From 7c3682777fc15669983410a28a2eb3eb5ab318bf Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Mon, 2 Dec 2024 14:52:55 +0800
Subject: [PATCH] =?UTF-8?q?refactor(ruoyi):=E8=B0=83=E6=95=B4=E6=AF=8D?=
 =?UTF-8?q?=E6=8E=92=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=92=8C=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了 BaseBusbarInfoMapper 和 BaseCabinetInfoMapper 中的冗余 SQL 连接
- 更新了 baseBusbarInfo 页面的查询条件和表格展示内容
- 注释掉了部分不再使用的查询字段和表格列
- 调整了部分字段的显示标签，如"是否启用"改为"是否快检"
---
 .../mapper/base/BaseBusbarInfoMapper.xml      |  8 +++---
 .../mapper/base/BaseCabinetInfoMapper.xml     |  2 +-
 .../src/views/base/baseBusbarInfo/index.vue   | 26 +++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ruoyi-module/src/main/resources/mapper/base/BaseBusbarInfoMapper.xml b/ruoyi-module/src/main/resources/mapper/base/BaseBusbarInfoMapper.xml
index 4ef7477..e07ad4d 100644
--- a/ruoyi-module/src/main/resources/mapper/base/BaseBusbarInfoMapper.xml
+++ b/ruoyi-module/src/main/resources/mapper/base/BaseBusbarInfoMapper.xml
@@ -36,10 +36,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                bbi.created_time,
                bbi.updated_by,
                bbi.updated_time,
-               bbi.is_pictures ,
-               bci.cabinet_alias
+               bbi.is_pictures
+
         from base_busbar_info bbi
-        LEFT JOIN base_cabinet_info bci on bci.cabinet_code = bbi.cabinet_code
+
     </sql>
 
     <select id="selectBaseBusbarInfoList" parameterType="BaseBusbarInfo" resultMap="BaseBusbarInfoResult">
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedBy != null  and updatedBy != ''"> and bbi.updated_by = #{updatedBy}</if>
             <if test="params.beginUpdatedTime != null and params.beginUpdatedTime != '' and params.endUpdatedTime != null and params.endUpdatedTime != ''"> and bbi.updated_time between #{params.beginUpdatedTime} and #{params.endUpdatedTime}</if>
             <if test="isPictures != null "> and bbi.is_pictures = #{isPictures}</if>
-             <if test="cabinetAlias != null  and cabinetAlias != ''"> and bci.cabinet_alias like concat('%', #{cabinetAlias}, '%')</if>
+
         </where>
     </select>
 
diff --git a/ruoyi-module/src/main/resources/mapper/base/BaseCabinetInfoMapper.xml b/ruoyi-module/src/main/resources/mapper/base/BaseCabinetInfoMapper.xml
index a74837c..0a44be4 100644
--- a/ruoyi-module/src/main/resources/mapper/base/BaseCabinetInfoMapper.xml
+++ b/ruoyi-module/src/main/resources/mapper/base/BaseCabinetInfoMapper.xml
@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                bci.is_rotate,
                bci.rotate_angle
         from base_cabinet_info bci
-        LEFT JOIN base_busbar_info bbi on bci.cabinet_code = bbi.cabinet_code
+
     </sql>
 
     <select id="selectBaseCabinetInfoList" parameterType="BaseCabinetInfo" resultMap="BaseCabinetInfoResult">
diff --git a/ruoyi-ui/src/views/base/baseBusbarInfo/index.vue b/ruoyi-ui/src/views/base/baseBusbarInfo/index.vue
index 67e57a2..3cd8664 100644
--- a/ruoyi-ui/src/views/base/baseBusbarInfo/index.vue
+++ b/ruoyi-ui/src/views/base/baseBusbarInfo/index.vue
@@ -40,14 +40,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <el-form-item label="母排编号" prop="busbarCode">
+<!--      <el-form-item label="母排编号" prop="busbarCode">
         <el-input
           v-model="queryParams.busbarCode"
           placeholder="请输入母排编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="母排别名" prop="busbarAlias">
         <el-input
           v-model="queryParams.busbarAlias"
@@ -64,14 +64,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <el-form-item label="母排距离" prop="busbarDist">
+<!--      <el-form-item label="母排距离" prop="busbarDist">
         <el-input
           v-model="queryParams.busbarDist"
           placeholder="请输入母排距离"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="是否检测" prop="isChecked">
         <el-select v-model="queryParams.isChecked" placeholder="请选择是否检测" clearable>
           <el-option
@@ -82,7 +82,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="是否尾排" prop="isEnd">
+<!--      <el-form-item label="是否尾排" prop="isEnd">
         <el-select v-model="queryParams.isEnd" placeholder="请选择是否尾排" clearable>
           <el-option
             v-for="dict in dict.type.busbar_is_end"
@@ -91,9 +91,9 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
-      <el-form-item label="是否启用" prop="isFlag">
-        <el-select v-model="queryParams.isFlag" placeholder="请选择是否启用" clearable>
+      </el-form-item>-->
+      <el-form-item label="是否快检" prop="isFlag">
+        <el-select v-model="queryParams.isFlag" placeholder="请选择是否快检" clearable>
           <el-option
             v-for="dict in dict.type.busbar_is_flag"
             :key="dict.value"
@@ -213,10 +213,10 @@
     <el-table v-loading="loading" :data="baseBusbarInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="标识编号" align="center" prop="objId" />-->
-      <el-table-column label="母排编号" align="center" prop="busbarCode" />
-      <el-table-column label="母排别名" align="center" prop="busbarAlias" />
+      <el-table-column label="检测编号" align="center" prop="busbarCode" />
+      <el-table-column label="检测位置" align="center" prop="busbarAlias" />
 <!--      <el-table-column label="电柜别名" align="center" prop="cabinetAlias" />-->
-      <el-table-column label="电柜编号" align="center" prop="cabinetCode" />
+      <el-table-column label="所属电柜" align="center" prop="cabinetCode" />
       <el-table-column label="母排距离" align="center" prop="busbarDist" />
       <el-table-column label="是否检测" align="center" prop="isChecked">
         <template slot-scope="scope">
@@ -228,11 +228,11 @@
           <dict-tag :options="dict.type.busbar_is_end" :value="scope.row.isEnd"/>
         </template>
       </el-table-column>
-      <el-table-column label="是否启用" align="center" prop="isFlag">
+<!--      <el-table-column label="是否启用" align="center" prop="isFlag">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.busbar_is_flag" :value="scope.row.isFlag"/>
         </template>
-      </el-table-column>
+      </el-table-column>-->
 <!--      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="创建人" align="center" prop="createdBy" />
       <el-table-column label="创建时间" align="center" prop="createdTime" width="180">