refactor(ruoyi):调整母排信息查询接口和相关页面展示

- 移除了 BaseBusbarInfoMapper 和 BaseCabinetInfoMapper 中的冗余 SQL 连接
- 更新了 baseBusbarInfo 页面的查询条件和表格展示内容
- 注释掉了部分不再使用的查询字段和表格列
- 调整了部分字段的显示标签,如"是否启用"改为"是否快检"
IOT
zch 3 months ago
parent a73a1ff7af
commit 7c3682777f

@ -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>

@ -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">

@ -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">

Loading…
Cancel
Save