填报管理

src/api/dataFilling/fillingManage.ts

@@ -58,7 +58,7 @@ export const fillingTable = (reportId) => {
 // 我的填报-填表-上报
 export function fillingReport(reportId, form) {
   return request({
-    url: '/api/dataFilling/submission-status',
+    url: '/api/dataFilling/submission_status',
     method: 'post',
     data: {
       report_id: reportId,

src/types/components.d.ts

@@ -27,6 +27,7 @@ declare module 'vue' {
     ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElBadge: typeof import('element-plus/es')['ElBadge']
     ElButton: typeof import('element-plus/es')['ElButton']
+    ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
@@ -45,13 +46,18 @@ declare module 'vue' {
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
+    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
+    ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
+    ElSegmented: typeof import('element-plus/es')['ElSegmented']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
     ElSkeletonItem: typeof import('element-plus/es')['ElSkeletonItem']

src/views/dataFilling/dossierDetail.vue

@@ -16,16 +16,19 @@
         </el-row>
       </el-col>
       <el-col :lg="30" :xs="24">
-        <el-table :data="tableData" border>
-          <el-table-column v-for="header in editableHeaders" :key="header.prop" :label="header.label" :prop="header.prop">
-            <template #header="{ column }">
-              <span class="editable-header" v-text="column.label"></span>
-            </template>
-            <template #default="{ row, $index }">
-              <span class="editable-span" v-text="row[header.prop]"></span>
-            </template>
-          </el-table-column>
-        </el-table>
+<!--        <el-table :data="tableData" border>-->
+<!--          <el-table-column v-for="header in editableHeaders" :key="header.prop" :label="header.label" :prop="header.prop">-->
+<!--            <template #header="{ column }">-->
+<!--              <span class="editable-header" v-text="column.label"></span>-->
+<!--            </template>-->
+<!--            <template #default="{ row, $index }">-->
+<!--              <span class="editable-span" v-text="row[header.prop]"></span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--        </el-table>-->
+        <div :style="{ height: tableHeight + 'px' }">
+          <hot-table ref="wrapper" :data="tableData" :settings="hotSettings" />
+        </div>
       </el-col>
     </el-row>
   </div>
@@ -36,8 +39,13 @@ import { ref, onMounted } from 'vue';
 import { ElTable, ElButton, ElCol, ElRow, ElTableColumn, ElMessageBox } from 'element-plus';
 import * as XLSX from 'xlsx';
 import { fillDetail, collectList } from '@/api/dataFilling/fileManagement';
+import { HotTable } from '@handsontable/vue3';
+import 'handsontable/languages';
+import 'handsontable/dist/handsontable.full.css';
+import { registerAllModules } from 'handsontable/registry';
+registerAllModules();
 
-const emits = defineEmits(['close']);
+const emits = defineEmits(['close', 'refresh']);
 const props = defineProps({
   eventId: String,
   tableName: String,
@@ -51,26 +59,46 @@ const detailData = ref({
   start: '',
   end: ''
 });
-
+let tableHeight = window.innerHeight - 230
+let wrapper = ref();
 onMounted(() => {
   fetchFillDetail();
 });
-
+const editableHeadersList = ref([]);
 const fetchFillDetail = async () => {
   try {
     const res = await fillDetail({ report_id: props.eventId });
     // 动态设置表头
     editableHeaders.value = res.columns;
     // 转换表格数据格式以匹配表头
-    tableData.value = res.rows.map((row) => {
-      const formattedRow = {};
-      editableHeaders.value.forEach((header) => {
-        formattedRow[header.prop] = row[header.prop];
-      });
-      return formattedRow;
-    });
+
     detailData.value.start = res.start_time;
     detailData.value.end = res.end_time;
+
+
+    editableHeaders.value.forEach((header) => {
+      editableHeadersList.value.push(header.label)
+    })
+    let arr1 = []
+    // tableData.value = response.tableData;
+    //如果tableData是空就用下满这段，tableData有数据就用tableData的内容
+    if (!res.rows || res.rows.length === 0) {
+      editableHeadersList.value.forEach((item) => {
+        arr1.push('');
+      })
+      tableData.value = [arr1];
+      wrapper.value.hotInstance.loadData([arr1]);
+    } else {
+      tableData.value = res.rows.map((row) => {
+        const formattedRow = {};
+        editableHeaders.value.forEach((header) => {
+          formattedRow[header.prop] = row[header.prop];
+        });
+        return formattedRow;
+      });
+      wrapper.value.hotInstance.loadData(tableData.value);
+    }
+    wrapper.value.hotInstance.loadData(tableData.value);
   } catch (error) {
     console.error('Error fetching data:', error);
   }
@@ -130,10 +158,81 @@ const handleWrite = () => {
       // 用户点击了取消按钮
       console.log('取消收取');
     });
+  emits('refresh');
 };
 const handleReturn = () => {
   emits('close');
 };
+const hotSettings = reactive({
+  language: 'zh-CN',
+  readOnly: true,
+  colHeaders: editableHeadersList,
+  rowHeaders: true,
+  autoColumnSize: true,
+  width: '100%', // auto  or  100%
+  height: '100%', // auto  or  100%
+  licenseKey: 'non-commercial-and-evaluation', // 隐藏版权文字
+  colWidths: 129, // 默认单元格宽度
+  rowHeights: 28, // 默认单元格高度
+  wordWrap: true, // 单元格文字是否换行展示
+  contextMenu: {
+    // 自定义右键菜单
+    items: {
+      'row_above': {
+        name: '向上插一行'
+      },
+      'row_below': {
+        name: '向下插一行'
+      },
+      'col_left': {
+        name: '向左插一列'
+      },
+      'col_right': {
+        name: '向右插一列'
+      },
+      'hsep1': '---------', // 分隔线
+      'remove_row': {
+        name: '删除当前行'
+      },
+      'remove_col': {
+        name: '删除当前列'
+      },
+      'clear_column': {
+        name: '清空当前列'
+      },
+      'hsep2': '---------', // 必须和上次的变量名不一样
+      'undo': {
+        name: '撤销'
+      },
+      'cut': {
+        name: '剪切'
+      },
+      'copy': {
+        name: '复制'
+      },
+      'alignment': {
+        name: '对齐'
+      },
+      'hsep3': '---------',
+      'commentsAddEdit': {
+        // 必须开启 comments: true
+        name: '添加备注'
+      },
+      'commentsRemove': {
+        // 必须开启 comments: true
+        name: '删除备注'
+      },
+      'freeze_column': {
+        // 必须开启 manualColumnFreeze: true
+        name: '固定列'
+      },
+      'unfreeze_column': {
+        // 必须开启 manualColumnFreeze: true
+        name: '取消固定列'
+      }
+    }
+  }
+});
 </script>
 
 <style scoped>

src/views/dataFilling/fileManagement.vue

@@ -55,6 +55,7 @@
       :table-name="dossierDetailState.table_name"
       :collection-status="dossierDetailState.collection_status"
       @close="handleCancel"
+      @refresh="fetchFillList"
     />
   </div>
 </template>

src/views/dataFilling/myFilling.vue

@@ -70,7 +70,7 @@
         <pagination v-show="total > 0" v-model:page="queryParams.page" v-model:limit="queryParams.pageSize" :total="total" @pagination="tableData" />
       </div>
     </div>
-    <WriteForm v-if="writeFormState.show" :event-id="writeFormState.eventId" @close="handleCancel" />
+    <WriteForm v-if="writeFormState.show" :event-id="writeFormState.eventId" @refresh="fetchFillList" @close="handleCancel" />
     <FormDetail v-if="formDetailState.show" :event-id="formDetailState.eventId" @close="handleCancel" />
   </div>
 </template>

src/views/dataFilling/writeForm.vue

@@ -68,7 +68,7 @@ const props = defineProps({
   eventId: String
 });
 
-const emits = defineEmits(['close']);
+const emits = defineEmits(['close', 'refresh']);
 let wrapper = ref();
 let tableHeight = window.innerHeight - 230
 const detailData = ref({
@@ -82,7 +82,7 @@ const { proxy } = getCurrentInstance();
 const editableHeaders = ref<string[]>([]);
 const tableData = ref<any[]>([]);
 const headerMapping = ref<{ [key: string]: string }>({});
-const fields = ref();
+const fields = ref([]);
 // 获取表头数据
 const fetchHeaders = async () => {
   const response = await writeView({ report_id: props.eventId });
@@ -197,47 +197,26 @@ const handleSave = () => {
 const handleReturn = () => {
   emits('close');
 };
-const dataTemp = ref()
-const formattedData = () => {
-  dataTemp.value = tableData.value.map(row =>
-    fields.value.reduce((obj, field, index) => {
-      const key = field.file_name === 'xmbz' ? 'bz' : field.file_name;
-      obj[key] = row[index];
-      return obj;
-    }, {})
-  )
-};
-const handleReport = async () => {
-  formattedData();
-  // fillingReport(props.eventId)
 
-  // try {
-  //   const mappedData = tableData.value.map((row) => {
-  //     const mappedRow: any = {};
-  //     Object.keys(row).forEach((header) => {
-  //       const fieldName = headerMapping.value[header];
-  //       if (fieldName) {
-  //         mappedRow[fieldName] = row[header];
-  //       }
-  //     });
-  //     return mappedRow;
-  //   });
-  //
-  //   const data = {
-  //     report_id: props.eventId,
-  //     data: mappedData
-  //   };
-  //
-  //   const response = await submitFill(data);
-  //   if (response.code === 200) {
-  //     alert('数据上报成功');
-  //   } else {
-  //     alert('数据上报失败: ' + response.msg);
-  //   }
-  // } catch (error) {
-  //   console.error('上报数据时发生错误:', error);
-  //   alert('数据上报失败，请稍后再试');
-  // }
+
+const handleReport = async () => {
+  const keyArr = []
+  for (let obj of fields.value) {
+   keyArr.push(obj.field_name)
+  }
+  const dataTemp = [];
+  for (let i =0; i< tableData.value.length; i++) {
+    let objectTemp = {};
+    for (let j = 0; j < tableData.value[i].length; j++) {
+      let temp = keyArr[j];
+      objectTemp[temp] = tableData.value[i][j];
+    }
+    dataTemp.push(objectTemp);
+  }
+  fillingReport(props.eventId, dataTemp);
+  proxy?.$modal.msgSuccess('上报成功');
+  emits('close');
+  emits('refresh');
 };
 // 组件挂载时调用
 onMounted(() => {

src/views/informationissue/informationList.vue

@@ -25,14 +25,14 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="发布状态：">
-                  <el-select v-model="queryParams.publish_status" placeholder="请选择">
+                  <el-select v-model="queryParams.publish_status" placeholder="请选择" clearable>
                     <el-option v-for="item in publishStatusOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="审批状态：">
-                  <el-select v-model="queryParams.examine_status" placeholder="请选择">
+                  <el-select v-model="queryParams.examine_status" placeholder="请选择" clearable>
                     <el-option v-for="item in approvalStatusOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
                   </el-select>
                 </el-form-item>
@@ -58,7 +58,7 @@
         <el-table-column label="发布渠道" align="center" prop="publish_channel" />
         <el-table-column label="发布申请人" align="center" prop="nick_name" />
         <el-table-column label="待处理人" align="center" prop="examine_user" />
-        <el-table-column label="发布状态" align="center" prop="publish_status">
+        <el-table-column label="发布状态" align="center" prop="publish_status" >
           <template #default="scope">
             <div class="common-flex">
               <i :class="getStatusClass(scope.row.publish_status)"></i>

src/views/knowledge/knowledge-management/detail.vue

@@ -1,9 +1,16 @@
 <template>
   <div class="detail-container">
-    <div class="common-back-box" @click="goBack">
-      <i class="common-back" />
-      返回上一级
+    <div style="display: flex; justify-content: space-between">
+      <div class="common-back-box" @click="goBack">
+        <i class="common-back" />
+        返回上一级
+      </div>
+      <div>
+        <el-button type="primary" @click="handleUpdate()">编辑</el-button>
+        <el-button type="danger" @click="handleDelete(report)">删除</el-button>
+      </div>
     </div>
+
     <div class="common-header">
       <div class="common-header-left">
         <i class="common-title-icon" />
@@ -25,9 +32,9 @@
         <div class="common-info-item">报告编号：{{ report.reportId }}</div>
         <div class="common-info-item">主题词：{{ report.subject }}</div>
         <div class="common-info-item">事件类型：<dict-tag :options="mm_event_type" :value="report.eventType" /></div>
-        <div class="common-info-item">发布日期：{{ report.publishDate }}</div>
         <div class="common-info-item">来源单位：{{ report.sourceUnit }}</div>
-        <div class="common-info-item">来源单位：{{ report.notificationType }}</div>
+        <div class="common-info-item">发布日期：{{ report.publishDate }}</div>
+        <div class="common-info-item">知识类型：{{ report.notificationType }}</div>
         <div class="common-info-item">摘要：{{ report.summary }}</div>
       </div>
     </div>
@@ -36,19 +43,31 @@
         <i class="line-icon" />
         <div class="common-info-title">报告附件</div>
       </div>
-      <div style="padding: 10px">
-        <el-link :href="report.attachmentUrl" target="_blank" class="common-info-item">{{ report.attachmentName }}</el-link>
+      <div style="padding: 10px; display: flex">
+<!--        <div class="link" @click="previewSummaryFile(item.file_name, item.url)">{{ item.file_name }}</div>-->
+<!--        <div style="margin-left: 40px" @click="previewSummaryFile(item.file_name, item.url)">查看</div>-->
+        <div>{{ report.attachmentName }}</div>
+        <div style="margin-left: 20px; display: flex; align-items: center; color: #5986ff" @click="downloadSummaryFile(report.attachmentName, report.attachmentUrl)">
+          <span>下载</span>
+          <el-icon class="icon" style="margin-left: 0px"><Download /></el-icon>
+        </div>
+<!--        <el-link :href="report.attachmentUrl" target="_blank" class="common-info-item">{{ report.attachmentName }}</el-link>-->
+
       </div>
     </div>
   </div>
+  <edit v-if="isShowEdit" :id="report.reportId" @close="close" />
 </template>
 
 <script setup>
 import { useRoute, useRouter } from 'vue-router';
 import { ElMessageBox, ElMessage } from 'element-plus';
-import { fetchReportDetail } from '@/api/knowledge/index';
+import { deleteReport, fetchReportDetail } from '@/api/knowledge/index';
 import { getDicts } from '@/api/system/dict/data/index';
+import { download2 } from '@/utils/request';
+import Edit from '@/views/knowledge/knowledge-management/edit.vue';
 
+const isShowEdit = ref(false);
 const report = ref({
   reportId: '',
   title: '',
@@ -66,10 +85,11 @@ const props = defineProps({
   reportId: ''
 });
 
-const emits = defineEmits(['close']);
+const emits = defineEmits(['close', 'refresh']);
 
 const route = useRoute();
 const router = useRouter();
+const baseUrl = import.meta.env.VITE_APP_BASE_API;
 
 // 初始化事件类型字典
 const mm_event_type = ref([]);
@@ -80,6 +100,10 @@ const goBack = () => {
   emits('close');
 };
 
+const downloadSummaryFile = (file_name, url) => {
+  download2(baseUrl + '/file/download/' + url, file_name);
+};
+
 // 编辑报告
 const handleEdit = () => {
   ElMessageBox.prompt('编辑报告标题', '提示', {
@@ -113,27 +137,30 @@ const handleEdit = () => {
 };
 
 // 删除报告
-const handleDelete = () => {
+const handleDelete = async (row) => {
   ElMessageBox.confirm('此操作将永久删除该报告, 是否继续?', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning'
   })
     .then(() => {
+      deleteReport(row.reportId);
       ElMessage({
         type: 'success',
         message: '报告已删除'
       });
-      router.push('/');
+      emits('close');
+      emits('refresh');
     })
-    .catch(() => {
-      ElMessage({
-        type: 'info',
-        message: '已取消删除'
-      });
-    });
 };
 
+const handleUpdate = () => {
+  isShowEdit.value = true;
+}
+const close = () => {
+  isShowEdit.value = false
+}
+
 onMounted(async () => {
   try {
     const dictResponse = await getDicts('mm_event_type');

src/views/knowledge/knowledge-management/edit.vue

@@ -0,0 +1,148 @@
+<template>
+  <!-- 新增/修改弹窗 -->
+  <div class="common-dialog">
+    <div class="common-dialog-content">
+      <div class="common-dialog-title-box">
+        <i class="common-dialog-title-icon" />
+        <div>{{ !!id ? "修改报告" : "添加报告" }}</div>
+      </div>
+      <div class="common-dialog-box">
+        <el-form ref="demoFormRef" :model="form" :rules="rules" label-width="80px">
+          <el-form-item label="报告名称：" prop="reportName">
+            <el-input v-model="form.reportName" placeholder="请输入报告名称" style="width: 468px !important" />
+          </el-form-item>
+          <el-form-item label="主题词：" prop="subject">
+            <el-input v-model="form.subject" placeholder="请输入主题词" style="width: 468px !important" />
+          </el-form-item>
+          <el-form-item label="事件类型：" prop="eventType">
+            <el-select v-model="form.eventType" placeholder="请选择事件类型" clearable style="width: 468px !important">
+              <el-option v-for="item in eventTypeSelection" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="摘要：" prop="summary">
+            <el-input v-model="form.summary" placeholder="请输入摘要" style="width: 468px !important" />
+          </el-form-item>
+          <el-form-item label="来源单位：" prop="publishingUnit">
+            <el-input v-model="form.publishingUnit" placeholder="请输入来源单位" style="width: 468px !important" />
+          </el-form-item>
+          <el-form-item label="发布日期：" prop="publishDate">
+            <el-date-picker v-model="form.publishDate" type="datetime" placeholder="选择发布日期" style="width: 468px !important"></el-date-picker>
+          </el-form-item>
+          <el-form-item prop="fileNames">
+            <el-col :span="1.5">
+              <!-- 使用分片上传组件,每个分片 -->
+              <!--          <chunk-upload ref="chunkUploadRef" :max-file-size="50 * 1024 * 1024" :max-files="5" />-->
+              <FileUpload v-model="form.fileNames" />
+            </el-col>
+          </el-form-item>
+
+        </el-form>
+      </div>
+      <div class="common-dialog-footer" style="display: flex; justify-content: center">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确定</el-button>
+        <el-button @click="cancel">取消</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { AddReportParams } from '@/api/knowledge/types';
+import { ref } from 'vue';
+import { getDicts } from '@/api/system/dict/data';
+import { addReport, fetchReportDetail, updateReport } from '@/api/knowledge';
+
+interface PropType {
+  id: String;
+}
+const props = withDefaults(defineProps<PropType>(), {});
+const eventTypeSelection = ref([]);
+const buttonLoading = ref(false);
+const demoFormRef = ref(null);
+const emits = defineEmits(['close', 'refresh']);
+// 表单数据
+const form = ref({
+  reportName: '',
+  subject: '',
+  eventType: '',
+  summary: '',
+  publishingUnit: '',
+  publishDate: '',
+  fileNames: []
+});
+if (!!props.id) {
+  fetchReportDetail(props.id).then(response => {
+    response.data[0].file.forEach((item) => {
+      item.name = item.content;
+    })
+    form.value = response.data[0];
+    form.value.fileNames = response.data[0].file;
+  })
+}
+const rules = reactive({
+  reportName: [{ required: true, message: '报告名称不能为空', trigger: 'blur' }],
+  subject: [{ required: true, message: '主题词不能为空', trigger: 'blur' }],
+  eventType: [{ required: true, message: '事件类型不能为空', trigger: 'blur' }],
+  summary: [{ required: true, message: '摘要不能为空', trigger: 'blur' }],
+  publishingUnit: [{ required: true, message: '来源单位不能为空', trigger: 'blur' }],
+  publishDate: [{ required: true, message: '发布日期不能为空', trigger: 'blur' }],
+  fileNames: [{ required: true, message: '请上传附件', trigger: 'change' }],
+});
+// 提交表单
+const submitForm = () => {
+  demoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+
+        // 格式化日期为后端所需的格式
+        form.value.publishDate = formatDate(new Date(form.value.publishDate));
+
+        if (!!props.id) {
+          const updateData = {
+            ...form.value,
+            reportId: props.id
+          };
+          console.log('modify:', updateData)
+          updateReport(updateData).then(response => {
+            ElMessage.success('更新成功');
+            cancel();
+            emits('refresh');
+          })
+        } else {
+          addReport(form.value).then(res => {
+            ElMessage.success('添加成功');
+            cancel();
+            emits('refresh');
+          })
+        }
+      buttonLoading.value = false;
+    }
+  });
+};
+// 取消按钮
+const cancel = () => {
+  emits('close')
+};
+
+// 格式化日期
+const formatDate = (date: Date): string => {
+  const yyyy = date.getFullYear();
+  const mm = String(date.getMonth() + 1).padStart(2, '0'); // 月份以0为基数
+  const dd = String(date.getDate()).padStart(2, '0');
+  const hh = String(date.getHours()).padStart(2, '0');
+  const min = String(date.getMinutes()).padStart(2, '0');
+  const ss = String(date.getSeconds()).padStart(2, '0');
+  return `${yyyy}-${mm}-${dd} ${hh}:${min}:${ss}`;
+};
+onMounted(() => {
+  getDicts('mm_event_type').then((res) => {
+    eventTypeSelection.value = res.data;
+  });
+})
+</script>
+
+
+
+<style scoped lang="scss">
+
+</style>

src/views/knowledge/knowledge-management/index.vue

@@ -80,70 +80,21 @@
             </template>
           </el-table-column>
         </el-table>
-
         <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
       </div>
-      <!-- 新增/修改弹窗 -->
-      <div v-show="dialog.visible" class="common-dialog">
-        <div class="common-dialog-content">
-          <div class="common-dialog-title-box">
-            <i class="common-dialog-title-icon" />
-            <div>{{ dialog.title }}</div>
-          </div>
-          <div class="common-dialog-box">
-            <el-form ref="demoFormRef" :model="form" :rules="rules" label-width="80px">
-              <el-form-item label="报告名称：" prop="reportName">
-                <el-input v-model="form.reportName" placeholder="请输入报告名称" style="width: 468px !important" />
-              </el-form-item>
-              <el-form-item label="主题词：" prop="subject">
-                <el-input v-model="form.subject" placeholder="请输入主题词" style="width: 468px !important" />
-              </el-form-item>
-              <el-form-item label="事件类型：" prop="eventType">
-                <el-select v-model="form.eventType" placeholder="请选择事件类型" clearable style="width: 468px !important">
-                  <el-option v-for="item in eventTypeSelection" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="摘要：" prop="summary">
-                <el-input v-model="form.summary" placeholder="请输入摘要" style="width: 468px !important" />
-              </el-form-item>
-              <el-form-item label="来源单位：" prop="publishingUnit">
-                <el-input v-model="form.publishingUnit" placeholder="请输入来源单位" style="width: 468px !important" />
-              </el-form-item>
-              <el-form-item label="发布日期：" prop="publishDate">
-                <el-date-picker v-model="form.publishDate" type="datetime" placeholder="选择发布日期" style="width: 468px !important"></el-date-picker>
-              </el-form-item>
-              <el-col :span="1.5">
-                <!-- 使用分片上传组件,每个分片 -->
-                <!--          <chunk-upload ref="chunkUploadRef" :max-file-size="50 * 1024 * 1024" :max-files="5" />-->
-                <FileUpload v-model="form.fileNames" />
-              </el-col>
-            </el-form>
-          </div>
-          <div class="common-dialog-footer" style="display: flex; justify-content: center">
-            <el-button :loading="buttonLoading" type="primary" @click="submitForm">确定</el-button>
-            <el-button @click="cancel">取消</el-button>
-          </div>
-        </div>
-      </div>
     </div>
-    <KnowledgeDetail v-if="knowledgeDetailState.show" :reportId="knowledgeDetailState.reportId" @close="handleKnowledgeDetailClose"></KnowledgeDetail>
+    <KnowledgeDetail v-if="knowledgeDetailState.show" :reportId="knowledgeDetailState.reportId" @close="handleKnowledgeDetailClose" @refresh="getList"></KnowledgeDetail>
+    <edit v-if="dialog.visible" :id="dialog.id" @close="close" @refresh="getList" />
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onMounted } from 'vue';
-import { ElMessage } from 'element-plus';
-import { fetchReports, addReport, updateReport, deleteReport } from '@/api/knowledge';
-import { AddReportParams, QueryParams, ReportItem } from '@/api/knowledge/types';
-// import ChunkUpload from '@/components/ChunkUpload/index.vue';
-import { getDicts } from '@/api/system/dict/data';
-import router from '@/router';
-import axios, { AxiosError, isAxiosError } from 'axios';
+import { QueryParams, ReportItem } from '@/api/knowledge/types';
+import { fetchReports, deleteReport } from '@/api/knowledge';
 import KnowledgeDetail from './detail.vue';
+import Edit from '@/views/knowledge/knowledge-management/edit.vue';
 
-const demoFormRef = ref(null);
 const demoList = ref<ReportItem[]>([]);
-const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const ids = ref<string[]>([]);
@@ -167,31 +118,14 @@ const queryParams = reactive<QueryParams>({
   sortOrder: 'desc',
   publishDateRange: ''
 });
-// 表单数据
-const form = reactive<AddReportParams>({
-  reportName: '',
-  subject: '',
-  eventType: '',
-  summary: '',
-  publishingUnit: '',
-  publishDate: '',
-  fileNames: []
-});
 
-const rules = reactive({
-  reportName: [{ required: true, message: '报告名称不能为空', trigger: 'blur' }],
-  subject: [{ required: true, message: '主题词不能为空', trigger: 'blur' }],
-  eventType: [{ required: true, message: '事件类型不能为空', trigger: 'blur' }],
-  summary: [{ required: true, message: '摘要不能为空', trigger: 'blur' }],
-  publishingUnit: [{ required: true, message: '来源单位不能为空', trigger: 'blur' }],
-  publishDate: [{ required: true, message: '发布日期不能为空', trigger: 'blur' }]
-});
 
 const eventTypeSelection = ref([]);
 
 const dialog = reactive({
   visible: false,
-  title: ''
+  id: '',
+  base_code: ''
 });
 
 let knowledgeDetailState = reactive({
@@ -223,22 +157,16 @@ const getList = async () => {
 
     // 发送请求
     const response = await fetchReports(requestParams);
-
-    if (response && response.code === 200) {
-      // demoLIst是ref对象，需要通过.value赋值
-      demoList.value = response.data.map((item: ReportItem) => {
-        return {
-          ...item,
-          publishDate: item.publishDate.replace('T', ' ')
-        };
-      });
-      total.value = response.total;
-      queryParams.pageNum = response.currentPage; // 确保currentPage赋值
-      queryParams.pageSize = response.pageSize; // 确保pageSize赋值
-    } else {
-      console.error('数据格式不匹配:', response);
-      throw new Error(response.msg || '响应数据格式不正确');
-    }
+    // demoLIst是ref对象，需要通过.value赋值
+    demoList.value = response.data.map((item: ReportItem) => {
+      return {
+        ...item,
+        publishDate: item.publishDate.replace('T', ' ')
+      };
+    });
+    total.value = response.total;
+    queryParams.pageNum = response.currentPage; // 确保currentPage赋值
+    queryParams.pageSize = response.pageSize; // 确保pageSize赋值
   } catch (error) {
     console.error('获取数据时出错:', error);
     ElMessage.error('获取数据失败');
@@ -276,18 +204,17 @@ const handleSelectionChange = (selection: ReportItem[]) => {
 
 // 新增报告
 const handleAdd = () => {
-  resetForm();
   dialog.visible = true;
-  dialog.title = '添加报告';
+  dialog.id = '';
 };
+const formData = ref();
 // 修改报告
-const handleUpdate = (row: ReportItem) => {
+const handleUpdate = (row) => {
+  formData.value = row;
   if (row) {
-    selectedRow.value = row;
-    resetForm();
-    Object.assign(form, row);
     dialog.visible = true;
-    dialog.title = '修改报告';
+    dialog.id = row.reportId;
+    dialog.base_code = row.base_code;
   }
 };
 
@@ -337,76 +264,27 @@ const handleKnowledgeDetailClose = () => {
   knowledgeDetailState.show = false;
 }
 
-// 格式化日期
-const formatDate = (date: Date): string => {
-  const yyyy = date.getFullYear();
-  const mm = String(date.getMonth() + 1).padStart(2, '0'); // 月份以0为基数
-  const dd = String(date.getDate()).padStart(2, '0');
-  const hh = String(date.getHours()).padStart(2, '0');
-  const min = String(date.getMinutes()).padStart(2, '0');
-  const ss = String(date.getSeconds()).padStart(2, '0');
-  return `${yyyy}-${mm}-${dd} ${hh}:${min}:${ss}`;
-};
 
-// 提交表单
-const submitForm = () => {
-  demoFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      try {
-        // 格式化日期为后端所需的格式
-        form.publishDate = formatDate(new Date(form.publishDate));
 
-        // 打印发送的数据，检查格式是否正确
-        console.log(dialog.title, '提交给后端的 JSON 数据:', JSON.stringify(form, null, 2));
 
-        if (dialog.title === '修改报告' && selectedRow.value) {
-          const updateData = {
-            ...form,
-            reportId: selectedRow.value.reportId
-          };
-          console.log('modify:', updateData)
-          await updateReport(updateData);
-          ElMessage.success('更新成功');
-        } else {
-          await addReport(form);
-          ElMessage.success('添加成功');
-        }
-        dialog.visible = false;
-        getList(); // 刷新列表
-      } catch (error) {
-        if (isAxiosError(error)) {
-          console.error('后端响应错误:', error.response?.data);
-          ElMessage.error(`操作失败: ${error.response?.data.message || '未知错误'}`);
-        } else {
-          console.error('提交失败:', error);
-          ElMessage.error('操作失败，无法连接到服务器');
-        }
-      } finally {
-        buttonLoading.value = false;
-      }
-    }
-  });
-};
 // 重置表单
-const resetForm = () => {
-  Object.assign(form, {
-    reportName: '',
-    subject: '',
-    eventType: '',
-    summary: '',
-    publishingUnit: '',
-    publishDate: '',
-    fileNames: [] // 也可以清空上传的文件名列表
-  });
-  demoFormRef.value?.resetFields();
-};
+// const resetForm = () => {
+//   Object.assign(form, {
+//     reportName: '',
+//     subject: '',
+//     eventType: '',
+//     summary: '',
+//     publishingUnit: '',
+//     publishDate: '',
+//     fileNames: [] // 也可以清空上传的文件名列表
+//   });
+//   demoFormRef.value?.resetFields();
+// };
+
+const close = () => {
+  dialog.visible = false
+}
 
-// 取消按钮
-const cancel = () => {
-  resetForm();
-  dialog.visible = false;
-};
 
 const handleExport = () => {
   ElMessage.success('导出成功');
@@ -414,8 +292,6 @@ const handleExport = () => {
 
 onMounted(() => {
   getList();
-  getDicts('mm_event_type').then((res) => {
-    eventTypeSelection.value = res.data;
-  });
+
 });
 </script>

src/views/system/dict/data.vue

@@ -77,7 +77,7 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-text v-hasPermi="['system:menu:edit']" class="common-btn-text-primary" @click="handleUpdate(scope.row)">修改</el-text>
-            <!--            <el-text v-hasPermi="['system:menu:remove']" class="common-btn-text-danger" @click="handleDelete(scope.row)">删除</el-text>-->
+<!--                        <el-text v-hasPermi="['system:menu:remove']" class="common-btn-text-danger" @click="handleDelete(scope.row)">删除</el-text>-->
           </template>
         </el-table-column>
       </el-table>
@@ -267,7 +267,7 @@ const handleAdd = () => {
 };
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: DictDataVO[]) => {
-  ids.value = selection.map((item) => item.dictCode);
+  ids.value = selection.map((item) => item.dictLabel);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 };
@@ -294,9 +294,9 @@ const submitForm = () => {
 };
 /** 删除按钮操作 */
 const handleDelete = async (row?: DictDataVO) => {
-  const dictCodes = row?.dictCode || ids.value;
-  await proxy?.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？');
-  await delData(dictCodes);
+  const dictLabels = row?.dictLabel || ids.value;
+  await proxy?.$modal.confirm('是否确认删除字典标签为"' + dictLabels + '"的数据项？');
+  await delData(dictLabels);
   await getList();
   proxy?.$modal.msgSuccess('删除成功');
   useDictStore().removeDict(queryParams.value.dictType);