mt-fe-group/yudao-init
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

新增

Browse Source
This commit is contained in:
‘937886381’
2024-05-07 10:03:55 +08:00
parent 1b8f2522c1 b6b0d32fa2
commit 61ea9ea4a6
80 changed files with 13648 additions and 8947 deletions
Download Patch File Download Diff File Expand all files Collapse all files

317
src/views/greenest/index.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-15 10:49:13
* @LastEditTime: 2024-04-26 15:18:15
* @LastEditTime: 2024-05-07 08:40:58
* @LastEditors: zhp
* @Description:
-->
@@ -11,18 +11,18 @@
<!-- <el-alert title="自定义 close-text" type="warning" close-text="知道了">
</el-alert> -->
<el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
<el-form-item label="时间维度" prop="reportTime">
<el-select clearable v-model="timeSelect" placeholder="请选择">
<el-form-item label="时间维度" prop="mode">
<el-select clearable v-model="listQuery.mode" placeholder="请选择">
<el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item v-show="timeSelect === 'month'" label="时间范围" prop="reportTime">
<el-form-item v-show="listQuery.mode === 2" label="时间范围" prop="reportTime">
<el-date-picker clearable v-model="listQuery.reportTime" type="monthrange" range-separator="至"
start-placeholder="开始月份" end-placeholder="结束月份" @change="changeTime">
</el-date-picker>
</el-form-item>
<el-form-item v-show="timeSelect === 'year'" label="时间范围" prop="reportTime">
<el-form-item v-show="listQuery.mode === 3" label="时间范围" prop="reportTime">
<el-date-picker clearable v-model="listQuery.reportTime[0]" value-format="yyyy" type="year"
placeholder="开始时间">
</el-date-picker>
@@ -31,8 +31,8 @@
@change="getYear">
</el-date-picker>
</el-form-item>
<el-form-item label="工厂名称" prop="factoryId">
<el-select clearable v-model="listQuery.factoryId" placeholder="请选择工厂名称">
<el-form-item label="工厂名称" prop="factorys">
<el-select clearable v-model="listQuery.factorys" placeholder="请选择工厂名称" multiple>
<el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
@@ -56,8 +56,7 @@
</div>
<div class="app-container" style="margin-top: 18px;flex-grow: 1; padding: 16px;">
<search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
<base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
:table-data="tableData">
<base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData">
</base-table>
</div>
<!-- <inputTable :date="date" :data="tableData" :time="[startTimeStamp, endTimeStamp]" :sum="all"
@@ -71,7 +70,7 @@
</template>
<script>
// import { parseTime } from '../../core/mixins/code-filter';
import { parseTime } from '@/mixins/code-filter';
import { getEpPage } from '@/api/greenest/index';
// import inputTable from './inputTable.vue';
import lineChart from './lineChart';
@@ -84,13 +83,17 @@ export default {
return {
listQuery: {
current: 1,
size: 999,
// factoryId: null,
size: 10,
factorys: [],
mode: 2,
beginTime: undefined,
endTime: undefined,
// total: 0,
// type: null,
// reportType: 2,
reportTime: []
},
dynamicProps: [],
urlOptions: {
// getDataListURL: getGlassPage,
// exportURL: exportGlasscExcel
@@ -103,19 +106,43 @@ export default {
],
timeList: [
{
value: 'month',
value: 2,
label:'月'
},
{
value: 'year',
value: 3,
label: '年'
}
],
factoryList: [
{
name: '测试',
id:1
}
id: 0,
name: '瑞昌中建材光电材料有限公司'
},
{
id: 1,
name: '邯郸中建材光电材料有限公司'
},
{
id: 2,
name: '中建材株洲光电材料有限公司'
},
{
id: 3,
name: '佳木斯中建材光电材料有限公司'
},
{
id: 4,
name: '成都中建材光电材料有限公司'
},
{
id: 5,
name: '凯盛光伏材料有限公司'
},
{
id: 6,
name: '蚌埠兴科玻璃有限公司'
},
],
typeList: [
{
@@ -131,82 +158,42 @@ export default {
id: 2,
},
],
tableProps: [
// {
// prop: 'createTime',
// label: '添加时间',
// fixed: true,
// width: 180,
// filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
// },
{
prop: 'userName',
label: '日期',
},
{
prop: 'nickName',
label: '工厂名称',
},
{
prop: 'datas',
label: '废水(t)',
// subcomponent: row
},
{
prop: 'unit',
label: '废气(m³)',
// subcomponent: row
},
{
prop: 'remark',
label: 'VOC(g/L)',
// subcomponent: row
},
{
prop: 'kg',
label: '固体废弃物-可回收(kg)',
// subcomponent: row
}
],
timeSelect:'month',
startTimeStamp:null, //开始时间
endTimeStamp:null, //结束时间
date:'凯盛玻璃控股成员企业2024生产数据',
tableProps: [],
// startTimeStamp:null, //开始时间
// endTimeStamp:null, //结束时间
// date:'凯盛玻璃控股成员企业2024生产数据',
// reportTime: '',
startTimeStamp: '',
endTimeStamp: '',
tableData: [
{
userName: 'userName',
nickName: '用户名',
datas:'111111'
},
{
userName: 'userName',
nickName: '用户名',
datas: '111111'
},
{
userName: 'userName',
nickName: '用户名',
datas: '111111'
// subcomponent: row
}
],
// startTimeStamp: '',
// endTimeStamp: '',
tableData: [],
// proLineList: [],
// all: {}
};
},
mounted() {
this.getDict()
this.getCurrentYearFirst()
// this.getCurrentYearFirst()
// this.getDataList()
},
},
// computed: {
// tableProps() {
// return [
// {
// prop: 'createTime',
// label: '日期',
// filter: parseTime
// },
// ...this.dynamicProps,
// ];
// },
// },
methods: {
buttonClick() {
},
getYear(e) {
this.listQuery.beginTime = this.listQuery.reportTime ? new Date(new Date(new Date(this.listQuery.reportTime[0]).setMonth(0, 1)).setHours(0, 0, 0)).getTime() : undefined
this.listQuery.endTime = this.listQuery.reportTime ? new Date(new Date(new Date(this.listQuery.reportTime[1]).setMonth(11, 31)).setHours(23,59,59)).getTime() : undefined
if (this.listQuery.reportTime[0] && e - this.listQuery.reportTime[0] > 10) {
this.$message({
message: '年份起止时间不能超过十年',
@@ -218,20 +205,22 @@ export default {
},
changeTime() {
if (this.listQuery.reportTime) {
this.createStartDate = moment(new Date(this.listQuery.reportTime[0]), 'yyyy-MM-dd hh:mm:ss');
this.createEndDate = moment(new Date(this.listQuery.reportTime[1]), 'yyyy-MM-dd hh:mm:ss');
this.listQuery.beginTime = this.listQuery.reportTime ? new Date(this.listQuery.reportTime[0]).getTime() : undefined
this.listQuery.endTime = this.listQuery.reportTime ? new Date(this.listQuery.reportTime[1]).getTime() : undefined
// this.createStartDate = moment(new Date(this.listQuery.reportTime[0]), 'yyyy-MM-dd hh:mm:ss');
// this.createEndDate = moment(new Date(this.listQuery.reportTime[1]), 'yyyy-MM-dd hh:mm:ss');
const numDays = (new Date(this.listQuery.reportTime[1]).getTime() - new Date(this.listQuery.reportTime[0]).getTime()) / (24 * 3600 * 1000); if (numDays > 730) {
this.$message({
message: '时间范围不能超过24个月',
type: 'warning'
});
this.listQuery.reportTime = [];
this.createStartDate = '';
this.createEndDate = '';
// this.createStartDate = '';
// this.createEndDate = '';
}
} else {
this.createStartDate = '';
this.createEndDate = '';
// this.createStartDate = '';
// this.createEndDate = '';
}
},
async getDict() {
@@ -264,63 +253,109 @@ export default {
},
async getDataList() {
const res = getEpPage(this.listQuery)
console.log(res)
// this.tableData = []
// this.tabl
const res = await getEpPage(this.listQuery)
let arr =[
{
prop: 'createTime',
label: '日期',
// filter: parseTime
},
{
prop: 'factory',
label: '工厂名称',
filter: (val) => ['瑞昌中建材光电材料有限公司', '邯郸中建材光电材料有限公司', '中建材株洲光电材料有限公司', '佳木斯中建材光电材料有限公司', '成都中建材光电材料有限公司', '凯盛光伏材料有限公司', '蚌埠兴科玻璃有限公司'][val]
}
]
// console.log(dataArr);
// for (let i = 0; i < res.data.list.length-1; i++) {
// if (r[i].createTime != r[i + 1].createTime ) {
// this.data.a.push(r[i])
// }
// }
// console.log(res.data);
// this.dynamicProps = []
const dateList = []
const processList = []
const factoryList = []
res.data.records.forEach(ele => {
// 表头
dateList.push(ele.environmentalProtectionName)
// 列数
processList.push(ele.createTime)
factoryList.push(ele.factory)
})
this.dateProps = Array.from(new Set(dateList))
// this.processArray = Array.from(new Set(processList))
// this.factoryArray = Array.from(new Set(factoryList))
// this.factoryArray.forEach(item => {
// const props =
// arr.push(props)
// })
// res.data.records.forEach(ele => {
// if (this.factoryArray.some(ele.factory) && this.factoryArray.some(ele.createTime)) {
// arr.push({
// })
// }
// // 表头
// // dateList.push(ele.environmentalProtectionName)
// // 列数
// // processList.push(ele.createTime)
// // factoryList.push(ele.factory)
// })
this.dateProps.forEach(item => {
const props = {
'prop': item,
'label': item
}
arr.push(props)
})
this.tableProps = arr
this.tableData = this.mergeGrade(res.data.records)
console.log(this.tableData)
// // 构造表格数据
// this.total = this.processArray.length
// this.processArray.forEach(process => {
// const listData = {
// 'createTime': process,
// 'factory':null
// }
// res.data.records.forEach((r,index) => {
// if (process === r.createTime) {
// // const temp = Object.keys(r).filter(keys => keys !== 'reportDate' && keys !== 'factory' && keys !== 'environmentalProtectionName' && keys !== 'id' && keys !== 'createTime')
// // const item = Object.keys(r).filter(keys => keys !== 'reportDate' && keys !== 'environmentalProtectionValue' && keys !== 'environmentalProtectionName' && keys !== 'id' && keys !== 'createTime')
// // console.log(r[item[0]]);
// listData[r.environmentalProtectionName] = r.environmentalProtectionValue
// listData.factory = r.factory
// }
// })
// console.log(listData);
// this.tableData.push(listData)
// })
},
add0(m) {
return m < 10 ? '0' + m : m
mergeGrade(grade) {
if (!Array.isArray(grade)) return []
const newGrade = []
grade.forEach(item => {
const index = newGrade.findIndex(subItem => subItem.factory === item.factory && subItem.createTime === item.createTime)
if (index > -1) {
newGrade[index][item.environmentalProtectionName] = item.environmentalProtectionValue
} else {
newGrade.push({
factory: item.factory,
createTime: item.groupTime,
[item.environmentalProtectionName]: item.environmentalProtectionValue
// grades: { [item.class]: item.grade }
})
}
})
return newGrade
},
format(shijianchuo) {
//shijianchuo是整数，否则要parseInt转换
var time = moment(new Date(shijianchuo)).format('YYYY-MM-DD HH:mm:ss')
// console.log(time)
// var y = time.getFullYear();
// var m = time.getMonth() + 1;
// var d = time.getDate();
// var h = time.getHours();
// var mm = time.getMinutes();
// var s = time.getSeconds();
return time
},
// changeTime(val) {
// if (val) {
// // console.log(val)
// // console.log(val.setHours(7, 0, 0))
// // console.log(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000)
// // let time = this.format(val.setHours(7, 0, 0))
// this.endTimeStamp = this.format(val.setHours(7, 0, 0)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
// this.startTimeStamp = this.format(val.setHours(7, 0, 1) - 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
// // console.log(this.listQuery.reportTime);
// this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
// this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
// console.log(this.listQuery.reportTime);
// } else {
// this.listQuery.reportTime = []
// }
// },
//时间戳转为yy-mm-dd hh:mm:ss
timeFun(unixtimestamp) {
var unixtimestamp = new Date(unixtimestamp);
var year = 1900 + unixtimestamp.getYear();
var month = "0" + (unixtimestamp.getMonth() + 1);
var date = "0" + unixtimestamp.getDate();
return year + "-" + month.substring(month.length - 2, month.length) + "-" + date.substring(date.length - 2, date.length)
},
buttonClick(val) {
this.listQuery.reportTime = val.reportTime ? val.reportTime : undefined;
switch (val.btnName) {
case 'search':
this.listQuery.pageNo = 1;
this.listQuery.pageSize = 10;
this.getDataList();
break;
case 'export':
this.handleExport();
break;
default:
console.log(val);
}
},
/** 导出按钮操作 */
handleExport() {
// 处理查询参数