From 3691d5d90f737a02bf8c1a906b338a966a889c59 Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Wed, 25 Jun 2025 09:07:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E9=9A=8F=E8=AE=BF=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/humanResource/clockin/index.ts | 11 -- src/api/humanResource/personnel/index.ts | 9 ++ src/api/politics/health.ts | 17 +++ src/api/system/index.ts | 26 +++- src/pages-humanResource/absence/add.vue | 27 +++-- src/pages-politics/health/followup.vue | 145 +++++++++++++++++++++++ src/pages.json | 9 ++ src/pages/user/people.vue | 35 ++++-- src/static/index/index/followup.png | Bin 0 -> 5777 bytes src/store/index.ts | 4 - src/types/uni-pages.d.ts | 1 + src/utils/index.ts | 138 ++++++--------------- 12 files changed, 279 insertions(+), 143 deletions(-) delete mode 100644 src/api/humanResource/clockin/index.ts create mode 100644 src/pages-politics/health/followup.vue create mode 100644 src/static/index/index/followup.png diff --git a/src/api/humanResource/clockin/index.ts b/src/api/humanResource/clockin/index.ts deleted file mode 100644 index 57c1f37..0000000 --- a/src/api/humanResource/clockin/index.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { http } from '@/utils/http'; - - -/*新增打卡记录*/ -export function addApi(config : Object) { - return http({ - url: '/cxc_rlzy.wbxm.wbdk/cxcRlzyWbdk/add', - method: 'POST', - data: config - }) -} \ No newline at end of file diff --git a/src/api/humanResource/personnel/index.ts b/src/api/humanResource/personnel/index.ts index 5c932d2..a2b7464 100644 --- a/src/api/humanResource/personnel/index.ts +++ b/src/api/humanResource/personnel/index.ts @@ -112,4 +112,13 @@ export function cxcRyDatAstatisticsDetails(parm) { // 员工信息统计 method: 'GET', data: parm }) +} + +/*新增打卡记录*/ +export function clockInApi(data : object) { + return http({ + url: '/cxc_rlzy.wbxm.wbdk/cxcRlzyWbdk/add', + method: 'POST', + data + }) } \ No newline at end of file diff --git a/src/api/politics/health.ts b/src/api/politics/health.ts index eade129..346a12b 100644 --- a/src/api/politics/health.ts +++ b/src/api/politics/health.ts @@ -18,4 +18,21 @@ export function queryIf3rdGxyApi(ldhth : string) { // 根据username获取职位 ldhth } }) +} + +//查询登录人本月随访问题 +export function querySfwtApi() { + return http({ + url: '/jksf.tbb/cxcGwjktbTbb/querySfwtByMonthLdhth', + method: 'GET' + }) +} + +// 提交随访问题 +export function editApi(data : object) { + return http({ + url: '/jksf.tbb/cxcGwjktbTbb/editCxcGwjktbTbbZb', + method: 'PUT', + data + }) } \ No newline at end of file diff --git a/src/api/system/index.ts b/src/api/system/index.ts index f1c117c..a257519 100644 --- a/src/api/system/index.ts +++ b/src/api/system/index.ts @@ -90,10 +90,34 @@ export function getDictItemsApi(dictCode : string) { // 字典标签专用 }) } -export function deleteFile(config : object){//删除文件 by 闵 +export function deleteFile(config : object) {//删除文件 by 闵 return http({ url: `/sys/common/deleteFileAndCache`, method: 'GET', data: config }) } + +/*根据经纬度获取地理位置*/ +export function getLocationApi(longitude : number, latitude : number) { + return http({ + url: `/sys/common/getLocation`, + method: 'GET', + data: { + longitude, + latitude + } + }) +} + +/*根据经纬度或城市名称获取天气信息*/ +export function getWeatherApi(longitude : number, latitude : number) { + return http({ + url: `/sys/common/getWeather`, + method: 'GET', + data: { + longitude, + latitude + } + }) +} \ No newline at end of file diff --git a/src/pages-humanResource/absence/add.vue b/src/pages-humanResource/absence/add.vue index 9e3d463..47d59ee 100644 --- a/src/pages-humanResource/absence/add.vue +++ b/src/pages-humanResource/absence/add.vue @@ -27,7 +27,7 @@ :rules="[{ required: true, message: '请选择结束时间' }]" :min-date="minEndtime" /> - + @@ -251,8 +251,8 @@ } else { toast.warning(res.message) setTimeout(() => { - handleClickLeft() - }, 1000) + uni.navigateBack() + }, 2000) } }) } @@ -333,13 +333,20 @@ roleId: '1554379432313397250', orgCode: userStore.userInfo.orgCode }).then(res => { - model.hr = res.result[0].username - hrData.value = res.result.map(item => { - return { - label: item.realname, - value: item.username - } - }) + if (res.result.length == 0) { + toast.warning('请切换工作单位!') + setTimeout(() => { + uni.navigateBack() + }, 2000) + } else { + model.hr = res.result[0].username + hrData.value = res.result.map(item => { + return { + label: item.realname, + value: item.username + } + }) + } }) } diff --git a/src/pages-politics/health/followup.vue b/src/pages-politics/health/followup.vue new file mode 100644 index 0000000..ce7b71c --- /dev/null +++ b/src/pages-politics/health/followup.vue @@ -0,0 +1,145 @@ + + { + layout: 'default', + style: { + navigationStyle: 'custom', + navigationBarTitleText: '健康随访', + }, + } + + + + + + + \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index 88e5087..2bc63ea 100644 --- a/src/pages.json +++ b/src/pages.json @@ -479,6 +479,15 @@ "navigationStyle": "custom", "navigationBarTitleText": "健康填报" } + }, + { + "path": "health/followup", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "健康随访" + } } ] }, diff --git a/src/pages/user/people.vue b/src/pages/user/people.vue index d67f01c..ccb4f7d 100644 --- a/src/pages/user/people.vue +++ b/src/pages/user/people.vue @@ -61,8 +61,8 @@ import { getEnvBaseUrl } from '@/utils/index' import { queryPostByUserIdApi, editUserApi } from '@/api/system/user' import { useAppStore } from '@/store' - import { addApi } from '@/api/humanResource/clockin' - + import { clockInApi } from '@/api/humanResource/personnel' + const appStore = useAppStore(); const userStore = useUserStore() const toast = useToast() @@ -156,19 +156,30 @@ toast.warning('H5暂不支持') // #endif } - + const clockin = () => { if (loading.value) return - addApi({ - weizhi: appStore.clockin - }).then((res : any) => { - if(res.success){ - toast.success(res.message) - }else{ - toast.warning(res.message) + loading.value = true; + uni.getLocation({ + type: 'wgs84', + success: function (position) { + clockInApi({ + longitude: position.longitude, + latitude: position.latitude + }).then((res : any) => { + if (res.success) { + toast.success(res.message) + } else { + toast.warning(res.message) + } + loading.value = false + }) + }, + fail: function (err) { + toast.warning('请打开系统定位再打卡!') + loading.value = false } - loading.value = true - }) + }); } diff --git a/src/static/index/index/followup.png b/src/static/index/index/followup.png new file mode 100644 index 0000000000000000000000000000000000000000..95bbd537b24d0594acb0a9811755476a80d98440 GIT binary patch literal 5777 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 literal 0 HcmV?d00001 diff --git a/src/store/index.ts b/src/store/index.ts index d23a18b..159cdf9 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -15,7 +15,6 @@ export const useAppStore = defineStore('app', { isGray: 0 as 0 | 1, // 0=正常，1=灰化 position: null, //市 location: null, //省市区 - clockin: null, //详细位置 精确到街道 temperature: null, //温度 weather: null //天气 }), @@ -29,9 +28,6 @@ export const useAppStore = defineStore('app', { setLocation(value : string) { this.location = value }, - setClockin(value : string) { - this.clockin = value - }, setTemperature(value : number) { this.temperature = value }, diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts index 34686a6..5b03bf8 100644 --- a/src/types/uni-pages.d.ts +++ b/src/types/uni-pages.d.ts @@ -53,6 +53,7 @@ interface NavigateToOptions { "/pages-humanResource/personnel/standingbook" | "/pages-integrated/duty/index" | "/pages-politics/health/add" | + "/pages-politics/health/followup" | "/pages-process/approvalTabbar" | "/pages-process/myApplyProcess" | "/pages-process/taskHandle" | diff --git a/src/utils/index.ts b/src/utils/index.ts index 431290f..419f779 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -2,7 +2,7 @@ import { defineStore } from 'pinia' import { pages, subPackages, tabBar } from '@/pages.json' import { isMpWeixin } from './platform' import { useAppStore } from '@/store' -import { upDateAppApi } from '@/api/system' +import { upDateAppApi, getLocationApi, getWeatherApi } from '@/api/system' @@ -232,11 +232,9 @@ export const useUpdateApp = defineStore('updateApp', () => { try { let path = '' let webApp = import.meta.env.VITE_WEBAPP - console.log(webApp) - if(webApp){//如果是测试环境 ，upDateAppApi 传递参数 by min + if (webApp) {//如果是测试环境 ，upDateAppApi 传递参数 by min path = webApp } - console.log(path) upDateAppApi(path).then(async (res : any) => { let { result @@ -285,19 +283,19 @@ export const useUpdateApp = defineStore('updateApp', () => { * @param isWgt 是否是热资源更新 默认不是 */ export const hasNewVersion = (version, isWgt = false) => { - // #ifdef APP_PLUS - return new Promise((resolve) => { - if (isWgt) { - plus.runtime.getProperty(plus.runtime.appid, (widgetInfo) => { - const currentVersion = widgetInfo.versionCode - resolve(Number(version) > Number(currentVersion)) - }) - } else { - const currentVersion = plus.runtime.versionCode - resolve(Number(version) > Number(currentVersion)) - } - }) - // #endif + // #ifdef APP_PLUS + return new Promise((resolve) => { + if (isWgt) { + plus.runtime.getProperty(plus.runtime.appid, (widgetInfo) => { + const currentVersion = widgetInfo.versionCode + resolve(Number(version) > Number(currentVersion)) + }) + } else { + const currentVersion = plus.runtime.versionCode + resolve(Number(version) > Number(currentVersion)) + } + }) + // #endif } export function onClickUpdate(updateType : string, url) { @@ -389,108 +387,38 @@ export const getLocation = () => { type: 'wgs84', success: function (position) { // 成功获取位置后请求地理编码 - uni.request({ - url: 'https://api.tianditu.gov.cn/geocoder', - method: 'GET', - data: { - postStr: JSON.stringify({ - lon: position.longitude, - lat: position.latitude, - ver: 1 - }), - type: 'geocode', - tk: '30fe0f0c1b2320e112bde797f3ddaff4' - }, - success: function (res : any) { - let data = res.data; - if (data.status == 0) { - const obj = data.result.addressComponent - store.setPosition(obj.city ? obj.city : obj.province) //市 - store.setLocation(obj.city ? obj.province + obj.city + obj.county : obj.province + obj.county) //省市区 - store.setClockin(data.result.formatted_address) - getWeather(position.latitude, position.longitude) - } else { - handleDefaultLocation() - } - }, - fail: function (err) { - // uni.showToast({ - // title: '位置解析失败', - // icon: 'error' - // }) + getLocationApi(position.longitude, position.latitude).then((res : any) => { + if (res) { + const obj = res.addressComponent + store.setPosition(obj.city ? obj.city : obj.province) //市 + store.setLocation(obj.city ? obj.province + obj.city + obj.county : obj.province + obj.county) //省市区 + getWeather(position.longitude, position.latitude) + } else { handleDefaultLocation() } - }); + }) }, - fail: function (err) { - // 根据不同错误码处理 - // if (err.errCode === 2 || err.errCode === 12) { - // // 2: 位置服务不可用, 12: 定位权限未开启 - // uni.showToast({ - // title: '请开启定位服务', - // icon: 'error' - // }) - - // } else { - // uni.showToast({ - // title: '定位获取失败', - // icon: 'error' - // }) - // } + fail: function () { handleDefaultLocation() } }); } -const getWeather = (lat : number, lon : number) => { - let params = { - lat: lat, - lon: lon - } - weatherRequest(params) -} - // 处理默认位置和天气 function handleDefaultLocation() { useAppStore().setPosition('濮阳市') - weatherRequest({ - q: '濮阳市' - }) + getWeather(115.08784, 35.773116) // //油田总部经纬度 } -function weatherRequest(params : { lat ?: number; lon ?: number; q ?: string }) { +function getWeather(lon : number, lat : number) { const store = useAppStore() - uni.request({ - url: 'https://api.openweathermap.org/data/2.5/weather', - method: 'GET', - data: { - ...params, - appid: '600a60694b0e453dfbaafa862f1d1482', - lang: 'zh_cn' - }, - success: function (res : any) { - if (res.data && res.data.main && res.data.weather) { - store.setTemperature( - Math.round(res.data.main.temp - 273.15) - ) - store.setWeather( - res.data.weather[0].icon - ) - } else { - // uni.showToast({ - // title: '天气数据格式错误', - // icon: 'error' - // }) - } - }, - // fail: function () { - // uni.showToast({ - // title: '天气获取失败', - // icon: 'error' - // }) - // } - }); + getWeatherApi(lon, lat).then((res : any) => { + if (res) { + store.setTemperature(Math.round(res.main.temp - 273.15)) + store.setWeather(res.weather[0].icon) + } + }) } export const imgUrl = (url : string) => { @@ -518,7 +446,7 @@ export function getFileAccessHttpUrl(avatar, subStr) { /* 获取文件名 */ export function getFilename(text : string) { if (!text) { - return text === null ? null : ""; + return text === null ? null : ""; } if (text.indexOf(',') > 0) { let arr = text.split(",")