fix:调整统计报表

menu1.0
郭承 2 months ago
parent 1407bb8239
commit 7e917bd8be

@ -38,7 +38,8 @@
</el-form-item> </el-form-item>
<el-form-item label="活动" class="activitybox" <el-form-item label="活动" class="activitybox"
v-if="roleName === 'superadmin' || roleName === 'Matthew'"> v-if="roleName === 'superadmin' || roleName === 'Matthew'">
<el-select @keyup.enter.native="onSubmit()" v-model="formdata.activityId" filterable @change="changeActive"> <el-select @keyup.enter.native="onSubmit()" v-model="formdata.activityId" filterable
@change="changeActive">
<el-option v-for="item in activityOptions" :key="item.id" :label="item.name" <el-option v-for="item in activityOptions" :key="item.id" :label="item.name"
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
@ -82,24 +83,32 @@
</el-table-column> </el-table-column>
<el-table-column prop='hours' label="预计拍照" width="100px" align="center"> <el-table-column prop='hours' label="预计拍照" width="100px" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.hours.length * 2 }}</span> <!-- <span>{{ scope.row.hours.length * 2 }}</span> -->
<span>{{ scope.row.scheduleList.length }}</span>
<!-- <el-tooltip placement="top"> <!-- <el-tooltip placement="top">
<div slot="content">{{scope.row.hours.length}}</div> <div slot="content">{{scope.row.hours.length}}</div>
<span>{{ scope.row.hours.length * 2 }}</span> <span>{{ scope.row.hours.length * 2 }}</span>
</el-tooltip> --> </el-tooltip> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop='total' label="拍照总数" width="100px" align="center"></el-table-column> <el-table-column prop='total' label="拍照总数" width="100px"
align="center"></el-table-column>
<el-table-column prop='presets' label="多出数量" width="100px" align="center"> <el-table-column prop='presets' label="多出数量" width="100px" align="center">
<template #default="{ row }"> <!-- <template #default="{ row }">
<el-tooltip placement="top" popper-class="eltooltip"> <el-tooltip placement="top" popper-class="eltooltip">
<div slot="content">{{handlePresetsMany(row).txt}}</div> <div slot="content">{{ handlePresetsMany(row).txt }}</div>
<span>{{handlePresetsMany(row).number}}</span> <span>{{ handlePresetsMany(row).number }}</span>
</el-tooltip> </el-tooltip>
</template> -->
<template slot-scope="scope">
<span>{{scope.row.timeList.length}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop='' label='缺少数量' width="100px" :formatter="countLackPicture" align="center"></el-table-column> <!-- <el-table-column prop='' label='缺少数量' width="100px" :formatter="countLackPicture"
<el-table-column prop='presets' label="缺少图片详细时间点" :formatter="handlePresetsFew" min-width="65%"></el-table-column> align="center"></el-table-column> -->
<el-table-column prop='wrongCount' label='异常数量' width="100px" align="center"></el-table-column>
<el-table-column prop='presets' label="缺少图片详细时间点" :formatter="handlePresetsFew"
min-width="65%"></el-table-column>
</el-table> </el-table>
</template> </template>
@ -131,6 +140,8 @@ import {
getRealtimePhoto, getRealtimePhoto,
deletePicList, deletePicList,
getStatisticalReport, getStatisticalReport,
getScheduleOne,
getScheduleList,
} from "@/utils/api/index"; } from "@/utils/api/index";
import { import {
getActivityApi, getActivityApi,
@ -168,6 +179,7 @@ export default {
total: 0, // total: 0, //
loading: false, loading: false,
signtype: 0, //0 signtype: 0, //0
scheduleRule: {}, //
}; };
}, },
created() { created() {
@ -204,52 +216,44 @@ export default {
} }
}, },
methods: { methods: {
//
assumeTakePic(row){
console.log(row);
return "123";
},
// //
handlePresetsMany(row) { handlePresetsMany(row) {
let result = {txt: "" , number: 0}; let result = { txt: "", number: 0 };
if (row.wrongCount == 0) { // if (row.wrongCount == 0) {
return result; // return result;
} else { // } else {
row.hours.forEach(data => { // row.hours.forEach(data => {
if (data.base < data.timeList.length) { // if (data.base < data.timeList.length) {
let hour = parseInt(data.hour.substring(11, 13)); // let hour = parseInt(data.hour.substring(11, 13));
result.txt += hour + "点" + data.wrongDetail + "张 , "; // result.txt += hour + "" + data.wrongDetail + " , ";
result.number += data.timeList.length - data.base; // result.number += data.timeList.length - data.base;
} // }
}); // });
} // }
if (result.txt=="") { if (result.txt == "") {
result.txt = "无"; result.txt = "无";
} }
return result; return result;
}, },
// //
handlePresetsFew(row, column, cellValue) { handlePresetsFew(row, column, cellValue) {
if (row.wrongCount == 0) {
return "无";
} else {
let txt = ""; let txt = "";
row.hours.forEach(data => { row.scheduleList.forEach(data => {
if (data.base > data.timeList.length) { if ( data.timeList.length == 0 ) {
let hour = data.hour.substring(11, 13); let hour = data.hour;
//30 if ( hour < 10 ) {
let da = 0; hour = "0" + hour;
//30
let xi = 0;
data.timeList.forEach(timedata => {
let min = parseInt(timedata.substring(11, 13));
if (min > 30) {
da++;
} else if (min < 30) {
xi++;
} }
}); let minute = data.minute;
if (xi == 0) { if ( data.minute < 10 ){
txt += hour + ":00 , "; minute = "0" + minute;
}
if (da == 0) {
txt += hour + ":30 , ";
} }
txt += hour + ":" + minute + ",";
} }
}); });
if ("" == txt) { if ("" == txt) {
@ -257,21 +261,25 @@ export default {
} else { } else {
return txt; return txt;
} }
}
}, },
// //
countLackPicture(row, column, cellValue){ countLackPicture(row, column, cellValue) {
let number = 0; let number = 0;
if (row.wrongCount == 0) { // if (row.wrongCount == 0) {
return number; // return number;
} else { // } else {
row.hours.forEach(data => { // row.hours.forEach(data => {
if (data.base > data.timeList.length) { // if (data.base > data.timeList.length) {
number += data.base - data.timeList.length; // number += data.base - data.timeList.length;
} // }
}); // });
} // }
return number; return number;
},
//
statuteHandle(protocol, val) {
}, },
setDefaultImage(e) { setDefaultImage(e) {
e.target.src = defaultImage; e.target.src = defaultImage;
@ -379,7 +387,7 @@ export default {
// : this.activityOptions[0].id; // : this.activityOptions[0].id;
}).catch((err) => { }); }).catch((err) => { });
}, },
changeActive(val){ changeActive(val) {
this.formdata.activityId = val; this.formdata.activityId = val;
}, },
getSearchtdAlone() { getSearchtdAlone() {
@ -396,6 +404,16 @@ export default {
this.$set(this.formdata, "pageindex", this.page); this.$set(this.formdata, "pageindex", this.page);
this.$set(this.formdata, "pagesize", this.pageSize); this.$set(this.formdata, "pagesize", this.pageSize);
console.log(this.formdata); console.log(this.formdata);
// this.$set(this.formdata, "activityId", 10149);
// getScheduleList().then((res) => {
// res.data.forEach(obj => {
// this.scheduleRule['key' + obj.termId + obj.channelId] = obj;
// });
// // console.log(this.scheduleRule);
// }).catch((err) => { });
getStatisticalReport(this.formdata).then((res) => { getStatisticalReport(this.formdata).then((res) => {
this.picList = []; this.picList = [];
//presetList //presetList
@ -410,8 +428,9 @@ export default {
}); });
a.presetList = presetList; a.presetList = presetList;
}); });
// console.log(dataList);
this.picList = dataList; this.picList = dataList;
console.log(dataList);
this.loading = false; this.loading = false;
// console.log(res.data); // console.log(res.data);
}).catch((err) => { }).catch((err) => {
@ -630,7 +649,8 @@ export default {
} }
.eltooltip{
max-width:50%; .eltooltip {
} max-width: 50%;
}
</style> </style>
Loading…
Cancel
Save