新增数据集和数据项

src/api/data-auth.js

@@ -4,396 +4,427 @@
  @Date：2021-04-09
  */
 
-import request from '@/utils/request';
+import request from "@/utils/request"
 import qs from "qs"
-const baseUrl = '/authsvr/v2/dataauth';
-
+const baseUrl = "/authsvr/v2/dataauth"
 
 // 数据资源树联动勾选
 export function reactTree(data) {
-  return request({
-    url: `${baseUrl}/tree-react`,
-    method: 'POST',
-    data
-  });
+    return request({
+        url: `${baseUrl}/tree-react`,
+        method: "POST",
+        data
+    })
 }
 
+/* *******************************************  数据集  ***************************************** */
+const dataSetBaseUrl = "/app-data-resource/v2/"
+export const dataSetlTableUrl = `${dataSetBaseUrl}page`
+// 数据集详情
+export function getDataSetDetail(id) {
+    return request({
+        url: `${dataSetBaseUrl}` + id,
+        method: "get"
+    })
+}
+// 删除数据集
+export function delDataSet(id) {
+    return request({
+        url: `${dataSetBaseUrl}` + id,
+        method: "DELETE"
+    })
+}
 
+/* *******************************************  数据项  ***************************************** */
+const dataItemBaseUrl = "/app-data-item/v2/"
+export const dataItemlTableUrl = `${dataItemBaseUrl}page`
+// 数据项详情
+export function getDataItemDetail(id) {
+    return request({
+        url: `${dataItemBaseUrl}` + id,
+        method: "get"
+    })
+}
+// 删除数据项
+export function delDataItem(id) {
+    return request({
+        url: `${dataItemBaseUrl}` + id,
+        method: "DELETE"
+    })
+}
 
-/********************************************  数据授权  ******************************************/
+/* *******************************************  数据授权  ***************************************** */
 
 // 标签树
 export function getBusinessTagTree(data) {
-  return request({
-    url: `${baseUrl}/businessTreeList`,
-    method: 'get'
-  });
+    return request({
+        url: `${baseUrl}/businessTreeList`,
+        method: "get"
+    })
 }
 
 // 获取数据授权资源树
 export function getAllDataTree(params) {
-  return request({
-    url: `${baseUrl}/allDataTree`,
-    method: 'get',
-    params
-  });
+    return request({
+        url: `${baseUrl}/allDataTree`,
+        method: "get",
+        params
+    })
 }
 
 // 获取单个主体数据权限
 export function getSubDataAuth(data) {
-  return request({
-    url: `${baseUrl}/getSubDataAuth`,
-    method: 'post',
-    data
-  });
+    return request({
+        url: `${baseUrl}/getSubDataAuth`,
+        method: "post",
+        data
+    })
 }
 
 // 人员视角数据权限查询
 export function dataAuthInfoByUserId(params) {
-  return request({
-    url: `${baseUrl}/dataAuthInfoByUserId`,
-    method: 'get',
-    params
-  });
+    return request({
+        url: `${baseUrl}/dataAuthInfoByUserId`,
+        method: "get",
+        params
+    })
 }
 
 // 业务域标签数据授权
 export function saveLabelDataAuth(data) {
-  return request({
-    url: `${baseUrl}/labelDataAuth`,
-    method: 'post',
-    data
-  });
+    return request({
+        url: `${baseUrl}/labelDataAuth`,
+        method: "post",
+        data
+    })
 }
 
 // 机构数据授权
 export function saveOrgDataAuth(data) {
-  return request({
-    url: `${baseUrl}/orgDataAuth`,
-    method: 'post',
-    data
-  });
+    return request({
+        url: `${baseUrl}/orgDataAuth`,
+        method: "post",
+        data
+    })
 }
 
 // 人员数据授权
 export function saveUserDataAuth(data) {
-  return request({
-    url: `${baseUrl}/userDataAuth`,
-    method: 'post',
-    data
-  });
+    return request({
+        url: `${baseUrl}/userDataAuth`,
+        method: "post",
+        data
+    })
 }
 
-/*********************************** 数据分级分类表码    ******************************************************/
+/** ********************************* 数据分级分类表码    ******************************************************/
 
-const dataLevelBaseUrl = '/datalevelsvr/v2';
-export const dataLevelTableUrl = `${dataLevelBaseUrl}/search`;
+const dataLevelBaseUrl = "/datalevelsvr/v2"
+export const dataLevelTableUrl = `${dataLevelBaseUrl}/search`
 // 数据分级详情
 export function getDataLevelDetail(id) {
-  return request({
-    url: `${dataLevelBaseUrl}/detail/` + id,
-    method: 'get'
-  });
+    return request({
+        url: `${dataLevelBaseUrl}/detail/` + id,
+        method: "get"
+    })
 }
 // 保存数据分级
 export function saveDataLevel(data) {
-  return request({
-    url: `${dataLevelBaseUrl}/save`,
-    method: 'POST',
-    data
-  });
+    return request({
+        url: `${dataLevelBaseUrl}/save`,
+        method: "POST",
+        data
+    })
 }
 // 删除数据分级
 export function delDataLevel(id) {
-  return request({
-    url: `${dataLevelBaseUrl}/deleteById/` + id,
-    method: 'DELETE'
-  });
+    return request({
+        url: `${dataLevelBaseUrl}/deleteById/` + id,
+        method: "DELETE"
+    })
 }
 
 // 数据安全等级
