设备标签数据对接

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

@@ -44,8 +44,8 @@ public class TblEquipmentTagController extends BaseController {
      */
     @SaCheckPermission("data:equipmentTag:list")
     @GetMapping("/list")
-    public TableDataInfo<TblEquipmentTagVo> list(TblEquipmentTagBo bo, PageQuery pageQuery) {
-        return iTblEquipmentTagService.queryPageList(bo, pageQuery);
+    public R<?> list(TblEquipmentTagBo bo) {
+        return R.ok(iTblEquipmentTagService.queryList(bo));
     }
 
     /**

ruoyi-ui-vue3/src/api/data/equipmenttag.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询规则列表
+export function listEquipmentTag(query) {
+  return request({
+    url: '/data/equipmentTag/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询规则详细
+export function getEquipmentTag(id) {
+  return request({
+    url: '/data/equipmentTag/' + id,
+    method: 'get'
+  })
+}
+
+// 新增规则
+export function addEquipmentTag(data) {
+  return request({
+    url: '/data/equipmentTag',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改规则
+export function updateEquipmentTag(data) {
+  return request({
+    url: '/data/equipmentTag',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除规则
+export function delEquipmentTag(id) {
+  return request({
+    url: '/data/equipmentTag/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui-vue3/src/views/system/devicetag/index.vue

@@ -8,8 +8,7 @@
           <el-button
             type="primary"
             @click="
-              detailshow = true;
-              edittype = 1;
+                doedit(null,1)
             "
             >添加</el-button
           >
@@ -19,17 +18,16 @@
 
         <el-col :span="24" style="padding-left: 10px">
           <el-table :data="dwtabledata" :border="true" :height="gettbheight()">
-            <el-table-column label="编码"></el-table-column>
-            <el-table-column label="名称"></el-table-column>
-            <el-table-column label="备注"></el-table-column>
+            <el-table-column prop="sn" label="编码"></el-table-column>
+            <el-table-column prop="name" label="名称"></el-table-column>
+            <el-table-column prop="remark" label="备注"></el-table-column>
             <el-table-column label="操作">
               <template #default="scope">
                 <div>
                   <el-button
                     link
                     @click="
-                      detailshow = true;
-                      edittype = 2;
+                     doedit(scope.row,2)
                     "
                   >
                     <el-tooltip effect="dark" content="编辑">
@@ -38,9 +36,9 @@
                       </el-icon>
                     </el-tooltip>
                   </el-button>
-                  <el-popconfirm title="确定删除该记录?">
+                  <el-popconfirm title="确定删除该记录?" @confirm="deleterow(scope.row)">
                     <template #reference>
-                      <el-button link @click="deleterow(scope.row)"
+                      <el-button link
                         ><el-tooltip effect="dark" content="删除"
                           ><el-icon><Delete /></el-icon></el-tooltip
                       ></el-button>
@@ -60,13 +58,13 @@
     >
       <el-form  :model="dwform" label-width="120px">
         <el-form-item label="编码">
-          <el-input v-model="dwform.name"  :disabled="edittype==3"/>
+          <el-input v-model="dwform.sn"  :disabled="edittype==3"/>
         </el-form-item>
         <el-form-item label="名称">
           <el-input v-model="dwform.name"  :disabled="edittype==3"/>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input type="textarea" v-model="dwform.name" :disabled="edittype==3"/>
+          <el-input type="textarea" v-model="dwform.remark" :disabled="edittype==3"/>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -81,41 +79,73 @@
 
 <script setup lang="ts" name="Units">
 import { ref } from "vue";
+import { listEquipmentTag,addEquipmentTag,updateEquipmentTag,delEquipmentTag } from '@/api/data/equipmenttag.js'
+import {ElMessage} from "element-plus";
+
 
-const dwtypetabledata = ref([]);
-const dwtabledata = ref([1,1,1,1,1,1]);
+const dwtabledata = ref([]);
 
 const edittype = ref(1);
 const detailshow = ref(false);
 
 const dwform = ref({
-  id: 0,
-  name: "",
-  unitSymbol: "",
-  unitName: "",
-  isStandard: "",
-  unitType: "",
-  toStandardRatio: 0,
-  toOffset: 0,
-  remark: "",
-  creator: "",
-  ctime: "",
-  modifier: "",
-  utime: "",
+  "sn": "",
+  "name": "",
+  "remark": ""
 });
+const initdata = ()=>{
+  dwform.value = ({
+    "sn": "",
+    "name": "",
+    "remark": ""
+  })
+}
+initdata();
+const doedit = (item,type) => {
+  edittype.value = 2;
+  dwform.value = item;
+  if(type==1){
+    initdata();
+  }
+  detailshow.value = true;
+};
 
 const gettbheight = () => {
   return window.innerHeight - 200;
 }
 
 const dosavedw = () => {
+  if(dwform.value["id"]!=undefined&&dwform.value["id"]!=null){
+    updateEquipmentTag(dwform.value).then((res) => {
+      ElMessage.success("保存成功")
+      getalldata();
+    });
+  }else{
+    addEquipmentTag(dwform.value).then((res) => {
+      ElMessage.success("保存成功")
+      getalldata();
+    })
+  }
   detailshow.value = false;
+
 };
 
 const  deleterow = (item) =>{
+   delEquipmentTag(item.id).then(res=>{
+     ElMessage.success("删除成功")
+     getalldata();
+   })
+}
+
+const getalldata = ()=>{
+  listEquipmentTag({}).then((res) => {
+    dwtabledata.value = res.data;
+  });
 
 }
 
+getalldata();
+
 
 </script>