From efd950473656ea0b439f5d20bfb19b5b93b56e03 Mon Sep 17 00:00:00 2001
From: "zyc@123456" <784479659@qq.com>
Date: Tue, 30 May 2023 11:25:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=EF=BC=8C=E8=B4=A8=E7=89=A9=E7=9B=91=E6=B5=8B=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E6=95=88=E6=9E=9C?=
 =?UTF-8?q?=EF=BC=8C=E8=B4=A8=E7=89=A9=E7=9B=91=E6=B5=8B=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=EF=BC=8C=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=BC=96=E5=86=99=E7=AD=89=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Sidebar/index.vue       |  10 +-
 src/router/index.js                           |  19 +
 src/views/dashboard/components/HomeMap.vue    | 223 +++++-
 src/views/index.vue                           |  30 +-
 src/views/renlianshibie/renlianshibieList.vue |  78 +-
 .../shebeizhuangtai/shebeizhuangtaiList.vue   |   8 +-
 src/views/zhiwujiance/zhiwujianceAdd.vue      | 336 +++++++++
 src/views/zhiwujiance/zhiwujianceInfo.vue     | 228 ++++++
 src/views/zhiwujiance/zhiwujianceList.vue     | 664 ++++++++++++++++++
 9 files changed, 1539 insertions(+), 57 deletions(-)
 create mode 100644 src/views/zhiwujiance/zhiwujianceAdd.vue
 create mode 100644 src/views/zhiwujiance/zhiwujianceInfo.vue
 create mode 100644 src/views/zhiwujiance/zhiwujianceList.vue

diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index c13910a..8ee8365 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -119,13 +119,13 @@
         // },
         {
           alwaysShow: true,
-          component: "renlianshibie",
+          component: "zhiwujiance",
           meta: {
-            icon: "icon-renlianshibie6",
+            icon: "icon-renlianshibie",
             title: "质物监测",
           },
           name: "",
-          path: "/renlianshibie/renlianshibieList",
+          path: "/zhiwujiance/zhiwujianceList",
           // children: [{
           //   alwaysShow: true,
           //   component: "index",
@@ -133,8 +133,8 @@
           //     icon: "el-icon-help",
           //     title: "质物监测",
           //   },
-          //   name: "/renlianshibie/renlianshibieList",
-          //   path: "/renlianshibie/renlianshibieList",
+          //   name: "/zhiwujiance/zhiwujianceList",
+          //   path: "/zhiwujiance/zhiwujianceList",
           // }]
         },
         // {
diff --git a/src/router/index.js b/src/router/index.js
index 60012ef..d1b1a06 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -96,6 +96,25 @@ export const constantRoutes = [
     ],
   },
   ////质物监测
+  {
+    path: "/zhiwujianceList",
+    component: Layout,
+    redirect: "/zhiwujiance/zhiwujianceList",
+    meta: {
+      title: "质物监测",
+    },
+    children: [
+      {
+        path: "/zhiwujiance/zhiwujianceList",
+        component: () => import("@/views/zhiwujiance/zhiwujianceList.vue"),
+        name: "zhiwujianceList",
+        meta: {
+          title: "质物监测",
+          noCache: true,
+        },
+      },
+    ],
+  },
   {
     path: "/renlianshibieList",
     component: Layout,
diff --git a/src/views/dashboard/components/HomeMap.vue b/src/views/dashboard/components/HomeMap.vue
index 1203375..7c02495 100644
--- a/src/views/dashboard/components/HomeMap.vue
+++ b/src/views/dashboard/components/HomeMap.vue
@@ -1,6 +1,6 @@
 <template>
   <div ref="myEchart" id="mapID" class="content"
-    :style="{ height: '100%', width: '100%', margin: '-50px 10px 10px 10px' }"></div>
+    :style="{ height: '100%', width: '100%', margin: '-50px 10px 10px 80px' }"></div>
 </template>
 
 <script>
@@ -19,20 +19,227 @@
         charPie3currentIndex: 0,
         markPointData: [
           {
-            name: '河北省第一仓库',
+            name: '河北省第一仓库货物数1325个',
             coord: [114.693382, 37.483596],
             symbol: 'image://dapingmu/dianyellow.gif'
           },
           {
-            name: '河北省第二仓库',
+            name: '河北省第二仓库货物数1028个',
             coord: [115.793379, 37.483596],
             symbol: 'image://dapingmu/dianyellow.gif'
           },
           {
-            name: '河北省第三仓库',
+            name: '河北省第三仓库货物数2053个',
             coord: [116.693382, 38.483596],
             symbol: 'image://dapingmu/dianyellow.gif'
-          }
+          },
+          //
+          {
+            name: '湖北省第一仓库货物数1046个',
+            coord: [111.960704, 32.253967],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          {
+            name: '湖北省第二仓库货物数1052个',
+            coord: [112.271301, 30.987527],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          {
+            name: '湖北省第三仓库货物数1016个',
+            coord: [110.524048, 31.309506],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '黑龙江省第一仓库货物数1025个',
+            coord: [126.960704, 47.253967],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          {
+            name: '黑龙江省第二仓库货物数1632个',
+            coord: [127.693027, 48.040465],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          {
+            name: '黑龙江省第三仓库货物数1236个',
+            coord: [125.524048, 47.309506],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '上海市第一仓库货物数1236个',
+            coord: [121.438737, 31.072559],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '北京市第一仓库货物数1632个',
+            coord: [116.41995, 40.18994],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '甘肃省第一仓库货物数826个',
+            coord: [103.823557, 36.058039],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '四川省第一仓库货物数952个',
+            coord: [102.693453, 30.674545],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '山西省第一仓库货物数1021个',
+            coord: [112.304436, 37.618179],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '辽宁省第一仓库货物数951个',
+            coord: [122.604994, 41.299712],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '吉林省第一仓库货物数963个',
+            coord: [126.171208, 43.703954],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '陕西省第一仓库货物数686个',
+            coord: [108.887114, 35.263661],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '山东省第一仓库货物数1016个',
+            coord: [118.187759, 36.376092],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '天津市第一仓库货物数821个',
+            coord: [117.347043, 39.288036],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '河南省第一仓库货物数1012个',
+            coord: [113.619717, 33.902648],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '重庆市第一仓库货物数851个',
+            coord: [107.8839, 30.067297],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '贵州省第一仓库货物数236个',
+            coord: [106.880455, 26.826368],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '福建省第一仓库货物数236个',
+            coord: [118.006468, 26.069925],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '湖南省第一仓库货物数236个',
+            coord: [111.711649, 27.629216],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '江西省第一仓库货物数236个',
+            coord: [115.732975, 27.636112],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '广东省第一仓库货物数236个',
+            coord: [113.429919, 23.334643],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '海南省第一仓库货物数236个',
+            coord: [109.754859, 19.189767],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '台湾省第一仓库货物数236个',
+            coord: [120.971485, 23.749452],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '江苏省第一仓库货物数236个',
+            coord: [119.486506, 32.983991],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '安徽省第一仓库货物数236个',
+            coord: [117.226884, 31.849254],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '浙江省第一仓库货物数236个',
+            coord: [120.109913, 29.181466],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '云南省第一仓库货物数236个',
+            coord: [101.485106, 25.008643],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '青海省第一仓库货物数236个',
+            coord: [96.043533, 35.726403],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '广西壮族自治区第一仓库货物数236个',
+            coord: [108.7944, 23.833381],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '宁夏回族自治区第一仓库货物数236个',
+            coord: [106.169866, 37.291332],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '西藏自治区第一仓库货物数236个',
+            coord: [88.388277, 31.56375],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '内蒙古自治区第一仓库货物数236个',
+            coord: [114.077429, 44.331087],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+          //
+          {
+            name: '新疆维吾尔自治区第一仓库货物数236个',
+            coord: [85.294711, 41.371801],
+            symbol: 'image://dapingmu/dianyellow.gif'
+          },
+
         ],
         dataLen: 0
       }
@@ -187,6 +394,7 @@
               color: '#fff'
             },
             inRange: {
+
               color: ['#f37b1d', '#1e6ff0', '#6e41c7', '#34b157'],
               symbolSize: [30, 100]
             }
@@ -240,6 +448,9 @@
           ],
           animation: true
         }
+
+
+
         myChart.setOption(option)
         myChart.hideLoading()
         setTimeout(() => {
@@ -308,4 +519,4 @@
       }
     }
   }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/index.vue b/src/views/index.vue
