From ef561e204ee6fd7df25477b456b0d466b026550e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 30 一月 2023 15:28:32 +0800
Subject: [PATCH] 1.tagView标签新增可拖动功能

---
 src/views/sbgl/bybw.vue |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/views/sbgl/bybw.vue b/src/views/sbgl/bybw.vue
index bda6be2..d192bf5 100644
--- a/src/views/sbgl/bybw.vue
+++ b/src/views/sbgl/bybw.vue
@@ -12,10 +12,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.maiitemcode" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item label="閮ㄤ綅鍚嶇О" style=" display: flex;">
@@ -36,7 +36,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>
@@ -74,10 +74,12 @@
             prop="code"
             label="閮ㄤ綅缂栫爜"
             sortable="custom"
+            show-tooltip-when-overflow
           />
           <el-table-column
             prop="name"
             label="閮ㄤ綅鍚嶇О"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
@@ -94,15 +96,18 @@
           <el-table-column
             prop="isscan"
             label="閫夋嫨鎵爜"
+            show-tooltip-when-overflow
             sortable="custom"
           >
             <template slot-scope="{row}">
               <div v-if="row.isscan==='Y'">
-                <svg-icon icon-class="circleYes" style="margin-right: 2px" />
+                <!--                <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.isscan==='N'">
-                <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+                <!--                <svg-icon icon-class="circleNo" style="margin-right: 2px" />-->
+                <i class="el-icon-info" style="margin-right: 2px" />
                 鍚�
               </div>
             </template>
@@ -110,12 +115,14 @@
           <el-table-column
             prop="lm_user"
             label="鍒涘缓浜哄憳"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
             prop="lm_date"
             label="鍒涘缓鏃堕棿"
             width="160"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
@@ -126,10 +133,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>
@@ -149,6 +156,7 @@
     </div>
 
     <el-dialog
+      v-el-drag-dialog
       :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
       width="800px"
@@ -209,12 +217,14 @@
 import { AddUpdateDeviceMaiItem, DeleteDeviceMaiItem, DeviceMaiItemSearch } from '@/api/sbgl'
 import ImportPicker from '@/components/ImportPicker'
 import { validateCode } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
 
 export default {
   name: 'Zzjg',
   components: {
     Pagination, ImportPicker
   },
+  directives: { elDragDialog },
   data() {
     return {
       mouseHoverType: 'mouseout',
@@ -258,7 +268,7 @@
       },
 
       title_value: '鏁版嵁瀵煎叆 / 淇濆吇閮ㄤ綅',
-      code: '4',
+      code: '11',
       shows: false
     }
   },

--
Gitblit v1.9.3