From b693b8061247a0edf43cd714c8d3b9e221c7da79 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期一, 20 二月 2023 17:18:04 +0800
Subject: [PATCH] * 2023/2/20 肖辉 修改事项处理管理-所属区域

---
 src/views/operate/disposal/casepool/pool/index.vue |   45 ++++++++++++++++++++++-----------------------
 src/components/seachHeader/index.vue               |    7 +++++--
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/components/seachHeader/index.vue b/src/components/seachHeader/index.vue
index 228f1be..1a610b4 100644
--- a/src/components/seachHeader/index.vue
+++ b/src/components/seachHeader/index.vue
@@ -139,8 +139,11 @@
 
     },
     getUserList(){
-      this.seachData.street = this.seachData.street[this.seachData.street.length-1]
-      this.$emit('getUserList', {seachData:this.seachData})
+      console.log(this.seachData)
+      // this.seachData.alarmTimeOne =this.seachData.alarmTime[0];
+      // this.seachData.alarmTimeTwo = this.seachData.alarmTime[1];
+      this.seachData.street=this.seachData.street?this.seachData.street[this.seachData.street.length-1]:null;
+      this.$emit('getUserList', {seachData:this.seachData});
     },
     dialogCreate(){
       this.$emit('dialogCreatepro')
diff --git a/src/views/operate/disposal/casepool/pool/index.vue b/src/views/operate/disposal/casepool/pool/index.vue
index 391bf7c..15d727b 100644
--- a/src/views/operate/disposal/casepool/pool/index.vue
+++ b/src/views/operate/disposal/casepool/pool/index.vue
@@ -100,21 +100,22 @@
             :prop="mystatus === 1 ? 'site' : ''"
             :label="mystatus === 1 ? '鎶ヨ鐐逛綅' : '杩濇硶寤虹瓚闀裤�佸銆侀珮'"
             :min-width="mystatus === 1 ? '10' : '20'"
+            show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <div v-if="mystatus === 2">
+                <div v-if="mystatus === 2">
                 <span>{{
-                  scope.row.buildingLength +
-                  "绫�" +
-                  "銆�" +
-                  scope.row.buildingWidth +
-                  "绫�" +
-                  "銆�" +
-                  scope.row.buildingHigh +
-                  "绫�"
-                }}</span>
-              </div>
-              <div v-else>{{ scope.row.site }}</div>
+                    scope.row.buildingLength +
+                    "绫�" +
+                    "銆�" +
+                    scope.row.buildingWidth +
+                    "绫�" +
+                    "銆�" +
+                    scope.row.buildingHigh +
+                    "绫�"
+                  }}</span>
+                </div>
+                <div v-else>{{ scope.row.site }}</div>
             </template>
           </el-table-column>
           <el-table-column
@@ -681,20 +682,18 @@
     .nav {
       display: flex;
       line-height: 40px;
-
+      .is-active {
+        // background-color: #070f22;
+        //color: #333;
+        color: #f5222d;
+        font-weight: 700;
+      }
       .nav-item {
         width: 80px;
         text-align: center;
-
         &:hover {
           cursor: pointer;
         }
-      }
-
-      .is-active {
-        // background-color: #070f22;
-        color: #333;
-        font-size: 500;
       }
     }
 
@@ -716,8 +715,8 @@
       .is-active {
         // background-color: #070f22;
         border-radius: 4px;
-        color: #333;
-        font-size: 500;
+        color: #f5222d;
+        font-weight: 700;
       }
     }
 
@@ -800,7 +799,7 @@
 
       .operation {
         display: flex;
-
+        color: #2f54eb;
         .line {
           padding: 0 5px;
         }

--
Gitblit v1.8.0