diff --git a/public/sysConfig.html b/public/sysConfig.html
new file mode 100644
index 0000000..302aef0
--- /dev/null
+++ b/public/sysConfig.html
@@ -0,0 +1,3 @@
+{
+ "apiurl": "http://140.143.162.39:9529"
+}
\ No newline at end of file
diff --git a/public/sysConfig.js b/public/sysConfig.js
deleted file mode 100644
index f313f78..0000000
--- a/public/sysConfig.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default{
- apiurl:'http://140.143.162.39:9529',
-}
\ No newline at end of file
diff --git a/src/api/api.js b/src/api/api.js
index 0d09fd3..562af95 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -1,7 +1,8 @@
import request from "@/api/request";
-import sysConfig from "../../public/sysConfig"
import { Loading } from 'element-ui';
+const sysConfig = JSON.parse(window.sessionStorage.getItem('sysConfig'))
+
export async function getapi(url, params = {}, config) {
return new Promise((resolve, reject) => {
let loading = Loading.service({
diff --git a/src/api/request.js b/src/api/request.js
index 46f0375..729807d 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -3,12 +3,13 @@ import router from "@/router";
import axios from "axios";
// import Promise from 'promise'
import { yztoken } from "@/utlis/istoken";
-import mm from "@/utlis/mm";
import { Message } from "element-ui";
+const sysConfig = JSON.parse(window.sessionStorage.getItem('sysConfig'))
+
const instance = axios.create({
- baseURL: mm.apiurl,
- timeout: 500000,
+ baseURL: sysConfig.apiurl,
+ //timeout: 500000,
withCredentials: true, // 允许跨域
});
diff --git a/src/components/doctorCheck/CheckPicture.vue b/src/components/doctorCheck/CheckPicture.vue
index e322f80..ac57efd 100644
--- a/src/components/doctorCheck/CheckPicture.vue
+++ b/src/components/doctorCheck/CheckPicture.vue
@@ -60,7 +60,7 @@
:src="
item.pictureFilename.indexOf('http') > -1
? item.pictureFilename
- : apiUrl + item.pictureFilename
+ : sysConfig.apiUrl + item.pictureFilename
"
:preview-src-list="previewSrcList(checkPictures,item)"
>
@@ -110,7 +110,7 @@ import { mapState } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api";
import { getPagePriv,checkPagePriv, deepCopy, arrayExistObj } from "../../utlis/proFunc";
import CheckPictureUpload from "./CheckPictureUpload.vue";
-import server from "../../utlis/mm";
+
export default {
components: {
@@ -118,6 +118,7 @@ export default {
},
data() {
return {
+ sysConfig:{}, //
pagePriv:{
routeUrlorPageName:'doctorCheck', //当前页面归属路由或归属页面权限名称
privs:[] // 页面权限
@@ -140,8 +141,6 @@ export default {
"https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg",
},
],
-
- apiUrl: server.apiurl,
//图片上传
dialogCheckPictureUpload: false,
uploadSeq: 0, //第几次点图片上传,每点一次清空前次所选图片
@@ -155,7 +154,9 @@ export default {
},
//挂载完成
- mounted() {},
+ mounted() {
+ this.sysConfig = JSON.parse(window.sessionStorage.getItem('sysConfig'))
+ },
computed: {
...mapState([
@@ -211,7 +212,7 @@ export default {
let srcList = []
let image = curImag.pictureFilename.indexOf('http') > -1
? curImag.pictureFilename
- : this.apiUrl + curImag.pictureFilename;
+ : this.sysConfig.apiUrl + curImag.pictureFilename;
srcList.push(image)
let lfind = arrayExistObj(oriList,'id',curImag.id)
if(lfind > -1){
@@ -219,14 +220,14 @@ export default {
let e = oriList[i];
image = e.pictureFilename.indexOf('http') > -1
? e.pictureFilename
- : this.apiUrl + e.pictureFilename;
+ : this.sysConfig.apiUrl + e.pictureFilename;
srcList.push(image)
}
for (let index = 0; index < lfind; index++) {
let e = oriList[index];
image = e.pictureFilename.indexOf('http') > -1
? e.pictureFilename
- : this.apiUrl + e.pictureFilename;
+ : this.sysConfig.apiUrl + e.pictureFilename;
srcList.push(image)
}
}
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index b82fdd0..d605203 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -494,7 +494,7 @@
import moment from "moment";
import { mapState, mapActions } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import mm from "../../utlis/mm";
+
import {
getPagePriv, checkPagePriv, objCopy, setNull, dddw, checkIDCode, parseID,
birthdayToAge, ageToBirthday, deepCopy, arrayFilter, arrayReduce, parsIcCardtoLocal,
@@ -521,12 +521,12 @@ export default {
props: ['isDoctor', 'patientRegisterId', 'editTimes', 'refreshRegister', 'refFuncSetData'],
data() {
return {
+
pagePriv: {
routeUrlorPageName: 'PatientRegisterEdit', //当前页面归属路由或归属页面权限名称
privs: [] // 页面权限
},
- apiurl: mm.apiurl,
brushTimes: 0,
peisid: null,
diff --git a/src/components/patientRegister/PatientRegisterEditBak240401.vue b/src/components/patientRegister/PatientRegisterEditBak240401.vue
index 40e9709..8c5d9de 100644
--- a/src/components/patientRegister/PatientRegisterEditBak240401.vue
+++ b/src/components/patientRegister/PatientRegisterEditBak240401.vue
@@ -483,7 +483,6 @@
import moment from "moment";
import { mapState, mapActions } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import mm from "../../utlis/mm";
import {
getPagePriv, checkPagePriv, objCopy, setNull, dddw, checkIDCode, parseID,
birthdayToAge, ageToBirthday, deepCopy, arrayFilter, arrayReduce, parsIcCardtoLocal,
@@ -515,7 +514,7 @@ export default {
privs: [] // 页面权限
},
- apiurl: mm.apiurl,
+
brushTimes: 0,
peisid: null,
diff --git a/src/components/patientRegister/PatientRegisterEditQuery.vue b/src/components/patientRegister/PatientRegisterEditQuery.vue
index 4b6f782..717ec72 100644
--- a/src/components/patientRegister/PatientRegisterEditQuery.vue
+++ b/src/components/patientRegister/PatientRegisterEditQuery.vue
@@ -37,7 +37,6 @@
import { mapState, mapActions } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import mm from "../../utlis/mm";
import { getPagePriv,checkPagePriv, objCopy, setNull, dddw,checkIDCode, parseID, birthdayToAge,ageToBirthday, deepCopy, arrayFilter, arrayReduce,parsIcCardtoLocal, photoParse, savePeoplePhoto, arrayExistObj } from "../../utlis/proFunc";
import PatientRegisterForChoose from "./PatientRegisterForChoose.vue";
export default {
diff --git a/src/main.js b/src/main.js
index 5ecf9d1..a7a8839 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,9 +17,6 @@ Vue.use(Meta);
Vue.use(ElementUI);
-console.log('vue', Vue.prototype)
-Vue.prototype.$axios = axios;
-
//全局注册外壳的 peisAPI 对象
try {
Vue.prototype.$peisAPI = window.peisAPI;
diff --git a/src/utlis/istoken.js b/src/utlis/istoken.js
index 1c13cee..1e8305c 100644
--- a/src/utlis/istoken.js
+++ b/src/utlis/istoken.js
@@ -1,8 +1,9 @@
import moment from "moment";
import axios from "axios";
-import mm from "@/utlis/mm";
import router from "../router";
+const sysConfig = JSON.parse(window.sessionStorage.getItem('sysConfig'))
+
export const yztoken = async () => {
//console.log("验证");
//let dqtime = parseInt(new Date().getTime() / 1000); // 当前时间的时间戳
@@ -21,7 +22,7 @@ export const yztoken = async () => {
//少于300秒 重新拉取
await axios
.post(
- mm.apiurl + "/connect/token",
+ sysConfig.apiurl + "/connect/token",
{
client_id: "Peis_App",
grant_type: "refresh_token",
@@ -44,7 +45,7 @@ export const yztoken = async () => {
})
.catch((err) =>{
- console.log(mm.apiurl + "/connect/token",{
+ console.log(sysConfig.apiurl + "/connect/token",{
client_id: "Peis_App",
grant_type: "refresh_token",
refresh_token: window.sessionStorage.getItem("refresh_token"),
diff --git a/src/utlis/mm.js b/src/utlis/mm.js
deleted file mode 100644
index 86f7b25..0000000
--- a/src/utlis/mm.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// export default{
-// apiurl:'http://140.143.162.39:9529',
-// }
-
-// modify by pengjun
-module.exports = {
- apiurl:'http://140.143.162.39:9529', // http://140.143.162.39:9529 192.168.1.168
-}
\ No newline at end of file
diff --git a/src/utlis/proFunc.js b/src/utlis/proFunc.js
index 10c7f80..5a5494a 100644
--- a/src/utlis/proFunc.js
+++ b/src/utlis/proFunc.js
@@ -1,7 +1,5 @@
-// import sysConfig from "./mm";
-// import { getapi, postapi, putapi, deletapi } from "@/api/api";
-const sysConfig = require('./mm');
const { getapi, postapi, putapi, deletapi } = require('../api/api');
+const sysConfig = JSON.parse(window.sessionStorage.getItem('sysConfig'))
//多级联动选择数据处理 add by pengjun
function tcdate(date) {
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index 0e24c93..9190ba3 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -61,7 +61,6 @@
import { lognis } from "@/request/ruquset";
import { yzstr } from "@/utlis/validate.js";
import { writetoken } from "@/utlis/istoken";
-import mm from "@/utlis/mm";
import axios from "axios";
import { getapi, postapi } from "@/api/api";
@@ -69,6 +68,7 @@ import { getapi, postapi } from "@/api/api";
export default {
data() {
return {
+ sysConfig:{}, // 配置信息
form: {
Username: "",
Password: "",
@@ -85,7 +85,8 @@ export default {
},
};
},
- mounted() {
+ async mounted() {
+ await this.getSysConfig()
// 壳程序懒加载通讯组件
if (this.$peisAPI) {
this.$peisAPI.lazyLoad(); // 加载报表 dll
@@ -93,6 +94,17 @@ export default {
}
},
methods: {
+
+ async getSysConfig(){
+ try {
+ let res = await axios.get('/sysConfig.html')
+ this.sysConfig = res.data
+ window.sessionStorage.setItem('sysConfig',JSON.stringify(res.data))
+ } catch (error) {
+ this.$message.error({showClose:true,message:`获取配置参数错误 ${error}`})
+ }
+ },
+
//打开客户端调试工具
toggleDevTools() {
if (!this.$peisAPI) {
@@ -133,7 +145,7 @@ export default {
this.$refs.form.validate((valid) => {
if (valid) {
- axios.post(`${mm.apiurl}/api/identity/users/login`, {
+ axios.post(`${this.sysConfig.apiurl}/api/identity/users/login`, {
userName: this.form.Username,
passWord: this.form.Password,
}).then(ret => {