From 63b2432286110be1f270672a223c8fb9ddc24233 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期三, 21 五月 2025 11:39:39 +0800
Subject: [PATCH] 修改 点检-作业指导书
---
common/service/config.service.js | 2
pages/ToDoList/ToDoBaoZhouSure/ToDoBaoZhouSure.vue | 2
common/service/service.js | 167 ++++++++++++++++++++++++++++++-------------------------
3 files changed, 92 insertions(+), 79 deletions(-)
diff --git a/common/service/config.service.js b/common/service/config.service.js
index 5dcaf09..39d1de7 100644
--- a/common/service/config.service.js
+++ b/common/service/config.service.js
@@ -6,7 +6,7 @@
BASE_URL = '/jeecg-boot' // 鐢熶骇鐜
}
let staticDomainURL ='/sys/common/static';
-let staticURL ='https://http://192.168.4.20:9999/jeecg-boot/sys/common/static';
+let staticURL ='http://192.168.4.20:9999/jeecg-boot/sys/common/static';
const configService = {
apiUrl: BASE_URL,
staticDomainURL: staticDomainURL,
diff --git a/common/service/service.js b/common/service/service.js
index de4ec21..d23985a 100644
--- a/common/service/service.js
+++ b/common/service/service.js
@@ -1,5 +1,7 @@
import Request from '@/common/luch-request/index.js'
-import {ACCESS_TOKEN} from '@/common/util/constants.js'
+import {
+ ACCESS_TOKEN
+} from '@/common/util/constants.js'
import configService from './config.service.js'
import tip from '@/common/util/tip.js';
import store from '@/store/index.js';
@@ -8,11 +10,11 @@
const getTokenStorage = () => {
let token = ''
- try{
+ try {
token = uni.getStorageSync(ACCESS_TOKEN)
- }catch(e){
+ } catch (e) {
//TODO handle the exception
- console.log("getTokenStorage",token)
+ console.log("getTokenStorage", token)
}
return token
}
@@ -20,12 +22,13 @@
const http = new Request()
-http.setConfig((config) => { /* 璁剧疆鍏ㄥ眬閰嶇疆 */
- config.baseUrl = apiUrl /* 鏍瑰煙鍚嶄笉鍚� */
- config.header = {
- ...config.header
- }
- return config
+http.setConfig((config) => {
+ /* 璁剧疆鍏ㄥ眬閰嶇疆 */
+ config.baseUrl = apiUrl /* 鏍瑰煙鍚嶄笉鍚� */
+ config.header = {
+ ...config.header
+ }
+ return config
})
/**
@@ -35,80 +38,90 @@
*/
// 鏈夐粯璁わ紝闈炲繀鍐�
http.validateStatus = (statusCode) => {
- return statusCode === 200
+ return statusCode === 200
}
-http.interceptor.request((config, cancel) => { /* 璇锋眰涔嬪墠鎷︽埅鍣� */
- config.header = {
- ...config.header,
- 'X-Access-Token':getTokenStorage()
- }
- /*
- if (!token) { // 濡傛灉token涓嶅瓨鍦紝璋冪敤cancel 浼氬彇娑堟湰娆¤姹傦紝浣嗘槸璇ュ嚱鏁扮殑catch() 浠嶄細鎵ц
- cancel('token 涓嶅瓨鍦�') // 鎺ユ敹涓�涓弬鏁帮紝浼氫紶缁檆atch((err) => {}) err.errMsg === 'token 涓嶅瓨鍦�'
- }
- */
- return config
+http.interceptor.request((config, cancel) => {
+ /* 璇锋眰涔嬪墠鎷︽埅鍣� */
+ config.header = {
+ ...config.header,
+ 'X-Access-Token': getTokenStorage()
+ }
+ /*
+ if (!token) { // 濡傛灉token涓嶅瓨鍦紝璋冪敤cancel 浼氬彇娑堟湰娆¤姹傦紝浣嗘槸璇ュ嚱鏁扮殑catch() 浠嶄細鎵ц
+ cancel('token 涓嶅瓨鍦�') // 鎺ユ敹涓�涓弬鏁帮紝浼氫紶缁檆atch((err) => {}) err.errMsg === 'token 涓嶅瓨鍦�'
+ }
+ */
+ return config
})
// 蹇呴』浣跨敤寮傛鍑芥暟锛屾敞鎰�
-http.interceptor.response(async (response) => { /* 璇锋眰涔嬪悗鎷︽埅鍣� */
- // if (response.data.code !== 200) { // 鏈嶅姟绔繑鍥炵殑鐘舵�佺爜涓嶇瓑浜�200锛屽垯reject()
- // return Promise.reject(response)
- // }
- return response
+http.interceptor.response(async (response) => {
+ /* 璇锋眰涔嬪悗鎷︽埅鍣� */
+ // if (response.data.code !== 200) { // 鏈嶅姟绔繑鍥炵殑鐘舵�佺爜涓嶇瓑浜�200锛屽垯reject()
+ // return Promise.reject(response)
+ // }
+ return response
}, (response) => {
// 璇锋眰閿欒鍋氱偣浠�涔�
- console.log("璇锋眰閿欒鍋氱偣浠�涔�",response);
- if (response) {
- let data = response.data
- const token = uni.getStorageSync(ACCESS_TOKEN)
- console.log("------寮傚父鍝嶅簲------",token)
- console.log("------寮傚父鍝嶅簲------",data.status)
- switch (data.status) {
- case 403:
- tip.error('鎷掔粷璁块棶');
- break
- case 500:
- this.$tip.alert('鏈嶅姟鍣ㄩ亣鍒颁竴涓敊璇紝鏆傛椂鏃犳硶澶勭悊鎮ㄧ殑璇锋眰');
- // if(!token || data.message=="Token澶辨晥锛岃閲嶆柊鐧诲綍"){
- // let timeout=setTimeout(tip.alert('鐧诲綍宸茶繃鏈�'), 1000);
- // store.dispatch('Logout').then(() => {
- // clearTimeout(timeout)
- // window.location.reload()
- // })
- // }
- break
- case 404:
- break
- case 504:
- break
- case 401:
- uni.showModal({
- title: '鎻愮ず',
- content: '鐧诲綍瓒呮椂锛岄渶瑕侀噸鏂扮櫥褰�!',
- showCancel:false,
- success: (res)=> {
- if (res.confirm) {
- uni.reLaunch({
- url: '/pages/login/login'
- })
- }
- }
- });
- break
- default:
- tip.error({
- duration: 0,
- forbidClick: true,
- message: data.message
- });
- break
- }
- }
- return response
+ console.log("璇锋眰閿欒鍋氱偣浠�涔�", response);
+ if (response) {
+ let data = response.data
+ const token = uni.getStorageSync(ACCESS_TOKEN)
+ console.log("------寮傚父鍝嶅簲------", token)
+ console.log("------寮傚父鍝嶅簲------", data.status)
+ switch (data.code) {
+ case 403:
+ tip.error('鎷掔粷璁块棶');
+ break
+ case 500:
+ if (!token || data.message === "Token澶辨晥锛岃閲嶆柊鐧诲綍") {
+ // 鍏堟彁绀虹敤鎴�
+ tip.alert('鐧诲綍宸茶繃鏈�');
+
+ // 寤惰繜鎵ц鐧诲嚭骞跺埛鏂伴〉闈紝閬垮厤鎻愮ず琚腑鏂�
+ const timeout = setTimeout(() => {
+ store.dispatch('Logout')
+ .then(() => {
+ window.location.reload();
+ })
+ .catch((error) => {
+ console.error('Logout failed:', error);
+ window.location.reload(); // 鍑洪敊鏃朵篃寮哄埗鍒锋柊
+ });
+ }, 1000);
+ }
+ break
+ case 404:
+ break
+ case 504:
+ break
+ case 401:
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '鐧诲綍瓒呮椂锛岄渶瑕侀噸鏂扮櫥褰�!',
+ showCancel: false,
+ success: (res) => {
+ if (res.confirm) {
+ uni.reLaunch({
+ url: '/pages/login/login'
+ })
+ }
+ }
+ });
+ break
+ default:
+ tip.error({
+ duration: 0,
+ forbidClick: true,
+ message: data.message
+ });
+ break
+ }
+ }
+ return response
})
export {
- http
-}
+ http
+}
\ No newline at end of file
diff --git a/pages/ToDoList/ToDoBaoZhouSure/ToDoBaoZhouSure.vue b/pages/ToDoList/ToDoBaoZhouSure/ToDoBaoZhouSure.vue
index a953048..1c85fbf 100644
--- a/pages/ToDoList/ToDoBaoZhouSure/ToDoBaoZhouSure.vue
+++ b/pages/ToDoList/ToDoBaoZhouSure/ToDoBaoZhouSure.vue
@@ -140,7 +140,7 @@
<uni-forms-item :label-width="80" required name="randomInspectionFlag" label="鎶芥鏍囪:">
<uni-data-select v-model="ScanData.InspectionFlagName"
:localdata="ScanData.randomInspectionFlagList" @change="changehandlingInspectionFlag"
- placeholder="璇烽�夋嫨" :disabled="isShowSure" />
+ placeholder="璇烽�夋嫨" :disabled="isShowLast"/>
</uni-forms-item>
<uni-forms-item :label-width="80" name="outNum" label="鍒濋獙鏀堕檮浠�:">
<uni-file-picker limit="9" :value="fileList" :image-styles="imageStyles"
--
Gitblit v1.9.3