From 3f80fc1d0e2de66499d5cead179428a607c4766c Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 29 Jun 2020 14:25:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=8F=90=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menus/dialog/trainControl.vue | 30 +- .../fuzhou_01/menus/dialog/trainControl.vue | 440 ------------------ .../theme/fuzhou_01/menus/menuTrain.vue | 4 +- src/jmapNew/theme/xian_01/menus/menuTrain.vue | 4 +- 4 files changed, 21 insertions(+), 457 deletions(-) rename src/jmapNew/theme/{xian_01 => components}/menus/dialog/trainControl.vue (94%) delete mode 100644 src/jmapNew/theme/fuzhou_01/menus/dialog/trainControl.vue diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue b/src/jmapNew/theme/components/menus/dialog/trainControl.vue similarity index 94% rename from src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue rename to src/jmapNew/theme/components/menus/dialog/trainControl.vue index 600ce0c38..96c4e4dd5 100644 --- a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue +++ b/src/jmapNew/theme/components/menus/dialog/trainControl.vue @@ -1,5 +1,5 @@ diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue index 24626d759..df521cc6b 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue @@ -2,7 +2,7 @@
- + @@ -17,7 +17,7 @@ import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; -import TrainControl from './dialog/trainControl'; +import TrainControl from '@/jmapNew/theme/components/menus/dialog/trainControl'; import TrainDelete from './dialog/trainDelete'; import TrainMove from './dialog/trainMove'; import TrainSwitch from './dialog/trainSwitch'; diff --git a/src/jmapNew/theme/xian_01/menus/menuTrain.vue b/src/jmapNew/theme/xian_01/menus/menuTrain.vue index 1ee3ff62f..f9dbbda84 100644 --- a/src/jmapNew/theme/xian_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/xian_01/menus/menuTrain.vue @@ -2,7 +2,7 @@
- + @@ -18,7 +18,7 @@ import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; -import TrainControl from './dialog/trainControl'; +import TrainControl from '@/jmapNew/theme/components/menus/dialog/trainControl'; import TrainDelete from './dialog/trainDelete'; import TrainMove from './dialog/trainMove'; import TrainSwitch from './dialog/trainSwitch'; From 755eab63013082db5769372a61dc4d3438896ed6 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 30 Jun 2020 14:42:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=80=83=E8=AF=95?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E6=97=B6=E6=9C=AA=E6=B8=85=E9=99=A4=E5=8E=9F=E6=9C=89?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/exam/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/exam/index.vue b/src/views/exam/index.vue index 5b164816f..2e6a9900f 100644 --- a/src/views/exam/index.vue +++ b/src/views/exam/index.vue @@ -65,6 +65,8 @@ export default { getSubSystemDetail(this.$route.params.subSystem).then(resp =>{ if (resp.data) { this.tableData = resp.data.lessonList; + } else { + this.tableData = []; } }).catch((error)=>{ if (error.code == 30001) {