Browse Source

1. 修改风门风窗控制下发指令
2. 预警历史公司端、矿端进行根据页面打开方式判断后对应显示

hongrunxia 5 months ago
parent
commit
39fac13300

+ 1 - 1
src/views/vent/monitorManager/gateMonitor/modal.vue

@@ -55,7 +55,7 @@
   function handleOk() {
     //
     if (type.value == '10') {
-      emit('handleOk', passWord.value, type.value, frontSetValue);
+      emit('handleOk', passWord.value, type.value, frontSetValue.value);
     } else {
       emit('handleOk', passWord.value, type.value);
     }

+ 1 - 1
src/views/vent/monitorManager/warningMonitor/index.vue

@@ -169,7 +169,7 @@
       },
       beforeFetch(params) {
         const { sysOrgCode } = useGlobSetting();
-        params.orgcode = sysOrgCode;
+        params.orgcode = orgcode ? orgcode : sysOrgCode;
         params.type = 'alarmLog';
         // params.devicetype = params.devicetype ? params.devicetype + '*' : '';
         if (props.sysId) {