Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/types/components.d.ts

src/components/ChunkUpload/index.vue

@@ -116,6 +116,7 @@ export default defineComponent({
       }
     };
 
+    // 合并文件分片
     const mergeChunks = async (identifier: string, filename: string) => {
       try {
         const response = await axios.post("/api/file/upload/mergefile", null, {
@@ -139,6 +140,7 @@ export default defineComponent({
       return uuidv1();  // 生成一个固定的 UUID1
     };
 
+    // 获取已上传的文件名
     const getUploadedFileNames = () => {
       return uploadedFileNames.value;
     };

src/views/duty/eventing/index.vue

@@ -89,10 +89,22 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="事件编号" align="center" prop="eventId" />
       <el-table-column label="事件标题" align="center" prop="eventTitle" />
-      <el-table-column label="事件类型" align="center" prop="eventType" />
-      <el-table-column label="事件等级" align="center" prop="eventLevel" />
+      <el-table-column label="事件类型" align="center" prop="eventType">
+        <template #default="scope">
+          <dict-tag :options="mm_event_type" :value="scope.row.eventType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="事件等级" align="center" prop="eventLevel">
+        <template #default="scope">
+          <dict-tag :options="mm_event_level" :value="scope.row.eventLevel" />
+        </template>
+      </el-table-column>
       <el-table-column label="事件地点" align="center" prop="address" />
-      <el-table-column label="事件状态" align="center" prop="eventStatus" />
+      <el-table-column label="事件状态" align="center" prop="eventStatus">
+        <template #default="scope">
+          <dict-tag :options="mm_event_state" :value="scope.row.eventStatus" />
+        </template>
+      </el-table-column>
       <el-table-column label="事件时间" align="center" prop="eventTime" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
@@ -164,6 +176,9 @@
         <el-form-item label="事件来源" prop="eventSource">
           <el-input v-model="form.eventSource" placeholder="请输入事件来源" />
         </el-form-item>
+        <el-form-item label="事件描述" prop="eventDescription">
+          <el-input type="textarea" v-model="form.eventDescription" placeholder="请输入事件描述" />
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -183,6 +198,9 @@ import { ref, reactive, toRefs, onMounted } from 'vue';
 import { getDicts } from '@/api/system/dict/data';
 import { addEvent, getEvent } from '@/api/duty/eventing';
 
+let proxy = getCurrentInstance()?.proxy;
+const { mm_event_type,mm_event_level,mm_event_state } = toRefs<any>(proxy?.useDict('mm_event_type','mm_event_level','mm_event_state'));
+
 const router = useRouter();
 const eventList = ref([]);
 const buttonLoading = ref(false);
@@ -201,24 +219,25 @@ const dialog = reactive({
   visible: false,
   title: ''
 });
-
+ // 表单初始数据
 const initFormData = {
-  eventId: '',
-  eventTitle: '',
-  eventType: '',
-  eventLevel: '',
-  eventStatus: '',
-  address: '',
-  longitude: '',
-  latitude: '',
-  eventTime: '',
-  reportTime: '',
+  // eventId: '',
+  eventTitle: '', // 事件标题
+  eventType: '', // 事件类型
+  eventLevel: '', // 事件等级
+  eventStatus: '', // 事件状态
+  address: '', // 事件地点
+  longitude: '', // 经度
+  latitude: '', // 纬度
+  eventTime: '',// 事发时间
+  reportTime: '',// 上报时间
   deaths: '',
   injuries: '',
   missing: '',
-  eventSource: ''
+  eventSource: '', // 事件来源
+  eventDescription: '' // 事件描述
 };
-
+// 表单数据
 const data = reactive({
   form: { ...initFormData },
   queryParams: {
@@ -239,7 +258,8 @@ const data = reactive({
     address: [{ required: true, message: '事件地点不能为空', trigger: 'blur' }],
     eventTime: [{ required: true, message: '事发时间不能为空', trigger: 'blur' }],
     reportTime: [{ required: true, message: '上报时间不能为空', trigger: 'blur' }],
-    eventSource: [{ required: true, message: '事件来源不能为空', trigger: 'blur' }]
+    eventSource: [{ required: true, message: '事件来源不能为空', trigger: 'blur' }],
+    eventDescription: [{ required: true, message: '事件描述不能为空', trigger: 'blur' }]
   },
   eventTypeSelection: [],
   eventLevelSelection: [],
@@ -276,6 +296,7 @@ const handleQuery = () => {
   getList();
 };
 
+// 重置查询条件
 const resetQuery = () => {
   queryParams.value = { page: 1, pageSize: 10, eventType: '', eventLevel: '', eventStatus: '', eventTime: '', regionCode: '', keyword: '' };
   handleQuery();
@@ -309,6 +330,8 @@ const submitForm = () => {
   eventFormRef.value?.validate((valid) => {
     if (valid) {
       buttonLoading.value = true;
+      // 打印表单数据
+      console.log('表单数据', form.value);
       addEvent(form.value)
         .then(() => {
           dialog.visible = false;

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

@@ -242,8 +242,6 @@ const getList = async () => {
 };
 
 
-
-
 const handleQuery = () => {
   queryParams.pageNum = 1;
   getList();