From bf44ae2dd15b2b139ce56b1ba1294fdfd220c763 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 25 十二月 2024 17:13:34 +0800
Subject: [PATCH] #问题修复 1. 列表字段空间调整 2. 地址链接放至配置文件中 3. 定时任务执行完成后，状态修改补上 4. 修改状态时，需校验上一步状态是否对应 5. 下发任务完成后，查看是否修改状态为2 7. 任务状态列表，数据显示不全问题修复 8. 波次列表，表格合并问题导致多订单出库问题
---
zy-asrs-admin/src/main.js | 60 +++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 15 deletions(-)
diff --git a/zy-asrs-admin/src/main.js b/zy-asrs-admin/src/main.js
index 06214a2..88a3227 100644
--- a/zy-asrs-admin/src/main.js
+++ b/zy-asrs-admin/src/main.js
@@ -1,15 +1,45 @@
-import './assets/main.css'
-import { createApp } from 'vue'
-import { createPinia } from 'pinia'
-import App from './App.vue'
-import router from './router'
-import Antd from 'ant-design-vue';
-import 'ant-design-vue/dist/reset.css';
-
-const app = createApp(App)
-
-app.use(createPinia())
-app.use(router)
-app.use(Antd)
-
-app.mount('#app')
+import './assets/main.css'
+import { createApp } from 'vue'
+import { createPinia } from 'pinia'
+import App from './App.vue'
+import router from './router'
+import Antd from 'ant-design-vue';
+import 'ant-design-vue/dist/reset.css';
+import { initRouter } from '@/router/index.js'
+import { globalState } from './config.js'
+import print from 'vue3-print-nb'
+import { loadData } from '@/utils/localeUtils.js'
+
+const app = createApp(App)
+
+const initToken = async () => {
+ if (globalState.token == '' || globalState.token == null) {
+ let token = localStorage.getItem('token')
+ let user = JSON.parse(localStorage.getItem('user'))
+ let locale = localStorage.getItem('locale')
+ globalState.token = token;
+ globalState.user = user;
+ if(locale != null) {
+ globalState.locale = locale;
+ }
+
+ loadData(globalState.locale)
+ }
+}
+
+const boot = async () => {
+ await initToken();
+ await initRouter()
+
+ //wait route load
+ app.use(createPinia())
+ app.use(router)
+ app.use(Antd)
+ app.use(print)
+ router.isReady().then((e) => {
+ app.mount('#app')
+ })
+}
+boot()
+
+
--
Gitblit v1.9.1