diff --git a/sample-form-client-ui/admin/src/App.vue b/sample-form-client-ui/admin/src/App.vue index 73200f44950e4ab880d21b7edc00775aa764a118..0403bb9810e64a309cb9fc75886adcb0a2a8d405 100644 --- a/sample-form-client-ui/admin/src/App.vue +++ b/sample-form-client-ui/admin/src/App.vue @@ -85,7 +85,7 @@ export default { window.addEventListener("offline", () => { this.isShowError = true; }); - this.getDevInfo(); + // this.getDevInfo(); }, methods: { ...mapMutations([ diff --git a/sample-form-client-ui/admin/src/api/index.js b/sample-form-client-ui/admin/src/api/index.js index d2f48c09077a718770b21a35f2c99a478fd1f503..888bf404e62aa0362db26572d67e375a257ac713 100644 --- a/sample-form-client-ui/admin/src/api/index.js +++ b/sample-form-client-ui/admin/src/api/index.js @@ -9,7 +9,7 @@ export const getHomeInfo = (data) => { let siteId = local.getLocal("siteId"); let deviceCode = local.getLocal("devicenum"); return request({ - url: `${baseUrl}sampleform/home/info`, + url: `${baseUrl}basics_api/sampleform/home/info`, method: "post", data: { siteId, @@ -25,7 +25,7 @@ export const getdeptList = (data) => { let siteId = local.getLocal("siteId"); // let deviceCode = local.getLocal("devicenum"); return request({ - url: `${baseUrl}sampleform/home/depts`, + url: `${baseUrl}basics_api/sampleform/home/depts`, method: "post", data: { siteId, @@ -40,7 +40,7 @@ export const getSampleformMatterList = (data) => { let baseUrl = local.getLocal("serverUrl"); let siteId = local.getLocal("siteId"); return request({ - url: `${baseUrl}sampleform/matter/interlist`, + url: `${baseUrl}basics_api/sampleform/matter/interlist`, method: "post", data: { siteId, @@ -55,7 +55,7 @@ export const getDeviceMatterList = (data) => { let siteId = local.getLocal("siteId"); // let deviceCode = local.getLocal("devicenum"); return request({ - url: `${baseUrl}sampleform/device/matter/datum/interlist`, + url: `${baseUrl}basics_api/sampleform/device/matter/datum/interlist`, method: "post", data: { siteId, @@ -70,7 +70,7 @@ export const getMaterialsList = (data) => { let baseUrl = local.getLocal("serverUrl"); let siteId = local.getLocal("siteId"); return request({ - url: `${baseUrl}sampleform/matter/datum/interlist`, + url: `${baseUrl}basics_api/sampleform/matter/datum/interlist`, method: "post", data: { siteId, @@ -84,7 +84,7 @@ export const mergeFormToDocx = (data) => { let baseUrl = local.getLocal("serverUrl"); let siteId = local.getLocal("siteId"); return request({ - url: `${baseUrl}sampleform/home/mergeFormToDocx`, + url: `${baseUrl}basics_api/sampleform/home/mergeFormToDocx`, method: "post", data: { siteId, @@ -98,7 +98,7 @@ export const checkMaterials = (data) => { let siteId = local.getLocal("siteId"); let deviceCode = local.getLocal("devicenum"); return request({ - url: `${baseUrl}sampleform/sample/bill/save`, + url: `${baseUrl}basics_api/sampleform/sample/bill/save`, method: "post", data: { siteId, @@ -112,7 +112,7 @@ export const getSkinList = (data) => { let baseUrl = local.getLocal("serverUrl"); // let siteId = local.getLocal("siteId"); return request({ - url: `${baseUrl}sampleform/skin/interlist`, + url: `${baseUrl}basics_api/sampleform/skin/interlist`, method: "post", data, }); @@ -131,7 +131,7 @@ export const getDeviceInfo = (data) => { let baseUrl = local.getLocal("serverUrl"); let deviceCode = local.getLocal("devicenum"); return request({ - url: `${baseUrl}sampleform/device/check`, + url: `${baseUrl}basics_api/sampleform/device/check`, method: "post", data: { deviceCode, diff --git a/sample-form-client-ui/admin/src/utils/request.js b/sample-form-client-ui/admin/src/utils/request.js index 7cfd20de16c1707862671295be4703aaea4daa64..4a71cca6b910fca4f7b4d143e343a97cfec7045e 100644 --- a/sample-form-client-ui/admin/src/utils/request.js +++ b/sample-form-client-ui/admin/src/utils/request.js @@ -2,15 +2,18 @@ * axios 宸ュ叿鍑芥暟灞� */ import axios from "axios"; -import { Message } from "element-ui"; +import { message } from "@/utils/resetMessage"; // import local from "@/utils/local"; -// 璇锋眰瓒呮椂鏃堕棿 -// axios.defaults.timeout = 15 * 1000; + +const instance = axios.create({ + // 璇锋眰瓒呮椂鏃堕棿 + timeout: 20 * 1000, +}); // 璁剧疆缁熶竴鏈嶅姟鍣ㄥ湴鍧€ // axios.defaults.baseURL = local.getLocal("serverUrl"); // 璇锋眰鎷︽埅 -axios.interceptors.request.use( +instance.interceptors.request.use( (config) => { // let token = local.getLocal('token') // if (token) { @@ -24,31 +27,48 @@ axios.interceptors.request.use( ); // 鍝嶅簲鎷︽埅 -axios.interceptors.response.use( +instance.interceptors.response.use( (response) => { if (response.data.code !== undefined && response.data.msg !== undefined) { // 鍙栧嚭鏁版嵁 let { code, msg } = response.data; if (code === -1) { - Message.error({ + message.error({ message: msg, }); } else if (code === 401) { - Message.error({ + message.error({ message: msg, }); } } return response; }, - (err) => { - if (err.message.includes("timeout")) { - Message.error({ - message: "璇锋眰瓒呮椂锛岃绋嶅悗鍐嶈瘯", + (error) => { + let path = window.location.hash; + if ( + error.response && + error.response.status && + error.response.status != 200 && + path == "#/" + ) { + setTimeout(() => { + // 閲嶆柊鍙戦€佽姹� + return instance(error.config); + }, 5000); + } else if (error.request && path == "#/") { + setTimeout(() => { + // 閲嶆柊鍙戦€佽姹� + return instance(error.config); + }, 5000); + } + if (error.message.includes("timeout")) { + message.error({ + message: "缃戠粶涓嶇粰鍔涘憖", }); } - return Promise.reject(err); + return Promise.reject(error); } ); -export default axios; +export default instance; diff --git a/sample-form-manager-ui/admin/src/pages/software/materials/modal/AddMaterials.vue b/sample-form-manager-ui/admin/src/pages/software/materials/modal/AddMaterials.vue index e381d358a277c6ccfc5fd78c5626ecea91deeac8..c73fbd0533589f95b64a7c13677f28520356edb6 100644 --- a/sample-form-manager-ui/admin/src/pages/software/materials/modal/AddMaterials.vue +++ b/sample-form-manager-ui/admin/src/pages/software/materials/modal/AddMaterials.vue @@ -211,9 +211,14 @@ export default { }, // 涓婁紶鏍疯〃 OnsuccessSamplePath(response, file, fileList) { - this.samplePathFileList = fileList.slice(-1); - this.form.samplePath = response.url; - this.form.sampleName = response.fileName; + if (response.code == 1) { + this.samplePathFileList = fileList.slice(-1); + this.form.samplePath = response.url; + this.form.sampleName = response.fileName; + } else { + let msg = response.msg || "涓婁紶澶辫触"; + this.$message.error(msg); + } }, // 鍒犻櫎鏍疯〃 handleRemoveSamplePath() {