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

---
 src/api/call.js                               |   5 +
 src/views/baojingchaxun/baojingchaxunList.vue |   5 +-
 src/views/call.vue                            | 905 +++++++++---------
 .../shebeitaizhang/shebeitaizhangAdd.vue      |  24 +-
 .../shebeitaizhang/shebeitaizhangInfo.vue     |  14 +-
 5 files changed, 482 insertions(+), 471 deletions(-)

diff --git a/src/api/call.js b/src/api/call.js
index 794e4be..a1f4ac7 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -41,4 +41,9 @@ export function doCallMessageOffsets(data) {
 // 获取所有防区状态
 export function getCallZoneStatusList(data) {
   return request({ url: '/call/getCallZoneStatusList', method: 'GET'})
+}
+
+// 临时测试
+export function callTempFunc() {
+  return request({ url: '/call/callTempFunc', method: 'GET'})
 }
\ No newline at end of file
diff --git a/src/views/baojingchaxun/baojingchaxunList.vue b/src/views/baojingchaxun/baojingchaxunList.vue
index 009f42a..e485a32 100644
--- a/src/views/baojingchaxun/baojingchaxunList.vue
+++ b/src/views/baojingchaxun/baojingchaxunList.vue
@@ -187,11 +187,12 @@ export default {
     },
     init() {
       getCallPolicePage(this.listQuery).then((res) => {
+        console.log(res)
         if (res.code == 200) {
-          // this.list = res.data.records
+          this.list = res.data.records
           this.total = res.total
         } else {
-          // this.list = []
+          this.list = []
         }
       })
     },
diff --git a/src/views/call.vue b/src/views/call.vue
index fdf4a71..bf92943 100644
--- a/src/views/call.vue
+++ b/src/views/call.vue
@@ -79,7 +79,7 @@
             <div class="rights">
               <div class="note" @click="getMessageList">拉取消息：<span class="bluezi">38</span></div>
               <div class="note" @click="doMessageOffsets">手动提交消息偏移量：<span class="huizi">15</span></div>
-              <div class="note">消费者ID：<span class="redzi">{{consumerId}}</span></div>
+              <div class="note" @click="tempFunc">消费者ID：<span class="redzi">{{ consumerId }}</span></div>
             </div>
             <div class="bar">
             </div>
@@ -112,455 +112,470 @@
 </template>
 
 <script>
-  import { login1 } from '@/api/system/user/login.js'
-  import { getCallToken, getCallSonList, getCallArm, getCallDisArm, createCallConsumer, getCallMessageList, doCallMessageOffsets,getCallZoneStatusList } from '@/api/call.js'
-  import * as echarts from "echarts";
-  import PieChartrenyuan from '@/views/echarts/components/PieChartrenyuan'
-  import HomeMap from '@/views/dashboard/components/HomeMap'
-  export default {
-    name: 'index',
-    components: {
-      PieChartrenyuan, HomeMap,
+import { login1 } from '@/api/system/user/login.js'
+import {
+  getCallToken,
+  getCallSonList,
+  getCallArm,
+  getCallDisArm,
+  createCallConsumer,
+  getCallMessageList,
+  doCallMessageOffsets,
+  getCallZoneStatusList,
+  callTempFunc
+} from '@/api/call.js'
+import * as echarts from "echarts";
+import PieChartrenyuan from '@/views/echarts/components/PieChartrenyuan'
+import HomeMap from '@/views/dashboard/components/HomeMap'
+export default {
+  name: 'index',
+  components: {
+    PieChartrenyuan, HomeMap,
+  },
+  created() {
+    var _self = this
+  },
+  data() {
+    return {
+      token: '',
+      consumerId: '',
+      Datalista: [
+        { title: '您有新任务了', createTime: '2023-05-23' },
+        { title: '您有新任务了', createTime: '2023-05-23' },
+        { title: '您有新任务了', createTime: '2023-05-23' },
+        { title: '您有新任务了', createTime: '2023-05-23' },
+        { title: '您有新任务了', createTime: '2023-05-23' },
+      ],
+      Datalist: [
+        { title: '您有新消息了', createTime: '2023-05-23' },
+        { title: '您有新消息了', createTime: '2023-05-23' },
+        { title: '您有新消息了', createTime: '2023-05-23' },
+        { title: '您有新消息了', createTime: '2023-05-23' },
+        { title: '您有新消息了', createTime: '2023-05-23' },
+      ],
+    }
+  },
+  methods: {
+    getToken() {
+      getCallToken().then(res => {
+        console.log(res)
+      })
     },
-    created() {
-      var _self = this
+    getSonList() {
+      getCallSonList().then(res => {
+        console.log(res)
+      })
     },
-    data() {
-      return {
-        token: '',
-        consumerId: '',
-        Datalista: [
-          { title: '您有新任务了', createTime: '2023-05-23' },
-          { title: '您有新任务了', createTime: '2023-05-23' },
-          { title: '您有新任务了', createTime: '2023-05-23' },
-          { title: '您有新任务了', createTime: '2023-05-23' },
-          { title: '您有新任务了', createTime: '2023-05-23' },
-        ],
-        Datalist: [
-          { title: '您有新消息了', createTime: '2023-05-23' },
-          { title: '您有新消息了', createTime: '2023-05-23' },
-          { title: '您有新消息了', createTime: '2023-05-23' },
-          { title: '您有新消息了', createTime: '2023-05-23' },
-          { title: '您有新消息了', createTime: '2023-05-23' },
-        ],
-      }
+    subSystemArm() {
+      getCallArm().then(res => {
+        console.log(res)
+      })
+    },
+    subSystemDisArm() {
+      getCallDisArm().then(res => {
+        console.log(res)
+      })
+    },
+    createConsumer() {
+      createCallConsumer().then(res => {
+        this.consumerId = res.data.consumerId
+      })
+    },
+    getMessageList() {
+      getCallMessageList({ consumerId: this.consumerId }).then(res => {
+        console.log(res)
+      })
+    },
+    doMessageOffsets() {
+      doCallMessageOffsets({ consumerId: this.consumerId }).then(res => {
+        console.log(res)
+      })
+    },
+    tempFunc() {
+      callTempFunc().then(res => {
+        console.log(res)
+      })
+    },
+    getZoneStatusList() {
+      getCallZoneStatusList().then(res => {
+        console.log(res)
+      })
+    },
+    toMore() {
+      this.$router.push({
+        path: '/baojingchaxun/baojingchaxunList',
+      })
+    },
+    getMessage() {
+
+      this.$notify({
+        title: '报警消息',
+        dangerouslyUseHTMLString: true,
+        message: " <div style='display: flex;flex-direction: row;flex-wrap: nowrap;justify-content: flex-start;align-items:center;margin: 0 auto;height:60px;line-height: 60px;'><img style='width:40px;height:40px;margin: 0 10px 0 0;' src='/image/yujing.png'>" + "<span style='display: inline-block;margin: 0 0px 0 0;height:40px;line-height: 40px;font-weight: bold;'>新的报警待处理</span></div>",
+        position: 'bottom-right',
+        onClick: () => {
+          alert("这是一条新订单")
+        },
+        duration: 3000,
+      })
     },
-    methods: {
-      getToken() {
-        getCallToken().then(res => {
-          console.log(res)
-        })
-      },
-      getSonList() {
-        getCallSonList().then(res => {
-          console.log(res)
-        })
-      },
-      subSystemArm() {
-        getCallArm().then(res => {
-          console.log(res)
-        })
-      },
-      subSystemDisArm() {
-        getCallDisArm().then(res => {
-          console.log(res)
-        })
-      },
-      createConsumer() {
-        createCallConsumer().then(res => {
-          this.consumerId = res.data.consumerId
-        })
-      },
-      getMessageList() {
-        getCallMessageList({ consumerId: this.consumerId }).then(res => {
-          console.log(res)
-        })
-      },
-      doMessageOffsets() {
-        doCallMessageOffsets({ consumerId: this.consumerId }).then(res => {
-          console.log(res)
-        })
-      },
-      getZoneStatusList(){
-        getCallZoneStatusList().then(res => {
-          console.log(res)
-        })
-      },
-      toMore() {
-        this.$router.push({
-          path: '/baojingchaxun/baojingchaxunList',
-        })
-      },
-      getMessage() {
-
-        this.$notify({
-          title: '报警消息',
-          dangerouslyUseHTMLString: true,
-          message: " <div style='display: flex;flex-direction: row;flex-wrap: nowrap;justify-content: flex-start;align-items:center;margin: 0 auto;height:60px;line-height: 60px;'><img style='width:40px;height:40px;margin: 0 10px 0 0;' src='/image/yujing.png'>" + "<span style='display: inline-block;margin: 0 0px 0 0;height:40px;line-height: 40px;font-weight: bold;'>新的报警待处理</span></div>",
-          position: 'bottom-right',
-          onClick: () => {
-            alert("这是一条新订单")
-          },
-          duration: 3000,
-        })
-      },
-    }
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .zongcons {
-    margin: 0;
-    padding: 0;
-    flex: 1;
-    width: 100%;
-    height: calc(100% - 160px);
-  }
-
-  .rightbars {}
-
-  .zongcons .maps {
-    width: 100%;
-    height: 605px;
-    padding: 40px 0 0 100px;
-    text-align: right;
-  }
-
-  .webindex {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    justify-content: flex-start;
-    align-items: flex-start;
-    width: 100%;
-    padding: 20px;
-    height: 100%;
-    overflow-y: auto;
-    background: radial-gradient(#fff, #f5f7f4, #fff);
-  }
-
-  .tops {
-    width: 470px;
-    // display: flex;
-    // flex-direction: row;
-    // flex-wrap: nowrap;
-    // justify-content: flex-start;align-items: flex-start;
-    padding: 0 0 0 20px;
-    margin: 0px;
-  }
-
-  .tops .topboxs {
-    width: 100%;
-
-    padding: 0px 0px 15px 0 !important;
-
-  }
-
-  .topbox {
-    // width: 25%;
-    //margin: 20px 20 0 0 !important;
-    background-color: #fff;
-    box-shadow: 0px 0px 10px #E9E9E9;
-    border-radius: 5px;
-    padding: 20px 10px 21px 10px;
-  }
-
-  // .tops .topbox:last-of-type {
-  //   margin: 0;
-  // }
-  .topbox .toptitle {
-    font-size: 20px;
-    padding: 10px 20px;
-    font-weight: bold;
-    color: #333;
-    font-size: 16px;
-    border-bottom: 1px solid #ececee;
-  }
-
-  .topbox .mids {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    justify-content: flex-start;
-    align-items: center;
-    margin: 0;
-    padding: 35px 20px 38px 20px;
-    // padding: 20px ;
-  }
-
-  .topbox .mids .lefts {
-    width: 100px;
-  }
-
-  .topbox .mids .lefts .iconbox {
-    border-radius: 10px;
-    line-height: 80px;
-    width: 80px;
-    height: 80px;
-    color: #fff;
-    font-size: 36px;
-    text-align: center;
-  }
-
-  .iconbox_red {
-    background-color: #df2f07;
-  }
-
-  .iconbox_yellow {
-    background-color: #ff7521;
-  }
-
-
-  .iconbox_green {
-    background-color: #07C160;
-  }
-
-  .iconbox_blue {
-    background-color: #3f9bfa;
-  }
-
-  .iconbox_zi {
-    background-color: #6421ff;
-  }
-
-  .iconbox_fen {
-    background-color: #9b2efb;
-  }
-
-  .topbox .mids .rights {
-    flex: 1;
-    padding: 2px 0 2px 10px;
-  }
-
-  .topbox .mids .rights .note {
-    color: #333;
-    font-size: 14px;
-    padding: 0 0 3px 0;
-  }
-
-  .topbox .mids .rights .note span {
-    font-size: 20px;
-    padding: 0 5px;
-  }
-
-  /* 饼图部分 */
-  .tbars {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    justify-content: flex-start;
-    align-items: flex-start;
-    margin: 0;
-    padding: 20px 0 0 0;
-  }
-
-  .tbar {
-    width: 25%;
-    margin: 0 20px 0 0;
-    background-color: #fff;
-    box-shadow: 0px 0px 10px #E9E9E9;
-    border-radius: 5px;
-    padding: 10px;
-  }
-
-  .tbar:last-of-type {
-    margin: 0;
-  }
-
-  .tbar0 {
-    border-bottom: 0px solid #032ab8;
-  }
-
-  .tbar .title {
-    font-size: 20px;
-    padding: 10px 20px;
-    font-weight: bold;
-    color: #333;
-    font-size: 16px;
-    border-bottom: 1px solid #ececee;
-  }
-
-  .tbar .title span {
-    padding: 0 10px 0 0;
-  }
-
-  .tbar .bar {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    justify-content: flex-start;
-    align-items: center;
-    margin: 0;
-    padding: 0px;
-    height: 190px;
-
-  }
-
-  .con {
-    padding: 10px 0 0 0;
-    display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    justify-content: space-around;
-  }
-
-  .news {
-    width: calc(100% / 2);
-    margin: 0 20px 0 0;
-    background-color: #fff;
-    box-shadow: 0px 0px 10px #E9E9E9;
-    border-radius: 5px;
-    padding: 10px;
-  }
-
-  .news:last-of-type {
-    margin: 0;
-  }
-
-  .news .title {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    justify-content: space-between;
-    align-items: center;
-    padding: 10px 10px 10px 20px;
-    border-bottom: 1px solid #ececee;
-  }
-
-  .news .title .newstits {
-    font-weight: bold;
-    color: #333;
-    font-size: 16px;
-  }
-
-  .news .title .more {
-    text-align: right;
-    cursor: pointer;
-    color: #6c6a6a;
-    font-size: 14px;
-  }
-
-  .news .content {
-    padding: 10px 0;
-    height: 120px;
-    // height:160px;
-    overflow: hidden;
-  }
-
-  .news .content .newsli {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    justify-content: space-between;
-    margin: 0px 0px;
-    padding: 5px 10px;
-    border-bottom: 1px solid #ececee;
-  }
-
-  .news .content .newsli .dot {
-    padding: 0px 8px 0 0;
-    font-size: 18px;
-    height: 25px;
-    line-height: 25px;
-    color: #047cf7;
-  }
-
-  .news .content .newsli .tit {
-    padding: 0px 0;
-    font-size: 14px;
-    flex: 3;
-    height: 25px;
-    overflow: hidden;
-    line-height: 25px;
-    cursor: pointer;
-  }
-
-  // .news .content .newsli .tel{padding: 10px 0;color: #84d1f5;flex: 1;text-align: center;}
-  .news .content .newsli .time {
-    padding: 0px 0;
-    color: #666666;
-    text-align: right;
-    font-size: 14px;
-    width: 100px;
-    height: 25px;
-    line-height: 25px;
-  }
-
-  /////
-
-  .wenboxs {
-    padding: 20px;
-    margin: 0;
-    position: absolute;
-    z-index: 600;
-    top: 20px;
-    left: 20px;
-    // background-color: rgba($color: #ffffff, $alpha: 0.7);
-    // box-shadow: 0px 0px 6px #0d27c2;
-    background-color: #fff;
-    box-shadow: 0px 0px 10px #E9E9E9;
-    border-radius: 5px;
-  }
-
-  .wenboxs .wenbox {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    justify-content: flex-start;
-    align-items: center;
-    margin: 0;
-    font-size: 18px;
-    color: #8d8e90;
-    padding: 10px;
-    border-bottom: 1px solid #E9E9E9;
-  }
-
-  .wenboxs .wenbox:last-of-type {
-    border-bottom: 0px solid #E9E9E9;
-  }
-
-  .wenbox .tubiao {
-    margin: 0 5px;
-    font-size: 18px;
-    // color: #b7d8fa;
-    padding: 0 5px 0 0;
-  }
-
-  .wenbox .tubiao .tolzi {
-    color: #3f9bfa;
-    font-size: 40px;
-  }
-
-  .bluezi {
-    // color: #042d6a;
-    font-size: 18px !important;
-  }
-
-  .wenbox .tos {
-    margin: 0;
-    font-size: 14px;
-    color: #474848;
-    padding: 0;
-    text-align: left;
-  }
-
-  .wenbox .tos .tit {
-    margin: 0;
-    font-size: 14px;
-    // color: #6f7172;
-    padding: 0 0 10px 0;
-  }
-
-  .wenbox .tos .nums {
-    margin: 0;
-    padding: 0;
-  }
-
-  .wenbox .tos .nums .num {
-    font-size: 20px;
-    padding: 0 5px;
-    font-weight: bold;
-    display: inline-block;
-    color: #fc6f04;
-  }
+.zongcons {
+  margin: 0;
+  padding: 0;
+  flex: 1;
+  width: 100%;
+  height: calc(100% - 160px);
+}
+
+.rightbars {}
+
+.zongcons .maps {
+  width: 100%;
+  height: 605px;
+  padding: 40px 0 0 100px;
+  text-align: right;
+}
+
+.webindex {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: flex-start;
+  align-items: flex-start;
+  width: 100%;
+  padding: 20px;
+  height: 100%;
+  overflow-y: auto;
+  background: radial-gradient(#fff, #f5f7f4, #fff);
+}
+
+.tops {
+  width: 470px;
+  // display: flex;
+  // flex-direction: row;
+  // flex-wrap: nowrap;
+  // justify-content: flex-start;align-items: flex-start;
+  padding: 0 0 0 20px;
+  margin: 0px;
+}
+
+.tops .topboxs {
+  width: 100%;
+
+  padding: 0px 0px 15px 0 !important;
+
+}
+
+.topbox {
+  // width: 25%;
+  //margin: 20px 20 0 0 !important;
+  background-color: #fff;
+  box-shadow: 0px 0px 10px #E9E9E9;
+  border-radius: 5px;
+  padding: 20px 10px 21px 10px;
+}
+
+// .tops .topbox:last-of-type {
+//   margin: 0;
+// }
+.topbox .toptitle {
+  font-size: 20px;
+  padding: 10px 20px;
+  font-weight: bold;
+  color: #333;
+  font-size: 16px;
+  border-bottom: 1px solid #ececee;
+}
+
+.topbox .mids {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: flex-start;
+  align-items: center;
+  margin: 0;
+  padding: 35px 20px 38px 20px;
+  // padding: 20px ;
+}
+
+.topbox .mids .lefts {
+  width: 100px;
+}
+
+.topbox .mids .lefts .iconbox {
+  border-radius: 10px;
+  line-height: 80px;
+  width: 80px;
+  height: 80px;
+  color: #fff;
+  font-size: 36px;
+  text-align: center;
+}
+
+.iconbox_red {
+  background-color: #df2f07;
+}
+
+.iconbox_yellow {
+  background-color: #ff7521;
+}
+
+
+.iconbox_green {
+  background-color: #07C160;
+}
+
+.iconbox_blue {
+  background-color: #3f9bfa;
+}
+
+.iconbox_zi {
+  background-color: #6421ff;
+}
+
+.iconbox_fen {
+  background-color: #9b2efb;
+}
+
+.topbox .mids .rights {
+  flex: 1;
+  padding: 2px 0 2px 10px;
+}
+
+.topbox .mids .rights .note {
+  color: #333;
+  font-size: 14px;
+  padding: 0 0 3px 0;
+}
+
+.topbox .mids .rights .note span {
+  font-size: 20px;
+  padding: 0 5px;
+}
+
+/* 饼图部分 */
+.tbars {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: flex-start;
+  align-items: flex-start;
+  margin: 0;
+  padding: 20px 0 0 0;
+}
+
+.tbar {
+  width: 25%;
+  margin: 0 20px 0 0;
+  background-color: #fff;
+  box-shadow: 0px 0px 10px #E9E9E9;
+  border-radius: 5px;
+  padding: 10px;
+}
+
+.tbar:last-of-type {
+  margin: 0;
+}
+
+.tbar0 {
+  border-bottom: 0px solid #032ab8;
+}
+
+.tbar .title {
+  font-size: 20px;
+  padding: 10px 20px;
+  font-weight: bold;
+  color: #333;
+  font-size: 16px;
+  border-bottom: 1px solid #ececee;
+}
+
+.tbar .title span {
+  padding: 0 10px 0 0;
+}
+
+.tbar .bar {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: flex-start;
+  align-items: center;
+  margin: 0;
+  padding: 0px;
+  height: 190px;
+
+}
+
+.con {
+  padding: 10px 0 0 0;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: space-around;
+}
+
+.news {
+  width: calc(100% / 2);
+  margin: 0 20px 0 0;
+  background-color: #fff;
+  box-shadow: 0px 0px 10px #E9E9E9;
+  border-radius: 5px;
+  padding: 10px;
+}
+
+.news:last-of-type {
+  margin: 0;
+}
+
+.news .title {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  padding: 10px 10px 10px 20px;
+  border-bottom: 1px solid #ececee;
+}
+
+.news .title .newstits {
+  font-weight: bold;
+  color: #333;
+  font-size: 16px;
+}
+
+.news .title .more {
+  text-align: right;
+  cursor: pointer;
+  color: #6c6a6a;
+  font-size: 14px;
+}
+
+.news .content {
+  padding: 10px 0;
+  height: 120px;
+  // height:160px;
+  overflow: hidden;
+}
+
+.news .content .newsli {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  margin: 0px 0px;
+  padding: 5px 10px;
+  border-bottom: 1px solid #ececee;
+}
+
+.news .content .newsli .dot {
+  padding: 0px 8px 0 0;
+  font-size: 18px;
+  height: 25px;
+  line-height: 25px;
+  color: #047cf7;
+}
+
+.news .content .newsli .tit {
+  padding: 0px 0;
+  font-size: 14px;
+  flex: 3;
+  height: 25px;
+  overflow: hidden;
+  line-height: 25px;
+  cursor: pointer;
+}
+
+// .news .content .newsli .tel{padding: 10px 0;color: #84d1f5;flex: 1;text-align: center;}
+.news .content .newsli .time {
+  padding: 0px 0;
+  color: #666666;
+  text-align: right;
+  font-size: 14px;
+  width: 100px;
+  height: 25px;
+  line-height: 25px;
+}
+
+/////
+
+.wenboxs {
+  padding: 20px;
+  margin: 0;
+  position: absolute;
+  z-index: 600;
+  top: 20px;
+  left: 20px;
+  // background-color: rgba($color: #ffffff, $alpha: 0.7);
+  // box-shadow: 0px 0px 6px #0d27c2;
+  background-color: #fff;
+  box-shadow: 0px 0px 10px #E9E9E9;
+  border-radius: 5px;
+}
+
+.wenboxs .wenbox {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: flex-start;
+  align-items: center;
+  margin: 0;
+  font-size: 18px;
+  color: #8d8e90;
+  padding: 10px;
+  border-bottom: 1px solid #E9E9E9;
+}
+
+.wenboxs .wenbox:last-of-type {
+  border-bottom: 0px solid #E9E9E9;
+}
+
+.wenbox .tubiao {
+  margin: 0 5px;
+  font-size: 18px;
+  // color: #b7d8fa;
+  padding: 0 5px 0 0;
+}
+
+.wenbox .tubiao .tolzi {
+  color: #3f9bfa;
+  font-size: 40px;
+}
+
+.bluezi {
+  // color: #042d6a;
+  font-size: 18px !important;
+}
+
+.wenbox .tos {
+  margin: 0;
+  font-size: 14px;
+  color: #474848;
+  padding: 0;
+  text-align: left;
+}
+
+.wenbox .tos .tit {
+  margin: 0;
+  font-size: 14px;
+  // color: #6f7172;
+  padding: 0 0 10px 0;
+}
+
+.wenbox .tos .nums {
+  margin: 0;
+  padding: 0;
+}
+
+.wenbox .tos .nums .num {
+  font-size: 20px;
+  padding: 0 5px;
+  font-weight: bold;
+  display: inline-block;
+  color: #fc6f04;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/shebeitaizhang/shebeitaizhangAdd.vue b/src/views/shebeitaizhang/shebeitaizhangAdd.vue
index e49816e..6ec2c42 100644
--- a/src/views/shebeitaizhang/shebeitaizhangAdd.vue
+++ b/src/views/shebeitaizhang/shebeitaizhangAdd.vue
@@ -15,20 +15,28 @@
             <div>编辑信息</div>
           </div>
           <el-row>
-            <el-col :span="4" class="tleftb">
+            <!-- <el-col :span="4" class="tleftb">
               <span><span class="icon">*</span>设备验证码</span>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="vCode">
                 <el-input v-model="addForm.vCode" 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="name">
+                <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>
             </el-col>
             <el-col :span="8">
               <el-form-item>
-                <el-input v-model="addForm.posotion" maxlength="20" placeholder="请填写设备位置 " class="addinputw" clearable />
+                <el-input v-model="addForm.position" maxlength="20" placeholder="请填写设备位置 " class="addinputw" clearable />
               </el-form-item>
             </el-col>
           </el-row>
@@ -55,15 +63,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>设备名称</span>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item prop="name">
-                <el-input v-model="addForm.name" maxlength="20" placeholder="请填写设备名称" class="addinputw" clearable />
-              </el-form-item>
-            </el-col>
+          <!-- <el-row>
             <el-col :span="4" class="tleftb">
               <span><span class="icon">*</span>设备序列号</span>
             </el-col>
@@ -73,7 +73,7 @@
                   clearable />
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
         </el-form>
       </div>
     </div>
diff --git a/src/views/shebeitaizhang/shebeitaizhangInfo.vue b/src/views/shebeitaizhang/shebeitaizhangInfo.vue
index 9e85d65..3755be5 100644
--- a/src/views/shebeitaizhang/shebeitaizhangInfo.vue
+++ b/src/views/shebeitaizhang/shebeitaizhangInfo.vue
@@ -14,11 +14,11 @@
           </div>
           <el-row>
             <el-col :span="4" class="tleftb">
-              <span>设备验证码</span>
+              <span>设备名称</span>
             </el-col>
             <el-col :span="8">
               <el-form-item>
-                <span>{{ infoForm.vCode }}</span>
+                <span>{{ infoForm.name }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
@@ -48,16 +48,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="4" class="tleftb">
-              <span>设备名称</span>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item>
-                <span>{{ infoForm.name }}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
           <!-- <el-row>
             <el-col :span="4" class="tleftb">
               <span>状态</span>