diff --git a/src/api/device copy/device.js b/src/api/device copy/device.js
new file mode 100644
index 0000000..72677ee
--- /dev/null
+++ b/src/api/device copy/device.js	
@@ -0,0 +1,15 @@
+import request from '@/utils/request'
+// eslint-disable-next-line no-unused-vars
+import qs from 'qs'
+
+// 获取设备列表
+export function getInfoPage(data) {
+  return request({ url: '/yInfo/getInfoPage', method: 'GET', params: data })
+}
+
+
+// 单条获取设备
+export function getInfoById(data) {
+  return request({ url: '/yInfo/getInfoById', method: 'GET', params: data })
+}
+
diff --git a/src/api/device/device.js b/src/api/device/device.js
index 1ba19aa..3f6bcda 100644
--- a/src/api/device/device.js
+++ b/src/api/device/device.js
@@ -62,6 +62,13 @@ export function sysDisArm(data) {
   return request({ url: '/device/sysDisArm', method: 'GET', params: data })
 }
 
+// 获取设备状态数量
+export function getStatusCount(data) {
+  return request({ url: '/device/getStatusCount', method: 'GET', params: data })
+}
+
+
+
 
 
 /******************************************************************************************************************************************** */
diff --git a/src/views/baojingchaxun/baojingchaxunList.vue b/src/views/baojingchaxun/baojingchaxunList.vue
index 6c0feaa..d1eedaa 100644
--- a/src/views/baojingchaxun/baojingchaxunList.vue
+++ b/src/views/baojingchaxun/baojingchaxunList.vue
@@ -221,6 +221,9 @@ export default {
       this.getList()
     },
     handleReset() {
+      this.listQuery.name = null
+      this.listQuery.startTime = null
+      this.listQuery.endTime = null
       // this.listQuery = {
       //   params: {
       //     manufacturerName: '',
diff --git a/src/views/echarts/components/PieChartrenyuan.vue b/src/views/echarts/components/PieChartrenyuan.vue
index 02b4ea7..16fb118 100644
--- a/src/views/echarts/components/PieChartrenyuan.vue
+++ b/src/views/echarts/components/PieChartrenyuan.vue
@@ -113,12 +113,12 @@ export default {
           containLabel: true,
         },
         tooltip: {
-          show: false,
+          show: true,
           trigger: 'item',
-          formatter: '{b} : {c} ' + unit + ' ({d}%)',
-          // formatter: '{a} <br/>{b} : {c} ({d}%)'
+          formatter: '{b} : {c} ' + ' ({d}%)',
         },
-        legend: {show: false,
+        legend: {
+          show: false,
           // right: '10',
           bottom: '0',
           data: legend, // ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts']
diff --git a/src/views/echarts/components/PieChartrenyuanb.vue b/src/views/echarts/components/PieChartrenyuanb.vue
index d579028..9713537 100644
--- a/src/views/echarts/components/PieChartrenyuanb.vue
+++ b/src/views/echarts/components/PieChartrenyuanb.vue
@@ -113,12 +113,12 @@ export default {
           containLabel: true,
         },
         tooltip: {
-          show: false,
+          show: true,
           trigger: 'item',
-          formatter: '{b} : {c} ' + unit + ' ({d}%)',
-          // formatter: '{a} <br/>{b} : {c} ({d}%)'
+          formatter: '{b} : {c} ' + ' ({d}%)',
         },
-        legend: {show: false,
+        legend: {
+          show: true,
           // right: '10',
           bottom: '0',
           data: legend, // ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts']
diff --git a/src/views/index.vue b/src/views/index.vue
index 1f0675e..6453e55 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -109,8 +109,10 @@
               <div class="icon myiconfont iconbox iconbox_blue">&#xe64a;</div>
             </div>
             <div class="rights">
-              <div class="note">正常：<span class="bluezi">36</span></div>
-              <div class="note">离线：<span class="huizi">16</span></div>
+              <div class="note">正常：<span class="bluezi">{{ statusDataSp.online }}</span></div>
+              <div class="note">离线：<span class="huizi">{{ statusDataSp.offline == null ? 0 : statusDataSp.offline
+              }}</span>
+              </div>
               <div class="note"><span class="redzi"></span></div>
             </div>
             <div class="bar">
@@ -147,9 +149,10 @@
               <div class="icon myiconfont iconbox iconbox_red">&#xe9f7;</div>
             </div>
             <div class="rights">
-              <div class="note">正常：<span class="bluezi">26</span></div>
-              <div class="note">离线：<span class="huizi">12</span></div>
-              <div class="note">报警：<span class="redzi">11</span></div>
+              <div class="note">正常：<span class="bluezi">{{ statusDataWl.online }}</span></div>
+              <div class="note">离线：<span class="huizi">{{ statusDataWl.offline == null ? 0 : statusDataWl.offline
+              }}</span></div>
+              <!-- <div class="note">报警：<span class="redzi">11</span></div> -->
             </div>
             <div class="bar">
               <pie-chartrenyuan :chart-data="dianziweilan_Chart"></pie-chartrenyuan>
@@ -170,6 +173,8 @@ import * as echarts from "echarts";
 import PieChartrenyuan from '@/views/echarts/components/PieChartrenyuan'
 import HomeMap from '@/views/dashboard/components/HomeMap'
 import { getCallPolicePage } from '@/api/callPolice/callPolice'
+import { getInfoPage } from '@/api/yInfo/yInfo'
+import { getStatusCount } from '@/api/device/device'
 import { init } from 'events';
 // 1.1入侵报警饼图
 const ruqinbaojing_Chart = {
@@ -196,7 +201,7 @@ const ruqinbaojing_Chart = {
 const shipinjiankong_Chart = {
   // seriesName: '视频监控',
   unit: '次',
-  color: ['#fe7f02', '#049f51', '#fdc004'],
+  color: ['#fe7f02', '#049f51'],
   Data: {
     seriesData: [
       { value: 39, name: '正常' },
@@ -222,19 +227,18 @@ const menjinguanli_Chart = {
     '#C1232B'],
   Data: {
     seriesData: [
-      { value: 28, name: '正常' },
-      { value: 22, name: '离线' },
-      { value: 18, name: '报警' }
+      { value: 38, name: '正常' },
+      { value: 15, name: '离线' },
+      { value: 12, name: '报警' }
     ]
   },
   label: {
     normal: {
       position: 'inner',
-      show: false
+      show: false,
+      layoutAnimation: false
     }
   },
-
-  // radius: ['50%', '55%']
 }
 // 1.4电子围栏饼图
 const dianziweilan_Chart = {
@@ -303,24 +307,48 @@ export default {
       dianziweilan_Chart: dianziweilan_Chart,
       dianzixungeng_Chart: dianzixungeng_Chart,
       token: '',
-      Datalista: [
-        { title: '您有新任务了', createTime: '2023-05-23' },
-        { title: '您有新任务了', createTime: '2023-05-23' },
-        { title: '您有新任务了', createTime: '2023-05-23' },
-        { title: '您有新任务了', createTime: '2023-05-23' },
-        { title: '您有新任务了', createTime: '2023-05-23' },
-      ],
+      statusDataSp: {},
+      statusDataWl: {},
+      Datalista: [],
       Datalist: [],
     }
   },
   methods: {
     init() {
+      getStatusCount({ deviceType: 1 }).then(res => {
+        this.statusDataSp = res.data
+        this.shipinjiankong_Chart.Data.seriesData = []
+        var offline = this.statusDataSp.offline == null ? 0 : this.statusDataSp.offline
+        var online = this.statusDataSp.online == null ? 0 : this.statusDataSp.online
+        var obj = { name: '正常', value: online }
+        var obj1 = { name: '离线', value: offline }
+        this.shipinjiankong_Chart.Data.seriesData.push(obj)
+        this.shipinjiankong_Chart.Data.seriesData.push(obj1)
+      })
+      getStatusCount({ deviceType: 2 }).then(res => {
+        this.statusDataWl = res.data
+        this.dianziweilan_Chart.Data.seriesData = []
+        var offline = this.statusDataWl.offline == null ? 0 : this.statusDataWl.offline
+        var online = this.statusDataWl.online == null ? 0 : this.statusDataWl.online
+        var obj = { name: '正常', value: online }
+        var obj1 = { name: '离线', value: offline }
+        this.dianziweilan_Chart.Data.seriesData.push(obj)
+        this.dianziweilan_Chart.Data.seriesData.push(obj1)
+      })
       getCallPolicePage({ current: 1, size: 5 }).then((res) => {
         console.log(res)
         if (res.code == 200) {
           this.Datalist = res.data.records
         } else {
-          this.list = []
+          this.Datalist = []
+        }
+      })
+      getInfoPage({ current: 1, size: 5 }).then((res) => {
+        this.listLoading = false
+        if (res.code == 200) {
+          this.Datalista = res.data.records
+        } else {
+          this.Datalista = []
         }
       })
     },
@@ -329,6 +357,11 @@ export default {
         path: '/baojingchaxun/baojingchaxunList',
       })
     },
+    toMoreb() {
+      this.$router.push({
+        path: '/xiaoxi/xiaoxiList',
+      })
+    },
     getMessage() {
 
       this.$notify({
@@ -340,11 +373,12 @@ export default {
         message: " <div style='display: flex;flex-direction: row;flex-wrap: nowrap;justify-content: flex-start;align-items:center;margin: 0 auto;height:60px;line-height: 60px;'><img style='width:40px;height:40px;margin: 0 10px 0 0;' src='/image/yujing.png'>" + "<span style='display: inline-block;margin: 0 0px 0 0;height:40px;line-height: 40px;font-weight: bold;'>新的报警待处理</span></div>",
         position: 'bottom-right',
         onClick: () => {
-          alert("这是一条新订单")
+          this.$router.push({
+            path: '/xiaoxi/xiaoxiList',
+          })
+          // alert("这是一条新订单")
           // this.playText('你有一条报警信息未读')
           // this.getServicePageLists()
-
-
         },
         duration: 3000,
       })
diff --git a/src/views/monitor/videos/index.vue b/src/views/monitor/videos/index.vue
index 5217d3e..d1b9220 100644
--- a/src/views/monitor/videos/index.vue
+++ b/src/views/monitor/videos/index.vue
@@ -7,7 +7,7 @@
         <div class="shipinlisttop">
           <el-form ref="" :inline="true" label-width="110px" class="tab-header">
             <el-form-item label="选择仓库">
-              <el-select v-model="ckId" filterable clearable placeholder="请选择仓库" @change="ckChange">
+              <el-select v-model="ckId" filterable placeholder="请选择仓库" @change="ckChange">
                 <el-option v-for="item in ckList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -80,35 +80,29 @@
               </div>
               <!-- 2222end -->
               <!-- 333门禁管理 -->
-              <div class="ruqinbaojingcss" v-if="showMenjinguanli">
+              <!-- <div class="ruqinbaojingcss" v-if="showMenjinguanli">
                 <div class="Menjincss Menjin_yingzi" v-if="showMenjinguanli_zhengchang">
-                  <!-- <div class="myiconfont bluezibg jingicon menjin_zhengchang1"  v-if="showMenjinguanli_zhengchang"  @click="openshipinMenjinguanli()">&#xe60b;</div> -->
+                  <div class="myiconfont bluezibg jingicon menjin_zhengchang1"  v-if="showMenjinguanli_zhengchang"  @click="openshipinMenjinguanli()">&#xe60b;</div>
                   <div class="myiconfont bluezibg jingicon menjin_zhengchang2" v-if="showMenjinguanli_zhengchang">&#xe60b;
                   </div>
                   <div class="jingicon  menjin_zhengchang1" v-if="showMenjinguanli_zhengchang">
                     <div class="myiconfont jingicon   bluezibg" v-if="showMenjinguanli_zhengchang"
                       @click="openshipinMenjinguanli()">&#xe60b;</div>
-                    <!-- 显示文字 -->
                     <div class="seencons shipin_out" v-if="seenshipinMenjinguanli">
                       <p @click="openshipinMenjinguanli()">开门</p>
                     </div>
-                    <!-- 鼠标移入显示文字 -->
-                    <!-- <div class="seenconsc shipin_out" v-if="seen_shubiaoShipinjiankong">
+                    <div class="seenconsc shipin_out" v-if="seen_shubiaoShipinjiankong">
                       <p>设备名称：1号楼1F西侧走廊像头1</p>
                       <p>设备编号：HK023123</p>
-                    </div> -->
+                    </div>
                   </div>
-
-
                 </div>
-
                 <div class="myiconfont huizibg jingicon menjin_lixian1" v-if="showMenjinguanli_lixian">&#xe60b;</div>
                 <div class="myiconfont redzibg jingicon menjin_baojing1" v-if="showMenjinguanli_baojing">&#xe60b;</div>
-                <!-- 显示文字 -->
-                <!-- <div class="seencons menjin_zhengchang1b" v-if="seenshipinMenjinguanli">
+                <div class="seencons menjin_zhengchang1b" v-if="seenshipinMenjinguanli">
                   <p @click="toMore()">开门</p>
-                </div> -->
-              </div>
+                </div>
+              </div> -->
               <!-- 333end -->
               <!--444门电子围栏-->
               <div class="ruqinbaojingcss" v-if="showDianziweilan" v-for="(item, index) in dzwl_list">
@@ -135,17 +129,14 @@
             <div class="tabhead">
               <el-checkbox-group v-model="departmentTypeArray">
                 <!-- <el-checkbox-button label="1" checked><div  @click="openruqinbaojing()"><span  class="iconfontyuan myiconfont redziyuan icon-intruder-alarm"></span>入侵报警</div></el-checkbox-button> -->
-                <el-checkbox-button checked label="2">
-                  <div @click="openshipinjiankong()"><span
-                      class="iconfontyuan myiconfont greenziyuan icon-shipin1"></span>视频监控</div>
+                <el-checkbox-button checked label="2" @change="openshipinjiankong()">
+                  <div><span class="iconfontyuan myiconfont greenziyuan icon-shipin1"></span>视频监控</div>
                 </el-checkbox-button>
-                <el-checkbox-button checked label="3">
-                  <div @click="openmenjinguanli()"><span
-                      class="iconfontyuan myiconfont yellowziyuan icon-menjin"></span>门禁管理</div>
+                <el-checkbox-button checked label="3" @change="openmenjinguanli()">
+                  <div><span class="iconfontyuan myiconfont yellowziyuan icon-menjin"></span>门禁管理</div>
                 </el-checkbox-button>
-                <el-checkbox-button checked label="4">
-                  <div @click="opendianziweilan()"><span
-                      class="iconfontyuan myiconfont blueziyuan icon-dianziweilan2"></span>电子围栏</div>
+                <el-checkbox-button checked label="4" @change="opendianziweilan()">
+                  <div><span class="iconfontyuan myiconfont blueziyuan icon-dianziweilan2"></span>电子围栏</div>
                 </el-checkbox-button>
               </el-checkbox-group>
             </div>
@@ -154,26 +145,26 @@
               <!-- 视频监控按钮组 -->
               <div class="mores">
                 <el-checkbox-group size="mini" v-model="btnShipinjiankong">
-                  <el-checkbox-button checked label="备选项1" border>
-                    <div class="more" @click="open_zhengchang()">
+                  <el-checkbox-button checked label="备选项1" border @change="open_zhengchang()">
+                    <div class="more">
                       <p class="bluezi">正常</p>
-
-                      <span class="myiconfont iconbox bluezibg">&#xe651;</span><span class="numzi bluezi">216</span>
-                      <!-- <span class="myiconfont iconbox bluezibg">&#xe644;</span><span class="numzi bluezi">216</span> -->
+                      <span class="myiconfont iconbox bluezibg">&#xe651;</span><span class="numzi bluezi">{{
+                        statusData.online }}</span>
                     </div>
                   </el-checkbox-button>
-                  <el-checkbox-button checked label="备选项2" border>
-                    <div class="more" @click="open_lixian()">
+                  <el-checkbox-button checked label="备选项2" border @change="open_lixian()">
+                    <div class="more">
                       <p class="huizi">离线</p>
-                      <span class="myiconfont iconbox huizibg">&#xe651;</span><span class="numzi huizi">23</span>
+                      <span class="myiconfont iconbox huizibg">&#xe651;</span><span class="numzi huizi">{{
+                        statusData.offline == null ? 0 : statusData.offline }}</span>
                     </div>
                   </el-checkbox-button>
-                  <el-checkbox-button checked label="备选项3" border>
+                  <!-- <el-checkbox-button checked label="备选项3" border>
                     <div class="more" @click="open_baojing()">
                       <p class="redzi">报警</p>
                       <span class="myiconfont iconbox redzibg">&#xe651;</span><span class="numzi redzi">38</span>
                     </div>
-                  </el-checkbox-button>
+                  </el-checkbox-button> -->
                 </el-checkbox-group>
               </div>
             </div>
@@ -216,8 +207,9 @@
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
-import { getOtherList, sysArm, sysDisArm, getWareHouseList } from '@/api/device/device'
+import { getOtherList, sysArm, sysDisArm, getWareHouseList, getStatusCount } from '@/api/device/device'
 import { getVedioPcRecById, getVedioPcLiveById } from '@/api/deviceImage/deviceImage'
+import { getCounty } from '@/api/Common/areaPicker'
 // import baojingchaxunAdd from './baojingchaxunAdd'
 // import baojingchaxunInfo from './baojingchaxunInfo'
 // import req from '@/api/baojingchaxun/baojingchaxun'
@@ -237,6 +229,7 @@ export default {
       btnShipinjiankong: [],
       btnMenjinguanli: [],
       btnDianziweilan: [],
+      statusData: {},
       btndisabled: false,
       zc_list: [],
       dzwl_list: [],
@@ -282,16 +275,7 @@ export default {
       ],
       supplierType_list: [{ dictValue: '一层', dictKey: '1' }],
 
-      Datalista: [
-        { xiaoqu: '和平家园小区南门出口', tuUrl: './image/ren1.jpg', weizhi: '南门出口', createTime: '2023-05-03', createTime2: '18:26:38', shijian: '社区户主', name: '李明华' },
-        { xiaoqu: '和平家园小区东门出口', tuUrl: './image/ren2.jpg', weizhi: '东门出口', createTime: '2023-05-08', createTime2: '18:26:38', shijian: '社区户主', name: '李明华' },
-        { xiaoqu: '和平家园小区西门出口', tuUrl: './image/ren1.jpg', weizhi: '西门出口', createTime: '2023-05-12', createTime2: '19:32:38', shijian: '社区户主', name: '李明华' },
-        { xiaoqu: '和平家园小区东门出口', tuUrl: './image/ren2.jpg', weizhi: '东门出口', createTime: '2023-05-23', createTime2: '18:26:38', shijian: '社区户主', name: '李明华' },
-        { xiaoqu: '和平家园小区南门出口', tuUrl: './image/ren1.jpg', weizhi: '南门出口', createTime: '2023-05-03', createTime2: '18:26:38', shijian: '社区户主', name: '李明华' },
-        { xiaoqu: '和平家园小区东门出口', tuUrl: './image/ren2.jpg', weizhi: '东门出口', createTime: '2023-05-08', createTime2: '18:26:38', shijian: '社区户主', name: '李明华' },
-        { xiaoqu: '和平家园小区西门出口', tuUrl: './image/ren1.jpg', weizhi: '西门出口', createTime: '2023-05-12', createTime2: '19:32:38', shijian: '社区户主', name: '李明华' },
-        { xiaoqu: '和平家园小区东门出口', tuUrl: './image/ren2.jpg', weizhi: '东门出口', createTime: '2023-05-23', createTime2: '18:26:38', shijian: '社区户主', name: '李明华' },
-      ],
+      Datalista: [],
       dialogImage: false,
       dialogImageJK: false,
       dialogImageJKRec: false,
@@ -451,6 +435,9 @@ export default {
     openruqinbaojing() {
       this.showRuqinbaojing = !this.showRuqinbaojing
     },
+    abc() {
+      alert(1)
+    },
     openshipinjiankong() {
       this.showShipinjiankong = !this.showShipinjiankong
     },
@@ -601,24 +588,26 @@ export default {
       }
     },
     init() {
-      getWareHouseList().then(res => {
-        console.log(res)
-        if (res.code == 200) {
-          this.ckList = res.data
-        }
-      })
       getOtherList({ type: 1 }).then((res) => {
         if (res.code == 200) {
           this.zc_list = res.data
         }
       })
-
       getOtherList({ type: 2 }).then((res) => {
         if (res.code == 200) {
           this.dzwl_list = res.data
         }
         console.log(this.dzwl_list)
       })
+      getStatusCount({ deviceType: null, statusType: null }).then(res => {
+        this.statusData = res.data
+      })
+      getWareHouseList().then(res => {
+        console.log(res)
+        if (res.code == 200) {
+          this.ckList = res.data
+        }
+      })
     },
     // 序号
     indexMethod(index) {
diff --git a/src/views/shebeirizhi/shebeirizhiList.vue b/src/views/shebeirizhi/shebeirizhiList.vue
index 45f3dd2..67b21c6 100644
--- a/src/views/shebeirizhi/shebeirizhiList.vue
+++ b/src/views/shebeirizhi/shebeirizhiList.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div v-show="viewState == 1">
-      <button-bar view-title="设备日志" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <!-- <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>
@@ -108,7 +108,7 @@ export default {
       listLoading: false,
       listQuery: {
         current: 1,
-        size: 5,
+        size: 10,
         total: 0
       },
       supplierType_list: [
@@ -177,9 +177,10 @@ export default {
       getMessageInfoPage(this.listQuery).then((res) => {
         if (res.code == 200) {
           this.list = res.data.records
-          this.total = res.total
+          this.listQuery.total = res.data.total
         } else {
           this.list = []
+          this.listQuery.total = res.data.total
         }
       })
     },
@@ -194,9 +195,10 @@ export default {
       getMessageInfoPage(this.listQuery).then((res) => {
         if (res.code == 200) {
           this.list = res.data.records
-          this.total = res.total
+          this.listQuery.total = res.data.total
         } else {
           this.list = []
+          this.listQuery.total = res.data.total
         }
       })
     },
@@ -206,6 +208,9 @@ export default {
       this.getList()
     },
     handleReset() {
+      this.listQuery.startTime = null
+      this.listQuery.name = null
+      this.listQuery.position = null
       // this.listQuery = {
       //   params: {
       //     manufacturerName: '',
diff --git a/src/views/shebeitaizhang/shebeitaizhangList.vue b/src/views/shebeitaizhang/shebeitaizhangList.vue
index 05c6717..1e5602c 100644
--- a/src/views/shebeitaizhang/shebeitaizhangList.vue
+++ b/src/views/shebeitaizhang/shebeitaizhangList.vue
@@ -10,7 +10,7 @@
             <pie-chartrenyuan :chart-data="wanhao_Chart"></pie-chartrenyuan>
             <!-- <div class="zhongzi">75%</div> -->
           </div>
-          <div class="title"><span class="iconfont icon-jiating greenzi"></span>完好率</div>
+          <div class="title"><span class="iconfont icon-jiating greenzi"></span></div>
         </div>
         <!-- 第1个图表 -->
         <div class="tbar">
@@ -19,7 +19,7 @@
             <pie-chartrenyuan :chart-data="weixiu_Chart"></pie-chartrenyuan>
             <!-- <div class="zhongzi">15%</div> -->
           </div>
-          <div class="title"><span class="iconfont icon-jiating greenzi"></span>维修率</div>
+          <div class="title"><span class="iconfont icon-jiating greenzi"></span></div>
         </div>
         <!-- 第1个图表 -->
         <div class="tbar">
@@ -27,7 +27,7 @@
             <pie-chartrenyuan :chart-data="sunhai_Chart"></pie-chartrenyuan>
             <!-- <div class="zhongzi">10%</div> -->
           </div>
-          <div class="title"><span class="iconfont icon-jiating greenzi"></span>损害率</div>
+          <div class="title"><span class="iconfont icon-jiating greenzi"></span></div>
         </div>
       </div>
       <div class="webye">
@@ -150,7 +150,6 @@ import * as echarts from "echarts";
 import PieChartrenyuan from '@/views/echarts/components/PieChartrenyuanb'
 // 1.1完好率饼图
 const wanhao_Chart = {
-  unit: '次',
   color: ['#30e9ff', '#d9d9d9'],
   Data: {
     seriesData: [
@@ -167,8 +166,7 @@ const wanhao_Chart = {
 }
 // 1.2维修率饼图
 const weixiu_Chart = {
-  unit: '次',
-  color: ['#fe7f02', '#fdc004'],
+  color: ['#d9d9d9', '#fdc004'],
   Data: {
     seriesData: [
       { value: 15, name: '维修' },
@@ -184,8 +182,7 @@ const weixiu_Chart = {
 }
 // 1.3损害率饼图
 const sunhai_Chart = {
-  unit: '次',
-  color: ['#ff0202', '#d2cece'],
+  color: ['#d9d9d9', '#ff0202'],
   Data: {
     seriesData: [
       { value: 10, name: '损害' },
@@ -374,6 +371,7 @@ export default {
             var item = res.data[i];
             // 1完好 2维修 3损坏
             if (item.maintenance == '1') {
+              console.log('完好', item.maintenanceCount)
               var bad = 100 - item.maintenanceCount;
               var obj = { name: '完好', value: item.maintenanceCount }
               var obj1 = { name: '不完好', value: bad }
@@ -383,18 +381,20 @@ export default {
 
             // 1完好 2维修 3损坏
             if (item.maintenance == '2') {
+              console.log('维修', item.maintenanceCount)
               var bad = 100 - item.maintenanceCount;
               var obj = { name: '维修', value: item.maintenanceCount }
-              var obj1 = { name: '不维修', value: bad }
+              var obj1 = { name: '未维修', value: bad }
               this.weixiu_Chart.Data.seriesData.push(obj1)
               this.weixiu_Chart.Data.seriesData.push(obj)
             }
 
             // 1完好 2维修 3损坏
             if (item.maintenance == '3') {
+              console.log('损害', item.maintenanceCount)
               var bad = 100 - item.maintenanceCount;
               var obj = { name: '损害', value: item.maintenanceCount }
-              var obj1 = { name: '不损害', value: bad }
+              var obj1 = { name: '未损害', value: bad }
               this.sunhai_Chart.Data.seriesData.push(obj1)
               this.sunhai_Chart.Data.seriesData.push(obj)
             }
@@ -428,6 +428,9 @@ export default {
       this.getList()
     },
     handleReset() {
+      this.listQuery.ckId = null
+      this.listQuery.type = null
+      this.listQuery.name = null
     },
     // 打开添加对话框
     toAdd() {
diff --git a/src/views/shebeizhuangtai/shebeizhuangtaiList.vue b/src/views/shebeizhuangtai/shebeizhuangtaiList.vue
index e4d5c5e..18d41dd 100644
--- a/src/views/shebeizhuangtai/shebeizhuangtaiList.vue
+++ b/src/views/shebeizhuangtai/shebeizhuangtaiList.vue
@@ -201,6 +201,7 @@ export default {
       this.getList()
     },
     handleReset() {
+      this.listQuery.type = null
       // this.listQuery = {
       //   params: {
       //     manufacturerName: '',
diff --git a/src/views/xiaoxi/xiaoxiInfo.vue b/src/views/xiaoxi/xiaoxiInfo.vue
index 1f67d1a..0ec7975 100644
--- a/src/views/xiaoxi/xiaoxiInfo.vue
+++ b/src/views/xiaoxi/xiaoxiInfo.vue
@@ -13,20 +13,12 @@
             <div>详情信息</div>
           </div>
           <el-row>
-            <el-col :span="4" class="tleftb">
-              <span>类型</span>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item>
-                <span>{{ getSupplierType(infoForm.manufacturerCode) }}</span>
-              </el-form-item>
-            </el-col>
             <el-col :span="4" class="tleftb">
               <span>时间</span>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="15">
               <el-form-item>
-                <span>2023-05-23 08:16:26</span>
+                <span>{{ infoForm.createTime }}</span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -34,34 +26,24 @@
             <el-col :span="4" class="tleftb">
               <span>标题</span>
             </el-col>
-            <el-col :span="20">
+            <el-col :span="15">
               <el-form-item>
-                <span>标题标题标题标题标题标题标题标题标题标题标题标题</span>
+                <span>{{ infoForm.title }}</span>
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="4" class="tleftb">
-              <span>安装时间</span>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item>
-                <span>{{ infoForm.supplierTypeValue }}</span>
-              </el-form-item>
-            </el-col> -->
           </el-row>
           <el-row>
             <el-col :span="4" class="tleftb">
               <span>内容</span>
             </el-col>
-            <el-col :span="20">
+            <el-col :span="15">
               <el-form-item>
                 <span>
-                  内容内容内容内容内容内容内容内容内容内容
+                  {{ infoForm.content }}
                 </span>
               </el-form-item>
             </el-col>
-
           </el-row>
-
         </el-form>
       </div>
     </div>
@@ -69,71 +51,68 @@
 </template>
 
 <script>
-  // import req from '@/api/xiaoxi/xiaoxi'
-
-  export default {
-    name: 'xiaoxiInfo',
-    data() {
-      return {
-        // tableKey: 0,
-        // index: 0,
-        viewTitle: '',
-        supplierType_list: [
+// import req from '@/api/xiaoxi/xiaoxi'
+import { getInfoById } from '@/api/yInfo/yInfo'
+export default {
+  name: 'xiaoxiInfo',
+  data() {
+    return {
+      // tableKey: 0,
+      // index: 0,
+      viewTitle: '',
+      supplierType_list: [
         { title: '任务', id: '1' },
-        ],
-        status_list: [
+      ],
+      status_list: [
         { title: '已读', id: '1' },
-          { title: '未读', id: '2' },
-        ],
-        infoForm: {
-          manufacturerName: 'KD-22',
-          manufacturerAs: '2F金陵文脉',
-          manufacturerCode: '1',
-          supplierTypeValue: '2023-02-26 16:00:00',
-          manufacturerAddress: '大华',
-          manufacturer: '2023-02-26 12:00:00',
-          manufacturerTelePhone: '大华科技',
-          manufacturerFax: '2023-05-23',
-          status:'1'
-        },
-        // baseManufacturerBankDto: [],
-        rules: {},
-        // submitdisabled: false
+        { title: '未读', id: '2' },
+      ],
+      infoForm: {
+        manufacturerName: 'KD-22',
+        manufacturerAs: '2F金陵文脉',
+        manufacturerCode: '1',
+        supplierTypeValue: '2023-02-26 16:00:00',
+        manufacturerAddress: '大华',
+        manufacturer: '2023-02-26 12:00:00',
+        manufacturerTelePhone: '大华科技',
+        manufacturerFax: '2023-05-23',
+        status: '1'
+      },
+      rules: {},
+      // submitdisabled: false
+    }
+  },
+  methods: {
+    getStatus(item) {
+      for (var i = 0; i < this.status_list.length; i++) {
+        if (this.status_list[i].id == item) {
+          return this.status_list[i].title
+        }
       }
     },
-    methods: {
-      getStatus(item) {
-        for (var i = 0; i < this.status_list.length; i++) {
-          if (this.status_list[i].id == item) {
-            return this.status_list[i].title
-          }
-        }
-      },
-      getSupplierType(item) {
-        for (var i = 0; i < this.supplierType_list.length; i++) {
-          if (this.supplierType_list[i].id == item) {
-            return this.supplierType_list[i].title
-          }
+    getSupplierType(item) {
+      for (var i = 0; i < this.supplierType_list.length; i++) {
+        if (this.supplierType_list[i].id == item) {
+          return this.supplierType_list[i].title
         }
-      },
-      showInfo(row) {
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
-        this.viewTitle = '设备台账详情'
-        // req.fetchBySid(row.sid).then(resp => {
-        //   this.infoForm = resp.data.infoForm
-        //   this.baseManufacturerBankDto = resp.data.baseManufacturerBankDto
-        // }).catch(e => {
-        //   this.formobj = row
-        // })
-      },
-      handleReturn() {
-        this.$emit('doback')
       }
+    },
+    showInfo(row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.viewTitle = '设备台账详情'
+      getInfoById({ id: row.id }).then(resp => {
+        this.infoForm = resp.data
+      }).catch(e => {
+        this.formobj = row
+      })
+    },
+    handleReturn() {
+      this.$emit('doback')
     }
   }
+}
 </script>
 
-<style scoped>
-</style>
+<style scoped></style>
diff --git a/src/views/xiaoxi/xiaoxiList.vue b/src/views/xiaoxi/xiaoxiList.vue
index b589d1f..532ddd3 100644
--- a/src/views/xiaoxi/xiaoxiList.vue
+++ b/src/views/xiaoxi/xiaoxiList.vue
@@ -1,28 +1,28 @@
 <template>
-<div  class="app-container">
-  <div  v-show="viewState == 1">
-      <button-bar view-title="消息" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <!-- <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>
           <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-select v-model="listQuery.params.supplierType" filterable clearable placeholder="请选择消息类型">
+              <!-- <el-form-item label="消息类型">
+                <el-select v-model="listQuery.supplierType" filterable clearable placeholder="请选择消息类型">
                   <el-option v-for="item in supplierType_list" :key="item.id" :label="item.title" :value="item.id" />
                 </el-select>
               </el-form-item>
-              <!-- <el-form-item label="选择楼层">
+              <el-form-item label="选择楼层">
                 <el-select v-model="listQuery.params.supplierType" 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 label="厂商办公电话">
-                <el-input v-model="listQuery.params.manufacturerTelePhone" maxlength="130" placeholder="" class="addinputw" clearable/>
               </el-form-item>
-              <el-form-item label="联系人">
-                <el-input v-model="listQuery.params.contactName" maxlength="125" placeholder="" class="addinputw" clearable/>
+              <el-form-item label="厂商办公电话">
+                <el-input v-model="listQuery.params.manufacturerTelePhone" maxlength="130" placeholder="" class="addinputw" clearable/>
               </el-form-item> -->
+              <el-form-item label="消息">
+                <el-input v-model="listQuery.content" maxlength="125" placeholder="" class="addinputw" clearable />
+              </el-form-item>
             </el-form>
             <div class="btn">
               <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
@@ -43,34 +43,35 @@
             <el-table-column label="序号" fixed type="index" width="80" :index="indexMethod" align="center" />
             <el-table-column label="操作" fixed align="center" width="160px" class-name="small-padding fixed-width">
               <template slot-scope="{row}">
-                <!-- <el-button size="mini" type="primary"
-                  :disabled="!row.isShow && (row.supplierTypeValue === '主机厂' || row.supplierTypeValue === '分公司')"
-                  @click="handleEdit(row)">编辑</el-button> -->
                 <el-button size="mini" type="primary" @click="handleCheck(row)">详情</el-button>
-                <!-- <el-button size="mini" type="primary">处理</el-button> -->
               </template>
             </el-table-column>
-            <el-table-column label="类型" width="110" align="center">
+            <!-- <el-table-column label="类型" width="110" align="center">
               <template slot-scope="scope">
                 <span>{{ getSupplierType(scope.row.supplierTypeValue) }}</span>
               </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="标题" width="" header-align="center" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.biaoti }}</span>
+                <span>{{ scope.row.title }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="消息" width="" header-align="center" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.content }}</span>
               </template>
             </el-table-column>
             <el-table-column label="时间" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.time }}</span>
+                <span>{{ scope.row.createTime }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="状态" align="center">
+            <!-- <el-table-column label="状态" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.status == 1" style="color:green">{{ getStatus(scope.row.status) }}</span>
                 <span v-if="scope.row.status == 2" style="color:red">{{ getStatus(scope.row.status) }}</span>
               </template>
-            </el-table-column>
+            </el-table-column> -->
           </el-table>
         </div>
         <div class="pages">
@@ -79,357 +80,329 @@
             :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
         </div>
       </div>
-  </div>
+    </div>
     <!-- <xiaoxiAdd v-show="viewState == 2" ref="divadd" @doback="resetState" @reloadlist="handleFilter" /> -->
     <xiaoxiInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" />
-</div>
+  </div>
 </template>
 
 <script>
 
-  import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
-  import ButtonBar from '@/components/ButtonBar'
-  // import { typeValues, getOrgSidByPath } from '@/api/cheliang/dictcommons'
-  // import xiaoxiAdd from './xiaoxiAdd'
-  import xiaoxiInfo from './xiaoxiInfo'
-  // import req from '@/api/xiaoxi/xiaoxi'
-  export default {
-    name: 'xiaoxiList',
-    components: {
-      Pagination,
-      pageye,
-      ButtonBar,
-      // xiaoxiAdd,
-      xiaoxiInfo
-    },
-    data() {
-      return {
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import { getInfoPage } from '@/api/yInfo/yInfo'
+// import { typeValues, getOrgSidByPath } from '@/api/cheliang/dictcommons'
+// import xiaoxiAdd from './xiaoxiAdd'
+import xiaoxiInfo from './xiaoxiInfo'
+// import req from '@/api/xiaoxi/xiaoxi'
+export default {
+  name: 'xiaoxiList',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    // xiaoxiAdd,
+    xiaoxiInfo
+  },
+  data() {
+    return {
 
-        btndisabled: false,
-        btnList: [
-          // {
-          //   type: 'primary',
-          //   size: 'small',
-          //   icon: 'plus',
-          //   btnKey: 'toAdd',
-          //   btnLabel: '新增'
-          // },
-          {
-            type: 'danger',
-            size: 'small',
-            icon: 'del',
-            btnKey: 'doDel',
-            btnLabel: '删除'
-          },
-          // {
-          //   type: 'primary',
-          //   size: 'small',
-          //   icon: '',
-          //   btnKey: 'toChangShang',
-          //   btnLabel: '获取厂商'
-          // },
-          // {
-          //   type: 'primary',
-          //   size: 'small',
-          //   icon: '',
-          //   btnKey: 'toGain',
-          //   btnLabel: '获取分公司'
-          // },
-          // {
-          //   type: 'success',
-          //   size: 'small',
-          //   icon: 'export',
-          //   btnKey: 'import',
-          //   btnLabel: '导入'
-          // },
-          // {
-          //   type: 'success',
-          //   size: 'small',
-          //   icon: 'export',
-          //   btnKey: 'build',
-          //   btnLabel: '导出'
-          // },
-          {
-            type: 'info',
-            size: 'small',
-            icon: 'cross',
-            btnKey: 'doClose',
-            btnLabel: '关闭'
-          }
-        ],
-        viewState: 1,
-        isSearchShow: false,
-        searchxianshitit: '显示查询条件',
-        sids: [],
-        // 查询 -----------
-        tableKey: 0,
-        list: [
-          {  supplierTypeValue: '1', biaoti: '您有新消息了', time: '2023-02-26 12:00:00', status: '2' },
-          {  supplierTypeValue: '1', biaoti: '您有新消息了', time: '2023-02-26 12:00:00', status: '2' },
-        ],
-        listLoading: false,
-        listQuery: {
-          params: {
-            manufacturerName: '',
-            supplierType: '',
-            useOrgSid: '',
-            createOrgSid: '',
-            manufacturerTelePhone: '',
-            contactName: ''
-          },
-          current: 1,
-          size: 5,
-          total: 0
+      btndisabled: false,
+      btnList: [
+        // {
+        //   type: 'primary',
+        //   size: 'small',
+        //   icon: 'plus',
+        //   btnKey: 'toAdd',
+        //   btnLabel: '新增'
+        // },
+        {
+          type: 'danger',
+          size: 'small',
+          icon: 'del',
+          btnKey: 'doDel',
+          btnLabel: '删除'
         },
-        supplierType_list: [
-          { title: '任务', id: '1' },
-        ],
-        floor_list: [
-          { title: '一层', id: '1' },
-          { title: '二层', id: '2' },
-          { title: '三层', id: '3' },
-          { title: '四层', id: '4' },
-        ],
-        status_list: [
-          { title: '已读', id: '1' },
-          { title: '未读', id: '2' },
-        ],
-        rules: {}
+        // {
+        //   type: 'primary',
+        //   size: 'small',
+        //   icon: '',
+        //   btnKey: 'toChangShang',
+        //   btnLabel: '获取厂商'
+        // },
+        // {
+        //   type: 'primary',
+        //   size: 'small',
+        //   icon: '',
+        //   btnKey: 'toGain',
+        //   btnLabel: '获取分公司'
+        // },
+        // {
+        //   type: 'success',
+        //   size: 'small',
+        //   icon: 'export',
+        //   btnKey: 'import',
+        //   btnLabel: '导入'
+        // },
+        // {
+        //   type: 'success',
+        //   size: 'small',
+        //   icon: 'export',
+        //   btnKey: 'build',
+        //   btnLabel: '导出'
+        // },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      viewState: 1,
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      sids: [],
+      // 查询 -----------
+      tableKey: 0,
+      list: [],
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 10,
+        total: 0
+      },
+      supplierType_list: [
+        { title: '任务', id: '1' },
+      ],
+      floor_list: [
+        { title: '一层', id: '1' },
+        { title: '二层', id: '2' },
+        { title: '三层', id: '3' },
+        { title: '四层', id: '4' },
+      ],
+      status_list: [
+        { title: '已读', id: '1' },
+        { title: '未读', id: '2' },
+      ],
+      rules: {}
+    }
+  },
+  mounted() {
+    // this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  created() {
+    // 初始化变量
+    this.init()
+  },
+  methods: {
+    getStatus(item) {
+      for (var i = 0; i < this.status_list.length; i++) {
+        if (this.status_list[i].id == item) {
+          return this.status_list[i].title
+        }
       }
     },
-    mounted() {
-      this.$refs['btnbar'].setButtonList(this.btnList)
+    getSupplierType(item) {
+      for (var i = 0; i < this.supplierType_list.length; i++) {
+        if (this.supplierType_list[i].id == item) {
+          return this.supplierType_list[i].title
+        }
+      }
     },
-    created() {
-      // 初始化变量
-      // this.init()
+    resetState() {
+      this.viewState = 1
     },
-    methods: {
-      getStatus(item) {
-        for (var i = 0; i < this.status_list.length; i++) {
-          if (this.status_list[i].id == item) {
-            return this.status_list[i].title
-          }
-        }
-      },
-      getSupplierType(item) {
-        for (var i = 0; i < this.supplierType_list.length; i++) {
-          if (this.supplierType_list[i].id == item) {
-            return this.supplierType_list[i].title
-          }
-        }
-      },
-      resetState() {
-        this.viewState = 1
-      },
-      btnHandle(btnKey) {
-        console.log('XXXXXXXXXXXXXXX    ' + btnKey)
-        switch (btnKey) {
-          case 'toAdd':
-            this.toAdd()
-            break
-          case 'doDel':
-            this.doDel()
-            break
-          case 'toChangShang':
-            this.toChangShang()
-            break
-          case 'toGain':
-            this.toGain()
-            break
-          case 'doExport':
-            this.doExport()
-            break
-          case 'doClose':
-            this.doClose()
-            break
-          default:
-            break
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'doDel':
+          this.doDel()
+          break
+        case 'toChangShang':
+          this.toChangShang()
+          break
+        case 'toGain':
+          this.toGain()
+          break
+        case 'doExport':
+          this.doExport()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    init() {
+      getInfoPage(this.listQuery).then((res) => {
+        if (res.code == 200) {
+          this.list = res.data.records
+          this.listQuery.total = res.data.total
         }
-      },
-      // 搜索条件效果
-      clicksearchShow() {
-        this.isSearchShow = !this.isSearchShow
-        if (this.isSearchShow) {
-          this.searchxianshitit = '隐藏查询条件'
-        } else {
-          this.searchxianshitit = '显示查询条件'
+      })
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      getInfoPage(this.listQuery).then((res) => {
+        this.listLoading = false
+        if (res.code == 200) {
+          this.list = res.data.records
+          this.listQuery.total = res.data.total
         }
-      },
-      // init() {
-      //   getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
-      //     if (res.success) {
-      //       this.listQuery.params.createOrgSid = res.data
-      //       this.getType()
-      //       this.getList()
-      //     }
-      //   })
-      // },
-      // getType() {
-      //   typeValues({
-      //     type: 'supplierType'
-      //   }).then((res) => {
-      //     if (res.code === '200') {
-      //       this.supplierType_list = res.data
-      //       console.log('选择楼层', this.supplierType_list)
-      //     }
-      //   })
-      // },
-      // 序号
-      indexMethod(index) {
-        var pagestart = (this.listQuery.current - 1) * this.listQuery.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      // 查询列表信息
-      getList() {
-        // this.listLoading = true
-        // req.gysPagerList(this.listQuery).then((response) => {
-        //   this.listLoading = false
-        //   if (response.code === '200' && response.data && response.data.total > 0) {
-        //     this.list = response.data.records
-        //     this.listQuery.total = response.data.total
-        //   } else {
-        //     this.list = []
-        //     this.listQuery.total = 0
-        //   }
-        // })
-      },
-      // 查询按钮
-      handleFilter() {
-        this.listQuery.current = 1
-        this.getList()
-      },
-      handleReset() {
-        // this.listQuery = {
-        //   params: {
-        //     manufacturerName: '',
-        //     supplierType: '',
-        //     useOrgSid: '',
-        //     createOrgSid: '',
-        //     manufacturerTelePhone: '',
-        //     contactName: ''
-        //   },
-        //   current: 1,
-        //   size: 5
-        // }
-        // this.init()
-      },
-      // 打开添加对话框
-      toAdd() {
-        this.viewState = 2
-        this.$refs['divadd'].showAdd(this.listQuery.params.createOrgSid)
-      },
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    handleReset() {
+      this.listQuery.content = null
+    },
+    // 打开添加对话框
+    toAdd() {
+      this.viewState = 2
+      this.$refs['divadd'].showAdd(this.listQuery.params.createOrgSid)
+    },
 
-      handleSelectionChange(row) {
-        const aa = []
-        row.forEach((element) => {
-          aa.push(element.sid)
-        })
-        this.sids = aa
-      },
-      // 根据本行ID删除数据
-      doDel() {
-        if (this.sids.length > 0) {
-          const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
-          this.$confirm(tip, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            const loading = this.$loading({
-              lock: true,
-              text: 'Loading',
-              spinner: 'el-icon-loading',
-              background: 'rgba(0, 0, 0, 0.7)'
-            })
-            req.delBySids(this.sids.toString()).then(resp => {
-              if (resp.success) {
-                loading.close()
-                this.$message({ type: 'success', message: resp.msg, showClose: true })
-                this.getList()
-              } else {
-                loading.close()
-              }
-            }).catch(e => {
+    handleSelectionChange(row) {
+      const aa = []
+      row.forEach((element) => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+    },
+    // 根据本行ID删除数据
+    doDel() {
+      if (this.sids.length > 0) {
+        const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          req.delBySids(this.sids.toString()).then(resp => {
+            if (resp.success) {
               loading.close()
-            })
-          }).catch(() => {
+              this.$message({ type: 'success', message: resp.msg, showClose: true })
+              this.getList()
+            } else {
+              loading.close()
+            }
+          }).catch(e => {
+            loading.close()
           })
-        } else {
-          this.$message({ type: 'error', message: '没有选择!!', showClose: true })
-          return
-        }
-      },
-      // toChangShang() {
-      //   req.saveGysByOrgSid(this.listQuery.params.createOrgSid).then((resp) => {
-      //     if (resp.success) {
-      //       this.$message({ showClose: true, type: 'success', message: '获取成功' })
-      //       this.getList()
-      //     }
-      //   })
-      // },
-      // toGain() {
-      //   req.saveAllByOrgSid({ orgSid: this.listQuery.params.createOrgSid }).then((resp) => {
-      //     if (resp.success) {
-      //       this.$message({ showClose: true, type: 'success', message: '获取成功' })
-      //       this.getList()
-      //     }
-      //   })
-      // },
-      handleEdit(row) {
-        // this.viewState = 3
-        // this.$refs['divadd'].showEdit(row)
-        this.viewState = 2
-        this.$refs['divadd'].showAdd(this.listQuery.params.createOrgSid)
-        // if (row.supplierTypeValue !== '主机厂' && row.supplierTypeValue !== '分公司') {
-        //   this.viewState = 3
-        //   this.$refs['divadd'].showEdit(row)
-        // } else {
-        //   this.viewState = 5
-        //   this.$refs['divHosts'].showInfo(row)
-        // }
-      },
-      // 打开查看
-      handleCheck(row) {
-        this.viewState = 4
-        this.$refs['divinfo'].showInfo(row)
-      },
-      // 导出
-      // doExport() {
-      //   basefinbankExportExcel(this.sids).then((res) => {
-      //     const blob = new Blob([res], {
-      //       type: 'application/vnd.ms-excel'
-      //     })
-      //     const objectUrl = URL.createObjectURL(blob)
-      //     window.location.href = objectUrl
-      //     this.$notify({
-      //       title: '提示',
-      //       message: '导出成功',
-      //       type: 'success',
-      //       duration: 2000
-      //     })
-      //   })
-      // },
-      doClose() {
-        this.$store.dispatch('tagsView/delView', this.$route)
-        this.$router.go(-1)
+        }).catch(() => {
+        })
+      } else {
+        this.$message({ type: 'error', message: '没有选择!!', showClose: true })
+        return
       }
+    },
+    // toChangShang() {
+    //   req.saveGysByOrgSid(this.listQuery.params.createOrgSid).then((resp) => {
+    //     if (resp.success) {
+    //       this.$message({ showClose: true, type: 'success', message: '获取成功' })
+    //       this.getList()
+    //     }
+    //   })
+    // },
+    // toGain() {
+    //   req.saveAllByOrgSid({ orgSid: this.listQuery.params.createOrgSid }).then((resp) => {
+    //     if (resp.success) {
+    //       this.$message({ showClose: true, type: 'success', message: '获取成功' })
+    //       this.getList()
+    //     }
+    //   })
+    // },
+    handleEdit(row) {
+      // this.viewState = 3
+      // this.$refs['divadd'].showEdit(row)
+      this.viewState = 2
+      this.$refs['divadd'].showAdd(this.listQuery.params.createOrgSid)
+      // if (row.supplierTypeValue !== '主机厂' && row.supplierTypeValue !== '分公司') {
+      //   this.viewState = 3
+      //   this.$refs['divadd'].showEdit(row)
+      // } else {
+      //   this.viewState = 5
+      //   this.$refs['divHosts'].showInfo(row)
+      // }
+    },
+    // 打开查看
+    handleCheck(row) {
+      this.viewState = 4
+      this.$refs['divinfo'].showInfo(row)
+    },
+    // 导出
+    // doExport() {
+    //   basefinbankExportExcel(this.sids).then((res) => {
+    //     const blob = new Blob([res], {
+    //       type: 'application/vnd.ms-excel'
+    //     })
+    //     const objectUrl = URL.createObjectURL(blob)
+    //     window.location.href = objectUrl
+    //     this.$notify({
+    //       title: '提示',
+    //       message: '导出成功',
+    //       type: 'success',
+    //       duration: 2000
+    //     })
+    //   })
+    // },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
     }
   }
+}
 </script>
 
 <style scoped>
-.app-containerb{
+.app-containerb {
   display: flex;
   flex-direction: row;
   flex-wrap: nowrap;
-  justify-content: flex-start;align-items: flex-start;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.webye {
+  flex: 1;
+  text-align: left;
 }
-.webye{flex: 1;text-align: left;}
+
 /* 饼图部分 */
-.tbars {width: 250px;height: 100%;
+.tbars {
+  width: 250px;
+  height: 100%;
   /* display: flex;
   flex-direction: row;
   flex-wrap: nowrap;
@@ -437,8 +410,10 @@
   margin: 0 20px 0 0;
   padding: 10px;
   background-color: #fff;
-  box-shadow:0px 0px 10px #E9E9E9;border-radius: 5px;
+  box-shadow: 0px 0px 10px #E9E9E9;
+  border-radius: 5px;
 }
+
 .tbar {
   /* width: 25%; */
   margin: 0 0px 0 0;
@@ -446,22 +421,31 @@
   box-shadow:0px 0px 10px #E9E9E9;border-radius: 5px; */
   padding: 10px;
 }
+
 .tbar:last-of-type {
   margin: 0;
 }
+
 .tbar0 {
   border-bottom: 0px solid #032ab8;
 }
+
 .tbar .title {
   font-size: 20px;
-  padding: 0px 20px;text-align: center;
-  font-weight: bold;  color: #333;font-size: 16px;
+  padding: 0px 20px;
+  text-align: center;
+  font-weight: bold;
+  color: #333;
+  font-size: 16px;
   /* border-bottom: 1px solid #ececee; */
 }
+
 .tbar .title span {
   padding: 0 10px 0 0;
 }
-.tbar .bar {position: relative;
+
+.tbar .bar {
+  position: relative;
   /* display: flex;
   flex-direction: row;
   flex-wrap: nowrap;
@@ -470,7 +454,17 @@
   padding: 0px;
   height: 190px;
 }
-.tbar .bar .zhongzi {position: absolute;top:0;bottom: 0;left: 0;right: 0;line-height: 240px;text-align: center;
-  font-weight: bold;  color: #333;font-size: 18px;
+
+.tbar .bar .zhongzi {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  line-height: 240px;
+  text-align: center;
+  font-weight: bold;
+  color: #333;
+  font-size: 18px;
 }
 </style>
diff --git a/src/views/zhiwujiance/zhiwujianceInfo.vue b/src/views/zhiwujiance/zhiwujianceInfo.vue
index 7148539..04621b6 100644
--- a/src/views/zhiwujiance/zhiwujianceInfo.vue
+++ b/src/views/zhiwujiance/zhiwujianceInfo.vue
@@ -68,11 +68,11 @@
           </el-row>
           <el-row>
             <el-col :span="4" class="tleftb">
-              <span>拍照图片</span>
+              <span>拍照图片{{ infoForm.imgAfter }}</span>
             </el-col>
             <el-col :span="20">
               <el-form-item>
-                <span><img class="tus" :src="infoForm.imgAfter" alt="" /></span>
+                <span><img class="tus" :src="fileUrl + infoForm.imgAfter" alt="" /></span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -93,6 +93,8 @@ export default {
       // tableKey: 0,
       // index: 0,
       viewTitle: '',
+      // fileUrl: 'http://8.130.39.13:7003/upload/monitor/',
+      fileUrl: 'http://huirong.ybkjyl.com/imagesDownload/',
       supplierType_list: [
         { title: '摄像头', id: '1' },
       ],
@@ -127,6 +129,7 @@ export default {
       })
       this.viewTitle = '质物台账详情'
       getDeviceImageById({ id: row.id }).then(resp => {
+        console.log('resp', resp)
         this.infoForm = {
           cangkuname: '仓库1', huohao: '1025632', ren: 'sun', tel: '138330025635',
           bianma: '02124623', name: '矿泉水', num: '500', weizhi: '仓库1F3',
diff --git a/src/views/zhiwujiance/zhiwujianceList.vue b/src/views/zhiwujiance/zhiwujianceList.vue
index 85e7614..f8fa3e8 100644
--- a/src/views/zhiwujiance/zhiwujianceList.vue
+++ b/src/views/zhiwujiance/zhiwujianceList.vue
@@ -182,8 +182,8 @@ 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/',
+      // fileUrl: 'http://8.130.39.13:7003/upload/monitor/',
       wanhao_Chart: wanhao_Chart, // 1.1
       weixiu_Chart: weixiu_Chart,
       sunhai_Chart: sunhai_Chart,
@@ -361,6 +361,7 @@ export default {
       this.getList()
     },
     handleReset() {
+      this.listQuery.ckId = null
     },
     // 打开添加对话框
     toAdd() {