@logwire/logwire-wms-pda-ui 1.1.17 → 1.1.18

package/src/views/common/init/index.vue

@@ -1,124 +1,128 @@
-<!--
-  起始页
-  @author: 张文
-  @date: 2022-05-12
--->
-<template>
-  <div
-    class="lw-global-flex-center"
-    style="position: fixed;width: 100%;height: 100%;"
-  >
-    <div v-if="showLoading">
-      <span class="van-loading__spinner van-loading__spinner--circular" style="width: 30px; height: 30px;">
-        <svg viewBox="25 25 50 50" class="van-loading__circular">
-          <circle cx="50" cy="50" r="20" fill="none"></circle>
-        </svg>
-      </span>
-    </div>
-
-    <div v-else class="lw-global-animation-rotate" style="text-align: center">
-      <van-icon name="warning" size="50px" color="#D50000"/>
-      <div
-        style="margin: 10px 0;font-size: 18px;"
-      >{{ errorMsg }}
-      </div>
-      <lw-button plain type="last" @click="refresh">
-        <van-icon name="replay" size="16px" style="font-weight: bold"/>
-        {{ $lwLanguage.get('wms_project.pda.views.init.refresh', '重试') }}
-      </lw-button>
-
-    </div>
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: "init",
-  data() {
-    return {
-      // 显示加载框
-      showLoading: true,
-      // 错误提示语
-      errorMsg: ''
-    }
-  },
-  mounted() {
-
-    window.lwInitTimeout && clearInterval(window.lwInitTimeout)
-    this.init()
-  },
-  methods: {
-    async init() {
-
-      try {
-
-        // 获取语言  优先级：本地储存 > 项目预设 > 系统语言
-        const lang = this.$lwLocalStorag.get('lwLanguage') || this.$lwLanguage.getKey() || navigator.language
-        await this.$lwLanguage.asyncSetKey(lang, false)
-
-        // 如果没有token 或者 没有仓库就去登录
-        if (!this.$lwApiUtils.getToken() || !this.$lwWarehouse.get().id) {
-
-          this.$router.replace({
-            path: '/lwLogin'
-          })
-
-          return
-        }
-
-
-        // 判断是否存在UUID
-        await this.$lwUUID.bound()
-
-
-        await Promise.all([
-          // 获取字典数据
-          this.$lwDict.asyncGet(),
-          // 获取权限数据
-          this.$lwPermissions.asyncGet(),
-          // 获取当前配置了的打印机
-          this.$lwPrint.asyncGet(),
-          // 获取条码解析规则
-          this.$lwBarcodeResolve.asyncInitRule()
-        ])
-
-        if (self === top){
-          history.go(-1)
-        }else {
-          this.$router.replace({
-            path: '/lwHome'
-          })
-        }
-
-        // 如果没有跳转就显示等待超时
-        setTimeout(() => {
-          this.errorMsg = this.$lwLanguage.get('wms_project.pda.views.init.time', '等待超时')
-          this.showLoading = false
-        }, 1000)
-      } catch (e) {
-        setTimeout(() => {
-          this.errorMsg = this.$lwLanguage.get('wms_project.pda.views.init.infoError', '基础数据加载失败')
-          this.showLoading = false
-        }, 1000)
-        console.warn('初始化页面异常：', e)
-      }
-    },
-
-    // 重试
-    refresh() {
-      this.$router.push({
-        path: '/lwHome'
-      })
-
-      setTimeout(() => {
-        history.go(0)
-      },5)
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-
-</style>
+<!--
+  起始页
+  @author: 张文
+  @date: 2022-05-12
+-->
+<template>
+  <div
+    class="lw-global-flex-center"
+    style="position: fixed;width: 100%;height: 100%;"
+  >
+    <div v-if="showLoading">
+      <span class="van-loading__spinner van-loading__spinner--circular" style="width: 30px; height: 30px;">
+        <svg viewBox="25 25 50 50" class="van-loading__circular">
+          <circle cx="50" cy="50" r="20" fill="none"></circle>
+        </svg>
+      </span>
+    </div>
+
+    <div v-else class="lw-global-animation-rotate" style="text-align: center">
+      <van-icon name="warning" size="50px" color="#D50000"/>
+      <div
+        style="margin: 10px 0;font-size: 18px;"
+      >{{ errorMsg }}
+      </div>
+      <lw-button plain type="last" @click="refresh">
+        <van-icon name="replay" size="16px" style="font-weight: bold"/>
+        {{ $lwLanguage.get('wms_project.pda.views.init.refresh', '重试') }}
+      </lw-button>
+
+    </div>
+  </div>
+</template>
+
+<script>
+
+import {loginAndInit} from "../../../mixins/loginAndInit";
+
+export default {
+  name: "init",
+  mixins:[loginAndInit],
+  data() {
+    return {
+      // 显示加载框
+      showLoading: true,
+      // 错误提示语
+      errorMsg: ''
+    }
+  },
+  mounted() {
+
+    window.lwInitTimeout && clearInterval(window.lwInitTimeout)
+    this.init()
+  },
+  methods: {
+    async init() {
+
+      try {
+
+        // 获取语言  优先级：本地储存 > 项目预设 > 系统语言
+        const lang = this.$lwLocalStorag.get('lwLanguage') || this.$lwLanguage.getKey() || navigator.language
+        await this.$lwLanguage.asyncSetKey(lang, false)
+
+        // 如果没有token 或者 没有仓库就去登录
+        if (!this.$lwApiUtils.getToken() || !this.$lwWarehouse.get().id) {
+
+          this.$router.replace({
+            path: '/lwLogin'
+          })
+
+          return
+        }
+
+
+        // 判断是否存在UUID
+        await this.$lwUUID.bound()
+
+
+        await this.getSystemInitData()
+
+        if (self === top){
+          history.go(-1)
+        }else {
+          this.$router.replace({
+            path: '/lwHome'
+          })
+        }
+
+        // 如果没有跳转就显示等待超时
+        setTimeout(() => {
+          this.errorMsg = this.$lwLanguage.get('wms_project.pda.views.init.time', '等待超时')
+          this.showLoading = false
+        }, 1000)
+      } catch (e) {
+        setTimeout(() => {
+          this.errorMsg = this.$lwLanguage.get('wms_project.pda.views.init.infoError', '基础数据加载失败')
+          this.showLoading = false
+        }, 1000)
+
+        console.warn('初始化页面异常：', e)
+
+        const api = ['wmsGetAllChoices','wmsGetUserPermissions']
+        const url = e.config.url.split('/')
+
+        if (api.includes(url.pop())){
+          this.$router.replace({
+            path: '/lwLogin'
+          })
+        }
+      }
+    },
+
+    // 重试
+    refresh() {
+      this.$router.push({
+        path: '/lwHome'
+      })
+
+      setTimeout(() => {
+        history.go(0)
+      },5)
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/common/login/index.vue

@@ -1,23 +1,23 @@
-<!--
-  登录页
-  @author: 张文
-  @date: 2022-04-18
--->
-<template>
-  <lw-login-page/>
-</template>
-
-<script>
-
-export default {
-  name: "login",
-  data() {
-    return {}
-  },
-  methods: {}
-}
-</script>
-
-<style scoped lang="less">
-
-</style>
+<!--
+  登录页
+  @author: 张文
+  @date: 2022-04-18
+-->
+<template>
+  <lw-login-page/>
+</template>
+
+<script>
+
+export default {
+  name: "login",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/common/menu/menuOne.vue

@@ -1,36 +1,36 @@
-<!--
-  菜单页面一
-  @author: 张文
-  @date: 2022-03-07
--->
-<template>
-  <lw-menu-page @click="click"/>
-</template>
-
-<script>
-
-export default {
-  name: "menuOne",
-  data() {
-    return {}
-  },
-  mounted() {
-
-  },
-  methods: {
-    click({item, key}){
-      this.$router.push({
-        path:'/lwMenuTwo',
-        query:{
-          lwMenuTitle: item.title,
-          lwMenuKey:key
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-
-</style>
+<!--
+  菜单页面一
+  @author: 张文
+  @date: 2022-03-07
+-->
+<template>
+  <lw-menu-page @click="click"/>
+</template>
+
+<script>
+
+export default {
+  name: "menuOne",
+  data() {
+    return {}
+  },
+  mounted() {
+
+  },
+  methods: {
+    click({item, key}){
+      this.$router.push({
+        path:'/lwMenuTwo',
+        query:{
+          lwMenuTitle: item.title,
+          lwMenuKey:key
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/common/menu/menuTwo.vue

@@ -1,33 +1,33 @@
-<!--
-  菜单页面二
-  @author: 张文
-  @date: 2022-03-07
--->
-<template>
-  <lw-menu-page @click="click"/>
-</template>
-
-<script>
-
-export default {
-  name: "menuTwo",
-  data() {
-    return {}
-  },
-  methods: {
-    click({item, key}){
-      this.$router.push({
-        path:'/lwMenuOne',
-        query:{
-          lwMenuTitle: item.title,
-          lwMenuKey:key
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-
-</style>
+<!--
+  菜单页面二
+  @author: 张文
+  @date: 2022-03-07
+-->
+<template>
+  <lw-menu-page @click="click"/>
+</template>
+
+<script>
+
+export default {
+  name: "menuTwo",
+  data() {
+    return {}
+  },
+  methods: {
+    click({item, key}){
+      this.$router.push({
+        path:'/lwMenuOne',
+        query:{
+          lwMenuTitle: item.title,
+          lwMenuKey:key
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/common/my/device.vue

@@ -1,23 +1,23 @@
-<!--
-  设备
-  @author: 张文
-  @date: 2022-04-18
--->
-<template>
-  <lw-device-page/>
-</template>
-
-<script>
-
-export default {
-  name: "device",
-  data() {
-    return {}
-  },
-  methods: {}
-}
-</script>
-
-<style scoped lang="less">
-
-</style>
+<!--
+  设备
+  @author: 张文
+  @date: 2022-04-18
+-->
+<template>
+  <lw-device-page/>
+</template>
+
+<script>
+
+export default {
+  name: "device",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/common/my/index.vue

@@ -1,23 +1,23 @@
-<!--
-  我的
-  @author: 张文
-  @date: 2022-04-18
--->
-<template>
-  <lw-my-page/>
-</template>
-
-<script>
-
-export default {
-  name: "my",
-  data() {
-    return {}
-  },
-  methods: {}
-}
-</script>
-
-<style scoped lang="less">
-
-</style>
+<!--
+  我的
+  @author: 张文
+  @date: 2022-04-18
+-->
+<template>
+  <lw-my-page/>
+</template>
+
+<script>
+
+export default {
+  name: "my",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/common/my/language.vue

@@ -1,23 +1,23 @@
-<!--
-  语言
-  @author: 张文
-  @date: 2022-04-18
--->
-<template>
-  <lw-language-page/>
-</template>
-
-<script>
-
-export default {
-  name: "language",
-  data() {
-    return {}
-  },
-  methods: {}
-}
-</script>
-
-<style scoped lang="less">
-
-</style>
+<!--
+  语言
+  @author: 张文
+  @date: 2022-04-18
+-->
+<template>
+  <lw-language-page/>
+</template>
+
+<script>
+
+export default {
+  name: "language",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/common/my/msg.vue

@@ -1,23 +1,23 @@
-<!--
-  消息
-  @author: 张文
-  @date: 2022-04-18
--->
-<template>
-  <lw-msg-page/>
-</template>
-
-<script>
-
-export default {
-  name: "msg",
-  data() {
-    return {}
-  },
-  methods: {}
-}
-</script>
-
-<style scoped lang="less">
-
-</style>
+<!--
+  消息
+  @author: 张文
+  @date: 2022-04-18
+-->
+<template>
+  <lw-msg-page/>
+</template>
+
+<script>
+
+export default {
+  name: "msg",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/common/my/print.vue

@@ -1,23 +1,23 @@
-<!--
-  打印
-  @author: 张文
-  @date: 2022-04-18
--->
-<template>
-  <lw-print-page/>
-</template>
-
-<script>
-
-export default {
-  name: "print",
-  data() {
-    return {}
-  },
-  methods: {}
-}
-</script>
-
-<style scoped lang="less">
-
-</style>
+<!--
+  打印
+  @author: 张文
+  @date: 2022-04-18
+-->
+<template>
+  <lw-print-page/>
+</template>
+
+<script>
+
+export default {
+  name: "print",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>