From 382791e77f9bb80f468dc6dd30efdd6ea883bec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=B5=E7=82=B3=E8=BE=89?= <972108913@qq.com>
Date: Fri, 12 Jul 2024 11:20:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/backend/auth/menu/index.vue     |  4 +--
 .../equipment/equipmentManagement/index.vue   | 26 +++++++++++++------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/auth/menu/index.vue b/ui/dasadmin/src/views/backend/auth/menu/index.vue
index 1bf84f78..d9a3da04 100644
--- a/ui/dasadmin/src/views/backend/auth/menu/index.vue
+++ b/ui/dasadmin/src/views/backend/auth/menu/index.vue
@@ -77,7 +77,7 @@
                     </el-form-item>
 
                     <el-form-item label="&nbsp;&nbsp;菜单权限:">
-                        <el-select v-model="fromUpDate.authorityId" placeholder="选择菜单权限" multiple style="width: 240px">
+                        <el-select v-model="fromUpDate.authorityId" placeholder="选择菜单权限" style="width: 240px">
                             <el-option v-for="item in allPermissionData" :key="item.id" :label="item.authorityName" :value="item.id" />
                         </el-select>
                     </el-form-item>
@@ -123,7 +123,7 @@
                     </el-form-item>
 
                     <el-form-item label="&nbsp;&nbsp;菜单权限:">
-                        <el-select v-model="formInlineAdd.authorityId" placeholder="选择菜单权限" multiple style="width: 240px">
+                        <el-select v-model="formInlineAdd.authorityId" placeholder="选择菜单权限" style="width: 240px">
                             <el-option v-for="item in allPermissionData" :key="item.id" :label="item.authorityName" :value="item.id" />
                         </el-select>
                     </el-form-item>
diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
index 4cb4ff0c..0c97e4f2 100644
--- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
@@ -134,6 +134,8 @@
                         <el-col :span="12">
                             <el-form-item label="所属设备:">
                                 <el-tree-select
+                                    :disabled="editDeviceData.objectType === '风电场'"
+                                    :placeholder="editAddDeviceData.objectType === '风电场' ? '该所属设备不可选择' : '请选择所属设备'"
                                     v-model="editDeviceData.parentEquipmentId"
                                     :data="belongingEquipment"
                                     :props="defaultEquipmentProps"
@@ -156,6 +158,7 @@
                                 <el-input-number
                                     v-model="editDeviceData.longitude"
                                     style="width: 200px"
+                                    :controls="false"
                                     placeholder="请输入经度"
                                     controls-position="right"
                                 />
@@ -166,6 +169,7 @@
                                 <el-input-number
                                     v-model="editDeviceData.latitude"
                                     style="width: 200px"
+                                    :controls="false"
                                     placeholder="请输入纬度"
                                     controls-position="right"
                                 />
@@ -274,6 +278,8 @@
                         <el-col :span="12">
                             <el-form-item label="所属设备:">
                                 <el-tree-select
+                                    :disabled="editAddDeviceData.objectType === '风电场'"
+                                    :placeholder="editAddDeviceData.objectType === '风电场' ? '该所属设备不可选择' : '请选择所属设备'"
                                     v-model="editAddDeviceData.parentEquipmentId"
                                     :data="belongingEquipment"
                                     :props="defaultEquipmentProps"
@@ -296,6 +302,7 @@
                                 <el-input-number
                                     v-model="editAddDeviceData.longitude"
                                     style="width: 200px"
+                                    :controls="false"
                                     placeholder="请输入经度"
                                     controls-position="right"
                                 />
@@ -306,6 +313,7 @@
                                 <el-input-number
                                     v-model="editAddDeviceData.latitude"
                                     style="width: 200px"
+                                    :controls="false"
                                     placeholder="请输入纬度"
                                     controls-position="right"
                                 />
@@ -483,6 +491,7 @@ const treeSelectProps = {
 const defaultEquipmentProps = {
     label: 'name',
     value: 'id',
+    children: 'equipChildren',
 }
 
 onMounted(() => {
@@ -580,6 +589,7 @@ const headerForm = reactive({
 
 // 新增按钮
 const addDeviceList = () => {
+    equipOrgBelonging()
     editAddDeviceDialog.value = true
     editAddDeviceData.objectType = queryParameter.value.equipmentTypeName
     editAddDeviceData.code = ''
@@ -587,8 +597,8 @@ const addDeviceList = () => {
     editAddDeviceData.madeinFactory = ''
     editAddDeviceData.model = ''
     editAddDeviceData.location = ''
-    editAddDeviceData.longitude = ''
-    editAddDeviceData.latitude = ''
+    editAddDeviceData.longitude = null
+    editAddDeviceData.latitude = null
     editAddDeviceData.installDate = ''
     editAddDeviceData.remarks = ''
     editAddDeviceData.orgId = ''
@@ -606,8 +616,8 @@ const editDeviceData = reactive({
     madeinFactory: '',
     model: '',
     location: '',
-    longitude: '',
-    latitude: '',
+    longitude: null,
+    latitude: null,
     installDate: '',
     remarks: '',
     orgId: '',
@@ -625,10 +635,11 @@ const handleCloseEditDevice = () => {
 // 设备查看按钮
 const viewDeviceDetails = (data: any) => {
     console.log(data, '查看设备详情')
+    equipOrgBelonging()
     modifyDeviceDetails.value?.resetFields()
     editDeviceDialog.value = true
     editDeviceData.id = data.row.id
-    editDeviceData.objectType = data.row.equipmentTypeName
+    editDeviceData.objectType = queryParameter.value.equipmentTypeName
     editDeviceData.code = data.row.code
     editDeviceData.name = data.row.name
     editDeviceData.madeinFactory = data.row.madeinFactory
@@ -676,7 +687,6 @@ const dialogDeviceDeletion1 = () => {
     })
 }
 const longitudePass = (rule: any, value: any, callback: any) => {
-    console.log(value, 6666)
     if (!value) {
         callback()
     }
@@ -758,8 +768,8 @@ const editAddDeviceData = reactive({
     madeinFactory: '',
     model: '',
     location: '',
-    longitude: '',
-    latitude: '',
+    longitude: null,
+    latitude: null,
     installDate: '',
     remarks: '',
     orgId: '',