Merge branch 'master' of http://git.2weisou.com/wangxiao/zkPCproject into master

src/views/Statistics/index.vue

@@ -230,12 +230,28 @@ export default {
         },
       ],
       houseId: "",
+      options:{},
+      value:''
     };
   },
   mounted() {
     this.myChartinit();
+    // this.zkhousePage()
   },
   methods: {
+     zkhousePage() {
+        let obj = {
+          current: 1,
+          size: 100,
+        };
+        this.$api.api.zkhousePage(obj).then((res) => {
+          console.log(res)
+  //         this.tableData = res.data.records;
+  //         this.total = res.data.total;
+        });
+    },
+
+
     tabtimetap(index) {
       this.TimetoAhoose = index;
       this.fromobj.starttime = "";

vue.config.js

@@ -3,9 +3,8 @@
  * https://cli.vuejs.org/zh/config/
  */
 // const url = 'http://pigx-gateway'
-
 const url = 'http://39.97.167.65:9999' //测试
-// const url = 'http://192.168.31.160:9999' //长龙/
+// const url = 'http://192.168.31.160:9999' //长龙
 // const url = 'http://192.168.31.128:9999' //嘉豪
 // const url = 'http://192.168.31.100:9999' //王笑