1. 亚美大宁局部风机5.5首页跳转修改

2. 风门对接风窗控制接口
3. 亚美大宁局部风机优化

src/views/vent/home/colliery/index.vue

@@ -143,7 +143,11 @@
     if (deviceType == 'fanMain') {
       router.push('/monitorChannel/monitor-fanmain');
     } else if (deviceType == 'fanLocal') {
-      router.push('/monitorChannel/monitor-fanlocal');
+      if (sysOrgCode !== 'ymdnymdn') {
+        router.push('/monitorChannel/monitor-fanlocal');
+      } else {
+        router.push('/fanlocal-page/home');
+      }
     } else if (deviceType == 'windrect') {
       router.push('/monitorChannel/monitor-windrect');
     } else if (deviceType == 'warning') {

src/views/vent/monitorManager/comment/HistoryTable.vue

@@ -127,6 +127,7 @@
       } else {
         columns.value = column;
       }
+      getDataSource();
       if (historyTable.value) reload();
     },
     {

src/views/vent/monitorManager/deviceMC/HistoryTable.vue

@@ -122,6 +122,7 @@
       } else {
         columns.value = column;
       }
+      await getDataSource();
       if (historyTable.value) reload();
     },
     {
@@ -196,6 +197,7 @@
     const stationTypeStr = stationType.value;
     const formData = getForm().getFieldsValue();
     const pagination = getPaginationRef();
+    debugger;
     formData['pageNo'] = pagination['current'];
     formData['pageSize'] = pagination['pageSize'];
     formData['column'] = 'createTime';

src/views/vent/monitorManager/deviceMonitor/components/device/index.vue

@@ -489,13 +489,13 @@ const onSelect: TreeProps['onSelect'] = (keys, e) => {
       expandedKeys.value = keys;
       selectedKeys.value = keys;
       treeNodeTitle.value = e.node.title;
-      activeKey.value = '1';
+     
       // if (e.node.children?.length < 1 && timer) {
       //   getMonitor(true);
       // }
     }, 1000);
   }
-  
+  // activeKey.value = '1';
 };
 
 function tabChange(activeKeyVal) {

src/views/vent/monitorManager/fanLocalMonitor1/components/fanlocal-history.vue

@@ -35,7 +35,7 @@
 
   let selectDatas = reactive({});
   let scroll = reactive({
-    y: 700,
+    y: 580,
   });
 
   watch(

src/views/vent/monitorManager/fanLocalMonitor1/components/fanlocal-operate-history.vue

@@ -21,7 +21,7 @@
     },
   });
   let scroll = reactive({
-    y: 700,
+    y: 580,
   });
 </script>
 <style lang="less" scoped>

src/views/vent/monitorManager/fanLocalMonitor1/components/fanlocal-warn-history.vue

@@ -14,7 +14,7 @@
     },
   });
   let scroll = reactive({
-    y: 700,
+    y: 580,
   });
 </script>
 <style lang="less" scoped>

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

@@ -1,13 +1,12 @@
 <template>
-  <div class="bg" style="width: 100%; height: 100%; display: flex; justify-content: center; align-items: center; overflow: hidden">
+  <div
+    v-show="activeBtn == 'fanLocal-ssjc'"
+    class="bg"
+    style="width: 100%; height: 100%; display: flex; justify-content: center; align-items: center; overflow: hidden"
+  >
     <a-spin :spinning="loading" />
-    <div v-show="activeBtn == 'fanLocal-ssjc'" id="fanLocal3D" style="width: 100%; height: 100%; position: absolute; overflow: hidden"> </div>
-    <div
-      v-show="activeBtn == 'fanLocal-ssjc'"
-      id="fanLocal3DCSS"
-      class="threejs-Object-CSS"
-      style="width: 100%; height: 100%; position: absolute; overflow: hidden; pointer-events: none"
-    >
+    <div id="fanLocal3D" style="width: 100%; height: 100%; position: absolute; overflow: hidden"> </div>
+    <div id="fanLocal3DCSS" class="threejs-Object-CSS" style="width: 100%; height: 100%; position: absolute; overflow: hidden; pointer-events: none">
       <div style="z-index: -1; position: relative" v-if="hasPermission('show:sensorMonitor')">
         <div class="elementTag" id="inputBox1">
           <div class="elementContent" v-if="selectData.windSpeed1 || selectData.gas3 || selectData.windSpeed_merge">
@@ -302,6 +301,7 @@
     </div>
   </div>
   <div
