From e713b378b01d189f972cfb5b9eae749ee95a8b51 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 29 十月 2022 13:48:00 +0800
Subject: [PATCH] 1.解决两个账号登录，是否被挤掉的问题

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

diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 9d96565..6c58af2 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -16,12 +16,12 @@
         <el-form
           ref="form"
           :model="form"
-          label-width="80px"
+          label-width="100px"
           inline
           style="display: flex;justify-content: space-between"
         >
-          <div class="elForm">
-            <el-form-item label="璁惧缂栫爜" style=" display: flex;">
+          <div class="elForm" style="justify-content: flex-start">
+            <el-form-item label-width="70px" label="璁惧缂栫爜" style=" display: flex;">
               <el-input v-model="form.DeviceCode" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item label="璁惧鍚嶇О" style=" display: flex;">
@@ -60,7 +60,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item filterable label="璁惧绫诲瀷" style="display: flex;">
+            <el-form-item v-show="isExpandForm" label-width="70px" filterable label="璁惧绫诲瀷" style="display: flex;">
               <el-select
                 v-model="form.DeviceType"
                 :popper-append-to-body="false"
@@ -96,24 +96,36 @@
               </el-select>
             </el-form-item>
           </div>
-          <div style="display: flex;align-items: start;margin-top: 5px;">
+          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'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>
         </el-form>
+        <div
+          class="bodyTopFormExpand"
+        >
+          <svg-icon
+            v-show="mouseHoverType==='mouseout'"
+            style="cursor: pointer"
+            :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+            @mouseenter="mouseHoverType=$event.type"
+          />
+          <svg-icon
+            v-show="mouseHoverType==='mouseenter'"
+            style="cursor: pointer"
+            :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+            @click="isExpandForm=!isExpandForm"
+            @mouseout="mouseHoverType=$event.type"
+          />
+        </div>
       </div>
-      <div
-        class="bodyTopFormExpand"
-        @click="isExpandForm=!isExpandForm"
-      >
-        <i
-          :class="!isExpandForm?'el-icon-arrow-down':'el-icon-arrow-up'"
-          :style="{color:'#42B983'}"
-        /></div>
+
       <div class="elTableDiv" style="margin-top: 0;">
         <el-table
+          ref="tableDataRef"
           :data="tableData"
           border
+          class="tableFixed"
           :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
           highlight-current-row
           :row-class-name="tableRowClassName"
@@ -153,6 +165,7 @@
           <el-table-column
             prop="eqpgroup_name"
             label="璁惧缁�"
+            show-tooltip-when-overflow
             min-width="110"
             sortable="custom"
           />
@@ -361,7 +374,12 @@
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
           <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
-          <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+          <el-button
+            type="primary"
+            :loading="$store.state.app.buttonIsDisabled"
+            :disabled="$store.state.app.buttonIsDisabled"
+            @click="dialogVisibleConfirm"
+          >纭� 瀹�</el-button>
         </div>
       </span>
     </el-dialog>
@@ -595,6 +613,7 @@
   },
   data() {
     return {
+      mouseHoverType: 'mouseout',
       isExpandForm: false,
       mainHeight: 0,
       tableHeight: 0,
@@ -835,6 +854,7 @@
     dialogVisibleConfirm() {
       this.$refs.dialogForm.validate(valid => {
         if (valid) {
+          this.$store.state.app.buttonIsDisabled = true
           const data = {
             id: this.dialogForm.id,
             devicecode: this.dialogForm.devicecode,
@@ -851,9 +871,10 @@
           }
           AddUpdateDeviceManger(data).then(res => {
             if (res.code === '200') {
-              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
               this.dialogVisible = false
+              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
               this.getDeviceMangerSearch()
+              this.$store.state.app.buttonIsDisabled = false
             } else {
               this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
             }
@@ -865,7 +886,8 @@
     getHeight() {
       this.$nextTick(() => {
         this.mainHeight = window.innerHeight - 85
-        this.tableHeight = this.mainHeight - 250
+        this.tableHeight = this.mainHeight - 245
+        this.$refs.tableDataRef.doLayout()
         // if (window.innerHeight < 769) {
         //   this.tableHeight = this.tableHeight - 50
         // }
@@ -1197,6 +1219,15 @@
   justify-content: center;
   align-items: center;
 }
+
+.tableFixed{
+  ::v-deep .el-table__fixed-right{
+    height: 100% !important;
+  }
+  ::v-deep .el-table__fixed{
+    height: 100% !important;
+  }
+}
 </style>
 <style>
 

--
Gitblit v1.9.3