From 0367b59f935b0c0ee330efd79efbab353accb1d2 Mon Sep 17 00:00:00 2001 From: pengjun <158915633@qq.com> Date: Fri, 19 Apr 2024 21:44:01 +0800 Subject: [PATCH] config --- src/main.js | 2 +- src/store/index.js | 130 +++++++++++++++++++------------------- src/utlis/istoken.js | 4 +- src/views/Home.vue | 18 ++++-- src/views/login/Login.vue | 35 +--------- 5 files changed, 81 insertions(+), 108 deletions(-) diff --git a/src/main.js b/src/main.js index a7a8839..c647591 100644 --- a/src/main.js +++ b/src/main.js @@ -15,7 +15,7 @@ import "./assets/css/global_font.css"; Vue.use(Contextmenu); Vue.use(Meta); Vue.use(ElementUI); - +Vue.prototype.$axios = axios //全局注册外壳的 peisAPI 对象 try { diff --git a/src/store/index.js b/src/store/index.js index 5b5ee3f..7f62684 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1,7 +1,7 @@ import Vue from "vue"; import Vuex from "vuex"; -import { getapi, postapi, putapi, deletapi } from "@/api/api"; -import { arrayReduce } from "@/utlis/proFunc"; +// import { getapi, postapi, putapi, deletapi } from "@/api/api"; +// import { arrayReduce } from "@/utlis/proFunc"; Vue.use(Vuex); @@ -439,72 +439,72 @@ export default new Vuex.Store({ }, actions: { - //获取体检人员所选组合项目 - getPatientRegisterAbs(context, id) { - //console.log(`vuex getPatientRegisterAbs /api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`, context.state.dict.asbItemAll) - if (id) { - getapi(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`).then( - (res) => { - console.log(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`, res) - if (res.code == 1) { - let patientRegisterAbs = [] - res.data.forEach(e => { - e.standTotal = e.amount * e.standardPrice - e.total = e.amount * e.chargePrice - patientRegisterAbs.push(e) - }); - context.commit("setData", { - key: "patientRegister.patientRegisterAbs", - value: patientRegisterAbs, - }); + // //获取体检人员所选组合项目 + // getPatientRegisterAbs(context, id) { + // //console.log(`vuex getPatientRegisterAbs /api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`, context.state.dict.asbItemAll) + // if (id) { + // getapi(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`).then( + // (res) => { + // console.log(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`, res) + // if (res.code == 1) { + // let patientRegisterAbs = [] + // res.data.forEach(e => { + // e.standTotal = e.amount * e.standardPrice + // e.total = e.amount * e.chargePrice + // patientRegisterAbs.push(e) + // }); + // context.commit("setData", { + // key: "patientRegister.patientRegisterAbs", + // value: patientRegisterAbs, + // }); - context.commit("setData", { - key: "dict.asbItem", - value: arrayReduce( - [...context.state.dict.asbItem], [...context.state.patientRegister.patientRegisterAbs], - "id=asbitemId" - ), - }); - context.commit("setData", { - key: "dict.asbItemQuick", - value: arrayReduce([...context.state.dict.asbItemAll], [...context.state.patientRegister.patientRegisterAbs], "id=asbitemId"), - }); - //console.log(`getPatientRegisterAbs ${id}`,context.state.dict.asbItemQuick) - } - } - ); - } else { - context.commit("setData", { - key: "patientRegister.patientRegisterAbs", - value: [], - }); + // context.commit("setData", { + // key: "dict.asbItem", + // value: arrayReduce( + // [...context.state.dict.asbItem], [...context.state.patientRegister.patientRegisterAbs], + // "id=asbitemId" + // ), + // }); + // context.commit("setData", { + // key: "dict.asbItemQuick", + // value: arrayReduce([...context.state.dict.asbItemAll], [...context.state.patientRegister.patientRegisterAbs], "id=asbitemId"), + // }); + // //console.log(`getPatientRegisterAbs ${id}`,context.state.dict.asbItemQuick) + // } + // } + // ); + // } else { + // context.commit("setData", { + // key: "patientRegister.patientRegisterAbs", + // value: [], + // }); - context.commit("setData", { - key: "dict.asbItem", - value: [...context.state.dict.asbItemAll], - }); - context.commit("setData", { - key: "dict.asbItemQuick", - value: [...context.state.dict.asbItemAll], - }); - } - }, + // context.commit("setData", { + // key: "dict.asbItem", + // value: [...context.state.dict.asbItemAll], + // }); + // context.commit("setData", { + // key: "dict.asbItemQuick", + // value: [...context.state.dict.asbItemAll], + // }); + // } + // }, - //获取单位分组 /api/app/customer-org-group/in-customer-org-id/3a0c0444-d7a0-871f-4074-19faf1655caf - getCustomerOrgGroup(context, customerOrgld) { - console.log(`vuex /api/app/customer-org-group/in-customer-org-id/${customerOrgld}`); - getapi(`/api/app/customer-org-group/in-customer-org-id/${customerOrgld}`) - .then((res) => { - console.log("vuex getCustomerOrgGroup", res.data); - if (res.code == 1) { - //this.patientRegister.customerOrgGroup = res.data - context.commit("setData", { - key: "patientRegister.customerOrgGroup", - value: res.data, - }); - } - }); - }, + // //获取单位分组 /api/app/customer-org-group/in-customer-org-id/3a0c0444-d7a0-871f-4074-19faf1655caf + // getCustomerOrgGroup(context, customerOrgld) { + // console.log(`vuex /api/app/customer-org-group/in-customer-org-id/${customerOrgld}`); + // getapi(`/api/app/customer-org-group/in-customer-org-id/${customerOrgld}`) + // .then((res) => { + // console.log("vuex getCustomerOrgGroup", res.data); + // if (res.code == 1) { + // //this.patientRegister.customerOrgGroup = res.data + // context.commit("setData", { + // key: "patientRegister.customerOrgGroup", + // value: res.data, + // }); + // } + // }); + // }, }, modules: {}, }); \ No newline at end of file diff --git a/src/utlis/istoken.js b/src/utlis/istoken.js index 1e8305c..491f40e 100644 --- a/src/utlis/istoken.js +++ b/src/utlis/istoken.js @@ -1,13 +1,11 @@ -import moment from "moment"; import axios from "axios"; 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); // 当前时间的时间戳 //let tokentime = parseInt(window.sessionStorage.getItem("expires_in")); //登录缓存后的时间戳 + let sysConfig = JSON.parse(window.sessionStorage.getItem('sysConfig')) let dqtime = new Date().getTime(); // 当前时间的时间戳 let expires_in = parseInt(window.sessionStorage.getItem("expires_in")) diff --git a/src/views/Home.vue b/src/views/Home.vue index 5472634..b2a27f1 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -327,13 +327,23 @@ export default { this.user = window.sessionStorage.getItem("user"); //获取当前用户的菜单权限 + this.getUserAllPriv() this.getUserMenuPriv() - }, methods: { + //获取用户所有权限 + getUserAllPriv() { + getapi('/api/app/menuinfo/getmymenuinfolist').then(res => { + if (res.code > -1) { + window.sessionStorage.setItem("userPriv", JSON.stringify(res.data)); + } + }) + }, + + //获取用户菜单树 getUserMenuPriv() { getapi('/api/app/menuinfo/getmymenuinfotreelist').then(res => { - if (res.code != -1) { + if (res.code > -1) { this.menuPriv = res.data this.menuPriv = this.menuPriv.filter(e => { return e.menuType == '0' || e.menuType == '1' @@ -390,9 +400,7 @@ export default { window.sessionStorage.clear(); this.$router.push({ path: "/login" }); }, - aa(aa) { - console.log(aa); - }, + //打开客户端调试工具 toggleDevTools() { if (!this.$peisAPI) { diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue index 9190ba3..f211084 100644 --- a/src/views/login/Login.vue +++ b/src/views/login/Login.vue @@ -58,13 +58,10 @@