achao 2 年之前
父節點
當前提交
d460f5eafc

+ 0 - 1
public/static/weightCheck.html

@@ -589,7 +589,6 @@
             printBig() {},
             printBig() {},
         },
         },
         mounted() {
         mounted() {
-            debugger
             let _data = decodeURIComponent(this.getQueryVariable("tableData"))
             let _data = decodeURIComponent(this.getQueryVariable("tableData"))
             let _type = this.getQueryVariable("type")
             let _type = this.getQueryVariable("type")
             let _ew = this.getQueryVariable("selectEW")
             let _ew = this.getQueryVariable("selectEW")

+ 403 - 326
src/views/home/index.vue

@@ -6,81 +6,101 @@
  * @FilePath: \web-pc\src\pages\big-screen\view\indexs\index.vue
  * @FilePath: \web-pc\src\pages\big-screen\view\indexs\index.vue
 -->
 -->
 <template>
 <template>
-<div class="winseaview-view">
-  <div class="host-body">
-    <div class="d-flex jc-center title_wrap">
-      <div class="zuojuxing"></div>
-      <div class="youjuxing"></div>
-      <div class="guang"></div>
-      <div class="d-flex jc-center">
-        <div class="title">
-          <span class="title-text">易粮易运大数据分析平台</span>
+  <div class="winseaview-view">
+    <div class="host-body">
+      <div class="d-flex jc-center title_wrap">
+        <div class="zuojuxing"></div>
+        <div class="youjuxing"></div>
+        <div class="guang"></div>
+        <div class="d-flex jc-center">
+          <div class="title">
+            <span class="title-text">易粮易运大数据分析平台</span>
+          </div>
         </div>
         </div>
-      </div>
-      <div class="timers ">
+        <div class="timers ">
 
 
-        {{ dateYear }} {{ dateWeek }} {{ dateDay }}
-        <i class=" blq-icon-shezhi02" style="margin-left:10px" @click="showSetting"></i>
+          {{ dateYear }} {{ dateWeek }} {{ dateDay }}
+          <i class=" blq-icon-shezhi02" style="margin-left:10px" @click="showSetting"></i>
+        </div>
       </div>
       </div>
     </div>
     </div>
-  </div>
-   <div class="contents ">
-    <div class="contetn_left">
-      <div class="pagetab">
-        <!-- <div class="item">实时监测</div> -->
-        
+    <div class="contents ">
+      <div class="contetn_left">
+        <div class="pagetab">
+          <!-- <div class="item">实时监测</div> -->
+
+        </div>
+        <ItemWrap class="contetn_left-top contetn_lr-item" title="在途信息统计">
+          <LeftTop :listData="leftTopDataList"/>
+        </ItemWrap>
+        <ItemWrap class="contetn_left-center contetn_lr-item" title="合营比例">
+          <LeftCenter />
+        </ItemWrap>
+        <ItemWrap class="contetn_left-bottom contetn_lr-item" title="在途信息" style="padding: 0 10px 16px 10px">
+          <LeftBottom />
+        </ItemWrap>
       </div>
       </div>
-      <ItemWrap class="contetn_left-top contetn_lr-item" title="设备总览">
-        <LeftTop/>
-      </ItemWrap>
-       <ItemWrap class="contetn_left-center contetn_lr-item" title="用户总览">
-        <LeftCenter />
-      </ItemWrap>
-       <ItemWrap class="contetn_left-bottom contetn_lr-item" title="设备提醒" style="padding: 0 10px 16px 10px">
-        <LeftBottom />
-      </ItemWrap>
-    </div>
-     <div class="contetn_center">
+      <div class="contetn_center">
         <div class="maptitle">
         <div class="maptitle">
-      <div class="zuo"></div>
-      <span class="titletext">库点流向分布</span>
-      <div class="you"></div>
-    </div>
-       <dv-border-box-13>
+          <div class="zuo"></div>
+          <span class="titletext">库点流向分布</span>
+          <div class="you"></div>
+        </div>
+        <dv-border-box-13>
           <div id="china-map"></div>
           <div id="china-map"></div>
-      </dv-border-box-13>
-     
-      <!-- <CenterMap class="contetn_center_top" /> -->
-      <!-- <ItemWrap class="contetn_center-bottom" title="安装计划">
+        </dv-border-box-13>
+        <dv-border-box-1 class="center_bottom">
+          <div class="center_bottom_content">
+
+            <div class="row1">
+              <div class="item_title">
+                <!-- <div class="zuo"></div> -->
+                <span class="title-inner"> 头寸</span>
+                <!-- <div class="you"></div> -->
+              </div>
+              <div>123123吨</div>
+            </div>
+            <div class="row2 ">
+              <div class="item_title">
+                <span class="title-inner"> 实际库存</span>
+                <div>123123吨</div>
+              </div>
+              <div class="item_title">
+                <div class="title-inner">采购待执行(吨)</div>
+                <div>123123吨</div>
+              </div>
+              <div class="item_title">
+                <div class="title-inner">销售待执行(吨)</div>
+                <div>123123吨</div>
+              </div>
+
+            </div>
+          </div>
+        </dv-border-box-1>
+        <!-- <CenterMap class="contetn_center_top" /> -->
+        <!-- <ItemWrap class="contetn_center-bottom" title="安装计划">
         <CenterBottom />
         <CenterBottom />
       </ItemWrap> -->
       </ItemWrap> -->
-    </div>
-        <div class="contetn_right">
-      <ItemWrap
-        class="contetn_left-bottom contetn_lr-item"
-        title="报警次数"
-      >
-        <RightTop />
-      </ItemWrap>
-      <ItemWrap
-        class="contetn_left-bottom contetn_lr-item"
-        title="报警排名(TOP8)"
-        style="padding: 0 10px 16px 10px"
-      >
-        <RightCenter />
-      </ItemWrap>
-      <ItemWrap
-        class="contetn_left-bottom contetn_lr-item"
-        title="数据统计图 "
-      >
-        <RightBottom />
-      </ItemWrap>
+      </div>
+      <div class="contetn_right">
+        <ItemWrap class="contetn_left-bottom contetn_lr-item" title="出入库分布">
+          <RightTop />
+        </ItemWrap>
+        <ItemWrap class="contetn_left-bottom contetn_lr-item" title="库存排名" style="padding: 0 10px 16px 10px">
+          <RightCenter />
+        </ItemWrap>
+        <ItemWrap class="contetn_left-bottom contetn_lr-item" title="最新合同 ">
+          <RightBottom />
+        </ItemWrap>
+      </div>
     </div>
     </div>
   </div>
   </div>
-</div>
 </template>
 </template>
 
 
 <script>
 <script>
+import {
+  gChartsData,
+} from '@/model/home/index'
 import { formatTime } from '../../utils/index.js';
 import { formatTime } from '../../utils/index.js';
 import LeftTop from './left-top.vue'
 import LeftTop from './left-top.vue'
 import LeftCenter from './left-center.vue';
 import LeftCenter from './left-center.vue';
@@ -96,12 +116,13 @@ export default {
     LeftBottom,
     LeftBottom,
     // CenterMap,
     // CenterMap,
     RightTop,
     RightTop,
-   RightCenter,
-   RightBottom
+    RightCenter,
+    RightBottom
   },
   },
   data() {
   data() {
     return {
     return {
-     timing: null,
+      leftTopDataList:[],
+      timing: null,
       loading: true,
       loading: true,
       dateDay: null,
       dateDay: null,
       dateYear: null,
       dateYear: null,
@@ -117,19 +138,27 @@ export default {
   },
   },
   created() {
   created() {
   },
   },
-
   mounted() {
   mounted() {
-     this.timeFn();
-    this.cancelLoading();
+    gChartsData({
+      compId: localStorage.getItem('ws-pf_compId'),
+      loadingstatus: 1,
+      seachMoth: '2022'
+    }).toPromise().then(res => {
+      console.log('··············', res)
+      this.leftTopDataList = res[2].biViewInfoList
+      this.timeFn();
+      this.cancelLoading();
       this.china_map();
       this.china_map();
+
+    })
+
   },
   },
-   beforeDestroy() {
+  beforeDestroy() {
     clearInterval(this.timing);
     clearInterval(this.timing);
   },
   },
   methods: {
   methods: {
     //中国地图
     //中国地图
     china_map() {
     china_map() {
-      debugger
       let mapChart = this.$echarts.init(document.getElementById('china-map')); //图表初始化,china-map是绑定的元素
       let mapChart = this.$echarts.init(document.getElementById('china-map')); //图表初始化,china-map是绑定的元素
       window.onresize = mapChart.resize; //如果容器变大小,自适应从新构图
       window.onresize = mapChart.resize; //如果容器变大小,自适应从新构图
       let series = []; //存放循环配置项
       let series = []; //存放循环配置项
@@ -488,8 +517,8 @@ export default {
       };
       };
       mapChart.setOption(option); //生成图表
       mapChart.setOption(option); //生成图表
     },
     },
-    showSetting(){
-        this.$refs.setting.init()
+    showSetting() {
+      this.$refs.setting.init()
     },
     },
     timeFn() {
     timeFn() {
       this.timing = setInterval(() => {
       this.timing = setInterval(() => {
@@ -507,269 +536,273 @@ export default {
 };
 };
 </script>
 </script>
 <style lang="scss" scoped>
 <style lang="scss" scoped>
-    // &.pageisScale {
-    //     position: absolute;
-    //     top: 50%;
-    //     left: 50%;
-    //     transform: translate(-50%, -50%);
-    //     transform-origin: left top;
-    // }
-  .winseaview-view{
-    background:#03050C
-  }
+// &.pageisScale {
+//     position: absolute;
+//     top: 50%;
+//     left: 50%;
+//     transform: translate(-50%, -50%);
+//     transform-origin: left top;
+// }
+.winseaview-view {
+  background: #03050C
+}
+
+.bg {
+  width: 100%;
+  height: 100%;
+  padding: 16px 16px 10px 16px;
+  box-sizing: border-box;
+  background-image: url("../../assets/images/pageBg.png");
+  background-size: cover;
+  background-position: center center;
+}
+
+.host-body {
 
 
-    .bg {
-        width: 100%;
-        height: 100%;
-        padding: 16px 16px 10px 16px;
-        box-sizing: border-box;
-        background-image: url("../../assets/images/pageBg.png");
-        background-size: cover;
-        background-position: center center;
+  .title_wrap {
+    height: 60px;
+    background-image: url("../../assets/images/top.png");
+    background-size: cover;
+    background-position: center center;
+    position: relative;
+    margin-bottom: 4px;
+
+    .guang {
+      position: absolute;
+      bottom: -26px;
+      background-image: url("../../assets/images/guang.png");
+      background-position: 80px center;
+      width: 100%;
+      height: 56px;
     }
     }
 
 
-    .host-body {
-
-        .title_wrap {
-            height: 60px;
-            background-image: url("../../assets/images/top.png");
-            background-size: cover;
-            background-position: center center;
-            position: relative;
-            margin-bottom: 4px;
-
-            .guang {
-                position: absolute;
-                bottom: -26px;
-                background-image: url("../../assets/images/guang.png");
-                background-position: 80px center;
-                width: 100%;
-                height: 56px;
-            }
-
-            .zuojuxing,
-            .youjuxing {
-                position: absolute;
-                top: -2px;
-                width: 140px;
-                height: 6px;
-                background-image: url("../../assets/images/headers/juxing1.png");
-            }
-
-            .zuojuxing {
-
-                left: 11%;
-            }
-
-            .youjuxing {
-                right: 11%;
-                transform: rotate(180deg);
-            }
-
-            .timers {
-                position: absolute;
-                right: 0;
-                top: 30px;
-                font-size: 18px;
-                display: flex;
-                align-items: center;
-
-                .blq-icon-shezhi02 {
-                    cursor: pointer;
-                }
-            }
-        }
+    .zuojuxing,
+    .youjuxing {
+      position: absolute;
+      top: -2px;
+      width: 140px;
+      height: 6px;
+      background-image: url("../../assets/images/headers/juxing1.png");
+    }
 
 
-        .title {
-            position: relative;
-            // width: 500px;
-            text-align: center;
-            background-size: cover;
-            color: transparent;
-            height: 60px;
-            line-height: 46px;
-
-            .title-text {
-                font-size: 38px;
-                font-weight: 900;
-                letter-spacing: 6px;
-                width: 100%;
-                background: linear-gradient(92deg, #0072FF 0%, #00EAFF 48.8525390625%, #01AAFF 100%);
-                -webkit-background-clip: text;
-                -webkit-text-fill-color: transparent;
-            }
-        }
+    .zuojuxing {
+
+      left: 11%;
     }
     }
 
 
+    .youjuxing {
+      right: 11%;
+      transform: rotate(180deg);
+    }
+
+    .timers {
+      position: absolute;
+      right: 0;
+      top: 30px;
+      font-size: 18px;
+      display: flex;
+      align-items: center;
+
+      .blq-icon-shezhi02 {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .title {
+    position: relative;
+    // width: 500px;
+    text-align: center;
+    background-size: cover;
+    color: transparent;
+    height: 60px;
+    line-height: 46px;
+
+    .title-text {
+      font-size: 38px;
+      font-weight: 900;
+      letter-spacing: 6px;
+      width: 100%;
+      background: linear-gradient(92deg, #0072FF 0%, #00EAFF 48.8525390625%, #01AAFF 100%);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+  }
+}
+
 
 
 .index_home {
 .index_home {
-    .pagetab {
-        position: absolute;
-        top: -35px;
-        display: flex;
-
-        .item {
-            width: 130px;
-            height: 36px;
-            border-radius: 18px 0px 0px 18px;
-            color: #00FBF8;
-            text-indent: 26px;
-            line-height: 36px;
-            font-size: 16px;
-            margin-right: 20px;
-            background: linear-gradient(to right, rgba(76, 245, 255, .5), rgba(76, 245, 255, 0));
-        }
+  .pagetab {
+    position: absolute;
+    top: -35px;
+    display: flex;
+
+    .item {
+      width: 130px;
+      height: 36px;
+      border-radius: 18px 0px 0px 18px;
+      color: #00FBF8;
+      text-indent: 26px;
+      line-height: 36px;
+      font-size: 16px;
+      margin-right: 20px;
+      background: linear-gradient(to right, rgba(76, 245, 255, .5), rgba(76, 245, 255, 0));
     }
     }
+  }
 }
 }
 
 
 .setting {
 .setting {
-    position: fixed;
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  z-index: 999;
+  top: 0;
+  left: 0;
+
+  .left_shu {
+    color: #000;
+    font-weight: 900;
+    position: relative;
+    text-indent: 10px;
+    padding: 16px 0 10px 0;
+
+    &::before {
+      display: block;
+      content: " ";
+      height: 16px;
+      width: 4px;
+      border-radius: 2px;
+      background: #0072FF;
+      position: absolute;
+      left: 0px;
+    }
+  }
+
+  .setting_dislog {
+    background-color: rgba($color: #000000, $alpha: .5);
+    position: absolute;
     width: 100%;
     width: 100%;
     height: 100%;
     height: 100%;
-    z-index: 999;
+    z-index: 0;
+    right: 0;
     top: 0;
     top: 0;
-    left: 0;
-
-    .left_shu {
-        color: #000;
-        font-weight: 900;
-        position: relative;
-        text-indent: 10px;
-        padding:16px 0 10px 0 ;
-        &::before {
-            display: block;
-            content: " ";
-            height: 16px;
-            width: 4px;
-            border-radius: 2px;
-            background: #0072FF;
-            position: absolute;
-            left: 0px;
-        }
+  }
+
+  .setting_inner {
+    box-sizing: border-box;
+    background: #FFF;
+    width: 340px;
+    height: 100%;
+    position: absolute;
+    right: 0px;
+    top: 0;
+    z-index: 1;
+    color: #000000;
+    box-shadow: 0 8px 10px -5px rgba(0, 0, 0, .2), 0 16px 24px 2px rgba(0, 0, 0, .14), 0 6px 30px 5px rgba(0, 0, 0, .12);
+
+    .setting_header {
+      font-size: 20px;
+      color: rgb(0, 0, 0);
+      font-weight: 900;
+      text-align: center;
+      line-height: 40px;
     }
     }
 
 
-    .setting_dislog {
-        background-color: rgba($color: #000000, $alpha: .5);
-        position: absolute;
-        width: 100%;
-        height: 100%;
-        z-index: 0;
-        right: 0;
-        top: 0;
+    .setting_body {
+      padding: 0px 16px;
+      box-sizing: border-box;
+      position: relative;
     }
     }
 
 
-    .setting_inner {
-        box-sizing: border-box;
-        background: #FFF;
-        width: 340px;
-        height: 100%;
-        position: absolute;
-        right: 0px;
-        top: 0;
-        z-index: 1;
-        color: #000000;
-        box-shadow: 0 8px 10px -5px rgba(0, 0, 0, .2), 0 16px 24px 2px rgba(0, 0, 0, .14), 0 6px 30px 5px rgba(0, 0, 0, .12);
-
-        .setting_header {
-            font-size: 20px;
-            color: rgb(0, 0, 0);
-            font-weight: 900;
-            text-align: center;
-            line-height: 40px;
-        }
+    .setting_item {
+      font-size: 14px;
+      line-height: 1.5;
 
 
-        .setting_body {
-            padding: 0px 16px;
-            box-sizing: border-box;
-            position: relative;
-        }
+      // display: flex;
+      .setting_label {
+        color: #555454;
+      }
 
 
-        .setting_item {
-            font-size: 14px;
-            line-height: 1.5;
-
-            // display: flex;
-            .setting_label {
-                color: #555454;
-            }
-            .setting_label_tip{
-                font-size: 12px;
-                color: #838282;
-            }
-        }
+      .setting_label_tip {
+        font-size: 12px;
+        color: #838282;
+      }
     }
     }
+  }
 
 
-    .setting_inner {
-        animation: rtl-drawer-out .3s;
-    }
+  .setting_inner {
+    animation: rtl-drawer-out .3s;
+  }
 }
 }
 
 
 
 
 .settingShow {
 .settingShow {
-    .setting_inner {
-        animation: rtl-drawer-in .3s 1ms;
-    }
+  .setting_inner {
+    animation: rtl-drawer-in .3s 1ms;
+  }
 
 
 }
 }
 
 
 .yh-setting-fade-enter-active {
 .yh-setting-fade-enter-active {
-    animation: yh-setting-fade-in .3s;
+  animation: yh-setting-fade-in .3s;
 }
 }
 
 
 .yh-setting-fade-leave-active {
 .yh-setting-fade-leave-active {
 
 
-    animation: yh-setting-fade-out .3s;
+  animation: yh-setting-fade-out .3s;
 
 
 }
 }
 
 
 @keyframes yh-setting-fade-in {
 @keyframes yh-setting-fade-in {
-    0% {
-        opacity: 0;
-    }
+  0% {
+    opacity: 0;
+  }
 
 
-    100% {
-        opacity: 1;
-    }
+  100% {
+    opacity: 1;
+  }
 }
 }
 
 
 @keyframes yh-setting-fade-out {
 @keyframes yh-setting-fade-out {
-    0% {
-        opacity: 1;
+  0% {
+    opacity: 1;
 
 
-    }
+  }
 
 
-    100% {
-        opacity: 0;
-    }
+  100% {
+    opacity: 0;
+  }
 }
 }
 
 
 
 
 @keyframes rtl-drawer-in {
 @keyframes rtl-drawer-in {
-    0% {
-        transform: translate(100%, 0)
-    }
+  0% {
+    transform: translate(100%, 0)
+  }
 
 
-    100% {
-        -webkit-transform: translate(0, 0);
-        transform: translate(0, 0)
-    }
+  100% {
+    -webkit-transform: translate(0, 0);
+    transform: translate(0, 0)
+  }
 }
 }
 
 
 @keyframes rtl-drawer-out {
 @keyframes rtl-drawer-out {
-    0% {
-        transform: translate(0, 0)
-    }
+  0% {
+    transform: translate(0, 0)
+  }
 
 
-    100% {
-        transform: translate(100%, 0)
-    }
+  100% {
+    transform: translate(100%, 0)
+  }
 }
 }
+
 // 内容
 // 内容
 .contents {
 .contents {
   width: 100%;
   width: 100%;
-    display: flex;
-    min-height: calc(100% - 60px);
-    justify-content: space-between;
+  display: flex;
+  min-height: calc(100% - 60px);
+  justify-content: space-between;
+
   .contetn_left,
   .contetn_left,
   .contetn_right {
   .contetn_right {
     width: 540px;
     width: 540px;
@@ -809,65 +842,109 @@ export default {
     justify-content: space-around;
     justify-content: space-around;
     position: relative;
     position: relative;
 
 
-  
+
   }
   }
 }
 }
 
 
 
 
 @keyframes rotating {
 @keyframes rotating {
-    0% {
-        -webkit-transform: rotate(0) scale(1);
-        transform: rotate(0) scale(1);
-    }
-    50% {
-        -webkit-transform: rotate(180deg) scale(1.1);
-        transform: rotate(180deg) scale(1.1);
-    }
-    100% {
-        -webkit-transform: rotate(360deg) scale(1);
-        transform: rotate(360deg) scale(1);
-    }
-}
- #china-map {
-    height: 540px;
-    width: 100%;
-    top: 0;
+  0% {
+    -webkit-transform: rotate(0) scale(1);
+    transform: rotate(0) scale(1);
   }
   }
-  
-  .maptitle {
-    height: 60px;
-    display: flex;
-    justify-content: center;
-    padding-top: 10px;
-    box-sizing: border-box;
 
 
-    .titletext {
-      font-size: 28px;
-      font-weight: 900;
-      letter-spacing: 6px;
-      background: linear-gradient(92deg,
-          #0072ff 0%,
-          #00eaff 48.8525390625%,
-          #01aaff 100%);
-      -webkit-background-clip: text;
-      -webkit-text-fill-color: transparent;
-      margin: 0 10px;
-    }
+  50% {
+    -webkit-transform: rotate(180deg) scale(1.1);
+    transform: rotate(180deg) scale(1.1);
+  }
 
 
-    .zuo,
-    .you {
-      background-size: 100% 100%;
-      width: 29px;
-      height: 20px;
-      margin-top: 8px;
-    }
+  100% {
+    -webkit-transform: rotate(360deg) scale(1);
+    transform: rotate(360deg) scale(1);
+  }
+}
 
 
-    .zuo {
-      background: url("../../assets/images/xiezuo.png") no-repeat;
-    }
+#china-map {
+  height: 540px;
+  width: 100%;
+  top: 0;
+}
 
 
-    .you {
-      background: url("../../assets/images/xieyou.png") no-repeat;
-    }
+.maptitle {
+  height: 60px;
+  display: flex;
+  justify-content: center;
+  padding-top: 10px;
+  box-sizing: border-box;
+
+  .titletext {
+    font-size: 28px;
+    font-weight: 900;
+    letter-spacing: 6px;
+    background: linear-gradient(92deg,
+        #0072ff 0%,
+        #00eaff 48.8525390625%,
+        #01aaff 100%);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+    margin: 0 10px;
+  }
+
+  .zuo,
+  .you {
+    background-size: 100% 100%;
+    width: 29px;
+    height: 20px;
+    margin-top: 8px;
+  }
+
+  .zuo {
+    background: url("../../assets/images/xiezuo.png") no-repeat;
   }
   }
+
+  .you {
+    background: url("../../assets/images/xieyou.png") no-repeat;
+  }
+}
+
+.center_bottom {
+  color: #fff;
+  font-size: 30px;
+}
+
+.center_bottom_content {
+  padding: 20px;
+  box-sizing: border-box;
+}
+
+.item_title {
+  display: flex;
+  align-items: center;
+}
+
+.zuo,
+.you {
+  width: 58px;
+  height: 14px;
+  background-image: url("../../assets/images/titles/zuo.png");
+}
+
+.you {
+  transform: rotate(180deg);
+}
+
+.title-inner {
+  font-weight: 900;
+  letter-spacing: 2px;
+  background: linear-gradient(92deg,
+      #0072ff 0%,
+      #00eaff 48.8525390625%,
+      #01aaff 100%);
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+
+.row1 {
+  display: flex
+}
 </style>
 </style>

+ 41 - 36
src/views/home/left-bottom.vue

@@ -19,13 +19,13 @@
             <div class="dibu"></div>
             <div class="dibu"></div>
             <div class="flex">
             <div class="flex">
               <div class="info">
               <div class="info">
-                <span class="labels">设备ID:</span>
+                <span class="labels">车牌号:</span>
                 <span class="contents zhuyao doudong wangguan">
                 <span class="contents zhuyao doudong wangguan">
                   {{ item.gatewayno }}</span
                   {{ item.gatewayno }}</span
                 >
                 >
               </div>
               </div>
               <div class="info">
               <div class="info">
-                <span class="labels">时间:</span>
+                <span class="labels">装车时间:</span>
                 <span class="contents " style="font-size: 12px">
                 <span class="contents " style="font-size: 12px">
                   {{ item.createTime }}</span
                   {{ item.createTime }}</span
                 >
                 >
@@ -38,15 +38,22 @@
                   typeRed: item.onlineState == 0,
                   typeRed: item.onlineState == 0,
                   typeGreen: item.onlineState == 1,
                   typeGreen: item.onlineState == 1,
                 }"
                 }"
-                >{{ item.onlineState == 1 ? "上线" : "下线" }}</span
+                >{{ item.onlineState == 1 ? "在途" : "60吨" }}</span
               >
               >
 
 
             <div class="info addresswrap">
             <div class="info addresswrap">
-              <span class="labels">地:</span>
+              <span class="labels">始发地:</span>
               <span class="contents ciyao" style="font-size: 12px">
               <span class="contents ciyao" style="font-size: 12px">
                 {{ addressHandle(item) }}</span
                 {{ addressHandle(item) }}</span
               >
               >
             </div>
             </div>
+            <div class="info addresswrap">
+              <span class="labels">目的地:</span>
+              <span class="contents ciyao" style="font-size: 12px">
+                {{ addressHandle(item) }}</span
+              >
+            </div>
+            
           </div>
           </div>
         </li>
         </li>
       </ul>
       </ul>
@@ -58,8 +65,8 @@
 
 
 <script>
 <script>
 // import { currentGET } from "api";
 // import { currentGET } from "api";
-import vueSeamlessScroll from "vue-seamless-scroll"; // vue2引入方式
-import Kong from "../../components/kong.vue";
+import vueSeamlessScroll from 'vue-seamless-scroll'; // vue2引入方式
+import Kong from '../../components/kong.vue';
 export default {
 export default {
   components: { vueSeamlessScroll, Kong },
   components: { vueSeamlessScroll, Kong },
   data() {
   data() {
@@ -81,7 +88,6 @@ export default {
   },
   },
   computed: {
   computed: {
     sbtxSwiperFlag() {
     sbtxSwiperFlag() {
-      debugger
       let sbtxSwiper = true;
       let sbtxSwiper = true;
       if (sbtxSwiper) {
       if (sbtxSwiper) {
         this.components = vueSeamlessScroll;
         this.components = vueSeamlessScroll;
@@ -100,15 +106,14 @@ export default {
     addressHandle(item) {
     addressHandle(item) {
       let name = item.provinceName;
       let name = item.provinceName;
       if (item.cityName) {
       if (item.cityName) {
-        name += "/" + item.cityName;
+        name += '/' + item.cityName;
         if (item.countyName) {
         if (item.countyName) {
-          name += "/" + item.countyName;
+          name += '/' + item.countyName;
         }
         }
       }
       }
       return name;
       return name;
     },
     },
     getData() {
     getData() {
-      debugger
       this.pageflag = true;
       this.pageflag = true;
       // this.pageflag =false
       // this.pageflag =false
       // currentGET("big3", { limitNum: 20 }).then((res) => {
       // currentGET("big3", { limitNum: 20 }).then((res) => {
@@ -136,7 +141,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+          gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -145,7 +150,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+          gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -154,7 +159,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+          gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -163,7 +168,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+          gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -172,7 +177,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+          gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -181,7 +186,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+          gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -190,7 +195,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+          gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -199,7 +204,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+          gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -208,7 +213,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+          gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -217,7 +222,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+          gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -226,7 +231,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+          gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -235,7 +240,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+          gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -244,7 +249,7 @@ export default {
           countyName: '千山区1',
           countyName: '千山区1',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+          gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省1',
           provinceName: '福建省1',
         },
         },
@@ -256,7 +261,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+           gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -265,7 +270,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+           gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -274,7 +279,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+           gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -283,7 +288,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+           gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -292,7 +297,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+           gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -301,7 +306,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+           gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -310,7 +315,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+           gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -319,7 +324,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+           gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -328,7 +333,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+           gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -337,7 +342,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+           gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -346,7 +351,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+           gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -355,7 +360,7 @@ export default {
           countyName: '千山区',
           countyName: '千山区',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+           gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省',
           provinceName: '福建省',
         },
         },
@@ -364,7 +369,7 @@ export default {
           countyName: '千山区1',
           countyName: '千山区1',
           createTime: '2021-05-15 08:27:26',
           createTime: '2021-05-15 08:27:26',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
           deviceId: '6c512d754bbcd6d7cd86abce0e0cac58',
-          gatewayno: 10000,
+           gatewayno: '辽H12345',
           onlineState: 0,
           onlineState: 0,
           provinceName: '福建省1',
           provinceName: '福建省1',
         },
         },

+ 4 - 12
src/views/home/left-center.vue

@@ -62,7 +62,7 @@ export default {
         }
         }
         that.$nextTick(() => {
         that.$nextTick(() => {
           that.init()
           that.init()
-          that.switper()
+          // that.switper()
         })
         })
       }, 1000)
       }, 1000)
       // this.pageflag =false
       // this.pageflag =false
@@ -106,11 +106,10 @@ export default {
       })
       })
     },
     },
     init() {
     init() {
-      debugger
       let total = this.countUserNumData.totalNum
       let total = this.countUserNumData.totalNum
       let colors = ['#ECA444', '#33A1DB', '#56B557']
       let colors = ['#ECA444', '#33A1DB', '#56B557']
       let piedata = {
       let piedata = {
-        name: '用户总览',
+        name: '合营比例',
         type: 'pie',
         type: 'pie',
         radius: ['42%', '65%'],
         radius: ['42%', '65%'],
         avoidLabelOverlap: false,
         avoidLabelOverlap: false,
@@ -131,25 +130,18 @@ export default {
           // },
           // },
           {
           {
             value: this.countUserNumData.lockNum,
             value: this.countUserNumData.lockNum,
-            name: '锁定',
+            name: '自有库',
             label: {
             label: {
               shadowColor: colors[0],
               shadowColor: colors[0],
             },
             },
           },
           },
           {
           {
             value: this.countUserNumData.onlineNum,
             value: this.countUserNumData.onlineNum,
-            name: '在线',
+            name: '合营库',
             label: {
             label: {
               shadowColor: colors[2],
               shadowColor: colors[2],
             },
             },
           },
           },
-          {
-            value: this.countUserNumData.offlineNum,
-            name: '离线',
-            label: {
-              shadowColor: colors[1],
-            },
-          },
         ],
         ],
       }
       }
       this.options = {
       this.options = {

+ 53 - 39
src/views/home/left-top.vue

@@ -9,29 +9,29 @@
     <ul class="user_Overview flex">
     <ul class="user_Overview flex">
         <li class="user_Overview-item" style="color: #00fdfa">
         <li class="user_Overview-item" style="color: #00fdfa">
             <div class="user_Overview_nums allnum ">
             <div class="user_Overview_nums allnum ">
-                <dv-digital-flop :config="config" style="width:100%;height:100%;" />
+                <dv-digital-flop :config="config" style="width:100%;height:100%;"/>
             </div>
             </div>
-            <p>总设备数</p>
+            <p>在途车辆</p>
         </li>
         </li>
         <li class="user_Overview-item" style="color: #07f7a8">
         <li class="user_Overview-item" style="color: #07f7a8">
             <div class="user_Overview_nums online">
             <div class="user_Overview_nums online">
                 <dv-digital-flop :config="onlineconfig" style="width:100%;height:100%;" />
                 <dv-digital-flop :config="onlineconfig" style="width:100%;height:100%;" />
             </div>
             </div>
-            <p>在线数</p>
+            <p>装货车辆</p>
         </li>
         </li>
         <li class="user_Overview-item" style="color: #e3b337">
         <li class="user_Overview-item" style="color: #e3b337">
             <div class="user_Overview_nums offline">
             <div class="user_Overview_nums offline">
                 <dv-digital-flop :config="offlineconfig" style="width:100%;height:100%;" />
                 <dv-digital-flop :config="offlineconfig" style="width:100%;height:100%;" />
 
 
             </div>
             </div>
-            <p>掉线数</p>
+            <p>卸货车辆</p>
         </li>
         </li>
-        <li class="user_Overview-item" style="color: #f5023d">
+        <!-- <li class="user_Overview-item" style="color: #f5023d">
             <div class="user_Overview_nums laramnum">
             <div class="user_Overview_nums laramnum">
                 <dv-digital-flop :config="laramnumconfig" style="width:100%;height:100%;" />
                 <dv-digital-flop :config="laramnumconfig" style="width:100%;height:100%;" />
             </div>
             </div>
             <p>告警次数</p>
             <p>告警次数</p>
-        </li>
+        </li> -->
     </ul>
     </ul>
     <!-- <Reacquire v-else @onclick="getData" line-height="200px">
     <!-- <Reacquire v-else @onclick="getData" line-height="200px">
         重新获取
         重新获取
@@ -43,7 +43,11 @@
 let style = {
 let style = {
     fontSize: 24
     fontSize: 24
 }
 }
+import {
+  gChartsData,
+} from '@/model/home/index'
 export default {
 export default {
+    props:['listData'],
     data() {
     data() {
         return {
         return {
             num:0,
             num:0,
@@ -57,7 +61,7 @@ export default {
             pageflag: true,
             pageflag: true,
             timer: null,
             timer: null,
             config: {
             config: {
-                number: [100],
+                number: [0],
                 content: '{nt}',
                 content: '{nt}',
                 style: {
                 style: {
                     ...style,
                     ...style,
@@ -95,6 +99,22 @@ export default {
 
 
         };
         };
     },
     },
+    watch:{
+        listData(res){
+            this.config = {
+                        ...this.config,
+                        number: [Number(res[0].count)]
+                    }
+                    this.onlineconfig = {
+                        ...this.onlineconfig,
+                        number: [Number(res[1].count)]
+                    }
+                    this.offlineconfig = {
+                        ...this.offlineconfig,
+                        number: [Number(res[2].count)]
+                    }
+        }
+    },
     filters: {
     filters: {
         numsFilter(msg) {
         numsFilter(msg) {
             return msg || 0;
             return msg || 0;
@@ -117,37 +137,31 @@ export default {
             }
             }
         },
         },
         getData() {
         getData() {
-            // this.pageflag = true;
-            console.log('111')
-                //  this.switper()
-            // currentGET('big2').then((res) => {
-            //     if (!this.timer) {
-            //         console.log('设备总览', res);
-            //     }
-            //     if (res.success) {
-            //         this.userOverview = res.data;
-            //         this.onlineconfig = {
-            //             ...this.onlineconfig,
-            //             number: [res.data.onlineNum]
-            //         }
-                    this.config = {
-                        ...this.config,
-                        number: [this.num++]
-                    }
-            //         this.offlineconfig = {
-            //             ...this.offlineconfig,
-            //             number: [res.data.offlineNum]
-            //         }
-            //         this.laramnumconfig = {
-            //             ...this.laramnumconfig,
-            //             number: [res.data.alarmNum]
-            //         }
-                    this.switper()
-            //     } else {
-            //         this.pageflag = false;
-            //         this.$Message.warning(res.msg);
-            //     }
-            // });
+
+    //         gChartsData({
+    //   compId: localStorage.getItem('ws-pf_compId'),
+    //   loadingstatus: 1,
+    //   seachMoth: '2022'
+    // }).toPromise().then(res => {
+    //   debugger
+    //   console.log('··············', res)
+    //                 this.config = {
+    //                     ...this.config,
+    //                     number: [Number(res[2].biViewInfoList[0].count)]
+    //                 }
+    //                 this.onlineconfig = {
+    //                     ...this.onlineconfig,
+    //                     number: [Number(res[2].biViewInfoList[1].count)]
+    //                 }
+    //                 this.offlineconfig = {
+    //                     ...this.offlineconfig,
+    //                     number: [Number(res[2].biViewInfoList[2].count)]
+    //                 }
+                    
+    //                 this.switper()
+        
+    // })
+           
         },
         },
         //轮询
         //轮询
         switper() {
         switper() {
@@ -157,7 +171,7 @@ export default {
             let looper = (a) => {
             let looper = (a) => {
                 this.getData()
                 this.getData()
             };
             };
-            this.timer = setInterval(looper, 1000);
+            this.timer = setInterval(looper, 30000);
         },
         },
     },
     },
 };
 };

+ 533 - 534
src/views/home/right-bottom.vue

@@ -15,36 +15,35 @@
             <div class="dibu"></div>
             <div class="dibu"></div>
             <div class="flex">
             <div class="flex">
               <div class="info">
               <div class="info">
-                <span class="labels ">设备ID:</span>
+                <span class="labels ">合同编号</span>
                 <span class="contents zhuyao"> {{ item.gatewayno }}</span>
                 <span class="contents zhuyao"> {{ item.gatewayno }}</span>
               </div>
               </div>
               <div class="info">
               <div class="info">
-                <span class="labels">型:</span>
+                <span class="labels">合同类型:</span>
                 <span class="contents "> {{ item.terminalno }}</span>
                 <span class="contents "> {{ item.terminalno }}</span>
               </div>
               </div>
               <div class="info">
               <div class="info">
-                <span class="labels">告警值:</span>
+                <span class="labels">合同量:</span>
                 <span class="contents warning"> {{ item.alertvalue | montionFilter }}</span>
                 <span class="contents warning"> {{ item.alertvalue | montionFilter }}</span>
               </div>
               </div>
             </div>
             </div>
-
-
-            <div class="flex">
-
+			<div class="flex">
               <div class="info">
               <div class="info">
-                <span class="labels"> 地址:</span>
-                <span class="contents ciyao" style="font-size:12px"> {{ item.provinceName }}/{{ item.cityName }}/{{ item.countyName }}</span>
+                <span class="labels">签订时间:</span>
+                <span class="contents ciyao" :class="{ warning: item.alertdetail }"> {{ item.alertdetail || '无'
+                }}</span>
               </div>
               </div>
-              <div class="info time">
-                <span class="labels">时间:</span>
-                <span class="contents" style="font-size:12px"> {{ item.createtime }}</span>
+            </div>
+			<div class="flex">
+              <div class="info">
+                <span class="labels">买方:</span>
+                <span class="contents ciyao" :class="{ warning: item.alertdetail }"> {{ item.alertdetail || '无'
+                }}</span>
               </div>
               </div>
-
             </div>
             </div>
             <div class="flex">
             <div class="flex">
-
               <div class="info">
               <div class="info">
-                <span class="labels">报警内容:</span>
+                <span class="labels">卖方:</span>
                 <span class="contents ciyao" :class="{ warning: item.alertdetail }"> {{ item.alertdetail || '无'
                 <span class="contents ciyao" :class="{ warning: item.alertdetail }"> {{ item.alertdetail || '无'
                 }}</span>
                 }}</span>
               </div>
               </div>
@@ -103,525 +102,525 @@ export default {
       let res = {
       let res = {
         data:{
         data:{
           list:[{
           list:[{
-	"alertdetail": "主么本指美证队众。",
-	"alertname": "水浸告警",
-	"alertvalue": 76.35193366743,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10000,
-	"phase": "A1",
-	"sbInfo": "先加话她为斗价难就结空心府。",
-	"terminalno": 100,
-	"provinceName": "广西壮族自治区",
-	"cityName": "延安市",
-	"countyName": "东区"
-}, {
-	"alertdetail": "这分龙理处决装制细。",
-	"alertname": "各种报警",
-	"alertvalue": 179.4578676454877,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10001,
-	"phase": "A1",
-	"sbInfo": "说运务战用受到在厂变共。",
-	"terminalno": 101,
-	"provinceName": "香港特别行政区",
-	"cityName": "连云港市",
-	"countyName": "彭山县"
-}, {
-	"alertdetail": "经山义打己系意。",
-	"alertname": "各种报警",
-	"alertvalue": 112.23387347173968,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10002,
-	"phase": "A1",
-	"sbInfo": "内维量强解基必号油来出至商议万。",
-	"terminalno": 102,
-	"provinceName": "云南省",
-	"cityName": "邢台市",
-	"countyName": "奇台县"
-}, {
-	"alertdetail": "手转京飞百。",
-	"alertname": "水浸告警",
-	"alertvalue": 110.15,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10003,
-	"phase": "A1",
-	"sbInfo": "又新加看适成确道边型。",
-	"terminalno": 103,
-	"provinceName": "北京",
-	"cityName": "襄阳市",
-	"countyName": "浏阳市"
-}, {
-	"alertdetail": "例感改中京规。",
-	"alertname": "各种报警",
-	"alertvalue": 185.2746953,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10004,
-	"phase": "A1",
-	"sbInfo": "党下江全准意场月义部次省消。",
-	"terminalno": 104,
-	"provinceName": "浙江省",
-	"cityName": "忻州市",
-	"countyName": "洮北区"
-}, {
-	"alertdetail": "应个命给转小变十何。",
-	"alertname": "水浸告警",
-	"alertvalue": 84.37245586588067,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10005,
-	"phase": "A1",
-	"sbInfo": "学老节实果北果需何料化门织。",
-	"terminalno": 105,
-	"provinceName": "重庆",
-	"cityName": "贺州市",
-	"countyName": "巴楚县"
-}, {
-	"alertdetail": "段事华叫七然厂家。",
-	"alertname": "各种报警",
-	"alertvalue": 150.161361,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10006,
-	"phase": "A1",
-	"sbInfo": "这飞世平海经合务石实别广不对只。",
-	"terminalno": 106,
-	"provinceName": "四川省",
-	"cityName": "黄冈市",
-	"countyName": "铁山港区"
-}, {
-	"alertdetail": "且事飞取清证。",
-	"alertname": "各种报警",
-	"alertvalue": 67.4,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10007,
-	"phase": "A1",
-	"sbInfo": "月场保圆记光京公快龙就。",
-	"terminalno": 107,
-	"provinceName": "福建省",
-	"cityName": "博尔塔拉蒙古自治州",
-	"countyName": "静乐县"
-}, {
-	"alertdetail": "任加按过资因。",
-	"alertname": "水浸告警",
-	"alertvalue": 176.5,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10008,
-	"phase": "A1",
-	"sbInfo": "改志业除金好历验标品口果之之。",
-	"terminalno": 108,
-	"provinceName": "新疆维吾尔自治区",
-	"cityName": "重庆市",
-	"countyName": "启东市"
-}, {
-	"alertdetail": "石团斗是思可。",
-	"alertname": "各种报警",
-	"alertvalue": 127.28686626615864,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10009,
-	"phase": "A1",
-	"sbInfo": "人发感历手任门同次市况直。",
-	"terminalno": 109,
-	"provinceName": "西藏自治区",
-	"cityName": "烟台市",
-	"countyName": "新邱区"
-}, {
-	"alertdetail": "许导思头商面。",
-	"alertname": "各种报警",
-	"alertvalue": 74.7141208,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10010,
-	"phase": "A1",
-	"sbInfo": "美术江按时经飞以商除思始起高术。",
-	"terminalno": 110,
-	"provinceName": "重庆",
-	"cityName": "天津市",
-	"countyName": "怀柔区"
-}, {
-	"alertdetail": "越习行算对参。",
-	"alertname": "各种报警",
-	"alertvalue": 134.9774247,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10011,
-	"phase": "A1",
-	"sbInfo": "以精带样解见社七我北具先地列这能引。",
-	"terminalno": 111,
-	"provinceName": "澳门特别行政区",
-	"cityName": "和田地区",
-	"countyName": "抚远县"
-}, {
-	"alertdetail": "少书且维明我体。",
-	"alertname": "各种报警",
-	"alertvalue": 177.7125254463579,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10012,
-	"phase": "A1",
-	"sbInfo": "认术快也装值精级路表任经为片及地极。",
-	"terminalno": 112,
-	"provinceName": "浙江省",
-	"cityName": "成都市",
-	"countyName": "其它区"
-}, {
-	"alertdetail": "传却温府历住分月华。",
-	"alertname": "各种报警",
-	"alertvalue": 68.8735,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10013,
-	"phase": "A1",
-	"sbInfo": "府亲场人重素产或千天。",
-	"terminalno": 113,
-	"provinceName": "新疆维吾尔自治区",
-	"cityName": "澳门半岛",
-	"countyName": "芦溪县"
-}, {
-	"alertdetail": "满收应提观千细学别。",
-	"alertname": "各种报警",
-	"alertvalue": 200.0874694361121,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10014,
-	"phase": "A1",
-	"sbInfo": "火本数专命向科百们维据且同太回实。",
-	"terminalno": 114,
-	"provinceName": "北京",
-	"cityName": "海外",
-	"countyName": "涟源市"
-}, {
-	"alertdetail": "低与金利许验。",
-	"alertname": "各种报警",
-	"alertvalue": 87.014122311,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10015,
-	"phase": "A1",
-	"sbInfo": "南目时农天立声来会农满后手严化。",
-	"terminalno": 115,
-	"provinceName": "内蒙古自治区",
-	"cityName": "衡水市",
-	"countyName": "-"
-}, {
-	"alertdetail": "生路题你少队表。",
-	"alertname": "水浸告警",
-	"alertvalue": 105.65846324863895,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10016,
-	"phase": "A1",
-	"sbInfo": "周动阶了节农给自流更土完新化号。",
-	"terminalno": 116,
-	"provinceName": "云南省",
-	"cityName": "锡林郭勒盟",
-	"countyName": "双桥区"
-}, {
-	"alertdetail": "本不叫间王装斯国强。",
-	"alertname": "各种报警",
-	"alertvalue": 103.73382063737,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10017,
-	"phase": "A1",
-	"sbInfo": "第资有军器张几际红矿八们。",
-	"terminalno": 117,
-	"provinceName": "新疆维吾尔自治区",
-	"cityName": "来宾市",
-	"countyName": "让胡路区"
-}, {
-	"alertdetail": "建思很开应非文。",
-	"alertname": "各种报警",
-	"alertvalue": 161.2652895979,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10018,
-	"phase": "A1",
-	"sbInfo": "通每土感何几千工铁完在区江儿。",
-	"terminalno": 118,
-	"provinceName": "辽宁省",
-	"cityName": "秦皇岛市",
-	"countyName": "龙海市"
-}, {
-	"alertdetail": "系它难持保。",
-	"alertname": "各种报警",
-	"alertvalue": 93.6,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10019,
-	"phase": "A1",
-	"sbInfo": "北八约即于后志前极由习史。",
-	"terminalno": 119,
-	"provinceName": "黑龙江省",
-	"cityName": "太原市",
-	"countyName": "双牌县"
-}, {
-	"alertdetail": "油后基交要可议。",
-	"alertname": "水浸告警",
-	"alertvalue": 99.8360675,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10020,
-	"phase": "A1",
-	"sbInfo": "所着百中何现石别开百人酸道民特往。",
-	"terminalno": 120,
-	"provinceName": "黑龙江省",
-	"cityName": "佛山市",
-	"countyName": "谢家集区"
-}, {
-	"alertdetail": "白长价办表干便。",
-	"alertname": "各种报警",
-	"alertvalue": 98.323,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10021,
-	"phase": "A1",
-	"sbInfo": "由如至等这总且调张常话线有采。",
-	"terminalno": 121,
-	"provinceName": "四川省",
-	"cityName": "澳门半岛",
-	"countyName": "邹城市"
-}, {
-	"alertdetail": "真保重其导水例。",
-	"alertname": "各种报警",
-	"alertvalue": 89.1839,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10022,
-	"phase": "A1",
-	"sbInfo": "变高值做经什无千年成且集须。",
-	"terminalno": 122,
-	"provinceName": "江西省",
-	"cityName": "九龙",
-	"countyName": "-"
-}, {
-	"alertdetail": "指况团将素定间消。",
-	"alertname": "水浸告警",
-	"alertvalue": 130.7253866476,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10023,
-	"phase": "A1",
-	"sbInfo": "步十须东号部给米造属县该性。",
-	"terminalno": 123,
-	"provinceName": "浙江省",
-	"cityName": "唐山市",
-	"countyName": "通榆县"
-}, {
-	"alertdetail": "性选变安心斗道求。",
-	"alertname": "各种报警",
-	"alertvalue": 115.05665,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10024,
-	"phase": "A1",
-	"sbInfo": "会整保术准许因圆引准因便品马济支。",
-	"terminalno": 124,
-	"provinceName": "吉林省",
-	"cityName": "韶关市",
-	"countyName": "中西区"
-}, {
-	"alertdetail": "处那率西导活相活来段。",
-	"alertname": "水浸告警",
-	"alertvalue": 112.35306815919544,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10025,
-	"phase": "A1",
-	"sbInfo": "结中严听代验平想与导光设。",
-	"terminalno": 125,
-	"provinceName": "台湾",
-	"cityName": "澳门半岛",
-	"countyName": "葵青区"
-}, {
-	"alertdetail": "计保因除当。",
-	"alertname": "各种报警",
-	"alertvalue": 109.8,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10026,
-	"phase": "A1",
-	"sbInfo": "公想路则头求该把音即国正内。",
-	"terminalno": 126,
-	"provinceName": "河南省",
-	"cityName": "重庆市",
-	"countyName": "寿阳县"
-}, {
-	"alertdetail": "保家林单会通以。",
-	"alertname": "水浸告警",
-	"alertvalue": 122.66135364618854,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10027,
-	"phase": "A1",
-	"sbInfo": "南主历型教本上证格统积许感界后那。",
-	"terminalno": 127,
-	"provinceName": "广东省",
-	"cityName": "昌都地区",
-	"countyName": "榕城区"
-}, {
-	"alertdetail": "装场较次文造边海意。",
-	"alertname": "各种报警",
-	"alertvalue": 164.25152937377285,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10028,
-	"phase": "A1",
-	"sbInfo": "形际管少回平至须具专日。",
-	"terminalno": 128,
-	"provinceName": "香港特别行政区",
-	"cityName": "云林县",
-	"countyName": "其它区"
-}, {
-	"alertdetail": "当市圆义作存业半。",
-	"alertname": "水浸告警",
-	"alertvalue": 161.01245771919,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10029,
-	"phase": "A1",
-	"sbInfo": "历已出区图或规要关化。",
-	"terminalno": 129,
-	"provinceName": "江西省",
-	"cityName": "海外",
-	"countyName": "其它区"
-}, {
-	"alertdetail": "系想线想长。",
-	"alertname": "水浸告警",
-	"alertvalue": 91.21834139614853,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10030,
-	"phase": "A1",
-	"sbInfo": "色量儿公运长声们入制么整离消志要。",
-	"terminalno": 130,
-	"provinceName": "安徽省",
-	"cityName": "云林县",
-	"countyName": "渝北区"
-}, {
-	"alertdetail": "并近住处太日天。",
-	"alertname": "水浸告警",
-	"alertvalue": 146.113779396,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10031,
-	"phase": "A1",
-	"sbInfo": "事小即之适与日改单备部次完置最。",
-	"terminalno": 131,
-	"provinceName": "四川省",
-	"cityName": "晋城市",
-	"countyName": "伽师县"
-}, {
-	"alertdetail": "领造年算院十现他比。",
-	"alertname": "水浸告警",
-	"alertvalue": 96,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10032,
-	"phase": "A1",
-	"sbInfo": "不往张着制色极命片布决。",
-	"terminalno": 132,
-	"provinceName": "陕西省",
-	"cityName": "宜兰县",
-	"countyName": "松溪县"
-}, {
-	"alertdetail": "化量毛见使而。",
-	"alertname": "各种报警",
-	"alertvalue": 89,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10033,
-	"phase": "A1",
-	"sbInfo": "什果老例压争团事大光声选。",
-	"terminalno": 133,
-	"provinceName": "四川省",
-	"cityName": "临沧市",
-	"countyName": "闸北区"
-}, {
-	"alertdetail": "南青类科属体达名路。",
-	"alertname": "各种报警",
-	"alertvalue": 170.3138633584148,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10034,
-	"phase": "A1",
-	"sbInfo": "除或究接北知龙老增之张争证公权。",
-	"terminalno": 134,
-	"provinceName": "江西省",
-	"cityName": "信阳市",
-	"countyName": "阜宁县"
-}, {
-	"alertdetail": "者使光矿照有水写。",
-	"alertname": "水浸告警",
-	"alertvalue": 117.82,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10035,
-	"phase": "A1",
-	"sbInfo": "当越商受示议无社题本问目。",
-	"terminalno": 135,
-	"provinceName": "山东省",
-	"cityName": "龙岩市",
-	"countyName": "隆德县"
-}, {
-	"alertdetail": "志西院定自先变照今如。",
-	"alertname": "水浸告警",
-	"alertvalue": 85.754742662974,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10036,
-	"phase": "A1",
-	"sbInfo": "当了型江在万近它且严民眼目。",
-	"terminalno": 136,
-	"provinceName": "海南省",
-	"cityName": "三门峡市",
-	"countyName": "通州区"
-}, {
-	"alertdetail": "代命不量花族斯题节想。",
-	"alertname": "各种报警",
-	"alertvalue": 98.38545528,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10037,
-	"phase": "A1",
-	"sbInfo": "此本个理九道型中子每劳府象育到西交。",
-	"terminalno": 137,
-	"provinceName": "江苏省",
-	"cityName": "苗栗县",
-	"countyName": "平罗县"
-}, {
-	"alertdetail": "据切两它较般见林。",
-	"alertname": "各种报警",
-	"alertvalue": 155.737,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10038,
-	"phase": "A1",
-	"sbInfo": "里力大下相为比每争当般求。",
-	"terminalno": 138,
-	"provinceName": "海南省",
-	"cityName": "日喀则地区",
-	"countyName": "金州区"
-}, {
-	"alertdetail": "引三可为比事常族现表。",
-	"alertname": "水浸告警",
-	"alertvalue": 131.4231678633,
-	"createtime": "2022-04-19 08:38:33",
-	"deviceid": null,
-	"gatewayno": 10039,
-	"phase": "A1",
-	"sbInfo": "手提个加极地平每备统。",
-	"terminalno": 139,
-	"provinceName": "江西省",
-	"cityName": "大同市",
-	"countyName": "万荣乡"
+	'alertdetail': '主么本指美证队众。',
+	'alertname': '水浸告警',
+	'alertvalue': 76.35193366743,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10000,
+	'phase': 'A1',
+	'sbInfo': '先加话她为斗价难就结空心府。',
+	'terminalno': 100,
+	'provinceName': '广西壮族自治区',
+	'cityName': '延安市',
+	'countyName': '东区'
+}, {
+	'alertdetail': '这分龙理处决装制细。',
+	'alertname': '各种报警',
+	'alertvalue': 179.4578676454877,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10001,
+	'phase': 'A1',
+	'sbInfo': '说运务战用受到在厂变共。',
+	'terminalno': 101,
+	'provinceName': '香港特别行政区',
+	'cityName': '连云港市',
+	'countyName': '彭山县'
+}, {
+	'alertdetail': '经山义打己系意。',
+	'alertname': '各种报警',
+	'alertvalue': 112.23387347173968,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10002,
+	'phase': 'A1',
+	'sbInfo': '内维量强解基必号油来出至商议万。',
+	'terminalno': 102,
+	'provinceName': '云南省',
+	'cityName': '邢台市',
+	'countyName': '奇台县'
+}, {
+	'alertdetail': '手转京飞百。',
+	'alertname': '水浸告警',
+	'alertvalue': 110.15,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10003,
+	'phase': 'A1',
+	'sbInfo': '又新加看适成确道边型。',
+	'terminalno': 103,
+	'provinceName': '北京',
+	'cityName': '襄阳市',
+	'countyName': '浏阳市'
+}, {
+	'alertdetail': '例感改中京规。',
+	'alertname': '各种报警',
+	'alertvalue': 185.2746953,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10004,
+	'phase': 'A1',
+	'sbInfo': '党下江全准意场月义部次省消。',
+	'terminalno': 104,
+	'provinceName': '浙江省',
+	'cityName': '忻州市',
+	'countyName': '洮北区'
+}, {
+	'alertdetail': '应个命给转小变十何。',
+	'alertname': '水浸告警',
+	'alertvalue': 84.37245586588067,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10005,
+	'phase': 'A1',
+	'sbInfo': '学老节实果北果需何料化门织。',
+	'terminalno': 105,
+	'provinceName': '重庆',
+	'cityName': '贺州市',
+	'countyName': '巴楚县'
+}, {
+	'alertdetail': '段事华叫七然厂家。',
+	'alertname': '各种报警',
+	'alertvalue': 150.161361,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10006,
+	'phase': 'A1',
+	'sbInfo': '这飞世平海经合务石实别广不对只。',
+	'terminalno': 106,
+	'provinceName': '四川省',
+	'cityName': '黄冈市',
+	'countyName': '铁山港区'
+}, {
+	'alertdetail': '且事飞取清证。',
+	'alertname': '各种报警',
+	'alertvalue': 67.4,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10007,
+	'phase': 'A1',
+	'sbInfo': '月场保圆记光京公快龙就。',
+	'terminalno': 107,
+	'provinceName': '福建省',
+	'cityName': '博尔塔拉蒙古自治州',
+	'countyName': '静乐县'
+}, {
+	'alertdetail': '任加按过资因。',
+	'alertname': '水浸告警',
+	'alertvalue': 176.5,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10008,
+	'phase': 'A1',
+	'sbInfo': '改志业除金好历验标品口果之之。',
+	'terminalno': 108,
+	'provinceName': '新疆维吾尔自治区',
+	'cityName': '重庆市',
+	'countyName': '启东市'
+}, {
+	'alertdetail': '石团斗是思可。',
+	'alertname': '各种报警',
+	'alertvalue': 127.28686626615864,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10009,
+	'phase': 'A1',
+	'sbInfo': '人发感历手任门同次市况直。',
+	'terminalno': 109,
+	'provinceName': '西藏自治区',
+	'cityName': '烟台市',
+	'countyName': '新邱区'
+}, {
+	'alertdetail': '许导思头商面。',
+	'alertname': '各种报警',
+	'alertvalue': 74.7141208,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10010,
+	'phase': 'A1',
+	'sbInfo': '美术江按时经飞以商除思始起高术。',
+	'terminalno': 110,
+	'provinceName': '重庆',
+	'cityName': '天津市',
+	'countyName': '怀柔区'
+}, {
+	'alertdetail': '越习行算对参。',
+	'alertname': '各种报警',
+	'alertvalue': 134.9774247,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10011,
+	'phase': 'A1',
+	'sbInfo': '以精带样解见社七我北具先地列这能引。',
+	'terminalno': 111,
+	'provinceName': '澳门特别行政区',
+	'cityName': '和田地区',
+	'countyName': '抚远县'
+}, {
+	'alertdetail': '少书且维明我体。',
+	'alertname': '各种报警',
+	'alertvalue': 177.7125254463579,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10012,
+	'phase': 'A1',
+	'sbInfo': '认术快也装值精级路表任经为片及地极。',
+	'terminalno': 112,
+	'provinceName': '浙江省',
+	'cityName': '成都市',
+	'countyName': '其它区'
+}, {
+	'alertdetail': '传却温府历住分月华。',
+	'alertname': '各种报警',
+	'alertvalue': 68.8735,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10013,
+	'phase': 'A1',
+	'sbInfo': '府亲场人重素产或千天。',
+	'terminalno': 113,
+	'provinceName': '新疆维吾尔自治区',
+	'cityName': '澳门半岛',
+	'countyName': '芦溪县'
+}, {
+	'alertdetail': '满收应提观千细学别。',
+	'alertname': '各种报警',
+	'alertvalue': 200.0874694361121,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10014,
+	'phase': 'A1',
+	'sbInfo': '火本数专命向科百们维据且同太回实。',
+	'terminalno': 114,
+	'provinceName': '北京',
+	'cityName': '海外',
+	'countyName': '涟源市'
+}, {
+	'alertdetail': '低与金利许验。',
+	'alertname': '各种报警',
+	'alertvalue': 87.014122311,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10015,
+	'phase': 'A1',
+	'sbInfo': '南目时农天立声来会农满后手严化。',
+	'terminalno': 115,
+	'provinceName': '内蒙古自治区',
+	'cityName': '衡水市',
+	'countyName': '-'
+}, {
+	'alertdetail': '生路题你少队表。',
+	'alertname': '水浸告警',
+	'alertvalue': 105.65846324863895,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10016,
+	'phase': 'A1',
+	'sbInfo': '周动阶了节农给自流更土完新化号。',
+	'terminalno': 116,
+	'provinceName': '云南省',
+	'cityName': '锡林郭勒盟',
+	'countyName': '双桥区'
+}, {
+	'alertdetail': '本不叫间王装斯国强。',
+	'alertname': '各种报警',
+	'alertvalue': 103.73382063737,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10017,
+	'phase': 'A1',
+	'sbInfo': '第资有军器张几际红矿八们。',
+	'terminalno': 117,
+	'provinceName': '新疆维吾尔自治区',
+	'cityName': '来宾市',
+	'countyName': '让胡路区'
+}, {
+	'alertdetail': '建思很开应非文。',
+	'alertname': '各种报警',
+	'alertvalue': 161.2652895979,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10018,
+	'phase': 'A1',
+	'sbInfo': '通每土感何几千工铁完在区江儿。',
+	'terminalno': 118,
+	'provinceName': '辽宁省',
+	'cityName': '秦皇岛市',
+	'countyName': '龙海市'
+}, {
+	'alertdetail': '系它难持保。',
+	'alertname': '各种报警',
+	'alertvalue': 93.6,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10019,
+	'phase': 'A1',
+	'sbInfo': '北八约即于后志前极由习史。',
+	'terminalno': 119,
+	'provinceName': '黑龙江省',
+	'cityName': '太原市',
+	'countyName': '双牌县'
+}, {
+	'alertdetail': '油后基交要可议。',
+	'alertname': '水浸告警',
+	'alertvalue': 99.8360675,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10020,
+	'phase': 'A1',
+	'sbInfo': '所着百中何现石别开百人酸道民特往。',
+	'terminalno': 120,
+	'provinceName': '黑龙江省',
+	'cityName': '佛山市',
+	'countyName': '谢家集区'
+}, {
+	'alertdetail': '白长价办表干便。',
+	'alertname': '各种报警',
+	'alertvalue': 98.323,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10021,
+	'phase': 'A1',
+	'sbInfo': '由如至等这总且调张常话线有采。',
+	'terminalno': 121,
+	'provinceName': '四川省',
+	'cityName': '澳门半岛',
+	'countyName': '邹城市'
+}, {
+	'alertdetail': '真保重其导水例。',
+	'alertname': '各种报警',
+	'alertvalue': 89.1839,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10022,
+	'phase': 'A1',
+	'sbInfo': '变高值做经什无千年成且集须。',
+	'terminalno': 122,
+	'provinceName': '江西省',
+	'cityName': '九龙',
+	'countyName': '-'
+}, {
+	'alertdetail': '指况团将素定间消。',
+	'alertname': '水浸告警',
+	'alertvalue': 130.7253866476,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10023,
+	'phase': 'A1',
+	'sbInfo': '步十须东号部给米造属县该性。',
+	'terminalno': 123,
+	'provinceName': '浙江省',
+	'cityName': '唐山市',
+	'countyName': '通榆县'
+}, {
+	'alertdetail': '性选变安心斗道求。',
+	'alertname': '各种报警',
+	'alertvalue': 115.05665,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10024,
+	'phase': 'A1',
+	'sbInfo': '会整保术准许因圆引准因便品马济支。',
+	'terminalno': 124,
+	'provinceName': '吉林省',
+	'cityName': '韶关市',
+	'countyName': '中西区'
+}, {
+	'alertdetail': '处那率西导活相活来段。',
+	'alertname': '水浸告警',
+	'alertvalue': 112.35306815919544,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10025,
+	'phase': 'A1',
+	'sbInfo': '结中严听代验平想与导光设。',
+	'terminalno': 125,
+	'provinceName': '台湾',
+	'cityName': '澳门半岛',
+	'countyName': '葵青区'
+}, {
+	'alertdetail': '计保因除当。',
+	'alertname': '各种报警',
+	'alertvalue': 109.8,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10026,
+	'phase': 'A1',
+	'sbInfo': '公想路则头求该把音即国正内。',
+	'terminalno': 126,
+	'provinceName': '河南省',
+	'cityName': '重庆市',
+	'countyName': '寿阳县'
+}, {
+	'alertdetail': '保家林单会通以。',
+	'alertname': '水浸告警',
+	'alertvalue': 122.66135364618854,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10027,
+	'phase': 'A1',
+	'sbInfo': '南主历型教本上证格统积许感界后那。',
+	'terminalno': 127,
+	'provinceName': '广东省',
+	'cityName': '昌都地区',
+	'countyName': '榕城区'
+}, {
+	'alertdetail': '装场较次文造边海意。',
+	'alertname': '各种报警',
+	'alertvalue': 164.25152937377285,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10028,
+	'phase': 'A1',
+	'sbInfo': '形际管少回平至须具专日。',
+	'terminalno': 128,
+	'provinceName': '香港特别行政区',
+	'cityName': '云林县',
+	'countyName': '其它区'
+}, {
+	'alertdetail': '当市圆义作存业半。',
+	'alertname': '水浸告警',
+	'alertvalue': 161.01245771919,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10029,
+	'phase': 'A1',
+	'sbInfo': '历已出区图或规要关化。',
+	'terminalno': 129,
+	'provinceName': '江西省',
+	'cityName': '海外',
+	'countyName': '其它区'
+}, {
+	'alertdetail': '系想线想长。',
+	'alertname': '水浸告警',
+	'alertvalue': 91.21834139614853,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10030,
+	'phase': 'A1',
+	'sbInfo': '色量儿公运长声们入制么整离消志要。',
+	'terminalno': 130,
+	'provinceName': '安徽省',
+	'cityName': '云林县',
+	'countyName': '渝北区'
+}, {
+	'alertdetail': '并近住处太日天。',
+	'alertname': '水浸告警',
+	'alertvalue': 146.113779396,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10031,
+	'phase': 'A1',
+	'sbInfo': '事小即之适与日改单备部次完置最。',
+	'terminalno': 131,
+	'provinceName': '四川省',
+	'cityName': '晋城市',
+	'countyName': '伽师县'
+}, {
+	'alertdetail': '领造年算院十现他比。',
+	'alertname': '水浸告警',
+	'alertvalue': 96,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10032,
+	'phase': 'A1',
+	'sbInfo': '不往张着制色极命片布决。',
+	'terminalno': 132,
+	'provinceName': '陕西省',
+	'cityName': '宜兰县',
+	'countyName': '松溪县'
+}, {
+	'alertdetail': '化量毛见使而。',
+	'alertname': '各种报警',
+	'alertvalue': 89,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10033,
+	'phase': 'A1',
+	'sbInfo': '什果老例压争团事大光声选。',
+	'terminalno': 133,
+	'provinceName': '四川省',
+	'cityName': '临沧市',
+	'countyName': '闸北区'
+}, {
+	'alertdetail': '南青类科属体达名路。',
+	'alertname': '各种报警',
+	'alertvalue': 170.3138633584148,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10034,
+	'phase': 'A1',
+	'sbInfo': '除或究接北知龙老增之张争证公权。',
+	'terminalno': 134,
+	'provinceName': '江西省',
+	'cityName': '信阳市',
+	'countyName': '阜宁县'
+}, {
+	'alertdetail': '者使光矿照有水写。',
+	'alertname': '水浸告警',
+	'alertvalue': 117.82,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10035,
+	'phase': 'A1',
+	'sbInfo': '当越商受示议无社题本问目。',
+	'terminalno': 135,
+	'provinceName': '山东省',
+	'cityName': '龙岩市',
+	'countyName': '隆德县'
+}, {
+	'alertdetail': '志西院定自先变照今如。',
+	'alertname': '水浸告警',
+	'alertvalue': 85.754742662974,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10036,
+	'phase': 'A1',
+	'sbInfo': '当了型江在万近它且严民眼目。',
+	'terminalno': 136,
+	'provinceName': '海南省',
+	'cityName': '三门峡市',
+	'countyName': '通州区'
+}, {
+	'alertdetail': '代命不量花族斯题节想。',
+	'alertname': '各种报警',
+	'alertvalue': 98.38545528,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10037,
+	'phase': 'A1',
+	'sbInfo': '此本个理九道型中子每劳府象育到西交。',
+	'terminalno': 137,
+	'provinceName': '江苏省',
+	'cityName': '苗栗县',
+	'countyName': '平罗县'
+}, {
+	'alertdetail': '据切两它较般见林。',
+	'alertname': '各种报警',
+	'alertvalue': 155.737,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10038,
+	'phase': 'A1',
+	'sbInfo': '里力大下相为比每争当般求。',
+	'terminalno': 138,
+	'provinceName': '海南省',
+	'cityName': '日喀则地区',
+	'countyName': '金州区'
+}, {
+	'alertdetail': '引三可为比事常族现表。',
+	'alertname': '水浸告警',
+	'alertvalue': 131.4231678633,
+	'createtime': '2022-04-19 08:38:33',
+	'deviceid': null,
+	'gatewayno': 10039,
+	'phase': 'A1',
+	'sbInfo': '手提个加极地平每备统。',
+	'terminalno': 139,
+	'provinceName': '江西省',
+	'cityName': '大同市',
+	'countyName': '万荣乡'
 }]
 }]
         }
         }
       }
       }

+ 9 - 9
src/views/home/right-center.vue

@@ -19,7 +19,7 @@ export default {
       gatewayno: '',
       gatewayno: '',
       config: {
       config: {
         showValue: true,
         showValue: true,
-        unit: "次",
+        unit: '吨',
         data: []
         data: []
       },
       },
       value:0,    
       value:0,    
@@ -57,14 +57,14 @@ export default {
       // this.pageflag =false
       // this.pageflag =false
       let res  = {
       let res  = {
         data:[
         data:[
-          {value: this.value++, name: '通辽市'},
-{value: 817, name: '黄南藏族自治州'},
-{value: 800, name: '汉中市'},
-{value: 792, name: '鹤壁市'},
-{value: 759, name: '漯河市'},
-{value: 671, name: '遵义市'},
-{value: 592, name: '伊犁哈萨克自治州'},
-{value: 226, name: '平顶山市'}
+          {value: this.value++, name: '鲅鱼圈金信库'},
+{value: 817, name: '鲅鱼圈金信库'},
+{value: 800, name: '鲅鱼圈金信库'},
+{value: 792, name: '鲅鱼圈金信库'},
+{value: 759, name: '鲅鱼圈金信库'},
+{value: 671, name: '鲅鱼圈金信库'},
+{value: 592, name: '鲅鱼圈金信库'},
+{value: 226, name: '鲅鱼圈金信库'}
         ]
         ]
       }
       }
            this.config = {
            this.config = {

+ 65 - 66
src/views/home/right-top.vue

@@ -30,7 +30,6 @@ export default {
     };
     };
   },
   },
   created() {
   created() {
-    debugger
     this.getData();
     this.getData();
   },
   },
 
 
@@ -94,10 +93,10 @@ numList2:[659, 316, 710, 990, 26, 820]
         1000
         1000
       );
       );
       let myChart = this.$refs.charts.chart;
       let myChart = this.$refs.charts.chart;
-      myChart.on("mouseover", (params) => {
+      myChart.on('mouseover', (params) => {
         this.clearData();
         this.clearData();
       });
       });
-      myChart.on("mouseout", (params) => {
+      myChart.on('mouseout', (params) => {
         this.timer = setInterval(
         this.timer = setInterval(
           looper,
           looper,
          1000
          1000
@@ -107,70 +106,70 @@ numList2:[659, 316, 710, 990, 26, 820]
     init(xData, yData, yData2) {
     init(xData, yData, yData2) {
       this.option = {
       this.option = {
         xAxis: {
         xAxis: {
-          type: "category",
+          type: 'category',
           data: xData,
           data: xData,
           boundaryGap: false, // 不留白,从原点开始
           boundaryGap: false, // 不留白,从原点开始
           splitLine: {
           splitLine: {
             show: true,
             show: true,
             lineStyle: {
             lineStyle: {
-              color: "rgba(31,99,163,.2)",
+              color: 'rgba(31,99,163,.2)',
             },
             },
           },
           },
           axisLine: {
           axisLine: {
             // show:false,
             // show:false,
             lineStyle: {
             lineStyle: {
-              color: "rgba(31,99,163,.1)",
+              color: 'rgba(31,99,163,.1)',
             },
             },
           },
           },
           axisLabel: {
           axisLabel: {
-            color: "#7EB7FD",
-            fontWeight: "500",
+            color: '#7EB7FD',
+            fontWeight: '500',
           },
           },
         },
         },
         yAxis: {
         yAxis: {
-          type: "value",
+          type: 'value',
           splitLine: {
           splitLine: {
             show: true,
             show: true,
             lineStyle: {
             lineStyle: {
-              color: "rgba(31,99,163,.2)",
+              color: 'rgba(31,99,163,.2)',
             },
             },
           },
           },
           axisLine: {
           axisLine: {
             lineStyle: {
             lineStyle: {
-              color: "rgba(31,99,163,.1)",
+              color: 'rgba(31,99,163,.1)',
             },
             },
           },
           },
           axisLabel: {
           axisLabel: {
-            color: "#7EB7FD",
-            fontWeight: "500",
+            color: '#7EB7FD',
+            fontWeight: '500',
           },
           },
         },
         },
         tooltip: {
         tooltip: {
-          trigger: "axis",
-          backgroundColor: "rgba(0,0,0,.6)",
-          borderColor: "rgba(147, 235, 248, .8)",
+          trigger: 'axis',
+          backgroundColor: 'rgba(0,0,0,.6)',
+          borderColor: 'rgba(147, 235, 248, .8)',
           textStyle: {
           textStyle: {
-            color: "#FFF",
+            color: '#FFF',
           },
           },
         },
         },
         grid: {
         grid: {
           //布局
           //布局
           show: true,
           show: true,
-          left: "10px",
-          right: "30px",
-          bottom: "10px",
-          top: "28px",
+          left: '10px',
+          right: '30px',
+          bottom: '10px',
+          top: '28px',
           containLabel: true,
           containLabel: true,
-          borderColor: "#1F63A3",
+          borderColor: '#1F63A3',
         },
         },
         series: [
         series: [
           {
           {
             data: yData,
             data: yData,
-            type: "line",
+            type: 'line',
             smooth: true,
             smooth: true,
-            symbol: "none", //去除点
-            name: "报警1次数",
-            color: "rgba(252,144,16,.7)",
+            symbol: 'none', //去除点
+            name: '出库量',
+            color: 'rgba(252,144,16,.7)',
             areaStyle: {
             areaStyle: {
               normal: {
               normal: {
                 //右,下,左,上
                 //右,下,左,上
@@ -182,11 +181,11 @@ numList2:[659, 316, 710, 990, 26, 820]
                   [
                   [
                     {
                     {
                       offset: 0,
                       offset: 0,
-                      color: "rgba(252,144,16,.7)",
+                      color: 'rgba(252,144,16,.7)',
                     },
                     },
                     {
                     {
                       offset: 1,
                       offset: 1,
-                      color: "rgba(252,144,16,.0)",
+                      color: 'rgba(252,144,16,.0)',
                     },
                     },
                   ],
                   ],
                   false
                   false
@@ -196,38 +195,38 @@ numList2:[659, 316, 710, 990, 26, 820]
             markPoint: {
             markPoint: {
               data: [
               data: [
                 {
                 {
-                  name: "最大值",
-                  type: "max",
-                  valueDim: "y",
-                  symbol: "rect",
+                  name: '最大值',
+                  type: 'max',
+                  valueDim: 'y',
+                  symbol: 'rect',
                   symbolSize: [60, 26],
                   symbolSize: [60, 26],
                   symbolOffset: [0, -20],
                   symbolOffset: [0, -20],
                   itemStyle: {
                   itemStyle: {
-                    color: "rgba(0,0,0,0)",
+                    color: 'rgba(0,0,0,0)',
                   },
                   },
                   label: {
                   label: {
-                    color: "#FC9010",
-                    backgroundColor: "rgba(252,144,16,0.1)",
+                    color: '#FC9010',
+                    backgroundColor: 'rgba(252,144,16,0.1)',
                     borderRadius: 6,
                     borderRadius: 6,
                     padding: [7, 14],
                     padding: [7, 14],
                     borderWidth: 0.5,
                     borderWidth: 0.5,
-                    borderColor: "rgba(252,144,16,.5)",
-                    formatter: "报警1:{c}",
+                    borderColor: 'rgba(252,144,16,.5)',
+                    formatter: '出库量:{c}',
                   },
                   },
                 },
                 },
                 {
                 {
-                  name: "最大值",
-                  type: "max",
-                  valueDim: "y",
-                  symbol: "circle",
+                  name: '最大值',
+                  type: 'max',
+                  valueDim: 'y',
+                  symbol: 'circle',
                   symbolSize: 6,
                   symbolSize: 6,
                   itemStyle: {
                   itemStyle: {
-                    color: "#FC9010",
-                    shadowColor: "#FC9010",
+                    color: '#FC9010',
+                    shadowColor: '#FC9010',
                     shadowBlur: 8,
                     shadowBlur: 8,
                   },
                   },
                   label: {
                   label: {
-                    formatter: "",
+                    formatter: '',
                   },
                   },
                 },
                 },
               ],
               ],
@@ -235,11 +234,11 @@ numList2:[659, 316, 710, 990, 26, 820]
           },
           },
           {
           {
             data: yData2,
             data: yData2,
-            type: "line",
+            type: 'line',
             smooth: true,
             smooth: true,
-            symbol: "none", //去除点
-            name: "报警2次数",
-            color: "rgba(9,202,243,.7)",
+            symbol: 'none', //去除点
+            name: '入库量',
+            color: 'rgba(9,202,243,.7)',
             areaStyle: {
             areaStyle: {
               normal: {
               normal: {
                 //右,下,左,上
                 //右,下,左,上
@@ -251,11 +250,11 @@ numList2:[659, 316, 710, 990, 26, 820]
                   [
                   [
                     {
                     {
                       offset: 0,
                       offset: 0,
-                      color: "rgba(9,202,243,.7)",
+                      color: 'rgba(9,202,243,.7)',
                     },
                     },
                     {
                     {
                       offset: 1,
                       offset: 1,
-                      color: "rgba(9,202,243,.0)",
+                      color: 'rgba(9,202,243,.0)',
                     },
                     },
                   ],
                   ],
                   false
                   false
@@ -265,39 +264,39 @@ numList2:[659, 316, 710, 990, 26, 820]
             markPoint: {
             markPoint: {
               data: [
               data: [
                 {
                 {
-                  name: "最大值",
-                  type: "max",
-                  valueDim: "y",
-                  symbol: "rect",
+                  name: '最大值',
+                  type: 'max',
+                  valueDim: 'y',
+                  symbol: 'rect',
                   symbolSize: [60, 26],
                   symbolSize: [60, 26],
                   symbolOffset: [0, -20],
                   symbolOffset: [0, -20],
                   itemStyle: {
                   itemStyle: {
-                    color: "rgba(0,0,0,0)",
+                    color: 'rgba(0,0,0,0)',
                   },
                   },
                   label: {
                   label: {
-                    color: "#09CAF3",
-                    backgroundColor: "rgba(9,202,243,0.1)",
+                    color: '#09CAF3',
+                    backgroundColor: 'rgba(9,202,243,0.1)',
 
 
                     borderRadius: 6,
                     borderRadius: 6,
-                    borderColor: "rgba(9,202,243,.5)",
+                    borderColor: 'rgba(9,202,243,.5)',
                     padding: [7, 14],
                     padding: [7, 14],
-                    formatter: "报警2:{c}",
+                    formatter: '入库量:{c}',
                     borderWidth: 0.5,
                     borderWidth: 0.5,
                   },
                   },
                 },
                 },
                 {
                 {
-                  name: "最大值",
-                  type: "max",
-                  valueDim: "y",
-                  symbol: "circle",
+                  name: '最大值',
+                  type: 'max',
+                  valueDim: 'y',
+                  symbol: 'circle',
                   symbolSize: 6,
                   symbolSize: 6,
                   itemStyle: {
                   itemStyle: {
-                    color: "#09CAF3",
-                    shadowColor: "#09CAF3",
+                    color: '#09CAF3',
+                    shadowColor: '#09CAF3',
                     shadowBlur: 8,
                     shadowBlur: 8,
                   },
                   },
                   label: {
                   label: {
-                    formatter: "",
+                    formatter: '',
                   },
                   },
                 },
                 },
               ],
               ],

+ 1 - 2
src/views/houseSelfCollect/weightCheckRecord.vue

@@ -746,7 +746,7 @@
       printSmall() {
       printSmall() {
         window.open('../../../../static/weightCheck.html?type=1&tableData=' + JSON.stringify(this.dialogData).replace(/%/g, 'baifenhao'))
         window.open('../../../../static/weightCheck.html?type=1&tableData=' + JSON.stringify(this.dialogData).replace(/%/g, 'baifenhao'))
       },
       },
-      printBig(type, radioType) {debugger
+      printBig(type, radioType) {
         // 打印额外
         // 打印额外
         if (this.checked || this.ddchecked) {
         if (this.checked || this.ddchecked) {
           this.makeEWjjSelectPrintList()
           this.makeEWjjSelectPrintList()
@@ -761,7 +761,6 @@
           window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType)
           window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType)
         } else {
         } else {
           console.log(this.dialogDataList)
           console.log(this.dialogDataList)
-          debugger
           window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
           window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
         }
         }
       },
       },

+ 0 - 1
src/views/statisticalReport/autoSettlementList.vue

@@ -497,7 +497,6 @@ export default {
       }
       }
     },
     },
     selectInit(row) {
     selectInit(row) {
-      debugger
       //在这里一定要记得类型匹配的上。
       //在这里一定要记得类型匹配的上。
       if (row.approveStatus == null) {
       if (row.approveStatus == null) {
         return true
         return true

+ 6 - 8
src/views/warehouse/warehouseManagementRecord.vue

@@ -457,8 +457,8 @@
           label: '厦门建发物产有限公司'
           label: '厦门建发物产有限公司'
         }],
         }],
         companyName: '黑龙江利润元粮食贸易有限公司',
         companyName: '黑龙江利润元粮食贸易有限公司',
-        companyNameEW: "厦门建发物产有限公司",
-        ewCustomer: "黑龙江利润元粮食贸易有限公司",
+        companyNameEW: '厦门建发物产有限公司',
+        ewCustomer: '黑龙江利润元粮食贸易有限公司',
         ddchecked: false,
         ddchecked: false,
         checked: false,
         checked: false,
         isShowPrintType: false,
         isShowPrintType: false,
@@ -494,7 +494,7 @@
         modification: [],
         modification: [],
         printList: [], //批量打印数据
         printList: [], //批量打印数据
         onePrint: false, //单个打印开关
         onePrint: false, //单个打印开关
-        idPrint:"",
+        idPrint:'',
       }
       }
     },
     },
 
 
@@ -525,7 +525,6 @@
         }
         }
       },
       },
       changeEw(e) {
       changeEw(e) {
-        debugger
         this.ddchecked = false
         this.ddchecked = false
 
 
         if (e) {
         if (e) {
@@ -544,7 +543,6 @@
         localStorage.setItem('ewWarehouseBatchPrint', JSON.stringify(_printList))
         localStorage.setItem('ewWarehouseBatchPrint', JSON.stringify(_printList))
       },
       },
       async typePrintClick() {
       async typePrintClick() {
-        debugger
         this.printList = []
         this.printList = []
         if (this.onePrint) {
         if (this.onePrint) {
           sessionStorage.removeItem('ck_bd_printData')
           sessionStorage.removeItem('ck_bd_printData')
@@ -585,7 +583,7 @@
                     this.makeEWjjSelectPrintList()
                     this.makeEWjjSelectPrintList()
                     //  this.selectEW = true;
                     //  this.selectEW = true;
                   }
                   }
-                  localStorage.setItem("warehouseBatchPrint", JSON.stringify(this.printList))
+                  localStorage.setItem('warehouseBatchPrint', JSON.stringify(this.printList))
                   window.open('../../../../static/warehouseBatchPrint.html?selectEW=' + this.checked +
                   window.open('../../../../static/warehouseBatchPrint.html?selectEW=' + this.checked +
                     '&selectEWDD=' + this.ddchecked)
                     '&selectEWDD=' + this.ddchecked)
                 }
                 }
@@ -682,7 +680,7 @@
       
       
         this.printList = []
         this.printList = []
         if (this.modification.length == 0) {
         if (this.modification.length == 0) {
-          this.$message.error("请勾选要打印的条目!")
+          this.$message.error('请勾选要打印的条目!')
         } else {
         } else {
 
 
           this.isShowPrintType = true
           this.isShowPrintType = true
@@ -710,7 +708,7 @@
       },
       },
       handleSelectionChange(val) {
       handleSelectionChange(val) {
         this.modification = val
         this.modification = val
-        console.log("sfasa", this.modification)
+        console.log('sfasa', this.modification)
       },
       },
       selectInit(row){
       selectInit(row){
 				 //在这里一定要记得类型匹配的上。
 				 //在这里一定要记得类型匹配的上。