Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

src/router/routes/modules/dashboard.ts

@@ -23,15 +23,15 @@ const dashboard: AppRouteModule = {
         title: t('routes.dashboard.analysis'),
       },
     },
-    {
-      path: '/dashboard/dataScreen',
-      name: 'DataScreen',
-      component: () => import('@/views/dashboard/dataScreen/index.vue'),
-      meta: {
-        // affix: true,
-        title: t('routes.dashboard.dataScreen'),
-      },
-    },
+    // {
+    //   path: '/dashboard/dataScreen',
+    //   name: 'DataScreen',
+    //   component: () => import('@/views/dashboard/dataScreen/index.vue'),
+    //   meta: {
+    //     // affix: true,
+    //     title: t('routes.dashboard.dataScreen'),
+    //   },
+    // },
     {
       path: '/formCallPage',
       name: 'formCallPage',

src/store/modules/permission.ts

@@ -63,7 +63,7 @@ export const usePermissionStore = defineStore({
     // menu List
     // 菜单列表
     frontMenuList: [],
-    changeMenu: dayjs().valueOf()
+    changeMenu: dayjs().valueOf(),
   }),
   getters: {
     getChangeMenu(state): number {
@@ -95,7 +95,7 @@ export const usePermissionStore = defineStore({
       list?.length > 0 && this.setLastBuildMenuTime();
     },
 
-    setChangeMenu(){
+    setChangeMenu() {
       this.changeMenu = dayjs().valueOf();
     },
 
@@ -170,7 +170,16 @@ export const usePermissionStore = defineStore({
       };
       // 注册路由
       const registeredRoute = (data) => {
-        const modules = import.meta.glob('../../views/demo/**/**/index.vue');
+        let modules;
+        let component;
+        // 判断是不是大屏，不是大屏的情况下增加路径demo
+        if (data.item.url.split('/')[1] == 'map') {
+          modules = import.meta.glob('../../views/**/**/**/index.vue');
+          component = modules['../../views' + data.item.url + '/index.vue'];
+        } else {
+          modules = import.meta.glob('../../views/demo/**/**/index.vue');
+          component = modules['../../views/demo' + data.item.url + '/index.vue'];
+        }
         if (data.children.length == 0 && data.item.parentId == 0 && data.item.status == 1) {
           //给带参数的路由先注册主路由
           if (data.item.url.indexOf('@') > 0) {
@@ -218,7 +227,7 @@ export const usePermissionStore = defineStore({
                     icon: data.item.iconName,
                     elements: data.item.elements,
                   },
-                  component: modules['../../views/demo' + data.item.url + '/index.vue'],
+                  component: component,
                 },
               ],
             });
@@ -235,16 +244,21 @@ export const usePermissionStore = defineStore({
               icon: data.item.iconName,
               elements: data.item.elements,
             },
-            // component: data.item.parentId == 0 ? LAYOUT : () => import('../../views/demo' + data.item.url + '/index.vue'),
-            component:
-              data.item.parentId == 0
-                ? LAYOUT
-                : modules['../../views/demo' + data.item.url + '/index.vue'],
+            component: data.item.parentId == 0 ? LAYOUT : component,
           });
           if (data.children && data.children.length > 0) {
             data.children.forEach((element) => {
+              // 菜单里配置带参数，但没有单独的主路由，先注册主路由
               if (element.item.status == 1 && element.item.url.indexOf('@') > 0) {
                 const path = element.item.url.substring(0, element.item.url.indexOf('@'));
+                let childComponent;
+                if (data.item.url.split('/')[1] == 'map') {
+                  modules = import.meta.glob('../../views/**/**/**/index.vue');
+                  childComponent = modules['../../views' + path + '/index.vue'];
+                } else {
+                  modules = import.meta.glob('../../views/demo/**/**/index.vue');
+                  childComponent = modules['../../views/demo' + path + '/index.vue'];
+                }
                 router.addRoute('Root', {
                   path: path,
                   name: element.item.code,
@@ -264,11 +278,19 @@ export const usePermissionStore = defineStore({
                         icon: element.item.iconName,
                         elements: element.item.elements,
                       },
-                      component: modules['../../views/demo' + path + '/index.vue'],
+                      component: childComponent,
                     },
                   ],
                 });
               } else if (element.item.code && element.item.status == 1) {
+                let childComponent;
+                if (data.item.url.split('/')[1] == 'map') {
+                  modules = import.meta.glob('../../views/**/**/**/index.vue');
+                  childComponent = modules['../../views' + element.item.url + '/index.vue'];
+                } else {
+                  modules = import.meta.glob('../../views/demo/**/**/index.vue');
+                  childComponent = modules['../../views/demo' + element.item.url + '/index.vue'];
+                }
                 router.addRoute(element.item.code, {
                   path: element.item.url,
                   name: element.item.url.replaceAll('/', ''),
@@ -278,7 +300,7 @@ export const usePermissionStore = defineStore({
                     elements: element.item.elements,
                   },
                   // component: () => import('../../views/demo' + element.item.url + '/index.vue')
-                  component: modules['../../views/demo' + element.item.url + '/index.vue'],
+                  component: childComponent,
                 });
               }
             });

src/views/demo/workflow/task/process/audit.vue

@@ -298,7 +298,7 @@
   const auditName = ref('audit');
   const auditTitleVal = ref('审批栏');
   const auditNameVal = ref('审批意见');
-  const rejectOpen = ref(false);
+  const rejectOpen = ref(true);
   const footerStyle = ref({
     height: '220px',
     width: mapConfig.value.isShowMap ? '100%' : '60%',