字典、统计
This commit is contained in:
@@ -76,7 +76,7 @@ export default {
|
||||
);
|
||||
|
||||
// 解析成对象数组
|
||||
const billName = aoa[0][0];
|
||||
const billName = file.name;
|
||||
const billData = utils.toObjData(functionNoiseList);
|
||||
|
||||
const billData2 = utils.toPlaceData(functionNoiseList2);
|
||||
@@ -163,7 +163,7 @@ export default {
|
||||
});
|
||||
|
||||
// 解析成对象数组
|
||||
const billName = aoa[0][0];
|
||||
const billName = file.name;
|
||||
const billData = utils.toAreaObjData(functionNoiseList);
|
||||
|
||||
if (!billData || billData.length == 0) {
|
||||
|
||||
@@ -49,7 +49,7 @@ export default {
|
||||
}
|
||||
if (row.indexL10 < row.indexL50 || row.indexL50 < row.indexL90) {
|
||||
|
||||
throw new Error(row.place + "数值有误" + `${row.indexL10},${row.indexL10},${row.indexL50},${row.indexL90}`)
|
||||
throw new Error(row.place + "数值有误" + `${row.indexLeq},${row.indexL10},${row.indexL50},${row.indexL90}`)
|
||||
}
|
||||
return row;
|
||||
})
|
||||
@@ -81,12 +81,12 @@ export default {
|
||||
return excelData.map(item => {
|
||||
const monitorTime = new Date();
|
||||
monitorTime.setFullYear(item[1]);
|
||||
monitorTime.setMonth(item[14] - 1);
|
||||
monitorTime.setDate(item[15]);
|
||||
monitorTime.setHours(item[16]);
|
||||
monitorTime.setMinutes(item[17]);
|
||||
monitorTime.setMonth(item[9] - 1);
|
||||
monitorTime.setDate(item[10]);
|
||||
monitorTime.setHours(item[11]);
|
||||
monitorTime.setMinutes(item[23]);
|
||||
let quarter = 1;
|
||||
const month = item[14]
|
||||
const month = item[9]
|
||||
if (month < 4) {
|
||||
quarter = 1
|
||||
} else if (month < 7) {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -11,9 +11,9 @@
|
||||
<!-- <a-tab-pane key="quarter" tab="季度报告">
|
||||
<quarter-statistic></quarter-statistic>
|
||||
</a-tab-pane> -->
|
||||
<a-tab-pane key="year-compare" tab="同比">
|
||||
<compare></compare>
|
||||
</a-tab-pane>
|
||||
<!-- <a-tab-pane key="year-compare" tab="同比">-->
|
||||
<!-- <compare></compare>-->
|
||||
<!-- </a-tab-pane>-->
|
||||
</a-tabs>
|
||||
</a-card>
|
||||
</div>
|
||||
@@ -27,7 +27,7 @@
|
||||
*/
|
||||
import BaseStatistic from "./base.vue";
|
||||
// import QuarterStatistic from "./quarter.vue";
|
||||
import Compare from "./compare.vue";
|
||||
// import Compare from "./compare.vue";
|
||||
import AverageStatistic from "./average.vue";
|
||||
|
||||
export default {
|
||||
@@ -35,7 +35,7 @@
|
||||
components: {
|
||||
BaseStatistic,
|
||||
// QuarterStatistic,
|
||||
Compare,
|
||||
// Compare,
|
||||
AverageStatistic
|
||||
},
|
||||
data() {
|
||||
|
||||
Reference in New Issue
Block a user