From 82a759b4c1dc81b0c78e13af19091c5a5012dd84 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 03 一月 2023 16:50:12 +0800
Subject: [PATCH] 1.优化浅色侧边栏bug

---
 src/views/jcsz/zzjg.vue |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index 5fa44be..27d35a8 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -11,10 +11,10 @@
           :model="form"
           label-width="100px"
           inline
-          style="display: flex;justify-content: space-between"
+          style="display: flex;"
         >
           <div class="elForm">
-            <el-form-item label-width="70px" label="缁勭粐缂栫爜" style=" display: flex;">
+            <el-form-item label="缁勭粐缂栫爜" style=" display: flex;">
               <el-input v-model="form.OrgCode" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item label="缁勭粐鍚嶇О" style=" display: flex;">
@@ -40,7 +40,10 @@
               <el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />
             </el-form-item>
           </div>
-          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+          <div
+            class="bodySearchReset"
+            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+          >
             <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
             <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
           </div>
@@ -78,18 +81,21 @@
             prop="org_code"
             label="缁勭粐缂栫爜"
             sortable="custom"
+            show-tooltip-when-overflow
             min-width="110"
           />
           <el-table-column
             prop="org_name"
             label="缁勭粐鍚嶇О"
             sortable="custom"
+            show-tooltip-when-overflow
             min-width="110"
           />
           <el-table-column
             prop="description"
             label="缁勭粐绫诲瀷"
             min-width="110"
+            show-tooltip-when-overflow
             sortable="custom"
           >
             <template slot-scope="{row}">
@@ -104,6 +110,7 @@
             prop="parentorg_name"
             label="涓婄骇鍗曚綅"
             sortable="custom"
+            show-tooltip-when-overflow
             min-widt="110"
           >
             <template slot-scope="{row}">
@@ -115,12 +122,14 @@
             prop="lm_user"
             label="鍒涘缓浜哄憳"
             width="110"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
             prop="lm_date"
             label="鍒涘缓鏃堕棿"
             width="160"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
@@ -131,11 +140,14 @@
             <template slot-scope="{row}">
               <div class="operationClass">
                 <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
-                  <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+                  <i :style="{color:$store.state.settings.theme}" class="el-icon-edit-outline" @click="edit('edit',row)" />
                 </el-tooltip>
                 <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
-                  <i class="el-icon-delete" @click="del(row.id)" />
+                  <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row.id)" />
                 </el-tooltip>
+                <!--                <el-button type="primary" size="mini" />-->
+                <!--                <el-button type="danger" size="mini">鍒犻櫎</el-button>-->
+
               </div>
             </template>
           </el-table-column>

--
Gitblit v1.9.3