From bfa480a1ee6f3d27f677701bf265da1c81facb80 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Thu, 2 May 2024 17:00:55 +0800
Subject: [PATCH] sum

---
 src/components/sumDoctorCheck/SumSug.vue | 22 +++++++++++++--
 src/views/Home.vue                       | 35 ++++++++++++++++--------
 src/views/login/Login.vue                | 14 ++++++++--
 3 files changed, 56 insertions(+), 15 deletions(-)

diff --git a/src/components/sumDoctorCheck/SumSug.vue b/src/components/sumDoctorCheck/SumSug.vue
index 48777d0..a021b77 100644
--- a/src/components/sumDoctorCheck/SumSug.vue
+++ b/src/components/sumDoctorCheck/SumSug.vue
@@ -72,12 +72,18 @@
                 </div>
                 <div v-show="!scope.row.collapse">
                   <div style="display: flex;margin-top: 2px;">
-                    <div style="width:60px;">诊断</div>
+                    <div style="width:60px;">诊断</div>                    
                     <el-select v-model="scope.row.diagnosisIds" multiple placeholder="请选择" style="width: 100%;"
-                      :disabled="sumBtnDisabled()" @change="changeDiagnosis" filterable>
+                      :disabled="sumBtnDisabled()" @change="changeDiagnosis" filterable class="no-animation">                      
                       <el-option v-for="item in diagnosises" :key="item.id" :value="item.id" :label="item.displayName"
                         :disabled="disabledDiagnosis(item.id, scope.$index)" />
                     </el-select>
+                    <!--
+                    <select v-model="scope.row.diagnosisIds" placeholder="请选择" style="width: 100%;" multiple :disabled="sumBtnDisabled()" @change="changeDiagnosis">
+                      <el-option v-for="item in diagnosises" :key="item.id" :value="item.id" :label="item.displayName"
+                        :disabled="disabledDiagnosis(item.id, scope.$index)" />
+                    </select>
+                    -->
                   </div>
                   <div style="display: flex;margin-top: 2px;">
                     <div style="width:60px;">医学解释</div>
