diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 629d407..755559f 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -5,6 +5,11 @@
       <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="projectCodeList">
+        <el-select clearable v-model="queryParams.projectCodeList" 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>
       <el-form-item label="整改状态:" prop="isRectification">
         <el-select clearable v-model="queryParams.isRectification" style="width: 180px" placeholder="请选择整改状态">
           <el-option v-for="item in case_level" :key="item.value" :label="item.label" :value="item.value" />
@@ -32,26 +37,27 @@
     <el-table :data="dataList" v-loading="loading" stripe :max-height="280">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="巡查任务名称" prop="taskName" />
+      <el-table-column label="项目名称" prop="expiredDays" />
+      <el-table-column label="项目起止年月" prop="issuedDatetime" />
+      <el-table-column label="建设进度(%)" prop="expiredDays" />
       <el-table-column label="巡查人员" prop="taskUserIdList">
         <template #default="scope">
           <p v-for="item in scope.row.taskUserList">{{ item.userName }}</p>
         </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" />
-      <el-table-column label="整改状态" prop="expiredDays" />
+      <el-table-column label="巡查需整改问题" prop="expiredDays" />
+
+      <el-table-column label="项目整改状态" prop="issuedDatetime" />
       <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="问题描述" prop="expiredDays" />
+      <el-table-column label="创建时间" prop="expiredDays" />
       <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="handleUpdate(scope.row)">发布整改通知</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>
         </template>
       </el-table-column>
@@ -66,54 +72,87 @@
     />
 
     <!-- 新增弹窗 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" v-model="open" width="1000px" append-to-body :close-on-click-modal="false">
       <el-form ref="roleRef" :model="form" :rules="rules" label-width="120px" :disabled="multiple">
         <el-row :gutter="20">
-          <el-col :span="20">
+          <el-col :span="12">
             <el-form-item label="巡查任务名称:" prop="taskName">
               <el-input v-model="form.taskName" placeholder="请输入巡查任务名称" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="整改方式:" prop="method">
+              <el-input v-model="form.method" placeholder="请输入整改方式" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="20">
-            <el-form-item label="巡查项目:" prop="projectCodeList">
-              <el-select v-model="form.projectCodeList" multiple placeholder="请选择巡查项目" clearable style="width: 100%">
+          <el-col :span="12">
+            <el-form-item label="督办事项:" prop="warning">
+              <el-input v-model="form.warning" type="textarea" placeholder="请输入督办事项" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="存在问题:" prop="problem">
+              <el-input v-model="form.problem" type="textarea" placeholder="请输入存在问题" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="建设单位:" prop="projectCodeList">
+              <el-select v-model="form.projectCodeList" multiple placeholder="请选择建设单位" clearable style="width: 100%">
                 <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="20">
-            <el-form-item label="巡查类型:" prop="patrolType">
-              <el-select v-model="form.patrolType" placeholder="请选择巡查类型" clearable style="width: 100%">
-                <el-option v-for="item in patrol_type" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
+          <el-col :span="12">
+            <el-form-item label="整改时限:" prop="timeRange">
+              <el-date-picker v-model="form.timeRange" multiple placeholder="请选择整改时限" clearable style="width: 100%">
+              </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="20">
-            <el-form-item label="计划日期" prop="publishTime1">
-              <el-date-picker
-                style="width: 380px"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
-                v-model="AllData.publishTime1"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-              />
+          <el-col :span="12">
+            <el-form-item label="责任领导:" prop="administrant">
+              <el-input v-model="form.administrant" placeholder="请输入责任领导" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电话:" prop="administrantPho">
+              <el-input v-model="form.administrantPho" placeholder="请输入责任领导电话" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </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-col :span="12">
+            <el-form-item label="责任人:" prop="administrant">
+              <el-input v-model="form.administrant" placeholder="请输入责任人" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电话:" prop="administrantPho">
+              <el-input v-model="form.administrantPho" placeholder="请输入责任人电话" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="整改书:" prop="reportList">
+              <ImageFileUpload
+                :limit="1"
+                :saveFileArr="form.reportList"
+                :listType="'text'"
+                :refField="'trfield'"
+                :refType="'tr_site_info'"
+                :fileType="['jpg', 'png', 'jpeg', 'pdf']"
+              ></ImageFileUpload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注:" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" type="textarea" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -144,6 +183,7 @@
 import { getProjectInfoList } from '@/api/preassess/targetManage';
 import { listUser } from '@/api/system/user';
 import anjianPopup from '../longoPeration/Patrolmanagement/anjianPopup.vue'; //详情弹框
+import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 const { proxy } = getCurrentInstance();
 const { patrol_type } = proxy.useDict('patrol_type'); //  巡查类型的字典
 const open = ref(false);
@@ -219,7 +259,6 @@
 function projectTypeListMPage() {
   patrolBasicInfopage().then(res => {
     BasicInfopage.value = res.data;
-    // console.log(BasicInfopage.value, 'res.data');
   });
 }
 
@@ -229,9 +268,9 @@
   getList1(val.fatherCode);
 }
 