-const dataSecLevBaseUrl = '/datasecsvr/v2';
-export const dataSecLevTableUrl = `${dataSecLevBaseUrl}/search`;
+const dataSecLevBaseUrl = "/datasecsvr/v2"
+export const dataSecLevTableUrl = `${dataSecLevBaseUrl}/search`
 // 获取数据安全等级详情
 export function getDataSecLevDetail(id) {
-  return request({
-    url: `${dataSecLevBaseUrl}/detail/` + id,
-    method: 'get'
-  });
+    return request({
+        url: `${dataSecLevBaseUrl}/detail/` + id,
+        method: "get"
+    })
 }
 // 保存数据安全等级
 export function saveDataSecLev(data) {
-  return request({
-    url: `${dataSecLevBaseUrl}/save`,
-    method: 'POST',
-    data
-  });
+    return request({
+        url: `${dataSecLevBaseUrl}/save`,
+        method: "POST",
+        data
+    })
 }
 // 删除数据安全等级
 export function delDataSecLev(id) {
-  return request({
-    url: `${dataSecLevBaseUrl}/deleteById/` + id,
-    method: 'DELETE'
-  });
+    return request({
+        url: `${dataSecLevBaseUrl}/deleteById/` + id,
+        method: "DELETE"
+    })
 }
 
 // 数据资源分类表码
-const dataSourceClaBaseUrl = '/dataclassifysvr/v2';
-export const dataSourceClaTableUrl = `${dataSourceClaBaseUrl}/search`;
+const dataSourceClaBaseUrl = "/dataclassifysvr/v2"
+export const dataSourceClaTableUrl = `${dataSourceClaBaseUrl}/search`
 // 获取数据资源分类详情
 export function getDataSourceClaDetail(labId) {
-  return request({
-    url: `${dataSourceClaBaseUrl}/detailAllLevel/` + labId,
-    method: 'get'
-  });
+    return request({
+        url: `${dataSourceClaBaseUrl}/detailAllLevel/` + labId,
+        method: "get"
+    })
 }
 // 添加数据资源分类
 export function saveDataSourceCla(data) {
-  return request({
-    url: `${dataSourceClaBaseUrl}/save`,
-    method: 'POST',
-    data
-  });
+    return request({
+        url: `${dataSourceClaBaseUrl}/save`,
+        method: "POST",
+        data
+    })
 }
 
 // 修改数据资源分类
 export function updateDataSourceCla(data) {
-  return request({
-    url: `${dataSourceClaBaseUrl}/update`,
-    method: 'POST',
-    data
-  });
+    return request({
+        url: `${dataSourceClaBaseUrl}/update`,
+        method: "POST",
+        data
+    })
 }
 // 删除数据资源分类
 export function delDataSourceCla(id) {
-  return request({
-    url: `${dataSourceClaBaseUrl}/deleteById/` + id,
-    method: 'DELETE'
-  });
+    return request({
+        url: `${dataSourceClaBaseUrl}/deleteById/` + id,
+        method: "DELETE"
+    })
 }
 
 // 字段分类列表
-const fieldClassifyBaseUrl = '/fieldclassifysvr/v2';
-export const fieldClassifyTableUrl = `${fieldClassifyBaseUrl}/search`;
+const fieldClassifyBaseUrl = "/fieldclassifysvr/v2"
+export const fieldClassifyTableUrl = `${fieldClassifyBaseUrl}/search`
 // 获取字段分类详情
 export function getFieldClassifyDetail(labId) {
-  return request({
-    url: `${fieldClassifyBaseUrl}/detailAllLevel/` + labId,
-    method: 'get'
-  });
+    return request({
+        url: `${fieldClassifyBaseUrl}/detailAllLevel/` + labId,
+        method: "get"
+    })
 }
 // 添加字段分类
 export function saveFieldClassify(data) {
-  return request({
-    url: `${fieldClassifyBaseUrl}/save`,
-    method: 'POST',
-    data
-  });
+    return request({
+        url: `${fieldClassifyBaseUrl}/save`,
+        method: "POST",
+        data
+    })
 }
 
 // 修改字段分类
 export function updateFieldClassify(data) {
-  return request({
-    url: `${fieldClassifyBaseUrl}/update`,
-    method: 'POST',
-    data
-  });
+    return request({
+        url: `${fieldClassifyBaseUrl}/update`,
+        method: "POST",
+        data
+    })
 }
 // 删除字段分类
 export function delFieldClassify(id) {
-  return request({
-    url: `${fieldClassifyBaseUrl}/deleteById/` + id,
-    method: 'DELETE'
-  });
+    return request({
+        url: `${fieldClassifyBaseUrl}/deleteById/` + id,
+        method: "DELETE"
+    })
 }
 
 // 字段分类关系接口
 const fieldRelBaseUrl = "/cloumnRelation/v2"
