浏览代码

优化与修复

lighter 1 年之前
父节点
当前提交
15db92babd
共有 3 个文件被更改,包括 34 次插入32 次删除
  1. 3 3
      src/components/inpatient/WristStrap.vue
  2. 5 5
      src/router/modules/dashboard.js
  3. 26 24
      src/store/plugins/persistent.js

+ 3 - 3
src/components/inpatient/WristStrap.vue

@@ -85,10 +85,10 @@ const printChildWristStrap = () => {
 
 const getPrinters = () => {
   LODOP = getLodop()
-  var count = LODOP.GET_PRINTER_COUNT();
-  for (var i = 0; i < count; i++) {
+  const count = LODOP.GET_PRINTER_COUNT();
+  for (let i = 0; i < count; i++) {
     //根据设备序号获取设备名
-    var printerName = LODOP.GET_PRINTER_NAME(i);
+    const printerName = LODOP.GET_PRINTER_NAME(i);
     printers.value.push({code: i, name: printerName})
   }
 }

+ 5 - 5
src/router/modules/dashboard.js

@@ -790,11 +790,11 @@ const route = [
                 component: createNameComponent(() => import('@/views/settings/permissions/RoleMenuSettings.vue')),
                 meta: {title: '角色菜单管理'},
             },
-            // {
-            //     path: 'test',
-            //     component: createNameComponent(() => import('@/views/settings/Test.vue')),
-            //     meta: {title: '测试页面'},
-            // },
+            {
+                path: 'test',
+                component: createNameComponent(() => import('@/views/settings/Test.vue')),
+                meta: {title: '测试页面'},
+            },
         ],
     },
     {

+ 26 - 24
src/store/plugins/persistent.js

@@ -1,31 +1,33 @@
 export default function Presistent({key, modules, modulesKeys}) {
     return (store) => {
-        const localOldState = JSON.parse(localStorage.getItem(key) || '{}')
-        const sessionOldState = JSON.parse(sessionStorage.getItem(key) || '{}')
-        let oldState = {}
-        Object.assign(oldState, localOldState, sessionOldState)
-        if (Object.keys(oldState).length > 0) {
-            for (const oldKey in oldState) {
-                modules[oldKey] = oldState[oldKey]
+        if (localStorage) {
+            const localOldState = JSON.parse(localStorage[key] || '{}');
+            const sessionOldState = JSON.parse(sessionStorage[key] || '{}');
+            let oldState = {};
+            Object.assign(oldState, localOldState, sessionOldState);
+            if (Object.keys(oldState).length > 0) {
+                for (const oldKey in oldState) {
+                    modules[oldKey] = oldState[oldKey]
+                }
+                store.replaceState(modules)
             }
-            store.replaceState(modules)
+            store.subscribe((mutation, state) => {
+                // 判断是否需要缓存数据至localStorage
+                if (modulesKeys.local.length > 0) {
+                    const localData = setData(store.state, modulesKeys.local)
+                    localStorage.setItem(key, JSON.stringify(localData))
+                } else {
+                    localStorage.removeItem(key)
+                }
+                // 判断是否需要缓存数据至sessionStorage
+                if (modulesKeys.session.length > 0) {
+                    const sessionData = setData(store.state, modulesKeys.session)
+                    sessionStorage.setItem(key, JSON.stringify(sessionData))
+                } else {
+                    sessionStorage.removeItem(key)
+                }
+            });
         }
-        store.subscribe((mutation, state) => {
-            // 判断是否需要缓存数据至localStorage
-            if (modulesKeys.local.length > 0) {
-                const localData = setData(store.state, modulesKeys.local)
-                localStorage.setItem(key, JSON.stringify(localData))
-            } else {
-                localStorage.removeItem(key)
-            }
-            // 判断是否需要缓存数据至sessionStorage
-            if (modulesKeys.session.length > 0) {
-                const sessionData = setData(store.state, modulesKeys.session)
-                sessionStorage.setItem(key, JSON.stringify(sessionData))
-            } else {
-                sessionStorage.removeItem(key)
-            }
-        })
     }
 }