diff --git a/src/assets/ISCS/PSD/duanmenAlarm.png b/src/assets/ISCS/PSD/duanmenAlarm.png new file mode 100644 index 0000000..f3427aa Binary files /dev/null and b/src/assets/ISCS/PSD/duanmenAlarm.png differ diff --git a/src/assets/ISCS/PSD/duanmenClose.png b/src/assets/ISCS/PSD/duanmenClose.png new file mode 100644 index 0000000..99b504e Binary files /dev/null and b/src/assets/ISCS/PSD/duanmenClose.png differ diff --git a/src/assets/ISCS/PSD/duanmenConnectBreak.png b/src/assets/ISCS/PSD/duanmenConnectBreak.png new file mode 100644 index 0000000..3e60f6d Binary files /dev/null and b/src/assets/ISCS/PSD/duanmenConnectBreak.png differ diff --git a/src/assets/ISCS/PSD/train.png b/src/assets/ISCS/PSD/train.png new file mode 100644 index 0000000..cacd3e4 Binary files /dev/null and b/src/assets/ISCS/PSD/train.png differ diff --git a/src/components/Iscs/ModeControl.vue b/src/components/Iscs/ModeControl.vue new file mode 100644 index 0000000..bc086a0 --- /dev/null +++ b/src/components/Iscs/ModeControl.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/components/Iscs/PSD.vue b/src/components/Iscs/PSD.vue new file mode 100644 index 0000000..9e4d08a --- /dev/null +++ b/src/components/Iscs/PSD.vue @@ -0,0 +1,382 @@ + + + + + diff --git a/src/components/draw-app/properties/ButtonProperty.vue b/src/components/draw-app/properties/ButtonProperty.vue index 26effbf..6836a33 100644 --- a/src/components/draw-app/properties/ButtonProperty.vue +++ b/src/components/draw-app/properties/ButtonProperty.vue @@ -130,7 +130,7 @@ const { data: buttonModel, onUpdate } = useFormData( const optionsButtonType = [ { label: '无Icon', value: iscsGraphicData.Button.ButtonType.noIcon }, { label: '方形', value: iscsGraphicData.Button.ButtonType.cctvRect }, - { label: '监视器', value: iscsGraphicData.Button.ButtonType.cctvMonitor }, - { label: '半圆', value: iscsGraphicData.Button.ButtonType.cctvSemicircle }, + { label: '枪机', value: iscsGraphicData.Button.ButtonType.cctvMonitor }, + { label: '球机', value: iscsGraphicData.Button.ButtonType.cctvSemicircle }, ]; diff --git a/src/configs/iscsStyleConfig.ts b/src/configs/iscsStyleConfig.ts index 31d291c..ea876fe 100644 --- a/src/configs/iscsStyleConfig.ts +++ b/src/configs/iscsStyleConfig.ts @@ -60,7 +60,7 @@ const DA_SHI_ZHI_NENG: I_DA_SHI_ZHI_NENG[] = [ { sunMenuName: '导向标识/广告', displayForm: DisplayForm.draw }, { sunMenuName: '人防门', displayForm: DisplayForm.draw }, { sunMenuName: 'BAS系统', displayForm: DisplayForm.draw }, - { sunMenuName: '模式控制', displayForm: DisplayForm.draw }, + { sunMenuName: '模式控制', displayForm: DisplayForm.component }, { sunMenuName: '时间表', displayForm: DisplayForm.draw }, { sunMenuName: '操作场所切换', displayForm: DisplayForm.draw }, ], @@ -132,7 +132,9 @@ const DA_SHI_ZHI_NENG: I_DA_SHI_ZHI_NENG[] = [ menuName: 'PSD', icon: 'svguse:../iscsMenuIcon.svg#icon-PSD', activeIcon: 'svguse:../iscsMenuIcon.svg#icon-PSD-active', - sunMenu: [{ sunMenuName: '屏蔽门系统图', displayForm: DisplayForm.draw }], + sunMenu: [ + { sunMenuName: '屏蔽门系统图', displayForm: DisplayForm.component }, + ], }, { menuName: 'FG', diff --git a/src/graphics/BAS/escalator/EscalatorDrawAssistant.ts b/src/graphics/BAS/escalator/EscalatorDrawAssistant.ts index 2115d75..c70efbb 100644 --- a/src/graphics/BAS/escalator/EscalatorDrawAssistant.ts +++ b/src/graphics/BAS/escalator/EscalatorDrawAssistant.ts @@ -82,7 +82,7 @@ function buildAbsorbablePositions(escalator: Escalator): AbsorbablePosition[] { } export class EscalatorInteraction extends GraphicInteractionPlugin { - static Name = 'tcc_light_transform'; + static Name = 'escalator_transform'; constructor(app: IDrawApp) { super(EscalatorInteraction.Name, app); } diff --git a/src/graphics/BAS/verticalElevator/VerticalElevatorDrawAssistant.ts b/src/graphics/BAS/verticalElevator/VerticalElevatorDrawAssistant.ts index da4969d..47cedfc 100644 --- a/src/graphics/BAS/verticalElevator/VerticalElevatorDrawAssistant.ts +++ b/src/graphics/BAS/verticalElevator/VerticalElevatorDrawAssistant.ts @@ -89,7 +89,7 @@ function buildAbsorbablePositions( } export class VerticalElevatorInteraction extends GraphicInteractionPlugin { - static Name = 'tcc_light_transform'; + static Name = 'vertical_elevator_transform'; constructor(app: IDrawApp) { super(VerticalElevatorInteraction.Name, app); } diff --git a/src/graphics/button/cctv-button-data.json b/src/graphics/button/cctv-button-data.json index e3c17dd..c80c13b 100644 --- a/src/graphics/button/cctv-button-data.json +++ b/src/graphics/button/cctv-button-data.json @@ -17,19 +17,19 @@ "anchor": { "x": 0.5, "y": 0.5 } }, "monitor-btn.png": { - "frame": { "x": 148, "y": 0, "w": 74, "h": 66 }, + "frame": { "x": 352, "y": 0, "w": 85, "h": 66 }, "rotated": false, "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 74, "h": 66 }, - "sourceSize": { "w": 74, "h": 66 }, + "spriteSourceSize": { "x": 0, "y": 0, "w": 85, "h": 66 }, + "sourceSize": { "w": 85, "h": 66 }, "anchor": { "x": 0.5, "y": 0.5 } }, "semicircle-btn.png": { - "frame": { "x": 230, "y": 0, "w": 66, "h": 66 }, + "frame": { "x": 292, "y": 0, "w": 60, "h": 66 }, "rotated": false, "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 66, "h": 66 }, - "sourceSize": { "w": 66, "h": 66 }, + "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 66 }, + "sourceSize": { "w": 60, "h": 66 }, "anchor": { "x": 0.5, "y": 0.5 } } }, diff --git a/src/graphics/button/cctv-button-spritesheet.png b/src/graphics/button/cctv-button-spritesheet.png index b1c9720..56fcd75 100644 Binary files a/src/graphics/button/cctv-button-spritesheet.png and b/src/graphics/button/cctv-button-spritesheet.png differ diff --git a/src/layouts/IscsDrawLayout.vue b/src/layouts/IscsDrawLayout.vue index 4db8bb8..9f38406 100644 --- a/src/layouts/IscsDrawLayout.vue +++ b/src/layouts/IscsDrawLayout.vue @@ -162,6 +162,14 @@ v-if="drawStore.selectSubmenuAndStation.submenu == '监控布局图'" :stationName="drawStore.selectSubmenuAndStation.station" /> + + @@ -306,6 +314,8 @@ import { toStorageTransform } from 'src/drawApp/graphics/GraphicDataBase'; import { Circle } from 'src/graphics/circle/Circle'; import IscsBottomAlarm from 'src/components/Iscs/IscsBottomAlarm.vue'; import CCTVMonitoring from 'src/components/Iscs/CCTVMonitoring.vue'; +import PSD from 'src/components/Iscs/PSD.vue'; +import ModeControl from 'src/components/Iscs/ModeControl.vue'; import FASPlaneGraph from 'src/components/Iscs/FASPlaneGraph.vue'; import { FasFailureControlHost } from 'src/graphics/FAS/fireFailureControlHost/FasFailureControlHost'; import { FasAlarm } from 'src/graphics/FAS/fasAlarm/FasAlarm'; @@ -718,10 +728,12 @@ function selectedSubMenu(subName: string) { ).displayForm; if (subMenuDisplayForm.value !== DisplayForm.component) { showDrawTool.value = true; + rightDrawerOpen.value = true; forceReloadDate(); handleUtilsOption(); } else { showDrawTool.value = false; + rightDrawerOpen.value = false; } onResize(); }