From 6fbace53ee3d19a4736416721ffba3ca10f8507e Mon Sep 17 00:00:00 2001
From: yangzongjia <yangzongjia>
Date: Mon, 5 Jun 2023 19:06:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E8=8E=B7=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E5=88=86=E5=88=AB=E6=B7=BB=E5=8A=A0=E5=88=B0?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=A1=A8=EF=BC=8C=E6=8A=A5=E8=AD=A6=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=8C=E6=97=A5=E5=BF=97=E8=A1=A8=E3=80=82=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8D?=
 =?UTF-8?q?=E5=86=8D=E5=AF=B9=E6=B5=B7=E5=BA=B7=E6=8E=A5=E5=8F=A3=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E6=93=8D=E4=BD=9C=E3=80=82=E7=9B=B4=E6=8E=A5=E5=AD=98?=
 =?UTF-8?q?=E5=BA=93=E3=80=82=20=E6=B5=8B=E8=AF=95=E6=91=84=E5=83=8F?=
 =?UTF-8?q?=E5=A4=B4=E6=8A=93=E6=8B=8D=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/callPolice/callPolice.js              |    8 +
 src/api/device/device.js                      |   10 +
 src/api/deviceImage/deviceImage.js            |    8 +
 src/api/deviceLog/deviceLog.js                |    8 +
 src/views/baojingchaxun/baojingchaxunList.vue |  634 ++++------
 src/views/shebeirizhi/shebeirizhiList.vue     |  594 ++++-----
 .../shebeitaizhang/shebeitaizhangAdd.vue      |   18 +-
 .../shebeitaizhang/shebeitaizhangList.vue     |    4 +-
 src/views/zhiwujiance/zhiwujianceList.vue     | 1073 +++++++++--------
 9 files changed, 1129 insertions(+), 1228 deletions(-)
 create mode 100644 src/api/callPolice/callPolice.js
 create mode 100644 src/api/deviceImage/deviceImage.js
 create mode 100644 src/api/deviceLog/deviceLog.js

diff --git a/src/api/callPolice/callPolice.js b/src/api/callPolice/callPolice.js
new file mode 100644
index 0000000..af8f29b
--- /dev/null
+++ b/src/api/callPolice/callPolice.js
@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+// eslint-disable-next-line no-unused-vars
+import qs from 'qs'
+
+// 获取报警列表
+export function getCallPolicePage(data) {
+  return request({ url: '/callPolice/getCallPolicePage', method: 'GET', params: data })
+}
diff --git a/src/api/device/device.js b/src/api/device/device.js
index 11cd5fc..5231947 100644
--- a/src/api/device/device.js
+++ b/src/api/device/device.js
@@ -2,11 +2,21 @@ import request from '@/utils/request'
 // eslint-disable-next-line no-unused-vars
 import qs from 'qs'
 
+// 添加设备
+export function createDeviceGroup(data) {
+  return request({ url: '/device/createDeviceGroup', method: 'post', params: data })
+}
+
 // 添加设备
 export function createDevice(data) {
   return request({ url: '/device/createDevice', method: 'post', params: data })
 }
 
+// 删除设备
+export function removeDevice(data) {
+  return request({ url: '/device/removeDevice', method: 'post', params: data })
+}
+
 // 获取设备列表
 export function getDevicePage(data) {
   return request({ url: '/device/getDevicePage', method: 'GET', params: data })
diff --git a/src/api/deviceImage/deviceImage.js b/src/api/deviceImage/deviceImage.js
new file mode 100644
index 0000000..66c77d2
--- /dev/null
+++ b/src/api/deviceImage/deviceImage.js
@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+// eslint-disable-next-line no-unused-vars
+import qs from 'qs'
+
+// 获取设备日志列表
+export function getDeviceImagePage(data) {
+  return request({ url: '/deviceImage/getDeviceImagePage', method: 'GET', params: data })
+}
diff --git a/src/api/deviceLog/deviceLog.js b/src/api/deviceLog/deviceLog.js
new file mode 100644
index 0000000..f999a73
--- /dev/null
+++ b/src/api/deviceLog/deviceLog.js
@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+// eslint-disable-next-line no-unused-vars
+import qs from 'qs'
+
+// 获取设备日志列表
+export function getDeviceLogPage(data) {
+  return request({ url: '/deviceLog/getDeviceLogPage', method: 'GET', params: data })
+}
diff --git a/src/views/baojingchaxun/baojingchaxunList.vue b/src/views/baojingchaxun/baojingchaxunList.vue
index 3ec58bb..009f42a 100644
--- a/src/views/baojingchaxun/baojingchaxunList.vue
+++ b/src/views/baojingchaxun/baojingchaxunList.vue
@@ -8,36 +8,21 @@
           <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-input v-model="listQuery.params.manufacturerName" clearable placeholder=""
-                  class="addinputw"></el-input>
+                <el-input v-model="listQuery.name" clearable placeholder="" class="addinputw"></el-input>
               </el-form-item>
               <el-form-item label="设备类型">
-                <el-select v-model="listQuery.params.supplierType" filterable clearable placeholder="请选择设备类型">
+                <el-select v-model="listQuery.type" 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-date-picker v-model="listQuery.params.time1" type="date" placeholder="选择日期"
+                <el-date-picker v-model="listQuery.startTIme" type="date" placeholder="选择日期"
                   maxlength="20"></el-date-picker>
-
-                <!-- <el-select v-model="listQuery.params.time1" 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-date-picker v-model="listQuery.params.time2" type="date" placeholder="选择日期"
+                <el-date-picker v-model="listQuery.endTime" type="date" placeholder="选择日期"
                   maxlength="20"></el-date-picker>
-
-                <!-- <el-select v-model="listQuery.params.time2" 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-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>
@@ -56,30 +41,9 @@
             @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 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>
-              </template>
-            </el-table-column> -->
-            <!-- <el-table-column prop="jc" label="设备" width="220" header-align="center" align="center">
-              <template slot-scope="scope">
-                <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.bianma }}</span>
-              </template>
-            </el-table-column> -->
-            <!-- <el-table-column prop="jc" label="设备编码" header-align="center" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.bianma }}</span>
-              </template>
-            </el-table-column> -->
-            <!-- <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 label="报警时间" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.policeTime }}</span>
+                <span>{{ scope.row.createTime }}</span>
               </template>
             </el-table-column>
             <el-table-column label="设备名称" width="" header-align="center" align="center">
