lijianfu
/
eemcs_ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1.修改热水-项目总览，饼图描述 

2.修改热水-用能查询，水电表读数添加单位
3.修改热水-能源分析，温度变化表、水位变化表添加全部时间点
meizhou
selia-zx 4 weeks ago
parent
68efeef754
commit
8416806539
7 changed files with 105 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      package.json
  2. 50
      src/views/hotWater/energyAnalysis/components/temReport.vue
  3. 54
      src/views/hotWater/energyAnalysis/components/waterReport.vue
  4. 8
      src/views/hotWater/energyQuery/components/electReading.vue
  5. 8
      src/views/hotWater/energyQuery/components/waterReading.vue
  6. 6
      src/views/hotWater/overview/index.vue
  7. 2
      src/views/region/index.vue

1
package.json
Unescape View File

@ -73,6 +73,7 @@
"connect": "3.6.6",
"eslint": "7.15.0",
"eslint-plugin-vue": "7.2.0",
"html-webpack-plugin": "^5.6.3",
"lint-staged": "10.5.3",
"runjs": "4.4.2",
"sass": "1.32.13",

50
src/views/hotWater/energyAnalysis/components/temReport.vue
Unescape View File

@ -35,7 +35,7 @@
:data="tableData"
@row-click="handlerow"
highlight-current-row
height="500"
height="400"
ref="maintable"
:cell-style="tableRowStyle"
>
@ -44,10 +44,18 @@
<el-table-column v-if="!showBuild" prop="deviceName" label="热泵名称">
</el-table-column>
<el-table-column label="0点" align="center" prop="temp00" />
<el-table-column label="1点" align="center" prop="temp01" />
<el-table-column label="2点" align="center" prop="temp02" />
<el-table-column label="3点" align="center" prop="temp03" />
<el-table-column label="4点" align="center" prop="temp04" />
<el-table-column label="5点" align="center" prop="temp05" />
<el-table-column label="6点" align="center" prop="temp06" />
<el-table-column label="7点" align="center" prop="temp07" />
<el-table-column label="8点" align="center" prop="temp08" />
<el-table-column label="9点" align="center" prop="temp09" />
<el-table-column label="10点" align="center" prop="temp10" />
<el-table-column label="11点" align="center" prop="temp11" />
<el-table-column label="12点" align="center" prop="temp12" />
<el-table-column label="13点" align="center" prop="temp13" />
<el-table-column label="14点" align="center" prop="temp14" />
<el-table-column label="15点" align="center" prop="temp15" />
@ -251,10 +259,18 @@ export default {
var tHeader = [
"楼栋名称",
"0点",
"02点",
"06点",
"1点",
"2点",
"3点",
"4点",
"5点",
"6点",
"7点",
"8点",
"9点",
"10点",
"11点",
"12点",
"13点",
"14点",
"15点",
@ -270,10 +286,18 @@ export default {
var filterVal = [
"buildingName",
"temp00",
"temp01",
"temp02",
"temp03",
"temp04",
"temp05",
"temp06",
"temp07",
"temp08",
"temp09",
"temp10",
"temp11",
"temp12",
"temp13",
"temp14",
"temp15",
@ -290,10 +314,18 @@ export default {
var tHeader = [
"热泵名称",
"0点",
"02点",
"06点",
"1点",
"2点",
"3点",
"4点",
"5点",
"6点",
"7点",
"8点",
"9点",
"10点",
"11点",
"12点",
"13点",
"14点",
"15点",
@ -309,10 +341,18 @@ export default {
var filterVal = [
"deviceName",
"temp00",
"temp01",
"temp02",
"temp03",
"temp04",
"temp05",
"temp06",
"temp07",
"temp08",
"temp09",
"temp10",
"temp11",
"temp12",
"temp13",
"temp14",
"temp15",

54
src/views/hotWater/energyAnalysis/components/waterReport.vue
Unescape View File

@ -35,7 +35,7 @@
:data="tableData"
@row-click="handlerow"
highlight-current-row
height="500"
height="400"
ref="maintable"
:cell-style="tableRowStyle"
>
@ -43,10 +43,18 @@
<el-table-column v-if="showDeviceName" prop="deviceName" label="设备名称">
</el-table-column>
<el-table-column label="0点" align="center" prop="temp00" />
<el-table-column label="1点" align="center" prop="temp01" />
<el-table-column label="2点" align="center" prop="temp02" />
<el-table-column label="3点" align="center" prop="temp03" />
<el-table-column label="4点" align="center" prop="temp04" />
<el-table-column label="5点" align="center" prop="temp05" />
<el-table-column label="6点" align="center" prop="temp06" />
<el-table-column label="7点" align="center" prop="temp07" />
<el-table-column label="8点" align="center" prop="temp08" />
<el-table-column label="9点" align="center" prop="temp09" />
<el-table-column label="10点" align="center" prop="temp10" />
<el-table-column label="11点" align="center" prop="temp11" />
<el-table-column label="12点" align="center" prop="temp12" />
<el-table-column label="13点" align="center" prop="temp13" />
<el-table-column label="14点" align="center" prop="temp14" />
<el-table-column label="15点" align="center" prop="temp15" />
@ -235,7 +243,7 @@ export default {
const data = params[0];
const month = data.name;
const value = data.value;
return `${month}<br/>温度: ${value} ℃`;
return `${month}<br/>水位: ${value} %`;
},
};
this.brokenOption.xAxis.data = this.brokenTime;
@ -250,10 +258,18 @@ export default {
"楼栋名称",
"设备名称",
"0点",
"02点",
"06点",
"1点",
"2点",
"3点",
"4点",
"5点",
"6点",
"7点",
"8点",
"9点",
"10点",
"11点",
"12点",
"13点",
"14点",
"15点",
@ -270,10 +286,18 @@ export default {
"buildingName",
"deviceName",
"temp00",
"temp01",
"temp02",
"temp03",
"temp04",
"temp05",
"temp06",
"temp07",
"temp08",
"temp09",
"temp10",
"temp11",
"temp12",
"temp13",
"temp14",
"temp15",
@ -290,10 +314,18 @@ export default {
var tHeader = [
"楼栋名称",
"0点",
"02点",
"06点",
"1点",
"2点",
"3点",
"4点",
"5点",
"6点",
"7点",
"8点",
"9点",
"10点",
"11点",
"12点",
"13点",
"14点",
"15点",
@ -309,10 +341,18 @@ export default {
var filterVal = [
"buildingName",
"temp00",
"temp01",
"temp02",
"temp03",
"temp04",
"temp05",
"temp06",
"temp07",
"temp08",
"temp09",
"temp10",
"temp11",
"temp12",
"temp13",
"temp14",
"temp15",
@ -331,7 +371,7 @@ export default {
excel.export_json_to_excel({
header: tHeader, //表头
data, //数据
filename: "温度变化报表", //名称
filename: "水位变化报表", //名称
autoWidth: true, //宽度自适应
});
});

8
src/views/hotWater/energyQuery/components/electReading.vue
Unescape View File

@ -52,9 +52,9 @@
<el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="抄表时间" align="center" prop="curTime" />
<el-table-column label="采集读数" align="center" prop="curValue" />
<el-table-column label="用量" align="center" prop="usedValue" />
<el-table-column label="用量(度)" align="center" prop="usedValue" />
<el-table-column label="倍率" align="center" prop="ratio" />
<el-table-column label="计算量" align="center" prop="calcValue" />
<el-table-column label="计算量(度)" align="center" prop="calcValue" />
</el-table>
<pagination
@ -215,9 +215,9 @@ export default {
"设备名称",
"抄表时间",
"采集读数",
"用量",
"用量(度)",
"倍率",
"计算量",
"计算量(度)",
]; // 导出的excel表头名信息 改参数
var filterVal = [
"buildingName",

8
src/views/hotWater/energyQuery/components/waterReading.vue
Unescape View File

@ -52,9 +52,9 @@
<el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="抄表时间" align="center" prop="curTime" />
<el-table-column label="采集读数" align="center" prop="curValue" />
<el-table-column label="用量" align="center" prop="usedValue" />
<el-table-column label="用量(吨)" align="center" prop="usedValue" />
<el-table-column label="倍率" align="center" prop="ratio" />
<el-table-column label="计算量" align="center" prop="calcValue" />
<el-table-column label="计算量(吨)" align="center" prop="calcValue" />
</el-table>
<pagination
@ -215,9 +215,9 @@ export default {
"设备名称",
"抄表时间",
"采集读数",
"用量",
"用量(吨)",
"倍率",
"计算量",
"计算量(吨)",
]; // 导出的excel表头名信息 改参数
var filterVal = [
"buildingName",

6
src/views/hotWater/overview/index.vue
Unescape View File

@ -226,7 +226,7 @@ export default {
},
series: [
{
name: "温度监测:",
name: "热泵运行状态:",
data: [
{ value: this.chartData1, name: "运行" },
{ value: this.chartData2, name: "不运行" },
@ -325,7 +325,7 @@ export default {
},
series: [
{
name: "温度监测:",
name: "热泵运行状态:",
data: [
{ value: 0, name: "运行" },
{ value: 0, name: "不运行" },
@ -388,7 +388,7 @@ export default {
series: [
// 数据圆
{
name: "温度监测:",
name: "热泵运行状态:",
type: "pie",
radius: ["50%", "62%"],
center: ["30%", "44%"],

2
src/views/region/index.vue
Unescape View File

@ -1352,7 +1352,7 @@ export default {
}
.treeTable {
margin-left: 0.2rem !important;
width: calc(100% - 3, 7rem) !important;
width: calc(100% - 3.7rem) !important;
}
}
</style>

Write Preview
Loading…
Cancel
Save