diff --git a/src/api/politics/health.ts b/src/api/politics/health.ts new file mode 100644 index 0000000..eade129 --- /dev/null +++ b/src/api/politics/health.ts @@ -0,0 +1,21 @@ +import { http } from '@/utils/http'; + +// 健康数据提交API +export function addApi(data : Object) { + return http({ + url: '/cxcGwjktb/cxcGwjktb/addData', + method: 'POST', + data + }) +} + +// 判断是否是三级高血压人员 +export function queryIf3rdGxyApi(ldhth : string) { // 根据username获取职位名称和审批领导列表 + return http({ + url: '/cxcGwjktbHmc/cxcGwjktbHmc/queryIf3rdGxy', + method: 'GET', + data: { + ldhth + } + }) +} \ No newline at end of file diff --git a/src/pages-humanResource/absence/apply.vue b/src/pages-humanResource/absence/add.vue similarity index 100% rename from src/pages-humanResource/absence/apply.vue rename to src/pages-humanResource/absence/add.vue diff --git a/src/pages-politics/health/add.vue b/src/pages-politics/health/add.vue new file mode 100644 index 0000000..72c71fd --- /dev/null +++ b/src/pages-politics/health/add.vue @@ -0,0 +1,159 @@ + + { + layout: 'default', + style: { + navigationStyle: 'custom', + navigationBarTitleText: '健康填报', + }, + } + + + + + + \ No newline at end of file diff --git a/src/pages/process/approvalTabbar.vue b/src/pages-process/approvalTabbar.vue similarity index 100% rename from src/pages/process/approvalTabbar.vue rename to src/pages-process/approvalTabbar.vue diff --git a/src/pages/process/components/myTask.vue b/src/pages-process/components/myTask.vue similarity index 98% rename from src/pages/process/components/myTask.vue rename to src/pages-process/components/myTask.vue index c4679a4..c4b5b62 100644 --- a/src/pages/process/components/myTask.vue +++ b/src/pages-process/components/myTask.vue @@ -102,7 +102,7 @@ console.log(11) //办理任务,直接进入办理页面 uni.navigateTo({ - url:`/pages/process/taskHandle?data=${JSON.stringify(item)}` + url:`/pages-process/taskHandle?data=${JSON.stringify(item)}` }) }else{ message diff --git a/src/pages/process/taskHandle.vue b/src/pages-process/taskHandle.vue similarity index 100% rename from src/pages/process/taskHandle.vue rename to src/pages-process/taskHandle.vue diff --git a/src/pages.json b/src/pages.json index 127bf80..1167340 100644 --- a/src/pages.json +++ b/src/pages.json @@ -130,24 +130,6 @@ "navigationBarTitleText": "H5在线预览" } }, - { - "path": "pages/process/approvalTabbar", - "type": "page", - "layout": "default", - "style": { - "navigationStyle": "custom", - "navigationBarTitleText": "流程审批导航" - } - }, - { - "path": "pages/process/taskHandle", - "type": "page", - "layout": "default", - "style": { - "navigationStyle": "custom", - "navigationBarTitleText": "任务处理" - } - }, { "path": "pages/user/people", "type": "page", @@ -346,7 +328,7 @@ "root": "pages-humanResource", "pages": [ { - "path": "absence/apply", + "path": "absence/add", "type": "page", "layout": "default", "style": { @@ -374,9 +356,42 @@ } ] }, + { + "root": "pages-politics", + "pages": [ + { + "path": "health/add", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "健康填报" + } + } + ] + }, { "root": "pages-process", - "pages": [] + "pages": [ + { + "path": "approvalTabbar", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "流程审批导航" + } + }, + { + "path": "taskHandle", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "任务处理" + } + } + ] } ] } \ No newline at end of file diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 47aa909..a12a809 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -107,7 +107,7 @@ const goToProcess = ()=>{ uni.navigateTo({ - url: '/pages/process/approvalTabbar' + url: '/pages-process/approvalTabbar' }) } diff --git a/src/pagess-process/approvalTabbar.vue b/src/pagess-process/approvalTabbar.vue deleted file mode 100644 index 1a56e51..0000000 --- a/src/pagess-process/approvalTabbar.vue +++ /dev/null @@ -1,45 +0,0 @@ - - { - layout: 'default', - style: { - navigationStyle: 'custom', - navigationBarTitleText: '流程审批导航', - }, - } - - - - - - \ No newline at end of file diff --git a/src/pagess-process/components/myTask.vue b/src/pagess-process/components/myTask.vue deleted file mode 100644 index c4679a4..0000000 --- a/src/pagess-process/components/myTask.vue +++ /dev/null @@ -1,170 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pagess-process/taskHandle.vue b/src/pagess-process/taskHandle.vue deleted file mode 100644 index 6d8051c..0000000 --- a/src/pagess-process/taskHandle.vue +++ /dev/null @@ -1,98 +0,0 @@ - - { - layout: 'default', - style: { - navigationStyle: 'custom', - navigationBarTitleText: '任务处理', - }, - } - - - - - - \ No newline at end of file diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts index 0364fc7..4f1279f 100644 --- a/src/types/uni-pages.d.ts +++ b/src/types/uni-pages.d.ts @@ -13,8 +13,6 @@ interface NavigateToOptions { "/pages/onlinePreview/detail" | "/pages/onlinePreview/onlinePreview" | "/pages/onlinePreview/onlinePreviewH5" | - "/pages/process/approvalTabbar" | - "/pages/process/taskHandle" | "/pages/user/people" | "/pages/workHome/index" | "/pages-home/home/home" | @@ -33,9 +31,12 @@ interface NavigateToOptions { "/pages-operate/file/detail" | "/pages-operate/file/index" | "/pages-operate/sc/index" | - "/pages-humanResource/absence/apply" | + "/pages-humanResource/absence/add" | "/pages-humanResource/absence/index" | - "/pages-integrated/duty/index"; + "/pages-integrated/duty/index" | + "/pages-politics/health/add" | + "/pages-process/approvalTabbar" | + "/pages-process/taskHandle"; } interface RedirectToOptions extends NavigateToOptions {} diff --git a/src/utils/index.ts b/src/utils/index.ts index 7e31469..181af15 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -343,29 +343,29 @@ export const getLocation = () => { } }, fail: function (err) { - uni.showToast({ - title: '位置解析失败', - icon: 'error' - }) + // uni.showToast({ + // title: '位置解析失败', + // icon: 'error' + // }) handleDefaultLocation() } }); }, fail: function (err) { // 根据不同错误码处理 - if (err.errCode === 2 || err.errCode === 12) { - // 2: 位置服务不可用, 12: 定位权限未开启 - uni.showToast({ - title: '请开启定位服务', - icon: 'error' - }) + // if (err.errCode === 2 || err.errCode === 12) { + // // 2: 位置服务不可用, 12: 定位权限未开启 + // uni.showToast({ + // title: '请开启定位服务', + // icon: 'error' + // }) - } else { - uni.showToast({ - title: '定位获取失败', - icon: 'error' - }) - } + // } else { + // uni.showToast({ + // title: '定位获取失败', + // icon: 'error' + // }) + // } handleDefaultLocation() } }); @@ -388,7 +388,7 @@ function handleDefaultLocation() { } -function weatherRequest(params : { lat ?: string; lon ?: string; q ?: string }) { +function weatherRequest(params : { lat ?: number; lon ?: number; q ?: string }) { const store = useAppStore() uni.request({ url: 'https://api.openweathermap.org/data/2.5/weather', @@ -407,17 +407,17 @@ function weatherRequest(params : { lat ?: string; lon ?: string; q ?: string }) res.data.weather[0].icon ) } else { - uni.showToast({ - title: '天气数据格式错误', - icon: 'error' - }) + // uni.showToast({ + // title: '天气数据格式错误', + // icon: 'error' + // }) } }, - fail: function () { - uni.showToast({ - title: '天气获取失败', - icon: 'error' - }) - } + // fail: function () { + // uni.showToast({ + // title: '天气获取失败', + // icon: 'error' + // }) + // } }); } \ No newline at end of file diff --git a/vite.config.ts b/vite.config.ts index d4b48e8..de02ae5 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -68,6 +68,7 @@ export default ({ command, mode }) => { 'src/pages-operate', 'src/pages-humanResource', 'src/pages-integrated', + 'src/pages-politics', 'src/pages-process', ], // 是个数组,可以配置多个,但是不能为pages里面的目录 dts: 'src/types/uni-pages.d.ts',