diff --git a/env/.env b/env/.env index 55a1f11..5a3c17e 100644 --- a/env/.env +++ b/env/.env @@ -1,9 +1,9 @@ VITE_APP_TITLE = '数智产销测试' VITE_APP_PORT = 9000 -#VITE_UNI_APPID = '__UNI__9F097F0' +VITE_UNI_APPID = '__UNI__9F097F0' #测试APPID -VITE_UNI_APPID = '__UNI__1B02D50' +#VITE_UNI_APPID = '__UNI__1B02D50' VITE_WX_APPID = 'wx8e287639924edb51' #发布版本号 diff --git a/env/.env.development b/env/.env.development index cfea491..f347345 100644 --- a/env/.env.development +++ b/env/.env.development @@ -7,8 +7,11 @@ VITE_SHOW_SOURCEMAP = true # 是否启用读取配置文件 min #VITE_WEBAPP = 'D://opt//AppUpdateTest' VITE_WEBAPP = '' -#VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot' +VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot' #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' -VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' +#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' + + + #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/wwapi' #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/yjapi' \ No newline at end of file diff --git a/env/.env.production b/env/.env.production index 6bf67f0..2984c4d 100644 --- a/env/.env.production +++ b/env/.env.production @@ -8,6 +8,9 @@ VITE_SHOW_SOURCEMAP = false #VITE_WEBAPP = 'D://opt//AppUpdateTest' VITE_WEBAPP = '' VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' + + + + #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/wwapi' #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/yjapi' -#VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot' \ No newline at end of file diff --git a/manifest.config.ts b/manifest.config.ts index 1f1d5e0..2a74033 100644 --- a/manifest.config.ts +++ b/manifest.config.ts @@ -17,8 +17,8 @@ export default defineManifestConfig({ name: VITE_APP_TITLE, appid: VITE_UNI_APPID, description: '', - versionName: '2.0.2', - versionCode: '20250617', + versionName: '2.1.0', + versionCode: '20250627', transformPx: false, locale: VITE_FALLBACK_LOCALE, // 'zh-Hans' /* 5+App特有相关 */ diff --git a/package.json b/package.json index 970f434..7d4d70a 100644 --- a/package.json +++ b/package.json @@ -80,18 +80,24 @@ "@tanstack/query-core": "^5.76.0", "@tanstack/vue-query": "^5.62.16", "@vant/area-data": "^2.0.0", + "@vue/devtools-api": "^7.7.6", + "@vue/devtools-kit": "^7.7.6", + "@vue/devtools-shared": "^7.7.6", "abortcontroller-polyfill": "^1.7.8", "base-64": "^1.0.0", + "birpc": "^2.3.0", "charenc": "^0.0.2", "crypt": "^0.0.2", "dayjs": "1.11.10", "echarts": "^5.6.0", "fs-extra": "^11.3.0", + "hookable": "^5.5.3", "is-buffer": "^2.0.5", "js-base64": "^3.6.1", "lodash": "^4.17.21", "lodash-es": "^4.17.21", "md5": "^2.3.0", + "perfect-debounce": "^1.0.0", "pinia": "2.0.36", "pinia-plugin-persistedstate": "3.2.1", "qs": "6.5.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 86da682..fa6df3b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -68,12 +68,24 @@ importers: '@vant/area-data': specifier: ^2.0.0 version: 2.0.0 + '@vue/devtools-api': + specifier: ^7.7.6 + version: 7.7.6 + '@vue/devtools-kit': + specifier: ^7.7.6 + version: 7.7.6 + '@vue/devtools-shared': + specifier: ^7.7.6 + version: 7.7.6 abortcontroller-polyfill: specifier: ^1.7.8 version: 1.7.8 base-64: specifier: ^1.0.0 version: 1.0.0 + birpc: + specifier: ^2.3.0 + version: 2.3.0 charenc: specifier: ^0.0.2 version: 0.0.2 @@ -89,6 +101,9 @@ importers: fs-extra: specifier: ^11.3.0 version: 11.3.0 + hookable: + specifier: ^5.5.3 + version: 5.5.3 is-buffer: specifier: ^2.0.5 version: 2.0.5 @@ -104,6 +119,9 @@ importers: md5: specifier: ^2.3.0 version: 2.3.0 + perfect-debounce: + specifier: ^1.0.0 + version: 1.0.0 pinia: specifier: 2.0.36 version: 2.0.36(typescript@5.7.2)(vue@3.4.21(typescript@5.7.2)) diff --git a/src/api/OfficeEquipmentMaintenanceApplication/bpmApi/index.ts b/src/api/OfficeEquipmentMaintenanceApplication/bpmApi/index.ts new file mode 100644 index 0000000..5efa2df --- /dev/null +++ b/src/api/OfficeEquipmentMaintenanceApplication/bpmApi/index.ts @@ -0,0 +1,11 @@ +import { http } from '@/utils/http'; + + +/*通过id查询请假数据*/ +export function queryByIdApi(id : string) { + return http({ + url: '/cxcbgjjwxsq/cxcBgjjwxsq/queryByIdForApp',//填写表单的queryById请求地址 + method: 'GET', + data: { id } + }) +} diff --git a/src/api/SuperiorSystem/bpmApi/index.ts b/src/api/SuperiorSystem/bpmApi/index.ts new file mode 100644 index 0000000..9551f60 --- /dev/null +++ b/src/api/SuperiorSystem/bpmApi/index.ts @@ -0,0 +1,11 @@ +import { http } from '@/utils/http'; + + +/*通过id查询数据*/ +export function queryByIdApi(id : string) { + return http({ + url: '/cxcjyglsjzdgl/cxcJyglSjzdgl/queryByIdForAPP',//填写表单的queryById请求地址 + method: 'GET', + data: { id } + }) +} diff --git a/src/api/bpm/index.ts b/src/api/bpm/index.ts index 716e0d0..c7cc202 100644 --- a/src/api/bpm/index.ts +++ b/src/api/bpm/index.ts @@ -29,11 +29,11 @@ export function queryZbkhZbByIdApi(id : string) { } /*通过id查询指标考核子表数据*/ -export function queryZbkhFbByIdApi(mainId : string) { +export function queryZbkhFbByIdApi(data : object) { return http({ url: '/jxkh.zbkh/cxcJxkhZbkhZb/listCxcJxkhZbkhDwkhByMainId', method: 'GET', - data: { mainId } + data }) } @@ -46,3 +46,47 @@ export function queryZbkhBtByIdApi(mainId : string) { }) } +/*通过id查询考核实施主表数据*/ +export function queryKhssZbByIdApi(id : string) { + return http({ + url: '/jxkh.khss/cxcJxkhXhss/getAllById', + method: 'GET', + data: { id } + }) +} + + /*通过id查询考核实施主表自定义表头*/ + export function queryKhssZbBtByIdApi(mainId : string) { + return http({ + url: '/jxkh.jxkh/cxcJxkhKhssKhjxZb/getByMainId', + method: 'GET', + data: { mainId } + }) + } + + /*通过id查询考核实施子表数据*/ + export function queryKhssFbByIdApi(data : object) { + return http({ + url: '/jxkh.khss/cxcJxkhXhss/selectAllByMainId', + method: 'GET', + data + }) + } + + /*通过id查询总金额*/ + export function queryKhssAllSumByIdApi(mainId : string) { + return http({ + url: '/jxkh.khss/cxcJxkhXhss/getAllSum', + method: 'GET', + data: { mainId } + }) + } + + /*通过id查询考核实子表自定义表头*/ + export function queryKhssFbBtByIdApi(mainId : string) { + return http({ + url: '/jxkh.jxfp.bt/cxcJxkhJxfbBtZb/listByMainId', + method: 'GET', + data: { mainId } + }) + } diff --git a/src/api/healthfollow/healthfllow.ts b/src/api/healthfollow/healthfllow.ts new file mode 100644 index 0000000..631d1dd --- /dev/null +++ b/src/api/healthfollow/healthfllow.ts @@ -0,0 +1,44 @@ +import { http } from '@/utils/http'; + + + + +export function followpersonList(config : object) { // 获取随访人员信息 + return http({ + url: '/Hmcappselect/appselect/Hmcapplist', + method: 'GET', + data: config + }) +} + + +// +export function addhealthList(config : object) { // 获取随访人员信息 + return http({ + url: '/tbbApp/Tbbapp/applist', + method: 'GET', + data: config + }) +} + + +// +export function addByCld(config : object) { // + return http({ + url: '/jksf.tbb/cxcGwjktbTbb/addByCld', + method: 'GET', + data: config + }) +} + + + +/*通过id查询数据*/ +//查询人员回答问题子表 +export function queryByIdApi(id : string) { + return http({ + url: '/tbbApp/Tbbapp/queryById', + method: 'GET', + data: { id } + }) +} \ 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/lawsAndRegulations/bpmApi/index.ts b/src/api/lawsAndRegulations/bpmApi/index.ts new file mode 100644 index 0000000..bb1b4f7 --- /dev/null +++ b/src/api/lawsAndRegulations/bpmApi/index.ts @@ -0,0 +1,11 @@ +import { http } from '@/utils/http'; + + +/*通过id查询请假数据*/ +export function queryByIdApi(id : string) { + return http({ + url: '/cxcoaflgf/cxcOaFlgf/queryByIdForApp',//填写表单的queryById请求地址 + method: 'GET', + data: { id } + }) +} diff --git a/src/api/pages/sc/index.ts b/src/api/pages/sc/index.ts index 0f6c53a..bfd3db7 100644 --- a/src/api/pages/sc/index.ts +++ b/src/api/pages/sc/index.ts @@ -1,18 +1,17 @@ import { http } from '@/utils/http'; -export function getListApi(orgCode : string) { +export function getListApi() { return http({ url: '/sjgl.scnr/cxcSjSc/queryTreeData', - method: 'GET', - data: { orgCode } + method: 'GET' }) } -export function getJobDesIdByDepAndName(config : Object) { +export function getJobDesIdByDepAndName(jobname : string) { return http({ url: '/sjgl.tynr/cxcSjJobdescription/queryByNameDep', method: 'GET', - data: config + data: { jobname } }) } 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/manifest.json b/src/manifest.json index 151aa1b..6d3cf2a 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,9 +1,9 @@ { - "name": "数智产销测试", - "appid": "__UNI__1B02D50", + "name": "数智产销", + "appid": "__UNI__9F097F0", "description": "", - "versionName": "2.0.2", - "versionCode": "20250617", + "versionName": "2.1.0", + "versionCode": "20250627", "transformPx": false, "app-plus": { "usingComponents": true, diff --git a/src/pages-bpm/OfficeEquipmentMaintenanceApplication/index.vue b/src/pages-bpm/OfficeEquipmentMaintenanceApplication/index.vue new file mode 100644 index 0000000..04bf31b --- /dev/null +++ b/src/pages-bpm/OfficeEquipmentMaintenanceApplication/index.vue @@ -0,0 +1,49 @@ + + + diff --git a/src/pages-bpm/SuperiorSystem/index.vue b/src/pages-bpm/SuperiorSystem/index.vue new file mode 100644 index 0000000..0565728 --- /dev/null +++ b/src/pages-bpm/SuperiorSystem/index.vue @@ -0,0 +1,56 @@ + + + diff --git a/src/pages-bpm/khss/index.vue b/src/pages-bpm/khss/index.vue new file mode 100644 index 0000000..0f7ba0d --- /dev/null +++ b/src/pages-bpm/khss/index.vue @@ -0,0 +1,230 @@ + + + + + \ No newline at end of file diff --git a/src/pages-bpm/lawsAndRegulations/index.vue b/src/pages-bpm/lawsAndRegulations/index.vue new file mode 100644 index 0000000..9dbb7f4 --- /dev/null +++ b/src/pages-bpm/lawsAndRegulations/index.vue @@ -0,0 +1,59 @@ + + + diff --git a/src/pages-bpm/zbkh/index.vue b/src/pages-bpm/zbkh/index.vue index 1b27d63..940d603 100644 --- a/src/pages-bpm/zbkh/index.vue +++ b/src/pages-bpm/zbkh/index.vue @@ -1,46 +1,57 @@ - \ No newline at end of file diff --git a/src/pages-home/device-control/office/Personaldevices.vue b/src/pages-home/device-control/office/Personaldevices.vue new file mode 100644 index 0000000..263a5ee --- /dev/null +++ b/src/pages-home/device-control/office/Personaldevices.vue @@ -0,0 +1,44 @@ + + + + + \ No newline at end of file diff --git a/src/pages-home/device-control/office/index.vue b/src/pages-home/device-control/office/index.vue new file mode 100644 index 0000000..f9187cc --- /dev/null +++ b/src/pages-home/device-control/office/index.vue @@ -0,0 +1,36 @@ + + { + layout: 'default', + style: { + navigationBarTitleText: '办公室设备列表', + }, + } + + + + + + + \ No newline at end of file diff --git a/src/pages-home/home/home.vue b/src/pages-home/home/home.vue deleted file mode 100644 index 16c7130..0000000 --- a/src/pages-home/home/home.vue +++ /dev/null @@ -1,20 +0,0 @@ - - { - layout: 'default', - style: { - navigationBarTitleText: '', - }, - } - - - - - - - \ 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-humanResource/absence/index.vue b/src/pages-humanResource/absence/index.vue index b383575..23df1bd 100644 --- a/src/pages-humanResource/absence/index.vue +++ b/src/pages-humanResource/absence/index.vue @@ -118,7 +118,6 @@ pageSize }).then((res) => { if (res.success) { - console.log('----',res.result.records) list.value = [...list.value, ...res.result.records] } loading = false diff --git a/src/pages-operate/sc/index.vue b/src/pages-operate/sc/index.vue index e8d57d4..2628dc1 100644 --- a/src/pages-operate/sc/index.vue +++ b/src/pages-operate/sc/index.vue @@ -83,10 +83,7 @@ new base64().encode(baseUrl + url)) } } else if (/^-?\d+$/.test(quote) && !insFlag) { - getJobDesIdByDepAndName({ - jobname: quote, - jobdep: useUserStore().userInfo.orgCode - }).then((res) => { + getJobDesIdByDepAndName(quote).then((res) => { fileUrl.value = getEnvBaseUrl() + '/jmreport/view/929517863011811328?id=' + res .id + "&token=" + useUserStore().userInfo.token; @@ -113,7 +110,7 @@ } const getList = () => { - getListApi(useUserStore().userInfo.orgCode).then(res => { + getListApi().then(res => { data.value = res.result dataSource.value = [data.value.map(item => { return { diff --git a/src/pages-politics/health/followup.vue b/src/pages-politics/health/followup.vue new file mode 100644 index 0000000..53f7160 --- /dev/null +++ b/src/pages-politics/health/followup.vue @@ -0,0 +1,144 @@ + + { + layout: 'default', + style: { + navigationStyle: 'custom', + navigationBarTitleText: '健康随访问卷', + }, + } + + + + + + + \ No newline at end of file diff --git a/src/pages-politics/healthfollow/HealthDetails.vue b/src/pages-politics/healthfollow/HealthDetails.vue new file mode 100644 index 0000000..76e976f --- /dev/null +++ b/src/pages-politics/healthfollow/HealthDetails.vue @@ -0,0 +1,77 @@ + + { + layout: 'default', + style: { + navigationStyle: 'custom', + navigationBarTitleText: '健康随访详情', + }, + } + + + + + + \ No newline at end of file diff --git a/src/pages-politics/healthfollow/lookhealth.vue b/src/pages-politics/healthfollow/lookhealth.vue new file mode 100644 index 0000000..f201bf0 --- /dev/null +++ b/src/pages-politics/healthfollow/lookhealth.vue @@ -0,0 +1,173 @@ + + + + + \ No newline at end of file diff --git a/src/pages-politics/healthfollow/send.vue b/src/pages-politics/healthfollow/send.vue new file mode 100644 index 0000000..ebf0652 --- /dev/null +++ b/src/pages-politics/healthfollow/send.vue @@ -0,0 +1,148 @@ + + + + + \ No newline at end of file diff --git a/src/pages-politics/healthfollow/sendmessage.vue b/src/pages-politics/healthfollow/sendmessage.vue new file mode 100644 index 0000000..9936d7a --- /dev/null +++ b/src/pages-politics/healthfollow/sendmessage.vue @@ -0,0 +1,81 @@ + + { + layout: 'default', + style: { + navigationStyle: 'custom', + navigationBarTitleText: '健康随访', + }, + } + + + + + + \ No newline at end of file diff --git a/src/pages-process/components/DynamicLink.vue b/src/pages-process/components/DynamicLink.vue index a0fe46a..3347dac 100644 --- a/src/pages-process/components/DynamicLink.vue +++ b/src/pages-process/components/DynamicLink.vue @@ -1,13 +1,16 @@ diff --git a/src/pages.json b/src/pages.json index c5bf3e1..7fa1038 100644 --- a/src/pages.json +++ b/src/pages.json @@ -222,12 +222,16 @@ "root": "pages-home", "pages": [ { - "path": "home/home", + "path": "device-control/office/index", "type": "page", "layout": "default", "style": { - "navigationBarTitleText": "" + "navigationBarTitleText": "办公室设备列表" } + }, + { + "path": "device-control/office/Personaldevices", + "type": "page" } ] }, @@ -479,6 +483,41 @@ "navigationStyle": "custom", "navigationBarTitleText": "健康填报" } + }, + { + "path": "health/followup", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "健康随访问卷" + } + }, + { + "path": "healthfollow/HealthDetails", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "健康随访详情" + } + }, + { + "path": "healthfollow/lookhealth", + "type": "page" + }, + { + "path": "healthfollow/send", + "type": "page" + }, + { + "path": "healthfollow/sendmessage", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "健康随访" + } } ] }, @@ -525,10 +564,26 @@ "path": "document/index", "type": "page" }, + { + "path": "khss/index", + "type": "page" + }, + { + "path": "lawsAndRegulations/index", + "type": "page" + }, { "path": "leaveApplication/index", "type": "page" }, + { + "path": "OfficeEquipmentMaintenanceApplication/index", + "type": "page" + }, + { + "path": "SuperiorSystem/index", + "type": "page" + }, { "path": "unconventional/index", "type": "page" diff --git a/src/pages/user/people.vue b/src/pages/user/people.vue index f4d1354..ccb4f7d 100644 --- a/src/pages/user/people.vue +++ b/src/pages/user/people.vue @@ -52,9 +52,7 @@