From 0b1837e9b6d1ac8825e9c1acf6f0cd5b2b14a897 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 04 一月 2023 10:41:00 +0800
Subject: [PATCH] 1.列展示设置   静态框架初步搭建完成

---
 src/views/scgl/cngh.vue |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/scgl/cngh.vue b/src/views/scgl/cngh.vue
index 8e49ea7..bae47e3 100644
--- a/src/views/scgl/cngh.vue
+++ b/src/views/scgl/cngh.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-select
                 v-model="form.workshop"
                 style="width: 200px"
@@ -56,7 +56,7 @@
             </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>
@@ -91,16 +91,19 @@
             label="鐢熶骇杞﹂棿"
             sortable="custom"
             width="160"
+            show-tooltip-when-overflow
           />
           <el-table-column
             prop="CaptPlanDeviceType"
             label="鐢熶骇鍗曞厓"
             width="160"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
             prop="CaptPlanWorkShift"
             label="榛樿鏂规"
+            show-tooltip-when-overflow
             sortable="custom"
             width="240"
           >
@@ -121,6 +124,7 @@
           <el-table-column
             prop="CaptPlanShopCalendarList"
             label="宸ヤ綔鏃ュ巻"
+            show-tooltip-when-overflow
             sortable="custom"
             min-width="300"
           >
@@ -140,12 +144,14 @@
             prop="CaptPlanUser"
             label="鍒涘缓浜哄憳"
             sortable="custom"
+            show-tooltip-when-overflow
             width="120"
           />
           <el-table-column
             prop="CaptPlanDate"
             width="160"
             label="鍒涘缓鏃堕棿"
+            show-tooltip-when-overflow
             sortable="custom"
           />
 
@@ -154,14 +160,15 @@
             width="120"
             label="鏈夋晥鐘舵��"
             sortable="custom"
+            show-tooltip-when-overflow
           >
             <template slot-scope="{row}">
               <div v-if="row.CaptPlanStus==='Y'">
-                <svg-icon icon-class="circleYes" style="margin-right: 2px" />
+                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
                 鏈夋晥
               </div>
               <div v-else-if="row.CaptPlanStus==='N'">
-                <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+                <i class="el-icon-info" style="margin-right: 2px" />
                 鏃犳晥
               </div>
               <div v-else>/</div>

--
Gitblit v1.9.3