diff --git a/pages/performance/index1.vue b/pages/performance/index1.vue index 2969a2f..db5c611 100644 --- a/pages/performance/index1.vue +++ b/pages/performance/index1.vue @@ -150,7 +150,7 @@ - + 标准化得分 @@ -185,8 +185,8 @@ - - + + 工作票完成数 @@ -196,7 +196,7 @@ - + + - - - + @@ -513,7 +510,7 @@ m = 12 + (curMonth - 5) } d = curDate.getDate() - + const startTime = uni.$u.timeFormat(new Date(y, m, d), 'yyyy-mm-dd') const endTime = uni.$u.timeFormat(new Date(), 'yyyy-mm-dd') let json = initFilter(orgId, User.NAME, "", "", "", startTime, endTime); @@ -540,7 +537,7 @@ this.getRiskLevel() this.getClassActive() this.getWorkTicket() - this.getDangerTotal() + // this.getDangerTotal() }, methods: { @@ -591,8 +588,11 @@ const orgId = uni.getStorageSync('orgId') let json = initFilter(orgId, this.MineCurrentType); const res = await getStandardScore(json) - if (res.IsSuccessful) { + if (res.IsSuccessful && res.Data && res.Data.RESULT_TOTAL && res.Data.STAND_TOTAL != 0) { + debugger this.standardScore = (Number(res.Data.RESULT_TOTAL / res.Data.STAND_TOTAL) * 100).toFixed(2); + } else { + this.standardScore = '' } }, @@ -738,101 +738,101 @@ }, 500) } }, - async getDangerTotal() { - const orgId = uni.getStorageSync('orgId') - let json = initFilter( - orgId, - this.MineCurrentType, - "NUM", - ); - const res = await getDangerTotal(json) - if (res.IsSuccessful) { - let xData = []; - let data1 = []; - let data2 = []; - let data3 = []; - let seriesName = []; - if (res.Data.ListSafeCheckYearMonth) { - let ListSafeCheckYearMonth = res.Data.ListSafeCheckYearMonth.slice(-6) - ListSafeCheckYearMonth.forEach((item) => { - xData.push(item.MONTH + '月') - seriesName = item.listSOURCENAME - data1.push(item.listListCount); - }); - for (var i = 0; i < ListSafeCheckYearMonth[0].listListCount.length; i++) { - for (var j = 0; j < ListSafeCheckYearMonth.length; j++) { - data2.push(data1[j][i]); - } - } - for (var i = 0; i < data2.length; i += ListSafeCheckYearMonth.length) { - data3.push(data2.slice(i, i + ListSafeCheckYearMonth.length)) - } - setTimeout(() => { - let safeCheckConfig = { - categories: xData, - series: [{ - name: seriesName[0], - data: data3[0], - }, { - name: seriesName[1], - data: data3[1], - }, { - name: seriesName[2], - data: data3[2], - }, { - name: seriesName[3], - data: data3[3], - }], - }; + // async getDangerTotal() { + // const orgId = uni.getStorageSync('orgId') + // let json = initFilter( + // orgId, + // this.MineCurrentType, + // "NUM", + // ); + // const res = await getDangerTotal(json) + // if (res.IsSuccessful) { + // let xData = []; + // let data1 = []; + // let data2 = []; + // let data3 = []; + // let seriesName = []; + // if (res.Data.ListSafeCheckYearMonth) { + // let ListSafeCheckYearMonth = res.Data.ListSafeCheckYearMonth.slice(-6) + // ListSafeCheckYearMonth.forEach((item) => { + // xData.push(item.MONTH + '月') + // seriesName = item.listSOURCENAME + // data1.push(item.listListCount); + // }); + // for (var i = 0; i < ListSafeCheckYearMonth[0].listListCount.length; i++) { + // for (var j = 0; j < ListSafeCheckYearMonth.length; j++) { + // data2.push(data1[j][i]); + // } + // } + // for (var i = 0; i < data2.length; i += ListSafeCheckYearMonth.length) { + // data3.push(data2.slice(i, i + ListSafeCheckYearMonth.length)) + // } + // setTimeout(() => { + // let safeCheckConfig = { + // categories: xData, + // series: [{ + // name: seriesName[0], + // data: data3[0], + // }, { + // name: seriesName[1], + // data: data3[1], + // }, { + // name: seriesName[2], + // data: data3[2], + // }, { + // name: seriesName[3], + // data: data3[3], + // }], + // }; - this.safeChartData = JSON.parse(JSON.stringify(safeCheckConfig)); - }, 500); - } + // this.safeChartData = JSON.parse(JSON.stringify(safeCheckConfig)); + // }, 500); + // } - let xName = []; - let yName = []; - let legendName = []; - res.Data.ListC.forEach((item) => { - let name = item.NAME.split(","); - xName.push(name); - legendName.push(item.SOURCENAME); - let valu = item.Val.split(","); - yName.push(valu); - }); - let month = xName[0].map((item) => { - return item.replace("月", ""); - }); + // let xName = []; + // let yName = []; + // let legendName = []; + // res.Data.ListC.forEach((item) => { + // let name = item.NAME.split(","); + // xName.push(name); + // legendName.push(item.SOURCENAME); + // let valu = item.Val.split(","); + // yName.push(valu); + // }); + // let month = xName[0].map((item) => { + // return item.replace("月", ""); + // }); - setTimeout(() => { - let monthDangerConfig = { - categories: xName[0], - series: [{ - name: legendName[0], - // index: 1, - type: "column", - data: yName[0] - }, - { - name: legendName[1], - // index: 1, - type: "column", - data: yName[1] - }, - { - name: legendName[2], - // index: 1, - type: "column", - data: yName[2] - }, + // setTimeout(() => { + // let monthDangerConfig = { + // categories: xName[0], + // series: [{ + // name: legendName[0], + // // index: 1, + // type: "column", + // data: yName[0] + // }, + // { + // name: legendName[1], + // // index: 1, + // type: "column", + // data: yName[1] + // }, + // { + // name: legendName[2], + // // index: 1, + // type: "column", + // data: yName[2] + // }, - ], - }; + // ], + // }; - this.dangerChartData = JSON.parse(JSON.stringify(monthDangerConfig)); - }, 500) + // this.dangerChartData = JSON.parse(JSON.stringify(monthDangerConfig)); + // }, 500) - } - } + // } + // } }, computed: { allFinishRate() {