update: 分类分级

xukangle
Showing 3 changed files with 19 additions and 14 deletions
src/api/modules/dataInventory.ts
src/views/data_inventory/classifyGradeCatalogue.vue
src/views/data_inventory/dataLabel.vue
--- a/src/api/modules/dataInventory.ts
View file @dcdb450
+++ b/src/api/modules/dataInventory.ts
View file @dcdb450
@@ -755,8 +755,8 @@ export const exportCgDir = () => request({
 * @param {no params}
 * @path /db-dir/table/export
 */
-export const exportDbDirTable = () => request({
+export const exportDbDirTable = (params) => request({
-  url: `${import.meta.env.VITE_APP_CHECK_BASEURL}/db-dir/table/export`,
+  url: `${import.meta.env.VITE_APP_CHECK_BASEURL}/db-dir/table/export?execGuid=${params.execGuid}`,
  method: 'post',
 })
--- a/src/views/data_inventory/classifyGradeCatalogue.vue
View file @dcdb450
+++ b/src/views/data_inventory/classifyGradeCatalogue.vue
View file @dcdb450
@@ -331,7 +331,7 @@ const tableCheckboxSelectChange = (select, row) => {
  let rulesGuid: any = [];
  select.forEach((item: any) => {
    rulesName.push(item.fieldName);
-    rulesGuid.push(item.guid);
+    rulesGuid.push(item.fieldGuid);
  });
  selectedRulesData.value = {
    rulesName: rulesName.join('、'),
@@ -344,7 +344,7 @@ const tableCheckboxAllSelectChange = (select) => {
  let rulesGuid: any = [];
  select.forEach((item: any) => {
    rulesName.push(item.fieldName);
-    rulesGuid.push(item.guid);
+    rulesGuid.push(item.fieldGuid);
  });
  selectedRulesData.value = {
    rulesName: rulesName.join('、'),
@@ -1007,7 +1007,9 @@ const btnClick = async () => {
 };
 // 数据库导出
 const exportDB = async () => {
-  exportDbDirTable().then((res: any) => {
+  exportDbDirTable({
+    execGuid: execGuidInfo.value.execGuid,
+  }).then((res: any) => {
    download(res, '数据库目录数据.xlsx', 'excel')
  });
 }
--- a/src/views/data_inventory/dataLabel.vue
View file @dcdb450
+++ b/src/views/data_inventory/dataLabel.vue
View file @dcdb450
@@ -11,7 +11,7 @@ import { CirclePlus, Delete, Warning } from "@element-plus/icons-vue";
 const { proxy } = getCurrentInstance() as any;
 const dialogLabelFormRef = ref();
+const isAddDisabled = ref(true);
 // 原始数据存储
 const classGradeTreeData: any = ref([]);
 const expandedKey: any = ref([])
@@ -41,6 +41,7 @@ const getClassifyGradeTree = async () => {
    classifyGuid.value = classGradeTreeData.value[0].guid;
    newCreateGradeFormItems.value[1].options = transformDataForTree(transformedData)
    treeInfo.value.loading = false;
+    isAddDisabled.value = false;
  } else {
    proxy.$ElMessage.error(res.msg);
  }
@@ -230,12 +231,12 @@ const tableInfo = ref({
        return tempInfo.join('/')
      },
    },
-    { label: "分级", field: "gradeDetailName", width: 80 },
+    { label: "分级", field: "gradeDetailName", width: 60 },
    {
      label: '状态', field: 'bizState', type: 'switch', activeText: '启用', inactiveText: '停用', activeValue: 'Y', inactiveValue: 'N', switchWidth: 56, width: 100, align: 'center'
    },
-    { label: "修改人", field: "updateUserName", width: 140 },
+    { label: "修改人", field: "updateUserName", width: 80 },
-    { label: "更新时间", field: "updateTime", width: 180 },
+    { label: "更新时间", field: "updateTime", width: 160 },
  ],
  data: tableDataList.value,
  page: {
@@ -818,7 +819,7 @@ const matchEnValue = ref({
            @select-change="selectChange" />
        </div>
        <div>
-          <el-button type="primary" class="v-add" @click="addNewLabel">新增</el-button>
+          <el-button type="primary" class="v-add" @click="addNewLabel" :disabled="isAddDisabled">新增</el-button>
          <!-- <el-button class="v-import">导入</el-button>
          <el-button>导出</el-button> -->
        </div>
@@ -838,14 +839,16 @@ const matchEnValue = ref({
              <Warning />
            </el-icon>
            <span class="tip">
-              精确匹配使用中文；分隔每个规则
+              精确匹配使用英文","分隔每个规则
            </span>
          </div>
          <div class="v-match">
            <el-input v-model="matchChValue.value" :disabled="matchChValue.disabled" maxlength="200"
-              style="width: 272px;height:94px;" show-word-limit type="textarea" class="no-resize" />
+              style="width: 272px;height:94px;" show-word-limit type="textarea" class="no-resize"
+              placeholder="请输入字段中文" />
            <el-input v-model="matchEnValue.value" :disabled="matchEnValue.disabled" maxlength="200"
-              style="width: 272px;height:94px;" show-word-limit type="textarea" class="no-resize" />
+              style="width: 272px;height:94px;" show-word-limit type="textarea" class="no-resize"
+              placeholder="请输入字段英文" />
          </div>
        </div>
        <div class="dim-label" style="margin-top: 16px;">
@@ -861,7 +864,7 @@ const matchEnValue = ref({
        <div v-for="(row, index) in formRows" :key="index" class="match-content-wrapper">
          <div class="match-content" @mouseenter="handleMouseEnter(index)" @mouseleave="handleMouseLeave()">
            <!-- 位置映射下拉框 -->
-            <el-select v-model="row.name" placeholder="请选择中文名/英文名" :disabled=row.disabled class="v-select">
+            <el-select v-model="row.name" placeholder="请选择" :disabled=row.disabled class="v-select">
              <el-option v-for="option in languageOptions" :key="option.value" :label="option.label"
                :value="option.value" />
            </el-select>