From 1e0e614983b5fdfa9d23b89ea06dac2db48f0bf6 Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Sun, 18 Feb 2024 18:22:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StatsDialogVisible/index.vue              | 109 ++++++++++--------
 1 file changed, 63 insertions(+), 46 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/StatsDialogVisible/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/StatsDialogVisible/index.vue
index 012e8e8b..1539aff0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/StatsDialogVisible/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/StatsDialogVisible/index.vue
@@ -5,7 +5,9 @@
         </div>
 
         <div class="StatsDetail">
-            <el-table v-if="searchType == 2" :data="tableData" style="width: 100%" :span-method="arraySpanMethod">
+            <!-- {{ facilityIds }} {{ facilityTableData }} -->
+            <el-table key="table1" v-if="searchType == 2" :data="tableData" style="width: 100%"
+                :span-method="arraySpanMethod">
                 <el-table-column prop="controlCauseName" label="封闭原因" width="150" align="center">
                 </el-table-column>
                 <el-table-column prop="causeTypeName" label="" align="center">
@@ -41,12 +43,12 @@
                     <el-table-column prop="yearTimeRatio" label="同比（%）" align="center"></el-table-column>
                 </el-table-column>
             </el-table>
-            <el-table v-else :data="facilityTableData" style="width: 100%">
+            <el-table key="table2" v-else :data="facilityTableData" style="width: 100%">
                 <el-table-column prop="facilityName" label="" width="150" align="center">
                 </el-table-column>
                 <el-table-column prop="facilityClose" label="封闭" align="center">
                 </el-table-column>
-                <el-table-column prop="facilityRestriction" label="限行" width="150" align="center">
+                <el-table-column prop="facilityRestriction" label="限行" align="center">
                 </el-table-column>
                 <el-table-column prop="facilityInterval" label="间隔放行" align="center">
                 </el-table-column>
@@ -119,6 +121,7 @@ export default {
                     label: "事件类型:",
                     key: "controlType",
                     required: true,
+                    isAlone: true,
                     type: "RadioGroup",
                     visible: data => {
                         if (data.searchType == 2) {
@@ -142,9 +145,12 @@ export default {
                     label: "选择站点:",
                     key: "facilityId",
                     required: true,
+                    isAlone: true,
                     type: "select",
+                    default: this.facilityIds,
                     options: {
-                        multiple: true
+                        multiple: true,
+                        placeholder: "请选择"
                     },
                     visible: data => {
                         if (data.searchType == 1) {
@@ -216,55 +222,58 @@ export default {
             this.getSelectTollStation(data)
         },
         arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-            // console.log("+++++++", row, column, rowIndex, columnIndex)
+            console.log("+++++++", row, column, rowIndex, columnIndex)
 
+            if (this.searchType == 2) {
 
-            if (!row.causeTypeName) {
-                // console.log("11111111111")
-                if (columnIndex === 0) {
-                    return [1, 2];
-                }
-                else if (columnIndex === 1) {
-                    return [0, 0];
-                }
-            };
-            if (row.controlCauseName === '恶劣天气') {
-                // console.log("222222222222")
-                if (columnIndex === 0) {
-                    console.log(this.weatherNum.length)
-                    if (rowIndex === 0) {
-                        return [this.weatherNum.length, 1];
-                    } else if (rowIndex <= this.weatherNum.length) {
+                if (!row.causeTypeName) {
+                    // console.log("11111111111")
+                    if (columnIndex === 0) {
+                        return [1, 2];
+                    }
+                    else if (columnIndex === 1) {
                         return [0, 0];
                     }
-                    // if (rowIndex === 2) {
-                    //     return [7, 1];
-                    // }
-                    // else if (rowIndex === 3) {
-                    //     return [0, 0];
-                    // } else if (rowIndex === 4) {
-                    //     return [0, 0];
-                    // }
-                    // else if (rowIndex === 5) {
-                    //     return [0, 0];
-                    // }
-                    // else if (rowIndex === 6) {
-                    //     return [0, 0];
-                    // }
-                    // else if (rowIndex === 7) {
-                    //     return [0, 0];
-                    // }
-                    // else if (rowIndex === 8) {
-                    //     return [0, 0];
-                    // }
+                };
+                if (row.controlCauseName === '恶劣天气') {
+                    // console.log("222222222222")
+                    if (columnIndex === 0) {
+                        console.log(this.weatherNum.length)
+                        if (rowIndex === 0) {
+                            return [this.weatherNum.length, 1];
+                        } else if (rowIndex <= this.weatherNum.length) {
+                            return [0, 0];
+                        }
+                        // if (rowIndex === 2) {
+                        //     return [7, 1];
+                        // }
+                        // else if (rowIndex === 3) {
+                        //     return [0, 0];
+                        // } else if (rowIndex === 4) {
+                        //     return [0, 0];
+                        // }
+                        // else if (rowIndex === 5) {
+                        //     return [0, 0];
+                        // }
+                        // else if (rowIndex === 6) {
+                        //     return [0, 0];
+                        // }
+                        // else if (rowIndex === 7) {
+                        //     return [0, 0];
+                        // }
+                        // else if (rowIndex === 8) {
+                        //     return [0, 0];
+                        // }
 
+                    }
+                    // this.weatherNum = 0
                 }
-                // this.weatherNum = 0
             }
 
 
         },
         getSelectTollStation(data) {
+            this.facilityTableData = []
             console.log(45, data)
             let startTime = ""
             let endTime = ""
@@ -277,7 +286,7 @@ export default {
             }
 
             var formData = new FormData();
-            this.searchType == data.searchType
+            this.searchType = data.searchType
 
             formData.append("controlType", data.controlType);
             formData.append("searchType", data.searchType);
@@ -300,6 +309,11 @@ export default {
                     this.tableData = weatherData.concat(otherData)
                 } else {
                     this.facilityTableData = res.data
+                    // this.$nextTick(() => {
+
+
+                    // })
+                    console.log("this.facilityTableData", this.facilityTableData)
                 }
 
             })
@@ -346,11 +360,14 @@ export default {
     background: #0B6581;
 }
 
-::v-deep .has-gutter {}
+::v-deep .el-table .el-table__header-wrapper th,
+.el-table .el-table__fixed-header-wrapper th {
+    background: #0B6581;
+    border: 1px solid #07AEC6;
+}
 
 ::v-deep .el-table th.el-table__cell>.cell {
     color: #3DE8FF;
-    background: #1B586D;
 }
 
 ::v-deep .el-table thead.is-group th.el-table__cell {
@@ -367,7 +384,7 @@ export default {
 
 ::v-deep .el-table tr {
     border: 1px solid #07AEC6;
-    background-color: #1B586D;
+    background-color: #0B6581;
 }
 
 ::v-deep .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {