更新

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblEquipmentController.java

@@ -119,16 +119,16 @@ public class TblEquipmentController extends BaseController {
         return R.ok(iTblEquipmentService.getDeviceMqttInfo(id));
     }
 
-    /**
-     * 根据网关查询所有设备列表
-     */
-    @SaCheckPermission("data:equipment:list")
-    @GetMapping("/alllist")
-    public TableDataInfo<TblEquipmentVo> alllist(TblEquipmentBo bo, PageQuery pageQuery) {
-        TableDataInfo<TblEquipmentVo> obj= new TableDataInfo<>();
-        List<TblEquipmentVo> tblEquipmentVoList = iTblEquipmentService.queryList(bo);
-        obj.setRows(tblEquipmentVoList);
-        return obj;
-    }
+//    /**
+//     * 根据网关查询所有设备列表
+//     */
+//    @SaCheckPermission("data:equipment:list")
+//    @GetMapping("/alllist")
+//    public TableDataInfo<TblEquipmentVo> alllist(TblEquipmentBo bo, PageQuery pageQuery) {
+//        TableDataInfo<TblEquipmentVo> obj= new TableDataInfo<>();
+//        List<TblEquipmentVo> tblEquipmentVoList = iTblEquipmentService.queryList(bo);
+//        obj.setRows(tblEquipmentVoList);
+//        return obj;
+//    }
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblEquipmentSbookController.java

@@ -59,14 +59,14 @@ public class TblEquipmentSbookController extends BaseController {
      */
     @SaCheckPermission("data:equipmentSbook:list")
     @GetMapping("/list")
-    public TableDataInfo<TblEquipmentSbook> list(TblEquipmentSbook bo, PageQuery pageQuery) {
-        TableDataInfo<TblEquipmentSbook> listObj= iTblEquipmentSbookService.queryallPageList(bo,pageQuery);
-        List<TblEquipmentSbook> tblEquipmentVoList = listObj.getRows();
+    public TableDataInfo<TblEquipmentSbookVo> list(TblEquipmentSbook bo, PageQuery pageQuery) {
+        TableDataInfo<TblEquipmentSbookVo> listObj= iTblEquipmentSbookService.queryallPageList(bo,pageQuery);
+        List<TblEquipmentSbookVo> tblEquipmentVoList = listObj.getRows();
         TblEquipmentOrganizationalBo organizationalBo = new TblEquipmentOrganizationalBo();
         List<TblEquipmentOrganizationalVo> tblEquipmentOrganizationalVoList = iTblEquipmentOrganizationalService.queryList(organizationalBo);
         TblEquipmentBo tblEquipmentBo = new TblEquipmentBo();
         List<TblEquipmentVo> tblEquipmentVos = iTblEquipmentService.queryList(tblEquipmentBo);
-        for(TblEquipmentSbook tblEquipmentSbook:tblEquipmentVoList){
+        for(TblEquipmentSbookVo tblEquipmentSbook:tblEquipmentVoList){
             for(TblEquipmentOrganizationalVo tblEquipmentOrganizationalVo:tblEquipmentOrganizationalVoList){
                 if(tblEquipmentSbook.getEquipmentTreeId().longValue() == tblEquipmentOrganizationalVo.getId().longValue()){
                     tblEquipmentSbook.setDeptName(tblEquipmentOrganizationalVo.getName());

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblEquipmentSbook.java

@@ -134,6 +134,5 @@ public class TblEquipmentSbook extends BaseEntity {
      */
     private String expr2;
 
-    private  TblEquipment equipment;
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblEquipmentSbookBo.java

@@ -44,7 +44,7 @@ public class TblEquipmentSbookBo extends BaseEntity {
     /**
      * 备用编码
      */
-    @NotBlank(message = "备用编码不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备用编码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String spareSn;
 
     /**
@@ -62,13 +62,13 @@ public class TblEquipmentSbookBo extends BaseEntity {
     /**
      * 所属公司
      */
-    @NotBlank(message = "所属公司不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "所属公司不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long deptId;
 
     /**
      * 所属组织机构
      */
-    @NotBlank(message = "所属组织机构不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "所属组织机构不能为空", groups = { AddGroup.class, EditGroup.class })
     private String deptName;
 
     /**

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblEquipmentSbookVo.java

@@ -189,4 +189,12 @@ public class TblEquipmentSbookVo implements Serializable {
     private String gatewayName;
 
     private TblEquipment equipment;
+
+    private String createBy;
+
+    private String updateBy;
+
+    private Date createTime;
+
+    private Date updateTime;
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblEquipmentVo.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.data.domain.TblEquipment;
 import lombok.Data;
 import java.util.Date;
 
@@ -99,5 +100,6 @@ public class TblEquipmentVo implements Serializable {
     @ExcelProperty(value = "拓展字段2")
     private Integer protocalType;
 
+    private TblEquipment equipment;
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblEquipmentSbookMapper.java

@@ -23,6 +23,6 @@ public interface TblEquipmentSbookMapper extends BaseMapperPlus<TblEquipmentSboo
         @DataColumn(key = "name", value = "d.id"),
         @DataColumn(key = "name", value = "u.id")
     })
-    Page<TblEquipmentSbook> selectPageList(@Param("page") Page<TblEquipmentSbook> page, @Param(Constants.WRAPPER) Wrapper<TblEquipmentSbook> queryWrapper);
+    Page<TblEquipmentSbookVo> selectPageList(@Param("page") Page<TblEquipmentSbook> page, @Param(Constants.WRAPPER) Wrapper<TblEquipmentSbook> queryWrapper);
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/service/ITblEquipmentSbookService.java

@@ -28,7 +28,7 @@ public interface ITblEquipmentSbookService {
     TableDataInfo<TblEquipmentSbookVo> queryPageList(TblEquipmentSbookBo bo, PageQuery pageQuery);
 
 
-    TableDataInfo<TblEquipmentSbook> queryallPageList(TblEquipmentSbook tblEquipmentSbook, PageQuery pageQuery);
+    TableDataInfo<TblEquipmentSbookVo> queryallPageList(TblEquipmentSbook tblEquipmentSbook, PageQuery pageQuery);
 
     /**
      * 查询设备台账列表

ruoyi-system/src/main/java/com/ruoyi/data/service/impl/MqttServiceImpl.java

@@ -78,14 +78,16 @@ public class MqttServiceImpl implements MqttService {
         tblRecord.setJson(mqttStr);
         tblRecord.setCreateBy("admin");
         tblRecord.setUpdateBy("admin");
+        tblRecord.setSensorId(sensorId);
         tblRecordMapper.insert(tblRecord);
         TblSensorRecordBo tblSensorRecord = new TblSensorRecordBo();
         tblSensorRecord.setEquipmentId(deviceId);
         tblSensorRecord.setJson(mqttStr);
         tblSensorRecord.setCreateBy("admin");
         tblSensorRecord.setUpdateBy("admin");
+        tblSensorRecord.setSensorId(sensorId);
         updateNowRecord(tblSensorRecord);
-//        tblSensorRecordMapper.insert(tblSensorRecord);
+//      tblSensorRecordMapper.insert(tblSensorRecord);
         for(MqttObj obj:mqttObjList){
                if(obj.getStatus() == 1) {
                    JSONObject topicObj = obj.getTopicQos("tcp");

ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblEquipmentSbookServiceImpl.java

@@ -12,10 +12,7 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.data.domain.TblEquipment;
 import com.ruoyi.data.domain.TblEquipmentOrganizational;
-import com.ruoyi.data.domain.bo.TblEquipmentOrganizationalBo;
-import com.ruoyi.data.domain.vo.TblEquipmentOrganizationalVo;
 import com.ruoyi.data.mapper.TblEquipmentMapper;
 import com.ruoyi.data.mapper.TblEquipmentOrganizationalMapper;
 import lombok.RequiredArgsConstructor;
@@ -67,8 +64,8 @@ public class TblEquipmentSbookServiceImpl implements ITblEquipmentSbookService {
     }
 
     @Override
-    public TableDataInfo<TblEquipmentSbook> queryallPageList(TblEquipmentSbook tblEquipmentSbook, PageQuery pageQuery) {
-        Page<TblEquipmentSbook> page = baseMapper.selectPageList(pageQuery.build(), this.buildLeftWrapper(tblEquipmentSbook));
+    public TableDataInfo<TblEquipmentSbookVo> queryallPageList(TblEquipmentSbook tblEquipmentSbook, PageQuery pageQuery) {
+        Page<TblEquipmentSbookVo> page = baseMapper.selectPageList(pageQuery.build(), this.buildLeftWrapper(tblEquipmentSbook));
         return TableDataInfo.build(page);
     }
 

ruoyi-system/src/main/resources/mapper/data/TblEquipmentSbookMapper.xml

@@ -36,6 +36,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+<!--        <association property="equipment" column="id" javaType="TblEquipment" resultMap="TblEquipmentResult"/>-->
+    </resultMap>
+
+    <resultMap type="com.ruoyi.data.domain.vo.TblEquipmentSbookVo" id="TblEquipmentSbookVoResult">
+        <result property="id" column="id"/>
+        <result property="equipmentTreeId" column="equipment_tree_id"/>
+        <result property="sn" column="sn"/>
+        <result property="spareSn" column="spare_sn"/>
+        <result property="name" column="name"/>
+        <result property="equipmentInfoId" column="equipment_info_id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="equipmentTypeId" column="equipment_type_id"/>
+        <result property="personInCharge" column="person_in_charge"/>
+        <result property="installationDate" column="installation_date"/>
+        <result property="address" column="address"/>
+        <result property="gatewayId" column="gateway_id"/>
+        <result property="tagids" column="tagids"/>
+        <result property="status" column="status"/>
+        <result property="endOfWarrantyPeriod" column="end_of_warranty_period"/>
+        <result property="manufacturingDate" column="manufacturing_date"/>
+        <result property="assetNo" column="asset_no"/>
+        <result property="serialNumber" column="serial_number"/>
+        <result property="useCertificateNo" column="use_certificate_no"/>
+        <result property="securityLevel" column="security_level"/>
+        <result property="usefulLife" column="useful_life"/>
+        <result property="changeDate" column="change_date"/>
+        <result property="supplier" column="supplier"/>
+        <result property="remark" column="remark"/>
+        <result property="expr1" column="expr1"/>
+        <result property="expr2" column="expr2"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
         <association property="equipment" column="id" javaType="TblEquipment" resultMap="TblEquipmentResult"/>
     </resultMap>
 
@@ -59,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
-    <select id="selectPageList" resultMap="TblEquipmentSbookResult">
+    <select id="selectPageList" resultMap="TblEquipmentSbookVoResult">
         select u.id, u.equipment_tree_id, u.sn, u.spare_sn, u.name, u.equipment_info_id, u.dept_id, u.dept_name,
                u.equipment_type_id, u.person_in_charge, u.installation_date, u.asset_no, u.serial_number,u.use_certificate_no,
                u.security_level,u.useful_life,u.change_date,u.supplier,

ruoyi-ui-vue3/src/views/device/equipmentdash/add.vue

@@ -6,7 +6,7 @@
           <span>设备台账-新增</span>
           <div>
             <el-button type="warning" @click="">复位</el-button>
-            <el-button type="primary" @click="save()">保存</el-button>
+            <el-button type="primary" @click="submit()">保存</el-button>
             <el-button type="primary" plain @click="router.back();">返回</el-button>
           </div>
         </div>
@@ -51,15 +51,17 @@
             <el-descriptions-item>
               <template #label>
                 <div style="display: inline-block;min-width: 100px;text-align: right">
-                  <span style="color: red">*</span> 所属项目
+                  状态
                 </div>
               </template>
               <div class="content-w">
-                <el-select-v2 v-model="value" :options="options" placeholder="请选择" filterable remote
-                  :prefix-icon="Search" />
+                <el-select v-model="queryParams.status" filterable placeholder="Select">
+                  <el-option v-for="item in statusList" :key="item.dictValue" :label="item.dictLabel"
+                    :value="item.dictValue" />
+                </el-select>
               </div>
             </el-descriptions-item>
-            <el-descriptions-item>
+            <!-- <el-descriptions-item>
               <template #label>
                 <div style="display: inline-block;min-width: 100px;text-align: right">
                   状态
@@ -71,7 +73,7 @@
                     :value="item.dictValue" />
                 </el-select>
               </div>
-            </el-descriptions-item>
+            </el-descriptions-item> -->
             <el-descriptions-item>
               <template #label>
                 <div style="display: inline-block;min-width: 100px;text-align: right">
@@ -79,8 +81,9 @@
                 </div>
               </template>
               <div class="content-w">
-                <el-select v-model="queryParams.equipmentInfoId" filterable placeholder="Select">
-                  <el-option v-for="item in equipmentList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-select v-model="equipmentObj" value-key="id" filterable placeholder="Select"
+                  @change="selectEquipment">
+                  <el-option v-for="item in equipmentList" :key="item.id" :label="item.name" :value="item" />
                 </el-select>
               </div>
             </el-descriptions-item>
@@ -90,7 +93,7 @@
                   设备型号
                 </div>
               </template>
-              <div class="content-w"> -</div>
+              <div class="content-w"> {{ equipmentObj.model }}</div>
             </el-descriptions-item>
             <el-descriptions-item>
               <template #label>
@@ -98,12 +101,9 @@
                   所属类型
                 </div>
               </template>
-              <div class="content-w">
-                <el-select v-model="queryParams.equipmentTypeId" filterable placeholder="Select">
-                  <el-option v-for="item in typeList" :key="item.dictValue" :label="item.dictLabel"
-                    :value="item.dictValue" />
-                </el-select>
-              </div>
+              <div class="content-w">{{ equipmentObj.type }}</div>
+            </el-descriptions-item>
+            <el-descriptions-item>
             </el-descriptions-item>
             <el-descriptions-item>
               <template #label>
@@ -113,7 +113,7 @@
               </template>
               <div class="content-w"> <el-input v-model="queryParams.personInCharge" placeholder="" /> </div>
             </el-descriptions-item>
-            <el-descriptions-item>
+            <!-- <el-descriptions-item>
               <template #label>
                 <div style="display: inline-block;min-width: 100px;text-align: right">
                   所属组织机构
@@ -122,7 +122,7 @@
               <div class="content-w">
                 <el-select-v2 v-model="value" :options="options" placeholder="请选择" />
               </div>
-            </el-descriptions-item>
+            </el-descriptions-item> -->
             <el-descriptions-item :span="2">
               <template #label>
                 <div style="display: inline-block;min-width: 100px;text-align: right">
@@ -135,16 +135,16 @@
                 </el-select>
               </div>
             </el-descriptions-item>
-            <el-descriptions-item :span="4">
+            <!-- <el-descriptions-item :span="4">
               <template #label>
-                <div style="display: inline-block;min-width: 100px;text-align: right;    vertical-align: top;">
+                <div style="display: inline-bloc1k;min-width: 100px;text-align: right;    vertical-align: top;">
                   备注
                 </div>
               </template>
               <div class="content-w" style="min-width: 600px">
                 <el-input  v-model="queryParams.remark" type="textarea" :line-count="5" placeholder="请输入备注" />
               </div>
-            </el-descriptions-item>
+            </el-descriptions-item> -->
 
           </el-descriptions>
 
@@ -161,7 +161,7 @@
 
                   </template>
                   <div class="content-w">
-                    <el-input  v-model="queryParams.supplier" placeholder="" />
+                    <el-input v-model="queryParams.supplier" placeholder="" />
                   </div>
                 </el-descriptions-item>
                 <el-descriptions-item>
@@ -172,7 +172,8 @@
 
                   </template>
                   <div class="content-w">
-                    <el-date-picker  v-model="queryParams.manufacturingDate" type="date" placeholder="请选择" />
+                    <el-date-picker value-format="YYYY-MM-DD HH:mm:ss" v-model="queryParams.manufacturingDate" type="date"
+                      placeholder="请选择" />
                   </div>
                 </el-descriptions-item>
 
@@ -184,7 +185,7 @@
 
                   </template>
                   <div class="content-w">
-                    <el-input  v-model="queryParams.usefulLife" placeholder="" />
+                    <el-input v-model="queryParams.usefulLife" placeholder="" />
                   </div>
                 </el-descriptions-item>
 
@@ -196,7 +197,8 @@
 
                   </template>
                   <div class="content-w">
-                    <el-date-picker  v-model="queryParams.endOfWarrantyPeriod" type="date" placeholder="请选择" />
+                    <el-date-picker value-format="YYYY-MM-DD HH:mm:ss" v-model="queryParams.endOfWarrantyPeriod"
+                      type="date" placeholder="请选择" />
                   </div>
                 </el-descriptions-item>
                 <el-descriptions-item>
@@ -207,7 +209,8 @@
 
                   </template>
                   <div class="content-w">
-                    <el-date-picker  v-model="queryParams.installationDate" type="date" placeholder="请选择" />
+                    <el-date-picker value-format="YYYY-MM-DD HH:mm:ss" v-model="queryParams.installationDate" type="date"
+                      placeholder="请选择" />
                   </div>
                 </el-descriptions-item>
                 <el-descriptions-item>
@@ -218,7 +221,7 @@
 
                   </template>
                   <div class="content-w">
-                    <el-input  v-model="queryParams.address" placeholder="" />
+                    <el-input v-model="queryParams.address" placeholder="" />
                   </div>
                 </el-descriptions-item>
                 <el-descriptions-item>
@@ -229,7 +232,8 @@
 
                   </template>
                   <div class="content-w">
-                    <el-date-picker  v-model="queryParams.changeDate" type="date" placeholder="请选择" />
+                    <el-date-picker value-format="YYYY-MM-DD HH:mm:ss" v-model="queryParams.changeDate" type="date"
+                      placeholder="请选择" />
                   </div>
                 </el-descriptions-item>
                 <!-- <el-descriptions-item>
@@ -269,7 +273,7 @@
                     </div>
                   </template>
                   <div class="content-w">
-                    <el-input  v-model="queryParams.assetNo" placeholder="" />
+                    <el-input v-model="queryParams.assetNo" placeholder="" />
                   </div>
                 </el-descriptions-item>
                 <el-descriptions-item>
@@ -279,7 +283,7 @@
                     </div>
                   </template>
                   <div class="content-w">
-                    <el-input  v-model="queryParams.serialNumber" placeholder="" />
+                    <el-input v-model="queryParams.serialNumber" placeholder="" />
                   </div>
                 </el-descriptions-item>
                 <el-descriptions-item>
@@ -289,7 +293,7 @@
                     </div>
                   </template>
                   <div class="content-w">
-                    <el-input  v-model="queryParams.useCertificateNo" placeholder="" />
+                    <el-input v-model="queryParams.useCertificateNo" placeholder="" />
                   </div>
                 </el-descriptions-item>
                 <el-descriptions-item>
@@ -299,7 +303,7 @@
                     </div>
                   </template>
                   <div class="content-w">
-                    <el-input  v-model="queryParams.securityLevel" placeholder="" />
+                    <el-input v-model="queryParams.securityLevel" placeholder="" />
                   </div>
                 </el-descriptions-item>
                 <!-- <el-descriptions-item>
@@ -343,6 +347,7 @@ import { getDicts } from '@/api/system/dict/data'
 import { listEquipmentTag } from '@/api/data/equipmenttag'
 import { listEquipmentOrganizational } from "@/api/data/equipmentOrganizational"
 import { listEquipment } from "@/api/data/equipment"
+import { addEquipmentSbook, getEquipmentSbook, updateEquipmentSbook } from "@/api/data/equipmentSbook"
 
 
 
@@ -352,6 +357,7 @@ const router = useRouter();
 const { proxy } = getCurrentInstance();
 
 const queryParams = ref({
+  id: null,
   equipmentTreeId: "",
   sn: "",
   spareSn: "",
@@ -377,6 +383,25 @@ const queryParams = ref({
   supplier: "",
 })
 
+
+let objId = route.query.id
+console.log(objId);
+
+// queryParams.value = router.params;
+
+const equipmentObj = ref({
+  id: '',
+  name: '',
+  sn: '',
+  model: '',
+  specs: '',
+  type: '',
+  equipmentTypeId: '',
+  manufacturer: '',
+  producer: '',
+  pictures: ''
+})
+
 const equipmentList = ref([]);
 const treeList = ref([]);
 const value = ref("1");
@@ -412,16 +437,57 @@ const getTreedata = () => {
 
 const getEquipmentList = () => {
   listEquipment({ pageSize: 10000 }).then(res => {
+    console.log(1);
     console.log(res);
     const { rows, total, page, size } = res;
     equipmentList.value = res.rows
+    if (objId != null) {
+      getDetail();
+    }
   })
 }
 
-const save = () =>{
-   console.log(queryParams.value);
+const submit = () => {
+  queryParams.value.equipmentInfoId = equipmentObj.value.id;
+  queryParams.value.equipmentTypeId = equipmentObj.value.equipmentTypeId;
+  console.log(queryParams.value);
+  if (queryParams.value.id == null) {
+    addEquipmentSbook(queryParams.value).then(res => {
+      console.log(res);
+      router.back()
+    })
+  } else {
+    updateEquipmentSbook(queryParams.value).then(res => {
+      console.log(res);
+      router.back()
+    })
+  }
 }
 
+
+const selectEquipment = (value) => {
+  console.log(value);
+}
+
+const getDetail = () => {
+  console.log(2);
+  getEquipmentSbook(objId).then(res => {
+    console.log(res);
+    queryParams.value = res.data
+    console.log(equipmentList.value);
+    console.log(3);
+    for (var index in equipmentList.value) {
+      // console.log(queryParams.value.equipmentInfoId);
+      // console.log(queryParams.value.equipmentInfoId);
+      if (queryParams.value.equipmentInfoId == equipmentList.value[index].id) {
+        equipmentObj.value = equipmentList.value[index]
+      }
+    }
+  })
+}
+
+
+
 getDictsData("equipment_type", typeList);
 getDictsData("status_type", statusList);
 getlistEquipmentTag();

ruoyi-ui-vue3/src/views/device/equipmentdash/index.vue

@@ -72,11 +72,11 @@
                 <el-table-column type="selection" width="55" />
                 <el-table-column v-for="item in columns.filter(i => i.visible)" :prop="item.prop"
                   :label="item.label"></el-table-column>
-                <el-table-column label="设备类型">
+                <!-- <el-table-column label="设备类型">
                   <template #default="scope">
                     {{ getTypeName(scope.row) }}
                   </template>
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column label="操作">
                   <template #default="scope">
                     <div>
@@ -87,6 +87,13 @@
                           </el-icon>
                         </el-tooltip>
                       </el-button>
+                      <el-button link @click="goUpdate(scope.row)">
+                        <el-tooltip effect="dark" content="修改">
+                          <el-icon>
+                            <Edit />
+                          </el-icon>
+                        </el-tooltip>
+                      </el-button>
                       <el-popconfirm title="确定删除该标签?">
                         <template #reference>
                           <el-button link><el-tooltip effect="dark" content="删除"><el-icon>
@@ -115,7 +122,7 @@
 </template>
 
 <script setup lang="ts" name="Units">
-import { ref,toRaw } from "vue";
+import { ref, toRaw } from "vue";
 import { LayTree } from "@layui/layui-vue";
 import "@layui/layui-vue/lib/index.css";
 
@@ -135,6 +142,14 @@ const goadd = () => {
   router.push("/device/equipmentdash/add")
 }
 
+
+const goUpdate = (item) => {
+  // router.push({ name: 'EquipmentDashAdd', params: { userId: '123' }})
+  router.push({ path: '/device/equipmentdash/add', query:{id:item.id} })
+  // router.push({ name: "EquipmentDashAdd", params: { item } })
+  // router.push({path:"/device/equipmentdash/add",params:item})
+}
+
 const handleClick = (node) => {
   //console.log("Click Node:" + JSON.stringify(node));
   searchform.value.equipmentTreeId = node.id
@@ -154,7 +169,7 @@ const devicetabledata = ref([]);
 const searchform = ref({
   name: "",
   sn: "",
-  equipmentTreeId:""
+  equipmentTreeId: ""
 });
 
 const columns = ref([
@@ -163,30 +178,30 @@ const columns = ref([
   { label: '设备编码', prop: 'sn', visible: true },
   { label: '备用编码', prop: 'spareSn', visible: true },
   { label: '设备名称', prop: 'name', visible: true },
-  { label: '设备信息', prop: 'equipment.name', visible: true },
+  { label: '设备模板', prop: 'equipment.name', visible: true },
   //{label: '所属公司', prop: 'parity', visible: true},
-  { label: '所属组织机构', prop: 'deptName', visible: true },
-  // { label: '所属类型', prop: 'apiUrl', visible: true },
-  { label: '负责人', prop: 'uuid', visible: true },
-  { label: '安装日期', prop: 'installationDate', visible: true },
-  { label: '安装地点地址', prop: 'address', visible: true },
-  // {label: '关联设备Id', prop: 'protocolDesc', visible: true},
-  { label: '标签', prop: 'tagids', visible: true },
-  { label: '状态', prop: 'status', visible: true },
-  { label: '保修期结束日期', prop: 'endOfWarrantyPeriod', visible: true },
-  { label: '制造日期', prop: 'manufacturingDate', visible: true },
-  { label: '资产编码', prop: 'assetNo', visible: true },
-  { label: '资产编号', prop: 'serialNumber', visible: true },
-  { label: '使用证编号', prop: 'useCertificateNo', visible: true },
-  { label: '安全级别', prop: 'securityLevel', visible: true },
-  { label: '使用年限', prop: 'usefulLife', visible: true },
-  { label: '变动日期', prop: 'changeDate', visible: true },
-  { label: '供货厂家', prop: 'supplier', visible: true },
-  { label: '创建人', prop: 'createBy', visible: true },
-  { label: '创建时间', prop: 'createTime', visible: true },
-  { label: '更新人', prop: 'updateBy', visible: true },
-  { label: '更新时间', prop: 'updateTime', visible: true },
-  { label: '备注', prop: 'remark', visible: true },
+  // { label: '所属组织机构', prop: 'deptName', visible: true },
+  { label: '所属类型', prop: 'equipment.type', visible: true },
+  { label: '负责人', prop: 'uuid', visible: false },
+  { label: '安装日期', prop: 'installationDate', visible: false },
+  { label: '安装地点地址', prop: 'address', visible: false },
+  { label: '关联设备Id', prop: 'protocolDesc', visible: false },
+  { label: '标签', prop: 'tagids', visible: false },
+  { label: '状态', prop: 'status', visible: false },
+  { label: '保修期结束日期', prop: 'endOfWarrantyPeriod', visible: false },
+  { label: '制造日期', prop: 'manufacturingDate', visible: false },
+  { label: '资产编码', prop: 'assetNo', visible: false },
+  { label: '资产编号', prop: 'serialNumber', visible: false },
+  { label: '使用证编号', prop: 'useCertificateNo', visible: false },
+  { label: '安全级别', prop: 'securityLevel', visible: false },
+  { label: '使用年限', prop: 'usefulLife', visible: false },
+  { label: '变动日期', prop: 'changeDate', visible: false },
+  { label: '供货厂家', prop: 'supplier', visible: false },
+  { label: '创建人', prop: 'createBy', visible: false },
+  { label: '创建时间', prop: 'createTime', visible: false },
+  { label: '更新人', prop: 'updateBy', visible: false },
+  { label: '更新时间', prop: 'updateTime', visible: false },
+  { label: '备注', prop: 'remark', visible: false },
 ])
 
 const onchangepage = (page) => {
@@ -212,7 +227,7 @@ const requery = () => {
   searchform.value = {
     name: "",
     sn: "",
-    equipmentTreeId:''
+    equipmentTreeId: ''
   }
   getlistEquipmentSbook();
 }