Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/router/guards.ts

@@ -153,7 +153,7 @@ function setupKeepAlive(router: Router) {
     const keepAliveStore = useKeepAliveStore()
     // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
     if (to.meta.cache) {
-      const componentName = to.matched.at(-1)?.components?.default.name
+      const componentName = to.matched.at(-1)?.path.split('/').pop()
       if (componentName) {
         keepAliveStore.add(componentName)
       }

src/store/modules/route.ts

@@ -180,9 +180,10 @@ function formatBackRoutes(routes: any, views = import.meta.glob('../../views/**/
       case 'Layout':
         route.component = () => import('@/layouts/index.vue')
         break
-      default:
-        if (route.component) {
+        default:
+          if (route.component) {
           route.component = views[`../../views${route.component}.vue`]
+          if(route.keepAlive==='1') route.cache=true
           if (route.menu ==0) {
             route.menu = false;
           }

src/views/consoleManage/taskDataManage/channelData/index.vue

@@ -303,6 +303,7 @@ const queryList = async () => {
     pageNo: pageInfo.value.pageNum,
     pageSize: pageInfo.value.pageSize,
     routerKey: routerKey.value,
+    systemCode: localStorage.getItem('login_system'),
     userId: phone,
     orderType: globalSortKey.value
       ? globalSortKey.value + " " + globalSortOrder.value
@@ -329,6 +330,7 @@ const downloadFile = async () => {
     pageNo: pageInfo.value.pageNum,
     pageSize: pageInfo.value.pageSize,
     routerKey: routerKey.value,
+    systemCode: localStorage.getItem('login_system'),
     userId: phone,
     orderType: globalSortKey.value
       ? globalSortKey.value + " " + globalSortOrder.value

src/views/consoleManage/taskDataManage/salesmanData/index.vue

@@ -304,6 +304,7 @@ const queryList = async () => {
     pageSize: pageInfo.value.pageSize,
     routerKey: routerKey.value,
     userId: phone,
+    systemCode: localStorage.getItem('login_system'),
     orderType: globalSortKey.value
       ? globalSortKey.value + " " + globalSortOrder.value
       : "",
@@ -329,6 +330,7 @@ const downloadFile = async () => {
     pageNo: pageInfo.value.pageNum,
     pageSize: pageInfo.value.pageSize,
     routerKey: routerKey.value,
+    systemCode: localStorage.getItem('login_system'),
     userId: phone,
     orderType: globalSortKey.value
       ? globalSortKey.value + " " + globalSortOrder.value

src/views/consoleManage/taskDataManage/telemarketingData/index.vue

@@ -303,6 +303,7 @@ const queryList = async () => {
     pageNo: pageInfo.value.pageNum,
     pageSize: pageInfo.value.pageSize,
     routerKey: routerKey.value,
+    systemCode: localStorage.getItem('login_system'),
     userId: phone,
     orderType: globalSortKey.value
       ? globalSortKey.value + " " + globalSortOrder.value
@@ -329,6 +330,7 @@ const downloadFile = async () => {
     pageNo: pageInfo.value.pageNum,
     pageSize: pageInfo.value.pageSize,
     routerKey: routerKey.value,
+    systemCode: localStorage.getItem('login_system'),
     userId: phone,
     orderType: globalSortKey.value
       ? globalSortKey.value + " " + globalSortOrder.value