合并master

package.json

@@ -21,7 +21,7 @@
     "dom-zindex": "^1.0.1",
     "driver.js": "^1.3.0",
     "echarts": "^5.2.0",
-    "element-plus": "file:deps/element-plus.2.0.4.1.tar.gz",
+    "element-plus": "file:deps/element-plus.2.7.1.1.tar.gz",
     "exceljs": "^4.4.0",
     "file-saver": "^2.0.5",
     "iconv-lite": "^0.6.3",
@@ -32,6 +32,7 @@
     "monaco-editor": "^0.40.0",
     "normalize.css": "^8.0.1",
     "nprogress": "^0.2.0",
+    "pinia": "^2.1.7",
     "qrcanvas": "^3.1.2",
     "sortablejs": "^1.14.0",
     "vue": "^3.2.37",
@@ -41,8 +42,7 @@
     "vxe-table": "^4.3.14",
     "vxe-table-plugin-export-xlsx": "^4.0.1",
     "xe-utils": "^3.5.7",
-    "xlsx": "^0.17.0",
-    "pinia": "^2.1.7"
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "@types/node": "^15.0.3",

src/App.vue

@@ -21,13 +21,9 @@ import {formatDateToStr} from '@/utils/moment-utils'
 import {ElLink} from 'element-plus'
 import JsDialogComp from "@/components/js-dialog-comp/JsDialogComp.vue";
 import {CyMessageBox} from "@/components/cy/message-box";
-<<<<<<< HEAD
 import {useProgressBarStore} from "@/pinia/progress-bar-store";
 import {useUserStore} from "@/pinia/user-store";
 import {useSystemStore} from "@/pinia/system-store";
-=======
->>>>>>> master
-
 const progressBarStore = useProgressBarStore()
 const userStore = useUserStore()
 const systemStore = useSystemStore()

src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/BaoCunMuBan.vue

@@ -25,7 +25,6 @@
 
 <script name="BaoCunMuBan" setup>
 import {computed, ref} from "vue";
-import store from '../../../store'
 import {noNeedRule} from "@/utils/public";
 import {muBanMing} from '@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng'
 import {stringNotBlank} from "@/utils/blank-utils";

src/layout/MenuV2/MenuV2.vue

@@ -29,7 +29,6 @@
 </template>
 
 <script setup lang="ts">
-import store from '@/store'
 import MenuItemV2 from "./MenuItemV2.vue";
 import {computed, nextTick, onMounted, reactive, Ref, ref, watch} from "vue";
 import {useRoute} from "vue-router";
@@ -41,6 +40,7 @@ import {treeSearch} from "@/utils/array-utils";
 import {useCompRef} from "@/utils/useCompRef";
 import {ElMenu} from "element-plus";
 import {getUserMenu} from "@/api/settings/menu-settings";
+import {useSystemStore} from "@/pinia/system-store";
 
 const menuText: Ref<string> = ref('')
 const menuRef = useCompRef(ElMenu)
@@ -100,13 +100,14 @@ const menuLaunch = async path => {
   }
 }
 
-const expandOneMenu = computed<boolean>(() => store.state['app'].expandOneMenu)
+const systemStore = useSystemStore()
+const expandOneMenu = computed<boolean>(() => systemStore.expandOneMenu)
 const route = useRoute()
-const isCollapse = computed<boolean>(() => store.state['app'].isCollapse)
+const isCollapse = computed<boolean>(() => systemStore.getCollapse)
 
 const expandMenu = () => {
   if (isCollapse.value) {
-    store.commit('app/isCollapseChange', false)
+    systemStore.setCollapse(false)
     setTimeout(() => {
       searchRef.value!.focus()
     }, 100)

src/layout/index.vue

@@ -1,11 +1,6 @@
 <template>
-<<<<<<< HEAD
   <el-container style="height: 100vh">
     <div class="mask" v-show="!isCollapse" @click="hideMenu"></div>
-=======
-  <el-container style="height: 100%;width: 100%">
-    <div class="mask" v-show="!isCollapse && !contentFullScreen" @click="hideMenu"></div>
->>>>>>> master
     <el-aside :width="isCollapse ? '50px' : '260px'"
               class="layout_aside"
               :class="isCollapse ? 'hide-aside' : 'show-side'"

src/router/index.ts

@@ -13,7 +13,6 @@ import {changeTitle} from '@/utils/system/title'
 import Dashboard from './modules/dashboard'
 import {getUserMenu, IntergrationMenu} from "@/api/settings/menu-settings";
 import {createVNode, defineComponent, h} from "vue";
-import {userInfoStore} from "@/utils/store-public";
 import {stringNotBlank} from "@/utils/blank-utils";
 
 
@@ -115,7 +114,7 @@ function addRoutes(menus: IntergrationMenu[]) {
 router.beforeEach(async (to, _from, next) => {
         NProgress.start();
 
-        const hasToken = stringNotBlank(userInfoStore.value.token)
+        const hasToken = stringNotBlank(localStorage.token)
 
         function tmpNext(...arg) {
             to.meta.title && changeTitle(to.meta.title)