gx

src/App.vue

@@ -26,6 +26,7 @@ export default {
 
     window.addEventListener("resize", () => {
       this.resize_window();
+      console.log(this.scalesNum)
     });
   },
   methods: {
@@ -39,6 +40,7 @@ export default {
       } else {
         this.scalesNum = myWidth / 3840;
       }
+
     },
   },
   metaInfo() {

src/components2/cnergyConsumptionStatistics/index.vue

@@ -5,7 +5,7 @@
       <el-image :src="cnergyConsumption" fit="scale-down" />
       <el-col class="name"
         >当日耗能<el-col class="num"
-          >165<span class="unit">kw · h</span></el-col
+          >88<span class="unit">kw · h</span></el-col
         ></el-col
       >
     </el-col>
@@ -13,7 +13,7 @@
       <el-image :src="cnergyConsumption" fit="scale-down" />
       <el-col class="name"
         >当月耗能<el-col class="num"
-          >3421<span class="unit">kw · h</span></el-col
+          >1725<span class="unit">kw · h</span></el-col
         ></el-col
       >
     </el-col>
@@ -21,7 +21,7 @@
       <el-image :src="cnergyConsumption" fit="scale-down" />
       <el-col class="name"
         >昨日耗能<el-col class="num"
-          >158<span class="unit">kw · h</span></el-col
+          >115<span class="unit">kw · h</span></el-col
         ></el-col
       >
     </el-col>

src/components2/conferenceRoomStatistics/pie.vue

@@ -2,7 +2,7 @@
   <el-row >
     <div
       id="index2"
-      style="width:360px;height:360px;margin:-78px 0 0 130px;"
+      style="width:360px;height:360px;margin:-78px 0 0 134px;"
     ></div>
   </el-row>
 </template>
@@ -32,7 +32,7 @@ export default {
         ],
         title: {
           //text: data.attendeeIsSign,
-          text: '79%',
+          text: '0.46%',
           textStyle: {
             color: '#E6EFFF',
             fontSize: 25
@@ -77,8 +77,8 @@ export default {
               show: false
             },
             data: [
-              { value: 79, name: '使用时长' },
-              { value: 21, name: '未使用时长' },
+              { value: 0.46, name: '使用时长' },
+              { value: 99.54, name: '未使用时长' },
             ]
           }
         ]

src/components2/conferenceRoomStatistics/seTable.vue

@@ -1,107 +0,0 @@
-<template>
-  <el-table ref="initList" :data="initList"  height="11.11111vh" @row-click="clickData" highlight-current-row @cell-mouse-enter="mouseEnter" @cell-mouse-leave="mouseLeave">
-      <el-table-column label="告警时间" align="center" prop="time"  show-overflow-tooltip />
-      <el-table-column label="告警内容" align="center" prop="evtname"  show-overflow-tooltip />
-      <el-table-column label="告警类型" align="center" prop="dwtype"  show-overflow-tooltip >
-         <template slot-scope="scope">
-          <span>{{scope.row.dwtype == "1" ? "用户传输装置" : scope.row.dwtype == "2" ? "喷淋水压" : 
-            scope.row.dwtype == "2" ? "喷淋水压" : scope.row.dwtype == "5" ? "消防水箱液位" : 
-            scope.row.dwtype == "6" ? "RTU" : scope.row.dwtype == "16" ? "消防视频监控" : "其它"}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="告警状态" align="center" prop="evt"  show-overflow-tooltip >
-        <template slot-scope="scope">
-          <span :class="scope.row.evt ? 'handle' : 'untreated'">{{scope.row.evt  ? "已处理" : "未处理"}}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-</template>
-<script>
-export default {
-
-  data() {
-    return {
-      initList:[],
-      table_interval:null,
-    };
-  },
-  created(){
-    this.initData();
-  },
-  mounted() {},
-  methods: {
-    //初始化数据
-    initData() {
-      let that = this
-      let num = 0
-      let wsUri = "wss://iot.usky.cn:55120";
-      try {
-          let websocket = new WebSocket(wsUri);
-          websocket.onopen = function(evt) {
-            let json = {};
-            json.agentid = 'admin';
-            websocket.send(JSON.stringify(json));
-          };
-          websocket.onclose = function(evt) {
-              this.initWebSocket();
-          };
-          websocket.onmessage = function(evt) {
-            let warningInfo = eval('(' + evt.data + ')');
-            if(warningInfo.dwtype){
-              that.initList.push(warningInfo)
-              if(num == '0'){
-                if(that.initList.length>2){
-                  that.dataScrolling();
-                  num = 1
-                }
-              }
-            }
-          };
-          websocket.onerror = function(evt) {
-            // console.log("Error:", evt.data);
-            (function() {})()
-          };
-      } catch (exception) {
-        // console.log("Exception:", exception);
-        (function() {})()
-      }
-      that.dataScrolling();
-    },
-    //数据滚动
-    dataScrolling:function(){
-        let top=this.$refs.initList.bodyWrapper;
-        this.table_interval=setInterval(() => {
-            top.scrollTop+=1;
-            if(top.clientHeight+top.scrollTop==top.scrollHeight){
-              top.scrollTop=0;
-            }
-        }, 100);
-    },
-    //鼠标进入，停止滚动
-    mouseEnter:function(){
-        clearInterval(this.table_interval);
-        this.table_interval=null;
-    },
-    //鼠标离开，开始滚动
-    mouseLeave:function(){
-        this.dataScrolling();
-    },
-    //点击行
-    clickData(row, event, column){
-    },
-    cellStyle (row, column, rowIndex, columnIndex) {
-    //列的label的名称
-      if (row.column.label === "告警" || row.column.label === "离线") {
-        return 'color:#2280D9' //修改的样式
-      }
-    },
-  },
-};
-</script>
-<style scoped>
-/*最外层透明*/
-.el-table{
-  height:11.11111vh !important;
-}
-</style>
-

src/components2/parkingSpace/index.vue

@@ -10,16 +10,16 @@
       <el-col class="rowN">
         <el-image :src="car" fit="scale-down" />
         <el-col class="name">已停车位</el-col>
-        <el-col class="num">160<span> 个</span></el-col>
+        <el-col class="num">32<span> 个</span></el-col>
       </el-col>
       <el-col class="rowN">
         <el-image :src="car" fit="scale-down" />
         <el-col class="name">剩余车位</el-col>
-        <el-col class="num">0<span> 个</span></el-col>
+        <el-col class="num">128<span> 个</span></el-col>
       </el-col>
     </el-col>
     <el-col class="parkingSpaceRight">
-      <el-col class="num">217<span> 辆/次</span></el-col>
+      <el-col class="num">39<span> 辆/次</span></el-col>
       <el-col class="name">今日出入车辆</el-col>
     </el-col>
   </el-col>
@@ -35,14 +35,14 @@ export default {
     };
   },
   mounted() {
-    this.init()
+    //this.init()
   },
   methods: {
     init(){
       axios({
         method: 'get',
         url: 'https://smartpark.caih.com/ykt/api/thirdparty/v1/openInterface/parkingSpot',
-        timeout: 3000,
+        timeout: 10000,
       }).then(res =>{
         console.log(res)
 

src/components2/populationStatistics/echartsZXT.vue

@@ -128,7 +128,7 @@ export default {
         series: series,
       };
       option && myChart.setOption(option);
-      
+
       setTimeout(function () {
         window.onresize = function () {
           myChart.resize();

src/components2/restaurant/index.vue

@@ -4,19 +4,27 @@
     <el-col class="restaurantLeft">
       <el-col :span="24" class="nh">
         <el-image :src="restaurant1" fit="scale-down" />
-        <el-col class="name"
+        <el-col class="name">今日营业额
+          <el-col class="num">0<span class="unit">元</span></el-col>
+        </el-col>
+        <!-- <el-col class="name"
           >今日营业额<el-col class="num"
             >{{ data.nowIncome || 0 }}<span class="unit">元</span></el-col
           ></el-col
-        >
+        > -->
       </el-col>
       <el-col :span="24" class="nh">
         <el-image :src="restaurant1" fit="scale-down" />
         <el-col class="name"
           >今日销售人/次<el-col class="num"
-            >{{ data.consumerNowNumber || 0 }}<span class="unit"></span></el-col
+            >0<span class="unit"></span></el-col
           ></el-col
         >
+        <!-- <el-col class="name"
+          >今日销售人/次<el-col class="num"
+            >{{ data.consumerNowNumber || 0 }}<span class="unit"></span></el-col
+          ></el-col
+        > -->
       </el-col>
     </el-col>
     <el-col class="restaurantRight">
@@ -30,6 +38,10 @@
           <el-col :span="5"><el-image :src="item.img" fit="scale-down" class="leftImg iconCP"/></el-col>
           <el-col :span="11" class="dishName">{{item.name}}</el-col>
           <el-col :span="8" class="fs">{{item.countPid}}份</el-col>
+
+          <!-- <el-col :span="5"><el-image :src="item.img" fit="scale-down" class="leftImg iconCP"/></el-col>
+          <el-col :span="11" class="dishName">{{item.name}}</el-col>
+          <el-col :span="8" class="fs">{{item.countPid}}份</el-col> -->
         </div>
       </el-col>
     </el-col>
@@ -48,14 +60,28 @@ export default {
   name: "restaurant",
   data() {
     return {
-      loading:true,
+      loading:false,
       restaurant1: restaurant1,
       restaurant2: restaurant2,
       restaurant3: restaurant3,
       num1: num1,
       num2: num2,
       num3: num3,
-      data:{},
+      data:{
+        countTheTopThree:[
+          // {img:num1,name:"蒜茸小白菜",countPid:436},
+          // {img:num2,name:"雪菜老豆腐",countPid:403},
+          // {img:num3,name:"碎肉粉",countPid:395}
+
+          // {img:num1,name:"蒜茸小白菜",countPid:436},
+          // {img:num2,name:"雪菜老豆腐",countPid:403},
+          // {img:num3,name:"碎肉粉",countPid:395}
+
+          {img:num1,name:"未营业",countPid:0},
+          {img:num2,name:"未营业",countPid:0},
+          {img:num3,name:"未营业",countPid:0},
+        ]
+      },
     };
   },
   created(){
@@ -73,8 +99,8 @@ export default {
     }
   },
   mounted() {
-    this.init()
-    this.timing()
+    // this.init()
+    // this.timing()
   },
   methods: {
     init(){
@@ -82,7 +108,7 @@ export default {
       axios({
         method: 'get',
         url: 'https://smartpark.caih.com/zhcy/api/thirdparty/v1/open/getCanYinData',
-        timeout: 3000,
+        timeout: 10000,
       }).then(res =>{
         this.data = res.data.data
         if(this.data.countTheTopThree.length>0){