-// 新增
-function handleAdd() {
-  title.value = '新增巡查任务';
+// 发布整改通知
+function handlenotice() {
+  title.value = '发布整改通知';
   open.value = true;
   form.value = {};
   multiple.value = false;

diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 629d407..755559f 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -5,6 +5,11 @@
       <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="projectCodeList">
+        <el-select clearable v-model="queryParams.projectCodeList" 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>
       <el-form-item label="整改状态:" prop="isRectification">
         <el-select clearable v-model="queryParams.isRectification" style="width: 180px" placeholder="请选择整改状态">
           <el-option v-for="item in case_level" :key="item.value" :label="item.label" :value="item.value" />
@@ -32,26 +37,27 @@
     <el-table :data="dataList" v-loading="loading" stripe :max-height="280">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="巡查任务名称" prop="taskName" />
+      <el-table-column label="项目名称" prop="expiredDays" />
+      <el-table-column label="项目起止年月" prop="issuedDatetime" />
+      <el-table-column label="建设进度(%)" prop="expiredDays" />
       <el-table-column label="巡查人员" prop="taskUserIdList">
         <template #default="scope">
           <p v-for="item in scope.row.taskUserList">{{ item.userName }}</p>
         </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" />
-      <el-table-column label="整改状态" prop="expiredDays" />
+      <el-table-column label="巡查需整改问题" prop="expiredDays" />
+
+      <el-table-column label="项目整改状态" prop="issuedDatetime" />
       <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="问题描述" prop="expiredDays" />
+      <el-table-column label="创建时间" prop="expiredDays" />
       <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="handleUpdate(scope.row)">发布整改通知</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>
         </template>
       </el-table-column>
@@ -66,54 +72,87 @@
     />
 
     <!-- 新增弹窗 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" v-model="open" width="1000px" append-to-body :close-on-click-modal="false">
       <el-form ref="roleRef" :model="form" :rules="rules" label-width="120px" :disabled="multiple">
         <el-row :gutter="20">
-          <el-col :span="20">
+          <el-col :span="12">
             <el-form-item label="巡查任务名称:" prop="taskName">
               <el-input v-model="form.taskName" placeholder="请输入巡查任务名称" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="整改方式:" prop="method">
+              <el-input v-model="form.method" placeholder="请输入整改方式" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="20">
-            <el-form-item label="巡查项目:" prop="projectCodeList">
-              <el-select v-model="form.projectCodeList" multiple placeholder="请选择巡查项目" clearable style="width: 100%">
+          <el-col :span="12">
+            <el-form-item label="督办事项:" prop="warning">
+              <el-input v-model="form.warning" type="textarea" placeholder="请输入督办事项" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="存在问题:" prop="problem">
+              <el-input v-model="form.problem" type="textarea" placeholder="请输入存在问题" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="建设单位:" prop="projectCodeList">
+              <el-select v-model="form.projectCodeList" multiple placeholder="请选择建设单位" clearable style="width: 100%">
                 <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="20">
-            <el-form-item label="巡查类型:" prop="patrolType">
-              <el-select v-model="form.patrolType" placeholder="请选择巡查类型" clearable style="width: 100%">
-                <el-option v-for="item in patrol_type" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
+          <el-col :span="12">
+            <el-form-item label="整改时限:" prop="timeRange">
+              <el-date-picker v-model="form.timeRange" multiple placeholder="请选择整改时限" clearable style="width: 100%">
+              </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="20">
-            <el-form-item label="计划日期" prop="publishTime1">
-              <el-date-picker
-                style="width: 380px"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
-                v-model="AllData.publishTime1"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-              />
+          <el-col :span="12">
+            <el-form-item label="责任领导:" prop="administrant">
+              <el-input v-model="form.administrant" placeholder="请输入责任领导" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电话:" prop="administrantPho">
+              <el-input v-model="form.administrantPho" placeholder="请输入责任领导电话" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </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-col :span="12">
+            <el-form-item label="责任人:" prop="administrant">
+              <el-input v-model="form.administrant" placeholder="请输入责任人" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电话:" prop="administrantPho">
+              <el-input v-model="form.administrantPho" placeholder="请输入责任人电话" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="整改书:" prop="reportList">
+              <ImageFileUpload
+                :limit="1"
+                :saveFileArr="form.reportList"
+                :listType="'text'"
+                :refField="'trfield'"
+                :refType="'tr_site_info'"
+                :fileType="['jpg', 'png', 'jpeg', 'pdf']"
+              ></ImageFileUpload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注:" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" type="textarea" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -144,6 +183,7 @@
 import { getProjectInfoList } from '@/api/preassess/targetManage';
 import { listUser } from '@/api/system/user';
 import anjianPopup from '../longoPeration/Patrolmanagement/anjianPopup.vue'; //详情弹框
+import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 const { proxy } = getCurrentInstance();
 const { patrol_type } = proxy.useDict('patrol_type'); //  巡查类型的字典
 const open = ref(false);
@@ -219,7 +259,6 @@
 function projectTypeListMPage() {
   patrolBasicInfopage().then(res => {
     BasicInfopage.value = res.data;
-    // console.log(BasicInfopage.value, 'res.data');
   });
 }
 
@@ -229,9 +268,9 @@
   getList1(val.fatherCode);
 }
 
-// 新增
-function handleAdd() {
-  title.value = '新增巡查任务';
+// 发布整改通知
+function handlenotice() {
+  title.value = '发布整改通知';
   open.value = true;
   form.value = {};
   multiple.value = false;
diff --git a/src/views/longoPeration/Patrolmanagement/CaseIssuesPopup.vue b/src/views/longoPeration/Patrolmanagement/CaseIssuesPopup.vue
new file mode 100644
index 0000000..de40266
--- /dev/null
+++ b/src/views/longoPeration/Patrolmanagement/CaseIssuesPopup.vue
@@ -0,0 +1,4 @@
+<template>
+  <div>123</div>
+</template>
+<script setup name="CaseIssuesPopup"></script>

diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 629d407..755559f 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -5,6 +5,11 @@
       <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="projectCodeList">
+        <el-select clearable v-model="queryParams.projectCodeList" 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>
       <el-form-item label="整改状态:" prop="isRectification">
         <el-select clearable v-model="queryParams.isRectification" style="width: 180px" placeholder="请选择整改状态">
           <el-option v-for="item in case_level" :key="item.value" :label="item.label" :value="item.value" />
@@ -32,26 +37,27 @@
     <el-table :data="dataList" v-loading="loading" stripe :max-height="280">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="巡查任务名称" prop="taskName" />
+      <el-table-column label="项目名称" prop="expiredDays" />
+      <el-table-column label="项目起止年月" prop="issuedDatetime" />
+      <el-table-column label="建设进度(%)" prop="expiredDays" />
       <el-table-column label="巡查人员" prop="taskUserIdList">
         <template #default="scope">
           <p v-for="item in scope.row.taskUserList">{{ item.userName }}</p>
         </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" />
-      <el-table-column label="整改状态" prop="expiredDays" />
+      <el-table-column label="巡查需整改问题" prop="expiredDays" />
+
+      <el-table-column label="项目整改状态" prop="issuedDatetime" />
       <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="问题描述" prop="expiredDays" />
+      <el-table-column label="创建时间" prop="expiredDays" />
       <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="handleUpdate(scope.row)">发布整改通知</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>
         </template>
       </el-table-column>
@@ -66,54 +72,87 @@
     />
 
     <!-- 新增弹窗 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" v-model="open" width="1000px" append-to-body :close-on-click-modal="false">
       <el-form ref="roleRef" :model="form" :rules="rules" label-width="120px" :disabled="multiple">
         <el-row :gutter="20">
-          <el-col :span="20">
+          <el-col :span="12">
             <el-form-item label="巡查任务名称:" prop="taskName">
               <el-input v-model="form.taskName" placeholder="请输入巡查任务名称" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="整改方式:" prop="method">
+              <el-input v-model="form.method" placeholder="请输入整改方式" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="20">
-            <el-form-item label="巡查项目:" prop="projectCodeList">
-              <el-select v-model="form.projectCodeList" multiple placeholder="请选择巡查项目" clearable style="width: 100%">
+          <el-col :span="12">
+            <el-form-item label="督办事项:" prop="warning">
+              <el-input v-model="form.warning" type="textarea" placeholder="请输入督办事项" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="存在问题:" prop="problem">
+              <el-input v-model="form.problem" type="textarea" placeholder="请输入存在问题" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="建设单位:" prop="projectCodeList">
+              <el-select v-model="form.projectCodeList" multiple placeholder="请选择建设单位" clearable style="width: 100%">
                 <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="20">
-            <el-form-item label="巡查类型:" prop="patrolType">
-              <el-select v-model="form.patrolType" placeholder="请选择巡查类型" clearable style="width: 100%">
-                <el-option v-for="item in patrol_type" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
+          <el-col :span="12">
+            <el-form-item label="整改时限:" prop="timeRange">
+              <el-date-picker v-model="form.timeRange" multiple placeholder="请选择整改时限" clearable style="width: 100%">
+              </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="20">
-            <el-form-item label="计划日期" prop="publishTime1">
-              <el-date-picker
-                style="width: 380px"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
-                v-model="AllData.publishTime1"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-              />
+          <el-col :span="12">
+            <el-form-item label="责任领导:" prop="administrant">
+              <el-input v-model="form.administrant" placeholder="请输入责任领导" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电话:" prop="administrantPho">
+              <el-input v-model="form.administrantPho" placeholder="请输入责任领导电话" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </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-col :span="12">
+            <el-form-item label="责任人:" prop="administrant">
+              <el-input v-model="form.administrant" placeholder="请输入责任人" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电话:" prop="administrantPho">
+              <el-input v-model="form.administrantPho" placeholder="请输入责任人电话" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="整改书:" prop="reportList">
+              <ImageFileUpload
+                :limit="1"
+                :saveFileArr="form.reportList"
+                :listType="'text'"
+                :refField="'trfield'"
+                :refType="'tr_site_info'"
+                :fileType="['jpg', 'png', 'jpeg', 'pdf']"
+              ></ImageFileUpload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注:" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" type="textarea" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -144,6 +183,7 @@
 import { getProjectInfoList } from '@/api/preassess/targetManage';
 import { listUser } from '@/api/system/user';
 import anjianPopup from '../longoPeration/Patrolmanagement/anjianPopup.vue'; //详情弹框
+import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 const { proxy } = getCurrentInstance();
 const { patrol_type } = proxy.useDict('patrol_type'); //  巡查类型的字典
 const open = ref(false);
@@ -219,7 +259,6 @@
 function projectTypeListMPage() {
   patrolBasicInfopage().then(res => {
     BasicInfopage.value = res.data;
-    // console.log(BasicInfopage.value, 'res.data');
   });
 }
 
@@ -229,9 +268,9 @@
   getList1(val.fatherCode);
 }
 
-// 新增
-function handleAdd() {
-  title.value = '新增巡查任务';
+// 发布整改通知
+function handlenotice() {
+  title.value = '发布整改通知';
   open.value = true;
   form.value = {};
   multiple.value = false;
diff --git a/src/views/longoPeration/Patrolmanagement/CaseIssuesPopup.vue b/src/views/longoPeration/Patrolmanagement/CaseIssuesPopup.vue
new file mode 100644
index 0000000..de40266
--- /dev/null
+++ b/src/views/longoPeration/Patrolmanagement/CaseIssuesPopup.vue
@@ -0,0 +1,4 @@
+<template>
+  <div>123</div>
+</template>
+<script setup name="CaseIssuesPopup"></script>
diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
index 79636fc..29261a7 100644
--- a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
+++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
@@ -1,5 +1,8 @@
 <template>
   <div class="first">
+    <div class="ditu">
+      <gisMap2D style="position: relative" :initJson="`/static/libs/mapbox/style/projectIndex.json`" @map-click="clickMap"></gisMap2D>
+    </div>
     <!-- 类容 -->
     <div class="dialog-form-detail flex flex-r flex-wrap" style="margin-top: 5px">
       <div class="flex flex-r">
@@ -20,36 +23,7 @@
         <div class="detail-label flex flex-align-center">任务结束时间</div>
         <div class="detail-value flex flex-align-center">{{ props.DataList.planEndDatetime }}</div>
       </div>
-      <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">任务状态</div>
-        <div class="detail-value flex flex-align-center">
-          <span>
-            {{
-              props.DataList.status == 'to_start'
-                ? '未开始'
-                : props.DataList.status == 'proceed'
-                ? '进行中'
-                : props.DataList.status == 'done'
-                ? '已完成'
-                : props.DataList.status == 'expired'
-                ? '超时'
-                : ''
-            }}
-          </span>
-        </div>
-      </div>
-      <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">超时时间</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.expiredDays }}</div>
-      </div>
-      <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">任务下发时间</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.issuedDatetime }}</div>
-      </div>
-      <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">巡查任务描述</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.taskDescribe }}</div>
-      </div>
+
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查位置</div>
         <div class="detail-value flex flex-align-center">{{ props.DataList.projectLocationName }}</div>
@@ -60,26 +34,17 @@
           {{ props.DataList.projectList[0].projectAbbreviation }}
         </div>
       </div>
-    </div>
-    <!-- 巡查照片 -->
-    <!-- <div>
-      <p style="color: aliceblue">巡查照片</p>
-      <div v-if="dataListPhone.length">
-        <el-image style="width: 150px; height: 60px; margin: 5px" v-for="i in dataListPhone" :src="i.url" :preview-src-list="[i.url]">
-        </el-image>
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">巡查任务描述</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.taskDescribe }}</div>
       </div>
-      <el-empty v-else description="暂无图片" :image-size="30" />
-    </div> -->
+    </div>
 
     <el-table :data="dataList" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px">
       <el-table-column type="index" width="55" label="序号" />
-      <el-table-column label="问题类型" prop="problemType">
-        <!-- <template #default="scope">
-          <dict-tag :options="problem_type" :value="String(scope.row.problemType)" />
-        </template> -->
-      </el-table-column>
-      <el-table-column label="检查项" prop="checkItem" />
-      <el-table-column label="是否整改" prop="isRectification">
+      <el-table-column label="存在问题" prop="problemType"> </el-table-column>
+      <el-table-column label="督办事项" prop="checkItem" />
+      <el-table-column label="整改状态" prop="isRectification">
         <template #default="scope">
           <span>
             {{
@@ -94,32 +59,37 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="问题描述" prop="problemContent" />
-      <el-table-column label="上报时间" prop="createTime" />
-      <el-table-column label="巡查照片" prop="sysFileList">
-        <template #default="scope">
-          <el-image
-            style="width: 60px; height: 60px; margin: 5px"
-            v-for="i in scope.row.sysFileList"
-            :src="i.url"
-            :preview-src-list="[i.url]"
-          >
-          </el-image>
-          <span v-if="scope.row.sysFileList.length == ''">暂无照片</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="整改通知单" prop="problemContent" />
+      <el-table-column label="整改回复单" prop="createTime" />
+      <el-table-column label="整改时限" prop="problemContent" />
+      <el-table-column label="整改方式" prop="createTime" />
+      <el-table-column label="责任人及电话" prop="problemContent" />
+      <el-table-column label="创建时间" prop="createTime" />
     </el-table>
   </div>
 </template>
 
 <script setup>
 import { patrolProblempage } from '@/api/longoPeration/inspectiontasks';
+import gisMap2D from '@/views/gisMapPage/gisMapBox1.vue';
+import CoordTransform from '@/utils/gis/CoorTransform.js';
+import point_start from '@/assets/newImgs/point_start.png';
+import point_end from '@/assets/newImgs/point_end.png';
+import user from '@/assets/newImgs/user_1.png';
 const props = defineProps({
   // 数据
   DataList: {
     type: Array,
     default: null,
   },
+  pathData: {
+    type: Array,
+    default: null,
+  },
+  pathGeometry: {
+    type: String,
+    default: '',
+  },
 });
 const { proxy } = getCurrentInstance();
 const { problem_type } = proxy.useDict('problem_type'); //  巡查类型的字典
@@ -133,7 +103,44 @@
     dataListPhone.value = element.sysFileList;
   });
 };
-
+//添加轨迹线
+const addRecordLine = (geojson, layerId) => {
+  newfiberMapbox.map.addSource(layerId, {
+    type: 'geojson',
+    data: geojson,
+  });
+  newfiberMapbox.map.addLayer({
+    id: layerId,
+    type: 'line',
+    source: layerId,
+    paint: {
+      'line-color': 'rgba(35, 217, 110,1)',
+      'line-width': 3,
+    },
+  });
+};
+//添加轨迹起止点
+const addStartAndEnd = (geojson, layerId, Icon) => {
+  newfiberMapbox.map.loadImage(Icon, (error, image) => {
+    if (error) throw error;
+    newfiberMapbox.map.addImage(layerId + '_icon', image);
+  });
+  newfiberMapbox.map.addSource(layerId, {
+    type: 'geojson',
+    data: geojson,
+  });
+  newfiberMapbox.map.addLayer({
+    id: layerId,
+    type: 'symbol',
+    source: layerId,
+    layout: {
+      'icon-image': layerId + '_icon',
+      'icon-size': 0.2,
+      'icon-offset': [0, 0],
+      'icon-allow-overlap': true,
+    },
+  });
+};
 watch(
   () => props.DataList,
   val => {
@@ -144,10 +151,82 @@
   },
   { deep: true, immediate: true }
 );
+watch(
+  () => props.pathGeometry,
+  val => {
+    if (val) {
+      if (newfiberMapbox.map.getLayer('recordLineGeojson')) {
+        newfiberMapbox.map.removeLayer('recordLineGeojson');
+        newfiberMapbox.map.removeSource('recordLineGeojson');
+      }
+      if (val === '') return;
+
+      //轨迹线
+      let recordLineGeojson = {
+        type: 'FeatureCollection',
+        features: [
+          {
+            type: 'Feature',
+            geometry: Terraformer.WKT.parse(val),
+          },
+        ],
+      };
+      console.log('recordLineGeojson--', recordLineGeojson);
+      gcoord.transform(recordLineGeojson.features[0], gcoord.GCJ02, gcoord.WGS84);
+      setTimeout(() => {
+        addRecordLine(recordLineGeojson, 'recordLineGeojson');
+        gcoord.transform(recordLineGeojson.features[0], gcoord.WGS84, gcoord.GCJ02);
+      }, 2000);
+    }
+  }
+);
+watch(
+  () => props.pathData,
+  val => {
+    if (val) {
+      console.log('val-----', val);
+      if (newfiberMapbox.map.getLayer('point_start')) {
+        newfiberMapbox.map.removeLayer('point_start');
+        newfiberMapbox.map.removeLayer('point_end');
+        newfiberMapbox.map.removeSource('point_start');
+        newfiberMapbox.map.removeSource('point_end');
+        newfiberMapbox.map.removeImage('point_start_icon');
+        newfiberMapbox.map.removeImage('point_end_icon');
+      }
+      if (!val.length) return;
+
+      //起止点
+      let start_84 = CoordTransform.gcj02towgs84(Number(val[0].lng), Number(val[0].lat));
+      let end_84 = CoordTransform.gcj02towgs84(Number(val[val.length - 1].lng), Number(val[val.length - 1].lat));
+      let startPointGeojson = {
+        type: 'FeatureCollection',
+        features: [turf.point(start_84)],
+      };
+      let endPointGeojson = {
+        type: 'FeatureCollection',
+        features: [turf.point(end_84)],
+      };
+      setTimeout(() => {
+        addStartAndEnd(startPointGeojson, 'point_start', point_start);
+        addStartAndEnd(endPointGeojson, 'point_end', point_end);
+        newfiberMapbox.map.setPitch(0);
+        newfiberMapbox.map.easeTo({
+          center: start_84,
+          zoom: 15,
+        });
+      }, 2000);
+    }
+  },
+  { deep: true, immediate: true }
+);
 onMounted(() => {});
 </script>
 
 <style scoped lang="scss">
 .first {
+  .ditu {
+    width: 100%;
+    height: 200px;
+  }
 }
 </style>

diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 629d407..755559f 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -5,6 +5,11 @@
       <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="projectCodeList">
+        <el-select clearable v-model="queryParams.projectCodeList" 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>
       <el-form-item label="整改状态:" prop="isRectification">
         <el-select clearable v-model="queryParams.isRectification" style="width: 180px" placeholder="请选择整改状态">
           <el-option v-for="item in case_level" :key="item.value" :label="item.label" :value="item.value" />
@@ -32,26 +37,27 @@
     <el-table :data="dataList" v-loading="loading" stripe :max-height="280">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="巡查任务名称" prop="taskName" />
+      <el-table-column label="项目名称" prop="expiredDays" />
+      <el-table-column label="项目起止年月" prop="issuedDatetime" />
+      <el-table-column label="建设进度(%)" prop="expiredDays" />
       <el-table-column label="巡查人员" prop="taskUserIdList">
         <template #default="scope">
           <p v-for="item in scope.row.taskUserList">{{ item.userName }}</p>
         </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" />
-      <el-table-column label="整改状态" prop="expiredDays" />
+      <el-table-column label="巡查需整改问题" prop="expiredDays" />
+
+      <el-table-column label="项目整改状态" prop="issuedDatetime" />
       <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="问题描述" prop="expiredDays" />
+      <el-table-column label="创建时间" prop="expiredDays" />
       <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="handleUpdate(scope.row)">发布整改通知</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>
         </template>
       </el-table-column>
@@ -66,54 +72,87 @@
     />
 
     <!-- 新增弹窗 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" v-model="open" width="1000px" append-to-body :close-on-click-modal="false">
       <el-form ref="roleRef" :model="form" :rules="rules" label-width="120px" :disabled="multiple">
         <el-row :gutter="20">
-          <el-col :span="20">
+          <el-col :span="12">
             <el-form-item label="巡查任务名称:" prop="taskName">
               <el-input v-model="form.taskName" placeholder="请输入巡查任务名称" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="整改方式:" prop="method">
+              <el-input v-model="form.method" placeholder="请输入整改方式" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="20">
-            <el-form-item label="巡查项目:" prop="projectCodeList">
-              <el-select v-model="form.projectCodeList" multiple placeholder="请选择巡查项目" clearable style="width: 100%">
+          <el-col :span="12">
+            <el-form-item label="督办事项:" prop="warning">
+              <el-input v-model="form.warning" type="textarea" placeholder="请输入督办事项" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="存在问题:" prop="problem">
+              <el-input v-model="form.problem" type="textarea" placeholder="请输入存在问题" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="建设单位:" prop="projectCodeList">
+              <el-select v-model="form.projectCodeList" multiple placeholder="请选择建设单位" clearable style="width: 100%">
                 <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="20">
-            <el-form-item label="巡查类型:" prop="patrolType">
-              <el-select v-model="form.patrolType" placeholder="请选择巡查类型" clearable style="width: 100%">
-                <el-option v-for="item in patrol_type" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
+          <el-col :span="12">
+            <el-form-item label="整改时限:" prop="timeRange">
+              <el-date-picker v-model="form.timeRange" multiple placeholder="请选择整改时限" clearable style="width: 100%">
+              </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="20">
-            <el-form-item label="计划日期" prop="publishTime1">
-              <el-date-picker
-                style="width: 380px"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
-                v-model="AllData.publishTime1"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-              />
+          <el-col :span="12">
+            <el-form-item label="责任领导:" prop="administrant">
+              <el-input v-model="form.administrant" placeholder="请输入责任领导" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电话:" prop="administrantPho">
+              <el-input v-model="form.administrantPho" placeholder="请输入责任领导电话" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </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-col :span="12">
+            <el-form-item label="责任人:" prop="administrant">
+              <el-input v-model="form.administrant" placeholder="请输入责任人" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电话:" prop="administrantPho">
+              <el-input v-model="form.administrantPho" placeholder="请输入责任人电话" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="整改书:" prop="reportList">
+              <ImageFileUpload
+                :limit="1"
+                :saveFileArr="form.reportList"
+                :listType="'text'"
+                :refField="'trfield'"
+                :refType="'tr_site_info'"
+                :fileType="['jpg', 'png', 'jpeg', 'pdf']"
+              ></ImageFileUpload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注:" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" type="textarea" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -144,6 +183,7 @@
 import { getProjectInfoList } from '@/api/preassess/targetManage';
 import { listUser } from '@/api/system/user';
 import anjianPopup from '../longoPeration/Patrolmanagement/anjianPopup.vue'; //详情弹框
+import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 const { proxy } = getCurrentInstance();
 const { patrol_type } = proxy.useDict('patrol_type'); //  巡查类型的字典
 const open = ref(false);
@@ -219,7 +259,6 @@
 function projectTypeListMPage() {
   patrolBasicInfopage().then(res => {
     BasicInfopage.value = res.data;
-    // console.log(BasicInfopage.value, 'res.data');
   });
 }
 
@@ -229,9 +268,9 @@
   getList1(val.fatherCode);
 }
 
-// 新增
-function handleAdd() {
-  title.value = '新增巡查任务';
+// 发布整改通知
+function handlenotice() {
+  title.value = '发布整改通知';
   open.value = true;
   form.value = {};
   multiple.value = false;
diff --git a/src/views/longoPeration/Patrolmanagement/CaseIssuesPopup.vue b/src/views/longoPeration/Patrolmanagement/CaseIssuesPopup.vue
new file mode 100644
index 0000000..de40266
--- /dev/null
+++ b/src/views/longoPeration/Patrolmanagement/CaseIssuesPopup.vue
@@ -0,0 +1,4 @@
+<template>
+  <div>123</div>
+</template>
+<script setup name="CaseIssuesPopup"></script>
diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
index 79636fc..29261a7 100644
--- a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
+++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
@@ -1,5 +1,8 @@
 <template>
   <div class="first">
+    <div class="ditu">
+      <gisMap2D style="position: relative" :initJson="`/static/libs/mapbox/style/projectIndex.json`" @map-click="clickMap"></gisMap2D>
+    </div>
     <!-- 类容 -->
     <div class="dialog-form-detail flex flex-r flex-wrap" style="margin-top: 5px">
       <div class="flex flex-r">
@@ -20,36 +23,7 @@
         <div class="detail-label flex flex-align-center">任务结束时间</div>
         <div class="detail-value flex flex-align-center">{{ props.DataList.planEndDatetime }}</div>
       </div>
-      <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">任务状态</div>
-        <div class="detail-value flex flex-align-center">
-          <span>
-            {{
-              props.DataList.status == 'to_start'
-                ? '未开始'
-                : props.DataList.status == 'proceed'
-                ? '进行中'
-                : props.DataList.status == 'done'
-                ? '已完成'
-                : props.DataList.status == 'expired'
-                ? '超时'
-                : ''
-            }}
-          </span>
-        </div>
-      </div>
-      <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">超时时间</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.expiredDays }}</div>
-      </div>
-      <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">任务下发时间</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.issuedDatetime }}</div>
-      </div>
-      <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">巡查任务描述</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.taskDescribe }}</div>
-      </div>
+
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查位置</div>
         <div class="detail-value flex flex-align-center">{{ props.DataList.projectLocationName }}</div>
@@ -60,26 +34,17 @@
           {{ props.DataList.projectList[0].projectAbbreviation }}
         </div>
       </div>
-    </div>
-    <!-- 巡查照片 -->
-    <!-- <div>
-      <p style="color: aliceblue">巡查照片</p>
-      <div v-if="dataListPhone.length">
-        <el-image style="width: 150px; height: 60px; margin: 5px" v-for="i in dataListPhone" :src="i.url" :preview-src-list="[i.url]">
-        </el-image>
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">巡查任务描述</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.taskDescribe }}</div>
       </div>
-      <el-empty v-else description="暂无图片" :image-size="30" />
-    </div> -->
+    </div>
 
     <el-table :data="dataList" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px">
       <el-table-column type="index" width="55" label="序号" />
-      <el-table-column label="问题类型" prop="problemType">
-        <!-- <template #default="scope">
-          <dict-tag :options="problem_type" :value="String(scope.row.problemType)" />
-        </template> -->
-      </el-table-column>
-      <el-table-column label="检查项" prop="checkItem" />
-      <el-table-column label="是否整改" prop="isRectification">
+      <el-table-column label="存在问题" prop="problemType"> </el-table-column>
+      <el-table-column label="督办事项" prop="checkItem" />
+      <el-table-column label="整改状态" prop="isRectification">
         <template #default="scope">
           <span>
             {{
@@ -94,32 +59,37 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="问题描述" prop="problemContent" />
-      <el-table-column label="上报时间" prop="createTime" />
-      <el-table-column label="巡查照片" prop="sysFileList">
-        <template #default="scope">
-          <el-image
-            style="width: 60px; height: 60px; margin: 5px"
-            v-for="i in scope.row.sysFileList"
-            :src="i.url"
-            :preview-src-list="[i.url]"
-          >
-          </el-image>
-          <span v-if="scope.row.sysFileList.length == ''">暂无照片</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="整改通知单" prop="problemContent" />
+      <el-table-column label="整改回复单" prop="createTime" />
+      <el-table-column label="整改时限" prop="problemContent" />
+      <el-table-column label="整改方式" prop="createTime" />
+      <el-table-column label="责任人及电话" prop="problemContent" />
+      <el-table-column label="创建时间" prop="createTime" />
     </el-table>
   </div>
 </template>
 
 <script setup>
 import { patrolProblempage } from '@/api/longoPeration/inspectiontasks';
+import gisMap2D from '@/views/gisMapPage/gisMapBox1.vue';
+import CoordTransform from '@/utils/gis/CoorTransform.js';
+import point_start from '@/assets/newImgs/point_start.png';
+import point_end from '@/assets/newImgs/point_end.png';
+import user from '@/assets/newImgs/user_1.png';
 const props = defineProps({
   // 数据
   DataList: {
     type: Array,
     default: null,
   },
+  pathData: {
+    type: Array,
+    default: null,
+  },
+  pathGeometry: {
+    type: String,
+    default: '',
+  },
 });
 const { proxy } = getCurrentInstance();
 const { problem_type } = proxy.useDict('problem_type'); //  巡查类型的字典
@@ -133,7 +103,44 @@
     dataListPhone.value = element.sysFileList;
   });
 };
-
+//添加轨迹线
+const addRecordLine = (geojson, layerId) => {
+  newfiberMapbox.map.addSource(layerId, {
+    type: 'geojson',
+    data: geojson,
+  });
+  newfiberMapbox.map.addLayer({
+    id: layerId,
+    type: 'line',
+    source: layerId,
+    paint: {
+      'line-color': 'rgba(35, 217, 110,1)',
+      'line-width': 3,
+    },
+  });
+};
+//添加轨迹起止点
+const addStartAndEnd = (geojson, layerId, Icon) => {
+  newfiberMapbox.map.loadImage(Icon, (error, image) => {
+    if (error) throw error;
+    newfiberMapbox.map.addImage(layerId + '_icon', image);
+  });
+  newfiberMapbox.map.addSource(layerId, {
+    type: 'geojson',
+    data: geojson,
+  });
+  newfiberMapbox.map.addLayer({
+    id: layerId,
+    type: 'symbol',
+    source: layerId,
+    layout: {
+      'icon-image': layerId + '_icon',
+      'icon-size': 0.2,
+      'icon-offset': [0, 0],
+      'icon-allow-overlap': true,
+    },
+  });
+};
 watch(
   () => props.DataList,
   val => {
@@ -144,10 +151,82 @@
   },
   { deep: true, immediate: true }
 );
+watch(
+  () => props.pathGeometry,
+  val => {
+    if (val) {
+      if (newfiberMapbox.map.getLayer('recordLineGeojson')) {
+        newfiberMapbox.map.removeLayer('recordLineGeojson');
+        newfiberMapbox.map.removeSource('recordLineGeojson');
+      }
+      if (val === '') return;
+
+      //轨迹线
+      let recordLineGeojson = {
+        type: 'FeatureCollection',
+        features: [
+          {
+            type: 'Feature',
+            geometry: Terraformer.WKT.parse(val),
+          },
+        ],
+      };
+      console.log('recordLineGeojson--', recordLineGeojson);
+      gcoord.transform(recordLineGeojson.features[0], gcoord.GCJ02, gcoord.WGS84);
+      setTimeout(() => {
+        addRecordLine(recordLineGeojson, 'recordLineGeojson');
+        gcoord.transform(recordLineGeojson.features[0], gcoord.WGS84, gcoord.GCJ02);
+      }, 2000);
+    }
+  }
+);
+watch(
+  () => props.pathData,
+  val => {
+    if (val) {
+      console.log('val-----', val);
+      if (newfiberMapbox.map.getLayer('point_start')) {
+        newfiberMapbox.map.removeLayer('point_start');
+        newfiberMapbox.map.removeLayer('point_end');
+        newfiberMapbox.map.removeSource('point_start');
+        newfiberMapbox.map.removeSource('point_end');
+        newfiberMapbox.map.removeImage('point_start_icon');
+        newfiberMapbox.map.removeImage('point_end_icon');
+      }
+      if (!val.length) return;
+
+      //起止点
+      let start_84 = CoordTransform.gcj02towgs84(Number(val[0].lng), Number(val[0].lat));
+      let end_84 = CoordTransform.gcj02towgs84(Number(val[val.length - 1].lng), Number(val[val.length - 1].lat));
+      let startPointGeojson = {
+        type: 'FeatureCollection',
+        features: [turf.point(start_84)],
+      };
+      let endPointGeojson = {
+        type: 'FeatureCollection',
+        features: [turf.point(end_84)],
+      };
+      setTimeout(() => {
+        addStartAndEnd(startPointGeojson, 'point_start', point_start);
+        addStartAndEnd(endPointGeojson, 'point_end', point_end);
+        newfiberMapbox.map.setPitch(0);
+        newfiberMapbox.map.easeTo({
+          center: start_84,
+          zoom: 15,
+        });
+      }, 2000);
+    }
+  },
+  { deep: true, immediate: true }
+);
 onMounted(() => {});
 </script>
 
 <style scoped lang="scss">
 .first {
+  .ditu {
+    width: 100%;
+    height: 200px;
+  }
 }
 </style>
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index 5b7e5ee..e46d048 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -56,6 +56,11 @@
               <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
             </template>
           </el-table-column>
+          <el-table-column label="巡查进度">
+            <template #default="scope">
+              <p>{{ scope.row.doneTasknumber }}/{{ scope.row.allTasknumber }}</p>
+            </template>
+          </el-table-column>
           <el-table-column label="任务开始时间" prop="planStartDatetime" />
           <el-table-column label="任务结束时间" prop="planEndDatetime" />
           <el-table-column label="任务状态" prop="status">
@@ -126,7 +131,7 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column label="超时时间" prop="expiredDays" />
+          <!-- <el-table-column label="超时时间" prop="expiredDays" /> -->
           <el-table-column label="任务下发时间" prop="issuedDatetime" />
           <el-table-column label="操作" width="240">
             <template #default="scope">
@@ -330,8 +335,8 @@
 
 //表格点击事件
 function clickLogData(val) {
-  val.fatherCode = val.number;
-  getList1(val.fatherCode);
+  queryParamstwo.value.fatherCode = val.number;
+  getList1();
 }
 
 // 新增
@@ -378,7 +383,7 @@
 /** 查询列表 */
 const getList1 = async code => {
   loadingTwo.value = true;
-  let res = await patrolTaskpage({ ...queryParamstwo.value, fatherCode: code });
+  let res = await patrolTaskpage(queryParamstwo.value);
   dataListTwo.value = res.data;
   totaltwo.value = res.total;
   loadingTwo.value = false;

diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 629d407..755559f 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -5,6 +5,11 @@
       <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="projectCodeList">
+        <el-select clearable v-model="queryParams.projectCodeList" 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>
       <el-form-item label="整改状态:" prop="isRectification">
         <el-select clearable v-model="queryParams.isRectification" style="width: 180px" placeholder="请选择整改状态">
           <el-option v-for="item in case_level" :key="item.value" :label="item.label" :value="item.value" />
@@ -32,26 +37,27 @@
     <el-table :data="dataList" v-loading="loading" stripe :max-height="280">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="巡查任务名称" prop="taskName" />
+      <el-table-column label="项目名称" prop="expiredDays" />
+      <el-table-column label="项目起止年月" prop="issuedDatetime" />
+      <el-table-column label="建设进度(%)" prop="expiredDays" />
       <el-table-column label="巡查人员" prop="taskUserIdList">
         <template #default="scope">
           <p v-for="item in scope.row.taskUserList">{{ item.userName }}</p>
         </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" />
-      <el-table-column label="整改状态" prop="expiredDays" />
+      <el-table-column label="巡查需整改问题" prop="expiredDays" />
+
+      <el-table-column label="项目整改状态" prop="issuedDatetime" />
       <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="问题描述" prop="expiredDays" />
+      <el-table-column label="创建时间" prop="expiredDays" />
       <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="handleUpdate(scope.row)">发布整改通知</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>
         </template>
       </el-table-column>
@@ -66,54 +72,87 @@
     />
 
     <!-- 新增弹窗 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" v-model="open" width="1000px" append-to-body :close-on-click-modal="false">
       <el-form ref="roleRef" :model="form" :rules="rules" label-width="120px" :disabled="multiple">
         <el-row :gutter="20">
-          <el-col :span="20">
+          <el-col :span="12">
             <el-form-item label="巡查任务名称:" prop="taskName">
               <el-input v-model="form.taskName" placeholder="请输入巡查任务名称" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="整改方式:" prop="method">
+              <el-input v-model="form.method" placeholder="请输入整改方式" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="20">
-            <el-form-item label="巡查项目:" prop="projectCodeList">
-              <el-select v-model="form.projectCodeList" multiple placeholder="请选择巡查项目" clearable style="width: 100%">
+          <el-col :span="12">
+            <el-form-item label="督办事项:" prop="warning">
+              <el-input v-model="form.warning" type="textarea" placeholder="请输入督办事项" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="存在问题:" prop="problem">
+              <el-input v-model="form.problem" type="textarea" placeholder="请输入存在问题" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="建设单位:" prop="projectCodeList">
+              <el-select v-model="form.projectCodeList" multiple placeholder="请选择建设单位" clearable style="width: 100%">
                 <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="20">
-            <el-form-item label="巡查类型:" prop="patrolType">
-              <el-select v-model="form.patrolType" placeholder="请选择巡查类型" clearable style="width: 100%">
-                <el-option v-for="item in patrol_type" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
+          <el-col :span="12">
+            <el-form-item label="整改时限:" prop="timeRange">
+              <el-date-picker v-model="form.timeRange" multiple placeholder="请选择整改时限" clearable style="width: 100%">
+              </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="20">
-            <el-form-item label="计划日期" prop="publishTime1">
-              <el-date-picker
-                style="width: 380px"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
-                v-model="AllData.publishTime1"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-              />
+          <el-col :span="12">
+            <el-form-item label="责任领导:" prop="administrant">
+              <el-input v-model="form.administrant" placeholder="请输入责任领导" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电话:" prop="administrantPho">
+              <el-input v-model="form.administrantPho" placeholder="请输入责任领导电话" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </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-col :span="12">
+            <el-form-item label="责任人:" prop="administrant">
+              <el-input v-model="form.administrant" placeholder="请输入责任人" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电话:" prop="administrantPho">
+              <el-input v-model="form.administrantPho" placeholder="请输入责任人电话" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="整改书:" prop="reportList">
+              <ImageFileUpload
+                :limit="1"
+                :saveFileArr="form.reportList"
+                :listType="'text'"
+                :refField="'trfield'"
+                :refType="'tr_site_info'"
+                :fileType="['jpg', 'png', 'jpeg', 'pdf']"
+              ></ImageFileUpload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注:" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" type="textarea" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -144,6 +183,7 @@
 import { getProjectInfoList } from '@/api/preassess/targetManage';
 import { listUser } from '@/api/system/user';
 import anjianPopup from '../longoPeration/Patrolmanagement/anjianPopup.vue'; //详情弹框
+import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 const { proxy } = getCurrentInstance();
 const { patrol_type } = proxy.useDict('patrol_type'); //  巡查类型的字典
 const open = ref(false);
@@ -219,7 +259,6 @@
 function projectTypeListMPage() {
   patrolBasicInfopage().then(res => {
     BasicInfopage.value = res.data;
-    // console.log(BasicInfopage.value, 'res.data');
   });
 }
 
@@ -229,9 +268,9 @@
   getList1(val.fatherCode);
 }
 
-// 新增
-function handleAdd() {
-  title.value = '新增巡查任务';
+// 发布整改通知
+function handlenotice() {
+  title.value = '发布整改通知';
   open.value = true;
   form.value = {};
   multiple.value = false;
diff --git a/src/views/longoPeration/Patrolmanagement/CaseIssuesPopup.vue b/src/views/longoPeration/Patrolmanagement/CaseIssuesPopup.vue
new file mode 100644
index 0000000..de40266
--- /dev/null
+++ b/src/views/longoPeration/Patrolmanagement/CaseIssuesPopup.vue
@@ -0,0 +1,4 @@
+<template>
+  <div>123</div>
+</template>
+<script setup name="CaseIssuesPopup"></script>
diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
index 79636fc..29261a7 100644
--- a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
+++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
@@ -1,5 +1,8 @@
 <template>
   <div class="first">
+    <div class="ditu">
+      <gisMap2D style="position: relative" :initJson="`/static/libs/mapbox/style/projectIndex.json`" @map-click="clickMap"></gisMap2D>
+    </div>
     <!-- 类容 -->
     <div class="dialog-form-detail flex flex-r flex-wrap" style="margin-top: 5px">
       <div class="flex flex-r">
@@ -20,36 +23,7 @@
         <div class="detail-label flex flex-align-center">任务结束时间</div>
         <div class="detail-value flex flex-align-center">{{ props.DataList.planEndDatetime }}</div>
       </div>
-      <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">任务状态</div>
-        <div class="detail-value flex flex-align-center">
-          <span>
-            {{
-              props.DataList.status == 'to_start'
-                ? '未开始'
-                : props.DataList.status == 'proceed'
-                ? '进行中'
-                : props.DataList.status == 'done'
-                ? '已完成'
-                : props.DataList.status == 'expired'
-                ? '超时'
-                : ''
-            }}
-          </span>
-        </div>
-      </div>
-      <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">超时时间</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.expiredDays }}</div>
-      </div>
-      <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">任务下发时间</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.issuedDatetime }}</div>
-      </div>
-      <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">巡查任务描述</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.taskDescribe }}</div>
-      </div>
+
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查位置</div>
         <div class="detail-value flex flex-align-center">{{ props.DataList.projectLocationName }}</div>
@@ -60,26 +34,17 @@
           {{ props.DataList.projectList[0].projectAbbreviation }}
         </div>
       </div>
-    </div>
-    <!-- 巡查照片 -->
-    <!-- <div>
-      <p style="color: aliceblue">巡查照片</p>
-      <div v-if="dataListPhone.length">
-        <el-image style="width: 150px; height: 60px; margin: 5px" v-for="i in dataListPhone" :src="i.url" :preview-src-list="[i.url]">
-        </el-image>
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">巡查任务描述</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.taskDescribe }}</div>
       </div>
-      <el-empty v-else description="暂无图片" :image-size="30" />
-    </div> -->
+    </div>
 
     <el-table :data="dataList" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px">
       <el-table-column type="index" width="55" label="序号" />
-      <el-table-column label="问题类型" prop="problemType">
-        <!-- <template #default="scope">
-          <dict-tag :options="problem_type" :value="String(scope.row.problemType)" />
-        </template> -->
-      </el-table-column>
-      <el-table-column label="检查项" prop="checkItem" />
-      <el-table-column label="是否整改" prop="isRectification">
+      <el-table-column label="存在问题" prop="problemType"> </el-table-column>
+      <el-table-column label="督办事项" prop="checkItem" />
+      <el-table-column label="整改状态" prop="isRectification">
         <template #default="scope">
           <span>
             {{
@@ -94,32 +59,37 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="问题描述" prop="problemContent" />
-      <el-table-column label="上报时间" prop="createTime" />
-      <el-table-column label="巡查照片" prop="sysFileList">
-        <template #default="scope">
-          <el-image
-            style="width: 60px; height: 60px; margin: 5px"
-            v-for="i in scope.row.sysFileList"
-            :src="i.url"
-            :preview-src-list="[i.url]"
-          >
-          </el-image>
-          <span v-if="scope.row.sysFileList.length == ''">暂无照片</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="整改通知单" prop="problemContent" />
+      <el-table-column label="整改回复单" prop="createTime" />
+      <el-table-column label="整改时限" prop="problemContent" />
+      <el-table-column label="整改方式" prop="createTime" />
+      <el-table-column label="责任人及电话" prop="problemContent" />
+      <el-table-column label="创建时间" prop="createTime" />
     </el-table>
   </div>
 </template>
 
 <script setup>
 import { patrolProblempage } from '@/api/longoPeration/inspectiontasks';
+import gisMap2D from '@/views/gisMapPage/gisMapBox1.vue';
+import CoordTransform from '@/utils/gis/CoorTransform.js';
+import point_start from '@/assets/newImgs/point_start.png';
+import point_end from '@/assets/newImgs/point_end.png';
+import user from '@/assets/newImgs/user_1.png';
 const props = defineProps({
   // 数据
   DataList: {
     type: Array,
     default: null,
   },
+  pathData: {
+    type: Array,
+    default: null,
+  },
+  pathGeometry: {
+    type: String,
+    default: '',
+  },
 });
 const { proxy } = getCurrentInstance();
 const { problem_type } = proxy.useDict('problem_type'); //  巡查类型的字典
@@ -133,7 +103,44 @@
     dataListPhone.value = element.sysFileList;
   });
 };
-
+//添加轨迹线
+const addRecordLine = (geojson, layerId) => {
+  newfiberMapbox.map.addSource(layerId, {
+    type: 'geojson',
+    data: geojson,
+  });
+  newfiberMapbox.map.addLayer({
+    id: layerId,
+    type: 'line',
+    source: layerId,
+    paint: {
+      'line-color': 'rgba(35, 217, 110,1)',
+      'line-width': 3,
+    },
+  });
+};
+//添加轨迹起止点
+const addStartAndEnd = (geojson, layerId, Icon) => {
+  newfiberMapbox.map.loadImage(Icon, (error, image) => {
+    if (error) throw error;
+    newfiberMapbox.map.addImage(layerId + '_icon', image);
+  });
+  newfiberMapbox.map.addSource(layerId, {
+    type: 'geojson',
+    data: geojson,
+  });
+  newfiberMapbox.map.addLayer({
+    id: layerId,
+    type: 'symbol',
+    source: layerId,
+    layout: {
+      'icon-image': layerId + '_icon',
+      'icon-size': 0.2,
+      'icon-offset': [0, 0],
+      'icon-allow-overlap': true,
+    },
+  });
+};
 watch(
   () => props.DataList,
   val => {
@@ -144,10 +151,82 @@
   },
   { deep: true, immediate: true }
 );
+watch(
+  () => props.pathGeometry,
+  val => {
+    if (val) {
+      if (newfiberMapbox.map.getLayer('recordLineGeojson')) {
+        newfiberMapbox.map.removeLayer('recordLineGeojson');
+        newfiberMapbox.map.removeSource('recordLineGeojson');
+      }
+      if (val === '') return;
+
+      //轨迹线
+      let recordLineGeojson = {
+        type: 'FeatureCollection',
+        features: [
+          {
+            type: 'Feature',
+            geometry: Terraformer.WKT.parse(val),
+          },
+        ],
+      };
+      console.log('recordLineGeojson--', recordLineGeojson);
+      gcoord.transform(recordLineGeojson.features[0], gcoord.GCJ02, gcoord.WGS84);
+      setTimeout(() => {
+        addRecordLine(recordLineGeojson, 'recordLineGeojson');
+        gcoord.transform(recordLineGeojson.features[0], gcoord.WGS84, gcoord.GCJ02);
+      }, 2000);
+    }
+  }
+);
+watch(
+  () => props.pathData,
+  val => {
+    if (val) {
+      console.log('val-----', val);
+      if (newfiberMapbox.map.getLayer('point_start')) {
+        newfiberMapbox.map.removeLayer('point_start');
+        newfiberMapbox.map.removeLayer('point_end');
+        newfiberMapbox.map.removeSource('point_start');
+        newfiberMapbox.map.removeSource('point_end');
+        newfiberMapbox.map.removeImage('point_start_icon');
+        newfiberMapbox.map.removeImage('point_end_icon');
+      }
+      if (!val.length) return;
+
+      //起止点
+      let start_84 = CoordTransform.gcj02towgs84(Number(val[0].lng), Number(val[0].lat));
+      let end_84 = CoordTransform.gcj02towgs84(Number(val[val.length - 1].lng), Number(val[val.length - 1].lat));
+      let startPointGeojson = {
+        type: 'FeatureCollection',
+        features: [turf.point(start_84)],
+      };
+      let endPointGeojson = {
+        type: 'FeatureCollection',
+        features: [turf.point(end_84)],
+      };
+      setTimeout(() => {
+        addStartAndEnd(startPointGeojson, 'point_start', point_start);
+        addStartAndEnd(endPointGeojson, 'point_end', point_end);
+        newfiberMapbox.map.setPitch(0);
+        newfiberMapbox.map.easeTo({
+          center: start_84,
+          zoom: 15,
+        });
+      }, 2000);
+    }
+  },
+  { deep: true, immediate: true }
+);
 onMounted(() => {});
 </script>
 
 <style scoped lang="scss">
 .first {
+  .ditu {
+    width: 100%;
+    height: 200px;
+  }
 }
 </style>
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index 5b7e5ee..e46d048 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -56,6 +56,11 @@
               <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
             </template>
           </el-table-column>
+          <el-table-column label="巡查进度">
+            <template #default="scope">
+              <p>{{ scope.row.doneTasknumber }}/{{ scope.row.allTasknumber }}</p>
+            </template>
+          </el-table-column>
           <el-table-column label="任务开始时间" prop="planStartDatetime" />
           <el-table-column label="任务结束时间" prop="planEndDatetime" />
           <el-table-column label="任务状态" prop="status">
@@ -126,7 +131,7 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column label="超时时间" prop="expiredDays" />
+          <!-- <el-table-column label="超时时间" prop="expiredDays" /> -->
           <el-table-column label="任务下发时间" prop="issuedDatetime" />
           <el-table-column label="操作" width="240">
             <template #default="scope">
@@ -330,8 +335,8 @@
 
 //表格点击事件
 function clickLogData(val) {
-  val.fatherCode = val.number;
-  getList1(val.fatherCode);
+  queryParamstwo.value.fatherCode = val.number;
+  getList1();
 }
 
 // 新增
@@ -378,7 +383,7 @@
 /** 查询列表 */
 const getList1 = async code => {
   loadingTwo.value = true;
-  let res = await patrolTaskpage({ ...queryParamstwo.value, fatherCode: code });
+  let res = await patrolTaskpage(queryParamstwo.value);
   dataListTwo.value = res.data;
   totaltwo.value = res.total;
   loadingTwo.value = false;
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index 1b82b3e..3ade0c0 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -85,15 +85,7 @@
       <el-table-column label="是否整改" prop="isRectification">
         <template #default="scope">
           <span>
-            {{
-              scope.row.isRectification == '1'
-                ? '无需整改'
-                : scope.row.isRectification == '2'
-                ? '待整改'
-                : scope.row.isRectification == '3'
-                ? '整改已完成'
-                : ''
-            }}
+            {{ scope.row.isRectification == '1' ? '无需整改' : scope.row.isRectification == '2' ? '需要整改' : '' }}
           </span>
         </template>
       </el-table-column>

diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
index 629d407..755559f 100644
--- a/src/views/longoPeration/CaseIssues.vue
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -5,6 +5,11 @@
       <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="projectCodeList">
+        <el-select clearable v-model="queryParams.projectCodeList" 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>
       <el-form-item label="整改状态:" prop="isRectification">
         <el-select clearable v-model="queryParams.isRectification" style="width: 180px" placeholder="请选择整改状态">
           <el-option v-for="item in case_level" :key="item.value" :label="item.label" :value="item.value" />
@@ -32,26 +37,27 @@
     <el-table :data="dataList" v-loading="loading" stripe :max-height="280">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="巡查任务名称" prop="taskName" />
+      <el-table-column label="项目名称" prop="expiredDays" />
+      <el-table-column label="项目起止年月" prop="issuedDatetime" />
+      <el-table-column label="建设进度(%)" prop="expiredDays" />
       <el-table-column label="巡查人员" prop="taskUserIdList">
         <template #default="scope">
           <p v-for="item in scope.row.taskUserList">{{ item.userName }}</p>
         </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" />
-      <el-table-column label="整改状态" prop="expiredDays" />
+      <el-table-column label="巡查需整改问题" prop="expiredDays" />
+
+      <el-table-column label="项目整改状态" prop="issuedDatetime" />
       <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="问题描述" prop="expiredDays" />
+      <el-table-column label="创建时间" prop="expiredDays" />
       <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="handleUpdate(scope.row)">发布整改通知</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>
         </template>
       </el-table-column>
@@ -66,54 +72,87 @@
     />
 
     <!-- 新增弹窗 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" v-model="open" width="1000px" append-to-body :close-on-click-modal="false">
       <el-form ref="roleRef" :model="form" :rules="rules" label-width="120px" :disabled="multiple">
         <el-row :gutter="20">
-          <el-col :span="20">
+          <el-col :span="12">
             <el-form-item label="巡查任务名称:" prop="taskName">
               <el-input v-model="form.taskName" placeholder="请输入巡查任务名称" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="整改方式:" prop="method">
+              <el-input v-model="form.method" placeholder="请输入整改方式" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="20">
-            <el-form-item label="巡查项目:" prop="projectCodeList">
-              <el-select v-model="form.projectCodeList" multiple placeholder="请选择巡查项目" clearable style="width: 100%">
+          <el-col :span="12">
+            <el-form-item label="督办事项:" prop="warning">
+              <el-input v-model="form.warning" type="textarea" placeholder="请输入督办事项" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="存在问题:" prop="problem">
+              <el-input v-model="form.problem" type="textarea" placeholder="请输入存在问题" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="建设单位:" prop="projectCodeList">
+              <el-select v-model="form.projectCodeList" multiple placeholder="请选择建设单位" clearable style="width: 100%">
                 <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="20">
-            <el-form-item label="巡查类型:" prop="patrolType">
-              <el-select v-model="form.patrolType" placeholder="请选择巡查类型" clearable style="width: 100%">
-                <el-option v-for="item in patrol_type" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
+          <el-col :span="12">
+            <el-form-item label="整改时限:" prop="timeRange">
+              <el-date-picker v-model="form.timeRange" multiple placeholder="请选择整改时限" clearable style="width: 100%">
+              </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="20">
-            <el-form-item label="计划日期" prop="publishTime1">
-              <el-date-picker
-                style="width: 380px"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
-                v-model="AllData.publishTime1"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-              />
+          <el-col :span="12">
+            <el-form-item label="责任领导:" prop="administrant">
+              <el-input v-model="form.administrant" placeholder="请输入责任领导" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电话:" prop="administrantPho">
+              <el-input v-model="form.administrantPho" placeholder="请输入责任领导电话" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </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-col :span="12">
+            <el-form-item label="责任人:" prop="administrant">
+              <el-input v-model="form.administrant" placeholder="请输入责任人" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电话:" prop="administrantPho">
+              <el-input v-model="form.administrantPho" placeholder="请输入责任人电话" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="整改书:" prop="reportList">
+              <ImageFileUpload
+                :limit="1"
+                :saveFileArr="form.reportList"
+                :listType="'text'"
+                :refField="'trfield'"
+                :refType="'tr_site_info'"
+                :fileType="['jpg', 'png', 'jpeg', 'pdf']"
+              ></ImageFileUpload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注:" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" type="textarea" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -144,6 +183,7 @@
 import { getProjectInfoList } from '@/api/preassess/targetManage';
 import { listUser } from '@/api/system/user';
 import anjianPopup from '../longoPeration/Patrolmanagement/anjianPopup.vue'; //详情弹框
+import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 const { proxy } = getCurrentInstance();
 const { patrol_type } = proxy.useDict('patrol_type'); //  巡查类型的字典
 const open = ref(false);
@@ -219,7 +259,6 @@
 function projectTypeListMPage() {
   patrolBasicInfopage().then(res => {
     BasicInfopage.value = res.data;
-    // console.log(BasicInfopage.value, 'res.data');
   });
 }
 
@@ -229,9 +268,9 @@
   getList1(val.fatherCode);
 }
 
-// 新增
-function handleAdd() {
-  title.value = '新增巡查任务';
+// 发布整改通知
+function handlenotice() {
+  title.value = '发布整改通知';
   open.value = true;
   form.value = {};
   multiple.value = false;
diff --git a/src/views/longoPeration/Patrolmanagement/CaseIssuesPopup.vue b/src/views/longoPeration/Patrolmanagement/CaseIssuesPopup.vue
new file mode 100644
index 0000000..de40266
--- /dev/null
+++ b/src/views/longoPeration/Patrolmanagement/CaseIssuesPopup.vue
@@ -0,0 +1,4 @@
+<template>
+  <div>123</div>
+</template>
+<script setup name="CaseIssuesPopup"></script>
diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
index 79636fc..29261a7 100644
--- a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
+++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
@@ -1,5 +1,8 @@
 <template>
   <div class="first">
+    <div class="ditu">
+      <gisMap2D style="position: relative" :initJson="`/static/libs/mapbox/style/projectIndex.json`" @map-click="clickMap"></gisMap2D>
+    </div>
     <!-- 类容 -->
     <div class="dialog-form-detail flex flex-r flex-wrap" style="margin-top: 5px">
       <div class="flex flex-r">
@@ -20,36 +23,7 @@
         <div class="detail-label flex flex-align-center">任务结束时间</div>
         <div class="detail-value flex flex-align-center">{{ props.DataList.planEndDatetime }}</div>
       </div>
-      <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">任务状态</div>
-        <div class="detail-value flex flex-align-center">
-          <span>
-            {{
-              props.DataList.status == 'to_start'
-                ? '未开始'
-                : props.DataList.status == 'proceed'
-                ? '进行中'
-                : props.DataList.status == 'done'
-                ? '已完成'
-                : props.DataList.status == 'expired'
-                ? '超时'
-                : ''
-            }}
-          </span>
-        </div>
-      </div>
-      <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">超时时间</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.expiredDays }}</div>
-      </div>
-      <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">任务下发时间</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.issuedDatetime }}</div>
-      </div>
-      <div class="flex flex-r">
-        <div class="detail-label flex flex-align-center">巡查任务描述</div>
-        <div class="detail-value flex flex-align-center">{{ props.DataList.taskDescribe }}</div>
-      </div>
+
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查位置</div>
         <div class="detail-value flex flex-align-center">{{ props.DataList.projectLocationName }}</div>
@@ -60,26 +34,17 @@
           {{ props.DataList.projectList[0].projectAbbreviation }}
         </div>
       </div>
-    </div>
-    <!-- 巡查照片 -->
-    <!-- <div>
-      <p style="color: aliceblue">巡查照片</p>
-      <div v-if="dataListPhone.length">
-        <el-image style="width: 150px; height: 60px; margin: 5px" v-for="i in dataListPhone" :src="i.url" :preview-src-list="[i.url]">
-        </el-image>
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">巡查任务描述</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.taskDescribe }}</div>
       </div>
-      <el-empty v-else description="暂无图片" :image-size="30" />
-    </div> -->
+    </div>
 
     <el-table :data="dataList" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px">
       <el-table-column type="index" width="55" label="序号" />
-      <el-table-column label="问题类型" prop="problemType">
-        <!-- <template #default="scope">
-          <dict-tag :options="problem_type" :value="String(scope.row.problemType)" />
-        </template> -->
-      </el-table-column>
-      <el-table-column label="检查项" prop="checkItem" />
-      <el-table-column label="是否整改" prop="isRectification">
+      <el-table-column label="存在问题" prop="problemType"> </el-table-column>
+      <el-table-column label="督办事项" prop="checkItem" />
+      <el-table-column label="整改状态" prop="isRectification">
         <template #default="scope">
           <span>
             {{
@@ -94,32 +59,37 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="问题描述" prop="problemContent" />
-      <el-table-column label="上报时间" prop="createTime" />
-      <el-table-column label="巡查照片" prop="sysFileList">
-        <template #default="scope">
-          <el-image
-            style="width: 60px; height: 60px; margin: 5px"
-            v-for="i in scope.row.sysFileList"
-            :src="i.url"
-            :preview-src-list="[i.url]"
-          >
-          </el-image>
-          <span v-if="scope.row.sysFileList.length == ''">暂无照片</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="整改通知单" prop="problemContent" />
+      <el-table-column label="整改回复单" prop="createTime" />
+      <el-table-column label="整改时限" prop="problemContent" />
+      <el-table-column label="整改方式" prop="createTime" />
+      <el-table-column label="责任人及电话" prop="problemContent" />
+      <el-table-column label="创建时间" prop="createTime" />
     </el-table>
   </div>
 </template>
 
 <script setup>
 import { patrolProblempage } from '@/api/longoPeration/inspectiontasks';
+import gisMap2D from '@/views/gisMapPage/gisMapBox1.vue';
+import CoordTransform from '@/utils/gis/CoorTransform.js';
+import point_start from '@/assets/newImgs/point_start.png';
+import point_end from '@/assets/newImgs/point_end.png';
+import user from '@/assets/newImgs/user_1.png';
 const props = defineProps({
   // 数据
   DataList: {
     type: Array,
     default: null,
   },
+  pathData: {
+    type: Array,
+    default: null,
+  },
+  pathGeometry: {
+    type: String,
+    default: '',
+  },
 });
 const { proxy } = getCurrentInstance();
 const { problem_type } = proxy.useDict('problem_type'); //  巡查类型的字典
@@ -133,7 +103,44 @@
     dataListPhone.value = element.sysFileList;
   });
 };
-
+//添加轨迹线
+const addRecordLine = (geojson, layerId) => {
+  newfiberMapbox.map.addSource(layerId, {
+    type: 'geojson',
+    data: geojson,
+  });
+  newfiberMapbox.map.addLayer({
+    id: layerId,
+    type: 'line',
+    source: layerId,
+    paint: {
+      'line-color': 'rgba(35, 217, 110,1)',
+      'line-width': 3,
+    },
+  });
+};
+//添加轨迹起止点
+const addStartAndEnd = (geojson, layerId, Icon) => {
+  newfiberMapbox.map.loadImage(Icon, (error, image) => {
+    if (error) throw error;
+    newfiberMapbox.map.addImage(layerId + '_icon', image);
+  });
+  newfiberMapbox.map.addSource(layerId, {
+    type: 'geojson',
+    data: geojson,
+  });
+  newfiberMapbox.map.addLayer({
+    id: layerId,
+    type: 'symbol',
+    source: layerId,
+    layout: {
+      'icon-image': layerId + '_icon',
+      'icon-size': 0.2,
+      'icon-offset': [0, 0],
+      'icon-allow-overlap': true,
+    },
+  });
+};
 watch(
   () => props.DataList,
   val => {
@@ -144,10 +151,82 @@
   },
   { deep: true, immediate: true }
 );
+watch(
+  () => props.pathGeometry,
+  val => {
+    if (val) {
+      if (newfiberMapbox.map.getLayer('recordLineGeojson')) {
+        newfiberMapbox.map.removeLayer('recordLineGeojson');
+        newfiberMapbox.map.removeSource('recordLineGeojson');
+      }
+      if (val === '') return;
+
+      //轨迹线
+      let recordLineGeojson = {
+        type: 'FeatureCollection',
+        features: [
+          {
+            type: 'Feature',
+            geometry: Terraformer.WKT.parse(val),
+          },
+        ],
+      };
+      console.log('recordLineGeojson--', recordLineGeojson);
+      gcoord.transform(recordLineGeojson.features[0], gcoord.GCJ02, gcoord.WGS84);
+      setTimeout(() => {
+        addRecordLine(recordLineGeojson, 'recordLineGeojson');
+        gcoord.transform(recordLineGeojson.features[0], gcoord.WGS84, gcoord.GCJ02);
+      }, 2000);
+    }
+  }
+);
+watch(
+  () => props.pathData,
+  val => {
+    if (val) {
+      console.log('val-----', val);
+      if (newfiberMapbox.map.getLayer('point_start')) {
+        newfiberMapbox.map.removeLayer('point_start');
+        newfiberMapbox.map.removeLayer('point_end');
+        newfiberMapbox.map.removeSource('point_start');
+        newfiberMapbox.map.removeSource('point_end');
+        newfiberMapbox.map.removeImage('point_start_icon');
+        newfiberMapbox.map.removeImage('point_end_icon');
+      }
+      if (!val.length) return;
+
+      //起止点
+      let start_84 = CoordTransform.gcj02towgs84(Number(val[0].lng), Number(val[0].lat));
+      let end_84 = CoordTransform.gcj02towgs84(Number(val[val.length - 1].lng), Number(val[val.length - 1].lat));
+      let startPointGeojson = {
+        type: 'FeatureCollection',
+        features: [turf.point(start_84)],
+      };
+      let endPointGeojson = {
+        type: 'FeatureCollection',
+        features: [turf.point(end_84)],
+      };
+      setTimeout(() => {
+        addStartAndEnd(startPointGeojson, 'point_start', point_start);
+        addStartAndEnd(endPointGeojson, 'point_end', point_end);
+        newfiberMapbox.map.setPitch(0);
+        newfiberMapbox.map.easeTo({
+          center: start_84,
+          zoom: 15,
+        });
+      }, 2000);
+    }
+  },
+  { deep: true, immediate: true }
+);
 onMounted(() => {});
 </script>
 
 <style scoped lang="scss">
 .first {
+  .ditu {
+    width: 100%;
+    height: 200px;
+  }
 }
 </style>
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index 5b7e5ee..e46d048 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -56,6 +56,11 @@
               <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
             </template>
           </el-table-column>
+          <el-table-column label="巡查进度">
+            <template #default="scope">
+              <p>{{ scope.row.doneTasknumber }}/{{ scope.row.allTasknumber }}</p>
+            </template>
+          </el-table-column>
           <el-table-column label="任务开始时间" prop="planStartDatetime" />
           <el-table-column label="任务结束时间" prop="planEndDatetime" />
           <el-table-column label="任务状态" prop="status">
@@ -126,7 +131,7 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column label="超时时间" prop="expiredDays" />
+          <!-- <el-table-column label="超时时间" prop="expiredDays" /> -->
           <el-table-column label="任务下发时间" prop="issuedDatetime" />
           <el-table-column label="操作" width="240">
             <template #default="scope">
@@ -330,8 +335,8 @@
 
 //表格点击事件
 function clickLogData(val) {
-  val.fatherCode = val.number;
-  getList1(val.fatherCode);
+  queryParamstwo.value.fatherCode = val.number;
+  getList1();
 }
 
 // 新增
@@ -378,7 +383,7 @@
 /** 查询列表 */
 const getList1 = async code => {
   loadingTwo.value = true;
-  let res = await patrolTaskpage({ ...queryParamstwo.value, fatherCode: code });
+  let res = await patrolTaskpage(queryParamstwo.value);
   dataListTwo.value = res.data;
   totaltwo.value = res.total;
   loadingTwo.value = false;
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index 1b82b3e..3ade0c0 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -85,15 +85,7 @@
       <el-table-column label="是否整改" prop="isRectification">
         <template #default="scope">
           <span>
-            {{
-              scope.row.isRectification == '1'
-                ? '无需整改'
-                : scope.row.isRectification == '2'
-                ? '待整改'
-                : scope.row.isRectification == '3'
-                ? '整改已完成'
-                : ''
-            }}
+            {{ scope.row.isRectification == '1' ? '无需整改' : scope.row.isRectification == '2' ? '需要整改' : '' }}
           </span>
         </template>
       </el-table-column>
diff --git a/vite.config.js b/vite.config.js
index 06b69fe..b8e41b6 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -7,8 +7,8 @@
 const Timestamp = new Date().getTime(); //随机时间戳
 
 // const targetUrl = 'http://192.168.20.49:7200'; //谢斌斌
-// const targetUrl = 'http://192.168.20.52:7300'; //杨辉
-const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上
+const targetUrl = 'http://192.168.20.52:7300'; //杨辉
+// const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode, command }) => {