diff --git a/src/views/energy/WaterManagement/dianMeasurement/index.vue b/src/views/energy/WaterManagement/dianMeasurement/index.vue
index 3e81174..d7cd5c7 100644
--- a/src/views/energy/WaterManagement/dianMeasurement/index.vue
+++ b/src/views/energy/WaterManagement/dianMeasurement/index.vue
@@ -71,10 +71,10 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
- >搜索搜索
重置重置
@@ -88,7 +88,7 @@
size="mini"
@click="handleAdd"
v-hasPermi="['energy:ShuiMeasurement:add']"
- >新增新增
@@ -98,7 +98,7 @@
icon="el-icon-sort"
size="mini"
@click="toggleExpandAll"
- >展开/折叠展开/折叠
@@ -161,7 +161,7 @@
-
+
@@ -205,7 +205,7 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['energy:ShuiMeasurement:edit']"
- >修改修改
新增新增
删除删除
@@ -240,7 +240,7 @@
选择采集设备选择采集设备
@@ -280,8 +280,8 @@
-
-
+
+
@@ -289,7 +289,7 @@
v-for="dict in dict.type.monitorStatus"
:key="dict.value"
:label="parseInt(dict.value)"
- >{{ dict.label }}{{ dict.label }}
@@ -314,7 +314,7 @@
:props="defaultProps"
>
-
+
{{ dict.label }}{{ dict.label }}
@@ -439,10 +439,10 @@
icon="el-icon-search"
size="mini"
@click="handleQuery1"
- >搜索搜索
重置重置
@@ -585,7 +585,7 @@ export default {
children: "children",
label: "label",
},
- // 分项类型列表
+ // 部门类型列表
subentryOptions: [],
// 业态类型列表
businessOptions: [],
@@ -683,7 +683,6 @@ export default {
updateBy: null,
updateTime: null,
publicShareType: null,
- connCode: null,
};
this.resetForm("form");
},
@@ -850,7 +849,7 @@ export default {
this.buildOptions = response.data;
});
},
- /** 查询分项类型树结构 */
+ /** 查询部门类型树结构 */
getSubentrySelect() {
subentryTreeSelect().then((response) => {
this.subentryOptions = response.data;
@@ -872,7 +871,7 @@ export default {
let checkedKeystr = checkedKeys.join();
return checkedKeystr;
},
- // 所有分项节点数据
+ // 所有部门节点数据
getSubentryAllCheckedKeys() {
// 目前被选中的菜单节点
let checkedKeys = this.$refs.subentry.getCheckedKeys();
diff --git a/src/views/energy/energy/base/subentryType/index.vue b/src/views/energy/energy/base/subentryType/index.vue
index 03f6302..cdb73e0 100644
--- a/src/views/energy/energy/base/subentryType/index.vue
+++ b/src/views/energy/energy/base/subentryType/index.vue
@@ -9,18 +9,18 @@
@keyup.enter.native="handleQuery"
/>
-
+
-
+
@@ -52,7 +52,7 @@
/>
-->
- 搜索
+ 搜索
重置
@@ -91,16 +91,16 @@
:default-expand-all="isExpandAll"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
-
-
-
+
+
+
-
-
+
+
-
+
-
-
-
+
+
@@ -183,9 +183,9 @@ export default {
list: null,
// 显示搜索条件
showSearch: true,
- // 分项类型管理表格数据
+ // 部门类型管理表格数据
subentryTypeList: [],
- // 分项类型管理树选项
+ // 部门类型管理树选项
subentryTypeOptions: [],
// 弹出层标题
title: "",
@@ -215,7 +215,7 @@ export default {
this.getList();
},
methods: {
- /** 查询分项类型管理列表 */
+ /** 查询部门类型管理列表 */
getList() {
this.loading = true;
listSubentryType(this.queryParams).then(response => {
@@ -224,7 +224,7 @@ export default {
this.loading = false;
});
},
- /** 转换分项类型管理数据结构 */
+ /** 转换部门类型管理数据结构 */
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children;
@@ -235,7 +235,7 @@ export default {
children: node.children
};
},
- /** 查询分项类型管理下拉树结构 */
+ /** 查询部门类型管理下拉树结构 */
getTreeselect() {
listSubentryType().then(response => {
this.subentryTypeOptions = [];
@@ -285,7 +285,7 @@ export default {
this.form.parentId = 0;
}
this.open = true;
- this.title = "添加分项类型管理";
+ this.title = "添加部门类型管理";
},
/** 展开/折叠操作 */
toggleExpandAll() {
@@ -305,7 +305,7 @@ export default {
getSubentryType(row.objid).then(response => {
this.form = response.data;
this.open = true;
- this.title = "修改分项类型管理";
+ this.title = "修改部门类型管理";
});
},
/** 提交按钮 */
@@ -330,7 +330,7 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
- this.$modal.confirm('是否确认删除分项类型管理编号为"' + row.objid + '"的数据项？').then(function() {
+ this.$modal.confirm('是否确认删除部门类型管理编号为"' + row.objid + '"的数据项？').then(function() {
return delSubentryType(row.objid);
}).then(() => {
this.getList();
diff --git a/src/views/energy/report/energyConsumptionTrendAnalysis/index.vue b/src/views/energy/report/energyConsumptionTrendAnalysis/index.vue
index b9ee684..36bf951 100644
--- a/src/views/energy/report/energyConsumptionTrendAnalysis/index.vue
+++ b/src/views/energy/report/energyConsumptionTrendAnalysis/index.vue
@@ -53,7 +53,7 @@
:type="getDatePickerType"
value-format="yyyy-MM-dd HH:mm:ss"
:placeholder="getDatePickerPlaceholder"
- style="width: 240px"
+ style="width: 200px"
@change="handleQuery"
/>
-
@@ -62,16 +62,16 @@
:type="getDatePickerType"
value-format="yyyy-MM-dd HH:mm:ss"
:placeholder="getDatePickerPlaceholder"
- style="width: 240px"
+ style="width: 200px"
@change="handleEndTimeChange"
/>
-
+
+
+
+
+
+
@@ -99,6 +110,7 @@ import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import * as echarts from "echarts";
import {treeDat} from "@/api/energy/energy/base/typeRelation";
+import {treeDatthree, treeDattwo} from "../../../../api/energy/energy/base/typeRelation";
export default {
name: "EnergyConsumptionTrendAnalysis",
@@ -166,6 +178,7 @@ export default {
endTime: '',
energyType: 2,
monitorIds: '',
+ relationType: '0',
},
// 列信息
columns: [
@@ -287,6 +300,11 @@ export default {
{label: "月", value: "month"},
{label: "年", value: "year"},
],
+ statisticalUnit: [
+ {label: "建筑", value: "0"},
+ {label: "业态", value: "1"},
+ {label: "部门", value: "2"}
+ ],
// 图表配置
chartOptions: {
lineChart: {
@@ -340,7 +358,7 @@ export default {
const minutes = pad(date.getMinutes());
const seconds = pad(date.getSeconds());
- switch(type) {
+ switch (type) {
case 'year':
return `${year}-01-01 00:00:00`;
case 'month':
@@ -360,7 +378,7 @@ export default {
const month = pad(date.getMonth() + 1);
const day = pad(date.getDate());
- switch(type) {
+ switch (type) {
case 'year':
return `${year}-12-31 23:59:59`;
case 'month':
@@ -428,16 +446,39 @@ export default {
},
/** 查询部门下拉树结构 */
getDeptTree() {
- treeDat().then((response) => {
- response.map((item, index) => {
- item,
- item.oid = item.id,
- item.lable = item.name
- })
- this.deptOptions = this.tranListToTreeData(response);
- console.log(this.deptOptions)
- //this.deptOptions = response.data;
- });
+ if (this.queryParams.relationType == '0') {
+ treeDat().then(response => {
+ response.map((item, index) => {
+ item,
+ item.oid = item.id,
+ item.lable = item.name
+ })
+ this.deptOptions = this.tranListToTreeData(response);
+ });
+ } else if (this.queryParams.relationType == '1') {
+ treeDattwo().then(response => {
+ response.map((item, index) => {
+ item,
+ item.oid = item.id,
+ item.lable = item.name
+ })
+ this.deptOptions = this.tranListToTreeData(response);
+ });
+ } else if (this.queryParams.relationType == '2') {
+ treeDatthree().then(response => {
+ response.map((item, index) => {
+ item,
+ item.oid = item.id,
+ item.lable = item.name
+ })
+ this.deptOptions = this.tranListToTreeData(response);
+ });
+ }
+ this.dynamicTags = [];
+ console.log(this.deptOptions)
+ },
+ getRelationTreeData() {
+ this.getDeptTree();
},
// 筛选节点
filterNode(value, data) {
@@ -497,6 +538,7 @@ export default {
type: this.queryParams.type,
startTime: this.queryParams.startTime,
endTime: this.queryParams.endTime,
+ relationType: this.queryParams.relationType,
monitorIds,
energyType: 2
});
@@ -533,7 +575,7 @@ export default {
},
computed: {
getDatePickerType() {
- switch(this.queryParams.type) {
+ switch (this.queryParams.type) {
case 'year':
return 'year';
case 'month':
@@ -546,7 +588,7 @@ export default {
}
},
getDatePickerPlaceholder() {
- switch(this.queryParams.type) {
+ switch (this.queryParams.type) {
case 'year':
return '选择年份';
case 'month':