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

src/api/inspectionWork/inspector.ts

@@ -0,0 +1,56 @@
+import request from '@/utils/request';
+import {uploadEventCasualties} from "@/api/duty/eventing";
+// 查询部门列表
+export function deptList(params) {
+  return request({
+    url: '/api/riskManagement/allAreas',
+    method: 'get',
+    params: params
+  });
+}
+// 查询用户列表
+export function inspectorList(params) {
+  return request({
+    url: '/api/riskManagement/inspection/user/list',
+    method: 'get',
+    params: params
+  });
+}
+// 查询用户详情
+export function inspectorDetail(id) {
+  return request({
+    url: '/api/riskManagement/inspection/user/' + id,
+    method: 'get',
+    params: id
+  });
+}
+export function inspectorUpload(data) {
+  return request({
+    url: '/api/riskManagement/inspection/user/update',
+    method: 'put',
+    data: data
+  });
+}
+export function inspectorAdd(data) {
+  return request({
+    url: '/api/riskManagement/inspection/user/create',
+    method: 'post',
+    data: data
+  });
+}
+// 获取新建用户列表
+export function userList(params) {
+  return request({
+    url: '/api/riskManagement/inspection/user/',
+    method: 'get',
+    params: params
+  });
+}
+// 获取新建用户列表
+export function workList(params) {
+  return request({
+    url: '/api/riskManagement/inspection/task/list',
+    method: 'get',
+    params: params
+  });
+}

src/views/inspectionWork/inspector.vue

@@ -1,11 +1,184 @@
+<template>
+  <div v-show="!inspectorEditState.show && !inspectorAddState.show" class="app-container">
+    <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-row :gutter="20">
+                <el-col :span="8">
+                  <el-form-item prop="username">
+                    <el-input v-model="queryParams.username" placeholder="请输入巡查人员" clearable />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <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">
+          <el-col :span="1.5">
+            <el-button type="primary" icon="Plus" @click="handleAdd()">新建</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Top" @click="handleImport()"> 批量导入 </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain :disabled="multiple" icon="Delete" @click="handleDelete()"> 删除 </el-button>
+          </el-col>
+        </el-row>
+        <el-table ref="multipleTable" v-loading="loading" :data="tableData" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="姓名" align="center" prop="username" />
+          <el-table-column label="联系方式" align="center" prop="phone" />
+          <el-table-column label="粤政易组织" align="center" prop="yzy_organization" />
+          <el-table-column label="责任区划" align="center" prop="division_responsibility" />
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template #default="scope">
+              <el-text class="common-btn-text-primary" @click="handleUpdate(scope.row)">编辑</el-text>
+              <el-text class="common-btn-text-danger" @click="handleDelete(scope.row)">删除</el-text>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination v-show="total > 0" v-model:page="queryParams.page" v-model:limit="queryParams.pageSize" :total="total" @pagination="tableData" />
+      </el-col>
+    </el-row>
+  </div>
+  <InspectorEdit v-if="inspectorEditState.show" :event-id="inspectorEditState.eventId" @close="handleCancel" />
+  <InspectorAdd v-if="inspectorAddState.show" :event-id="inspectorAddState.eventId" @close="handleCancel" />
+</template>
+
 <script setup lang="ts">
+import { onMounted, reactive, ref, watch } from 'vue';
+import { useRouter } from 'vue-router';
+import { deptList, inspectorList } from '@/api/inspectionWork/inspector';
+import InspectorEdit from './inspectorEdit.vue';
+import InspectorAdd from './inspectorAdd.vue';
+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([]);
 
-</script>
+const initFormData = reactive({
+  username: '',
+  phone: '',
+  yzy_organization: '',
+  division_responsibility: '',
+  id: ''
+});
 
-<template>
+const data = reactive({
+  form: { ...initFormData },
+  queryParams: {
+    page: 1,
+    pageSize: 10,
+    nickName: '',
+    deptId: ''
+  }
+});
 
-</template>
+const { queryParams, form } = toRefs(data);
 
-<style scoped lang="scss">
+const filterNode = (value: string, data: any) => {
+  if (!value) return true;
+  return data.label.indexOf(value) !== -1;
+};
 
