张丁 spec设备在用页面 单个预警筛选

master/src/main/resources/mybatis/sems/TSpecdevCcMapper.xml

@@ -82,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="devno != null  and devno != ''"> and devno = #{devno}</if>
             <if test="status != null "> and d.status = #{status}</if>
             <if test="approveStatus != null ">and approve_status = #{approveStatus}</if>
+            <if test="warnFlag != null ">and warn_Flag = #{warnFlag}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

master/src/main/resources/mybatis/sems/TSpecdevDtMapper.xml

@@ -62,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="devno != null  and devno != ''"> and devno = #{devno}</if>
             <if test="status != null "> and d.status = #{status}</if>
             <if test="approveStatus != null ">and approve_status = #{approveStatus}</if>
+            <if test="warnFlag != null ">and warn_Flag = #{warnFlag}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

master/src/main/resources/mybatis/sems/TSpecdevDzsbMapper.xml

@@ -63,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="submitdate != null "> and submitdate = #{submitdate}</if>
             <if test="status != null "> and d.status = #{status}</if>
             <if test="approveStatus != null ">and approve_status = #{approveStatus}</if>
+            <if test="warnFlag != null ">and warn_Flag = #{warnFlag}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

master/src/main/resources/mybatis/sems/TSpecdevGlMapper.xml

@@ -89,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="plantMaint != null  and plantMaint != ''"> and plant_maint = #{plantMaint}</if>
             <if test="status != null "> and d.status = #{status}</if>
             <if test="approveStatus != null ">and approve_status = #{approveStatus}</if>
+            <if test="warnFlag != null ">and warn_Flag = #{warnFlag}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

master/src/main/resources/mybatis/sems/TSpecdevYlgdMapper.xml

@@ -161,6 +161,7 @@
             <if test="isDanger != null ">and is_danger = #{isDanger}</if>
             <if test="status != null ">and d.status = #{status}</if>
             <if test="approveStatus != null ">and approve_status = #{approveStatus}</if>
+            <if test="warnFlag != null ">and warn_Flag = #{warnFlag}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

master/src/main/resources/mybatis/sems/TSpecdevYlrqMapper.xml

@@ -133,6 +133,7 @@
             <if test="devno != null  and devno != ''">and devno = #{devno}</if>
             <if test="status != null ">and d.status = #{status}</if>
             <if test="approveStatus != null ">and approve_status = #{approveStatus}</if>
+            <if test="warnFlag != null ">and warn_Flag = #{warnFlag}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

ui/src/views/sems/specCc/index.vue

@@ -27,6 +27,18 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
+      </el-form-item>
+         <el-form-item :label="$t('预警等级')" prop="ALARM_LEVEL" label-width="50">
+        <el-select v-model="queryParams.warnFlag"   clearable placeholder="请选择">
+    <el-option
+      v-for="item in filterList"
+      :key="item.value"
+      :label="item.text"
+      :value="item.value">
+      <span style="float: left">{{ item.text }}</span>
+      <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>
+    </el-option>
+  </el-select>
       </el-form-item>
       <el-form-item :label="$t('申请状态')" prop="approveStatus" label-width="50">
         <el-select v-model="queryParams.approveStatus" :placeholder="$t('请选择') + $t('申请状态')" clearable size="small">
