hywen
/
YNUtdPlatform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码优化

This commit is contained in:
BianLzhaoMin 2024-11-04 10:13:18 +08:00
parent 58e42dd8d6
commit 2d43edd5b8
12 changed files with 271 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.hbuilderx/launch.json
View File

@ -13,7 +13,7 @@
"type" : "uniCloud" "type" : "uniCloud"
}, },
{ {
"playground" : "standard", "playground" : "custom",
"type" : "uni-app:app-android" "type" : "uni-app:app-android"
} }
] ]

334
manifest.json
View File

@ -1,41 +1,41 @@
{ {
"name": "作业管控智慧平台", "name" : "作业管控智慧平台",
"appid": "__UNI__5A28908", "appid" : "__UNI__5A28908",
"description": "作业管控智慧平台", "description" : "作业管控智慧平台",
"versionName": "1.0.11", "versionName" : "1.0.11",
"versionCode": 111, "versionCode" : 111,
"transformPx": false, "transformPx" : false,
"app-plus": { "app-plus" : {
"runmode": "liberate", "runmode" : "liberate",
"compatible": { "compatible" : {
"ignoreVersion": true "ignoreVersion" : true
}, },
"popGesture": "none", "popGesture" : "none",
"useragent": { "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", "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则为替换默认 "concatenate" : true //true则为在默认基础上追加 false则为替换默认
}, },
"usingComponents": true, "usingComponents" : true,
"nvueCompiler": "uni-app", "nvueCompiler" : "uni-app",
"nvueStyleCompiler": "uni-app", "nvueStyleCompiler" : "uni-app",
"compilerVersion": 3, "compilerVersion" : 3,
"nvueLaunchMode": "fast", "nvueLaunchMode" : "fast",
"splashscreen": { "splashscreen" : {
"alwaysShowBeforeRender": true, "alwaysShowBeforeRender" : true,
"waiting": true, "waiting" : true,
"autoclose": true, "autoclose" : true,
"delay": 0 "delay" : 0
}, },
"modules": { "modules" : {
"Camera": {}, "Camera" : {},
"VideoPlayer": {}, "VideoPlayer" : {},
"Barcode": {}, "Barcode" : {},
"FaceID": {}, "FaceID" : {},
"Geolocation": {} "Geolocation" : {}
}, },
"distribute": { "distribute" : {
"android": { "android" : {
"permissions": [ "permissions" : [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>", "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
@ -54,194 +54,194 @@
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>" "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>"
], ],
"schemes": "blob" "schemes" : "blob"
}, },
"ios": { "ios" : {
"permissions": { "permissions" : {
"WRITE_EXTERNAL_STORAGE": { "WRITE_EXTERNAL_STORAGE" : {
"description": "允许应用保存文件到外部存储", "description" : "允许应用保存文件到外部存储",
"permission": "YES" "permission" : "YES"
}, },
"READ_EXTERNAL_STORAGE": { "READ_EXTERNAL_STORAGE" : {
"description": "允许应用从外部存储读取文件", "description" : "允许应用从外部存储读取文件",
"permission": "YES" "permission" : "YES"
} }
}, },
"urlschemewhitelist": ["baidumap", "iosamap"], "urlschemewhitelist" : [ "baidumap", "iosamap" ],
"dSYMs": false, "dSYMs" : false,
"privacyDescription": { "privacyDescription" : {
"NSAppleMusicUsageDescription": "库该应用需要访问你的媒体资料，以便为你编辑个人信息", "NSAppleMusicUsageDescription" : "库该应用需要访问你的媒体资料，以便为你编辑个人信息",
"NSPhotoLibraryUsageDescription": "该应用需要读取你的相册，以便为你编辑个人信息，更新头像设置", "NSPhotoLibraryUsageDescription" : "该应用需要读取你的相册，以便为你编辑个人信息，更新头像设置",
"NSPhotoLibraryAddUsageDescription": "该应用需要读取你的相册，以便为你编辑个人信息，更新头像设置", "NSPhotoLibraryAddUsageDescription" : "该应用需要读取你的相册，以便为你编辑个人信息，更新头像设置",
"NSCameraUsageDescription": "该应用需要你的相机，以便你拍摄上传个人信息，更新头像设置，验证是否为本人", "NSCameraUsageDescription" : "该应用需要你的相机，以便你拍摄上传个人信息，更新头像设置，验证是否为本人",
"NSMicrophoneUsageDescription": "", "NSMicrophoneUsageDescription" : "",
"NSLocationWhenInUseUsageDescription": "该应用需要你的位置信息，以便为你编辑个人信息", "NSLocationWhenInUseUsageDescription" : "该应用需要你的位置信息，以便为你编辑个人信息",
"NSLocationAlwaysUsageDescription": "该应用需要你的位置信息，以便为你编辑个人信息", "NSLocationAlwaysUsageDescription" : "该应用需要你的位置信息，以便为你编辑个人信息",
"NSLocationAlwaysAndWhenInUseUsageDescription": "该应用需要你的位置信息，以便为你编辑个人信息", "NSLocationAlwaysAndWhenInUseUsageDescription" : "该应用需要你的位置信息，以便为你编辑个人信息",
"NSCalendarsUsageDescription": "该应用需要你的日历，以便为你编辑个人信息", "NSCalendarsUsageDescription" : "该应用需要你的日历，以便为你编辑个人信息",
"NSContactsUsageDescription": "", "NSContactsUsageDescription" : "",
"NSLocalNetworkUsageDescription": "该应用需要你的网络，以便为你编辑个人信息" "NSLocalNetworkUsageDescription" : "该应用需要你的网络，以便为你编辑个人信息"
}, },
"idfa": false "idfa" : false
}, },
"sdkConfigs": { "sdkConfigs" : {
"ad": {}, "ad" : {},
"geolocation": { "geolocation" : {
"system": { "system" : {
"__platform__": ["ios", "android"] "__platform__" : [ "ios", "android" ]
} }
} }
}, },
"orientation": ["portrait-primary"], "orientation" : [ "portrait-primary" ],
"icons": { "icons" : {
"ios": { "ios" : {
"iphone": { "iphone" : {
"app@2x": "unpackage/res/icons/120x120.png", "app@2x" : "unpackage/res/icons/120x120.png",
"app@3x": "unpackage/res/icons/180x180.png", "app@3x" : "unpackage/res/icons/180x180.png",
"spotlight@2x": "unpackage/res/icons/80x80.png", "spotlight@2x" : "unpackage/res/icons/80x80.png",
"notification@2x": "unpackage/res/icons/40x40.png", "notification@2x" : "unpackage/res/icons/40x40.png",
"notification@3x": "unpackage/res/icons/60x60.png", "notification@3x" : "unpackage/res/icons/60x60.png",
"settings@2x": "unpackage/res/icons/58x58.png", "settings@2x" : "unpackage/res/icons/58x58.png",
"settings@3x": "unpackage/res/icons/87x87.png", "settings@3x" : "unpackage/res/icons/87x87.png",
"spotlight@3x": "unpackage/res/icons/120x120.png" "spotlight@3x" : "unpackage/res/icons/120x120.png"
}, },
"appstore": "unpackage/res/icons/1024x1024.png", "appstore" : "unpackage/res/icons/1024x1024.png",
"ipad": { "ipad" : {
"app": "unpackage/res/icons/76x76.png", "app" : "unpackage/res/icons/76x76.png",
"app@2x": "unpackage/res/icons/152x152.png", "app@2x" : "unpackage/res/icons/152x152.png",
"notification": "unpackage/res/icons/20x20.png", "notification" : "unpackage/res/icons/20x20.png",
"notification@2x": "unpackage/res/icons/40x40.png", "notification@2x" : "unpackage/res/icons/40x40.png",
"proapp@2x": "unpackage/res/icons/167x167.png", "proapp@2x" : "unpackage/res/icons/167x167.png",
"settings": "unpackage/res/icons/29x29.png", "settings" : "unpackage/res/icons/29x29.png",
"settings@2x": "unpackage/res/icons/58x58.png", "settings@2x" : "unpackage/res/icons/58x58.png",
"spotlight": "unpackage/res/icons/40x40.png", "spotlight" : "unpackage/res/icons/40x40.png",
"spotlight@2x": "unpackage/res/icons/80x80.png" "spotlight@2x" : "unpackage/res/icons/80x80.png"
} }
}, },
"android": { "android" : {
"hdpi": "unpackage/res/icons/72x72.png", "hdpi" : "unpackage/res/icons/72x72.png",
"xhdpi": "unpackage/res/icons/96x96.png", "xhdpi" : "unpackage/res/icons/96x96.png",
"xxhdpi": "unpackage/res/icons/144x144.png", "xxhdpi" : "unpackage/res/icons/144x144.png",
"xxxhdpi": "unpackage/res/icons/192x192.png" "xxxhdpi" : "unpackage/res/icons/192x192.png"
} }
}, },
"splashscreen": { "splashscreen" : {
"iosStyle": "common" "iosStyle" : "common"
} }
}, },
"uniStatistics": { "uniStatistics" : {
"enable": true "enable" : true
} }
}, },
"quickapp": {}, "quickapp" : {},
"quickapp-native": { "quickapp-native" : {
"icon": "/static/logo.png", "icon" : "/static/logo.png",
"package": "com.example.demo", "package" : "com.example.demo",
"features": [ "features" : [
{ {
"name": "system.clipboard" "name" : "system.clipboard"
} }
] ]
}, },
"quickapp-webview": { "quickapp-webview" : {
"icon": "/static/logo.png", "icon" : "/static/logo.png",
"package": "com.example.demo", "package" : "com.example.demo",
"minPlatformVersion": 1070, "minPlatformVersion" : 1070,
"versionName": "1.0.0", "versionName" : "1.0.0",
"versionCode": 100 "versionCode" : 100
}, },
"mp-weixin": { "mp-weixin" : {
"appid": "", "appid" : "",
"setting": { "setting" : {
"urlCheck": false "urlCheck" : false
}, },
"usingComponents": true, "usingComponents" : true,
"permission": { "permission" : {
"scope.userLocation": { "scope.userLocation" : {
"desc": "演示定位能力" "desc" : "演示定位能力"
} }
}, },
"uniStatistics": { "uniStatistics" : {
"enable": true "enable" : true
} }
}, },
"mp-alipay": { "mp-alipay" : {
"usingComponents": true, "usingComponents" : true,
"uniStatistics": { "uniStatistics" : {
"enable": true "enable" : true
} }
}, },
"mp-baidu": { "mp-baidu" : {
"usingComponents": true, "usingComponents" : true,
"uniStatistics": { "uniStatistics" : {
"enable": true "enable" : true
}, },
"dynamicLib": { "dynamicLib" : {
"editorLib": { "editorLib" : {
"provider": "swan-editor" "provider" : "swan-editor"
} }
} }
}, },
"mp-toutiao": { "mp-toutiao" : {
"usingComponents": true, "usingComponents" : true,
"uniStatistics": { "uniStatistics" : {
"enable": true "enable" : true
} }
}, },
"mp-jd": { "mp-jd" : {
"usingComponents": true, "usingComponents" : true,
"uniStatistics": { "uniStatistics" : {
"enable": true "enable" : true
} }
}, },
"h5": { "h5" : {
"template": "template.h5.html", "template" : "template.h5.html",
"router": { "router" : {
"mode": "history", "mode" : "history",
"base": "" "base" : ""
}, },
"sdkConfigs": { "sdkConfigs" : {
"maps": { "maps" : {
"qqmap": { "qqmap" : {
"key": "TKUBZ-D24AF-GJ4JY-JDVM2-IBYKK-KEBCU" "key" : "TKUBZ-D24AF-GJ4JY-JDVM2-IBYKK-KEBCU"
} }
} }
}, },
"async": { "async" : {
"timeout": 20000 "timeout" : 20000
}, },
"uniStatistics": { "uniStatistics" : {
"enable": true "enable" : true
} }
}, },
"vueVersion": "2", "vueVersion" : "2",
"mp-kuaishou": { "mp-kuaishou" : {
"uniStatistics": { "uniStatistics" : {
"enable": true "enable" : true
} }
}, },
"mp-lark": { "mp-lark" : {
"uniStatistics": { "uniStatistics" : {
"enable": true "enable" : true
} }
}, },
"mp-qq": { "mp-qq" : {
"uniStatistics": { "uniStatistics" : {
"enable": true "enable" : true
} }
}, },
"quickapp-webview-huawei": { "quickapp-webview-huawei" : {
"uniStatistics": { "uniStatistics" : {
"enable": true "enable" : true
} }
}, },
"quickapp-webview-union": { "quickapp-webview-union" : {
"uniStatistics": { "uniStatistics" : {
"enable": true "enable" : true
} }
}, },
"uniStatistics": { "uniStatistics" : {
"version": "2", "version" : "2",
"enable": true "enable" : true
} }
} }

