访问控制管理

src/page/main/system-admin/visit-control/add/index.vue

@@ -44,7 +44,7 @@
               </bg-table>
               <bg-pagination
                 :page="pageConfig.page"
-                :size="pageConfig.limit"
+                :size="pageConfig.page_size"
                 :total="pageConfig.total"
                 @change-page="changePage"
                 @change-size="changeSize">
@@ -96,7 +96,7 @@
                 ref="dialogBgTable"
                 height="430"
                 select
-                rowKey="systemId"
+                rowKey="user_id"
                 :headers="detailHeaders"
                 :rows="dialogTableRows"
                 :stripe="true"
@@ -107,7 +107,7 @@
               </bg-table>
               <bg-pagination
                 :page="dialogPageConfig.page"
-                :size="dialogPageConfig.limit"
+                :size="dialogPageConfig.page_size"
                 :total="dialogPageConfig.total"
                 @change-page="dialogChangePage"
                 @change-size="dialogChangeSize">
@@ -196,13 +196,13 @@ const state = reactive({
   },
   pageConfig: {
     page: 1,
-    limit: 10,
+    page_size: 10,
     total: 0,
   },
   //弹框中表格分页配置项
   dialogPageConfig: {
     page: 1,
-    limit: 10,
+    page_size: 10,
     total: 0,
   },
   //表格数据
@@ -269,7 +269,7 @@ const userMaintain = () => {
 };
 //获取所属组织级联数据
 const getOrgTree = () => {
-  axios.get(`/apaas/system/v5/org/tree`).then((res) => {
+  axios.get(`/v1/api/org/tree`).then((res) => {
     if (res.data.code == 200) {
       const orgDataTemp = res.data.data || [];
       state.orgData = orgDataTemp;
@@ -280,11 +280,14 @@ const getOrgTree = () => {
 };
 const changePage = (page) => {
   state.pageConfig.page = page;
-  state.tableRows = state.selectedRows.slice((page - 1) * state.pageConfig.limit, page * state.pageConfig.limit);
+  state.tableRows = state.selectedRows.slice(
+    (page - 1) * state.pageConfig.page_size,
+    page * state.pageConfig.page_size
+  );
 };
 
 const changeSize = (size) => {
-  state.pageConfig.limit = size;
+  state.pageConfig.page_size = size;
   changePage(1);
 };
 const dialogChangePage = (page) => {
@@ -293,19 +296,19 @@ const dialogChangePage = (page) => {
 };
 
 const dialogChangeSize = (size) => {
-  state.dialogPageConfig.limit = size;
+  state.dialogPageConfig.page_size = size;
   dialogChangePage(1);
 };
 
 //获取用户维护数据
 const getTableList = () => {
   const params = {
-    limit: state.dialogPageConfig.limit,
+    page_size: state.dialogPageConfig.page_size,
     page: state.dialogPageConfig.page,
     disp: 1,
     ...state.dialogFilterData,
   };
-  axios.get("/apaas/system/v5/accessRule/listRuleUser", { params }).then((res) => {
+  axios.get("/v1/api/accessRule/listRuleUser", { params }).then((res) => {
     if (res.data.code == 200) {
       state.dialogTableRows = res.data.data || [];
       state.dialogPageConfig.total = res.data.total || 0;
@@ -335,17 +338,17 @@ const save = () => {
   const res = dialogBgTable.value.dealSelectData();
   state.selectedRows = Object.values(res);
   state.formData.userScope = state.selectedRows.map((item) => ({
-    systemId: item.systemId,
+    user_id: item.user_id,
   }));
   state.pageConfig.total = state.formData.userScope.length;
   changePage(1);
 };
 //提交
 const submit = () => {
-  axios.post("/apaas/system/v5/accessRule/addAccessRule", state.formData).then((res) => {
+  axios.post("/v1/api/accessRule/addAccessRule", state.formData).then((res) => {
     if (res.data.code == 200) {
       ElMessage.success("添加成功");
-      router.push("/config/accessRule");
+      router.push("/system-admin/visit-control");
     } else {
       ElMessage.error(res.data.data);
     }

src/page/main/system-admin/visit-control/edit/index.vue

@@ -44,7 +44,7 @@
               </bg-table>
               <bg-pagination
                 :page="pageConfig.page"
-                :size="pageConfig.limit"
+                :size="pageConfig.page_size"
                 :total="pageConfig.total"
                 @change-page="changePage"
                 @change-size="changeSize">
@@ -96,7 +96,7 @@
                 ref="dialogBgTable"
                 height="430"
                 select
-                rowKey="systemId"
+                rowKey="user_id"
                 :headers="detailHeaders"
                 :rows="dialogTableRows"
                 :originSelectedData="selectedRows"
@@ -108,7 +108,7 @@
               </bg-table>
               <bg-pagination
                 :page="dialogPageConfig.page"
-                :size="dialogPageConfig.limit"
+                :size="dialogPageConfig.page_size"
                 :total="dialogPageConfig.total"
                 @change-page="dialogChangePage"
                 @change-size="dialogChangeSize">
@@ -198,13 +198,13 @@ const state = reactive({
   },
   pageConfig: {
     page: 1,
-    limit: 10,
+    page_size: 10,
     total: 0,
   },
   //弹框中表格分页配置项
   dialogPageConfig: {
     page: 1,
-    limit: 10,
+    page_size: 10,
     total: 0,
   },
   //表格数据
@@ -282,7 +282,7 @@ const userMaintain = () => {
 };
 //获取所属组织级联数据
 const getOrgTree = () => {
-  axios.get(`/apaas/system/v5/org/tree`).then((res) => {
+  axios.get(`/v1/api/org/tree`).then((res) => {
     if (res.data.code == 200) {
       const orgDataTemp = res.data.data || [];
       state.orgData = orgDataTemp;
@@ -293,11 +293,14 @@ const getOrgTree = () => {
 };
 const changePage = (page) => {
   state.pageConfig.page = page;
-  state.tableRows = state.selectedRows.slice((page - 1) * state.pageConfig.limit, page * state.pageConfig.limit);
+  state.tableRows = state.selectedRows.slice(
+    (page - 1) * state.pageConfig.page_size,
+    page * state.pageConfig.page_size
+  );
 };
 
 const changeSize = (size) => {
-  state.pageConfig.limit = size;
+  state.pageConfig.page_size = size;
   changePage(1);
 };
 const dialogChangePage = (page) => {
@@ -306,18 +309,18 @@ const dialogChangePage = (page) => {
 };
 
 const dialogChangeSize = (size) => {
-  state.dialogPageConfig.limit = size;
+  state.dialogPageConfig.page_size = size;
   dialogChangePage(1);
 };
 //编辑时回显用户范围数据
 const getUserScopeList = () => {
   const params = {
-    limit: 10000,
+    page_size: 10000,
     page: 1,
     id: route.query.id,
     disp: 0,
   };
-  axios.get("/apaas/system/v5/accessRule/listRuleUser", { params }).then((res) => {
+  axios.get("/v1/api/accessRule/listRuleUser", { params }).then((res) => {
     if (res.data.code == 200) {
       state.selectedRows = res.data.data || [];
       state.pageConfig.total = state.selectedRows.length;
@@ -331,12 +334,12 @@ const getUserScopeList = () => {
 //获取用户维护数据
 const getTableList = () => {
   const params = {
-    limit: state.dialogPageConfig.limit,
+    page_size: state.dialogPageConfig.page_size,
     page: state.dialogPageConfig.page,
     disp: 1,
     ...state.dialogFilterData,
   };
-  axios.get("/apaas/system/v5/accessRule/listRuleUser", { params }).then((res) => {
+  axios.get("/v1/api/accessRule/listRuleUser", { params }).then((res) => {
     if (res.data.code == 200) {
       state.dialogTableRows = res.data.data || [];
       state.dialogPageConfig.total = res.data.total || 0;
@@ -366,7 +369,7 @@ const save = () => {
   const res = dialogBgTable.value.dealSelectData();
   state.selectedRows = Object.values(res);
   state.formData.userScope = state.selectedRows.map((item) => ({
-    systemId: item.systemId,
+    user_id: item.user_id,
   }));
   state.pageConfig.total = state.formData.userScope.length;
   changePage(1);
@@ -377,10 +380,10 @@ const submit = () => {
     ruleId: route.query.ruleId,
     ...state.formData,
   };
-  axios.put("/apaas/system/v5/accessRule/updateAccessRule", params).then((res) => {
+  axios.put("/v1/api/accessRule/updateAccessRule", params).then((res) => {
     if (res.data.code == 200) {
       ElMessage.success("更新成功");
-      router.push("/config/accessRule");
+      router.push("/system-admin/visit-control");
     } else {
       ElMessage.error(res.data.data);
     }

src/page/main/system-admin/visit-control/index.vue

@@ -74,7 +74,7 @@
         </bg-table>
         <bg-pagination
           :page="filter.page"
-          :size="filter.limit"
+          :size="filter.page_size"
           :total="tableTotal"
           @change-page="changePage"
           @change-size="changeSize">
@@ -133,7 +133,7 @@
           </bg-table>
           <bg-pagination
             :page="userFilter.page"
-            :size="userFilter.limit"
+            :size="userFilter.page_size"
             :total="userTableTotal"
             @change-page="changeUserPage"
             @change-size="changeUserSize">
@@ -171,7 +171,7 @@ const state = reactive({
   filter: {
     search: "",
     page: 1,
-    limit: 10,
+    page_size: 10,
     time: [],
   },
   headers: [
@@ -214,7 +214,7 @@ const state = reactive({
   dialogDetail: false,
   userFilter: {
     page: 1,
-    limit: 10,
+    page_size: 10,
     search: "",
     isAdmin: "",
     organizationId: "",
@@ -269,7 +269,7 @@ const state = reactive({
 });
 
 const getOrgList = () => {
-  axios.get(`/apaas/system/v5/org/tree`).then((res) => {
+  axios.get(`/v1/api/org/tree`).then((res) => {
     if (res.data.code == 200) {
       state.orgList = res.data.data || [];
     } else {
@@ -287,7 +287,7 @@ const changePage = (page) => {
   getTableRows();
 }; // 改变页码
 const changeSize = (size) => {
-  state.filter.limit = size;
+  state.filter.page_size = size;
   changePage(1);
 }; // 改变每页条数
 const filterAction = () => {
@@ -297,7 +297,7 @@ const filterClear = () => {
   state.filter = {
     search: "",
     page: 1,
-    limit: 10,
+    page_size: 10,
     time: [],
   };
   changePage(1);
@@ -308,7 +308,7 @@ const getTableRows = () => {
   params.updatedTimeTo = params.time ? params.time[1] || "" : "";
   delete params.time;
   axios
-    .get(`/apaas/system/v5/accessRule/listAccessRule`, {
+    .get(`/v1/api/accessRule/listAccessRule`, {
       params,
     })
     .then((res) => {
@@ -323,6 +323,7 @@ const getTableRows = () => {
 
 const selectRows = (data) => {
   state.selectedNum = data.allLength;
+  stateChange;
   state.selection = data.selection;
 };
 
@@ -337,7 +338,7 @@ const cleanSelected = () => {
 
 // 改变规则状态
 const stateChange = (row) => {
-  axios.put(`/apaas/system/v5/accessRule/updateState?id=${row.id}&state=${row.state}`).then((res) => {
+  axios.put(`/v1/api/accessRule/updateState?id=${row.id}&state=${row.state}`).then((res) => {
     if (res.data.code == 200) {
       ElMessage.success(res.data.msg);
       changePage(1);
@@ -347,7 +348,6 @@ const stateChange = (row) => {
     }
   });
 };
-
 // 打开用户弹窗
 const openUserDialog = (row) => {
   state.dialogDetail = true;
@@ -363,7 +363,7 @@ const searchUsers = () => {
 const clearAction = () => {
   state.userFilter = {
     page: 1,
-    limit: 10,
+    page_size: 10,
     search: "",
     isAdmin: "",
     organizationId: "",
@@ -379,7 +379,7 @@ const changeUserPage = (page) => {
 };
 
 const changeUserSize = (size) => {
-  state.userFilter.limit = size;
+  state.userFilter.page_size = size;
   changeUserPage(1);
 };
 
@@ -389,7 +389,7 @@ const getUserTableRows = () => {
     ...state.userFilter,
     id: state.actionRow.id,
   };
-  axios.get(`/apaas/system/v5/accessRule/listRuleUser`, { params }).then((res) => {
+  axios.get(`/v1/api/accessRule/listRuleUser`, { params }).then((res) => {
     if (res.data.code == 200) {
       state.userTableRows = res.data.data || [];
       state.userTableTotal = res.data.total;
@@ -434,7 +434,7 @@ const openDeleteDialog = (type, row) => {
 //确定删除
 const confimDelete = () => {
   axios
-    .delete("/apaas/system/v5/accessRule/delAccessRule", {
+    .delete("/v1/api/accessRule/delAccessRule", {
       data: {
         ruleId: state.deleteDialogConfig.ruleId,
       },
@@ -465,7 +465,6 @@ const {
   userFilter,
   userTypeList,
   orgList,
-  selection,
   dialogDelete,
   deleteDialogConfig,
 } = toRefs(state);