From 3ffffffe8de65711987bf4a0f263da6a0da441a8 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Fri, 28 Aug 2020 14:43:30 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E4=B8=80=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=E5=AE=9E=E8=AE=AD=E8=B0=83=E6=95=B4=20=E5=89=A7?= =?UTF-8?q?=E6=9C=AC=E7=BC=96=E5=88=B6=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 --- .../theme/ningbo_01/operationConfig.js | 27 ++++++-- src/store/modules/training.js | 2 +- .../lesson/trainingRule/detail/index.vue | 4 +- src/views/newMap/chatView/chatBox.vue | 3 +- src/views/newMap/jlmapNew/index.vue | 2 +- .../mapsystemNew/plugin/trainingtip.vue | 2 +- .../newMapdraft/mapoperate/ControlDraft.vue | 66 ++++++++++--------- 7 files changed, 64 insertions(+), 42 deletions(-) diff --git a/src/jmapNew/theme/ningbo_01/operationConfig.js b/src/jmapNew/theme/ningbo_01/operationConfig.js index 2c986de89..8781a1595 100644 --- a/src/jmapNew/theme/ningbo_01/operationConfig.js +++ b/src/jmapNew/theme/ningbo_01/operationConfig.js @@ -221,7 +221,6 @@ export default { { deviceType: '06', orderNum: 2, operateCode: '0012', tip: '鼠标左键点击【确定】按钮' } ] }, - { maxDuration: 15, minDuration: 8, @@ -766,8 +765,8 @@ export default { minDuration: 8, operateType: 'Signal_Set_Auto_Turn_Back', skinCode: '06', - trainingName: '设置自动折返进路({3})', - trainingRemark: '设置自动折返进路', + trainingName: '设置自动折返({3})', + trainingRemark: '设置自动折返', trainingType: 'Signal', productTypes: ['02'], stepVOList: [ @@ -780,14 +779,32 @@ export default { minDuration: 8, operateType: 'Signal_Cancel_Auto_Turn_Back', skinCode: '06', - trainingName: ' 取消自动折返进路({3})', - trainingRemark: ' 取消自动折返进路', + trainingName: ' 取消自动折返({3})', + trainingRemark: ' 取消自动折返', trainingType: 'Signal', productTypes: ['02'], stepVOList: [ { deviceType: '05', orderNum: 1, operateCode: '901', tip: '鼠标右键菜单选择【取消自动折返】'}, { deviceType: '05', orderNum: 2, operateCode: '901', tip: '鼠标左键点击【应用】' } ] + }, + { + maxDuration: 20, + minDuration: 15, + operateType: 'Cancel_All_Limit_Speed', + skinCode: '06', + trainingName: ' 取消全线临时限速', + trainingRemark: ' 取消全线临时限速', + trainingType: 'LimitControl', + productTypes: ['02'], + stepVOList: [ + { deviceType: '10', orderNum: 1, operateCode: '800', tip: '鼠标右键菜单选择【取消全线临时限速】'}, + { deviceType: '10', orderNum: 2, operateCode: '8001', tip: '鼠标左键点击【打开会话】'}, + { deviceType: '10', orderNum: 3, operateCode: '8003', tip: '鼠标左键点击【确认】'}, + { deviceType: '10', orderNum: 4, operateCode: '8004', tip: '鼠标左键点击【确认】'}, + { deviceType: '10', orderNum: 5, operateCode: '8005', tip: '鼠标左键点击【关闭】'}, + { deviceType: '10', orderNum: 6, operateCode: '8006', tip: '鼠标左键点击【确认】' } + ] } ] }; diff --git a/src/store/modules/training.js b/src/store/modules/training.js index babef6d4a..85ff969f8 100644 --- a/src/store/modules/training.js +++ b/src/store/modules/training.js @@ -490,7 +490,7 @@ const training = { // 处理operation Handler.handle(operate).then(rtn => { if (state.started) { - // 教学和联系模式需要给出过程步骤提示 + // 教学和联系模式需要给出过程步骤提示 if (TrainingMode.TEACH === state.mode || TrainingMode.PRACTICE === state.mode) { if (rtn && rtn.valid) { commit('next'); diff --git a/src/views/lesson/trainingRule/detail/index.vue b/src/views/lesson/trainingRule/detail/index.vue index c71fec8c3..8b9ada380 100644 --- a/src/views/lesson/trainingRule/detail/index.vue +++ b/src/views/lesson/trainingRule/detail/index.vue @@ -34,7 +34,8 @@ export default { { label: this.$t('lesson.platform'), value: '06' }, { label: this.$t('lesson.train'), value: '07' }, { label: this.$t('lesson.station'), value: '08' }, - { label: this.$t('lesson.trainWindow'), value: '09' } + { label: this.$t('lesson.trainWindow'), value: '09' }, + { label: '全线限速', value: '10' } ], pagerConfig: { pageSize: 'pageSize', @@ -119,6 +120,7 @@ export default { } return fieldValue; } + return fieldValue; }, queryFunction(params) { return getOperateStepDataList(this.dicId, params); diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue index a4c5813ae..2ebc567cb 100644 --- a/src/views/newMap/chatView/chatBox.vue +++ b/src/views/newMap/chatView/chatBox.vue @@ -167,7 +167,8 @@ export default { this.memberIdList = []; if (memberList && memberList.length) { memberList.forEach(member => { - if (member && !(member.children) && (member.userId == '' || member.userId)) { + // (!member.userId) + if (member && !(member.children)) { this.userString += member.label + ','; this.memberIdList.push(member.id); } diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue index 338bb50e0..297dd4c3b 100644 --- a/src/views/newMap/jlmapNew/index.vue +++ b/src/views/newMap/jlmapNew/index.vue @@ -129,7 +129,7 @@ export default { }, '$store.state.training.rezoomCount': function () { let code = this.$store.state.training.offsetStationCode; // 偏移集中站坐标 - if (code && code.includes('TurnedAround')) { // 单独处理 自动折返 + if (code && code.includes('Cycle')) { // 单独处理 自动折返 const cycleButtonList = this.$store.state.map.map.cycleButtonList; if (cycleButtonList && cycleButtonList.length > 0) { cycleButtonList.forEach(element => { diff --git a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue index 074fbfc3d..51c09baf0 100644 --- a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue +++ b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue @@ -106,7 +106,7 @@ export default { var position = null; // 单独处理 自动折返 const newStep = Object.assign({}, step); - if (newStep.code.includes('TurnedAround')) { + if (newStep.code.includes('Cycle')) { const buttonList = this.$store.state.map.map.cycleButtonList; if (buttonList && buttonList.length > 0) { buttonList.forEach(element => { diff --git a/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue b/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue index 0687b620e..b7675b66b 100644 --- a/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue +++ b/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue @@ -4,14 +4,14 @@
- 站后折返数据 + 站后折返数据
- + @@ -127,8 +127,8 @@ export default { type: '', name: '', show: true, // 站后折返显示 - subtitleName: '', - initId: '', + subtitleName: '', + initId: '', optionList: [], // 战后折返列表 automaticRouteCode: '', // 关联自动进路code cycleCode: '', // 自动折返关联code @@ -316,8 +316,8 @@ export default { code: '', type: '', name: '', - show: true, // 站后折返显示 - initId: '', + show: true, // 站后折返显示 + initId: '', subtitleName: '', optionList: [], // 战后折返列表 automaticRouteCode: '', // 关联自动进路code @@ -387,13 +387,15 @@ export default { this.handleTypes(selected._type); this.$refs.dataform && this.$refs.dataform.resetFields(); this.$refs.make && this.$refs.make.resetFields(); - this.activeName = 'first'; - selected.optionList.forEach(item => { - item.checked = false; - if (item.id == selected.initId) { - item.checked = true; - } - }); + this.activeName = 'first'; + if (selected.optionList) { + selected.optionList.forEach(item => { + item.checked = false; + if (item.id == selected.initId) { + item.checked = true; + } + }); + } this.editModel = deepAssign(this.editModel, selected); this.editModel.type = selected._type; this.$nextTick(() => { @@ -454,8 +456,8 @@ export default { edit() { this.$refs['dataform'].validate((valid) => { if (valid) { - const data = Object.assign({_type: this.editModel.type}, this.editModel); - console.log(data, '====='); + const data = Object.assign({_type: this.editModel.type}, this.editModel); + console.log(data, '====='); this.$emit('updateMapModel', data); } }); @@ -483,18 +485,18 @@ export default { } else { this.$emit('deviceSelect', ''); } - }, - checkOverlab(list, index) { - list.forEach((item, i) => { - if (i != index) { - item.checked = false; - } - }) - list[index].checked = !list[index].checked; - if (list[index].checked) { - this.editModel.initId = list[index].id; - } - }, + }, + checkOverlab(list, index) { + list.forEach((item, i) => { + if (i != index) { + item.checked = false; + } + }); + list[index].checked = !list[index].checked; + if (list[index].checked) { + this.editModel.initId = list[index].id; + } + }, deleteOverlab(list, index) { list.splice(index, 1); this.cardMode = 'generate'; @@ -510,8 +512,8 @@ export default { const data = { id: this.addBackModel.id, type: this.addBackModel.type, - label: this.addBackModel.label, - checked: false, + label: this.addBackModel.label, + checked: false, sectionList: this.addBackModel.type == 'NONE' ? [] : this.addBackModel.sectionList }; this.editModel.optionList.splice(this.addBackModel.parentIndex, 1, data); @@ -528,8 +530,8 @@ export default { this.editModel.optionList.push({ id: id, type: this.addBackModel.type, - label: this.addBackModel.label, - checked: false, + label: this.addBackModel.label, + checked: false, sectionList: this.addBackModel.type == 'NONE' ? [] : this.addBackModel.sectionList }); this.$refs.hostileForm.resetFields(); From 16a4b0fb840d73416c3a4ecb72c7ee59b4239671 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 28 Aug 2020 15:28:24 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E5=A4=A7=E8=B5=9B?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../displayNew/dispatherContest/index.vue | 7 +- .../displayNew/dispatherContest/sceneList.vue | 237 ++++++++++++++++++ src/views/newMap/displayNew/index.vue | 1 - 3 files changed, 242 insertions(+), 3 deletions(-) create mode 100644 src/views/newMap/displayNew/dispatherContest/sceneList.vue diff --git a/src/views/newMap/displayNew/dispatherContest/index.vue b/src/views/newMap/displayNew/dispatherContest/index.vue index c4a11c25e..049cabc89 100644 --- a/src/views/newMap/displayNew/dispatherContest/index.vue +++ b/src/views/newMap/displayNew/dispatherContest/index.vue @@ -51,6 +51,7 @@ @switchMode="switchMode" --> +
@@ -60,6 +61,7 @@ import SetTime from '../demon/setTime'; import DemonMenu from '../demonMenu'; import DemonChat from '../demonChat'; +import SceneList from './sceneList'; import MenuSchema from '@/views/newMap/displayNew/menuSchema'; import { getGoodsTryUse } from '@/api/management/goods'; import { ranAsPlan, exitRunPlan, clearSimulation, getSimulationInfoNew } from '@/api/simulation'; @@ -80,7 +82,8 @@ export default { SetTime, DemonChat, MenuSchema, - DemonMenu + DemonMenu, + SceneList }, props: { offset: { @@ -436,7 +439,7 @@ export default { } }, fieldPractice() { - this.$refs.menuSchema.viewRunQuest(); + this.$refs.sceneList.doShow(); } } }; diff --git a/src/views/newMap/displayNew/dispatherContest/sceneList.vue b/src/views/newMap/displayNew/dispatherContest/sceneList.vue new file mode 100644 index 000000000..65a0fd046 --- /dev/null +++ b/src/views/newMap/displayNew/dispatherContest/sceneList.vue @@ -0,0 +1,237 @@ + + diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue index 1d5c4b605..01e01f1a4 100644 --- a/src/views/newMap/displayNew/index.vue +++ b/src/views/newMap/displayNew/index.vue @@ -209,7 +209,6 @@ export default { this.textStatusHeight = textStatus.offsetHeight || 0; textStatus.style.top = this.offset - 15 + 'px'; } - console.log(this.offset, '*************'); }); }, // 缩放设置 From d5dabca2c642d415490fd86943cd24e798212dce Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Fri, 28 Aug 2020 16:52:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4=20?= =?UTF-8?q?=E5=8C=BA=E6=AE=B5=EF=BC=88parentCode=EF=BC=89=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/beijing_01/menus/dialog/alxeEffective.vue | 5 +++-- src/jmapNew/theme/beijing_01/menus/menuSection.vue | 9 ++++++--- .../theme/chengdu_03/menus/dialog/sectionDetail.vue | 3 ++- .../theme/ningbo_01/menus/dialog/alxeEffective.vue | 3 ++- src/jmapNew/theme/ningbo_01/menus/menuSection.vue | 6 ++++-- .../theme/ningbo_03/menus/dialog/alxeEffective.vue | 3 ++- src/jmapNew/theme/ningbo_03/menus/menuSection.vue | 6 ++++-- .../scriptDisplay/component/covertOperation.js | 2 +- .../newMap/newMapdraft/mapoperate/section/index.vue | 2 +- 9 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue b/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue index 28a76263d..76f80c3c8 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue @@ -260,14 +260,15 @@ export default { this.model.confirmSectionName = ''; if (selected) { if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) { - if (selected.isSwitchSection) { + if (selected.type == '03') { const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode); if (section) { this.model.sectionName = section.name; } } else { + const hasParentCode = (this.selected.type == '02'); const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode); - if (section) { + if (section && hasParentCode) { this.model.sectionName = section.name; this.model.sectionName = `${section.name}-${selected.name}`; } else { diff --git a/src/jmapNew/theme/beijing_01/menus/menuSection.vue b/src/jmapNew/theme/beijing_01/menus/menuSection.vue index 1cc6f2cf6..67f8d80bd 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuSection.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuSection.vue @@ -218,7 +218,8 @@ export default { }, // 切除 split() { - const sectionCode = this.selected.parentCode ? this.selected.parentCode : this.selected.code; + const hasParentCode = (this.selected.type == '02' || this.selected.type == '03'); + const sectionCode = hasParentCode ? this.selected.parentCode : this.selected.code; commitOperate(menuOperate.Section.split, {sectionCode:sectionCode}, 0).then(({valid, operate})=>{ if (valid) { this.$refs.sectionControl.doShow(operate, this.selected); @@ -234,7 +235,8 @@ export default { }, // 激活 active() { - const sectionCode = this.selected.parentCode ? this.selected.parentCode : this.selected.code; + const hasParentCode = (this.selected.type == '02' || this.selected.type == '03'); + const sectionCode = hasParentCode ? this.selected.parentCode : this.selected.code; commitOperate(menuOperate.Section.active, {sectionCode:sectionCode}, 0).then(({valid, operate})=>{ if (valid) { this.$refs.sectionControl.doShow(operate, this.selected); @@ -257,7 +259,8 @@ export default { // }, // 设置速度 setSpeed() { - const sectionCode = this.selected.parentCode ? this.selected.parentCode : this.selected.code; + const hasParentCode = (this.selected.type == '02' || this.selected.type == '03'); + const sectionCode = hasParentCode ? this.selected.parentCode : this.selected.code; commitOperate(menuOperate.Section.setSpeed, {sectionCode:sectionCode}, 0).then(({valid, operate})=>{ if (valid) { this.$refs.speedLimitControl.doShow(operate, this.selected); diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/sectionDetail.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/sectionDetail.vue index fd3803d05..b38fc2a7c 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/sectionDetail.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/sectionDetail.vue @@ -80,7 +80,8 @@ export default { // 如果不是因为断点激活则需要，初始化菜单初始值 if (!this.dialogShow) { if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) { - this.formModel.sectionName = selected.parentCode ? selected.parentName + '-' + selected.name : selected.name; + const hasParentCode = (this.selected.type == '02'); + this.formModel.sectionName = hasParentCode ? selected.parentName + '-' + selected.name : selected.name; this.formModel.lengthFact = selected.lengthFact; const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode); if (station) { diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue index d2246c6e4..3335a31b9 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue @@ -230,7 +230,8 @@ export default { this.model.sectionCode = selected.code; if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) { const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode); - if (section) { + const hasParentCode = (this.selected.type == '02'); + if (section && hasParentCode) { this.model.sectionName = `${section.name}-${selected.name}(${selected.code})`; } else { this.model.sectionName = `${selected.name}(${selected.code})`; diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue index e2b47d81e..9649357da 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue @@ -195,7 +195,8 @@ export default { }, // 切除 split() { - const sectionCode = this.selected.parentCode ? this.selected.parentCode : this.selected.code; + const hasParentCode = (this.selected.type == '02' || this.selected.type == '03'); + const sectionCode = hasParentCode ? this.selected.parentCode : this.selected.code; commitOperate(menuOperate.Section.split, {sectionCode:sectionCode}, 0).then(({valid, operate})=>{ if (valid) { this.$refs.sectionControl.doShow(operate, this.selected); @@ -212,7 +213,8 @@ export default { }, // 区段激活 active() { - const sectionCode = this.selected.parentCode ? this.selected.parentCode : this.selected.code; + const hasParentCode = (this.selected.type == '02' || this.selected.type == '03'); + const sectionCode = hasParentCode ? this.selected.parentCode : this.selected.code; commitOperate(menuOperate.Section.active, {sectionCode:sectionCode}, 0).then(({valid, operate})=>{ if (valid) { this.$refs.sectionControl.doShow(operate, this.selected); diff --git a/src/jmapNew/theme/ningbo_03/menus/dialog/alxeEffective.vue b/src/jmapNew/theme/ningbo_03/menus/dialog/alxeEffective.vue index d2246c6e4..3335a31b9 100644 --- a/src/jmapNew/theme/ningbo_03/menus/dialog/alxeEffective.vue +++ b/src/jmapNew/theme/ningbo_03/menus/dialog/alxeEffective.vue @@ -230,7 +230,8 @@ export default { this.model.sectionCode = selected.code; if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) { const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode); - if (section) { + const hasParentCode = (this.selected.type == '02'); + if (section && hasParentCode) { this.model.sectionName = `${section.name}-${selected.name}(${selected.code})`; } else { this.model.sectionName = `${selected.name}(${selected.code})`; diff --git a/src/jmapNew/theme/ningbo_03/menus/menuSection.vue b/src/jmapNew/theme/ningbo_03/menus/menuSection.vue index e2b47d81e..9649357da 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuSection.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuSection.vue @@ -195,7 +195,8 @@ export default { }, // 切除 split() { - const sectionCode = this.selected.parentCode ? this.selected.parentCode : this.selected.code; + const hasParentCode = (this.selected.type == '02' || this.selected.type == '03'); + const sectionCode = hasParentCode ? this.selected.parentCode : this.selected.code; commitOperate(menuOperate.Section.split, {sectionCode:sectionCode}, 0).then(({valid, operate})=>{ if (valid) { this.$refs.sectionControl.doShow(operate, this.selected); @@ -212,7 +213,8 @@ export default { }, // 区段激活 active() { - const sectionCode = this.selected.parentCode ? this.selected.parentCode : this.selected.code; + const hasParentCode = (this.selected.type == '02' || this.selected.type == '03'); + const sectionCode = hasParentCode ? this.selected.parentCode : this.selected.code; commitOperate(menuOperate.Section.active, {sectionCode:sectionCode}, 0).then(({valid, operate})=>{ if (valid) { this.$refs.sectionControl.doShow(operate, this.selected); diff --git a/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js b/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js index 9e1811fe8..c560855fa 100644 --- a/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js +++ b/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js @@ -155,7 +155,7 @@ function covertOperation(deviceType, operationParamMap, operationType) { deviceName += '【车站-' + station.name + '】/'; } if (device._type == 'Section') { - if (device.parentCode) { + if (device.parentCode && device.type == '02') { const parentSection = store.getters['map/getDeviceByCode'](device.parentCode); deviceName += '【' + operateEnum[deviceType].type + ' ' + parentSection.name + '-' + device.name + '】'; } diff --git a/src/views/newMap/newMapdraft/mapoperate/section/index.vue b/src/views/newMap/newMapdraft/mapoperate/section/index.vue index 7fb3e71d1..52c44d02a 100644 --- a/src/views/newMap/newMapdraft/mapoperate/section/index.vue +++ b/src/views/newMap/newMapdraft/mapoperate/section/index.vue @@ -136,7 +136,7 @@ export default { { prop: 'namePosition.x', firstLevel: 'namePosition', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' }, { prop: 'namePosition.y', firstLevel: 'namePosition', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' } ] }, - { prop: 'type', label: this.$t('map.sectionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SectionTypeList }, // 区段类型 + { prop: 'type', label: this.$t('map.sectionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SectionTypeList, disabled: true }, // 区段类型 { prop: 'roadType', label: '线路类型:', type: 'select', optionLabel: 'name', optionValue: 'code', options: this.sectionRoadTypeList, clearable: true, isHidden: !this.isSwitchSectionType, deviceChange: this.roadTypeChange }, { prop: 'leftSectionCode', label: this.$t('map.leftAssociatedSection'), type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', clearable: true, options: this.switchAndPhySicalSectionList, hover: this.hover, buttonType: 'leftSection', buttonShowType: this.isLeftSectionButtonShow, isHidden: !this.hasAssociatedSection }, // 左关联区段 { prop: 'rightSectionCode', label: this.$t('map.rightAssociatedSection'), type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', clearable: true, options: this.switchAndPhySicalSectionList, hover: this.hover, buttonType: 'rightSection', buttonShowType: this.isRightSectionButtonShow, isHidden: !this.hasAssociatedSection }, // 右关联区段 From a28f7a39754ad93ddb9441f7d6af076977b2de28 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 28 Aug 2020 16:58:17 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E5=A4=A7=E8=B5=9B?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.native | 2 +- .env.production | 2 +- .env.staging | 2 +- .../theme/chengdu_03/menus/menuBar.vue | 7 +- .../displayNew/dispatherContest/sceneList.vue | 104 ++---------------- .../scriptDisplay/component/scriptTip.vue | 13 +++ 7 files changed, 30 insertions(+), 102 deletions(-) diff --git a/.env.development b/.env.development index c0924475f..907d441c5 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ NODE_ENV = 'development' # VUE_APP_BASE_API = 'https://joylink.club/jlcloud' # 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://test.joylink.club/jlcloud' +VUE_APP_VOICE_API = 'https://test.joylink.club/jlcloud/' # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # to control whether the babel-plugin-dynamic-import-node plugin is enabled. diff --git a/.env.native b/.env.native index 09eb3fd7c..b8a05aae5 100644 --- a/.env.native +++ b/.env.native @@ -4,4 +4,4 @@ VUE_APP_PRO = 'local' # base api VUE_APP_BASE_API = 'https://joylink.club/jlcloud' -VUE_APP_VOICE_API = 'https://joylink.club/jlcloud' +VUE_APP_VOICE_API = 'https://joylink.club/jlcloud/' diff --git a/.env.production b/.env.production index 68c9d7458..11718e8ad 100644 --- a/.env.production +++ b/.env.production @@ -3,4 +3,4 @@ NODE_ENV = 'production' # base api VUE_APP_BASE_API = 'https://joylink.club/jlcloud' -VUE_APP_VOICE_API = 'https://joylink.club/jlcloud' +VUE_APP_VOICE_API = 'https://joylink.club/jlcloud/' diff --git a/.env.staging b/.env.staging index 2e62c739e..6e00a4872 100644 --- a/.env.staging +++ b/.env.staging @@ -3,4 +3,4 @@ NODE_ENV = 'production' # base api VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud' -VUE_APP_VOICE_API = 'https://test.joylink.club/jlcloud' +VUE_APP_VOICE_API = 'https://test.joylink.club/jlcloud/' diff --git a/src/jmapNew/theme/chengdu_03/menus/menuBar.vue b/src/jmapNew/theme/chengdu_03/menus/menuBar.vue index eb2504219..c9cf5c801 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuBar.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuBar.vue @@ -947,7 +947,7 @@ export default { padding: 0px; margin: 0px; max-height: 550px; - overflow-y: scroll; + /*overflow-y: scroll;*/ &::-webkit-scrollbar { width: 4px; @@ -972,10 +972,13 @@ export default { line-height: $menuItemHeight; width: $menuItemWidth; bottom: $menuItemHeight; + position: relative; + left: 180px; + padding-left: 0; } .active { - position: absolute; + /*position: absolute;*/ display: block !important; } diff --git a/src/views/newMap/displayNew/dispatherContest/sceneList.vue b/src/views/newMap/displayNew/dispatherContest/sceneList.vue index 65a0fd046..65a4bd73d 100644 --- a/src/views/newMap/displayNew/dispatherContest/sceneList.vue +++ b/src/views/newMap/displayNew/dispatherContest/sceneList.vue @@ -27,43 +27,11 @@ - -
- - - - - - - - -
- - {{ $t('global.cancel') }} - {{ $t('global.confirm') }} - -