2
pages/workPlan/custody/index.vue
View File

@ -462,7 +462,7 @@ export default {
}, },
fail: err => { fail: err => {
console.error('获取位置失败:', err) console.error('获取位置失败:', err)
uni.showToast({ title: '位置获取失败，请稍后尝试' }) uni.showToast({ title: '位置获取失败，请稍后尝试',icon:'none' })
} }
}) })

2
pages/workPlan/dayPlan/inf-index.vue
View File

@ -428,7 +428,7 @@
<view class="item-time"> <view class="item-time">
<text>提交人/提交时间</text> <text>提交人/提交时间</text>
<text>{{ item.upUser }}/{{ item.planTime }}</text> <text>{{ item.upUser }}/{{ item.upTime }}</text>
<text :class="getTYpeStyle(item.state)">{{ onTypeChange(item.state) }}</text> <text :class="getTYpeStyle(item.state)">{{ onTypeChange(item.state) }}</text>
</view> </view>
</view> </view>

2
pages/workPlan/dayPlan/pro-index.vue
View File

@ -436,7 +436,7 @@
<view class="item-time"> <view class="item-time">
<text>提交人/提交时间</text> <text>提交人/提交时间</text>
<text>{{ item.upUser }}/{{ item.planTime }}</text> <text>{{ item.upUser }}/{{ item.upTime }}</text>
<text :class="getTYpeStyle(item.state)">{{ onTypeChange(item.state) }}</text> <text :class="getTYpeStyle(item.state)">{{ onTypeChange(item.state) }}</text>
</view> </view>
</view> </view>