index ccf933a..f7e83de 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -6,43 +6,43 @@
             <div class="wenbox">
               <div class="tubiao"><span class="myiconfont icon-shishijiance1 tolzi"></span></div>
               <div class="tos">
-                <div class="tit nums">河北仓库<span class="num">39</span>家</div>
+                <div class="tit nums">河北仓库<span class="num">3</span>家</div>
                 <div class="tit nums">货物数<span class="num">4575</span>个</div>
               </div>
             </div>
             <div class="wenbox">
               <div class="tubiao"><span class="myiconfont icon-louyuzidonghua tolzi"></span></div>
               <div class="tos">
-                <div class="tit nums">河北仓库<span class="num">39</span>家</div>
-                <div class="tit nums">货物数<span class="num">4575</span>个</div>
+                <div class="tit nums">湖北仓库<span class="num">3</span>家</div>
+                <div class="tit nums">货物数<span class="num">2575</span>个</div>
               </div>
             </div>
             <div class="wenbox">
               <div class="tubiao"><span class="myiconfont icon-shebeitaizhang tolzi"></span></div>
               <div class="tos">
-                <div class="tit nums">北京仓库<span class="num">39</span>家</div>
+                <div class="tit nums">黑龙江<span class="num">3</span>家</div>
                 <div class="tit nums">货物数<span class="num">4575</span>个</div>
               </div>
             </div>
             <div class="wenbox">
               <div class="tubiao"><span class="myiconfont icon-zhihuilouyu tolzi"></span></div>
               <div class="tos">
-                <div class="tit nums">上海仓库<span class="num">39</span>家</div>
-                <div class="tit nums">货物数<span class="num">4575</span>个</div>
+                <div class="tit nums">上海仓库<span class="num">1</span>家</div>
+                <div class="tit nums">货物数<span class="num">123</span>个</div>
               </div>
             </div>
             <div class="wenbox">
               <div class="tubiao"><span class="myiconfont icon-rizhi2 tolzi"></span></div>
               <div class="tos">
-                <div class="tit nums">江苏仓库<span class="num">39</span>家</div>
-                <div class="tit nums">货物数<span class="num">4575</span>个</div>
+                <div class="tit nums">江苏仓库<span class="num">1</span>家</div>
+                <div class="tit nums">货物数<span class="num">126</span>个</div>
               </div>
             </div>
 
 
 
           </div>
-          <home-map></home-map>
+          <home-map style="height:600px"></home-map>
         </div>
           <!-- 第3行 -->
         <div class="con">
@@ -64,7 +64,7 @@
           <div class="news">
             <div class="title">
               <div class="newstits">提醒任务</div>
-              <div class="more" @click="toMore()">更多></div>
+              <div class="more" @click="toMoreb()">更多></div>
             </div>
             <div class="content">
               <div class="newsli" v-for="(item, index) in Datalista" :key="index" @click="toinfo()">
