From 6582b5dd37e5779cc2eead7337e4b2cd7319a36d Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sun, 09 May 2021 12:51:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

---
 src/views/parcel/parcelKind.vue       |    2 ++
 src/views/realTimePolice/real.vue     |    2 ++
 src/views/system/dept.vue             |    4 ++--
 src/views/animalHeat/animalHeat.vue   |    3 ++-
 src/views/healthcode/healthcode.vue   |    3 ++-
 src/views/supervisoryConsole/data.vue |    7 +++++++
 src/views/system/user.vue             |   10 ++++++----
 src/views/parcel/parcel.vue           |    2 ++
 8 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/views/animalHeat/animalHeat.vue b/src/views/animalHeat/animalHeat.vue
index b05232b..591582d 100644
--- a/src/views/animalHeat/animalHeat.vue
+++ b/src/views/animalHeat/animalHeat.vue
@@ -217,6 +217,8 @@
       },
       //搜索按钮
       searchChange(params, done) {
+        //清空this.$route.query
+        this.$router.push({ query: {} });
         this.query = params;
         this.page.currentPage = 1;
         this.onLoad(this.page, params);
@@ -308,7 +310,6 @@
           }
       },
       onLoad(page, params = {}) {
-        // debugger;
         const { dateTime } = this.query;
         let values = {
           ...params,
diff --git a/src/views/healthcode/healthcode.vue b/src/views/healthcode/healthcode.vue
index 16406b3..7d85b58 100644
--- a/src/views/healthcode/healthcode.vue
+++ b/src/views/healthcode/healthcode.vue
@@ -240,6 +240,8 @@
         this.onLoad(this.page);
       },
       searchChange(params, done) {
+        //清空this.$route.query
+        this.$router.push({ query: {} });
         this.query = params;
         this.page.currentPage = 1;
         this.onLoad(this.page, params);
@@ -322,7 +324,6 @@
         let values = {
           ...params,
         };
-        debugger;
         if (this.$route.query.status!=undefined && this.$route.query != undefined && this.$route.query != null && this.$route.query != "" ) {
             if (this.$route.query.type != undefined) {
               this.page.currentPage = 1;
diff --git a/src/views/parcel/parcel.vue b/src/views/parcel/parcel.vue
index f7ffd8d..37b74b0 100644
--- a/src/views/parcel/parcel.vue
+++ b/src/views/parcel/parcel.vue
@@ -243,6 +243,8 @@
         this.onLoad(this.page);
       },
       searchChange(params, done) {
+        //清空this.$route.query
+        this.$router.push({ query: {} });
         this.query = params;
         this.page.currentPage = 1;
         this.onLoad(this.page, params);
diff --git a/src/views/parcel/parcelKind.vue b/src/views/parcel/parcelKind.vue
index 523d5d3..3f54c2f 100644
--- a/src/views/parcel/parcelKind.vue
+++ b/src/views/parcel/parcelKind.vue
@@ -226,6 +226,8 @@
         this.onLoad(this.page);
       },
       searchChange(params, done) {
+        //清空this.$route.query
+        this.$router.push({ query: {} });
         this.query = params;
         this.page.currentPage = 1;
         this.onLoad(this.page, params);
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 1be720c..0db564c 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -460,6 +460,8 @@
       this.onLoad(this.page);
     },
     searchChange(params, done) {
+      //清空this.$route.query
+      this.$router.push({ query: {} });
       this.query = params;
       this.page.currentPage = 1;
       this.onLoad(this.page, params);
diff --git a/src/views/supervisoryConsole/data.vue b/src/views/supervisoryConsole/data.vue
index a33fb03..29be65a 100644
--- a/src/views/supervisoryConsole/data.vue
+++ b/src/views/supervisoryConsole/data.vue
@@ -320,6 +320,7 @@
   methods: {
     drawPie() {
       var that = this;
+      debugger;
       var myChart = this.$echarts.init(
         document.getElementById("base_information_pie_echarts")
       );
@@ -332,6 +333,12 @@
           itemStyle: { color: "#29c194" },
         },
         {
+          value: that.yj,
+          legendname: "预警",
+          name: "预警",
+          itemStyle: { color: "#F34A4A" },
+        },
+        {
           value: that.gz,
           legendname: "故障",
           name: "故障",
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index a4b9a24..166a2c3 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -96,7 +96,7 @@
               }]
             },
             {
-              label: "所属租户",
+              label: "所属客户",
               prop: "tenantId",
               type: "tree",
               dicUrl: "/api/blade-system/tenant/select",
@@ -112,7 +112,7 @@
               search: website.tenantMode,
               rules: [{
                 required: true,
-                message: "请输入所属租户",
+                message: "请输入所属客户",
                 trigger: "click"
               }]
             },
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index ac38e50..7094006 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -279,10 +279,11 @@
               display: false
             },
             {
-              label: "所属租户",
+              label: "所属客户",
               prop: "tenantName",
               slot: true,
-              display: false
+              display: false,
+              width:200
             },
             {
               label: "用户姓名",
@@ -300,7 +301,8 @@
               label: "所属部门",
               prop: "deptName",
               slot: true,
-              display: false
+              display: false,
+              width:260
             },
 
             {
@@ -348,7 +350,7 @@
               icon: 'el-icon-user-solid',
               column: [
                 {
-                  label: "所属租户",
+                  label: "所属客户",
                   prop: "tenantId",
                   type: "tree",
                   dicUrl: "/api/blade-system/tenant/select",

--
Gitblit v1.9.3