10
pages/workPlan/index/components/calendar.vue
View File

@ -93,9 +93,9 @@
</view> </view>
<view class="day-td"> <view class="day-td">
<view>{{ currentDayInfo.proName }}</view> <view>{{ currentDayInfo.proName || '' }}</view>
<view> <view>
<text>{{ currentDayInfo.rys }}</text> <text>{{ currentDayInfo.rys || '' }}</text>
</view> </view>
<view @tap="onViewPersonDetails(currentDayInfo.idNumber)"> <view @tap="onViewPersonDetails(currentDayInfo.idNumber)">
<text class="style_4" v-if="currentDayInfo.kjsfx > 0">可接受:{{ currentDayInfo.kjsfx }}</text> <text class="style_4" v-if="currentDayInfo.kjsfx > 0">可接受:{{ currentDayInfo.kjsfx }}</text>
@ -166,7 +166,9 @@ export default {
todayCount: 0, todayCount: 0,
currentQueryDay: this.$moment().format('YYYY-MM'), currentQueryDay: this.$moment().format('YYYY-MM'),
currentPramsWeekDay: '', currentPramsWeekDay: '',
currentDayInfo: {} currentDayInfo: {
proName: ''
}
} }
}, },
computed: { computed: {
@ -376,8 +378,10 @@ export default {
/* 获取当日数据 */ /* 获取当日数据 */
async getProFxByDayFun() { async getProFxByDayFun() {
const res = await getProFxByDayApi({ day: this.currentDay }) const res = await getProFxByDayApi({ day: this.currentDay })
if (res.data.length > 0) {
this.currentDayInfo = res.data[0] this.currentDayInfo = res.data[0]
console.log('----------当日数据', res) console.log('----------当日数据', res)
}
}, },
onViewPersonDetails(id) { onViewPersonDetails(id) {
uni.navigateTo({ url: `/pages/realName/index/pages/personDetail?idNumber=${id}` }) uni.navigateTo({ url: `/pages/realName/index/pages/personDetail?idNumber=${id}` })

7
pages/workPlan/index/components/day-risk-view.vue
View File

@ -10,7 +10,7 @@
<view class="left-right"> <view class="left-right">
<text>本周风险数</text> <text>本周风险数</text>
<text>{{ weekNum }}</text> <text>{{ weekNum }}</text>
<text>累计总数： {{ weekNum }}</text> <text>累计总数： {{ weekAmount }}</text>
</view> </view>
</view> </view>
</view> </view>
@ -24,7 +24,7 @@ export default {
monthNum: 0, monthNum: 0,
monthAmount: 9520, monthAmount: 9520,
weekNum: 0, weekNum: 0,
weekAmount: 9820 weekAmount: 0
} }
}, },
methods: { methods: {
@ -40,6 +40,9 @@ export default {
if (e.type == 'w1') { if (e.type == 'w1') {
this.weekNum = e.num this.weekNum = e.num
} }
if (e.type == 'w2') {
this.weekAmount = e.num
}
}) })
} }
} }