@@ -89,29 +53,9 @@
             </el-table-column>
             <el-table-column label="设备位置" width="" header-align="center" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.weizhi }}</span>
+                <span>{{ scope.row.position }}</span>
               </template>
             </el-table-column>
-            <!-- <el-table-column label="出厂时间" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.time }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="安装时间" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.anzhuangtime }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="供货商" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.gonghuashang }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="生产厂家" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.owner }}</span>
-              </template>
-            </el-table-column> -->
             <el-table-column label="状态" align="center">
               <template slot-scope="scope">
                 <span>{{ getSupplierType(scope.row.supplierTypeValue) }}</span>
@@ -126,331 +70,281 @@
         </div>
       </div>
     </div>
-    <!-- <baojingchaxunAdd v-show="viewState == 2" ref="divadd" @doback="resetState" @reloadlist="handleFilter"/>
-    <baojingchaxunInfo 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 baojingchaxunAdd from './baojingchaxunAdd'
-  // import baojingchaxunInfo from './baojingchaxunInfo'
-  // import req from '@/api/baojingchaxun/baojingchaxun'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import { getCallPolicePage } from '@/api/callPolice/callPolice'
 
-  export default {
-    name: 'baojingchaxunList',
-    components: {
-      Pagination,
-      pageye,
-      ButtonBar,
-      // baojingchaxunAdd,
-      // baojingchaxunInfo,
-    },
-    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: 'build',
-          //   btnLabel: '导出'
-          // },
-          {
-            type: 'info',
-            size: 'small',
-            icon: 'cross',
-            btnKey: 'doClose',
-            btnLabel: '关闭'
-          }
-        ],
-        viewState: 1,
-        isSearchShow: false,
-        searchxianshitit: '显示查询条件',
-        sids: [],
-        // 查询 -----------
-        tableKey: 0,
-        list: [
-          { bianma: 'ZYR2060801', supplierTypeValue: '1', name: '电梯系统', weizhi: '库房', time: '2023-02-26', anzhuangtime: '2023-02-26', gonghuashang: 'Pepsi Cola', owner: 'Owner Peer', policeTime: '2023-05-18 06:00:00', isElse: '待处理' },
-          { bianma: 'ZYR2060802', supplierTypeValue: '1', name: '电梯系统', weizhi: '观察', time: '2023-02-26', anzhuangtime: '2023-02-26', gonghuashang: 'Pepsi Cola', owner: 'Owner Peer', policeTime: '2023-05-19 06:00:00', isElse: '已处理' },
-          { bianma: 'ZYR2060803', supplierTypeValue: '2', name: '电梯系统', weizhi: '后院', time: '2023-02-26', anzhuangtime: '2023-02-26', gonghuashang: 'Pepsi Cola', owner: 'Owner Peer', policeTime: '2023-05-19 06:00:00', isElse: '待处理' },
-          { bianma: 'ZYR2060804', supplierTypeValue: '2', name: '电梯系统', weizhi: '铁皮', time: '2023-02-26', anzhuangtime: '2023-02-26', gonghuashang: 'Pepsi Cola', owner: 'Owner Peer', policeTime: '2023-05-20 06:00:00', isElse: '已处理' },
-          { bianma: 'ZYR2060805', supplierTypeValue: '2', name: '电梯系统', weizhi: '盲点', time: '2023-02-26', anzhuangtime: '2023-02-26', gonghuashang: 'Pepsi Cola', owner: 'Owner Peer', policeTime: '2023-05-20 06:00:00', isElse: '待处理' },
-          { bianma: 'ZYR2060806', supplierTypeValue: '3', name: '电梯系统', weizhi: '凉亭', time: '2023-02-26', anzhuangtime: '2023-02-26', gonghuashang: 'Pepsi Cola', owner: 'Owner Peer', policeTime: '2023-05-21 06:00:00', isElse: '待处理' },
-          { bianma: 'ZYR2060807', supplierTypeValue: '3', name: '电梯系统', weizhi: '书房', time: '2023-02-26', anzhuangtime: '2023-02-26', gonghuashang: 'Pepsi Cola', owner: 'Owner Peer', policeTime: '2023-05-23 06:00:00', isElse: '已处理' },
-          { bianma: 'ZYR2060808', supplierTypeValue: '4', name: '电梯系统', weizhi: '藏经阁', time: '2023-02-26', anzhuangtime: '2023-02-26', gonghuashang: 'Pepsi Cola', owner: 'Owner Peer', policeTime: '2023-05-23 06:00:00', isElse: '待处理' },
-          { bianma: 'ZYR2060809', supplierTypeValue: '4', name: '电梯系统', weizhi: '车库', time: '2023-02-26', anzhuangtime: '2023-02-26', gonghuashang: 'Pepsi Cola', owner: 'Owner Peer', policeTime: '2023-05-23 06:00:00', isElse: '已处理' },
-          { bianma: 'ZYR2060810', supplierTypeValue: '5', name: '电梯系统', weizhi: '斜坡', time: '2023-02-26', anzhuangtime: '2023-02-26', gonghuashang: 'Pepsi Cola', owner: 'Owner Peer', policeTime: '2023-05-23 06:00:00', isElse: '待处理' },
-        ],
-        listLoading: false,
-        listQuery: {
-          params: {
-            manufacturerName: '',
-            supplierType: '',
-            useOrgSid: '',
-            createOrgSid: '',
-            manufacturerTelePhone: '',
-            contactName: ''
-          },
-          current: 1,
-          size: 5,
-          total: 10
-        },
-        supplierType_list: [
-          { title: '入侵报警', id: '1' },
-          { title: '电子围栏', id: '2' },
-          { title: '门禁报警', id: '3' },
-          { title: '监控报警', id: '4' },
-          { title: '设备离线', id: '5' },
-        ],
-        rules: {}
+export default {
+  name: 'baojingchaxunList',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      viewState: 1,
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      sids: [],
+      // 查询 -----------
+      tableKey: 0,
+      list: [
+        { bianma: 'ZYR2060801', supplierTypeValue: '1', name: '电梯系统', weizhi: '库房', time: '2023-02-26', anzhuangtime: '2023-02-26', gonghuashang: 'Pepsi Cola', owner: 'Owner Peer', policeTime: '2023-05-18 06:00:00', isElse: '待处理' },
+        { bianma: 'ZYR2060802', supplierTypeValue: '1', name: '电梯系统', weizhi: '观察', time: '2023-02-26', anzhuangtime: '2023-02-26', gonghuashang: 'Pepsi Cola', owner: 'Owner Peer', policeTime: '2023-05-19 06:00:00', isElse: '已处理' },
+        { bianma: 'ZYR2060803', supplierTypeValue: '2', name: '电梯系统', weizhi: '后院', time: '2023-02-26', anzhuangtime: '2023-02-26', gonghuashang: 'Pepsi Cola', owner: 'Owner Peer', policeTime: '2023-05-19 06:00:00', isElse: '待处理' },
+        { bianma: 'ZYR2060804', supplierTypeValue: '2', name: '电梯系统', weizhi: '铁皮', time: '2023-02-26', anzhuangtime: '2023-02-26', gonghuashang: 'Pepsi Cola', owner: 'Owner Peer', policeTime: '2023-05-20 06:00:00', isElse: '已处理' },
+        { bianma: 'ZYR2060805', supplierTypeValue: '2', name: '电梯系统', weizhi: '盲点', time: '2023-02-26', anzhuangtime: '2023-02-26', gonghuashang: 'Pepsi Cola', owner: 'Owner Peer', policeTime: '2023-05-20 06:00:00', isElse: '待处理' },
+        { bianma: 'ZYR2060806', supplierTypeValue: '3', name: '电梯系统', weizhi: '凉亭', time: '2023-02-26', anzhuangtime: '2023-02-26', gonghuashang: 'Pepsi Cola', owner: 'Owner Peer', policeTime: '2023-05-21 06:00:00', isElse: '待处理' },
+        { bianma: 'ZYR2060807', supplierTypeValue: '3', name: '电梯系统', weizhi: '书房', time: '2023-02-26', anzhuangtime: '2023-02-26', gonghuashang: 'Pepsi Cola', owner: 'Owner Peer', policeTime: '2023-05-23 06:00:00', isElse: '已处理' },
+        { bianma: 'ZYR2060808', supplierTypeValue: '4', name: '电梯系统', weizhi: '藏经阁', time: '2023-02-26', anzhuangtime: '2023-02-26', gonghuashang: 'Pepsi Cola', owner: 'Owner Peer', policeTime: '2023-05-23 06:00:00', isElse: '待处理' },
+        { bianma: 'ZYR2060809', supplierTypeValue: '4', name: '电梯系统', weizhi: '车库', time: '2023-02-26', anzhuangtime: '2023-02-26', gonghuashang: 'Pepsi Cola', owner: 'Owner Peer', policeTime: '2023-05-23 06:00:00', isElse: '已处理' },
+        { bianma: 'ZYR2060810', supplierTypeValue: '5', name: '电梯系统', weizhi: '斜坡', time: '2023-02-26', anzhuangtime: '2023-02-26', gonghuashang: 'Pepsi Cola', owner: 'Owner Peer', policeTime: '2023-05-23 06:00:00', isElse: '待处理' },
+      ],
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 5,
+        total: 10
+      },
+      supplierType_list: [
+        { title: '入侵报警', id: '1' },
+        { title: '电子围栏', id: '2' },
+        { title: '门禁报警', id: '3' },
+        { title: '监控报警', id: '4' },
+        { title: '设备离线', id: '5' },
+      ],
+      rules: {}
+    }
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  created() {
+    // 初始化变量
+    this.init()
+  },
+  methods: {
+    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
+        }
       }
     },
