From 501dd0b18126f39f4df8a977d4248345f1689906 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Fri, 26 May 2023 13:50:52 +0800 Subject: [PATCH 01/32] =?UTF-8?q?=E6=96=B0=E4=BC=9A=E8=AF=9D=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/display/newChat/chatDialog.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/views/newMap/display/newChat/chatDialog.vue b/src/views/newMap/display/newChat/chatDialog.vue index 58535167c..5199037ac 100644 --- a/src/views/newMap/display/newChat/chatDialog.vue +++ b/src/views/newMap/display/newChat/chatDialog.vue @@ -17,8 +17,8 @@
-
@@ -40,6 +40,7 @@ From 177bb7888389f2419dd9a885bb092f214a158a80 Mon Sep 17 00:00:00 2001 From: fan Date: Tue, 30 May 2023 09:50:51 +0800 Subject: [PATCH 14/32] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E4=B8=80=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=E8=AE=A1=E8=BD=B4=E5=A4=8D=E4=BD=8D=E5=8C=BA=E6=AE=B5?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E8=B0=83=E6=95=B4&=E8=BD=A6=E7=AB=99?= =?UTF-8?q?=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F=E5=88=A4=E6=96=AD=E8=B0=83?= =?UTF-8?q?=E6=95=B4&=E6=B3=A8=E9=87=8A=E5=AE=81=E6=B3=A2=E4=B8=80?= =?UTF-8?q?=E5=8F=B7=E7=BA=BF=E8=BD=A6=E7=AB=99=E4=B8=8A=E7=94=B5=E8=A7=A3?= =?UTF-8?q?=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/graph/Station/EStationText.js | 2 +- .../ningbo_01/menus/dialog/sectionAlxeReset.vue | 10 +++++----- src/jmapNew/theme/ningbo_01/menus/menuStation.vue | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/jmapNew/shape/graph/Station/EStationText.js b/src/jmapNew/shape/graph/Station/EStationText.js index 7d4c96574..601b92673 100644 --- a/src/jmapNew/shape/graph/Station/EStationText.js +++ b/src/jmapNew/shape/graph/Station/EStationText.js @@ -21,7 +21,7 @@ class EStationText extends Group { x: model.computedPosition.x, y: model.computedPosition.y, fontWeight: style.Station.stationText.fontWeight, - fontSize: isNaN(Number(model.nameFont)) ? 20 : Number(model.nameFont), + fontSize: model.nameFont || 20, fontFamily: style.fontFamily, text: model.number ? model.number + model.name : model.name, textAlign: 'middle', diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/sectionAlxeReset.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionAlxeReset.vue index b1c077800..966541082 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/sectionAlxeReset.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionAlxeReset.vue @@ -54,7 +54,7 @@ export default { loading: false, operation: '', sectionCode: '', - selected: null + selected: null }; }, computed: { @@ -64,7 +64,7 @@ export default { switchAndPhySicalSectionList() { let list = []; if (this.sectionList && this.sectionList.length) { - list = this.sectionList.filter(elem => { return elem.type === '01' || elem.type === '03'; }); + list = this.sectionList.filter(elem => { return elem.type === '01' || elem.type === '04'; }); } return list; }, @@ -93,9 +93,9 @@ export default { }, methods: { doShow(operate, selected) { - this.$root.$emit('dialogOpen', selected); + this.$root.$emit('dialogOpen', selected); if (!this.dialogShow) { - this.selected = selected; + this.selected = selected; this.sectionCode = ''; this.operation = operate.operation || ''; } @@ -107,7 +107,7 @@ export default { doClose() { this.loading = false; this.dialogShow = false; - this.$root.$emit('dialogClose', this.selected); + this.$root.$emit('dialogClose', this.selected); this.$store.dispatch('training/emitTipFresh'); }, sectionSelectChange() { diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue index 238df6a62..9005f07ad 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue @@ -61,12 +61,12 @@ export default { cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, isShow: (selected, work) => work == 'localWork' }, - { - label: '上电解锁', - handler: this.powerUnLock, - cmdType: CMD.Station.CMD_STATION_POWER_ON_UNLOCK, - isShow: (selected, work) => work == 'localWork' - }, + // { + // label: '上电解锁', + // handler: this.powerUnLock, + // cmdType: CMD.Station.CMD_STATION_POWER_ON_UNLOCK, + // isShow: (selected, work) => work == 'localWork' + // }, // { // label: '执行关键操作测试', // handler: this.execKeyOperationTest, From b2ce52612f40e769f161b1194b1bbea1f0bd0ae9 Mon Sep 17 00:00:00 2001 From: fan Date: Tue, 30 May 2023 10:20:36 +0800 Subject: [PATCH 15/32] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E4=B8=80=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/ningbo_01/menus/dialog/passwordInput.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/passwordInput.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/passwordInput.vue index c53ee69f6..7780cfd77 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/passwordInput.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/passwordInput.vue @@ -13,7 +13,7 @@ > -
密码：
+
密码(root)：
 From 8449d731bdaf5955615122e8d4d7745eaa7107ed Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Tue, 30 May 2023 10:58:36 +0800 Subject: [PATCH 16/32] =?UTF-8?q?=E6=96=B0=E4=BC=9A=E8=AF=9D=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/display/newChat/chatContent.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/newMap/display/newChat/chatContent.vue b/src/views/newMap/display/newChat/chatContent.vue index b43716a85..f5af5dd84 100644 --- a/src/views/newMap/display/newChat/chatContent.vue +++ b/src/views/newMap/display/newChat/chatContent.vue @@ -26,7 +26,7 @@
- + T @@ -197,7 +197,7 @@ export default { return name; }, sendText() { - if ((!this.id && !this.privateChatId) || !this.textContent) { return; } + if ((!this.id && !this.privateChatId) || this.contentSend) { return; } const operate = { over: true, cmdType: CMD.Conversation.CMD_Conversation_Group_Text_Chat, From 57f65d45e34f856709486257ede9c6518a152d2b Mon Sep 17 00:00:00 2001 From: fan Date: Tue, 30 May 2023 11:23:52 +0800 Subject: [PATCH 17/32] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8D=89=E7=A8=BFibp?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 10 ++++++++++ src/views/ibp/home.vue | 6 +++++- src/views/ibp/ibpDraw/ibpOperate/index.vue | 4 ++++ src/views/ibp/ibpDraw/index.vue | 10 ++++------ src/views/publish/publishMap/index.vue | 7 +++++++ 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index bd26053c5..a6e00967c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1948,6 +1948,16 @@ export const asyncRouter = [ path: 'publishIscs', component: PublishISCS, hidden: true + }, + { // ibp列表 + path: 'ibp/home/:mapId', + component: IbpHome, + hidden: true + }, + { + path: 'ibp/edit', + component: IbpDraw, + hidden: true } ] }, diff --git a/src/views/ibp/home.vue b/src/views/ibp/home.vue index f767e2c6e..ad6d249b8 100644 --- a/src/views/ibp/home.vue +++ b/src/views/ibp/home.vue @@ -2,6 +2,7 @@
IBP盘列表
+ 返回 {{ $t('scriptRecord.scriptCreate') }} 发布数据创建
@@ -142,7 +143,7 @@ export default { // 进入绘图数据 handleModify(index, row) { const query = { mapId: this.$route.params.mapId, stationCode: row.stationCode, ibpId: row.id }; - this.$router.push({ path: `/design/ibp/edit`, query: query }); + this.$router.push({ path: `/systemManagement/lineDataManage/ibp/edit`, query: query }); }, // 更新 editInfo(index, row) { @@ -184,6 +185,9 @@ export default { }, createByPublish() { this.$refs.copyIbp.doShow(null); + }, + goBack() { + this.$router.go(-1); } } }; diff --git a/src/views/ibp/ibpDraw/ibpOperate/index.vue b/src/views/ibp/ibpDraw/ibpOperate/index.vue index ee355dc36..f491b7cf3 100644 --- a/src/views/ibp/ibpDraw/ibpOperate/index.vue +++ b/src/views/ibp/ibpDraw/ibpOperate/index.vue @@ -14,6 +14,7 @@ :value="item.value" /> --> + 返回 {{ $t('ibp.save') }}
@@ -140,6 +141,9 @@ export default { deleteDataModel(model) { this.$store.dispatch('ibp/deleteIbpDevices', model); }, + goBack() { + this.$router.go(-1); + }, async handleSave() { if (this.$store.state.ibp.ibp.background) { try { diff --git a/src/views/ibp/ibpDraw/index.vue b/src/views/ibp/ibpDraw/index.vue index 1f046859d..35a377c42 100644 --- a/src/views/ibp/ibpDraw/index.vue +++ b/src/views/ibp/ibpDraw/index.vue @@ -13,7 +13,6 @@ diff --git a/src/views/newMap/display/terminals/registerBook.vue b/src/views/newMap/display/terminals/registerBook.vue index 83ba28554..b7b8b125f 100644 --- a/src/views/newMap/display/terminals/registerBook.vue +++ b/src/views/newMap/display/terminals/registerBook.vue @@ -11,15 +11,17 @@ style="width: 100%" :height="tableHeight" > - + - + @@ -30,15 +32,17 @@ - + @@ -50,15 +54,17 @@ - + @@ -70,15 +76,17 @@ - + @@ -304,6 +312,15 @@ export default { }; - From 4471a3000cac90ac7d6b24012fb06091e38b98af Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 1 Jun 2023 09:39:43 +0800 Subject: [PATCH 30/32] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=99=BB=E5=BD=95query?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/normalLogin.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/login/normalLogin.vue b/src/views/login/normalLogin.vue index dbb9f4b3b..2a5674490 100644 --- a/src/views/login/normalLogin.vue +++ b/src/views/login/normalLogin.vue @@ -138,7 +138,7 @@ export default { return this.$route.query.projectDevice; }, projectCode() { - return this.$store.state.projectConfig.projectCode; + return this.$store.state.projectConfig.markKey; } }, watch: { @@ -250,7 +250,7 @@ export default { }, judgeOtherPage(params) { // itemMap: {DEFAULT_MEMBER: '1'}type: "METRO" - getBackProjectConfigByCode(this.projectCode).then(res=>{ + getBackProjectConfigByCode(this.$store.state.projectConfig.projectCode).then(res=>{ if (res.data) { const {mapId, functionId} = res.data; if (functionId && mapId) { @@ -354,7 +354,7 @@ export default { const model = Object.assign({}, this.loginForm); model.password = md5(model.password); model.type = 'class'; - model.project = this.projectCode; + model.project = this.$store.state.projectConfig.projectCode; if (this.$route.query.projectDevice) { model.deviceCode = this.$route.query.projectDevice; } From 06ec5fe8e1808785043b637e3f9a5fffafa52d65 Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 1 Jun 2023 10:21:24 +0800 Subject: [PATCH 31/32] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E9=80=89=E6=8B=A9=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/deviceManage/editConfig.vue | 102 +++++++----------- .../system/deviceManage/editConfigScreen.vue | 88 ++++++++------- 2 files changed, 88 insertions(+), 102 deletions(-) diff --git a/src/views/system/deviceManage/editConfig.vue b/src/views/system/deviceManage/editConfig.vue index af99bee96..c7433204d 100644 --- a/src/views/system/deviceManage/editConfig.vue +++ b/src/views/system/deviceManage/editConfig.vue @@ -22,7 +22,7 @@ - + - + @@ -76,7 +76,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -157,17 +157,15 @@ + diff --git a/src/jmapNew/theme/datie_02/menus/menuSection.vue b/src/jmapNew/theme/datie_02/menus/menuSection.vue index 5ce3df704..80c1a3906 100644 --- a/src/jmapNew/theme/datie_02/menus/menuSection.vue +++ b/src/jmapNew/theme/datie_02/menus/menuSection.vue @@ -4,6 +4,7 @@ + @@ -22,6 +23,7 @@ import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/men import AddSpareTrain from './dialog/addSpareTrain'; import DrawSelect from './dialog/drawSelect'; import ForkDirective from './dialog/forkDirective'; +import LoadSpareTrain from './dialog/loadSpareTrain'; export default { name: 'SectionMenu', @@ -32,7 +34,8 @@ export default { SetFault, AddSpareTrain, DrawSelect, - ForkDirective + ForkDirective, + LoadSpareTrain }, props: { selected: { @@ -84,6 +87,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT + }, + { + label: '设置备用车', + handler: this.loadSpare, + cmdType: CMD.Section.CMD_TRAIN_LOAD_SPARE_TRAIN } ] }; @@ -107,14 +115,14 @@ export default { } }, mounted() { - const isDev = process.env.NODE_ENV === 'development'; - if (isDev) { - this.menuNormal.push( { - label: '新建计划列车', - handler: this.createPlanTrain, - cmdType: CMD.Section.CMD_Train_Init_Plan - }); - } + // const isDev = process.env.NODE_ENV === 'development'; + // if (isDev) { + // this.menuNormal.push( { + // label: '新建计划列车', + // handler: this.createPlanTrain, + // cmdType: CMD.Section.CMD_Train_Init_Plan + // }); + // } }, methods: { initMenu() { @@ -202,6 +210,13 @@ export default { this.$refs.trainAddPlan.doShow(operate); } }); + }, + loadSpare() { + commitOperate(menuOperate.Section.loadSpareTrain, {sectionCode:this.selected.code}).then(({valid, operate})=>{ + if (valid) { + this.$refs.loadSpareTrain.doShow(operate, this.selected); + } + }); } } };