gengx

src/router/index.js

@@ -46,15 +46,15 @@ const router = new Router({
             children: routes
         },
         {
-            name: 'data_v',
+            name: 'datasv',
-            path: '/data_v',
+            path: '/datasv',
-            component: resolve => require(['@/views/datav/data_v'], resolve),
+            component: resolve => require(['@/views/datav/dataV'], resolve),
             meta: {model: 'error'},
         },
         {
-            name: 'copy_v',
+            name: 'copysv',
-            path: '/copy_v',
+            path: '/copysv',
-            component: resolve => require(['@/views/datav/copy_v'], resolve),
+            component: resolve => require(['@/views/datav/copyV'], resolve),
             meta: {model: 'error'},
         },
         // {
@@ -128,7 +128,7 @@ const router = new Router({
 });
 
 router.beforeEach((to, from, next) => {
-    console.log(to);
+    // console.log(to);
     let tokenList = getStore('tokenList', true);
     if (tokenList) {
         let refreshToken = tokenList.refreshToken;
@@ -146,6 +146,11 @@ router.beforeEach((to, from, next) => {
             }));
         }
     }
+
+    if (to.name === 'datasv' || to.path === '/datasv' || to.name === 'copysv' || to.path === '/copysv') {
+        next();
+        return false;
+    }
     //页面中转
     if (to.name === 'index' || to.path === '/index' || to.path === '/') {
         next({path: HOME_PAGE});

src/views/datav/copyV.vue

@@ -401,7 +401,6 @@
                           :id="task.code"
                           :key="task.code"
                           :class="showTaskPri(task.pri)"
-                          v-if="!task.done && task.canRead"
                           @click.stop="taskDetail(task.code, index)"
                         >
                           <div class="task-priority bg-priority-0"></div>
@@ -991,7 +990,7 @@
   import { notice } from "@/assets/js/notice";
   
   export default {
-    name: "project-space-task",
+    name: "copyV",
     components: {
       RecycleBin,
       TaskTag,
@@ -1361,11 +1360,13 @@
             if (!task.canRead) {
               canNotReadCount++;
             }
-            if (task.done) {
+            stage.doneTasks.push(task);
-              stage.doneTasks.push(task);
+            // console.log(params.type_name, task.done);
-            } else {
+            // if (task.done) {
-              stage.unDoneTasks.push(task);
+            //   stage.doneTasks.push(task);
-            }
+            // } else {
+            //   stage.unDoneTasks.push(task);
+            // }
           });
           stage.canNotReadCount = canNotReadCount;
           stage.tasksLoading = false;

src/views/datav/dataV.vue

@@ -46,7 +46,7 @@ import {
 import { notice } from '../../assets/js/notice';
 
 export default {
-  name: "datav",
+  name: "dataV",
   data() {
     return {
       map: null,

src/views/index.vue

@@ -326,9 +326,12 @@
             },
             menuModelClick(event) {
                 //点击顶部导航跳转页面
-                console.log(event);
+                console.log('event', event);
-                if(event.key==173){ // 跳转大屏
+                if(event.key==179){ // 跳转大屏
-                    return window.open('/#/data_v', '_blank');
+                    return this.$router.push('/datasv');
+                }
+                if(event.key==181){ // 跳转大屏
+                    return this.$router.push('/copysv');
                 }
                 let that = this;
                 that.menu.forEach(function (v, k) {