Jelajahi Sumber

[Mod 0000]安全监控不是新国标的添加设备类型过滤条件

hongrunxia 6 hari lalu
induk
melakukan
38a05b1c15

+ 5 - 2
src/views/vent/monitorManager/comment/MonitorTable.vue

@@ -8,11 +8,14 @@
         <div></div>
       </template>
       <template #bodyCell="{ column, record }">
-        <template v-if="column.dataIndex === 'nwartype'">
+        <template v-if="column.dict">
           <!-- 除了 101(蓝色预警)其他都是红色字体 -->
-          <span :class="{ 'color-#ff3823': ['102', '103', '104', '201', '1001'].includes(record.nwartype) }">
+          <span v-if="column.dataIndex === 'nwartype'" :class="{ 'color-#ff3823': ['102', '103', '104', '201', '1001'].includes(record.nwartype) }">
             {{ render.renderDictText(record.nwartype, 'leveltype') || '-' }}
           </span>
+          <span v-else>
+            {{ render.renderDictText(record[column.dataIndex], column.dict) || '-' }}
+          </span>
         </template>
         <slot name="filterCell" v-bind="{ column, record }"></slot>
       </template>

+ 1 - 1
src/views/vent/monitorManager/comment/components/DeviceBaseInfo.vue

@@ -236,7 +236,7 @@
         field: 'strtype',
         component: 'JDictSelectTag',
         componentProps: {
-          dictCode: `${deviceType.value}kind`,
+          dictCode: `${deviceType.value.split('_')[0]}kind`, //${deviceType.value}kind
           placeholder: '请选择点表',
           // stringToNumber: true,
         },

+ 1 - 0
src/views/vent/monitorManager/safetyMonitor/index.vue

@@ -15,6 +15,7 @@
               :isShowPagination="false"
               :isShowActionColumn="isHaveNoAction.includes(deviceType.split('_')[0]) ? false : true"
               :is-show-select="false"
+              :form-config="deviceType == 'safetymonitor' && sysOrgCode != 'zjtzqctmk' ? formConfig : undefined"
               title="设备监测"
               :scroll="{ y: 650 }"
               :defSort="defSort"