-export const fieldRelTabelUrl = `${fieldRelBaseUrl}/search`;
+export const fieldRelTabelUrl = `${fieldRelBaseUrl}/search`
 
 // 获取关系分类
 export function getSecLevelColumn() {
-  return request({
-    url: `/fieldclassifysvr/v2/getSecLevelColumn`,
-    method: 'POST',
-    data: qs.stringify({
-      searchCondition: JSON.stringify([]),
-      page: 0,
-      size: 100
+    return request({
+        url: `/fieldclassifysvr/v2/getSecLevelColumn`,
+        method: "POST",
+        data: qs.stringify({
+            searchCondition: JSON.stringify([]),
+            page: 0,
+            size: 100
+        })
     })
-  });
 }
 
-
 // 获取字段分类详情
 export function getfieldRelDetail(id) {
-  return request({
-    url: `${fieldRelBaseUrl}/detail`,
-    method: 'get',
-    params: {
-      id
-    }
-  });
+    return request({
+        url: `${fieldRelBaseUrl}/detail`,
+        method: "get",
+        params: {
+            id
+        }
+    })
 }
 // 添加字段分类
 export function saveFieldRel(data) {
-  return request({
-    url: `${fieldRelBaseUrl}/relationAdd`,
-    method: 'POST',
-    data
-  });
+    return request({
+        url: `${fieldRelBaseUrl}/relationAdd`,
+        method: "POST",
+        data
+    })
 }
 
 // 修改字段分类
 export function updateFieldRel(data) {
-  return request({
-    url: `${fieldRelBaseUrl}/relationUpdate`,
-    method: 'POST',
-    data
-  });
+    return request({
+        url: `${fieldRelBaseUrl}/relationUpdate`,
+        method: "POST",
+        data
+    })
 }
 // 删除字段分类
 export function delFieldRel(id) {
-  return request({
-    url: `${fieldRelBaseUrl}/deleteById`,
-    method: 'DELETE',
-    params: {
-      id
-    }
-  });
+    return request({
+        url: `${fieldRelBaseUrl}/deleteById`,
+        method: "DELETE",
+        params: {
+            id
+        }
+    })
 }
 
-
-/************************************ 清单  *****************************************/
+/** ********************************** 清单  *****************************************/
 
 // 清单列表
 export function getDataDetailList() {
-  return request({
-    url: `${baseUrl}/dataDetailList`,
-    method: 'POST'
-  });
+    return request({
+        url: `${baseUrl}/dataDetailList`,
+        method: "POST"
+    })
 }
 
 // 获取清单搜索下拉表
 export function getSelectList(params) {
-  return request({
-    url: `${baseUrl}/getDataResourceTree`,
-    method: 'GET',
-    params: {
-      typeCode: params
-    }
-  });
+    return request({
+        url: `${baseUrl}/getDataResourceTree`,
+        method: "GET",
+        params: {
+            typeCode: params
+        }
+    })
 }
 
 // 人员视角 - 授权列表
 export function userDataTreeByIdcard(authType, idcard) {
-  return request({
-    url: `${baseUrl}/userDataTreeByIdcard`,
-    method: 'GET',
-    params: {
-      authType,
-      idcard
-    }
-  });
+    return request({
+        url: `${baseUrl}/userDataTreeByIdcard`,
+        method: "GET",
+        params: {
+            authType,
+            idcard
+        }
+    })
 }
 
-/****************************** 用户属性管理 ************************************ */
+/** **************************** 用户属性管理 ************************************ */
 
-const authUserBaseUrl = '/authsvr/v2/authuserinfo';
-export const authUserTableUrl = `${authUserBaseUrl}/page`;
+const authUserBaseUrl = "/authsvr/v2/authuserinfo"
+export const authUserTableUrl = `${authUserBaseUrl}/page`
 // 获取人员详情
 export function getAuthUserDetail(id) {
-  return request({
-    url: `${authUserBaseUrl}/detail/` + id,
-    method: 'GET'
-  });
+    return request({
+        url: `${authUserBaseUrl}/detail/` + id,
+        method: "GET"
+    })
 }
 
-/****************************** 机构属性管理 ************************************ */
-const authOrgBaseUrl = '/authsvr/v2/authorginfo';
+/** **************************** 机构属性管理 ************************************ */
+const authOrgBaseUrl = "/authsvr/v2/authorginfo"
 // 机构详情
 export function orgInfoDetail(id) {
-  return request({
-    url: `${authOrgBaseUrl}/detail/` + id,
-    method: 'GET'
-  });
+    return request({
+        url: `${authOrgBaseUrl}/detail/` + id,
+        method: "GET"
+    })
 }
 
-/******************************* 主客体授权管理    ********************************* */
-const propBaseUrl = '/attrsvr/v2';
+/** ***************************** 主客体授权管理    ********************************* */
+const propBaseUrl = "/attrsvr/v2"
 // 根据属性所属类别获取属性列表,返回树结构
 export function getPropTreeByType(attrSubType) {
-  return request({
-    url: `${propBaseUrl}/getAttrTreeList`,
-    method: 'GET',
-    params: {
-        attrSubType
-    }
-  });
+    return request({
+        url: `${propBaseUrl}/getAttrTreeList`,
+        method: "GET",
+        params: {
+            attrSubType
+        }
+    })
 }
 // 获取属性详情
 export function getPropDetail(params) {
-  return request({
-    url: `${propBaseUrl}/attrRelToIds`,
-    method: 'GET',
-    params
-  });
+    return request({
+        url: `${propBaseUrl}/attrRelToIds`,
+        method: "GET",
+        params
+    })
 }
 
 // 保存属性
 export function saveProp(data) {
-  return request({
-    url: `${propBaseUrl}/attrAdds`,
-    method: 'POST',
-    data
-  });
+    return request({
+        url: `${propBaseUrl}/attrAdds`,
+        method: "POST",
+        data
+    })
 }
 // 删除属性
 export function deleteProp(params) {
-  return request({
-    url: `${propBaseUrl}/deleteAllById`,
-    method: 'GET',
-    params
-  });
+    return request({
+        url: `${propBaseUrl}/deleteAllById`,
+        method: "GET",
+        params
+    })
 }
 
 // 添加属性关联应用
 export function addAttrRelateSource(data) {
-  return request({
-    url: `${propBaseUrl}/attrRelAdd`,
-    method: 'POST',
-    data
-  });
+    return request({
+        url: `${propBaseUrl}/attrRelAdd`,
+        method: "POST",
+        data
+    })
 }
 
 // 查询属性关联的id集合
 export function getRelateIds(params) {
-  return request({
-    url: `${propBaseUrl}/attrRelToIds`,
-    method: 'get',
-    params
-  });
+    return request({
+        url: `${propBaseUrl}/attrRelToIds`,
+        method: "get",
+        params
+    })
 }
 
 // 删除被关联的资源
 export function delAttrRelResource(attrRelId) {
     return request({
-      url: `${propBaseUrl}/delAttrRelResource`,
-      method: 'get',
-      params: {
-        attrRelId
-      }
-    });
-  }
+        url: `${propBaseUrl}/delAttrRelResource`,
+        method: "get",
+        params: {
+            attrRelId
+        }
+    })
+}
 
 // 查询客体属性-关联应用列表
