对接空间区域管理

package.json

@@ -1,8 +1,8 @@
 {
-  "name": "ruoyi",
+  "name": "mh",
   "version": "3.8.8",
-  "description": "若依管理系统",
+  "description": "铭汉能耗监测控制系统",
-  "author": "若依",
+  "author": "铭汉",
   "license": "MIT",
   "scripts": {
     "dev": "vue-cli-service serve",

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",
+  });
+}

src/assets/icons/svg/region.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1741677673232" class="icon" viewBox="0 0 1026 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3796" xmlns:xlink="http://www.w3.org/1999/xlink" width="200.390625" height="200"><path d="M311.999 435.014c0 1.528 1.522 3.050 1.522 3.050l170.742 245.442 4.571 4.564c3.064 4.578 6.099 7.629 9.15 10.686 15.243 9.135 36.578 3.043 48.778-13.729l155.508-250.014 3.036-4.571s0-1.528 1.528-1.528c21.351-35.057 33.535-76.222 33.535-120.428 0-129.578-105.186-234.772-234.765-234.772s-234.772 105.193-234.772 234.772c3.050 45.736 16.771 89.95 41.165 126.528zM508.649 139.265c0.144-0.001 0.316-0.001 0.486-0.001 92.35 0 167.214 74.864 167.214 167.214 0 0.169 0 0.337-0.001 0.505 0 31.987-9.143 60.952-24.393 86.873l-3.050 6.099-132.622 211.9-143.307-205.808-6.099-12.193c-15.25-24.393-24.393-54.886-24.393-86.9-1.522-91.471 73.186-167.693 166.164-167.693zM508.649 139.265z" p-id="3797" fill=""></path><path d="M513.229 413.671c0.119 0.001 0.261 0.001 0.4 0.001 52.822 0 95.643-42.821 95.643-95.643 0-0.138 0-0.277-0.001-0.415 0-53.343-42.693-96.028-96.042-96.028s-96.036 42.686-96.036 96.051c-0.001 0.119-0.001 0.261-0.001 0.401 0 52.818 42.818 95.635 95.635 95.635 0.141 0 0.282 0 0.423-0.001zM513.229 285.621c18.3 0 32.014 13.721 32.014 32.014s-13.721 32.007-32.014 32.007c-16.764 0-32.007-13.715-32.007-32.007-0.008-18.292 15.243-32.014 32.007-32.014zM932.464 433.493h-163.121c-18.3 0-32.014 13.721-32.014 32.014 0 18.3 13.721 32.014 32.014 32.014h99.093c16.764 0 32.007 15.25 32.007 32v323.2c0 18.293-13.721 32.014-32.007 32.014h-710.415c-18.292 0-32.007-13.729-32.007-32.014v-321.664c0-18.286 13.721-32.007 32.007-32.007h99.086c18.3 0 32.014-13.721 32.014-32.014 0-18.3-13.721-32.014-32.014-32.014h-163.107c-18.293 0-32.007 13.721-32.007 32.014v451.243c0 18.292 13.721 32 32.007 32h838.471c18.293 0 32.007-13.715 32.007-32v-452.771c1.522-16.771-13.721-32.014-32.014-32.014zM932.464 433.493z" p-id="3798" fill=""></path></svg>

src/views/alarm/alarmCode/index.vue

@@ -138,6 +138,7 @@
       v-loading="loading"
       :data="postList"
       @selection-change="handleSelectionChange"
+      stripe
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="消息编码" align="center" prop="msgCode" />

src/views/alarm/alarmRecord/index.vue

@@ -97,7 +97,7 @@
         </div>
       </div>
     </div>
-    <el-table v-loading="loading" :data="postList">
+    <el-table v-loading="loading" :data="postList" stripe>
       <el-table-column label="设备名称" align="center" prop="deviceName" />
       <el-table-column label="仪表名称" align="center" prop="cpmName" />
       <el-table-column label="报警类型" align="center" prop="alarmType">

src/views/alarm/alarmRule/index.vue

@@ -130,6 +130,7 @@
       v-loading="loading"
       :data="postList"
       @selection-change="handleSelectionChange"
