1. 修改瓦斯抽采泵初始位置、视角

src/views/vent/monitorManager/gasPumpMonitor/gasPump.threejs.ts

@@ -81,8 +81,8 @@ export const setModelType = (type) => {
         await animateCamera(
           oldCameraPosition,
           { x: 0.544, y: 0.3335, z: 0.29222 },
-          { x: -0.18283701989485915, y: 1.5585182112304712, z: 6.23432935897143 },
-          { x: -0.15497121991536436, y: 0.3354979232986092, z: -0.10561004136342216 },
+          { x: -11.014079961863667, y: 1.6456786378357198, z: 5.733554317319543 },
+          { x: -7.043053237796046, y: 0.3354979232986092, z: -0.10561004136342216 },
           model,
           0.6
         );

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

@@ -35,15 +35,14 @@
           <div v-if="hasPermission('window:AreaControl')" class="button-box" @click="setArea(1)">设定风窗面积</div>
           <div v-if="hasPermission('window:showAngle')" class="button-box" @click="setAngle(1)">设定风窗角度</div>
           <div v-if="hasPermission('window:ldkz')" class="button-box" @click="setArea(7)">风窗自主调控</div>
-
-          <!-- 展会功能 -->
-          <!-- <div v-if="hasPermission('window:ldkz')" class="button-box" @click="setArea(3)">自主联动控制开启</div>
-          <div v-if="hasPermission('window:ldkz')" class="button-box" @click="setArea(4)">自主联动控制停止</div> -->
         </div>
       </div>
       <div class="top-right row">
         <div v-if="hasPermission('window:controlFull')" class="button-box" @click="setArea(5)">一键全开</div>
         <div v-if="hasPermission('window:controlFull')" class="button-box" @click="setArea(6)">一键全关</div>
+        <!-- 展会功能 -->
+        <div v-if="hasPermission('window:ldkz')" class="button-box" @click="setArea(3)">自主联动控制开启</div>
+        <div v-if="hasPermission('window:ldkz')" class="button-box" @click="setArea(4)">自主联动控制停止</div>
         <!-- <div class="button-box" @click="() => (linkAlarmShow = true)">预警指标</div> -->
         <!-- <div class="control-type row">
           <div class="control-title">控制模式：</div>
@@ -223,6 +222,7 @@
   const activeKey = ref('1');
   const loading = ref(false);
   const windowAngle = ref(0);
+  const ch4 = ref(0.6);
 
   // const rotationParam = {
   //   frontDeg0: 0, // 前门初始
@@ -416,6 +416,7 @@
       password: passWord || globalConfig?.simulatedPassword,
       value: null,
     };
+    let params;
     if (handlerState == 7 || handlerState == 8) {
       let params;
       if (handlerState == 7) {
@@ -452,12 +453,16 @@
       } else if (handlerState == 3 || handlerState == 4) {
         data.paramcode = 'autoRun';
         data.value = handlerState == 3 ? 1 : 0;
+        if (handlerState == 3) {
+          ch4.value = windowAngleNum;
+          params = { auto: 1, windowId: selectData.deviceID, gasMax: ch4.value };
+        }
       } else if (handlerState == 5 || handlerState == 6) {
         data.paramcode = 'frontSetValue';
         data.value = handlerState == 5 ? selectData.maxarea : 0;
       }
 
-      deviceControlApi(data)
+      deviceControlApi(handlerState == 3 ? params : data)
         .then((res) => {
           if (res.success) {
             if (globalConfig.History_Type == 'remote') {

src/views/vent/monitorManager/windowMonitor/modal.vue

@@ -23,6 +23,12 @@
           <a-input-number size="small" placeholder="0" :min="0" v-model:value="rearW" />
         </div>
       </template>
+      <template v-if="type == '3'">
+        <div class="vent-flex-row input-box">
+          <div class="label">瓦斯超限浓度：</div>
+          <a-input-number size="small" placeholder="0" :min="0" v-model:value="ch4" />
+        </div>
+      </template>
       <div v-if="!globalConfig?.simulatedPassword" class="vent-flex-row input-box">
         <div class="label">操作密码：</div>
         <a-input size="small" type="password" v-model:value="passWord" />
@@ -60,6 +66,7 @@
   const area = ref(0);
   const frontW = ref(0);
   const rearW = ref(0);
+  const ch4 = ref(0);
 
   watch([() => props.modalIsShow, () => props.modalTitle, () => props.modalType], ([newVal, newModalTitle, newModalType]) => {
     visible.value = newVal;
@@ -73,7 +80,11 @@
     if (globalConfig?.simulatedPassword) {
       emit('handleOk', '', type.value, area.value);
     } else {
-      emit('handleOk', passWord.value, type.value, area.value);
+      if (type.value == '3') {
+        emit('handleOk', passWord.value, type.value, ch4.value);
+      } else {
+        emit('handleOk', passWord.value, type.value, area.value);
+      }
     }
   }
   function handleCancel() {