From 13c58d78112a8bb63abd288a51165f122fc0965b Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 31 一月 2023 10:29:57 +0800
Subject: [PATCH] 1.页面刷新功能优化

---
 src/views/sbgl/sbqd.vue |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 1f232de..79c7cfd 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -20,10 +20,10 @@
           :model="form"
           label-width="100px"
           inline
-          style="display: flex;justify-content: space-between"
+          style="display: flex;"
         >
           <div class="elForm" style="justify-content: flex-start">
-            <el-form-item label-width="70px" label="璁惧缂栫爜" style=" display: flex;">
+            <el-form-item label="璁惧缂栫爜" style=" display: flex;">
               <el-input v-model="form.DeviceCode" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item label="璁惧鍚嶇О" style=" display: flex;">
@@ -62,7 +62,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-show="isExpandForm" label-width="70px" filterable label="璁惧绫诲瀷" style="display: flex;">
+            <el-form-item v-show="isExpandForm" filterable label="璁惧绫诲瀷" style="display: flex;">
               <el-select
                 v-model="form.DeviceType"
                 :popper-append-to-body="false"
@@ -98,7 +98,10 @@
               </el-select>
             </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>
@@ -183,11 +186,11 @@
           >
             <template slot-scope="{row}">
               <div v-if="row.enable==='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-if="row.enable==='N'">
-                <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+                <i class="el-icon-info" style="margin-right: 2px" />
                 鍚�
               </div>
             </template>
@@ -249,10 +252,10 @@
             <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)" />
+                  <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row)" />
                 </el-tooltip>
               </div>
             </template>
@@ -272,6 +275,7 @@
     </div>
     <!--璁惧娓呭崟鏂板缂栬緫-->
     <el-dialog
+      v-el-drag-dialog
       :close-on-click-modal="false"
       :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
@@ -403,6 +407,7 @@
 
     <!--璁惧绫诲瀷-->
     <el-dialog
+      v-el-drag-dialog
       title="璁惧绫诲瀷"
       :visible.sync="DeviceTypeDialogVisible"
       width="800px"
@@ -501,6 +506,7 @@
 
     <!--璁惧缁�-->
     <el-dialog
+      v-el-drag-dialog
       title="璁惧缁�"
       :visible.sync="DeviceGroupDialogVisible"
       width="800px"
@@ -648,12 +654,14 @@
 } from '@/api/sbgl'
 import { handleDatetime, validateCode } from '@/utils/global'
 import ImportPicker from '@/components/ImportPicker'
+import elDragDialog from '@/directive/el-drag-dialog'
 
 export default {
   name: 'SBQD',
   components: {
     Pagination, ImportPicker
   },
+  directives: { elDragDialog },
   data() {
     return {
       mouseHoverType: 'mouseout',

--
Gitblit v1.9.3