From 2de3e26abfff642ad2b0c340987b9f80bce26ad0 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Tue, 27 Jan 2026 12:28:34 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E6=A1=86=E6=9E=B6]=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue                   | 54 ++++++++++++----------
 .../business/comps/template/comps/gsp/MJYLQSQD.vue | 22 ++++-----
 2 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index a0ec7b0..c996c4a 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -2,38 +2,42 @@
   <div class="navbar">
 
     <div class="navbar-header">
-      <div class="right-menu">
-        <template v-if="device !== 'mobile'">
+      <div>
+        <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
+          @toggleClick="toggleSideBar" />
 
-          <!-- <screenfull id="screenfull" class="right-menu-item hover-effect" />
+        <breadcrumb v-if="!topNav" id="breadcrumb-container" class="breadcrumb-container" />
+        <top-nav v-if="topNav" id="topmenu-container" class="topmenu-container" />
+      </div>
+      <div>
+        <div class="right-menu">
+          <template v-if="device !== 'mobile'">
+
+            <!-- <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
         <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip> -->
 
-        </template>
-        <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
-          <div class="avatar-wrapper">
-            <img src="@/assets/images/profile.jpg" class="user-avatar">
-            <span class="user-nickname"> {{ nickName }} </span>
-          </div>
-          <el-dropdown-menu slot="dropdown">
-            <router-link to="/user/profile">
-              <el-dropdown-item>{{ $t('login.profile') }}</el-dropdown-item>
-            </router-link>
-            <el-dropdown-item divided @click.native="logout">
-              <span>{{ $t('login.logOut') }}</span>
-            </el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
+          </template>
+          <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
+            <div class="avatar-wrapper">
+              <img src="@/assets/images/profile.jpg" class="user-avatar">
+              <span class="user-nickname"> {{ nickName }} </span>
+            </div>
+            <el-dropdown-menu slot="dropdown">
+              <router-link to="/user/profile">
+                <el-dropdown-item>{{ $t('login.profile') }}</el-dropdown-item>
+              </router-link>
+              <el-dropdown-item divided @click.native="logout">
+                <span>{{ $t('login.logOut') }}</span>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+          <lang-select class="set-language" style="margin-left: 10px;"/>
+        </div>
       </div>
-      <lang-select class="set-language" />
     </div>
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
-      @toggleClick="toggleSideBar" />
-
-    <breadcrumb v-if="!topNav" id="breadcrumb-container" class="breadcrumb-container" />
-    <top-nav v-if="topNav" id="topmenu-container" class="topmenu-container" />
   </div>
 </template>
 
@@ -117,7 +121,7 @@ export default {
     height: 50px;
     line-height: 50px;
     display: flex;
-    justify-content: flex-end;
+    justify-content: space-between;
 
   }
 
diff --git a/src/views/business/comps/template/comps/gsp/MJYLQSQD.vue b/src/views/business/comps/template/comps/gsp/MJYLQSQD.vue
index cb9870a..23b56ca 100644
--- a/src/views/business/comps/template/comps/gsp/MJYLQSQD.vue
+++ b/src/views/business/comps/template/comps/gsp/MJYLQSQD.vue
@@ -249,12 +249,12 @@ export default {
 			this.gyjlOptions = tmp
 			if (reset) {
 				this.gyndOptions = []
-				setTimeout(() => {
-					that.$refs.baseInfoRef.batchUpdateFormData({
-						gyjl: '',
-						xynd: '',
-					});
-				}, 10)
+				// setTimeout(() => {
+				// 	that.$refs.baseInfoRef.batchUpdateFormData({
+				// 		gyjl: '',
+				// 		xynd: '',
+				// 	});
+				// }, 10)
 			}
 		},
 		filterGynd(val, reset) {
@@ -273,11 +273,11 @@ export default {
 			})
 			this.gyndOptions = tmp
 			if (reset) {
-				setTimeout(() => {
-					that.$refs.baseInfoRef.batchUpdateFormData({
-						xynd: '',
-					});
-				}, 10)
+				// setTimeout(() => {
+				// 	that.$refs.baseInfoRef.batchUpdateFormData({
+				// 		xynd: '',
+				// 	});
+				// }, 10)
 			}
 		},
 		//获取给药剂量