+const getTreeSelect = async () => {
+  const res = await deptList();
+  deptOptions.value = res.data; // 直接赋值给 deptOptions
+  loading.value = false; // 加载完成后关闭加载提示
+};
+
+const fetchUserData = async () => {
+  const res = await inspectorList(queryParams.value); // 调用 inspectorList 接口
+  tableData.value = res.data.map((item) => ({
+    id: item.id,
+    username: item.user_name,
+    phone: item.phonenumber,
+    yzy_organization: item.yzy_account || '', // 如果 yzy_account 为空，则显示空字符串
+    division_responsibility: item.area // 显示责任区划
+  }));
+  total.value = res.total;
+};
+
+// 监听查询参数变化并重新获取数据
+watch(queryParams, () => {
+  fetchUserData();
+});
+let inspectorEditState = reactive({
+  show: false,
+  eventId: ''
+});
+let inspectorAddState = reactive({
+  show: false
+});
+const handleCancel = () => {
+  inspectorEditState.show = false;
+  inspectorAddState.show = false;
+};
+const handleImport = () => {
+  // 实现导入逻辑
+};
+
+const handleAdd = async () => {
+  inspectorAddState.show = true;
+};
+
+const handleUpdate = (row) => {
+  if (row) {
+    inspectorEditState.eventId = row.id; // 假设eventId是id字段
+    inspectorEditState.show = true;
+  }
+};
+const handleQuery = () => {
+  queryParams.value.page = 1;
+  fetchUserData();
+};
+// 重置查询条件
+const resetQuery = () => {
+  queryParams.value = { page: 1, pageSize: 10, nickName: '', deptId: '' };
+  handleQuery();
+};
+const handleSelectionChange = (selection) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+onMounted(async () => {
+  await getTreeSelect();
+  fetchUserData();
+});
+</script>
+<style scoped>
+.mt-2 {
+  max-width: 300px; /* 设置最大宽度 */
+  max-height: 800px; /* 设置最大高度 */
+  overflow-y: auto; /* 如果内容超出高度则显示滚动条 */
+}
 </style>

src/views/inspectionWork/inspectorAdd.vue

@@ -0,0 +1,59 @@
+<template>
+  <div class="common-dialog">
+    <div class="common-dialog-content">
+      <div class="common-dialog-title-box">
+        <h3 class="common-dialog-title">新建巡查人员</h3>
+      </div>
+      <div class="common-dialog-box">
+        <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
+          <el-form-item label="姓名：" prop="nick_name">
+            <el-input v-model="formData.nick_name" style="width: 468px !important" />
+          </el-form-item>
+          <el-form-item label="粤政易组织：" prop="yzy_account">
+            <el-input v-model="formData.yzy_account" style="width: 468px !important" />
+          </el-form-item>
+          <el-form-item label="联系方式：" prop="phonenumber">
+            <el-input v-model="formData.phonenumber" style="width: 468px !important" />
+          </el-form-item>
+          <el-form-item label="责任区划：" prop="area">
+            <el-input v-model="formData.area" style="width: 468px !important" />
+          </el-form-item>
+        </el-form>
+        <div class="common-dialog-footer">
+          <el-button @click="closeDialog">取消</el-button>
+          <el-button type="primary" @click="submitForm">确定</el-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import { inspectorAdd } from '@/api/inspectionWork/inspector';
+import { ref, watch } from 'vue';
+import { ElMessage } from 'element-plus';
+const emits = defineEmits(['close']);
+const props = defineProps<{
+  eventId: string | number;
+}>();
+const formData = ref({
+  nick_name: '',
+  phonenumber: '',
+  yzy_account: '',
+  area: ''
+});
+const closeDialog = () => {
+  emits('close');
+};
+// 提交表单
+const submitForm = async () => {
+  // 假设表单已经通过验证
+  const response = await inspectorAdd(formData.value);
+  if (response.code === 200) {
+    ElMessage.success('提交成功');
+    closeDialog(); // 关闭对话框
+  } else {
+    ElMessage.error(response.msg);
+  }
+};
+</script>
+<style scoped></style>

src/views/inspectionWork/inspectorEdit.vue

