From fb40db0ad842589daebed255a5194541a05d32d1 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 29 May 2020 18:24:51 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=A3=81=E5=88=A4=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/QueryListPage/QueryForm.vue | 3 +++ src/components/QueryListPage/QueryListPage.vue | 7 +++++++ src/jmapNew/shape/Switch/index.js | 6 +++--- src/views/jsxt/refereeList/index.vue | 3 ++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/components/QueryListPage/QueryForm.vue b/src/components/QueryListPage/QueryForm.vue index 28421fb31..47cd039d8 100644 --- a/src/components/QueryListPage/QueryForm.vue +++ b/src/components/QueryListPage/QueryForm.vue @@ -510,6 +510,9 @@ export default { if ( typeof row.selectChange === 'function') { row.selectChange && row.selectChange(form); } + }, + getFormModel() { + return this.formModel; } } }; diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue index 54abab9d7..12d30a7c2 100644 --- a/src/components/QueryListPage/QueryListPage.vue +++ b/src/components/QueryListPage/QueryListPage.vue @@ -486,6 +486,13 @@ export default { } this.queryList.data = [...this.queryList.data]; }, + getFormModel() { + if (this.$refs.queryForm) { + return this.$refs.queryForm.getFormModel(); + } else { + return ''; + } + }, sortChange(data) { const self = this; if (data.order && data.column.sortable == 'custom') { diff --git a/src/jmapNew/shape/Switch/index.js b/src/jmapNew/shape/Switch/index.js index 0dce65d13..3303fbb2c 100644 --- a/src/jmapNew/shape/Switch/index.js +++ b/src/jmapNew/shape/Switch/index.js @@ -121,7 +121,7 @@ export default class Switch extends Group { fill: 'rgba(0, 0, 0, 1)', lineDash: [3, 3], stroke: '#F00', - lineWidth: 1 + lineWidth: 2 } }); this.add(this.lossShow); @@ -333,8 +333,8 @@ export default class Switch extends Group { this.lossShow && this.lossShow.show(); this.lossShow && this.lossShow.animateStyle(true) .when(0, { stroke: this.style.backgroundColor }) - .when(1000, { stroke: '#F00' }) - .when(2000, { stroke: this.style.backgroundColor }) + .when(500, { stroke: '#F00' }) + .when(1000, { stroke: this.style.backgroundColor }) .start(); } diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue index 0b7d97b4e..c2292df31 100644 --- a/src/views/jsxt/refereeList/index.vue +++ b/src/views/jsxt/refereeList/index.vue @@ -141,7 +141,8 @@ export default { return statusDict[status]; }, getData() { - const params = {raceId:this.$route.query.raceId, pageSize:999, pageNum:1}; + const formModel = this.$refs.queryListPage.getFormModel(); + const params = {raceId:this.$route.query.raceId, pageSize:999, pageNum:1, name: formModel ? formModel.name : '', organization: formModel ? formModel.organization : ''}; getRaceUserList(params).then(response=>{ this.queryList.data = response.data.list; this.refresh(); From 106d217e63ffef5a5b8fda3075fab27fff8b2b9d Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Fri, 29 May 2020 18:26:12 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=9B=BE=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/planMonitor/editTool/menus/createEmptyPlan.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/planMonitor/editTool/menus/createEmptyPlan.vue b/src/views/planMonitor/editTool/menus/createEmptyPlan.vue index 6413edccf..9a90b9d1a 100644 --- a/src/views/planMonitor/editTool/menus/createEmptyPlan.vue +++ b/src/views/planMonitor/editTool/menus/createEmptyPlan.vue @@ -219,9 +219,9 @@ export default { for (const index in wb.Sheets) { jsonData = that.planConvert.importData(wb.Sheets[index], jsonData); } - // console.log(jsonData, '解析后数据'); + console.log(jsonData, '解析后数据'); - if (that.$route.query.lineCode == '02') { + if (that.$route.query.lineCode == '02' && !jsonData[0].downTrack && !jsonData[0].upTrack) { that.loadingDig.close(); that.$message.warning(`运行图暂无默认上行折返轨或默认下行折返轨，请输入`); } else { From 6705d59a267025552f9a1c740e086e208b2d7e3d Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Mon, 1 Jun 2020 10:11:09 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AB=9E=E8=B5=9B?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E8=A3=81=E5=88=A4=E6=9F=A5=E7=9C=8B=E7=90=86?= =?UTF-8?q?=E8=AE=BA=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/baseUrl.js | 4 ++-- src/views/jsxt/competition/theory/result.vue | 11 ++++++++--- src/views/jsxt/refereeList/index.vue | 13 +++++++++++-- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 836771751..778caeb7b 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,11 +2,11 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 - BASE_API = 'http://192.168.3.82:9000'; // 杜康 + // BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 diff --git a/src/views/jsxt/competition/theory/result.vue b/src/views/jsxt/competition/theory/result.vue index c16f9a4bb..2b572fd33 100644 --- a/src/views/jsxt/competition/theory/result.vue +++ b/src/views/jsxt/competition/theory/result.vue @@ -98,7 +98,6 @@ export default { this.examQuestions.push({...item.question, ...{answer: String(item.answerOptionId), score: item.score, index: i}}); }); this.totalScore = resp.data.reduce((pre, ver) => pre + ver.score, 0); - console.log(this.totalScore); } }).catch(error => { this.$message.error(`加载考试详情失败：${error.message}`); }); }, @@ -106,8 +105,14 @@ export default { document.querySelector('.el-header').scrollIntoView(true); }, commit() { - const query = { raceId:this.$route.query.raceId }; - this.$router.push({path: `/jsxt/home`, query: query }); + if (this.$route.query.result) { + const query = { raceId:this.$route.query.raceId }; + this.$router.push({path: `/refereeJsxt/home`, query: query }); + } else { + const query = { raceId:this.$route.query.raceId }; + this.$router.push({path: `/jsxt/home`, query: query }); + } + } } }; diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue index c2292df31..dfd2adb1c 100644 --- a/src/views/jsxt/refereeList/index.vue +++ b/src/views/jsxt/refereeList/index.vue @@ -103,7 +103,13 @@ export default { showControl: (row) => { return row.status == '3'; } }, { - name: '回放', + name: '理论结果', + handleClick: this.handleTheoryResult, + type: '', + showControl: (row) => { return row.status == '5'; } + }, + { + name: '实操回放', handleClick: this.playBack, type: '', showControl: (row) => { return row.status == '4'; } @@ -154,6 +160,9 @@ export default { }, 2000); }); }, + handleTheoryResult() { + this.$router.replace({ path: `/jsxt/theory/result?raceId=${this.$route.query.raceId}&result=true` }); + }, handleAdd() { const loading = this.$loading({ lock: true, @@ -170,7 +179,7 @@ export default { reader.readAsText(f, 'utf-8'); reader.onload = function(e) { const data = e.target.result; - console.log(JSON.parse(data)); + // console.log(JSON.parse(data)); loadingPaper(that.$route.query.raceId, JSON.parse(data)).then(res => { that.$message.success('试题加载成功'); loading.close(); From 14e8dfe547466571a7b0d356cff4285ac53853ec Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Mon, 1 Jun 2020 10:27:34 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=81=93=E5=B2=94?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmap/shape/Switch/index.js | 2 +- src/jmapNew/shape/Switch/ESwLnversion.js | 4 ++++ src/jmapNew/shape/Switch/index.js | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/jmap/shape/Switch/index.js b/src/jmap/shape/Switch/index.js index d3d4a4035..81ca5bba9 100644 --- a/src/jmap/shape/Switch/index.js +++ b/src/jmap/shape/Switch/index.js @@ -303,7 +303,7 @@ export default class Switch extends Group { this.releaseBackground.hide(); break; case '02': - this.relocShelter.getSection().animateStyle(true) + this.relocShelter && this.relocShelter.getSection().animateStyle(true) .when(1000, { fill: this.style.backgroundColor }) .start(); break; diff --git a/src/jmapNew/shape/Switch/ESwLnversion.js b/src/jmapNew/shape/Switch/ESwLnversion.js index 943bafbd5..6a1d054b1 100644 --- a/src/jmapNew/shape/Switch/ESwLnversion.js +++ b/src/jmapNew/shape/Switch/ESwLnversion.js @@ -47,6 +47,10 @@ class ESwLnversion extends Group { this.relocShelter.stopAnimation(flag); } + getSection() { + return this.relocShelter; + } + animateStyle(cb) { this.eachChild((child) => { cb(child); diff --git a/src/jmapNew/shape/Switch/index.js b/src/jmapNew/shape/Switch/index.js index 3303fbb2c..28a8e6368 100644 --- a/src/jmapNew/shape/Switch/index.js +++ b/src/jmapNew/shape/Switch/index.js @@ -462,10 +462,10 @@ export default class Switch extends Group { if (this.model.normalPosition) { this.releaseBackground.hide(); /** 定位*/ } else if (this.model.reversePosition) { - this.relocShelter.getSection().animateStyle(true) + this.relocShelter && this.relocShelter.getSection().animateStyle(true) .when(1000, { fill: this.style.backgroundColor }) .start(); - this.rhomboid.getSection().animateStyle(true) + this.rhomboid && this.rhomboid.getSection().animateStyle(true) .when(1000, { fill: this.style.backgroundColor }) .start(); /** 反位*/ } From 76990e129e07712676e0eb0cd623eedbdcc56bab Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 1 Jun 2020 10:32:02 +0800 Subject: [PATCH 5/6] =?UTF-8?q?iscs=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/map.js | 1 + src/utils/baseUrl.js | 4 +-- .../config/pis/emergencyRelease.vue | 34 ++++++++++++------- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js index d9b6dc9b8..e147ef126 100644 --- a/src/jmapNew/map.js +++ b/src/jmapNew/map.js @@ -289,6 +289,7 @@ class Jlmap { setUpdateMapDevice(list) { store.dispatch('map/updateMapDevice', list); (list || []).forEach(elem => { + const code = elem.code; const type = elem._type; if (elem.deviceType === 'TRAIN' && elem.type === 'HEAD') { diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 836771751..778caeb7b 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,11 +2,11 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 - BASE_API = 'http://192.168.3.82:9000'; // 杜康 + // BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 diff --git a/src/views/iscs/iscsSystem/config/pis/emergencyRelease.vue b/src/views/iscs/iscsSystem/config/pis/emergencyRelease.vue index 7a4f70106..6c52b8b8d 100644 --- a/src/views/iscs/iscsSystem/config/pis/emergencyRelease.vue +++ b/src/views/iscs/iscsSystem/config/pis/emergencyRelease.vue @@ -2,19 +2,21 @@
中心PIS紧急信息一览
- + -
-
显示内容
-
-
-
-
区域详细
-
紧急信息清除
-
清除
+
+
+
显示内容
+
+
+
+
区域详细
+
紧急信息清除
+
清除
+
@@ -25,14 +27,16 @@ export default { data() { return { tableData: [], - headerCellStyle: {background: '#121A86', height: '25px', color: '#FFF'} + headerCellStyle: {background: '#121A86', height: '25px', color: '#FFF'}, + cellStyle: {height:'25px'} }; } }; From 119af195223f3344bddb126cb1f5f990d6cf0c64 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 1 Jun 2020 10:57:19 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E6=8C=89=E8=AE=A1=E5=88=92=E8=A1=8C=E8=BD=A6=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/map.js | 1 - src/views/newMap/jlmapNew/index.vue | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js index e147ef126..d9b6dc9b8 100644 --- a/src/jmapNew/map.js +++ b/src/jmapNew/map.js @@ -289,7 +289,6 @@ class Jlmap { setUpdateMapDevice(list) { store.dispatch('map/updateMapDevice', list); (list || []).forEach(elem => { - const code = elem.code; const type = elem._type; if (elem.deviceType === 'TRAIN' && elem.type === 'HEAD') { diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue index 0c024e860..184cddb81 100644 --- a/src/views/newMap/jlmapNew/index.vue +++ b/src/views/newMap/jlmapNew/index.vue @@ -433,7 +433,13 @@ export default { let list = []; nameList.forEach(item => { if (this.$store.state.map.map[item] && this.$store.state.map.map[item].constructor === Array) { - list = [...list, ...this.$store.state.map.map[item]]; + if (item === 'trainList') { + this.$store.state.map.map[item].forEach(elem => { + elem && list.push(elem); + }); + } else { + list = [...list, ...this.$store.state.map.map[item]]; + } } }); this.$jlmap.updateShowStation(list, stationCode);