-    mounted() {
-      this.$refs['btnbar'].setButtonList(this.btnList)
+    resetState() {
+      this.viewState = 1
     },
-    created() {
-      // 初始化变量
-      // this.init()
+    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
+      }
     },
-    methods: {
-      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 = '隐藏查询条件'
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    init() {
+      getCallPolicePage(this.listQuery).then((res) => {
+        if (res.code == 200) {
+          // this.list = res.data.records
+          this.total = res.total
         } else {
-          this.searchxianshitit = '显示查询条件'
+          // this.list = []
         }
-      },
-      // 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)
-      },
+      })
+    },
+    // 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)
+    },
 
-      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)
-        // 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)
+      // 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>
-</style>
\ No newline at end of file
+<style scoped></style>
\ No newline at end of file
diff --git a/src/views/shebeirizhi/shebeirizhiList.vue b/src/views/shebeirizhi/shebeirizhiList.vue
index fe920cb..6cdddd1 100644
--- a/src/views/shebeirizhi/shebeirizhiList.vue
+++ b/src/views/shebeirizhi/shebeirizhiList.vue
@@ -8,29 +8,26 @@
           <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-date-picker v-model="listQuery.params.supplierType" type="date" placeholder="选择日期"
+                <el-date-picker v-model="listQuery.startTime" type="date" placeholder="选择日期"
                   maxlength="20"></el-date-picker>
               </el-form-item>
               <el-form-item label="设备名称">
