diff --git a/package.json b/package.json index 01ea60b..23a94e5 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "axios": "^1.3.0", "dayjs": "^1.11.7", "echarts": "^5.6.0", + "element-resize-detector": "^1.2.4", "html2canvas": "^1.4.1", "jspdf": "^3.0.1", "lodash-es": "^4.17.21", diff --git a/src/assets/img/creative-generation-workshop/icon-photo.png b/src/assets/img/creative-generation-workshop/icon-photo.png new file mode 100644 index 0000000..270b691 Binary files /dev/null and b/src/assets/img/creative-generation-workshop/icon-photo.png differ diff --git a/src/assets/img/creative-generation-workshop/icon-upload-fail.png b/src/assets/img/creative-generation-workshop/icon-upload-fail.png new file mode 100644 index 0000000..b0b667e Binary files /dev/null and b/src/assets/img/creative-generation-workshop/icon-upload-fail.png differ diff --git a/src/assets/img/creative-generation-workshop/icon-video.png b/src/assets/img/creative-generation-workshop/icon-video.png new file mode 100644 index 0000000..471861e Binary files /dev/null and b/src/assets/img/creative-generation-workshop/icon-video.png differ diff --git a/src/components/_base/navbar/components/navbar-menu/index.vue b/src/components/_base/navbar/components/navbar-menu/index.vue index 7c33508..8611b4c 100644 --- a/src/components/_base/navbar/components/navbar-menu/index.vue +++ b/src/components/_base/navbar/components/navbar-menu/index.vue @@ -27,9 +27,11 @@ + diff --git a/src/main.ts b/src/main.ts index bab185a..c88a324 100644 --- a/src/main.ts +++ b/src/main.ts @@ -6,8 +6,8 @@ import App from './App.vue'; import router from './router'; import store from './stores'; -import NoData from '@/components/no-data'; -import SvgIcon from "@/components/svg-icon"; +import NoData from '@/components/no-data/index.vue'; +import SvgIcon from '@/components/svg-icon/index.vue'; import '@/api/index'; import '@arco-design/web-vue/dist/arco.css'; // Arco 默认样式 @@ -15,7 +15,7 @@ import './core'; import 'normalize.css'; import 'uno.css'; -import 'virtual:svg-icons-register' +import 'virtual:svg-icons-register'; // import '@/styles/vars.css'; // 优先加载 @@ -24,6 +24,4 @@ const app = createApp(App); app.component('NoData', NoData); app.component('SvgIcon', SvgIcon); -app.use(store); -app.use(router); -app.mount('#app'); +app.use(store).use(router).mount('#app'); diff --git a/src/stores/modules/user/index.ts b/src/stores/modules/user/index.ts index e94729e..972eda7 100644 --- a/src/stores/modules/user/index.ts +++ b/src/stores/modules/user/index.ts @@ -79,7 +79,7 @@ export const useUserStore = defineStore('user', { getUserAllowAccessRoutes() { const sidebarStore = useSidebarStore(); const menuList = sidebarStore.menuList; - const appRoutes = router.options?.routes ?? []; + const appRoutes = router.getRoutes(); appRoutes.forEach((route: any) => { if (!route.meta?.requiresAuth) { diff --git a/src/styles/components/form.scss b/src/styles/components/form.scss index 8a5895c..0457555 100644 --- a/src/styles/components/form.scss +++ b/src/styles/components/form.scss @@ -1,6 +1,9 @@ .arco-form { .arco-form-item { - margin-bottom: 16px !important; + margin-bottom: 0; + &:not(:last-child) { + margin-bottom: 16px !important; + } .arco-form-item-label-col { padding-right: 12px !important; .arco-form-item-label { diff --git a/src/styles/lib/reset.scss b/src/styles/lib/reset.scss index 5c3b861..00bdba2 100644 --- a/src/styles/lib/reset.scss +++ b/src/styles/lib/reset.scss @@ -23,3 +23,23 @@ p { a { text-decoration: none; } + +/* 滚动条样式 */ +::-webkit-scrollbar { + width: 4px; + height: 4px; +} + +::-webkit-scrollbar-track-piece { + border-radius: 0; +} + +::-webkit-scrollbar-thumb { + height: 10px; + background-color: #C9CDD4; + border-radius: 99px; + outline-offset: -2px; +} +::-webkit-scrollbar-button { + display: none; +} diff --git a/src/styles/vars.scss b/src/styles/vars.scss index 573e1ee..8741cbe 100644 --- a/src/styles/vars.scss +++ b/src/styles/vars.scss @@ -74,3 +74,27 @@ .arco-link { --color-primary-6: var(--arco-primary-6) !important; } + +.common-filter-wrap { + padding: 24px 24px 8px; + .filter-row { + display: flex; + align-items: center; + flex-wrap: wrap; + .filter-row-item { + display: flex; + align-items: center; + margin: 0 24px 16px 0; + .label { + margin-right: 8px; + color: #211f24; + font-family: $font-family-regular; + font-size: 14px; + font-style: normal; + font-weight: 400; + flex-shrink: 0; + line-height: 22px; + } + } + } +} diff --git a/src/views/creative-generation-workshop/manuscript/manuscript-check/components/filter-block/index.vue b/src/views/creative-generation-workshop/manuscript/manuscript-check/components/filter-block/index.vue index 4a884e2..edc1821 100644 --- a/src/views/creative-generation-workshop/manuscript/manuscript-check/components/filter-block/index.vue +++ b/src/views/creative-generation-workshop/manuscript/manuscript-check/components/filter-block/index.vue @@ -4,9 +4,9 @@ * @Date: 2025-06-25 14:02:40 -->