diff --git a/src/api/base/monitorInfo.js b/src/api/base/monitorInfo.js
index b7c42d0..1666b79 100644
--- a/src/api/base/monitorInfo.js
+++ b/src/api/base/monitorInfo.js
@@ -42,3 +42,9 @@ export function delMonitorInfo(objId) {
method: 'delete'
})
}
+export function getMointorListLike(monitorName){
+ return request({
+ url:'/base/monitorInfo/like/'+monitorName,
+ method:'get'
+ })
+}
diff --git a/src/api/report/DayDnb.js b/src/api/report/DayDnb.js
new file mode 100644
index 0000000..e2d66e2
--- /dev/null
+++ b/src/api/report/DayDnb.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询电日耗报列表
+export function listDayDnb(query) {
+ return request({
+ url: '/report/DayDnb/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询电日耗报详细
+export function getDayDnb(objId) {
+ return request({
+ url: '/report/DayDnb/' + objId,
+ method: 'get'
+ })
+}
+
+// 新增电日耗报
+export function addDayDnb(data) {
+ return request({
+ url: '/report/DayDnb',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改电日耗报
+export function updateDayDnb(data) {
+ return request({
+ url: '/report/DayDnb',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除电日耗报
+export function delDayDnb(objId) {
+ return request({
+ url: '/report/DayDnb/' + objId,
+ method: 'delete'
+ })
+}
diff --git a/src/api/report/pointDnb.js b/src/api/report/pointDnb.js
new file mode 100644
index 0000000..4351c98
--- /dev/null
+++ b/src/api/report/pointDnb.js
@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+
+// 查询电整点耗量报表列表
+export function listPointDnb(query) {
+ return request({
+ url: '/report/pointDnb/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询电整点耗量报表详细
+export function getPointDnb(objId) {
+ return request({
+ url: '/report/pointDnb/' + objId,
+ method: 'get'
+ })
+}
+
+// 新增电整点耗量报表
+export function addPointDnb(data) {
+ return request({
+ url: '/report/pointDnb',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改电整点耗量报表
+export function updatePointDnb(data) {
+ return request({
+ url: '/report/pointDnb',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除电整点耗量报表
+export function delPointDnb(objId) {
+ return request({
+ url: '/report/pointDnb/' + objId,
+ method: 'delete'
+ })
+}
+//查询设备计量设备信息下拉结构
+export function getMonitorInfoTree(){
+ return request({
+ url: '/base/monitorInfo/monitorInfoTree',
+ method: 'post'
+ })
+}
diff --git a/src/views/base/monitorInfo/index.vue b/src/views/base/monitorInfo/index.vue
index b3b9b69..834b41a 100644
--- a/src/views/base/monitorInfo/index.vue
+++ b/src/views/base/monitorInfo/index.vue
@@ -267,7 +267,8 @@ export default {
{ key: 13, label: `更新人`, visible: false },
{ key: 14, label: `更新时间`, visible: false },
{ key: 15, label: `计量设备编号`, visible: true },
- ]
+ ],
+
};
},
created() {
diff --git a/src/views/report/DayDnb/index.vue b/src/views/report/DayDnb/index.vue
new file mode 100644
index 0000000..a10a333
--- /dev/null
+++ b/src/views/report/DayDnb/index.vue
@@ -0,0 +1,430 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+ {{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dict.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/report/pointDnb/index.vue b/src/views/report/pointDnb/index.vue
new file mode 100644
index 0000000..b9eeecb
--- /dev/null
+++ b/src/views/report/pointDnb/index.vue
@@ -0,0 +1,443 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+ {{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dict.label}}
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index ae87fe4..5812938 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -476,6 +476,7 @@ export default {
}
);
},
+ //this
/** 查询部门下拉树结构 */
getDeptTree() {
deptTreeSelect().then(response => {
@@ -667,4 +668,4 @@ export default {
}
}
};
-
\ No newline at end of file
+