diff --git a/src/components/QueryListPage/QueryForm.vue b/src/components/QueryListPage/QueryForm.vue index 47cd039d8..1d87f4363 100644 --- a/src/components/QueryListPage/QueryForm.vue +++ b/src/components/QueryListPage/QueryForm.vue @@ -94,7 +94,7 @@ :ref="name" v-model="formModel[name]" :multiple="field.config.multiple" - clearable + :clearable="!field.config.noClear" :placeholder="field.placeholder || $t('global.choose')" filterable @change="selectChange(field, formModel)" @@ -293,6 +293,7 @@ export default { // 获取默认查询参数 initQueryModel() { this.formModel = localStore.get(this.$route.path) || this.formModel; + this.buildForm(); if (typeof this.queryForm.initLoadCallback === 'function') { this.queryForm.initLoadCallback(this.formModel); } @@ -304,7 +305,6 @@ export default { this.exportFlag = this.queryForm.canExport; this.resetShow = this.queryForm.reset; this.buildQueryField(); - this.buildForm(); }, // 构建查询表单对象、显示的查询对象 buildForm() { @@ -342,13 +342,12 @@ export default { if (this.queryForm.queryObject.show === false) { continue; } else if (this.queryForm.queryObject.visible === false) { - model[item] = this.queryForm.queryObject[item].value; + model[item] = this.formModel[item] || this.queryForm.queryObject[item].value; } else { queryObject[item] = this.queryForm.queryObject[item]; - model[item] = this.queryForm.queryObject[item].value || getDefaultValueByField(this.queryForm.queryObject[item]); + model[item] = this.formModel[item] || this.queryForm.queryObject[item].value || getDefaultValueByField(this.queryForm.queryObject[item]); } } - this.queryObject = queryObject; this.formModel = model; }, diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue index 41a744627..c736675c7 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue @@ -129,6 +129,11 @@ export default { watch: { '$store.state.training.prdType': function (val) { this.initControlModeList(val); + }, + '$store.state.map.controlTransfer':function (controlTransferList) { + controlTransferList.forEach(controlTransfer=>{ + this.updateTableValue(controlTransfer); + }); } }, mounted() { @@ -146,6 +151,17 @@ export default { this.controlModeList = []; } }, + updateTableValue(controlTransfer) { + this.centralizedStationList.forEach((row, index) => { + if (row.code == controlTransfer.code) { + if (controlTransfer.applicantIdOfControlTransfer) { + this.disabledCommit = true; + } else { + this.disabledCommit = false; + } + } + }); + }, doShow(operate) { if (!this.dialogShow) { this.operate = operate || {}; diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue index da4d25c20..ed6441c26 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue @@ -33,7 +33,7 @@ 全部确认 - 应 用 + 应 用 关 闭 @@ -65,7 +65,8 @@ export default { operation: '', stationLists: [], disabledAll: false, - checked2: false + checked2: false, + commitDisabled:false }; }, computed: { @@ -109,6 +110,11 @@ export default { } }, watch: { + '$store.state.map.controlTransfer':function (controlTransferList) { + controlTransferList.forEach(controlTransfer=>{ + this.updateTableValue(controlTransfer); + }); + }, '$store.state.map.keyboardEnterCount': function (val) { if (this.show && !this.loading) { this.commit(); @@ -143,6 +149,41 @@ export default { }); } }, + updateTableValue(controlTransfer) { + this.stationLists.forEach((row, index) => { + if (row.code == controlTransfer.code) { + if (controlTransfer.applicantIdOfControlTransfer) { + this.commitDisabled = true; + } else { + this.commitDisabled = false; + } + } + }); + // this.tableData.forEach((row, index) => { + // if (row.code == controlTransfer.code) { + // if (controlTransfer.applicantIdOfControlTransfer) { + // row.result = this.$t('menu.menuDialog.senedMessageOne') + controlTransfer.validDurationOfControlTransferApplication + this.$t('menu.menuDialog.senedMessageTwo'); + // row.disabled = true; + // row.check = false; + // } else { + // if (row.control != this.controlProps[controlTransfer.controlMode]) { + // row.result = this.$t('menu.menuDialog.controlModeTransfersuccees'); + // row.control = this.controlProps[controlTransfer.controlMode]; + // this.removeSelection(controlTransfer.code); + // row.disabled = true; + // row.check = false; + // } else { + // row.result = this.$t('menu.menuDialog.controlModeTransferFailed'); + // this.removeSelection(controlTransfer.code); + // row.disabled = false; + // row.check = false; + // } + // this.disabledClose = false; + // this.disabledSure = false; + // } + // } + // }); + }, getProtectedSectionName(row) { let name = ''; if (row && diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControl.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControl.vue index f0df380b4..b984a0b7c 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControl.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControl.vue @@ -119,6 +119,11 @@ export default { if (this.show && !this.disabledCommit) { this.handleCommit(); } + }, + '$store.state.map.controlTransfer':function (controlTransferList) { + controlTransferList.forEach(controlTransfer=>{ + this.updateTableValue(controlTransfer); + }); } }, mounted() { @@ -142,6 +147,17 @@ export default { // } this.$store.dispatch('training/emitTipFresh'); }, + updateTableValue(controlTransfer) { + this.concertrateStationList.forEach((row, index) => { + if (row.code == controlTransfer.code) { + if (controlTransfer.applicantIdOfControlTransfer) { + this.disabledCommit = true; + } else { + this.disabledCommit = false; + } + } + }); + }, doClose() { this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); diff --git a/src/router/index_Common.js b/src/router/index_Common.js index 1e499b4a1..70c10b451 100644 --- a/src/router/index_Common.js +++ b/src/router/index_Common.js @@ -117,9 +117,6 @@ const PermissionCreate = () => import('@/views/orderauthor/permission/create/ind const UserRules = () => import('@/views/orderauthor/rules/index'); const UserRulesDetail = () => import('@/views/orderauthor/rules/detail'); -const LessonApproval = () => import('@/views/approval/lesson/index'); -const ScriptApproval = () => import('@/views/approval/script/index'); -const RunPlanApproval = () => import('@/views/approval/runPlan/index'); const DeviceManage = () => import('@/views/system/deviceManage/index'); const MapSort = () => import('@/views/publish/publishMap/mapSort'); const StudentManage = () => import('@/views/studentManage'); @@ -140,6 +137,7 @@ const JsxtApply = () => import('@/views/jsxt/apply/index'); // const theoryManage = () => import('@/views/jsxt/competition/theory/index'); const RefereeList = () => import('@/views/jsxt/refereeList/index'); const RefereeDisplay = () => import('@/views/jsxt/refereeList/display'); +const Approval = () => import('@/views/approval/index'); import { GenerateRouteProjectList } from '@/scripts/ProjectConfig'; // import { getSessionStorage } from '@/utils/auth'; @@ -793,6 +791,13 @@ export const asyncRouter = [ meta: { i18n: 'router.configLine' } + }, + {// 发布申请 + path: 'approval', + component: Approval, + meta: { + i18n: 'router.releaseApplication' + } } // { // path: 'deviceManage', @@ -803,37 +808,6 @@ export const asyncRouter = [ // } ] }, - { // 发布申请 - path: '/apply', - component: Layout, - meta: { - i18n: 'router.releaseApplication', - roles: [admin] - }, - children: [ - { - path: 'lesson', - component: LessonApproval, - meta: { - i18n: 'router.courseApplication' - } - }, - { - path: 'script', - component: ScriptApproval, - meta: { - i18n: 'router.scriptReleaseApplication' - } - }, - { - path: 'runGraph', - component: RunPlanApproval, - meta: { - i18n: 'router.runGraphReleaseApplication' - } - } - ] - }, { // 新个人地图 path: '/design', component: Layout, diff --git a/src/router/index_HEB.js b/src/router/index_HEB.js index e7757f2f3..4d9385951 100644 --- a/src/router/index_HEB.js +++ b/src/router/index_HEB.js @@ -103,11 +103,9 @@ const PermissionCreate = () => import('@/views/orderauthor/permission/create/ind const UserRules = () => import('@/views/orderauthor/rules/index'); const UserRulesDetail = () => import('@/views/orderauthor/rules/detail'); -const LessonApproval = () => import('@/views/approval/lesson/index'); -const ScriptApproval = () => import('@/views/approval/script/index'); -const RunPlanApproval = () => import('@/views/approval/runPlan/index'); const DeviceManage = () => import('@/views/system/deviceManage/index'); const MapSort = () => import('@/views/publish/publishMap/mapSort'); +const Approval = () => import('@/views/approval/index'); // import { loginInfo } from '@/scripts/ProjectConfig'; // import { getSessionStorage } from '@/utils/auth'; @@ -716,36 +714,12 @@ export const asyncRouter = [ meta: { i18n: 'router.deviceManage' } - } - ] - }, - { // 发布申请 - path: '/apply', - component: Layout, - meta: { - i18n: 'router.releaseApplication', - roles: [admin] - }, - children: [ - { - path: 'lesson', - component: LessonApproval, - meta: { - i18n: 'router.courseApplication' - } }, - { - path: 'script', - component: ScriptApproval, + {// 发布申请 + path: 'approval', + component: Approval, meta: { - i18n: 'router.scriptReleaseApplication' - } - }, - { - path: 'runGraph', - component: RunPlanApproval, - meta: { - i18n: 'router.runGraphReleaseApplication' + i18n: 'router.releaseApplication' } } ] diff --git a/src/views/approval/lesson/detail.vue b/src/views/approval/detail.vue similarity index 100% rename from src/views/approval/lesson/detail.vue rename to src/views/approval/detail.vue diff --git a/src/views/approval/index.vue b/src/views/approval/index.vue new file mode 100644 index 000000000..5b13f0459 --- /dev/null +++ b/src/views/approval/index.vue @@ -0,0 +1,527 @@ + + + + diff --git a/src/views/approval/lesson/index.vue b/src/views/approval/lesson/index.vue deleted file mode 100644 index c4a9d334a..000000000 --- a/src/views/approval/lesson/index.vue +++ /dev/null @@ -1,193 +0,0 @@ - - - - diff --git a/src/views/approval/runPlan/index.vue b/src/views/approval/runPlan/index.vue deleted file mode 100644 index ca7964db5..000000000 --- a/src/views/approval/runPlan/index.vue +++ /dev/null @@ -1,166 +0,0 @@ - - diff --git a/src/views/approval/runPlan/operate.vue b/src/views/approval/runPlan/operate.vue deleted file mode 100644 index 6f92f43e9..000000000 --- a/src/views/approval/runPlan/operate.vue +++ /dev/null @@ -1,96 +0,0 @@ - - - diff --git a/src/views/approval/script/index.vue b/src/views/approval/script/index.vue deleted file mode 100644 index 412305d2b..000000000 --- a/src/views/approval/script/index.vue +++ /dev/null @@ -1,171 +0,0 @@ - - - diff --git a/src/views/approval/script/operate.vue b/src/views/approval/script/operate.vue deleted file mode 100644 index ec4398641..000000000 --- a/src/views/approval/script/operate.vue +++ /dev/null @@ -1,70 +0,0 @@ - - - diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue index 4ccd52923..899142ad9 100644 --- a/src/views/demonstration/detail/index.vue +++ b/src/views/demonstration/detail/index.vue @@ -308,7 +308,7 @@ export default { jump() { this.disabled = true; setTimeout(() => { - const data = { mapId: this.courseModel.mapId, prdType: this.currentPrdType }; + const data = { mapId: this.courseModel.mapId, prdType: this.currentPrdType }; if (!this.drawWay) { simulationNotify(data).then(resp => { const query = { lineCode: this.courseModel.lineCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, goodsId: this.goodsId, try: this.tryUser, project: this.project }; @@ -320,8 +320,8 @@ export default { }); } else { createSimulationNew(data).then(resp => { - const query = { lineCode: this.courseModel.lineCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, goodsId: this.goodsId, try: this.tryUser, project: this.project }; - this.$store.dispatch('training/setPrdType', this.currentPrdType); // 改变prdType + const query = { lineCode: this.courseModel.lineCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, goodsId: this.goodsId, try: this.tryUser, project: this.project }; + this.$store.dispatch('training/setPrdType', this.currentPrdType); // 改变prdType this.$router.push({ path: `${UrlConfig.displayNew}/demon`, query: query }); launchFullscreen(); }).catch(error => { diff --git a/src/views/lesson/home.vue b/src/views/lesson/home.vue index afe8874f2..38ba9f500 100644 --- a/src/views/lesson/home.vue +++ b/src/views/lesson/home.vue @@ -23,7 +23,7 @@ import { UrlConfig } from '@/scripts/ConstDic'; import PublishCreate from './lessoncategory/edit/create'; import PublishLesson from './lessoncategory/edit/lesson/publish'; import { delLesson } from '@/api/jmap/lessondraft'; -import LessonDetail from '@/views/approval/lesson/detail'; +import LessonDetail from '@/views/approval/detail'; import ConstConfig from '@/scripts/ConstConfig'; export default { diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue index 69c3acb0d..9b417ae8a 100644 --- a/src/views/newMap/chatView/chatBox.vue +++ b/src/views/newMap/chatView/chatBox.vue @@ -1,5 +1,5 @@ diff --git a/src/views/newMap/displayNew/chatView/chatBox.vue b/src/views/newMap/displayNew/chatView/chatBox.vue deleted file mode 100644 index f2524ee2a..000000000 --- a/src/views/newMap/displayNew/chatView/chatBox.vue +++ /dev/null @@ -1,828 +0,0 @@ - - - diff --git a/src/views/newMap/displayNew/chatView/chatContent.vue b/src/views/newMap/displayNew/chatView/chatContent.vue deleted file mode 100644 index 40184eb64..000000000 --- a/src/views/newMap/displayNew/chatView/chatContent.vue +++ /dev/null @@ -1,153 +0,0 @@ - - - diff --git a/src/views/newMap/displayNew/chatView/chatCreateGroup.vue b/src/views/newMap/displayNew/chatView/chatCreateGroup.vue deleted file mode 100644 index 901ca6f5f..000000000 --- a/src/views/newMap/displayNew/chatView/chatCreateGroup.vue +++ /dev/null @@ -1,199 +0,0 @@ - - - diff --git a/src/views/newMap/displayNew/chatView/chatMemberList.vue b/src/views/newMap/displayNew/chatView/chatMemberList.vue deleted file mode 100644 index 3e157c89d..000000000 --- a/src/views/newMap/displayNew/chatView/chatMemberList.vue +++ /dev/null @@ -1,117 +0,0 @@ - - - diff --git a/src/views/newMap/displayNew/chatView/chatSetting.vue b/src/views/newMap/displayNew/chatView/chatSetting.vue deleted file mode 100644 index 26e59ac5b..000000000 --- a/src/views/newMap/displayNew/chatView/chatSetting.vue +++ /dev/null @@ -1,126 +0,0 @@ - - - - diff --git a/src/views/newMap/displayNew/chatView/chatTooltip.vue b/src/views/newMap/displayNew/chatView/chatTooltip.vue deleted file mode 100644 index 5ccc19fc7..000000000 --- a/src/views/newMap/displayNew/chatView/chatTooltip.vue +++ /dev/null @@ -1,110 +0,0 @@ - - - diff --git a/src/views/newMap/displayNew/demonChat.vue b/src/views/newMap/displayNew/demonChat.vue index a961a9bfd..af3ff607a 100644 --- a/src/views/newMap/displayNew/demonChat.vue +++ b/src/views/newMap/displayNew/demonChat.vue @@ -4,7 +4,6 @@ :group="group" :is-show="isShow" :tree-data="treeData" - :offset-bottom="offsetBottom" :conversition-id="conversitionId" :current-member-list="currentMemberList" :chat-content-list="chatContentList" @@ -40,7 +39,6 @@ export default { }, data() { return { - offsetBottom:15, scriptTip:'', isHasCoversition:false, conversitionId:'', @@ -66,13 +64,6 @@ export default { } }, watch:{ - '$store.state.config.menuBarLoadedCount': function (val) { - this.$nextTick(() => { - this.offsetBottom = 15; - const menuBottom = document.getElementById('menuButton'); - this.offsetBottom = this.offsetBottom + (menuBottom ? menuBottom.offsetHeight || 0 : 0); - }); - }, '$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识 开始获取仿真成员 getSimulationMemberList(this.group).then(resp => { let lastData = JSON.stringify(resp.data); @@ -108,9 +99,8 @@ export default { const device = this.$store.getters['map/getDeviceByCode'](member.deviceCode); if (device) { if (device._type == 'Train') { - member.memberName = member.type + device.groupNumber + name; + member.label = member.type + device.groupNumber + name; lastMemberList.push(member); - member.label = member.memberName; if (this.activeTrainList.length > 0) { if (this.activeTrainList.includes(member.deviceCode)) { driverList.push(member); @@ -119,20 +109,18 @@ export default { this.driverList.push(member); } } else { - member.memberName = member.type + device.name + name; + member.label = member.type + device.name + name; lastMemberList.push(member); if (device._type == 'Station') { - member.label = member.memberName; stationSupervisorList.push(member); } } } else { - member.memberName = member.type + member.deviceCode + name; + member.label = member.type + member.deviceCode + name; lastMemberList.push(member); } } else { - member.memberName = member.type + name; - member.label = member.memberName; + member.label = member.type + name; if (member.type == '行调') { dispatcherList.push(member); } else if (member.type == '通号') { @@ -248,7 +236,7 @@ export default { if (val) { if (val.type == 'Conversation') { this.scriptTip = '请说：' + val.content; - } else if (val.type == 'Command') { + } else if (val.type == 'Operation') { const commandName = val.operationType; let device = val.operationType.split('_')[0]; if (device == 'CM') { @@ -267,6 +255,19 @@ export default { } }); this.scriptTip = '请创建会话,选择' + inviteMember.toString(); + } else if (val.type == 'Command') { + const targetName = this.memberData.find(member=>{ return member.id == val.commandInitiateVO.targetMemberId; }); + const CommandList = { + Drive_Ahead:'确认运行至前方站', + Route_Block_Drive:'进路闭塞法行车', + Drive_Through_The_Guide_Signal:'越引导信号行驶', + Drive_Through_The_Red_Light:'越红灯行驶', + Drive_In_Urm_Mode:'URM模式驾驶', + Set_Speed_Limit:'设置限速', + Open_Or_Close_Door:'开关门', + Switch_Hook_Lock: '道岔钩锁' + }; + this.$messageBox('请对【' + targetName.label + '】下达【' + CommandList[val.commandInitiateVO.commandType] + '】指令'); } } }, diff --git a/src/views/newMap/displayNew/designIndex.vue b/src/views/newMap/displayNew/designIndex.vue index 10f4438d3..5be4ce080 100644 --- a/src/views/newMap/displayNew/designIndex.vue +++ b/src/views/newMap/displayNew/designIndex.vue @@ -5,7 +5,7 @@ - +
{{ $t('display.demon.exitScript') }} {{ $t('display.demon.back') }} @@ -308,25 +308,22 @@ export default { const device = this.$store.getters['map/getDeviceByCode'](member.deviceCode); if (device) { if (device._type == 'Train') { - member.memberName = member.type + device.groupNumber + name; + member.label = member.type + device.groupNumber + name; lastMemberList.push(member); - member.label = member.memberName; driverList.push(member); } else { - member.memberName = member.type + device.name + name; + member.label = member.type + device.name + name; lastMemberList.push(member); if (device._type == 'Station') { - member.label = member.memberName; stationSupervisorList.push(member); } } } else { - member.memberName = member.type + member.deviceCode + name; + member.label = member.type + member.deviceCode + name; lastMemberList.push(member); } } else { - member.memberName = member.type + name; - member.label = member.memberName; + member.label = member.type + name; if (member.type == '行调') { dispatcherList.push(member); } else if (member.type == '通号') { diff --git a/src/views/newMap/displayNew/menuScript.vue b/src/views/newMap/displayNew/menuScript.vue index 078675b24..0b7c25848 100644 --- a/src/views/newMap/displayNew/menuScript.vue +++ b/src/views/newMap/displayNew/menuScript.vue @@ -8,7 +8,7 @@ {{ $t('scriptRecord.scriptBack') }}
- + @@ -16,7 +16,7 @@ diff --git a/src/views/newMap/displayNew/scriptPreviewChat.vue b/src/views/newMap/displayNew/scriptPreviewChat.vue index 8429b1014..f8cd69481 100644 --- a/src/views/newMap/displayNew/scriptPreviewChat.vue +++ b/src/views/newMap/displayNew/scriptPreviewChat.vue @@ -4,7 +4,6 @@ :group="group" :is-show="isShow" :tree-data="treeData" - :offset-bottom="offsetBottom" :conversition-id="conversitionId" :current-member-list="currentMemberList" :chat-content-list="chatContentList" @@ -40,10 +39,6 @@ export default { treeData:{ type: Array, required: true - }, - offsetBottom:{ - type: Number, - required: true } }, data() { @@ -135,7 +130,7 @@ export default { if (val) { if (val.type == 'Conversation') { this.scriptTip = '请说：' + val.content; - } else if (val.type == 'Command') { + } else if (val.type == 'Operation') { const commandName = val.operationType; let device = val.operationType.split('_')[0]; if (device == 'CM') { @@ -154,6 +149,19 @@ export default { } }); this.scriptTip = '请创建会话,选择' + inviteMember.toString(); + } else if (val.type == 'Command') { + const targetName = this.memberData.find(member=>{ return member.id == val.commandInitiateVO.targetMemberId; }); + const CommandList = { + Drive_Ahead:'确认运行至前方站', + Route_Block_Drive:'进路闭塞法行车', + Drive_Through_The_Guide_Signal:'越引导信号行驶', + Drive_Through_The_Red_Light:'越红灯行驶', + Drive_In_Urm_Mode:'URM模式驾驶', + Set_Speed_Limit:'设置限速', + Open_Or_Close_Door:'开关门', + Switch_Hook_Lock: '道岔钩锁' + }; + this.$messageBox('请对【' + targetName.label + '】下达【' + CommandList[val.commandInitiateVO.commandType] + '】指令'); } } }, diff --git a/src/views/newMap/jointTrainingNew/chatView/chatBox.vue b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue index d28c54b51..f95eb1366 100644 --- a/src/views/newMap/jointTrainingNew/chatView/chatBox.vue +++ b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue @@ -552,9 +552,7 @@ export default { this.privateMessageList = []; this.quitLoading = false; this.$nextTick(() => { - if (this.$refs.tree) { - this.$refs.tree.filter(this.queryMember); - } + this.$refs.tree && this.$refs.tree.filter(this.queryMember); }); }).catch(() => { this.$message.error('退出会话失败！'); @@ -687,9 +685,7 @@ export default { this.conversitionMemberList = this.privateMemberList; this.messageList = [...this.privateMessageList]; this.$nextTick(() => { - if (this.$refs.tree) { - this.$refs.tree.filter(this.queryMember); - } + this.$refs.tree && this.$refs.tree.filter(this.queryMember); }); }, clearAllData() { diff --git a/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue b/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue index d2e92dfaa..bc246f793 100644 --- a/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue +++ b/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue @@ -460,7 +460,6 @@ export default { this.$refs.make.validate((valid) => { if (valid) { const model = deepAssign(this.addModel, {code:getUID(this.getIdPrefix(this.addModel.type), this.selectLists)}); - debugger; this.$emit('updateMapModel', model); this.$refs.make.resetForm(); this.$refs.dataform.resetFields(); diff --git a/src/views/scriptManage/getAction.vue b/src/views/scriptManage/getAction.vue index 1a991d66e..35c978461 100644 --- a/src/views/scriptManage/getAction.vue +++ b/src/views/scriptManage/getAction.vue @@ -164,7 +164,6 @@ export default { } case 'Command': { const targetName = memberList.find(elem=>{ return elem.id == element.commandInitiateVO.targetMemberId; }); - debugger; const CommandList = { Drive_Ahead:'确认运行至前方站', Route_Block_Drive:'进路闭塞法行车',