merge

2025-12-29 16:00:13 +08:00
parent b946afb12d a0ecd2e567
commit e050770714
7 changed files with 78 additions and 9 deletions
--- a/src/utils/i18n/en.ts
+++ b/src/utils/i18n/en.ts
@@ -30,6 +30,10 @@ const lang = {
    开始月份: 'Start Month',
    结束月份: 'End Month',
    选择项目: 'Select Project',
+    创建人: 'Creator',
+    创建时间: 'Create Time',
+    更新人: 'Updater',
+    更新时间: 'Update Time',
  },
  菜单: {
    首页: 'Home',
@@ -200,6 +204,8 @@ const lang = {
    请输入名称: 'Please input name',
    审批完成: 'Approval Completed',
    知识库列表: 'Knowledge Base List',
+    基本信息: 'Basic Info',
+    目录名称: 'Directory Name',
  },
  我的任务: {
    待接收任务: 'Accepted Tasks',
--- a/src/utils/i18n/zh.ts
+++ b/src/utils/i18n/zh.ts
@@ -30,6 +30,10 @@ const lang = {
    开始月份: '开始月份',
    结束月份: '结束月份',
    选择项目: '选择项目',
+    创建人: '创建人',
+    创建时间: '创建时间',
+    更新人: '更新人',
+    更新时间: '更新时间',
  },
  菜单: {
    首页: '首页',
@@ -196,6 +200,8 @@ const lang = {
    请输入名称: '请输入名称',
    审批完成: '审批完成',
    知识库列表: '知识库列表',
+    基本信息: '基本信息',
+    目录名称: '目录名称',
  },
  我的任务: {
    待接收任务: '待接收任务',
--- a/src/views/competenceCenter/knowledge/components/infoDrawer.vue
+++ b/src/views/competenceCenter/knowledge/components/infoDrawer.vue
@@ -0,0 +1,44 @@
+<template>
+  <el-drawer
+    v-model="visible"
+    :size="400"
+    :title="$t('知识库.基本信息')"
+    :close-on-click-modal="false"
+    @close="visible = false"
+  >
+    <div class="info-content">
+      <el-descriptions class="info-content-descriptions" :column="1" label-width="100px" border>
+        <el-descriptions-item :label="$t('知识库.目录名称')">
+          {{ data?.originalName }}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('通用.创建人')">
+          {{ data?.creatorName }}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('通用.创建时间')">
+          {{ data?.createTime }}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('通用.更新人')">
+          {{ data?.updaterName }}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('通用.更新时间')">
+          {{ data?.updateTime }}
+        </el-descriptions-item>
+      </el-descriptions>
+    </div>
+  </el-drawer>
+</template>
+
+<script lang="ts" setup>
+const visible = defineModel<boolean>({ default: false });
+defineProps<{ data?: any }>();
+</script>
+
+<style lang="scss" scoped>
+.info-content {
+  width: 100%;
+  height: 100%;
+  .info-content-descriptions {
+    margin-top: var(--margin-small);
+  }
+}
+</style>
--- a/src/views/competenceCenter/knowledge/index.vue
+++ b/src/views/competenceCenter/knowledge/index.vue
@@ -83,6 +83,9 @@
                    >
                      {{ $t('知识库.上传') }}
                    </el-button>
+                    <el-button @click="infoVisible = true" :disabled="!currentFolder">
+                      {{ $t('知识库.基本信息') }}
+                    </el-button>
                  </div>
                </template>
                <template #originalName="{ row }">
@@ -155,6 +158,7 @@
      :params="approveDelParams"
      @confirm="refreshTableFun"
    />
+    <InfoDrawer v-model="infoVisible" :data="currentFolder" />
  </div>
 </template>

@@ -165,6 +169,7 @@ import BaseTable from '@/components/common/table/baseTable.vue';
 import FileTree from '@/components/common/fileTree/index.vue';
 import knowledgeDetailModal from './components/knowledgeDetailModal.vue';
 import folderModal from './components/folderDetailModal.vue';
+import InfoDrawer from './components/infoDrawer.vue';
 import {
  dataCreateDirApi,
  dataListDirApi,
@@ -385,6 +390,7 @@ const onFolderConfirmFun = async (formData: any) => {
  }
 };
 const visible = ref(false);
+const infoVisible = ref(false);
 const currentRow = ref();
 const openModalFun = () => {
  visible.value = true;
--- a/src/views/data/overview/components/configuration.vue
+++ b/src/views/data/overview/components/configuration.vue
@@ -68,7 +68,7 @@
      @confirm="addConfigurationFun"
    />
    <!-- 编辑配置对话框 -->
-    <el-dialog v-model="editDialogVisible" title="修改配置" width="400">
+    <Dialog v-model="editDialogVisible" diaTitle="修改配置" width="400" show-footer>
      <el-form :model="editform" label-width="auto">
        <el-form-item
          label="配置名称"
@@ -89,7 +89,7 @@
          </el-button>
        </div>
      </template>
-    </el-dialog>
+    </Dialog>
  </el-drawer>
 </template>

@@ -105,6 +105,7 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 import AddConfigurationDia from './addConfigurationDia.vue';
 import type { TabPaneName } from 'element-plus';
 import { NODE_TYPE } from '@/utils/enum/node';
+import Dialog from '@/components/common/dialog/index.vue';

 interface SelectLevelItem {
  name: string;
--- a/src/views/data/storage/components/storageSettings/index.vue
+++ b/src/views/data/storage/components/storageSettings/index.vue
@@ -43,12 +43,14 @@
    </template>
  </el-drawer> -->
  <!-- 编辑配置对话框 -->
-    <el-dialog
+    <Dialog
      v-model="editDialogVisible"
-      title="修改配置"
+      diaTitle="修改配置"
      width="400"
+      show-footer
      @closed="closeDialogFun"
    >
+    <template #default>
      <el-form :model="editform" label-width="auto">
        <el-form-item label="用户：" v-if="editType === 'single'">
          <el-input readonly class="w160" v-model="editform.userName"></el-input>
@@ -65,18 +67,19 @@
          </el-select>
        </el-form-item>
      </el-form>
+    </template>
      <template #footer>
-        <div class="dialog-footer">
+        <div>
          <el-button @click="editDialogVisible = false">取消</el-button>
          <el-button
          type="primary"
          :disabled="
          !editform.quotaValue ||
          ( currentEditRow.quotaValueString.split(' ')[0] === editform.quotaValue && currentEditRow.quotaValueString.split(' ')[1] === editform.quotaUnit )"
-          @click="editDialogVisible = false"> 确定 </el-button>
+          @click="batchEditFun"> 确定 </el-button>
        </div>
      </template>
-    </el-dialog>
+    </Dialog>

 </template>

@@ -88,6 +91,7 @@ import StatusDot from '@/components/common/statusDot/index.vue';
 import TableForm from '@/components/common/table/tableForm.vue';
 import { ElMessage } from 'element-plus';
 import { useI18n } from 'vue-i18n';
+import Dialog from '@/components/common/dialog/index.vue';

 const chosenData = ref<any>([]);
 const { t } = useI18n();
@@ -148,6 +152,7 @@ const editform = ref({
 // 点击批量修改
 const batchEditClickFun = () => {
  editType.value = 'batch';
+  currentEditRow.value = { userId: '', quotaValueString: '' };
  editDialogVisible.value = true;
 };
 // 关闭弹窗时重置
--- a/src/views/system/dictionary/components/classDetail.vue
+++ b/src/views/system/dictionary/components/classDetail.vue
@@ -8,7 +8,7 @@
      @close="closeFun"
    >
      <div class="content">
-        <TableForm ref="tableFormRef" :tableName="tableName" :showDisabled="!!data.uuid" />
+        <TableForm ref="tableFormRef" :tableName="tableName" :data="formData" :showDisabled="!!data.uuid" />
      </div>
      <template #footer>
        <div>
@@ -63,13 +63,14 @@ watch(
  }
 );

+const formData = ref<any>({});
 const getDetailFun = () => {
  const params = {
    uuid: props.data.uuid,
  };
  getDictionaryClassDetailApi(params).then((res: any) => {
    if (res.code === 200) {
-      tableFormRef.value.setFormDataFun(res.data);
+      formData.value = res.data;
    }
  });
 };