From 72db8b3e94d11a33ecfbd02b2a379074c6f3e16e Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 29 Dec 2020 11:04:01 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=B4=A7=E6=80=A5=E5=81=9C=E8=BD=A6?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/chengdu_01.js | 1 + src/jmapNew/config/skinCode/chengdu_03.js | 4 ++-- .../shape/StationStand/emergent/EEmergentRhombus.js | 7 +++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/jmapNew/config/skinCode/chengdu_01.js b/src/jmapNew/config/skinCode/chengdu_01.js index f6d7a6d0b..0c7368295 100644 --- a/src/jmapNew/config/skinCode/chengdu_01.js +++ b/src/jmapNew/config/skinCode/chengdu_01.js @@ -234,6 +234,7 @@ class SkinCode extends defaultStyle { // 站台紧急关闭 emergentRhombus:{ z:1, + flicker: true, // 闪烁 mergentR: 4, // 站台紧急关闭半径 mergentN: 4, // 站台紧急关闭边数 insideOffset: { x: 0, y: 25 }, // 内站台紧急关闭偏移量 diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js index 620d40196..5cc88ccfd 100644 --- a/src/jmapNew/config/skinCode/chengdu_03.js +++ b/src/jmapNew/config/skinCode/chengdu_03.js @@ -264,8 +264,8 @@ class SkinCode extends defaultStyle { flicker: true, // 闪烁 mergentR: 5, // 站台紧急关闭半径 mergentN: 4, // 站台紧急关闭边数 - insideOffset: { x: 0, y: 30 }, // 内站台紧急关闭偏移量 - outsideOffset: { x: 0, y: -30}, // 外站台紧急关闭偏移量 + insideOffset: { x: 0, y: -30 }, // 内站台紧急关闭偏移量 + outsideOffset: { x: 0, y: 30}, // 外站台紧急关闭偏移量 closeColor: '#F61107' // 站台紧急关闭颜色 }, // 扣车元素 普通扣车 diff --git a/src/jmapNew/shape/StationStand/emergent/EEmergentRhombus.js b/src/jmapNew/shape/StationStand/emergent/EEmergentRhombus.js index d3934e729..536dd3d4e 100644 --- a/src/jmapNew/shape/StationStand/emergent/EEmergentRhombus.js +++ b/src/jmapNew/shape/StationStand/emergent/EEmergentRhombus.js @@ -57,10 +57,9 @@ class EEmergentRhombus extends Group { this.create(); this.emergent.show(); if (this.model.style.StationStand.emergentRhombus.flicker) { - this.emergent.getElement().animateStyle(true) - .when(0, { fill: this.style.backgroundColor }) - .when(1000, { fill: this.style.StationStand.emergentRhombus.closeColor }) - .when(2000, { fill: this.style.backgroundColor }) + this.emergent.animateStyle(true) + .when(0, { fill: this.model.style.backgroundColor }) + .when(1000, { fill: this.model.style.StationStand.emergentRhombus.closeColor }) .start(); } } From 637e76683736eee6edcd5df8b8ac0d1e05b72067 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 29 Dec 2020 15:20:01 +0800 Subject: [PATCH 2/5] =?UTF-8?q?iscs=20=E5=A4=8D=E5=88=B6=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/iscs.js | 26 ++++++++++++++++++++++++++ src/i18n/langs/en/router.js | 3 ++- src/i18n/langs/zh/router.js | 3 ++- src/router/index_Common.js | 8 ++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/src/api/iscs.js b/src/api/iscs.js index 2de26bfd3..0f15a31b9 100644 --- a/src/api/iscs.js +++ b/src/api/iscs.js @@ -15,3 +15,29 @@ export function getIscsData(params) { params }); } + +// 分页获取ISCS数据 +export function getIscsDataByPage(params) { + return request({ + url: '/api/v1/iscs/pagedQuery', + method: 'get', + params + }); +} + +// 复制iscs数据 +export function copyIscsData(data) { + return request({ + url: '/api/v1/iscs/copy', + method: 'post', + data + }); +} + +// 删除iscs数据绘图数据(发布的) +export function deleteIscs(id) { + return request({ + url: `/api/v1/iscs/${id}`, + method: 'delete' + }); +} diff --git a/src/i18n/langs/en/router.js b/src/i18n/langs/en/router.js index 542b1d872..774c025aa 100644 --- a/src/i18n/langs/en/router.js +++ b/src/i18n/langs/en/router.js @@ -88,5 +88,6 @@ export default { questionsRuleManage: 'Question rule manage', preTheoryData: 'Pre Theory Data', boardManage: 'Message Board Manage', - publishIBPManage:'publish IBP Manage' + publishIBPManage:'publish IBP Manage', + publishISCSManage:'publish ISCS Manage' }; diff --git a/src/i18n/langs/zh/router.js b/src/i18n/langs/zh/router.js index 4b0964ce8..96ece23b7 100644 --- a/src/i18n/langs/zh/router.js +++ b/src/i18n/langs/zh/router.js @@ -93,5 +93,6 @@ export default { questionsRuleManage: '出题规则管理', preTheoryData: '理论导入预处理', boardManage: '留言板管理', - publishIBPManage:'发布IBP盘管理' + publishIBPManage:'发布IBP盘管理', + publishISCSManage:'发布ISCS管理' }; diff --git a/src/router/index_Common.js b/src/router/index_Common.js index 84d337e8f..bf494bd87 100644 --- a/src/router/index_Common.js +++ b/src/router/index_Common.js @@ -108,6 +108,7 @@ const RunplanView = () => import('@/views/publish/runPlanEveryDay/runPlanView'); const PublishExamRule = () => import('@/views/publish/examRule/index'); const PublishExamRuleDraft = () => import('@/views/publish/examRule/draft/index'); const PublishIBP = () => import('@/views/publish/publishIBP/index'); +const PublishISCS = () => import('@/views/publish/publishISCS/index'); const TrainingPlatform = () => import('@/views/trainingPlatform/index'); @@ -673,6 +674,13 @@ export const asyncRouter = [ meta: { i18n: 'router.publishIBPManage' } + }, + { // 发布ibp盘 + path: 'iscs', + component: PublishISCS, + meta: { + i18n: 'router.publishISCSManage' + } } ] }, From 575895afe19025a24f55fbf1a69a4a48d5ab7ef6 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 29 Dec 2020 15:53:20 +0800 Subject: [PATCH 3/5] =?UTF-8?q?ISCS=20=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iscs/iscsSystem/config/canvas/iscsCanvas.vue | 3 ++- src/views/iscs/iscsSystem/index.vue | 3 ++- .../stationConfig/environment/index.vue | 3 ++- .../stationConfig/powerMonitor/substation.vue | 3 ++- .../iscsSystem/stationConfig/psdSystem/index.vue | 3 ++- src/views/iscs/iscsSystem/stationNav.vue | 16 ++++++++++++---- src/views/iscsSystem/index.vue | 3 ++- 7 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue b/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue index a59c34312..0070088bb 100644 --- a/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue +++ b/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue @@ -80,7 +80,8 @@ export default { methods: { async getDetail(mode, system, part) { const params = { - lineCode: this.$route.query.lineCode, + // lineCode: this.$route.query.lineCode, + mapId:this.$route.query.mapId, totalSystem: mode, system: system, userInterface : part diff --git a/src/views/iscs/iscsSystem/index.vue b/src/views/iscs/iscsSystem/index.vue index bbc491cc4..f6a971c79 100644 --- a/src/views/iscs/iscsSystem/index.vue +++ b/src/views/iscs/iscsSystem/index.vue @@ -8,7 +8,8 @@ -
+ +
diff --git a/src/views/iscs/iscsSystem/stationConfig/environment/index.vue b/src/views/iscs/iscsSystem/stationConfig/environment/index.vue index 328967856..2be0ca4b6 100644 --- a/src/views/iscs/iscsSystem/stationConfig/environment/index.vue +++ b/src/views/iscs/iscsSystem/stationConfig/environment/index.vue @@ -144,7 +144,8 @@ export default { }, getDetail() { const params = { - lineCode: this.$route.query.lineCode, + // lineCode: this.$route.query.lineCode, + mapId: this.$route.query.mapId, system: this.system, totalSystem :'environment02', userInterface : this.mode diff --git a/src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue b/src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue index 956b4d281..e12c6dc5d 100644 --- a/src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue +++ b/src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue @@ -51,7 +51,8 @@ export default { methods:{ getInitData() { const params = { - lineCode: this.$route.query.lineCode, + // lineCode: this.$route.query.lineCode, + mapId: this.$route.query.mapId, system: 'powerMonitoring', totalSystem :'powerMonitoring02' }; diff --git a/src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue b/src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue index 8a9104f85..1a4116a19 100644 --- a/src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue +++ b/src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue @@ -37,7 +37,8 @@ export default { }, mounted() { const params = { - lineCode: this.$route.query.lineCode, + // lineCode: this.$route.query.lineCode, + mapId: this.$route.query.mapId, totalSystem: 'psdSystem02', system: 'psdSystem', userInterface: 'psdOne' diff --git a/src/views/iscs/iscsSystem/stationNav.vue b/src/views/iscs/iscsSystem/stationNav.vue index 8fd265e88..80a743204 100644 --- a/src/views/iscs/iscsSystem/stationNav.vue +++ b/src/views/iscs/iscsSystem/stationNav.vue @@ -328,10 +328,18 @@ export default { this.stationList = []; res.data.forEach(station => { if (!station.depot && station.visible) { - const param = { - name: station.runPlanName + '站', - id: station.code - }; + let param = {}; + if (station.runPlanName.includes('站')) { + param = { + name: station.runPlanName, + id: station.code + }; + } else { + param = { + name: station.runPlanName + '站', + id: station.code + }; + } this.stationList.push(param); } }); diff --git a/src/views/iscsSystem/index.vue b/src/views/iscsSystem/index.vue index 3a64755df..d8e528213 100644 --- a/src/views/iscsSystem/index.vue +++ b/src/views/iscsSystem/index.vue @@ -115,7 +115,8 @@ export default { }); Vue.prototype.$iscs = this.$iscs; const params = { - lineCode: this.$route.query.lineCode, + // lineCode: this.$route.query.lineCode, + mapId: this.$route.query.mapId, totalSystem: mode, system: system, userInterface: part From 9a6008f9f23e018157afb5eaf291e7a7691a7510 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 29 Dec 2020 15:56:29 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=AB=AF=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.heb | 2 +- .env.ntyl | 2 +- .env.production | 2 +- .env.staging | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.env.development b/.env.development index d7827cfb4..9f3da3f19 100644 --- a/.env.development +++ b/.env.development @@ -7,7 +7,7 @@ NODE_ENV = 'development' # VUE_APP_BASE_API = 'http://192.168.3.4:9000' VUE_APP_BASE_API = 'http://192.168.3.6:9000' VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink' -VUE_APP_UPLOAD_API = 'https://oss.joylink.club/jlfile' +VUE_APP_UPLOAD_API = 'https://upload.joylink.club/jlfile' # VUE_APP_VOICE_API = 'http://192.168.8.110:9008' diff --git a/.env.heb b/.env.heb index 5f78a725b..fb5faa637 100644 --- a/.env.heb +++ b/.env.heb @@ -5,4 +5,4 @@ VUE_APP_PRO = 'local' # base api VUE_APP_BASE_API = 'https://joylink.club/jlcloud' VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink' -VUE_APP_UPLOAD_API = 'https://oss.joylink.club/jlfile' +VUE_APP_UPLOAD_API = 'https://upload.joylink.club/jlfile' diff --git a/.env.ntyl b/.env.ntyl index 6f627f0a5..55cc20af3 100644 --- a/.env.ntyl +++ b/.env.ntyl @@ -5,4 +5,4 @@ VUE_APP_PRO = 'ntyl' # base api VUE_APP_BASE_API = 'https://joylink.club/jlcloud' VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink' -VUE_APP_UPLOAD_API = 'https://oss.joylink.club/jlfile' +VUE_APP_UPLOAD_API = 'https://upload.joylink.club/jlfile' diff --git a/.env.production b/.env.production index 0e1b21424..c71cb9ae4 100644 --- a/.env.production +++ b/.env.production @@ -4,4 +4,4 @@ NODE_ENV = 'production' # base api VUE_APP_BASE_API = 'https://api.joylink.club/jlcloud' VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink' -VUE_APP_UPLOAD_API = 'https://oss.joylink.club/jlfile' +VUE_APP_UPLOAD_API = 'https://upload.joylink.club/jlfile' diff --git a/.env.staging b/.env.staging index 130d85550..fca7c4cd8 100644 --- a/.env.staging +++ b/.env.staging @@ -4,4 +4,4 @@ NODE_ENV = 'test' # base api VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud' VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink' -VUE_APP_UPLOAD_API = 'https://oss.joylink.club/jlfile' +VUE_APP_UPLOAD_API = 'https://upload.joylink.club/jlfile' From 27eb820781e17f60ab3f58b032bb134194172979 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 29 Dec 2020 15:59:43 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/publish/publishISCS/index.vue | 175 ++++++++++++++++++++++++ 1 file changed, 175 insertions(+) create mode 100644 src/views/publish/publishISCS/index.vue diff --git a/src/views/publish/publishISCS/index.vue b/src/views/publish/publishISCS/index.vue new file mode 100644 index 000000000..f6825b465 --- /dev/null +++ b/src/views/publish/publishISCS/index.vue @@ -0,0 +1,175 @@ + +