From f263e0396359ac7686e68ce0e1a2e2ef6419906d Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期三, 15 十一月 2023 23:24:31 +0800
Subject: [PATCH] 解决冲突

---
 src/components/map/viewer1.vue |  101 ++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 73 insertions(+), 28 deletions(-)

diff --git a/src/components/map/viewer1.vue b/src/components/map/viewer1.vue
index 498e38c..e4409bf 100644
--- a/src/components/map/viewer1.vue
+++ b/src/components/map/viewer1.vue
@@ -53,20 +53,35 @@
         </div>
       </ul>
     </div>
-    <div :style="{
-      width: `${size}`,
-      height: `${size}`,
-      transform: `scale(${scale}) translate(${offset},${offset})`,
-      '-webkit-transform': `scale(${scale}) translate(${offset},${offset})`,
-      '-moz-transform': `scale(${scale}) translate(${offset},${offset})`,
-      '-o-transform': `scale(${scale}) translate(${offset},${offset})`,
-      '-ms-transform': `scale(${scale}) translate(${offset},${offset})`,
-    }">
-      <el-dialog class="aboutDialog" title="浼佷笟淇℃伅" append-to-body width="50%" height="55%" style="overflow: auto"
-        :visible.sync="QYbox" :before-close="dialogClose">
+    <div
+      :style="{
+        width: `${size}`,
+        height: `${size}`,
+        transform: `scale(${scale}) translate(${offset},${offset})`,
+        '-webkit-transform': `scale(${scale}) translate(${offset},${offset})`,
+        '-moz-transform': `scale(${scale}) translate(${offset},${offset})`,
+        '-o-transform': `scale(${scale}) translate(${offset},${offset})`,
+        '-ms-transform': `scale(${scale}) translate(${offset},${offset})`,
+      }"
+    >
+      <el-dialog
+        class="aboutDialog"
+        title="浼佷笟淇℃伅"
+        append-to-body
+        width="50%"
+        height="60%"
+        style="overflow: auto"
+        :visible.sync="QYbox"
+        :before-close="dialogClose"
+      >
         <div class="el-dialog-div">
           <div class="inquire">
-            <el-form size="medium" ref="queryForm" :model="queryForm" :inline="true">
+            <el-form
+              size="mini"
+              ref="queryForm"
+              :model="queryForm"
+              :inline="true"
+            >
               <el-form-item label="鏌ヨ鍐呭" prop="name">
                 <el-input v-model="queryForm.content" placeholder="璇疯緭鍏ユ煡璇㈠唴瀹�" />
               </el-form-item>
@@ -75,36 +90,62 @@
               </el-form-item>
             </el-form>
           </div>
-          <el-table fit style="width: 100%" :data="tableData" highlight-current-row height="50">
-            <el-table-column type="index" width="50"></el-table-column>
-            <el-table-column property="浼佷笟鍚嶇О" label="浼佷笟鍚嶇О"></el-table-column>
-            <!-- <el-table-column
+          <el-table
+            fit
+            style="width: 100%"
+            :data="tableData"
+            highlight-current-row
+            height="50"
+          >
+            <el-table-column type="index" width="40"></el-table-column>
+            <el-table-column
+              property="浼佷笟鍚嶇О"
+              label="浼佷笟鍚嶇О"
+              min-width="240"
+            ></el-table-column>
+            <el-table-column
               property="浼佷笟绫诲瀷"
               label="浼佷笟绫诲瀷"
+              min-width="240"
             ></el-table-column>
             <el-table-column
               property="鎴愮珛鏃堕棿"
               label="鎴愮珛鏃堕棿"
+              width="120"
             ></el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               property="鎵�灞炶涓�"
               label="鎵�灞炶涓�"
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               property="娉曚汉"
               label="娉曚汉"
-              width="100"
+              width="80"
+            ></el-table-column>
+            <!-- <el-table-column
+              property="娉ㄥ唽鍦板潃"
+              label="娉ㄥ唽鍦板潃"
             ></el-table-column> -->
-            <el-table-column property="娉ㄥ唽鍦板潃" label="娉ㄥ唽鍦板潃"></el-table-column>
-            <el-table-column label="鎿嶄綔" width="100">
+            <el-table-column label="鎿嶄綔" width="80">
               <template slot-scope="scope">
                 <el-button @click="handleClick(scope.row)" type="text" size="small">璇︽儏</el-button>
               </template>
             </el-table-column>
           </el-table>
-          <div slot="footer" class="dialog-footer" style="text-align: center; margin-top: 5px">
-            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-              :current-page.sync="currentPage" :page-size="10" :pager-count="11" layout="total, pager" :total="searchNum">
+          <div
+            slot="footer"
+            class="dialog-footer"
+            style="text-align: center; margin-top: 2px"
+          >
+            <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page.sync="currentPage"
+              :page-size="10"
+              :pager-count="11"
+              layout="total, pager"
+              :total="searchNum"
+            >
             </el-pagination>
           </div>
         </div>
@@ -1217,11 +1258,11 @@
 .aboutDialog>>>.el-dialog__body {
   height: 77%;
   padding: 0px !important;
-  padding: 15px !important;
+  padding: 10px 10px 8px !important;
 }
 
-.aboutDialog>>>.el-dialog__header {
-  padding: 10px 20px;
+.aboutDialog >>> .el-dialog__header {
+  padding: 10px 20px 0;
   height: 25px;
   line-height: 25px;
   font-weight: bold;
@@ -1252,6 +1293,7 @@
 
 .el-form>>>.el-form-item__label {
   color: #fff;
+  margin-left: 10px;
 }
 
 .aboutDialog .el-dialog-div {
@@ -1281,8 +1323,11 @@
   width: 383px;
 }
 
-.el-table /deep/ th {
+.el-table /deep/ th,
+.el-table /deep/ td {
   background-color: transparent;
+  padding-top: 4px;
+  padding-bottom: 4px;
 }
 
 .el-table /deep/ tr {

--
Gitblit v1.9.3