From 362c51fec3e41217b8a6e39dede8f43e868f13da Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Mon, 2 Dec 2024 17:09:06 +0800
Subject: [PATCH] =?UTF-8?q?refactor(baseInfo):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=92=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 注释掉创建人和创建时间列的显示
- 移除电柜编号输入框的禁用属性
- 更新是否检测选项的字典类型
- 调整报警信息列表的加载逻辑
- 修复母排信息和报警信息更新时的 ID 获取问题
---
 ruoyi-ui/src/views/base/baseInfo/index.vue | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/ruoyi-ui/src/views/base/baseInfo/index.vue b/ruoyi-ui/src/views/base/baseInfo/index.vue
index adc0c61..9a0e7cb 100644
--- a/ruoyi-ui/src/views/base/baseInfo/index.vue
+++ b/ruoyi-ui/src/views/base/baseInfo/index.vue
@@ -249,7 +249,7 @@
                 <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
               </template>
             </el-table-column>
-            <el-table-column label="创建人" align="center" prop="createdBy" />
+<!--            <el-table-column label="创建人" align="center" prop="createdBy" />
             <el-table-column label="创建时间" align="center" prop="createdTime" width="180">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
@@ -260,7 +260,7 @@
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>
               </template>
-            </el-table-column>
+            </el-table-column>-->
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <el-button
@@ -302,8 +302,8 @@
         <el-form-item label="母排别名" prop="busbarAlias">
           <el-input v-model="formBusbar.busbarAlias" placeholder="请输入母排别名" />
         </el-form-item>
-        <el-form-item label="电柜编号" prop="cabinetCode">
-          <el-input v-model="formBusbar.cabinetCode" placeholder="请输入电柜编号" disabled="!null"/>
+        <el-form-item label="电柜编号" prop="cabinetCode" >
+          <el-input v-model="formBusbar.cabinetCode" placeholder="请输入电柜编号" />
         </el-form-item>
         <el-form-item label="母排距离" prop="busbarDist">
           <el-input v-model="formBusbar.busbarDist" placeholder="请输入母排距离" />
@@ -311,7 +311,7 @@
         <el-form-item label="是否检测" prop="isChecked">
           <el-radio-group v-model="formBusbar.isChecked">
             <el-radio
-              v-for="dict in dict.type.busbar_is_checked"
+              v-for="dict in dict.type.is_checked"
               :key="dict.value"
               :label="parseInt(dict.value)"
             >{{dict.label}}</el-radio>
@@ -467,7 +467,7 @@ export default {
 
       // 遮罩层
       loadingBusbar: true,
-      loadingAlarm: true,
+      loadingAlarm: false,
       // 选中数组
       idsBusbar: [],
       idsAlarm: [],
@@ -609,7 +609,6 @@ export default {
     },
     /** 查询报警信息列表 */
     getListAlarm() {
-      this.loadingAlarm = true;
       this.queryParamsAlarm.params = {};
       if (null != this.daterangeCreatedTimeAlarm && '' != this.daterangeCreatedTimeAlarm) {
         this.queryParamsAlarm.params["beginCreatedTime"] = this.daterangeCreatedTimeAlarm[0];
@@ -665,7 +664,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdateBusbar(row) {
-      const id = row.id || this.idsBusbar.length === 1 ? this.idsBusbar[0] : "";
+      const id = row.objId || this.ids
       getBaseBusbarInfo(id).then(response => {
         this.formBusbar = response.data;
         this.openBusbar = true;
@@ -673,7 +672,7 @@ export default {
       });
     },
     handleUpdateAlarm(row) {
-      const id = row.id || this.idsAlarm.length === 1 ? this.idsAlarm[0] : "";
+      const id = row.objId || this.ids
       getBaseAlarmInfo(id).then(response => {
         this.formAlarm = response.data;
         this.openAlarm = true;