|
|
|
|
@ -38,7 +38,7 @@
|
|
|
|
|
<!-- @keyup.enter.native="handleQuery"-->
|
|
|
|
|
<!-- />-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<el-form-item label="开始时间">
|
|
|
|
|
<!-- <el-form-item label="开始时间">
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="daterangeBeginTime"
|
|
|
|
|
style="width: 340px"
|
|
|
|
|
@ -48,7 +48,30 @@
|
|
|
|
|
start-placeholder="开始时间"
|
|
|
|
|
end-placeholder="结束时间"
|
|
|
|
|
></el-date-picker>
|
|
|
|
|
</el-form-item>-->
|
|
|
|
|
<el-form-item label="采集日期范围">
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="daterangeBeginTime"
|
|
|
|
|
style="width: 340px"
|
|
|
|
|
value-format="yyyy-MM-dd"
|
|
|
|
|
type="daterange"
|
|
|
|
|
range-separator="-"
|
|
|
|
|
start-placeholder="开始日期"
|
|
|
|
|
end-placeholder="结束日期"
|
|
|
|
|
></el-date-picker>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="采集时间范围">
|
|
|
|
|
<el-time-picker
|
|
|
|
|
v-model="timerangeRecordTime"
|
|
|
|
|
style="width: 340px"
|
|
|
|
|
value-format="HH:mm:ss"
|
|
|
|
|
is-range
|
|
|
|
|
range-separator="-"
|
|
|
|
|
start-placeholder="开始时间"
|
|
|
|
|
end-placeholder="结束时间"
|
|
|
|
|
></el-time-picker>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
|
|
<el-form-item label="修改标识" prop="updateFlag">
|
|
|
|
|
<el-select v-model="queryParams.updateFlag" placeholder="请选择修改标识" clearable>
|
|
|
|
|
<el-option
|
|
|
|
|
@ -259,16 +282,6 @@ export default {
|
|
|
|
|
monitorInfoOptions: [],
|
|
|
|
|
//左侧树结构筛选框
|
|
|
|
|
filterBoxName: undefined,
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
//树状结构按照客户给定顺序排序
|
|
|
|
|
monitorInfoOptionsData: [],
|
|
|
|
|
specificOrder: ["赛轮沈阳","公用橡胶","三像","维航","维",
|
|
|
|
|
"米其林高压","米其林低压","米其林","橡胶四厂",
|
|
|
|
|
"三聚凯特","世源","联盛","正兴","天峰药业","中科北方","沃得","管理中心","沈阳经济技术升发区管理委员会办","科创","博泰","亿纬","普利司通"
|
|
|
|
|
], // 客户提供的特定顺序
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
monitorProps: {
|
|
|
|
|
children: 'children',
|
|
|
|
|
label: 'label'
|
|
|
|
|
@ -293,6 +306,8 @@ export default {
|
|
|
|
|
open: false,
|
|
|
|
|
// 修改标识时间范围
|
|
|
|
|
daterangeBeginTime: [],
|
|
|
|
|
//时间选择
|
|
|
|
|
timerangeRecordTime:[],
|
|
|
|
|
// 查询参数
|
|
|
|
|
queryParams: {
|
|
|
|
|
pageNum: 1,
|
|
|
|
|
@ -331,9 +346,16 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
created() {
|
|
|
|
|
const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
|
|
|
|
|
this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
|
|
|
|
|
this.daterangeBeginTime[1] = nowDate + ' 23:59:59'
|
|
|
|
|
const today = new Date();
|
|
|
|
|
const yesterday = new Date(today);
|
|
|
|
|
yesterday.setDate(today.getDate() - 1);
|
|
|
|
|
//时间默认为8点
|
|
|
|
|
/* this.timerangeRecordTime = ['08:30:00', '08:30:00']; */
|
|
|
|
|
this.timerangeRecordTime[0] = '08:00:00';
|
|
|
|
|
this.timerangeRecordTime[1] = '08:00:00';
|
|
|
|
|
this.daterangeBeginTime[0] = parseTime(yesterday, '{y}-{m}-{d}') ;
|
|
|
|
|
this.daterangeBeginTime[1] = parseTime(today, '{y}-{m}-{d}') ;
|
|
|
|
|
|
|
|
|
|
this.getTreeselect()
|
|
|
|
|
this.getList()
|
|
|
|
|
},
|
|
|
|
|
@ -349,8 +371,8 @@ export default {
|
|
|
|
|
this.loading = true
|
|
|
|
|
this.queryParams.params = {}
|
|
|
|
|
if (null != this.daterangeBeginTime && '' != this.daterangeBeginTime) {
|
|
|
|
|
this.queryParams.params['beginBeginTime'] = this.daterangeBeginTime[0]
|
|
|
|
|
this.queryParams.params['endBeginTime'] = this.daterangeBeginTime[1]
|
|
|
|
|
this.queryParams.params['beginBeginTime'] = this.daterangeBeginTime[0] + ' ' + this.timerangeRecordTime[0];
|
|
|
|
|
this.queryParams.params['endBeginTime'] = this.daterangeBeginTime[1] + ' ' + this.timerangeRecordTime[1];
|
|
|
|
|
}
|
|
|
|
|
listReportPointSteam(this.queryParams).then(response => {
|
|
|
|
|
this.reportPointSteamList = response.rows
|
|
|
|
|
@ -469,33 +491,66 @@ export default {
|
|
|
|
|
this.download('ems/report/reportPointSteam/export', {
|
|
|
|
|
...this.queryParams
|
|
|
|
|
}, `reportPointSteam_${new Date().getTime()}.xlsx`)
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
decreaseBeginDate() {
|
|
|
|
|
if (this.daterangeBeginTime && this.daterangeBeginTime.length === 2) {
|
|
|
|
|
const startDate = new Date(this.daterangeBeginTime[0]);
|
|
|
|
|
startDate.setDate(startDate.getDate() - 1);
|
|
|
|
|
this.daterangeBeginTime = [startDate.toISOString().split('T')[0], endDate.toISOString().split('T')[0]];
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
decreaseEndDate() {
|
|
|
|
|
if (this.daterangeBeginTime && this.daterangeBeginTime.length === 2) {
|
|
|
|
|
const endDate = new Date(this.daterangeBeginTime[1]);
|
|
|
|
|
endDate.setDate(endDate.getDate() - 1);
|
|
|
|
|
this.daterangeBeginTime = [startDate.toISOString().split('T')[0], endDate.toISOString().split('T')[0]];
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
increaseBeginDate() {
|
|
|
|
|
if (this.daterangeBeginTime && this.daterangeBeginTime.length === 2) {
|
|
|
|
|
const startDate = new Date(this.daterangeBeginTime[0]);
|
|
|
|
|
startDate.setDate(startDate.getDate() + 1);
|
|
|
|
|
this.daterangeBeginTime = [startDate.toISOString().split('T')[0], endDate.toISOString().split('T')[0]];
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
increaseEndDate() {
|
|
|
|
|
if (this.daterangeBeginTime && this.daterangeBeginTime.length === 2) {
|
|
|
|
|
const endDate = new Date(this.daterangeBeginTime[1]);
|
|
|
|
|
endDate.setDate(startDate.getDate() + 1);
|
|
|
|
|
this.daterangeBeginTime = [startDate.toISOString().split('T')[0], endDate.toISOString().split('T')[0]];
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
decreaseBeginTime() {
|
|
|
|
|
if (this.timerangeRecordTime && this.timerangeRecordTime.length === 2) {
|
|
|
|
|
const startTime = new Date(`1970-01-01T${this.timerangeRecordTime[0]}`);
|
|
|
|
|
startTime.setHours(startTime.getHours() - 1);
|
|
|
|
|
this.timerangeRecordTime = [startTime.toTimeString().substring(0, 8), endTime.toTimeString().substring(0, 8)];
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
decreaseEndTime() {
|
|
|
|
|
if (this.timerangeRecordTime && this.timerangeRecordTime.length === 2) {
|
|
|
|
|
const endTime = new Date(`1970-01-01T${this.timerangeRecordTime[1]}`);
|
|
|
|
|
endTime.setHours(endTime.getHours() - 1);
|
|
|
|
|
this.timerangeRecordTime = [startTime.toTimeString().substring(0, 8), endTime.toTimeString().substring(0, 8)];
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
increaseBeginTime() {
|
|
|
|
|
if (this.timerangeRecordTime && this.timerangeRecordTime.length === 2) {
|
|
|
|
|
const startTime = new Date(`1970-01-01T${this.timerangeRecordTime[0]}`);
|
|
|
|
|
startTime.setHours(startTime.getHours() + 1);
|
|
|
|
|
this.timerangeRecordTime = [startTime.toTimeString().substring(0, 8), endTime.toTimeString().substring(0, 8)];
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
increaseEndTime() {
|
|
|
|
|
if (this.timerangeRecordTime && this.timerangeRecordTime.length === 2) {
|
|
|
|
|
const endTime = new Date(`1970-01-01T${this.timerangeRecordTime[1]}`);
|
|
|
|
|
endTime.setHours(endTime.getHours() + 1);
|
|
|
|
|
this.timerangeRecordTime = [startTime.toTimeString().substring(0, 8), endTime.toTimeString().substring(0, 8)];
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
}/*
|
|
|
|
|
function sortByPrefixOrder(data, specificOrder) {
|
|
|
|
|
// 创建映射表
|
|
|
|
|
const orderMap = {};
|
|
|
|
|
specificOrder.forEach((prefix, index) => {
|
|
|
|
|
orderMap[prefix] = index;
|
|
|
|
|
});
|
|
|
|
|
console.log('Original data:', data); // 打印原始数据
|
|
|
|
|
// 按照映射表排序
|
|
|
|
|
const sortedData = data.sort((a, b) => {
|
|
|
|
|
const prefixA = specificOrder.find(prefix => a.label.startsWith(prefix));
|
|
|
|
|
const prefixB = specificOrder.find(prefix => b.label.startsWith(prefix));
|
|
|
|
|
// 如果前缀相同，则按照标签的完整字符串进行排序
|
|
|
|
|
if (prefixA === prefixB) {
|
|
|
|
|
return a.label.localeCompare(b.label);
|
|
|
|
|
}
|
|
|
|
|
// 如果前缀不同，则按照映射表中的索引值进行排序
|
|
|
|
|
if (prefixA === undefined) return 1; // 如果没有匹配到前缀，排在最后
|
|
|
|
|
if (prefixB === undefined) return -1; // 如果没有匹配到前缀，排在最后
|
|
|
|
|
return orderMap[prefixA] - orderMap[prefixB];
|
|
|
|
|
});
|
|
|
|
|
console.log('Sorted data:', sortedData); // 打印排序后的数据
|
|
|
|
|
return sortedData;
|
|
|
|
|
}
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
</script>
|
|
|
|
|
|
|
|
|
|
<style scoped>
|
|
|
|
|
|
