Browse Source

数据治理、数据目录-元数据、数据资源&模型&指标:字段名调整(name=》name_zh、en_name=》name_en、time=》create_time)

Xiao_123 1 month ago
parent
commit
b4f39021c0
35 changed files with 249 additions and 240 deletions
  1. 19 7
      src/api/dataGovernance.js
  2. 5 5
      src/views/dataBook/dataLabel/index.vue
  3. 3 3
      src/views/dataBook/dataMetaData/components/metaDataInfo.vue
  4. 8 8
      src/views/dataBook/dataMetaData/index.vue
  5. 5 5
      src/views/dataBook/dataModel/dynamic/info.vue
  6. 2 2
      src/views/dataBook/dataModel/dynamic/metadata.vue
  7. 12 12
      src/views/dataBook/dataModel/index.vue
  8. 1 1
      src/views/dataBook/dataProcess/index.vue
  9. 9 9
      src/views/dataBook/dataResource/dynamic/info.vue
  10. 2 2
      src/views/dataBook/dataResource/dynamic/metadata.vue
  11. 14 14
      src/views/dataBook/dataResource/index.vue
  12. 8 8
      src/views/dataBook/dataStandard/index.vue
  13. 8 8
      src/views/dataBook/indicator/index.vue
  14. 4 4
      src/views/dataGovernance/components/Filter.vue
  15. 6 6
      src/views/dataGovernance/dataIndicator/components/dataList.vue
  16. 4 4
      src/views/dataGovernance/dataIndicator/components/edit.vue
  17. 9 9
      src/views/dataGovernance/dataIndicator/components/editBase.vue
  18. 4 4
      src/views/dataGovernance/dataIndicator/components/indicatorList.vue
  19. 7 7
      src/views/dataGovernance/dataIndicator/index.vue
  20. 4 4
      src/views/dataGovernance/dataLabel/index.vue
  21. 10 10
      src/views/dataGovernance/dataModules/components/dataList.vue
  22. 19 19
      src/views/dataGovernance/dataModules/components/edit.vue
  23. 10 10
      src/views/dataGovernance/dataModules/components/editBase.vue
  24. 5 5
      src/views/dataGovernance/dataModules/components/editMetadataAdd.vue
  25. 7 7
      src/views/dataGovernance/dataModules/index.vue
  26. 13 13
      src/views/dataGovernance/dataResource/components/Database/index.vue
  27. 7 7
      src/views/dataGovernance/dataResource/components/Structure/index.vue
  28. 3 3
      src/views/dataGovernance/dataResource/components/Unstructured/index.vue
  29. 9 9
      src/views/dataGovernance/dataResource/components/editBase.vue
  30. 7 10
      src/views/dataGovernance/dataResource/components/editSelected.vue
  31. 8 8
      src/views/dataGovernance/dataResource/index.vue
  32. 2 2
      src/views/dataGovernance/dataStandard/components/edit.vue
  33. 3 3
      src/views/dataGovernance/dataStandard/index.vue
  34. 9 9
      src/views/dataGovernance/metadata/components/edit.vue
  35. 3 3
      src/views/dataGovernance/metadata/index.vue

+ 19 - 7
src/api/dataGovernance.js

@@ -165,6 +165,10 @@ const dataLabel = {
   // 数据标签动态识别分组
   dataLabelIdentifyGroup: (param) => {
     return http.post('/interface/data/label/dynamic/identify', param)
+  },
+  // 删除数据标签
+  deleteDataLabel: (param) => {
+    return http.post('/interface/data/label/delete', param)
   }
 }
 
