diff --git a/src/views/zhiwujiance/zhiwujianceList.vue b/src/views/zhiwujiance/zhiwujianceList.vue
index e1cb030..be79dd8 100644
--- a/src/views/zhiwujiance/zhiwujianceList.vue
+++ b/src/views/zhiwujiance/zhiwujianceList.vue
@@ -5,20 +5,20 @@
         <button-bar view-title="质物监测" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
         <div class="main-content">
           <div class="searchcon">
-            <!-- <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button> -->
+            <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
             <div v-show="isSearchShow" class="search">
               <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">
-                <el-form-item label="物品名称">
+                <!-- <el-form-item label="物品名称">
                   <el-input v-model="listQuery.manufacturerName" clearable placeholder="" class="addinputw"></el-input>
-                </el-form-item>
-                <el-form-item label="选择楼层">
+                </el-form-item> -->
+                <!-- <el-form-item label="选择楼层">
                   <el-select v-model="listQuery.supplierType1" filterable clearable placeholder="请选择楼层">
                     <el-option v-for="item in floor_list" :key="item.id" :label="item.title" :value="item.id" />
                   </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="选择仓库">
-                  <el-select v-model="listQuery.supplierType2" filterable clearable placeholder="请选择仓库">
-                    <el-option v-for="item in cangku_list" :key="item.id" :label="item.title" :value="item.id" />
+                  <el-select v-model="listQuery.ckId" filterable clearable placeholder="请选择仓库">
+                    <el-option v-for="item in ckList" :key="item.id" :label="item.name" :value="item.id" />
                   </el-select>
                 </el-form-item>
               </el-form>
@@ -48,7 +48,6 @@
                     <div class="time">联系人：{{ item.ren }}</div>
                     <div class="time">联系电话：{{ item.dianhua }}</div>
                   </div>
-
                 </template>
               </el-table-column>
               <el-table-column prop="jc" label="相似度对比" header-align="center" align="center">
@@ -83,8 +82,8 @@
             </el-table>
           </div>
           <div class="pages">
-            <!-- <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
-              :limit.sync="listQuery.size" class="pagination" @pagination="getList" /> -->
+            <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+              :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
           </div>
         </div>
       </div>
@@ -109,6 +108,7 @@ import zhiwujianceInfo from './zhiwujianceInfo'
 import * as echarts from "echarts";
 import PieChartrenyuan from '@/views/echarts/components/PieChartrenyuanb'
 import { getDeviceImagePage, getShiPinNormalByChannelNo } from '@/api/deviceImage/deviceImage'
+import { getWareHouseList } from '@/api/device/device'
 
 // 1.1完好率饼图
 const wanhao_Chart = {
@@ -182,8 +182,7 @@ export default {
   data() {
     return {
       // imgUrl: 'http://huirong.ybkjyl.com/1.png',
-      // fileUrl: 'http://huirong.ybkjyl.com/imagesDownload/',
-      fileUrl: 'http://8.130.39.13:7003/upload/monitor/',
+      fileUrl: 'http://huirong.ybkjyl.com/imagesDownload/',
       wanhao_Chart: wanhao_Chart, // 1.1
       weixiu_Chart: weixiu_Chart,
       sunhai_Chart: sunhai_Chart,
@@ -211,6 +210,7 @@ export default {
       // 查询 -----------
       tableKey: 0,
       list: [],
+      ckList: [],
       Datalistb: [
         { name: '仓库1', cangku: '仓库1003F3', weizhi: '石家庄市长安区和平西路126号', huohao: 'F31006C102325', ren: '李舜华', dianhua: '13933263572' },
       ],
@@ -285,9 +285,6 @@ export default {
         }
       }
     },
-    parseImg(imgUrl) {
-      return imgUrl
-    },
     getSupplierType(item) {
       for (var i = 0; i < this.supplierType_list.length; i++) {
         if (this.supplierType_list[i].id == item) {
@@ -333,8 +330,22 @@ export default {
       }
     },
     init() {
+      getWareHouseList().then(res => {
+        console.log(res)
+        if (res.code == 200) {
+          this.ckList = res.data
+        }
+      })
+
+      getDeviceImagePage(this.listQuery).then((res) => {
+        this.list = res.data.records
+        this.listQuery.total = res.data.total
+      })
+    },
+    getList() {
       getDeviceImagePage(this.listQuery).then((res) => {
         this.list = res.data.records
+        this.listQuery.total = res.data.total
       })
     },
     // 序号