林倩 4 роки тому
батько
коміт
a1f771f369

+ 7 - 0
src/api/common.js

@@ -44,6 +44,13 @@ export function getTree(data) {
     return axios.post("/orgsvr/v2/org/tree/catalog", data);
 }
 
+// 机构树-正确的树,暂时只用在主体机构列表页面
+export function getOrgTree(data) {
+    data.type = data.type || "APP";
+    return axios.post("/authsvr/v2/authorginfo/org/tree/catalog", data);
+
+}
+
 // 机构列表 *查询本级
 export function getBaseTree(data) {
     return axios.get(`/orgsvr/v2/org/tree/node/${data.id}`);

+ 2 - 0
src/pages/common/import/index.vue

@@ -38,6 +38,8 @@ const dd = {
     serviceResource: "服务资源模板.xls",
     org: "机构模板.xls",
     user: "人员模板.xls",
+    dataLevel: "数据分级模板.xls",
+    dataSec: "数据安全级别模板.xls",
 };
 
 export default {

+ 2 - 2
src/pages/data-auth-module/auth-object-manage/service-resource-manage/index.vue

@@ -28,9 +28,9 @@
         </el-form>
         <!-- 操作 -->
         <dg-row zebra="10px">
-            <dg-button type="primary" icon="el-icon-upload2" @click="handleSynchro">导入</dg-button>
+            <dg-button type="primary" icon="el-icon-upload2" @click="handleImport">导入</dg-button>
             <dg-button type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd">新增</dg-button>
-            <dg-button type="primary" icon="el-icon-refresh" @click="handleSync">同步</dg-button>
+            <dg-button type="primary" icon="el-icon-refresh" @click="handleSynchro">同步</dg-button>
         </dg-row>
         <!-- 表格 -->
         <dg-table ref="table" :url="tableUrl" :condition="form" border row-key="id">

+ 6 - 5
src/pages/data-auth-module/auth-subject-manage/org-prop-manage/index.vue

@@ -27,6 +27,7 @@
                     class="u-pm__left"
                     title="机构列表"
                     :search="true"
+                    apiName="getOrgTree"
                     @handleGetNode="handleGetNode"
                     @submitRootNode="submitRootNode"
                 />
@@ -55,9 +56,9 @@
 import Tree from "@/pages/common/tree";
 import { institutionField } from "../DataConfig";
 import { orgInfoDetail } from "@/api/data-auth";
-import { authOrgSync } from "@/api/sync"
+import { authOrgSync } from "@/api/sync";
 import importFile from "@/pages/common/import";
-import { orgImportUrl  } from "@/api/import"
+import { orgImportUrl } from "@/api/import";
 export default {
     name: "institutional-attributes", // 组件名称
     props: {},
@@ -91,7 +92,7 @@ export default {
                     success(params) {
                         vm.key++;
                         layer.close(layer.dialogIndex);
-                    },
+                    }
                 },
                 cancel: function (index, layero) {
                     // 关闭对应弹窗的ID
@@ -105,10 +106,10 @@ export default {
          * @description:同步方法,假同步
          */
         handleSynchro() {
-            authOrgSync().then(res => {
+            authOrgSync().then((res) => {
                 this.$message.success("同步成功");
                 this.handleSearch();
-            })
+            });
         },
         /**
          * @description:树方法