From 9deec6f5505ddfdf8170d9543ae4a37ded0cc04c Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Tue, 16 Apr 2024 18:01:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=B1=E6=9D=86=E9=85=8D=E5=A5=97=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/api/store/poleConfig.js           | 10 +++++
 .../src/views/store/poleConfig/poleConfig.vue | 39 +++++++++++--------
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/sgzb-ui/src/api/store/poleConfig.js b/sgzb-ui/src/api/store/poleConfig.js
index fb5bbb24..02c81303 100644
--- a/sgzb-ui/src/api/store/poleConfig.js
+++ b/sgzb-ui/src/api/store/poleConfig.js
@@ -5,6 +5,7 @@ const addUrl = '/material/maWhole/add' // 添加
 const selectListUrl = '/material/maWhole/selectList' // 查询首页
 const selectListByIdUrl = '/material/maWhole/selectListById' // 查询详情
 const deleteByIdUrl = '/material/maWhole/deleteById' // 删除
+const treeTypeUrl = '/system/select/getDeviceTypeTree' // 设备树
 
 // 物品类型 选择配件
 export function getMaType(query) {
@@ -15,6 +16,15 @@ export function getMaType(query) {
   })
 }
 
+// 设备树
+export function getDeviceTypeTree(params = {}){
+  return request({
+    url: treeTypeUrl,
+    method: 'post',
+    data: params
+  })
+}
+
 // 新增
 export function addMaWhole(data) {
   return request({
diff --git a/sgzb-ui/src/views/store/poleConfig/poleConfig.vue b/sgzb-ui/src/views/store/poleConfig/poleConfig.vue
index c4d40bfc..2ed316ce 100644
--- a/sgzb-ui/src/views/store/poleConfig/poleConfig.vue
+++ b/sgzb-ui/src/views/store/poleConfig/poleConfig.vue
@@ -144,7 +144,13 @@
 </template>
 
 <script>
-import { getMaType, addMaWhole, searchSelectList, searchSelectListById, deleteById } from '@/api/store/poleConfig'
+import {
+  getDeviceTypeTree,
+  addMaWhole,
+  searchSelectList,
+  searchSelectListById,
+  deleteById,
+} from '@/api/store/poleConfig'
 export default {
   name: 'poleConfig',
   data() {
@@ -178,25 +184,15 @@ export default {
   },
   created() {
     this.getList()
-    getMaType({ parentId: 1 }).then(res => {
-      // 处理为typeOptions需要的数据格式
-      const data = res.data
-      this.typeOptions = this.getTree(data)
-    })
-    getMaType({ parentId: 2 }).then(res => {
-      // 处理为mountingsOptions需要的数据格式
-      const data = res.data
-      this.mountingsOptions = this.getTree(data)
-    })
   },
   methods: {
     // 获取列表
     async getList(data = {}) {
+      this.houseList = []
       this.queryParams.pageNum = data.page || 1
       this.queryParams.pageSize = data.limit || 10
       this.queryParams.keyWord = this.formData.keyWord || ''
       const res = await searchSelectList({ ...this.queryParams })
-      console.log('🚀 ~ getList ~ res:', res);
       this.houseList = res.data.result
       this.total = res.data.totalCount || 0
     },
@@ -228,6 +224,18 @@ export default {
       this.$nextTick(() => {
         this.$refs.dialogForm.resetFields()
       })
+      getDeviceTypeTree().then(res => {
+        // 处理为typeOptions需要的数据格式
+        const data = res.data
+        // this.typeOptions = this.getTree(data)
+        // this.mountingsOptions = this.getTree(data)
+        this.typeOptions = this.mountingsOptions = this.getTree(data)
+      })
+      // getDeviceTypeTree().then(res => {
+      //   // 处理为mountingsOptions需要的数据格式
+      //   const data = res.data
+      //   this.mountingsOptions = this.getTree(data)
+      // })
     },
     // 详情弹框
     handleDetail(row) {
@@ -263,7 +271,7 @@ export default {
     },
     // 选择物品类型
     handleTypeOptions(val) {
-      this.dialogForm.parentId = val[val.length - 1]
+      this.dialogForm.parentId = val[3]
     },
     // 选择配件
     handleMountingsOptions(val) {
@@ -271,11 +279,11 @@ export default {
       this.dialogForm.mountingsValue = val
       const selected = this.$refs.mountingsTree.getCheckedNodes()
       // 过滤出 level = 2 的数据
-      const filterSel = selected.filter(item => item.level === 2)
+      const filterSel = selected.filter(item => item.level === 4)
       this.selectList = filterSel.map(item => {
         return {
           typeId: item.value,
-          typeName: item.pathLabels[0],
+          typeName: item.pathLabels[2],
           typeModelName: item.label,
           totalNum: 1,
         }
@@ -296,7 +304,6 @@ export default {
     },
     // 删除
     handleDeleteDialog(row) {
-      console.log('🚀 ~ handleDeleteDialog ~ row:', row);
       // 根据row.parentId删除
       this.dialogList = this.dialogList.filter(item => item.typeId !== row.typeId)
     },