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

# Conflicts:
#	src/views/dataFilling/tableDetails.vue

src/api/dataFilling/datafilling.ts

@@ -1,4 +1,5 @@
 import request from '@/utils/request';
+
 // 查询部门列表
 export function fillList(data) {
   return request({
@@ -7,6 +8,7 @@ export function fillList(data) {
     data: data
   });
 }
+
 export function fillDetail(data) {
   return request({
     url: '/api/dataFilling/submission_status',
@@ -14,6 +16,7 @@ export function fillDetail(data) {
     data: data
   });
 }
+
 export function writeView(params) {
   return request({
     url: '/api/dataFilling/report_fields',
@@ -21,6 +24,7 @@ export function writeView(params) {
     params: params
   });
 }
+
 export function submitFill(data) {
   return request({
     url: '/api/dataFilling/submit_data',

src/api/emergencyCommandMap/communication.ts

@@ -54,4 +54,4 @@ export function getAvconDeviceList(id, params) {
     method: 'get',
     params: params
   });
-}
+}

src/types/components.d.ts

@@ -27,8 +27,6 @@ declare module 'vue' {
     ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElBadge: typeof import('element-plus/es')['ElBadge']
     ElButton: typeof import('element-plus/es')['ElButton']
-    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
-    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
@@ -43,9 +41,7 @@ declare module 'vue' {
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     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']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
@@ -54,20 +50,14 @@ declare module 'vue' {
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
-    ElSkeletonItem: typeof import('element-plus/es')['ElSkeletonItem']
-    ElSlider: typeof import('element-plus/es')['ElSlider']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElText: typeof import('element-plus/es')['ElText']
-    ElTimeline: typeof import('element-plus/es')['ElTimeline']
-    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
-    ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     ExcelEditor: typeof import('./../components/ExcelEditor/index.vue')['default']
     FileUpload: typeof import('./../components/FileUpload/index.vue')['default']

src/views/dataFilling/tableDetails.vue

@@ -160,7 +160,6 @@ onMounted(async () => {
 
 const fetchReportDetails = (reportId) => {
   return fillingList(reportId).then((res: any) => {
-    res.report_info.user_ids = [7, 8, 11, 4, 1, 12];
     reportInfo.value = res.report_info;
     const headers = Object.keys(res.table_data["0"]);
     const result = [
@@ -430,7 +429,7 @@ const handleData = () => {
 
 function findNodeById(data, targetId) {
   for (const node of data) {
-    if (node.id === targetId) {
+    if ((node.id === targetId || node.id.toString() === targetId) && !node.deptType) {
       return { id: node.id, label: node.label }; // 找到匹配节点，直接返回
     }
     if (node.children && node.children.length > 0) {