diff --git a/src/views/base/dnbInstant/index.vue b/src/views/base/dnbInstant/index.vue
index a0afa1b..fa392f9 100644
--- a/src/views/base/dnbInstant/index.vue
+++ b/src/views/base/dnbInstant/index.vue
@@ -28,14 +28,14 @@
-
-
-
+
+
+
+
+
+
+
+
@@ -112,8 +112,8 @@
-
-
+
+
{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
@@ -157,24 +157,24 @@
-
-
- 修改
- 删除
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
import { listDnbInstant, getDnbInstant, delDnbInstant, addDnbInstant, updateDnbInstant } from "@/api/base/dnbInstant";
import { getMonitorInfoTree } from '@/api/report/pointDnb'
+import { parseTime } from '@//utils/ruoyi'
export default {
name: "DnbInstant",
@@ -345,7 +346,7 @@ export default {
{ key: 7, label: `B项电流`, visible: true },
{ key: 8, label: `C项电流`, visible: true },
{ key: 9, label: `记录时间`, visible: false },
- { key: 10, label: `功率因数`, visible: true },
+ { key: 10, label: `功率因数`, visible: false },
{ key: 11, label: `正向有功`, visible: true },
{ key: 12, label: `有功功率`, visible: false },
{ key: 13, label: `无功功率`, visible: false },
@@ -367,6 +368,9 @@ export default {
}
},
created() {
+ const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
+ this.daterangeCollectTime[0] = nowDate + ' 00:00:00'
+ this.daterangeCollectTime[1] = nowDate + ' 23:59:59'
this.getList();
this.getDeptTrees();
},
diff --git a/src/views/report/DayDnb/index.vue b/src/views/report/DayDnb/index.vue
index 4e98c3c..383690d 100644
--- a/src/views/report/DayDnb/index.vue
+++ b/src/views/report/DayDnb/index.vue
@@ -27,166 +27,170 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+ {{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
- 重置
-
-
-
-
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
- 导出
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
-
-
-
-
- {{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
-
-
-
- 修改
- 删除
-
-
-
-
-
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
@@ -194,29 +198,32 @@
v-for="dict in dict.type.is_flag"
:key="dict.value"
:label="parseInt(dict.value)"
- >{{dict.label}}
+ >{{ dict.label }}
+
-
+
+ v-model="form.createdTime"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="请选择创建时间"
+ >
-
+
+ v-model="form.updatedTime"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="请选择更新时间"
+ >
@@ -229,17 +236,18 @@
diff --git a/src/views/report/pointDnb/index.vue b/src/views/report/pointDnb/index.vue
index a6daad2..56bef72 100644
--- a/src/views/report/pointDnb/index.vue
+++ b/src/views/report/pointDnb/index.vue
@@ -46,13 +46,16 @@
-
-
-
+
+
@@ -62,27 +65,27 @@
-
- 新增
-
-
- 修改
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
@@ -169,8 +172,8 @@
-
-
+
+
@@ -212,6 +215,7 @@ import {
getMonitorInfoTree
} from '@/api/report/pointDnb'
import { listMonitorInfo,getMointorListLike} from "@/api/base/monitorInfo";
+import { parseTime } from '@//utils/ruoyi'
@@ -266,6 +270,7 @@ export default {
},
// 表单参数
form: {},
+ daterangeCollectTime: [],
defaultProps: {
children: "children",
label: "label"
@@ -279,7 +284,7 @@ export default {
columns: [
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `计量设备编号`, visible: true },
- { key: 2, label: `仪表值`, visible: true },
+ { key: 2, label: `仪表值(kW·h)`, visible: true },
{ key: 3, label: `耗量`, visible: true },
{ key: 4, label: `记录时间`, visible: true },
{ key: 5, label: `开始时间`, visible: true },
@@ -291,8 +296,6 @@ export default {
{ key: 11, label: `更新时间`, visible: false },
{ key: 12, label: `计量设备名称`, visible: true },
],
-
-
};
},
watch: {
@@ -303,6 +306,9 @@ export default {
}
},
created() {
+ const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
+ this.daterangeCollectTime[0] = nowDate + ' 00:00:00'
+ this.daterangeCollectTime[1] = nowDate + ' 23:59:59'
this.getList();
this.getDeptTrees();
},
@@ -317,6 +323,11 @@ export default {
/** 查询电整点耗量报表列表 */
getList() {
this.loading = true;
+ this.queryParams.params = {};
+ if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) {
+ this.queryParams.params["beginCollectTime"] = this.daterangeCollectTime[0];
+ this.queryParams.params["endCollectTime"] = this.daterangeCollectTime[1];
+ }
listPointDnb(this.queryParams).then(response => {
this.pointDnbList = response.rows;
this.total = response.total;
@@ -376,6 +387,7 @@ export default {
/** 重置按钮操作 */
resetQuery() {
+ this.daterangeCollectTime = [];
this.resetForm("queryForm");
this.queryParams.monitorCode = null;
this.handleQuery();
diff --git a/src/views/report/repairRateReport/index.vue b/src/views/report/repairRateReport/index.vue
index d197f8c..8f73d58 100644
--- a/src/views/report/repairRateReport/index.vue
+++ b/src/views/report/repairRateReport/index.vue
@@ -226,6 +226,15 @@ export default {
},
},
},
+ label: {
+ show: true,
+ position: "top",
+ textStyle: {
+ color: "#fff",
+ fontSize: 16
+ },
+ formatter: '{c}%'
+ },
legend: {
itemWidth: 3 * vw,
data: ['检漏返修率(%)'],
@@ -307,6 +316,15 @@ export default {
},
},
},
+ label: {
+ show: true,
+ position: "top",
+ textStyle: {
+ color: "#fff",
+ fontSize: 16
+ },
+ formatter: '{c}%'
+ },
legend: {
itemWidth: 3 * vw,
data: ['发泡返修率(%)'],
@@ -388,6 +406,15 @@ export default {
},
},
},
+ label: {
+ show: true,
+ position: "top",
+ textStyle: {
+ color: "#fff",
+ fontSize: 16
+ },
+ formatter: '{c}%'
+ },
legend: {
itemWidth: 3 * vw,
data: ['电检返修率(%)'],
@@ -469,6 +496,15 @@ export default {
},
},
},
+ label: {
+ show: true,
+ position: "top",
+ textStyle: {
+ color: "#fff",
+ fontSize: 16
+ },
+ formatter: '{c}%'
+ },
legend: {
itemWidth: 3 * vw,
data: ['总装返修率(%)'],