From dc65ffa6eb06ff4b9e45592ff9f10eb89a3398f9 Mon Sep 17 00:00:00 2001 From: aBin Date: Tue, 29 Nov 2022 20:54:55 +0800 Subject: [PATCH] =?UTF-8?q?v4.0.0=E6=96=B0=E7=89=88=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 8 +- .env.production | 6 +- src/apis/carbasics.js | 9 + src/apis/project.js | 13 +- src/apis/role.js | 5 +- src/apis/tall.js | 3 +- src/apis/task.js | 16 +- src/components/NewRole/NewRole.vue | 42 ++ src/components/PatientList/PatientList.vue | 197 +++++--- src/components/Service/Service.vue | 2 +- src/components/Test/Test.vue | 149 +++--- src/components/Volume/Volume.vue | 31 +- .../VolumeProject/VolumeProject.vue | 47 +- src/main.js | 2 + src/pages.json | 14 + src/pages/Apply/img/0.png | Bin 0 -> 26237 bytes src/pages/Apply/img/1.png | Bin 0 -> 27405 bytes src/pages/Apply/img/2.png | Bin 0 -> 24636 bytes src/pages/Apply/img/kefu.jpg | Bin 0 -> 233547 bytes src/pages/Apply/img/weixin.png | Bin 0 -> 512553 bytes src/pages/Apply/index.vue | 443 ++++++++++++++++++ src/pages/Statistics/components/Title.vue | 294 ++++++++++++ src/pages/Statistics/index.vue | 104 ++++ src/pages/index/index.vue | 300 ++++++++++-- src/pages/info/info.vue | 61 ++- src/pages/inner/inner.vue | 62 ++- src/pages/inner/mixin.js | 12 +- src/pages/patient/patient.vue | 79 +++- src/pages/patientLine/patientLine.vue | 98 +++- src/pages/task-page/task-page.vue | 23 +- src/static/news/car.png | Bin 0 -> 4623 bytes src/static/news/logo.png | Bin 0 -> 559 bytes src/static/news/news.png | Bin 0 -> 18890 bytes src/static/news/role.png | Bin 0 -> 813 bytes src/static/news/top-bg.png | Bin 0 -> 31361 bytes 35 files changed, 1735 insertions(+), 285 deletions(-) create mode 100644 src/components/NewRole/NewRole.vue create mode 100644 src/pages/Apply/img/0.png create mode 100644 src/pages/Apply/img/1.png create mode 100644 src/pages/Apply/img/2.png create mode 100644 src/pages/Apply/img/kefu.jpg create mode 100644 src/pages/Apply/img/weixin.png create mode 100644 src/pages/Apply/index.vue create mode 100644 src/pages/Statistics/components/Title.vue create mode 100644 src/pages/Statistics/index.vue create mode 100644 src/static/news/car.png create mode 100644 src/static/news/logo.png create mode 100644 src/static/news/news.png create mode 100644 src/static/news/role.png create mode 100644 src/static/news/top-bg.png diff --git a/.env.development b/.env.development index 1f5da05..329fbe6 100644 --- a/.env.development +++ b/.env.development @@ -1,8 +1,8 @@ VUE_APP_NODE_ENV=development -VUE_APP_BASE_URL=https://www.tall.wiki -VUE_APP_API_URL=https://www.tall.wiki/gateway +VUE_APP_BASE_URL=https://test.tall.wiki +VUE_APP_API_URL=https://test.tall.wiki/gateway1 VUE_APP_MSG_URL=wss://www.tall.wiki/websocket/message/v4.0/ws -VUE_APP_PROJECT_PATH=https://www.tall.wiki/carBasicTall -VUE_APP_QUESTION_PATH=https://www.tall.wiki/carbasics +VUE_APP_PROJECT_PATH=https://test.tall.wiki/carBasicTall +VUE_APP_QUESTION_PATH=https://test.tall.wiki/carbasics VUE_APP_VERSION=v3.1.0 VUE_APP_PUBLIC_PATH=/carBasicCalendar/ diff --git a/.env.production b/.env.production index 158f804..1b7f5f0 100644 --- a/.env.production +++ b/.env.production @@ -1,8 +1,8 @@ VUE_APP_NODE_ENV=production -VUE_APP_BASE_URL=https://www.tall.wiki -VUE_APP_API_URL=https://www.tall.wiki/gateway +VUE_APP_BASE_URL=https://test.tall.wiki +VUE_APP_API_URL=https://test.tall.wiki/gateway1 VUE_APP_MSG_URL=wss://www.tall.wiki/websocket/message/v4.0/ws -VUE_APP_PROJECT_PATH=https://www.tall.wiki/carBasicTall +VUE_APP_PROJECT_PATH=https://test.tall.wiki/carBasicTall VUE_APP_QUESTION_PATH=https://www.tall.wiki/carbasics VUE_APP_VERSION=v3.1.0 VUE_APP_PUBLIC_PATH=/carBasicCalendar/ diff --git a/src/apis/carbasics.js b/src/apis/carbasics.js index 2d1196a..bbb7f09 100644 --- a/src/apis/carbasics.js +++ b/src/apis/carbasics.js @@ -6,6 +6,7 @@ const patient = `${carbasics}/patient`; // 患者相关接口 const firstAid = `${carbasics}/firstAid`; // 急救数据相关接口 const screening = `${carbasics}/screening`; // 高危人群筛查相关接口 const questionnaire = `${carbasics}/questionnaire`; // 调查问卷相关接口 +const account = `${carbasics}/account`; // 用户管理相关接口 // 获取急救/出院数据列表 export const querySelf = { @@ -112,6 +113,14 @@ const install = (Vue, vm) => { vm.$u.api.generalBasic = params => vm.$u.post(`${carbasics}/ocr/general/basic`, params); // 上传文件 vm.$u.api.uploadFile = `${filedeal}/file/upload/multiple`; + // 查询我的申请列表; + vm.$u.api.queryMyApply = params => vm.$u.post(`${account}/queryMyApply`, params); + // 查询部门与职位 + vm.$u.api.queryDepartment = params => vm.$u.post(`${account}/queryDepartment`, params); + // 查询医院列表 + vm.$u.api.queryHospital = params => vm.$u.post(`${account}/queryHospital`, params); + // 提交申请 + vm.$u.api.submitAccount = params => vm.$u.post(`${account}/submitAccount`, params); }; export default { install }; diff --git a/src/apis/project.js b/src/apis/project.js index f5b9910..1f6426b 100644 --- a/src/apis/project.js +++ b/src/apis/project.js @@ -1,19 +1,22 @@ +const apiUrl = process.env.VUE_APP_API_URL; +export const carbasics = `${apiUrl}/carbasics/v4.0`; + const install = (Vue, vm) => { vm.$u.api = { ...vm.$u.api } || {}; //根据id获取项目信息 - vm.$u.api.findProjectById = param => vm.$u.post(`${uni.$t.domain}/project/findProjectById`, param); + vm.$u.api.findProjectById = param => vm.$u.post(`${carbasics}/project/findProjectById`, param); //创建分享连接 - vm.$u.api.createShare = param => vm.$u.post(`${uni.$t.domain}/share/create`, param); + vm.$u.api.createShare = param => vm.$u.post(`${carbasics}/share/create`, param); //点击分享连接 - vm.$u.api.clickShare = param => vm.$u.post(`${uni.$t.domain}/share/click`, param); + vm.$u.api.clickShare = param => vm.$u.post(`${carbasics}/share/click`, param); //查询医院是否填写了调查问卷 - vm.$u.api.queryNotWrite = param => vm.$u.post(`${uni.$t.domain}/questionnaire/queryNotWrite`, param); + vm.$u.api.queryNotWrite = param => vm.$u.post(`${carbasics}/questionnaire/queryNotWrite`, param); // 根据项目id查询当前项目是不是 医院体验项目 - vm.$u.api.getByProject = param => vm.$u.post(`${uni.$t.domain}/organization/getByProject`, param); + vm.$u.api.getByProject = param => vm.$u.post(`${carbasics}/organization/getByProject`, param); }; export default { install }; diff --git a/src/apis/role.js b/src/apis/role.js index 7d2454c..98b9501 100644 --- a/src/apis/role.js +++ b/src/apis/role.js @@ -1,4 +1,5 @@ const url = process.env.VUE_APP_API_URL; +export const carbasics = `${url}/carbasics/v4.0`; // 查询首页按钮的名称及跳转 export const queryMustShow = { async index(params) { @@ -41,9 +42,9 @@ const install = (Vue, vm) => { // 保存当前用户在当前项目最后一次选择的角色 vm.$u.api.saveRoleRecord = params => saveRoleRecord.index(params); // 根据项目id查找角色 - vm.$u.api.findShowRole = param => vm.$u.post(`${uni.$t.domain}/role/show`, param); + vm.$u.api.findShowRole = param => vm.$u.post(`${carbasics}/role/show`, param); // 根据项目id查找所有成员 - vm.$u.api.queryChecker = param => vm.$u.post(`${uni.$t.domain}/deliver/queryChecker`, param); + vm.$u.api.queryChecker = param => vm.$u.post(`${carbasics}/deliver/queryChecker`, param); }; export default { install }; diff --git a/src/apis/tall.js b/src/apis/tall.js index f3af0c0..e9bd6e8 100644 --- a/src/apis/tall.js +++ b/src/apis/tall.js @@ -38,7 +38,8 @@ const install = (Vue, vm) => { // 修改用户信息 vm.$u.api.updateUserInfo = params => vm.$u.http.post(`${tall}/users/userInfo`, params); // 获取项目列表 - vm.$u.api.getProjects = (startTime, endTime) => vm.$u.post(`${tall}/project/query`, { startTime, endTime }); + // vm.$u.api.getProjects = (startTime, endTime) => vm.$u.post(`${tall}/project/query`, { startTime, endTime }); + vm.$u.api.getProjects = (startTime, endTime) => vm.$u.post(`${carbasics}/project/queryProjectList`, { startTime, endTime }); // 查询首页的按钮展示及跳转 vm.$u.api.getQueryButton = params => vm.$u.post(`${carbasics}/questionnaire/queryButton`, params); // 查询首页轮播图 diff --git a/src/apis/task.js b/src/apis/task.js index b11d0a3..a6722cf 100644 --- a/src/apis/task.js +++ b/src/apis/task.js @@ -1,17 +1,19 @@ +const url = process.env.VUE_APP_API_URL; +export const carbasics = `${url}/carbasics/v4.0`; const install = (Vue, vm) => { vm.$u.api = { ...vm.$u.api } || {}; - vm.$u.api.getGlobal = param => vm.$u.post(`${uni.$t.domain}/task/global`, param); - vm.$u.api.getPermanent = param => vm.$u.post(`${uni.$t.domain}/task/permanent`, param); + vm.$u.api.getGlobal = param => vm.$u.post(`${carbasics}/task/global`, param); + vm.$u.api.getPermanent = param => vm.$u.post(`${carbasics}/task/permanent`, param); //根据时间基准点和角色查找定期任务 - vm.$u.api.getRegularTask = param => vm.$u.post(`${uni.$t.domain}/task/regular`, param); + vm.$u.api.getRegularTask = param => vm.$u.post(`${carbasics}/task/regular`, param); //修改任务状态 - vm.$u.api.updateTaskType = param => vm.$u.post(`${uni.$t.domain}/task/type`, param); + vm.$u.api.updateTaskType = param => vm.$u.post(`${carbasics}/task/type`, param); //新建任务 - vm.$u.api.saveTask = param => vm.$u.post(`${uni.$t.domain}/task/save`, param); + vm.$u.api.saveTask = param => vm.$u.post(`${carbasics}/task/save`, param); //克隆任务 - vm.$u.api.cloneTask = param => vm.$u.post(`${uni.$t.domain}/task/clone`, param); + vm.$u.api.cloneTask = param => vm.$u.post(`${carbasics}/task/clone`, param); //模糊查询 查找项目下的任务 - vm.$u.api.queryTaskOfProject = param => vm.$u.post(`${uni.$t.domain}/task/queryTaskOfProject`, param); + vm.$u.api.queryTaskOfProject = param => vm.$u.post(`${carbasics}/task/queryTaskOfProject`, param); }; export default { install }; diff --git a/src/components/NewRole/NewRole.vue b/src/components/NewRole/NewRole.vue new file mode 100644 index 0000000..716d37f --- /dev/null +++ b/src/components/NewRole/NewRole.vue @@ -0,0 +1,42 @@ + + + diff --git a/src/components/PatientList/PatientList.vue b/src/components/PatientList/PatientList.vue index b69de94..4c7b210 100644 --- a/src/components/PatientList/PatientList.vue +++ b/src/components/PatientList/PatientList.vue @@ -1,48 +1,31 @@ - diff --git a/src/components/Volume/Volume.vue b/src/components/Volume/Volume.vue index 7e83548..063e192 100644 --- a/src/components/Volume/Volume.vue +++ b/src/components/Volume/Volume.vue @@ -1,17 +1,26 @@