diff --git a/src/api/longoPeration/Inspectionplana.js b/src/api/longoPeration/Inspectionplana.js
index 934f156..0d63d49 100644
--- a/src/api/longoPeration/Inspectionplana.js
+++ b/src/api/longoPeration/Inspectionplana.js
@@ -8,15 +8,13 @@
   });
 }
 
-// 列表
-export function FloodPreventionMaterialList(query) {
+// 激活
+export function activation(ids) {
   return request({
-    url: '/business/floodPreventionMaterial/list',
-    method: 'get',
-    params: query,
+    url: '/business/patrolPlan/activation/' + ids,
+    method: 'put',
   });
 }
-
 // 新增
 export function patrolPlanadd(data) {
   return request({
@@ -25,20 +23,19 @@
     data: data,
   });
 }
-
-// 修改排水防涝--防汛物资
-export function FloodPreventionMaterialedit(data) {
+// 修改
+export function patrolPlanedit(data) {
   return request({
-    url: '/business/floodPreventionMaterial/edit',
+    url: '/business/patrolPlan/edit',
     method: 'put',
     data: data,
   });
 }
 
-// 删除排水防涝--防汛物资
-export function FloodPreventionMaterialdelete(id) {
+// 删除
+export function patrolPlandelete(ids) {
   return request({
-    url: '/business/floodPreventionMaterial/' + id,
+    url: '/business/patrolPlan/' + ids,
     method: 'delete',
   });
 }

diff --git a/src/api/longoPeration/Inspectionplana.js b/src/api/longoPeration/Inspectionplana.js
index 934f156..0d63d49 100644
--- a/src/api/longoPeration/Inspectionplana.js
+++ b/src/api/longoPeration/Inspectionplana.js
@@ -8,15 +8,13 @@
   });
 }
 
-// 列表
-export function FloodPreventionMaterialList(query) {
+// 激活
+export function activation(ids) {
   return request({
-    url: '/business/floodPreventionMaterial/list',
-    method: 'get',
-    params: query,
+    url: '/business/patrolPlan/activation/' + ids,
+    method: 'put',
   });
 }
-
 // 新增
 export function patrolPlanadd(data) {
   return request({
@@ -25,20 +23,19 @@
     data: data,
   });
 }
-
-// 修改排水防涝--防汛物资
-export function FloodPreventionMaterialedit(data) {
+// 修改
+export function patrolPlanedit(data) {
   return request({
-    url: '/business/floodPreventionMaterial/edit',
+    url: '/business/patrolPlan/edit',
     method: 'put',
     data: data,
   });
 }
 
-// 删除排水防涝--防汛物资
-export function FloodPreventionMaterialdelete(id) {
+// 删除
+export function patrolPlandelete(ids) {
   return request({
-    url: '/business/floodPreventionMaterial/' + id,
+    url: '/business/patrolPlan/' + ids,
     method: 'delete',
   });
 }
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 962ce20..21db720 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -34,7 +34,7 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
     <!-- 表格 -->
-    <el-table :data="dataList" v-loading="loading" stripe :max-height="280">
+    <el-table :data="dataList" v-loading="loading" stripe :max-height="580">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="巡查任务名称" prop="taskName" />
       <el-table-column label="项目名称" prop="projectName" />
@@ -57,8 +57,12 @@
       <el-table-column label="操作" width="350">
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
-          <el-button link type="primary" icon="Edit" @click="handlenotice(scope.row)">发布整改通知</el-button>
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">提交整改回复单</el-button>
+          <el-button v-if="scope.row.fileListToNotice.length == 0" link type="primary" icon="Edit" @click="handlenotice(scope.row)"
+            >发布整改通知</el-button
+          >
+          <el-button link type="primary" v-if="scope.row.fileListToReply.length == 0" icon="Edit" @click="handleUpdate(scope.row)"
+            >提交整改回复单</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -262,7 +266,7 @@
     rectifyType: [{ required: true, message: '请输入整改方式', trigger: 'blur' }],
     supervisionWork: [{ required: true, message: '请输入督办事项', trigger: 'blur' }],
     haveProblem: [{ required: true, message: '请输入存在问题', trigger: 'blur' }],
-    // fileListToNotice: [{ 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' }],
@@ -298,8 +302,11 @@
       },
     ],
   },
+  rulesOne: {
+    fileListToReply: [{ required: true, message: '请上传整改回复单', trigger: 'blur' }],
+  },
 });
-const { queryParams, form, rules, formOne } = toRefs(AllData);
+const { queryParams, form, rules, formOne, rulesOne } = toRefs(AllData);
 
 //搜索
 function handleQuery() {

diff --git a/src/api/longoPeration/Inspectionplana.js b/src/api/longoPeration/Inspectionplana.js
index 934f156..0d63d49 100644
--- a/src/api/longoPeration/Inspectionplana.js
+++ b/src/api/longoPeration/Inspectionplana.js
@@ -8,15 +8,13 @@
   });
 }
 
-// 列表
-export function FloodPreventionMaterialList(query) {
+// 激活
+export function activation(ids) {
   return request({
-    url: '/business/floodPreventionMaterial/list',
-    method: 'get',
-    params: query,
+    url: '/business/patrolPlan/activation/' + ids,
+    method: 'put',
   });
 }
-
 // 新增
 export function patrolPlanadd(data) {
   return request({
@@ -25,20 +23,19 @@
     data: data,
   });
 }
-
-// 修改排水防涝--防汛物资
-export function FloodPreventionMaterialedit(data) {
+// 修改
+export function patrolPlanedit(data) {
   return request({
-    url: '/business/floodPreventionMaterial/edit',
+    url: '/business/patrolPlan/edit',
     method: 'put',
     data: data,
   });
 }
 
-// 删除排水防涝--防汛物资
-export function FloodPreventionMaterialdelete(id) {
+// 删除
+export function patrolPlandelete(ids) {
   return request({
-    url: '/business/floodPreventionMaterial/' + id,
+    url: '/business/patrolPlan/' + ids,
     method: 'delete',
   });
 }
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 962ce20..21db720 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -34,7 +34,7 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
     <!-- 表格 -->
-    <el-table :data="dataList" v-loading="loading" stripe :max-height="280">
+    <el-table :data="dataList" v-loading="loading" stripe :max-height="580">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="巡查任务名称" prop="taskName" />
       <el-table-column label="项目名称" prop="projectName" />
@@ -57,8 +57,12 @@
       <el-table-column label="操作" width="350">
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
-          <el-button link type="primary" icon="Edit" @click="handlenotice(scope.row)">发布整改通知</el-button>
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">提交整改回复单</el-button>
+          <el-button v-if="scope.row.fileListToNotice.length == 0" link type="primary" icon="Edit" @click="handlenotice(scope.row)"
+            >发布整改通知</el-button
+          >
+          <el-button link type="primary" v-if="scope.row.fileListToReply.length == 0" icon="Edit" @click="handleUpdate(scope.row)"
+            >提交整改回复单</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -262,7 +266,7 @@
     rectifyType: [{ required: true, message: '请输入整改方式', trigger: 'blur' }],
     supervisionWork: [{ required: true, message: '请输入督办事项', trigger: 'blur' }],
     haveProblem: [{ required: true, message: '请输入存在问题', trigger: 'blur' }],
-    // fileListToNotice: [{ 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' }],
@@ -298,8 +302,11 @@
       },
     ],
   },
+  rulesOne: {
+    fileListToReply: [{ required: true, message: '请上传整改回复单', trigger: 'blur' }],
+  },
 });
-const { queryParams, form, rules, formOne } = toRefs(AllData);
+const { queryParams, form, rules, formOne, rulesOne } = toRefs(AllData);
 
 //搜索
 function handleQuery() {
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index cc67429..41b65ac 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -6,9 +6,9 @@
         <el-input v-model="queryParams.planName" placeholder="请输入计划名称" clearable style="width: 180px" />
       </el-form-item>
 
-      <el-form-item label="项目名称:" prop="eventType">
-        <el-select clearable v-model="queryParams.eventType" style="width: 180px" placeholder="请选择项目名称">
-          <el-option v-for="item in Xmtype" :key="item.value" :label="item.label" :value="item.value" />
+      <el-form-item label="项目名称:" prop="projectCodes">
+        <el-select clearable v-model="queryParams.projectCodes" style="width: 180px" placeholder="请选择项目名称">
+          <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
         </el-select>
       </el-form-item>
 
@@ -22,6 +22,7 @@
         <el-date-picker
           style="width: 380px"
           format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           v-model="AllData.publishTime"
           type="daterange"
           range-separator="至"
@@ -47,31 +48,51 @@
     <!-- 表格 -->
     <el-table :data="dataList" v-loading="loading" stripe :max-height="580">
       <el-table-column type="index" width="55" label="序号" />
-      <el-table-column label="巡查计划名称" prop="planName" />
-      <el-table-column label="项目名称" prop="project" />
-      <el-table-column label="巡查人员" prop="planUserIds" />
+      <el-table-column label="巡查计划名称" prop="planName" width="140" />
+      <el-table-column label="巡查计划状态" prop="status" width="150">
+        <template #default="scope">
+          <span>
+            {{ scope.row.status == '0' ? '未激活' : scope.row.status == '1' ? '已激活' : '' }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目名称" prop="projectCodes" width="400">
+        <template #default="scope">
+          <p v-for="item in scope.row.projectList">{{ item.projectAbbreviation }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="巡查人员" prop="planUserIds">
+        <template #default="scope">
+          <p v-for="item in scope.row.taskUserList">{{ item.userName }}</p>
+        </template>
+      </el-table-column>
       <el-table-column label="巡查类型" prop="patrolType">
         <template #default="scope">
           <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
         </template>
       </el-table-column>
-      <el-table-column label="巡查公里数(km)" prop="num" />
-      <el-table-column label="计划开始时间" prop="startTime" />
-      <el-table-column label="计划结束时间" prop="endDate" />
-      <el-table-column label="任务频率" prop="patrolFrequencyType" />
-      <el-table-column label="创建时间" prop="create" />
-      <el-table-column label="巡查要求" prop="remark" />
-      <el-table-column label="巡查计划状态" prop="status" />
-      <el-table-column label="操作" width="280">
+      <!-- <el-table-column label="巡查公里数(km)" prop="num" /> -->
+      <el-table-column label="计划开始时间" prop="startTime" width="180" />
+      <el-table-column label="计划结束时间" prop="endDate" width="180" />
+      <el-table-column label="任务频率" prop="patrolFrequencyContent" width="200">
+        <!-- <template #default="scope">
+          <span>
+            {{ scope.row.patrolFrequencyType == 'for_week' ? '周' : scope.row.patrolFrequencyType == 'for_day' ? '日' : '' }}
+          </span>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="创建时间" prop="createTime" width="180" />
+      <el-table-column label="巡查要求" prop="remark" width="180" />
+      <el-table-column label="操作" width="280" fixed="right">
         <template #default="scope">
-          <el-button link icon="View" type="success" v-if="scope.row.status == '未激活'" @click="activation(scope.row, 'view')">
+          <el-button link icon="View" type="success" v-if="scope.row.status == '0'" @click="handleActive(scope.row, 'view')">
             激活
           </el-button>
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">详情</el-button>
-          <el-button link type="warning" icon="Edit" v-if="scope.row.status == '未激活'" @click="handleUpdate(scope.row, 'view')">
+          <el-button link type="warning" icon="Edit" v-if="scope.row.status == '0'" @click="handleUpdate(scope.row, 'view')">
             修改
           </el-button>
-          <el-button link type="danger" icon="Delete" v-if="scope.row.status == '未激活'" @click="handleDelete(scope.row, 'view')">
+          <el-button link type="danger" icon="Delete" v-if="scope.row.status == '0'" @click="handleDelete(scope.row, 'view')">
             删除
           </el-button>
         </template>
@@ -98,7 +119,7 @@
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="项目名称:" prop="projectList">
+            <el-form-item label="项目名称:" prop="projectCodes">
               <el-select
                 clearable
                 v-model="form.projectList"
@@ -108,13 +129,13 @@
                 multiple
                 label="projectName"
               >
-                <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj" />
+                <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="巡查计划类型:" prop="patrolType">
-              <el-select clearable v-model="form.patrolType" style="width: 100%" placeholder="请选择项目名称">
+              <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-form-item>
@@ -123,13 +144,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="巡查频率:" prop="patrolFrequencyType">
-              <el-select
-                v-model="form.patrolFrequencyType"
-                placeholder="请选择巡查频率"
-                clearable
-                style="width: 100%"
-                @change="changeStation"
-              >
+              <el-select v-model="form.patrolFrequencyType" placeholder="请选择巡查频率" clearable style="width: 100%">
                 <el-option v-for="dict in Xcfrequency" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
@@ -137,14 +152,14 @@
           <el-col :span="12">
             <el-form-item label="巡查频率(周):" prop="fileTag1" v-if="form.patrolFrequencyType == 'for_week'">
               <el-select v-model="form.patrolWeekDay" placeholder="请选择巡查频率(周)" clearable style="width: 100%" multiple>
-                <el-option v-for="item in weekList" :key="item.value" :label="item.label" :value="Number(item.value)" />
+                <el-option v-for="item in weekList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="巡查人员:" prop="patrolUserList">
+            <el-form-item label="巡查人员:" prop="planUserIds">
               <el-select
                 v-model="form.patrolUserList"
                 placeholder="请选择巡查人员"
@@ -154,7 +169,7 @@
                 label="nickName"
                 multiple
               >
-                <el-option v-for="item in userList" :key="String(item.userId)" :label="item.nickName" :value="item" />
+                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -184,7 +199,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm" v-show="!multiple">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
@@ -192,12 +207,7 @@
   </div>
 </template>
 <script setup name="Inspectionplan">
-import {
-  patrolPlanpage,
-  FloodPreventionMaterialedit,
-  patrolPlanadd,
-  FloodPreventionMaterialdelete,
-} from '@/api/longoPeration/Inspectionplana';
+import { patrolPlanpage, activation, patrolPlanedit, patrolPlanadd, patrolPlandelete } from '@/api/longoPeration/Inspectionplana';
 import { listUser } from '@/api/system/user';
 import { getProjectInfoList } from '@/api/preassess/targetManage';
 const { proxy } = getCurrentInstance();
@@ -212,9 +222,8 @@
   { value: 'for_week', label: '周' },
 ]);
 const WaterDate = ref([
-  { value: '0', label: '已完成' },
   { value: '1', label: '已激活' },
-  { value: '2', label: '未激活' },
+  { value: '0', label: '未激活' },
 ]);
 const weekList = ref([
   { value: '1', label: '周日' },
@@ -234,8 +243,8 @@
   id: '',
   caseid: '',
   caseidone: '',
-  publishTime: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')],
-  form: { a: [] },
+  publishTime: [],
+  form: {},
   formDate: {},
   caseFormDate: { id: '' },
   queryParams: {
@@ -248,19 +257,19 @@
   },
   rules: {
     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' }],
+    projectCodes: [{ required: true, message: '请选择项目名称', trigger: 'blur' }],
+    patrolType: [{ required: true, message: '请选择巡查计划类型', trigger: 'blur' }],
+    planUserIds: [{ required: true, message: '请选择巡查人员', trigger: 'blur' }],
     reportTime1: [{ required: true, message: '请选择计划日期', trigger: 'blur' }],
     eventDescription: [{ required: true, message: '请输入', trigger: 'blur' }],
-    patrolWeekDay: [{ required: true, message: '请选择巡查频率(周)', trigger: 'blur' }],
+    fileTag1: [{ required: true, message: '请选择巡查频率(周)', trigger: 'blur' }],
   },
 });
 const { queryParams, form, rules } = toRefs(AllData);
 
 //搜索
 function handleQuery() {
+  // console.log('123', AllData.publishTime);
   if (AllData.publishTime) {
     queryParams.value.startTime = AllData.publishTime[0];
     queryParams.value.endDate = AllData.publishTime[1];
@@ -272,7 +281,7 @@
 }
 //重置
 function resetQuery() {
-  AllData.publishTime = [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD 23:59:59')];
+  AllData.publishTime = [];
   proxy.resetForm('queryRef');
   handleQuery();
 }
@@ -289,44 +298,15 @@
   open.value = false;
   proxy.resetForm('roleRef');
 }
-
-// 巡查频率下拉框点击事件
-function changeStation(value) {
-  // console.log(value, 'value');
-}
-
-//查看详情操作
-function handleDetail(row) {
-  open.value = true;
-  multiple.value = true;
-  title.value = '查看巡查计划';
-  form.value = row;
-  form.value.patrolUserList = row.taskUserList.map(item => {
-    return item.userName;
-  });
-  form.value.projectList = row.projectList.map(item => {
-    return item.projectAbbreviation;
-  });
-}
-// 修改按钮操作
-function handleUpdate(row) {
-  open.value = true;
-  title.value = '修改巡查计划';
-  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;
+    userList.value = res.data || [];
+    userList.value.map(item => {
+      item.userId = String(item.userId);
+    });
   });
 }
