diff --git a/src/api/feature/loginServer.ts b/src/api/feature/loginServer.ts index 54fbf7cc922829e0dd66c4d1c0856d1764e07891..f270da553286b3bf3d12b033c306fe0cb73ade06 100644 --- a/src/api/feature/loginServer.ts +++ b/src/api/feature/loginServer.ts @@ -16,7 +16,7 @@ export class LoginServer { // 病患类型下拉框 public loginOut() { const opts = { - token: localStorage.getItem('token'), + // token: localStorage.getItem('token'), }; const url = 'sys/logout'; return this.rSerivce.serverObj.post(url, opts); diff --git a/src/components/feature/DataCompare/DataCompare.vue b/src/components/feature/DataCompare/DataCompare.vue index 09b8affe813f289326bcbcd27d8a28c266d804b8..fe21b8dda26a88802b8b50e647cd096ba2561212 100644 --- a/src/components/feature/DataCompare/DataCompare.vue +++ b/src/components/feature/DataCompare/DataCompare.vue @@ -66,7 +66,7 @@ 更新核酸检测次数计算累计核酸检测次数 @@ -234,17 +234,17 @@ export default class DiseasDeList extends Vue { } }); } - // 更新核酸检测次数 updateNucleicDetection + // 计算累计核酸检测次数 updateNucleicDetection private updateNucleicDetection() { diseaseInfoServer.updateNucleicDetection().then((res: any) => { try { if (res.status === 200) { - this.nucleicResult = '更新核酸检测次数成功'; + this.nucleicResult = '计算累计核酸检测次数成功'; } else { - this.nucleicResult = '更新核酸检测次数失败'; + this.nucleicResult = '计算累计核酸检测次数失败'; } } catch (error) { - this.nucleicResult = '更新核酸检测次数失败'; + this.nucleicResult = '计算累计核酸检测次数失败'; this.$message('系统异常'); } }); diff --git a/src/components/feature/DiseaseInfoFeverClinic/DiseaseList.vue b/src/components/feature/DiseaseInfoFeverClinic/DiseaseList.vue index 53c64250c73317915ddac4ee6c8cf633acf8ddf3..2f6af751747b92f93e828a057eb12b99db7c0ed9 100644 --- a/src/components/feature/DiseaseInfoFeverClinic/DiseaseList.vue +++ b/src/components/feature/DiseaseInfoFeverClinic/DiseaseList.vue @@ -4,37 +4,6 @@ 发热门诊患者列表
重置 - - - - -
@@ -257,8 +226,6 @@ import { diseaseInfoServer } from '@/api/installServer'; name: 'DiseaseList', }) export default class DiseasDeList extends Vue { - // 角色权限 - private sourceType: any = '2'; // 上传框显示控制 private uploadFormVisible: any = false; // 上传框参数 @@ -326,7 +293,6 @@ export default class DiseasDeList extends Vue { this.queryInfo = JSON.parse(feverSearch); sessionStorage.setItem('feverSearch', ''); } - this.sourceType = localStorage.getItem('sourcetype'); this.getList(); this.getSuffererStatus(); // this.getPatientTypeList(); diff --git a/src/components/feature/DiseaseInfoGL/DiseaseList.vue b/src/components/feature/DiseaseInfoGL/DiseaseList.vue index 8ff913550d1cef42d5490a2d719ad0e6a600fcdf..214e003c97d959b06db8ef262879694ac5183def 100644 --- a/src/components/feature/DiseaseInfoGL/DiseaseList.vue +++ b/src/components/feature/DiseaseInfoGL/DiseaseList.vue @@ -4,37 +4,6 @@ 隔离点人员列表
重置 - - - - -
@@ -273,8 +242,6 @@ import { diseaseInfoServer } from '@/api/installServer'; name: 'DiseaseList', }) export default class DiseasDeList extends Vue { - // 角色权限 - private sourceType: any = '2'; // 上传框显示控制 private uploadFormVisible: any = false; // 上传框参数 @@ -343,7 +310,6 @@ export default class DiseasDeList extends Vue { this.queryInfo = JSON.parse(GLsearch); sessionStorage.setItem('GLsearch', ''); } - this.sourceType = localStorage.getItem('sourcetype'); this.getList(); this.getPatientTypeList(); this.getIllnessStateList(); diff --git a/src/components/feature/DiseaseInfoHospitalDD/DiseaseList.vue b/src/components/feature/DiseaseInfoHospitalDD/DiseaseList.vue index 667c8080ba872792e227917d3793e8182bc989eb..6616a3583485171bf18e7316596b688ed31ed1f7 100644 --- a/src/components/feature/DiseaseInfoHospitalDD/DiseaseList.vue +++ b/src/components/feature/DiseaseInfoHospitalDD/DiseaseList.vue @@ -229,8 +229,6 @@ import { diseaseInfoServer } from '@/api/installServer'; name: 'DiseaseList', }) export default class DiseasDeList extends Vue { - // 角色权限 - private sourceType: any = '2'; // 上传框显示控制 private uploadFormVisible: any = false; // 上传框参数 @@ -301,7 +299,6 @@ export default class DiseasDeList extends Vue { this.queryInfo = JSON.parse(DDsearch); sessionStorage.setItem('DDsearch', ''); } - this.sourceType = localStorage.getItem('sourcetype'); this.getList(); this.getSuffererStatus(); this.getPatientTypeList(); diff --git a/src/components/feature/DiseaseInfoHospitalFC/DiseaseList.vue b/src/components/feature/DiseaseInfoHospitalFC/DiseaseList.vue index 18fd3ea535ebced090b507b19d6772cfad297a92..fa6b50ba082874ddd0abe4c31708a52c5c393689 100644 --- a/src/components/feature/DiseaseInfoHospitalFC/DiseaseList.vue +++ b/src/components/feature/DiseaseInfoHospitalFC/DiseaseList.vue @@ -4,37 +4,6 @@ 方舱医院患者列表
重置 - - - - -
@@ -265,8 +234,6 @@ import { diseaseInfoServer } from '@/api/installServer'; name: 'DiseaseList', }) export default class DiseasDeList extends Vue { - // 角色权限 - private sourceType: any = '2'; // 上传框显示控制 private uploadFormVisible: any = false; // 上传框参数 @@ -322,7 +289,6 @@ export default class DiseasDeList extends Vue { this.queryInfo = JSON.parse(FCsearch); sessionStorage.setItem('FCsearch', ''); } - this.sourceType = localStorage.getItem('sourcetype'); this.getList(); } diff --git a/src/components/feature/DiseaseInfoNucleic/DiseaseList.vue b/src/components/feature/DiseaseInfoNucleic/DiseaseList.vue index ffcbe34e0012fb1302113b52b4d55840020ee57d..983ab7cf695e7fecf6ff52e0b32492cb99d3ca17 100644 --- a/src/components/feature/DiseaseInfoNucleic/DiseaseList.vue +++ b/src/components/feature/DiseaseInfoNucleic/DiseaseList.vue @@ -4,37 +4,6 @@ 核酸检测人员列表
重置 - - - - -
@@ -323,8 +292,6 @@ import { diseaseInfoServer } from '@/api/installServer'; name: 'DiseaseList', }) export default class DiseasDeList extends Vue { - // 角色权限 - private sourceType: any = '2'; // 上传框显示控制 private uploadFormVisible: any = false; // 上传框参数 @@ -394,7 +361,6 @@ export default class DiseasDeList extends Vue { this.queryInfo = JSON.parse(nucleicSearch); sessionStorage.setItem('nucleicSearch', ''); } - this.sourceType = localStorage.getItem('sourcetype'); this.getList(); this.getIsolationTypeList(); this.getDetectionResultTypeList(); diff --git a/src/components/feature/DiseaseInfoYQ/DiseaseList.vue b/src/components/feature/DiseaseInfoYQ/DiseaseList.vue index 4f4d49d6e01cc47e2084f1ef1f579f2370c7eed3..a8beeee6a6ca728290006a6e1cbb679202fd699a 100644 --- a/src/components/feature/DiseaseInfoYQ/DiseaseList.vue +++ b/src/components/feature/DiseaseInfoYQ/DiseaseList.vue @@ -4,37 +4,6 @@ 疫情网患者列表
重置 - - - - -
@@ -222,8 +191,6 @@ export default class DiseasDeList extends Vue { private mindVisible: any = false; private mindList = []; private jm: any = null; - // 角色权限 - private sourceType: any = '2'; // 上传框显示控制 private uploadFormVisible: any = false; // 上传框参数 @@ -335,7 +302,6 @@ export default class DiseasDeList extends Vue { this.queryInfo = JSON.parse(YQsearch); sessionStorage.setItem('YQsearch', ''); } - this.sourceType = localStorage.getItem('sourcetype'); this.getList(); this.getSuffererStatus(); this.getPatientTypeList(); diff --git a/src/config/build.js b/src/config/build.js index d48bac4c42e4b7c3c67d7b5bd78add7ccecbebb6..ae7114aa60d9ca9beb15f597adaecdf081359fa2 100644 --- a/src/config/build.js +++ b/src/config/build.js @@ -1,8 +1,8 @@ // 部署环境配置项 const globalPath = { - jsonPath: '/yqt_web', - servePath: 'https://ncp.gsafety.com/cdcapi/', + jsonPath: '/', + servePath: 'http://172.16.31.19:4321/', webSocketServer: 'http://114.67.117.97:3001/', }; diff --git a/src/config/env.js b/src/config/env.js index 0ceb582c48074e7e367ba0d3b69fa76d171b418e..aa5004278f563ab4ee7edea013fb2292c8538bbc 100644 --- a/src/config/env.js +++ b/src/config/env.js @@ -1,7 +1,7 @@ // 开发环境配置项 module.exports = { jsonPath: '/', - servePath: 'https://ncp.gsafety.com/cdcapi', + servePath: 'http://172.16.31.19:4321/', // servePath: 'http://16957179rs.51mypc.cn', webSocketServer: 'ws://172.17.38.202:8080/ws', }; diff --git a/src/router/router.ts b/src/router/router.ts index 40e8e13b24d689138586115c82e56e6733997235..a5b41f5a5a638c056baa1ee9a2c1f73bdfd3dc64 100644 --- a/src/router/router.ts +++ b/src/router/router.ts @@ -52,7 +52,7 @@ const router = new Router({ routes: [ { path: '/', - redirect: '/Login', + redirect: '/LayoutHome/DiseaseInfoYQ', }, { path: '/Login', @@ -256,15 +256,15 @@ const router = new Router({ }, ], }); -router.beforeEach((to, from, next) => { - if ( - to.path === '/login' || - to.path === '/dataCompare' || - localStorage.getItem('token') - ) { - next(); - } else { - next('/login'); - } -}); +// router.beforeEach((to, from, next) => { +// if ( +// to.path === '/login' || +// to.path === '/dataCompare' || +// localStorage.getItem('token') +// ) { +// next(); +// } else { +// next('/login'); +// } +// }); export default router; diff --git a/src/util/downRequest.ts b/src/util/downRequest.ts index 2035c534877c49cd225327033139fbb2121a21c7..7e30fbfa35b9dbef9516a3b5e289e763c873f30c 100644 --- a/src/util/downRequest.ts +++ b/src/util/downRequest.ts @@ -12,7 +12,7 @@ export class DownloadRequestServer { ); this.downloadRequest = axios.create(obj); this.downloadRequest.interceptors.request.use((item: any) => { - item.headers.token = localStorage.getItem('token'); + // item.headers.token = localStorage.getItem('token'); return item; }); } diff --git a/src/util/request.ts b/src/util/request.ts index 01f82d5cff90c7948a85ded7aa9a98dc3773ce8e..bee43a69682dc2b97d2c0d68692feadfb86d0826 100644 --- a/src/util/request.ts +++ b/src/util/request.ts @@ -24,7 +24,7 @@ export class RequestServerClass { ); this.serverObj = axios.create(obj); this.serverObj.interceptors.request.use((item: any) => { - item.headers.token = localStorage.getItem('token'); + // item.headers.token = localStorage.getItem('token'); return item; }); this.serverObj.interceptors.response.use( diff --git a/src/views/LayoutHome.vue b/src/views/LayoutHome.vue index 768dea7ee5839038bed3f685f33a1400acec4e8a..d9bb9d55b2c60da7fb8acad3178d76c34eadae69 100644 --- a/src/views/LayoutHome.vue +++ b/src/views/LayoutHome.vue @@ -2,14 +2,14 @@
-
江夏疫情通
-
欢迎您, {{ userName }}
-
+
江夏疫情通
+ +
@@ -32,10 +32,9 @@ import MenuList from '@/views/MenuList.vue'; export default class LayoutHome extends Vue { private userName: string | null = localStorage.getItem('username'); private loginOut() { - loginServer.loginOut().then((res: any) => { - localStorage.setItem('token', ''); - }); - this.$router.push('/login'); + // let url = window.location.href.split('/')[2] + '/iams_web/#/nav'; + const url = `http://${window.location.hostname}:8000/iams_web/#/nav`; + window.location.replace(url); } } @@ -58,6 +57,7 @@ export default class LayoutHome extends Vue { color: #fff; .head-item { height: 100%; + cursor: pointer; } .logo { background: url('../../src/assets/img/icon-home.png') no-repeat; diff --git a/src/views/MenuList.vue b/src/views/MenuList.vue index f50ca345f40cc669c6943708a935f8c0c7a72bbc..52a669ec9cc7ac23db120dfddfb2f2f72244ad69 100644 --- a/src/views/MenuList.vue +++ b/src/views/MenuList.vue @@ -77,22 +77,16 @@ export default class MenuList extends Vue { ]; private isCollapse: any = false; public created() { - // 菜单权限处理 - const sourceType = localStorage.getItem('sourcetype'); - const list: any = []; - this.routeList.forEach((item: any) => { - if (item.authority.includes(sourceType)) { - list.push(item); - } - }); - - this.routeList = list; + // // 菜单权限处理 + // const sourceType = localStorage.getItem('sourcetype'); + // const list: any = []; + // this.routeList.forEach((item: any) => { + // if (item.authority.includes(sourceType)) { + // list.push(item); + // } + // }); - // if (sourceType === '1') { - // this.routeList.splice(1, 1); - // } else if (sourceType === '2') { - // this.routeList.splice(0, 1); - // } + // this.routeList = list; // 刷新界面菜单跳转位置处理 for (let i = 0; i < this.routeList.length; i++) { if (this.$route.path.indexOf(this.routeList[i].path) !== -1) {