@@ -882,6 +888,18 @@ export default {
 <style scoped>
 @import '../../assets/css/global_table.css';
 
+.no-animation {
+  animation: none !important;
+  -webkit-animation: none !important;
+}
+
+::v-deep .el-select {
+  &.el-select-dropdown {    
+    animation: none !important;
+    -webkit-animation: none !important;
+  }
+}
+
 /* 设置单元格内内容顶对齐 */
 ::v-deep .el-table__cell {
   display: table-cell;
diff --git a/src/views/Home.vue b/src/views/Home.vue
index c4a5d75..67c537b 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -1,6 +1,12 @@
 <template>
   <div style="background: #F4F8FF">
     <div style="position: absolute; top:15px;right:5px; z-index: 1000;">
+      <el-tooltip class="item" content="刷新" placement="left">
+        <i class="el-icon-refresh" @click="reloadIgnoringCache"
+          style="padding-right: 5px;font-size: 22px;cursor:pointer;"></i>
+      </el-tooltip>
+      <i class="el-icon-minus" @click="windowMin" style="padding-right: 5px;font-size: 22px;cursor:pointer;"></i>
+      <i class="el-icon-copy-document" @click="btnMax" style="padding-right: 5px;font-size: 22px;cursor:pointer;"></i>
       <i class="el-icon-close" @click="windowClose" style="padding-right: 5px;font-size: 22px;cursor:pointer;"></i>
     </div>
     <div>
@@ -27,7 +33,7 @@
           </div>
           -->
             <!--动态生成菜单支持多级 add by pengj -->
-            <div :style="`display:flex;justify-content:center;width: ${(window.pageWidth - 350)}px;`">
+            <div :style="`display:flex;justify-content:center;width: ${(window.pageWidth - 450)}px;`">
               <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
                 style="display: flex">
                 <!--1级菜单-->
@@ -84,7 +90,7 @@
               </el-menu>
             </div>
             <!--  -->
-            <div class="btn">
+            <div>
               <img src="@/assets/images/me.png" alt="" class="currentuser" />
               <!-- <i class="el-icon-arrow-down el-icon--right"></i> -->
               <el-dropdown>
@@ -102,10 +108,9 @@
                   <el-dropdown-item @click.native="editpassword">修改密码</el-dropdown-item>
 
                   <el-dropdown-item @click.native="localSet">本地设置</el-dropdown-item>
-                  <el-dropdown-item v-if="LocalConfig.normal.isDevTool" @click.native="toggleDevTools">调试工具</el-dropdown-item>
-                  <el-dropdown-item @click.native="clientConfigShow">客户端参数</el-dropdown-item>
-                  <el-dropdown-item @click.native="windowMin">最小化</el-dropdown-item>
-                  <el-dropdown-item @click.native="reloadIgnoringCache">刷新</el-dropdown-item>
+                  <el-dropdown-item v-if="LocalConfig.normal.isDevTool"
+                    @click.native="toggleDevTools">调试工具</el-dropdown-item>
+                  <el-dropdown-item @click.native="clientConfigShow">客户端参数</el-dropdown-item>                  
                   <!--
                   <el-dropdown-item @click.native="windowMax"
                   >最大化</el-dropdown-item
@@ -340,7 +345,7 @@ export default {
     //打开客户端调试工具
     toggleDevTools() {
       if (!this.$peisAPI) {
-        this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！"});
+        this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" });
         return;
       }
       this.$peisAPI.toggleDevTools();
@@ -349,7 +354,7 @@ export default {
     // 打开客户端设置
     clientConfigShow() {
       if (!this.$peisAPI) {
-        this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！"})
+        this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" })
         return
       }
       this.$peisAPI.clientConfigShow();
@@ -362,8 +367,16 @@ export default {
       }
       this.$peisAPI.windowMin();
     },
+
+    btnMax() {
+      if (!this.$peisAPI) {
+        this.$message.info("此功能，需要在壳客户端才可运行！")
+        return
+      }
+      this.$peisAPI.windowMax();
+    },
     // 刷新
-    reloadIgnoringCache(){
+    reloadIgnoringCache() {
       if (!this.$peisAPI) {
         this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" });
         return;
@@ -373,14 +386,14 @@ export default {
     // 最大化
     windowMax() {
       if (!this.$peisAPI) {
-        this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！"});
+        this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" });
         return;
       }
       this.$peisAPI.windowMax();
     },
     windowClose() {
       if (!this.$peisAPI) {
-        this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！"});
+        this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" });
         return;
       }
       this.$peisAPI.windowClose();
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index 01dcbfc..86da7c6 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -63,6 +63,7 @@
 import { writetoken } from "@/utlis/istoken";
 import { deepCopy } from "@/utlis/proFunc";
 import axios from "axios";
+import { Loading } from "element-ui";
 
 export default {
   data() {
@@ -90,7 +91,7 @@ export default {
       LocalConfigInit: {}
     };
   },
-  created() {    
+  created() {
     this.LocalConfigInit = deepCopy(this.LocalConfig)
     let LocalConfig = window.localStorage.getItem("LocalConfig") || null
     try {
@@ -126,7 +127,7 @@ export default {
       }
     },
 
-     //打开客户端调试工具
+    //打开客户端调试工具
     toggleDevTools() {
       if (!this.$peisAPI) {
         this.$message.info("此功能，需要在壳客户端才可运行！")
@@ -166,6 +167,13 @@ export default {
 
       this.$refs.form.validate((valid) => {
         if (valid) {
+          let loading = Loading.service({
+            lock: true,
+            text: "正在加载中，请稍后",
+            spinner: "el-icon-loading",
+            background: "rgba(0, 0, 0, 0)",
+            customClass: "boxStyle"
+          });
           axios.post(`${this.sysConfig.apiurl}/api/identity/users/login`, {
             userName: this.form.Username,
             passWord: this.form.Password,
@@ -187,6 +195,8 @@ export default {
             }
           }).catch(err => {
             this.$message.error(err);
+          }).finally(() => {
+            loading.close()
           })
         }
       });