From ef0d0924f57ac39738525d8a3449e6fe7e727185 Mon Sep 17 00:00:00 2001 From: wuqing_b Date: Wed, 15 Apr 2020 15:47:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/feature/DataCompare/DataCompare.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/feature/DataCompare/DataCompare.vue b/src/components/feature/DataCompare/DataCompare.vue index 09b8aff..fe21b8d 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('系统异常'); } }); -- Gitee From daff73b2525f2ac1033504a55faaa7c5494eb272 Mon Sep 17 00:00:00 2001 From: wuqing_b Date: Tue, 24 Nov 2020 14:28:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=96=AB=E6=83=85=E9=80=9A=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E5=8E=9F=E6=9C=89=E7=99=BB=E5=BD=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/feature/loginServer.ts | 2 +- .../DiseaseInfoFeverClinic/DiseaseList.vue | 34 ------------------- .../feature/DiseaseInfoGL/DiseaseList.vue | 34 ------------------- .../DiseaseInfoHospitalDD/DiseaseList.vue | 3 -- .../DiseaseInfoHospitalFC/DiseaseList.vue | 34 ------------------- .../DiseaseInfoNucleic/DiseaseList.vue | 34 ------------------- .../feature/DiseaseInfoYQ/DiseaseList.vue | 34 ------------------- src/config/build.js | 4 +-- src/config/env.js | 2 +- src/router/router.ts | 24 ++++++------- src/util/downRequest.ts | 2 +- src/util/request.ts | 2 +- src/views/LayoutHome.vue | 16 ++++----- src/views/MenuList.vue | 24 +++++-------- 14 files changed, 35 insertions(+), 214 deletions(-) diff --git a/src/api/feature/loginServer.ts b/src/api/feature/loginServer.ts index 54fbf7c..f270da5 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/DiseaseInfoFeverClinic/DiseaseList.vue b/src/components/feature/DiseaseInfoFeverClinic/DiseaseList.vue index 53c6425..2f6af75 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 8ff9135..214e003 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 667c808..6616a35 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 18fd3ea..fa6b50b 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 ffcbe34..983ab7c 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 4f4d49d..a8beeee 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 d48bac4..ae7114a 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 0ceb582..aa50042 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 40e8e13..a5b41f5 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 2035c53..7e30fbf 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 01f82d5..bee43a6 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 768dea7..d9bb9d5 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 f50ca34..52a669e 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) { -- Gitee