Merge remote-tracking branch 'origin/master'

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([

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,

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;

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() {