From 4a441311ba8ea28b67db5ee4a364ce9af3f663ee Mon Sep 17 00:00:00 2001 From: joylink_cui Date: Mon, 3 Feb 2020 13:32:37 +0800 Subject: [PATCH 1/5] =?UTF-8?q?iscs=20=E4=B9=98=E5=AE=A2=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=AE=A1=E6=97=B6=E4=B8=80=E8=A7=88=20=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iscsSystem/config/pis/timePreview.vue | 46 ++++++++++++++++++- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/src/views/iscs/iscsSystem/config/pis/timePreview.vue b/src/views/iscs/iscsSystem/config/pis/timePreview.vue index 8057c85e4..ce9c1a0b2 100644 --- a/src/views/iscs/iscsSystem/config/pis/timePreview.vue +++ b/src/views/iscs/iscsSystem/config/pis/timePreview.vue @@ -41,7 +41,16 @@ /> -
+
+
操作
+
+
区域
详细
+
删除
+
停用
+
激活
+
修改
+
+
diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmControl.vue new file mode 100644 index 000000000..db0298ce5 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmControl.vue @@ -0,0 +1,361 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmControlSpeed.vue new file mode 100644 index 000000000..a7dbc79db --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmControlSpeed.vue @@ -0,0 +1,144 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmSignalUnlock.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmSignalUnlock.vue new file mode 100644 index 000000000..c4fe8cf20 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmSignalUnlock.vue @@ -0,0 +1,126 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmTrain.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmTrain.vue new file mode 100644 index 000000000..ac4e2b65e --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmTrain.vue @@ -0,0 +1,180 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/routeCmdControl.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/routeCmdControl.vue new file mode 100644 index 000000000..258096dfb --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/routeCmdControl.vue @@ -0,0 +1,450 @@ + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/routeControl.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/routeControl.vue new file mode 100644 index 000000000..63e732f6b --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/routeControl.vue @@ -0,0 +1,332 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/routeDetail.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/routeDetail.vue new file mode 100644 index 000000000..19472e077 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/routeDetail.vue @@ -0,0 +1,166 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/routeHandControl.vue new file mode 100644 index 000000000..9b6715176 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/routeHandControl.vue @@ -0,0 +1,316 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/routeLock.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/routeLock.vue new file mode 100644 index 000000000..eaa3d6027 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/routeLock.vue @@ -0,0 +1,167 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/routeSelection.vue new file mode 100644 index 000000000..14a6c0c34 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/routeSelection.vue @@ -0,0 +1,239 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/sectionCmdControl.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/sectionCmdControl.vue new file mode 100644 index 000000000..6d4a00fdb --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/sectionCmdControl.vue @@ -0,0 +1,419 @@ + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/sectionControl.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/sectionControl.vue new file mode 100644 index 000000000..d66d41180 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/sectionControl.vue @@ -0,0 +1,167 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/speedCmdControl.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/speedCmdControl.vue new file mode 100644 index 000000000..0e4298f4b --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/speedCmdControl.vue @@ -0,0 +1,547 @@ + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/standBackStrategy.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/standBackStrategy.vue new file mode 100644 index 000000000..f3325f200 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/standBackStrategy.vue @@ -0,0 +1,253 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/standControl.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/standControl.vue new file mode 100644 index 000000000..185d399cf --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/standControl.vue @@ -0,0 +1,271 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/standDetail.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/standDetail.vue new file mode 100644 index 000000000..cd0b5e891 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/standDetail.vue @@ -0,0 +1,180 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/standDetainTrainAll.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/standDetainTrainAll.vue new file mode 100644 index 000000000..d5e3640f1 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/standDetainTrainAll.vue @@ -0,0 +1,192 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/standRunLevel.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/standRunLevel.vue new file mode 100644 index 000000000..958656680 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/standRunLevel.vue @@ -0,0 +1,276 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/standStopTime.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/standStopTime.vue new file mode 100644 index 000000000..11ec73b92 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/standStopTime.vue @@ -0,0 +1,265 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/stationCmdControl.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/stationCmdControl.vue new file mode 100644 index 000000000..a25a8d7ac --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/stationCmdControl.vue @@ -0,0 +1,406 @@ + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/stationHumanControlAll.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/stationHumanControlAll.vue new file mode 100644 index 000000000..4fe701445 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/stationHumanControlAll.vue @@ -0,0 +1,123 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/stationSetRouteControlAll.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/stationSetRouteControlAll.vue new file mode 100644 index 000000000..40a952722 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/stationSetRouteControlAll.vue @@ -0,0 +1,145 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/switchCmdControl.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/switchCmdControl.vue new file mode 100644 index 000000000..f55a1a53d --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/switchCmdControl.vue @@ -0,0 +1,482 @@ + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/switchControl.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/switchControl.vue new file mode 100644 index 000000000..acdfa7ced --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/switchControl.vue @@ -0,0 +1,286 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/trainControl.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/trainControl.vue new file mode 100644 index 000000000..87286986a --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/trainControl.vue @@ -0,0 +1,472 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/trainCreate.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/trainCreate.vue new file mode 100644 index 000000000..c6e00382c --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/trainCreate.vue @@ -0,0 +1,155 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/trainDelete.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/trainDelete.vue new file mode 100644 index 000000000..448f7fd28 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/trainDelete.vue @@ -0,0 +1,167 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/trainEditNumber.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/trainEditNumber.vue new file mode 100644 index 000000000..fe924739b --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/trainEditNumber.vue @@ -0,0 +1,138 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/trainMove.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/trainMove.vue new file mode 100644 index 000000000..845e76b56 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/trainMove.vue @@ -0,0 +1,201 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/trainSwitch.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/trainSwitch.vue new file mode 100644 index 000000000..c7cb6d580 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/trainSwitch.vue @@ -0,0 +1,206 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/index.vue b/src/jmapNew/theme/haerbin_01/menus/index.vue new file mode 100644 index 000000000..0dfd8757e --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/index.vue @@ -0,0 +1,356 @@ + + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuBar.vue b/src/jmapNew/theme/haerbin_01/menus/menuBar.vue new file mode 100644 index 000000000..e59b47d55 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuBar.vue @@ -0,0 +1,813 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuCancel.vue b/src/jmapNew/theme/haerbin_01/menus/menuCancel.vue new file mode 100644 index 000000000..c977cd799 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuCancel.vue @@ -0,0 +1,130 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/twoConfirmation.vue new file mode 100644 index 000000000..309fb8c00 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/twoConfirmation.vue @@ -0,0 +1,142 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userAdd.vue new file mode 100644 index 000000000..d2467898d --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userAdd.vue @@ -0,0 +1,172 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userDelete.vue new file mode 100644 index 000000000..f0fb7cdc1 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userDelete.vue @@ -0,0 +1,143 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userEdit.vue new file mode 100644 index 000000000..a39351cd4 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userEdit.vue @@ -0,0 +1,189 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/helpAbout.vue new file mode 100644 index 000000000..688174504 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/helpAbout.vue @@ -0,0 +1,140 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/manageUser.vue new file mode 100644 index 000000000..996630adf --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/manageUser.vue @@ -0,0 +1,309 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/passwordBox.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/passwordBox.vue new file mode 100644 index 000000000..dd3767489 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/passwordBox.vue @@ -0,0 +1,228 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/stationControlConvert.vue new file mode 100644 index 000000000..ea48fd5ea --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/stationControlConvert.vue @@ -0,0 +1,463 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainAdd.vue new file mode 100644 index 000000000..89055de36 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainAdd.vue @@ -0,0 +1,179 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainDelete.vue new file mode 100644 index 000000000..7e947d735 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainDelete.vue @@ -0,0 +1,157 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainTranstalet.vue new file mode 100644 index 000000000..60da613b0 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainTranstalet.vue @@ -0,0 +1,164 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewDevice.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewDevice.vue new file mode 100644 index 000000000..3b4b101da --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewDevice.vue @@ -0,0 +1,166 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewName.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewName.vue new file mode 100644 index 000000000..35fc8f51d --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewName.vue @@ -0,0 +1,248 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewTrainId.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewTrainId.vue new file mode 100644 index 000000000..c5e38fab9 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewTrainId.vue @@ -0,0 +1,209 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuSection.vue b/src/jmapNew/theme/haerbin_01/menus/menuSection.vue new file mode 100644 index 000000000..885bda462 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuSection.vue @@ -0,0 +1,370 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue b/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue new file mode 100644 index 000000000..958cd69f1 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue @@ -0,0 +1,516 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuStation.vue b/src/jmapNew/theme/haerbin_01/menus/menuStation.vue new file mode 100644 index 000000000..0efa0bfed --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuStation.vue @@ -0,0 +1,309 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue b/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue new file mode 100644 index 000000000..f96f1ebd0 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue @@ -0,0 +1,473 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue b/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue new file mode 100644 index 000000000..a62a42a12 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue @@ -0,0 +1,498 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue new file mode 100644 index 000000000..7f215a543 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue @@ -0,0 +1,332 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/haerbin_01/menus/passiveDialog/alarm.vue new file mode 100644 index 000000000..471f03888 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/passiveDialog/alarm.vue @@ -0,0 +1,218 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/passiveDialog/control.vue b/src/jmapNew/theme/haerbin_01/menus/passiveDialog/control.vue new file mode 100644 index 000000000..9e5752284 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/passiveDialog/control.vue @@ -0,0 +1,309 @@ + + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/haerbin_01/menus/passiveDialog/timeout.vue new file mode 100644 index 000000000..2b87d09de --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/passiveDialog/timeout.vue @@ -0,0 +1,111 @@ + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/statusDownTrainDetail.vue b/src/jmapNew/theme/haerbin_01/menus/statusDownTrainDetail.vue new file mode 100644 index 000000000..ac712152d --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/statusDownTrainDetail.vue @@ -0,0 +1,25 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/statusUpTrainDetail.vue b/src/jmapNew/theme/haerbin_01/menus/statusUpTrainDetail.vue new file mode 100644 index 000000000..bb1e0cee3 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/statusUpTrainDetail.vue @@ -0,0 +1,26 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/utils/menuItemStatus.js b/src/jmapNew/theme/haerbin_01/menus/utils/menuItemStatus.js new file mode 100644 index 000000000..bd43672d1 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/utils/menuItemStatus.js @@ -0,0 +1,570 @@ +import store from '@/store'; +import deviceState from '@/jmap/constant/deviceState'; +import { OperateMode } from '@/scripts/ConstDic'; + +export function getCurrentStateObject() { + return store.getters['menuOperation/selected']; +} + +/** 系统类型 */ +export const State2SimulationMap = { + '01': 'local', // 现地工作站 + '02': 'central' // 中心调度工作站 +}; + +export const State2ControlMap = { + '01': 'center', // 中控 + '02': 'station', // 站控 + '03': 'station' +}; + +// 控制禁用 +export const MenuDisabledState = { + Section: { + // 故障解锁 + fault() { + }, + // 切除 + split() { + const device = getCurrentStateObject(); + if (device && device.cutOff != deviceState.Section.cutOff.Default) { + return true; + } + }, + // 激活 + active() { + const device = getCurrentStateObject(); + if (device && device.cutOff == deviceState.Section.cutOff.Default) { + return true; + } + }, + // 区段封锁 + lock() { + const device = getCurrentStateObject(); + if (device && device.status == deviceState.Section.status.State06) { + return true; + } + }, + // 区段解禁 + unlock() { + const device = getCurrentStateObject(); + if (device && device.status != deviceState.Section.status.State06) { + return true; + } + }, + // 区段设置限速 + setSpeed() { + const device = getCurrentStateObject(); + if (device && device.speedUpperLimit != deviceState.Section.speedUpperLimit.Default) { + return true; + } + }, + // 区段取消限速 + cancelSpeed() { + const device = getCurrentStateObject(); + if (device && device.speedUpperLimit == deviceState.Section.speedUpperLimit.Default) { + return true; + } + }, + // 新建列车 + newTrain() { + }, + // 计轴预复位 + axlePreReset() { + }, + // 设置故障 + setStoppage() { + const device = getCurrentStateObject(); + if (device && device.fault) { + return true; + } + }, + // 取消故障 + cancelStoppage() { + const device = getCurrentStateObject(); + if (device && !device.fault) { + return true; + } + } + }, + Signal: { + // 进路选排 + arrangementRoute() { + + }, + // 进路取消 + cancelTrainRoute() { + }, + // 信号封闭 + lock() { + const device = getCurrentStateObject(); + if (device && device.status == deviceState.Signal.status.State05) { + return true; + } + }, + // 信号解封 + unlock() { + const device = getCurrentStateObject(); + if (device && device.status != deviceState.Signal.status.State05) { + return true; + } + }, + // 信号重开 + reopenSignal() { + }, + // 进路引导 + guide() { + }, + // 设置联锁自动进路 + setAutoInterlock() { + }, + // 取消联锁自动进路 + cancelAutoInterlock() { + }, + // 设置联锁自动触发 + setAutoTrigger() { + }, + // 取消联锁自动触发 + cancelAutoTrigger() { + }, + // 关灯 + signalClose() { + const device = getCurrentStateObject(); + if (device && device.status == deviceState.Signal.status.State01) { + return true; + } + }, + // 人工控 + humanControl() { + }, + // ats自动控 + atsAutoControl() { + }, + // 查询进路状态 + detail() { + }, + // 设置故障 + setStoppage() { + const device = getCurrentStateObject(); + if (device && device.fault) { + return true; + } + }, + // 取消故障 + cancelStoppage() { + const device = getCurrentStateObject(); + if (device && !device.fault) { + return true; + } + } + }, + Station: { + // 全站设置联锁自动触发 + setAutoTrigger() { + }, + // 全站取消联锁自动触发 + cancelAutoTrigger() { + }, + // 上电解锁 + powerUnLock() { + }, + // 执行关键操作测试 + execKeyOperationTest() { + }, + // 所有进路自排开 + atsAutoControlALL() { + }, + // 所有进路自排关 + humanControlALL() { + }, + // 设置ZC故障 + setStoppage() { + const device = getCurrentStateObject(); + if (device && device.fault) { + return true; + } + }, + // 取消ZC故障 + cancelStoppage() { + const device = getCurrentStateObject(); + if (device && !device.fault) { + return true; + } + } + }, + StationControl: { + // 紧急站控 + emergencyStationControl() { + const device = getCurrentStateObject(); + if (device && device.status == deviceState.StationControl.status.State03) { + return true; + } + }, + // 请求站控 + requestStationControl() { + const device = getCurrentStateObject(); + if (device && device.status == deviceState.StationControl.status.State02) { + return true; + } + }, + // 强行站控 + forcedStationControl() { + const device = getCurrentStateObject(); + if (device && device.status == deviceState.StationControl.status.State02) { + return true; + } + }, + // 请求中控 + requestCentralControl() { + const device = getCurrentStateObject(); + if (device && device.status == deviceState.StationControl.status.State01) { + return true; + } + }, + // 设置故障 + setStoppage() { + const device = getCurrentStateObject(); + if (device && device.fault) { + return true; + } + }, + // 取消故障 + cancelStoppage() { + const device = getCurrentStateObject(); + if (device && !device.fault) { + return true; + } + } + }, + StationStand: { + // 设置扣车 + setDetainTrain() { + const device = getCurrentStateObject(); + if (store.state.training.prdType == '02') { // 中心行调模式 + if (device && device.holdStatus == deviceState.StationStand.holdStatus.State04) { + return true; + } else if (device && device.holdStatus == deviceState.StationStand.holdStatus.State03) { + return true; + } + } else { // 现地模式 + if (device && device.holdStatus == deviceState.StationStand.holdStatus.State04) { + return true; + } else if (device && device.holdStatus == deviceState.StationStand.holdStatus.State02) { + return true; + } + } + }, + // 取消扣车 + cancelDetainTrain() { + const device = getCurrentStateObject(); + if (store.state.training.prdType == '02') { + if (device && device.holdStatus == deviceState.StationStand.holdStatus.State04) { + return false; + } else if (device && device.holdStatus != deviceState.StationStand.holdStatus.State03) { + return true; + } + } else { + if (device && device.holdStatus == deviceState.StationStand.holdStatus.State04) { + return false; + } else if (device && device.holdStatus != deviceState.StationStand.holdStatus.State02) { + return true; + } + } + }, + // 强制取消扣车 + cancelDetainTrainForce() { + const device = getCurrentStateObject(); + if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) { + return true; + } + }, + // 设置全站扣车 + cancelDetainTrainAll() { + }, + // 设置运行等级 + setRunLevel() { + }, + // 设置停站时间 + setStopTime() { + }, + // 设置跳停 + setJumpStop() { + const device = getCurrentStateObject(); + if (device && device.jumpStopStatus != deviceState.StationStand.jumpStopStatus.State01) { + return true; + } + }, + // 取消跳停 + cancelJumpStop() { + const device = getCurrentStateObject(); + if (device && device.jumpStopStatus == deviceState.StationStand.jumpStopStatus.State01) { + return true; + } + }, + // 提前发车 + earlyDeparture() { + }, + // 站台详细信息 + detail() { + }, + // 设置折返策略 + setBackStrategy() { + }, + // 设置故障 + setStoppage() { + const device = getCurrentStateObject(); + if (device && device.fault) { + return true; + } + }, + // 取消故障 + cancelStoppage() { + const device = getCurrentStateObject(); + if (device && !device.fault) { + return true; + } + } + }, + Switch: { + // 单锁 + lock() { + const device = getCurrentStateObject(); + if (device && device.status == deviceState.Switch.status.State10) { + return true; + } + }, + // 解锁 + unlock() { + const device = getCurrentStateObject(); + if (device && device.status != deviceState.Switch.status.State10) { + return true; + } + }, + // 封锁 + block() { + const device = getCurrentStateObject(); + if (device && device.status == deviceState.Switch.status.State14) { + return true; + } + }, + // 解封 + unblock() { + const device = getCurrentStateObject(); + if (device && device.status != deviceState.Switch.status.State14) { + return true; + } + }, + // 强扳 + switchTurnoutForce() { + }, + // 转动 + switchTurnout() { + }, + // 道岔故障解锁 + fault() { + }, + // 计轴预复位 + axlePreReset() { + }, + // 道岔切除 + split() { + }, + // 道岔激活 + active() { + }, + // 道岔设置速度 + setSpeed() { + // const device = getCurrentStateObject(); + }, + // 道岔取消速度 + cancelSpeed() { + }, + // 设置故障 + setStoppage() { + const device = getCurrentStateObject(); + if (device && device.fault) { + return true; + } + }, + // 取消故障 + cancelStoppage() { + const device = getCurrentStateObject(); + if (device && !device.fault) { + return true; + } + } + }, + Train: { + // 添加列车识别号 + addTrainId() { + }, + // 删除列车识别号 + delTrainId() { + }, + // 修改列车识别号 + editTrainId() { + }, + // 修改车组号 + editTrainNo() { + }, + // 移动列车识别号 + moveTrainId() { + }, + // 交换列车识别号 + switchTrainId() { + }, + // 设置限速 + limitSpeed() { + }, + // 设置通信故障 + setStoppage() { + const device = getCurrentStateObject(); + if (device && device.fault) { + return true; + } + }, + // 取消通信故障 + cancelStoppage() { + const device = getCurrentStateObject(); + if (device && !device.fault) { + return true; + } + } + } +}; + +export function checkOperationValidity() { + if (store.state.training.prdType == '02') { + return true; + } +} + +/** + * 将menu的disabled属性使用disabledCallback计算并返回 + * @param {Array} menu + */ +export function menuConvert(menu) { + if (menu.constructor === Array) { + menu.forEach(elem => { + if (elem.type === 'separator') { + elem.show = true; + return; + } + + if (elem.disabledCallback.constructor === Function) { + elem.disabled = elem.defaultDisabled; + if (!elem.defaultDisabled) { + elem.disabled = elem.disabledCallback(); + } + } + }); + } + return menu; +} + +/** + * 根据产品类型，返回对应的menuBar + * @param {*} menuObj + */ +export function menuBarConvert(menu, mode) { + if (menu) { + if (mode === OperateMode.NORMAL) { + menu.forEach(item => { + if (item.type === 'separator') { + item.show = true; + return; + } + + item.show = false; + if (!item.click) { + item.click = () => { }; + } + + if (!item.froce) { + item.show = true; + if (item.children && item.children.length > 0) { + menuBarConvert(item.children, mode); + } + } + }); + } else if (mode === OperateMode.ADMIN) { + menu.forEach(item => { + item.show = true; + if (!item.click) { + item.click = () => { }; + } + if (item.children && item.children.length > 0) { + menuBarConvert(item.children, mode); + } + }); + } + } + return menu || []; +} + +/** + * 将menu的show属性过滤返回 + * @param {Array} menu + */ +export function menuFiltration(menuObj) { + var selected = getCurrentStateObject(); + var control; + var menu = []; + + if (selected._type == 'StationStand') { + control = store.getters['map/getStationControlByStationCode'](selected.deviceStationCode); + } else if (selected._type == 'Station') { + control = store.getters['map/getStationControlByStationCode'](selected.code); + } else { + control = store.getters['map/getStationControlByStationCode'](selected.stationCode); + } + + if (control) { + if (store.state.training.prdType != '') { + const type = State2SimulationMap[store.state.training.prdType]; + const status = State2ControlMap[control.status]; + menu = [...menuObj[type]]; + if (menu.constructor === Array) { + menu.forEach(elem => { + if (elem.type === 'separator') { + elem.show = true; + return; + } + + if (elem.auth.constructor === Object) { + elem.show = true; + if (!elem.auth['station'] && !elem.auth['center']) { // 控制不显示 + elem.show = false; + } + elem.defaultDisabled = !elem.auth[status]; + } + }); + } + } + } + + return menu; +} + +/** + * 将train menu的show属性过滤返回 + */ +export function trainMenuFiltration(menuObj) { + var menu = []; + if (store.state.training.prdType != '') { + const type = State2SimulationMap[store.state.training.prdType]; + menu = [...menuObj[type]]; + if (menu.constructor === Array) { + menu.forEach(elem => { + if (elem.auth.constructor === Object) { + elem.show = true; + if (!elem.auth['station'] && !elem.auth['center']) { // 控制不显示 + elem.show = false; + } + } + }); + } + } + return menu; +} + diff --git a/src/jmapNew/theme/haerbin_01/menusPlan/addTask.vue b/src/jmapNew/theme/haerbin_01/menusPlan/addTask.vue new file mode 100644 index 000000000..b9e6c42e8 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menusPlan/addTask.vue @@ -0,0 +1,175 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menusPlan/chooseTemplatePlan.vue b/src/jmapNew/theme/haerbin_01/menusPlan/chooseTemplatePlan.vue new file mode 100644 index 000000000..78abc470e --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menusPlan/chooseTemplatePlan.vue @@ -0,0 +1,115 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menusPlan/components/dataTable.vue b/src/jmapNew/theme/haerbin_01/menusPlan/components/dataTable.vue new file mode 100644 index 000000000..cfaac866d --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menusPlan/components/dataTable.vue @@ -0,0 +1,206 @@ + + + + + diff --git a/src/jmapNew/theme/haerbin_01/menusPlan/createTodayPlan.vue b/src/jmapNew/theme/haerbin_01/menusPlan/createTodayPlan.vue new file mode 100644 index 000000000..e1616fa86 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menusPlan/createTodayPlan.vue @@ -0,0 +1,135 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menusPlan/createWeekPlan.vue b/src/jmapNew/theme/haerbin_01/menusPlan/createWeekPlan.vue new file mode 100644 index 000000000..469fd37d6 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menusPlan/createWeekPlan.vue @@ -0,0 +1,137 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menusPlan/deleteTask.vue b/src/jmapNew/theme/haerbin_01/menusPlan/deleteTask.vue new file mode 100644 index 000000000..363f3c8ab --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menusPlan/deleteTask.vue @@ -0,0 +1,73 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menusPlan/deleteTodayPlan.vue b/src/jmapNew/theme/haerbin_01/menusPlan/deleteTodayPlan.vue new file mode 100644 index 000000000..be003663e --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menusPlan/deleteTodayPlan.vue @@ -0,0 +1,62 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menusPlan/managePlanList.vue b/src/jmapNew/theme/haerbin_01/menusPlan/managePlanList.vue new file mode 100644 index 000000000..7ad2e21bd --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menusPlan/managePlanList.vue @@ -0,0 +1,143 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menusPlan/modifyingPlan.vue b/src/jmapNew/theme/haerbin_01/menusPlan/modifyingPlan.vue new file mode 100644 index 000000000..6cba11edc --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menusPlan/modifyingPlan.vue @@ -0,0 +1,177 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/menusPlan/modifyingTask.vue b/src/jmapNew/theme/haerbin_01/menusPlan/modifyingTask.vue new file mode 100644 index 000000000..2ebad67a8 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menusPlan/modifyingTask.vue @@ -0,0 +1,326 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/model.js b/src/jmapNew/theme/haerbin_01/model.js new file mode 100644 index 000000000..62440bda8 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/model.js @@ -0,0 +1,63 @@ +import deviceType from '../../constant/deviceType'; + +class Model { + constructor() { + // 公共字段部分默认初始值 + this['public'] = {}; + this['public'][deviceType.Signal] = { + lampPositionType: '02', + lampPostType: '02' + }; + + // 私有字段部分默认初始值 + this['private'] = {}; + this['private'][deviceType.StationControl] = { + indicatorShow: true // 标识灯名称显示 + }; + this['private'][deviceType.Section] = { + borderBorderShow: true, // 区段边界显示 + standTrackNameShow: true, // 站台轨名称显示 + reentryTrackNameShow: true, // 折返轨名称显示 + transferTrackNameShow: true // 转换轨名称显示 + }; + this['private'][deviceType.Signal] = { + linkageAutoRouteShow: true, // 联锁自动进路表示灯显示 + atsAutoTriggerShow: true // ATS自动触发表示灯显示 + }; + this['private'][deviceType.Train] = { + nameFormat: 'targetCode:serviceNumber:tripNumber', // 字体格式 + nameFontSize: 10 // 字体大小 + }; + this['private'][deviceType.TrainWindow] = { + trainWindowShow: true + }; + } + + initPublicProps(model) { + if (model) { + var modelInitial = this.public[model._type]; + if (modelInitial) { + for (var prop in modelInitial) { + model[prop] = modelInitial[prop]; + } + } + } + + return model; + } + + initPrivateProps(model) { + if (model) { + var modelInitial = this.private[model._type]; + if (modelInitial) { + for (var prop in modelInitial) { + model[prop] = modelInitial[prop]; + } + } + } + + return model; + } +} + +export default new Model(); diff --git a/src/jmapNew/theme/haerbin_01/planConvert.js b/src/jmapNew/theme/haerbin_01/planConvert.js new file mode 100644 index 000000000..7ba770da9 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/planConvert.js @@ -0,0 +1,364 @@ +import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, prefixTime, convertSheetToList } from '@/utils/runPlan'; + +export default { + /** 边缘高度*/ + EdgeHeight: 3, + + /** 间隔高度*/ + CoordMultiple: 3, + + /** 偏移时间*/ + TranslationTime: 60 * 60 * 2, + + /** excel解析配置*/ + ExcelConfig: { + beginRow: 1, + beginCol: 0, + // fieldNum: 10, + columns: { + '默认上行折返轨': { key: 'upTrack', formatter: (val) => { return val; } }, + '默认下行折返轨': { key: 'downTrack', formatter: (val) => { return val; } } + } + }, + + /** 解析exal数据转换为Json后台数据*/ + importData(Sheet, JsonData) { + const dataList = convertSheetToList(Sheet, true); + const needList = Object.keys(this.ExcelConfig.columns); + const tripObj = { upTrack: '', downTrack: '' }; + if (dataList && dataList.length && dataList[1] && dataList[0]) { + const tIndex = dataList.findIndex(it => { return it[0]; }); + if (dataList[0][0] == needList[0] && dataList[1][0] == needList[1]) { + for (var colIndex = this.ExcelConfig.beginCol; colIndex < dataList.length; colIndex += 1) { + var isContinue = true; + + for (var rowIndex = this.ExcelConfig.beginRow; isContinue; rowIndex += 1) { + isContinue = false; + + var title = dataList[colIndex][0]; + var value = dataList[colIndex][rowIndex]; + + if (title && value) { + // 数据列解析 + isContinue = true; + var titleStr = `${title}`.replace(/\s*/g, ''); + var valueStr = `${value}`.replace(/\s*/g, ''); + + // 取需要的字段 + if (needList.findIndex(elem => { return elem == titleStr; }) >= 0) { + tripObj[this.ExcelConfig.columns[titleStr].key] = this.ExcelConfig.columns[titleStr].formatter(valueStr); + } + } + + } + } + } else { + /** 解析二维数组为json对象*/ + const reg0 = /^[↑|↓|¡|ü|ý|]+(.*)/; // ↑|↓ + const reg1 = /^([▼|▲|¡ø|¨‹]+)\s*(\d+:\d+:\d+)/; // ▲ 06:10:00 + const reg2 = /^(\d+:\d+:\d+)\s*([▼|▲|¡ø|¨‹]+)/; // 06:10:00 ▲ + const reg3 = /^(\d+:\d+:\d+)\s*(\d+:\d+:\d+|)/; // 06:10:00 06:12:00 + const reg4 = /[▼|▲|¡|ø|¨|‹]+/; // ▲ + + dataList.forEach((elem, i) => { + var begin = -1; + /** 跳过名称所在的行*/ + if (i != tIndex && elem && elem.length > 0) { + elem.forEach((item, j) => { + /** 过滤空值*/ + if (item) { + var value = `${item}`.trim(); + var title = `${dataList[tIndex][j]}`.replace(/\s*/g, ''); + /** 匹配到开始位置或者结束位置*/ + if (reg0.test(value)) { + if (begin == -1) { + begin = value; // 设置初始索引 + JsonData.push({ + code: reg0.exec(value)[1], + arrivalList: [] + }); + } else if (begin === value) { + begin = -1; // 清空初始索引 + } + } else if (begin !== -1) { + /** 匹配到中间位置*/ + var begTime, endTime; + var runFlag = JsonData[JsonData.length - 1].code[2]; + var stationName = title.replace(/\s/, ''); + var need = false; + var flag = false; + if (reg1.test(value)) { + /** 含有特殊字符的时间格式*/ + [, begTime, endTime] = reg1.exec(value); + + begTime = reg4.test(begTime) ? '' : begTime; + endTime = reg4.test(endTime) ? '' : endTime; + + /** 下行方向时间互换*/ + if (runFlag === '2') { + [begTime, endTime] = [endTime, begTime]; + } + + /** 设置标志*/ + [need, flag] = [true, true]; + } else if (reg2.test(value)) { + /** 含有特殊字符的时间格式*/ + [, begTime, endTime] = reg2.exec(value); + + begTime = reg4.test(begTime) ? '' : begTime; + endTime = reg4.test(endTime) ? '' : endTime; + + /** 下行方向时间互换*/ + if (runFlag === '2') { + [begTime, endTime] = [endTime, begTime]; + } + + /** 设置标志*/ + [need, flag] = [true, true]; + } else if (reg3.test(value)) { + /** 正常时间格式*/ + [, begTime, endTime] = reg3.exec(value); + + /** 如果只存在一个数据时，则开始和结束设置一样*/ + endTime = endTime || begTime; + + /** 下行方向时间互换*/ + if (runFlag === '2') { + [begTime, endTime] = [endTime, begTime]; + } + + /** 设置标志*/ + [need, flag] = [true, false]; + } + + /** 添加json数据*/ + if (need) { // 储存非空 数据 + var stationObj = { + stationName: stationName + }; + + if (begTime) { stationObj['arriveTime'] = prefixTime(begTime); } + if (endTime) { stationObj['departureTime'] = prefixTime(endTime); } + if (flag) { stationObj['flag'] = flag; } // 是否转换轨 + JsonData[JsonData.length - 1].arrivalList.push(stationObj); + } + } + } + }); + } + }); + } + } + JsonData.forEach(item => { + item['upTrack'] = tripObj.upTrack; + item['downTrack'] = tripObj.downTrack; + }); + + return JsonData; + }, + + /** 将后台数据解析成图表*/ + convertDataToModels(data, stations, kmRangeCoordMap, lineStyle) { + var models = []; + + if (data && data.serviceNumberDataList && data.serviceNumberDataList.length) { + /** 按服务遍历数据*/ + data.serviceNumberDataList.forEach((service) => { + /** 按车次遍历数据*/ + var isBackup = true; + var opt = { name: '', markPointData: [], data: [] }; + if (service.tripNumberDataList && service.tripNumberDataList.length) { + service.tripNumberDataList.forEach((train, j) => { + var pointdata = {}; + var idx = 0; + var lastPoint = null; + var nextPoint = null; + + /** 创建标记点名称和坐标*/ + pointdata.name = `${service.serviceNumber}${train.directionCode}${train.tripNumber}`; + pointdata.color = '#000' || lineStyle.color; + pointdata.directionCode = train.directionCode; + pointdata.coord = [train.stationTimeList[0].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[0], train.directionCode, false)]; + + /** 给服务对象添加服务名称和标记点*/ + opt.name = '' + service.serviceNumber; + opt.markPointData.push(createMartPoint(pointdata)); + + /** 计算非折返点车次点坐标集合*/ + train.stationTimeList.forEach((elem, index) => { + idx = index; + const aa = `${train.directionCode}${train.tripNumber}`; + opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]); + }); + + /** 计算折返点车次坐标点集合*/ + if (!train.backup && train.reentry && service.tripNumberDataList[j + 1] && service.tripNumberDataList[j + 1].stationTimeList) { + lastPoint = train.stationTimeList[idx]; + nextPoint = service.tripNumberDataList[j + 1].stationTimeList[0]; + const aa = `${train.directionCode}${train.tripNumber}`; + opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true), lastPoint.stationCode, aa, '折返轨']); + opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true), lastPoint.stationCode, aa, '折返轨']); + } + + /** 如果是备用车，按车次添加线*/ + if (train.backup) { + /** 创建一条完成的服务数据*/ + opt.name += j; + // var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle)); + var model = createSeriesModel(opt, Object.assign({ color: '#000' }, lineStyle)); + if (model) { + models.push(model); + opt = { name: '', markPointData: [], data: [] }; + } + } + + isBackup = train.backup; + }); + + // 不是备用车，按服务添加线 + if (!isBackup) { + /** 创建一条完成的服务数据*/ + // var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle)); + var model = createSeriesModel(opt, Object.assign({ color: '#000' }, lineStyle)); + if (model) { + models.push(model); + } + } + } + }); + return models; + } else { + return []; + } + }, + + /** 更新数据并解析成图表*/ + updateDataToModels(data, stations, kmRangeCoordMap, runPlanData, series, lineStyle) { + if (data && data.length) { + data.forEach(elem => { + /** 判断此条记录的服务号是否存在*/ + if (!runPlanData[elem.serviceNumber]) { + /** 创建一个新服务号标记*/ + runPlanData[elem.serviceNumber] = {}; + + /** 不存在此服务号，则需要创建一条新的line*/ + series.push(createSeriesModel({ + zlevel: 1, + name: `run${elem.serviceNumber}`, + data: [], + markPointData: [] + }, Object.assign({ color: hexColor.toCreate() }, lineStyle))); + } + + /** 添加数据*/ + series.forEach(serie => { + /** 找到服务号所在图数据的位置*/ + if (serie.name == `run${elem.serviceNumber}`) { + /** 添加车组号记录标记*/ + if (!runPlanData[elem.serviceNumber][elem.tripNumber]) { + runPlanData[elem.serviceNumber][elem.tripNumber] = []; + } + + runPlanData[elem.serviceNumber][elem.tripNumber].push(elem); + runPlanData[elem.serviceNumber][elem.tripNumber].sort((a, b) => { + return parseInt(a.secondTime) - parseInt(b.secondTime); + }); + + /** 如果此记录车组号的数据为第一条时，则打上标签*/ + if (runPlanData[elem.serviceNumber][elem.tripNumber].length <= 1) { + serie.markPoint.data.push(createMartPoint({ + directionCode: elem.directionCode, + coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem)], + name: `(${elem.groupNumber})${elem.serviceNumber}${elem.directionCode}${elem.tripNumber}`, + color: lineStyle.color || '#000' + })); + } + + /** 计算折返点*/ + var nextPoint = [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem), elem.directionCode]; + if (serie.data.length > 0) { + var lastPoint = serie.data[serie.data.length - 1]; + if (lastPoint[2] !== nextPoint[2]) { + serie.data.push([lastPoint[0], this.getYvalueByDirectionCode(lastPoint[1], lastPoint[2]), lastPoint[2]]); + serie.data.push([nextPoint[0], this.getYvalueByDirectionCode(nextPoint[1], lastPoint[2]), lastPoint[2]]); + } + } + + /** 添加车组号数据到对应的服务图数据中*/ + serie.data.push(nextPoint); + + /** 保证原始数据排序*/ + serie.data.sort((a, b) => { + return parseInt(a[0]) - parseInt(b[0]); + }); + } + }); + }); + } + + return series; + }, + + /** 将后台数据转换为试图序列模型*/ + convertStationsToMap(stations) { + var map = {}; + if (stations && stations.length) { + stations.forEach((elem, index) => { + map[`${elem.kmRange}`] = this.EdgeHeight + index * this.CoordMultiple; + }); + } + + return map; + }, + /** 初始化Y轴*/ + initializeYaxis(stations) { + return createMarkLineModels(stations, (elem, index) => { + return this.EdgeHeight + index * this.CoordMultiple; + }); + }, + + /** 计算y轴最小值*/ + computedYaxisMinValue() { + return 0; + }, + + /** 计算y轴最大值*/ + computedYaxisMaxValue(stations) { + return this.EdgeHeight * 2 + (stations.length - 1) * this.CoordMultiple; + }, + + /** 格式化y轴数据*/ + computedFormatYAxis(stations, params) { + var yText = '0m'; + var index = Math.floor((parseInt(params.value) - this.EdgeHeight) / this.CoordMultiple); + if (index >= 0 && index < stations.length) { + yText = Math.floor(stations[index].kmRange) + 'm'; + } + return yText; + }, + + /** 根据方向计算y折返偏移量*/ + getYvalueByDirectionCode(defaultVlue, directionCode) { + if (directionCode === '1') { + defaultVlue -= this.EdgeHeight / 2; + } else if (directionCode === '2') { + defaultVlue += this.EdgeHeight / 2; + } + + return defaultVlue; + }, + + /** 根据elem计算y值*/ + getCoordYByElem(stations, kmRangeCoordMap, elem, directionCode, isSpecial) { + var defaultVlue = 0; + var station = stations.find(it => { return it.code == elem.stationCode; }); + if (station) { + defaultVlue = kmRangeCoordMap[`${station.kmRange}`]; + if (isSpecial) { + defaultVlue = this.getYvalueByDirectionCode(defaultVlue, directionCode); + } + } + + return defaultVlue; + } +}; diff --git a/src/jmapNew/theme/haerbin_01/planSchedule/index.vue b/src/jmapNew/theme/haerbin_01/planSchedule/index.vue new file mode 100644 index 000000000..0555c8878 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/planSchedule/index.vue @@ -0,0 +1,403 @@ + + + + + diff --git a/src/jmapNew/theme/haerbin_01/planSchedule/menuBar.vue b/src/jmapNew/theme/haerbin_01/planSchedule/menuBar.vue new file mode 100644 index 000000000..b58115ead --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/planSchedule/menuBar.vue @@ -0,0 +1,518 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/planSchedule/schedule.vue b/src/jmapNew/theme/haerbin_01/planSchedule/schedule.vue new file mode 100644 index 000000000..d157b4e01 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/planSchedule/schedule.vue @@ -0,0 +1,482 @@ + + + + diff --git a/src/jmapNew/theme/haerbin_01/planSchedule/statusBar.vue b/src/jmapNew/theme/haerbin_01/planSchedule/statusBar.vue new file mode 100644 index 000000000..d21265950 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/planSchedule/statusBar.vue @@ -0,0 +1,107 @@ + + + + + diff --git a/src/jmapNew/theme/haerbin_01/planSchedule/titleBar.vue b/src/jmapNew/theme/haerbin_01/planSchedule/titleBar.vue new file mode 100644 index 000000000..56e459044 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/planSchedule/titleBar.vue @@ -0,0 +1,75 @@ + + + + diff --git a/src/views/newMap/newMapdraft/mapoperate/stationstand.vue b/src/views/newMap/newMapdraft/mapoperate/stationstand.vue index 43c56d149..d860870a6 100644 --- a/src/views/newMap/newMapdraft/mapoperate/stationstand.vue +++ b/src/views/newMap/newMapdraft/mapoperate/stationstand.vue @@ -288,7 +288,7 @@ export default { this.$refs.make.validate((valid) => { if (valid) { const models = []; - const space = 8; + const space = this.$store.state.map.map.skinVO.code == '07' ? 0 : 8; const Standuid = getUID('PF', this.stationStandList); const model = { _type: 'StationStand', @@ -321,7 +321,7 @@ export default { code: uid, name: `Psd${this.psdList.length + 1}`, width: this.addModel.width, - height: 3, + height: this.$store.state.map.map.skinVO.code == '07' ? this.addModel.height : 3, standCode: Standuid, // 关联站台唯一code position: { x: models[0].position.x, @@ -331,6 +331,9 @@ export default { if (this.addModel.stationstandDirection == '01') { // 朝下 param.position.y = this.addModel.pointY + (this.addModel.height / 2) + space; } + if (this.$store.state.map.map.skinVO.code == '07') { + param.position.y = this.addModel.pointY; + } models.push(param); const espUid = getUID('Esp', this.espList); // 创建紧急停车按钮 models.push({ From f11865385b1a402ba889fdc798ad90d13fe98974 Mon Sep 17 00:00:00 2001 From: joylink_zyy <> Date: Mon, 3 Feb 2020 17:26:17 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=93=88=E5=B0=94?= =?UTF-8?q?=E6=BB=A8=E7=BA=BF=E8=B7=AF=E8=BD=A6=E7=AB=99=E5=8C=85=E5=9B=B4?= =?UTF-8?q?=E6=A1=86=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/haerbin_01.js | 1 + src/jmapNew/shape/Station/index.js | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js index 406bdf33c..7d3f3a6c1 100644 --- a/src/jmapNew/config/skinCode/haerbin_01.js +++ b/src/jmapNew/config/skinCode/haerbin_01.js @@ -268,6 +268,7 @@ class SkinCode extends defaultStyle { kmPostShow: true, // 公里标显示 kilometerPosition: 'up', // 公里标朝向 text: { + borderShow: true, // 车站包围框显示 fontSize: 11, // 字体大小 fontWeight: 'normal', // 字体粗细 distance: 5 // 灯跟文字距离 diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js index c38b82874..2ad4e35e8 100644 --- a/src/jmapNew/shape/Station/index.js +++ b/src/jmapNew/shape/Station/index.js @@ -46,6 +46,12 @@ export default class Station extends Group { textFill: model.nameFontColor }); this.add(this.stationText); + if (style.Station.text.borderShow) { + this.stationText.setStyle('textPadding', [2, 6]); + this.stationText.setStyle('textBorderColor', model.nameFontColor); + this.stationText.setStyle('textBorderWidth', 1); + } + const path = window.location.href; if (style.Station.kmPostShow || path.includes('/map/draw')) { // 公里标是否显示 From 35494c1480016d4eeba79003d19c46317bf0d546 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 3 Feb 2020 17:33:08 +0800 Subject: [PATCH 5/5] =?UTF-8?q?iscs=20=E9=97=AD=E8=B7=AF=E7=94=B5=E8=A7=86?= =?UTF-8?q?=20=E8=BD=A6=E7=AB=99=E6=8E=A7=E5=88=B6=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iscsSystem/config/cctv/controlCCTV.vue | 106 +++++++++++++++++- 1 file changed, 105 insertions(+), 1 deletion(-) diff --git a/src/views/iscs/iscsSystem/config/cctv/controlCCTV.vue b/src/views/iscs/iscsSystem/config/cctv/controlCCTV.vue index 2677ee901..9865194f7 100644 --- a/src/views/iscs/iscsSystem/config/cctv/controlCCTV.vue +++ b/src/views/iscs/iscsSystem/config/cctv/controlCCTV.vue @@ -1,6 +1,43 @@