From c7c4b8ff0680b889697a4fc30a00ceae33f0114e Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Thu, 24 Jul 2025 10:22:09 +0800
Subject: [PATCH 1/2] hebing

---
 src/views/permissions/permission.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/views/permissions/permission.vue b/src/views/permissions/permission.vue
index b56656b..a2be56f 100644
--- a/src/views/permissions/permission.vue
+++ b/src/views/permissions/permission.vue
@@ -81,7 +81,6 @@ const getAdminData = async function () {
     console.log('请求失败', error)
   }
 }
-<<<<<<< HEAD
 const viewRole =ref([])
 const getRolePermission = async function(){
     const result = await request({
@@ -93,10 +92,6 @@ const getRolePermission = async function(){
     viewRole.value = collectIds(result.data)
     console.log('result111',viewRole.value);
 }
-=======
-
-
->>>>>>> zhangrenyuan/feature-20250714163943-金币前端二期
 // 编辑用户权限对象
 const permissionEditObj = ref({
   checkedKeys: [],

From 0d6503ca48a32c45c14a6fda6b2fdf47d29e593c Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Thu, 24 Jul 2025 11:37:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                     |  3 ++-
 src/views/permissions/permission.vue | 14 ++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.env.development b/.env.development
index c5af22d..1c4e650 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,5 @@
 # VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
- VITE_API_BASE='http://192.168.9.28:8081/'
+#  VITE_API_BASE='http://192.168.9.28:8081/'
+ VITE_API_BASE='http://18.143.76.3:10704/'
 VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
 
diff --git a/src/views/permissions/permission.vue b/src/views/permissions/permission.vue
index 16d2c64..066ab00 100644
--- a/src/views/permissions/permission.vue
+++ b/src/views/permissions/permission.vue
@@ -401,15 +401,16 @@ const getRoles = async function () {
 
 // 打开编辑用户权限弹窗
 const openUserEditVisible = function () {
-  getRoles()
   userEditVisible.value = true
 }
 // 关闭编辑用户权限弹窗
 const closeUserEditVisible = function () {
   userEditVisible.value = false
+  data.value = []
 }
 // 编辑用户权限初始化
 const permissionEditInit = async function (row) {
+  getRoles()
   console.log('row', row)
   permissionEditObj.value = {}
   permissionEditObj.value.id = row.id
@@ -437,7 +438,10 @@ const permissionEditInit = async function (row) {
   permissionEditObj.value.parentId = result.data?.fatherId
   permissionEditObj.value.parentName = result.data?.fatherName
   console.log('get前', permissionEditObj.value.roleId);
-
+  permissionEditObj.value.roleName = row.roleName
+  if(permissionEditObj.value.roleId==0){
+    permissionEditObj.value.roleId = ''
+  }
   getUserLists(row.roleId)
 
   let machineIdsRef = await request({
@@ -459,7 +463,6 @@ const permissionEditInit = async function (row) {
   permissionEditObj.value.machineId = permissionEditObj.value.machineIds[0]
   //permissionEditObj.value.permission = row.permission
 
-  permissionEditObj.value.roleName = row.roleName
   console.log('编辑用户权限', permissionEditObj.value)
   console.log('11111111111111', permissionEditObj.value.machineId)
   openUserEditVisible()
@@ -1396,9 +1399,12 @@ onMounted(async function () {
         </el-select>
       </el-form-item>
       <el-form-item prop="permissionSelect" label="权限列表:">
-        <el-tree :data="data" :disabled="true" show-checkbox node-key="id"
+        <el-tree v-if="data.length > 0" :data="data" :disabled="true" show-checkbox node-key="id"
           :props="{ label: 'menuName', children: 'children' }" :default-checked-keys="permissionEditObj.checkedKeys">
         </el-tree>
+        <div v-else style="display: flex; align-items: center; gap: 8px;">
+            <span style="color: #999;">暂无数据</span>
+          </div>
       </el-form-item>
       <el-form-item prop="machineIds" label="机器码:">
         <div style="display: flex; align-items: center; flex-wrap: wrap; gap: 10px;">