Merge branch 'milestone-20250711-金币前端二期' into zhangrenyuan/feature-20250714163943-金币前端二期

.env.development

@@ -1,4 +1,5 @@
-VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
+# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
 #  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
 

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;">