Bladeren bron

思山岭铁矿风门同控-设备集控提交

lxh 5 maanden geleden
bovenliggende
commit
5c6f388883

+ 1 - 1
src/views/vent/monitorManager/airDoor/airdoor.api.ts

@@ -13,7 +13,7 @@ enum Api {
   GetSyncRuleOperationLog='/ventanaly-device/synccontrol/upcoming/GetSyncRuleOperationLog',
   GetSyncRuleOperationLog='/ventanaly-device/synccontrol/upcoming/GetSyncRuleOperationLog',
   GetSyncRuleExecLog='/ventanaly-device/synccontrol/upcoming/GetSyncRuleExecLog',
   GetSyncRuleExecLog='/ventanaly-device/synccontrol/upcoming/GetSyncRuleExecLog',
   list='/safety/ventanalyDeviceInfo/list',
   list='/safety/ventanalyDeviceInfo/list',
-  edit='/safety/ventanalyDeviceInfo/edit'
+  edit='/ventanaly-device/safety/ventanalyDeviceInfo/batchEdit'
 }
 }
 
 
 
 

+ 7 - 4
src/views/vent/monitorManager/airDoor/components/door-content-r.vue

@@ -24,7 +24,8 @@
         </div>
         </div>
         <div class="box-content">
         <div class="box-content">
           <!-- plc时钟显示 -->
           <!-- plc时钟显示 -->
-          <div class="timePlcNow">2025-12-4 13:23:24</div>
+          <!-- <div class="timePlcNow">2025-12-4 13:23:24</div> -->
+            <div class="timePlcNow">{{item.readData.PLCyear ?  `${item.readData.PLCyear}-${item.readData.PLCmonth}-${item.readData.PLCday} ${item.readData.PLChour}:${item.readData.PLCminute}:${item.readData.PLCsecond}` : '' }}</div>
           <!-- 二三维信息 -->
           <!-- 二三维信息 -->
           <gateSVG v-if="item.gateStyle == 'fm_fc_ssl'" :ref="(el) => setChildRef(el, index)" :identify="index">
           <gateSVG v-if="item.gateStyle == 'fm_fc_ssl'" :ref="(el) => setChildRef(el, index)" :identify="index">
           </gateSVG>
           </gateSVG>
@@ -35,15 +36,17 @@
         <div class="setting-time">
         <div class="setting-time">
           <div>
           <div>
             <span>定时开启时间:</span>
             <span>定时开启时间:</span>
-            <span class="set-time">13:23:24</span>
+            <!-- <span class="set-time">13:23:24</span> -->
+             <span class="set-time">{{ item.readData.time_on_hour ? `${item.readData.time_on_hour}:${item.readData.time_on_min}` : '--' }}</span>
           </div>
           </div>
           <div>
           <div>
             <span>启用状态:</span>
             <span>启用状态:</span>
-            <span class="set-time">启用</span>
+            <span class="set-time">{{ item.readData.timerSwitch=='0' ? '启用' : '未启用' }}</span>
           </div>
           </div>
           <div>
           <div>
             <span>定时关闭时间:</span>
             <span>定时关闭时间:</span>
-            <span class="set-time">13:23:24</span>
+            <!-- <span class="set-time">13:23:24</span> -->
+              <span class="set-time">{{ item.readData.time_off_hour ? `${item.readData.time_off_hour}:${item.readData.time_off_min}` : '--' }}</span>
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>

+ 8 - 4
src/views/vent/monitorManager/airDoor/index.vue

@@ -19,9 +19,9 @@ import doorMenuL from './components/door-menu-l.vue'
 import doorContentR from './components/door-content-r.vue'
 import doorContentR from './components/door-content-r.vue'
 import { getDevice, upcoming } from './airdoor.api'
 import { getDevice, upcoming } from './airdoor.api'
 
 
-  let menuData = ref<any[]>([]);
-  //控制定时设置提示弹窗显示/隐藏
-  let visibleTs30 = ref(false);
+let menuData = ref<any[]>([]);
+//控制定时设置提示弹窗显示/隐藏
+let visibleTs30 = ref(false);
 
 
 // https获取监测数据
 // https获取监测数据
 let timer: null | NodeJS.Timeout = null;
 let timer: null | NodeJS.Timeout = null;
@@ -44,7 +44,11 @@ function getMonitor(flag?) {
 async function getMenuList() {
 async function getMenuList() {
   let res = await getDevice({ devicetype: "gate", pagetype: "normal" })
   let res = await getDevice({ devicetype: "gate", pagetype: "normal" })
   console.log(res, 'menuList')
   console.log(res, 'menuList')
-  menuData.value = res.msgTxt[0].datalist || []
+  if (res.msgTxt[0].datalist.length) {
+    menuData.value = res.msgTxt[0].datalist.filter(v => v.isAutosync == '1')
+  } else {
+    menuData.value = []
+  }
 }
 }
 async function upcomingList() {
 async function upcomingList() {
   let res = await upcoming({})
   let res = await upcoming({})