-                <el-select v-model="listQuery.params.supplierType1" filterable clearable placeholder="请选择设备名称">
+                <el-select v-model="listQuery.name" 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-input v-model="listQuery.params.ress" clearable placeholder="" class="addinputw" placeholder="请填写地点名称"></el-input>
-              </el-form-item>
-              <el-form-item label="名称">
-                <el-input v-model="listQuery.params.name" clearable placeholder="" class="addinputw" placeholder="请填写名称"></el-input>
+                <el-input v-model="listQuery.position" clearable placeholder="" class="addinputw"
+                  placeholder="请填写地点名称"></el-input>
               </el-form-item>
+              <!-- <el-form-item label="名称">
+                <el-input v-model="listQuery.params.name" clearable placeholder="" class="addinputw"
+                  placeholder="请填写名称"></el-input>
+              </el-form-item> -->
               <el-form-item label="卡号">
-                <el-input v-model="listQuery.params.code" clearable placeholder="" class="addinputw" placeholder="请填写卡号"></el-input>
+                <el-input v-model="listQuery.code" clearable placeholder="" class="addinputw"
+                  placeholder="请填写卡号"></el-input>
               </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>
@@ -49,17 +46,6 @@
             @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 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>
-              </template>
-            </el-table-column> -->
-            <!-- <el-table-column prop="jc" label="设备" width="220" header-align="center" align="center">
-              <template slot-scope="scope">
-                <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.bianma }}</span>
-              </template>
-            </el-table-column> -->
             <el-table-column prop="jc" label="时间" header-align="center" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.time }}</span>
@@ -67,7 +53,7 @@
             </el-table-column>
             <el-table-column label="设备名称" width="" header-align="center" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.deviceName }}</span>
+                <span>{{ scope.row.name }}</span>
               </template>
             </el-table-column>
             <el-table-column label="地点名称" align="center">