+      stripe
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="报警类型" align="center" prop="alarmType">

src/views/device/comm/index.vue

@@ -102,6 +102,7 @@
       v-loading="loading"
       :data="postList"
       @selection-change="handleSelectionChange"
+      stripe
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="仪表类型" align="center" prop="mtType">

src/views/device/gateway/index.vue

@@ -110,6 +110,7 @@
       v-loading="loading"
       :data="postList"
       @selection-change="handleSelectionChange"
+      stripe
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="网关名称" align="center" prop="gwName" />

src/views/device/gather/index.vue

@@ -147,6 +147,7 @@
       v-loading="loading"
       :data="postList"
       @selection-change="handleSelectionChange"
+      stripe
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="仪表类型" align="center" prop="mtType">
@@ -216,7 +217,6 @@
           <span v-if="scope.row.isUse === 1">否</span>
         </template>
       </el-table-column>
-      <el-table-column label="别名" align="center" prop="otherName" />
       <el-table-column label="累计/瞬时标识" align="center" prop="grade" />
       <el-table-column label="系统类型" align="center" prop="systemType">
         <template slot-scope="scope">
@@ -239,6 +239,14 @@
           />
         </template>
       </el-table-column>
+      <el-table-column
+        label="设备名称"
+        align="center"
+        prop="deviceLedgerId"
+        :formatter="formatDeviceLedger"
+      >
+      </el-table-column>
+      <el-table-column label="别名" align="center" prop="otherName" />
       <el-table-column label="参数类型" align="center" prop="paramType">
         <template slot-scope="scope">
           <dict-tag
@@ -566,6 +574,7 @@
                 v-model="form.terminalDeviceType"
                 placeholder="请选择采集设备"
                 clearable
+                @change="handleDeviceType"
               >
                 <el-option
                   v-for="dict in dict.type.sys_device_type"
@@ -576,11 +585,19 @@
               </el-select> </el-form-item
           ></el-col>
           <el-col :span="12">
-            <el-form-item label="设备台账id" prop="deviceLedgerId">
+            <el-form-item label="设备名称" prop="deviceLedgerId">
-              <el-input
+              <el-select
                 v-model="form.deviceLedgerId"
-                placeholder="请输入id"
+                placeholder="请选择设备名称"
-              /> </el-form-item
+                clearable
+              >
+                <el-option
+                  v-for="item in ledgerList"
+                  :key="item.id"
+                  :label="item.deviceName"
+                  :value="item.id"
+                />
+              </el-select> </el-form-item
           ></el-col>
         </el-row>
       </el-form>
@@ -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);
       });
     },
     /** 提交按钮 */

src/views/device/ledger/index.vue

@@ -132,6 +132,7 @@
       v-loading="loading"
       :data="postList"
       @selection-change="handleSelectionChange"
+      stripe
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="设备名称" align="center" prop="deviceName" />
@@ -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" },
+        ],
       },
     };
   },

src/views/device/maintenance/index.vue

@@ -207,6 +207,7 @@
       v-loading="loading"
       :data="postList"
       @selection-change="handleSelectionChange"
+      stripe
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="维保类型" align="center" prop="maintainType">

src/views/device/qrCode/index.vue

@@ -102,6 +102,7 @@
       v-loading="loading"
       :data="postList"
       @selection-change="handleSelectionChange"
+      stripe
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="二维码序列号" align="center" prop="serialNum" />

src/views/device/spare/index.vue

@@ -118,6 +118,7 @@
       v-loading="loading"
       :data="postList"
       @selection-change="handleSelectionChange"
+      stripe
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="备件序列号" align="center" prop="serialNum" />

src/views/device/spareInOut/index.vue

@@ -113,7 +113,7 @@
       ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="postList">
+    <el-table v-loading="loading" :data="postList" stripe>
       <!-- <el-table-column label="库存备件Id" align="center" prop="sparePartsId" /> -->
       <el-table-column label="备件名称" align="center" prop="spareName" />
       <el-table-column label="出入库操作类型" align="center" prop="operaType">