-
 /** 查询列表 */
 const getList = async () => {
   loading.value = true;
@@ -334,7 +314,6 @@
     queryParams.value.startTime = AllData.publishTime[0];
     queryParams.value.endDate = AllData.publishTime[1];
   }
-
   let res = await patrolPlanpage(queryParams.value);
   dataList.value = res.data;
   console.log(dataList.value, 'dataList.value');
@@ -342,6 +321,57 @@
   loading.value = false;
 };
 
+//查看详情操作
+function handleDetail(row) {
+  open.value = true;
+  multiple.value = true;
+  title.value = '查看巡查计划';
+  form.value = { ...row };
+  // 做详情回显判断
+  form.value.patrolUserList = row.taskUserList.map(item => {
+    return item.userName;
+  });
+  form.value.projectList = row.projectList.map(item => {
+    return item.projectAbbreviation;
+  });
+  form.value.reportTime1 = [form.value.startDate, form.value.endDate];
+  form.value.patrolWeekDay = row.patrolFrequencyList ? row.patrolFrequencyList.split(',') : [];
+}
+// 修改按钮操作
+function handleUpdate(row) {
+  open.value = true;
+  title.value = '修改巡查计划';
+  multiple.value = false;
+  form.value = { ...row };
+  console.log(form.value, 'form.value form.value ');
+  // 做修改回显判断
+  form.value.patrolUserList = row.planUserIds ? row.planUserIds.split(',') : [];
+  form.value.patrolUserList.forEach(element => {
+    element = element.userId;
+  });
+  form.value.projectList = row.projectCodes ? row.projectCodes.split(',') : [];
+  form.value.patrolWeekDay = row.patrolFrequencyList ? row.patrolFrequencyList.split(',') : [];
+  form.value.reportTime1 = [form.value.startDate, form.value.endDate];
+}
+// 激活
+function handleActive(row) {
+  console.log(row.id, '1');
+  activation(row.id).then(res => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('激活成功');
+      getList();
+    } else {
+      proxy.$modal.msgError('激活失败');
+      getList();
+    }
+  });
+}
+// 项目接口
+async function projectTypeListM() {
+  let { data } = await getProjectInfoList();
+  projectTList.value = data;
+}
+
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
@@ -351,24 +381,57 @@
       form.value.endDate = form.value.reportTime1[1];
       // 处理项目传参
       form.value.projectList = form.value.projectList.map(obj => {
-        return { projectNo: obj.projectNo, projectName: obj.projectName };
+        console.log(projectTList.value, 'projectTList.value');
+        let nameXm = '';
+        projectTList.value.forEach(item => {
+          if (item.projectNo == obj) {
+            nameXm = item.projectName;
+            // console.log(item.projectName, 'item');
+          }
+        });
+        // console.log(obj, 'obj');
+        return { projectNo: obj, projectName: nameXm };
       });
       // 处理人员传参
-      form.value.patrolUserList = form.value.patrolUserList.map(obj => {
-        return { userId: String(obj.userId) };
+      form.value.patrolUserList = form.value.patrolUserList.map(item => {
+        console.log(item, 'item');
+        return { userId: item };
       });
-
       form.value.basicInfoId = '1686274734091489284';
       // console.log(form.value, 'form.value');
-      patrolPlanadd(form.value).then(response => {
-        proxy.$modal.msgSuccess('新增成功');
-        open.value = false;
-        getList();
-      });
+
+      if (title.value == '修改巡查计划') {
+        patrolPlanedit(form.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          open.value = false;
+          getList();
+        });
+      } else {
+        if (form.value.id) delete form.value.id;
+        patrolPlanadd(form.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          open.value = false;
+          getList();
+        });
+      }
     }
   });
 }
 
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return patrolPlandelete(postIds);
+    })
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
+}
 onMounted(() => {
   getList();
   projectTypeListM();

diff --git a/src/api/longoPeration/Inspectionplana.js b/src/api/longoPeration/Inspectionplana.js
index 934f156..0d63d49 100644
--- a/src/api/longoPeration/Inspectionplana.js
+++ b/src/api/longoPeration/Inspectionplana.js
@@ -8,15 +8,13 @@
   });
 }
 
-// 列表
-export function FloodPreventionMaterialList(query) {
+// 激活
+export function activation(ids) {
   return request({
-    url: '/business/floodPreventionMaterial/list',
-    method: 'get',
-    params: query,
+    url: '/business/patrolPlan/activation/' + ids,
+    method: 'put',
   });
 }
-
 // 新增
 export function patrolPlanadd(data) {
   return request({
@@ -25,20 +23,19 @@
     data: data,
   });
 }
-
-// 修改排水防涝--防汛物资
-export function FloodPreventionMaterialedit(data) {
+// 修改
+export function patrolPlanedit(data) {
   return request({
-    url: '/business/floodPreventionMaterial/edit',
+    url: '/business/patrolPlan/edit',
     method: 'put',
     data: data,
   });
 }
 
-// 删除排水防涝--防汛物资
-export function FloodPreventionMaterialdelete(id) {
+// 删除
+export function patrolPlandelete(ids) {
   return request({
-    url: '/business/floodPreventionMaterial/' + id,
+    url: '/business/patrolPlan/' + ids,
     method: 'delete',
   });
 }
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 962ce20..21db720 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -34,7 +34,7 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
     <!-- 表格 -->
-    <el-table :data="dataList" v-loading="loading" stripe :max-height="280">
+    <el-table :data="dataList" v-loading="loading" stripe :max-height="580">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="巡查任务名称" prop="taskName" />
       <el-table-column label="项目名称" prop="projectName" />
@@ -57,8 +57,12 @@
       <el-table-column label="操作" width="350">
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
-          <el-button link type="primary" icon="Edit" @click="handlenotice(scope.row)">发布整改通知</el-button>
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">提交整改回复单</el-button>
+          <el-button v-if="scope.row.fileListToNotice.length == 0" link type="primary" icon="Edit" @click="handlenotice(scope.row)"
+            >发布整改通知</el-button
+          >
+          <el-button link type="primary" v-if="scope.row.fileListToReply.length == 0" icon="Edit" @click="handleUpdate(scope.row)"
+            >提交整改回复单</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -262,7 +266,7 @@
     rectifyType: [{ required: true, message: '请输入整改方式', trigger: 'blur' }],
     supervisionWork: [{ required: true, message: '请输入督办事项', trigger: 'blur' }],
     haveProblem: [{ required: true, message: '请输入存在问题', trigger: 'blur' }],
-    // fileListToNotice: [{ 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' }],
@@ -298,8 +302,11 @@
       },
     ],
   },
+  rulesOne: {
+    fileListToReply: [{ required: true, message: '请上传整改回复单', trigger: 'blur' }],
+  },
 });
