首页修改

applications/architecture-dee/src/layout/components/TagsView/index.vue

@@ -21,7 +21,7 @@
         v-show="!['系统管理','应用中心','安全中心','运维中心'].includes(activeModel.name)"
         ref="homeLink"
         class="home tags-view-item"
-        :to="{ path: '/dee-task-center/home?title=任务中心&showMenu=false'}"
+        :to="{ path: '/'}"
         tag="span"
       >
         <i class="el-icon-s-home" />
@@ -217,7 +217,8 @@ export default {
         if (!this.$utils._get(this.showViews, this.activeModel.id)) {
           this.visitedViews = []
         } else {
-          this.$set(this, 'visitedViews', this.$store.state.tagsView.visitedViews[this.activeModel.id].filter(x => (x.path !== '/dee-task-center/workflow/task-center/home')))
+          // this.$set(this, 'visitedViews', this.$store.state.tagsView.visitedViews[this.activeModel.id].filter(x => (x.path !== '/dee-task-center/workflow/task-center/home')))
+          this.$set(this, 'visitedViews', this.$store.state.tagsView.visitedViews[this.activeModel.id].filter(x => (x.path !== '/home')))
         }
       }, 0)
     },
@@ -264,11 +265,14 @@ export default {
       if (!['系统管理', '应用中心', '安全中心', '运维中心'].includes(this.activeModel.name)) {
         this.$store.dispatch('tagsView/delAllVisitedViews')
         this.$store.dispatch('tagsView/delAllCachedViews')
+        // this.$router.push({
+        //   path: '/dee-task-center/workflow/task-center/home',
+        //   query: {
+        //     title: '任务中心'
+        //   }
+        // })
         this.$router.push({
-          path: '/dee-task-center/workflow/task-center/home',
-          query: {
-            title: '任务中心'
-          }
+          path: '/home'
         })
       } else {
         // const view = this.showViews[this.activeModel.id].find(r => r.path === this.$route.path)
@@ -442,7 +446,8 @@ export default {
           if (this.visitedViews.length) {
             this.$router.push(this.visitedViews[0].fullPath)
           } else {
-            this.$router.push('/dee-task-center/workflow/task-center/home')
+            // this.$router.push('/dee-task-center/workflow/task-center/home')
+            this.$router.push('/home')
           }
         } else {
           if (this.visitedViews.length > 1) {

applications/architecture-dee/src/router/index.js

@@ -137,16 +137,17 @@ export const constantRoutes = [
     path: '/',
     name: 'navigation',
     meta: { disnav: true },
-    component: () => import('@/views/navigation/index'),
+    // component: () => import('@/views/navigation/index'),
+    redirect: '/home',
     hidden: true
   },
   {
     path: '/home',
-    name: 'home',
-    meta: { title: '任务中心', disnav: true },
-    // component: () => import('../../../dee-task-center/src/views/home/index.vue'),
+    name: 'navigation',
+    meta: { disnav: false, isHome: true },
+    component: () => import('../../../dee-task-center/src/views/home/index.vue'),
     // component: () => import('@/layout/home.vue'),
-    redirect: '/dee-task-center/home?title=任务中心&showMenu=false',
+    // redirect: '/dee-task-center/home?showMenu=false',
     hidden: true
   },
   // {

applications/architecture-dee/src/store/modules/menu.js

@@ -97,7 +97,7 @@ const mutations = {
 const actions = {
   activeModel({ commit, state }, model) {
     // if (!state.activeModel || model.appId !== state.activeModel.id || (model.appId === 'todoTask' && state.activeModel.id !== 'todoTask')) {
-    if (model.appId === 'todoTask' || model.appId === 'myMessage' ||
+    if (model.appId === 'todoTask' || model.appId === 'homeCenter' || model.appId === 'myMessage' ||
      model.appId === 'myTaskReceive' || model.appId === 'myCheckTaskReceive' ||
      model.appId === 'myAirTaskReceive') { // 待办任务页特殊处理
       commit('SET_ACTIVE_MODEL', {

applications/architecture-dee/src/views/login/index.vue

@@ -199,6 +199,14 @@ export default {
               this.$store.dispatch('permission/clearPermissionList')
               // this.$router.push({ path: this.redirect || '/' })
               this.$router.push({ path: '/' })
+              this.$store.dispatch('menu/activeModel', {
+                appId: 'homeCenter',
+                pageInfo: {
+                  path: '/home'
+                }
+              })
+              this.$store.dispatch('app/closeSideBar', false)
+              // this.$store.dispatch('app/toggleSideBar')
             }
           })
         }).catch(e => {

applications/dee-task-center/src/views/home/compontents/my-task.vue

@@ -67,7 +67,7 @@ import { showIcon } from '@/utils/util'
 import { getTemps } from '@/api/workflow/userSettings.js'
 // import { getFinishedTaskHome } from '@/api/workflow/taskCenter.js'
 import { getAllApplication } from '@/api/workflow/config'
-import { getTaskCount } from '@/api/workspace.js'
+// import { getTaskCount } from '@/api/workspace.js'
 import _get from 'lodash.get'
 import { post, get } from '@/utils/http'
 
@@ -353,7 +353,7 @@ export default {
       const params = {
         type: this.quickAccessList[index].type
       }
-      getTaskCount(params).then(res => {
+      get(`/indexTask/task/fitOut`, params).then(res => {
         this.$set(this.quickAccessList[index], 'taskCount', res.items.count)
       })
     },
@@ -368,6 +368,7 @@ export default {
           path: '/dee-task-center/workflow/task-center/home',
           query: {
             DAO: '单个签审',
+            title: '任务中心',
             processDefKey: item.procDefKey,
             taskDefinitionKey: item.taskKey,
             type: this.type

applications/dee-task-center/src/views/workflow/task-center/myPlanTask/moduleTaskListNew.vue

@@ -23,9 +23,10 @@
   </div>
 </template>
 <script>
-import { getMyTodoList } from '@/api/workflow/taskCenter'
+// import { getMyTodoList } from '@/api/workflow/taskCenter'
+import { get } from '@/utils/http'
 export default {
-  name: 'ModuleTaskList',
+  name: 'ModuleTaskListNew',
   data() {
     return {
       loading: false,
@@ -41,7 +42,7 @@ export default {
   methods: {
     loadData(hasFlag) {
       this.loading = true
-      getMyTodoList().then(res => {
+      get('indexTask/task/todo').then(res => {
         const that = this
         that.taskList = res.items || []
         that.loading = false
@@ -57,6 +58,7 @@ export default {
         // path: '/dee-task-center/taskList?title=批量签审',
         path: '/dee-task-center/workflow/task-center/home',
         query: {
+          title: '任务中心',
           DAO: '批量签审',
           processDefKey: item.procDefKey,
           taskDefinitionKey: item.taskKey