From d782e7ccd14d75f399b6283ca0974a35c90efb27 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期二, 10 一月 2023 16:52:06 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0

---
 src/views/operate/viewEvent/index.vue |   44 +++++++++++++++++++++++++-------------------
 1 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/views/operate/viewEvent/index.vue b/src/views/operate/viewEvent/index.vue
index 628f749..40a643f 100644
--- a/src/views/operate/viewEvent/index.vue
+++ b/src/views/operate/viewEvent/index.vue
@@ -23,9 +23,8 @@
         <div class="contentItem">
           <div style="width: 80px">鎸夌ぞ鍖�:</div>
           <div class="search">
-            <el-select clearable v-model="searchData.communityId" placeholder="璇烽�夋嫨绀惧尯">
-              <el-option v-for="option in communityOptions" :key="option.id" :value="option.id" :label="option.regionName"></el-option>
-            </el-select>
+            <el-cascader clearable v-model="searchData.community" :props="communityProps" :options="communityOptions" placeholder="璇烽�夋嫨绀惧尯">
+            </el-cascader>
           </div>
         </div>
         <div class="contentItem">
@@ -66,9 +65,7 @@
         <el-table
           ref="multipleTable"
           :header-cell-style="{
-            background: '#06122c',
-            'font-size': '12px',
-            color: '#4b9bb7',
+            background: '#fff',
             'font-weight': '650',
             'line-height': '45px',
           }"
@@ -89,7 +86,7 @@
           <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="8">
             <template v-if="scope.row.eventSource" slot-scope="scope">
               <span>{{
-                scope.row.eventSource === 2 ? "浜哄伐涓婃姤" : "瑙嗛涓婁紶"
+                scope.row.eventSource === 2 ? "浜哄伐涓婃姤" : "瑙嗛宸℃煡"
               }}</span>
             </template>
           </el-table-column>
@@ -208,12 +205,16 @@
       currentPage: 1,
       categoryOptions: CATEGOTY,
       communityOptions: [],
+      communityProps: {
+        label: 'regionName',
+        value: 'id'
+      },
       myproblem: 1,
       number: "",
       searchData: {
         categories: null,
         number: null,
-        communityId: null,
+        community: null,
         endTime: null,
         site: null,
         startTime: null,
@@ -227,11 +228,16 @@
   methods: {
     // 鑾峰彇鍒楄〃
     getList() {
+      const searchData = Object.assign({}, this.searchData);
+      if (this.searchData.community) {
+        searchData.communityId = searchData.community[1];
+      }
+      delete searchData.community;
       casequery
         .baseCaseQuery({
           current: this.currentPage,
           pageSize: this.pageSize,
-          ...this.searchData,
+          ...searchData,
         })
         .then((res) => {
           this.tableData = res.records;
@@ -336,7 +342,7 @@
   }
 
   main {
-    background-color: #09152f;
+    background-color: #fff;
     margin-top: 20px;
     padding-bottom: 50px;
 
@@ -376,7 +382,7 @@
 
           &::v-deep .el-input__inner {
             border: none;
-            background-color: #09152f;
+            // background-color: #09152f;
           }
 
           &:hover {
@@ -399,7 +405,7 @@
           &::v-deep li,
           &::v-deep .btn-prev,
           &::v-deep .btn-next {
-            background-color: #071f39;
+            // background-color: #071f39;
             color: #4b9bb7;
           }
 
@@ -412,8 +418,8 @@
     }
 
     .el-table {
-      color: #4b9bb7;
-      font-size: 10px;
+      // color: #4b9bb7;
+      // font-size: 10px;
 
       &::v-deep .cell {
         text-overflow: ellipsis;
@@ -422,7 +428,7 @@
       }
 
       &::v-deep .el-table__empty-block {
-        background-color: #09152f;
+        // background-color: #09152f;
       }
 
       &::v-deep .el-table__empty-block {
@@ -443,11 +449,11 @@
     }
 
     .el-table::v-deep .warning-row {
-      background: #06122c;
+      // background: #06122c;
     }
 
     .el-table::v-deep .success-row {
-      background: #071f39;
+      // background: #071f39;
     }
 
     &::v-deep .switchStyle .el-switch__label {
@@ -486,7 +492,7 @@
 
   &::v-deep .el-dialog__header,
   &::v-deep .el-dialog__body {
-    background-color: #06122c;
+    // background-color: #06122c;
   }
 
   &::v-deep .el-dialog__header {
@@ -512,7 +518,7 @@
   }
 
   &::v-deep .el-range-input {
-    background-color: #06122c;
+    // background-color: #06122c;
   }
 }
 </style>
\ No newline at end of file

--
Gitblit v1.8.0