From 8707ad6b3bfb1a5f5e84b63517a75bd718db5ab1 Mon Sep 17 00:00:00 2001
From: mch <1332099529@qq.com>
Date: Thu, 20 Jul 2023 18:09:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/request/ruquset.js                   | 32 ++++++++++++++----------
 src/views/basic-dictionary/GuideType.vue |  8 ++++++
 src/views/user-list/Role.vue             |  4 ++-
 src/views/user-list/UserList.vue         | 14 +++++------
 4 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/src/request/ruquset.js b/src/request/ruquset.js
index 3086f45..9445e0b 100644
--- a/src/request/ruquset.js
+++ b/src/request/ruquset.js
@@ -21,9 +21,10 @@ export const getbook = (data) => {
   });
 };
 //权限查找
-export const limitsofauthority = (data) => {
+export const limitsofauthority = (user,data) => {
   return request({
-    url: "/api/permission-management/permissions",
+    // url: "/api/permission-management/permissions",
+    url:`/api/permissionmanagement/get?providerName=R&providerKey=${user}`,
     method: "get",
     headers: {
       "Accept-Language": "zh-Hans",
@@ -35,7 +36,7 @@ export const limitsofauthority = (data) => {
 //获取用户列表
 export const usreslist = (data) => {
   return request({
-    url: "/api/identity/users",
+    url: "/api/identity/users/getlist",
     method: "get",
     params: data,
   });
@@ -43,15 +44,17 @@ export const usreslist = (data) => {
 //用户绑定
 export const userbind = (id, data) => {
   return request({
-    url: `/api/identity/users/${id}/roles`,
-    method: "put",
+    // url: `/api/identity/users/${id}/roles`,
+    ///api/identity/users/updateroles?id=3a0c6597-75df-bc78-8173-ef4a59930832
+    url:`/api/identity/users/updateroles?id=${id}`,
+    method: "post",
     data,
   });
 };
 //用户列表新增
 export const newlists = (data) => {
   return request({
-    url: "/api/identity/users",
+    url: "/api/identity/users/create",
     method: "post",
     data,
   });
@@ -59,15 +62,15 @@ export const newlists = (data) => {
 //用户列表删除
 export const delestsid = (id) => {
   return request({
-    url: `/api/identity/users/${id}`,
-    method: "delete",
+    url: `/api/identity/users/delete/${id}`,
+    method: "post",
   });
 };
 //用户列表编辑修改
 export const editmodify = (id, data) => {
   return request({
-    url: `/api/identity/users/${id}`,
-    method: "put",
+    url: `/api/identity/users/update?id=${id}`,
+    method: "post",
     headers: {
       "Content-Type": "application/json",
     },
@@ -154,15 +157,18 @@ export const roledelention = (id) => {
 //权限控制编辑
 export const permissionconntro = (name, peodekey, data) => {
   return request({
-    url: `/api/permission-management/permissions?providerName=${name}&providerKey=${peodekey}`,
-    method: "put",
+    url: `/api/permissionmanagement/update?providerName=${name}&providerKey=${peodekey}`,
+    // url: `/api/permission-management/permissions?providerName=${name}&providerKey=${peodekey}`,
+    // /api/permissionmanagement/update?providerName=R&providerKey=users
+    method: "post",
     data,
   });
 };
 //用户管理所属用户查询
 export const useraffiliation = (id) => {
   return request({
-    url: `/api/identity/users/${id}/roles`,
+    // url: `/api/identity/users/${id}/roles`,
+    url:`/api/identity/users/getroles?id=${id}`,
     method: "get",
   });
 };
diff --git a/src/views/basic-dictionary/GuideType.vue b/src/views/basic-dictionary/GuideType.vue
index ca3c555..682d786 100644
--- a/src/views/basic-dictionary/GuideType.vue
+++ b/src/views/basic-dictionary/GuideType.vue
@@ -52,6 +52,7 @@
             border:stripe="true"
             @row-click="rowick"
             highlight-current-row
+             :row-class-name="getRowClassName"
           >
             <el-table-column
               prop="id"
@@ -755,10 +756,17 @@ export default {
         console.log(res);
       });
     },
+    getRowClassName(row, rowIndex) {
+      // 根据需要确定每一行的 CSS 类名
+      return 'fixed-height-row';
+    }
   },
 };
 </script>
 <style scoped>
+.fixed-height-row {
+  height: 30px; 
+}
 ::v-depp .el-input.is-disabled .el-input__inner {
   width: 90%;
 }
diff --git a/src/views/user-list/Role.vue b/src/views/user-list/Role.vue
index bc684d1..f348028 100644
--- a/src/views/user-list/Role.vue
+++ b/src/views/user-list/Role.vue
@@ -135,6 +135,7 @@ import {
   roledelention,
   permissionconntro,
 } from "@/request/ruquset";
+import { getapi } from '@/api/api';
 export default {
   data() {
     return {
@@ -368,7 +369,8 @@ export default {
       };
       this.title = "用户权限-" + row.name;
       this.userobj = obj;
-      limitsofauthority(obj).then((res) => {
+      // limitsofauthority
+      getapi(`/api/permissionmanagement/get?providerName=R&providerKey=${row.name}`).then((res) => {
         this.defaultKeys = [];
         this.currenItem = [];
         this.allCheckedLength = 0;
diff --git a/src/views/user-list/UserList.vue b/src/views/user-list/UserList.vue
index 103556e..d7c50c6 100644
--- a/src/views/user-list/UserList.vue
+++ b/src/views/user-list/UserList.vue
@@ -77,7 +77,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
+      <!-- <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :page-sizes="[2, 10, 20, 30]"
@@ -85,7 +85,7 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="total - 1"
       >
-      </el-pagination>
+      </el-pagination> -->
       <!-- 编辑 -->
       <el-dialog
         :title="title == 1 ? '新增用户' : '修改用户'"
@@ -176,7 +176,7 @@
               </el-checkbox>
             </el-checkbox-group>
           </el-tab-pane>
-          <el-tab-pane label="组织机构">
+          <el-tab-pane label="组织架构">
             <!-- :default-checked-keys="defaultKeys" -->
 
             <el-tree
@@ -475,8 +475,8 @@ export default {
       are: [],
       checkList: [], //多选框
       pages: {
-        SkipCount: 1,
-        MaxResultCount: 2,
+        SkipCount: 0,
+        MaxResultCount: 5,
         Filter: "",
         // Filter:{
         //   userName:this.form.userName,
@@ -489,7 +489,7 @@ export default {
       rowid: "",
       userid: "",
       bingdusers: [], //s所属用户角色
-      organizationalstructure: [], //组织机构
+      organizationalstructure: [], //组织架构
       defaultKeys: [], //选中的
       newachitecture: [], //新增弹框获取组织数据
       // customer:[]
@@ -583,7 +583,7 @@ export default {
       this.userid = row.id;
       usersroles().then((res) => {
         this.useroptions = res.data.items;
-        // console.log(res);
+        console.log(res);
       });
       useraffiliation(row.id).then((res) => {
         res.data.items.forEach((element) => {