diff --git a/src/api/longoPeration/CaseIssues.js b/src/api/longoPeration/CaseIssues.js
new file mode 100644
index 0000000..bb8c1b1
--- /dev/null
+++ b/src/api/longoPeration/CaseIssues.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request';
+// 列表分页
+export function rectifypage(query) {
+  return request({
+    url: '/business/patrolProblemRectify/rectifypage',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 下拉框
+export function projectCompanyList(query) {
+  return request({
+    url: '/business/projectCompany/list',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 修改
+export function patrolProblemRectifyedit(data) {
+  return request({
+    url: '/business/patrolProblemRectify/edit',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 删除排水防涝--防汛物资
+export function FloodPreventionMaterialdelete(id) {
+  return request({
+    url: '/business/floodPreventionMaterial/' + id,
+    method: 'delete',
+  });
+}

diff --git a/src/api/longoPeration/CaseIssues.js b/src/api/longoPeration/CaseIssues.js
new file mode 100644
index 0000000..bb8c1b1
--- /dev/null
+++ b/src/api/longoPeration/CaseIssues.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request';
+// 列表分页
+export function rectifypage(query) {
+  return request({
+    url: '/business/patrolProblemRectify/rectifypage',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 下拉框
+export function projectCompanyList(query) {
+  return request({
+    url: '/business/projectCompany/list',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 修改
+export function patrolProblemRectifyedit(data) {
+  return request({
+    url: '/business/patrolProblemRectify/edit',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 删除排水防涝--防汛物资
+export function FloodPreventionMaterialdelete(id) {
+  return request({
+    url: '/business/floodPreventionMaterial/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/api/longoPeration/Inspectionplana.js b/src/api/longoPeration/Inspectionplana.js
index 311bce8..934f156 100644
--- a/src/api/longoPeration/Inspectionplana.js
+++ b/src/api/longoPeration/Inspectionplana.js
@@ -17,10 +17,10 @@
   });
 }
 
-// 新增排水防涝--防汛物资
-export function FloodPreventionMaterialadd(data) {
+// 新增
+export function patrolPlanadd(data) {
   return request({
-    url: '/business/floodPreventionMaterial/add',
+    url: '/business/patrolPlan/add',
     method: 'post',
     data: data,
   });

diff --git a/src/api/longoPeration/CaseIssues.js b/src/api/longoPeration/CaseIssues.js
new file mode 100644
index 0000000..bb8c1b1
--- /dev/null
+++ b/src/api/longoPeration/CaseIssues.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request';
+// 列表分页
+export function rectifypage(query) {
+  return request({
+    url: '/business/patrolProblemRectify/rectifypage',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 下拉框
+export function projectCompanyList(query) {
+  return request({
+    url: '/business/projectCompany/list',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 修改
+export function patrolProblemRectifyedit(data) {
+  return request({
+    url: '/business/patrolProblemRectify/edit',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 删除排水防涝--防汛物资
+export function FloodPreventionMaterialdelete(id) {
+  return request({
+    url: '/business/floodPreventionMaterial/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/api/longoPeration/Inspectionplana.js b/src/api/longoPeration/Inspectionplana.js
index 311bce8..934f156 100644
--- a/src/api/longoPeration/Inspectionplana.js
+++ b/src/api/longoPeration/Inspectionplana.js
@@ -17,10 +17,10 @@
   });
 }
 
-// 新增排水防涝--防汛物资
-export function FloodPreventionMaterialadd(data) {
+// 新增
+export function patrolPlanadd(data) {
   return request({
-    url: '/business/floodPreventionMaterial/add',
+    url: '/business/patrolPlan/add',
     method: 'post',
     data: data,
   });
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 755559f..634a38d 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -37,23 +37,23 @@
     <el-table :data="dataList" v-loading="loading" stripe :max-height="280">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="巡查任务名称" prop="taskName" />
-      <el-table-column label="项目名称" prop="expiredDays" />
-      <el-table-column label="项目起止年月" prop="issuedDatetime" />
-      <el-table-column label="建设进度(%)" prop="expiredDays" />
-      <el-table-column label="巡查人员" prop="taskUserIdList">
+      <el-table-column label="项目名称" prop="projectName" />
+      <el-table-column label="项目开始时间" prop="projectStartTime" />
+      <el-table-column label="项目结束时间" prop="projectEndTime" />
+      <el-table-column label="建设进度(%)" prop="projectProgress" />
+      <el-table-column label="巡查人员" prop="useridlist">
         <template #default="scope">
-          <p v-for="item in scope.row.taskUserList">{{ item.userName }}</p>
+          <p v-for="item in scope.row.useridlist">{{ item.userName }}</p>
         </template>
       </el-table-column>
       <el-table-column label="巡查需整改问题" prop="expiredDays" />
-
-      <el-table-column label="项目整改状态" prop="issuedDatetime" />
-      <el-table-column label="巡查类型" prop="patrolType">
+      <el-table-column label="项目整改状态" prop="problemtitle" />
+      <el-table-column label="巡查类型" prop="patroltype">
         <template #default="scope">
-          <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
+          <dict-tag :options="patrol_type" :value="String(scope.row.patroltype)" />
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" prop="expiredDays" />
+      <el-table-column label="创建时间" prop="createTime" />
       <el-table-column label="操作" width="350">
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
@@ -81,71 +81,71 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="整改方式:" prop="method">
-              <el-input v-model="form.method" placeholder="请输入整改方式" />
+            <el-form-item label="整改方式:" prop="rectifyType">
+              <el-input v-model="form.rectifyType" placeholder="请输入整改方式" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="督办事项:" prop="warning">
-              <el-input v-model="form.warning" type="textarea" placeholder="请输入督办事项" />
+            <el-form-item label="督办事项:" prop="supervisionWork">
+              <el-input v-model="form.supervisionWork" type="textarea" placeholder="请输入督办事项" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="存在问题:" prop="problem">
-              <el-input v-model="form.problem" type="textarea" placeholder="请输入存在问题" />
+            <el-form-item label="存在问题:" prop="haveProblem">
+              <el-input v-model="form.haveProblem" type="textarea" placeholder="请输入存在问题" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="建设单位:" prop="projectCodeList">
-              <el-select v-model="form.projectCodeList" multiple placeholder="请选择建设单位" clearable style="width: 100%">
-                <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
+            <el-form-item label="建设单位:" prop="projectCompanyId">
+              <el-select v-model="form.projectCompanyId" placeholder="请选择建设单位" clearable style="width: 100%">
+                <el-option v-for="proj in ConstructionUnit" :key="proj.id" :label="proj.unitName" :value="proj.id" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="整改时限:" prop="timeRange">
-              <el-date-picker v-model="form.timeRange" multiple placeholder="请选择整改时限" clearable style="width: 100%">
+            <el-form-item label="整改时限:" prop="rectifyTime">
+              <el-date-picker v-model="form.rectifyTime" multiple placeholder="请选择整改时限" clearable style="width: 100%">
               </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="责任领导:" prop="administrant">
-              <el-input v-model="form.administrant" placeholder="请输入责任领导" clearable style="width: 100%" />
+            <el-form-item label="责任领导:" prop="leaderName">
+              <el-input v-model="form.leaderName" placeholder="请输入责任领导" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="电话:" prop="administrantPho">
-              <el-input v-model="form.administrantPho" placeholder="请输入责任领导电话" clearable style="width: 100%" />
+            <el-form-item label="电话:" prop="leaderPhone">
+              <el-input v-model="form.leaderPhone" placeholder="请输入责任领导电话" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="责任人:" prop="administrant">
-              <el-input v-model="form.administrant" placeholder="请输入责任人" clearable style="width: 100%" />
+            <el-form-item label="责任人:" prop="peopleName">
+              <el-input v-model="form.peopleName" placeholder="请输入责任人" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="电话:" prop="administrantPho">
-              <el-input v-model="form.administrantPho" placeholder="请输入责任人电话" clearable style="width: 100%" />
+            <el-form-item label="电话:" prop="peoplePhone">
+              <el-input v-model="form.peoplePhone" placeholder="请输入责任人电话" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="整改书:" prop="reportList">
+            <el-form-item label="整改书:" prop="fileListToNotice">
               <ImageFileUpload
                 :limit="1"
-                :saveFileArr="form.reportList"
+                v-model:saveFileArr="form.fileListToNotice"
                 :listType="'text'"
                 :refField="'trfield'"
-                :refType="'tr_site_info'"
+                :refType="'problem_notice'"
                 :fileType="['jpg', 'png', 'jpeg', 'pdf']"
               ></ImageFileUpload>
             </el-form-item>
@@ -179,11 +179,12 @@
   </div>
 </template>
 <script setup name="CaseIssues">
-import { patrolTaskpage, patrolTaskadd, patrolBasicInfopage } from '@/api/longoPeration/inspectiontasks';
+import { rectifypage, patrolProblemRectifyedit, projectCompanyList } from '@/api/longoPeration/CaseIssues';
 import { getProjectInfoList } from '@/api/preassess/targetManage';
-import { listUser } from '@/api/system/user';
+
 import anjianPopup from '../longoPeration/Patrolmanagement/anjianPopup.vue'; //详情弹框
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
+import { validPhone } from '@/utils/validate';
 const { proxy } = getCurrentInstance();
 const { patrol_type } = proxy.useDict('patrol_type'); //  巡查类型的字典
 const open = ref(false);
@@ -203,6 +204,7 @@
 ]);
 
 const projectTList = ref([]);
+const ConstructionUnit = ref([]);
 const loading = ref(true);
 const loadingTwo = ref(false);
 const total = ref(0);
@@ -211,17 +213,18 @@
 const dataList = ref([]);
 const dataListTwo = ref([]);
 const DataList = ref([]);
+
 const AllData = reactive({
   publishTime: [],
   publishTime1: [],
-  form: {},
+  form: { fileListToNotice: [] },
+  NumId: '',
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     handleStatus: '',
     taskName: '',
     taskUserIdList: '',
-    fatherCode: 0,
   },
   queryParamstwo: {
     pageNum: 1,
@@ -229,10 +232,45 @@
   },
 
   rules: {
-    taskName: [{ required: true, message: '请输入巡查任务名称', trigger: 'blur' }],
-    projectCodeList: [{ required: true, message: '请选择巡查项目', trigger: 'blur' }],
-    taskUserIdList: [{ required: true, message: '请选择巡查人员', trigger: 'blur' }],
-    patrolType: [{ required: true, message: '请选择巡查类型', trigger: 'blur' }],
+    // taskName: [{ required: true, message: '请输入巡查任务名称', trigger: 'blur' }],
+    // rectifyType: [{ required: true, message: '请输入整改方式', trigger: 'blur' }],
+    // supervisionWork: [{ required: true, message: '请输入督办事项', trigger: 'blur' }],
+    // haveProblem: [{ required: true, message: '请输入存在问题', trigger: 'blur' }],
+    // // fileListToNotice: [{ required: true, message: '请上传整改书', trigger: 'blur' }],
+    // rectifyTime: [{ required: true, message: '请选择整改时限', trigger: 'blur' }],
+    // projectCompanyId: [{ required: true, message: '请选择建设单位', trigger: 'blur' }],
+    // leaderName: [{ required: true, message: '请输入责任领导', trigger: 'blur' }],
+    // leaderPhone: [
+    //   { required: true, message: '请输入责任领导电话', trigger: 'blur' },
+    //   {
+    //     validator: (rule, value) => {
+    //       return new Promise((resolve, reject) => {
+    //         if (!validPhone(value)) {
+    //           reject(Error('手机号格式错误'));
+    //         } else {
+    //           resolve();
+    //         }
+    //       });
+    //     },
+    //     trigger: 'blur',
+    //   },
+    // ],
+    // peopleName: [{ required: true, message: '请输入责任人', trigger: 'blur' }],
+    // peoplePhone: [
+    //   { required: true, message: '请输入责任人电话', trigger: 'blur' },
+    //   {
+    //     validator: (rule, value) => {
+    //       return new Promise((resolve, reject) => {
+    //         if (!validPhone(value)) {
+    //           reject(Error('手机号格式错误'));
+    //         } else {
+    //           resolve();
+    //         }
+    //       });
+    //     },
+    //     trigger: 'blur',
+    //   },
+    // ],
   },
 });
 const { queryParams, form, rules, queryParamstwo } = toRefs(AllData);
@@ -248,90 +286,63 @@
   handleQuery();
 }
 
-// 项目接口
-async function projectTypeListM() {
-  let { data } = await getProjectInfoList();
-  projectTList.value = data;
-}
-
-//
-const BasicInfopage = ref('');
-function projectTypeListMPage() {
-  patrolBasicInfopage().then(res => {
-    BasicInfopage.value = res.data;
-  });
-}
-
-//表格点击事件
-function clickLogData(val) {
-  val.fatherCode = val.number;
-  getList1(val.fatherCode);
-}
-
 // 发布整改通知
-function handlenotice() {
+function handlenotice(Val) {
   title.value = '发布整改通知';
   open.value = true;
+  AllData.NumId = Val.id;
   form.value = {};
   multiple.value = false;
 }
-// 新增中取消事件
+// 发布整改取消事件
 function cancel() {
   open.value = false;
   proxy.resetForm('roleRef');
 }
 
-//查看详情操作
-function handleDetail(row) {
-  opendetails.value = true;
-  DataList.value = { ...row };
-  // console.log(DataList.value, 'DataList.value');
-}
-
-/** 主任务查询列表 */
+/** 查询列表 */
 const getList = async () => {
   loading.value = true;
-  console.log(AllData.publishTime, 'AllData.publishTime');
-  if (AllData.publishTime) {
-    queryParams.value.planStartDatetime = AllData.publishTime[0];
-    queryParams.value.planEndDatetime = AllData.publishTime[1];
-  }
-  let res = await patrolTaskpage(queryParams.value);
+  let res = await rectifypage(queryParams.value);
   dataList.value = res.data;
   total.value = res.total;
   loading.value = false;
 };
-
-/** 查询列表 */
-const getList1 = async code => {
-  loadingTwo.value = true;
-  let res = await patrolTaskpage({ ...queryParamstwo.value, fatherCode: code });
-  dataListTwo.value = res.data;
-  totaltwo.value = res.total;
-  loadingTwo.value = false;
-};
-
+//查看详情操作
+function handleDetail(row) {
+  opendetails.value = true;
+  DataList.value = { ...row };
+  console.log(DataList.value, 'DataList.value');
+}
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
     if (valid) {
-      form.value.planStartDatetime = AllData.publishTime1[0];
-      form.value.planEndDatetime = AllData.publishTime1[1];
-      form.value.basicInfoId = '1686274734091489284';
-      patrolTaskadd(form.value).then(response => {
-        proxy.$modal.msgSuccess('新增成功');
-        open.value = false;
-        getList();
-      });
+      form.value.id = AllData.NumId;
+      console.log(form.value, 'form.value');
+      // patrolProblemRectifyedit(form.value).then(response => {
+      //   proxy.$modal.msgSuccess('发布整改通知单成功');
+      //   open.value = false;
+      //   getList();
+      // });
     }
   });
 }
 
+// 下拉框
+async function DropDown() {
+  let { data } = await projectCompanyList();
+  ConstructionUnit.value = data;
+}
+// 项目接口
+async function projectTypeListM() {
+  let { data } = await getProjectInfoList();
+  projectTList.value = data;
+}
 onMounted(() => {
   getList();
+  DropDown();
   projectTypeListM();
-  projectTypeListMPage();
-  // getList1();
 });
 </script>
 <style scoped lang="scss"></style>

diff --git a/src/api/longoPeration/CaseIssues.js b/src/api/longoPeration/CaseIssues.js
new file mode 100644
index 0000000..bb8c1b1
--- /dev/null
+++ b/src/api/longoPeration/CaseIssues.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request';
+// 列表分页
+export function rectifypage(query) {
+  return request({
+    url: '/business/patrolProblemRectify/rectifypage',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 下拉框
+export function projectCompanyList(query) {
+  return request({
+    url: '/business/projectCompany/list',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 修改
+export function patrolProblemRectifyedit(data) {
+  return request({
+    url: '/business/patrolProblemRectify/edit',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 删除排水防涝--防汛物资
+export function FloodPreventionMaterialdelete(id) {
+  return request({
+    url: '/business/floodPreventionMaterial/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/api/longoPeration/Inspectionplana.js b/src/api/longoPeration/Inspectionplana.js
index 311bce8..934f156 100644
--- a/src/api/longoPeration/Inspectionplana.js
+++ b/src/api/longoPeration/Inspectionplana.js
@@ -17,10 +17,10 @@
   });
 }
 
-// 新增排水防涝--防汛物资
-export function FloodPreventionMaterialadd(data) {
+// 新增
+export function patrolPlanadd(data) {
   return request({
-    url: '/business/floodPreventionMaterial/add',
+    url: '/business/patrolPlan/add',
     method: 'post',
     data: data,
   });
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 755559f..634a38d 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -37,23 +37,23 @@
     <el-table :data="dataList" v-loading="loading" stripe :max-height="280">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="巡查任务名称" prop="taskName" />
-      <el-table-column label="项目名称" prop="expiredDays" />
-      <el-table-column label="项目起止年月" prop="issuedDatetime" />
-      <el-table-column label="建设进度(%)" prop="expiredDays" />
-      <el-table-column label="巡查人员" prop="taskUserIdList">
+      <el-table-column label="项目名称" prop="projectName" />
+      <el-table-column label="项目开始时间" prop="projectStartTime" />
+      <el-table-column label="项目结束时间" prop="projectEndTime" />
+      <el-table-column label="建设进度(%)" prop="projectProgress" />
+      <el-table-column label="巡查人员" prop="useridlist">
         <template #default="scope">
-          <p v-for="item in scope.row.taskUserList">{{ item.userName }}</p>
+          <p v-for="item in scope.row.useridlist">{{ item.userName }}</p>
         </template>
       </el-table-column>
       <el-table-column label="巡查需整改问题" prop="expiredDays" />
-
-      <el-table-column label="项目整改状态" prop="issuedDatetime" />
-      <el-table-column label="巡查类型" prop="patrolType">
+      <el-table-column label="项目整改状态" prop="problemtitle" />
+      <el-table-column label="巡查类型" prop="patroltype">
         <template #default="scope">
-          <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
+          <dict-tag :options="patrol_type" :value="String(scope.row.patroltype)" />
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" prop="expiredDays" />
+      <el-table-column label="创建时间" prop="createTime" />
       <el-table-column label="操作" width="350">
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
@@ -81,71 +81,71 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="整改方式:" prop="method">
-              <el-input v-model="form.method" placeholder="请输入整改方式" />
+            <el-form-item label="整改方式:" prop="rectifyType">
+              <el-input v-model="form.rectifyType" placeholder="请输入整改方式" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="督办事项:" prop="warning">
-              <el-input v-model="form.warning" type="textarea" placeholder="请输入督办事项" />
+            <el-form-item label="督办事项:" prop="supervisionWork">
+              <el-input v-model="form.supervisionWork" type="textarea" placeholder="请输入督办事项" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="存在问题:" prop="problem">
-              <el-input v-model="form.problem" type="textarea" placeholder="请输入存在问题" />
+            <el-form-item label="存在问题:" prop="haveProblem">
+              <el-input v-model="form.haveProblem" type="textarea" placeholder="请输入存在问题" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="建设单位:" prop="projectCodeList">
-              <el-select v-model="form.projectCodeList" multiple placeholder="请选择建设单位" clearable style="width: 100%">
-                <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
+            <el-form-item label="建设单位:" prop="projectCompanyId">
+              <el-select v-model="form.projectCompanyId" placeholder="请选择建设单位" clearable style="width: 100%">
+                <el-option v-for="proj in ConstructionUnit" :key="proj.id" :label="proj.unitName" :value="proj.id" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="整改时限:" prop="timeRange">
-              <el-date-picker v-model="form.timeRange" multiple placeholder="请选择整改时限" clearable style="width: 100%">
+            <el-form-item label="整改时限:" prop="rectifyTime">
+              <el-date-picker v-model="form.rectifyTime" multiple placeholder="请选择整改时限" clearable style="width: 100%">
               </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="责任领导:" prop="administrant">
-              <el-input v-model="form.administrant" placeholder="请输入责任领导" clearable style="width: 100%" />
+            <el-form-item label="责任领导:" prop="leaderName">
+              <el-input v-model="form.leaderName" placeholder="请输入责任领导" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="电话:" prop="administrantPho">
-              <el-input v-model="form.administrantPho" placeholder="请输入责任领导电话" clearable style="width: 100%" />
+            <el-form-item label="电话:" prop="leaderPhone">
+              <el-input v-model="form.leaderPhone" placeholder="请输入责任领导电话" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="责任人:" prop="administrant">
-              <el-input v-model="form.administrant" placeholder="请输入责任人" clearable style="width: 100%" />
+            <el-form-item label="责任人:" prop="peopleName">
+              <el-input v-model="form.peopleName" placeholder="请输入责任人" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="电话:" prop="administrantPho">
-              <el-input v-model="form.administrantPho" placeholder="请输入责任人电话" clearable style="width: 100%" />
+            <el-form-item label="电话:" prop="peoplePhone">
+              <el-input v-model="form.peoplePhone" placeholder="请输入责任人电话" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="整改书:" prop="reportList">
+            <el-form-item label="整改书:" prop="fileListToNotice">
               <ImageFileUpload
                 :limit="1"
-                :saveFileArr="form.reportList"
+                v-model:saveFileArr="form.fileListToNotice"
                 :listType="'text'"
                 :refField="'trfield'"
-                :refType="'tr_site_info'"
+                :refType="'problem_notice'"
                 :fileType="['jpg', 'png', 'jpeg', 'pdf']"
               ></ImageFileUpload>
             </el-form-item>
@@ -179,11 +179,12 @@
   </div>
 </template>
 <script setup name="CaseIssues">
-import { patrolTaskpage, patrolTaskadd, patrolBasicInfopage } from '@/api/longoPeration/inspectiontasks';
+import { rectifypage, patrolProblemRectifyedit, projectCompanyList } from '@/api/longoPeration/CaseIssues';
 import { getProjectInfoList } from '@/api/preassess/targetManage';
-import { listUser } from '@/api/system/user';
+
 import anjianPopup from '../longoPeration/Patrolmanagement/anjianPopup.vue'; //详情弹框
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
+import { validPhone } from '@/utils/validate';
 const { proxy } = getCurrentInstance();
 const { patrol_type } = proxy.useDict('patrol_type'); //  巡查类型的字典
 const open = ref(false);
@@ -203,6 +204,7 @@
 ]);
 
 const projectTList = ref([]);
+const ConstructionUnit = ref([]);
 const loading = ref(true);
 const loadingTwo = ref(false);
 const total = ref(0);
@@ -211,17 +213,18 @@
 const dataList = ref([]);
 const dataListTwo = ref([]);
 const DataList = ref([]);
+
 const AllData = reactive({
   publishTime: [],
   publishTime1: [],
-  form: {},
+  form: { fileListToNotice: [] },
+  NumId: '',
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     handleStatus: '',
     taskName: '',
     taskUserIdList: '',
-    fatherCode: 0,
   },
   queryParamstwo: {
     pageNum: 1,
@@ -229,10 +232,45 @@
   },
 
   rules: {
-    taskName: [{ required: true, message: '请输入巡查任务名称', trigger: 'blur' }],
-    projectCodeList: [{ required: true, message: '请选择巡查项目', trigger: 'blur' }],
-    taskUserIdList: [{ required: true, message: '请选择巡查人员', trigger: 'blur' }],
-    patrolType: [{ required: true, message: '请选择巡查类型', trigger: 'blur' }],
+    // taskName: [{ required: true, message: '请输入巡查任务名称', trigger: 'blur' }],
+    // rectifyType: [{ required: true, message: '请输入整改方式', trigger: 'blur' }],
+    // supervisionWork: [{ required: true, message: '请输入督办事项', trigger: 'blur' }],
+    // haveProblem: [{ required: true, message: '请输入存在问题', trigger: 'blur' }],
+    // // fileListToNotice: [{ required: true, message: '请上传整改书', trigger: 'blur' }],
+    // rectifyTime: [{ required: true, message: '请选择整改时限', trigger: 'blur' }],
+    // projectCompanyId: [{ required: true, message: '请选择建设单位', trigger: 'blur' }],
+    // leaderName: [{ required: true, message: '请输入责任领导', trigger: 'blur' }],
+    // leaderPhone: [
+    //   { required: true, message: '请输入责任领导电话', trigger: 'blur' },
+    //   {
+    //     validator: (rule, value) => {
+    //       return new Promise((resolve, reject) => {
+    //         if (!validPhone(value)) {
+    //           reject(Error('手机号格式错误'));
+    //         } else {
+    //           resolve();
+    //         }
+    //       });
+    //     },
+    //     trigger: 'blur',
+    //   },
+    // ],
+    // peopleName: [{ required: true, message: '请输入责任人', trigger: 'blur' }],
+    // peoplePhone: [
+    //   { required: true, message: '请输入责任人电话', trigger: 'blur' },
+    //   {
+    //     validator: (rule, value) => {
+    //       return new Promise((resolve, reject) => {
+    //         if (!validPhone(value)) {
+    //           reject(Error('手机号格式错误'));
+    //         } else {
+    //           resolve();
+    //         }
+    //       });
+    //     },
+    //     trigger: 'blur',
+    //   },
+    // ],
   },
 });
 const { queryParams, form, rules, queryParamstwo } = toRefs(AllData);
@@ -248,90 +286,63 @@
   handleQuery();
 }
 
-// 项目接口
-async function projectTypeListM() {
-  let { data } = await getProjectInfoList();
-  projectTList.value = data;
-}
-
-//
-const BasicInfopage = ref('');
-function projectTypeListMPage() {
-  patrolBasicInfopage().then(res => {
-    BasicInfopage.value = res.data;
-  });
-}
-
-//表格点击事件
-function clickLogData(val) {
-  val.fatherCode = val.number;
-  getList1(val.fatherCode);
-}
-
 // 发布整改通知
-function handlenotice() {
+function handlenotice(Val) {
   title.value = '发布整改通知';
   open.value = true;
+  AllData.NumId = Val.id;
   form.value = {};
   multiple.value = false;
 }
-// 新增中取消事件
+// 发布整改取消事件
 function cancel() {
   open.value = false;
   proxy.resetForm('roleRef');
 }
 
-//查看详情操作
-function handleDetail(row) {
-  opendetails.value = true;
-  DataList.value = { ...row };
-  // console.log(DataList.value, 'DataList.value');
-}
-
-/** 主任务查询列表 */
+/** 查询列表 */
 const getList = async () => {
   loading.value = true;
-  console.log(AllData.publishTime, 'AllData.publishTime');
-  if (AllData.publishTime) {
-    queryParams.value.planStartDatetime = AllData.publishTime[0];
-    queryParams.value.planEndDatetime = AllData.publishTime[1];
-  }
-  let res = await patrolTaskpage(queryParams.value);
+  let res = await rectifypage(queryParams.value);
   dataList.value = res.data;
   total.value = res.total;
   loading.value = false;
 };
-
-/** 查询列表 */
-const getList1 = async code => {
-  loadingTwo.value = true;
-  let res = await patrolTaskpage({ ...queryParamstwo.value, fatherCode: code });
-  dataListTwo.value = res.data;
-  totaltwo.value = res.total;
-  loadingTwo.value = false;
-};
-
+//查看详情操作
+function handleDetail(row) {
+  opendetails.value = true;
+  DataList.value = { ...row };
+  console.log(DataList.value, 'DataList.value');
+}
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
     if (valid) {
-      form.value.planStartDatetime = AllData.publishTime1[0];
-      form.value.planEndDatetime = AllData.publishTime1[1];
-      form.value.basicInfoId = '1686274734091489284';
-      patrolTaskadd(form.value).then(response => {
-        proxy.$modal.msgSuccess('新增成功');
-        open.value = false;
-        getList();
-      });
+      form.value.id = AllData.NumId;
+      console.log(form.value, 'form.value');
+      // patrolProblemRectifyedit(form.value).then(response => {
+      //   proxy.$modal.msgSuccess('发布整改通知单成功');
+      //   open.value = false;
+      //   getList();
+      // });
     }
   });
 }
 
+// 下拉框
+async function DropDown() {
+  let { data } = await projectCompanyList();
+  ConstructionUnit.value = data;
+}
+// 项目接口
+async function projectTypeListM() {
+  let { data } = await getProjectInfoList();
+  projectTList.value = data;
+}
 onMounted(() => {
   getList();
+  DropDown();
   projectTypeListM();
-  projectTypeListMPage();
-  // getList1();
 });
 </script>
 <style scoped lang="scss"></style>
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index 1f0ce78..2e1d0ab 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -18,7 +18,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="计划日期" prop="reportTime">
+      <el-form-item label="计划日期" prop="publishTime">
         <el-date-picker
           style="width: 380px"
           format="YYYY-MM-DD"
@@ -91,51 +91,70 @@
         <el-row :gutter="20">
           <el-col :span="24">
             <el-form-item label="巡查计划名称:" prop="planName">
-              <el-form-item label="巡查计划名称:" prop="planName">
-                <el-input v-model="form.planName" placeholder="请输入巡查计划名称" clearable style="width: 100%" />
-              </el-form-item>
+              <el-input v-model="form.planName" placeholder="请输入巡查计划名称" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="项目名称:" prop="q">
-              <el-select clearable v-model="form.q" style="width: 100%" placeholder="请选择项目名称">
-                <el-option v-for="item in Xmtype" :key="item.value" :label="item.label" :value="item.value" />
+            <el-form-item label="项目名称:" prop="projectList">
+              <el-select
+                clearable
+                v-model="form.projectList"
+                style="width: 100%"
+                placeholder="请选择项目名称"
+                value-key="projectNo"
+                multiple
+                label="projectName"
+              >
+                <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="巡查计划类型:" prop="w">
-              <el-select clearable v-model="form.w" style="width: 100%" placeholder="请选择项目名称">
-                <el-option v-for="item in Xmtype" :key="item.value" :label="item.label" :value="item.value" />
+            <el-form-item label="巡查计划类型:" prop="patrolType">
+              <el-select clearable v-model="form.patrolType" style="width: 100%" placeholder="请选择项目名称">
+                <el-option v-for="item in patrol_type" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
-              <!-- <el-input v-model="form.w" placeholder="请输入巡查计划类型" clearable style="width: 100%" /> -->
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="巡查频率:" prop="fileTag">
-              <el-select v-model="form.fileTag" placeholder="请选择巡查频率" clearable style="width: 100%" @change="changeStation">
+            <el-form-item label="巡查频率:" prop="patrolFrequencyType">
+              <el-select
+                v-model="form.patrolFrequencyType"
+                placeholder="请选择巡查频率"
+                clearable
+                style="width: 100%"
+                @change="changeStation"
+              >
                 <el-option v-for="dict in Xcfrequency" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="巡查频率(周):" prop="fileTag1" v-if="form.fileTag == 'zhou'">
               <el-select v-model="form.fileTag1" placeholder="请选择巡查频率(周)" clearable style="width: 100%">
                 <el-option v-for="dict in document_tag" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="巡查人员:" prop="fileTag1">
-              <el-select v-model="form.fileTag1" placeholder="请选择巡查人员" clearable style="width: 100%">
-                <el-option v-for="dict in Xcpersonnel" :key="dict.value" :label="dict.label" :value="dict.value" />
+            <el-form-item label="巡查人员:" prop="patrolUserList">
+              <el-select
+                v-model="form.patrolUserList"
+                placeholder="请选择巡查人员"
+                clearable
+                style="width: 100%"
+                value-key="userId"
+                label="nickName"
+                multiple
+              >
+                <el-option v-for="item in userList" :key="String(item.userId)" :label="item.nickName" :value="item" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -144,6 +163,7 @@
               <el-date-picker
                 style="width: 380px"
                 format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 v-model="form.reportTime1"
                 type="daterange"
                 range-separator="至"
@@ -155,7 +175,11 @@
         </el-row>
 
         <el-row :gutter="20">
-          <div class="dituclass">地图</div>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input type="textarea" v-model="form.remark" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <template #footer>
@@ -171,55 +195,37 @@
 import {
   patrolPlanpage,
   FloodPreventionMaterialedit,
-  FloodPreventionMaterialadd,
+  patrolPlanadd,
   FloodPreventionMaterialdelete,
 } from '@/api/longoPeration/Inspectionplana';
+import { listUser } from '@/api/system/user';
+import { getProjectInfoList } from '@/api/preassess/targetManage';
 const { proxy } = getCurrentInstance();
 const { patrol_type } = proxy.useDict('patrol_type'); //  巡查类型的字典
+console.log(patrol_type);
 const open = ref(false);
 const multiple = ref(false);
 const showSearch = ref(true);
-const Xmtype = ref([
-  { value: '0', label: '海绵项目0' },
-  { value: '1', label: '海绵项目1' },
-  { value: '2', label: '海绵项目2' },
-]);
+const projectTList = ref([]);
 const Xcfrequency = ref([
-  { value: 'tian', label: '天' },
-  { value: 'zhou', label: '周' },
-]);
-const Xcpersonnel = ref([
-  { value: '0', label: '激萌飞' },
-  { value: '1', label: '杨辉' },
+  { value: 'for_day', label: '天' },
+  { value: 'for_week', label: '周' },
 ]);
 const WaterDate = ref([
   { value: '0', label: '已完成' },
   { value: '1', label: '已激活' },
   { value: '2', label: '未激活' },
 ]);
+const userList = ref([]);
 const loading = ref(true);
 const total = ref(1);
 const title = ref('');
-const dataList = ref([
-  {
-    name: '0612汴京路巡查',
-    status: '未激活',
-    project: '汴京路东郊沟雨水泵站新建项目、市政公建雨水资源化利用项目',
-    user: '杨辉,张磊',
-    type: '海绵项目巡查',
-    num: '1.2',
-    pl: '天',
-    start: '2024-06-12 09:00:00',
-    end: '2024-06-12 13:00:00',
-    create: '2024-06-11 09:00:00',
-    remark: '仔细巡查',
-  },
-]);
+const dataList = ref([]);
 const AllData = reactive({
   id: '',
   caseid: '',
   caseidone: '',
-  publishTime: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD ')],
+  publishTime: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')],
   form: {},
   formDate: {},
   caseFormDate: { id: '' },
@@ -232,14 +238,16 @@
     endDate: '',
   },
   rules: {
-    id: [{ required: true, message: '请输入', trigger: 'blur' }],
+    planName: [{ required: true, message: '请输入巡查计划名称', trigger: 'blur' }],
+    projectList: [{ required: true, message: '请选择项目名称', trigger: 'blur' }],
+    patrolType: [{ required: true, message: '请选择项目名称', trigger: 'blur' }],
+    // fileTag: [{ required: true, message: '请选择项目名称', trigger: 'blur' }],
+    patrolUserList: [{ required: true, message: '请选择巡查人员', trigger: 'blur' }],
+    reportTime1: [{ required: true, message: '请选择计划日期', trigger: 'blur' }],
     eventDescription: [{ required: true, message: '请输入', trigger: 'blur' }],
   },
-  rulesFormRef: {
-    dispositionDepartment: [{ required: true, message: '请选择', trigger: 'blur' }],
-  },
 });
-const { queryParams, form, formDate, rules, rulesFormRef, caseFormDate } = toRefs(AllData);
+const { queryParams, form, rules } = toRefs(AllData);
 
 //搜索
 function handleQuery() {
@@ -264,7 +272,7 @@
   open.value = true;
   form.value = {};
   multiple.value = false;
-  form.value.fileTag = Xcfrequency.value[0].value;
+  form.value.patrolFrequencyType = Xcfrequency.value[0].value;
 }
 // 新增中取消事件
 function cancel() {
@@ -291,6 +299,17 @@
   multiple.value = false;
   form.value = { ...row };
 }
+// 项目接口
+async function projectTypeListM() {
+  let { data } = await getProjectInfoList();
+  projectTList.value = data;
+}
+//查询维修人员列表
+function getUserList() {
+  listUser().then(res => {
+    userList.value = res.data;
+  });
+}
 
 /** 查询列表 */
 const getList = async () => {
@@ -307,8 +326,36 @@
   loading.value = false;
 };
 
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs['roleRef'].validate(valid => {
+    if (valid) {
+      // 处理时间传参
+      form.value.startDate = form.value.reportTime1[0];
+      form.value.endDate = form.value.reportTime1[1];
+      // 处理项目传参
+      form.value.projectList = form.value.projectList.map(obj => {
+        return { projectNo: obj.projectNo, projectName: obj.projectName };
+      });
+      // 处理人员传参
+      form.value.patrolUserList = form.value.patrolUserList.map(obj => {
+        return { userId: String(obj.userId) };
+      });
+      form.value.basicInfoId = '1686274734091489284';
+      // console.log(form.value, 'form.value');
+      patrolPlanadd(form.value).then(response => {
+        proxy.$modal.msgSuccess('新增成功');
+        open.value = false;
+        getList();
+      });
+    }
+  });
+}
+
 onMounted(() => {
   getList();
+  projectTypeListM();
+  getUserList();
 });
 </script>
 <style scoped lang="scss">

diff --git a/src/api/longoPeration/CaseIssues.js b/src/api/longoPeration/CaseIssues.js
new file mode 100644
index 0000000..bb8c1b1
--- /dev/null
+++ b/src/api/longoPeration/CaseIssues.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request';
+// 列表分页
+export function rectifypage(query) {
+  return request({
+    url: '/business/patrolProblemRectify/rectifypage',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 下拉框
+export function projectCompanyList(query) {
+  return request({
+    url: '/business/projectCompany/list',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 修改
+export function patrolProblemRectifyedit(data) {
+  return request({
+    url: '/business/patrolProblemRectify/edit',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 删除排水防涝--防汛物资
+export function FloodPreventionMaterialdelete(id) {
+  return request({
+    url: '/business/floodPreventionMaterial/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/api/longoPeration/Inspectionplana.js b/src/api/longoPeration/Inspectionplana.js
index 311bce8..934f156 100644
--- a/src/api/longoPeration/Inspectionplana.js
+++ b/src/api/longoPeration/Inspectionplana.js
@@ -17,10 +17,10 @@
   });
 }
 
-// 新增排水防涝--防汛物资
-export function FloodPreventionMaterialadd(data) {
+// 新增
+export function patrolPlanadd(data) {
   return request({
-    url: '/business/floodPreventionMaterial/add',
+    url: '/business/patrolPlan/add',
     method: 'post',
     data: data,
   });
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 755559f..634a38d 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -37,23 +37,23 @@
     <el-table :data="dataList" v-loading="loading" stripe :max-height="280">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="巡查任务名称" prop="taskName" />
-      <el-table-column label="项目名称" prop="expiredDays" />
-      <el-table-column label="项目起止年月" prop="issuedDatetime" />
-      <el-table-column label="建设进度(%)" prop="expiredDays" />
-      <el-table-column label="巡查人员" prop="taskUserIdList">
+      <el-table-column label="项目名称" prop="projectName" />
+      <el-table-column label="项目开始时间" prop="projectStartTime" />
+      <el-table-column label="项目结束时间" prop="projectEndTime" />
+      <el-table-column label="建设进度(%)" prop="projectProgress" />
+      <el-table-column label="巡查人员" prop="useridlist">
         <template #default="scope">
-          <p v-for="item in scope.row.taskUserList">{{ item.userName }}</p>
+          <p v-for="item in scope.row.useridlist">{{ item.userName }}</p>
         </template>
       </el-table-column>
       <el-table-column label="巡查需整改问题" prop="expiredDays" />
-
-      <el-table-column label="项目整改状态" prop="issuedDatetime" />
-      <el-table-column label="巡查类型" prop="patrolType">
+      <el-table-column label="项目整改状态" prop="problemtitle" />
+      <el-table-column label="巡查类型" prop="patroltype">
         <template #default="scope">
-          <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
+          <dict-tag :options="patrol_type" :value="String(scope.row.patroltype)" />
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" prop="expiredDays" />
+      <el-table-column label="创建时间" prop="createTime" />
       <el-table-column label="操作" width="350">
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
@@ -81,71 +81,71 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="整改方式:" prop="method">
-              <el-input v-model="form.method" placeholder="请输入整改方式" />
+            <el-form-item label="整改方式:" prop="rectifyType">
+              <el-input v-model="form.rectifyType" placeholder="请输入整改方式" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="督办事项:" prop="warning">
-              <el-input v-model="form.warning" type="textarea" placeholder="请输入督办事项" />
+            <el-form-item label="督办事项:" prop="supervisionWork">
+              <el-input v-model="form.supervisionWork" type="textarea" placeholder="请输入督办事项" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="存在问题:" prop="problem">
-              <el-input v-model="form.problem" type="textarea" placeholder="请输入存在问题" />
+            <el-form-item label="存在问题:" prop="haveProblem">
+              <el-input v-model="form.haveProblem" type="textarea" placeholder="请输入存在问题" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="建设单位:" prop="projectCodeList">
-              <el-select v-model="form.projectCodeList" multiple placeholder="请选择建设单位" clearable style="width: 100%">
-                <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
+            <el-form-item label="建设单位:" prop="projectCompanyId">
+              <el-select v-model="form.projectCompanyId" placeholder="请选择建设单位" clearable style="width: 100%">
+                <el-option v-for="proj in ConstructionUnit" :key="proj.id" :label="proj.unitName" :value="proj.id" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="整改时限:" prop="timeRange">
-              <el-date-picker v-model="form.timeRange" multiple placeholder="请选择整改时限" clearable style="width: 100%">
+            <el-form-item label="整改时限:" prop="rectifyTime">
+              <el-date-picker v-model="form.rectifyTime" multiple placeholder="请选择整改时限" clearable style="width: 100%">
               </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="责任领导:" prop="administrant">
-              <el-input v-model="form.administrant" placeholder="请输入责任领导" clearable style="width: 100%" />
+            <el-form-item label="责任领导:" prop="leaderName">
+              <el-input v-model="form.leaderName" placeholder="请输入责任领导" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="电话:" prop="administrantPho">
-              <el-input v-model="form.administrantPho" placeholder="请输入责任领导电话" clearable style="width: 100%" />
+            <el-form-item label="电话:" prop="leaderPhone">
+              <el-input v-model="form.leaderPhone" placeholder="请输入责任领导电话" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="责任人:" prop="administrant">
-              <el-input v-model="form.administrant" placeholder="请输入责任人" clearable style="width: 100%" />
+            <el-form-item label="责任人:" prop="peopleName">
+              <el-input v-model="form.peopleName" placeholder="请输入责任人" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="电话:" prop="administrantPho">
-              <el-input v-model="form.administrantPho" placeholder="请输入责任人电话" clearable style="width: 100%" />
+            <el-form-item label="电话:" prop="peoplePhone">
+              <el-input v-model="form.peoplePhone" placeholder="请输入责任人电话" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="整改书:" prop="reportList">
+            <el-form-item label="整改书:" prop="fileListToNotice">
               <ImageFileUpload
                 :limit="1"
-                :saveFileArr="form.reportList"
+                v-model:saveFileArr="form.fileListToNotice"
                 :listType="'text'"
                 :refField="'trfield'"
-                :refType="'tr_site_info'"
+                :refType="'problem_notice'"
                 :fileType="['jpg', 'png', 'jpeg', 'pdf']"
               ></ImageFileUpload>
             </el-form-item>
@@ -179,11 +179,12 @@
   </div>
 </template>
 <script setup name="CaseIssues">
-import { patrolTaskpage, patrolTaskadd, patrolBasicInfopage } from '@/api/longoPeration/inspectiontasks';
+import { rectifypage, patrolProblemRectifyedit, projectCompanyList } from '@/api/longoPeration/CaseIssues';
 import { getProjectInfoList } from '@/api/preassess/targetManage';
-import { listUser } from '@/api/system/user';
+
 import anjianPopup from '../longoPeration/Patrolmanagement/anjianPopup.vue'; //详情弹框
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
+import { validPhone } from '@/utils/validate';
 const { proxy } = getCurrentInstance();
 const { patrol_type } = proxy.useDict('patrol_type'); //  巡查类型的字典
 const open = ref(false);
@@ -203,6 +204,7 @@
 ]);
 
 const projectTList = ref([]);
+const ConstructionUnit = ref([]);
 const loading = ref(true);
 const loadingTwo = ref(false);
 const total = ref(0);
@@ -211,17 +213,18 @@
 const dataList = ref([]);
 const dataListTwo = ref([]);
 const DataList = ref([]);
+
 const AllData = reactive({
   publishTime: [],
   publishTime1: [],
-  form: {},
+  form: { fileListToNotice: [] },
+  NumId: '',
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     handleStatus: '',
     taskName: '',
     taskUserIdList: '',
-    fatherCode: 0,
   },
   queryParamstwo: {
     pageNum: 1,
@@ -229,10 +232,45 @@
   },
 
   rules: {
-    taskName: [{ required: true, message: '请输入巡查任务名称', trigger: 'blur' }],
-    projectCodeList: [{ required: true, message: '请选择巡查项目', trigger: 'blur' }],
-    taskUserIdList: [{ required: true, message: '请选择巡查人员', trigger: 'blur' }],
-    patrolType: [{ required: true, message: '请选择巡查类型', trigger: 'blur' }],
+    // taskName: [{ required: true, message: '请输入巡查任务名称', trigger: 'blur' }],
+    // rectifyType: [{ required: true, message: '请输入整改方式', trigger: 'blur' }],
+    // supervisionWork: [{ required: true, message: '请输入督办事项', trigger: 'blur' }],
+    // haveProblem: [{ required: true, message: '请输入存在问题', trigger: 'blur' }],
+    // // fileListToNotice: [{ required: true, message: '请上传整改书', trigger: 'blur' }],
+    // rectifyTime: [{ required: true, message: '请选择整改时限', trigger: 'blur' }],
+    // projectCompanyId: [{ required: true, message: '请选择建设单位', trigger: 'blur' }],
+    // leaderName: [{ required: true, message: '请输入责任领导', trigger: 'blur' }],
+    // leaderPhone: [
+    //   { required: true, message: '请输入责任领导电话', trigger: 'blur' },
+    //   {
+    //     validator: (rule, value) => {
+    //       return new Promise((resolve, reject) => {
+    //         if (!validPhone(value)) {
+    //           reject(Error('手机号格式错误'));
+    //         } else {
+    //           resolve();
+    //         }
+    //       });
+    //     },
+    //     trigger: 'blur',
+    //   },
+    // ],
+    // peopleName: [{ required: true, message: '请输入责任人', trigger: 'blur' }],
+    // peoplePhone: [
+    //   { required: true, message: '请输入责任人电话', trigger: 'blur' },
+    //   {
+    //     validator: (rule, value) => {
+    //       return new Promise((resolve, reject) => {
+    //         if (!validPhone(value)) {
+    //           reject(Error('手机号格式错误'));
+    //         } else {
+    //           resolve();
+    //         }
+    //       });
+    //     },
+    //     trigger: 'blur',
+    //   },
+    // ],
   },
 });
 const { queryParams, form, rules, queryParamstwo } = toRefs(AllData);
@@ -248,90 +286,63 @@
   handleQuery();
 }
 
-// 项目接口
-async function projectTypeListM() {
-  let { data } = await getProjectInfoList();
-  projectTList.value = data;
-}
-
-//
-const BasicInfopage = ref('');
-function projectTypeListMPage() {
-  patrolBasicInfopage().then(res => {
-    BasicInfopage.value = res.data;
-  });
-}
-
-//表格点击事件
-function clickLogData(val) {
-  val.fatherCode = val.number;
-  getList1(val.fatherCode);
-}
-
 // 发布整改通知
-function handlenotice() {
+function handlenotice(Val) {
   title.value = '发布整改通知';
   open.value = true;
+  AllData.NumId = Val.id;
   form.value = {};
   multiple.value = false;
 }
-// 新增中取消事件
+// 发布整改取消事件
 function cancel() {
   open.value = false;
   proxy.resetForm('roleRef');
 }
 
-//查看详情操作
-function handleDetail(row) {
-  opendetails.value = true;
-  DataList.value = { ...row };
-  // console.log(DataList.value, 'DataList.value');
-}
-
-/** 主任务查询列表 */
+/** 查询列表 */
 const getList = async () => {
   loading.value = true;
-  console.log(AllData.publishTime, 'AllData.publishTime');
-  if (AllData.publishTime) {
-    queryParams.value.planStartDatetime = AllData.publishTime[0];
-    queryParams.value.planEndDatetime = AllData.publishTime[1];
-  }
-  let res = await patrolTaskpage(queryParams.value);
+  let res = await rectifypage(queryParams.value);
   dataList.value = res.data;
   total.value = res.total;
   loading.value = false;
 };
-
-/** 查询列表 */
-const getList1 = async code => {
-  loadingTwo.value = true;
-  let res = await patrolTaskpage({ ...queryParamstwo.value, fatherCode: code });
-  dataListTwo.value = res.data;
-  totaltwo.value = res.total;
-  loadingTwo.value = false;
-};
-
+//查看详情操作
+function handleDetail(row) {
+  opendetails.value = true;
+  DataList.value = { ...row };
+  console.log(DataList.value, 'DataList.value');
+}
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
     if (valid) {
-      form.value.planStartDatetime = AllData.publishTime1[0];
-      form.value.planEndDatetime = AllData.publishTime1[1];
-      form.value.basicInfoId = '1686274734091489284';
-      patrolTaskadd(form.value).then(response => {
-        proxy.$modal.msgSuccess('新增成功');
-        open.value = false;
-        getList();
-      });
+      form.value.id = AllData.NumId;
+      console.log(form.value, 'form.value');
+      // patrolProblemRectifyedit(form.value).then(response => {
+      //   proxy.$modal.msgSuccess('发布整改通知单成功');
+      //   open.value = false;
+      //   getList();
+      // });
     }
   });
 }
 
+// 下拉框
+async function DropDown() {
+  let { data } = await projectCompanyList();
+  ConstructionUnit.value = data;
+}
+// 项目接口
+async function projectTypeListM() {
+  let { data } = await getProjectInfoList();
+  projectTList.value = data;
+}
 onMounted(() => {
   getList();
+  DropDown();
   projectTypeListM();
-  projectTypeListMPage();
-  // getList1();
 });
 </script>
 <style scoped lang="scss"></style>
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index 1f0ce78..2e1d0ab 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -18,7 +18,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="计划日期" prop="reportTime">
+      <el-form-item label="计划日期" prop="publishTime">
         <el-date-picker
           style="width: 380px"
           format="YYYY-MM-DD"
@@ -91,51 +91,70 @@
         <el-row :gutter="20">
           <el-col :span="24">
             <el-form-item label="巡查计划名称:" prop="planName">
-              <el-form-item label="巡查计划名称:" prop="planName">
-                <el-input v-model="form.planName" placeholder="请输入巡查计划名称" clearable style="width: 100%" />
-              </el-form-item>
+              <el-input v-model="form.planName" placeholder="请输入巡查计划名称" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="项目名称:" prop="q">
-              <el-select clearable v-model="form.q" style="width: 100%" placeholder="请选择项目名称">
-                <el-option v-for="item in Xmtype" :key="item.value" :label="item.label" :value="item.value" />
+            <el-form-item label="项目名称:" prop="projectList">
+              <el-select
+                clearable
+                v-model="form.projectList"
+                style="width: 100%"
+                placeholder="请选择项目名称"
+                value-key="projectNo"
+                multiple
+                label="projectName"
+              >
+                <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="巡查计划类型:" prop="w">
-              <el-select clearable v-model="form.w" style="width: 100%" placeholder="请选择项目名称">
-                <el-option v-for="item in Xmtype" :key="item.value" :label="item.label" :value="item.value" />
+            <el-form-item label="巡查计划类型:" prop="patrolType">
+              <el-select clearable v-model="form.patrolType" style="width: 100%" placeholder="请选择项目名称">
+                <el-option v-for="item in patrol_type" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
-              <!-- <el-input v-model="form.w" placeholder="请输入巡查计划类型" clearable style="width: 100%" /> -->
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="巡查频率:" prop="fileTag">
-              <el-select v-model="form.fileTag" placeholder="请选择巡查频率" clearable style="width: 100%" @change="changeStation">
+            <el-form-item label="巡查频率:" prop="patrolFrequencyType">
+              <el-select
+                v-model="form.patrolFrequencyType"
+                placeholder="请选择巡查频率"
+                clearable
+                style="width: 100%"
+                @change="changeStation"
+              >
                 <el-option v-for="dict in Xcfrequency" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="巡查频率(周):" prop="fileTag1" v-if="form.fileTag == 'zhou'">
               <el-select v-model="form.fileTag1" placeholder="请选择巡查频率(周)" clearable style="width: 100%">
                 <el-option v-for="dict in document_tag" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="巡查人员:" prop="fileTag1">
-              <el-select v-model="form.fileTag1" placeholder="请选择巡查人员" clearable style="width: 100%">
-                <el-option v-for="dict in Xcpersonnel" :key="dict.value" :label="dict.label" :value="dict.value" />
+            <el-form-item label="巡查人员:" prop="patrolUserList">
+              <el-select
+                v-model="form.patrolUserList"
+                placeholder="请选择巡查人员"
+                clearable
+                style="width: 100%"
+                value-key="userId"
+                label="nickName"
+                multiple
+              >
+                <el-option v-for="item in userList" :key="String(item.userId)" :label="item.nickName" :value="item" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -144,6 +163,7 @@
               <el-date-picker
                 style="width: 380px"
                 format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 v-model="form.reportTime1"
                 type="daterange"
                 range-separator="至"
@@ -155,7 +175,11 @@
         </el-row>
 
         <el-row :gutter="20">
-          <div class="dituclass">地图</div>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input type="textarea" v-model="form.remark" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <template #footer>
@@ -171,55 +195,37 @@
 import {
   patrolPlanpage,
   FloodPreventionMaterialedit,
-  FloodPreventionMaterialadd,
+  patrolPlanadd,
   FloodPreventionMaterialdelete,
 } from '@/api/longoPeration/Inspectionplana';
+import { listUser } from '@/api/system/user';
+import { getProjectInfoList } from '@/api/preassess/targetManage';
 const { proxy } = getCurrentInstance();
 const { patrol_type } = proxy.useDict('patrol_type'); //  巡查类型的字典
+console.log(patrol_type);
 const open = ref(false);
 const multiple = ref(false);
 const showSearch = ref(true);
-const Xmtype = ref([
-  { value: '0', label: '海绵项目0' },
-  { value: '1', label: '海绵项目1' },
-  { value: '2', label: '海绵项目2' },
-]);
+const projectTList = ref([]);
 const Xcfrequency = ref([
-  { value: 'tian', label: '天' },
-  { value: 'zhou', label: '周' },
-]);
-const Xcpersonnel = ref([
-  { value: '0', label: '激萌飞' },
-  { value: '1', label: '杨辉' },
+  { value: 'for_day', label: '天' },
+  { value: 'for_week', label: '周' },
 ]);
 const WaterDate = ref([
   { value: '0', label: '已完成' },
   { value: '1', label: '已激活' },
   { value: '2', label: '未激活' },
 ]);
+const userList = ref([]);
 const loading = ref(true);
 const total = ref(1);
 const title = ref('');
-const dataList = ref([
-  {
-    name: '0612汴京路巡查',
-    status: '未激活',
-    project: '汴京路东郊沟雨水泵站新建项目、市政公建雨水资源化利用项目',
-    user: '杨辉,张磊',
-    type: '海绵项目巡查',
-    num: '1.2',
-    pl: '天',
-    start: '2024-06-12 09:00:00',
-    end: '2024-06-12 13:00:00',
-    create: '2024-06-11 09:00:00',
-    remark: '仔细巡查',
-  },
-]);
+const dataList = ref([]);
 const AllData = reactive({
   id: '',
   caseid: '',
   caseidone: '',
-  publishTime: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD ')],
+  publishTime: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')],
   form: {},
   formDate: {},
   caseFormDate: { id: '' },
@@ -232,14 +238,16 @@
     endDate: '',
   },
   rules: {
-    id: [{ required: true, message: '请输入', trigger: 'blur' }],
+    planName: [{ required: true, message: '请输入巡查计划名称', trigger: 'blur' }],
+    projectList: [{ required: true, message: '请选择项目名称', trigger: 'blur' }],
+    patrolType: [{ required: true, message: '请选择项目名称', trigger: 'blur' }],
+    // fileTag: [{ required: true, message: '请选择项目名称', trigger: 'blur' }],
+    patrolUserList: [{ required: true, message: '请选择巡查人员', trigger: 'blur' }],
+    reportTime1: [{ required: true, message: '请选择计划日期', trigger: 'blur' }],
     eventDescription: [{ required: true, message: '请输入', trigger: 'blur' }],
   },
-  rulesFormRef: {
-    dispositionDepartment: [{ required: true, message: '请选择', trigger: 'blur' }],
-  },
 });
-const { queryParams, form, formDate, rules, rulesFormRef, caseFormDate } = toRefs(AllData);
+const { queryParams, form, rules } = toRefs(AllData);
 
 //搜索
 function handleQuery() {
@@ -264,7 +272,7 @@
   open.value = true;
   form.value = {};
   multiple.value = false;
-  form.value.fileTag = Xcfrequency.value[0].value;
+  form.value.patrolFrequencyType = Xcfrequency.value[0].value;
 }
 // 新增中取消事件
 function cancel() {
@@ -291,6 +299,17 @@
   multiple.value = false;
   form.value = { ...row };
 }
+// 项目接口
+async function projectTypeListM() {
+  let { data } = await getProjectInfoList();
+  projectTList.value = data;
+}
+//查询维修人员列表
+function getUserList() {
+  listUser().then(res => {
+    userList.value = res.data;
+  });
+}
 
 /** 查询列表 */
 const getList = async () => {
@@ -307,8 +326,36 @@
   loading.value = false;
 };
 
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs['roleRef'].validate(valid => {
+    if (valid) {
+      // 处理时间传参
+      form.value.startDate = form.value.reportTime1[0];
+      form.value.endDate = form.value.reportTime1[1];
+      // 处理项目传参
+      form.value.projectList = form.value.projectList.map(obj => {
+        return { projectNo: obj.projectNo, projectName: obj.projectName };
+      });
+      // 处理人员传参
+      form.value.patrolUserList = form.value.patrolUserList.map(obj => {
+        return { userId: String(obj.userId) };
+      });
+      form.value.basicInfoId = '1686274734091489284';
+      // console.log(form.value, 'form.value');
+      patrolPlanadd(form.value).then(response => {
+        proxy.$modal.msgSuccess('新增成功');
+        open.value = false;
+        getList();
+      });
+    }
+  });
+}
+
 onMounted(() => {
   getList();
+  projectTypeListM();
+  getUserList();
 });
 </script>
 <style scoped lang="scss">
diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
index 29261a7..a4b1bab 100644
--- a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
+++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
@@ -1,8 +1,5 @@
 <template>
   <div class="first">
-    <div class="ditu">
-      <gisMap2D style="position: relative" :initJson="`/static/libs/mapbox/style/projectIndex.json`" @map-click="clickMap"></gisMap2D>
-    </div>
     <!-- 类容 -->
     <div class="dialog-form-detail flex flex-r flex-wrap" style="margin-top: 5px">
       <div class="flex flex-r">
@@ -13,38 +10,43 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查人员</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.taskUserList[0].userName }}</div>
+        <!-- <div class="detail-value flex flex-align-center">{{ props.DataList.taskUserList[0].userName }}</div> -->
       </div>
       <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">任务开始时间</div>
+        <div class="detail-label flex flex-align-center">巡查任务开始时间</div>
         <div class="detail-value flex flex-align-center">{{ props.DataList.planStartDatetime }}</div>
       </div>
       <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">任务结束时间</div>
+        <div class="detail-label flex flex-align-center">巡查任务结束时间</div>
         <div class="detail-value flex flex-align-center">{{ props.DataList.planEndDatetime }}</div>
       </div>
 
       <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">巡查位置</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.projectLocationName }}</div>
-      </div>
-      <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查项目</div>
         <div class="detail-value flex flex-align-center">
-          {{ props.DataList.projectList[0].projectAbbreviation }}
+          {{ props.DataList.projectName }}
         </div>
       </div>
-      <div class="flex flex-r">
+      <!-- <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查任务描述</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.taskDescribe }}</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.problemtitle }}</div>
+      </div> -->
+
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">巡查位置</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.projectAdress }}</div>
       </div>
     </div>
 
     <el-table :data="dataList" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px">
       <el-table-column type="index" width="55" label="序号" />
-      <el-table-column label="存在问题" prop="problemType"> </el-table-column>
-      <el-table-column label="督办事项" prop="checkItem" />
-      <el-table-column label="整改状态" prop="isRectification">
+      <el-table-column label="问题类型" prop="problemType">
+        <!-- <template #default="scope">
+          <dict-tag :options="problem_type" :value="String(scope.row.problemType)" />
+        </template> -->
+      </el-table-column>
+      <el-table-column label="检查项" prop="checkItem" />
+      <el-table-column label="是否整改" prop="isRectification">
         <template #default="scope">
           <span>
             {{
@@ -59,162 +61,51 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="整改通知单" prop="problemContent" />
-      <el-table-column label="整改回复单" prop="createTime" />
-      <el-table-column label="整改时限" prop="problemContent" />
-      <el-table-column label="整改方式" prop="createTime" />
-      <el-table-column label="责任人及电话" prop="problemContent" />
-      <el-table-column label="创建时间" prop="createTime" />
+      <el-table-column label="问题描述" prop="problemContent" />
+      <el-table-column label="上报时间" prop="createTime" />
+      <el-table-column label="巡查照片" prop="sysFileList">
+        <template #default="scope">
+          <el-image
+            style="width: 60px; height: 60px; margin: 5px"
+            v-for="i in scope.row.sysFileList"
+            :src="i.url"
+            :preview-src-list="[i.url]"
+          >
+          </el-image>
+          <span v-if="scope.row.sysFileList.length == ''">暂无照片</span>
+        </template>
+      </el-table-column>
     </el-table>
   </div>
 </template>
 
 <script setup>
-import { patrolProblempage } from '@/api/longoPeration/inspectiontasks';
-import gisMap2D from '@/views/gisMapPage/gisMapBox1.vue';
-import CoordTransform from '@/utils/gis/CoorTransform.js';
-import point_start from '@/assets/newImgs/point_start.png';
-import point_end from '@/assets/newImgs/point_end.png';
-import user from '@/assets/newImgs/user_1.png';
 const props = defineProps({
   // 数据
   DataList: {
     type: Array,
     default: null,
   },
-  pathData: {
-    type: Array,
-    default: null,
-  },
-  pathGeometry: {
-    type: String,
-    default: '',
-  },
 });
 const { proxy } = getCurrentInstance();
-const { problem_type } = proxy.useDict('problem_type'); //  巡查类型的字典
 const dataList = ref([]);
 const dataListPhone = ref([]);
 /** 查询列表 */
-const getList = async IdA => {
-  let res = await patrolProblempage({ patrolTaskId: IdA });
-  dataList.value = res.data;
-  res.data.forEach(element => {
-    dataListPhone.value = element.sysFileList;
-  });
-};
-//添加轨迹线
-const addRecordLine = (geojson, layerId) => {
-  newfiberMapbox.map.addSource(layerId, {
-    type: 'geojson',
-    data: geojson,
-  });
-  newfiberMapbox.map.addLayer({
-    id: layerId,
-    type: 'line',
-    source: layerId,
-    paint: {
-      'line-color': 'rgba(35, 217, 110,1)',
-      'line-width': 3,
-    },
-  });
-};
-//添加轨迹起止点
-const addStartAndEnd = (geojson, layerId, Icon) => {
-  newfiberMapbox.map.loadImage(Icon, (error, image) => {
-    if (error) throw error;
-    newfiberMapbox.map.addImage(layerId + '_icon', image);
-  });
-  newfiberMapbox.map.addSource(layerId, {
-    type: 'geojson',
-    data: geojson,
-  });
-  newfiberMapbox.map.addLayer({
-    id: layerId,
-    type: 'symbol',
-    source: layerId,
-    layout: {
-      'icon-image': layerId + '_icon',
-      'icon-size': 0.2,
-      'icon-offset': [0, 0],
-      'icon-allow-overlap': true,
-    },
-  });
-};
+// const getList = async IdA => {
+//   let res = await patrolProblempage({ patrolTaskId: IdA });
+//   dataList.value = res.data;
+//   res.data.forEach(element => {
+//     dataListPhone.value = element.sysFileList;
+//   });
+// };
+
 watch(
   () => props.DataList,
   val => {
     if (val) {
-      dataListPhone.value = [];
-      getList(props.DataList.id);
-    }
-  },
-  { deep: true, immediate: true }
-);
-watch(
-  () => props.pathGeometry,
-  val => {
-    if (val) {
-      if (newfiberMapbox.map.getLayer('recordLineGeojson')) {
-        newfiberMapbox.map.removeLayer('recordLineGeojson');
-        newfiberMapbox.map.removeSource('recordLineGeojson');
-      }
-      if (val === '') return;
-
-      //轨迹线
-      let recordLineGeojson = {
-        type: 'FeatureCollection',
-        features: [
-          {
-            type: 'Feature',
-            geometry: Terraformer.WKT.parse(val),
-          },
-        ],
-      };
-      console.log('recordLineGeojson--', recordLineGeojson);
-      gcoord.transform(recordLineGeojson.features[0], gcoord.GCJ02, gcoord.WGS84);
-      setTimeout(() => {
-        addRecordLine(recordLineGeojson, 'recordLineGeojson');
-        gcoord.transform(recordLineGeojson.features[0], gcoord.WGS84, gcoord.GCJ02);
-      }, 2000);
-    }
-  }
-);
-watch(
-  () => props.pathData,
-  val => {
-    if (val) {
-      console.log('val-----', val);
-      if (newfiberMapbox.map.getLayer('point_start')) {
-        newfiberMapbox.map.removeLayer('point_start');
-        newfiberMapbox.map.removeLayer('point_end');
-        newfiberMapbox.map.removeSource('point_start');
-        newfiberMapbox.map.removeSource('point_end');
-        newfiberMapbox.map.removeImage('point_start_icon');
-        newfiberMapbox.map.removeImage('point_end_icon');
-      }
-      if (!val.length) return;
-
-      //起止点
-      let start_84 = CoordTransform.gcj02towgs84(Number(val[0].lng), Number(val[0].lat));
-      let end_84 = CoordTransform.gcj02towgs84(Number(val[val.length - 1].lng), Number(val[val.length - 1].lat));
-      let startPointGeojson = {
-        type: 'FeatureCollection',
-        features: [turf.point(start_84)],
-      };
-      let endPointGeojson = {
-        type: 'FeatureCollection',
-        features: [turf.point(end_84)],
-      };
-      setTimeout(() => {
-        addStartAndEnd(startPointGeojson, 'point_start', point_start);
-        addStartAndEnd(endPointGeojson, 'point_end', point_end);
-        newfiberMapbox.map.setPitch(0);
-        newfiberMapbox.map.easeTo({
-          center: start_84,
-          zoom: 15,
-        });
-      }, 2000);
+      console.log(props.DataList, 'props.DataList');
+      // dataListPhone.value = [];
+      // getList(props.DataList.id);
     }
   },
   { deep: true, immediate: true }
@@ -224,9 +115,5 @@
 
 <style scoped lang="scss">
 .first {
-  .ditu {
-    width: 100%;
-    height: 200px;
-  }
 }
 </style>