From eea0de529174d326e99872907795dfe63b9b1d50 Mon Sep 17 00:00:00 2001
From: lnn19986213 <1667908750@qq.com>
Date: Mon, 27 May 2024 16:09:16 +0800
Subject: [PATCH] gx

---
 src/view/dialog/dialog.vue     | 115 ++++++++++++---------------------
 src/view/echarts_yl/ylXZZC.vue |   1 -
 src/view/yl.vue                |   3 +-
 3 files changed, 44 insertions(+), 75 deletions(-)

diff --git a/src/view/dialog/dialog.vue b/src/view/dialog/dialog.vue
index 9ad6810..7126cea 100644
--- a/src/view/dialog/dialog.vue
+++ b/src/view/dialog/dialog.vue
@@ -1,13 +1,7 @@
 <template>
   <div class="dialogPage">
-    <el-dialog
-      v-model="dialogShow"
-      width="80vw"
-      :show-close="false"
-      center
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-    >
+    <el-dialog v-model="dialogShow" width="80vw" :show-close="false" center :close-on-click-modal="false"
+      :close-on-press-escape="false">
       <template #header="{ close, titleId, titleClass }">
         <div class="my-header">
           <el-icon size="26" color="#fff" @click="closeDialog">
@@ -20,23 +14,16 @@
         <div class="bo">
           <div class="title">
             <div class="title_top">
-              <img src="@/assets/images/table_l.png" alt="" style="margin-right:10px;"/>
+              <img src="@/assets/images/table_l.png" alt="" style="margin-right:10px;" />
               <div class="name">{{ title }}详情</div>
-              <img src="@/assets/images/table_r.png" alt=""  style="margin-left:10px;"/>
+              <img src="@/assets/images/table_r.png" alt="" style="margin-left:10px;" />
             </div>
-            <img
-              class="title_botton"
-              src="@/assets/images/table_c.png"
-              alt=""
-            />
+            <img class="title_botton" src="@/assets/images/table_c.png" alt="" />
           </div>
         </div>
-        <el-table
-          :data="data.tableData"
-          height="calc(100% - 110px)"
-          :header-cell-style="{ background: '#008FCD' }"
-        >
-          <!-- <el-table-column
+        <div style="width: 100%; height: calc(100% - 110px);">
+          <el-table :data="data.tableData" height="100%" :header-cell-style="{ background: '#008FCD' }">
+            <!-- <el-table-column
             v-for="(item, index) in data.columns"
             :key="index"
             :property="item.property"
@@ -44,44 +31,23 @@
             :width="item.width"
             align="center"
           /> -->
-          <template v-for="item in data.columns">
-            <el-table-column
-              :key="item.label"
-              v-if="item.type === 'slot'"
-              :width="item.width"
-              :label="item.label"
-              :property="item.property"
-              align="center"
-            >
-              <template #default="scope">
-                <slot
-                  :name="item.property"
-                  :currentCol="item"
-                  :currentData="scope.row"
-                ></slot>
-              </template>
-            </el-table-column>
-            <el-table-column
-              :key="item.label"
-              :property="item.property"
-              :label="item.label"
-              :width="item.width"
-              align="center"
-              v-else
-            />
-          </template>
-        </el-table>
+            <template v-for="item in data.columns">
+              <el-table-column :key="item.label" v-if="item.type === 'slot'" :width="item.width" :label="item.label"
+                :property="item.property" align="center">
+                <template #default="scope">
+                  <slot :name="item.property" :currentCol="item" :currentData="scope.row"></slot>
+                </template>
+              </el-table-column>
+              <el-table-column :key="item.label" :property="item.property" :label="item.label" :width="item.width"
+                align="center" v-else />
+            </template>
+          </el-table>
+        </div>
+
         <div class="pagePart">
-          <el-pagination
-            background
-            layout="prev, pager, next"
-            :page-size="pagination.pageSize"
-            :total="pagination.total"
-            prev-text="上一页"
-            next-text="下一页"
-            @current-change="handle"
-            v-model:current-page="pagination.currentPage"
-          />
+          <el-pagination background layout="prev, pager, next" :page-size="pagination.pageSize"
+            :total="pagination.total" prev-text="上一页" next-text="下一页" @current-change="handle"
+            v-model:current-page="pagination.currentPage" />
         </div>
       </div>
     </el-dialog>
