Merge branch 'feature/unify-org-tree' into 'develop'

配合后端统一机构相关接口

See merge request dcuc-tjdsj/auth-web!49

config/dev.env.js

@@ -33,10 +33,10 @@ module.exports = merge(prodEnv, {
     PROT: "8871",
     PROXY_TABLE: JSON.stringify({
         "/dcucauth": {
-            // target: "http://10.11.1.237:8861"
+            target: "http://10.11.1.237:8861"
             // target: "http://10.254.11.203:8861"
             //  target: "http://192.168.10.2:8871"
-               target: "http://192.168.6.133:3471"
+            //  target: "http://192.168.6.133:3471"
 
         }
     })

src/api/admin-manage.js

@@ -39,7 +39,7 @@ export const tableUnAdminPolices = "/usersvr/v2/admin/unAdminPolices";
 // 管理员管理范围--树形
 export function orgRange(data) {
     // return axios.post(`/usersvr/admin/right/range`, data);
-    return axios.post(`/orgsvr/v2/org/tree/admin`, data);
+    return axios.post(`/authsvr/v2/authorginfo/org/tree/admin`, data);
 }
 // 管理员菜单权限-树形
 export function menuRange(data) {

src/api/common.js

@@ -33,16 +33,12 @@ function treeUtil(data, key = { id: "id", pid: "pid" }) {
 export function getOrgMtTree(data) {
     return req.post("/orgInfo/orgMtTreeYB", data);
 }
-// 所有机构的树形
-export function getAllorgTree(data) {
-    return axios.post("/orgsvr/v2/org/tree/full", data);
-}
 
 // 机构列表 *懒加载
 export function getTree(data) {
     data.type = data.type || "APP";
     // data.id = data.id || '7F08CCC3C4984A2586C9D3F0A6B804E5';
-    return axios.post("/orgsvr/v2/org/tree/catalog", data);
+    return axios.post("/authsvr/v2/authorginfo/org/tree/catalog", data);
 }
 
 // 机构树-正确的树 （权限过滤后的）
@@ -54,7 +50,7 @@ export function getOrgTree(data) {
 
 // 机构列表 *查询本级
 export function getBaseTree(data) {
-    return axios.get(`/orgsvr/v2/org/tree/node/${data.id}`);
+    return axios.get(`/authsvr/v2/authorginfo/org/tree/node/${data.id}`);
 }
 
 // 厂商列表
@@ -62,12 +58,6 @@ export function externalTree(data) {
     return axios.post("/appsvr/app/externalTree", data);
 }
 
-// 机构树 *懒加载
-export function appTree(data) {
-    data.type = data.type || "1";
-    return axios.post("/orgsvr/v2/org/tree/full", data);
-}
-
 /**
  * 机构树模糊查询
  * 根据名称name 分页pageNum pageSize
@@ -75,7 +65,7 @@ export function appTree(data) {
 export function treeMatch(data) {
     // return axios.post(`orgsvr/v2/org/tree/match`, data);
    return request({
-        url: "orgsvr/v2/org/tree/match",
+        url: "/authsvr/v2/authorginfo/org/tree/match",
         method: "POST",
         data
     })

src/pages/admin-manage/DataConfig.js

@@ -34,7 +34,7 @@ const conditionForm = [
     name: 'orgId',
     op: '=',
     value: '',
-    apiName: 'getTree',
+    apiName: 'getOrgTree',
     nodeKey: 'id',
     type: 'APP',
     component: 'SelectOrgTree',

src/pages/appfun-auth-manage/app-role-manage/index.vue

@@ -58,7 +58,7 @@ export default {
           name: 'orgId',
           op: '=',
           value: '',
-          apiName: 'getTree',
+          apiName: 'getOrgTree',
           nodeKey: 'id',
           type: 'APP',
           component: 'SelectOrgTree',

src/pages/appfun-auth-manage/org-quotas-manage/index.vue

@@ -56,7 +56,7 @@ export default {
           name: 'orgId',
           op: '=',
           value: '',
-          apiName: 'getTree',
+          apiName: 'getOrgTree',
           nodeKey: 'id',
           type: 'APP',
           component: 'SelectOrgTree',

src/pages/appfun-auth-manage/role-auth-manage/DataConfig.js

@@ -5,7 +5,7 @@ export const userConditionForm = [
     name: 'orgId',
     op: '=',
     value: '',
-    apiName: 'getTree',
+    apiName: 'getOrgTree',
     nodeKey: 'id',
     type: 'APP',
     component: 'SelectOrgTree',

src/pages/appfun-auth-manage/role-auth-manage/roleView.vue

@@ -121,7 +121,7 @@ export default {
           name: 'orgId',
           op: '=',
           value: '',
-          apiName: 'getTree',
+          apiName: 'getOrgTree',
           nodeKey: 'id',
           type: 'APP',
           component: 'SelectOrgTree',

src/pages/auth-subject-manage/DataConfig.js

@@ -322,7 +322,7 @@ const orgConditonForm = [
     name: 'orgId',
     op: '=',
     value: '',
-    apiName: 'getTree',
+    apiName: 'getOrgTree',
     nodeKey: 'id',
     type: 'APP',
     component: 'SelectOrgTree',

src/pages/data-auth-manage/person-auth.vue

@@ -69,7 +69,7 @@ export default {
           name: 'orgId',
           op: '=',
           value: '',
-          apiName: 'getTree',
+          apiName: 'getOrgTree',
           nodeKey: 'id',
           type: 'APP',
           component: 'SelectOrgTree',

src/pages/log-report/persionnel-author-audit/index.vue

@@ -92,7 +92,7 @@ export default {
           name: 'orgId',
           op: '=',
           value: '',
-          apiName: 'getTree',
+          apiName: 'getOrgTree',
           nodeKey: 'id',
           type: 'APP',
           component: 'SelectOrgTree',

src/pages/log-report/scope-author-audit/index.vue

@@ -55,7 +55,7 @@ export default {
           name: 'orgId',
           op: '=',
           value: '',
-          apiName: 'getTree',
+          apiName: 'getOrgTree',
           nodeKey: 'id',
           type: 'APP',
           component: 'SelectOrgTree',

src/pages/permission-to-search/data-auth-search.vue

@@ -77,7 +77,7 @@ export default {
           name: 'orgId',
           op: '=',
           value: '',
-          apiName: 'getTree',
+          apiName: 'getOrgTree',
           nodeKey: 'id',
           type: 'APP',
           component: 'SelectOrgTree',