From c7b2cd694ba8e3a8ffe87667d9c6651a3b2099dc Mon Sep 17 00:00:00 2001
From: lancer <1905818361@qq.com>
Date: Tue, 14 Dec 2021 16:49:11 +0800
Subject: [PATCH] init

---
 src/views/Equipment/equipmentDetailList.vue | 20 +++++++++++++-------
 src/views/Equipment/state.vue               |  2 +-
 vue.config.js                               |  4 ++--
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/views/Equipment/equipmentDetailList.vue b/src/views/Equipment/equipmentDetailList.vue
index e7cb784..ebd7188 100644
--- a/src/views/Equipment/equipmentDetailList.vue
+++ b/src/views/Equipment/equipmentDetailList.vue
@@ -979,13 +979,13 @@ export default {
     },
     screening() {
       this.page.pageNum = 1;
-      this.page.pageSize = 6;
+      this.page.pageSize = 10;
       this.getTableList();
     },
     empty() {
       this.page = {
         pageNum: 1,
-        pageSize: 6,
+        pageSize: 10,
         openTime: "",
         closeTime: "",
         houseName: "",
@@ -1170,12 +1170,18 @@ export default {
           item.time = item.first[str];
           item.time1 = item.second[str];
           item.time2 = item.contrast[str] + "";
-          if (index > 0) {
-            timeDate.push(item.name);
-            arr1.push(item.first[str]);
-            arr2.push(item.second[str]);
-          }
+
+          // if (index > 0) {
+          //   timeDate.push(item.name);
+          //   arr1.push(item.first[str]);
+          //   arr2.push(item.second[str]);
+          // }
         });
+          this.allCompare.data.first.map((item,idx)=>{
+          timeDate.push(item.createTime.substring(5)+'VS'+this.allCompare.data.second[idx].createTime.substring(5))
+          arr1.push(item[str])
+          arr2.push(this.allCompare.data.second[idx][str])
+        })
         this.compareList = Object.assign([], this.compareList);
         this.$forceUpdate();
         var chartDom = document.getElementById("compare");
diff --git a/src/views/Equipment/state.vue b/src/views/Equipment/state.vue
index b0b11ea..7fbc212 100644
--- a/src/views/Equipment/state.vue
+++ b/src/views/Equipment/state.vue
@@ -1006,7 +1006,7 @@ export default {
             .then((res) => {
               this.$message({
                 type: "success",
-                message: "操作成功!",
+                message: res.msg,
               });
               this.getTableList();
             });
diff --git a/vue.config.js b/vue.config.js
index f361a46..db6248b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,8 +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.169:9999' //长龙
+const url = 'http://39.97.167.65:9999' //测试
+// const url = 'http://192.168.31.169:9999' //长龙
 // const url = 'http://192.168.31.134:9999' //嘉豪
 // const url = 'http://192.168.31.100:9999' //王笑
 // const url = 'http://nitu5e.natappfree.cc' //王笑