-export const ObjRelAppTableUrl = `${propBaseUrl}/relAppPage`;
+export const ObjRelAppTableUrl = `${propBaseUrl}/relAppPage`
 
 // 查询客体属性-未关联应用列表
-export const ObjNotRelAppTableUrl = `${propBaseUrl}/notRelAppPage`;
+export const ObjNotRelAppTableUrl = `${propBaseUrl}/notRelAppPage`
 
 // 查询客体属性-关联服务列表
-export const ObjRelServiceTableUrl = `${propBaseUrl}/relServicePage`;
+export const ObjRelServiceTableUrl = `${propBaseUrl}/relServicePage`
 
 // 查询客体属性-未关联服务列表
-export const ObjNotRelServiceTableUrl = `${propBaseUrl}/notRelServicePage`;
+export const ObjNotRelServiceTableUrl = `${propBaseUrl}/notRelServicePage`

src/api/import.js

@@ -5,26 +5,32 @@
  */
 
 function getUrl(path) {
-    return `/subimportsvr/v2/${path}/import`;
+    return `/subimportsvr/v2/${path}/import`
 }
 
 // 应用导入
-export const appImportUrl = getUrl("app");
+export const appImportUrl = getUrl("app")
 
 // 机构导入
-export const orgImportUrl = getUrl("org");
+export const orgImportUrl = getUrl("org")
 
 // 功能导入
-export const funImportUrl = getUrl("fun");
+export const funImportUrl = getUrl("fun")
 
 // 服务导入
-export const serviceImportUrl = getUrl("service");
+export const serviceImportUrl = getUrl("service")
 
 // 人员导入
-export const userImportUrl = getUrl("user");
+export const userImportUrl = getUrl("user")
 
 // 数据分级导入
-export const dataLevelImportUrl = getUrl("dataLevel");
+export const dataLevelImportUrl = getUrl("dataLevel")
+
+// 数据集导入
+export const dataSetlImportUrl = getUrl("appData")
+
+// 数据项导入
+export const dataItemlImportUrl = getUrl("appDataItem")
 
 // 数据安全级别导入
-export const dataSafeLevelImportUrl = getUrl("dataSec");
+export const dataSafeLevelImportUrl = getUrl("dataSec")

src/pages/auth-object-manage/sort-code-manage/DataConfig.js

@@ -5,256 +5,354 @@
  */
 
 // 页面操作
-export const pageOptList = ['新增', '同步'];
+export const pageOptList = ["新增", "同步"]
 
 // 表格操作