@@ -0,0 +1,76 @@
+<template>
+  <div class="common-dialog">
+    <div class="common-dialog-content">
+      <div class="common-dialog-title-box">
+        <h3 class="common-dialog-title">修改巡查人员</h3>
+      </div>
+      <div class="common-dialog-box">
+        <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
+          <el-form-item label="姓名：" prop="nick_name">
+            <el-input v-model="formData.nick_name" style="width: 468px !important" />
+          </el-form-item>
+          <el-form-item label="粤政易组织：" prop="yzy_account">
+            <el-input v-model="formData.yzy_account" style="width: 468px !important" />
+          </el-form-item>
+          <el-form-item label="联系方式：" prop="phonenumber">
+            <el-input v-model="formData.phonenumber" style="width: 468px !important" />
+          </el-form-item>
+          <el-form-item label="责任区划：" prop="area">
+            <el-input v-model="formData.area" style="width: 468px !important" />
+          </el-form-item>
+        </el-form>
+        <div class="common-dialog-footer">
+          <el-button @click="closeDialog">取消</el-button>
+          <el-button type="primary" @click="submitForm">确定</el-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import { inspectorDetail, inspectorUpload } from '@/api/inspectionWork/inspector';
+import { ref, watch } from 'vue';
+import { ElMessage } from 'element-plus';
+const emits = defineEmits(['close']);
+const props = defineProps<{
+  eventId: string | number;
+}>();
+const formData = ref({
+  nick_name: '',
+  phonenumber: '',
+  yzy_account: '',
+  area: ''
+});
+const fetchDetail = async () => {
+  const response = await inspectorDetail(props.eventId);
+  if (response.code === 200) {
+    formData.value = response.data;
+  } else {
+    ElMessage.error(response.msg);
+  }
+};
+watch(
+  () => props.eventId,
+  (newVal) => {
+    if (newVal) {
+      fetchDetail();
+    }
+  },
+  { immediate: true }
+);
+const closeDialog = () => {
+  emits('close');
+};
+// 提交表单
+const submitForm = async () => {
+  // 假设表单已经通过验证
+  const response = await inspectorUpload(formData.value);
+  if (response.code === 200) {
+    ElMessage.success('提交成功');
+    closeDialog(); // 关闭对话框
+  } else {
+    ElMessage.error(response.msg);
+  }
+};
+</script>
+<style scoped></style>

src/views/inspectionWork/patrolTask.vue

@@ -1,11 +1,189 @@
-<script setup lang="ts">
-
-</script>
-
 <template>