+    v-show="activeBtn == 'fanLocal-ssjc'"
     ref="playerRef"
     :class="{ 'to-right': rightColumns.length < 1 || leftColumns.length < 1, 'to-no-right': rightColumns.length > 0 && leftColumns.length > 0 }"
     style="z-index: 999; position: absolute; top: 100px; right: 15px; width: 100%; height: 100%; margin: auto; pointer-events: none"
@@ -1198,7 +1198,7 @@
     mountedThree(player1.value).then(async () => {
       await getMonitor(true);
       nextTick(async () => {
-        setModelType('');
+        setModelType('fc');
         addCssText();
       });
     });

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

@@ -74,7 +74,7 @@
   async function getList() {
     let res = await device({ devicetype: 'fanlocal', pagetype: 'normal' });
     let res1 = await device({ devicetype: 'fanlocaldp', pagetype: 'normal' });
-    let data = [...res.msgTxt[0].datalist, res1.msgTxt[0] ? res1.msgTxt[0].datalist : []];
+    let data = [...res.msgTxt[0].datalist, ...(res1.msgTxt[0] ? res1.msgTxt[0].datalist : [])];
     cardList.length = 0;
     if (data.length != 0) {
       data.forEach((el) => {
@@ -94,15 +94,15 @@
             },
             {
               label: '风量',
-              value: el.readData.windQuantity1 ? el.readData.windQuantity1 : el.readData.windQuantity2 ? el.readData.windQuantity2 : '-',
+              value: el.readData.windQuantity ? el.readData.windQuantity : '-',
               dw: 'm³/min',
             },
             {
-              label: '迎头风速',
-              value: el.readData.windSpeed1 ? el.readData.windSpeed1 : el.readData.windSpeed2 ? el.readData.windSpeed2 : '-',
+              label: '风速',
+              value: el.readData.windSpeed ? el.readData.windSpeed : '-',
               dw: 'm/s',
             },
-            { label: '迎头瓦斯', value: el.readData.gas1 ? el.readData.gas1 : '-', dw: 'm/s' },
+            // { label: '迎头瓦斯', value: el.readData.gas1 ? el.readData.gas1 : '-', dw: 'm/s' },
             { label: '时间', value: el.readTime, dw: '' },
           ],
         });
@@ -112,7 +112,7 @@
 
   onMounted(() => {
     getList();
-    getMonitor();
+    getMonitor(true);
   });
   onUnmounted(() => {
     if (timer) {

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

@@ -635,7 +635,7 @@
     contrlValue = value;
   }
 
-  function handleOK(passWord, handlerState) {
+  function handleOK(passWord, handlerState, value?) {
     if (!passWord && !globalConfig?.simulatedPassword) {
       message.warning('请输入密码');
       return;
@@ -770,6 +770,11 @@
           selectData.autoRoManual = null;
         }
         break;
+      case '10': // 风窗控制
+        data.paramcode = 'frontSetValue';
+        data.value = value;
+
+        break;
     }
 
     if (data.paramcode) {

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

@@ -7,12 +7,8 @@
       </div>
       <div v-if="type == '10'">
         <div class="vent-flex-row input-box">
-          <div class="label">前窗开启角度：</div>
-          <a-input-number size="small" placeholder="0" :min="0" :max="90" v-model:value="frontA" />
-        </div>
-        <div class="vent-flex-row input-box">
-          <div class="label">后窗开启角度：</div>
-          <a-input-number size="small" placeholder="0" :min="0" :max="90" v-model:value="rearA" />
+          <div class="label">风窗开启角度：</div>
+          <a-input-number size="small" placeholder="0" :min="0" :max="90" v-model:value="frontSetValue" />
         </div>
       </div>
       <div class="vent-flex-row input-box">
@@ -47,8 +43,7 @@
   const title = ref<String>('');
   const type = ref<String>('');
   const passWord = ref('');
-  const frontA = ref(0);
-  const rearA = ref(0);
+  const frontSetValue = ref(0);
 
   watch([() => props.modalIsShow, () => props.modalTitle, () => props.modalType], ([newVal, newModalTitle, newModalType]) => {
     visible.value = newVal;
@@ -60,7 +55,7 @@
   function handleOk() {
     //
     if (type.value == '10') {
-      emit('handleOk', passWord.value, type.value, frontA, rearA);
+      emit('handleOk', passWord.value, type.value, frontSetValue);
     } else {
       emit('handleOk', passWord.value, type.value);
     }