@@ -180,25 +146,18 @@ const handle = (current) => {
 .tabelPart {
   height: 80vh;
   padding: 16px;
-  background: linear-gradient(
-      270deg,
+  background: linear-gradient(270deg,
       rgba(0, 77, 131, 0.69) 0%,
       rgba(0, 51, 83, 0.77) 50%,
-      rgba(0, 77, 131, 0.74) 100%
-    ),
-    radial-gradient(
-      66% 40% at 50% 0%,
+      rgba(0, 77, 131, 0.74) 100%),
+    radial-gradient(66% 40% at 50% 0%,
       rgba(1, 150, 243, 0.55) 0%,
-      rgba(0, 116, 255, 0) 100%
-    );
+      rgba(0, 116, 255, 0) 100%);
   box-shadow: inset 0px 0px 56px 0px rgba(100, 191, 255, 0.5);
   border: 2px solid;
-  border-image: linear-gradient(
-      180deg,
+  border-image: linear-gradient(180deg,
       rgba(21, 150, 255, 1),
-      rgba(0, 157, 227, 0)
-    )
-    2 2;
+      rgba(0, 157, 227, 0)) 2 2;
 
   :deep(.el-table) {
     --el-table-bg-color: none;
@@ -216,6 +175,7 @@ const handle = (current) => {
   display: flex;
   align-items: center;
   justify-content: center;
+
   :deep(.el-pagination) {
     --el-pagination-button-disabled-bg-color: none;
     --el-pagination-bg-color: none;
@@ -223,25 +183,31 @@ const handle = (current) => {
     --el-pagination-button-color: #fff;
     color: #fff;
   }
+
   :deep(.el-pagination button:disabled) {
     background-color: rgba(0, 116, 255, 0) !important;
   }
 }
+
 .bo {
   width: 100%;
   display: flex;
 }
+
 .title {
   margin: 10px auto;
   display: flex;
   flex-direction: column;
+
   &_top {
     display: flex;
     align-items: end;
+
     img {
       height: 33px;
       width: 33px;
     }
+
     .name {
       font-family: PangMenZhengDao, PangMenZhengDao;
       font-weight: 600;
@@ -252,10 +218,13 @@ const handle = (current) => {
       font-style: normal;
       letter-spacing: 2px;
       background: linear-gradient(180deg, #ffffff 0%, #51ffef 100%);
-      -webkit-background-clip: text; /*将设置的背景颜色限制在文字中*/
-      -webkit-text-fill-color: transparent; /*给文字设置成透明*/
+      -webkit-background-clip: text;
+      /*将设置的背景颜色限制在文字中*/
+      -webkit-text-fill-color: transparent;
+      /*给文字设置成透明*/
     }
   }
+
   &_botton {
     margin-top: 5px;
     height: 19px;
diff --git a/src/view/echarts_yl/ylXZZC.vue b/src/view/echarts_yl/ylXZZC.vue
index ed743aa..52e890e 100644
--- a/src/view/echarts_yl/ylXZZC.vue
+++ b/src/view/echarts_yl/ylXZZC.vue
@@ -262,7 +262,6 @@ const setChart = () => {
   // 使用刚指定的配置项和数据显示图表。
   myChart.setOption(data.option);
   myChart.on("click", function (params) {
-    console.log(params);
     emit('village',params.name);
   });
 };
diff --git a/src/view/yl.vue b/src/view/yl.vue
index 3433859..08d49d1 100644
--- a/src/view/yl.vue
+++ b/src/view/yl.vue
@@ -206,6 +206,7 @@
         <ylXZZC :list1="data.zccs1" :list2="data.zccs2" @village='chooseVillage'></ylXZZC>
       </div>
     </div>
+    
   </div>
 </template>
 
@@ -232,7 +233,7 @@ const change = (name, index) => {
   leftchoose.value[name] = index;
 };
 const chooseVillage=(village)=>{
-  console.log(village);
+  console.log('village',village);
 }
 const data = reactive({
   leftTop1: [],