-const { queryParams, form, rules, formOne } = toRefs(AllData);
+const { queryParams, form, rules, formOne, rulesOne } = toRefs(AllData);
 
 //搜索
 function handleQuery() {
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index cc67429..41b65ac 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -6,9 +6,9 @@
         <el-input v-model="queryParams.planName" placeholder="请输入计划名称" clearable style="width: 180px" />
       </el-form-item>
 
-      <el-form-item label="项目名称:" prop="eventType">
-        <el-select clearable v-model="queryParams.eventType" style="width: 180px" placeholder="请选择项目名称">
-          <el-option v-for="item in Xmtype" :key="item.value" :label="item.label" :value="item.value" />
+      <el-form-item label="项目名称:" prop="projectCodes">
+        <el-select clearable v-model="queryParams.projectCodes" style="width: 180px" placeholder="请选择项目名称">
+          <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
         </el-select>
       </el-form-item>
 
@@ -22,6 +22,7 @@
         <el-date-picker
           style="width: 380px"
           format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           v-model="AllData.publishTime"
           type="daterange"
           range-separator="至"
@@ -47,31 +48,51 @@
     <!-- 表格 -->
     <el-table :data="dataList" v-loading="loading" stripe :max-height="580">
       <el-table-column type="index" width="55" label="序号" />
-      <el-table-column label="巡查计划名称" prop="planName" />
-      <el-table-column label="项目名称" prop="project" />
-      <el-table-column label="巡查人员" prop="planUserIds" />
+      <el-table-column label="巡查计划名称" prop="planName" width="140" />
+      <el-table-column label="巡查计划状态" prop="status" width="150">
+        <template #default="scope">
+          <span>
+            {{ scope.row.status == '0' ? '未激活' : scope.row.status == '1' ? '已激活' : '' }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目名称" prop="projectCodes" width="400">
+        <template #default="scope">
+          <p v-for="item in scope.row.projectList">{{ item.projectAbbreviation }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="巡查人员" prop="planUserIds">
+        <template #default="scope">
+          <p v-for="item in scope.row.taskUserList">{{ item.userName }}</p>
+        </template>
+      </el-table-column>
       <el-table-column label="巡查类型" prop="patrolType">
         <template #default="scope">
           <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
         </template>
       </el-table-column>
-      <el-table-column label="巡查公里数(km)" prop="num" />
-      <el-table-column label="计划开始时间" prop="startTime" />
-      <el-table-column label="计划结束时间" prop="endDate" />
-      <el-table-column label="任务频率" prop="patrolFrequencyType" />
-      <el-table-column label="创建时间" prop="create" />
-      <el-table-column label="巡查要求" prop="remark" />
-      <el-table-column label="巡查计划状态" prop="status" />
-      <el-table-column label="操作" width="280">
+      <!-- <el-table-column label="巡查公里数(km)" prop="num" /> -->
+      <el-table-column label="计划开始时间" prop="startTime" width="180" />
+      <el-table-column label="计划结束时间" prop="endDate" width="180" />
+      <el-table-column label="任务频率" prop="patrolFrequencyContent" width="200">
+        <!-- <template #default="scope">
+          <span>
+            {{ scope.row.patrolFrequencyType == 'for_week' ? '周' : scope.row.patrolFrequencyType == 'for_day' ? '日' : '' }}
+          </span>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="创建时间" prop="createTime" width="180" />
+      <el-table-column label="巡查要求" prop="remark" width="180" />
+      <el-table-column label="操作" width="280" fixed="right">
         <template #default="scope">
-          <el-button link icon="View" type="success" v-if="scope.row.status == '未激活'" @click="activation(scope.row, 'view')">
+          <el-button link icon="View" type="success" v-if="scope.row.status == '0'" @click="handleActive(scope.row, 'view')">
             激活
           </el-button>
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">详情</el-button>
-          <el-button link type="warning" icon="Edit" v-if="scope.row.status == '未激活'" @click="handleUpdate(scope.row, 'view')">
+          <el-button link type="warning" icon="Edit" v-if="scope.row.status == '0'" @click="handleUpdate(scope.row, 'view')">
             修改
           </el-button>
-          <el-button link type="danger" icon="Delete" v-if="scope.row.status == '未激活'" @click="handleDelete(scope.row, 'view')">
+          <el-button link type="danger" icon="Delete" v-if="scope.row.status == '0'" @click="handleDelete(scope.row, 'view')">
             删除
           </el-button>
         </template>
@@ -98,7 +119,7 @@
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="项目名称:" prop="projectList">
+            <el-form-item label="项目名称:" prop="projectCodes">
               <el-select
                 clearable
                 v-model="form.projectList"
@@ -108,13 +129,13 @@
                 multiple
                 label="projectName"
               >
-                <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj" />
+                <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="巡查计划类型:" prop="patrolType">
-              <el-select clearable v-model="form.patrolType" style="width: 100%" placeholder="请选择项目名称">
+              <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-form-item>
@@ -123,13 +144,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="巡查频率:" prop="patrolFrequencyType">
-              <el-select
-                v-model="form.patrolFrequencyType"
-                placeholder="请选择巡查频率"
-                clearable
-                style="width: 100%"
-                @change="changeStation"
-              >
+              <el-select v-model="form.patrolFrequencyType" placeholder="请选择巡查频率" clearable style="width: 100%">
                 <el-option v-for="dict in Xcfrequency" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
@@ -137,14 +152,14 @@
           <el-col :span="12">
             <el-form-item label="巡查频率(周):" prop="fileTag1" v-if="form.patrolFrequencyType == 'for_week'">
               <el-select v-model="form.patrolWeekDay" placeholder="请选择巡查频率(周)" clearable style="width: 100%" multiple>
-                <el-option v-for="item in weekList" :key="item.value" :label="item.label" :value="Number(item.value)" />
+                <el-option v-for="item in weekList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="巡查人员:" prop="patrolUserList">
+            <el-form-item label="巡查人员:" prop="planUserIds">
               <el-select
                 v-model="form.patrolUserList"
                 placeholder="请选择巡查人员"
@@ -154,7 +169,7 @@
                 label="nickName"
                 multiple
               >
-                <el-option v-for="item in userList" :key="String(item.userId)" :label="item.nickName" :value="item" />
+                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -184,7 +199,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm" v-show="!multiple">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
@@ -192,12 +207,7 @@
   </div>
 </template>
 <script setup name="Inspectionplan">
-import {
-  patrolPlanpage,
-  FloodPreventionMaterialedit,
-  patrolPlanadd,
-  FloodPreventionMaterialdelete,
-} from '@/api/longoPeration/Inspectionplana';
+import { patrolPlanpage, activation, patrolPlanedit, patrolPlanadd, patrolPlandelete } from '@/api/longoPeration/Inspectionplana';
 import { listUser } from '@/api/system/user';
 import { getProjectInfoList } from '@/api/preassess/targetManage';
 const { proxy } = getCurrentInstance();
@@ -212,9 +222,8 @@
   { value: 'for_week', label: '周' },
 ]);
 const WaterDate = ref([
-  { value: '0', label: '已完成' },
   { value: '1', label: '已激活' },
-  { value: '2', label: '未激活' },
+  { value: '0', label: '未激活' },
 ]);
 const weekList = ref([
   { value: '1', label: '周日' },
@@ -234,8 +243,8 @@
   id: '',
   caseid: '',
   caseidone: '',
-  publishTime: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')],
-  form: { a: [] },
+  publishTime: [],
+  form: {},
   formDate: {},
   caseFormDate: { id: '' },
   queryParams: {
@@ -248,19 +257,19 @@
   },
   rules: {
     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' }],
+    projectCodes: [{ required: true, message: '请选择项目名称', trigger: 'blur' }],
+    patrolType: [{ required: true, message: '请选择巡查计划类型', trigger: 'blur' }],
+    planUserIds: [{ required: true, message: '请选择巡查人员', trigger: 'blur' }],
     reportTime1: [{ required: true, message: '请选择计划日期', trigger: 'blur' }],
     eventDescription: [{ required: true, message: '请输入', trigger: 'blur' }],
-    patrolWeekDay: [{ required: true, message: '请选择巡查频率(周)', trigger: 'blur' }],
+    fileTag1: [{ required: true, message: '请选择巡查频率(周)', trigger: 'blur' }],
   },
 });
 const { queryParams, form, rules } = toRefs(AllData);
 
 //搜索
 function handleQuery() {
+  // console.log('123', AllData.publishTime);
   if (AllData.publishTime) {
     queryParams.value.startTime = AllData.publishTime[0];
     queryParams.value.endDate = AllData.publishTime[1];
@@ -272,7 +281,7 @@
 }
 //重置
 function resetQuery() {
-  AllData.publishTime = [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD 23:59:59')];
+  AllData.publishTime = [];
   proxy.resetForm('queryRef');
   handleQuery();
 }
@@ -289,44 +298,15 @@
   open.value = false;
   proxy.resetForm('roleRef');
 }
-
-// 巡查频率下拉框点击事件
-function changeStation(value) {
-  // console.log(value, 'value');
-}
-
-//查看详情操作
-function handleDetail(row) {
-  open.value = true;
-  multiple.value = true;
-  title.value = '查看巡查计划';
-  form.value = row;
-  form.value.patrolUserList = row.taskUserList.map(item => {
-    return item.userName;
-  });
-  form.value.projectList = row.projectList.map(item => {
-    return item.projectAbbreviation;
-  });
-}
-// 修改按钮操作
-function handleUpdate(row) {
-  open.value = true;
-  title.value = '修改巡查计划';
-  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;
+    userList.value = res.data || [];
+    userList.value.map(item => {
+      item.userId = String(item.userId);
+    });
   });
 }
-
 /** 查询列表 */
 const getList = async () => {
   loading.value = true;
@@ -334,7 +314,6 @@
     queryParams.value.startTime = AllData.publishTime[0];
     queryParams.value.endDate = AllData.publishTime[1];
   }
-
   let res = await patrolPlanpage(queryParams.value);
   dataList.value = res.data;
   console.log(dataList.value, 'dataList.value');
@@ -342,6 +321,57 @@
   loading.value = false;
 };
 
+//查看详情操作
+function handleDetail(row) {
+  open.value = true;
+  multiple.value = true;
+  title.value = '查看巡查计划';
+  form.value = { ...row };
+  // 做详情回显判断
+  form.value.patrolUserList = row.taskUserList.map(item => {
+    return item.userName;
+  });
+  form.value.projectList = row.projectList.map(item => {
+    return item.projectAbbreviation;
+  });
+  form.value.reportTime1 = [form.value.startDate, form.value.endDate];
+  form.value.patrolWeekDay = row.patrolFrequencyList ? row.patrolFrequencyList.split(',') : [];
+}
+// 修改按钮操作
+function handleUpdate(row) {
+  open.value = true;
+  title.value = '修改巡查计划';
+  multiple.value = false;
+  form.value = { ...row };
+  console.log(form.value, 'form.value form.value ');
+  // 做修改回显判断
+  form.value.patrolUserList = row.planUserIds ? row.planUserIds.split(',') : [];
+  form.value.patrolUserList.forEach(element => {
+    element = element.userId;
+  });
+  form.value.projectList = row.projectCodes ? row.projectCodes.split(',') : [];
+  form.value.patrolWeekDay = row.patrolFrequencyList ? row.patrolFrequencyList.split(',') : [];
+  form.value.reportTime1 = [form.value.startDate, form.value.endDate];
+}
+// 激活
+function handleActive(row) {
+  console.log(row.id, '1');
+  activation(row.id).then(res => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('激活成功');
+      getList();
+    } else {
+      proxy.$modal.msgError('激活失败');
+      getList();
+    }
+  });
+}
+// 项目接口
+async function projectTypeListM() {
+  let { data } = await getProjectInfoList();
+  projectTList.value = data;
+}
+
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
@@ -351,24 +381,57 @@
       form.value.endDate = form.value.reportTime1[1];
       // 处理项目传参
       form.value.projectList = form.value.projectList.map(obj => {
-        return { projectNo: obj.projectNo, projectName: obj.projectName };
+        console.log(projectTList.value, 'projectTList.value');
+        let nameXm = '';
+        projectTList.value.forEach(item => {
+          if (item.projectNo == obj) {
+            nameXm = item.projectName;
+            // console.log(item.projectName, 'item');
+          }
+        });
+        // console.log(obj, 'obj');
+        return { projectNo: obj, projectName: nameXm };
       });
       // 处理人员传参
-      form.value.patrolUserList = form.value.patrolUserList.map(obj => {
-        return { userId: String(obj.userId) };
+      form.value.patrolUserList = form.value.patrolUserList.map(item => {
+        console.log(item, 'item');
+        return { userId: item };
       });
-
       form.value.basicInfoId = '1686274734091489284';
       // console.log(form.value, 'form.value');
-      patrolPlanadd(form.value).then(response => {
-        proxy.$modal.msgSuccess('新增成功');
-        open.value = false;
-        getList();
-      });
+
+      if (title.value == '修改巡查计划') {
+        patrolPlanedit(form.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          open.value = false;
+          getList();
+        });
+      } else {
+        if (form.value.id) delete form.value.id;
+        patrolPlanadd(form.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          open.value = false;
+          getList();
+        });
+      }
     }
   });
 }
 
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return patrolPlandelete(postIds);
+    })
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
+}
 onMounted(() => {
   getList();
   projectTypeListM();
diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
index d98328d..7735510 100644
--- a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
+++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
@@ -45,20 +45,24 @@
       <el-table-column label="整改状态" prop="isRectification" />
       <el-table-column label="整改通知单" prop="fileListToNotice">
         <template #default="scope">
-          <p v-for="item in scope.row.fileListToNotice" @click="ClickNmae(item.url)">{{ item.originalName }}</p>
+          <p v-for="item in scope.row.fileListToNotice" @click="ClickNmae(item.url)" style="cursor: pointer; color: #00a8ff">
+            {{ item.originalName }}
+          </p>
         </template>
       </el-table-column>
 
       <el-table-column label="整改回复单" prop="fileListToReply">
         <template #default="scope">
-          <p v-for="item in scope.row.fileListToReply">{{ item.originalName }}</p>
+          <p v-for="item in scope.row.fileListToReply" @click="ClickReply(item.url)" style="cursor: pointer; color: #00a8ff">
+            {{ item.originalName }}
+          </p>
         </template>
       </el-table-column>
       <el-table-column label="整改时限" prop="rectifyTime" />
       <el-table-column label="整改方式" prop="rectifyType" />
-      <el-table-column label="责任人电话" prop="peopleName" />
-      <el-table-column label="责任人" prop="peoplePhone" />
-      <el-table-column label="创建时间" prop="createTime" />
+      <el-table-column label="责任人电话" prop="peoplePhone" />
+      <el-table-column label="责任人" prop="peopleName" />
+      <el-table-column label="创建时间" prop="createTime" width="155" />
     </el-table>
   </div>
 </template>
@@ -84,6 +88,9 @@
 function ClickNmae(val) {
   window.open(val);
 }
+function ClickReply(val) {
+  window.open(val);
+}
 
 watch(
   () => props.DataList,

diff --git a/src/api/longoPeration/Inspectionplana.js b/src/api/longoPeration/Inspectionplana.js
index 934f156..0d63d49 100644
--- a/src/api/longoPeration/Inspectionplana.js
+++ b/src/api/longoPeration/Inspectionplana.js
@@ -8,15 +8,13 @@
   });
 }
 
-// 列表
-export function FloodPreventionMaterialList(query) {
+// 激活
+export function activation(ids) {
   return request({
-    url: '/business/floodPreventionMaterial/list',
-    method: 'get',
-    params: query,
+    url: '/business/patrolPlan/activation/' + ids,
+    method: 'put',
   });
 }
-
 // 新增
 export function patrolPlanadd(data) {
   return request({
@@ -25,20 +23,19 @@
     data: data,
   });
 }
-
-// 修改排水防涝--防汛物资
-export function FloodPreventionMaterialedit(data) {
+// 修改
+export function patrolPlanedit(data) {
   return request({
-    url: '/business/floodPreventionMaterial/edit',
+    url: '/business/patrolPlan/edit',
     method: 'put',
     data: data,
   });
 }
 
-// 删除排水防涝--防汛物资
-export function FloodPreventionMaterialdelete(id) {
+// 删除
+export function patrolPlandelete(ids) {
   return request({
-    url: '/business/floodPreventionMaterial/' + id,
+    url: '/business/patrolPlan/' + ids,
     method: 'delete',
   });
 }
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 962ce20..21db720 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -34,7 +34,7 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
     <!-- 表格 -->
-    <el-table :data="dataList" v-loading="loading" stripe :max-height="280">
+    <el-table :data="dataList" v-loading="loading" stripe :max-height="580">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="巡查任务名称" prop="taskName" />
       <el-table-column label="项目名称" prop="projectName" />
@@ -57,8 +57,12 @@
       <el-table-column label="操作" width="350">
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
-          <el-button link type="primary" icon="Edit" @click="handlenotice(scope.row)">发布整改通知</el-button>
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">提交整改回复单</el-button>
+          <el-button v-if="scope.row.fileListToNotice.length == 0" link type="primary" icon="Edit" @click="handlenotice(scope.row)"
+            >发布整改通知</el-button
+          >
+          <el-button link type="primary" v-if="scope.row.fileListToReply.length == 0" icon="Edit" @click="handleUpdate(scope.row)"
+            >提交整改回复单</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -262,7 +266,7 @@
     rectifyType: [{ required: true, message: '请输入整改方式', trigger: 'blur' }],
     supervisionWork: [{ required: true, message: '请输入督办事项', trigger: 'blur' }],
     haveProblem: [{ required: true, message: '请输入存在问题', trigger: 'blur' }],
-    // fileListToNotice: [{ 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' }],
@@ -298,8 +302,11 @@
       },
     ],
   },
+  rulesOne: {
+    fileListToReply: [{ required: true, message: '请上传整改回复单', trigger: 'blur' }],
+  },
 });