@@ -196,35 +200,43 @@ const dataStandard = {
 const dataIndicator = {
   // 指标列表
   dataIndicatorList: (param) => {
-    return http.post('/metric/data/metric/list', param)
+    return http.post('/metric/list', param)
   },
   // 指标列表切换图谱
   dataIndicatorListToGraph: (param) => {
-    return http.post('/metric/data/metric/list/graph', param)
+    return http.post('/metric/list/graph', param)
   },
   // 新增指标
   dataIndicatorAdd: (param) => {
-    return http.post('/metric/data/metric/add', param)
+    return http.post('/metric/add', param)
   },
   // 新增更新
   dataIndicatorUpdate: (param) => {
-    return http.post('/metric/data/metric/update', param)
+    return http.post('/metric/update', param)
   },
   // 指标详情
   dataIndicatorDetails: (param) => {
-    return http.post('/metric/data/metric/detail', param)
+    return http.post('/metric/detail', param)
   },
   // 指标血缘关系检测
   dataIndicatorRelation: (param) => {
-    return http.post('/metric/data/metric/relation', param)
+    return http.post('/metric/relation', param)
   },
   // 指标生成代码
   dataIndicatorCodeGenerate: (param) => {
-    return http.post('/metric/data/metric/code', param)
+    return http.post('/metric/code', param)
   },
   // 指标图谱
   dataIndicatorGraph: (param) => {
     return http.post('/metric/graph/all', param)
+  },
+  // 删除指标
+  deleteDataIndicator: (param) => {
+    return http.post('/metric/delete', param)
+  },
+  // 指标规则效验
+  dataIndicatorRuleValidate: (param) => {
+    return http.post('/metric/check', param)
   }
 }
 

+ 5 - 5
src/views/dataBook/dataLabel/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="pa-3 white">
-    <m-filter :filter="['name', 'en_name', 'category']" @search="handleSearch" />
+    <m-filter :filter="['name_zh', 'name_en', 'category']" @search="handleSearch" />
     <m-table
       class="mt-3"
       :loading="loading"
@@ -18,7 +18,7 @@
         {{ item.group ? '是' : '否' }}
       </template>
       <template #name_zh="{item}">
-        <div class="defaultLink" @click="handleDetails(item)">{{ item.name }}</div>
+        <div>{{ item.name_zh }}</div>
       </template>
       <template #status="{ item }">
         <v-chip
@@ -46,7 +46,7 @@ export default {
       loading: false,
       show: false,
       queryData: {
-        name: null
+        name_zh: null
       },
       headers: [
         { text: '名称', value: 'name_zh' },
@@ -105,8 +105,8 @@ export default {
       this.orders = val
       this.init()
     },
-    handleDetails ({ id, name }) {
-      this.$router.push(`${this.$route.path}/details/${id}/${name}`)
+    handleDetails (item) {
+      this.$router.push(`${this.$route.path}/details/${item.id}/${item.name_zh}`)
     }
   }
 }

+ 3 - 3
src/views/dataBook/dataMetaData/components/metaDataInfo.vue

@@ -12,10 +12,10 @@
           <!-- <li>元数据别名 : </li> -->
         </ul>
         <ul>
-          <li>{{ info.name }}</li>
-          <li>{{ info.en_name }}</li>
+          <li>{{ info.name_zh }}</li>
+          <li>{{ info.name_en }}</li>
           <li>{{ info.data_type }}</li>
-          <li>{{ info.time }}</li>
+          <li>{{ info.create_time }}</li>
           <li></li>
           <!-- <li>{{ info.system == 0 ? '系统级' : '用户级' }}</li> -->
           <!-- <li>

+ 8 - 8
src/views/dataBook/dataMetaData/index.vue

@@ -25,18 +25,18 @@
       <template #tag="{ item }">
         <m-graph-drill
           :id="item.tag?.id"
-          :title="`${item.tag?.name}血缘图谱`"
-        >{{ item.tag?.name }}</m-graph-drill>
+          :title="`${item.tag?.name_zh}血缘图谱`"
+        >{{ item.tag?.name_zh }}</m-graph-drill>
       </template>
       <template #blood_count="{ item }">
         <m-graph-drill
           :id="item.id"
-          :title="`${item.name}血缘图谱`"
+          :title="`${item.name_zh}血缘图谱`"
           :to-api="api.getMetaDataGraph"
         >{{ item.blood_count }}</m-graph-drill>
       </template>
-      <template v-slot:name = "{item}">
-        <span class="defaultLink" @click="toDetail(item)">{{ item.name }}</span>
+      <template v-slot:name_zh = "{item}">
+        <span class="defaultLink" @click="toDetail(item)">{{ item.name_zh }}</span>
       </template>
     </table-list>
   </div>
@@ -55,8 +55,8 @@ export default {
       api,
       loading: false,
       headers: [
-        { text: '中文名', value: 'name' },
-        { text: '英文名', value: 'en_name' },
+        { text: '中文名', value: 'name_zh' },
+        { text: '英文名', value: 'name_en' },
         { text: '分类', value: 'category' },
         { text: '描述', value: 'describe' },
         { text: '标签', value: 'tag' },
@@ -95,7 +95,7 @@ export default {
       this.init()
     },
     toDetail (item) {
-      this.$router.push(`${this.$route.path}/details/${item.id}/${item.name}`)
+      this.$router.push(`${this.$route.path}/details/${item.id}/${item.name_zh}`)
     },
     handleSearch (obj) {
       Object.assign(this.query, obj)

+ 5 - 5
src/views/dataBook/dataModel/dynamic/info.vue

@@ -28,22 +28,22 @@ export default {
         ? info.data_model.childrenId.map(e => {
           return {
             label: null,
-            value: [e.name]
+            value: [e?.name_zh]
           }
         })
         : []
       return [
-        { label: '中文名', value: info.data_model.name },
-        { label: '英文名', value: info.data_model.en_name },
+        { label: '中文名', value: info.data_model.name_zh },
+        { label: '英文名', value: info.data_model.name_en },
         {
           label: '数据来源',
           value,
           format: 'array'
         },
         { label: '层级', value: info.data_model.level },
-        { label: '标签', value: info.data_model.tag?.name },
+        { label: '标签', value: info.data_model.tag?.name_zh },
         { label: '描述', value: info.data_model.describe },
-        { label: '时间', value: info.data_model.time }
+        { label: '时间', value: info.data_model.create_time }
       ]
     }
   }

+ 2 - 2
src/views/dataBook/dataModel/dynamic/metadata.vue

@@ -32,8 +32,8 @@ export default {
     return {
       loading: false,
       headers: [
-        { text: '名称', value: 'name' },
-        { text: '英文名称', value: 'en_name' },
+        { text: '名称', value: 'name_zh' },
+        { text: '英文名称', value: 'name_en' },
         { text: '类型', value: 'data_type' },
         { text: '创建时间', value: 'create_time' }
       ],

+ 12 - 12
src/views/dataBook/dataModel/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="pa-3 white" :class="{content: switchShow}">
-    <m-filter switchover :filter="['name', 'en_name', 'category', 'tag', 'level']" @search="handleSearch" v-model="switchShow"/>
+    <m-filter switchover :filter="['name_zh', 'name_en', 'category', 'tag', 'level']" @search="handleSearch" v-model="switchShow"/>
     <m-table
       v-if="!switchShow"
       class="mt-3"
@@ -25,18 +25,18 @@
       <template #tag="{ item }">
         <m-graph-drill
           :id="item.tag?.id"
-          :title="`${item.tag?.name}血缘图谱`"
-        >{{ item.tag?.name }}</m-graph-drill>
+          :title="`${item.tag?.name_zh}血缘图谱`"
+        >{{ item.tag?.name_zh }}</m-graph-drill>
       </template>
       <template #blood_count="{ item }">
         <m-graph-drill
           :id="item.id"
-          :title="`${item.name}血缘图谱`"
+          :title="`${item.name_zh}血缘图谱`"
           :to-api="api.getModelGraph"
         >{{ item.blood_count }}</m-graph-drill>
       </template>
-      <template #name="{ item }">
-        <div class="defaultLink" @click="handleDetails(item)">{{ item.name }}</div>
+      <template #name_zh="{ item }">
+        <div class="defaultLink" @click="handleDetails(item)">{{ item.name_zh }}</div>
       </template>
       <template #alias="item">
         <v-chip v-for="chip in item.alias" :key="chip">{{ chip }}</v-chip>
@@ -68,18 +68,18 @@ export default {
       loading: false,
       show: false,
       queryData: {
-        name: null
+        name_zh: null
       },
       headers: [
-        { text: '中文名', value: 'name' },
-        { text: '英文名', value: 'en_name' },
+        { text: '中文名', value: 'name_zh' },
+        { text: '英文名', value: 'name_en' },
         { text: '分类', value: 'category' },
         { text: '标签', value: 'tag' },
         { text: '层级', value: 'level' },
         { text: '描述', value: 'describe' },
         { text: '状态', value: 'status' },
         { text: '血缘关系数量', value: 'blood_count', align: 'center' },
-        { text: '创建时间', value: 'time' }
+        { text: '创建时间', value: 'create_time' }
       ],
       itemData: {},
       items: [],
@@ -131,8 +131,8 @@ export default {
       this.pageInfo.current = 1
       this.init()
     },
-    handleDetails ({ id, name }) {
-      this.$router.push(`${this.$route.path}/details/${id}/${name}`)
+    handleDetails (item) {
+      this.$router.push(`${this.$route.path}/details/${item.id}/${item.name_zh}`)
     },
     pageHandleChange (page) {
       this.pageInfo.current = page

+ 1 - 1
src/views/dataBook/dataProcess/index.vue

@@ -14,7 +14,7 @@
       @sort="handleSort"
     >
       <template #name_zh="{ item }">
-        <span class="defaultLink">{{ item.name_zh }}</span>
+        <span>{{ item.name_zh }}</span>
       </template>
       <template #status="{ item }">
         <v-chip small :color="item.status === 'active' ? 'success' : 'error'">

+ 9 - 9
src/views/dataBook/dataResource/dynamic/info.vue

@@ -14,10 +14,10 @@ export default {
       if (info.type === 'unstructured') {
         // console.log(info)
         return [
-          { label: '中文名', value: info.name },
-          { label: '英文名', value: info.en_name },
+          { label: '中文名', value: info.name_zh },
+          { label: '英文名', value: info.name_en },
           { label: '数据来源', value: info.url },
-          { label: '标签', value: info.tag?.name ?? null },
+          { label: '标签', value: info.tag?.name_zh ?? null },
           // {
           //   label: '元数据',
           //   value: [
@@ -25,22 +25,22 @@ export default {
           //   ],
           //   format: 'array'
           // },
-          { label: '时间', value: info.time }
+          { label: '时间', value: info.create_time }
         ]
       }
       return [
-        { label: '中文名', value: info.name },
-        { label: '英文名', value: info.en_name },
+        { label: '中文名', value: info.name_zh },
+        { label: '英文名', value: info.name_en },
         { label: '数据来源', value: info.url ? info.url : 'ddl' },
-        { label: '标签', value: info.tag?.name ?? null },
+        { label: '标签', value: info.tag?.name_zh ?? null },
         {
           label: '元数据',
           value: [
-            { value: info.parsed_data ? info.parsed_data.map(e => e.name) : [] }
+            { value: info.parsed_data ? info.parsed_data.map(e => e?.name_zh) : [] }
           ],
           format: 'array'
         },
-        { label: '时间', value: info.time }
+        { label: '时间', value: info.create_time }
         // { label: '查询结果', value: info.data_resume }
       ]
     }

+ 2 - 2
src/views/dataBook/dataResource/dynamic/metadata.vue

@@ -32,8 +32,8 @@ export default {
     return {
       loading: false,
       headers: [
-        { text: '名称', value: 'name' },
-        { text: '英文名称', value: 'en_name' },
+        { text: '名称', value: 'name_zh' },
+        { text: '英文名称', value: 'name_en' },
         { text: '类型', value: 'data_type' },
         { text: '创建时间', value: 'create_time' }
       ],

+ 14 - 14
src/views/dataBook/dataResource/index.vue

@@ -21,24 +21,24 @@
           {{ item.status ? '已启用' : '已禁用'}}
         </v-chip>
       </template>
-      <template #tag="{ item }">
+      <template #tag_info="{ item }">
         <m-graph-drill
-          :id="item.tag?.id"
-          :title="`${item.tag?.name}血缘图谱`"
-        >{{ item.tag?.name }}</m-graph-drill>
+          :id="item.tag_info?.id"
+          :title="`${item.tag_info?.name_zh}血缘图谱`"
+        >{{ item.tag_info?.name_zh }}</m-graph-drill>
       </template>
       <template #blood_count="{ item }">
         <m-graph-drill
           :id="item.id"
-          :title="`${item.name}血缘图谱`"
+          :title="`${item.name_zh}血缘图谱`"
           :to-api="api.getResourceGraph"
         >{{ item.blood_count }}</m-graph-drill>
       </template>
       <template #type="{ item }">
         {{ item.type === 'unstructured' ? '非结构化' : '结构化' }}
       </template>
-      <template #name="{ item }">
-        <div class="defaultLink" @click="handleDetails(item)">{{ item.name }}</div>
+      <template #name_zh="{ item }">
+        <div class="defaultLink" @click="handleDetails(item)">{{ item.name_zh }}</div>
       </template>
       <template #alias="item">
         <v-chip v-for="chip in item.alias" :key="chip">{{ chip }}</v-chip>
@@ -65,19 +65,19 @@ export default {
       loading: false,
       show: false,
       queryData: {
-        name: null
+        name_zh: null
       },
       headers: [
-        { text: '中文名', value: 'name' },
-        { text: '英文名', value: 'en_name' },
+        { text: '中文名', value: 'name_zh' },
+        { text: '英文名', value: 'name_en' },
         { text: '分类', value: 'category' },
         { text: '描述', value: 'describe' },
-        { text: '标签', value: 'tag' },
+        { text: '标签', value: 'tag_info' },
         { text: '状态', value: 'status' },
         { text: '血缘关系数量', value: 'blood_count', align: 'center' },
         { text: '更新频率', value: 'frequency' },
         { text: '数据敏感度', value: 'data_sensitivity' },
-        { text: '创建时间', value: 'time' }
+        { text: '创建时间', value: 'create_time' }
       ],
       itemData: {},
       items: [],
@@ -124,8 +124,8 @@ export default {
       this.pageInfo.current = 1
       this.init()
     },
-    handleDetails ({ id, name }) {
-      this.$router.push(`${this.$route.path}/details/${id}/${name}`)
+    handleDetails (item) {
+      this.$router.push(`${this.$route.path}/details/${item.id}/${item.name_zh}`)
     },
     pageHandleChange (page) {
       this.pageInfo.current = page

+ 8 - 8
src/views/dataBook/dataStandard/index.vue

@@ -14,8 +14,8 @@
       @pageHandleChange="pageHandleChange"
       @sort="handleSort"
     >
-      <template #name="{ item }">
-        <div class="defaultLink" @click="handleDetails(item)">{{ item.name }}</div>
+      <template #name_zh="{ item }">
+        <div class="defaultLink" @click="handleDetails(item)">{{ item.name_zh }}</div>
       </template>
       <template #status="{ item }">
         <v-chip
@@ -26,7 +26,7 @@
         </v-chip>
       </template>
       <template #tag="{ item }">
-        {{ item.tag?.name }}
+        {{ item.tag?.name_zh }}
       </template>
     </m-table>
   </div>
@@ -45,16 +45,16 @@ export default {
       loading: false,
       show: false,
       queryData: {
-        name: null
+        name_zh: null
       },
       headers: [
-        { text: '名称', value: 'name' },
+        { text: '名称', value: 'name_zh' },
         { text: '分类', value: 'category' },
         { text: '适用范围', value: 'scope' },
         { text: '引用数量', value: 'number', align: 'center' },
         { text: '描述', value: 'describe' },
         { text: '状态', value: 'status' },
-        { text: '创建时间', value: 'time' }
+        { text: '创建时间', value: 'create_time' }
       ],
       itemData: {},
       items: [],
@@ -103,8 +103,8 @@ export default {
       this.orders = val
       this.init()
     },
-    handleDetails ({ id, name }) {
-      this.$router.push(`/data-book/data-standard/details/${id}/${name}`)
+    handleDetails (item) {
+      this.$router.push(`/data-book/data-standard/details/${item.id}/${item.name_zh}`)
     }
   }
 }

+ 8 - 8
src/views/dataBook/indicator/index.vue

@@ -15,8 +15,8 @@
       @pageHandleChange="pageHandleChange"
       @sort="handleSort"
     >
-    <template #name="{ item }">
-      <div class="defaultLink" @click="handleDetail(item)">{{ item.name }}</div>
+    <template #name_zh="{ item }">
+      <div class="defaultLink" @click="handleDetail(item)">{{ item.name_zh }}</div>
     </template>
     <template #status="{ item }">
       <v-chip
@@ -27,7 +27,7 @@
       </v-chip>
     </template>
     <template #tag="{ item }">
-        {{ item.tag?.name }}
+        {{ item.tag?.name_zh }}
       </template>
     </m-table>
     <div v-else style="flex: 1" class="mt-3">
@@ -52,10 +52,10 @@ export default {
       loading: false,
       show: false,
       queryData: {
-        name: null
+        name_zh: null
       },
       headers: [
-        { text: '名称', value: 'name' },
+        { text: '名称', value: 'name_zh' },
         { text: '分类', value: 'category' },
         { text: '所属机构', value: 'organization' },
         { text: '负责人', value: 'leader' },
@@ -66,7 +66,7 @@ export default {
         { text: '数据模型', value: 'data_model' },
         { text: '指标计算规则', value: 'metricRulesText' },
         { text: '状态', value: 'status' },
-        { text: '创建时间', value: 'time' }
+        { text: '创建时间', value: 'create_time' }
       ],
       itemData: {},
       items: [],
@@ -123,8 +123,8 @@ export default {
       this.orders = val
       this.init()
     },
-    handleDetail ({ id, name }) {
-      this.$router.push(`/data-book/data-indicator/details/${id}/${name}`)
+    handleDetail (item) {
+      this.$router.push(`/data-book/data-indicator/details/${item.id}/${item.name_zh}`)
     }
   }
 }

+ 4 - 4
src/views/dataGovernance/components/Filter.vue

@@ -33,8 +33,8 @@ import {
 
 import { api } from '@/api/dataGovernance'
 const options = [
-  { type: 'textField', value: null, label: '名称', key: 'name' },
-  { type: 'textField', value: null, label: '英文名称', key: 'en_name' },
+  { type: 'textField', value: null, label: '名称', key: 'name_zh' },
+  { type: 'textField', value: null, label: '英文名称', key: 'name_en' },
   {
     type: 'autocomplete',
     value: null,
@@ -66,7 +66,7 @@ export default {
     },
     filter: {
       type: Array,
-      default: () => ['name', 'en_name', 'category', 'tag']
+      default: () => ['name_zh', 'name_en', 'category', 'tag']
     },
     value: {
       type: Boolean,
@@ -102,7 +102,7 @@ export default {
       try {
         const { data } = await api.dataLabelList({
           ...this.tag.pageInfo,
-          name: this.tag.name
+          name_zh: this.tag.name
         })
         // this.option.list.find(e => e.key === 'tag').items = data.records
         options.find(e => e.key === 'tag').items = data.records

+ 6 - 6
src/views/dataGovernance/dataIndicator/components/dataList.vue

@@ -2,7 +2,7 @@
   <div class="pt-3 d-flex flex-column" style="height: 100%">
     <div class="px-3">
       <v-text-field
-        v-model="queryData.name"
+        v-model="queryData.name_zh"
         label="数据资源名称查找"
         placeholder="请输入数据资源名称"
         dense
@@ -25,7 +25,7 @@
           @click="handleOpen(index, item)"
         >
           <v-expansion-panel-header>
-            {{ item.name }}
+            {{ item.name_zh }}
           </v-expansion-panel-header>
 
           <v-expansion-panel-content>
@@ -38,7 +38,7 @@
                 <v-list-item-content>
                   <v-list-item-title>
                     <div class="d-flex justify-space-between align-center">
-                      <div class="text-truncate flex-shrink-1">{{ node.name }}</div>
+                      <div class="text-truncate flex-shrink-1">{{ node.name_zh }}</div>
                       <v-btn
                         text
                         color="primary"
@@ -73,7 +73,7 @@ export default {
       choose: null,
       loading: false,
       queryData: {
-        name: null
+        name_zh: null
       },
       items: [],
       orders: [],
@@ -119,7 +119,7 @@ export default {
         this.items.push(...data.records.map(e => {
           return {
             loading: false,
-            name: e.name,
+            name_zh: e.name_zh,
             id: e.id,
             metaNode: []
           }
@@ -142,7 +142,7 @@ export default {
     handleClear () {
       this.items = []
       this.pageInfo.current = 1
-      this.queryData.name = null
+      this.queryData.name_zh = null
       this.init()
     },
     handleChange (index) {

+ 4 - 4
src/views/dataGovernance/dataIndicator/components/edit.vue

@@ -193,7 +193,7 @@ export default {
         { label: 'data-belong', value: belong.id },
         { label: 'contenteditable', value: 'false' }
       ]
-      this.insertCode(`${node.name}(${belong.name})`, attribute)
+      this.insertCode(`${node.name_zh}(${belong.name_zh})`, attribute)
       this.updateContent()
     },
     handleChangeIndicator (item) {
@@ -201,7 +201,7 @@ export default {
         { label: 'data-id', value: item.id },
         { label: 'contenteditable', value: 'false' }
       ]
-      this.insertCode(`${item.name}(指标)`, attribute)
+      this.insertCode(`${item.name_zh}(指标)`, attribute)
       this.updateContent()
     },
     htmlStringToNode (htmlString) {
@@ -297,10 +297,10 @@ export default {
         if (this.itemData.id) {
           Object.assign(query, {
             id: this.itemData.id,
-            en_name: this.itemData.en_name
+            name_en: this.itemData.name_en
           })
           // console.log(query, this.itemData)
-          return
+          // return
         }
         const subApi = this.itemData.id ? api.dataIndicatorUpdate : api.dataIndicatorAdd
         await subApi(query)

+ 9 - 9
src/views/dataGovernance/dataIndicator/components/editBase.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <m-form ref="form" :items="formItems" v-model="formValues">
-      <template #en_name>
+      <template #name_en>
         <v-btn color="primary" class="ml-3" :loading="translateLoading" @click="getTranslate">翻译</v-btn>
       </template>
       <template #childrenId="{ item }">
@@ -35,8 +35,8 @@ export default {
   data () {
     return {
       formValues: {
-        name: '指标_' + new Date().getTime(),
-        en_name: null,
+        name_zh: '指标_' + new Date().getTime(),
+        name_en: null,
         category: '应用类',
         organization: this.$store.getters.userInfo.username,
         leader: this.$store.getters.userInfo.username,
@@ -60,8 +60,8 @@ export default {
   computed: {
     formItems () {
       return [
-        { type: 'text', key: 'name', label: '请输入名称 *', rules: [v => !!v || '请输入名称'] },
-        { type: 'text', key: 'en_name', label: '请输入英文名称 *', rules: [v => !!v || '请输入英文名称'], slotName: 'en_name' },
+        { type: 'text', key: 'name_zh', label: '请输入名称 *', rules: [v => !!v || '请输入名称'] },
+        { type: 'text', key: 'name_en', label: '请输入英文名称 *', rules: [v => !!v || '请输入英文名称'], slotName: 'name_en' },
         { type: 'autocomplete', key: 'category', label: '请选择分类 *', rules: [v => !!v || '请选择分类'], items: [...metadata] },
         { type: 'text', key: 'organization', label: '请输入所属机构 *', rules: [v => !!v || '请输入所属机构'] },
         { type: 'text', key: 'leader', label: '请输入负责人 *', rules: [v => !!v || '请输入负责人'] },
@@ -104,7 +104,7 @@ export default {
         this.formValues[key] = this.itemData.childrenId.map(e => {
           return {
             value: e.id,
-            text: e.name
+            text: e.name_zh
           }
         })
         return
@@ -136,16 +136,16 @@ export default {
       }
     },
     async getTranslate () {
-      if (!this.formValues.name) {
+      if (!this.formValues.name_zh) {
         this.$snackbar.error('请输入名称')
         return
       }
       this.translateLoading = true
       try {
         const { data } = await getTranslate({
-          node_name: this.formValues.name
+          node_name: this.formValues.name_zh
         })
-        this.formValues.en_name = data.translated
+        this.formValues.name_en = data.translated
       } catch (error) {
         this.$snackbar.error(error)
       } finally {

+ 4 - 4
src/views/dataGovernance/dataIndicator/components/indicatorList.vue

@@ -2,7 +2,7 @@
   <div class="pt-3 d-flex flex-column" style="height: 100%">
     <div class="px-3">
       <v-text-field
-        v-model="queryData.name"
+        v-model="queryData.name_zh"
         label="数据指标名称查找"
         placeholder="请输入数据指标名称"
         dense
@@ -24,7 +24,7 @@
           :key="item.id"
         >
           <v-list-item-content>
-            <v-list-item-title>{{ item.name }}</v-list-item-title>
+            <v-list-item-title>{{ item.name_zh }}</v-list-item-title>
           </v-list-item-content>
 
           <v-list-item-icon>
@@ -55,7 +55,7 @@ export default {
       choose: null,
       loading: false,
       queryData: {
-        name: null
+        name_zh: null
       },
       items: [],
       orders: [],
@@ -107,7 +107,7 @@ export default {
     handleClear () {
       this.items = []
       this.pageInfo.current = 1
-      this.queryData.name = null
+      this.queryData.name_zh = null
       this.init()
     },
     handlePage () {

+ 7 - 7
src/views/dataGovernance/dataIndicator/index.vue

@@ -32,7 +32,7 @@
         </v-btn>
       </template>
       <template #tag="{ item }">
-        {{ item.tag?.name }}
+        {{ item.tag?.name_zh }}
       </template>
     </m-table>
     <m-dialog
@@ -68,11 +68,11 @@ export default {
       loading: false,
       show: false,
       queryData: {
-        name: null
+        name_zh: null
       },
       headers: [
-        { text: '名称', value: 'name' },
-        { text: '英文名称', value: 'en_name' },
+        { text: '名称', value: 'name_zh' },
+        { text: '英文名称', value: 'name_en' },
         { text: '分类', value: 'category' },
         { text: '所属机构', value: 'organization' },
         { text: '负责人', value: 'leader' },
@@ -83,7 +83,7 @@ export default {
         { text: '数据模型', value: 'data_model' },
         { text: '指标计算规则', value: 'metricRulesText' },
         { text: '状态', value: 'status' },
-        { text: '创建时间', value: 'time' },
+        { text: '创建时间', value: 'create_time' },
         { text: '操作', value: 'actions' }
       ],
       itemData: {},
@@ -140,7 +140,7 @@ export default {
       // this.show = true
       try {
         const { data } = await api.dataIndicatorDetails({ id: item.id })
-        this.itemData = data.data_metric
+        this.itemData = { ...data.data_metric, id: item.id }
         this.show = true
       } catch (error) {
         this.$snackbar.error(error)
@@ -151,7 +151,7 @@ export default {
       this.$confirm('提示', '是否删除该选项')
         .then(async () => {
           try {
-            await api.graphDataDelete({ id: ids })
+            await api.deleteDataIndicator({ id: ids })
             this.$snackbar.success('删除成功')
             this.init()
           } catch (error) {

+ 4 - 4
src/views/dataGovernance/dataLabel/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="pa-3 white">
-    <m-filter :filter="['name', 'en_name', 'category']" @search="handleSearch" />
+    <m-filter :filter="['name_zh', 'name_en', 'category']" @search="handleSearch" />
     <m-table
       class="mt-3"
       :loading="loading"
@@ -79,7 +79,7 @@ export default {
       loading: false,
       show: false,
       queryData: {
-        name: null
+        name_zh: null
       },
       headers: [
         { text: '名称', value: 'name_zh' },
@@ -89,7 +89,7 @@ export default {
         { text: '标注数量', value: 'number' },
         { text: '是否业务域', value: 'group', align: 'center' },
         { text: '状态', value: 'status' },
-        { text: '创建时间', value: 'time' },
+        { text: '创建时间', value: 'create_time' },
         { text: '操作', value: 'actions' }
       ],
       itemData: {},
@@ -153,7 +153,7 @@ export default {
       this.$confirm('提示', '是否删除该选项')
         .then(async () => {
           try {
-            await api.graphDataDelete({ id: ids })
+            await api.deleteDataLabel({ id: ids })
             this.$snackbar.success('删除成功')
             this.init()
           } catch (error) {

+ 10 - 10
src/views/dataGovernance/dataModules/components/dataList.vue

@@ -2,7 +2,7 @@
   <div class="pt-3 d-flex flex-column" style="height: 100%">
     <div class="px-3">
       <v-text-field
-        v-model="queryData.name"
+        v-model="queryData.name_zh"
         label="数据资源名称查找"
         placeholder="请输入数据资源名称"
         dense
@@ -28,7 +28,7 @@
             <div class="d-flex justify-space-between align-center">
               <div>
                 <!-- <v-chip v-if="!item.relation">无血缘关系</v-chip> -->
-                {{ item.name }}
+                {{ item.name_zh }}
                 <v-chip
                   v-if="item.count"
                   class="ml-2"
@@ -70,7 +70,7 @@
                 <v-list-item-content>
                   <v-list-item-title>
                     <div class="d-flex justify-space-between align-center">
-                      <div class="text-truncate flex-shrink-1">{{ node.name }}</div>
+                      <div class="text-truncate flex-shrink-1">{{ node.name_zh }}</div>
                       <v-btn
                         v-if="node.used"
                         disabled
@@ -126,7 +126,7 @@ export default {
       loading: false,
       show: false,
       queryData: {
-        name: null
+        name_zh: null
       },
       items: [],
       orders: [],
@@ -173,7 +173,7 @@ export default {
         this.items.push(...data.records.map(e => {
           return {
             loading: false,
-            name: e.name,
+            name_zh: e.name_zh,
             id: e.id,
             type: e.type,
             metaNode: []
@@ -220,7 +220,7 @@ export default {
     handleClear () {
       this.pageInfo.current = 1
       this.items = []
-      this.queryData.name = null
+      this.queryData.name_zh = null
       this.init()
     },
     async getMetadata (item) {
@@ -241,10 +241,10 @@ export default {
                 ..._v,
                 master_data: {
                   id: data.data_model.id,
-                  name: data.data_model.name
+                  name_zh: data.data_model.name_zh
                 },
                 originId: data.data_model.id,
-                originName: data.data_model.name
+                originName: data.data_model.name_zh
               }
             }))
             res = res.reverse() // 反转数组
@@ -261,10 +261,10 @@ export default {
             used,
             master_data: {
               id: data.id,
-              name: data.name
+              name_zh: data.name_zh
             },
             originId: data.id,
-            originName: data.name
+            originName: data.name_zh
           }
         })
         item.metaNode = res.reverse() // 反转数组

+ 19 - 19
src/views/dataGovernance/dataModules/components/edit.vue

@@ -77,40 +77,40 @@
                       v-for="(item, index) in selected"
                       :key="`${item.id}-${item.originId}`"
                     >
-                      <td>{{ item.name }}</td>
+                      <td>{{ item.name_zh }}</td>
                       <td>{{ item.data_type }}</td>
                       <td v-if="!itemData.id">
-                        {{ item.master_data?.name || '--' }}
+                        {{ item.master_data?.name_zh || '--' }}
                       </td>
                       <td v-else>
                         <m-editTable
-                          :text="item.master_data?.name || '--'"
+                          :text="item.master_data?.name_zh || '--'"
                           :init="originInit"
-                          item-label="title"
+                          item-label="name_zh"
                           item-value="id"
                           @use="$el => originSave($el, item)"
                         >
                           <template #title>
-                            [{{ item.master_data?.name }}] 主数据选择
+                            [{{ item.name_zh }}] 主数据选择
                           </template>
                         </m-editTable>
-                        <v-btn color="error" icon v-if="item.master_data?.name" @click="originClose(item)">
+                        <v-btn color="error" icon v-if="item.master_data?.name_zh" @click="originClose(item)">
                           <v-icon>mdi-close</v-icon>
                         </v-btn>
                       </td>
                       <td>
                         <m-editTable
-                          :text="item.data_standard?.name || '--'"
+                          :text="item.data_standard?.name_zh || '--'"
                           :init="standardInit"
-                          item-label="name"
+                          item-label="name_zh"
                           item-value="id"
                           @use="$el => standardSave($el, item)"
                         >
                           <template #title>
-                            [{{ item.name }}] 数据标准选择
+                            [{{ item.name_zh }}] 数据标准选择
                           </template>
                         </m-editTable>
-                        <v-btn color="error" icon v-if="item.data_standard?.name" @click="standardClose(item)">
+                        <v-btn color="error" icon v-if="item.data_standard?.name_zh" @click="standardClose(item)">
                           <v-icon>mdi-close</v-icon>
                         </v-btn>
                       </td>
@@ -306,16 +306,16 @@ export default {
       this.selected.push({
         data_standard: {
           id: null,
-          name: null
+          name_zh: null
         },
         data_type: item.data_type,
-        en_name: item.en_name,
+        name_en: item.name_en,
         id: item.id,
         master_data: {
-          name: null,
+          name_zh: null,
           id: null
         },
-        name: item.name,
+        name_zh: item.name_zh,
         originId: null,
         originName: null
       })
@@ -343,20 +343,20 @@ export default {
     },
     originSave (use, item) {
       item.master_data = {
-        name: use.title,
+        name_zh: use.title,
         id: use.id
       }
     },
     originClose (item) {
       item.master_data = {
-        name: null,
+        name_zh: null,
         id: null
       }
     },
     standardSave (use, item) {
       item.data_standard = {
         id: use.id,
-        name: use.name
+        name_zh: use.name
       }
     },
     standardInit (query) {
@@ -419,8 +419,8 @@ export default {
           r.push({
             master_data: v.master_data?.id ?? null,
             data_standard: v.data_standard?.id ?? null,
-            name: v.name,
-            en_name: v.en_name,
+            name_zh: v.name_zh,
+            name_en: v.name_en,
             data_type: v.data_type,
             id: v.id
           })

+ 10 - 10
src/views/dataGovernance/dataModules/components/editBase.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <m-form ref="form" :items="formItems" v-model="formValues">
-      <template #en_name>
+      <template #name_en>
         <v-btn color="primary" class="ml-3" :loading="translateLoading" @click="getTranslate">翻译</v-btn>
       </template>
       <template #childrenId="{ item }">
@@ -39,8 +39,8 @@ export default {
   data () {
     return {
       formValues: {
-        name: '数据模型_' + new Date().getTime(),
-        en_name: null,
+        name_zh: '数据模型_' + new Date().getTime(),
+        name_en: null,
         category: '应用类',
         organization: this.$store.getters.userInfo.username,
         leader: this.$store.getters.userInfo.username,
@@ -64,13 +64,13 @@ export default {
   computed: {
     formItems () {
       return [
-        { type: 'text', key: 'name', label: '请输入名称 *', rules: [v => !!v || '请输入名称'] },
+        { type: 'text', key: 'name_zh', label: '请输入名称 *', rules: [v => !!v || '请输入名称'] },
         {
           type: 'text',
-          key: 'en_name',
+          key: 'name_en',
           label: '请输入英文名称 *',
           rules: [v => !!v || '请输入英文名称'],
-          slotName: 'en_name'
+          slotName: 'name_en'
         },
         { type: 'autocomplete', key: 'category', label: '请选择分类 *', rules: [v => !!v || '请选择分类'], items: [...metadata] },
         { type: 'text', key: 'organization', label: '请输入所属机构 *', rules: [v => !!v || '请输入所属机构'] },
@@ -111,7 +111,7 @@ export default {
       this.formValues.childrenId = val.childrenId.map(e => {
         return {
           value: e.id,
-          text: e.name
+          text: e.name_zh
         }
       })
     }
@@ -143,16 +143,16 @@ export default {
       }
     },
     async getTranslate () {
-      if (!this.formValues.name) {
+      if (!this.formValues.name_zh) {
         this.$snackbar.error('请输入名称')
         return
       }
       this.translateLoading = TextTrackCue
       try {
         const { data } = await getTranslate({
-          node_name: this.formValues.name
+          node_name: this.formValues.name_zh
         })
-        this.formValues.en_name = data.translated
+        this.formValues.name_en = data.translated
       } catch (error) {
         this.$snackbar.error(error)
       } finally {

+ 5 - 5
src/views/dataGovernance/dataModules/components/editMetadataAdd.vue

@@ -32,10 +32,10 @@
       <div class="mt-3" style="max-height: 60vh; min-height: 200px; overflow: auto;">
         <v-list dense>
           <template v-for="(val, index) in items">
-            <v-list-item :key="val.name">
+            <v-list-item :key="val.name_zh">
               <template v-slot:default>
                 <v-list-item-content>
-                  <v-list-item-title>{{val.name}} [{{ val.data_type }}]</v-list-item-title>
+                  <v-list-item-title>{{val.name_zh}} [{{ val.data_type }}]</v-list-item-title>
                 </v-list-item-content>
                 <v-list-item-action>
                   <v-btn text color="primary" small @click="onUse(val)">点击使用</v-btn>
@@ -110,7 +110,7 @@ export default {
     async init () {
       this.loading = true
       try {
-        const { data } = await api.getMetaDataList({ ...this.pageInfo, name: this.searchKey })
+        const { data } = await api.getMetaDataList({ ...this.pageInfo, name_zh: this.searchKey })
         this.total = data.total
         this.items.push(...data.records)
       } catch (error) {
@@ -152,9 +152,9 @@ export default {
         this.show = false
         this.$emit('use', {
           data_type: data.data_type,
-          en_name: data.en_name?.[0] ?? null,
+          name_en: data.name_en?.[0] ?? null,
           id: data.id,
-          name: data.name
+          name_zh: data.name_zh
         })
       } catch (error) {
         this.$snackbar.error(error)

+ 7 - 7
src/views/dataGovernance/dataModules/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="pa-3" style="background-color: #FFF;">
-    <filter-list :filter="['name', 'en_name', 'category', 'tag', 'level']" @search="handleSearch" />
+    <filter-list :filter="['name_zh', 'name_en', 'category', 'tag', 'level']" @search="handleSearch" />
     <table-list
       class="mt-3"
       :loading="loading"
@@ -26,7 +26,7 @@
         </v-chip>
       </template>
       <template #tag="{ item }">
-        {{ item.tag?.name }}
+        {{ item.tag?.name_zh }}
       </template>
       <template #navBtn>
         <v-btn class="elevation-5 mr-2 buttons" rounded color="primary" @click="handleAdd('ddl')">
@@ -86,15 +86,15 @@ export default {
       show: false,
       loading: false,
       headers: [
-        { text: '中文名', value: 'name' },
-        { text: '英文名', value: 'en_name' },
+        { text: '中文名', value: 'name_zh' },
+        { text: '英文名', value: 'name_en' },
         { text: '分类', value: 'category' },
         { text: '标签', value: 'tag' },
         { text: '层级', value: 'level' },
         { text: '描述', value: 'describe' },
         { text: '状态', value: 'status' },
         { text: '血缘关系数量', value: 'blood_count', align: 'center' },
-        { text: '创建时间', value: 'time' },
+        { text: '创建时间', value: 'create_time' },
         { text: '操作', value: 'actions' }
       ],
       items: [],
@@ -105,14 +105,14 @@ export default {
       },
       orders: [],
       query: {
-        name: null
+        name_zh: null
       }
     }
   },
   computed: {
     title () {
       return Object.keys(this.itemData).length
-        ? '编辑数据模型 - ' + this.itemData.data_model.name
+        ? '编辑数据模型 - ' + this.itemData.data_model.name_zh
         : '新增数据模型'
     }
   },

+ 13 - 13
src/views/dataGovernance/dataResource/components/Database/index.vue

@@ -75,9 +75,9 @@
                     </tr>
                   </thead>
                   <tbody>
-                    <tr v-for="val in item.meta" :key="key + val.map.name">
-                      <td>{{ val.map.name }}</td>
-                      <td>{{ val.map.en_name }}</td>
+                    <tr v-for="val in item.meta" :key="key + val.map.name_zh">
+                      <td>{{ val.map.name_zh }}</td>
+                      <td>{{ val.map.name_en }}</td>
                       <td>{{ val.map.data_type }}</td>
                     </tr>
                   </tbody>
@@ -174,13 +174,13 @@ export default {
     this.selectModel = this.itemData.parsed_data.map(e => {
       return {
         map: e,
-        text: e.name
+        text: e.name_zh
       }
     })
-    this.select = this.itemData.en_name
+    this.select = this.itemData.name_en
     this.names = {
-      name: this.itemData.name,
-      en_name: this.itemData.en_name
+      name_zh: this.itemData.name_zh,
+      name_en: this.itemData.name_en
     }
   },
   methods: {
@@ -196,7 +196,7 @@ export default {
             ...obj,
             meta: meta.map(e => {
               return {
-                text: e.name,
+                text: e.name_zh,
                 map: {
                   ...e,
                   data_standard: null
@@ -217,8 +217,8 @@ export default {
       this.select = key
       this.selectModel = item.meta
       this.names = {
-        name: key,
-        en_name: key
+        name_zh: key,
+        name_en: key
       }
     },
     handleSearch () {
@@ -260,7 +260,7 @@ export default {
                 ...obj
               }
             }),
-            en_name: this.select
+            name_en: this.select
           })
         } else {
           Object.assign(params, {
@@ -273,8 +273,8 @@ export default {
                 }
               }),
               data_resource: {
-                en_name: this.select,
-                name: obj.name
+                name_en: this.select,
+                name_zh: obj.name_zh
               }
             },
             url: '' // 文件上传路径

+ 7 - 7
src/views/dataGovernance/dataResource/components/Structure/index.vue

@@ -199,8 +199,8 @@ export default {
     ...mapGetters(['userInfo']),
     names () {
       return {
-        en_name: this.result.data_resource?.en_name,
-        name: this.result.data_resource?.name
+        name_en: this.result.data_resource?.name_en,
+        name_zh: this.result.data_resource?.name_zh
       }
     }
   },
@@ -211,14 +211,14 @@ export default {
     this.renderSheet = false
     this.headMap = this.itemData.parsed_data.map(e => {
       return {
-        text: e.name,
+        text: e.name_zh,
         map: e
       }
     }).reverse()
     this.result = {
       data_resource: {
-        name: this.itemData.name,
-        en_name: this.itemData.en_name
+        name_zh: this.itemData.name_zh,
+        name_en: this.itemData.name_en
       }
     }
     // 获取文件流
@@ -268,7 +268,7 @@ export default {
         this.result = data
         this.headMap.map(e => {
           e.map = {
-            ...data.head_data.find(_e => _e.name === e.text),
+            ...data.head_data.find(_e => _e.name_zh === e.text),
             master_data: null,
             data_standard: null
           }
@@ -317,7 +317,7 @@ export default {
                 ..._obj
               }
             }),
-            en_name: this.result.data_resource.en_name,
+            name_en: this.result.data_resource.name_en,
             url: data.url // 文件上传路径
           })
         } else {

+ 3 - 3
src/views/dataGovernance/dataResource/components/Unstructured/index.vue

@@ -121,7 +121,7 @@ export default {
         options: [
           {
             type: 'text',
-            key: 'name',
+            key: 'name_zh',
             value: null,
             col: 4,
             label: '请输入元数据名称 *',
@@ -131,7 +131,7 @@ export default {
           },
           {
             type: 'text',
-            key: 'en_name',
+            key: 'name_en',
             value: null,
             col: 4,
             label: '请输入元数据英文名称 *',
@@ -193,7 +193,7 @@ export default {
     handleSave (val, item) {
       const _item = this.headMap.find(e => e.map.name === item?.map?.name)
       const { id, name } = val
-      Object.assign(_item.map.data_standard, { id, name })
+      Object.assign(_item.map.data_standard, { id, name_zh: name })
     },
     async handleChangeFile (multipartFile) {
       const type = multipartFile.name.split('.').pop()

+ 9 - 9
src/views/dataGovernance/dataResource/components/editBase.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <m-form ref="form" :items="formItems" v-model="formValues">
-      <template #en_name>
+      <template #name_en>
         <v-btn color="primary" class="ml-3" :loading="translateLoading" @click="getTranslate">翻译</v-btn>
       </template>
     </m-form>
@@ -36,8 +36,8 @@ export default {
   data () {
     return {
       formValues: {
-        name: '数据资源_' + new Date().getTime(),
-        en_name: null,
+        name_zh: '数据资源_' + new Date().getTime(),
+        name_en: null,
         category: '应用类',
         organization: this.$store.getters.userInfo.username,
         leader: this.$store.getters.userInfo.username,
@@ -65,16 +65,16 @@ export default {
       return [
         {
           type: 'text',
-          key: 'name',
+          key: 'name_zh',
           label: '请输入名称 *',
           rules: [v => !!v || '请输入名称']
         },
         {
           type: 'text',
-          key: 'en_name',
+          key: 'name_en',
           label: '请输入英文名称 *',
           rules: [v => !!v || '请输入名称'],
-          slotName: 'en_name'
+          slotName: 'name_en'
         },
         {
           type: 'autocomplete',
@@ -198,16 +198,16 @@ export default {
       }
     },
     async getTranslate () {
-      if (!this.formValues.name) {
+      if (!this.formValues.name_zh) {
         this.$snackbar.error('请输入名称')
         return
       }
       this.translateLoading = true
       try {
         const { data } = await getTranslate({
-          node_name: this.formValues.name
+          node_name: this.formValues.name_zh
         })
-        this.formValues.en_name = data.translated
+        this.formValues.name_en = data.translated
       } catch (error) {
         this.$snackbar.error(error)
       } finally {

+ 7 - 10
src/views/dataGovernance/dataResource/components/editSelected.vue

@@ -26,12 +26,9 @@
                 </v-btn>
               </td>
               <td>{{ item.text }}</td>
-              <!-- <td>{{ item?.map?.name || '--' }}</td>
-              <td>{{ item.map?.en_name || '--'}}</td>
-              <td>{{ item.map?.data_type || '--' }}</td> -->
               <td>
                 <v-text-field
-                  v-model.trim="item.map.name"
+                  v-model.trim="item.map.name_zh"
                   label="元数据"
                   placeholder="请输入元数据"
                   dense
@@ -42,7 +39,7 @@
               </td>
               <td>
                 <v-text-field
-                  v-model.trim="item.map.en_name"
+                  v-model.trim="item.map.name_en"
                   label="元数据英文名"
                   placeholder="请输入元数据英文名"
                   dense
@@ -64,14 +61,14 @@
               </td>
               <td class="text-right">
                 <m-editTable
-                  :text="item?.map?.data_standard?.name || '--'"
+                  :text="item?.map?.data_standard?.name_zh || '--'"
                   :init="standardInit"
-                  item-label="name"
+                  item-label="name_zh"
                   item-value="id"
                   @use="$el => save($el, item)"
                 >
                   <template #title>
-                    [{{ item?.map?.name }}] 数据标准选择
+                    [{{ item?.map?.name_zh }}] 数据标准选择
                   </template>
                 </m-editTable>
                 <v-btn color="error" icon v-if="item.map?.data_standard?.id" @click="standardClose(item)">
@@ -146,8 +143,8 @@ export default {
         })
       })
     },
-    save ({ id, name }, item) {
-      item.map.data_standard = { id, name }
+    save (data, item) {
+      item.map.data_standard = { id: data?.id, name_zh: data?.name_zh }
     },
     standardClose (item) {
       item.map.data_standard = null

+ 8 - 8
src/views/dataGovernance/dataResource/index.vue

@@ -39,8 +39,8 @@
           {{ item.text }}
         </v-btn>
       </template>
-      <template #tag="{item}">
-        {{ item.tag?.name }}
+      <template #tag_info="{item}">
+        {{ item.tag_info?.name_zh }}
       </template>
     </m-table>
     <m-dialog
@@ -96,19 +96,19 @@ export default {
       ],
       show: false,
       queryData: {
-        name: null
+        name_zh: null
       },
       headers: [
-        { text: '中文名', value: 'name' },
-        { text: '英文名', value: 'en_name' },
+        { text: '中文名', value: 'name_zh' },
+        { text: '英文名', value: 'name_en' },
         { text: '分类', value: 'category' },
         { text: '描述', value: 'describe' },
-        { text: '标签', value: 'tag' },
+        { text: '标签', value: 'tag_info' },
         { text: '状态', value: 'status' },
         { text: '血缘关系数量', value: 'blood_count', align: 'center' },
         { text: '更新频率', value: 'frequency' },
         { text: '数据敏感度', value: 'data_sensitivity' },
-        { text: '创建时间', value: 'time' },
+        { text: '创建时间', value: 'create_time' },
         { text: '操作', value: 'actions' }
       ],
       itemData: {},
@@ -130,7 +130,7 @@ export default {
         database: 'DDL数据资源'
       }
       return Object.keys(this.itemData).length
-        ? `编辑${list[this.path]} - ` + this.itemData.name
+        ? `编辑${list[this.path]} - ` + this.itemData.name_zh
         : `新增${list[this.path]}`
     }
   },

+ 2 - 2
src/views/dataGovernance/dataStandard/components/edit.vue

@@ -50,7 +50,7 @@ export default {
         options: [
           {
             type: 'text',
-            key: 'name',
+            key: 'name_zh',
             value: null,
             label: '名称 *',
             placeholder: '请输入名称',
@@ -212,7 +212,7 @@ export default {
         if (item.key === 'tag' && item.value) {
           res.tag = {
             id: item.value,
-            name: item.items.find(e => e.id === item.value)?.name ?? null
+            name_zh: item.items.find(e => e.id === item.value)?.name_zh ?? null
           }
           return res
         }

+ 3 - 3
src/views/dataGovernance/dataStandard/index.vue

@@ -59,16 +59,16 @@ export default {
       overlay: false,
       show: false,
       queryData: {
-        name: null
+        name_zh: null
       },
       headers: [
-        { text: '名称', value: 'name' },
+        { text: '名称', value: 'name_zh' },
         { text: '分类', value: 'category' },
         { text: '适用范围', value: 'scope' },
         { text: '引用数量', value: 'number', align: 'center' },
         { text: '描述', value: 'describe' },
         { text: '状态', value: 'status' },
-        { text: '创建时间', value: 'time' },
+        { text: '创建时间', value: 'create_time' },
         { text: '操作', value: 'actions' }
       ],
       itemData: {},

+ 9 - 9
src/views/dataGovernance/metadata/components/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <m-form ref="form" class="mt-5" :items="formItems" v-model="formValues">
-    <template #en_name>
+    <template #name_en>
       <v-btn color="primary" class="ml-3" @click="getTranslate" :loading="translateLoading">翻译</v-btn>
     </template>
   </m-form>
@@ -28,8 +28,8 @@ export default {
     return {
       translateLoading: false,
       formValues: {
-        name: null,
-        en_name: null,
+        name_zh: null,
+        name_en: null,
         category: null,
         alias: null,
         affiliation: null,
@@ -52,16 +52,16 @@ export default {
       return [
         {
           type: 'text',
-          key: 'name',
+          key: 'name_zh',
           label: '请输入中文名称 *',
           rules: [v => !!v || '请输入中文名称']
         },
         {
           type: 'text',
-          key: 'en_name',
+          key: 'name_en',
           label: '请输入英文名称 *',
           rules: [v => !!v || '请输入英文名称'],
-          slotName: 'en_name'
+          slotName: 'name_en'
         },
         {
           type: 'autocomplete',
@@ -151,16 +151,16 @@ export default {
       }
     },
     async getTranslate () {
-      if (!this.formValues.name) {
+      if (!this.formValues.name_zh) {
         this.$snackbar.error('请输入名称')
         return
       }
       this.translateLoading = true
       try {
         const { data } = await getTranslate({
-          node_name: this.formValues.name
+          node_name: this.formValues.name_zh
         })
-        this.formValues.en_name = data.translated
+        this.formValues.name_en = data.translated
       } catch (error) {
         this.$snackbar.error(error)
       } finally {

+ 3 - 3
src/views/dataGovernance/metadata/index.vue

@@ -23,7 +23,7 @@
         </v-chip>
       </template>
       <template #tag="{ item }">
-        {{ item.tag?.name }}
+        {{ item.tag?.name_zh }}
       </template>
       <template v-slot:navBtn>
         <v-btn class="elevation-5 buttons mr-3" color="primary" rounded @click="handleAdd">
@@ -75,8 +75,8 @@ export default {
       show: false,
       loading: false,
       headers: [
-        { text: '中文名', value: 'name' },
-        { text: '英文名', value: 'en_name' },
+        { text: '中文名', value: 'name_zh' },
+        { text: '英文名', value: 'name_en' },
         { text: '分类', value: 'category' },
         { text: '描述', value: 'describe' },
         { text: '标签', value: 'tag' },