diff --git a/package.json b/package.json
index 0f7964d..9bf353c 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
{
- "name": "ruoyi",
+ "name": "mh",
"version": "3.8.8",
- "description": "若依管理系统",
- "author": "若依",
+ "description": "铭汉能耗监测控制系统",
+ "author": "铭汉",
"license": "MIT",
"scripts": {
"dev": "vue-cli-service serve",
diff --git a/src/api/region.js b/src/api/region.js
new file mode 100644
index 0000000..db51c9b
--- /dev/null
+++ b/src/api/region.js
@@ -0,0 +1,162 @@
+import request from "@/utils/request";
+
+// 查询树形结构
+export function spaceTree() {
+ return request({
+ url: "/space/tree",
+ method: "get",
+ });
+}
+
+// 获取区域信息
+export function getAreaList(query) {
+ return request({
+ url: "/space/area/list",
+ method: "get",
+ params: query,
+ });
+}
+// 添加区域
+export function addArea(data) {
+ return request({
+ url: "/space/area",
+ method: "post",
+ data: data,
+ });
+}
+// 修改区域
+export function updateArea(data) {
+ return request({
+ url: "/space/area",
+ method: "put",
+ data: data,
+ });
+}
+// 根据id查询区域信息
+export function getArea(areaId) {
+ return request({
+ url: "/space/area/" + areaId,
+ method: "get",
+ });
+}
+// 删除区域
+export function delArea(areaIds) {
+ return request({
+ url: "/space/area/" + areaIds,
+ method: "delete",
+ });
+}
+// 获取楼栋信息
+export function getBuildingList(query) {
+ return request({
+ url: "/space/building/list",
+ method: "get",
+ params: query,
+ });
+}
+// 添加楼栋
+export function addBuilding(data) {
+ return request({
+ url: "/space/building",
+ method: "post",
+ data: data,
+ });
+}
+// 修改楼栋
+export function updateBuilding(data) {
+ return request({
+ url: "/space/building",
+ method: "put",
+ data: data,
+ });
+}
+// 根据id查询楼栋信息
+export function getBuilding(buildingId) {
+ return request({
+ url: "/space/building/" + buildingId,
+ method: "get",
+ });
+}
+// 删除楼栋
+export function delBuilding(buildingIds) {
+ return request({
+ url: "/space/building/" + buildingIds,
+ method: "delete",
+ });
+}
+// 获取楼层信息
+export function getFloorList(query) {
+ return request({
+ url: "/space/floor/list",
+ method: "get",
+ params: query,
+ });
+}
+// 添加楼层
+export function addFloor(data) {
+ return request({
+ url: "/space/floor",
+ method: "post",
+ data: data,
+ });
+}
+// 修改楼层
+export function updateFloor(data) {
+ return request({
+ url: "/space/floor",
+ method: "put",
+ data: data,
+ });
+}
+// 根据id查询楼层信息
+export function getFloor(floorId) {
+ return request({
+ url: "/space/floor/" + floorId,
+ method: "get",
+ });
+}
+// 删除楼层
+export function delFloor(floorIds) {
+ return request({
+ url: "/space/floor/" + floorIds,
+ method: "delete",
+ });
+}
+// 获取房间信息
+export function getHouseList(query) {
+ return request({
+ url: "/space/house/list",
+ method: "get",
+ params: query,
+ });
+}
+// 添加房间
+export function addHouse(data) {
+ return request({
+ url: "/space/house",
+ method: "post",
+ data: data,
+ });
+}
+// 修改房间
+export function updateHouse(data) {
+ return request({
+ url: "/space/house",
+ method: "put",
+ data: data,
+ });
+}
+// 根据id查询楼层信息
+export function getHouse(houseId) {
+ return request({
+ url: "/space/house/" + houseId,
+ method: "get",
+ });
+}
+// 删除房间
+export function delHouse(houseIds) {
+ return request({
+ url: "/space/house/" + houseIds,
+ method: "delete",
+ });
+}
diff --git a/src/assets/icons/svg/region.svg b/src/assets/icons/svg/region.svg
new file mode 100644
index 0000000..6ea09d4
--- /dev/null
+++ b/src/assets/icons/svg/region.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/views/alarm/alarmCode/index.vue b/src/views/alarm/alarmCode/index.vue
index 6feb127..e85d995 100644
--- a/src/views/alarm/alarmCode/index.vue
+++ b/src/views/alarm/alarmCode/index.vue
@@ -138,6 +138,7 @@
v-loading="loading"
:data="postList"
@selection-change="handleSelectionChange"
+ stripe
>
diff --git a/src/views/alarm/alarmRecord/index.vue b/src/views/alarm/alarmRecord/index.vue
index 25972b1..5846c27 100644
--- a/src/views/alarm/alarmRecord/index.vue
+++ b/src/views/alarm/alarmRecord/index.vue
@@ -97,7 +97,7 @@
-
+
diff --git a/src/views/alarm/alarmRule/index.vue b/src/views/alarm/alarmRule/index.vue
index c7bd942..125c1d5 100644
--- a/src/views/alarm/alarmRule/index.vue
+++ b/src/views/alarm/alarmRule/index.vue
@@ -130,6 +130,7 @@
v-loading="loading"
:data="postList"
@selection-change="handleSelectionChange"
+ stripe
>
diff --git a/src/views/device/comm/index.vue b/src/views/device/comm/index.vue
index 7c456d9..08ea041 100644
--- a/src/views/device/comm/index.vue
+++ b/src/views/device/comm/index.vue
@@ -102,6 +102,7 @@
v-loading="loading"
:data="postList"
@selection-change="handleSelectionChange"
+ stripe
>
diff --git a/src/views/device/gateway/index.vue b/src/views/device/gateway/index.vue
index 78d930e..d9320e8 100644
--- a/src/views/device/gateway/index.vue
+++ b/src/views/device/gateway/index.vue
@@ -110,6 +110,7 @@
v-loading="loading"
:data="postList"
@selection-change="handleSelectionChange"
+ stripe
>
diff --git a/src/views/device/gather/index.vue b/src/views/device/gather/index.vue
index b785e9d..00c6eae 100644
--- a/src/views/device/gather/index.vue
+++ b/src/views/device/gather/index.vue
@@ -147,6 +147,7 @@
v-loading="loading"
:data="postList"
@selection-change="handleSelectionChange"
+ stripe
>
@@ -216,7 +217,6 @@
否
-
@@ -239,6 +239,14 @@
/>
+
+
+
-
-
+
+
+
@@ -600,7 +617,7 @@ import {
addCPM,
updateCPM,
} from "@/api/device/gather";
-
+import { ledgerList } from "@/api/device/ledger";
export default {
name: "gather",
dicts: [
@@ -654,9 +671,11 @@ export default {
{ required: true, message: "请选择仪表类型", trigger: "blur" },
],
},
+ ledgerList: [], //设备台账列表
};
},
created() {
+ this.getLedgerList();
this.getList();
},
methods: {
@@ -683,6 +702,28 @@ export default {
this.loading = false;
});
},
+ // 选择采集设备的时候，请求设备台账列表
+ handleDeviceType() {
+ this.getLedgerList();
+ },
+ // 查找设备台账列表
+ getLedgerList() {
+ let data = {
+ pageNum: 1,
+ pageSize: 100000,
+ deviceType: this.form.terminalDeviceType,
+ };
+ ledgerList(data).then((response) => {
+ this.ledgerList = response.rows;
+ });
+ },
+ // 格式化设备类型的函数
+ formatDeviceLedger(row, column, cellValue) {
+ // 查找 devices 数组中 id 等于 cellValue 的对象
+ const device = this.ledgerList.find((item) => item.id === cellValue);
+ // 如果找到，返回对应的 deviceName，否则返回原始值
+ return device ? device.deviceName : cellValue;
+ },
// 取消按钮
cancel() {
this.open = false;
@@ -758,7 +799,10 @@ export default {
this.form = {
id: response.data.id,
remark: response.data.remark,
- deviceLedgerId: response.data.deviceLedgerId,
+ deviceLedgerId:
+ response.data.deviceLedgerId !== null
+ ? response.data.deviceLedgerId.toString()
+ : null,
mtType:
response.data.mtType !== null
? response.data.mtType.toString()
@@ -819,6 +863,8 @@ export default {
};
this.open = true;
this.title = "修改设备参数信息";
+ this.getLedgerList();
+ console.log("打开修改弹框的时候，设备类型是", this.form.deviceLedgerId);
});
},
/** 提交按钮 */
diff --git a/src/views/device/ledger/index.vue b/src/views/device/ledger/index.vue
index 247d000..1fae964 100644
--- a/src/views/device/ledger/index.vue
+++ b/src/views/device/ledger/index.vue
@@ -132,6 +132,7 @@
v-loading="loading"
:data="postList"
@selection-change="handleSelectionChange"
+ stripe
>
@@ -410,10 +411,25 @@ export default {
assetNum: [
{ required: true, message: "资产编号不能为空", trigger: "blur" },
],
+ installTime: [
+ { required: true, message: "请选择安装时间", trigger: "blur" },
+ ],
deviceType: [
{ required: true, message: "请选择设备类型", trigger: "blur" },
],
status: [{ required: true, message: "请选择状态", trigger: "blur" }],
+ isCollection: [
+ { required: true, message: "请选择是否", trigger: "blur" },
+ ],
+ modelSpecs:[
+ { required: true, message: "规格型号不能为空", trigger: "blur" },
+ ],
+ isCalcEnergy: [
+ { required: true, message: "请选择是否", trigger: "blur" },
+ ],
+ systemType: [
+ { required: true, message: "请选择系统类型", trigger: "blur" },
+ ],
},
};
},
diff --git a/src/views/device/maintenance/index.vue b/src/views/device/maintenance/index.vue
index 0ebfa32..b447afd 100644
--- a/src/views/device/maintenance/index.vue
+++ b/src/views/device/maintenance/index.vue
@@ -207,6 +207,7 @@
v-loading="loading"
:data="postList"
@selection-change="handleSelectionChange"
+ stripe
>
diff --git a/src/views/device/qrCode/index.vue b/src/views/device/qrCode/index.vue
index 96039ae..a8e5b10 100644
--- a/src/views/device/qrCode/index.vue
+++ b/src/views/device/qrCode/index.vue
@@ -102,6 +102,7 @@
v-loading="loading"
:data="postList"
@selection-change="handleSelectionChange"
+ stripe
>
diff --git a/src/views/device/spare/index.vue b/src/views/device/spare/index.vue
index cb702d3..9ad8818 100644
--- a/src/views/device/spare/index.vue
+++ b/src/views/device/spare/index.vue
@@ -118,6 +118,7 @@
v-loading="loading"
:data="postList"
@selection-change="handleSelectionChange"
+ stripe
>
diff --git a/src/views/device/spareInOut/index.vue b/src/views/device/spareInOut/index.vue
index bbfce9e..4b5c513 100644
--- a/src/views/device/spareInOut/index.vue
+++ b/src/views/device/spareInOut/index.vue
@@ -113,7 +113,7 @@
>
-
+
diff --git a/src/views/region/index.vue b/src/views/region/index.vue
new file mode 100644
index 0000000..33afd98
--- /dev/null
+++ b/src/views/region/index.vue
@@ -0,0 +1,1599 @@
+
+
+
+
+
+
+
+
+
+ {{ node.label }}
+
+
+
+ 新增
+
+
+
+
+ 修改
+
+
+ 删除
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 正常
+ 禁用
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+