From 3101af994823ce5d74b700d03be8000bbd88a5fd Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Thu, 19 Dec 2019 18:04:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BA=BF=E8=B7=AF=E7=9A=AE?= =?UTF-8?q?=E8=82=A4=E9=85=8D=E7=BD=AE=EF=BC=8C=E8=B0=83=E6=95=B4=E8=81=94?= =?UTF-8?q?=E9=94=81=E7=AB=99=E5=8F=B0=E6=98=BE=E7=A4=BA=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/management/mapline.js | 42 + src/components/QueryListPage/DataForm.vue | 69 +- src/i18n/langs/en/router.js | 3 +- src/i18n/langs/zh/router.js | 3 +- src/jmapNew/config/deviceStyle.js | 3 +- src/jmapNew/config/skinCode/ningbo_01.js | 587 ++++++++ src/jmapNew/theme/factory.js | 3 +- .../ningbo_01/menus/dialog/alxeEffective.vue | 381 +++++ .../ningbo_01/menus/dialog/cancelAllLimit.vue | 371 +++++ .../childDialog/childDialog/noticeInfo.vue | 86 ++ .../dialog/childDialog/confirmControl.vue | 360 +++++ .../childDialog/confirmControlSpeed.vue | 153 +++ .../childDialog/confirmSignalUnlock.vue | 118 ++ .../menus/dialog/childDialog/confirmTip.vue | 68 + .../menus/dialog/childDialog/confirmTrain.vue | 178 +++ .../menus/dialog/childDialog/password.vue | 0 .../dialog/childDialog/passwordInputBox.vue | 206 +++ .../menus/dialog/childDialog/popupAlarm.vue | 99 ++ .../ningbo_01/menus/dialog/routeControl.vue | 363 +++++ .../ningbo_01/menus/dialog/routeDetail.vue | 140 ++ .../ningbo_01/menus/dialog/routeGuide.vue | 283 ++++ .../ningbo_01/menus/dialog/routeSelection.vue | 270 ++++ .../menus/dialog/sectionCmdControl.vue | 435 ++++++ .../ningbo_01/menus/dialog/sectionControl.vue | 215 +++ .../ningbo_01/menus/dialog/sectionDetail.vue | 115 ++ .../menus/dialog/speedCmdControl.vue | 902 ++++++++++++ .../ningbo_01/menus/dialog/standControl.vue | 621 +++++++++ .../ningbo_01/menus/dialog/standDetail.vue | 219 +++ .../menus/dialog/stationCmdControl.vue | 389 ++++++ .../menus/dialog/switchCmdControl.vue | 459 +++++++ .../ningbo_01/menus/dialog/switchControl.vue | 416 ++++++ src/jmapNew/theme/ningbo_01/menus/index.vue | 360 +++++ src/jmapNew/theme/ningbo_01/menus/menuBar.vue | 1220 +++++++++++++++++ .../theme/ningbo_01/menus/menuCancel.vue | 150 ++ .../childDialog/twoConfirmation.vue | 137 ++ .../menus/menuDialog/childDialog/userAdd.vue | 162 +++ .../menuDialog/childDialog/userDelete.vue | 144 ++ .../menus/menuDialog/childDialog/userEdit.vue | 178 +++ .../ningbo_01/menus/menuDialog/helpAbout.vue | 131 ++ .../ningbo_01/menus/menuDialog/limitSpeed.vue | 135 ++ .../ningbo_01/menus/menuDialog/manageUser.vue | 290 ++++ .../menus/menuDialog/passwordBox.vue | 221 +++ .../menus/menuDialog/setLimitSpeed.vue | 275 ++++ .../menuDialog/stationControlConvert.vue | 414 ++++++ .../ningbo_01/menus/menuDialog/trainAdd.vue | 162 +++ .../menus/menuDialog/trainDelete.vue | 149 ++ .../menus/menuDialog/trainTranstalet.vue | 152 ++ .../ningbo_01/menus/menuDialog/viewDevice.vue | 166 +++ .../ningbo_01/menus/menuDialog/viewName.vue | 248 ++++ .../menus/menuDialog/viewTrainId.vue | 183 +++ .../theme/ningbo_01/menus/menuLimit.vue | 118 ++ .../theme/ningbo_01/menus/menuSection.vue | 403 ++++++ .../theme/ningbo_01/menus/menuSignal.vue | 583 ++++++++ .../theme/ningbo_01/menus/menuStation.vue | 153 +++ .../ningbo_01/menus/menuStationControl.vue | 69 + .../ningbo_01/menus/menuStationStand.vue | 372 +++++ .../theme/ningbo_01/menus/menuSwitch.vue | 462 +++++++ .../theme/ningbo_01/menus/menuTool.vue | 205 +++ .../theme/ningbo_01/menus/menuTrain.vue | 42 + .../ningbo_01/menus/passiveDialog/alarm.vue | 210 +++ .../ningbo_01/menus/passiveDialog/control.vue | 285 ++++ .../ningbo_01/menus/passiveDialog/timeout.vue | 106 ++ .../theme/ningbo_01/menus/statusBar.vue | 31 + .../ningbo_01/menus/statusDownTrainDetail.vue | 31 + .../ningbo_01/menus/statusUpTrainDetail.vue | 31 + .../ningbo_01/menus/utils/menuItemStatus.js | 587 ++++++++ .../theme/ningbo_01/menusPlan/addTask.vue | 175 +++ .../menusPlan/chooseTemplatePlan.vue | 115 ++ .../menusPlan/components/dataTable.vue | 206 +++ .../ningbo_01/menusPlan/createTodayPlan.vue | 134 ++ .../ningbo_01/menusPlan/createWeekPlan.vue | 137 ++ .../theme/ningbo_01/menusPlan/deleteTask.vue | 73 + .../ningbo_01/menusPlan/deleteTodayPlan.vue | 62 + .../ningbo_01/menusPlan/managePlanList.vue | 143 ++ .../ningbo_01/menusPlan/modifyingPlan.vue | 177 +++ .../ningbo_01/menusPlan/modifyingTask.vue | 326 +++++ src/jmapNew/theme/ningbo_01/model.js | 63 + src/jmapNew/theme/ningbo_01/planConvert.js | 310 +++++ .../theme/ningbo_01/planSchedule/index.vue | 403 ++++++ .../theme/ningbo_01/planSchedule/menuBar.vue | 514 +++++++ .../theme/ningbo_01/planSchedule/menuTool.vue | 172 +++ .../theme/ningbo_01/planSchedule/schedule.vue | 482 +++++++ .../ningbo_01/planSchedule/statusBar.vue | 100 ++ .../theme/ningbo_01/planSchedule/titleBar.vue | 75 + src/router/index.js | 8 + src/scripts/GlobalPlugin.js | 2 +- src/views/jlmap/index.vue | 2 +- .../newMap/newMapdraft/dataRelation/index.vue | 7 + .../dataRelation/routeoperate/index.vue | 4 + .../dataRelation/routeoperate/route.vue | 12 +- src/views/newMap/newMapdraft/index.vue | 6 +- src/views/system/configLine/config.vue | 127 ++ src/views/system/configLine/edit.vue | 147 ++ src/views/system/configLine/editConfig.vue | 146 ++ src/views/system/configLine/index.vue | 134 ++ 95 files changed, 20368 insertions(+), 16 deletions(-) create mode 100644 src/jmapNew/config/skinCode/ningbo_01.js create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/cancelAllLimit.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/childDialog/noticeInfo.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControl.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControlSpeed.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmSignalUnlock.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmTip.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmTrain.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/password.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/passwordInputBox.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/popupAlarm.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/routeControl.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/routeGuide.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/sectionCmdControl.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/sectionControl.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/sectionDetail.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/speedCmdControl.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/standControl.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/standDetail.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/stationCmdControl.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/switchCmdControl.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/switchControl.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/index.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuBar.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuCancel.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/twoConfirmation.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userAdd.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userDelete.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userEdit.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/helpAbout.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/limitSpeed.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/manageUser.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/passwordBox.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/setLimitSpeed.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControlConvert.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/trainAdd.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/trainDelete.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/trainTranstalet.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/viewDevice.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/viewName.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/viewTrainId.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuLimit.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuSection.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuSignal.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuStation.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuTool.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuTrain.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/passiveDialog/alarm.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/passiveDialog/control.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/passiveDialog/timeout.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/statusBar.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/statusDownTrainDetail.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/statusUpTrainDetail.vue create mode 100644 src/jmapNew/theme/ningbo_01/menus/utils/menuItemStatus.js create mode 100644 src/jmapNew/theme/ningbo_01/menusPlan/addTask.vue create mode 100644 src/jmapNew/theme/ningbo_01/menusPlan/chooseTemplatePlan.vue create mode 100644 src/jmapNew/theme/ningbo_01/menusPlan/components/dataTable.vue create mode 100644 src/jmapNew/theme/ningbo_01/menusPlan/createTodayPlan.vue create mode 100644 src/jmapNew/theme/ningbo_01/menusPlan/createWeekPlan.vue create mode 100644 src/jmapNew/theme/ningbo_01/menusPlan/deleteTask.vue create mode 100644 src/jmapNew/theme/ningbo_01/menusPlan/deleteTodayPlan.vue create mode 100644 src/jmapNew/theme/ningbo_01/menusPlan/managePlanList.vue create mode 100644 src/jmapNew/theme/ningbo_01/menusPlan/modifyingPlan.vue create mode 100644 src/jmapNew/theme/ningbo_01/menusPlan/modifyingTask.vue create mode 100644 src/jmapNew/theme/ningbo_01/model.js create mode 100644 src/jmapNew/theme/ningbo_01/planConvert.js create mode 100644 src/jmapNew/theme/ningbo_01/planSchedule/index.vue create mode 100644 src/jmapNew/theme/ningbo_01/planSchedule/menuBar.vue create mode 100644 src/jmapNew/theme/ningbo_01/planSchedule/menuTool.vue create mode 100644 src/jmapNew/theme/ningbo_01/planSchedule/schedule.vue create mode 100644 src/jmapNew/theme/ningbo_01/planSchedule/statusBar.vue create mode 100644 src/jmapNew/theme/ningbo_01/planSchedule/titleBar.vue create mode 100644 src/views/system/configLine/config.vue create mode 100644 src/views/system/configLine/edit.vue create mode 100644 src/views/system/configLine/editConfig.vue create mode 100644 src/views/system/configLine/index.vue diff --git a/src/api/management/mapline.js b/src/api/management/mapline.js index 345914d09..a157095e6 100644 --- a/src/api/management/mapline.js +++ b/src/api/management/mapline.js @@ -43,6 +43,48 @@ export function updateSkinCode(data) { }); } +// 根据code获取线路配置 +export function getRealLineConfigList(lineCode) { + return request({ + url: `/api/realLine/config?lineCode=${lineCode}`, + method: 'get' + }); +} + +// 根据id获取线路配置 +export function getRealLineConfig(id) { + return request({ + url: `/api/realLine/config/${id}`, + method: 'get' + }); +} + +// 根据id修改线路配置 +export function putRealLineConfig(data) { + return request({ + url: `/api/realLine/config/${data.id}`, + method: 'put', + data: data + }); +} + +// 创建线路配置 +export function postRealLineConfig(data) { + return request({ + url: `/api/realLine/config`, + method: 'post', + data: data + }); +} + +// 删除线路配置 +export function delRealLineConfig(id) { + return request({ + url: `/api/realLine/config/${id}`, + method: 'delete' + }); +} + /** 通过皮肤Code更新地图皮肤*/ export function updateSkinCodeByCode(data) { return request({ diff --git a/src/components/QueryListPage/DataForm.vue b/src/components/QueryListPage/DataForm.vue index c23734a1b..9d1ef4c04 100644 --- a/src/components/QueryListPage/DataForm.vue +++ b/src/components/QueryListPage/DataForm.vue @@ -58,6 +58,7 @@ :disabled="item.disabled" :min="isNaN(item.min) ? -Infinity : item.min" :max="isNaN(item.max)? Infinity : item.max" + :step="isNaN(item.step) ? -Infinity : item.step" /> -