5
pages/workPlan/my/index.vue
View File

@ -35,8 +35,11 @@ export default {
} }
}, },
methods: { methods: {
// 返回
leftClick() { leftClick() {
uni.navigateBack() uni.reLaunch({
url: '/pages/gzt/index'
})
} }
}, },
onLoad() { onLoad() {

2
pages/workPlan/weekPlan/inf-index.vue
View File

@ -463,7 +463,7 @@
<view class="item-time"> <view class="item-time">
<text>提交人/提交时间</text> <text>提交人/提交时间</text>
<text>{{ item.upUser }}/{{ item.planTime }}</text> <text>{{ item.upUser }}/{{ item.upTime }}</text>
<text :class="getTYpeStyle(item.state)">{{ onTypeChange(item.state) }}</text> <text :class="getTYpeStyle(item.state)">{{ onTypeChange(item.state) }}</text>
</view> </view>
</view> </view>

2
pages/workPlan/weekPlan/pro-index.vue
View File

@ -481,7 +481,7 @@
<view class="item-time"> <view class="item-time">
<text>提交人/提交时间</text> <text>提交人/提交时间</text>
<text>{{ item.upUser }}/{{ item.planTime }}</text> <text>{{ item.upUser }}/{{ item.upTime }}</text>
<text :class="getTYpeStyle(item.state)">{{ onTypeChange(item.state) }}</text> <text :class="getTYpeStyle(item.state)">{{ onTypeChange(item.state) }}</text>
</view> </view>
</view> </view>

16
pages/workPlan/weekPlanAuditingDetails/inf-index.vue
View File

@ -685,12 +685,15 @@ export default {
} }
console.log('saveParams保存参数', params) console.log('saveParams保存参数', params)
uni.showLoading({
title: '正在提交，请稍后...'
})
const result = await submitPlanApi(params) const result = await submitPlanApi(params)
console.log(result, 'results上报人提交结果') console.log(result, 'results上报人提交结果')
if (result.res == 1) { if (result.res == 1) {
uni.showToast({ title: `审核成功`, icon: 'none' }) uni.showToast({ title: `审核成功`, icon: 'none' })
uni.hideLoading()
setTimeout(() => { setTimeout(() => {
uni.navigateBack({ uni.navigateBack({
delta: 1, delta: 1,
@ -711,7 +714,6 @@ export default {
uni.showToast({ title: '请选择审核意见', icon: 'none' }) uni.showToast({ title: '请选择审核意见', icon: 'none' })
} else if (this.isPass === 0) { } else if (this.isPass === 0) {
// 走审核通过的逻辑 // 走审核通过的逻辑
updateInfPlanContentApi({ id: JSON.stringify(this.monthDetailsList) }).then(async res => { updateInfPlanContentApi({ id: JSON.stringify(this.monthDetailsList) }).then(async res => {
console.log('修改结果---', res) console.log('修改结果---', res)
if (res.res == 1 && this.roles == 24) { if (res.res == 1 && this.roles == 24) {
@ -724,10 +726,14 @@ export default {
user: '' user: ''
// state: '2' // state: '2'
} }
uni.showLoading({
title: '正在提交，请稍后...'
})
const result = await submitPlanApi(params) const result = await submitPlanApi(params)
console.log(result, 'results上报人提交结果') console.log(result, 'results上报人提交结果')
if (result.res == 1) { if (result.res == 1) {
uni.showToast({ title: `审核成功`, icon: 'none' }) uni.showToast({ title: `审核成功`, icon: 'none' })
uni.hideLoading()
setTimeout(() => { setTimeout(() => {
uni.navigateBack({ uni.navigateBack({
delta: 1, delta: 1,
@ -893,18 +899,18 @@ export default {
} }
.revoke { .revoke {
width: 100%; width: 94%;
padding: 12px 0; padding: 12px 0;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
left: 0; left: 3%;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
// background-color: #fff; // background-color: #fff;
.auditing-complete { .auditing-complete {
width: 98%; width: 100%;
height: 70rpx; height: 70rpx;
margin: 0 auto; margin: 0 auto;
border-radius: 16rpx; border-radius: 16rpx;

4
pages/workPlan/workPlan/index.vue
View File

@ -187,11 +187,11 @@ export default {
console.log('params参数', params) console.log('params参数', params)
uni.request({ uni.request({
url: `${config.realNewBmwUrl}${ url: `${config.workPlanNewYnUrl}${
row.isCollect == 0 ? '/app/offLine/insertCollect' : '/app/offLine/deleteCollect' row.isCollect == 0 ? '/app/offLine/insertCollect' : '/app/offLine/deleteCollect'
}`, }`,
method: 'POST', method: 'POST',
data: JSON.stringify(params), data: JSON.stringify(params), //192.168.0.14:19191/ynPlanApp/
header: { header: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
token: this.token token: this.token