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

src/views/vent/monitorManager/alarmMonitor/common/gasParamter.vue

@@ -7,9 +7,9 @@
                 </template> -->
             </template>
         </a-table>
-        <div class="description">
+        <!-- <div class="description">
             ZWY300/355 : Z-泵站,W-瓦斯抽放,Y-移动式,270/300-流量(m³/min),355-功率(KW),抽放混合量160~230m³/min,抽放瓦斯浓度0.5~1.2%,抽放瓦斯量0.8~3m³/min。
-        </div>
+        </div> -->
     </div>
 </template>
 

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

@@ -298,37 +298,37 @@
       });
       if (deviceType.value == 'safetymonitor') {
         // 如果是安全监控的数据时需要过滤常见设备数据，根据设定的常用安全监控字典去匹配
-        let dictCodes = getDictItemsByCode('safetynormal');
-        console.log(dictCodes,'111-----------')
-        const searchForm = formData.getFieldsValue();
-      
-        if (searchForm && searchForm['dataTypeName'] && dictCodes && dictCodes.length > 0) {
-          console.log(searchForm,'000---------')
-          const tempData = [];
-          const tempData1 = [];
-          for (let i = 0; i < dataArr.length; i++) {
-            const item = dataArr[i];
-            let flag = false;
-            for (let i = 0; i < dictCodes.length; i++) {
-              const dict = dictCodes[i];
-              if (dict['value'] == item['dataTypeName']) {
-                flag = true;
-              }
-            }
-            if (flag) {
-              tempData.push(item);
-            } else {
-              tempData1.push(item);
-            }
-          }
-          if (sysOrgCode == 'zjtzqctmk' || hasPermission('btn:noGb')) {
-            dataSource.value = [...tempData, ...tempData1];
-          } else {
-            dataSource.value = [...tempData];
-          }
-        } else {
-          dataSource.value = dataArr;
-        }
+        // let dictCodes = getDictItemsByCode('safetynormal');
+        // console.log(dictCodes,'111-----------')
+        // const searchForm = formData.getFieldsValue();
+        dataSource.value = dataArr;
+        // if (searchForm && searchForm['dataTypeName'] && dictCodes && dictCodes.length > 0) {
+        //   console.log(searchForm,'000---------')
+        //   const tempData = [];
+        //   const tempData1 = [];
+        //   for (let i = 0; i < dataArr.length; i++) {
+        //     const item = dataArr[i];
+        //     let flag = false;
+        //     for (let i = 0; i < dictCodes.length; i++) {
+        //       const dict = dictCodes[i];
+        //       if (dict['value'] == item['dataTypeName']) {
+        //         flag = true;
+        //       }
+        //     }
+        //     if (flag) {
+        //       tempData.push(item);
+        //     } else {
+        //       tempData1.push(item);
+        //     }
+        //   }
+        //   if (sysOrgCode == 'zjtzqctmk' || hasPermission('btn:noGb')) {
+        //     dataSource.value = [...tempData, ...tempData1];
+        //   } else {
+        //     dataSource.value = [...tempData];
+        //   }
+        // } else {
+        //   dataSource.value = dataArr;
+        // }
       } else {
         dataSource.value = dataArr;
       }

src/views/vent/monitorManager/safetyMonitor/safety.data.ts

@@ -10,6 +10,7 @@ export const formConfig = {
   labelAlign: 'left',
   showAdvancedButton: false,
   showResetButton: false,
+  showSubmitButton: false,
   schemas: [
     {
       label: '设备类型',