-export const tableOptList = ['详情', '修改', '删除'];
+export const tableOptList = ["详情", "修改", "删除"]
+
+/** ************************************  数据集  **********************************/
+export const dataSetTable = [
+    {
+        label: "数据资源名称",
+        prop: "resourceName",
+        value: ""
+    },
+    {
+        label: "数据资源标识符",
+        prop: "resourceCode",
+        value: ""
+    },
+    {
+        label: "一级分类",
+        prop: "dataClassifyOneName",
+        value: ""
+    },
+    {
+        label: "二级分类",
+        prop: "dataClassifyTwoName",
+        value: ""
+    },
+    {
+        label: "标签",
+        prop: "labelName",
+        value: ""
+    },
+    {
+        label: "数据资源事权单位名称",
+        prop: "authorityDeptName",
+        value: ""
+    },
+    {
+        label: "应用系统名称",
+        prop: "applicationCodeName",
+        value: ""
+    },
+    {
+        label: "数据资源管理单位名称",
+        prop: "manageDeptName",
+        value: ""
+    },
+    {
+        label: "注册时间",
+        prop: "createTime",
+        value: ""
+    },
+    {
+        label: "更新时间",
+        prop: "updateTime",
+        value: ""
+    }
+]
+
+/** ************************************  数据项  **********************************/
+export const dataItemTable = [
+    {
+        label: "数据资源名称",
+        prop: "appDataResourceName",
+        value: ""
+    },
+    {
+        label: "数据项编号",
+        prop: "dataItemNo",
+        value: ""
+    },
+    {
+        label: "字段分类名",
+        prop: "columnClassifyName",
+        value: ""
+    },
+    {
+        label: "字段中文名称",
+        prop: "columnName",
+        value: ""
+    },
+    {
+        label: "字段英文名称",
+        prop: "columnCode",
+        value: ""
+    },
+    {
+        label: "是否失效",
+        prop: "invalidStatus",
+        value: "",
+        code: "DM_INVALID_STATUS"
+    },
+    {
+        label: "注册时间",
+        prop: "columnRegisterTime",
+        value: ""
+    },
+    {
+        label: "更新时间",
+        prop: "columnUpdateTime",
+        value: ""
+    }
+]
 
 /** ************************************  数据分级表码相关  **********************************/
 
 export const dataLevelTableHeader = [
-  {
-    label: '代码',
-    prop: 'levelCode'
-  },
-  {
-    label: '数据分级',
-    prop: 'levelName'
-  },
-  {
-    label: '说明',
-    prop: 'remark'
-  }
-];
+    {
+        label: "代码",
+        prop: "levelCode"
+    },
+    {
+        label: "数据分级",
+        prop: "levelName"
+    },
+    {
+        label: "说明",
+        prop: "remark"
+    }
+]
 
 export const dataLevelForm = [
-  {
-    label: '代码',
-    prop: 'levelCode',
-    component: 'ElInput',
-    value: '',
-    rules: [{ required: true, message: '请输入代码', trigger: 'change' }],
-    attr: {
-      placeholder: ''
-    },
-    span: 24
-  },
-  {
-    label: '数据分级',
-    prop: 'levelName',
-    component: 'ElInput',
-    value: '',
-    rules: [{ required: true, message: '请输入数据分级', trigger: 'change' }],
-    attr: {
-      placeholder: ''
-    },
-    span: 24
-  },
-  {
-    label: '说明',
-    prop: 'remark',
-    component: 'ElInput',
-    attr: {
-      type: 'textarea',
-      rows: 3,
-      placeholder: ''
-    },
-    value: '',
-    span: 24
-  }
-];
+    {
+        label: "代码",
+        prop: "levelCode",
+        component: "ElInput",
+        value: "",
+        rules: [{ required: true, message: "请输入代码", trigger: "change" }],
+        attr: {
+            placeholder: ""
+        },
+        span: 24
+    },
+    {
+        label: "数据分级",
+        prop: "levelName",
+        component: "ElInput",
+        value: "",
+        rules: [{ required: true, message: "请输入数据分级", trigger: "change" }],
+        attr: {
+            placeholder: ""
+        },
+        span: 24
+    },
+    {
+        label: "说明",
+        prop: "remark",
+        component: "ElInput",
+        attr: {
+            type: "textarea",
+            rows: 3,
+            placeholder: ""
+        },
+        value: "",
+        span: 24
+    }
+]
 
 /** ************************************  数据安全级别相关  **********************************/
 
 export const safeLevelForm = [
-  {
-    label: '代码',
-    prop: 'secCode',
-    component: 'ElInput',
-    value: '',
-    rules: [{ required: true, message: '请输入代码', trigger: 'change' }],
-    attr: {
-      placeholder: ''
-    },
-    span: 24
-  },
-  {
-    label: '数据安全级别',
-    prop: 'secName',
-    component: 'ElInput',
-    value: '',
-    rules: [{ required: true, message: '请输入数据安全级别', trigger: 'change' }],
-    attr: {
-      placeholder: ''
-    },
-    span: 24
-  },
-  {
-    label: '说明',
-    prop: 'remark',
-    component: 'ElInput',
-    attr: {
-      type: 'textarea',
-      rows: 3,
-      placeholder: ''
-    },
-    value: '',
-    span: 24
-  }
-];
+    {
+        label: "代码",
+        prop: "secCode",
+        component: "ElInput",
+        value: "",
+        rules: [{ required: true, message: "请输入代码", trigger: "change" }],
+        attr: {
+            placeholder: ""
+        },
+        span: 24
+    },
+    {
+        label: "数据安全级别",
+        prop: "secName",
+        component: "ElInput",
+        value: "",
+        rules: [{ required: true, message: "请输入数据安全级别", trigger: "change" }],
+        attr: {
+            placeholder: ""
+        },
+        span: 24
+    },
+    {
+        label: "说明",
+        prop: "remark",
+        component: "ElInput",
+        attr: {
+            type: "textarea",
+            rows: 3,
+            placeholder: ""
+        },
+        value: "",
+        span: 24
+    }
+]
 
 /** ************************************  字段分类相关  **********************************/
 export const fieldSortConditionForm = [
-  {
-    label: '字段一级分类',
-    name: 'firName',
-    op: 'like',
-    value: '',
-    component: 'ElInput'
-  },
-  {
-    label: '字段二级分类',
-    name: 'secName',
-    op: 'like',
-    value: '',
-    component: 'ElInput'
-  }
+    {
+        label: "字段一级分类",
+        name: "firName",
+        op: "like",
+        value: "",
+        component: "ElInput"
+    },
+    {
+        label: "字段二级分类",
+        name: "secName",
+        op: "like",
+        value: "",
+        component: "ElInput"
+    }
 ]
 
