增加巷道和是否缺烟查询

public/antd_color.less

@@ -1395,7 +1395,7 @@ tr.ant-table-expanded-row:hover {background: #fbfbfb;}
 .ant-tag-green-inverse {color: #fff;background: #52c41a;border-color: #52c41a;}
 .ant-tag-blue {color: #1890ff;background: #e6f7ff;border-color: #91d5ff;}
 .ant-tag-blue-inverse {color: #fff;background: #1890ff;border-color: #1890ff;}
-.ant-tag-geekblue {color: #2f54eb;background: color(~`colorPalette("@{heading-color}", 4)`);border-color: #adc6ff;}
+.ant-tag-geekblue {color: #2f54eb;background: #f0f5ff;border-color: #adc6ff;}
 .ant-tag-geekblue-inverse {color: #fff;background: #2f54eb;border-color: #2f54eb;}
 .ant-tag-purple {color: #722ed1;background: #f9f0ff;border-color: #d3adf7;}
 .ant-tag-purple-inverse {color: #fff;background: #722ed1;border-color: #722ed1;}

src/views/historyMonitoring/index.vue

@@ -3,12 +3,41 @@
         <div class="ant-advanced-search-form">
             <a-form layout="inline" :form="queryParam">
                 <a-row :gutter="24">
-                    <a-col :span="6" style="text-align: left">
+                    
+                    <a-col :span="4" style="text-align: left">
+                        <a-form-item label="设备名">
+                            <a-select  @change="handleChangeStreet" :value="queryParam.streetId" style="width:100px">
+                            <a-select-option :value="0">
+                                    全部
+                            </a-select-option>
+                                <a-select-option v-for="i in listData" :key="i.name" :value="i.id">
+                                    {{i.name}}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="5" style="text-align: left">
                         <a-form-item label="工单号">
-                            <a-input v-model="queryParam.orderNum" placeholder="请输入" style="width:270px;"/>
+                            <a-input v-model="queryParam.orderNum" placeholder="请输入" style="width:200px;"/>
                         </a-form-item>
                     </a-col>
-                    <a-col :span="8">
+                    
+                    <a-col :span="4" style="text-align: left">
+                        <a-form-item label="是否缺烟">
+                            <a-select
+      ref="select"
+      v-model="queryParam.status"
+      style="width: 120px"
+      @focus="focus"
+    >
+    
+    <a-select-option value="">全部</a-select-option>
+      <a-select-option value="1">缺烟</a-select-option>
+      <a-select-option value="0">正常</a-select-option>
+    </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="7">
                         <a-form-item class="ageInput" label="时间">
                             <a-range-picker
                                 @change="onTimeChange"
@@ -23,7 +52,7 @@
                             </a-range-picker>
                         </a-form-item>
                     </a-col>
-                    <a-col :span="10" style="text-align: right">
+                    <a-col :span="3" style="text-align: right">
                         <a-button type="primary" @click="handleSearch">搜索</a-button>
                         <a-button style="margin-left: 15px" @click="reset">重置</a-button>
                     </a-col>
@@ -47,7 +76,7 @@
                 <span v-if="text.pics" style="height:100%;">
                     <happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box" style="width:320px;height:90px;">
                         <viewer :images="text.pics">
-                            <img class="historyImg" v-for="(src,index) in text.pics" :src="imgUrl+src"
+                            <img class="historyImg" v-for="(src,index) in text.pics" :src="src"
                                 :key="index"/>
                         </viewer>
                     </happy-scroll>
@@ -96,9 +125,14 @@ export default {
     data() {
         return {
             queryParam: {
-                orderNum: ''
+                orderNum: '',
+                status: '',
+                streetId: '',
+                startTime: '',
+                endTime: ''
             },
             time:[],
+            listData:[],
             pageNum: 1,
             pageSize: 10,
             data: [],
@@ -156,6 +190,7 @@ export default {
         }
     },
     mounted() {
+        this.getStreetList()
         this.handleGetHistoryList()
         console.log(this.imgUrl)
         if (this.$route.params.orderNum) {
@@ -165,6 +200,30 @@ export default {
     },
     methods: {
         moment,
+        //获取巷道列表
+        getStreetList() {
+            this.$api.httpApi.getAllStreet({
+            }).then(res => {
+                this.listData = res.data; 
+            }).catch(err => {
+                console.error(err);
+            });
+        },
+        
+        handleChangeStreet(value) {
+            console.log(value);
+            if(value === 0){
+                this.select = "全部";
+                this.queryParam.streetId = value
+            } else {
+                for (let item of this.listData) {
+                    if (item.id == value){
+                        this.select = item.name
+                        this.queryParam.streetId = value
+                    } 
+                }
+            }
+        },
         range(start, end) {
             const result = [];
             for (let i = start; i < end; i++) {