@@ -509,6 +521,7 @@
   components: { Treeselect,AddApprove,HisApprove,HisCheck,HisReform },
   data() {
     return {
+      filterList:[{ text: "无", value: 0 }], //删选的list
       fullscreenLoading: false,
       waitSubmit: false,
       hisReformVisible: false,
@@ -609,6 +622,19 @@
     this.getTreeselect();
     this.getDicts("spec_dev_status").then(response => {
       this.statusOptions = response.data;
+    });
+     //预警等级字典
+    this.getDicts("ALARM_LEVEL").then(response => {
+
+         for (let i = 0; i < response.data.length; i++) {
+          let items={
+            text:'',
+            value:''
+          };
+      items.value = response.data[i].dictValue;
+          items.text = response.data[i].dictLabel;
+          this.filterList.push(items);
+      }
     });
     this.getDicts("spec_approve_status").then(response => {
       for (let i = 0; i < response.data.length; i++) {

ui/src/views/sems/specDt/index.vue

@@ -36,6 +36,18 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
+      </el-form-item>
+         <el-form-item :label="$t('预警等级')" prop="ALARM_LEVEL" label-width="50">
+        <el-select v-model="queryParams.warnFlag"   clearable placeholder="请选择">
+    <el-option
+      v-for="item in filterList"
+      :key="item.value"
+      :label="item.text"
+      :value="item.value">
+      <span style="float: left">{{ item.text }}</span>
+      <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>
+    </el-option>
+  </el-select>
       </el-form-item>
       <el-form-item :label="$t('申请状态')" prop="approveStatus" label-width="50">
         <el-select v-model="queryParams.approveStatus" :placeholder="$t('请选择') + $t('申请状态')" clearable size="small">
@@ -455,6 +467,7 @@
   components: { Treeselect ,AddApprove,HisApprove,HisCheck,HisReform  },
   data() {
     return {
+      filterList:[{ text: "无", value: 0 }], //删选的list
       fullscreenLoading: false,
       waitSubmit: false,
       hisReformVisible: false,
@@ -554,6 +567,18 @@
     this.getDicts("spec_dev_status").then(response => {
       this.statusOptions = response.data;
     });
+    //预警等级字典
+    this.getDicts("ALARM_LEVEL").then(response => {
+         for (let i = 0; i < response.data.length; i++) {
+          let items={
+            text:'',
+            value:''
+          };
+      items.value = response.data[i].dictValue;
+          items.text = response.data[i].dictLabel;
+          this.filterList.push(items);
+      }
+    });
     this.getDicts("spec_approve_status").then(response => {
       for (let i = 0; i < response.data.length; i++) {
         if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){

ui/src/views/sems/specDzsb/index.vue

@@ -36,6 +36,18 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
+      </el-form-item>
+         <el-form-item :label="$t('预警等级')" prop="ALARM_LEVEL" label-width="50">
+        <el-select v-model="queryParams.warnFlag"   clearable placeholder="请选择">
+    <el-option
+      v-for="item in filterList"
+      :key="item.value"
+      :label="item.text"
+      :value="item.value">
+      <span style="float: left">{{ item.text }}</span>
+      <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>
+    </el-option>
+  </el-select>
       </el-form-item>
       <el-form-item :label="$t('申请状态')" prop="approveStatus" label-width="50">
         <el-select v-model="queryParams.approveStatus" :placeholder="$t('请选择') + $t('申请状态')" clearable size="small">
@@ -47,6 +59,7 @@
           />
         </el-select>
       </el-form-item>
+    
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('搜索') }}</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('重置') }}</el-button>
@@ -140,7 +153,6 @@
       <el-table-column :label="$t('状态')" align="center" fixed="left"  prop="status" :formatter="statusFormat" />
       <el-table-column :label="$t('申请状态')" align="center" fixed="left"  prop="approveStatus" :formatter="approveStatusFormat" />
       <el-table-column :label="$t('设备名称')" align="center" fixed="left"  prop="devname" :show-overflow-tooltip="true"/>
-
       <el-table-column :label="$t('设备位号')" align="center"  fixed="left" prop="devno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center" prop="docno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('设备型号')" align="center" prop="model" :show-overflow-tooltip="true"/>
@@ -491,6 +503,7 @@
   components: { Treeselect,AddApprove ,HisApprove,HisCheck,HisReform  },
   data() {
     return {
+      filterList:[{ text: "无", value: 0 }], //删选的list
       fullscreenLoading: false,
       waitSubmit: false,
       hisReformVisible: false,
@@ -596,18 +609,31 @@
         // 根据名称筛选部门树
         deptName(val) {
             this.$refs.tree.filter(val);
-        }
+        },
    },
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
           this.clientHeight = document.body.clientHeight -250
       })
-    this.getList();
+   this.getList();
     this.getTreeselect();
     this.getDicts("spec_dev_status").then(response => {
       this.statusOptions = response.data;
     });
+    //预警等级字典
+    this.getDicts("ALARM_LEVEL").then(response => {
+
+         for (let i = 0; i < response.data.length; i++) {
+          let items={
+            text:'',
+            value:''
+          };
+      items.value = response.data[i].dictValue;
+          items.text = response.data[i].dictLabel;
+          this.filterList.push(items);
+      }
+    });
     this.getDicts("spec_approve_status").then(response => {
       for (let i = 0; i < response.data.length; i++) {
         if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
@@ -633,10 +659,10 @@
         this.specDzsbList = response.rows;
         this.total = response.total;
         this.$nextTick(() => {
-          this.$refs.deviceTable.doLayout(); // 解决表格错位
+          this.$refs.deviceTable.doLayout(); // 解决表格错位   
         });
         this.loading = false;
-      });
+      }); 
     },
      /** 查询部门下拉树结构 */
      getTreeselect() {

ui/src/views/sems/specGl/index.vue

@@ -54,6 +54,18 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
+      </el-form-item>
+       <el-form-item :label="$t('预警等级')" prop="ALARM_LEVEL" label-width="50">
+        <el-select v-model="queryParams.warnFlag"   clearable placeholder="请选择">
+    <el-option
+      v-for="item in filterList"
+      :key="item.value"
+      :label="item.text"
+      :value="item.value">
+      <span style="float: left">{{ item.text }}</span>
+      <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>
+    </el-option>
+  </el-select>
       </el-form-item>
       <el-form-item :label="$t('申请状态')" prop="approveStatus" label-width="50">
         <el-select v-model="queryParams.approveStatus" :placeholder="$t('请选择') + $t('申请状态')" clearable size="small">
@@ -574,6 +586,7 @@
   components: { Treeselect ,AddApprove,HisApprove,HisCheck,HisReform },
   data() {
     return {
+      filterList:[{ text: "无", value: 0 }], //删选的list
       fullscreenLoading: false,
       waitSubmit: false,
       hisReformVisible: false,
@@ -694,6 +707,19 @@
     this.getDicts("spec_dev_status").then(response => {
       this.statusOptions = response.data;
     });
+    //预警等级字典
+    this.getDicts("ALARM_LEVEL").then(response => {
+
+         for (let i = 0; i < response.data.length; i++) {
+          let items={
+            text:'',
+            value:''
+          };
+      items.value = response.data[i].dictValue;
+          items.text = response.data[i].dictLabel;
+          this.filterList.push(items);
+      }
+    });
     this.getDicts("spec_approve_status").then(response => {
       for (let i = 0; i < response.data.length; i++) {
         if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){

ui/src/views/sems/specYlgd/index.vue

@@ -108,6 +108,18 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
+      </el-form-item>
+        <el-form-item :label="$t('预警等级')" prop="ALARM_LEVEL" label-width="50">
+        <el-select v-model="queryParams.warnFlag"   clearable placeholder="请选择">
+    <el-option
+      v-for="item in filterList"
+      :key="item.value"
+      :label="item.text"
+      :value="item.value">
+      <span style="float: left">{{ item.text }}</span>
+      <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>
+    </el-option>
+  </el-select>
       </el-form-item>
 
       <el-form-item>
@@ -705,6 +717,7 @@ export default {
   components: { Treeselect,AddApprove ,HisApprove,HisCheck,HisReform  },
   data() {
     return {
+      filterList:[{ text: "无", value: 0 }], //删选的list
       fullscreenLoading: false,
       waitSubmit: false,
       hisReformVisible: false,
@@ -831,6 +844,19 @@ export default {
     this.getTreeselect();
     this.getDicts("spec_dev_status").then(response => {
       this.statusOptions = response.data;
+    });
+     //预警等级字典
+    this.getDicts("ALARM_LEVEL").then(response => {
+
+         for (let i = 0; i < response.data.length; i++) {
+          let items={
+            text:'',
+            value:''
+          };
+      items.value = response.data[i].dictValue;
+          items.text = response.data[i].dictLabel;
+          this.filterList.push(items);
+      }
     });
     this.getDicts("spec_approve_status").then(response => {
       for (let i = 0; i < response.data.length; i++) {

ui/src/views/sems/specYlrq/index.vue

@@ -36,6 +36,18 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
+      </el-form-item>
+        <el-form-item :label="$t('预警等级')" prop="ALARM_LEVEL" label-width="50">
+        <el-select v-model="queryParams.warnFlag"   clearable placeholder="请选择">
+    <el-option
+      v-for="item in filterList"
+      :key="item.value"
+      :label="item.text"
+      :value="item.value">
+      <span style="float: left">{{ item.text }}</span>
+      <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>
+    </el-option>
+  </el-select>
       </el-form-item>
       <el-form-item :label="$t('申请状态')" prop="approveStatus" label-width="50">
         <el-select v-model="queryParams.approveStatus" :placeholder="$t('请选择') + $t('申请状态')" clearable size="small">
@@ -629,6 +641,7 @@
   components: { Treeselect,AddApprove ,HisApprove,HisCheck ,HisReform},
   data() {
     return {
+      filterList:[{ text: "无", value: 0 }], //删选的list
       waitSubmit: false,
       fullscreenLoading: false,
       hisReformVisible: false,
@@ -729,6 +742,19 @@
     this.getTreeselect();
     this.getDicts("spec_dev_status").then(response => {
       this.statusOptions = response.data;
+    });
+     //预警等级字典
+    this.getDicts("ALARM_LEVEL").then(response => {
+
+         for (let i = 0; i < response.data.length; i++) {
+          let items={
+            text:'',
+            value:''
+          };
+      items.value = response.data[i].dictValue;
+          items.text = response.data[i].dictLabel;
+          this.filterList.push(items);
+      }
     });
     this.getDicts("spec_approve_status").then(response => {
       for (let i = 0; i < response.data.length; i++) {