@@ -75,11 +61,11 @@
                 <span>{{ scope.row.position }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="名称" align="center">
+            <!-- <el-table-column label="名称" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.name }}</span>
               </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="卡号" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.code }}</span>
@@ -94,331 +80,271 @@
         </div>
       </div>
     </div>
-    <!-- <baojingchaxunAdd v-show="viewState == 2" ref="divadd" @doback="resetState" @reloadlist="handleFilter"/>
-    <baojingchaxunInfo 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 baojingchaxunAdd from './baojingchaxunAdd'
-  // import baojingchaxunInfo from './baojingchaxunInfo'
-  // import req from '@/api/baojingchaxun/baojingchaxun'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import { getDeviceLogPage } from '@/api/deviceLog/deviceLog'
 
-  export default {
-    name: 'baojingchaxunList',
-    components: {
-      Pagination,
-      pageye,
-      ButtonBar,
-      // baojingchaxunAdd,
-      // baojingchaxunInfo,
-    },
-    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: 'build',
-          //   btnLabel: '导出'
-          // },
-          {
-            type: 'info',
-            size: 'small',
-            icon: 'cross',
-            btnKey: 'doClose',
-            btnLabel: '关闭'
-          }
-        ],
-        viewState: 1,
-        isSearchShow: false,
-        searchxianshitit: '显示查询条件',
-        sids: [],
-        // 查询 -----------
-        tableKey: 0,
-        list: [
-          { time: '2023-05-23 16:10:20', deviceName: '巡更点1', position: '东岸广场西侧东门', name: '闫永军', code: 'KTIO00065' },
-          { time: '2023-05-23 16:10:20', deviceName: '巡更点1', position: '东岸广场西侧东门', name: '闫永军', code: 'KTIO00065' },
-          { time: '2023-05-23 16:10:20', deviceName: '巡更点2', position: '东岸广场西侧走廊', name: '冷柠', code: 'KTIO00065' },
-          { time: '2023-05-23 16:10:20', deviceName: '巡更点4', position: '东岸广场东侧东门', name: '冷柠', code: 'KTIO00065' },
-          { time: '2023-05-23 16:10:20', deviceName: '巡更点3', position: '2F走廊西侧', name: '冷柠', code: 'KTIO00065' },
-          { time: '2023-05-23 16:10:20', deviceName: '巡更点5', position: '2F大厅', name: '冷柠', code: 'KTIO00065' },
-          { time: '2023-05-23 16:10:20', deviceName: '巡更点2', position: '2F206控制系统门口', name: '冷柠', code: 'KTIO00065' },
-          { time: '2023-05-23 16:10:20', deviceName: '巡更点4', position: '2F206控制系统门口', name: '冷柠', code: 'KTIO00065' },
-          { time: '2023-05-23 16:10:20', deviceName: '巡更点1', position: '2F走廊西侧', name: '闫阵', code: 'KTIO00065' },
-        ],
-        listLoading: false,
-        listQuery: {
-          params: {
-            manufacturerName: '',
-            supplierType: '',
-            useOrgSid: '',
-            createOrgSid: '',
-            manufacturerTelePhone: '',
-            contactName: ''
-          },
-          current: 1,
-          size: 5,
-          total: 0
-        },
-        supplierType_list: [
-          { title: '巡更点1', id: '1' },
-          { title: '巡更点2', id: '2' },
-          { title: '巡更点3', id: '3' },
-          { title: '巡更点4', id: '4' },
-          { title: '巡更点5', id: '5' },
+export default {
+  name: 'baojingchaxunList',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      viewState: 1,
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      sids: [],
+      // 查询 -----------
+      tableKey: 0,
+      list: [
+        { time: '2023-05-23 16:10:20', deviceName: '巡更点1', position: '东岸广场西侧东门', name: '闫永军', code: 'KTIO00065' },
+        { time: '2023-05-23 16:10:20', deviceName: '巡更点1', position: '东岸广场西侧东门', name: '闫永军', code: 'KTIO00065' },
+        { time: '2023-05-23 16:10:20', deviceName: '巡更点2', position: '东岸广场西侧走廊', name: '冷柠', code: 'KTIO00065' },
+        { time: '2023-05-23 16:10:20', deviceName: '巡更点4', position: '东岸广场东侧东门', name: '冷柠', code: 'KTIO00065' },
+        { time: '2023-05-23 16:10:20', deviceName: '巡更点3', position: '2F走廊西侧', name: '冷柠', code: 'KTIO00065' },
+        { time: '2023-05-23 16:10:20', deviceName: '巡更点5', position: '2F大厅', name: '冷柠', code: 'KTIO00065' },
+        { time: '2023-05-23 16:10:20', deviceName: '巡更点2', position: '2F206控制系统门口', name: '冷柠', code: 'KTIO00065' },
+        { time: '2023-05-23 16:10:20', deviceName: '巡更点4', position: '2F206控制系统门口', name: '冷柠', code: 'KTIO00065' },
+        { time: '2023-05-23 16:10:20', deviceName: '巡更点1', position: '2F走廊西侧', name: '闫阵', code: 'KTIO00065' },
+      ],
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 5,
+        total: 0
+      },
+      supplierType_list: [
+        { title: '巡更点1', id: '1' },
+        { title: '巡更点2', id: '2' },
+        { title: '巡更点3', id: '3' },
+        { title: '巡更点4', id: '4' },
+        { title: '巡更点5', id: '5' },
 
-        ],
-        rules: {}
+      ],
+      rules: {}
+    }
+  },
+  mounted() {
+    // this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  created() {
+    // 初始化变量
+    this.init()
+  },
+  methods: {
+    getPosition(item) {
+      for (var i = 0; i < this.supplierType_list.length; i++) {
+        if (this.supplierType_list[i].id == item) {
+          return this.supplierType_list[i].title
+        }
       }
     },
-    mounted() {
-      this.$refs['btnbar'].setButtonList(this.btnList)
+    resetState() {
+      this.viewState = 1
     },
-    created() {
-      // 初始化变量
-      // this.init()
+    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
+      }
     },
-    methods: {
-      getPosition(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 = '隐藏查询条件'
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    init() {
+      getDeviceLogPage(this.listQuery).then((res) => {
+        if (res.code == 200) {
+          this.list = res.data.records
+          this.total = res.total
         } else {
-          this.searchxianshitit = '显示查询条件'
+          this.list = []
         }
-      },
-      // 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)
-      },
+      })
+    },
+    // 序号
+    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)
+    },
 
