diff --git a/.env.development b/.env.development index 4ba6364..1f5da05 100644 --- a/.env.development +++ b/.env.development @@ -1,8 +1,8 @@ VUE_APP_NODE_ENV=development -VUE_APP_BASE_URL=https://test.tall.wiki -VUE_APP_API_URL=https://test.tall.wiki/gateway +VUE_APP_BASE_URL=https://www.tall.wiki +VUE_APP_API_URL=https://www.tall.wiki/gateway 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_PROJECT_PATH=https://www.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/.env.production b/.env.production index c289fb7..158f804 100644 --- a/.env.production +++ b/.env.production @@ -1,8 +1,8 @@ VUE_APP_NODE_ENV=production -VUE_APP_BASE_URL=https://test.tall.wiki -VUE_APP_API_URL=https://test.tall.wiki/gateway +VUE_APP_BASE_URL=https://www.tall.wiki +VUE_APP_API_URL=https://www.tall.wiki/gateway 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_PROJECT_PATH=https://www.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 4211551..2d1196a 100644 --- a/src/apis/carbasics.js +++ b/src/apis/carbasics.js @@ -5,6 +5,7 @@ export const filedeal = `${fileUrl}/filedeal`; const patient = `${carbasics}/patient`; // 患者相关接口 const firstAid = `${carbasics}/firstAid`; // 急救数据相关接口 const screening = `${carbasics}/screening`; // 高危人群筛查相关接口 +const questionnaire = `${carbasics}/questionnaire`; // 调查问卷相关接口 // 获取急救/出院数据列表 export const querySelf = { @@ -78,6 +79,15 @@ const install = (Vue, vm) => { vm.$u.api.getRecord = params => getRecord.index(params); // 获取急救/出院数据列表 vm.$u.api.querySelf = params => querySelf.index(params); + // 查询地区 + vm.$u.api.searchArea = params => vm.$u.post(`${questionnaire}/area`, params); + // 查询职位 + vm.$u.api.searchPosition = params => vm.$u.post(`${questionnaire}/queryPosition`, params); + // 查询当前地区的医院列表 + vm.$u.api.queryHospitalList = params => vm.$u.post(`${questionnaire}/queryHospitalList`, params); + // 医院名称回显 + vm.$u.api.hospitalNameEcho = params => vm.$u.post(`${questionnaire}/hospitalNameEcho`, params); + // 患者加入急救 vm.$u.api.joinAid = params => vm.$u.post(`${firstAid}/join`, params); // 患者退出急救 diff --git a/src/apis/tall.js b/src/apis/tall.js index bfef7c4..f3af0c0 100644 --- a/src/apis/tall.js +++ b/src/apis/tall.js @@ -41,6 +41,10 @@ const install = (Vue, vm) => { vm.$u.api.getProjects = (startTime, endTime) => vm.$u.post(`${tall}/project/query`, { startTime, endTime }); // 查询首页的按钮展示及跳转 vm.$u.api.getQueryButton = params => vm.$u.post(`${carbasics}/questionnaire/queryButton`, params); + // 查询首页轮播图 + vm.$u.api.getCarouselShow = params => vm.$u.post(`${carbasics}/carousel/show`, params); + // 查询首页轮播图 + vm.$u.api.getNoticeList = params => vm.$u.post(`${carbasics}/notice/query`, params); // 查询当前用户是否展示宣传页按钮 vm.$u.api.queryIsShow = params => vm.$u.post(`${carbasics}/questionnaire/queryIsShow`, params); // 查询日历是否有小红点 diff --git a/src/components/PrettyExchange/PrettyExchange.vue b/src/components/PrettyExchange/PrettyExchange.vue index e4e8199..019baa2 100644 --- a/src/components/PrettyExchange/PrettyExchange.vue +++ b/src/components/PrettyExchange/PrettyExchange.vue @@ -111,7 +111,7 @@ - v2.1.0 + v2.2.1 diff --git a/src/components/Projects/ProjectItem.vue b/src/components/Projects/ProjectItem.vue index 4746e1b..f496b78 100644 --- a/src/components/Projects/ProjectItem.vue +++ b/src/components/Projects/ProjectItem.vue @@ -39,22 +39,18 @@ - + - - {{ subItem.name }} - - + --> diff --git a/src/components/Service/Service.vue b/src/components/Service/Service.vue index 7892314..b2a78ee 100644 --- a/src/components/Service/Service.vue +++ b/src/components/Service/Service.vue @@ -9,6 +9,7 @@ + v3.0.0 diff --git a/src/components/VolumeProject/VolumeProject.vue b/src/components/VolumeProject/VolumeProject.vue new file mode 100644 index 0000000..95fe952 --- /dev/null +++ b/src/components/VolumeProject/VolumeProject.vue @@ -0,0 +1,120 @@ + + + + diff --git a/src/pages.json b/src/pages.json index 78a57de..ae4d021 100644 --- a/src/pages.json +++ b/src/pages.json @@ -85,6 +85,12 @@ "style": { "navigationBarTitleText": "暴风眼详情页" } + }, + { + "path": "pages/BL/BL-zhuce", + "style": { + "navigationBarTitleText": "注册" + } } ], "globalStyle": { diff --git a/src/pages/BL/BL-zhuce.vue b/src/pages/BL/BL-zhuce.vue new file mode 100644 index 0000000..9e6f299 --- /dev/null +++ b/src/pages/BL/BL-zhuce.vue @@ -0,0 +1,197 @@ + + + diff --git a/src/pages/BL/mixin.js b/src/pages/BL/mixin.js new file mode 100644 index 0000000..75ae2a3 --- /dev/null +++ b/src/pages/BL/mixin.js @@ -0,0 +1,113 @@ +const mixin = { + data() { + return { + codeValue: { + 'CITY-COUNTY': [], + 'HOS-NAME': null, + 'HOS-LEVEL': [], + 'HOS-GRADE': null, + 'HOS-KESHI': null, + 'HOS-ZHIWU': null, + 'HOS-MAN': null, + 'HOS-TEL': null, + }, + list: [], + }; + }, + methods: { + // 试题类型:type: 1:省市区三级下拉 11:医院等级 2:输入框模糊搜索 3:下拉菜单 5:输入框 + getList() { + this.list = [ + { + name: '', + testList: [ + { + secondName: '', + contentList: [ + { + name: '市/县', + code: 'CITY-COUNTY', + value: this.codeValue['CITY-COUNTY'], + type: 1, + itemList: [], + }, + { + name: '医院名称', + code: 'HOS-NAME', + value: this.codeValue['HOS-NAME'], + type: 2, + }, + { + name: '医院等级', + code: 'HOS-LEVEL', + value: this.codeValue['HOS-LEVEL'], + type: 11, + itemList: [ + { + value: '二级', + label: '二级', + children: [ + { + value: '甲等', + label: '甲等', + }, + { + value: '乙等', + label: '乙等', + }, + ], + }, + { + value: '三级', + label: '三级', + children: [ + { + value: '甲等', + label: '甲等', + }, + { + value: '乙等', + label: '乙等', + }, + ], + }, + ], + }, + { + name: '科室', + code: 'HOS-KESHI', + value: this.codeValue['HOS-KESHI'], + type: 3, + itemList: ['神经内科', '内科', '神经外科'], + }, + { + name: '职务', + code: 'HOS-ZHIWU', + value: this.codeValue['HOS-ZHIWU'], + type: 3, + // itemList: [], + itemList: ['科主任', '副主任', '卒中质控医生', '医生'], + }, + { + name: '联系人', + code: 'HOS-MAN', + value: this.codeValue['HOS-MAN'], + type: 5, + }, + { + name: '联系电话', + code: 'HOS-TEL', + value: this.codeValue['HOS-TEL'], + disable: true, + type: 5, + }, + ], + }, + ], + }, + ]; + }, + }, +}; + +export default mixin; diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 6548e55..e9b8ebc 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -1,19 +1,39 @@