From 64aa36be26507056543445cee849d8d14663deb6 Mon Sep 17 00:00:00 2001
From: wangxiaohua <1214073490@qq.com>
Date: Fri, 26 Nov 2021 13:53:09 +0800
Subject: [PATCH] init

---
 src/views/Equipment/equipmentOnlineRecordList.vue |  4 ++--
 src/views/Statistics/dataScreeSys.vue             |  9 +--------
 src/views/Statistics/trend.vue                    | 12 ++++++------
 src/views/admin/user/index.vue                    |  2 +-
 src/views/building/index.vue                      | 13 ++++---------
 vue.config.js                                     |  4 ++--
 6 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/src/views/Equipment/equipmentOnlineRecordList.vue b/src/views/Equipment/equipmentOnlineRecordList.vue
index 1cb0cd6..af60503 100644
--- a/src/views/Equipment/equipmentOnlineRecordList.vue
+++ b/src/views/Equipment/equipmentOnlineRecordList.vue
@@ -444,8 +444,8 @@ export default {
       console.log(this.activeTotal, "888888888888888888888");
       var url = "";
       let obj = {
-        pageNum: this.page.pageNum,
-        pageSize: this.page.pageSize,
+        current: this.page.pageNum,
+        size: this.page.pageSize,
         imei: this.page.imei,
       };
       this.tableData = [];
diff --git a/src/views/Statistics/dataScreeSys.vue b/src/views/Statistics/dataScreeSys.vue
index a8688a5..70b9c08 100644
--- a/src/views/Statistics/dataScreeSys.vue
+++ b/src/views/Statistics/dataScreeSys.vue
@@ -368,10 +368,6 @@ export default {
           orgCode: this.selValue == 1 ? this.choicValue : null,
         })
         .then((res) => {
-          // console.log(res);
-          // this.firstTab = res.data;
-          // 对数据进行处理
-          // 将数据给一个指定值然后设置一个方法还进行tab切换的时候调用
           this.secondTab = res.data;
           // 调用方法
           this.getChars1(1);
@@ -390,7 +386,7 @@ export default {
         .then((res) => {
           // console.log(res);
           this.thirdTab = res.data;
-          this.getChars2(1);
+          this.getChars2(this.cardindex);
         });
     },
     // echars生成
@@ -518,7 +514,6 @@ export default {
           orgCode: this.selValue == 1 ? this.choicValue : null,
         })
         .then((res) => {
-          // console.log(res);
           this.firstTab = res.data;
         });
     },
@@ -532,7 +527,6 @@ export default {
     },
     confirmtime(e) {
       this.dateType = null;
-
       this.dataOverviewWithSystemWithLook();
     },
     tabtimetap(i) {
@@ -545,7 +539,6 @@ export default {
     },
     //卡片下折线图
     SwitchCARDS(arr, str, timeDate, Strname) {
-      // console.log(arr,str,timeDate,Strname);
       var chartDom = document.getElementById(str);
       var myChart = echarts.init(chartDom);
       var option;
diff --git a/src/views/Statistics/trend.vue b/src/views/Statistics/trend.vue
index 97f51aa..ef6cb3e 100644
--- a/src/views/Statistics/trend.vue
+++ b/src/views/Statistics/trend.vue
@@ -166,7 +166,7 @@
                 compare2.receptionCount >= 0 ? 'color:green;' : 'color:red;'
               "
             >
-              {{ compare2.receptionCount || 0 }}
+              {{ compare2.receptionCount || 0 }}%
             </div>
           </div>
         </div>
@@ -191,7 +191,7 @@
             <div
               :style="compare2.avgDuration >= 0 ? 'color:green;' : 'color:red;'"
             >
-              {{ compare2.avgDuration || 0 }}
+              {{ compare2.avgDuration || 0 }}%
             </div>
           </div>
         </div>
@@ -224,7 +224,7 @@
                 compare2.prohibitedCustomer >= 0 ? 'color:green;' : 'color:red;'
               "
             >
-              {{ compare2.prohibitedCustomer || 0 }}
+              {{ compare2.prohibitedCustomer || 0 }}%
             </div>
           </div>
         </div>
@@ -257,7 +257,7 @@
                 compare2.activeCustomer >= 0 ? 'color:green;' : 'color:red;'
               "
             >
-              {{ compare2.activeCustomer || 0 }}
+              {{ compare2.activeCustomer || 0 }}%
             </div>
           </div>
         </div>
@@ -290,7 +290,7 @@
                 compare2.activeCustomerRate >= 0 ? 'color:green;' : 'color:red;'
               "
             >
-              {{ compare2.activeCustomerRate || 0 }}
+              {{ compare2.activeCustomerRate || 0 }}%
             </div>
           </div>
         </div>
@@ -315,7 +315,7 @@
             <div
               :style="compare2.fraction >= 0 ? 'color:green;' : 'color:red;'"
             >
-              {{ compare2.fraction || 0 }}
+              {{ compare2.fraction || 0 }}%
             </div>
           </div>
         </div>
diff --git a/src/views/admin/user/index.vue b/src/views/admin/user/index.vue
index ce46a14..6ebb67e 100644
--- a/src/views/admin/user/index.vue
+++ b/src/views/admin/user/index.vue
@@ -293,7 +293,7 @@
         <el-table-column type="selection" width="55"> </el-table-column>
         <el-table-column prop="name" label="用户名"> </el-table-column>
         <el-table-column label="登录手机" prop="username"> </el-table-column>
-        <el-table-column prop="orgName" label="所属组织"> </el-table-column>
+        <el-table-column  :show-overflow-tooltip="true"  width="120px" align="center" prop="orgName" label="所属组织"> </el-table-column>
         <!-- <el-table-column prop="orgType" label="组织类型">
           <template slot-scope="scope">
             {{
diff --git a/src/views/building/index.vue b/src/views/building/index.vue
index fbb582f..7c74aa2 100644
--- a/src/views/building/index.vue
+++ b/src/views/building/index.vue
@@ -873,17 +873,13 @@ export default {
     },
     // 添加楼盘
     addSure() {
-          if(!this.resetFlag){
-            this.$message.error('平台用户与楼盘用户不能重复添加！')
-            return
-        }
-      // console.log(this.addressOptions)
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
-          console.log(this.ruleForm);
+          if(!this.resetFlag){
+              return
+          }
           // 编辑
           if (this.editFlag) {
-            console.log("编辑");
             this.$api.api.editZkhouse(this.ruleForm).then((res) => {
               console.log(res);
               if (res.code == 0) {
@@ -894,7 +890,6 @@ export default {
             });
           } else {
             // 添加
-            console.log("添加");
             this.$api.api.addZkhouse(this.ruleForm).then((res) => {
               console.log(res);
               if (res.code == 0) {
@@ -985,7 +980,7 @@ export default {
       this.accountForm.id = row.id;
     },
     changeSure() {
-                if(!this.resetFlag){
+        if(!this.resetFlag){
             this.$message.error('平台用户与楼盘用户不能重复添加！')
             return
         }
diff --git a/vue.config.js b/vue.config.js
index db6248b..b514bbc 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,9 +3,9 @@
  * https://cli.vuejs.org/zh/config/
  */
 // const url = 'http://pigx-gateway'
-const url = 'http://39.97.167.65: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.134:9999' //嘉豪
 // const url = 'http://192.168.31.100:9999' //王笑
 // const url = 'http://nitu5e.natappfree.cc' //王笑