-      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()
+              this.$message({ type: 'success', message: resp.msg, showClose: true })
+              this.getList()
+            } else {
               loading.close()
-            })
-          }).catch(() => {
+            }
+          }).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)
-        // 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)
+      // 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>
-</style>
\ No newline at end of file
+<style scoped></style>
\ No newline at end of file
diff --git a/src/views/shebeitaizhang/shebeitaizhangAdd.vue b/src/views/shebeitaizhang/shebeitaizhangAdd.vue
index c942531..e49816e 100644
--- a/src/views/shebeitaizhang/shebeitaizhangAdd.vue
+++ b/src/views/shebeitaizhang/shebeitaizhangAdd.vue
@@ -64,6 +64,15 @@
                 <el-input v-model="addForm.name" maxlength="20" placeholder="请填写设备名称" class="addinputw" clearable />
               </el-form-item>
             </el-col>
+            <el-col :span="4" class="tleftb">
+              <span><span class="icon">*</span>设备序列号</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="deviceSerial">
+                <el-input v-model="addForm.deviceSerial" maxlength="20" placeholder="请填写设备序列号" class="addinputw"
+                  clearable />
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-form>
       </div>
@@ -72,7 +81,7 @@
 </template>
 
 <script>
-import { createDevice, updateDevice } from '@/api/device/device'
+import { createDevice, updateDevice, createDeviceGroup } from '@/api/device/device'
 
 export default {
   name: 'shebeitaizhangAdd',
@@ -127,7 +136,12 @@ export default {
           required: true,
           message: '请选择设备类型',
           trigger: 'change'
-        }]
+        }],
+        deviceSerial: [{
+          required: true,
+          message: '请选择序列号',
+          trigger: 'blur'
+        }],
       },
       submitdisabled: false
     }
diff --git a/src/views/shebeitaizhang/shebeitaizhangList.vue b/src/views/shebeitaizhang/shebeitaizhangList.vue
index 785d41e..828e9f1 100644
--- a/src/views/shebeitaizhang/shebeitaizhangList.vue
+++ b/src/views/shebeitaizhang/shebeitaizhangList.vue
@@ -133,7 +133,7 @@ import ButtonBar from '@/components/ButtonBar'
 // import { typeValues, getOrgSidByPath } from '@/api/cheliang/dictcommons'
 import shebeitaizhangAdd from './shebeitaizhangAdd'
 import shebeitaizhangInfo from './shebeitaizhangInfo'
-import { getDevicePage, getInfoById } from '@/api/device/device'
+import { getDevicePage, getInfoById,removeDevice } from '@/api/device/device'
 // import req from '@/api/shebeitaizhang/shebeitaizhang'
 import * as echarts from "echarts";
 import PieChartrenyuan from '@/views/echarts/components/PieChartrenyuanb'
@@ -426,7 +426,7 @@ export default {
             spinner: 'el-icon-loading',
             background: 'rgba(0, 0, 0, 0.7)'
           })
