diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..ea153e5 Binary files /dev/null and b/dist.zip differ diff --git a/src/router/index.js b/src/router/index.js index 7bf5862..225ee03 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -46,15 +46,15 @@ const router = new Router({ children: routes }, { - name: 'data_v', - path: '/data_v', - component: resolve => require(['@/views/datav/data_v'], resolve), + name: 'datasv', + path: '/datasv', + component: resolve => require(['@/views/datav/dataV'], resolve), meta: {model: 'error'}, }, { - name: 'copy_v', - path: '/copy_v', - component: resolve => require(['@/views/datav/copy_v'], resolve), + name: 'copysv', + path: '/copysv', + 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}); diff --git a/src/views/datav/copy_v.vue b/src/views/datav/copyV.vue similarity index 99% rename from src/views/datav/copy_v.vue rename to src/views/datav/copyV.vue index 61002d0..cbcd0b5 100644 --- a/src/views/datav/copy_v.vue +++ b/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)" >
@@ -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); - } else { - stage.unDoneTasks.push(task); - } + stage.doneTasks.push(task); + // console.log(params.type_name, task.done); + // if (task.done) { + // stage.doneTasks.push(task); + // } else { + // stage.unDoneTasks.push(task); + // } }); stage.canNotReadCount = canNotReadCount; stage.tasksLoading = false; diff --git a/src/views/datav/data_v.vue b/src/views/datav/dataV.vue similarity index 99% rename from src/views/datav/data_v.vue rename to src/views/datav/dataV.vue index 019d4c4..88fc137 100644 --- a/src/views/datav/data_v.vue +++ b/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, diff --git a/src/views/index.vue b/src/views/index.vue index 272ce47..a508e2d 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -326,9 +326,12 @@ }, menuModelClick(event) { //点击顶部导航跳转页面 - console.log(event); - if(event.key==173){ // 跳转大屏 - return window.open('/#/data_v', '_blank'); + console.log('event', event); + if(event.key==179){ // 跳转大屏 + return this.$router.push('/datasv'); + } + if(event.key==181){ // 跳转大屏 + return this.$router.push('/copysv'); } let that = this; that.menu.forEach(function (v, k) {