-
 export const fieldSortConfig = [
-  {
-    label: '字段一级代码',
-    prop: 'firCode',
-    component: 'ElInput',
-    value: '',
-    rules: [{ required: true, message: '请输入字段一级代码', trigger: 'change' }]
-  },
-  {
-    label: '字段一级分类',
-    prop: 'firName',
-    component: 'ElInput',
-    value: '',
-    rules: [{ required: true, message: '请输入字段一级分类', trigger: 'change' }]
-  },
-  {
-    label: '字段二级代码',
-    prop: 'secCode',
-    component: 'ElInput',
-    value: '',
-    rules: [{ required: true, message: '请输入字段二级代码', trigger: 'change' }]
-  },
-  {
-    label: '字段二级分类',
-    prop: 'secName',
-    component: 'ElInput',
-    value: '',
-    rules: [{ required: true, message: '请输入字段二级分类', trigger: 'change' }]
-  },
-  {
-    label: '说明',
-    prop: 'remark',
-    component: 'ElInput',
-    attr: {
-      type: 'textarea',
-      rows: 3
-    },
-    value: '',
-    span: 24
-  }
-];
+    {
+        label: "字段一级代码",
+        prop: "firCode",
+        component: "ElInput",
+        value: "",
+        rules: [{ required: true, message: "请输入字段一级代码", trigger: "change" }]
+    },
+    {
+        label: "字段一级分类",
+        prop: "firName",
+        component: "ElInput",
+        value: "",
+        rules: [{ required: true, message: "请输入字段一级分类", trigger: "change" }]
+    },
+    {
+        label: "字段二级代码",
+        prop: "secCode",
+        component: "ElInput",
+        value: "",
+        rules: [{ required: true, message: "请输入字段二级代码", trigger: "change" }]
+    },
+    {
+        label: "字段二级分类",
+        prop: "secName",
+        component: "ElInput",
+        value: "",
+        rules: [{ required: true, message: "请输入字段二级分类", trigger: "change" }]
+    },
+    {
+        label: "说明",
+        prop: "remark",
+        component: "ElInput",
+        attr: {
+            type: "textarea",
+            rows: 3
+        },
+        value: "",
+        span: 24
+    }
+]
 
 /** ************************************  数据资源分类表码  **********************************/
 export const sourceSortConditionForm = [
-  {
-    label: '数据组织一级分类',
-    name: 'firName',
-    op: 'like',
-    value: '',
-    component: 'ElInput'
-  },
-  {
-    label: '数据组织二级分类',
-    name: 'secName',
-    op: 'like',
-    value: '',
-    component: 'ElInput'
-  },
-  {
-    label: '标签名称',
-    name: 'labName',
-    op: 'like',
-    value: '',
-    component: 'ElInput'
-  }
+    {
+        label: "数据组织一级分类",
+        name: "firName",
+        op: "like",
+        value: "",
+        component: "ElInput"
+    },
+    {
+        label: "数据组织二级分类",
+        name: "secName",
+        op: "like",
+        value: "",
+        component: "ElInput"
+    },
+    {
+        label: "标签名称",
+        name: "labName",
+        op: "like",
+        value: "",
+        component: "ElInput"
+    }
 ]
 
 export const sourceSortConfig = [
-  {
-    label: '一级代码',
-    prop: 'firCode',
-    component: 'ElInput',
-    value: '',
-    rules: [{ required: true, message: '请输入一级代码', trigger: 'change' }]
-  },
-  {
-    label: '数据组织一级分类',
-    prop: 'firName',
-    component: 'ElInput',
-    value: '',
-    rules: [{ required: true, message: '请输入数据组织一级分类', trigger: 'change' }]
-  },
-  {
-    label: '二级代码',
-    prop: 'secCode',
-    component: 'ElInput',
-    value: '',
-    rules: [{ required: true, message: '请输入二级代码', trigger: 'change' }]
-  },
-  {
-    label: '数据组织二级分类',
-    prop: 'secName',
-    component: 'ElInput',
-    value: '',
-    rules: [{ required: true, message: '请输入数据组织二级分类', trigger: 'change' }]
-  },
-  {
-    label: '标签分类代码',
-    prop: 'labClaCode',
-    component: 'ElInput',
-    value: '',
-    rules: [{ required: true, message: '请输入标签分类代码', trigger: 'change' }]
-  },
-  {
-    label: '标签分类',
-    prop: 'labClaName',
-    component: 'ElInput',
-    value: '',
-    rules: [{ required: true, message: '请输入标签分类', trigger: 'change' }]
-  },
-  {
-    label: '标签代码',
-    prop: 'labCode',
-    component: 'ElInput',
-    value: '',
-    rules: [{ required: true, message: '请输入标签代码', trigger: 'change' }]
-  },
-  {
-    label: '标签名称',
-    prop: 'labName',
-    component: 'ElInput',
-    value: '',
-    rules: [{ required: true, message: '请输入标签名称', trigger: 'change' }]
-  },
-  {
-    label: '说明',
-    prop: 'remark',
-    component: 'ElInput',
-    attr: {
-      type: 'textarea',
-      rows: 3
-    },
-    value: '',
-    span: 24
-  }
-];
+    {
+        label: "一级代码",
+        prop: "firCode",
+        component: "ElInput",
+        value: "",
+        rules: [{ required: true, message: "请输入一级代码", trigger: "change" }]
+    },
+    {
+        label: "数据组织一级分类",
+        prop: "firName",
+        component: "ElInput",
+        value: "",
+        rules: [{ required: true, message: "请输入数据组织一级分类", trigger: "change" }]
+    },
+    {
+        label: "二级代码",
+        prop: "secCode",
+        component: "ElInput",
+        value: "",
+        rules: [{ required: true, message: "请输入二级代码", trigger: "change" }]
+    },
+    {
+        label: "数据组织二级分类",
+        prop: "secName",
+        component: "ElInput",
+        value: "",
+        rules: [{ required: true, message: "请输入数据组织二级分类", trigger: "change" }]
+    },
+    {
+        label: "标签分类代码",
+        prop: "labClaCode",
+        component: "ElInput",
+        value: "",
+        rules: [{ required: true, message: "请输入标签分类代码", trigger: "change" }]
+    },
+    {
+        label: "标签分类",
+        prop: "labClaName",
+        component: "ElInput",
+        value: "",
+        rules: [{ required: true, message: "请输入标签分类", trigger: "change" }]
+    },
+    {
+        label: "标签代码",
+        prop: "labCode",
+        component: "ElInput",
+        value: "",
+        rules: [{ required: true, message: "请输入标签代码", trigger: "change" }]
+    },
+    {
+        label: "标签名称",
+        prop: "labName",
+        component: "ElInput",
+        value: "",
+        rules: [{ required: true, message: "请输入标签名称", trigger: "change" }]
+    },
+    {
+        label: "说明",
+        prop: "remark",
+        component: "ElInput",
+        attr: {
+            type: "textarea",
+            rows: 3
+        },
+        value: "",
+        span: 24
+    }
+]