-          req.delBySids(this.sids.toString()).then(resp => {
+          removeDevice(this.sids.toString()).then(resp => {
             if (resp.success) {
               loading.close()
               this.$message({ type: 'success', message: resp.msg, showClose: true })
diff --git a/src/views/zhiwujiance/zhiwujianceList.vue b/src/views/zhiwujiance/zhiwujianceList.vue
index d17c749..1356158 100644
--- a/src/views/zhiwujiance/zhiwujianceList.vue
+++ b/src/views/zhiwujiance/zhiwujianceList.vue
@@ -1,132 +1,113 @@
 <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 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-input v-model="listQuery.manufacturerName" clearable placeholder="" class="addinputw"></el-input>
+                </el-form-item>
+                <el-form-item label="选择楼层">
+                  <el-select v-model="listQuery.supplierType1" filterable clearable placeholder="请选择楼层">
+                    <el-option v-for="item in floor_list" :key="item.id" :label="item.title" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="选择仓库">
+                  <el-select v-model="listQuery.supplierType2" filterable clearable placeholder="请选择仓库">
+                    <el-option v-for="item in cangku_list" :key="item.id" :label="item.title" :value="item.id" />
+                  </el-select>
+                </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>
-        <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" width="320" label="质物信息" header-align="center" align="center">
-              <template slot-scope="scope">
-                    <div class="newsname"  v-for="(item, index) in Datalistb" :key="index">
-                        <div class="tit">仓库名称：{{item.name}}</div>
-                        <div class="time">仓库位置：{{item.weizhi}}</div>
-                        <div class="time">货架号：{{item.huohao}}</div>
-                        <div class="time">联系人：{{item.ren}}</div>
-                        <div class="time">联系电话：{{item.dianhua}}</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" width="320" label="质物信息" header-align="center" align="center">
+                <template slot-scope="scope">
+                  <div class="newsname" v-for="(item, index) in Datalistb" :key="index">
+                    <div class="tit">仓库名称：{{ item.name }}</div>
+                    <div class="time">仓库位置：{{ item.weizhi }}</div>
+                    <div class="time">货架号：{{ item.huohao }}</div>
+                    <div class="time">联系人：{{ item.ren }}</div>
+                    <div class="time">联系电话：{{ item.dianhua }}</div>
+                  </div>
 
-              </template>
-            </el-table-column>
-            <el-table-column prop="jc" label="相似度对比" header-align="center" align="center">
-              <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> -->
+                </template>
+              </el-table-column>
+              <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>
                       </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 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>
-                </div>
-              </template>
-            </el-table-column>
+                </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-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" />
+                  <!-- <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>
-  </div>
-       <!-- 查看视频 -->
-       <el-dialog title="查看视频" :visible.sync="dialogImage" width="800px"  :before-close="handleClose">
+    <!-- 查看视频 -->
+    <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>
+          <source :src="videoSrc" type="video/mp4">
+        </video>
       </div>
       <!-- <span slot="footer" class="dialog-footer">
         <el-button @click="dialogImage = false">取 消</el-button>
@@ -135,29 +116,31 @@
     <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>
+  </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 = {
+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'
+import { getDeviceImagePage } from '@/api/deviceImage/deviceImage'
+
+// 1.1完好率饼图
+const wanhao_Chart = {
   // seriesName: '完好率',
   unit: '次',
   color: ['#30e9ff', '#d9d9d9', '#fdc004'],
   Data: {
     seriesData: [
-    { value: 75, name: '完好' },
+      { value: 75, name: '完好' },
       { value: 25, name: '不完好' },
       // { value: 12, name: '报警' }
     ]
@@ -171,14 +154,14 @@
 
   // radius: ['50%', '55%']
 }
-  // 1.2维修率饼图
-  const weixiu_Chart = {
+// 1.2维修率饼图
+const weixiu_Chart = {
   // seriesName: '维修率',
   unit: '次',
   color: ['#fe7f02', '#fdc004'],
   Data: {
     seriesData: [
-    { value: 15, name: '维修' },
+      { value: 15, name: '维修' },
       { value: 85, name: '无维修' },
       // { value: 12, name: '报警' }
     ]
@@ -192,14 +175,14 @@
 
   // radius: ['50%', '55%']
 }
-  // 1.3损害率饼图
-  const sunhai_Chart = {
+// 1.3损害率饼图
+const sunhai_Chart = {
   // seriesName: '损害率',
   unit: '次',
-  color: [ '#d2cece','#ff0202', '#fdc004'],
+  color: ['#d2cece', '#ff0202', '#fdc004'],
   Data: {
     seriesData: [
-    { value: 10, name: '损害' },
+      { value: 10, name: '损害' },
       { value: 90, name: '无损害' }
     ]
   },
@@ -213,149 +196,151 @@
   // 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'},
-
-        ],
-        Datalistb: [
-         {name:'仓库1',cangku:'仓库1003F3',weizhi: '石家庄市长安区和平西路126号', huohao: 'F31006C102325',ren:'李舜华',dianhua:'13933263572'},
-
-        ],
-        listLoading: false,
-        listQuery: {
-          params: {
-            manufacturerName: '',
-            supplierType: '',
-            useOrgSid: '',
-            createOrgSid: '',
-            manufacturerTelePhone: '',
-            contactName: ''
-          },
-          current: 1,
-          size: 5,
-          total: 0
+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'
         },
-        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: [
+        // { 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'
+        },
+
+      ],
+      Datalistb: [
+        { name: '仓库1', cangku: '仓库1003F3', weizhi: '石家庄市长安区和平西路126号', huohao: 'F31006C102325', ren: '李舜华', dianhua: '13933263572' },
+
+      ],
+      listLoading: false,
+      listQuery: {
+        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' },
+        { title: '仓库2', id: '2' },
       ],
       dialogImage: false,
-        // 视频开始
-     videoSrc: '../../../image/cangkushipin.mp4',
+      // 视频开始
+      videoSrc: '../../../image/cangkushipin.mp4',
 
       playStatus: '',
       muteStatus: '',
@@ -365,20 +350,20 @@
       height: '430', // 设置视频播放器的显示高度（以像素为单位）
       preload: 'auto', //  建议浏览器是否应在<video>加载元素后立即开始下载视频数据。
       controls: true, // 确定播放器是否具有用户可以与之交互的控件。没有控件，启动视频播放的唯一方法是使用autoplay属性或通过Player API。
-       autoplay: true,
+      autoplay: true,
       // 视频结束
-        rules: {}
-      }
-    },
-    mounted() {
-      this.$refs['btnbar'].setButtonList(this.btnList)
-    },
-    created() {
-      // 初始化变量
-      // this.init()
-    },
-    methods: {
-      toShipin() {
+      rules: {}
+    }
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  created() {
+    // 初始化变量
+    this.init()
+  },
+  methods: {
+    toShipin() {
       this.dialogImage = true
     },
     handleClose() {
@@ -390,250 +375,278 @@
     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
-          }
+    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 = '显示查询条件'
+      }
+    },
+    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
         }
-      },
-      // 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({
+      }
+    },
+    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() {
+      getDeviceImagePage(this.listQuery).then((res) => {
+      })
+    },
+    // 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.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 => {
+      // 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(() => {
+            }
+          }).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.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;
+}
+
 /* ///// */
 
