xiaochan 1 년 전
부모
커밋
b423083d9b

+ 0 - 1
src/components/zhu-yuan-yi-sheng/YzTag.vue

@@ -52,7 +52,6 @@ const yzSift = async (flag) => {
 }
 
 const pathList = ref([
-  {title: '患者信息', path: '/inpatient/zhuYuanYiSheng/patientInfoView'},
   {title: '全部', func: () => yzSift(frequCodeEnum.all), frequCode: frequCodeEnum.all},
   {title: '临时', func: () => yzSift(frequCodeEnum.temporary), frequCode: frequCodeEnum.temporary},
   {title: '长期', func: () => yzSift(frequCodeEnum.longTerm), frequCode: frequCodeEnum.longTerm},

+ 1 - 1
src/layout/HeaderV2/HeaderV2.vue

@@ -8,7 +8,7 @@
 </template>
 
 <script setup name='HeaderV2' lang="ts">
-import RouteNavigation from "@/layout/HeaderV2/RouteNavigation.vue";
+import RouteNavigation from "@/layout/HeaderV2/router-tabs/RouteNavigation.vue";
 import ToolInfoBar from "./ToolInfoBar.vue";
 
 

+ 5 - 1
src/layout/HeaderV2/function-list/user-info/UserInfo.vue

@@ -41,13 +41,17 @@
 import {genTextPortrait} from '@/utils/portrait'
 import UserInfoDisplay from "@/layout/HeaderV2/function-list/user-info/UserInfoDisplay.vue";
 import {useUserStore} from "@/pinia/user-store";
+import {stringNotBlank} from "@/utils/blank-utils";
 
 const emit = defineEmits(['password', 'logout'])
 
 const userInfo = useUserStore().userInfo
 
 const makeTextPortrait = () => {
-  return genTextPortrait(userInfo.name)
+  if (stringNotBlank(userInfo.avatar)) {
+    return userInfo.avatar
+  }
+  return genTextPortrait(userInfo.name);
 }
 
 const errorHandler = () => {

+ 1 - 1
src/layout/HeaderV2/RouteNavigation.vue → src/layout/HeaderV2/router-tabs/RouteNavigation.vue

@@ -21,7 +21,7 @@
 <script setup lang="ts">
 import {ref} from "vue";
 import tabsHook from "@/layout/HeaderV2/tabs-hook";
-import RightClickMenu from "@/components/menu-item/RightClickMenu";
+import RightClickMenu from "@/components/menu-item/RightClickMenu.vue";
 import router from '@/router'
 import XEUtils from "xe-utils";
 import {stringIsBlank} from "@/utils/blank-utils";

+ 23 - 0
src/layout/HeaderV2/router-tabs/index.ts

@@ -0,0 +1,23 @@
+import {useLocalStorage} from "@vueuse/core";
+import {defineStore} from "pinia";
+
+declare type Tabs = {
+    name: string,
+    query: any
+    title: string
+}
+
+const useLocalTabs = defineStore('tabs', {
+    state: () => useLocalStorage<Tabs[]>('tabs', []).value,
+    actions: {
+        remove(index: number) {
+
+        }
+    }
+})
+
+const useRouterTabs = () => {
+    
+}
+
+export default useRouterTabs;

+ 6 - 8
src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/MedicalHistoryPrompts.vue

@@ -1,10 +1,11 @@
 <template>
-  <div class="tips-main">
-    <div class="sidebar">
+
+  <div class="layout_container layout-horizontal">
+    <aside>
       <xc-table :local-data="tipsData"
                 layout="total,prev, pager, next"
                 @rowClick="rowClick"
-                :height="150">
+                final-height="100%">
         <el-table-column label="关键词" prop="queryKey" width="100"/>
         <el-table-column label="内容" prop="content" show-overflow-tooltip/>
         <el-table-column label="类型" prop="typeName" width="40"/>
@@ -29,10 +30,9 @@
           </template>
         </el-table-column>
       </xc-table>
-    </div>
-    <div class="main">
-      <div style="height: 40px"/>
+    </aside>
 
+    <div class="layout_main" style="padding-top: 30px">
       <el-form label-width="80px"
                ref="formRef"
                :rules="rules"
@@ -77,8 +77,6 @@
       </el-form>
     </div>
   </div>
-
-
 </template>
 
 <script setup name='MedicalHistoryPrompts'>