Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

src/views/vent/monitorManager/fireDoorMonitor/index.vue

@@ -6,8 +6,9 @@
   <div class="scene-box">
     <div class="top-box">
       <div class="top-center row">
-        <div v-if="hasPermission('btn:control')" class="button-box" @click="playAnimation(1)">打开防火门</div>
-        <div v-if="hasPermission('btn:control')" class="button-box" @click="playAnimation(2)">关闭防火门</div>
+        <div v-if="hasPermission('btn:control')" class="button-box" @click="setControl('frontGateOpen_S', '打开')">打开防火门</div>
+        <div v-if="hasPermission('btn:control')" class="button-box" @click="setControl('frontGateClose_S', '关闭')">关闭防火门</div>
+        <div v-if="hasPermission('btn:stopControl')" class="button-box" @click="setControl('frontGateStop_S', '停止')">关闭防火门</div>
       </div>
       <!-- 控制模式 -->
       <div class="top-right row">
@@ -18,7 +19,7 @@
               <a-radio :value="item.value" :disabled="true">{{ item.text }}</a-radio>
             </template>
           </a-radio-group>
-          <div class="button-box" @click="playAnimation(7)">切换模式</div>
+          <div class="button-box" @click="setControl('autoRoManualControl', '控制模式切换')">切换模式</div>
         </div>
         <div class="vent-flex-m row" v-else>
           <div class="control-title">控制模式：</div>
@@ -27,7 +28,13 @@
               <a-radio :value="item.value" :disabled="true">{{ item.text }}</a-radio>
             </template>
           </a-radio-group>
-          <div class="button-box" v-for="(item, index) in modelList" @click="playAnimation(7, item.value)" :key="index">{{ item.text }}</div>
+          <div
+            class="button-box"
+            v-for="(item, index) in modelList"
+            @click="setControl('autoRoManualControl', '控制模式切换', item.value)"
+            :key="index"
+            >{{ item.text }}</div
+          >
         </div>
 
         <!-- <div class="run-type row">
@@ -205,7 +212,8 @@
   const MonitorDataTable = ref();
   let contrlValue = '';
   const playerRef = ref();
-  const deviceType = ref('gate');
+  const deviceType = ref('door');
+  // const deviceType = ref('gate');
   // const deviceType = ref('firedoor');
   const activeKey = ref('1'); // tab
   const loading = ref(false);
@@ -322,6 +330,8 @@
       type = 'fireDoor';
     } else if (selectData.modelType == 'bd_kj') {
       type = 'fireDoorF';
+    } else if (selectData.modelType) {
+      type = selectData.modelType;
     }
     await setModelType(type);
     loading.value = false;
@@ -329,31 +339,15 @@
     await getCamera(selectRow.deviceID, playerRef.value);
   }
 
-  function playAnimation(handlerState, data: any = null) {
-    const value = data;
-    switch (handlerState) {
-      case 1: // 打开前门
-        modalTitle.value = '打开';
-        modalType.value = '1';
-        modalIsShow.value = true;
-        break;
-      case 2: // 关闭前门
-        modalTitle.value = '关闭';
-        modalType.value = '2';
-        modalIsShow.value = true;
-        break;
-      case 7: // 控制模式切换
-        modalTitle.value = '控制模式切换';
-        modalType.value = '7';
-        modalIsShow.value = true;
-        break;
-    }
-
+  const setControl = (flag, title, value?) => {
+    modalType.value = flag + '';
+    modalTitle.value = title;
+    modalIsShow.value = true;
+    if (value) contrlValue = value;
     if (globalConfig?.simulatedPassword) {
       handleOK('', handlerState + '');
     }
-    contrlValue = value;
-  }
+  };
 
   function handleOK(passWord, handlerState) {
     if (!passWord && !globalConfig?.simulatedPassword) {
@@ -371,21 +365,11 @@
       password: passWord || globalConfig?.simulatedPassword,
       masterComputer: selectData.masterComputer,
     };
-    switch (handlerState) {
-      case '1': // 打开前门
-        if (selectData.doorOpen == '0' && selectData.doorClose == '1') {
-          data.paramcode = 'frontGateOpen_S';
-        }
-        break;
-      case '2': // 关闭前门
-        if (selectData.doorOpen == '1' && selectData.doorClose == '0') {
-          data.paramcode = 'frontGateClose_S';
-        }
-        break;
-      case '7': // 远程与就地
-        data.paramcode = 'autoRoManualControl';
-        data.value = selectData.contrlMod != 'loopCtrl' ? contrlValue : '';
-        selectData.autoRoManual = null;
+
+    data.paramcode = handlerState;
+    if (handlerState == 'autoRoManualControl') {
+      data.value = selectData.contrlMod != 'loopCtrl' ? contrlValue : '';
+      selectData.autoRoManual = null;
     }
 
     if (data.paramcode) {
@@ -418,7 +402,6 @@
       if (doorDeviceState != 1) {
         // import.meta.env.VITE_GLOB_IS_SIMULATE ? play(1, timeScale) : play(1);
         play(1, timeScale);
-        debugger;
         doorDeviceState = 1;
         doorIsOpen.value = true;
       }
@@ -429,22 +412,10 @@
       if (doorDeviceState != 0) {
         // import.meta.env.VITE_GLOB_IS_SIMULATE ? play(1, timeScale) : play(1);
         play(2, timeScale);
-        debugger;
         doorDeviceState = 0;
         doorIsOpen.value = false;
       }
     }
-
-    // if (selectData.frontGateClose == '1' && selectData.frontGateOpen == '0' && isFrontOpenRunning) {
-    //   isFrontOpenRunning = false;
-    //   if (frontDeviceState != 0) {
-    //     // import.meta.env.VITE_GLOB_IS_SIMULATE ? play(2, timeScale) : play(2);
-    //     play(2, timeScale);
-    //     frontDeviceState = 0;
-    //     frontDoorIsOpen.value = false;
-    //     // backDoorIsOpen.value = false
-    //   }
-    // }
   }
 
   function handleCancel() {