任务执行的title修改

applications/architecture-dee/src/layout/components/Navbar.vue

@@ -6,7 +6,8 @@
       </span>
       <div v-if="activeModel" class="login-module">
         <span class="dex" style="cursor: pointer;" @click="goHome">DEX</span>
-        <span class="moudle-name"><i v-if="activeModel.path&&activeModel.path.backFlag" class="el-icon-back" @click="goback(activeModel)" />{{ activeModel | formatMoudleName }}</span>
+        <span v-if="$route.query.backFlag" class="moudle-name"><i class="el-icon-back" @click="goback()" />{{ $route.query.title }}</span>
+        <span v-else class="moudle-name">{{ activeModel | formatMoudleName }}</span>
         <!-- <span>>></span>
         <span>{{ routeName }}</span> -->
       </div>
@@ -102,8 +103,7 @@ export default {
         return '待办任务'
       } else if (obj.id === 'myMessage') {
         return '我的消息'
-      } else if (obj.id === 'myTaskReceive' || obj.id === 'myCheckTaskReceive' || obj.id === 'myAirTaskReceive' ||
-      obj.id === 'myTaskReceiveExecute' || obj.id === 'myCheckTaskReceiveExecute' || obj.id === 'myAirTaskReceiveExecute') {
+      } else if (obj.id === 'myTaskReceive' || obj.id === 'myCheckTaskReceive' || obj.id === 'myAirTaskReceive') {
         return obj.path.title
       }
     }
@@ -205,13 +205,6 @@ export default {
     // },
     goback() {
       this.$router.go(-1)
-      this.$store.dispatch('menu/activeModel', {
-        appId: this.activeModel.id,
-        pageInfo: {
-          title: this.$route.query.title.slice(0, -2),
-          path: '/dee-mes/taskExecution'
-        }
-      })
     },
     goHome() {
       this.$router.push(`/`)

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

@@ -99,8 +99,7 @@ const actions = {
     // if (!state.activeModel || model.appId !== state.activeModel.id || (model.appId === 'todoTask' && state.activeModel.id !== 'todoTask')) {
     if (model.appId === 'todoTask' || model.appId === 'myMessage' ||
      model.appId === 'myTaskReceive' || model.appId === 'myCheckTaskReceive' ||
-     model.appId === 'myAirTaskReceive' || model.appId === 'myTaskReceiveExecute' ||
-     model.appId === 'myCheckTaskReceiveExecute' || model.appId === 'myAirTaskReceiveExecute') { // 待办任务页特殊处理
+     model.appId === 'myAirTaskReceive') { // 待办任务页特殊处理
       commit('SET_ACTIVE_MODEL', {
         id: model.appId,
         path: { ...model.pageInfo }

applications/dee-mes/src/views/taskReception/components/taskReceiveCard/index.vue

@@ -226,20 +226,13 @@ export default {
           title: this.$route.query.title + '执行',
           showMenu: false,
           showTag: 'false',
-          isOK: item.isOK
+          isOK: item.isOK,
+          backFlag: true
           // materNo: item.materNo,
           // airModelId: item.airModelId,
           // sortiesId: item.sortiesId,
         }
       })
-      this.$store.dispatch('menu/activeModel', {
-        appId: this.activeModel.id + 'Execute',
-        pageInfo: {
-          title: this.activeModel.path.title + '执行',
-          path: '/dee-mes/taskExecution',
-          backFlag: true
-        }
-      })
       this.$store.dispatch('app/closeSideBar', false)
     },
     getTaskAcceptance() {