From ae17f5b669d6d4064526dc4628a6b8f9b43942ac Mon Sep 17 00:00:00 2001
From: wangxingyuan <2944009893@qq.com>
Date: Mon, 24 Feb 2025 14:18:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=BE=E5=A4=87=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/equipment/entry.js        |  19 ++-
 src/api/equipment/equipment.js    |   8 ++
 src/layout/components/Navbar.vue  |   8 +-
 src/views/equipment/api.js        |  19 +++
 src/views/equipment/entry.vue     | 217 +++++++++++++++++++++---------
 src/views/equipment/equipment.vue |  45 +++----
 6 files changed, 224 insertions(+), 92 deletions(-)
 create mode 100644 src/api/equipment/equipment.js
 create mode 100644 src/views/equipment/api.js

diff --git a/src/api/equipment/entry.js b/src/api/equipment/entry.js
index 96ef779..058a58d 100644
--- a/src/api/equipment/entry.js
+++ b/src/api/equipment/entry.js
@@ -22,4 +22,21 @@ export function devicetypeList(query) {
       method: 'get',
     //   params: query
     })
-  }
\ No newline at end of file
+  }
+  export function insertMainDeviceAndCommByDeviceType(data) {
+    return request({
+      url:`/basedata/prodevmnt/device/insertMainDeviceAndCommByDeviceType`,
+      method: 'post',
+      data:data
+    })
+  }
+
+  export function deviceRemove(id) {
+    console.log(id)
+    // return
+    return request({
+      url:`/basedata/prodevmnt/device/remove/${id}`,
+      method: 'post',
+    })
+  }
+ 
\ No newline at end of file
diff --git a/src/api/equipment/equipment.js b/src/api/equipment/equipment.js
new file mode 100644
index 0000000..e1e5be3
--- /dev/null
+++ b/src/api/equipment/equipment.js
@@ -0,0 +1,8 @@
+import request from '@/utils/request';
+export function getList(query) {
+  return request({
+    url: '/basedata/eqpbook/list',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 466cd98..0be1773 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -7,7 +7,7 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
+        <!-- <search id="header-search" class="right-menu-item" />
 
         <el-tooltip content="源码地址" effect="dark" placement="bottom">
           <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
@@ -15,13 +15,13 @@
 
         <el-tooltip content="文档地址" effect="dark" placement="bottom">
           <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
-        <el-tooltip content="布局大小" effect="dark" placement="bottom">
+        <!-- <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
 
       </template>
 
diff --git a/src/views/equipment/api.js b/src/views/equipment/api.js
new file mode 100644
index 0000000..0774a60
--- /dev/null
+++ b/src/views/equipment/api.js
@@ -0,0 +1,19 @@
+let api={
+    areaId:2000 //Tree ID
+    boolAdd:1 ？
+    deviceCode:"E100-001_main_4389_0022" //设备编号
+    deviceId:"" ？
+    deviceModel:"type" //设备型号
+    deviceName:"名称" //设备名称
+    devicetypeId:902 //设备类型ID
+    handerType:0 ?
+    manufacturer:"123123" //设备厂商
+    monitorIndexNo:"index" //监控索引号
+    orderNum:1 //排序
+    parentId:"" ？
+    parentName:"机器人" //父级名称
+    phyassetId:"shiwuID"    //实物ID
+    positionX:0.1 //坐标X
+    positionY: 66 //坐标Y
+    positionZ:0.2   //坐标Z
+}
\ No newline at end of file
diff --git a/src/views/equipment/entry.vue b/src/views/equipment/entry.vue
index 591341f..23b25f7 100644
--- a/src/views/equipment/entry.vue
+++ b/src/views/equipment/entry.vue
@@ -8,7 +8,7 @@
               <i class="el-icon-plus" @click="add" :class="addIcon?'addIcon':''"></i>
             </el-tooltip>
             <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
-              <i class="el-icon-delete"  :class="deleteIcon?'deleteIcon':''"></i>
+              <i class="el-icon-delete" @click="remove"  :class="deleteIcon?'deleteIcon':''"></i>
             </el-tooltip>
             <el-tooltip class="item" effect="dark" content="导出" placement="top-start">
               <i class="el-icon-download" ></i>
@@ -23,7 +23,7 @@
             :data="treeData"
             :props="defaultProps"
             @node-click="handleNodeClick"
-           
+           ref="tree"
           >
             <span slot-scope="{ node, data }" class="slot-node"">
               <template>
@@ -52,12 +52,12 @@
         <el-empty description="右侧功能暂未开发" v-if="!show"></el-empty>
         <div class="grid-content-right" v-if="show">
           <div class="titleName">{{ titleName }}</div>
-          <el-form ref="form" :model="form" label-width="80px">
+          <el-form ref="form" :model="form" label-width="100px">
             <el-form-item label="设备名称">
               <el-input v-model="form.deviceName"></el-input>
             </el-form-item>
             <el-form-item label="设备类型">
-              <el-select v-model="form.deviceTypeId" placeholder="请选择" :disabled="form.deviceName?true:false">
+              <el-select v-model="form.devicetypeId" placeholder="请选择">
                 <el-option :label="item.deviceTypeName" :value="item.deviceTypeId" v-for="item in deviceTypeData" :key="item.deviceTypeId"></el-option>
                 <!-- deviceTypeData -->
               </el-select>
@@ -67,33 +67,33 @@
                 <span class="serial-number">设备编号用于生产复核，需与SCADA系统中的设备编号一致</span>
             </el-form-item>
             <el-form-item label="显示排序">
-                <el-input-number v-model="form.num" controls-position="right" :min="1"></el-input-number>
+                <el-input-number v-model="form.orderNum" controls-position="right" :min="0"></el-input-number>
             </el-form-item>
             <el-form-item label="实物ID">
-                <el-input v-model="form.name"></el-input>
+                <el-input v-model="form.phyassetId"></el-input>
             </el-form-item>
             <el-form-item label="监控索引号">
-                <el-input v-model="form.name"></el-input>
+                <el-input v-model="form.monitorIndexNo"></el-input>
             </el-form-item>
             <el-form-item label="设备型号">
-                <el-input v-model="form.name"></el-input>
+                <el-input v-model="form.deviceModel"></el-input>
             </el-form-item>
             <el-form-item label="设备厂家">
-                <el-input v-model="form.name"></el-input>
+                <el-input v-model="form.manufacturer"></el-input>
             </el-form-item>
 
             <el-form-item label="x坐标">
-                <el-input-number v-model="form.numX" controls-position="right" :min="-20" :max="20"></el-input-number>
+                <el-input-number v-model="form.positionX" controls-position="right" :min="-20" :max="20" :step="0.1"></el-input-number>
                 <span class="number-title">(建议最小值-20，最大值20)</span>
             </el-form-item>
 
             <el-form-item label="y坐标">
-                <el-input-number v-model="form.num" controls-position="right" :min="66"></el-input-number>
+                <el-input-number v-model="form.positionY" controls-position="right" :min="66" :step="0.1"></el-input-number>
                 <span  class="number-title">(建议66)</span>
             </el-form-item>
 
             <el-form-item label="z坐标">
-                <el-input-number v-model="form.num" controls-position="right" :min="-6" :max="20"></el-input-number>
+                <el-input-number v-model="form.positionZ" controls-position="right" :min="-6" :max="20" :step="0.1"></el-input-number>
                 <span  class="number-title">(建议最小值-6，最大值20)</span>
             </el-form-item>
 
@@ -109,38 +109,19 @@
 </template>
 
 <script >
-import { treeAreaDeviceSelect,devicetypeList,deviceQuery } from "@/api/equipment/entry";
+import {
+  treeAreaDeviceSelect,
+  devicetypeList,
+  deviceQuery,
+  insertMainDeviceAndCommByDeviceType,
+  deviceRemove,
+} from "@/api/equipment/entry";
 export default {
   name: "entry",
   data() {
     return {
       queryParams: "",
-      treeData: [
-        {
-          label: "一级 1",
-          type: 1,
-          children: [
-            {
-              label: "二级 1-1",
-              children: [
-                {
-                  label: "三级 1-1-1",
-                  children: [
-                    {
-                      label: "四级 1-1-1-1",
-                      type: 4,
-                    },
-                    {
-                      label: "四级 1-1-1-2",
-                      type: 4,
-                    },
-                  ],
-                },
-              ],
-            },
-          ],
-        },
-      ],
+      treeData: [],
       defaultProps: {
         children: "children",
         // label: "areaName",
@@ -149,50 +130,161 @@ export default {
         },
       },
       titleName: "",
-      form: {},
+      form: {
+        orderNum: 0,
+        positionX: 0,
+        positionY: 66,
+        positionZ: 0,
+        handerType: 0,
+        boolAdd: 1,
+        deviceId: "",
+        // powerMainEquFlag: "Yes",
+        // parentId: "",
+        // devicetypeName: "A相",
+        // delFlag:0,
+        // ancestors:""
+      },
+      // form: {
+      //   ancestors: "",
+      //   areaId: 272,
+      //   areaIdS: null,
+      //   areaName: "",
+      //   boolAdd: 1,
+      //   createBy: "",
+      //   createTime: null,
+      //   delFlag: "0",
+      //   deviceCode: "1233321234",
+      //   deviceHigh: null,
+      //   deviceId: "",
+      //   deviceIdAll: null,
+      //   deviceIdListAll: null,
+      //   deviceLength: null,
+      //   deviceModel: "type",
+      //   deviceName: "无6",
+      //   deviceWidth: null,
+      //   devicetypeId: 902,
+      //   devicetypeName: "A相",
+      //   eqbookCode: null,
+      //   handerType: 0,
+      //   intallPosition: null,
+      //   manufacturer: "123",
+      //   monitorIndexNo: "index",
+      //   oldAreaId: "",
+      //   oldAreaName: null,
+      //   oldDeviceId: null,
+      //   oldParentId: null,
+      //   orderNum: 1,
+      //   params: {},
+      //   parentId: "",
+      //   parentName: "无人机机巢",
+      //   patrolTaskList: null,
+      //   phase: "O",
+      //   phaseNum: "无相别",
+      //   phyassetId: "id",
+      //   positionX: 0,
+      //   positionY: 66,
+      //   positionZ: 0,
+      //   powerMainEquFlag: "No",
+      //   remark: null,
+      //   searchValue: null,
+      //   stationNo: null,
+      //   status: "0",
+      //   updateBy: "",
+      //   updateTime: null,
+      // },
       show: false,
       deleteIcon: true,
-      addIcon:true,
-      deviceTypeData:[],
+      addIcon: true,
+      deviceTypeData: [],
+      deviceId: "",
     };
   },
   mounted() {
-    treeAreaDeviceSelect().then((res) => {
-      
+    this.init();
+    devicetypeList().then((res) => {
+      console.log(res);
       if (res.code == 200) {
-        this.treeData = res.data;
+        let arr = res.data.filter((item) => item.deviceTypeId !== 1);
+        this.deviceTypeData = arr;
       }
     });
-    devicetypeList().then(res=>{
-      console.log(res);
-      if(res.code==200){
-        this.deviceTypeData=res.data;
-      }
-    })
   },
   methods: {
-    handleNodeClick(data) {
+    init() {
+      treeAreaDeviceSelect().then((res) => {
+        if (res.code == 200) {
+          this.treeData = res.data;
+        }
+      });
+    },
+    handleNodeClick(data, e) {
+      console.log(data, e);
+      this.deviceId = data.deviceId;
       this.titleName = data.areaName || data.deviceName;
+      // this.form.boolAdd = 1;
+      (this.form.parentName = data.areaName), (this.form.areaId = data.areaId);
+
       if (data.areaName) {
         this.show = false;
-        this.deleteIcon=true;
-        this.addIcon=false;
+        this.deleteIcon = true;
+        this.addIcon = false;
       } else if (data.deviceName) {
         this.show = true;
         this.titleName = "编辑" + data.deviceName;
-        this.deleteIcon=false;
-        this.addIcon=true;
-        deviceQuery(data.deviceId).then(res=>{
-          console.log(res)
-          if(res.code==200){
-            this.form=res.data
+        this.deleteIcon = false;
+        this.addIcon = true;
+        deviceQuery(data.deviceId).then((res) => {
+          console.log(res, 1111);
+          if (res.code == 200) {
+            // this.form=res.data;
           }
-        })
+        });
       }
     },
     add() {
       this.show = true;
     },
+    remove() {
+      this.$confirm("是否确定删除","系统提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        deviceRemove(this.deviceId).then((res) => {
+          console.log(res, 1111);
+          if (res.code == 200) {
+            this.$message({
+              type: "success",
+              message: "删除成功",
+            });
+            this.init();
+          }
+        });
+      });
+    },
+    onSubmit() {
+      // console.log(this.form)
+      // return
+      insertMainDeviceAndCommByDeviceType(this.form).then((res) => {
+        if (res.code == 200) {
+          this.$message({
+            type: "success",
+            message: "新增成功",
+          });
+          // this.show = false;
+          this.form = {
+            orderNum: 0,
+            positionX: 0,
+            positionY: 66,
+            positionZ: 0,
+            handerType: 0,
+            boolAdd: 1,
+            deviceId: "",
+          };
+          this.init();
+        }
+      });
+    },
   },
 };
 </script>
@@ -236,7 +328,8 @@ export default {
   margin-bottom: 30px;
   margin-top: 20px;
 }
-.deleteIcon,.addIcon {
+.deleteIcon,
+.addIcon {
   color: #dddddd;
   cursor: not-allowed;
 }
diff --git a/src/views/equipment/equipment.vue b/src/views/equipment/equipment.vue
index 103780b..d8ee7ac 100644
--- a/src/views/equipment/equipment.vue
+++ b/src/views/equipment/equipment.vue
@@ -433,46 +433,41 @@
 </template>
 
 <script >
+import { getList } from "@/api/equipment/equipment";
 export default {
   name: "equipment",
   data() {
     return {
-      queryParams: {},
-      tableData: [
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1517 弄",
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1519 弄",
-        },
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1516 弄",
-        },
-      ],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      tableData: [],
       total: 20,
       dialogVisible: false,
       title: "新增",
       dialogForm: {},
     };
   },
+  mounted() {
+    this.init()
+  },
   methods: {
+    init() {
+      getList(this.queryParams).then((res) => {
+        console.log(res,11111)
+        if(res.code==200){
+          this.tableData = res.rows;
+          this.total = res.total;
+        }
+      });
+    },
     handleClose() {
       this.dialogVisible = false;
     },
-    handleAdd(){
+    handleAdd() {
       this.dialogVisible = true;
-    }
+    },
   },
 };
 </script>