@@ -316,7 +316,13 @@
       }
     },
     methods: {
+      toMore() {
+          this.$router.push({
+            path: '/baojingchaxun/baojingchaxunList',
+          })
+        },
       getMessage() {
+
         this.$notify({
           title: '报警消息',
           dangerouslyUseHTMLString: true,
@@ -357,7 +363,7 @@
 .rightbars{
 
 }
-.zongcons .maps{width: 100%;height: 605px;padding:40px 0 0 0;}
+.zongcons .maps{width: 100%;height: 605px;padding:40px 0 0 100px;text-align: right;}
   .webindex {
     display: flex;
   flex-direction: row;
@@ -572,7 +578,7 @@
     margin: 0;
     position: absolute;
     z-index: 600;
-    top: 20px;
+    top: 20px;left: 20px;
     // background-color: rgba($color: #ffffff, $alpha: 0.7);
     // box-shadow: 0px 0px 6px #0d27c2;
     background-color: #fff;
diff --git a/src/views/renlianshibie/renlianshibieList.vue b/src/views/renlianshibie/renlianshibieList.vue
index 29902c1..7224e69 100644
--- a/src/views/renlianshibie/renlianshibieList.vue
+++ b/src/views/renlianshibie/renlianshibieList.vue
@@ -90,33 +90,38 @@
             </div>
             <div class="contents">
               <div class="newslis">
-                    <span class="tits">图库照</span>
+                  <div class="newslilefts">
+                    <!-- <span class="tits">图库照</span> -->
                     <div class="newsli">
                       <div class="tu"><img :src="item.tuUrl" alt="" /></div>
                       <div class="rightwen">
-                        <div class="tit">质物名称：{{item.name}}</div>
-                        <div class="time">入库日期：{{item.createTime}}</div>
-                        <div class="time">时间：{{item.createTime2}}</div>
-                        <div class="time">生产厂家：{{item.changjia}}</div>
-                        <div class="time">数量：{{item.shuliang}}瓶</div>
+                        <div class="tit">位置：{{item.cangku}}</div>
+                        <div class="time">拍照日期：{{item.createTime}}</div>
+                        <div class="time">拍照时间：{{item.createTime2}}</div>
+                        <!-- <div class="time">生产厂家：{{item.changjia}}</div>
+                        <div class="time">数量：{{item.shuliang}}瓶</div> -->
                         <!-- <div class="time">重量：{{item.zhongliang}}千克</div> -->
                       </div>
                     </div>
                     <div class="yuans">
                       <p>98%</p><span>相似度</span>
                     </div>
-                    <span class="tits">图库照</span>
+                    <!-- <span class="tits">图库照</span> -->
                     <div class="newsli">
                       <div class="tu"><img :src="item.tuUrlb" alt="" /></div>
                       <div class="rightwen">
-                        <div class="tit">质物名称：{{item.nameb}}</div>
-                        <div class="time">入库日期：{{item.createTimeb}}</div>
-                        <div class="time">时间：{{item.createTime2}}</div>
-                        <div class="time">生产厂家：{{item.changjiab}}</div>
-                        <div class="time">数量：{{item.shuliangb}}瓶</div>
+                        <div class="tit">位置：{{item.cangku}}</div>
+                        <div class="time">拍照日期：{{item.createTime}}</div>
+                        <div class="time">拍照时间：{{item.createTime2}}</div>
 
                       </div>
                     </div>
+                  </div>
+                    <div class="caozuos">
+                      <el-button size="mini" type="primary" @click="handleCheck(row)">视频</el-button>
+                      <el-button size="mini" type="primary" @click="handleCheck(row)">详情</el-button>
+                      <el-button size="mini" type="primary" @click="handleCheck(row)">详情</el-button>
+                    </div>
               </div>
             </div>
           </div>
@@ -239,13 +244,13 @@ export default {
           { title: '仓库2', id: '2' },
       ],
       Datalista: [
-         {cangku:'华盛中心仓库1',name: '康师傅矿泉水',tuUrl:'./image/tu1.jpg', createTime: '2023-05-03',createTime2: '18:26:38', changjia: '康师傅',shuliang:'1000',zhongliang:'500',
+         {cangku:'仓库1003F3',name: '康师傅矿泉水',tuUrl:'./image/tu1.jpg', createTime: '2023-05-03',createTime2: '18:26:38', changjia: '康师傅',shuliang:'1000',zhongliang:'500',
          nameb: '康师傅矿泉水2',tuUrlb:'./image/tu2.jpg', createTimeb: '2023-05-03',createTime2: '18:26:38',changjiab: '康师傅',shuliangb:'1000',zhongliangb:'500'},
-         {cangku:'华盛中心仓库1',name: '康师傅矿泉水',tuUrl:'./image/tu1.jpg', createTime: '2023-05-03',createTime2: '18:26:38', changjia: '康师傅',shuliang:'1000',zhongliang:'500',
+         {cangku:'仓库1003F3',name: '康师傅矿泉水',tuUrl:'./image/tu1.jpg', createTime: '2023-05-03',createTime2: '18:26:38', changjia: '康师傅',shuliang:'1000',zhongliang:'500',
          nameb: '康师傅矿泉水2',tuUrlb:'./image/tu2.jpg', createTimeb: '2023-05-03',createTime2: '18:26:38',changjiab: '康师傅',shuliangb:'1000',zhongliangb:'500'},
-         {cangku:'华盛中心仓库1',name: '康师傅矿泉水',tuUrl:'./image/tu1.jpg', createTime: '2023-05-03',createTime2: '18:26:38', changjia: '康师傅',shuliang:'1000',zhongliang:'500',
+         {cangku:'仓库1003F3',name: '康师傅矿泉水',tuUrl:'./image/tu1.jpg', createTime: '2023-05-03',createTime2: '18:26:38', changjia: '康师傅',shuliang:'1000',zhongliang:'500',
          nameb: '康师傅矿泉水2',tuUrlb:'./image/tu2.jpg', createTimeb: '2023-05-03',createTime2: '18:26:38',changjiab: '康师傅',shuliangb:'1000',zhongliangb:'500'},
-         {cangku:'华盛中心仓库1',name: '康师傅矿泉水',tuUrl:'./image/tu1.jpg', createTime: '2023-05-03',createTime2: '18:26:38', changjia: '康师傅',shuliang:'1000',zhongliang:'500',
+         {cangku:'仓库1003F3',name: '康师傅矿泉水',tuUrl:'./image/tu1.jpg', createTime: '2023-05-03',createTime2: '18:26:38', changjia: '康师傅',shuliang:'1000',zhongliang:'500',
          nameb: '康师傅矿泉水2',tuUrlb:'./image/tu2.jpg', createTimeb: '2023-05-03',createTime2: '18:26:38',changjiab: '康师傅',shuliangb:'1000',zhongliangb:'500'},
         ],
         dialogImage: false,
@@ -565,8 +570,8 @@ export default {
   .con {
   padding: 20px 0;background-color: #fff;
 }
-.news {display: inline-block;
-  width: calc(50% - 20px);
+.news {display: block;width: calc(100% - 20px);
+  /* width: calc(50% - 20px); */
   margin: 10px 10px;
   background-color: #fff;
   box-shadow:0px 0px 10px #E9E9E9;border-radius: 5px;
@@ -575,9 +580,9 @@ export default {
 /* .news:nth-of-type(4n) {
   margin: 0 !important;
 } */
-.news:nth-of-type(2n) { width: calc(50% - 10px);
+/* .news:nth-of-type(2n) { width: calc(50% - 10px);
   margin: 10px  0 10px 10px;
-}
+} */
 /* .news:nth-of-type(4n - 3) {width: calc(25% - 10px);
   margin: 10px  10px 10px 0px;
 } */
@@ -608,16 +613,20 @@ export default {
 .news  .contents  .newslis{padding: 10px 10px; display: flex;
   flex-direction: row;
   flex-wrap: nowrap;
+  justify-content: space-between;align-items: center;}
+  .news  .contents  .newslis .newslilefts{flex: 1;background-color: #848383;
+    flex-direction: row;
+  flex-wrap: nowrap;
   justify-content: flex-start;align-items: center;}
-  .news  .contents  .newslis .tits{padding: 0;width: 20px;color: #8e8e8e;}
+  /* .news  .contents  .newslis .tits{padding: 0;width: 20px;color: #8e8e8e;} */
 /*
 .news  .contents  .newslis .rentu{padding: 0;width: 80px;height: 80px;border-radius: 5px;border: 1px solid #ff2424;margin: 0 20px;} */
-.news  .contents  .newslis .yuans{padding: 0;margin: 0 20px;width: 80px;height: 80px !important;border-radius: 80px;border: 1px solid #ff2424;text-align: center;}
-.news  .contents  .newslis .yuans p{padding: 15px 0 1px 0;color: #ff2424;font-size: 26px;margin: 0;}
-.news  .contents  .newslis .yuans span{padding: 0;margin: 0;color: #8e8e8e;font-size: 14px;display: block;}
+.news  .contents  .newslis .newslilefts .yuans{padding: 0;margin: 0 20px;width: 80px;height: 80px !important;border-radius: 80px;border: 1px solid #ff2424;text-align: center;}
+.news  .contents  .newslis .newslilefts .yuans p{padding: 15px 0 1px 0;color: #ff2424;font-size: 26px;margin: 0;}
+.news  .contents  .newslis .newslilefts .yuans span{padding: 0;margin: 0;color: #8e8e8e;font-size: 14px;display: block;}
 /* .news  .contents  .newslis .rightzi{padding: 0 10px;color: #8e8e8e;text-align: left;}
 .news  .contents  .newslis .rightzi p{padding: 1px 0;color: #8e8e8e;font-size: 12px;margin: 0;} */
-.news  .contents  .newslis  .newsli {display: inline-block;
+.news  .contents  .newslis .newslilefts  .newsli {flex: 1;
   display: flex;
   flex-direction: row;
   flex-wrap: nowrap;
@@ -626,29 +635,38 @@ export default {
   padding: 5px 10px;
   /* border-bottom: 1px solid #ececee; */
 }
-.news  .contents  .newslis  .newsli .tu {
+.news  .contents  .newslis .newslilefts  .newsli .tu {
   padding: 0px 0 0 0;
   width: 120px;height: 120px;border-radius: 5px;border: 1px solid #ff2424;
 }
-.news  .contents  .newslis  .newsli .tu img {
+.news  .contents  .newslis .newslilefts  .newsli .tu img {
   width: 100%;height: 100%;border-radius: 5px;border: 1px solid #ff2424;
 }
-.news  .contents  .newslis  .newsli .rightwen {
+.news  .contents  .newslis .newslilefts  .newsli .rightwen {
   padding: 0px 0 0 20px;
   flex: 3;
 }
-.news  .contents  .newslis  .newsli .rightwen .tit {
+.news  .contents  .newslis .newslilefts  .newsli .rightwen .tit {
   padding: 3px 0;
   font-size: 14px;font-weight: bold;
   /* height: 25px;
   overflow: hidden;
   line-height: 25px; */
 }
-.news  .contents  .newslis  .newsli .rightwen .time {
+.news  .contents  .newslis .newslilefts  .newsli .rightwen .time {
   padding: 3px 0;
   color: #848383;
  font-size: 14px;
   /* height: 25px;
   line-height: 25px; */
 }
+.news  .contents  .newslis  .caozuos {width: 180px;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  margin: 0px 0px;
+  padding: 5px 10px;
+  text-align: right;
+}
 </style>
diff --git a/src/views/shebeizhuangtai/shebeizhuangtaiList.vue b/src/views/shebeizhuangtai/shebeizhuangtaiList.vue
index 6935ae7..86db32f 100644
--- a/src/views/shebeizhuangtai/shebeizhuangtaiList.vue
+++ b/src/views/shebeizhuangtai/shebeizhuangtaiList.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>
@@ -30,7 +30,7 @@
           </div>
         </div>
         <div class="listtop">
-          <div class="tit">报警查询信息列表</div>
+          <div class="tit">设备状态信息列表</div>
           <!-- 翻页分页 -->
           <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
             :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
@@ -51,7 +51,7 @@
                 <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.bianma }}</span>
               </template>
             </el-table-column> -->
-            <!-- 
+            <!--
             <el-table-column label="报警时间" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.policeTime }}</span>
@@ -447,4 +447,4 @@
 </script>
 
 <style scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/zhiwujiance/zhiwujianceAdd.vue b/src/views/zhiwujiance/zhiwujianceAdd.vue
new file mode 100644
index 0000000..750d2fb
--- /dev/null
+++ b/src/views/zhiwujiance/zhiwujianceAdd.vue
@@ -0,0 +1,336 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSave()">保存
+          </el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="listconadd">
+        <el-form ref="form_obj" :model="addForm" :rules="rules" class="formadd">
+          <div class="title">
+            <div>编辑质物监测信息</div>
+          </div>
+          <el-row>
+            <el-col :span="4" class="tleftb">
+              <span><span class="icon">*</span>质物编码</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="">
+                <el-input v-model="addForm.manufacturerName" maxlength="20" placeholder="请填写质物编码" class="addinputw"
+                  clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="tleftb">
+              <span>质物位置</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <el-input v-model="addForm.manufacturerAs" maxlength="20" placeholder="请填写质物位置 " class="addinputw"
+                  clearable />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="tleftb">
+              <span><span class="icon">*</span>拍照时间</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="">
+                <!-- <el-date-picker type="datatime" placeholder="选择日期" v-model="addForm.manufacturerCode" style="width: 410px;"
+                  maxlength="20"></el-date-picker> -->
+                  <el-date-picker style="width: 80%;"
+      v-model="addForm.value1"
+      type="datetime"
+      placeholder="选择日期时间">
+    </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="tleftb">
+              <span>拍照图片</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <el-upload
+                  class="upload-demo"
+                  action="https://jsonplaceholder.typicode.com/posts/"
+                  :on-preview="handlePreview"
+                  :on-remove="handleRemove"
+                  :before-remove="beforeRemove"
+                  multiple
+                  :limit="3"
+                  :on-exceed="handleExceed"
+                  :file-list="fileList">
+                  <el-button size="small" type="primary">添加图片</el-button>
+                </el-upload>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <!-- <el-row>
+            <el-col :span="4" class="tleftb">
+              <span><span class="icon">*</span>质物类型</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <el-select v-model="addForm.manufacturerCode" filterable clearable placeholder="请选择质物类型"
+                  style="width: 410px;">
+                  <el-option v-for="item in supplierType_list" :key="item.id" :label="item.title" :value="item.id"
+                    class="addinputw" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="tleftb">
+              <span>拍照时间</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="">
+                <el-date-picker type="date" placeholder="选择日期" v-model="addForm.manufacturerCode" style="width: 410px;"
+                  maxlength="20"></el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row> -->
+          <!-- <el-row>
+            <el-col :span="4" class="tleftb">
+              <span><span class="icon">*</span>出厂时间</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="">
+                <el-date-picker type="date" placeholder="选择日期" v-model="addForm.manufacturerCode" style="width: 410px;"
+                  maxlength="20"></el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="tleftb">
+              <span>供货商</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="">
+                <el-input v-model="addForm.manufacturerCode" :disabled="!isShow" maxlength="20" placeholder="请填写供应商编码"
+                  class="addinputw" clearable />
+              </el-form-item>
+            </el-col>
+          </el-row> -->
+          <!-- <el-row>
+            <el-col :span="4" class="tleftb">
+              <span>生产厂家</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <el-input v-model="addForm.manufacturerTelePhone" maxlength="20" placeholder="请填写生产厂家编码"
+                  class="addinputw" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="tleftb">
+              <span>保修截止日期</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <el-date-picker type="date" placeholder="选择日期" v-model="addForm.manufacturerFax" style="width: 410px;"
+                  maxlength="20"></el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row> -->
+
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  // import req from '@/api/shebeitaizhang/shebeitaizhang'
+  // import { typeValues } from '@/api/cheliang/dictcommons'
+
+  export default {
+    name: 'shebeitaizhangAdd',
+    data() {
+      var checkSubmit = (rule, value, callback) => {
+        const Submit = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
+        if (Submit.test(value)) {
+          return callback()
+        }
+        callback(new Error('请输入手机号'))
+      }
+      var checkChuanzhen = (rule, value, callback) => {
+        const BanGongDianHua = /\d{3}-\d{8}|\d{4}-\d{7}/
+        if (value) {
+          // 如果没有通过验证！！
+          if (!BanGongDianHua.test(value)) {
+            callback(new Error('请输入正确的传真格式'))
+          }
+          callback()
+        } else {
+          callback()
+        }
+      }
+      return {
+        fileList: [],
+        tableKey: 0,
+        index: 0,
+        viewState: 1,
+        viewTitle: '',
+        dialogStatus: '',
+        sid: '',
+        isShow: true,
+        supplierType_list: [
+        { title: '摄像头', id: '1' },
+          { title: '电子围栏', id: '2' },
+          { title: '门禁', id: '3' },
+          { title: '机器人', id: '4' }
+        ],
+        addForm: {
+          manufacturerName: '',
+          manufacturerAs: '',
+          manufacturerCode: '',
+          supplierType: '',
+          supplierTypeValue: '',
+          manufacturerAddress: '',
+          manufacturerTelePhone: '',
+          manufacturerFax: '',
+          contactName: '',
+          contactMobile: '',
+          contactTelePhone: '',
+          weChatID: '',
+          zipCode: '',
+          email: '',
+          createOrg: '',
+          useOrg: ''
+        },
+        baseManufacturerBankDto: [],
+        rules: {
+          manufacturerName: [{
+            required: true,
+            message: '请填写供应商名称',
+            trigger: 'blur'
+          }],
+          supplierTypeValue: [{
+            required: true,
+            message: '请选择分类',
+            trigger: 'change'
+          }],
+          manufacturerAddress: [{
+            required: true,
+            message: '请填写供应商通讯地址',
+            trigger: 'blur'
+          }],
+          manufacturerFax: [{
+            required: true,
+            validator: checkChuanzhen,
+            trigger: 'blur'
+          }],
+          contactName: [{
+            required: true,
+            message: '请填写联系人名字',
+            trigger: 'blur'
+          }],
+          contactMobile: [{
+            required: true,
+            validator: checkSubmit,
+            trigger: 'blur'
+          }],
+          manufacturerCode: [{
+            required: true,
+            message: '编码不能为空',
+            trigger: 'blur'
+          }]
+        },
+        submitdisabled: false
+      }
+    },
+    methods: {
+      //图片添加开始
+      handleRemove(file, fileList) {
+      console.log(file, fileList);
+      },
+      handlePreview(file) {
+        console.log(file);
+      },
+      handleExceed(files, fileList) {
+        this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+      },
+      beforeRemove(file, fileList) {
+        return this.$confirm(`确定移除 ${ file.name }？`);
+      },
+      //图片添加结束
+      init() {
+        typeValues({ type: 'supplierType' }).then((res) => {
+          if (res.success) {
+            this.supplierType_list = res.data
+          }
+        })
+      },
+      changeSupplierType(value) {
+        let bb = null
+        this.supplierType_list.forEach((e) => {
+          if (e.dictValue === value) {
+            bb = {
+              key: e.dictKey,
+              value: e.dictValue
+            }
+          }
+        })
+        this.addForm.supplierType = bb.key
+      },
+      handleSave() {
+        this.$refs['form_obj'].validate(valid => {
+          if (valid) {
+            this.submitdisabled = true
+            const formobj = {
+              baseManufacturerBankDto: this.baseManufacturerBankDto,
+              addForm: this.addForm
+            }
+            if (this.dialogStatus === 'add') {
+              req.save(formobj).then(resp => {
+                this.submitdisabled = false
+                if (resp.success) {
+                  this.$message({ showClose: true, type: 'success', message: resp.msg })
+                  this.handleReturn('true')
+                }
+              }).catch(() => {
+                this.submitdisabled = false
+              })
+            } else if (this.dialogStatus === 'edit') {
+              req.update(formobj, this.sid).then(resp => {
+                this.submitdisabled = false
+                if (resp.success) {
+                  this.$message({ showClose: true, type: 'success', message: resp.msg })
+                  this.handleReturn('true')
+                }
+              }).catch(() => {
+                this.submitdisabled = false
+              })
+            }
+          } else {
+            return false
+          }
+        })
+      },
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.dialogStatus = ''
+        this.sid = ''
+        this.addForm = {}
+        this.baseManufacturerBankDto = []
+        this.isShow = true
+        this.$refs['form_obj'].resetFields()
+        this.$emit('doback')
+      }
+    }
+  }
+</script>
+<style scoped>
+  .divStyle {
+    padding: 7px;
+    font-weight: bold;
+    font-size: 16px;
+    background-color: #0294d7;
+    text-align: left;
+    color: #ffffff;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+</style>
diff --git a/src/views/zhiwujiance/zhiwujianceInfo.vue b/src/views/zhiwujiance/zhiwujianceInfo.vue
new file mode 100644
index 0000000..ca0b4b4
--- /dev/null
+++ b/src/views/zhiwujiance/zhiwujianceInfo.vue
@@ -0,0 +1,228 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="listconadd">
+        <el-form ref="form_obj" :model="infoForm" :rules="rules" class="formadd">
+          <div class="title">
+            <div>质物监测详情信息</div>
+          </div>
+          <el-row>
+            <el-col :span="4" class="tleftb">
+              <span>质物编码</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <span>{{ infoForm.bianma }}</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.weizhi }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="tleftb">
+              <span>拍照时间</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <span>{{ infoForm.time }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="tleftb">
+              <span></span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <span></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-form-item>
+                <span><img class="tus" :src="infoForm.tuUrl" alt="" /></span>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+          <!-- <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-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="8">
+              <el-form-item>
+                <span>{{ infoForm.manufacturer }}</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.manufacturerAddress }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="tleftb">
+              <span>生产厂家</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <span>{{ infoForm.manufacturerTelePhone }}</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.manufacturerFax }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="tleftb">
+              <span>状态</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <span>{{ getStatus(infoForm.status) }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="tleftb">
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+              </el-form-item>
+            </el-col>
+          </el-row> -->
+          <!-- <div class="title">
+            <div>开户行信息</div>
+          </div>
+          <el-table :key="tableKey" :data="baseManufacturerBankDto" :index="index" border style="width: 100%">
+            <el-table-column fixed width="60px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="dueBankValue" width="140px" label="账户类型" align="center"/>
+            <el-table-column prop="depositBank" width="180px" label="开户银行" align="center"/>
+            <el-table-column prop="bankAccount" width="160px" label="银行账号" align="center"/>
+            <el-table-column prop="accountName" width="130px" label="账号名称" align="center"/>
+            <el-table-column prop="bankingOutlets" width="180px" label="银行网点" align="center"/>
+            <el-table-column prop="bankAddress" width="260px" label="开户行地址" align="center"/>
+            <el-table-column prop="paymentLines" width="160px" label="联行号" align="center"/>
+            <el-table-column prop="swiftCode" width="200px" label="swiftcode(银行代码)" align="center"/>
+            <el-table-column prop="currency" width="130px" label="币种" align="center"/>
+            <el-table-column prop="remarks" width="240px" label="描述" align="center"/>
+            <el-table-column prop="actualPay" width="240px" label="厂家销售通路" align="center"/>
+            <el-table-column prop="paymentAccessNoValue" width="240px" label="付款通路编码" align="center"/>
+          </el-table> -->
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  // import req from '@/api/shebeitaizhang/shebeitaizhang'
+
+  export default {
+    name: 'shebeitaizhangInfo',
+    data() {
+      return {
+        // tableKey: 0,
+        // index: 0,
+        viewTitle: '',
+        supplierType_list: [
+          { title: '摄像头', id: '1' },
+        ],
+        status_list: [
+          { title: '已损坏', id: '1' },
+          { title: '已维修', id: '2' },
+          { title: '完好', id: '3' },
+        ],
+        infoForm: {bianma: '02124623',name: '矿泉水',num: '500',weizhi: '仓库1F3',
+          manufacturerName: 'KD-22',
+          manufacturerAs: '2F金陵文脉',
+          manufacturerCode: '1',
+          time: '2023-02-26 16:00:00',
+          manufacturerAddress: '大华',
+          manufacturer: '2023-02-26 12:00:00',
+          manufacturerTelePhone: '大华科技',
+          manufacturerFax: '2023-05-23',
+          status:'1',
+          cangku:'仓库1',
+          tuUrl:'./image/tu1.jpg'
+        },
+        // baseManufacturerBankDto: [],
+        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
+          }
+        }
+      },
+      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')
+      }
+    }
+  }
+</script>
+
+<style scoped>
+.tus{width: 400px;margin: 20px;}
+</style>
diff --git a/src/views/zhiwujiance/zhiwujianceList.vue b/src/views/zhiwujiance/zhiwujianceList.vue
new file mode 100644
index 0000000..7d1c2b7
--- /dev/null
+++ b/src/views/zhiwujiance/zhiwujianceList.vue
@@ -0,0 +1,664 @@
+<template>
+<div  class="app-container">
+  <div  class="app-containerb" v-show="viewState == 1">
+    <div class="webye" >
+      <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-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-select v-model="listQuery.params.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 label="物品名称">
+                <el-input v-model="listQuery.params.manufacturerName" clearable placeholder="" class="addinputw"></el-input>
+              </el-form-item>
+              <el-form-item label="选择楼层">
+                <el-select v-model="listQuery.params.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 label="选择仓库">
+                <el-select v-model="listQuery.params.supplierType2" filterable clearable placeholder="请选择仓库">
+                  <el-option v-for="item in cangku_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> -->
+            </el-form>
+            <div class="btn">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="listtop">
+          <div class="tit">质物监测信息列表</div>
+          <!-- 翻页分页 -->
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+            :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
+        </div>
+        <div>
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;"
+            @selection-change="handleSelectionChange">
+            <el-table-column type="selection" align="center" width="50" />
+            <el-table-column label="序号" fixed type="index" width="80" :index="indexMethod" align="center" />
+
+            <el-table-column prop="jc" label="" header-align="center" align="center">
+              <template slot-scope="scope">
+                <div  v-for="(item, index) in Datalista" :key="index">
+                  <div class="newslilefts"  >
+                    <!-- <span class="tits">图库照</span> -->
+                    <div class="newsli">
+                      <div class="tu"><img :src="item.tuUrl" alt="" /></div>
+                      <div class="rightwen">
+                        <div class="tit">位置：{{item.cangku}}</div>
+                        <div class="time">拍照日期：{{item.createTime}}</div>
+                        <div class="time">拍照时间：{{item.createTime2}}</div>
+                        <!-- <div class="time">生产厂家：{{item.changjia}}</div>
+                        <div class="time">数量：{{item.shuliang}}瓶</div> -->
+                        <!-- <div class="time">重量：{{item.zhongliang}}千克</div> -->
+                      </div>
+                    </div>
+                    <div class="yuans">
+                      <p>98%</p><span>相似度</span>
+                    </div>
+                    <!-- <span class="tits">图库照</span> -->
+                    <div class="newsli">
+                      <div class="tu"><img :src="item.tuUrlb" alt="" /></div>
+                      <div class="rightwen">
+                        <div class="tit">位置：{{item.cangku}}</div>
+                        <div class="time">拍照日期：{{item.createTime}}</div>
+                        <div class="time">拍照时间：{{item.createTime2}}</div>
+
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </template>
+            </el-table-column>
+
+
+            <el-table-column label="操作" align="center" width="220px" class-name="small-padding fixed-width">
+              <template slot-scope="{row}">
+                <el-button size="mini" type="primary"  @click="toShipin()">视频</el-button>
+                <el-button size="mini" type="primary" @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>
+        </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" />
+        </div>
+      </div>
+    </div>
+  </div>
+       <!-- 查看视频 -->
+       <el-dialog title="查看视频" :visible.sync="dialogImage" width="800px"  :before-close="handleClose">
+      <div class="shipin">
+        <video id="video" :preload="preload" :height="height" :width="width" align="center" :controls="controls">
+            <source :src="videoSrc" type="video/mp4">
+          </video>
+      </div>
+      <!-- <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogImage = false">取 消</el-button>
+      </span> -->
+    </el-dialog>
+    <zhiwujianceAdd v-show="viewState == 2" ref="divadd" @doback="resetState" @reloadlist="handleFilter" />
+    <!-- <zhiwujianceAddShebei v-show="viewState == 5" ref="divaddshebei" @doback="resetState" @reloadlist="handleFilter" /> -->
+    <zhiwujianceInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" />
+</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 zhiwujianceAdd from './zhiwujianceAdd'
+  // import zhiwujianceAddShebei from '@/views/zhiwujiance/shebei/shebeiList'
+  import zhiwujianceInfo from './zhiwujianceInfo'
+  // import req from '@/api/zhiwujiance/zhiwujiance'
+  import * as echarts from "echarts";
+  import PieChartrenyuan from '@/views/echarts/components/PieChartrenyuanb'
+  // 1.1完好率饼图
+  const wanhao_Chart = {
+  // seriesName: '完好率',
+  unit: '次',
+  color: ['#30e9ff', '#d9d9d9', '#fdc004'],
+  Data: {
+    seriesData: [
+    { value: 75, name: '完好' },
+      { value: 25, name: '不完好' },
+      // { value: 12, name: '报警' }
+    ]
+  },
+  label: {
+    normal: {
+      position: 'inner',
+      show: false
+    }
+  },
+
+  // radius: ['50%', '55%']
+}
+  // 1.2维修率饼图
+  const weixiu_Chart = {
+  // seriesName: '维修率',
+  unit: '次',
+  color: ['#fe7f02', '#fdc004'],
+  Data: {
+    seriesData: [
+    { value: 15, name: '维修' },
+      { value: 85, name: '无维修' },
+      // { value: 12, name: '报警' }
+    ]
+  },
+  label: {
+    normal: {
+      position: 'inner',
+      show: false
+    }
+  },
+
+  // radius: ['50%', '55%']
+}
+  // 1.3损害率饼图
+  const sunhai_Chart = {
+  // seriesName: '损害率',
+  unit: '次',
+  color: [ '#d2cece','#ff0202', '#fdc004'],
+  Data: {
+    seriesData: [
+    { value: 10, name: '损害' },
+      { value: 90, name: '无损害' }
+    ]
+  },
+  label: {
+    normal: {
+      position: 'inner',
+      show: false
+    }
+  },
+
+  // radius: ['50%', '55%']
+}
+
+  export default {
+    name: 'zhiwujianceList',
+    components: {
+      Pagination,
+      pageye,
+      ButtonBar,
+      zhiwujianceAdd,
+      // zhiwujianceAddShebei,
+      zhiwujianceInfo,PieChartrenyuan
+    },
+    data() {
+      return {
+        wanhao_Chart: wanhao_Chart, // 1.1
+        weixiu_Chart:weixiu_Chart,
+        sunhai_Chart: sunhai_Chart,
+        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: [
+        {cangku:'仓库1003F3',name: '康师傅矿泉水',tuUrl:'./image/tu1.jpg', createTime: '2023-05-03',createTime2: '18:26:38', changjia: '康师傅',shuliang:'1000',zhongliang:'500',
+         nameb: '康师傅矿泉水2',tuUrlb:'./image/tu2.jpg', createTimeb: '2023-05-03',createTime2: '18:26:38',changjiab: '康师傅',shuliangb:'1000',zhongliangb:'500'},
+         {cangku:'仓库1003F3',name: '康师傅矿泉水',tuUrl:'./image/tu1.jpg', createTime: '2023-05-03',createTime2: '18:26:38', changjia: '康师傅',shuliang:'1000',zhongliang:'500',
+         nameb: '康师傅矿泉水2',tuUrlb:'./image/tu2.jpg', createTimeb: '2023-05-03',createTime2: '18:26:38',changjiab: '康师傅',shuliangb:'1000',zhongliangb:'500'},
+         {cangku:'仓库1003F3',name: '康师傅矿泉水',tuUrl:'./image/tu1.jpg', createTime: '2023-05-03',createTime2: '18:26:38', changjia: '康师傅',shuliang:'1000',zhongliang:'500',
+         nameb: '康师傅矿泉水2',tuUrlb:'./image/tu2.jpg', createTimeb: '2023-05-03',createTime2: '18:26:38',changjiab: '康师傅',shuliangb:'1000',zhongliangb:'500'},
+         {cangku:'仓库1003F3',name: '康师傅矿泉水',tuUrl:'./image/tu1.jpg', createTime: '2023-05-03',createTime2: '18:26:38', changjia: '康师傅',shuliang:'1000',zhongliang:'500',
+         nameb: '康师傅矿泉水2',tuUrlb:'./image/tu2.jpg', createTimeb: '2023-05-03',createTime2: '18:26:38',changjiab: '康师傅',shuliangb:'1000',zhongliangb:'500'},
+          // { weizhi: '石家庄市长安区乐城', quyu: '开发区', mianji: '2000',
+          //  cenggao: '23', jiage: '263', xingzhi: '库房、物流仓储',
+          //  fangyuan: '中介', lianxiren: '孙宁', dianhua: '17073404927' ,leibie: '摄像头',beizhu:'备注2'},
+          //  { weizhi: '石家庄市长安区乐城', quyu: '开发区', mianji: '2000',
+          //  cenggao: '23', jiage: '263', xingzhi: '库房、物流仓储',
+          //  fangyuan: '中介', lianxiren: '孙宁', dianhua: '17073404927' ,leibie: '机器人',beizhu:'备注2'},
+          //  { weizhi: '石家庄市长安区乐城', quyu: '开发区', mianji: '2000',
+          //  cenggao: '23', jiage: '263', xingzhi: '库房、物流仓储',
+          //  fangyuan: '中介', lianxiren: '孙宁', dianhua: '17073404927' ,leibie: '电子围栏',beizhu:'备注2'},
+          //  { weizhi: '石家庄市长安区乐城', quyu: '开发区', mianji: '2000',
+          //  cenggao: '23', jiage: '263', xingzhi: '库房、物流仓储',
+          //  fangyuan: '中介', lianxiren: '孙宁', dianhua: '17073404927' ,leibie: '门禁',beizhu:'备注2'},
+          //  { weizhi: '石家庄市长安区乐城', quyu: '开发区', mianji: '2000',
+          //  cenggao: '23', jiage: '263', xingzhi: '库房、物流仓储',
+          //  fangyuan: '中介', lianxiren: '孙宁', dianhua: '17073404927' ,leibie: '摄像头',beizhu:'备注2'},
+        ],
+
+        Datalista: [
+         {cangku:'仓库1003F3',name: '康师傅矿泉水',tuUrl:'./image/tu1.jpg', createTime: '2023-05-03',createTime2: '18:26:38', changjia: '康师傅',shuliang:'1000',zhongliang:'500',
+         nameb: '康师傅矿泉水2',tuUrlb:'./image/tu2.jpg', createTimeb: '2023-05-03',createTime2: '18:26:38',changjiab: '康师傅',shuliangb:'1000',zhongliangb:'500'},
+
+        ],
+        listLoading: false,
+        listQuery: {
+          params: {
+            manufacturerName: '',
+            supplierType: '',
+            useOrgSid: '',
+            createOrgSid: '',
+            manufacturerTelePhone: '',
+            contactName: ''
+          },
+          current: 1,
+          size: 5,
+          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' },
+          { title: '完好', id: '3' },
+        ],
+        cangku_list: [
+        { title: '仓库1', id: '1' },
+          { title: '仓库2', id: '2' },
+      ],
+      dialogImage: false,
+        // 视频开始
+     videoSrc: '../../../image/cangkushipin.mp4',
+
+      playStatus: '',
+      muteStatus: '',
+      isMute: true,
+      isPlay: false,
+      width: '100%', // 设置视频播放器的显示宽度（以像素为单位）
+      height: '430', // 设置视频播放器的显示高度（以像素为单位）
+      preload: 'auto', //  建议浏览器是否应在<video>加载元素后立即开始下载视频数据。
+      controls: true, // 确定播放器是否具有用户可以与之交互的控件。没有控件，启动视频播放的唯一方法是使用autoplay属性或通过Player API。
+       autoplay: true,
+      // 视频结束
+        rules: {}
+      }
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    created() {
+      // 初始化变量
+      // this.init()
+    },
+    methods: {
+      toShipin() {
+      this.dialogImage = true
+    },
+    handleClose() {
+      this.dialogImage = false
+      // 关闭弹出框时 视频关闭播放
+      const video = document.getElementById('video')
+      video.pause()
+    },
+    handleVideo() {
+      this.$refs.videoDiolag.dialogImage = true
+    },
+      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
+        }
+      },
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      // 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)
+      },
+      // 打开添加设备对话框
+      handleDddShebei() {
+        this.$router.push({
+        path: '/zhiwujiance/shebeiList',
+      })
+        // this.viewState = 5
+        // this.$refs['divaddshebei'].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 => {
+              loading.close()
+            })
+          }).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{
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: flex-start;align-items: flex-start;
+}
+.webye{flex: 1;text-align: left;}
+/* ///// */
+
+.newslilefts{ display: flex;
+    flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: flex-start;align-items: center;}
+  /* .news  .contents  .newslis .tits{padding: 0;width: 20px;color: #8e8e8e;} */
+/*
+.news  .contents  .newslis .rentu{padding: 0;width: 80px;height: 80px;border-radius: 5px;border: 1px solid #ff2424;margin: 0 20px;} */
+.newslilefts .yuans{padding: 0;margin: 0 20px;width: 80px;height: 80px !important;border-radius: 80px;border: 1px solid #ff2424;text-align: center;display:inline-block;}
+.newslilefts .yuans p{padding: 23px 0 10px 0;color: #ff2424;font-size: 26px;margin: 0;}
+.newslilefts .yuans span{padding: 0;margin: 0;color: #8e8e8e;font-size: 14px;display: block;}
+/* .news  .contents  .newslis .rightzi{padding: 0 10px;color: #8e8e8e;text-align: left;}
+.news  .contents  .newslis .rightzi p{padding: 1px 0;color: #8e8e8e;font-size: 12px;margin: 0;} */
+.newslilefts  .newsli {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  margin: 0px 0px;
+  padding: 5px 10px;
+  /* border-bottom: 1px solid #ececee; */
+}
+.newslilefts  .newsli .tu {
+  padding: 0px 0 0 0;
+  width: 120px;height: 120px;border-radius: 5px;border: 1px solid #ff2424;
+}
+.newslilefts  .newsli .tu img {
+  width: 100%;height: 100%;border-radius: 5px;border: 1px solid #ff2424;
+}
+.newslilefts  .newsli .rightwen {
+  padding: 13px 0 0 20px;text-align: left;
+  flex: 3;
+}
+.newslilefts  .newsli .rightwen .tit {
+  padding: 7px 0;
+  font-size: 14px;font-weight: bold;
+  /* height: 25px;
+  overflow: hidden;
+  line-height: 25px; */
+}
+.newslilefts  .newsli .rightwen .time {
+  padding: 7px 0;
+  color: #848383;
+ font-size: 14px;
+  /* height: 25px;
+  line-height: 25px; */
+}
+.news  .contents  .newslis  .caozuos {width: 180px;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  margin: 0px 0px;
+  padding: 5px 10px;
+  text-align: right;
+}
+</style>