From 2f5851fee17755b04ec707d4f0788ef1ff997e7e Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Fri, 3 Nov 2023 11:25:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E9=97=A8=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bj-rtss-message                               |  2 +-
 .../line-app/states/ScreenDoorState.vue       | 93 ++++++++++++++-----
 src/drawApp/graphics/ScreenDoorInteraction.ts |  4 +-
 src/graphics/screenDoor/ScreenDoor.ts         |  4 +-
 4 files changed, 74 insertions(+), 29 deletions(-)

diff --git a/bj-rtss-message b/bj-rtss-message
index 92c5696..280219a 160000
--- a/bj-rtss-message
+++ b/bj-rtss-message
@@ -1 +1 @@
-Subproject commit 92c5696b7eb3b47b387f48e094f5c8644ddb7da8
+Subproject commit 280219a91abaa9c58fd9979ad7340fe5d85caad1
diff --git a/src/components/line-app/states/ScreenDoorState.vue b/src/components/line-app/states/ScreenDoorState.vue
index 526d609..3650747 100644
--- a/src/components/line-app/states/ScreenDoorState.vue
+++ b/src/components/line-app/states/ScreenDoorState.vue
@@ -33,25 +33,64 @@
         v-model.number="screenDoorState.code"
         label="名称"
       />
-      <q-input
-        outlined
-        readonly
-        style="margin-top: 10px"
-        v-model="screenDoorState.openAsdCodesString"
-        label="开启的滑动门的编号"
-        :disable="true"
-        type="textarea"
-        autogrow
-      />
       <q-checkbox
         dense
         style="margin-top: 10px"
-        v-model="screenDoorState.close"
+        v-model="screenDoorState.mgj"
         outlined
-        label="屏蔽门整体的关闭（继电器）状态"
+        label="屏蔽门关闭"
         :disable="true"
       />
+      <template :key="item" v-for="item in screenDoorState.asdStates">
+        <q-list dense bordered padding class="rounded-borders q-my-sm">
+          <q-item>
+            <q-item-section>
+              <q-input
+                outlined
+                readonly
+                v-model.number="item.code"
+                label="门名称"
+                :disable="true"
+              />
+            </q-item-section>
+          </q-item>
+          <q-item>
+            <q-item-section>
+              <q-checkbox
+                dense
+                v-model="item.kmdw"
+                outlined
+                label="开门到位（实际）"
+                :disable="true"
+              />
+            </q-item-section>
+          </q-item>
+          <q-item>
+            <q-item-section>
+              <q-checkbox
+                dense
+                v-model="item.gmdw"
+                outlined
+                label="关门到位（实际）"
+                :disable="true"
+              />
+            </q-item-section>
+          </q-item>
+          <q-item>
+            <q-item-section>
+              <q-checkbox
+                dense
+                v-model="item.mgj"
+                outlined
+                label="关闭（表示）"
+                :disable="true"
+              />
+            </q-item-section>
+          </q-item>
+        </q-list>
+      </template>
     </q-card-section>
+
     <!-- <q-card-actions align="center">
       <q-btn label="修改" type="submit" color="primary" @click="submitState" />
       <q-btn
@@ -74,20 +113,28 @@ import { request } from 'src/protos/request';
 import { screenDoorOperate } from 'src/api/Simulation';
 import { errorNotify } from 'src/utils/CommonNotify';
 
+// string code = 1; //滑动门的编号
+// 	bool kmdw = 2; //开门到位（实际位置）
+// 	bool gmdw = 3; //关门到位（实际位置）
+// 	bool mgj = 4; //门关继电器
 const lineStore = useLineStore();
+interface asdState {
+  code: string;
+  kmdw: boolean;
+  gmdw: boolean;
+  mgj: boolean;
+}
 interface psdState {
   id: string;
   code: string;
-  openAsdCodes: number[];
-  close: boolean;
-  openAsdCodesString: string;
+  asdStates: asdState[];
+  mgj: boolean;
 }
 const psdStateData: psdState = {
   id: '',
   code: '',
-  openAsdCodes: [],
-  close: false,
-  openAsdCodesString: '',
+  asdStates: [],
+  mgj: false,
 };
 const screenDoorState = ref(psdStateData);
 
@@ -139,9 +186,8 @@ watch(
       screenDoorState.value = {
         id: '',
         code: '',
-        openAsdCodes: [],
-        close: false,
-        openAsdCodesString: '',
+        asdStates: [],
+        mgj: false,
       };
     }
   }
@@ -150,9 +196,8 @@ function initScreenDoorState(screenDoor: ScreenDoor) {
   screenDoorState.value = {
     id: screenDoor.datas.id,
     code: screenDoor.datas.code,
-    openAsdCodes: screenDoor.states.openAsdCodes,
-    close: screenDoor.states.close,
-    openAsdCodesString: screenDoor.states.openAsdCodes.join('、'),
+    asdStates: screenDoor.states.asdStates,
+    mgj: screenDoor.states.mgj,
   };
 }
 // function submitState() {
diff --git a/src/drawApp/graphics/ScreenDoorInteraction.ts b/src/drawApp/graphics/ScreenDoorInteraction.ts
index 649f2c0..61f16e6 100644
--- a/src/drawApp/graphics/ScreenDoorInteraction.ts
+++ b/src/drawApp/graphics/ScreenDoorInteraction.ts
@@ -90,10 +90,10 @@ export class ScreenDoorState
   set asdStates(v: state.AsdState[]) {
     this.states.asdStates = v;
   }
-  get close() {
+  get mgj() {
     return this.states.mgj;
   }
-  set close(v: boolean) {
+  set mgj(v: boolean) {
     this.states.mgj = v;
   }
   get states(): state.PsdState {
diff --git a/src/graphics/screenDoor/ScreenDoor.ts b/src/graphics/screenDoor/ScreenDoor.ts
index d3cc6f9..e9859d6 100644
--- a/src/graphics/screenDoor/ScreenDoor.ts
+++ b/src/graphics/screenDoor/ScreenDoor.ts
@@ -28,8 +28,8 @@ export interface IScreenDoorData extends GraphicData {
 export interface IScreenDoorState extends GraphicState {
   get asdStates(): state.AsdState[]; //所有子门的状态
   set asdStates(v: state.AsdState[]);
-  get close(): boolean; //屏蔽门整体的关闭（继电器）状态
-  set close(v: boolean);
+  get mgj(): boolean; //屏蔽门整体的关闭（继电器）状态
+  set mgj(v: boolean);
 }
 
 const screenDoorConsts = {