迭代八风险防控的巡查结果、已完成、未完成界面及接口调试

src/api/inspectionWork/inspector.ts

@@ -31,7 +31,7 @@ export function inspectorDetail(id) {
     params: id
   });
 }
-// 查询用户详情
+// 查询区划树
 export function inspectorDivision(params) {
   return request({
     url: '/api/riskManagement/allAreas',
@@ -139,7 +139,7 @@ export function resultList(children_task_id, queryParams) {
     }
   });
 }
-// 查询用户详情
+// 文件下载
 export function fileDownload(url) {
   return request({
     url: '/api/file/download/' + url,
@@ -157,7 +157,7 @@ export function patrolNum(children_task_id, queryParams) {
     }
   });
 }
-// 查询巡查未完成果列表
+// 查询巡查未完成列表
 export function patrolNum_1(children_task_id, queryParams) {
   return request({
     url: '/api/riskManagement/inspection/task/children/task/log/' + children_task_id + '/' + 'incomplete' + '/list',

src/api/inspectionWork/riskManagement.ts

@@ -30,7 +30,7 @@ export function addtask(data) {
 export function getRiskDetail(id: string) {
   return request({
     url: '/api/riskManagement/risk/' + id,
-    method: 'get',
+    method: 'get'
   });
 }
 
@@ -47,7 +47,7 @@ export const deleteRisk = (data) => {
 export const getSubtaskList = (task_id: string) => {
   return request({
     url: `/api/riskManagement/risk/children/task/${task_id}/list`,
-    method: 'get',
+    method: 'get'
   });
 };
 
@@ -55,8 +55,56 @@ export const getSubtaskList = (task_id: string) => {
 export const getSubtaskResultList = (children_task_id: string) => {
   return request({
     url: `/api/riskManagement/risk/children/task/result/${children_task_id}/list`,
-    method: 'get',
+    method: 'get'
   });
 };
-
-
+// 查询区划树
+export function inspectorDivision(params) {
+  return request({
+    url: '/api/riskManagement/allAreas',
+    method: 'get',
+    params: params
+  });
+}
+// 查询巡查结果列表
+export function resultList(children_task_id, queryParams) {
+  return request({
+    url: '/api/riskManagement/risk/children/task/result/' + children_task_id + '/list',
+    method: 'get',
+    params: {
+      page: queryParams.page,
+      pageSize: queryParams.pageSize,
+      inspection_result: queryParams.inspection_result,
+      area_code: queryParams.area,
+      nick_name: queryParams.nick_name
+    }
+  });
+}
+// 文件下载
+export function fileDownload(url) {
+  return request({
+    url: '/api/file/download/' + url,
+    method: 'get',
+    params: url
+  });
+}
+// 查询风险未完成列表
+export function patrolNum_1(children_task_id, queryParams) {
+  return request({
+    url: '/api/riskManagement/risk/children/task/log/' + children_task_id + '/' + 'incomplete' + '/list',
+    method: 'get',
+    params: {
+      area_code: queryParams.area_code
+    }
+  });
+}
+// 查询风险已完成列表
+export function patrolNum(children_task_id, queryParams) {
+  return request({
+    url: '/api/riskManagement/risk/children/task/log/' + children_task_id + '/' + 'completed' + '/list',
+    method: 'get',
+    params: {
+      area_code: queryParams.area_code
+    }
+  });
+}

src/views/inspectionWork/patrolSubTasks.vue

@@ -53,9 +53,9 @@
               </template>
             </el-table-column>
             <el-table-column label="未完成" align="center" prop="incomplete_num">
-            <template #default="scope">
-              <el-text class="common-btn-text-primary" @click="handleIncompletedClick(scope.row)">{{ scope.row.incomplete_num }}</el-text>
-            </template>
+              <template #default="scope">
+                <el-text class="common-btn-text-primary" @click="handleIncompletedClick(scope.row)">{{ scope.row.incomplete_num }}</el-text>
+              </template>
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
               <template #default="scope">

src/views/inspectionWork/riskResult.vue

@@ -0,0 +1,239 @@
+<template>
+  <div>
+    <el-dialog v-model="showSearch" title="巡查结果" width="80%" @close="$emit('close')">
+      <div class="app-container">
+        <transition name="fade">
+          <div v-show="showSearch">
+            <el-form ref="queryFormRef" :model="queryParams">
+              <el-row :gutter="20">
+                <el-col :span="6">
+                  <el-form-item label="所属区划：" prop="area" label-width="auto">
+                    <el-tree-select
+                      v-model="divisionSelectedId"
+                      :data="formattedDivisionData"
+                      :props="{ label: 'label', value: 'code', children: 'children' }"
+                      :render-after-expand="false"
+                      style="width: 468px"
+                      @change="onDivisionChange"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="巡查结果：" prop="inspection_result" label-width="auto">
+                    <el-select v-model="queryParams.inspection_result" placeholder="全部" clearable>
+                      <el-option v-for="item in cycleOptions" :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 prop="nick_name" label-width="auto">
+                    <el-input v-model="queryParams.nick_name" placeholder="请输入巡查人"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-button type="primary" @click="handleQuery">搜索</el-button>
+                  <el-button @click="resetQuery">重置</el-button>
+                </el-col>
+              </el-row>
+            </el-form>
+          </div>
+        </transition>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" icon="Plus" @click="handleExport">导出</el-button>
+          </el-col>
+        </el-row>
+        <!-- 表格组件 -->
+        <el-table ref="multipleTable" v-loading="loading" :data="tableData" @selection-change="handleSelectionChange">
+          <el-table-column label="巡查点" align="center" prop="point_name" />
+          <el-table-column label="所属区划" align="center" prop="area" />
+          <el-table-column label="执行日期" align="center" prop="create_time" />
+          <el-table-column label="巡查人" align="center" prop="nick_name" />
+          <el-table-column label="巡查结果" align="center">
+            <template #default="{ row }">
+              {{ getInspectionResultText(row.inspection_result) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="现场照片" align="center" prop="fileList">
+            <template #default="{ row }">
+              <div v-if="row.fileList && row.fileList.length > 0">
+                <img v-for="file in row.fileList" :key="file.uid" :src="file.previewUrl" alt="" style="max-width: 100px" />
+              </div>
+              <div v-else>无图片</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" prop="remark" />
+        </el-table>
+        <pagination v-show="total > 0" v-model:page="queryParams.page" v-model:limit="queryParams.pageSize" :total="total" @pagination="tableData" />
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script setup lang="ts">
+import { onMounted, reactive, ref } from 'vue';
+import { inspectorDivision, resultList, fileDownload } from '@/api/inspectionWork/riskManagement';
+import { ElMessage } from 'element-plus';
+const loading = ref(true);
+const showSearch = ref(true);
+const multiple = ref(true);
+const ids = ref<Array<number | string>>([]);
+const single = ref(true);
+const total = ref(0);
+const tableData = ref([]);
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const divisionSelectedId = ref(null);
+const formattedDivisionData = ref([]);
+const rawDivisionData = ref([]);
+const props = defineProps<{
+  eventId: string | number;
+}>();
+const initFormData = reactive({
+  id: '',
+  children_task_id: '',
+  point_name: '',
+  area: '',
+  create_time: '',
+  nick_name: '',
+  inspection_result: '',
+  remark: '',
+  fileList: []
+});
+const data = reactive({
+  form: { ...initFormData },
+  queryParams: {
+    page: 1,
+    pageSize: 10,
+    inspection_result: '',
+    area_code: '',
+    nick_name: ''
+  }
+});
+const { queryParams, form } = toRefs(data);
+const cycleOptions = ref([
+  { label: '全部', value: '' }, // 通常“全部”对应空值或者特定的标识符，表示不按此条件过滤
+  { label: '正常', value: '1' },
+  { label: '异常', value: '2' }
+]);
+const getInspectionResultText = (resultCode) => {
+  switch (resultCode) {
+    case '1':
+      return '正常';
+    case '2':
+      return '异常';
+    default:
+      return '全部';
+  }
+};
+
+const fetchResulData = () => {
+  loading.value = true; // 开始加载
+  return resultList(props.eventId, queryParams.value)
+    .then((res) => {
+      if (res.code === 200) {
+        tableData.value = res.data || []; // 确保tableData是一个数组
+        total.value = res.total || 0; // 确保total是一个数字
+        console.log('Fetched subtasks data:', tableData.value);
+      } else {
+        console.error(res.msg);
+      }
+      loading.value = false; // 结束加载
+    })
+    .catch((error) => {
+      console.error('Error fetching sub tasks:', error);
+      loading.value = false; // 结束加载
+    });
+};
+const loadFilePreviews = (rowData) => {
+  if (rowData.fileList && rowData.fileList.length > 0) {
+    for (const file of rowData.fileList) {
+      try {
+        fileDownload(file.url)
+          .then((response) => {
+            if (response && response.data) {
+              file.previewUrl = URL.createObjectURL(new Blob([response.data]));
+            }
+          })
+          .catch((error) => {
+            console.error(`Failed to load image at ${file.url}:`, error);
+          });
+      } catch (error) {
+        console.error(`Failed to start download for ${file.url}:`, error);
+      }
+    }
+  }
+};
+const fetchAndLoadPreviews = () => {
+  fetchResulData().then(() => {
+    tableData.value.forEach(loadFilePreviews);
+  });
+};
+const handleQuery = () => {
+  queryParams.value.page = 1;
+  fetchResulData();
+};
+const handleExport = () => {
+  ElMessage.info("导出成功");
+};
+// 重置查询条件
+const resetQuery = () => {
+  queryParams.value = { page: 1, pageSize: 10, nick_name: '', area_code: '', inspection_result: '' };
+  handleQuery();
+};
+const handleSelectionChange = (selection) => {
+  ids.value = selection.map((item) => item.id);
+  selectedRow.value = selection.length === 1 ? selection[0] : null;
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+const fetchDivisionData = async () => {
+  const response = await inspectorDivision();
+  if (response.code === 200) {
+    rawDivisionData.value = response.data;
+    formattedDivisionData.value = formatDivisionData(rawDivisionData.value);
+    console.log('Formatted Division Data:', formattedDivisionData.value);
+  } else {
+    ElMessage.error(response.msg);
+  }
+};
+const onDivisionChange = (value) => {
+  // 确认选中的项存在
+  const selectedDivision = findNode(formattedDivisionData.value, value);
+  if (!selectedDivision) {
+    ElMessage.warning('未找到匹配的责任区划。');
+    // 将选中的值重置为 null 或空字符串，防止后续逻辑错误
+    divisionSelectedId.value = null;
+  } else {
+    console.log('Selected Division:', selectedDivision); // 调试输出
+  }
+};
+// 递归查找节点
+const findNode = (nodes, code) => {
+  for (let i = 0; i < nodes.length; i++) {
+    const node = nodes[i];
+    if (node.code === code) {
+      return node;
+    }
+    if (node.children && node.children.length > 0) {
+      const found = findNode(node.children, code);
+      if (found) {
+        return found;
+      }
+    }
+  }
+  return null;
+};
+// 格式化责任区划数据
+const formatDivisionData = (data) => {
+  return data.map((item) => ({
+    id: item.id,
+    label: item.label,
+    code: item.code,
+    children: item.children ? formatDivisionData(item.children) : []
+  }));
+};
+onMounted(() => {
+  fetchResulData();
+  fetchDivisionData();
+});
+</script>

src/views/inspectionWork/risk_completed.vue

@@ -0,0 +1,149 @@
+<template>
+  <el-dialog v-model="showSearch" title="已完成" width="80%" @close="$emit('close')">
+    <el-row :gutter="20">
+      <el-col :lg="4" :xs="24">
+        <el-tree
+          ref="deptTreeRef"
+          class="mt-2"
+          node-key="id"
+          :data="deptOptions"
+          :props="{ label: 'label', children: 'children' }"
+          :expand-on-click-node="false"
+          :filter-node-method="filterNode"
+          highlight-current
+          default-expand-all
+          @node-click="handleNodeClick"
+        />
+      </el-col>
+      <el-col :lg="20" :xs="24">
+        <transition name="fade">
+          <div v-show="showSearch">
+            <el-form ref="queryFormRef" :model="queryParams">
+              <el-button type="primary" @click="handleExport">导出</el-button>
+            </el-form>
+          </div>
+        </transition>
+        <el-table ref="multipleTable" v-loading="loading" :data="tableData" @selection-change="handleSelectionChange">
+          <el-table-column label="排查范围" align="center" prop="area" />
+          <el-table-column label="任务进度" align="center" prop="task_status">
+            <!-- 使用自定义槽来渲染转换后的文本 -->
+            <template #default="scope">
+              {{ formatStatus(scope.row.task_status) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="巡查人员" align="center" prop="nick_name" />
+          <el-table-column label="上报时间" align="center" prop="create_time" />
+        </el-table>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import { onMounted, reactive, ref, watch } from 'vue';
+import { useRouter } from 'vue-router';
+import { inspectorDivision, patrolNum } from '@/api/inspectionWork/riskManagement';
+
+const router = useRouter();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<number | string>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const deptOptions = ref([]);
+const deptTreeRef = ref(null);
+const tableData = ref([]);
+const props = defineProps<{ eventId: string }>();
+
+const initFormData = reactive({
+  area: '',
+  task_status: '',
+  yzy_organization: '',
+  nick_name: '',
+  create_time: ''
+});
+
+const data = reactive({
+  form: { ...initFormData },
+  queryParams: {
+    area_code: '',
+    deptId: ''
+  }
+});
+
+const { queryParams, form } = toRefs(data);
+const formatStatus = (status) => {
+  return Number(status) === 1 ? '已完成' : '未完成';
+};
+
+const filterNode = (value: string, data: any) => {
+  if (!value) return true;
+  return data.label.indexOf(value) !== -1;
+};
+
+const getTreeSelect = async () => {
+  const res = await inspectorDivision();
+  if (res.code === 200) {
+    deptOptions.value = res.data; // 将部门树数据赋值给deptOptions
+  } else {
+    console.error(res.msg);
+  }
+  loading.value = false; // 加载完成后关闭加载提示
+};
+
+const fetchUserData = async () => {
+  loading.value = true; // 开始加载
+
+  // 构造请求参数
+  const params = {
+    ...queryParams.value,
+    // 只在area_code有值时添加到请求参数中
+    ...(queryParams.value.area_code ? { area_code: queryParams.value.area_code } : {})
+  };
+
+  return patrolNum(props.eventId, params)
+    .then((res) => {
+      if (res.code === 200) {
+        tableData.value = res.data; // 确保tableData是一个数组
+        total.value = res.total;
+      } else {
+        console.error(res.msg);
+      }
+      loading.value = false; // 结束加载
+    })
+    .catch((error) => {
+      console.error('Error fetching sub tasks:', error);
+      loading.value = false; // 结束加载
+    });
+};
+
+watch(queryParams, () => {
+  fetchUserData();
+});
+
+const handleNodeClick = (data: any) => {
+  queryParams.value.deptId = data.id;
+  queryParams.value.area_code = data.code; // 设置area_code为点击节点的code值
+  fetchUserData();
+};
+
+const handleSelectionChange = (selection) => {
+  ids.value = selection.map((item) => item.id);
+};
+
+onMounted(async () => {
+  await getTreeSelect();
+  fetchUserData();
+});
+</script>
+
+<style scoped>
+.mt-2 {
+  max-width: 300px; /* 设置最大宽度 */
+  max-height: 800px; /* 设置最大高度 */
+  overflow-y: auto; /* 如果内容超出高度则显示滚动条 */
+}
+</style>

src/views/inspectionWork/risk_incomplete.vue

@@ -0,0 +1,149 @@
+<template>
+  <el-dialog v-model="showSearch" title="未完成" width="80%" @close="$emit('close')">
+    <el-row :gutter="20">
+      <el-col :lg="4" :xs="24">
+        <el-tree
+            ref="deptTreeRef"
+            class="mt-2"
+            node-key="id"
+            :data="deptOptions"
+            :props="{ label: 'label', children: 'children' }"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            highlight-current
+            default-expand-all
+            @node-click="handleNodeClick"
+        />
+      </el-col>
+      <el-col :lg="20" :xs="24">
+        <transition name="fade">
+          <div v-show="showSearch">
+            <el-form ref="queryFormRef" :model="queryParams">
+              <el-button type="primary" @click="handleExport">导出</el-button>
+            </el-form>
+          </div>
+        </transition>
+        <el-table ref="multipleTable" v-loading="loading" :data="tableData" @selection-change="handleSelectionChange">
+          <el-table-column label="排查范围" align="center" prop="area" />
+          <el-table-column label="任务进度" align="center" prop="task_status">
+            <!-- 使用自定义槽来渲染转换后的文本 -->
+            <template #default="scope">
+              {{ formatStatus(scope.row.task_status) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="巡查人员" align="center" prop="nick_name" />
+          <el-table-column label="上报时间" align="center" prop="create_time" />
+        </el-table>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import { onMounted, reactive, ref, watch } from 'vue';
+import { useRouter } from 'vue-router';
+import { inspectorDivision, patrolNum_1 } from '@/api/inspectionWork/riskManagement';
+
+const router = useRouter();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<number | string>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const deptOptions = ref([]);
+const deptTreeRef = ref(null);
+const tableData = ref([]);
+const props = defineProps<{ eventId: string }>();
+
+const initFormData = reactive({
+  area: '',
+  task_status: '',
+  yzy_organization: '',
+  nick_name: '',
+  create_time: ''
+});
+
+const data = reactive({
+  form: { ...initFormData },
+  queryParams: {
+    area_code: '',
+    deptId: ''
+  }
+});
+
+const { queryParams, form } = toRefs(data);
+
+const formatStatus = (status) => {
+  return Number(status) === 1 ? '已完成' : '未完成';
+};
+
+const filterNode = (value: string, data: any) => {
+  if (!value) return true;
+  return data.label.indexOf(value) !== -1;
+};
+
+const getTreeSelect = async () => {
+  const res = await inspectorDivision();
+  if (res.code === 200) {
+    deptOptions.value = res.data; // 将部门树数据赋值给deptOptions
+  } else {
+    console.error(res.msg);
+  }
+  loading.value = false; // 加载完成后关闭加载提示
+};
+
+const fetchUserData = async () => {
+  loading.value = true; // 开始加载
+
+  // 构造请求参数
+  const params = {
+    ...queryParams.value,
+    // 只在area_code有值时添加到请求参数中
+    ...(queryParams.value.area_code ? { area_code: queryParams.value.area_code } : {})
+  };
+
+  return patrolNum_1(props.eventId, params)
+      .then((res) => {
+        if (res.code === 200) {
+          tableData.value = res.data; // 确保tableData是一个数组
+          total.value = res.total;
+        } else {
+          console.error(res.msg);
+        }
+        loading.value = false; // 结束加载
+      })
+      .catch((error) => {
+        console.error('Error fetching sub tasks:', error);
+        loading.value = false; // 结束加载
+      });
+};
+watch(queryParams, () => {
+  fetchUserData();
+});
+
+const handleNodeClick = (data: any) => {
+  queryParams.value.deptId = data.id;
+  queryParams.value.area_code = data.code; // 设置 area_code
+  fetchUserData(); // 调用 fetchUserData 函数更新表格数据
+};
+
+const handleSelectionChange = (selection) => {
+  ids.value = selection.map((item) => item.id);
+};
+
+onMounted(async () => {
+  await getTreeSelect();
+  fetchUserData();
+});
+</script>
+
+<style scoped>
+.mt-2 {
+  max-width: 300px; /* 设置最大宽度 */
+  max-height: 800px; /* 设置最大高度 */
+  overflow-y: auto; /* 如果内容超出高度则显示滚动条 */
+}
+</style>

src/views/inspectionWork/riskdetails.vue

@@ -12,7 +12,7 @@
         </el-form-item>
         <el-row :span="24" :gutter="10">
           <el-col :span="20" label="预案名称">
-<!--            <h2 key="planName" style="font-weight: bolder">{{ detailData.type }}</h2>-->
+            <!--            <h2 key="planName" style="font-weight: bolder">{{ detailData.type }}</h2>-->
             <div class="td">
               <template v-if="detailData.type === '0'">
                 <div>风险源排查</div>
@@ -24,7 +24,7 @@
                 <div>危险源排查</div>
               </template>
             </div>
-        </el-col>
+          </el-col>
           <el-col :span="1.5">
             <el-button class="common-btn-text-primary" type="primary" @click="planUpdate()"> 编辑 </el-button>
           </el-col>
@@ -57,54 +57,53 @@
             </el-descriptions-item>
           </el-descriptions>
         </el-card>
+      </el-col>
+      <el-col :lg="30" :xs="24">
         <h3>子任务记录</h3>
-        <el-table v-loading="loading" :data="subtaskData" style="width: 100%; margin-top: 20px">
-          <el-table-column  label="风险源类型" align="center" prop="type" width="150">
-            <template #default="scope">
-              <dict-tag :options="risk_type" :value="scope.row.type" style="display: inline-block" />
-            </template>
-          </el-table-column>
-          <el-table-column prop="task_time" label="要求排查时间" width="150" />
-          <el-table-column  label="排查周期" align="center" prop="cycle" width="150">
-            <template #default="scope">
-              <dict-tag :options="risk_cycle" :value="scope.row.cycle" style="display: inline-block" />
-            </template>
-          </el-table-column>
-          <el-table-column  label="排查范围" align="center" prop="task_range" width="150">
-            <template #default="scope">
-              <dict-tag :options="risk_range" :value="scope.row.task_range" style="display: inline-block" />
-            </template>
-          </el-table-column>
-          <el-table-column prop="create_time" label="执行日期" width="150" />
-          <el-table-column prop="completed_num" label="已完成" width="100" >
-            <template #default="scope">
-              <span @click="handleClick(scope.row.completed_num, 'completed_num' )"  class="clickable-number">{{ scope.row.completed_num }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="incomplete_num" label="未完成" width="100">
-            <template #default="scope">
-              <span @click="handleClick(scope.row.uncompleted, 'incomplete_num')"  class="clickable-number">{{ scope.row.incomplete_num }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" width="150">
-            <template #default="scope">
-              <el-button size="small" @click="handleResult()">巡查结果</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+        <el-card style="margin-top: 10px" shadow="hover">
+          <el-table ref="multipleTable" v-loading="loading" :data="subtaskData" style="width: 100%">
+            <el-table-column label="风险源类型" align="center" prop="type" width="150">
+              <template #default="scope">
+                <dict-tag :options="risk_type" :value="scope.row.type" style="display: inline-block" />
+              </template>
+            </el-table-column>
+            <el-table-column prop="task_time" label="要求排查时间" width="150" />
+            <el-table-column label="排查周期" align="center" prop="cycle" width="150">
+              <template #default="scope">
+                <dict-tag :options="risk_cycle" :value="scope.row.cycle" style="display: inline-block" />
+              </template>
+            </el-table-column>
+            <el-table-column label="排查范围" align="center" prop="task_range" width="150">
+              <template #default="scope">
+                <dict-tag :options="risk_range" :value="scope.row.task_range" style="display: inline-block" />
+              </template>
+            </el-table-column>
+            <el-table-column prop="create_time" label="执行日期" width="150" />
+            <el-table-column prop="completed_num" label="已完成" width="100">
+              <template #default="scope">
+                <el-text class="common-btn-text-primary" @click="handleCompletedClick(scope.row)">{{ scope.row.completed_num }}</el-text>
+              </template>
+            </el-table-column>
+            <el-table-column prop="incomplete_num" label="未完成" width="100">
+              <template #default="scope">
+                <el-text class="common-btn-text-primary" @click="handleIncompletedClick(scope.row)">{{ scope.row.incomplete_num }}</el-text>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="150">
+              <template #default="scope">
+                <el-text class="common-btn-text-primary" @click="handleResult(scope.row)">巡查结果</el-text>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
       </el-col>
     </el-row>
     <!-- 修改弹窗 -->
     <el-dialog v-model="visible" title="修改任务" width="500px" append-to-body>
       <el-form ref="demoFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="风险源类型：" prop="type" >
+        <el-form-item label="风险源类型：" prop="type">
           <el-select v-model="form.type" placeholder="请选择风险源排查类型">
-            <el-option
-              v-for="item in risk_type"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
+            <el-option v-for="item in risk_type" :key="item.value" :label="item.label" :value="item.value"> </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="排查时间范围：" prop="publish">
@@ -120,10 +119,10 @@
             <el-radio value="4" size="large">一次</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-if="form.cycle ==='0'" label="选择时间：" prop="corn_query">
+        <el-form-item v-if="form.cycle === '0'" label="选择时间：" prop="corn_query">
           <el-date-picker v-model="form.corn_query" type="date" placeholder="选择日期时间" value-format="YYYY-MM-DD"></el-date-picker>
         </el-form-item>
-        <el-form-item v-if="form.cycle ==='1'" label="选择时间：" prop="corn_query">
+        <el-form-item v-if="form.cycle === '1'" label="选择时间：" prop="corn_query">
           <el-date-picker v-model="form.corn_query" type="month" placeholder="选择日期时间" value-format="MM"></el-date-picker>
         </el-form-item>
         <el-form-item v-if="form.cycle === '2'" label="选择时间：" prop="corn_query">
@@ -139,22 +138,18 @@
             </el-radio-group>
           </div>
         </el-form-item>
-        <el-form-item v-if="form.cycle ==='3'" label="选择时间：" prop="corn_query">
-          <el-date-picker v-model="form.corn_query" type="datetime" placeholder="选择日期时间"
-                          format="YYYY-MM-DD HH:mm:ss"
-          ></el-date-picker>
+        <el-form-item v-if="form.cycle === '3'" label="选择时间：" prop="corn_query">
+          <el-date-picker v-model="form.corn_query" type="datetime" placeholder="选择日期时间" format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
         </el-form-item>
-        <el-form-item v-if="form.cycle ==='4'" label="选择时间：" prop="corn_query">
-          <el-date-picker v-model="form.corn_query" type="datetime" placeholder="选择日期时间"
-                          format="HH:mm:ss"
-          ></el-date-picker>
+        <el-form-item v-if="form.cycle === '4'" label="选择时间：" prop="corn_query">
+          <el-date-picker v-model="form.corn_query" type="datetime" placeholder="选择日期时间" format="HH:mm:ss"></el-date-picker>
         </el-form-item>
         <el-form-item label="排查范围：" prop="task_range">
           <el-radio-group v-model="form.task_range">
-            <el-radio  value="0" size="large">市级</el-radio>
-            <el-radio  value="1" size="large">区县级</el-radio>
-            <el-radio  value="2" size="large">镇街级</el-radio>
-            <el-radio  value="3" size="large">村居级</el-radio>
+            <el-radio value="0" size="large">市级</el-radio>
+            <el-radio value="1" size="large">区县级</el-radio>
+            <el-radio value="2" size="large">镇街级</el-radio>
+            <el-radio value="3" size="large">村居级</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -163,7 +158,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-<!--    巡查结果-->
+    <!--    巡查结果-->
     <el-dialog v-model="visible" title="巡查结果" width="500px" append-to-body>
       <div v-show="showSearch">
         <el-form ref="queryFormRef" :model="queryParams">
@@ -199,7 +194,7 @@
           </el-row>
         </el-form>
       </div>
-<!--      表格组件-->
+      <!--      表格组件-->
       <el-table v-loading="loading" :data="SubtaskResultList" border style="width: 100%">
         <el-table-column prop="point_name" label="排查点" align="center" width="180" />
         <el-table-column prop="area" label="所属区划" width="180" />
@@ -211,21 +206,20 @@
       </el-table>
       <pagination v-show="total > 0" v-model:page="queryParams.page" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
     </el-dialog>
-
   </div>
+  <RiskResult v-if="riskResultState.show" :event-id="riskResultState.eventId" @close="handleCancel" />
+  <RiskCompleted v-if="risk_completedState.show" :event-id="risk_completedState.eventId" @close="handleCancel" />
+  <RiskIncomplete v-if="risk_incompleteState.show" :event-id="risk_incompleteState.eventId" @close="handleCancel" />
 </template>
 
 <script setup name="planList" lang="ts">
 import { to } from 'await-to-js';
-import {ElMessage, ElMessageBox} from 'element-plus';
-import {
-  deleteRisk,
-  getRiskDetail,
-  updatetask,
-  getSubtaskList,
-  getSubtaskResultList
-} from "@/api/inspectionWork/riskManagement";
-import {ref} from "vue";
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { deleteRisk, getRiskDetail, updatetask, getSubtaskList, getSubtaskResultList } from '@/api/inspectionWork/riskManagement';
+import { reactive, ref } from 'vue';
+import RiskResult from './riskResult.vue';
+import RiskCompleted from './risk_completed.vue';
+import RiskIncomplete from './risk_incomplete.vue';
 const divisionSelectedId = ref(null);
 const formattedDivisionData = ref([]);
 const onDivisionChange = (value) => {
@@ -254,7 +248,9 @@ const goBack = () => {
 
 const route = useRoute();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { risk_type,risk_range,risk_cycle,risk_status,risk_result } = toRefs<any>(proxy?.useDict('risk_type','risk_range','risk_cycle','risk_status','risk_result'));
+const { risk_type, risk_range, risk_cycle, risk_status, risk_result } = toRefs<any>(
+  proxy?.useDict('risk_type', 'risk_range', 'risk_cycle', 'risk_status', 'risk_result')
+);
 const subtaskData = ref([]);
 const SubtaskResultList = ref([]);
 
@@ -284,7 +280,6 @@ const detailData = ref({
   task_range: ''
 });
 
-
 let id = ref();
 let task_number = ref();
 let visible = ref(false);
@@ -301,21 +296,41 @@ let form = ref({
   corn_query: '',
   task_range: ''
 });
-
-// const handleResult = async () => {
-//   try {
-//     loading.value = true;
-//     const res = await getSubtaskResultList(subtaskData.value[0]?.id);
-//     SubtaskResultList.value = res.data;
-//   } catch (error) {
-//     console.error('获取子任务结果失败:', error);
-//   } finally {
-//     loading.value = false;
-//   }
-// }
-
-
-
+let riskResultState = reactive({
+  show: false,
+  eventId: ''
+});
+let risk_completedState = reactive({
+  show: false,
+  eventId: ''
+});
+let risk_incompleteState = reactive({
+  show: false,
+  eventId: ''
+});
+const handleCancel = () => {
+  riskResultState.show = false;
+  risk_completedState.show = false;
+  risk_incompleteState.show = false;
+};
+const handleResult = (row) => {
+  if (row) {
+    riskResultState.eventId = row.id; // 假设eventId是id字段
+    riskResultState.show = true;
+  }
+};
+const handleCompletedClick = (row) => {
+  if (row) {
+    risk_completedState.eventId = row.id; // 假设eventId是id字段
+    risk_completedState.show = true;
+  }
+};
+const handleIncompletedClick = (row) => {
+  if (row) {
+    risk_incompleteState.eventId = row.id; // 假设eventId是id字段
+    risk_incompleteState.show = true;
+  }
+};
 /** 编辑按钮操作 */
 const planUpdate = async () => {
   resetForm();
@@ -392,15 +407,12 @@ const submitForm = () => {
   });
 };
 
-
-
 onMounted(() => {
   task_number.value = route.query.id;
   getRiskDetail(task_number.value).then((res) => {
     detailData.value = res.data;
   });
   getSubtaskList(task_number.value).then((res) => {
-
     subtaskData.value = res.data;
   });
   // getSubtaskResultList(subtaskData.value[0]?.id).then((res) => {
@@ -414,5 +426,4 @@ onMounted(() => {
   color: blue;
   cursor: pointer;
 }
-
 </style>