src/pages/auth-object-manage/sort-code-manage/data-item.vue

@@ -0,0 +1,103 @@
+<template>
+    <div>
+        <!-- 搜索栏 -->
+        <search-bar :conditionForm="conditionForm" @submitSearch="receiveSearch"></search-bar>
+        <!-- 操作栏 -->
+        <operate-bar v-if="false" :pageOptList="pageOptList" @submitPageOpt="receviceOpt"></operate-bar>
+        <!-- 表格 -->
+        <new-table
+            ref="table"
+            :tableHeader="dataItemTable"
+            :tableUrl="dataItemlTableUrl"
+            :condition="condition"
+            :tableOptList="tableOptList"
+            @submitTableOpt="receviceOpt"
+        >
+        </new-table>
+    </div>
+</template>
+
+<script>
+import { dataItemlTableUrl, delDataItem, getDataItemDetail } from "@/api/data-auth"
+import { dataItemlImportUrl } from "@/api/import"
+import searchBar from "@/components/search-bar"
+import operateBar from "@/components/operate-bar"
+import newTable from "@/components/new-table"
+import { searchOpt, importOpt, detailOpt } from "@/mixins/page-opt"
+import { dataItemTable, tableOptList, pageOptList } from "./DataConfig"
+const area = ["1200px", "600px"]
+const labelWidth = "180px"
+
+export default {
+    components: { searchBar, operateBar, newTable },
+    mixins: [searchOpt, importOpt, detailOpt],
+    data() {
+        return {
+            dataItemlTableUrl,
+            dataItemTable,
+            tableOptList: ["详情", "删除"],
+            pageOptList: ["导入"],
+            conditionForm: [
+                {
+                    label: "字段中文名称",
+                    name: "columnName",
+                    op: "like",
+                    value: "",
+                    component: "ElInput"
+                }
+            ],
+            details: {}
+        }
+    },
+    computed: {},
+    methods: {
+        async receviceOpt(opt, row) {
+            const otherParams = {
+                config: dataItemTable,
+                labelWidth,
+                area
+            }
+            if (opt == "详情") {
+                this.details = row
+                this.handleViewDetail(row.id, otherParams)
+            } else if (opt == "删除") {
+                this.handleDelete(row)
+            } else if (opt == "导入") {
+                this.handleImport(dataItemlImportUrl, "appDataItem", "数据项导入")
+            }
+        },
+        /**
+         * 删除
+         */
+        handleDelete(row) {
+            this.$dgConfirm(`是否确定删除这条数据！`, "提示", {}).then(() => {
+                delDataItem(row.id).then(res => {
+                    this.$message.success("删除成功!")
+                    this.handleSearch()
+                })
+            })
+        },
+        /**
+         * 获取详情
+         */
+        // getDetail(id) {
+        //   return new Promise((resolve) => {
+        //     getDataItemDetail(id).then((res) => {
+        //       resolve(res.data.content);
+        //     });
+        //   });
+        // },
+        getDetail() {
+            return new Promise(resolve => {
+                resolve(this.details)
+            })
+        }
+    },
+    created() {},
+    mounted() {}
+}
+</script>
+
+<style lang="scss" scoped>
+@import url("./index.scss");
+</style>

src/pages/auth-object-manage/sort-code-manage/data-set.vue

