From ee7ccad3f9abe74c62c6d1c62efa4317cb62a3ce Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Tue, 5 Aug 2025 09:40:04 +0800
Subject: [PATCH] =?UTF-8?q?v1.9=20=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E7=95=8C=E9=9D=A2=E9=97=B4=E8=B7=9D=E6=AF=94?=
 =?UTF-8?q?=E8=BE=83=E5=A4=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/staff/staffCommunityApi.js         |   1 -
 src/components/org/dataPrivilegeStaff.vue  |   9 +-
 src/components/org/dataPrivilegeUnit.vue   |   1 +
 src/components/role/AddPrivilegeGroup.vue  |  10 +-
 src/components/role/EditPrivilegeGroup.vue | 157 +++++++++------------
 src/views/org/dataPrivilegeManageList.vue  |   9 +-
 src/views/user/login/Login.vue             |   4 +-
 7 files changed, 85 insertions(+), 106 deletions(-)

diff --git a/src/api/staff/staffCommunityApi.js b/src/api/staff/staffCommunityApi.js
index 806d31ac3..c314fbbc9 100644
--- a/src/api/staff/staffCommunityApi.js
+++ b/src/api/staff/staffCommunityApi.js
@@ -27,7 +27,6 @@ export function listStaffCommunity(params) {
       method: 'get',
       params: {
         ...params,
-        communityId: getCommunityId()
       }
     }).then(response => {
       resolve(response.data)
diff --git a/src/components/org/dataPrivilegeStaff.vue b/src/components/org/dataPrivilegeStaff.vue
index 24e6922cb..5863a9eb5 100644
--- a/src/components/org/dataPrivilegeStaff.vue
+++ b/src/components/org/dataPrivilegeStaff.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="data-privilege-staff">
 
-    <el-form :inline="true" :model="searchForm">
-      <el-form-item :label="$t('dataPrivilege.staffName')">
+    <el-form :inline="true" :model="searchForm" class="text-right">
+      <el-form-item >
         <el-input v-model="searchForm.staffName" :placeholder="$t('dataPrivilege.inputStaffName')" clearable>
         </el-input>
       </el-form-item>
-      <el-form-item :label="$t('dataPrivilege.phone')">
+      <el-form-item >
         <el-input v-model="searchForm.tel" :placeholder="$t('dataPrivilege.inputPhone')" clearable>
         </el-input>
       </el-form-item>
@@ -132,7 +132,7 @@ export default {
       this.$refs.deleteDataPrivilegeStaff.open(row)
     },
     handleDetail(row) {
-      this.$router.push(`/staff/detail/${row.staffId}`)
+      this.$router.push(`/views/staff/staffDetail?staffId=${row.staffId}`)
     },
     handleSizeChange(val) {
       this.pagination.size = val
@@ -150,6 +150,7 @@ export default {
 <style scoped>
 .data-privilege-staff {
   padding: 20px;
+  padding-top:10px;
 }
 
 .search-card {
diff --git a/src/components/org/dataPrivilegeUnit.vue b/src/components/org/dataPrivilegeUnit.vue
index 1a5497fa8..7c8e99d10 100644
--- a/src/components/org/dataPrivilegeUnit.vue
+++ b/src/components/org/dataPrivilegeUnit.vue
@@ -99,6 +99,7 @@ export default {
 <style scoped>
 .data-privilege-unit {
   padding: 20px;
+  padding-top: 0;
 }
 
 .action-bar {
diff --git a/src/components/role/AddPrivilegeGroup.vue b/src/components/role/AddPrivilegeGroup.vue
index 3da178778..9f2366369 100644
--- a/src/components/role/AddPrivilegeGroup.vue
+++ b/src/components/role/AddPrivilegeGroup.vue
@@ -1,15 +1,15 @@
 <template>
-    <el-dialog :title="isEdit ? $t('role.editRole') : $t('role.addRole')" :visible.sync="visible" width="50%"
+    <el-dialog :title="isEdit ? $t('role.editRole') : $t('role.addRole')" :visible.sync="visible" width="40%"
         @close="resetForm">
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-alert v-if="errorInfo" :title="errorInfo" type="error" show-icon />
 
             <el-form-item :label="$t('role.name')" prop="name">
-                <el-input v-model="form.name" :placeholder="$t('role.nameRequired')" />
+                <el-input v-model="form.name" :placeholder="$t('role.requiredName')" />
             </el-form-item>
 
             <el-form-item :label="$t('role.description')" prop="description">
-                <el-input v-model="form.description" type="textarea" :placeholder="$t('role.descLength')" :rows="4" />
+                <el-input v-model="form.description" type="textarea" :placeholder="$t('role.descriptionLength')" :rows="4" />
             </el-form-item>
         </el-form>
 
@@ -19,7 +19,7 @@
         </div>
     </el-dialog>
 </template>
-  
+
 <script>
 import { savePrivilegeGroup, updatePrivilegeGroup } from '@/api/role/roleApi'
 
@@ -86,7 +86,7 @@ export default {
 
 }
 </script>
-  
+
 <style lang="scss" scoped>
 .el-alert {
     margin-bottom: 20px;
diff --git a/src/components/role/EditPrivilegeGroup.vue b/src/components/role/EditPrivilegeGroup.vue
index f1110e76a..8faa2013a 100644
--- a/src/components/role/EditPrivilegeGroup.vue
+++ b/src/components/role/EditPrivilegeGroup.vue
@@ -1,95 +1,72 @@
 <template>
-    <el-dialog
-      :title="$t('role.edit')"
-      :visible.sync="visible"
-      width="50%"
-      @close="resetForm"
-    >
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="120px"
-      >
-        <el-form-item
-          :label="$t('role.name')"
-          prop="name"
-        >
-          <el-input
-            v-model="form.name"
-            :placeholder="$t('role.requiredName')"
-          />
-        </el-form-item>
-        
-        <el-form-item
-          :label="$t('role.description')"
-          prop="description"
-        >
-          <el-input
-            v-model="form.description"
-            type="textarea"
-            :placeholder="$t('role.descriptionLength')"
-          />
-        </el-form-item>
-      </el-form>
-      
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false">{{ $t('role.cancel') }}</el-button>
-        <el-button type="primary" @click="submitForm">{{ $t('role.save') }}</el-button>
-      </span>
-    </el-dialog>
-  </template>
-  
-  <script>
-  import { updatePrivilegeGroup } from '@/api/role/roleApi'
-  
-  export default {
-    name: 'EditPrivilegeGroup',
-    data() {
-      return {
-        visible: false,
-        form: {
-          pgId: '',
-          name: '',
-          description: ''
-        },
-        rules: {
-          name: [
-            { required: true, message: this.$t('role.requiredName'), trigger: 'blur' },
-            { min: 2, max: 10, message: this.$t('role.nameLength'), trigger: 'blur' }
-          ],
-          description: [
-            { max: 200, message: this.$t('role.descriptionLength'), trigger: 'blur' }
-          ]
-        }
-      }
-    },
-    methods: {
-      show(role) {
-        this.form = {
-          pgId: role.pgId,
-          name: role.name,
-          description: role.description
-        }
-        this.visible = true
+  <el-dialog :title="$t('role.edit')" :visible.sync="visible" width="40%" @close="resetForm">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form-item :label="$t('role.name')" prop="name">
+        <el-input v-model="form.name" :placeholder="$t('role.requiredName')" />
+      </el-form-item>
+
+      <el-form-item :label="$t('role.description')" prop="description">
+        <el-input v-model="form.description" type="textarea" :placeholder="$t('role.descriptionLength')" />
+      </el-form-item>
+    </el-form>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">{{ $t('role.cancel') }}</el-button>
+      <el-button type="primary" @click="submitForm">{{ $t('role.save') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { updatePrivilegeGroup } from '@/api/role/roleApi'
+
+export default {
+  name: 'EditPrivilegeGroup',
+  data() {
+    return {
+      visible: false,
+      form: {
+        pgId: '',
+        name: '',
+        description: ''
       },
-      submitForm() {
-        this.$refs.form.validate(async valid => {
-          if (valid) {
-            try {
-              await updatePrivilegeGroup(this.form)
-              this.$message.success(this.$t('role.updateSuccess'))
-              this.$emit('success')
-              this.visible = false
-            } catch (error) {
-              this.$message.error(error.message)
-            }
-          }
-        })
-      },
-      resetForm() {
-        this.$refs.form.resetFields()
+      rules: {
+        name: [
+          { required: true, message: this.$t('role.requiredName'), trigger: 'blur' },
+          { min: 2, max: 10, message: this.$t('role.nameLength'), trigger: 'blur' }
+        ],
+        description: [
+          { max: 200, message: this.$t('role.descriptionLength'), trigger: 'blur' }
+        ]
       }
     }
+  },
+  methods: {
+    show(role) {
+      this.form = {
+        pgId: role.pgId,
+        name: role.name,
+        description: role.description
+      }
+      this.visible = true
+    },
+    submitForm() {
+      this.$refs.form.validate(async valid => {
+        if (valid) {
+          try {
+            await updatePrivilegeGroup(this.form)
+            this.$message.success(this.$t('role.updateSuccess'))
+            this.$emit('success')
+            this.visible = false
+          } catch (error) {
+            this.$message.error(error.message)
+          }
+        }
+      })
+    },
+    resetForm() {
+      this.$refs.form.resetFields()
+    }
   }
-  </script>
\ No newline at end of file
+}
+</script>
\ No newline at end of file
diff --git a/src/views/org/dataPrivilegeManageList.vue b/src/views/org/dataPrivilegeManageList.vue
index b6de16099..86593196c 100644
--- a/src/views/org/dataPrivilegeManageList.vue
+++ b/src/views/org/dataPrivilegeManageList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="data-privilege-container">
+  <div class="data-privilege-container padding">
     <el-row class="data-privilege-wrapper">
       <el-col :span="4" class="left-panel">
         <data-privilege-div ref="dataPrivilegeDiv" @switch-data-privilege="handleSwitchDataPrivilege" />
@@ -7,8 +7,8 @@
       <el-col :span="20" class="right-panel">
         <el-card class="box-card">
           <div slot="header" class="text-left">
-            <h5>{{ $t('dataPrivilege.title') }}: {{ currentDataPrivilege.name }}</h5>
-            <p>{{ currentDataPrivilege.description }}</p>
+            <span>{{ $t('dataPrivilege.title') }}: {{ currentDataPrivilege.name }}</span>
+            <div>{{ currentDataPrivilege.description }}</div>
           </div>
           <div class="tab-wrapper">
             <el-tabs v-model="activeTab" @tab-click="handleTabClick(activeTab)">
@@ -83,8 +83,7 @@ export default {
 
 <style lang="scss" scoped>
 .data-privilege-container {
-  padding: 0;
-  margin: 0;
+
   height: 100%;
 
   .data-privilege-wrapper {
diff --git a/src/views/user/login/Login.vue b/src/views/user/login/Login.vue
index 1cc6ee1b2..1bd17b013 100644
--- a/src/views/user/login/Login.vue
+++ b/src/views/user/login/Login.vue
@@ -66,7 +66,9 @@ export default {
   created() {
     localStorage.clear();
     this.getSystemInfo()
-    this.refreshCaptcha();
+    setTimeout(() => {
+      this.refreshCaptcha();
+    }, 1000);
     
   },
   components: {