+  <div>
+    <div class="app-container">
+      <div>
+        <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="business" label-width="auto">
+                    <el-select v-model="queryParams.business" placeholder="全部" clearable>
+                      <el-option v-for="item in businessOptions" :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="巡查周期：" prop="cycle" label-width="auto">
+                    <el-select v-model="queryParams.cycle" 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-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="handleAdd">新建</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain :disabled="multiple" icon="Delete" @click="handleDelete()"> 删除 </el-button>
+          </el-col>
+        </el-row>
+        <!-- 表格组件 -->
+        <el-table ref="multipleTable" v-loading="loading" :data="tableData" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="任务编号" align="center" prop="task_number" />
+          <el-table-column label="巡查任务" align="center">
+            <template #default="scope">
+              {{ convertStatus(scope.row.business, 'business') }}
+            </template>
+          </el-table-column>
+          <el-table-column label="巡查时间范围" width="200" align="center" prop="task_time" />
+          <el-table-column label="巡查周期" align="center">
+            <template #default="scope">
+              {{ convertStatus(scope.row.cycle, 'cycle') }}
+            </template>
+          </el-table-column>
+          <el-table-column label="巡查范围" align="center">
+            <template #default="scope">
+              {{ convertStatus(scope.row.inspection_range, 'inspection_range') }}
+            </template>
+          </el-table-column>
+          <el-table-column label="创建人" align="center" prop="create_user" />
+          <el-table-column label="创建时间" align="center" prop="create_time" />
+          <el-table-column label="任务状态" align="center">
+            <template #default="scope">
+              {{ convertStatus(scope.row.task_status, 'task_status') }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template #default="scope">
+              <el-text class="common-btn-text-primary" @click="handleUpdate(scope.row)">编辑</el-text>
+              <el-text class="common-btn-text-danger" @click="handleWork(scope.row)">完成任务</el-text>
+              <el-text class="common-btn-text-danger" @click="handleDelete(scope.row)">删除</el-text>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination v-show="total > 0" v-model:page="queryParams.page" v-model:limit="queryParams.pageSize" :total="total" @pagination="tableData" />
+      </div>
+    </div>
+  </div>
 </template>
+<script setup lang="ts">
+import { onMounted, reactive, ref } from 'vue';
+import { workList } from '@/api/inspectionWork/inspector';
+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 initFormData = reactive({
+  task_number: '',
+  business: '',
+  task_time: '',
+  cycle: '',
+  id: '',
+  inspection_range: '',
+  task_status: '',
+  create_time: '',
+  create_user: ''
+});
+const data = reactive({
+  form: { ...initFormData },
+  queryParams: {
+    page: 1,
+    pageSize: 10,
+    business: '',
+    cycle: ''
+  }
+});
+const { queryParams, form } = toRefs(data);
+// 巡查业务选项
+const businessOptions = [
+  { value: '', label: '全部' },
+  { value: '0', label: '城市隐患巡查' },
+  { value: '1', label: '森林防火巡查' },
+  { value: '2', label: '重点危化企业巡查' },
+  { value: '3', label: '重点水库水位巡查' }
+];
 
-<style scoped lang="scss">
+// 巡查周期选项
+const cycleOptions = [
+  { value: '', label: '全部' },
+  { value: '0', label: '每年' },
+  { value: '1', label: '每月' },
+  { value: '2', label: '每周' },
+  { value: '3', label: '每日' },
+  { value: '4', label: '一次' }
+];
+// 转换状态的方法
+function convertStatus(value, type) {
+  const statusMapping = {
+    business: {
+      '0': '城市隐患巡查',
+      '1': '森林防火巡查',
+      '2': '重点危化企业巡查',
+      '3': '重点水库水位巡查'
+    },
+    cycle: {
+      '0': '每年',
+      '1': '每月',
+      '2': '每周',
+      '3': '每日',
+      '4': '一次'
+    },
+    inspection_range: {
+      '0': '市级',
+      '1': '区县级',
+      '2': '镇街级',
+      '3': '村居级'
+    },
+    task_status: {
+      '0': '未开始',
+      '1': '进行中',
+      '2': '未完成',
+      '3': '已完结'
+    }
+  };
 
-</style>
+  return statusMapping[type]?.[value] || value;
+}
+const fetchWorkrData = () => {
+  loading.value = true;
+  workList(queryParams.value)
+    .then((res) => {
+      tableData.value = res.data;
+      total.value = res.total;
+    })
+    .finally(() => {
+      loading.value = false;
+    });
+};
+const handleQuery = () => {
+  queryParams.value.page = 1;
+  fetchWorkrData();
+};
+// 重置查询条件
+const resetQuery = () => {
+  queryParams.value = { page: 1, pageSize: 10, business: '', cycle: '' };
+  handleQuery();
+};
+const handleSelectionChange = (selection) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+onMounted(() => {
+  fetchWorkrData();
+});
+</script>

src/views/inspectionWork/riskManagement.vue

@@ -50,7 +50,8 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-text  class="common-btn-text-primary" @click="handleView(scope.row)">查看</el-text>
-          <el-text  class="common-btn-text-primary" @click="handleUpdate(scope.row)">修改</el-text>
+          <el-text  class="common-btn-text-primary" @click="handleUpdate(scope.row)">编辑</el-text>
+          <el-text  class="common-btn-text-primary" @click="handlefinal">完结任务</el-text>
           <el-text  class="common-btn-text-danger" @click="handleDelete(scope.row)">删除</el-text>
         </template>
       </el-table-column>
@@ -109,6 +110,7 @@ import { useRouter } from 'vue-router';
 import { getPlanDetail, getPlanList, updateReport, deletePlan, addReport } from '@/api/riskPrevention/planManage';
 import { addDateRange2 } from '@/utils/ruoyi';
 import { to } from 'await-to-js';
+import  { ElMessageBox } from 'element-plus';
 
 const router = useRouter();
 const demoFormRef = ref(null);
@@ -123,8 +125,9 @@ const total = ref(0);
 const selectedRow = ref<PlanVO | null>(null);
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { mm_event_type, plan_type } = toRefs<any>(proxy?.useDict('plan_type', 'mm_event_type'));
-
 const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
+
+
 const planForm = reactive<PlanForm>({
   page: 1,
   pageSize: 10,
@@ -143,14 +146,21 @@ let form = ref({
   fileList: []
 });
 
-const rules = reactive({
-  planName: [{ required: true, message: '预案名称不能为空', trigger: 'blur' }],
-  planType: [{ required: true, message: '预案类型不能为空', trigger: 'blur' }],
-  document: [{ required: true, message: '发文字号不能为空', trigger: 'blur' }],
-  event_type: [{ required: true, message: '对应事件类型不能为空', trigger: 'blur' }],
-  organizingUnit: [{ required: true, message: '编制单位不能为空', trigger: 'blur' }],
-  publishDate: [{ required: true, message: '发布日期不能为空', trigger: 'blur' }]
-});
+const handlefinal = () => {
+  ElMessageBox.confirm('确定要完结任务吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    // 用户点击“确定”时的逻辑
+    console.log('任务已完结');
+    // 可以在这里添加更多完结任务的逻辑
+  }).catch(() => {
+    // 用户点击“取消”时的逻辑
+    console.log('任务未完结');
+  });
+};
+
 
 const planTypeSelection = ref([]);
 
@@ -161,16 +171,17 @@ const dialog = reactive({
 
 const getList = async () => {
   loading.value = true;
-  const res = await getPlanList(addDateRange2(planForm, dateRange.value));
+  const res = await getPlanList(addDateRange2(planForm, dateRange.value));  //调用预案列表的接口
   loading.value = false;
   demoList.value = res.data;
   total.value = res.total;
 };
+// 搜索功能
 const handleQuery = () => {
   planForm.page = 1;
   getList();
 };
-
+//重置功能
 const resetQuery = () => {
   planForm.page = 1;
   planForm.planType = '';
@@ -198,7 +209,7 @@ const handleUpdate = async (row: PlanVO) => {
     const res = await getPlanDetail(row.planId);
     form.value = res.data;
     dialog.visible = true;
-    dialog.title = '修改预案';
+    dialog.title = '修改任务';
   }
 };
 
@@ -214,17 +225,17 @@ const handleDelete = async (row) => {
 
 const handleView = (row: PlanVO) => {
   router.push({
-    path: '/riskPrevention/planManage/planList',
+    path: '/inspectionWork/riskdetails',
     query: { planId: row.planId }
   });
 };
-
+// 提交表单按钮
 const submitForm = () => {
   demoFormRef.value?.validate(async (valid) => {
     if (valid) {
       try {
         buttonLoading.value = true;
-        form.value.planId ? await updateReport(form.value) : await addReport(form.value);
+        form.value.planId ? await updateReport(form.value) : await addReport(form.value); //根据 form.value.planId 是否存在，调用 updateReport 或 addReport 方法
         proxy?.$modal.msgSuccess(form.value.planId ? '修改成功' : '新增成功');
         dialog.visible = false;
         getList();
@@ -234,7 +245,7 @@ const submitForm = () => {
     }
   });
 };
-
+// 重置表单数据和表单验证状态
 const resetForm = () => {
   form.value = {
     planId: '',
@@ -245,7 +256,7 @@ const resetForm = () => {
     publishDate: '',
     event_type: ''
   };
-  demoFormRef.value?.resetFields();
+  demoFormRef.value?.resetFields();  // 重置表单的验证状态
 };
 
 const cancel = () => {
@@ -253,6 +264,7 @@ const cancel = () => {
   dialog.visible = false;
 };
 
+
 onMounted(() => {
   getList();
   getDicts('mm_event_type').then((res) => {

src/views/inspectionWork/riskdetails.vue

@@ -0,0 +1,253 @@
+<!--任务详情页-->
+<template>
+  <div class="app-container p-2">
+    <el-row :gutter="20">
+      <!-- 基础信息 -->
+      <el-col :lg="30" :xs="24" style="">
+        <el-form-item>
+          <div class="back-btn" @click="goBack">
+            <el-icon><Back /></el-icon>
+            返回上一级
+          </div>
+        </el-form-item>
+        <el-row :span="24" :gutter="10">
+          <el-col :span="20" label="预案名称">
+            <h2 key="planName" style="font-weight: bolder">{{ detailData.planName }}</h2>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" @click="planUpdate()"> 编辑 </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" @click="handlefinal"> 完结任务 </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" @click="handleDelete"> 删除 </el-button>
+          </el-col>
+        </el-row>
+        <div class="line" style="background: #e7e7e7; width: auto; height: 0.6px; position: relative"></div>
+        <h3>基础信息</h3>
+        <el-card style="margin-top: 10px" shadow="hover">
+          <el-descriptions title="">
+            <el-descriptions-item key="planId" label="任务编号：">{{ detailData.planId }}</el-descriptions-item>
+            <el-descriptions-item key="planType" label="风险源类型：">
+              <dict-tag :options="plan_type" :value="detailData.planType" style="display: inline-block" />
+            </el-descriptions-item>
+            <el-descriptions-item key="publishDate" label="创建时间：">{{ detailData.publishDate }}</el-descriptions-item>
+            <el-descriptions-item key="organizingUnit" label="创建人：">{{ detailData.organizingUnit }}</el-descriptions-item>
+            <el-descriptions-item key="publishDate" label="排查时间范围：">{{ detailData.publishDate }}</el-descriptions-item>
+            <el-descriptions-item key="publishDate" label="排查周期：">{{ detailData.publishDate }}</el-descriptions-item>
+            <el-descriptions-item key="publishDate" label="排查范围：">{{ detailData.publishDate }}</el-descriptions-item>
+            <el-descriptions-item key="event_type" label="任务状态：">
+              <dict-tag :options="mm_event_type" :value="detailData.event_type" style="display: inline-block" />
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-card>
+        <h3>子任务记录</h3>
+        <el-table :data="tableData" style="width: 100%; margin-top: 20px">
+          <el-table-column prop="riskSourceType" label="风险源类型" width="150">
+            <template #default="scope">
+              <dict-tag :options="plan_type" :value="scope.row.riskSourceType" style="display: inline-block" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="requiredCheckTime" label="要求排查时间" width="150"></el-table-column>
+          <el-table-column prop="checkCycle" label="排查周期" width="150"></el-table-column>
+          <el-table-column prop="checkRange" label="排查范围" width="150"></el-table-column>
+          <el-table-column prop="executionDate" label="执行日期" width="150"></el-table-column>
+          <el-table-column prop="completed" label="已完成" width="100">
+            <template #default="scope">
+              <span @click="handleClick(scope.row.completed, 'completed')">{{ scope.row.completed }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="uncompleted" label="未完成" width="100">
+            <template #default="scope">
+              <span @click="handleClick(scope.row.uncompleted, 'uncompleted')">{{ scope.row.uncompleted }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="150">
+            <template #default="scope">
+              <el-button size="small" @click="handleresult(scope.$index, scope.row)">巡查结果</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </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="planName">
+          <el-input v-model="form.planName" placeholder="请选择风险源排查类型" />
+        </el-form-item>
+        <el-form-item label="排查时间范围：" prop="publishDate">
+          <el-date-picker v-model="dateRange" type="daterange" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="排查周期：" prop="organizingUnit">
+          <el-checkbox-group v-model="form.organizingUnit">
+            <el-checkbox label="选项1">每年</el-checkbox>
+            <el-checkbox label="选项2">每月</el-checkbox>
+            <el-checkbox label="选项3">每周</el-checkbox>
+            <el-checkbox label="选项4">每天</el-checkbox>
+            <el-checkbox label="选项4">一次</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+        <el-form-item label="排查范围：" prop="organizingUnit">
+          <el-checkbox-group v-model="form.organizingUnit">
+            <el-checkbox label="选项1">市级</el-checkbox>
+            <el-checkbox label="选项2">区县级</el-checkbox>
+            <el-checkbox label="选项3">镇街级</el-checkbox>
+            <el-checkbox label="选项4">村居量</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确定</el-button>
+          <el-button @click="cancel">取消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="planList" lang="ts">
+import { to } from 'await-to-js';
+import { deletePlan, getPlanDetail, updateReport } from '@/api/riskPrevention/planManage';
+import  { ElMessageBox } from 'element-plus';
+const router = useRouter();
+
+const goBack = () => {
+  proxy?.$tab.closePage();
+};
+
+const route = useRoute();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { mm_event_type, plan_type } = toRefs<any>(proxy?.useDict('plan_type', 'mm_event_type'));
+
+//已完成/未完成的页面跳转
+const handleClick = (value: number, type: string) => {
+  if (type === 'completed') {
+    router.push({
+      name: 'CompletedDetails', // 替换为实际的路由名称
+      params: { value }
+    });
+  } else if (type === 'uncompleted') {
+    router.push({
+      name: 'UncompletedDetails', // 替换为实际的路由名称
+      params: { value }
+    });
+  }
+};
+
+// 预案编辑
+let detailData = ref({
+  planId: '',
+  planName: '',
+  planType: '',
+  publishDate: '',
+  organizingUnit: '',
+  document: '',
+  event_type: '',
+  fileList: []
+});
+let planId = ref();
+let visible = ref(false);
+const demoFormRef = ref(null);
+const buttonLoading = ref(false);
+let form = ref({
+  planId: '',
+  planName: '',
+  planType: '',
+  document: '',
+  organizingUnit: '',
+  publishDate: '',
+  event_type: '',
+  fileList: []
+});
+const rules = reactive({
+  planName: [{ required: true, message: '预案名称不能为空', trigger: 'blur' }],
+  planType: [{ required: true, message: '预案类型不能为空', trigger: 'blur' }],
+  document: [{ required: true, message: '发文字号不能为空', trigger: 'blur' }],
+  event_type: [{ required: true, message: '对应事件类型不能为空', trigger: 'blur' }],
+  organizingUnit: [{ required: true, message: '编制单位不能为空', trigger: 'blur' }],
+  publishDate: [{ required: true, message: '发布日期不能为空', trigger: 'blur' }]
+});
+/** 修改按钮操作 */
+const planUpdate = async () => {
+  resetForm();
+  const res = await getPlanDetail(planId.value);
+  form.value = res.data;
+  visible.value = true;
+};
+
+const handlefinal = () => {
+  ElMessageBox.confirm('确定要完结任务吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    // 用户点击“确定”时的逻辑
+    console.log('任务已完结');
+    // 可以在这里添加更多完结任务的逻辑
+  }).catch(() => {
+    // 用户点击“取消”时的逻辑
+    console.log('任务未完结');
+  });
+};
+
+const resetForm = () => {
+  form.value = {
+    planId: '',
+    planName: '',
+    planType: '',
+    document: '',
+    organizingUnit: '',
+    publishDate: '',
+    event_type: '',
+    fileList: []
+  };
+  demoFormRef.value?.resetFields();
+};
+/** 删除按钮操作 */
+const handleDelete = async () => {
+  const [err] = await to(proxy?.$modal.confirm('是否确认删除该条预案？') as any);
+  if (!err) {
+    await deletePlan([detailData.value.planId]);
+    proxy?.$modal.msgSuccess('删除成功');
+    router.go(-1);
+  }
+};
+const cancel = () => {
+  resetForm();
+  visible.value = false;
+};
+
+/** 提交修改 */
+const submitForm = () => {
+  demoFormRef.value?.validate(async (valid) => {
+    if (valid) {
+      try {
+        buttonLoading.value = true;
+        await updateReport(form.value);
+        proxy?.$modal.msgSuccess('修改成功');
+        visible.value = false;
+        getPlanDetail(planId.value).then((res) => {
+          detailData.value = res.data;
+        });
+      } finally {
+        buttonLoading.value = false;
+      }
+    }
+  });
+};
+
+const baseUrl = import.meta.env.VITE_APP_BASE_API;
+
+
+onMounted(() => {
+  planId.value = route.query.planId;
+  getPlanDetail(planId.value).then((res) => {
+    detailData.value = res.data;
+  });
+});
+</script>
+
+<style lang="scss" scoped></style>