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

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

@@ -28,6 +28,9 @@
       <a-tag v-if="column.dataIndex === 'warnFlag'" :color="record.warnFlag == 0 ? 'green' : record.warnFlag == 1 ? '#FF5812' : 'gray'">
         {{ record.warnFlag == 0 ? '正常' : record.warnFlag == 1 ? '报警' : record.warnFlag == 2 ? '断开' : '未监测' }}
       </a-tag>
+      <a-tag v-if="column.dataIndex === 'isBlock'" :color="record.isBlock == 0 ? 'green' : record.isBlock == 1 ? '#FF5812' : 'gray'">
+        {{ record.isBlock == 0 ? '否' : record.isBlock == 1 ? '是' : '未监测' }}</a-tag
+      >
       <template v-else-if="column.dataIndex === 'warnLevel'">
         <a-tag v-if="record.warnLevel == '101'" color="green">低风险</a-tag>
         <a-tag v-else-if="record.warnLevel == '102'" color="#FF5812">一般风险</a-tag>

src/views/vent/monitorManager/comment/comment.data.ts

@@ -1294,4 +1294,9 @@ export const gasPipeColumns: BasicColumn[] = [
     dataIndex: 'isLeakage',
     key: 'isLeakage',
   },
+  {
+    title: '是否堵塞',
+    dataIndex: 'isBlock',
+    key: 'isBlock',
+  },
 ];