Merge branch 'master' of http://116.204.114.73:3000/ccsens_zhengzhichuan/acupuncture

acupuncture-前台/.env.development

@@ -6,10 +6,10 @@ ENV = 'development'
 
 # 大唐会议管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
-VUE_APP_IMG_URL = 'https://test.tall.wiki/acupuncture'
-VUE_APP_API_QZURL = 'https://test.tall.wiki/'
+VUE_APP_IMG_URL = 'https://test.tall.wiki/acupuncture/api/'
+VUE_APP_API_QZURL = 'https://test.tall.wiki/acupuncture/api/'
 # 筛查访问地址
-VUE_APP_H5_URL = 'https://test.tall.wiki/acupunctureClient/screening/h5'
+VUE_APP_H5_URL = 'https://test.tall.wiki//acupuncture/client/screening/h5'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 # 访问路径

acupuncture-前台/.env.production

@@ -4,9 +4,9 @@ VUE_APP_TITLE = 朱琏针灸联盟数据系统
 # 生产环境配置
 NODE_ENV = 'production'
 # 因孚生产
-VUE_APP_BASE_API = 'https://test.tall.wiki/acupuncture'
-VUE_APP_API_QZURL = 'https://test.tall.wiki/'
+VUE_APP_BASE_API = 'http://113.45.159.249:40010/acupuncture/api/'
+VUE_APP_API_QZURL = 'http://113.45.159.249:40010/acupuncture/api/'
 # 筛查访问地址
-VUE_APP_H5_URL = 'https://test.tall.wiki/acupunctureClient/screening/h5'
+VUE_APP_H5_URL = 'http://113.45.159.249:40010/acupuncture/client/screening/h5'
 # 访问路径
-VUE_APP_PUBLIC_PATH = '/acupunctureClient/'
+VUE_APP_PUBLIC_PATH = '/acupuncture/client/'

acupuncture-前台/.env.staging

@@ -1,12 +1,12 @@
 # 页面标题
 VUE_APP_TITLE = 朱琏针灸联盟数据系统
 
-BABEL_ENV = production
-
-NODE_ENV = production
-
-# 测试环境配置
-ENV = 'staging'
-
-# 朱琏针灸联盟数据系统/测试环境
-VUE_APP_BASE_API = '/stage-api'
+# 生产环境配置
+NODE_ENV = 'production'
+# 因孚生产
+VUE_APP_BASE_API = 'https://test.tall.wiki/acupuncture/api/'
+VUE_APP_API_QZURL = 'https://test.tall.wiki/acupuncture/api/'
+# 筛查访问地址
+VUE_APP_H5_URL = 'https://test.tall.wiki/acupuncture/client/screening/h5'
+# 访问路径
+VUE_APP_PUBLIC_PATH = '/acupuncture/client/'

acupuncture-前台/src/utils/request.js

@@ -40,7 +40,7 @@ service.interceptors.request.use(
     // 判断白名单是否存在当前则携带参数在header
     if (whiteList.includes(config.url)) {
       if (localStorage.getItem("tenantId")) {
-        config.headers.TENANT_ID = localStorage.getItem("tenantId");
+        config.headers["TENANT-ID"] = localStorage.getItem("tenantId");
       }
     }
     // get请求映射params参数

acupuncture-前台/src/views/medicalFile/details.vue

@@ -1226,7 +1226,7 @@ export default {
           return;
         }
         this.humanBodyOpen = true;
-        this.selectReportUrl = `${this.qzUrl}acupuncture${res.data.fileName}`;
+        this.selectReportUrl = `${this.qzUrl}${res.data.fileName}`;
       });
     },
     // 查询人体成分

acupuncture-前台/src/views/medicalFile/index.vue

@@ -734,8 +734,7 @@ export default {
         deptId: localStorage.getItem("hospitalId"),
       },
       uploadFileUrl1:
-        process.env.VUE_APP_API_QZURL +
-        "/acupuncture/treatment/importTreatment", // 上传的图片服务器地址
+        process.env.VUE_APP_API_QZURL + "/treatment/importTreatment", // 上传的图片服务器地址
       fileList: [],
       followupList: [],
       queueOpen: false,
@@ -1097,7 +1096,7 @@ export default {
     // 评估报告单
     handleReport(row) {
       exportTreatmentPg({ treatmentId: row.id }).then((res) => {
-        window.open(`${process.env.VUE_APP_API_QZURL}acupuncture${res.data}`);
+        window.open(`${process.env.VUE_APP_API_QZURL}${res.data}`);
       });
     },
     /** 提交审核 */
@@ -1284,7 +1283,7 @@ export default {
     /** 下载按钮操作 */
     handleDownload() {
       window.open(
-        `${process.env.VUE_APP_API_QZURL}/acupuncture/profile/TreamentTemplate.xlsx`
+        `${process.env.VUE_APP_API_QZURL}/profile/TreamentTemplate.xlsx`
       );
       // this.download1(
       // 	"/patient/export", {},

acupuncture-前台/src/views/patientFile/index.vue

@@ -463,7 +463,7 @@ export default {
         deptId: localStorage.getItem("hospitalId"),
       },
       uploadFileUrl1:
-        process.env.VUE_APP_API_QZURL + "/acupuncture/patient/import", // 上传的图片服务器地址
+        process.env.VUE_APP_API_QZURL + "/patient/import", // 上传的图片服务器地址
       fileList: [],
       // 受教育程度，年限
       educationYears: [
@@ -868,7 +868,7 @@ export default {
     /** 下载按钮操作 */
     handleDownload() {
       window.open(
-        `${process.env.VUE_APP_API_QZURL}/acupuncture/profile/PatientTemplate.xlsx`
+        `${process.env.VUE_APP_API_QZURL}/profile/PatientTemplate.xlsx`
       );
       // this.download1(
       // 	"/patient/export", {},

acupuncture-前台/src/views/screening/qrCode.vue

@@ -90,7 +90,7 @@
       >
         <template slot-scope="scope">
           <img
-            :src="qzUrl + '/acupuncture' + scope.row.url"
+            :src="qzUrl + scope.row.url"
             alt=""
             width="100"
             height="100"
@@ -241,7 +241,7 @@ export default {
     Original(_url) {
       this.imgUrl = [];
       if (_url) {
-        this.imgUrl.push(this.qzUrl + "/acupuncture" + _url);
+        this.imgUrl.push(this.qzUrl + _url);
       }
       this.$refs.preview.clickHandler();
     },
@@ -349,7 +349,7 @@ export default {
         url: row.url,
       };
       exportQr(data).then((res) => {
-        window.open(`${process.env.VUE_APP_API_QZURL}/acupuncture/${res.data}`);
+        window.open(`${process.env.VUE_APP_API_QZURL}${res.data}`);
       });
     },
   },

acupuncture-前台/vue.config.js

@@ -19,7 +19,9 @@ module.exports = {
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
   publicPath:
-    process.env.NODE_ENV === "production" ? "/acupunctureClient/" : "/",
+    process.env.NODE_ENV === "production"
+      ? process.env.VUE_APP_PUBLIC_PATH
+      : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: "dist",
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
@@ -37,7 +39,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `https://test.tall.wiki/acupuncture`,
+        target: `https://test.tall.wiki/acupuncture/api/`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",