-const { queryParams, form, rules, formOne } = toRefs(AllData);
+const { queryParams, form, rules, formOne, rulesOne } = toRefs(AllData);
 
 //搜索
 function handleQuery() {
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index cc67429..41b65ac 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -6,9 +6,9 @@
         <el-input v-model="queryParams.planName" placeholder="请输入计划名称" clearable style="width: 180px" />
       </el-form-item>
 
-      <el-form-item label="项目名称:" prop="eventType">
-        <el-select clearable v-model="queryParams.eventType" style="width: 180px" placeholder="请选择项目名称">
-          <el-option v-for="item in Xmtype" :key="item.value" :label="item.label" :value="item.value" />
+      <el-form-item label="项目名称:" prop="projectCodes">
+        <el-select clearable v-model="queryParams.projectCodes" style="width: 180px" placeholder="请选择项目名称">
+          <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
         </el-select>
       </el-form-item>
 
@@ -22,6 +22,7 @@
         <el-date-picker
           style="width: 380px"
           format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           v-model="AllData.publishTime"
           type="daterange"
           range-separator="至"
@@ -47,31 +48,51 @@
     <!-- 表格 -->
     <el-table :data="dataList" v-loading="loading" stripe :max-height="580">
       <el-table-column type="index" width="55" label="序号" />
-      <el-table-column label="巡查计划名称" prop="planName" />
-      <el-table-column label="项目名称" prop="project" />
-      <el-table-column label="巡查人员" prop="planUserIds" />
+      <el-table-column label="巡查计划名称" prop="planName" width="140" />
+      <el-table-column label="巡查计划状态" prop="status" width="150">
+        <template #default="scope">
+          <span>
+            {{ scope.row.status == '0' ? '未激活' : scope.row.status == '1' ? '已激活' : '' }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目名称" prop="projectCodes" width="400">
+        <template #default="scope">
+          <p v-for="item in scope.row.projectList">{{ item.projectAbbreviation }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="巡查人员" prop="planUserIds">
+        <template #default="scope">
+          <p v-for="item in scope.row.taskUserList">{{ item.userName }}</p>
+        </template>
+      </el-table-column>
       <el-table-column label="巡查类型" prop="patrolType">
         <template #default="scope">
           <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
         </template>
       </el-table-column>
-      <el-table-column label="巡查公里数(km)" prop="num" />
-      <el-table-column label="计划开始时间" prop="startTime" />
-      <el-table-column label="计划结束时间" prop="endDate" />
-      <el-table-column label="任务频率" prop="patrolFrequencyType" />
-      <el-table-column label="创建时间" prop="create" />
-      <el-table-column label="巡查要求" prop="remark" />
-      <el-table-column label="巡查计划状态" prop="status" />
-      <el-table-column label="操作" width="280">
+      <!-- <el-table-column label="巡查公里数(km)" prop="num" /> -->
+      <el-table-column label="计划开始时间" prop="startTime" width="180" />
+      <el-table-column label="计划结束时间" prop="endDate" width="180" />
+      <el-table-column label="任务频率" prop="patrolFrequencyContent" width="200">
+        <!-- <template #default="scope">
+          <span>
+            {{ scope.row.patrolFrequencyType == 'for_week' ? '周' : scope.row.patrolFrequencyType == 'for_day' ? '日' : '' }}
+          </span>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="创建时间" prop="createTime" width="180" />
+      <el-table-column label="巡查要求" prop="remark" width="180" />
+      <el-table-column label="操作" width="280" fixed="right">
         <template #default="scope">
-          <el-button link icon="View" type="success" v-if="scope.row.status == '未激活'" @click="activation(scope.row, 'view')">
+          <el-button link icon="View" type="success" v-if="scope.row.status == '0'" @click="handleActive(scope.row, 'view')">
             激活
           </el-button>
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">详情</el-button>
-          <el-button link type="warning" icon="Edit" v-if="scope.row.status == '未激活'" @click="handleUpdate(scope.row, 'view')">
+          <el-button link type="warning" icon="Edit" v-if="scope.row.status == '0'" @click="handleUpdate(scope.row, 'view')">
             修改
           </el-button>
-          <el-button link type="danger" icon="Delete" v-if="scope.row.status == '未激活'" @click="handleDelete(scope.row, 'view')">
+          <el-button link type="danger" icon="Delete" v-if="scope.row.status == '0'" @click="handleDelete(scope.row, 'view')">
             删除
           </el-button>
         </template>
@@ -98,7 +119,7 @@
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="项目名称:" prop="projectList">
+            <el-form-item label="项目名称:" prop="projectCodes">
               <el-select
                 clearable
                 v-model="form.projectList"
@@ -108,13 +129,13 @@
                 multiple
                 label="projectName"
               >
-                <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj" />
+                <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="巡查计划类型:" prop="patrolType">
-              <el-select clearable v-model="form.patrolType" style="width: 100%" placeholder="请选择项目名称">
+              <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-form-item>
@@ -123,13 +144,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="巡查频率:" prop="patrolFrequencyType">
-              <el-select
-                v-model="form.patrolFrequencyType"
-                placeholder="请选择巡查频率"
-                clearable
-                style="width: 100%"
-                @change="changeStation"
-              >
+              <el-select v-model="form.patrolFrequencyType" placeholder="请选择巡查频率" clearable style="width: 100%">
                 <el-option v-for="dict in Xcfrequency" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
@@ -137,14 +152,14 @@
           <el-col :span="12">
             <el-form-item label="巡查频率(周):" prop="fileTag1" v-if="form.patrolFrequencyType == 'for_week'">
               <el-select v-model="form.patrolWeekDay" placeholder="请选择巡查频率(周)" clearable style="width: 100%" multiple>
-                <el-option v-for="item in weekList" :key="item.value" :label="item.label" :value="Number(item.value)" />
+                <el-option v-for="item in weekList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="巡查人员:" prop="patrolUserList">
+            <el-form-item label="巡查人员:" prop="planUserIds">
               <el-select
                 v-model="form.patrolUserList"
                 placeholder="请选择巡查人员"
@@ -154,7 +169,7 @@
                 label="nickName"
                 multiple
               >
-                <el-option v-for="item in userList" :key="String(item.userId)" :label="item.nickName" :value="item" />
+                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -184,7 +199,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm" v-show="!multiple">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
@@ -192,12 +207,7 @@
   </div>
 </template>
 <script setup name="Inspectionplan">
-import {
-  patrolPlanpage,
-  FloodPreventionMaterialedit,
-  patrolPlanadd,
-  FloodPreventionMaterialdelete,
-} from '@/api/longoPeration/Inspectionplana';
+import { patrolPlanpage, activation, patrolPlanedit, patrolPlanadd, patrolPlandelete } from '@/api/longoPeration/Inspectionplana';
 import { listUser } from '@/api/system/user';
 import { getProjectInfoList } from '@/api/preassess/targetManage';
 const { proxy } = getCurrentInstance();
@@ -212,9 +222,8 @@
   { value: 'for_week', label: '周' },
 ]);
 const WaterDate = ref([
-  { value: '0', label: '已完成' },
   { value: '1', label: '已激活' },
-  { value: '2', label: '未激活' },
+  { value: '0', label: '未激活' },
 ]);
 const weekList = ref([
   { value: '1', label: '周日' },
@@ -234,8 +243,8 @@
   id: '',
   caseid: '',
   caseidone: '',
-  publishTime: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')],
-  form: { a: [] },
+  publishTime: [],
+  form: {},
   formDate: {},
   caseFormDate: { id: '' },
   queryParams: {
@@ -248,19 +257,19 @@
   },
   rules: {
     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' }],
+    projectCodes: [{ required: true, message: '请选择项目名称', trigger: 'blur' }],
+    patrolType: [{ required: true, message: '请选择巡查计划类型', trigger: 'blur' }],
+    planUserIds: [{ required: true, message: '请选择巡查人员', trigger: 'blur' }],
     reportTime1: [{ required: true, message: '请选择计划日期', trigger: 'blur' }],
     eventDescription: [{ required: true, message: '请输入', trigger: 'blur' }],
-    patrolWeekDay: [{ required: true, message: '请选择巡查频率(周)', trigger: 'blur' }],
+    fileTag1: [{ required: true, message: '请选择巡查频率(周)', trigger: 'blur' }],
   },
 });
 const { queryParams, form, rules } = toRefs(AllData);
 
 //搜索
 function handleQuery() {
+  // console.log('123', AllData.publishTime);
   if (AllData.publishTime) {
     queryParams.value.startTime = AllData.publishTime[0];
     queryParams.value.endDate = AllData.publishTime[1];
@@ -272,7 +281,7 @@
 }
 //重置
 function resetQuery() {
-  AllData.publishTime = [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD 23:59:59')];
+  AllData.publishTime = [];
   proxy.resetForm('queryRef');
   handleQuery();
 }
@@ -289,44 +298,15 @@
   open.value = false;
   proxy.resetForm('roleRef');
 }
-
-// 巡查频率下拉框点击事件
-function changeStation(value) {
-  // console.log(value, 'value');
-}
-
-//查看详情操作
-function handleDetail(row) {
-  open.value = true;
-  multiple.value = true;
-  title.value = '查看巡查计划';
-  form.value = row;
-  form.value.patrolUserList = row.taskUserList.map(item => {
-    return item.userName;
-  });
-  form.value.projectList = row.projectList.map(item => {
-    return item.projectAbbreviation;
-  });
-}
-// 修改按钮操作
-function handleUpdate(row) {
-  open.value = true;
-  title.value = '修改巡查计划';
-  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;
+    userList.value = res.data || [];
+    userList.value.map(item => {
+      item.userId = String(item.userId);
+    });
   });
 }
-
 /** 查询列表 */
 const getList = async () => {
   loading.value = true;
@@ -334,7 +314,6 @@
     queryParams.value.startTime = AllData.publishTime[0];
     queryParams.value.endDate = AllData.publishTime[1];
   }
-
   let res = await patrolPlanpage(queryParams.value);
   dataList.value = res.data;
   console.log(dataList.value, 'dataList.value');
@@ -342,6 +321,57 @@
   loading.value = false;
 };
 
+//查看详情操作
+function handleDetail(row) {
+  open.value = true;
+  multiple.value = true;
+  title.value = '查看巡查计划';
+  form.value = { ...row };
+  // 做详情回显判断
+  form.value.patrolUserList = row.taskUserList.map(item => {
+    return item.userName;
+  });
+  form.value.projectList = row.projectList.map(item => {
+    return item.projectAbbreviation;
+  });
+  form.value.reportTime1 = [form.value.startDate, form.value.endDate];
+  form.value.patrolWeekDay = row.patrolFrequencyList ? row.patrolFrequencyList.split(',') : [];
+}
+// 修改按钮操作
+function handleUpdate(row) {
+  open.value = true;
+  title.value = '修改巡查计划';
+  multiple.value = false;
+  form.value = { ...row };
+  console.log(form.value, 'form.value form.value ');
+  // 做修改回显判断
+  form.value.patrolUserList = row.planUserIds ? row.planUserIds.split(',') : [];
+  form.value.patrolUserList.forEach(element => {
+    element = element.userId;
+  });
+  form.value.projectList = row.projectCodes ? row.projectCodes.split(',') : [];
+  form.value.patrolWeekDay = row.patrolFrequencyList ? row.patrolFrequencyList.split(',') : [];
+  form.value.reportTime1 = [form.value.startDate, form.value.endDate];
+}
+// 激活
+function handleActive(row) {
+  console.log(row.id, '1');
+  activation(row.id).then(res => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('激活成功');
+      getList();
+    } else {
+      proxy.$modal.msgError('激活失败');
+      getList();
+    }
+  });
+}
+// 项目接口
+async function projectTypeListM() {
+  let { data } = await getProjectInfoList();
+  projectTList.value = data;
+}
+
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
@@ -351,24 +381,57 @@
       form.value.endDate = form.value.reportTime1[1];
       // 处理项目传参
       form.value.projectList = form.value.projectList.map(obj => {
-        return { projectNo: obj.projectNo, projectName: obj.projectName };
+        console.log(projectTList.value, 'projectTList.value');
+        let nameXm = '';
+        projectTList.value.forEach(item => {
+          if (item.projectNo == obj) {
+            nameXm = item.projectName;
+            // console.log(item.projectName, 'item');
+          }
+        });
+        // console.log(obj, 'obj');
+        return { projectNo: obj, projectName: nameXm };
       });
       // 处理人员传参
