diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 9b0d791..4ccd172 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -13,7 +13,7 @@ "type" : "uniCloud" }, { - "playground" : "standard", + "playground" : "custom", "type" : "uni-app:app-android" } ] diff --git a/manifest.json b/manifest.json index d04ff7a..28c8e18 100644 --- a/manifest.json +++ b/manifest.json @@ -1,247 +1,247 @@ { - "name": "作业管控智慧平台", - "appid": "__UNI__5A28908", - "description": "作业管控智慧平台", - "versionName": "1.0.11", - "versionCode": 111, - "transformPx": false, - "app-plus": { - "runmode": "liberate", - "compatible": { - "ignoreVersion": true - }, - "popGesture": "none", - "useragent": { - "value": "Mozilla/5.0 (iPhone; CPU iPhone OS 15_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Html5Plus/1.0 (Immersed/20) uni-app", - "concatenate": true //true则为在默认基础上追加 false则为替换默认 - }, - "usingComponents": true, - "nvueCompiler": "uni-app", - "nvueStyleCompiler": "uni-app", - "compilerVersion": 3, - "nvueLaunchMode": "fast", - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 - }, - "modules": { - "Camera": {}, - "VideoPlayer": {}, - "Barcode": {}, - "FaceID": {}, - "Geolocation": {} - }, - "distribute": { - "android": { - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "schemes": "blob" - }, - "ios": { - "permissions": { - "WRITE_EXTERNAL_STORAGE": { - "description": "允许应用保存文件到外部存储", - "permission": "YES" - }, - "READ_EXTERNAL_STORAGE": { - "description": "允许应用从外部存储读取文件", - "permission": "YES" - } + "name" : "作业管控智慧平台", + "appid" : "__UNI__5A28908", + "description" : "作业管控智慧平台", + "versionName" : "1.0.11", + "versionCode" : 111, + "transformPx" : false, + "app-plus" : { + "runmode" : "liberate", + "compatible" : { + "ignoreVersion" : true }, - "urlschemewhitelist": ["baidumap", "iosamap"], - "dSYMs": false, - "privacyDescription": { - "NSAppleMusicUsageDescription": "库该应用需要访问你的媒体资料,以便为你编辑个人信息", - "NSPhotoLibraryUsageDescription": "该应用需要读取你的相册,以便为你编辑个人信息,更新头像设置", - "NSPhotoLibraryAddUsageDescription": "该应用需要读取你的相册,以便为你编辑个人信息,更新头像设置", - "NSCameraUsageDescription": "该应用需要你的相机,以便你拍摄上传个人信息,更新头像设置,验证是否为本人", - "NSMicrophoneUsageDescription": "", - "NSLocationWhenInUseUsageDescription": "该应用需要你的位置信息,以便为你编辑个人信息", - "NSLocationAlwaysUsageDescription": "该应用需要你的位置信息,以便为你编辑个人信息", - "NSLocationAlwaysAndWhenInUseUsageDescription": "该应用需要你的位置信息,以便为你编辑个人信息", - "NSCalendarsUsageDescription": "该应用需要你的日历,以便为你编辑个人信息", - "NSContactsUsageDescription": "", - "NSLocalNetworkUsageDescription": "该应用需要你的网络,以便为你编辑个人信息" + "popGesture" : "none", + "useragent" : { + "value" : "Mozilla/5.0 (iPhone; CPU iPhone OS 15_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Html5Plus/1.0 (Immersed/20) uni-app", + "concatenate" : true //true则为在默认基础上追加 false则为替换默认 }, - "idfa": false - }, - "sdkConfigs": { - "ad": {}, - "geolocation": { - "system": { - "__platform__": ["ios", "android"] - } - } - }, - "orientation": ["portrait-primary"], - "icons": { - "ios": { - "iphone": { - "app@2x": "unpackage/res/icons/120x120.png", - "app@3x": "unpackage/res/icons/180x180.png", - "spotlight@2x": "unpackage/res/icons/80x80.png", - "notification@2x": "unpackage/res/icons/40x40.png", - "notification@3x": "unpackage/res/icons/60x60.png", - "settings@2x": "unpackage/res/icons/58x58.png", - "settings@3x": "unpackage/res/icons/87x87.png", - "spotlight@3x": "unpackage/res/icons/120x120.png" - }, - "appstore": "unpackage/res/icons/1024x1024.png", - "ipad": { - "app": "unpackage/res/icons/76x76.png", - "app@2x": "unpackage/res/icons/152x152.png", - "notification": "unpackage/res/icons/20x20.png", - "notification@2x": "unpackage/res/icons/40x40.png", - "proapp@2x": "unpackage/res/icons/167x167.png", - "settings": "unpackage/res/icons/29x29.png", - "settings@2x": "unpackage/res/icons/58x58.png", - "spotlight": "unpackage/res/icons/40x40.png", - "spotlight@2x": "unpackage/res/icons/80x80.png" - } + "usingComponents" : true, + "nvueCompiler" : "uni-app", + "nvueStyleCompiler" : "uni-app", + "compilerVersion" : 3, + "nvueLaunchMode" : "fast", + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 }, - "android": { - "hdpi": "unpackage/res/icons/72x72.png", - "xhdpi": "unpackage/res/icons/96x96.png", - "xxhdpi": "unpackage/res/icons/144x144.png", - "xxxhdpi": "unpackage/res/icons/192x192.png" + "modules" : { + "Camera" : {}, + "VideoPlayer" : {}, + "Barcode" : {}, + "FaceID" : {}, + "Geolocation" : {} + }, + "distribute" : { + "android" : { + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "schemes" : "blob" + }, + "ios" : { + "permissions" : { + "WRITE_EXTERNAL_STORAGE" : { + "description" : "允许应用保存文件到外部存储", + "permission" : "YES" + }, + "READ_EXTERNAL_STORAGE" : { + "description" : "允许应用从外部存储读取文件", + "permission" : "YES" + } + }, + "urlschemewhitelist" : [ "baidumap", "iosamap" ], + "dSYMs" : false, + "privacyDescription" : { + "NSAppleMusicUsageDescription" : "库该应用需要访问你的媒体资料,以便为你编辑个人信息", + "NSPhotoLibraryUsageDescription" : "该应用需要读取你的相册,以便为你编辑个人信息,更新头像设置", + "NSPhotoLibraryAddUsageDescription" : "该应用需要读取你的相册,以便为你编辑个人信息,更新头像设置", + "NSCameraUsageDescription" : "该应用需要你的相机,以便你拍摄上传个人信息,更新头像设置,验证是否为本人", + "NSMicrophoneUsageDescription" : "", + "NSLocationWhenInUseUsageDescription" : "该应用需要你的位置信息,以便为你编辑个人信息", + "NSLocationAlwaysUsageDescription" : "该应用需要你的位置信息,以便为你编辑个人信息", + "NSLocationAlwaysAndWhenInUseUsageDescription" : "该应用需要你的位置信息,以便为你编辑个人信息", + "NSCalendarsUsageDescription" : "该应用需要你的日历,以便为你编辑个人信息", + "NSContactsUsageDescription" : "", + "NSLocalNetworkUsageDescription" : "该应用需要你的网络,以便为你编辑个人信息" + }, + "idfa" : false + }, + "sdkConfigs" : { + "ad" : {}, + "geolocation" : { + "system" : { + "__platform__" : [ "ios", "android" ] + } + } + }, + "orientation" : [ "portrait-primary" ], + "icons" : { + "ios" : { + "iphone" : { + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png" + }, + "appstore" : "unpackage/res/icons/1024x1024.png", + "ipad" : { + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" + } + }, + "android" : { + "hdpi" : "unpackage/res/icons/72x72.png", + "xhdpi" : "unpackage/res/icons/96x96.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" + } + }, + "splashscreen" : { + "iosStyle" : "common" + } + }, + "uniStatistics" : { + "enable" : true } - }, - "splashscreen": { - "iosStyle": "common" - } }, - "uniStatistics": { - "enable": true - } - }, - "quickapp": {}, - "quickapp-native": { - "icon": "/static/logo.png", - "package": "com.example.demo", - "features": [ - { - "name": "system.clipboard" - } - ] - }, - "quickapp-webview": { - "icon": "/static/logo.png", - "package": "com.example.demo", - "minPlatformVersion": 1070, - "versionName": "1.0.0", - "versionCode": 100 - }, - "mp-weixin": { - "appid": "", - "setting": { - "urlCheck": false + "quickapp" : {}, + "quickapp-native" : { + "icon" : "/static/logo.png", + "package" : "com.example.demo", + "features" : [ + { + "name" : "system.clipboard" + } + ] }, - "usingComponents": true, - "permission": { - "scope.userLocation": { - "desc": "演示定位能力" - } + "quickapp-webview" : { + "icon" : "/static/logo.png", + "package" : "com.example.demo", + "minPlatformVersion" : 1070, + "versionName" : "1.0.0", + "versionCode" : 100 }, - "uniStatistics": { - "enable": true - } - }, - "mp-alipay": { - "usingComponents": true, - "uniStatistics": { - "enable": true - } - }, - "mp-baidu": { - "usingComponents": true, - "uniStatistics": { - "enable": true - }, - "dynamicLib": { - "editorLib": { - "provider": "swan-editor" - } - } - }, - "mp-toutiao": { - "usingComponents": true, - "uniStatistics": { - "enable": true - } - }, - "mp-jd": { - "usingComponents": true, - "uniStatistics": { - "enable": true - } - }, - "h5": { - "template": "template.h5.html", - "router": { - "mode": "history", - "base": "" - }, - "sdkConfigs": { - "maps": { - "qqmap": { - "key": "TKUBZ-D24AF-GJ4JY-JDVM2-IBYKK-KEBCU" + "mp-weixin" : { + "appid" : "", + "setting" : { + "urlCheck" : false + }, + "usingComponents" : true, + "permission" : { + "scope.userLocation" : { + "desc" : "演示定位能力" + } + }, + "uniStatistics" : { + "enable" : true } - } }, - "async": { - "timeout": 20000 + "mp-alipay" : { + "usingComponents" : true, + "uniStatistics" : { + "enable" : true + } }, - "uniStatistics": { - "enable": true + "mp-baidu" : { + "usingComponents" : true, + "uniStatistics" : { + "enable" : true + }, + "dynamicLib" : { + "editorLib" : { + "provider" : "swan-editor" + } + } + }, + "mp-toutiao" : { + "usingComponents" : true, + "uniStatistics" : { + "enable" : true + } + }, + "mp-jd" : { + "usingComponents" : true, + "uniStatistics" : { + "enable" : true + } + }, + "h5" : { + "template" : "template.h5.html", + "router" : { + "mode" : "history", + "base" : "" + }, + "sdkConfigs" : { + "maps" : { + "qqmap" : { + "key" : "TKUBZ-D24AF-GJ4JY-JDVM2-IBYKK-KEBCU" + } + } + }, + "async" : { + "timeout" : 20000 + }, + "uniStatistics" : { + "enable" : true + } + }, + "vueVersion" : "2", + "mp-kuaishou" : { + "uniStatistics" : { + "enable" : true + } + }, + "mp-lark" : { + "uniStatistics" : { + "enable" : true + } + }, + "mp-qq" : { + "uniStatistics" : { + "enable" : true + } + }, + "quickapp-webview-huawei" : { + "uniStatistics" : { + "enable" : true + } + }, + "quickapp-webview-union" : { + "uniStatistics" : { + "enable" : true + } + }, + "uniStatistics" : { + "version" : "2", + "enable" : true } - }, - "vueVersion": "2", - "mp-kuaishou": { - "uniStatistics": { - "enable": true - } - }, - "mp-lark": { - "uniStatistics": { - "enable": true - } - }, - "mp-qq": { - "uniStatistics": { - "enable": true - } - }, - "quickapp-webview-huawei": { - "uniStatistics": { - "enable": true - } - }, - "quickapp-webview-union": { - "uniStatistics": { - "enable": true - } - }, - "uniStatistics": { - "version": "2", - "enable": true - } } diff --git a/pages/workPlan/custody/index.vue b/pages/workPlan/custody/index.vue index 5c86c05..fb8449f 100644 --- a/pages/workPlan/custody/index.vue +++ b/pages/workPlan/custody/index.vue @@ -462,7 +462,7 @@ export default { }, fail: err => { console.error('获取位置失败:', err) - uni.showToast({ title: '位置获取失败,请稍后尝试' }) + uni.showToast({ title: '位置获取失败,请稍后尝试',icon:'none' }) } }) diff --git a/pages/workPlan/dayPlan/inf-index.vue b/pages/workPlan/dayPlan/inf-index.vue index caec91b..8b88521 100644 --- a/pages/workPlan/dayPlan/inf-index.vue +++ b/pages/workPlan/dayPlan/inf-index.vue @@ -428,7 +428,7 @@ 提交人/提交时间 - {{ item.upUser }}/{{ item.planTime }} + {{ item.upUser }}/{{ item.upTime }} {{ onTypeChange(item.state) }} diff --git a/pages/workPlan/dayPlan/pro-index.vue b/pages/workPlan/dayPlan/pro-index.vue index 1c6cd33..caf2c76 100644 --- a/pages/workPlan/dayPlan/pro-index.vue +++ b/pages/workPlan/dayPlan/pro-index.vue @@ -436,7 +436,7 @@ 提交人/提交时间 - {{ item.upUser }}/{{ item.planTime }} + {{ item.upUser }}/{{ item.upTime }} {{ onTypeChange(item.state) }} diff --git a/pages/workPlan/index/components/calendar.vue b/pages/workPlan/index/components/calendar.vue index cd8ad5b..2da00ef 100644 --- a/pages/workPlan/index/components/calendar.vue +++ b/pages/workPlan/index/components/calendar.vue @@ -93,9 +93,9 @@ - {{ currentDayInfo.proName }} + {{ currentDayInfo.proName || '' }} - {{ currentDayInfo.rys }} + {{ currentDayInfo.rys || '' }} 可接受:{{ currentDayInfo.kjsfx }} @@ -166,7 +166,9 @@ export default { todayCount: 0, currentQueryDay: this.$moment().format('YYYY-MM'), currentPramsWeekDay: '', - currentDayInfo: {} + currentDayInfo: { + proName: '' + } } }, computed: { @@ -376,8 +378,10 @@ export default { /* 获取当日数据 */ async getProFxByDayFun() { const res = await getProFxByDayApi({ day: this.currentDay }) - this.currentDayInfo = res.data[0] - console.log('----------当日数据', res) + if (res.data.length > 0) { + this.currentDayInfo = res.data[0] + console.log('----------当日数据', res) + } }, onViewPersonDetails(id) { uni.navigateTo({ url: `/pages/realName/index/pages/personDetail?idNumber=${id}` }) diff --git a/pages/workPlan/index/components/day-risk-view.vue b/pages/workPlan/index/components/day-risk-view.vue index 59b500b..e1c2f33 100644 --- a/pages/workPlan/index/components/day-risk-view.vue +++ b/pages/workPlan/index/components/day-risk-view.vue @@ -10,7 +10,7 @@ 本周风险数 {{ weekNum }} - 累计总数: {{ weekNum }} + 累计总数: {{ weekAmount }} @@ -24,7 +24,7 @@ export default { monthNum: 0, monthAmount: 9520, weekNum: 0, - weekAmount: 9820 + weekAmount: 0 } }, methods: { @@ -40,6 +40,9 @@ export default { if (e.type == 'w1') { this.weekNum = e.num } + if (e.type == 'w2') { + this.weekAmount = e.num + } }) } } diff --git a/pages/workPlan/my/index.vue b/pages/workPlan/my/index.vue index dde0f50..0cedf94 100644 --- a/pages/workPlan/my/index.vue +++ b/pages/workPlan/my/index.vue @@ -35,8 +35,11 @@ export default { } }, methods: { + // 返回 leftClick() { - uni.navigateBack() + uni.reLaunch({ + url: '/pages/gzt/index' + }) } }, onLoad() { diff --git a/pages/workPlan/weekPlan/inf-index.vue b/pages/workPlan/weekPlan/inf-index.vue index b45884f..8d03e82 100644 --- a/pages/workPlan/weekPlan/inf-index.vue +++ b/pages/workPlan/weekPlan/inf-index.vue @@ -463,7 +463,7 @@ 提交人/提交时间 - {{ item.upUser }}/{{ item.planTime }} + {{ item.upUser }}/{{ item.upTime }} {{ onTypeChange(item.state) }} diff --git a/pages/workPlan/weekPlan/pro-index.vue b/pages/workPlan/weekPlan/pro-index.vue index 864eced..9dcc6eb 100644 --- a/pages/workPlan/weekPlan/pro-index.vue +++ b/pages/workPlan/weekPlan/pro-index.vue @@ -481,7 +481,7 @@ 提交人/提交时间 - {{ item.upUser }}/{{ item.planTime }} + {{ item.upUser }}/{{ item.upTime }} {{ onTypeChange(item.state) }} diff --git a/pages/workPlan/weekPlanAuditingDetails/inf-index.vue b/pages/workPlan/weekPlanAuditingDetails/inf-index.vue index 0153d5f..f25ae13 100644 --- a/pages/workPlan/weekPlanAuditingDetails/inf-index.vue +++ b/pages/workPlan/weekPlanAuditingDetails/inf-index.vue @@ -685,12 +685,15 @@ export default { } console.log('saveParams保存参数', params) - + uni.showLoading({ + title: '正在提交,请稍后...' + }) const result = await submitPlanApi(params) console.log(result, 'results上报人提交结果') if (result.res == 1) { uni.showToast({ title: `审核成功`, icon: 'none' }) + uni.hideLoading() setTimeout(() => { uni.navigateBack({ delta: 1, @@ -711,7 +714,6 @@ export default { uni.showToast({ title: '请选择审核意见', icon: 'none' }) } else if (this.isPass === 0) { // 走审核通过的逻辑 - updateInfPlanContentApi({ id: JSON.stringify(this.monthDetailsList) }).then(async res => { console.log('修改结果---', res) if (res.res == 1 && this.roles == 24) { @@ -724,10 +726,14 @@ export default { user: '' // state: '2' } + uni.showLoading({ + title: '正在提交,请稍后...' + }) const result = await submitPlanApi(params) console.log(result, 'results上报人提交结果') if (result.res == 1) { uni.showToast({ title: `审核成功`, icon: 'none' }) + uni.hideLoading() setTimeout(() => { uni.navigateBack({ delta: 1, @@ -893,18 +899,18 @@ export default { } .revoke { - width: 100%; + width: 94%; padding: 12px 0; position: fixed; bottom: 0; - left: 0; + left: 3%; display: flex; justify-content: center; align-items: center; // background-color: #fff; .auditing-complete { - width: 98%; + width: 100%; height: 70rpx; margin: 0 auto; border-radius: 16rpx; diff --git a/pages/workPlan/workPlan/index.vue b/pages/workPlan/workPlan/index.vue index 360e2c3..763055b 100644 --- a/pages/workPlan/workPlan/index.vue +++ b/pages/workPlan/workPlan/index.vue @@ -187,11 +187,11 @@ export default { console.log('params参数', params) uni.request({ - url: `${config.realNewBmwUrl}${ + url: `${config.workPlanNewYnUrl}${ row.isCollect == 0 ? '/app/offLine/insertCollect' : '/app/offLine/deleteCollect' }`, method: 'POST', - data: JSON.stringify(params), + data: JSON.stringify(params), //192.168.0.14:19191/ynPlanApp/ header: { 'Content-Type': 'application/json', token: this.token