-.newslilefts{ display: flex;
-    flex-direction: row;
+.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;} */
+  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;}
+.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 {
+.newslilefts .newsli {
   display: flex;
   flex-direction: row;
   flex-wrap: nowrap;
@@ -642,32 +655,47 @@
   padding: 5px 10px;
   /* border-bottom: 1px solid #ececee; */
 }
-.newslilefts  .newsli .tu {
+
+.newslilefts .newsli .tu {
   padding: 0px 0 0 0;
-  width: 120px;height: 120px;border-radius: 5px;border: 1px solid #ff2424;
+  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 .tu img {
+  width: 100%;
+  height: 100%;
+  border-radius: 5px;
+  border: 1px solid #ff2424;
 }
-.newslilefts  .newsli .rightwen {
-  padding: 20px 0 0 20px;text-align: left;
+
+.newslilefts .newsli .rightwen {
+  padding: 20px 0 0 20px;
+  text-align: left;
   flex: 3;
 }
-.newslilefts  .newsli .rightwen .tit {
+
+.newslilefts .newsli .rightwen .tit {
   padding: 7px 0;
-  font-size: 14px;font-weight: bold;
+  font-size: 14px;
+  font-weight: bold;
   /* height: 25px;
   overflow: hidden;
   line-height: 25px; */
 }
-.newslilefts  .newsli .rightwen .time {
+
+.newslilefts .newsli .rightwen .time {
   padding: 12px 0;
   /* color: #848383; */
- font-size: 14px;
+  font-size: 14px;
   /* height: 25px;
   line-height: 25px; */
 }
-.news  .contents  .newslis  .caozuos {width: 180px;
+
+.news .contents .newslis .caozuos {
+  width: 180px;
   display: flex;
   flex-direction: row;
   flex-wrap: nowrap;
@@ -676,6 +704,7 @@
   padding: 5px 10px;
   text-align: right;
 }
+
 /* //// */
 .newsname {
   /* display: flex;
@@ -683,20 +712,24 @@
   flex-wrap: nowrap;
   justify-content: space-between; */
   margin: 0px 0px;
-  padding: 5px 10px;text-align: left;
+  padding: 5px 10px;
+  text-align: left;
   /* border-bottom: 1px solid #ececee; */
 }
+
 .newsname .tit {
   padding: 5px 0;
-  font-size: 14px;font-weight: bold;
+  font-size: 14px;
+  font-weight: bold;
   /* height: 25px;
   overflow: hidden;
   line-height: 25px; */
 }
+
 .newsname .time {
   padding: 5px 0;
   /* color: #848383; */
- font-size: 14px;
+  font-size: 14px;
   /* height: 25px;
   line-height: 25px; */
 }