-      form.value.patrolUserList = form.value.patrolUserList.map(obj => {
-        return { userId: String(obj.userId) };
+      form.value.patrolUserList = form.value.patrolUserList.map(item => {
+        console.log(item, 'item');
+        return { userId: item };
       });
-
       form.value.basicInfoId = '1686274734091489284';
       // console.log(form.value, 'form.value');
-      patrolPlanadd(form.value).then(response => {
-        proxy.$modal.msgSuccess('新增成功');
-        open.value = false;
-        getList();
-      });
+
+      if (title.value == '修改巡查计划') {
+        patrolPlanedit(form.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          open.value = false;
+          getList();
+        });
+      } else {
+        if (form.value.id) delete form.value.id;
+        patrolPlanadd(form.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          open.value = false;
+          getList();
+        });
+      }
     }
   });
 }
 
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return patrolPlandelete(postIds);
+    })
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
+}
 onMounted(() => {
   getList();
   projectTypeListM();
diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
index d98328d..7735510 100644
--- a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
+++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
@@ -45,20 +45,24 @@
       <el-table-column label="整改状态" prop="isRectification" />
       <el-table-column label="整改通知单" prop="fileListToNotice">
         <template #default="scope">
-          <p v-for="item in scope.row.fileListToNotice" @click="ClickNmae(item.url)">{{ item.originalName }}</p>
+          <p v-for="item in scope.row.fileListToNotice" @click="ClickNmae(item.url)" style="cursor: pointer; color: #00a8ff">
+            {{ item.originalName }}
+          </p>
         </template>
       </el-table-column>
 
       <el-table-column label="整改回复单" prop="fileListToReply">
         <template #default="scope">
-          <p v-for="item in scope.row.fileListToReply">{{ item.originalName }}</p>
+          <p v-for="item in scope.row.fileListToReply" @click="ClickReply(item.url)" style="cursor: pointer; color: #00a8ff">
+            {{ item.originalName }}
+          </p>
         </template>
       </el-table-column>
       <el-table-column label="整改时限" prop="rectifyTime" />
       <el-table-column label="整改方式" prop="rectifyType" />
-      <el-table-column label="责任人电话" prop="peopleName" />
-      <el-table-column label="责任人" prop="peoplePhone" />
-      <el-table-column label="创建时间" prop="createTime" />
+      <el-table-column label="责任人电话" prop="peoplePhone" />
+      <el-table-column label="责任人" prop="peopleName" />
+      <el-table-column label="创建时间" prop="createTime" width="155" />
     </el-table>
   </div>
 </template>
@@ -84,6 +88,9 @@
 function ClickNmae(val) {
   window.open(val);
 }
+function ClickReply(val) {
+  window.open(val);
+}
 
 watch(
   () => props.DataList,
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index e46d048..84bcd57 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -5,8 +5,8 @@
       <el-form-item label="任务名称:" prop="taskName">
         <el-input v-model="queryParams.taskName" placeholder="请输入任务名称" clearable style="width: 180px" />
       </el-form-item>
-      <el-form-item label="巡查人员:" prop="taskUserIdList">
-        <el-select clearable v-model="queryParams.taskUserIdList" style="width: 180px" placeholder="请选择巡查人员">
+      <el-form-item label="巡查人员:" prop="taskUserId">
+        <el-select clearable v-model="queryParams.taskUserId" style="width: 180px" placeholder="请选择巡查人员">
           <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
         </el-select>
       </el-form-item>
@@ -38,12 +38,19 @@
     <!--  -->
     <div class="whole">
       <div class="MainTask">
-        <el-table :data="dataList" v-loading="loading" stripe :max-height="280" @row-click="clickLogData">
+        <el-table
+          :data="dataList"
+          v-loading="loading"
+          stripe
+          :max-height="280"
+          @row-click="clickLogData"
+          :row-class-name="tableRowClassName"
+        >
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
             <template #default="scope">
-              <p v-for="item in scope.row.projectList">{{ item.projectAbbreviation }}</p>
+              <p v-for="item in scope.row.projectList">{{ item.projectName }}</p>
             </template>
           </el-table-column>
           <el-table-column label="巡查人员" prop="taskUserIdList">
@@ -80,8 +87,8 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column label="超时时间" prop="expiredDays" />
-          <el-table-column label="任务下发时间" prop="issuedDatetime" />
+          <!-- <el-table-column label="超时时间" prop="expiredDays" /> -->
+          <el-table-column label="任务下发时间" prop="issuedDatetime" width="200" />
         </el-table>
         <!-- 分页 -->
         <pagination
@@ -99,7 +106,7 @@
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
             <template #default="scope">
-              <p>{{ scope.row.projectList[0].projectAbbreviation }}</p>
+              <p>{{ scope.row.projectList[0].projectName }}</p>
             </template>
           </el-table-column>
           <el-table-column label="巡查人员" prop="taskUserIdList">
@@ -131,8 +138,8 @@
               </span>
             </template>
           </el-table-column>
-          <!-- <el-table-column label="超时时间" prop="expiredDays" /> -->
-          <el-table-column label="任务下发时间" prop="issuedDatetime" />
+          <el-table-column label="超时时间" prop="expiredDays" />
+          <el-table-column label="任务下发时间" prop="issuedDatetime" width="200" />
           <el-table-column label="操作" width="240">
             <template #default="scope">
               <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
@@ -222,8 +229,8 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="20">
-            <el-form-item label="巡查任务描述:" prop="taskDescribe">
-              <el-input v-model="form.taskDescribe" placeholder="请输入巡查任务描述" type="textarea" />
+            <el-form-item label="备注:" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" type="textarea" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -274,7 +281,7 @@
 const pathGeometry = ref([]);
 const AllData = reactive({
   publishTime: [],
-
+  activeIndex: 0,
   form: { publishTime1: [] },
   queryParams: {
     pageNum: 1,
@@ -333,12 +340,6 @@
   });
 }
 
-//表格点击事件
-function clickLogData(val) {
-  queryParamstwo.value.fatherCode = val.number;
-  getList1();
-}
-
 // 新增
 function handleAdd() {
   title.value = '新增巡查任务';
@@ -356,11 +357,11 @@
 async function handleDetail(row) {
   opendetails.value = true;
   DataList.value = { ...row };
-  console.log('row----', row);
+  // console.log('row----', row);
   // console.log(DataList.value, 'DataList.value');
   let res = await PatrolTaskID(row.id);
   if (res && res.code == 200) {
-    console.log('res.data--', res.data);
+    // console.log('res.data--', res.data);
     pathData.value = res.data.patrolPathLngLat;
     pathGeometry.value = res.data.patrolPath;
   }
@@ -369,7 +370,7 @@
 /** 主任务查询列表 */
 const getList = async () => {
   loading.value = true;
-  console.log(AllData.publishTime, 'AllData.publishTime');
+  // console.log(AllData.publishTime, 'AllData.publishTime');
   if (AllData.publishTime) {
     queryParams.value.planStartDatetime = AllData.publishTime[0];
     queryParams.value.planEndDatetime = AllData.publishTime[1];
@@ -378,17 +379,36 @@
   dataList.value = res.data;
   total.value = res.total;
   loading.value = false;
+  getList1(res.data[0].number);
 };
 
 /** 查询列表 */
 const getList1 = async code => {
   loadingTwo.value = true;
-  let res = await patrolTaskpage(queryParamstwo.value);
+  let res = await patrolTaskpage({ fatherCode: code });
   dataListTwo.value = res.data;
   totaltwo.value = res.total;
   loadingTwo.value = false;
 };
 
+//表格点击事件
+function clickLogData(val) {
+  console.log(val, '111');
+  queryParamstwo.value.fatherCode = val.number;
+  // if (val.index != '') {
+  //   console.log('1111');
+  //   return 'success-row';
+  // }
+  getList1(val.number);
+}
+
+function tableRowClassName(row, rowIndex) {
+  row.row.index = row.rowIndex;
+  // AllData.activeIndex = row.rowIndex;
+  // console.log(row.row.index, 'row.rowIndex');
+  // console.log(AllData.activeIndex, 'AllData.activeIndex');
+}
+
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
@@ -449,4 +469,7 @@
     // background: yellowgreen;
   }
 }
+// ::v-deep .el-table .success-row td.el-table__cell {
+//   background: red !important;
+// }
 </style>

diff --git a/src/api/longoPeration/Inspectionplana.js b/src/api/longoPeration/Inspectionplana.js
index 934f156..0d63d49 100644
--- a/src/api/longoPeration/Inspectionplana.js
+++ b/src/api/longoPeration/Inspectionplana.js
@@ -8,15 +8,13 @@
   });
 }
 
-// 列表
-export function FloodPreventionMaterialList(query) {
+// 激活
+export function activation(ids) {
   return request({
-    url: '/business/floodPreventionMaterial/list',
-    method: 'get',
-    params: query,
+    url: '/business/patrolPlan/activation/' + ids,
+    method: 'put',
   });
 }
-
 // 新增
 export function patrolPlanadd(data) {
   return request({
@@ -25,20 +23,19 @@
     data: data,
   });
 }
-
-// 修改排水防涝--防汛物资
-export function FloodPreventionMaterialedit(data) {
+// 修改
+export function patrolPlanedit(data) {
   return request({
-    url: '/business/floodPreventionMaterial/edit',
+    url: '/business/patrolPlan/edit',
     method: 'put',
     data: data,
   });
 }
 
-// 删除排水防涝--防汛物资
-export function FloodPreventionMaterialdelete(id) {
+// 删除
+export function patrolPlandelete(ids) {
   return request({
-    url: '/business/floodPreventionMaterial/' + id,
+    url: '/business/patrolPlan/' + ids,
     method: 'delete',
   });
 }
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 962ce20..21db720 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -34,7 +34,7 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
     <!-- 表格 -->
-    <el-table :data="dataList" v-loading="loading" stripe :max-height="280">
+    <el-table :data="dataList" v-loading="loading" stripe :max-height="580">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="巡查任务名称" prop="taskName" />
       <el-table-column label="项目名称" prop="projectName" />
@@ -57,8 +57,12 @@
       <el-table-column label="操作" width="350">
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
-          <el-button link type="primary" icon="Edit" @click="handlenotice(scope.row)">发布整改通知</el-button>
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">提交整改回复单</el-button>
+          <el-button v-if="scope.row.fileListToNotice.length == 0" link type="primary" icon="Edit" @click="handlenotice(scope.row)"
+            >发布整改通知</el-button
+          >
+          <el-button link type="primary" v-if="scope.row.fileListToReply.length == 0" icon="Edit" @click="handleUpdate(scope.row)"
+            >提交整改回复单</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -262,7 +266,7 @@
     rectifyType: [{ required: true, message: '请输入整改方式', trigger: 'blur' }],
     supervisionWork: [{ required: true, message: '请输入督办事项', trigger: 'blur' }],
     haveProblem: [{ required: true, message: '请输入存在问题', trigger: 'blur' }],
-    // fileListToNotice: [{ 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' }],
@@ -298,8 +302,11 @@
       },
     ],
   },
+  rulesOne: {
+    fileListToReply: [{ required: true, message: '请上传整改回复单', trigger: 'blur' }],
+  },
 });
-const { queryParams, form, rules, formOne } = toRefs(AllData);
+const { queryParams, form, rules, formOne, rulesOne } = toRefs(AllData);
 
 //搜索
 function handleQuery() {
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index cc67429..41b65ac 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -6,9 +6,9 @@
         <el-input v-model="queryParams.planName" placeholder="请输入计划名称" clearable style="width: 180px" />
       </el-form-item>
 
-      <el-form-item label="项目名称:" prop="eventType">
-        <el-select clearable v-model="queryParams.eventType" style="width: 180px" placeholder="请选择项目名称">
-          <el-option v-for="item in Xmtype" :key="item.value" :label="item.label" :value="item.value" />
+      <el-form-item label="项目名称:" prop="projectCodes">
+        <el-select clearable v-model="queryParams.projectCodes" style="width: 180px" placeholder="请选择项目名称">
+          <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
         </el-select>
       </el-form-item>
 
@@ -22,6 +22,7 @@
         <el-date-picker
           style="width: 380px"
           format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           v-model="AllData.publishTime"
           type="daterange"
           range-separator="至"
@@ -47,31 +48,51 @@
     <!-- 表格 -->
     <el-table :data="dataList" v-loading="loading" stripe :max-height="580">
       <el-table-column type="index" width="55" label="序号" />
-      <el-table-column label="巡查计划名称" prop="planName" />
-      <el-table-column label="项目名称" prop="project" />
-      <el-table-column label="巡查人员" prop="planUserIds" />
+      <el-table-column label="巡查计划名称" prop="planName" width="140" />
+      <el-table-column label="巡查计划状态" prop="status" width="150">
+        <template #default="scope">
+          <span>
+            {{ scope.row.status == '0' ? '未激活' : scope.row.status == '1' ? '已激活' : '' }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目名称" prop="projectCodes" width="400">
+        <template #default="scope">
+          <p v-for="item in scope.row.projectList">{{ item.projectAbbreviation }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="巡查人员" prop="planUserIds">
+        <template #default="scope">
+          <p v-for="item in scope.row.taskUserList">{{ item.userName }}</p>
+        </template>
+      </el-table-column>
       <el-table-column label="巡查类型" prop="patrolType">
         <template #default="scope">
           <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
         </template>
       </el-table-column>
-      <el-table-column label="巡查公里数(km)" prop="num" />
-      <el-table-column label="计划开始时间" prop="startTime" />
-      <el-table-column label="计划结束时间" prop="endDate" />
-      <el-table-column label="任务频率" prop="patrolFrequencyType" />
-      <el-table-column label="创建时间" prop="create" />
-      <el-table-column label="巡查要求" prop="remark" />
-      <el-table-column label="巡查计划状态" prop="status" />
-      <el-table-column label="操作" width="280">
+      <!-- <el-table-column label="巡查公里数(km)" prop="num" /> -->
+      <el-table-column label="计划开始时间" prop="startTime" width="180" />
+      <el-table-column label="计划结束时间" prop="endDate" width="180" />
+      <el-table-column label="任务频率" prop="patrolFrequencyContent" width="200">
+        <!-- <template #default="scope">
+          <span>
+            {{ scope.row.patrolFrequencyType == 'for_week' ? '周' : scope.row.patrolFrequencyType == 'for_day' ? '日' : '' }}
+          </span>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="创建时间" prop="createTime" width="180" />
+      <el-table-column label="巡查要求" prop="remark" width="180" />
+      <el-table-column label="操作" width="280" fixed="right">
         <template #default="scope">
-          <el-button link icon="View" type="success" v-if="scope.row.status == '未激活'" @click="activation(scope.row, 'view')">
+          <el-button link icon="View" type="success" v-if="scope.row.status == '0'" @click="handleActive(scope.row, 'view')">
             激活
           </el-button>
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">详情</el-button>
-          <el-button link type="warning" icon="Edit" v-if="scope.row.status == '未激活'" @click="handleUpdate(scope.row, 'view')">
+          <el-button link type="warning" icon="Edit" v-if="scope.row.status == '0'" @click="handleUpdate(scope.row, 'view')">
             修改
           </el-button>
-          <el-button link type="danger" icon="Delete" v-if="scope.row.status == '未激活'" @click="handleDelete(scope.row, 'view')">
+          <el-button link type="danger" icon="Delete" v-if="scope.row.status == '0'" @click="handleDelete(scope.row, 'view')">
             删除
           </el-button>
         </template>
@@ -98,7 +119,7 @@
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="项目名称:" prop="projectList">
+            <el-form-item label="项目名称:" prop="projectCodes">
               <el-select
                 clearable
                 v-model="form.projectList"
@@ -108,13 +129,13 @@
                 multiple
                 label="projectName"
               >
-                <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj" />
+                <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="巡查计划类型:" prop="patrolType">
-              <el-select clearable v-model="form.patrolType" style="width: 100%" placeholder="请选择项目名称">
+              <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-form-item>
@@ -123,13 +144,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="巡查频率:" prop="patrolFrequencyType">
-              <el-select
-                v-model="form.patrolFrequencyType"
-                placeholder="请选择巡查频率"
-                clearable
-                style="width: 100%"
-                @change="changeStation"
-              >
+              <el-select v-model="form.patrolFrequencyType" placeholder="请选择巡查频率" clearable style="width: 100%">
                 <el-option v-for="dict in Xcfrequency" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
@@ -137,14 +152,14 @@
           <el-col :span="12">
             <el-form-item label="巡查频率(周):" prop="fileTag1" v-if="form.patrolFrequencyType == 'for_week'">
               <el-select v-model="form.patrolWeekDay" placeholder="请选择巡查频率(周)" clearable style="width: 100%" multiple>
-                <el-option v-for="item in weekList" :key="item.value" :label="item.label" :value="Number(item.value)" />
+                <el-option v-for="item in weekList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="巡查人员:" prop="patrolUserList">
+            <el-form-item label="巡查人员:" prop="planUserIds">
               <el-select
                 v-model="form.patrolUserList"
                 placeholder="请选择巡查人员"
@@ -154,7 +169,7 @@
                 label="nickName"
                 multiple
               >
-                <el-option v-for="item in userList" :key="String(item.userId)" :label="item.nickName" :value="item" />
+                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -184,7 +199,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm" v-show="!multiple">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
@@ -192,12 +207,7 @@
   </div>
 </template>
 <script setup name="Inspectionplan">
-import {
-  patrolPlanpage,
-  FloodPreventionMaterialedit,
-  patrolPlanadd,
-  FloodPreventionMaterialdelete,
-} from '@/api/longoPeration/Inspectionplana';
+import { patrolPlanpage, activation, patrolPlanedit, patrolPlanadd, patrolPlandelete } from '@/api/longoPeration/Inspectionplana';
 import { listUser } from '@/api/system/user';
 import { getProjectInfoList } from '@/api/preassess/targetManage';
 const { proxy } = getCurrentInstance();
@@ -212,9 +222,8 @@
   { value: 'for_week', label: '周' },
 ]);
 const WaterDate = ref([
-  { value: '0', label: '已完成' },
   { value: '1', label: '已激活' },
-  { value: '2', label: '未激活' },
+  { value: '0', label: '未激活' },
 ]);
 const weekList = ref([
   { value: '1', label: '周日' },
@@ -234,8 +243,8 @@
   id: '',
   caseid: '',
   caseidone: '',
-  publishTime: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')],
-  form: { a: [] },
+  publishTime: [],
+  form: {},
   formDate: {},
   caseFormDate: { id: '' },
   queryParams: {
@@ -248,19 +257,19 @@
   },
   rules: {
     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' }],
+    projectCodes: [{ required: true, message: '请选择项目名称', trigger: 'blur' }],
+    patrolType: [{ required: true, message: '请选择巡查计划类型', trigger: 'blur' }],
+    planUserIds: [{ required: true, message: '请选择巡查人员', trigger: 'blur' }],
     reportTime1: [{ required: true, message: '请选择计划日期', trigger: 'blur' }],
     eventDescription: [{ required: true, message: '请输入', trigger: 'blur' }],
-    patrolWeekDay: [{ required: true, message: '请选择巡查频率(周)', trigger: 'blur' }],
+    fileTag1: [{ required: true, message: '请选择巡查频率(周)', trigger: 'blur' }],
   },
 });
 const { queryParams, form, rules } = toRefs(AllData);
 
 //搜索
 function handleQuery() {
+  // console.log('123', AllData.publishTime);
   if (AllData.publishTime) {
     queryParams.value.startTime = AllData.publishTime[0];
     queryParams.value.endDate = AllData.publishTime[1];
@@ -272,7 +281,7 @@
 }
 //重置
 function resetQuery() {
-  AllData.publishTime = [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD 23:59:59')];
+  AllData.publishTime = [];
   proxy.resetForm('queryRef');
   handleQuery();
 }
@@ -289,44 +298,15 @@
   open.value = false;
   proxy.resetForm('roleRef');
 }
-
-// 巡查频率下拉框点击事件
-function changeStation(value) {
-  // console.log(value, 'value');
-}
-
-//查看详情操作
-function handleDetail(row) {
-  open.value = true;
-  multiple.value = true;
-  title.value = '查看巡查计划';
-  form.value = row;
-  form.value.patrolUserList = row.taskUserList.map(item => {
-    return item.userName;
-  });
-  form.value.projectList = row.projectList.map(item => {
-    return item.projectAbbreviation;
-  });
-}
-// 修改按钮操作
-function handleUpdate(row) {
-  open.value = true;
-  title.value = '修改巡查计划';
-  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;
+    userList.value = res.data || [];
+    userList.value.map(item => {
+      item.userId = String(item.userId);
+    });
   });
 }
