diff --git a/.env.development b/.env.development
index 88ed841..8674ebc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,8 +1,8 @@
VUE_APP_NODE_ENV=development
-VUE_APP_BASE_URL=http://101.201.226.163
-VUE_APP_API_URL=http://101.201.226.163/gateway
-VUE_APP_MSG_URL=ws://www.tall.wiki/websocket/message/v4.0/ws
-VUE_APP_PROJECT_PATH=http://101.201.226.163/carBasicTall
-VUE_APP_QUESTION_PATH=http://101.201.226.163/carbasics
+VUE_APP_BASE_URL=https://test.tall.wiki
+VUE_APP_API_URL=https://test.tall.wiki/gateway-1
+VUE_APP_MSG_URL=wss://www.tall.wiki/websocket/message/v4.0/ws
+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/CHANGELOG.md b/CHANGELOG.md
index f1a5c7b..9a73497 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,22 @@
-# 0.1.0 (2022-03-07)
+# 0.1.0 (2022-05-25)
+### 🐛 Bug 修复
范围|描述|commitId
--|--|--
- - | 详情页内容迁移 | [2752bc9](https://101.201.226.163:50022/binbin0314/Typhoneye/commits/2752bc9)
- - | ocr识别及答案存储 | [5301c60](https://101.201.226.163:50022/binbin0314/Typhoneye/commits/5301c60)
- - | 病例列表,神内神外界面重构,ocr界面开发及逻辑处理 | [b45b67c](https://101.201.226.163:50022/binbin0314/Typhoneye/commits/b45b67c)
- - | 暴风眼 | [cb74b8b](https://101.201.226.163:50022/binbin0314/Typhoneye/commits/cb74b8b)
+ - | bug修复 | [63940a6](https://101.201.226.163:50022/ZhangBin/Typhoneye/commits/63940a6)
+
+
+范围|描述|commitId
+--|--|--
+ - | 2.0.4测试环境 | [0f84b7e](https://101.201.226.163:50022/ZhangBin/Typhoneye/commits/0f84b7e)
+ - | 2.0.2版本号与患者列表bug修改 | [9cdec00](https://101.201.226.163:50022/ZhangBin/Typhoneye/commits/9cdec00)
+ - | 暴风眼2.0.0上线bug测试及修改 | [6000be9](https://101.201.226.163:50022/ZhangBin/Typhoneye/commits/6000be9)
+ - | 2.0.0上线 | [5a6d721](https://101.201.226.163:50022/ZhangBin/Typhoneye/commits/5a6d721)
+ - | 静脉溶栓显示及判断bug修复 | [d5a5ca9](https://101.201.226.163:50022/ZhangBin/Typhoneye/commits/d5a5ca9)
+ - | bug修复 | [bb28e16](https://101.201.226.163:50022/ZhangBin/Typhoneye/commits/bb28e16)
+ - | 多选框等bug修改 | [acf511d](https://101.201.226.163:50022/ZhangBin/Typhoneye/commits/acf511d)
+ - | 详情页内容迁移 | [2752bc9](https://101.201.226.163:50022/ZhangBin/Typhoneye/commits/2752bc9)
+ - | ocr识别及答案存储 | [5301c60](https://101.201.226.163:50022/ZhangBin/Typhoneye/commits/5301c60)
+ - | 病例列表,神内神外界面重构,ocr界面开发及逻辑处理 | [b45b67c](https://101.201.226.163:50022/ZhangBin/Typhoneye/commits/b45b67c)
+ - | 暴风眼 | [cb74b8b](https://101.201.226.163:50022/ZhangBin/Typhoneye/commits/cb74b8b)
diff --git a/package.json b/package.json
index e337545..88e4de0 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
"test:mp-weixin": "cross-env UNI_PLATFORM=mp-weixin jest -i"
},
"dependencies": {
+ "@dcloudio/uni-cli-i18n": "^2.0.1-34720220422002",
"@dcloudio/uni-h5": "^2.0.0-32220210818002",
"@dcloudio/uni-helper-json": "*",
"@dcloudio/uni-i18n": "^2.0.0-32220210818002",
@@ -35,6 +36,7 @@
"@vue/shared": "^3.2.6",
"dayjs": "^1.10.6",
"flyio": "^0.6.2",
+ "html2canvas": "^1.4.1",
"lodash": "^4.17.21",
"regenerator-runtime": "^0.12.1",
"uview-ui": "^1.8.5",
diff --git a/src/apis/carbasics.js b/src/apis/carbasics.js
index 077c4ab..4211551 100644
--- a/src/apis/carbasics.js
+++ b/src/apis/carbasics.js
@@ -4,6 +4,7 @@ export const carbasics = `${apiUrl}/carbasics/v4.0`;
export const filedeal = `${fileUrl}/filedeal`;
const patient = `${carbasics}/patient`; // 患者相关接口
const firstAid = `${carbasics}/firstAid`; // 急救数据相关接口
+const screening = `${carbasics}/screening`; // 高危人群筛查相关接口
// 获取急救/出院数据列表
export const querySelf = {
@@ -89,6 +90,12 @@ const install = (Vue, vm) => {
vm.$u.api.getPatient = params => vm.$u.post(`${patient}/getPatient`, params);
// 修改急救患者的患者信息
vm.$u.api.updatePatient = params => vm.$u.post(`${patient}/updatePatient`, params);
+ // 分享问卷(生成分享二维码)
+ vm.$u.api.shareScreening = params => vm.$u.post(`${screening}/share`, params);
+ // 卫生院查看村医工作量
+ vm.$u.api.centerWorkload = params => vm.$u.post(`${screening}/center/workload`, params);
+ // 村医查看工作量
+ vm.$u.api.villageWorkload = params => vm.$u.post(`${screening}/village/workload`, params);
// 上传身份证图像识别
vm.$u.api.identifyWords = `${carbasics}/ocr/identifyWords`;
// 上传试题信息获取答案直接赋值给试题并且提交后台
diff --git a/src/components/PrettyExchange/PrettyExchange.vue b/src/components/PrettyExchange/PrettyExchange.vue
index d58fe7b..e4e8199 100644
--- a/src/components/PrettyExchange/PrettyExchange.vue
+++ b/src/components/PrettyExchange/PrettyExchange.vue
@@ -111,7 +111,7 @@
- v2.0.4
+ v2.1.0
diff --git a/src/components/Share/Share copy.vue b/src/components/Share/Share copy.vue
new file mode 100644
index 0000000..816f6d4
--- /dev/null
+++ b/src/components/Share/Share copy.vue
@@ -0,0 +1,134 @@
+
+
+
+
+
+
+
+
+ {{ hospitalName }}
+ {{ doctorName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/Share/Share.vue b/src/components/Share/Share.vue
new file mode 100644
index 0000000..f153c88
--- /dev/null
+++ b/src/components/Share/Share.vue
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/Share/imgs/all.png b/src/components/Share/imgs/all.png
new file mode 100644
index 0000000..3fdbba8
Binary files /dev/null and b/src/components/Share/imgs/all.png differ
diff --git a/src/components/Share/imgs/bg.png b/src/components/Share/imgs/bg.png
new file mode 100644
index 0000000..7520b5d
Binary files /dev/null and b/src/components/Share/imgs/bg.png differ
diff --git a/src/components/Share/imgs/btn.png b/src/components/Share/imgs/btn.png
new file mode 100644
index 0000000..e65d2d7
Binary files /dev/null and b/src/components/Share/imgs/btn.png differ
diff --git a/src/components/Share/imgs/code.png b/src/components/Share/imgs/code.png
new file mode 100644
index 0000000..788192d
Binary files /dev/null and b/src/components/Share/imgs/code.png differ
diff --git a/src/components/StatisticsCards/StatisticsCards.vue b/src/components/StatisticsCards/StatisticsCards.vue
new file mode 100644
index 0000000..193dd43
--- /dev/null
+++ b/src/components/StatisticsCards/StatisticsCards.vue
@@ -0,0 +1,176 @@
+
+
+
+
+
+ 全部{{ tags.all }}
+ 高危{{ tags.high }}
+ 中危{{ tags.middle }}
+ 低危{{ tags.low }}
+
+
+
+
+
+
+ 高危
+ 中危
+ 低危
+
+ {{ list.name }}
+ {{ list.phone }}
+
+
+ 提交时间:
+ {{ $moment(+list.submitTime).format('YYYY-MM-DD HH:mm') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/StatisticsLists/StatisticsLists.vue b/src/components/StatisticsLists/StatisticsLists.vue
new file mode 100644
index 0000000..35db016
--- /dev/null
+++ b/src/components/StatisticsLists/StatisticsLists.vue
@@ -0,0 +1,81 @@
+
+
+
+
+ 排名
+ 单位/个人
+ 提交总数
+ 高危人数
+
+
+
+
+
+ {{ index + 1 }}
+
+ {{ list.doctorName }}
+
+ {{ list.highNum }}
+
+ {{ list.totalNum }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/camera/camera.vue b/src/pages/camera/camera.vue
index 6423d7d..b3a8022 100644
--- a/src/pages/camera/camera.vue
+++ b/src/pages/camera/camera.vue
@@ -24,7 +24,7 @@ import { mapState, mapMutations } from 'vuex';
export default {
components: {},
data: () => ({
- srcList: ['http://101.201.226.163/filedeal/uploads/upload/20220118/23f05a3dde9a4323bc95b1b061379cb5.jpeg'],
+ srcList: ['https://test.tall.wiki/filedeal/uploads/upload/20220118/23f05a3dde9a4323bc95b1b061379cb5.jpeg'],
action: '',
}),
computed: {
diff --git a/src/pages/detail-webview/detail-webview.vue b/src/pages/detail-webview/detail-webview.vue
index 9abc856..2a2238b 100644
--- a/src/pages/detail-webview/detail-webview.vue
+++ b/src/pages/detail-webview/detail-webview.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/pages/task-page/task-page.vue b/src/pages/task-page/task-page.vue
index 9b0c96c..9601227 100644
--- a/src/pages/task-page/task-page.vue
+++ b/src/pages/task-page/task-page.vue
@@ -6,13 +6,16 @@
-
+
+
+
+
+ 详情内容在详情页内查看
+ 点击此处跳转
+
+
@@ -84,8 +87,13 @@ export default {
},
showPage(val) {
- if (val !== 'function') {
- let jumpUrl = `/pages/detail-webview/detail-webview?jumpUrl=${this.urlData.url}&projectId=${this.projectId}&roleId=${this.roleId}&userId=${this.userId}`;
+ console.log('val: ', val);
+ if (val !== 'function' && val !== 'share' && val !== 'statistics-lists' && val !== 'statistics-cards') {
+ let jumpUrl = `/pages/detail-webview/detail-webview?jumpUrl=
+ ${this.urlData.url}&projectId=
+ ${this.projectId}&roleId=
+ ${this.roleId}&userId=
+ ${this.userId}`;
for (let key in this.urlData) {
if (key !== 'url') {
jumpUrl += `&${key}=${this.urlData[key]}`;
@@ -116,7 +124,11 @@ export default {
// 点击跳转到详情页
jumpDetail() {
- let jumpUrl = `/pages/detail-webview/detail-webview?jumpUrl=${this.urlData.url}&projectId=${this.projectId}&roleId=${this.roleId}&userId=${this.userId}`;
+ let jumpUrl = `/pages/detail-webview/detail-webview?jumpUrl=
+ ${this.urlData.url}&projectId=
+ ${this.projectId}&roleId=
+ ${this.roleId}&userId=
+ ${this.userId}`;
for (let key in this.urlData) {
if (key !== 'url') {
jumpUrl += `&${key}=${this.urlData[key]}`;