admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

成润项目问题修复

Browse Source
This commit is contained in:
jxj_yjl 2023-06-19 19:28:30 +08:00
parent 76ecefbca6
commit d17247deb7
10 changed files with 6959 additions and 6569 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
components/u-charts/component.vue
View File

@ -1,6 +1,7 @@
<template> <template>
<canvas v-if="canvasId" :id="canvasId" :canvasId="canvasId" :style="{'width':cWidth*pixelRatio+'px','height':cHeight*pixelRatio+'px', 'transform': 'scale('+(1/pixelRatio)+')','margin-left':-cWidth*(pixelRatio-1)/2+'px','margin-top':-cHeight*(pixelRatio-1)/2+'px'}" <canvas v-if="canvasId" :id="canvasId" :canvasId="canvasId"
@touchstart="touchStart" @touchmove="touchMove" @touchend="touchEnd" @error="error"> :style="{'width':cWidth*pixelRatio+'px','height':cHeight*pixelRatio+'px', 'transform': 'scale('+(1/pixelRatio)+')','margin-left':-cWidth*(pixelRatio-1)/2+'px','margin-top':-cHeight*(pixelRatio-1)/2+'px'}"
@touchstart="touchStart" @touchmove="touchMove" @touchend="touchEnd" @error="error">
</canvas> </canvas>
</template> </template>
@ -54,40 +55,67 @@
] ]
} }
}, },
mounted() {
// this.$nextTick(() => {
// this.init();
// })
},
watch: { watch: {
opts: { opts: {
handler(newVal, oldVal) { handler(newVal, oldVal) {
this.init(); // // this.init();
// console.log('canvases') // // console.log('canvases')
// console.log(canvases) // // console.log(canvases)
// if(canvases=={}){ // if (canvases = {}) {
// this.init(); // // this.$nextTick(() => {
// }else{ // // this.init();
// this.changeData(this.canvasId,newVal) // // })
// } // setTimeout(()=>{
this.init();
this.changeData(this.canvasId, newVal)
// },600)
// } else {
// }
}, },
deep: true, deep: true,
immediate: true, immediate: true,
} }
}, },
mounted() {
// this.init();
},
methods: { methods: {
init() { init() {
console.log('图表初始化') console.log('图表初始化')
switch (this.chartType) { switch (this.chartType) {
case 'column': case 'column':
this.initColumnChart(); this.$nextTick(() => {
console.log('图表初始化1')
this.initColumnChart();
})
break; break;
case 'line': case 'line':
this.initLineChart(); this.$nextTick(() => {
console.log('图表初始化2')
this.initLineChart();
})
break; break;
case 'arcbar': //半圆 case 'arcbar': //半圆
this.initArcbarChart(); console.log('图表初始化3')
setTimeout(()=>{
this.initArcbarChart();
},1200)
break; break;
case 'ring': //圆环 case 'ring': //圆环
this.initRingChart(); this.$nextTick(() => {
console.log('图表初始化4')
this.initRingChart();
})
break; break;
default: default:
break; break;
@ -96,8 +124,8 @@
initColumnChart() { initColumnChart() {
var xData = this.opts.categories var xData = this.opts.categories
for (var i = 0; i < xData.length; i++) { for (var i = 0; i < xData.length; i++) {
if(xData[i].length>5){ if (xData[i].length > 5) {
xData[i]=xData[i].substring(0,5)+'...' xData[i] = xData[i].substring(0, 5) + '...'
} }
} }
@ -119,7 +147,7 @@
xAxis: { xAxis: {
disableGrid: true, disableGrid: true,
itemCount: 6, itemCount: 6,
labelCount:this.opts.categories.length, labelCount: this.opts.categories.length,
rotateLabel: true rotateLabel: true
}, },
yAxis: { yAxis: {
@ -145,13 +173,13 @@
width: 14 width: 14
} }
}, },
scales:{ scales: {
xAxis: [{ xAxis: [{
stacked: true, stacked: true,
ticks: { ticks: {
fontColor: 'red' // X轴样式 fontColor: 'red' // X轴样式
} }
}], }],
} }
}); });
}, },
@ -188,7 +216,7 @@
gridColor: 'rgba(42, 43, 91, 0.1)', gridColor: 'rgba(42, 43, 91, 0.1)',
// dashLength: 8, // dashLength: 8,
// splitNumber: 5, // splitNumber: 5,
min:0, min: 0,
// max: 180, // max: 180,
// format: (val) => { // format: (val) => {
// return val.toFixed(0) + '元' // return val.toFixed(0) + '元'
@ -255,51 +283,54 @@
//圆环 //圆环
initRingChart() { initRingChart() {
console.log('this.canvasId',this.canvasId) console.log('this.canvasId', this.canvasId)
var dataLabel=false,legend=false; var dataLabel = false,
legend = false;
var radius = 0; var radius = 0;
if(this.canvasId=='integritySafety'){ if (this.canvasId == 'integritySafety') {
dataLabel=legend=true dataLabel = legend = true
} }
if(this.canvasId=='qualityPieChart'){ if (this.canvasId == 'qualityPieChart') {
radius = 30 radius = 30
} }
canvases[this.canvasId] = new uCharts({ canvases[this.canvasId] = new uCharts({
$this: this, $this: this,
canvasId: this.canvasId, canvasId: this.canvasId,
type: 'ring', type: 'ring',
fontSize: 11, fontSize: 11,
title: this.opts.title, title: this.opts.title,
legend: {show:legend}, legend: {
extra: { show: legend
pie: { },
ringWidth:12, extra: {
offsetAngle:-90, pie: {
activeRadius:radius, ringWidth: 12,
}, offsetAngle: -90,
tooltip:{ activeRadius: radius,
showBox:false, },
} tooltip: {
}, showBox: false,
width: this.cWidth, }
height: this.cHeight, },
background: '#FFFFFF', width: this.cWidth,
series: this.opts.series, height: this.cHeight,
dataLabel: dataLabel, background: '#FFFFFF',
}); series: this.opts.series,
dataLabel: dataLabel,
});
}, },
// 这里仅作为示例传入两个参数，cid为canvas-id,newdata为更新的数据，需要更多参数请自行修改 // 这里仅作为示例传入两个参数，cid为canvas-id,newdata为更新的数据，需要更多参数请自行修改
changeData(cid, newdata) { changeData(cid, newdata) {
console.log('updateData',newdata) console.log('updateData', newdata)
console.log(canvases[cid]) console.log(canvases[cid])
var xData = newdata.categories var xData = newdata.categories
for (var i = 0; i < xData.length; i++) { for (var i = 0; i < xData.length; i++) {
if(xData[i].length>5){ if (xData[i].length > 5) {
xData[i]=xData[i].substring(0,5)+'...' xData[i] = xData[i].substring(0, 5) + '...'
} }
} }

6
main.js
View File

@ -52,9 +52,9 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.url_config = 'http://42.194.144.62:8088'//新中建四局地址 // Vue.prototype.url_config = 'http://42.194.144.62:8088'//新中建四局地址
// Vue.prototype.url_config = 'http://192.168.34.221:11111/'//郭圣雄三江本地 // Vue.prototype.url_config = 'http://192.168.34.221:11111/'//郭圣雄三江本地
// Vue.prototype.url_config = 'http://182.90.224.147:15551'//成润线上 // Vue.prototype.url_config = 'http://182.90.224.147:15551'//成润线上
//Vue.prototype.url_config = 'http://118.121.198.147:23232'//成润正式 Vue.prototype.url_config = 'http://118.121.198.147:23232'//成润正式
Vue.prototype.url_config = 'http://huli.zjzhiliao.com/jxjgdapi'//成润正式 // Vue.prototype.url_config = 'http://huli.zjzhiliao.com/jxjgdapi'//金林湾测试
//http://huli.zjzhiliao.com/jxjgdapi/
} }
} else { } else {

4
pages/projectEnd/dailyCheck/reply.vue
View File

@ -151,7 +151,9 @@
if(res.code==200){ if(res.code==200){
uni.showToast({ uni.showToast({
title:"新增整改回复成功", title:"新增整改回复成功",
duration:2000 duration:2000,
icon: 'none',
mask: true,
}) })
uni.navigateBack() uni.navigateBack()
} }

4
pages/projectEnd/qualityManage/reply.vue
View File

@ -239,7 +239,9 @@
if(res.code==200){ if(res.code==200){
uni.showToast({ uni.showToast({
title:"新增整改回复成功", title:"新增整改回复成功",
duration:2000,
icon: 'none',
mask: true,
}) })
setTimeout(() => { setTimeout(() => {
uni.navigateBack({}) uni.navigateBack({})

4
pages/projectEnd/safeManage/reply.vue
View File

@ -185,7 +185,9 @@
if(res.code==200){ if(res.code==200){
uni.showToast({ uni.showToast({
title:"新增整改回复成功", title:"新增整改回复成功",
duration:2000 duration:2000,
icon: 'none',
mask: true,
}) })
uni.navigateBack() uni.navigateBack()
} }

4936
unpackage/dist/dev/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

8231
unpackage/dist/dev/app-plus/app-view.js vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/app-plus/manifest.json vendored
View File

@ -1 +1 @@
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__4AA4101","name":"智慧工地云平台","version":{"name":"1.2.4","code":124},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Maps":{"coordType":"gcj02"},"VideoPlayer":{},"Bluetooth":{},"SQLite":{},"FaceID":{},"Fingerprint":{},"Speech":{},"Camera":{},"Push":{},"Record":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"light","background":"#F0AD4E"},"usingComponents":true,"nvueCompiler":"uni-app","compilerVersion":3,"compatible":{"ignoreVersion":true},"distribute":{"icons":{"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"},"ios":{"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"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.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@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"splashscreen":{"android":{"hdpi":"C:/Users/86173/Desktop/6d9e3eaea01d7138ad9cffaf4739cf0.png","xhdpi":"C:/Users/86173/Desktop/6d9e3eaea01d7138ad9cffaf4739cf0.png","xxhdpi":"C:/Users/86173/Desktop/6d9e3eaea01d7138ad9cffaf4739cf0.png"},"iosStyle":"common","ios":{"storyboard":"D:/work/JXJ2/unpackage/CustomStoryboard.zip","iphone":{"portrait-896h@3x":"C:/Users/86173/Desktop/6d9e3eaea01d7138ad9cffaf4739cf0.png"}},"useOriginalMsgbox":false,"androidStyle":"common"},"google":{"permissions":["<uses-feature android:name=\"android.hardware.camera\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_CHECKIN_PROPERTIES\"/>","<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH_PRIVILEGED\"/>","<uses-permission android:name=\"android.permission.CALL_PHONE\"/>","<uses-permission android:name=\"android.permission.CALL_PRIVILEGED\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.INTERNET\"/>","<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>","<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"]},"apple":{"idfa":false,"dSYMs":false},"plugins":{"maps":{"amap":{"appkey_ios":"9510eb01b56e6428646b256cc379f695","appkey_android":"fdc95509666dff9deb22e57dedd29550","key":"3b060f3a0ce4bafebeba1621dcd99c31"}},"ad":{},"geolocation":{},"speech":{"ifly":{}},"push":{"unipush":null},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"nativePlugins":{},"uniStatistics":{"enable":false},"arguments":"{\"name\":\"\",\"path\":\"\",\"query\":\"\",\"id\":0}","allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"3.6.18","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"launch_path":"__uniappview.html"}} {"@platforms":["android","iPhone","iPad"],"id":"__UNI__4AA4101","name":"智慧工地云平台","version":{"name":"1.2.4","code":124},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Maps":{"coordType":"gcj02"},"VideoPlayer":{},"Bluetooth":{},"SQLite":{},"FaceID":{},"Fingerprint":{},"Speech":{},"Push":{},"Record":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"light","background":"#F0AD4E"},"usingComponents":true,"nvueCompiler":"uni-app","compilerVersion":3,"compatible":{"ignoreVersion":true},"distribute":{"icons":{"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"},"ios":{"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"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.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@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"splashscreen":{"android":{"hdpi":"C:/Users/86173/Desktop/6d9e3eaea01d7138ad9cffaf4739cf0.png","xhdpi":"C:/Users/86173/Desktop/6d9e3eaea01d7138ad9cffaf4739cf0.png","xxhdpi":"C:/Users/86173/Desktop/6d9e3eaea01d7138ad9cffaf4739cf0.png"},"iosStyle":"common","ios":{"storyboard":"D:/work/JXJ2/unpackage/CustomStoryboard.zip","iphone":{"portrait-896h@3x":"C:/Users/86173/Desktop/6d9e3eaea01d7138ad9cffaf4739cf0.png"}},"useOriginalMsgbox":false,"androidStyle":"common"},"google":{"permissions":["<uses-feature android:name=\"android.hardware.camera\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_CHECKIN_PROPERTIES\"/>","<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH_PRIVILEGED\"/>","<uses-permission android:name=\"android.permission.CALL_PHONE\"/>","<uses-permission android:name=\"android.permission.CALL_PRIVILEGED\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.INTERNET\"/>","<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>","<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"]},"apple":{"idfa":false,"dSYMs":false},"plugins":{"maps":{"amap":{"appkey_ios":"9510eb01b56e6428646b256cc379f695","appkey_android":"fdc95509666dff9deb22e57dedd29550","key":"3b060f3a0ce4bafebeba1621dcd99c31"}},"ad":{},"geolocation":{},"speech":{"ifly":{}},"push":{"unipush":null},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"nativePlugins":{},"uniStatistics":{"enable":false},"arguments":"{\"name\":\"\",\"path\":\"\",\"query\":\"\",\"id\":0}","allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"3.6.18","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"launch_path":"__uniappview.html"}}

70
unpackage/dist/dev/app-plus/pages/projectEnd/laborManage/faceRecognition.js vendored
View File

File diff suppressed because one or more lines are too long

120
unpackage/dist/dev/app-plus/pages/projectEnd/project/projectInfo2.js vendored
View File

File diff suppressed because one or more lines are too long