-
 /** 查询列表 */
 const getList = async () => {
   loading.value = true;
@@ -334,7 +314,6 @@
     queryParams.value.startTime = AllData.publishTime[0];
     queryParams.value.endDate = AllData.publishTime[1];
   }
-
   let res = await patrolPlanpage(queryParams.value);
   dataList.value = res.data;
   console.log(dataList.value, 'dataList.value');
@@ -342,6 +321,57 @@
   loading.value = false;
 };
 
+//查看详情操作
+function handleDetail(row) {
+  open.value = true;
+  multiple.value = true;
+  title.value = '查看巡查计划';
+  form.value = { ...row };
+  // 做详情回显判断
+  form.value.patrolUserList = row.taskUserList.map(item => {
+    return item.userName;
+  });
+  form.value.projectList = row.projectList.map(item => {
+    return item.projectAbbreviation;
+  });
+  form.value.reportTime1 = [form.value.startDate, form.value.endDate];
+  form.value.patrolWeekDay = row.patrolFrequencyList ? row.patrolFrequencyList.split(',') : [];
+}
+// 修改按钮操作
+function handleUpdate(row) {
+  open.value = true;
+  title.value = '修改巡查计划';
+  multiple.value = false;
+  form.value = { ...row };
+  console.log(form.value, 'form.value form.value ');
+  // 做修改回显判断
+  form.value.patrolUserList = row.planUserIds ? row.planUserIds.split(',') : [];
+  form.value.patrolUserList.forEach(element => {
+    element = element.userId;
+  });
+  form.value.projectList = row.projectCodes ? row.projectCodes.split(',') : [];
+  form.value.patrolWeekDay = row.patrolFrequencyList ? row.patrolFrequencyList.split(',') : [];
+  form.value.reportTime1 = [form.value.startDate, form.value.endDate];
+}
+// 激活
+function handleActive(row) {
+  console.log(row.id, '1');
+  activation(row.id).then(res => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('激活成功');
+      getList();
+    } else {
+      proxy.$modal.msgError('激活失败');
+      getList();
+    }
+  });
+}
+// 项目接口
+async function projectTypeListM() {
+  let { data } = await getProjectInfoList();
+  projectTList.value = data;
+}
+
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
@@ -351,24 +381,57 @@
       form.value.endDate = form.value.reportTime1[1];
       // 处理项目传参
       form.value.projectList = form.value.projectList.map(obj => {
-        return { projectNo: obj.projectNo, projectName: obj.projectName };
+        console.log(projectTList.value, 'projectTList.value');
+        let nameXm = '';
+        projectTList.value.forEach(item => {
+          if (item.projectNo == obj) {
+            nameXm = item.projectName;
+            // console.log(item.projectName, 'item');
+          }
+        });
+        // console.log(obj, 'obj');
+        return { projectNo: obj, projectName: nameXm };
       });
       // 处理人员传参
-      form.value.patrolUserList = form.value.patrolUserList.map(obj => {
-        return { userId: String(obj.userId) };
+      form.value.patrolUserList = form.value.patrolUserList.map(item => {
+        console.log(item, 'item');
+        return { userId: item };
       });
-
       form.value.basicInfoId = '1686274734091489284';
       // console.log(form.value, 'form.value');
-      patrolPlanadd(form.value).then(response => {
-        proxy.$modal.msgSuccess('新增成功');
-        open.value = false;
-        getList();
-      });
+
+      if (title.value == '修改巡查计划') {
+        patrolPlanedit(form.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          open.value = false;
+          getList();
+        });
+      } else {
+        if (form.value.id) delete form.value.id;
+        patrolPlanadd(form.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          open.value = false;
+          getList();
+        });
+      }
     }
   });
 }
 
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return patrolPlandelete(postIds);
+    })
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
+}
 onMounted(() => {
   getList();
   projectTypeListM();
diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
index d98328d..7735510 100644
--- a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
+++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
@@ -45,20 +45,24 @@
       <el-table-column label="整改状态" prop="isRectification" />
       <el-table-column label="整改通知单" prop="fileListToNotice">
         <template #default="scope">
-          <p v-for="item in scope.row.fileListToNotice" @click="ClickNmae(item.url)">{{ item.originalName }}</p>
+          <p v-for="item in scope.row.fileListToNotice" @click="ClickNmae(item.url)" style="cursor: pointer; color: #00a8ff">
+            {{ item.originalName }}
+          </p>
         </template>
       </el-table-column>
 
       <el-table-column label="整改回复单" prop="fileListToReply">
         <template #default="scope">
-          <p v-for="item in scope.row.fileListToReply">{{ item.originalName }}</p>
+          <p v-for="item in scope.row.fileListToReply" @click="ClickReply(item.url)" style="cursor: pointer; color: #00a8ff">
+            {{ item.originalName }}
+          </p>
         </template>
       </el-table-column>
       <el-table-column label="整改时限" prop="rectifyTime" />
       <el-table-column label="整改方式" prop="rectifyType" />
-      <el-table-column label="责任人电话" prop="peopleName" />
-      <el-table-column label="责任人" prop="peoplePhone" />
-      <el-table-column label="创建时间" prop="createTime" />
+      <el-table-column label="责任人电话" prop="peoplePhone" />
+      <el-table-column label="责任人" prop="peopleName" />
+      <el-table-column label="创建时间" prop="createTime" width="155" />
     </el-table>
   </div>
 </template>
@@ -84,6 +88,9 @@
 function ClickNmae(val) {
   window.open(val);
 }
+function ClickReply(val) {
+  window.open(val);
+}
 
 watch(
   () => props.DataList,
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index e46d048..84bcd57 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -5,8 +5,8 @@
       <el-form-item label="任务名称:" prop="taskName">
         <el-input v-model="queryParams.taskName" placeholder="请输入任务名称" clearable style="width: 180px" />
       </el-form-item>
-      <el-form-item label="巡查人员:" prop="taskUserIdList">
-        <el-select clearable v-model="queryParams.taskUserIdList" style="width: 180px" placeholder="请选择巡查人员">
+      <el-form-item label="巡查人员:" prop="taskUserId">
+        <el-select clearable v-model="queryParams.taskUserId" style="width: 180px" placeholder="请选择巡查人员">
           <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
         </el-select>
       </el-form-item>
@@ -38,12 +38,19 @@
     <!--  -->
     <div class="whole">
       <div class="MainTask">
-        <el-table :data="dataList" v-loading="loading" stripe :max-height="280" @row-click="clickLogData">
+        <el-table
+          :data="dataList"
+          v-loading="loading"
+          stripe
+          :max-height="280"
+          @row-click="clickLogData"
+          :row-class-name="tableRowClassName"
+        >
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
             <template #default="scope">
-              <p v-for="item in scope.row.projectList">{{ item.projectAbbreviation }}</p>
+              <p v-for="item in scope.row.projectList">{{ item.projectName }}</p>
             </template>
           </el-table-column>
           <el-table-column label="巡查人员" prop="taskUserIdList">
@@ -80,8 +87,8 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column label="超时时间" prop="expiredDays" />
-          <el-table-column label="任务下发时间" prop="issuedDatetime" />
+          <!-- <el-table-column label="超时时间" prop="expiredDays" /> -->
+          <el-table-column label="任务下发时间" prop="issuedDatetime" width="200" />
         </el-table>
         <!-- 分页 -->
         <pagination
@@ -99,7 +106,7 @@
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
             <template #default="scope">
-              <p>{{ scope.row.projectList[0].projectAbbreviation }}</p>
+              <p>{{ scope.row.projectList[0].projectName }}</p>
             </template>
           </el-table-column>
           <el-table-column label="巡查人员" prop="taskUserIdList">
@@ -131,8 +138,8 @@
               </span>
             </template>
           </el-table-column>
-          <!-- <el-table-column label="超时时间" prop="expiredDays" /> -->
-          <el-table-column label="任务下发时间" prop="issuedDatetime" />
+          <el-table-column label="超时时间" prop="expiredDays" />
+          <el-table-column label="任务下发时间" prop="issuedDatetime" width="200" />
           <el-table-column label="操作" width="240">
             <template #default="scope">
               <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
@@ -222,8 +229,8 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="20">
-            <el-form-item label="巡查任务描述:" prop="taskDescribe">
-              <el-input v-model="form.taskDescribe" placeholder="请输入巡查任务描述" type="textarea" />
+            <el-form-item label="备注:" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" type="textarea" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -274,7 +281,7 @@
 const pathGeometry = ref([]);
 const AllData = reactive({
   publishTime: [],
-
+  activeIndex: 0,
   form: { publishTime1: [] },
   queryParams: {
     pageNum: 1,
@@ -333,12 +340,6 @@
   });
 }
 
-//表格点击事件
-function clickLogData(val) {
-  queryParamstwo.value.fatherCode = val.number;
-  getList1();
-}
-
 // 新增
 function handleAdd() {
   title.value = '新增巡查任务';
@@ -356,11 +357,11 @@
 async function handleDetail(row) {
   opendetails.value = true;
   DataList.value = { ...row };
-  console.log('row----', row);
+  // console.log('row----', row);
   // console.log(DataList.value, 'DataList.value');
   let res = await PatrolTaskID(row.id);
   if (res && res.code == 200) {
-    console.log('res.data--', res.data);
+    // console.log('res.data--', res.data);
     pathData.value = res.data.patrolPathLngLat;
     pathGeometry.value = res.data.patrolPath;
   }
@@ -369,7 +370,7 @@
 /** 主任务查询列表 */
 const getList = async () => {
   loading.value = true;
-  console.log(AllData.publishTime, 'AllData.publishTime');
+  // console.log(AllData.publishTime, 'AllData.publishTime');
   if (AllData.publishTime) {
     queryParams.value.planStartDatetime = AllData.publishTime[0];
     queryParams.value.planEndDatetime = AllData.publishTime[1];
@@ -378,17 +379,36 @@
   dataList.value = res.data;
   total.value = res.total;
   loading.value = false;
+  getList1(res.data[0].number);
 };
 
 /** 查询列表 */
 const getList1 = async code => {
   loadingTwo.value = true;
-  let res = await patrolTaskpage(queryParamstwo.value);
+  let res = await patrolTaskpage({ fatherCode: code });
   dataListTwo.value = res.data;
   totaltwo.value = res.total;
   loadingTwo.value = false;
 };
 
+//表格点击事件
+function clickLogData(val) {
+  console.log(val, '111');
+  queryParamstwo.value.fatherCode = val.number;
+  // if (val.index != '') {
+  //   console.log('1111');
+  //   return 'success-row';
+  // }
+  getList1(val.number);
+}
+
+function tableRowClassName(row, rowIndex) {
+  row.row.index = row.rowIndex;
+  // AllData.activeIndex = row.rowIndex;
+  // console.log(row.row.index, 'row.rowIndex');
+  // console.log(AllData.activeIndex, 'AllData.activeIndex');
+}
+
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
@@ -449,4 +469,7 @@
     // background: yellowgreen;
   }
 }
+// ::v-deep .el-table .success-row td.el-table__cell {
+//   background: red !important;
+// }
 </style>
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index 3ade0c0..2987f6c 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -16,11 +16,11 @@
         <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">
@@ -53,10 +53,10 @@
         <div class="detail-label flex flex-align-center">巡查任务描述</div>
         <div class="detail-value flex flex-align-center">{{ props.DataList.taskDescribe }}</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.projectLocationName }}</div>
-      </div>
+      </div> -->
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查项目</div>
         <div class="detail-value flex flex-align-center">

diff --git a/src/api/longoPeration/Inspectionplana.js b/src/api/longoPeration/Inspectionplana.js
index 934f156..0d63d49 100644
--- a/src/api/longoPeration/Inspectionplana.js
+++ b/src/api/longoPeration/Inspectionplana.js
@@ -8,15 +8,13 @@
   });
 }
 