@@ -0,0 +1,103 @@
+<template>
+    <div>
+        <!-- 搜索栏 -->
+        <search-bar :conditionForm="conditionForm" @submitSearch="receiveSearch"></search-bar>
+        <!-- 操作栏 -->
+        <operate-bar v-if="false" :pageOptList="pageOptList" @submitPageOpt="receviceOpt"></operate-bar>
+        <!-- 表格 -->
+        <new-table
+            ref="table"
+            :tableHeader="dataSetTable"
+            :tableUrl="dataSetlTableUrl"
+            :condition="condition"
+            :tableOptList="tableOptList"
+            @submitTableOpt="receviceOpt"
+        >
+        </new-table>
+    </div>
+</template>
+
+<script>
+import { dataSetlTableUrl, delDataSet, getDataSetDetail } from "@/api/data-auth.js"
+import { dataSetlImportUrl } from "@/api/import"
+import searchBar from "@/components/search-bar"
+import operateBar from "@/components/operate-bar"
+import newTable from "@/components/new-table"
+import { searchOpt, importOpt, detailOpt } from "@/mixins/page-opt"
+import { dataSetTable, tableOptList, pageOptList } from "./DataConfig.js"
+const area = ["1200px", "600px"]
+const labelWidth = "180px"
+
+export default {
+    components: { searchBar, operateBar, newTable },
+    mixins: [searchOpt, importOpt, detailOpt],
+    data() {
+        return {
+            dataSetlTableUrl,
+            dataSetTable,
+            tableOptList: ["详情", "删除"],
+            pageOptList: ["导入"],
+            conditionForm: [
+                {
+                    label: "数据资源名称",
+                    name: "resourceName",
+                    op: "like",
+                    value: "",
+                    component: "ElInput"
+                }
+            ],
+            details: {}
+        }
+    },
+    computed: {},
+    methods: {
+        async receviceOpt(opt, row) {
+            const otherParams = {
+                config: dataSetTable,
+                labelWidth,
+                area
+            }
+            if (opt == "详情") {
+                this.details = row
+                this.handleViewDetail(row.id, otherParams)
+            } else if (opt == "删除") {
+                this.handleDelete(row)
+            } else if (opt == "导入") {
+                this.handleImport(dataSetlImportUrl, "appData", "数据集导入")
+            }
+        },
+        /**
+         * 删除
+         */
+        handleDelete(row) {
+            this.$dgConfirm(`是否确定删除这条数据！`, "提示", {}).then(() => {
+                delDataSet(row.id).then(res => {
+                    this.$message.success("删除成功!")
+                    this.handleSearch()
+                })
+            })
+        },
+        /**
+         * 获取详情
+         */
+        // getDetail(id) {
+        //   return new Promise((resolve) => {
+        //     getDataSetDetail(id).then((res) => {
+        //       resolve(res.data.content);
+        //     });
+        //   });
+        // },
+        getDetail() {
+            return new Promise(resolve => {
+                resolve(this.details)
+            })
+        }
+    },
+    created() {},
+    mounted() {}
+}
+</script>
+
+<style lang="scss" scoped>
+@import url("./index.scss");
+</style>

src/pages/auth-object-manage/sort-code-manage/index.vue

@@ -1,11 +1,8 @@
-<!--
- * @Description: 数据分级分类码表管理
- * @Autor: linqian
- * @Date: 2021-03-31 14:51:53
--->
 <template>
     <div>
         <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+            <el-tab-pane label="数据集" name="dataSet"></el-tab-pane>
+            <el-tab-pane label="数据项" name="dataItem"></el-tab-pane>
             <el-tab-pane label="数据分级表码" name="dataLevel"></el-tab-pane>
             <el-tab-pane label="数据安全级别表码" name="safeLevelCode"></el-tab-pane>
             <el-tab-pane label="数据资源分类表码" name="sourceSortCode"></el-tab-pane>
@@ -13,19 +10,23 @@
             <el-tab-pane label="字段关系分类表码" name="fieldRelSort"></el-tab-pane>
         </el-tabs>
         <keep-alive>
-           <component :is="activeName"></component>         
+            <component :is="activeName"></component>
         </keep-alive>
     </div>
 </template>
 
 <script>
-import dataLevel from "./data-level.vue";
-import fieldSortCode from "./field-sort-code";
-import safeLevelCode from "./safe-level-code";
-import sourceSortCode from "./source-sort-code";
+import dataSet from "./data-set.vue"
+import dataItem from "./data-item.vue"
+import dataLevel from "./data-level.vue"
+import fieldSortCode from "./field-sort-code.vue"
+import safeLevelCode from "./safe-level-code.vue"
+import sourceSortCode from "./source-sort-code.vue"
 import fieldRelSort from "./filed-rel-sort.vue"
 export default {
     components: {
+        dataSet,
+        dataItem,
         dataLevel,
         fieldSortCode,
         safeLevelCode,
@@ -34,8 +35,8 @@ export default {
     },
     data() {
         return {
-            activeName: "dataLevel"
-        };
+            activeName: "dataSet"
+        }
     },
     computed: {},
     methods: {
@@ -45,14 +46,12 @@ export default {
          * @return {*}
          */
         handleClick(tab) {
-            this.component = tab.name;
+            this.component = tab.name
         }
     },
     created() {},
     mounted() {}
-};
+}
 </script>
 
-<style lang='scss' scoped>
-
-</style>
+<style lang="scss" scoped></style>