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/zlgl/gxjyjl.vue |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/views/zlgl/gxjyjl.vue b/src/views/zlgl/gxjyjl.vue
index 67b6739..5517348 100644
--- a/src/views/zlgl/gxjyjl.vue
+++ b/src/views/zlgl/gxjyjl.vue
@@ -13,10 +13,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.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item label="浜у搧缂栫爜" style=" display: flex;">
@@ -28,7 +28,7 @@
             <el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">
               <el-input v-model="form.partapec" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
-            <el-form-item v-show="isExpandForm" label-width="70px" label="宸ュ簭鍚嶇О" style=" display: flex;">
+            <el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style=" display: flex;">
               <el-input v-model="form.stepname" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item v-show="isExpandForm" label="鏍囧噯鍚嶇О" style=" display: flex;">
@@ -55,7 +55,7 @@
               </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>
@@ -187,8 +187,13 @@
             width="120"
           >
             <template slot-scope="{row}">
-              <div v-if="row.check_result==='NG'"> <i class="el-icon-circle-close" style="color:red;" /> 涓嶈壇</div>
-              <div v-if="row.check_result==='OK'">  <i class="el-icon-circle-check" style="color: #42b983" /> 鍚堟牸</div>
+              <div v-if="row.check_result==='NG'">
+                <i class="el-icon-info" style="margin-right: 2px" />
+                涓嶈壇
+              </div>
+              <div v-if="row.check_result==='OK'">
+                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+                鍚堟牸</div>
             </template>
           </el-table-column>
           <el-table-column
@@ -237,7 +242,8 @@
                 <el-tooltip class="item" effect="dark" content="鏌ョ湅" placement="top">
                   <i
                     class="el-icon-view"
-                    style="color: #42b983;cursor: pointer;margin-right: 15px;"
+                    :style="{color:$store.state.settings.theme}"
+                    style="cursor: pointer;margin-right: 15px;"
                     @click="check(row)"
                   />
                 </el-tooltip>
@@ -259,6 +265,7 @@
     </div>
 
     <el-dialog
+      v-el-drag-dialog
       title="宸ュ簭妫�楠屾槑缁�"
       :visible.sync="dialogVisible"
       width="900px"
@@ -313,8 +320,14 @@
             width="120"
           >
             <template slot-scope="{row}">
-              <div v-if="row.check_result==='NG'"> <i class="el-icon-circle-close" style="color:red;" /> 涓嶈壇</div>
-              <div v-if="row.check_result==='OK'">  <i class="el-icon-circle-check" style="color: #42b983" /> 鍚堟牸</div>
+              <div v-if="row.check_result==='NG'">
+                <i class="el-icon-info" style="margin-right: 2px" />
+                涓嶈壇
+              </div>
+              <div v-if="row.check_result==='OK'">
+                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+                鍚堟牸
+              </div>
             </template>
           </el-table-column>
           <el-table-column
@@ -371,6 +384,7 @@
 import { getCookie } from '@/utils/auth'
 import ImportPicker from '@/components/ImportPicker'
 import { StepCheckTableOutExcel, StepCheckTableSearch, StepCheckTableSubSearch } from '@/api/zlgl'
+import elDragDialog from '@/directive/el-drag-dialog'
 
 const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
@@ -378,6 +392,7 @@
   components: {
     Pagination, ImportPicker
   },
+  directives: { elDragDialog },
   data() {
     return {
       mouseHoverType: 'mouseout',

--
Gitblit v1.9.3