-// 列表
-export function FloodPreventionMaterialList(query) {
+// 激活
+export function activation(ids) {
   return request({
-    url: '/business/floodPreventionMaterial/list',
-    method: 'get',
-    params: query,
+    url: '/business/patrolPlan/activation/' + ids,
+    method: 'put',
   });
 }
-
 // 新增
 export function patrolPlanadd(data) {
   return request({
@@ -25,20 +23,19 @@
     data: data,
   });
 }
-
-// 修改排水防涝--防汛物资
-export function FloodPreventionMaterialedit(data) {
+// 修改
+export function patrolPlanedit(data) {
   return request({
-    url: '/business/floodPreventionMaterial/edit',
+    url: '/business/patrolPlan/edit',
     method: 'put',
     data: data,
   });
 }
 
-// 删除排水防涝--防汛物资
-export function FloodPreventionMaterialdelete(id) {
+// 删除
+export function patrolPlandelete(ids) {
   return request({
-    url: '/business/floodPreventionMaterial/' + id,
+    url: '/business/patrolPlan/' + ids,
     method: 'delete',
   });
 }
diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 962ce20..21db720 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -34,7 +34,7 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
     <!-- 表格 -->
-    <el-table :data="dataList" v-loading="loading" stripe :max-height="280">
+    <el-table :data="dataList" v-loading="loading" stripe :max-height="580">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="巡查任务名称" prop="taskName" />
       <el-table-column label="项目名称" prop="projectName" />
@@ -57,8 +57,12 @@
       <el-table-column label="操作" width="350">
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
-          <el-button link type="primary" icon="Edit" @click="handlenotice(scope.row)">发布整改通知</el-button>
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">提交整改回复单</el-button>
+          <el-button v-if="scope.row.fileListToNotice.length == 0" link type="primary" icon="Edit" @click="handlenotice(scope.row)"
+            >发布整改通知</el-button
+          >
+          <el-button link type="primary" v-if="scope.row.fileListToReply.length == 0" icon="Edit" @click="handleUpdate(scope.row)"
+            >提交整改回复单</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -262,7 +266,7 @@
     rectifyType: [{ required: true, message: '请输入整改方式', trigger: 'blur' }],
     supervisionWork: [{ required: true, message: '请输入督办事项', trigger: 'blur' }],
     haveProblem: [{ required: true, message: '请输入存在问题', trigger: 'blur' }],
-    // fileListToNotice: [{ 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' }],
@@ -298,8 +302,11 @@
       },
     ],
   },
+  rulesOne: {
+    fileListToReply: [{ required: true, message: '请上传整改回复单', trigger: 'blur' }],
+  },
 });
-const { queryParams, form, rules, formOne } = toRefs(AllData);
+const { queryParams, form, rules, formOne, rulesOne } = toRefs(AllData);
 
 //搜索
 function handleQuery() {
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index cc67429..41b65ac 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -6,9 +6,9 @@
         <el-input v-model="queryParams.planName" placeholder="请输入计划名称" clearable style="width: 180px" />
       </el-form-item>
 
-      <el-form-item label="项目名称:" prop="eventType">
-        <el-select clearable v-model="queryParams.eventType" style="width: 180px" placeholder="请选择项目名称">
-          <el-option v-for="item in Xmtype" :key="item.value" :label="item.label" :value="item.value" />
+      <el-form-item label="项目名称:" prop="projectCodes">
+        <el-select clearable v-model="queryParams.projectCodes" style="width: 180px" placeholder="请选择项目名称">
+          <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
         </el-select>
       </el-form-item>
 
@@ -22,6 +22,7 @@
         <el-date-picker
           style="width: 380px"
           format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           v-model="AllData.publishTime"
           type="daterange"
           range-separator="至"
@@ -47,31 +48,51 @@
     <!-- 表格 -->
     <el-table :data="dataList" v-loading="loading" stripe :max-height="580">
       <el-table-column type="index" width="55" label="序号" />
-      <el-table-column label="巡查计划名称" prop="planName" />
-      <el-table-column label="项目名称" prop="project" />
-      <el-table-column label="巡查人员" prop="planUserIds" />
+      <el-table-column label="巡查计划名称" prop="planName" width="140" />
+      <el-table-column label="巡查计划状态" prop="status" width="150">
+        <template #default="scope">
+          <span>
+            {{ scope.row.status == '0' ? '未激活' : scope.row.status == '1' ? '已激活' : '' }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目名称" prop="projectCodes" width="400">
+        <template #default="scope">
+          <p v-for="item in scope.row.projectList">{{ item.projectAbbreviation }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="巡查人员" prop="planUserIds">
+        <template #default="scope">
+          <p v-for="item in scope.row.taskUserList">{{ item.userName }}</p>
+        </template>
+      </el-table-column>
       <el-table-column label="巡查类型" prop="patrolType">
         <template #default="scope">
           <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
         </template>
       </el-table-column>
-      <el-table-column label="巡查公里数(km)" prop="num" />
-      <el-table-column label="计划开始时间" prop="startTime" />
-      <el-table-column label="计划结束时间" prop="endDate" />
-      <el-table-column label="任务频率" prop="patrolFrequencyType" />
-      <el-table-column label="创建时间" prop="create" />
-      <el-table-column label="巡查要求" prop="remark" />
-      <el-table-column label="巡查计划状态" prop="status" />
-      <el-table-column label="操作" width="280">
+      <!-- <el-table-column label="巡查公里数(km)" prop="num" /> -->
+      <el-table-column label="计划开始时间" prop="startTime" width="180" />
+      <el-table-column label="计划结束时间" prop="endDate" width="180" />
+      <el-table-column label="任务频率" prop="patrolFrequencyContent" width="200">
+        <!-- <template #default="scope">
+          <span>
+            {{ scope.row.patrolFrequencyType == 'for_week' ? '周' : scope.row.patrolFrequencyType == 'for_day' ? '日' : '' }}
+          </span>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="创建时间" prop="createTime" width="180" />
+      <el-table-column label="巡查要求" prop="remark" width="180" />
+      <el-table-column label="操作" width="280" fixed="right">
         <template #default="scope">
-          <el-button link icon="View" type="success" v-if="scope.row.status == '未激活'" @click="activation(scope.row, 'view')">
+          <el-button link icon="View" type="success" v-if="scope.row.status == '0'" @click="handleActive(scope.row, 'view')">
             激活
           </el-button>
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">详情</el-button>
-          <el-button link type="warning" icon="Edit" v-if="scope.row.status == '未激活'" @click="handleUpdate(scope.row, 'view')">
+          <el-button link type="warning" icon="Edit" v-if="scope.row.status == '0'" @click="handleUpdate(scope.row, 'view')">
             修改
           </el-button>
-          <el-button link type="danger" icon="Delete" v-if="scope.row.status == '未激活'" @click="handleDelete(scope.row, 'view')">
+          <el-button link type="danger" icon="Delete" v-if="scope.row.status == '0'" @click="handleDelete(scope.row, 'view')">
             删除
           </el-button>
         </template>
@@ -98,7 +119,7 @@
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="项目名称:" prop="projectList">
+            <el-form-item label="项目名称:" prop="projectCodes">
               <el-select
                 clearable
                 v-model="form.projectList"
@@ -108,13 +129,13 @@
                 multiple
                 label="projectName"
               >
-                <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj" />
+                <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="巡查计划类型:" prop="patrolType">
-              <el-select clearable v-model="form.patrolType" style="width: 100%" placeholder="请选择项目名称">
+              <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-form-item>
@@ -123,13 +144,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="巡查频率:" prop="patrolFrequencyType">
-              <el-select
-                v-model="form.patrolFrequencyType"
-                placeholder="请选择巡查频率"
-                clearable
-                style="width: 100%"
-                @change="changeStation"
-              >
+              <el-select v-model="form.patrolFrequencyType" placeholder="请选择巡查频率" clearable style="width: 100%">
                 <el-option v-for="dict in Xcfrequency" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
@@ -137,14 +152,14 @@
           <el-col :span="12">
             <el-form-item label="巡查频率(周):" prop="fileTag1" v-if="form.patrolFrequencyType == 'for_week'">
               <el-select v-model="form.patrolWeekDay" placeholder="请选择巡查频率(周)" clearable style="width: 100%" multiple>
-                <el-option v-for="item in weekList" :key="item.value" :label="item.label" :value="Number(item.value)" />
+                <el-option v-for="item in weekList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="巡查人员:" prop="patrolUserList">
+            <el-form-item label="巡查人员:" prop="planUserIds">
               <el-select
                 v-model="form.patrolUserList"
                 placeholder="请选择巡查人员"
@@ -154,7 +169,7 @@
                 label="nickName"
                 multiple
               >
-                <el-option v-for="item in userList" :key="String(item.userId)" :label="item.nickName" :value="item" />
+                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -184,7 +199,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm" v-show="!multiple">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
@@ -192,12 +207,7 @@
   </div>
 </template>
 <script setup name="Inspectionplan">
-import {
-  patrolPlanpage,
-  FloodPreventionMaterialedit,
-  patrolPlanadd,
-  FloodPreventionMaterialdelete,
-} from '@/api/longoPeration/Inspectionplana';
+import { patrolPlanpage, activation, patrolPlanedit, patrolPlanadd, patrolPlandelete } from '@/api/longoPeration/Inspectionplana';
 import { listUser } from '@/api/system/user';
 import { getProjectInfoList } from '@/api/preassess/targetManage';
 const { proxy } = getCurrentInstance();
@@ -212,9 +222,8 @@
   { value: 'for_week', label: '周' },
 ]);
 const WaterDate = ref([
-  { value: '0', label: '已完成' },
   { value: '1', label: '已激活' },
-  { value: '2', label: '未激活' },
+  { value: '0', label: '未激活' },
 ]);
 const weekList = ref([
   { value: '1', label: '周日' },
@@ -234,8 +243,8 @@
   id: '',
   caseid: '',
   caseidone: '',
-  publishTime: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')],
-  form: { a: [] },
+  publishTime: [],
+  form: {},
   formDate: {},
   caseFormDate: { id: '' },
   queryParams: {
@@ -248,19 +257,19 @@
   },
   rules: {
     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' }],
+    projectCodes: [{ required: true, message: '请选择项目名称', trigger: 'blur' }],
+    patrolType: [{ required: true, message: '请选择巡查计划类型', trigger: 'blur' }],
+    planUserIds: [{ required: true, message: '请选择巡查人员', trigger: 'blur' }],
     reportTime1: [{ required: true, message: '请选择计划日期', trigger: 'blur' }],
     eventDescription: [{ required: true, message: '请输入', trigger: 'blur' }],
-    patrolWeekDay: [{ required: true, message: '请选择巡查频率(周)', trigger: 'blur' }],
+    fileTag1: [{ required: true, message: '请选择巡查频率(周)', trigger: 'blur' }],
   },
 });
 const { queryParams, form, rules } = toRefs(AllData);
 
 //搜索
 function handleQuery() {
+  // console.log('123', AllData.publishTime);
   if (AllData.publishTime) {
     queryParams.value.startTime = AllData.publishTime[0];
     queryParams.value.endDate = AllData.publishTime[1];
@@ -272,7 +281,7 @@
 }
 //重置
 function resetQuery() {
-  AllData.publishTime = [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD 23:59:59')];
+  AllData.publishTime = [];
   proxy.resetForm('queryRef');
   handleQuery();
 }
@@ -289,44 +298,15 @@
   open.value = false;
   proxy.resetForm('roleRef');
 }
-
-// 巡查频率下拉框点击事件
-function changeStation(value) {
-  // console.log(value, 'value');
-}
-
-//查看详情操作
-function handleDetail(row) {
-  open.value = true;
-  multiple.value = true;
-  title.value = '查看巡查计划';
-  form.value = row;
-  form.value.patrolUserList = row.taskUserList.map(item => {
-    return item.userName;
-  });
-  form.value.projectList = row.projectList.map(item => {
-    return item.projectAbbreviation;
-  });
-}
-// 修改按钮操作
-function handleUpdate(row) {
-  open.value = true;
-  title.value = '修改巡查计划';
-  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;
+    userList.value = res.data || [];
+    userList.value.map(item => {
+      item.userId = String(item.userId);
+    });
   });
 }
