diff --git a/src/components/QueryListPage/DataForm.vue b/src/components/QueryListPage/DataForm.vue index 8d8008ca5..d7276f31d 100644 --- a/src/components/QueryListPage/DataForm.vue +++ b/src/components/QueryListPage/DataForm.vue @@ -264,7 +264,7 @@ :placeholder="item.placeholder" :disabled="item.disabled" :value-format="'HH:mm:ss'" - :picker-options="{ selectableRange: '00:00:00 - 23:59:59' }" + :picker-options="{ selectableRange: item.selectableRange ||'00:00:00 - 23:59:59' }" /> diff --git a/src/iscs/iscs.js b/src/iscs/iscs.js index 78cadb9a0..0cbd893f1 100644 --- a/src/iscs/iscs.js +++ b/src/iscs/iscs.js @@ -8,7 +8,7 @@ import KeyboardController from './keyboardController'; import {calculateDCenter, createBoundingRect, deviceFactory} from './utils/parser'; import { updateIscsData } from './utils/parser'; import store from '@/store/index'; -import { selectLineCode } from './constant/deviceStyle'; +import fuzhouStyle from './constant/skinCode/fuzhou_01.js'; const renderer = 'canvas'; const devicePixelRatio = 1; @@ -60,7 +60,7 @@ class Iscs { // 保存原始数据 this.data = config; this.lineCode = lineCode; - this.style = this.loadStyle(lineCode); + this.style = fuzhouStyle; // 保存需展现的画布大小 this.canvasSize = { x: 0, @@ -112,9 +112,11 @@ class Iscs { if (this.methods.optionsUpdate instanceof Function) { this.methods.optionsUpdate(this.$options); } } - loadStyle(lineCode) { - return selectLineCode(lineCode); - } + + // loadStyle(lineCode) { + // return selectLineCode(lineCode); + // } + setCenter(deviceCode) { const device = this.iscsDevice[deviceCode]; if (device && device.instance) { diff --git a/src/views/iscs/iscsDesign/demonList.vue b/src/views/iscs/iscsDesign/demonList.vue index ad7d37808..09555b5ea 100644 --- a/src/views/iscs/iscsDesign/demonList.vue +++ b/src/views/iscs/iscsDesign/demonList.vue @@ -7,12 +7,12 @@
- +
@@ -34,7 +34,6 @@ import { DeviceMenu } from '@/scripts/ConstDic'; import { removeSessionStorage } from '@/utils/auth'; import { getPublishMapListOnline, getStationListNeedAttendant } from '@/api/jmap/map'; -import { getLineCodeList } from '@/api/management/mapline'; export default { name: 'UserMapList', @@ -53,10 +52,10 @@ export default { y: 0 }, editModel: {}, - lineCode: '', + mapId: '', mapList: [], mapStationList: [], - lineList: [], + mapPublishList: [], pageTreeMap: { '01': [], '02': [ @@ -885,8 +884,8 @@ export default { }; }, treeList() { - if (this.lineCode) { - return this.pageTreeMap[this.lineCode]; + if (this.mapId) { + return this.pageTreeMap[this.mapId]; } else { return []; } @@ -904,11 +903,12 @@ export default { removeSessionStorage('demonList'); }, mounted() { - if (this.$route.query.lineCode) { - this.lineCode = this.$route.query.lineCode; + if (this.$route.query.mapId) { + this.mapId = this.$route.query.mapId; } - getLineCodeList().then(resp => { - this.lineList = resp.data || []; + + getPublishMapListOnline().then(resp => { + this.mapPublishList = resp.data || []; }).catch(() => { this.$message.error('获取线路列表异常！'); }); @@ -928,7 +928,7 @@ export default { case 'system' : break; case 'interface': - this.$router.push({ path: `/iscs/design/edit`, query: {mode: obj.mode, system: data.parent.data.id, part: obj.id, lineCode: this.lineCode} }); + this.$router.push({ path: `/iscs/design/edit`, query: {mode: obj.mode, system: data.parent.data.id, part: obj.id, mapId: this.mapId} }); break; } }, diff --git a/src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue b/src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue index 4e2cfd08b..b7e64b37e 100644 --- a/src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue +++ b/src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue @@ -126,7 +126,7 @@ export default { } }, setIscs(data, oldData) { - this.$iscs.setIscs(oldData, data, this.$route.query.lineCode); + this.$iscs.setIscs(oldData, data, this.$route.query.mapId); }, // 执行操作 handleModel(model) { diff --git a/src/views/iscs/iscsSystem/stationNav.vue b/src/views/iscs/iscsSystem/stationNav.vue index 80a743204..c915e0d48 100644 --- a/src/views/iscs/iscsSystem/stationNav.vue +++ b/src/views/iscs/iscsSystem/stationNav.vue @@ -102,9 +102,8 @@ export default { alarmInfo: true, selectStation: 'mainHouseOne', stationList:[], - tractionList:['象峰站', '罗汉山站', '树兜站', '东街口站', '达道站', '三叉街站', '葫芦阵站', '城门站', '胪雷站', '安平站', '梁厝站', '三江口站'], + tractionList:[], group:'', - lineCode:'', buttonId:'substation', buttonList:{ stationDescription:{name:'车站概要', type:'totalSystem', id: 'stationDescription', active:false, icon:iscs_icon1 }, @@ -328,18 +327,15 @@ export default { this.stationList = []; res.data.forEach(station => { if (!station.depot && station.visible) { - let param = {}; - if (station.runPlanName.includes('站')) { - param = { - name: station.runPlanName, - id: station.code - }; - } else { - param = { - name: station.runPlanName + '站', - id: station.code - }; + const param = { + name: station.name.includes('站') ? station.name : `${station.name}站`, + id: station.code + }; + + if (station.centralized) { + this.tractionList.push(param.name); } + this.stationList.push(param); } }); @@ -350,7 +346,6 @@ export default { }, mounted() { this.group = this.$route.query.group; - this.lineCode = this.$route.query.lineCode; this.subscribe(); const data = Object.values(this.buttonList); this.initButtonGroup(data); @@ -437,7 +432,7 @@ export default { if (station) { stationName = station.name; } - const query = {stationName: stationName, stationId: this.selectStation, group: this.group, lineCode:this.lineCode, mapId: this.$route.query.mapId, noPreLogout:this.$route.query.noPreLogout }; + const query = {stationName: stationName, stationId: this.selectStation, group: this.group, mapId: this.$route.query.mapId, noPreLogout:this.$route.query.noPreLogout }; if (isReplace) { this.$router.replace({ path: `/displayIscs/system/stationConfig/${type}`, query: query }); diff --git a/src/views/planMonitor/editTool/menus/addTask.vue b/src/views/planMonitor/editTool/menus/addTask.vue index 0cee88188..75d20a557 100644 --- a/src/views/planMonitor/editTool/menus/addTask.vue +++ b/src/views/planMonitor/editTool/menus/addTask.vue @@ -32,7 +32,7 @@ {{ $t('global.startTime')+$t('global.colon') }} - + diff --git a/src/views/planMonitor/editTool/menus/gernaratePlanTrain.vue b/src/views/planMonitor/editTool/menus/gernaratePlanTrain.vue index ad7be1b61..b24a05fc5 100644 --- a/src/views/planMonitor/editTool/menus/gernaratePlanTrain.vue +++ b/src/views/planMonitor/editTool/menus/gernaratePlanTrain.vue @@ -107,8 +107,8 @@ export default { { name: '多条服务', value: '02' } ] }, { prop: 'serviceNumber', label: '服务号', type: 'text', rightWidth:true, maxlength:3, show:this.formModel.gernarateType == '01'}, - { prop: 'beginTime', label: '开始时间', type: 'timePicker'}, - { prop: 'overTime', label: '结束时间', type: 'timePicker'}, + { prop: 'beginTime', label: '开始时间', type: 'timePicker', selectableRange:'02:00:00-23:59:59'}, + { prop: 'overTime', label: '结束时间', type: 'timePicker', selectableRange:'02:00:00-23:59:59'}, { prop: 'runLevel', label: '运行等级', type: 'select', options: this.runLevelList }, { prop: 'departureInterval', label: '发车间隔', type: 'number', show:this.formModel.gernarateType == '02', min:0, step:1, precisionFlag:true, precision:0, message:'s'}, { prop: 'reentryTime', label: '折返时间', type: 'number', min:0, step:1, precisionFlag:true, precision:0, message:'s' }, diff --git a/src/views/planMonitor/editTool/menus/modifyingTask.vue b/src/views/planMonitor/editTool/menus/modifyingTask.vue index 9114c6197..688323c97 100644 --- a/src/views/planMonitor/editTool/menus/modifyingTask.vue +++ b/src/views/planMonitor/editTool/menus/modifyingTask.vue @@ -145,6 +145,7 @@ :placeholder="$t('planMonitor.modifying.selectTime')" value-format="HH:mm:ss" size="mini" + :picker-options="{selectableRange:'02:00:00-23:59:59'}" :clearable="false" /> diff --git a/src/views/planMonitor/editTool/menus/populatingGenericData.vue b/src/views/planMonitor/editTool/menus/populatingGenericData.vue index ab86ab39f..561712a4a 100644 --- a/src/views/planMonitor/editTool/menus/populatingGenericData.vue +++ b/src/views/planMonitor/editTool/menus/populatingGenericData.vue @@ -88,8 +88,8 @@ export default { return { labelWidth: '100px', items: [ - { prop: 'beginTime', label: '开始时间', type: 'timePicker'}, - { prop: 'overTime', label: '结束时间', type: 'timePicker'}, + { prop: 'beginTime', label: '开始时间', type: 'timePicker', selectableRange:'02:00:00-23:59:59'}, + { prop: 'overTime', label: '结束时间', type: 'timePicker', selectableRange:'02:00:00-23:59:59'}, { prop: 'departureTimeInterval', label: '发车间隔', type: 'number', min:0, step:1, precisionFlag:true, precision:0, message:'s'}, // { prop: 'parkedTime', label: '停站时间', type: 'number', min:0, step:1, precisionFlag:true, precision:0}, { prop: 'reentryTime', label: '折返时间', type: 'number', min:0, step:1, precisionFlag:true, precision:0, message:'s'}, diff --git a/src/views/planMonitor/editTool/statusBar.vue b/src/views/planMonitor/editTool/statusBar.vue index 756fee8a0..962230572 100644 --- a/src/views/planMonitor/editTool/statusBar.vue +++ b/src/views/planMonitor/editTool/statusBar.vue @@ -6,7 +6,7 @@
{{ $t('planMonitor.gerneratePlan') }}
{{ $t('planMonitor.addPlan') }}
{{ $t('planMonitor.deletePlan') }}
-
平移计划
+
移动计划
{{ $t('planMonitor.duplicatePlan') }}
{{ $t('planMonitor.addTask') }}
{{ $t('planMonitor.deleteTask') }}
diff --git a/src/views/planMonitor/newEditTool/statusBar.vue b/src/views/planMonitor/newEditTool/statusBar.vue index db8cb1fb5..ae6d359fb 100644 --- a/src/views/planMonitor/newEditTool/statusBar.vue +++ b/src/views/planMonitor/newEditTool/statusBar.vue @@ -8,7 +8,7 @@
{{ $t('planMonitor.addPlan') }}
{{ $t('planMonitor.deletePlan') }}
-
平移计划
+
移动计划
{{ $t('planMonitor.duplicatePlan') }}
{{ $t('planMonitor.addTask') }}
{{ $t('planMonitor.deleteTask') }}
diff --git a/src/views/planSchedule/statusBar.vue b/src/views/planSchedule/statusBar.vue index 8b3473224..2c099e5f9 100644 --- a/src/views/planSchedule/statusBar.vue +++ b/src/views/planSchedule/statusBar.vue @@ -40,7 +40,7 @@ export default { width: 400 }, { - prop: 'startTime', + prop: 'endTime', label: '到点' }, { @@ -48,7 +48,7 @@ export default { label: '停站时间' }, { - prop: 'endTime', + prop: 'startTime', label: '发点' }, { @@ -72,16 +72,16 @@ export default { if (trainObj) { const stationTimeList = trainObj.stationTimeList; if (stationTimeList && stationTimeList.length) { - stationTimeList.forEach((elem, index) => { + for (var i = 0; i < stationTimeList.length; i += 2) { const stationObj = { - stationName: formatName(elem.stationCode), - startTime: formatTime(index == 0 ? null : stationTimeList[index - 1].secondTime), - stopTime: formatTime(index == 0 ? null : elem.secondTime - stationTimeList[index - 1].secondTime), - endTime: formatTime(elem.secondTime), - level: '' + stationName: formatName(stationTimeList[i].stationCode), + endTime : formatTime(i == 0 ? null : stationTimeList[i].secondTime + 7200), + stopTime: formatTime(i == 0 ? null : stationTimeList[i + 1].secondTime - stationTimeList[i].secondTime), + startTime: formatTime(stationTimeList[i + 1].secondTime + 7200), + level:formatTime(i == (stationTimeList.length - 2) ? null : (stationTimeList[i + 2].secondTime - stationTimeList[i + 1].secondTime)) }; this.stationListConfig.data.push(stationObj); - }); + } } } } diff --git a/src/views/publish/publishISCS/index.vue b/src/views/publish/publishISCS/index.vue index 8a1c2d3f2..767b593ac 100644 --- a/src/views/publish/publishISCS/index.vue +++ b/src/views/publish/publishISCS/index.vue @@ -22,7 +22,7 @@ export default { dialogVisible:false, loading:false, formModel:{ - fromId: '', + fromMapId: '', toMapId: '' }, rules: { @@ -77,10 +77,10 @@ export default { title: this.$t('global.operate'), width: '300', buttons: [ - { - name: this.$t('publish.copy'), - handleClick: this.handleCopy - }, + // { + // name: this.$t('publish.copy'), + // handleClick: this.handleCopy + // }, { name: this.$t('global.delete'), handleClick: this.handleDelete, @@ -89,6 +89,9 @@ export default { } ] } + ], + actions: [ + { text: '复制', btnCode: 'copy', handler: this.handleCopy } ] } }; @@ -101,6 +104,7 @@ export default { return { labelWidth: '100px', items: [ + { prop: 'fromMapId', label: '数据来源', type: 'select', required: true, options: this.covertOtherData()}, { prop: 'toMapId', label: '复制到', type: 'select', required: true, options: this.covertData()} ] }; @@ -119,7 +123,10 @@ export default { }); }, covertData() { - return this.mapList.filter(data=>{ return data.value != this.formModel.fromId; }); + return this.mapList.filter(data=>{ return data.value != this.formModel.fromMapId; }); + }, + covertOtherData() { + return this.mapList.filter(data=>{ return data.value != this.formModel.toMapId; }); }, covertMap(row) { return this.mapListMap[row.mapId]; @@ -143,7 +150,7 @@ export default { this.queryList.reload(); }, handleCopy(index, row) { - this.formModel.fromId = row.id; + // this.formModel.fromId = row.id; this.$nextTick(()=>{ this.dialogVisible = true; });