Browse Source

config

master
pengjun 2 years ago
parent
commit
74740ef917
  1. 3
      public/sysConfig.html
  2. 3
      public/sysConfig.js
  3. 3
      src/api/api.js
  4. 7
      src/api/request.js
  5. 17
      src/components/doctorCheck/CheckPicture.vue
  6. 4
      src/components/patientRegister/PatientRegisterEdit.vue
  7. 3
      src/components/patientRegister/PatientRegisterEditBak240401.vue
  8. 1
      src/components/patientRegister/PatientRegisterEditQuery.vue
  9. 3
      src/main.js
  10. 7
      src/utlis/istoken.js
  11. 8
      src/utlis/mm.js
  12. 4
      src/utlis/proFunc.js
  13. 18
      src/views/login/Login.vue

3
public/sysConfig.html

@ -0,0 +1,3 @@
{
"apiurl": "http://140.143.162.39:9529"
}

3
public/sysConfig.js

@ -1,3 +0,0 @@
export default{
apiurl:'http://140.143.162.39:9529',
}

3
src/api/api.js

@ -1,7 +1,8 @@
import request from "@/api/request"; import request from "@/api/request";
import sysConfig from "../../public/sysConfig"
import { Loading } from 'element-ui'; import { Loading } from 'element-ui';
const sysConfig = JSON.parse(window.sessionStorage.getItem('sysConfig'))
export async function getapi(url, params = {}, config) { export async function getapi(url, params = {}, config) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let loading = Loading.service({ let loading = Loading.service({

7
src/api/request.js

@ -3,12 +3,13 @@ import router from "@/router";
import axios from "axios"; import axios from "axios";
// import Promise from 'promise' // import Promise from 'promise'
import { yztoken } from "@/utlis/istoken"; import { yztoken } from "@/utlis/istoken";
import mm from "@/utlis/mm";
import { Message } from "element-ui"; import { Message } from "element-ui";
const sysConfig = JSON.parse(window.sessionStorage.getItem('sysConfig'))
const instance = axios.create({ const instance = axios.create({
baseURL: mm.apiurl,
timeout: 500000,
baseURL: sysConfig.apiurl,
//timeout: 500000,
withCredentials: true, // 允许跨域 withCredentials: true, // 允许跨域
}); });

17
src/components/doctorCheck/CheckPicture.vue

@ -60,7 +60,7 @@
:src=" :src="
item.pictureFilename.indexOf('http') > -1 item.pictureFilename.indexOf('http') > -1
? item.pictureFilename ? item.pictureFilename
: apiUrl + item.pictureFilename
: sysConfig.apiUrl + item.pictureFilename
" "
:preview-src-list="previewSrcList(checkPictures,item)" :preview-src-list="previewSrcList(checkPictures,item)"
> >
@ -110,7 +110,7 @@ import { mapState } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api"; import { getapi, postapi, putapi, deletapi } from "@/api/api";
import { getPagePriv,checkPagePriv, deepCopy, arrayExistObj } from "../../utlis/proFunc"; import { getPagePriv,checkPagePriv, deepCopy, arrayExistObj } from "../../utlis/proFunc";
import CheckPictureUpload from "./CheckPictureUpload.vue"; import CheckPictureUpload from "./CheckPictureUpload.vue";
import server from "../../utlis/mm";
export default { export default {
components: { components: {
@ -118,6 +118,7 @@ export default {
}, },
data() { data() {
return { return {
sysConfig:{}, //
pagePriv:{ pagePriv:{
routeUrlorPageName:'doctorCheck', // routeUrlorPageName:'doctorCheck', //
privs:[] // privs:[] //
@ -140,8 +141,6 @@ export default {
"https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg", "https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg",
}, },
], ],
apiUrl: server.apiurl,
// //
dialogCheckPictureUpload: false, dialogCheckPictureUpload: false,
uploadSeq: 0, // uploadSeq: 0, //
@ -155,7 +154,9 @@ export default {
}, },
// //
mounted() {},
mounted() {
this.sysConfig = JSON.parse(window.sessionStorage.getItem('sysConfig'))
},
computed: { computed: {
...mapState([ ...mapState([
@ -211,7 +212,7 @@ export default {
let srcList = [] let srcList = []
let image = curImag.pictureFilename.indexOf('http') > -1 let image = curImag.pictureFilename.indexOf('http') > -1
? curImag.pictureFilename ? curImag.pictureFilename
: this.apiUrl + curImag.pictureFilename;
: this.sysConfig.apiUrl + curImag.pictureFilename;
srcList.push(image) srcList.push(image)
let lfind = arrayExistObj(oriList,'id',curImag.id) let lfind = arrayExistObj(oriList,'id',curImag.id)
if(lfind > -1){ if(lfind > -1){
@ -219,14 +220,14 @@ export default {
let e = oriList[i]; let e = oriList[i];
image = e.pictureFilename.indexOf('http') > -1 image = e.pictureFilename.indexOf('http') > -1
? e.pictureFilename ? e.pictureFilename
: this.apiUrl + e.pictureFilename;
: this.sysConfig.apiUrl + e.pictureFilename;
srcList.push(image) srcList.push(image)
} }
for (let index = 0; index < lfind; index++) { for (let index = 0; index < lfind; index++) {
let e = oriList[index]; let e = oriList[index];
image = e.pictureFilename.indexOf('http') > -1 image = e.pictureFilename.indexOf('http') > -1
? e.pictureFilename ? e.pictureFilename
: this.apiUrl + e.pictureFilename;
: this.sysConfig.apiUrl + e.pictureFilename;
srcList.push(image) srcList.push(image)
} }
} }

4
src/components/patientRegister/PatientRegisterEdit.vue

@ -494,7 +494,7 @@
import moment from "moment"; import moment from "moment";
import { mapState, mapActions } from "vuex"; import { mapState, mapActions } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api"; import { getapi, postapi, putapi, deletapi } from "@/api/api";
import mm from "../../utlis/mm";
import { import {
getPagePriv, checkPagePriv, objCopy, setNull, dddw, checkIDCode, parseID, getPagePriv, checkPagePriv, objCopy, setNull, dddw, checkIDCode, parseID,
birthdayToAge, ageToBirthday, deepCopy, arrayFilter, arrayReduce, parsIcCardtoLocal, birthdayToAge, ageToBirthday, deepCopy, arrayFilter, arrayReduce, parsIcCardtoLocal,
@ -521,12 +521,12 @@ export default {
props: ['isDoctor', 'patientRegisterId', 'editTimes', 'refreshRegister', 'refFuncSetData'], props: ['isDoctor', 'patientRegisterId', 'editTimes', 'refreshRegister', 'refFuncSetData'],
data() { data() {
return { return {
pagePriv: { pagePriv: {
routeUrlorPageName: 'PatientRegisterEdit', // routeUrlorPageName: 'PatientRegisterEdit', //
privs: [] // privs: [] //
}, },
apiurl: mm.apiurl,
brushTimes: 0, brushTimes: 0,
peisid: null, peisid: null,

3
src/components/patientRegister/PatientRegisterEditBak240401.vue

@ -483,7 +483,6 @@
import moment from "moment"; import moment from "moment";
import { mapState, mapActions } from "vuex"; import { mapState, mapActions } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api"; import { getapi, postapi, putapi, deletapi } from "@/api/api";
import mm from "../../utlis/mm";
import { import {
getPagePriv, checkPagePriv, objCopy, setNull, dddw, checkIDCode, parseID, getPagePriv, checkPagePriv, objCopy, setNull, dddw, checkIDCode, parseID,
birthdayToAge, ageToBirthday, deepCopy, arrayFilter, arrayReduce, parsIcCardtoLocal, birthdayToAge, ageToBirthday, deepCopy, arrayFilter, arrayReduce, parsIcCardtoLocal,
@ -515,7 +514,7 @@ export default {
privs: [] // privs: [] //
}, },
apiurl: mm.apiurl,
brushTimes: 0, brushTimes: 0,
peisid: null, peisid: null,

1
src/components/patientRegister/PatientRegisterEditQuery.vue

@ -37,7 +37,6 @@
import { mapState, mapActions } from "vuex"; import { mapState, mapActions } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api"; 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 { getPagePriv,checkPagePriv, objCopy, setNull, dddw,checkIDCode, parseID, birthdayToAge,ageToBirthday, deepCopy, arrayFilter, arrayReduce,parsIcCardtoLocal, photoParse, savePeoplePhoto, arrayExistObj } from "../../utlis/proFunc";
import PatientRegisterForChoose from "./PatientRegisterForChoose.vue"; import PatientRegisterForChoose from "./PatientRegisterForChoose.vue";
export default { export default {

3
src/main.js

@ -17,9 +17,6 @@ Vue.use(Meta);
Vue.use(ElementUI); Vue.use(ElementUI);
console.log('vue', Vue.prototype)
Vue.prototype.$axios = axios;
//全局注册外壳的 peisAPI 对象 //全局注册外壳的 peisAPI 对象
try { try {
Vue.prototype.$peisAPI = window.peisAPI; Vue.prototype.$peisAPI = window.peisAPI;

7
src/utlis/istoken.js

@ -1,8 +1,9 @@
import moment from "moment"; import moment from "moment";
import axios from "axios"; import axios from "axios";
import mm from "@/utlis/mm";
import router from "../router"; import router from "../router";
const sysConfig = JSON.parse(window.sessionStorage.getItem('sysConfig'))
export const yztoken = async () => { export const yztoken = async () => {
//console.log("验证"); //console.log("验证");
//let dqtime = parseInt(new Date().getTime() / 1000); // 当前时间的时间戳 //let dqtime = parseInt(new Date().getTime() / 1000); // 当前时间的时间戳
@ -21,7 +22,7 @@ export const yztoken = async () => {
//少于300秒 重新拉取 //少于300秒 重新拉取
await axios await axios
.post( .post(
mm.apiurl + "/connect/token",
sysConfig.apiurl + "/connect/token",
{ {
client_id: "Peis_App", client_id: "Peis_App",
grant_type: "refresh_token", grant_type: "refresh_token",
@ -44,7 +45,7 @@ export const yztoken = async () => {
}) })
.catch((err) =>{ .catch((err) =>{
console.log(mm.apiurl + "/connect/token",{
console.log(sysConfig.apiurl + "/connect/token",{
client_id: "Peis_App", client_id: "Peis_App",
grant_type: "refresh_token", grant_type: "refresh_token",
refresh_token: window.sessionStorage.getItem("refresh_token"), refresh_token: window.sessionStorage.getItem("refresh_token"),

8
src/utlis/mm.js

@ -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
}

4
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 { getapi, postapi, putapi, deletapi } = require('../api/api');
const sysConfig = JSON.parse(window.sessionStorage.getItem('sysConfig'))
//多级联动选择数据处理 add by pengjun //多级联动选择数据处理 add by pengjun
function tcdate(date) { function tcdate(date) {

18
src/views/login/Login.vue

@ -61,7 +61,6 @@
import { lognis } from "@/request/ruquset"; import { lognis } from "@/request/ruquset";
import { yzstr } from "@/utlis/validate.js"; import { yzstr } from "@/utlis/validate.js";
import { writetoken } from "@/utlis/istoken"; import { writetoken } from "@/utlis/istoken";
import mm from "@/utlis/mm";
import axios from "axios"; import axios from "axios";
import { getapi, postapi } from "@/api/api"; import { getapi, postapi } from "@/api/api";
@ -69,6 +68,7 @@ import { getapi, postapi } from "@/api/api";
export default { export default {
data() { data() {
return { return {
sysConfig:{}, //
form: { form: {
Username: "", Username: "",
Password: "", Password: "",
@ -85,7 +85,8 @@ export default {
}, },
}; };
}, },
mounted() {
async mounted() {
await this.getSysConfig()
// //
if (this.$peisAPI) { if (this.$peisAPI) {
this.$peisAPI.lazyLoad(); // dll this.$peisAPI.lazyLoad(); // dll
@ -93,6 +94,17 @@ export default {
} }
}, },
methods: { 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() { toggleDevTools() {
if (!this.$peisAPI) { if (!this.$peisAPI) {
@ -133,7 +145,7 @@ export default {
this.$refs.form.validate((valid) => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
axios.post(`${mm.apiurl}/api/identity/users/login`, {
axios.post(`${this.sysConfig.apiurl}/api/identity/users/login`, {
userName: this.form.Username, userName: this.form.Username,
passWord: this.form.Password, passWord: this.form.Password,
}).then(ret => { }).then(ret => {

Loading…
Cancel
Save