-
 /** 查询列表 */
 const getList = async () => {
   loading.value = true;
@@ -334,7 +314,6 @@
     queryParams.value.startTime = AllData.publishTime[0];
     queryParams.value.endDate = AllData.publishTime[1];
   }
-
   let res = await patrolPlanpage(queryParams.value);
   dataList.value = res.data;
   console.log(dataList.value, 'dataList.value');
@@ -342,6 +321,57 @@
   loading.value = false;
 };
 
+//查看详情操作
+function handleDetail(row) {
+  open.value = true;
+  multiple.value = true;
+  title.value = '查看巡查计划';
+  form.value = { ...row };
+  // 做详情回显判断
+  form.value.patrolUserList = row.taskUserList.map(item => {
+    return item.userName;
+  });
+  form.value.projectList = row.projectList.map(item => {
+    return item.projectAbbreviation;
+  });
+  form.value.reportTime1 = [form.value.startDate, form.value.endDate];
+  form.value.patrolWeekDay = row.patrolFrequencyList ? row.patrolFrequencyList.split(',') : [];
+}
+// 修改按钮操作
+function handleUpdate(row) {
+  open.value = true;
+  title.value = '修改巡查计划';
+  multiple.value = false;
+  form.value = { ...row };
+  console.log(form.value, 'form.value form.value ');
+  // 做修改回显判断
+  form.value.patrolUserList = row.planUserIds ? row.planUserIds.split(',') : [];
+  form.value.patrolUserList.forEach(element => {
+    element = element.userId;
+  });
+  form.value.projectList = row.projectCodes ? row.projectCodes.split(',') : [];
+  form.value.patrolWeekDay = row.patrolFrequencyList ? row.patrolFrequencyList.split(',') : [];
+  form.value.reportTime1 = [form.value.startDate, form.value.endDate];
+}
+// 激活
+function handleActive(row) {
+  console.log(row.id, '1');
+  activation(row.id).then(res => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('激活成功');
+      getList();
+    } else {
+      proxy.$modal.msgError('激活失败');
+      getList();
+    }
+  });
+}
+// 项目接口
+async function projectTypeListM() {
+  let { data } = await getProjectInfoList();
+  projectTList.value = data;
+}
+
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
@@ -351,24 +381,57 @@
       form.value.endDate = form.value.reportTime1[1];
       // 处理项目传参
       form.value.projectList = form.value.projectList.map(obj => {
-        return { projectNo: obj.projectNo, projectName: obj.projectName };
+        console.log(projectTList.value, 'projectTList.value');
+        let nameXm = '';
+        projectTList.value.forEach(item => {
+          if (item.projectNo == obj) {
+            nameXm = item.projectName;
+            // console.log(item.projectName, 'item');
+          }
+        });
+        // console.log(obj, 'obj');
+        return { projectNo: obj, projectName: nameXm };
       });
       // 处理人员传参
-      form.value.patrolUserList = form.value.patrolUserList.map(obj => {
-        return { userId: String(obj.userId) };
+      form.value.patrolUserList = form.value.patrolUserList.map(item => {
+        console.log(item, 'item');
+        return { userId: item };
       });
-
       form.value.basicInfoId = '1686274734091489284';
       // console.log(form.value, 'form.value');
-      patrolPlanadd(form.value).then(response => {
-        proxy.$modal.msgSuccess('新增成功');
-        open.value = false;
-        getList();
-      });
+
+      if (title.value == '修改巡查计划') {
+        patrolPlanedit(form.value).then(response => {
+          proxy.$modal.msgSuccess('修改成功');
+          open.value = false;
+          getList();
+        });
+      } else {
+        if (form.value.id) delete form.value.id;
+        patrolPlanadd(form.value).then(response => {
+          proxy.$modal.msgSuccess('新增成功');
+          open.value = false;
+          getList();
+        });
+      }
     }
   });
 }
 
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const postIds = row.id;
+  proxy.$modal
+    .confirm('是否确认删除该数据项？')
+    .then(function () {
+      return patrolPlandelete(postIds);
+    })
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {});
+}
 onMounted(() => {
   getList();
   projectTypeListM();
diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
index d98328d..7735510 100644
--- a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
+++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
@@ -45,20 +45,24 @@
       <el-table-column label="整改状态" prop="isRectification" />
       <el-table-column label="整改通知单" prop="fileListToNotice">
         <template #default="scope">
-          <p v-for="item in scope.row.fileListToNotice" @click="ClickNmae(item.url)">{{ item.originalName }}</p>
+          <p v-for="item in scope.row.fileListToNotice" @click="ClickNmae(item.url)" style="cursor: pointer; color: #00a8ff">
+            {{ item.originalName }}
+          </p>
         </template>
       </el-table-column>
 
       <el-table-column label="整改回复单" prop="fileListToReply">
         <template #default="scope">
-          <p v-for="item in scope.row.fileListToReply">{{ item.originalName }}</p>
+          <p v-for="item in scope.row.fileListToReply" @click="ClickReply(item.url)" style="cursor: pointer; color: #00a8ff">
+            {{ item.originalName }}
+          </p>
         </template>
       </el-table-column>
       <el-table-column label="整改时限" prop="rectifyTime" />
       <el-table-column label="整改方式" prop="rectifyType" />
-      <el-table-column label="责任人电话" prop="peopleName" />
-      <el-table-column label="责任人" prop="peoplePhone" />
-      <el-table-column label="创建时间" prop="createTime" />
+      <el-table-column label="责任人电话" prop="peoplePhone" />
+      <el-table-column label="责任人" prop="peopleName" />
+      <el-table-column label="创建时间" prop="createTime" width="155" />
     </el-table>
   </div>
 </template>
@@ -84,6 +88,9 @@
 function ClickNmae(val) {
   window.open(val);
 }
+function ClickReply(val) {
+  window.open(val);
+}
 
 watch(
   () => props.DataList,
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index e46d048..84bcd57 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -5,8 +5,8 @@
       <el-form-item label="任务名称:" prop="taskName">
         <el-input v-model="queryParams.taskName" placeholder="请输入任务名称" clearable style="width: 180px" />
       </el-form-item>
-      <el-form-item label="巡查人员:" prop="taskUserIdList">
-        <el-select clearable v-model="queryParams.taskUserIdList" style="width: 180px" placeholder="请选择巡查人员">
+      <el-form-item label="巡查人员:" prop="taskUserId">
+        <el-select clearable v-model="queryParams.taskUserId" style="width: 180px" placeholder="请选择巡查人员">
           <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
         </el-select>
       </el-form-item>
@@ -38,12 +38,19 @@
     <!--  -->
     <div class="whole">
       <div class="MainTask">
-        <el-table :data="dataList" v-loading="loading" stripe :max-height="280" @row-click="clickLogData">
+        <el-table
+          :data="dataList"
+          v-loading="loading"
+          stripe
+          :max-height="280"
+          @row-click="clickLogData"
+          :row-class-name="tableRowClassName"
+        >
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
             <template #default="scope">
-              <p v-for="item in scope.row.projectList">{{ item.projectAbbreviation }}</p>
+              <p v-for="item in scope.row.projectList">{{ item.projectName }}</p>
             </template>
           </el-table-column>
           <el-table-column label="巡查人员" prop="taskUserIdList">
@@ -80,8 +87,8 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column label="超时时间" prop="expiredDays" />
-          <el-table-column label="任务下发时间" prop="issuedDatetime" />
+          <!-- <el-table-column label="超时时间" prop="expiredDays" /> -->
+          <el-table-column label="任务下发时间" prop="issuedDatetime" width="200" />
         </el-table>
         <!-- 分页 -->
         <pagination
@@ -99,7 +106,7 @@
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
             <template #default="scope">
-              <p>{{ scope.row.projectList[0].projectAbbreviation }}</p>
+              <p>{{ scope.row.projectList[0].projectName }}</p>
             </template>
           </el-table-column>
           <el-table-column label="巡查人员" prop="taskUserIdList">
@@ -131,8 +138,8 @@
               </span>
             </template>
           </el-table-column>
-          <!-- <el-table-column label="超时时间" prop="expiredDays" /> -->
-          <el-table-column label="任务下发时间" prop="issuedDatetime" />
+          <el-table-column label="超时时间" prop="expiredDays" />
+          <el-table-column label="任务下发时间" prop="issuedDatetime" width="200" />
           <el-table-column label="操作" width="240">
             <template #default="scope">
               <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
@@ -222,8 +229,8 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="20">
-            <el-form-item label="巡查任务描述:" prop="taskDescribe">
-              <el-input v-model="form.taskDescribe" placeholder="请输入巡查任务描述" type="textarea" />
+            <el-form-item label="备注:" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" type="textarea" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -274,7 +281,7 @@
 const pathGeometry = ref([]);
 const AllData = reactive({
   publishTime: [],
-
+  activeIndex: 0,
   form: { publishTime1: [] },
   queryParams: {
     pageNum: 1,
@@ -333,12 +340,6 @@
   });
 }
 
-//表格点击事件
-function clickLogData(val) {
-  queryParamstwo.value.fatherCode = val.number;
-  getList1();
-}
-
 // 新增
 function handleAdd() {
   title.value = '新增巡查任务';
@@ -356,11 +357,11 @@
 async function handleDetail(row) {
   opendetails.value = true;
   DataList.value = { ...row };
-  console.log('row----', row);
+  // console.log('row----', row);
   // console.log(DataList.value, 'DataList.value');
   let res = await PatrolTaskID(row.id);
   if (res && res.code == 200) {
-    console.log('res.data--', res.data);
+    // console.log('res.data--', res.data);
     pathData.value = res.data.patrolPathLngLat;
     pathGeometry.value = res.data.patrolPath;
   }
@@ -369,7 +370,7 @@
 /** 主任务查询列表 */
 const getList = async () => {
   loading.value = true;
-  console.log(AllData.publishTime, 'AllData.publishTime');
+  // console.log(AllData.publishTime, 'AllData.publishTime');
   if (AllData.publishTime) {
     queryParams.value.planStartDatetime = AllData.publishTime[0];
     queryParams.value.planEndDatetime = AllData.publishTime[1];
@@ -378,17 +379,36 @@
   dataList.value = res.data;
   total.value = res.total;
   loading.value = false;
+  getList1(res.data[0].number);
 };
 
 /** 查询列表 */
 const getList1 = async code => {
   loadingTwo.value = true;
-  let res = await patrolTaskpage(queryParamstwo.value);
+  let res = await patrolTaskpage({ fatherCode: code });
   dataListTwo.value = res.data;
   totaltwo.value = res.total;
   loadingTwo.value = false;
 };
 
+//表格点击事件
+function clickLogData(val) {
+  console.log(val, '111');
+  queryParamstwo.value.fatherCode = val.number;
+  // if (val.index != '') {
+  //   console.log('1111');
+  //   return 'success-row';
+  // }
+  getList1(val.number);
+}
+
+function tableRowClassName(row, rowIndex) {
+  row.row.index = row.rowIndex;
+  // AllData.activeIndex = row.rowIndex;
+  // console.log(row.row.index, 'row.rowIndex');
+  // console.log(AllData.activeIndex, 'AllData.activeIndex');
+}
+
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
@@ -449,4 +469,7 @@
     // background: yellowgreen;
   }
 }
+// ::v-deep .el-table .success-row td.el-table__cell {
+//   background: red !important;
+// }
 </style>
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index 3ade0c0..2987f6c 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -16,11 +16,11 @@
         <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">
@@ -53,10 +53,10 @@
         <div class="detail-label flex flex-align-center">巡查任务描述</div>
         <div class="detail-value flex flex-align-center">{{ props.DataList.taskDescribe }}</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.projectLocationName }}</div>
-      </div>
+      </div> -->
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查项目</div>
         <div class="detail-value flex flex-align-center">
diff --git a/src/views/publicService/quesNaire.vue b/src/views/publicService/quesNaire.vue
index 23d047d..6d9fa92 100644
--- a/src/views/publicService/quesNaire.vue
+++ b/src/views/publicService/quesNaire.vue
@@ -19,7 +19,9 @@
     <!-- 按钮区域 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-if="tableData.length == ''">新增</el-button>
+        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-if="tableData.length == '' || allData.ifStartQy == false"
+          >新增</el-button
+        >
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
@@ -50,7 +52,7 @@
           >
             删除
           </el-button>
-          <el-button type="warning" icon="Edit" @click="handleCount(scope.row)" v-if="scope.row.ifStart == 1 || allData.ifStartQy == 0">
+          <el-button type="warning" icon="Edit" @click="handleCount(scope.row)" v-if="scope.row.ifStart == 1 || allData.ifStartQy == true">
             满意度统计
           </el-button>
         </template>
@@ -137,7 +139,7 @@
           </el-table-column>
           <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
             <template #default="scope">
-              <el-button type="danger" icon="Edit" @click="deleteAnswer(scope.row)"> 删除 </el-button>
+              <el-button type="danger" icon="Delete" @click="deleteAnswer(scope.row)"> 删除 </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -187,7 +189,8 @@
 const dialogShowAns = ref(false);
 
 const allData = reactive({
-  ifStartQy: '',
+  ifStartQy: true,
+  isAddData: 0,
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -235,12 +238,16 @@
   tableLoading.value = true;
   quesNairePage(queryParams.value).then(response => {
     tableData.value = response.data;
-    response.data.forEach(element => {
-      if (element.ifStart == 0) {
-        allData.ifStartQy = element.ifStart;
-        console.log(allData.ifStartQy, '   allData.ifStartQy');
-      }
-    });
+    // response.data[0].ifStart = 1;
+    let arr = response.data.filter(item => item.ifStart == 1);
+    if (arr.length == 0) {
+      // 未启用
+      allData.ifStartQy = false;
+    } else {
+      // 启用
+      allData.ifStartQy = true;
+    }
+    // console.log(allData.ifStartQy, 'allData.isAddData');
     total.value = response.total;
     tableLoading.value = false;
   });