|
@@ -332,7 +332,7 @@
|
|
<span v-else>/</span>
|
|
<span v-else>/</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column prop="end_min_temp" label="最低室内温度(℃)" align="center" width="160">
|
|
|
|
|
|
+ <el-table-column prop="end_min_temp" label="最低室内温度(℃)" align="center" width="160" sortable="custom">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<span id="end_min_temp" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
|
|
<span id="end_min_temp" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
|
|
@click="handleItemClick(scope, 'end_min_temp')">
|
|
@click="handleItemClick(scope, 'end_min_temp')">
|
|
@@ -340,7 +340,7 @@
|
|
</span>
|
|
</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column prop="end_min_humidity" label="最低室内湿度(%)" align="center" width="160">
|
|
|
|
|
|
+ <el-table-column prop="end_min_humidity" label="最低室内湿度(%)" align="center" width="160" sortable="custom">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<span id="end_min_humidity" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
|
|
<span id="end_min_humidity" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
|
|
@click="handleItemClick(scope, 'end_min_humidity')">
|
|
@click="handleItemClick(scope, 'end_min_humidity')">
|
|
@@ -348,7 +348,7 @@
|
|
</span>
|
|
</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column prop="end_min_dew_point" label="最低室内露点(℃)" align="center" width="160">
|
|
|
|
|
|
+ <el-table-column prop="end_min_dew_point" label="最低室内露点(℃)" align="center" width="160" sortable="custom">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<span id="end_min_dew_point" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
|
|
<span id="end_min_dew_point" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
|
|
@click="handleItemClick(scope, 'end_min_dew_point')">
|
|
@click="handleItemClick(scope, 'end_min_dew_point')">
|
|
@@ -356,7 +356,7 @@
|
|
</span>
|
|
</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column prop="end_max_temp" label="最高室内温度(℃)" align="center" width="160">
|
|
|
|
|
|
+ <el-table-column prop="end_max_temp" label="最高室内温度(℃)" align="center" width="160" sortable="custom">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<span id="end_max_temp" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
|
|
<span id="end_max_temp" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
|
|
@click="handleItemClick(scope, 'end_max_temp')">
|
|
@click="handleItemClick(scope, 'end_max_temp')">
|
|
@@ -364,7 +364,7 @@
|
|
</span>
|
|
</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column prop="end_max_humidity" label="最高室内湿度(%)" align="center" width="160">
|
|
|
|
|
|
+ <el-table-column prop="end_max_humidity" label="最高室内湿度(%)" align="center" width="160" sortable="custom">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<span id="end_max_humidity" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
|
|
<span id="end_max_humidity" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
|
|
@click="handleItemClick(scope, 'end_max_humidity')">
|
|
@click="handleItemClick(scope, 'end_max_humidity')">
|
|
@@ -372,7 +372,7 @@
|
|
</span>
|
|
</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column prop="end_max_dew_point" label="最高室内露点(℃)" align="center" width="160">
|
|
|
|
|
|
+ <el-table-column prop="end_max_dew_point" label="最高室内露点(℃)" align="center" width="160" sortable="custom">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<div>
|
|
<div>
|
|
<span id="end_max_dew_point" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
|
|
<span id="end_max_dew_point" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
|
|
@@ -628,17 +628,12 @@ export default {
|
|
style: 'margin-left: 5px;',
|
|
style: 'margin-left: 5px;',
|
|
on: {
|
|
on: {
|
|
click: async function () {
|
|
click: async function () {
|
|
- // that.clickButton(type);
|
|
|
|
const res = await getReportTitle({ title: type });
|
|
const res = await getReportTitle({ title: type });
|
|
if (res.code === 200) {
|
|
if (res.code === 200) {
|
|
- //this.provinceOption = res.result;
|
|
|
|
- // alert(res.result.Content);
|
|
|
|
- console.log(res.result.Content);
|
|
|
|
that.showTitle = true;
|
|
that.showTitle = true;
|
|
that.Title = res.result.Content;
|
|
that.Title = res.result.Content;
|
|
that.titleTxt = type;
|
|
that.titleTxt = type;
|
|
}
|
|
}
|
|
- //alert(type);
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}, type)
|
|
}, type)
|
|
@@ -757,10 +752,13 @@ export default {
|
|
this.filterOriginData(originData);
|
|
this.filterOriginData(originData);
|
|
// 对每个字段设置颜色值
|
|
// 对每个字段设置颜色值
|
|
define.setPropColorVal(this.dataSource, this.argsList);
|
|
define.setPropColorVal(this.dataSource, this.argsList);
|
|
|
|
+ // console.log(">>> 设置颜色后: ", this.dataSource);
|
|
// 根据属性排序
|
|
// 根据属性排序
|
|
this.sortDataSource(sort);
|
|
this.sortDataSource(sort);
|
|
|
|
+ // console.log(">>> 排序后: ", this.dataSource);
|
|
// 分页并合并单元格
|
|
// 分页并合并单元格
|
|
this.genTableData();
|
|
this.genTableData();
|
|
|
|
+ // console.log('>>> 合并后: ', this.tableData);
|
|
loading.close();
|
|
loading.close();
|
|
}).catch(err => {
|
|
}).catch(err => {
|
|
console.log('[reportList]请求错误: ', err);
|
|
console.log('[reportList]请求错误: ', err);
|
|
@@ -857,7 +855,6 @@ export default {
|
|
} else {
|
|
} else {
|
|
return sortBoxList(this.dataSource, sort);
|
|
return sortBoxList(this.dataSource, sort);
|
|
}
|
|
}
|
|
- // console.log("排序后的数据: ", this.dataSource);
|
|
|
|
},
|
|
},
|
|
/** 生成tableData */
|
|
/** 生成tableData */
|
|
genTableData() {
|
|
genTableData() {
|
|
@@ -873,7 +870,6 @@ export default {
|
|
// 合并行和列
|
|
// 合并行和列
|
|
let dataSolve = mergeTableRows(expandNodes, this.mergeColums);
|
|
let dataSolve = mergeTableRows(expandNodes, this.mergeColums);
|
|
this.tableData = dataSolve;
|
|
this.tableData = dataSolve;
|
|
- console.log('>>> 合并后: ', this.tableData);
|
|
|
|
},
|
|
},
|
|
/** 数据行合并 */
|
|
/** 数据行合并 */
|
|
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
|
|
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
|