From 3c524b79075b03eb06349dbf6d9e0cbbab69051c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=AF=E9=BE=99=20=E6=9B=B9?= <1805857645@QQ.com>
Date: Thu, 22 Aug 2024 15:53:15 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=E6=B7=BB=E5=8A=A0=E7=89=A9=E8=81=94?=
=?UTF-8?q?=E7=BD=91=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=BB=A5?=
=?UTF-8?q?=E5=8F=8A=E6=A0=91=E7=8A=B6=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../base/baseMonitorInfoIOTDevice/index.vue | 43 +-
.../ems/base/baseMonitorInfoSteam/index.vue | 4 +-
.../ems/record/recordIOTInstant/index.vue | 496 ++++++++++++++++++
3 files changed, 536 insertions(+), 7 deletions(-)
create mode 100644 src/views/ems/record/recordIOTInstant/index.vue
diff --git a/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue b/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
index 87a1090..4121027 100644
--- a/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
+++ b/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
@@ -17,6 +17,16 @@
@keyup.enter.native="handleQuery"
/>
+
+
+
+
+
-
+
+
@@ -163,6 +174,16 @@
+
+
+
+
+
@@ -221,6 +242,7 @@
import { listBaseMonitorInfo, getBaseMonitorInfo, delBaseMonitorInfo, addBaseMonitorInfo, updateBaseMonitorInfo } from "@/api/ems/base/baseMonitorInfo";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { getBaseEnergyTypeList } from '@/api/ems/base/baseEnergyType'
export default {
name: "BaseMonitorInfo",
@@ -251,8 +273,9 @@ export default {
parentId: null,
monitorCode: null,
monitorName: null,
+ energyType: null,
monitorAddr: null,
- monitorType: 4,
+ monitorType: null,
monitorStatus: null,
collectDeviceId: null,
ancestors: null,
@@ -281,12 +304,16 @@ export default {
monitorCode: [
{ required: true, message: "计量设备编号不能为空", trigger: "blur" }
],
+ energyTypeId: [
+ { required: true, message: '能源类型不能为空', trigger: 'blur' }
+ ]
},
columns: [
{key: 0, label: `自增标识`, visible: false},
{key: 1, label: `父级编号`, visible: false},
{key: 2, label: `计量设备编号`, visible: true},
{key: 3, label: `计量设备名称`, visible: true},
+ {key: 3, label: `能源类型`, visible: true},
{key: 4, label: `计量设备位置`, visible: true},
{key: 5, label: `计量设备类型`, visible: true},
{key: 6, label: `计量设备状态`, visible: true},
@@ -306,11 +333,16 @@ export default {
{key: 20, label: `更新时间`, visible: false},
{key: 21, label: `公摊表类型`, visible: false},
{key: 22, label: `表具层级`, visible: false},
- ]
+ ],
+ //能源类型选项
+ energyTypeList:[]
};
},
created() {
- this.getList();
+ getBaseEnergyTypeList({}).then(response => {
+ this.energyTypeList = response.data
+ })
+ this.getList()
},
methods: {
/** 查询计量设备信息列表 */
@@ -353,8 +385,9 @@ export default {
parentId: null,
monitorCode: null,
monitorName: null,
+ energyType: null,
monitorAddr: null,
- monitorType: 4,
+ monitorType: null,
monitorStatus: null,
collectDeviceId: null,
ancestors: null,
diff --git a/src/views/ems/base/baseMonitorInfoSteam/index.vue b/src/views/ems/base/baseMonitorInfoSteam/index.vue
index 87a1090..9aaca8d 100644
--- a/src/views/ems/base/baseMonitorInfoSteam/index.vue
+++ b/src/views/ems/base/baseMonitorInfoSteam/index.vue
@@ -252,7 +252,7 @@ export default {
monitorCode: null,
monitorName: null,
monitorAddr: null,
- monitorType: 4,
+ monitorType: 3,
monitorStatus: null,
collectDeviceId: null,
ancestors: null,
@@ -354,7 +354,7 @@ export default {
monitorCode: null,
monitorName: null,
monitorAddr: null,
- monitorType: 4,
+ monitorType: 3,
monitorStatus: null,
collectDeviceId: null,
ancestors: null,
diff --git a/src/views/ems/record/recordIOTInstant/index.vue b/src/views/ems/record/recordIOTInstant/index.vue
new file mode 100644
index 0000000..23c448a
--- /dev/null
+++ b/src/views/ems/record/recordIOTInstant/index.vue
@@ -0,0 +1,496 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+
+ 修改
+
+
+
+ 删除
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+