diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js
index 372ebb6..e837d13 100644
--- a/src/api/longoPeration/inspectiontasks.js
+++ b/src/api/longoPeration/inspectiontasks.js
@@ -25,19 +25,10 @@
   });
 }
 
-// // 修改排水防涝--市主干道积水点信息
-// export function waterloggedRoadedit(data) {
-//   return request({
-//     url: '/business/waterloggedRoad/edit',
-//     method: 'put',
-//     data: data,
-//   });
-// }
-
-// // 删除排水防涝--防汛物资
-// export function waterloggedRoaddelete(id) {
-//   return request({
-//     url: '/business/waterloggedRoad/' + id,
-//     method: 'delete',
-//   });
-// }
+export function patrolProblempage(query) {
+  return request({
+    url: '/business/patrolProblem/page',
+    method: 'get',
+    params: query,
+  });
+}

diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js
index 372ebb6..e837d13 100644
--- a/src/api/longoPeration/inspectiontasks.js
+++ b/src/api/longoPeration/inspectiontasks.js
@@ -25,19 +25,10 @@
   });
 }
 
-// // 修改排水防涝--市主干道积水点信息
-// export function waterloggedRoadedit(data) {
-//   return request({
-//     url: '/business/waterloggedRoad/edit',
-//     method: 'put',
-//     data: data,
-//   });
-// }
-
-// // 删除排水防涝--防汛物资
-// export function waterloggedRoaddelete(id) {
-//   return request({
-//     url: '/business/waterloggedRoad/' + id,
-//     method: 'delete',
-//   });
-// }
+export function patrolProblempage(query) {
+  return request({
+    url: '/business/patrolProblem/page',
+    method: 'get',
+    params: query,
+  });
+}
diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index d59f2b7..271ac3e 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -16,6 +16,7 @@
 import '@wangeditor/editor/dist/css/style.css'; // 引入 css
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
 import { sysUpload } from '@/api/login.js';
+import bus from '@/utils/mitt';
 
 const props = defineProps({
   modelValue: [String],
@@ -93,7 +94,12 @@
   { immediate: true, deep: true }
 );
 // 模拟 ajax 异步获取内容
-onMounted(() => {});
+onMounted(() => {
+  bus.on('changeEdit', i => {
+    if (!i) editorRef.value.disable();
+    else editorRef.value.enable();
+  });
+});
 // 组件销毁时，也及时销毁编辑器
 onBeforeUnmount(() => {
   const editor = editorRef.value;

diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js
index 372ebb6..e837d13 100644
--- a/src/api/longoPeration/inspectiontasks.js
+++ b/src/api/longoPeration/inspectiontasks.js
@@ -25,19 +25,10 @@
   });
 }
 
-// // 修改排水防涝--市主干道积水点信息
-// export function waterloggedRoadedit(data) {
-//   return request({
-//     url: '/business/waterloggedRoad/edit',
-//     method: 'put',
-//     data: data,
-//   });
-// }
-
-// // 删除排水防涝--防汛物资
-// export function waterloggedRoaddelete(id) {
-//   return request({
-//     url: '/business/waterloggedRoad/' + id,
-//     method: 'delete',
-//   });
-// }
+export function patrolProblempage(query) {
+  return request({
+    url: '/business/patrolProblem/page',
+    method: 'get',
+    params: query,
+  });
+}
diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index d59f2b7..271ac3e 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -16,6 +16,7 @@
 import '@wangeditor/editor/dist/css/style.css'; // 引入 css
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
 import { sysUpload } from '@/api/login.js';
+import bus from '@/utils/mitt';
 
 const props = defineProps({
   modelValue: [String],
@@ -93,7 +94,12 @@
   { immediate: true, deep: true }
 );
 // 模拟 ajax 异步获取内容
-onMounted(() => {});
+onMounted(() => {
+  bus.on('changeEdit', i => {
+    if (!i) editorRef.value.disable();
+    else editorRef.value.enable();
+  });
+});
 // 组件销毁时，也及时销毁编辑器
 onBeforeUnmount(() => {
   const editor = editorRef.value;
diff --git a/src/views/login.vue b/src/views/login.vue
index 9ce6025..c709514 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -275,7 +275,7 @@
           background: url('@/assets/images/login/inputUser2.png') no-repeat;
           background-size: 100% 100%;
           position: relative;
-          left: 3px;
+          left: 0px;
           top: -2px;
         }
         .pass {
@@ -284,7 +284,7 @@
           background: url('@/assets/images/login/inputPass1.png') no-repeat;
           background-size: 100% 100%;
           position: relative;
-          left: 3px;
+          left: 0px;
           top: -2px;
         }
       }

diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js
index 372ebb6..e837d13 100644
--- a/src/api/longoPeration/inspectiontasks.js
+++ b/src/api/longoPeration/inspectiontasks.js
@@ -25,19 +25,10 @@
   });
 }
 
-// // 修改排水防涝--市主干道积水点信息
-// export function waterloggedRoadedit(data) {
-//   return request({
-//     url: '/business/waterloggedRoad/edit',
-//     method: 'put',
-//     data: data,
-//   });
-// }
-
-// // 删除排水防涝--防汛物资
-// export function waterloggedRoaddelete(id) {
-//   return request({
-//     url: '/business/waterloggedRoad/' + id,
-//     method: 'delete',
-//   });
-// }
+export function patrolProblempage(query) {
+  return request({
+    url: '/business/patrolProblem/page',
+    method: 'get',
+    params: query,
+  });
+}
diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index d59f2b7..271ac3e 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -16,6 +16,7 @@
 import '@wangeditor/editor/dist/css/style.css'; // 引入 css
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
 import { sysUpload } from '@/api/login.js';
+import bus from '@/utils/mitt';
 
 const props = defineProps({
   modelValue: [String],
@@ -93,7 +94,12 @@
   { immediate: true, deep: true }
 );
 // 模拟 ajax 异步获取内容
-onMounted(() => {});
+onMounted(() => {
+  bus.on('changeEdit', i => {
+    if (!i) editorRef.value.disable();
+    else editorRef.value.enable();
+  });
+});
 // 组件销毁时，也及时销毁编辑器
 onBeforeUnmount(() => {
   const editor = editorRef.value;
diff --git a/src/views/login.vue b/src/views/login.vue
index 9ce6025..c709514 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -275,7 +275,7 @@
           background: url('@/assets/images/login/inputUser2.png') no-repeat;
           background-size: 100% 100%;
           position: relative;
-          left: 3px;
+          left: 0px;
           top: -2px;
         }
         .pass {
@@ -284,7 +284,7 @@
           background: url('@/assets/images/login/inputPass1.png') no-repeat;
           background-size: 100% 100%;
           position: relative;
-          left: 3px;
+          left: 0px;
           top: -2px;
         }
       }
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index 6a78290..dbd882b 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -2,7 +2,7 @@
   <!-- 日常巡查任务管理 -->
   <div class="publicContainer">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="任务名称11:" prop="taskName">
+      <el-form-item label="任务名称:" prop="taskName">
         <el-input v-model="queryParams.taskName" placeholder="请输入任务名称" clearable style="width: 180px" />
       </el-form-item>
       <el-form-item label="巡查人员:" prop="taskUserIdList">
@@ -10,10 +10,11 @@
           <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
         </el-select>
       </el-form-item>
-      <el-form-item label="任务日期" prop="reportTime">
+      <el-form-item label="任务日期" prop="publishTime">
         <el-date-picker
           style="width: 380px"
           format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           v-model="AllData.publishTime"
           type="daterange"
           range-separator="至"
@@ -34,9 +35,10 @@
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
+    <!--  -->
     <div class="whole">
       <div class="MainTask">
-        <el-table :data="dataList" v-loading="loading" stripe :max-height="295" @row-click="clickLogData">
+        <el-table :data="dataList" v-loading="loading" stripe :max-height="280" @row-click="clickLogData">
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -54,8 +56,8 @@
               <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
             </template>
           </el-table-column>
-          <el-table-column label="任务开始时间" prop="taskPlanStartDateFrom" />
-          <el-table-column label="任务结束时间" prop="taskPlanStartDateTo" />
+          <el-table-column label="任务开始时间" prop="planStartDatetime" />
+          <el-table-column label="任务结束时间" prop="planEndDatetime" />
           <el-table-column label="任务状态" prop="status">
             <template #default="scope">
               <span>
@@ -86,8 +88,8 @@
         />
       </div>
       <div class="SingleTask">
-        任务详情
-        <el-table :data="dataListTwo" v-loading="loadingTwo" stripe :max-height="295">
+        <div>任务详情</div>
+        <el-table :data="dataListTwo" v-loading="loadingTwo" stripe :max-height="280">
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -105,8 +107,8 @@
               <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
             </template>
           </el-table-column>
-          <el-table-column label="任务开始时间" prop="taskPlanStartDateFrom" />
-          <el-table-column label="任务结束时间" prop="taskPlanStartDateTo" />
+          <el-table-column label="任务开始时间" prop="planStartDatetime" />
+          <el-table-column label="任务结束时间" prop="planEndDatetime" />
           <el-table-column label="任务状态" prop="status">
             <template #default="scope">
               <span>
@@ -183,11 +185,12 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="20">
-            <el-form-item label="计划日期" prop="reportTime1">
+            <el-form-item label="计划日期" prop="publishTime1">
               <el-date-picker
                 style="width: 380px"
                 format="YYYY-MM-DD"
-                v-model="form.reportTime1"
+                value-format="YYYY-MM-DD"
+                v-model="AllData.publishTime1"
                 type="daterange"
                 range-separator="至"
                 start-placeholder="开始时间"
@@ -247,7 +250,8 @@
 const dataListTwo = ref([]);
 const DataList = ref([]);
 const AllData = reactive({
-  publishTime: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD ')],
+  publishTime: [],
+  publishTime1: [],
   form: {},
   queryParams: {
     pageNum: 1,
@@ -277,7 +281,7 @@
 }
 //重置
 function resetQuery() {
-  AllData.publishTime = [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD 23:59:59')];
+  AllData.publishTime = [];
   proxy.resetForm('queryRef');
   handleQuery();
 }
@@ -325,13 +329,19 @@
 
 //查看详情操作
 function handleDetail(row) {
-  DataList.value = row;
   opendetails.value = true;
+  DataList.value = { ...row };
+  // console.log(DataList.value, 'DataList.value');
 }
 
 /** 主任务查询列表 */
 const getList = async () => {
   loading.value = true;
+  console.log(AllData.publishTime, 'AllData.publishTime');
+  if (AllData.publishTime) {
+    queryParams.value.planStartDatetime = AllData.publishTime[0];
+    queryParams.value.planEndDatetime = AllData.publishTime[1];
+  }
   let res = await patrolTaskpage(queryParams.value);
   dataList.value = res.data;
   total.value = res.total;
@@ -351,6 +361,8 @@
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
     if (valid) {
+      form.value.planStartDatetime = AllData.publishTime1[0];
+      form.value.planEndDatetime = AllData.publishTime1[1];
       form.value.basicInfoId = '1686274734091489284';
       patrolTaskadd(form.value).then(response => {
         proxy.$modal.msgSuccess('新增成功');

diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js
index 372ebb6..e837d13 100644
--- a/src/api/longoPeration/inspectiontasks.js
+++ b/src/api/longoPeration/inspectiontasks.js
@@ -25,19 +25,10 @@
   });
 }
 
-// // 修改排水防涝--市主干道积水点信息
-// export function waterloggedRoadedit(data) {
-//   return request({
-//     url: '/business/waterloggedRoad/edit',
-//     method: 'put',
-//     data: data,
-//   });
-// }
-
-// // 删除排水防涝--防汛物资
-// export function waterloggedRoaddelete(id) {
-//   return request({
-//     url: '/business/waterloggedRoad/' + id,
-//     method: 'delete',
-//   });
-// }
+export function patrolProblempage(query) {
+  return request({
+    url: '/business/patrolProblem/page',
+    method: 'get',
+    params: query,
+  });
+}
diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index d59f2b7..271ac3e 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -16,6 +16,7 @@
 import '@wangeditor/editor/dist/css/style.css'; // 引入 css
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
 import { sysUpload } from '@/api/login.js';
+import bus from '@/utils/mitt';
 
 const props = defineProps({
   modelValue: [String],
@@ -93,7 +94,12 @@
   { immediate: true, deep: true }
 );
 // 模拟 ajax 异步获取内容
-onMounted(() => {});
+onMounted(() => {
+  bus.on('changeEdit', i => {
+    if (!i) editorRef.value.disable();
+    else editorRef.value.enable();
+  });
+});
 // 组件销毁时，也及时销毁编辑器
 onBeforeUnmount(() => {
   const editor = editorRef.value;
diff --git a/src/views/login.vue b/src/views/login.vue
index 9ce6025..c709514 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -275,7 +275,7 @@
           background: url('@/assets/images/login/inputUser2.png') no-repeat;
           background-size: 100% 100%;
           position: relative;
-          left: 3px;
+          left: 0px;
           top: -2px;
         }
         .pass {
@@ -284,7 +284,7 @@
           background: url('@/assets/images/login/inputPass1.png') no-repeat;
           background-size: 100% 100%;
           position: relative;
-          left: 3px;
+          left: 0px;
           top: -2px;
         }
       }
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index 6a78290..dbd882b 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -2,7 +2,7 @@
   <!-- 日常巡查任务管理 -->
   <div class="publicContainer">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="任务名称11:" prop="taskName">
+      <el-form-item label="任务名称:" prop="taskName">
         <el-input v-model="queryParams.taskName" placeholder="请输入任务名称" clearable style="width: 180px" />
       </el-form-item>
       <el-form-item label="巡查人员:" prop="taskUserIdList">
@@ -10,10 +10,11 @@
           <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
         </el-select>
       </el-form-item>
-      <el-form-item label="任务日期" prop="reportTime">
+      <el-form-item label="任务日期" prop="publishTime">
         <el-date-picker
           style="width: 380px"
           format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           v-model="AllData.publishTime"
           type="daterange"
           range-separator="至"
@@ -34,9 +35,10 @@
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
+    <!--  -->
     <div class="whole">
       <div class="MainTask">
-        <el-table :data="dataList" v-loading="loading" stripe :max-height="295" @row-click="clickLogData">
+        <el-table :data="dataList" v-loading="loading" stripe :max-height="280" @row-click="clickLogData">
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -54,8 +56,8 @@
               <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
             </template>
           </el-table-column>
-          <el-table-column label="任务开始时间" prop="taskPlanStartDateFrom" />
-          <el-table-column label="任务结束时间" prop="taskPlanStartDateTo" />
+          <el-table-column label="任务开始时间" prop="planStartDatetime" />
+          <el-table-column label="任务结束时间" prop="planEndDatetime" />
           <el-table-column label="任务状态" prop="status">
             <template #default="scope">
               <span>
@@ -86,8 +88,8 @@
         />
       </div>
       <div class="SingleTask">
-        任务详情
-        <el-table :data="dataListTwo" v-loading="loadingTwo" stripe :max-height="295">
+        <div>任务详情</div>
+        <el-table :data="dataListTwo" v-loading="loadingTwo" stripe :max-height="280">
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -105,8 +107,8 @@
               <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
             </template>
           </el-table-column>
-          <el-table-column label="任务开始时间" prop="taskPlanStartDateFrom" />
-          <el-table-column label="任务结束时间" prop="taskPlanStartDateTo" />
+          <el-table-column label="任务开始时间" prop="planStartDatetime" />
+          <el-table-column label="任务结束时间" prop="planEndDatetime" />
           <el-table-column label="任务状态" prop="status">
             <template #default="scope">
               <span>
@@ -183,11 +185,12 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="20">
-            <el-form-item label="计划日期" prop="reportTime1">
+            <el-form-item label="计划日期" prop="publishTime1">
               <el-date-picker
                 style="width: 380px"
                 format="YYYY-MM-DD"
-                v-model="form.reportTime1"
+                value-format="YYYY-MM-DD"
+                v-model="AllData.publishTime1"
                 type="daterange"
                 range-separator="至"
                 start-placeholder="开始时间"
@@ -247,7 +250,8 @@
 const dataListTwo = ref([]);
 const DataList = ref([]);
 const AllData = reactive({
-  publishTime: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD ')],
+  publishTime: [],
+  publishTime1: [],
   form: {},
   queryParams: {
     pageNum: 1,
@@ -277,7 +281,7 @@
 }
 //重置
 function resetQuery() {
-  AllData.publishTime = [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD 23:59:59')];
+  AllData.publishTime = [];
   proxy.resetForm('queryRef');
   handleQuery();
 }
@@ -325,13 +329,19 @@
 
 //查看详情操作
 function handleDetail(row) {
-  DataList.value = row;
   opendetails.value = true;
+  DataList.value = { ...row };
+  // console.log(DataList.value, 'DataList.value');
 }
 
 /** 主任务查询列表 */
 const getList = async () => {
   loading.value = true;
+  console.log(AllData.publishTime, 'AllData.publishTime');
+  if (AllData.publishTime) {
+    queryParams.value.planStartDatetime = AllData.publishTime[0];
+    queryParams.value.planEndDatetime = AllData.publishTime[1];
+  }
   let res = await patrolTaskpage(queryParams.value);
   dataList.value = res.data;
   total.value = res.total;
@@ -351,6 +361,8 @@
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
     if (valid) {
+      form.value.planStartDatetime = AllData.publishTime1[0];
+      form.value.planEndDatetime = AllData.publishTime1[1];
       form.value.basicInfoId = '1686274734091489284';
       patrolTaskadd(form.value).then(response => {
         proxy.$modal.msgSuccess('新增成功');
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index 8c9a132..7b4d09d 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -15,31 +15,45 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">任务开始时间</div>
-        <div class="detail-value flex flex-align-center">123</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.planStartDatetime }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">任务结束时间</div>
-        <div class="detail-value flex flex-align-center">123</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">123</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">123</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">123</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">123</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">123</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.projectLocationName }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查项目</div>
@@ -49,23 +63,58 @@
       </div>
     </div>
     <!-- 巡查照片 -->
-    <div>
-      <p>巡查照片</p>
-      <div>123</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>
+      <el-empty v-else description="暂无图片" :image-size="30" />
+    </div> -->
 
-    <el-table :data="dataListTwo" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px">
+    <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="taskName" />
-      <el-table-column label="检查项" prop="taskName" />
-      <el-table-column label="是否整改" prop="taskName" />
-      <el-table-column label="是否整改" prop="taskName" />
-      <el-table-column label="上报时间" prop="taskName" />
+      <el-table-column label="问题类型" prop="problemType">
+        <!-- <template #default="scope">
+          <dict-tag :options="problem_type" :value="String(scope.row.problemType)" />
+        </template> -->
+      </el-table-column>
+      <el-table-column label="检查项" prop="checkItem" />
+      <el-table-column label="是否整改" prop="isRectification">
+        <template #default="scope">
+          <span>
+            {{
+              scope.row.isRectification == '1'
+                ? '无需整改'
+                : scope.row.isRectification == '2'
+                ? '待整改'
+                : scope.row.isRectification == '3'
+                ? '整改已完成'
+                : ''
+            }}
+          </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>
   </div>
 </template>
 
 <script setup>
+import { patrolProblempage } from '@/api/longoPeration/inspectiontasks';
 const props = defineProps({
   // 数据
   DataList: {
@@ -73,9 +122,30 @@
     default: null,
   },
 });
-onMounted(() => {
-  console.log(props.DataList, 'props');
-});
+const { proxy } = getCurrentInstance();
+const { problem_type } = proxy.useDict('problem_type'); //  巡查类型的字典
+const dataList = ref([]);
+const dataListPhone = ref([]);
+/** 查询列表 */
+const getList = async IdA => {
+  let res = await patrolProblempage({ patrolTaskId: IdA });
+  dataList.value = res.data;
+  res.data.forEach(element => {
+    dataListPhone.value = element.sysFileList;
+  });
+};
+
+watch(
+  () => props.DataList,
+  val => {
+    if (val) {
+      dataListPhone.value = [];
+      getList(props.DataList.id);
+    }
+  },
+  { deep: true, immediate: true }
+);
+onMounted(() => {});
 </script>
 
 <style scoped lang="scss">

diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js
index 372ebb6..e837d13 100644
--- a/src/api/longoPeration/inspectiontasks.js
+++ b/src/api/longoPeration/inspectiontasks.js
@@ -25,19 +25,10 @@
   });
 }
 
-// // 修改排水防涝--市主干道积水点信息
-// export function waterloggedRoadedit(data) {
-//   return request({
-//     url: '/business/waterloggedRoad/edit',
-//     method: 'put',
-//     data: data,
-//   });
-// }
-
-// // 删除排水防涝--防汛物资
-// export function waterloggedRoaddelete(id) {
-//   return request({
-//     url: '/business/waterloggedRoad/' + id,
-//     method: 'delete',
-//   });
-// }
+export function patrolProblempage(query) {
+  return request({
+    url: '/business/patrolProblem/page',
+    method: 'get',
+    params: query,
+  });
+}
diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index d59f2b7..271ac3e 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -16,6 +16,7 @@
 import '@wangeditor/editor/dist/css/style.css'; // 引入 css
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
 import { sysUpload } from '@/api/login.js';
+import bus from '@/utils/mitt';
 
 const props = defineProps({
   modelValue: [String],
@@ -93,7 +94,12 @@
   { immediate: true, deep: true }
 );
 // 模拟 ajax 异步获取内容
-onMounted(() => {});
+onMounted(() => {
+  bus.on('changeEdit', i => {
+    if (!i) editorRef.value.disable();
+    else editorRef.value.enable();
+  });
+});
 // 组件销毁时，也及时销毁编辑器
 onBeforeUnmount(() => {
   const editor = editorRef.value;
diff --git a/src/views/login.vue b/src/views/login.vue
index 9ce6025..c709514 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -275,7 +275,7 @@
           background: url('@/assets/images/login/inputUser2.png') no-repeat;
           background-size: 100% 100%;
           position: relative;
-          left: 3px;
+          left: 0px;
           top: -2px;
         }
         .pass {
@@ -284,7 +284,7 @@
           background: url('@/assets/images/login/inputPass1.png') no-repeat;
           background-size: 100% 100%;
           position: relative;
-          left: 3px;
+          left: 0px;
           top: -2px;
         }
       }
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index 6a78290..dbd882b 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -2,7 +2,7 @@
   <!-- 日常巡查任务管理 -->
   <div class="publicContainer">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="任务名称11:" prop="taskName">
+      <el-form-item label="任务名称:" prop="taskName">
         <el-input v-model="queryParams.taskName" placeholder="请输入任务名称" clearable style="width: 180px" />
       </el-form-item>
       <el-form-item label="巡查人员:" prop="taskUserIdList">
@@ -10,10 +10,11 @@
           <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
         </el-select>
       </el-form-item>
-      <el-form-item label="任务日期" prop="reportTime">
+      <el-form-item label="任务日期" prop="publishTime">
         <el-date-picker
           style="width: 380px"
           format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           v-model="AllData.publishTime"
           type="daterange"
           range-separator="至"
@@ -34,9 +35,10 @@
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
+    <!--  -->
     <div class="whole">
       <div class="MainTask">
-        <el-table :data="dataList" v-loading="loading" stripe :max-height="295" @row-click="clickLogData">
+        <el-table :data="dataList" v-loading="loading" stripe :max-height="280" @row-click="clickLogData">
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -54,8 +56,8 @@
               <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
             </template>
           </el-table-column>
-          <el-table-column label="任务开始时间" prop="taskPlanStartDateFrom" />
-          <el-table-column label="任务结束时间" prop="taskPlanStartDateTo" />
+          <el-table-column label="任务开始时间" prop="planStartDatetime" />
+          <el-table-column label="任务结束时间" prop="planEndDatetime" />
           <el-table-column label="任务状态" prop="status">
             <template #default="scope">
               <span>
@@ -86,8 +88,8 @@
         />
       </div>
       <div class="SingleTask">
-        任务详情
-        <el-table :data="dataListTwo" v-loading="loadingTwo" stripe :max-height="295">
+        <div>任务详情</div>
+        <el-table :data="dataListTwo" v-loading="loadingTwo" stripe :max-height="280">
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -105,8 +107,8 @@
               <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
             </template>
           </el-table-column>
-          <el-table-column label="任务开始时间" prop="taskPlanStartDateFrom" />
-          <el-table-column label="任务结束时间" prop="taskPlanStartDateTo" />
+          <el-table-column label="任务开始时间" prop="planStartDatetime" />
+          <el-table-column label="任务结束时间" prop="planEndDatetime" />
           <el-table-column label="任务状态" prop="status">
             <template #default="scope">
               <span>
@@ -183,11 +185,12 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="20">
-            <el-form-item label="计划日期" prop="reportTime1">
+            <el-form-item label="计划日期" prop="publishTime1">
               <el-date-picker
                 style="width: 380px"
                 format="YYYY-MM-DD"
-                v-model="form.reportTime1"
+                value-format="YYYY-MM-DD"
+                v-model="AllData.publishTime1"
                 type="daterange"
                 range-separator="至"
                 start-placeholder="开始时间"
@@ -247,7 +250,8 @@
 const dataListTwo = ref([]);
 const DataList = ref([]);
 const AllData = reactive({
-  publishTime: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD ')],
+  publishTime: [],
+  publishTime1: [],
   form: {},
   queryParams: {
     pageNum: 1,
@@ -277,7 +281,7 @@
 }
 //重置
 function resetQuery() {
-  AllData.publishTime = [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD 23:59:59')];
+  AllData.publishTime = [];
   proxy.resetForm('queryRef');
   handleQuery();
 }
@@ -325,13 +329,19 @@
 
 //查看详情操作
 function handleDetail(row) {
-  DataList.value = row;
   opendetails.value = true;
+  DataList.value = { ...row };
+  // console.log(DataList.value, 'DataList.value');
 }
 
 /** 主任务查询列表 */
 const getList = async () => {
   loading.value = true;
+  console.log(AllData.publishTime, 'AllData.publishTime');
+  if (AllData.publishTime) {
+    queryParams.value.planStartDatetime = AllData.publishTime[0];
+    queryParams.value.planEndDatetime = AllData.publishTime[1];
+  }
   let res = await patrolTaskpage(queryParams.value);
   dataList.value = res.data;
   total.value = res.total;
@@ -351,6 +361,8 @@
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
     if (valid) {
+      form.value.planStartDatetime = AllData.publishTime1[0];
+      form.value.planEndDatetime = AllData.publishTime1[1];
       form.value.basicInfoId = '1686274734091489284';
       patrolTaskadd(form.value).then(response => {
         proxy.$modal.msgSuccess('新增成功');
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index 8c9a132..7b4d09d 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -15,31 +15,45 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">任务开始时间</div>
-        <div class="detail-value flex flex-align-center">123</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.planStartDatetime }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">任务结束时间</div>
-        <div class="detail-value flex flex-align-center">123</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">123</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">123</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">123</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">123</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">123</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.projectLocationName }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查项目</div>
@@ -49,23 +63,58 @@
       </div>
     </div>
     <!-- 巡查照片 -->
-    <div>
-      <p>巡查照片</p>
-      <div>123</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>
+      <el-empty v-else description="暂无图片" :image-size="30" />
+    </div> -->
 
-    <el-table :data="dataListTwo" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px">
+    <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="taskName" />
-      <el-table-column label="检查项" prop="taskName" />
-      <el-table-column label="是否整改" prop="taskName" />
-      <el-table-column label="是否整改" prop="taskName" />
-      <el-table-column label="上报时间" prop="taskName" />
+      <el-table-column label="问题类型" prop="problemType">
+        <!-- <template #default="scope">
+          <dict-tag :options="problem_type" :value="String(scope.row.problemType)" />
+        </template> -->
+      </el-table-column>
+      <el-table-column label="检查项" prop="checkItem" />
+      <el-table-column label="是否整改" prop="isRectification">
+        <template #default="scope">
+          <span>
+            {{
+              scope.row.isRectification == '1'
+                ? '无需整改'
+                : scope.row.isRectification == '2'
+                ? '待整改'
+                : scope.row.isRectification == '3'
+                ? '整改已完成'
+                : ''
+            }}
+          </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>
   </div>
 </template>
 
 <script setup>
+import { patrolProblempage } from '@/api/longoPeration/inspectiontasks';
 const props = defineProps({
   // 数据
   DataList: {
@@ -73,9 +122,30 @@
     default: null,
   },
 });
-onMounted(() => {
-  console.log(props.DataList, 'props');
-});
+const { proxy } = getCurrentInstance();
+const { problem_type } = proxy.useDict('problem_type'); //  巡查类型的字典
+const dataList = ref([]);
+const dataListPhone = ref([]);
+/** 查询列表 */
+const getList = async IdA => {
+  let res = await patrolProblempage({ patrolTaskId: IdA });
+  dataList.value = res.data;
+  res.data.forEach(element => {
+    dataListPhone.value = element.sysFileList;
+  });
+};
+
+watch(
+  () => props.DataList,
+  val => {
+    if (val) {
+      dataListPhone.value = [];
+      getList(props.DataList.id);
+    }
+  },
+  { deep: true, immediate: true }
+);
+onMounted(() => {});
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/publicService/lawRule.vue b/src/views/publicService/lawRule.vue
index 4b32c4e..d2fe6d0 100644
--- a/src/views/publicService/lawRule.vue
+++ b/src/views/publicService/lawRule.vue
@@ -23,11 +23,11 @@
       <el-table-column label="序号" type="index" width="55" />
       <el-table-column label="日期" prop="publishTime" />
       <el-table-column label="政策法规名称" prop="title" />
-      <el-table-column label="政策法规内容" prop="content" width="500" show-overflow-tooltip>
+      <!-- <el-table-column label="政策法规内容" prop="content" width="500" show-overflow-tooltip>
         <template #default="scope">
           <div v-html="scope.row.content"></div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
@@ -39,12 +39,11 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="240" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row)">详情</el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -59,7 +58,7 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm">
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm" :disabled="isDisab">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="政策法规名称:" prop="title">
@@ -103,7 +102,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="info" @click="cancelForm">取 消</el-button>
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm" v-show="!isDisab">确 定</el-button>
         </div>
       </template>
     </el-dialog>
@@ -114,16 +113,15 @@
 import { articlePage, articleAdd, articleDel, articleDetail, articleEdit } from '@/api/publicService/index';
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 import WangEditor from '@/components/WangEditor/index.vue'; //富文本编辑器
-
+import bus from '@/utils/mitt';
 const { proxy } = getCurrentInstance();
-
+const isDisab = ref(false);
 const tableData = ref([]);
 const tableLoading = ref(true);
 const total = ref(0);
 const dialogShow = ref(false);
 const dialogTitle = ref('');
 const showSearch = ref(true);
-
 const allData = reactive({
   formData: {
     articleType: 'policies',
@@ -172,15 +170,30 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
+  isDisab.value = false;
   dialogTitle.value = '添加政策法规';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
   articleDetail(row.id).then(response => {
     dialogShow.value = true;
+    isDisab.value = false;
     dialogTitle.value = '修改政策法规';
     nextTick(() => {
       formData.value = response.data;
+      bus.emit('changeEdit', true);
+    });
+  });
+}
+//详情按钮
+function handleDetail(row) {
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    isDisab.value = true;
+    dialogTitle.value = '查看通知公告';
+    nextTick(() => {
+      formData.value = response.data;
+      bus.emit('changeEdit', false);
     });
   });
 }

diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js
index 372ebb6..e837d13 100644
--- a/src/api/longoPeration/inspectiontasks.js
+++ b/src/api/longoPeration/inspectiontasks.js
@@ -25,19 +25,10 @@
   });
 }
 
-// // 修改排水防涝--市主干道积水点信息
-// export function waterloggedRoadedit(data) {
-//   return request({
-//     url: '/business/waterloggedRoad/edit',
-//     method: 'put',
-//     data: data,
-//   });
-// }
-
-// // 删除排水防涝--防汛物资
-// export function waterloggedRoaddelete(id) {
-//   return request({
-//     url: '/business/waterloggedRoad/' + id,
-//     method: 'delete',
-//   });
-// }
+export function patrolProblempage(query) {
+  return request({
+    url: '/business/patrolProblem/page',
+    method: 'get',
+    params: query,
+  });
+}
diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index d59f2b7..271ac3e 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -16,6 +16,7 @@
 import '@wangeditor/editor/dist/css/style.css'; // 引入 css
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
 import { sysUpload } from '@/api/login.js';
+import bus from '@/utils/mitt';
 
 const props = defineProps({
   modelValue: [String],
@@ -93,7 +94,12 @@
   { immediate: true, deep: true }
 );
 // 模拟 ajax 异步获取内容
-onMounted(() => {});
+onMounted(() => {
+  bus.on('changeEdit', i => {
+    if (!i) editorRef.value.disable();
+    else editorRef.value.enable();
+  });
+});
 // 组件销毁时，也及时销毁编辑器
 onBeforeUnmount(() => {
   const editor = editorRef.value;
diff --git a/src/views/login.vue b/src/views/login.vue
index 9ce6025..c709514 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -275,7 +275,7 @@
           background: url('@/assets/images/login/inputUser2.png') no-repeat;
           background-size: 100% 100%;
           position: relative;
-          left: 3px;
+          left: 0px;
           top: -2px;
         }
         .pass {
@@ -284,7 +284,7 @@
           background: url('@/assets/images/login/inputPass1.png') no-repeat;
           background-size: 100% 100%;
           position: relative;
-          left: 3px;
+          left: 0px;
           top: -2px;
         }
       }
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index 6a78290..dbd882b 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -2,7 +2,7 @@
   <!-- 日常巡查任务管理 -->
   <div class="publicContainer">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="任务名称11:" prop="taskName">
+      <el-form-item label="任务名称:" prop="taskName">
         <el-input v-model="queryParams.taskName" placeholder="请输入任务名称" clearable style="width: 180px" />
       </el-form-item>
       <el-form-item label="巡查人员:" prop="taskUserIdList">
@@ -10,10 +10,11 @@
           <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
         </el-select>
       </el-form-item>
-      <el-form-item label="任务日期" prop="reportTime">
+      <el-form-item label="任务日期" prop="publishTime">
         <el-date-picker
           style="width: 380px"
           format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           v-model="AllData.publishTime"
           type="daterange"
           range-separator="至"
@@ -34,9 +35,10 @@
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
+    <!--  -->
     <div class="whole">
       <div class="MainTask">
-        <el-table :data="dataList" v-loading="loading" stripe :max-height="295" @row-click="clickLogData">
+        <el-table :data="dataList" v-loading="loading" stripe :max-height="280" @row-click="clickLogData">
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -54,8 +56,8 @@
               <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
             </template>
           </el-table-column>
-          <el-table-column label="任务开始时间" prop="taskPlanStartDateFrom" />
-          <el-table-column label="任务结束时间" prop="taskPlanStartDateTo" />
+          <el-table-column label="任务开始时间" prop="planStartDatetime" />
+          <el-table-column label="任务结束时间" prop="planEndDatetime" />
           <el-table-column label="任务状态" prop="status">
             <template #default="scope">
               <span>
@@ -86,8 +88,8 @@
         />
       </div>
       <div class="SingleTask">
-        任务详情
-        <el-table :data="dataListTwo" v-loading="loadingTwo" stripe :max-height="295">
+        <div>任务详情</div>
+        <el-table :data="dataListTwo" v-loading="loadingTwo" stripe :max-height="280">
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -105,8 +107,8 @@
               <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
             </template>
           </el-table-column>
-          <el-table-column label="任务开始时间" prop="taskPlanStartDateFrom" />
-          <el-table-column label="任务结束时间" prop="taskPlanStartDateTo" />
+          <el-table-column label="任务开始时间" prop="planStartDatetime" />
+          <el-table-column label="任务结束时间" prop="planEndDatetime" />
           <el-table-column label="任务状态" prop="status">
             <template #default="scope">
               <span>
@@ -183,11 +185,12 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="20">
-            <el-form-item label="计划日期" prop="reportTime1">
+            <el-form-item label="计划日期" prop="publishTime1">
               <el-date-picker
                 style="width: 380px"
                 format="YYYY-MM-DD"
-                v-model="form.reportTime1"
+                value-format="YYYY-MM-DD"
+                v-model="AllData.publishTime1"
                 type="daterange"
                 range-separator="至"
                 start-placeholder="开始时间"
@@ -247,7 +250,8 @@
 const dataListTwo = ref([]);
 const DataList = ref([]);
 const AllData = reactive({
-  publishTime: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD ')],
+  publishTime: [],
+  publishTime1: [],
   form: {},
   queryParams: {
     pageNum: 1,
@@ -277,7 +281,7 @@
 }
 //重置
 function resetQuery() {
-  AllData.publishTime = [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD 23:59:59')];
+  AllData.publishTime = [];
   proxy.resetForm('queryRef');
   handleQuery();
 }
@@ -325,13 +329,19 @@
 
 //查看详情操作
 function handleDetail(row) {
-  DataList.value = row;
   opendetails.value = true;
+  DataList.value = { ...row };
+  // console.log(DataList.value, 'DataList.value');
 }
 
 /** 主任务查询列表 */
 const getList = async () => {
   loading.value = true;
+  console.log(AllData.publishTime, 'AllData.publishTime');
+  if (AllData.publishTime) {
+    queryParams.value.planStartDatetime = AllData.publishTime[0];
+    queryParams.value.planEndDatetime = AllData.publishTime[1];
+  }
   let res = await patrolTaskpage(queryParams.value);
   dataList.value = res.data;
   total.value = res.total;
@@ -351,6 +361,8 @@
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
     if (valid) {
+      form.value.planStartDatetime = AllData.publishTime1[0];
+      form.value.planEndDatetime = AllData.publishTime1[1];
       form.value.basicInfoId = '1686274734091489284';
       patrolTaskadd(form.value).then(response => {
         proxy.$modal.msgSuccess('新增成功');
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index 8c9a132..7b4d09d 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -15,31 +15,45 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">任务开始时间</div>
-        <div class="detail-value flex flex-align-center">123</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.planStartDatetime }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">任务结束时间</div>
-        <div class="detail-value flex flex-align-center">123</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">123</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">123</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">123</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">123</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">123</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.projectLocationName }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查项目</div>
@@ -49,23 +63,58 @@
       </div>
     </div>
     <!-- 巡查照片 -->
-    <div>
-      <p>巡查照片</p>
-      <div>123</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>
+      <el-empty v-else description="暂无图片" :image-size="30" />
+    </div> -->
 
-    <el-table :data="dataListTwo" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px">
+    <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="taskName" />
-      <el-table-column label="检查项" prop="taskName" />
-      <el-table-column label="是否整改" prop="taskName" />
-      <el-table-column label="是否整改" prop="taskName" />
-      <el-table-column label="上报时间" prop="taskName" />
+      <el-table-column label="问题类型" prop="problemType">
+        <!-- <template #default="scope">
+          <dict-tag :options="problem_type" :value="String(scope.row.problemType)" />
+        </template> -->
+      </el-table-column>
+      <el-table-column label="检查项" prop="checkItem" />
+      <el-table-column label="是否整改" prop="isRectification">
+        <template #default="scope">
+          <span>
+            {{
+              scope.row.isRectification == '1'
+                ? '无需整改'
+                : scope.row.isRectification == '2'
+                ? '待整改'
+                : scope.row.isRectification == '3'
+                ? '整改已完成'
+                : ''
+            }}
+          </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>
   </div>
 </template>
 
 <script setup>
+import { patrolProblempage } from '@/api/longoPeration/inspectiontasks';
 const props = defineProps({
   // 数据
   DataList: {
@@ -73,9 +122,30 @@
     default: null,
   },
 });
-onMounted(() => {
-  console.log(props.DataList, 'props');
-});
+const { proxy } = getCurrentInstance();
+const { problem_type } = proxy.useDict('problem_type'); //  巡查类型的字典
+const dataList = ref([]);
+const dataListPhone = ref([]);
+/** 查询列表 */
+const getList = async IdA => {
+  let res = await patrolProblempage({ patrolTaskId: IdA });
+  dataList.value = res.data;
+  res.data.forEach(element => {
+    dataListPhone.value = element.sysFileList;
+  });
+};
+
+watch(
+  () => props.DataList,
+  val => {
+    if (val) {
+      dataListPhone.value = [];
+      getList(props.DataList.id);
+    }
+  },
+  { deep: true, immediate: true }
+);
+onMounted(() => {});
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/publicService/lawRule.vue b/src/views/publicService/lawRule.vue
index 4b32c4e..d2fe6d0 100644
--- a/src/views/publicService/lawRule.vue
+++ b/src/views/publicService/lawRule.vue
@@ -23,11 +23,11 @@
       <el-table-column label="序号" type="index" width="55" />
       <el-table-column label="日期" prop="publishTime" />
       <el-table-column label="政策法规名称" prop="title" />
-      <el-table-column label="政策法规内容" prop="content" width="500" show-overflow-tooltip>
+      <!-- <el-table-column label="政策法规内容" prop="content" width="500" show-overflow-tooltip>
         <template #default="scope">
           <div v-html="scope.row.content"></div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
@@ -39,12 +39,11 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="240" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row)">详情</el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -59,7 +58,7 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm">
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm" :disabled="isDisab">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="政策法规名称:" prop="title">
@@ -103,7 +102,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="info" @click="cancelForm">取 消</el-button>
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm" v-show="!isDisab">确 定</el-button>
         </div>
       </template>
     </el-dialog>
@@ -114,16 +113,15 @@
 import { articlePage, articleAdd, articleDel, articleDetail, articleEdit } from '@/api/publicService/index';
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 import WangEditor from '@/components/WangEditor/index.vue'; //富文本编辑器
-
+import bus from '@/utils/mitt';
 const { proxy } = getCurrentInstance();
-
+const isDisab = ref(false);
 const tableData = ref([]);
 const tableLoading = ref(true);
 const total = ref(0);
 const dialogShow = ref(false);
 const dialogTitle = ref('');
 const showSearch = ref(true);
-
 const allData = reactive({
   formData: {
     articleType: 'policies',
@@ -172,15 +170,30 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
+  isDisab.value = false;
   dialogTitle.value = '添加政策法规';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
   articleDetail(row.id).then(response => {
     dialogShow.value = true;
+    isDisab.value = false;
     dialogTitle.value = '修改政策法规';
     nextTick(() => {
       formData.value = response.data;
+      bus.emit('changeEdit', true);
+    });
+  });
+}
+//详情按钮
+function handleDetail(row) {
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    isDisab.value = true;
+    dialogTitle.value = '查看通知公告';
+    nextTick(() => {
+      formData.value = response.data;
+      bus.emit('changeEdit', false);
     });
   });
 }
diff --git a/src/views/publicService/notices.vue b/src/views/publicService/notices.vue
index 4d3fed6..bf5ee49 100644
--- a/src/views/publicService/notices.vue
+++ b/src/views/publicService/notices.vue
@@ -21,20 +21,19 @@
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
       <el-table-column label="序号" type="index" width="55" />
-      <el-table-column label="发布日期" prop="publishTime" />
+      <el-table-column label="发布日期" prop="publishTime" width="170" />
       <el-table-column label="通知公告名称" prop="title"> </el-table-column>
-      <el-table-column label="通知内容" prop="content" width="500" show-overflow-tooltip>
+      <!-- <el-table-column label="通知内容" prop="content" width="500" show-overflow-tooltip>
         <template #default="scope">
           <div v-html="scope.row.content"></div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="跳转链接" prop="linkUrl" />
-      <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="240" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row)">详情</el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -49,7 +48,7 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm" :disabled="isDisab">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="发布日期:" prop="publishTime">
@@ -71,7 +70,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="通知内容" prop="content">
-              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
+              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal" ref="Editor"></WangEditor>
             </el-form-item>
           </el-col>
         </el-row>
@@ -79,7 +78,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="info" @click="cancelForm">取 消</el-button>
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm" v-show="!isDisab">确 定</el-button>
         </div>
       </template>
     </el-dialog>
@@ -88,19 +87,18 @@
 
 <script setup name="通知公告">
 import { articlePage, articleAdd, articleDel, articleDetail, articleEdit } from '@/api/publicService/index';
-
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 import WangEditor from '@/components/WangEditor/index.vue'; //富文本编辑器
-
+import bus from '@/utils/mitt';
 const { proxy } = getCurrentInstance();
-
+const isDisab = ref(false);
 const tableData = ref([]);
 const tableLoading = ref(true);
 const total = ref(0);
 const dialogShow = ref(false);
 const dialogTitle = ref('');
 const showSearch = ref(true);
-
+const Editor = ref(null);
 const allData = reactive({
   formData: {
     articleType: 'notice',
@@ -150,15 +148,30 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
+  isDisab.value = false;
   dialogTitle.value = '新增通知公告';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
   articleDetail(row.id).then(response => {
     dialogShow.value = true;
+    isDisab.value = false;
     dialogTitle.value = '修改通知公告';
     nextTick(() => {
       formData.value = response.data;
+      bus.emit('changeEdit', true);
+    });
+  });
+}
+//详情按钮
+function handleDetail(row) {
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    isDisab.value = true;
+    dialogTitle.value = '查看通知公告';
+    nextTick(() => {
+      formData.value = response.data;
+      bus.emit('changeEdit', false);
     });
   });
 }

diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js
index 372ebb6..e837d13 100644
--- a/src/api/longoPeration/inspectiontasks.js
+++ b/src/api/longoPeration/inspectiontasks.js
@@ -25,19 +25,10 @@
   });
 }
 
-// // 修改排水防涝--市主干道积水点信息
-// export function waterloggedRoadedit(data) {
-//   return request({
-//     url: '/business/waterloggedRoad/edit',
-//     method: 'put',
-//     data: data,
-//   });
-// }
-
-// // 删除排水防涝--防汛物资
-// export function waterloggedRoaddelete(id) {
-//   return request({
-//     url: '/business/waterloggedRoad/' + id,
-//     method: 'delete',
-//   });
-// }
+export function patrolProblempage(query) {
+  return request({
+    url: '/business/patrolProblem/page',
+    method: 'get',
+    params: query,
+  });
+}
diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index d59f2b7..271ac3e 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -16,6 +16,7 @@
 import '@wangeditor/editor/dist/css/style.css'; // 引入 css
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
 import { sysUpload } from '@/api/login.js';
+import bus from '@/utils/mitt';
 
 const props = defineProps({
   modelValue: [String],
@@ -93,7 +94,12 @@
   { immediate: true, deep: true }
 );
 // 模拟 ajax 异步获取内容
-onMounted(() => {});
+onMounted(() => {
+  bus.on('changeEdit', i => {
+    if (!i) editorRef.value.disable();
+    else editorRef.value.enable();
+  });
+});
 // 组件销毁时，也及时销毁编辑器
 onBeforeUnmount(() => {
   const editor = editorRef.value;
diff --git a/src/views/login.vue b/src/views/login.vue
index 9ce6025..c709514 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -275,7 +275,7 @@
           background: url('@/assets/images/login/inputUser2.png') no-repeat;
           background-size: 100% 100%;
           position: relative;
-          left: 3px;
+          left: 0px;
           top: -2px;
         }
         .pass {
@@ -284,7 +284,7 @@
           background: url('@/assets/images/login/inputPass1.png') no-repeat;
           background-size: 100% 100%;
           position: relative;
-          left: 3px;
+          left: 0px;
           top: -2px;
         }
       }
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index 6a78290..dbd882b 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -2,7 +2,7 @@
   <!-- 日常巡查任务管理 -->
   <div class="publicContainer">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="任务名称11:" prop="taskName">
+      <el-form-item label="任务名称:" prop="taskName">
         <el-input v-model="queryParams.taskName" placeholder="请输入任务名称" clearable style="width: 180px" />
       </el-form-item>
       <el-form-item label="巡查人员:" prop="taskUserIdList">
@@ -10,10 +10,11 @@
           <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
         </el-select>
       </el-form-item>
-      <el-form-item label="任务日期" prop="reportTime">
+      <el-form-item label="任务日期" prop="publishTime">
         <el-date-picker
           style="width: 380px"
           format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           v-model="AllData.publishTime"
           type="daterange"
           range-separator="至"
@@ -34,9 +35,10 @@
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
+    <!--  -->
     <div class="whole">
       <div class="MainTask">
-        <el-table :data="dataList" v-loading="loading" stripe :max-height="295" @row-click="clickLogData">
+        <el-table :data="dataList" v-loading="loading" stripe :max-height="280" @row-click="clickLogData">
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -54,8 +56,8 @@
               <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
             </template>
           </el-table-column>
-          <el-table-column label="任务开始时间" prop="taskPlanStartDateFrom" />
-          <el-table-column label="任务结束时间" prop="taskPlanStartDateTo" />
+          <el-table-column label="任务开始时间" prop="planStartDatetime" />
+          <el-table-column label="任务结束时间" prop="planEndDatetime" />
           <el-table-column label="任务状态" prop="status">
             <template #default="scope">
               <span>
@@ -86,8 +88,8 @@
         />
       </div>
       <div class="SingleTask">
-        任务详情
-        <el-table :data="dataListTwo" v-loading="loadingTwo" stripe :max-height="295">
+        <div>任务详情</div>
+        <el-table :data="dataListTwo" v-loading="loadingTwo" stripe :max-height="280">
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -105,8 +107,8 @@
               <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
             </template>
           </el-table-column>
-          <el-table-column label="任务开始时间" prop="taskPlanStartDateFrom" />
-          <el-table-column label="任务结束时间" prop="taskPlanStartDateTo" />
+          <el-table-column label="任务开始时间" prop="planStartDatetime" />
+          <el-table-column label="任务结束时间" prop="planEndDatetime" />
           <el-table-column label="任务状态" prop="status">
             <template #default="scope">
               <span>
@@ -183,11 +185,12 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="20">
-            <el-form-item label="计划日期" prop="reportTime1">
+            <el-form-item label="计划日期" prop="publishTime1">
               <el-date-picker
                 style="width: 380px"
                 format="YYYY-MM-DD"
-                v-model="form.reportTime1"
+                value-format="YYYY-MM-DD"
+                v-model="AllData.publishTime1"
                 type="daterange"
                 range-separator="至"
                 start-placeholder="开始时间"
@@ -247,7 +250,8 @@
 const dataListTwo = ref([]);
 const DataList = ref([]);
 const AllData = reactive({
-  publishTime: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD ')],
+  publishTime: [],
+  publishTime1: [],
   form: {},
   queryParams: {
     pageNum: 1,
@@ -277,7 +281,7 @@
 }
 //重置
 function resetQuery() {
-  AllData.publishTime = [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD 23:59:59')];
+  AllData.publishTime = [];
   proxy.resetForm('queryRef');
   handleQuery();
 }
@@ -325,13 +329,19 @@
 
 //查看详情操作
 function handleDetail(row) {
-  DataList.value = row;
   opendetails.value = true;
+  DataList.value = { ...row };
+  // console.log(DataList.value, 'DataList.value');
 }
 
 /** 主任务查询列表 */
 const getList = async () => {
   loading.value = true;
+  console.log(AllData.publishTime, 'AllData.publishTime');
+  if (AllData.publishTime) {
+    queryParams.value.planStartDatetime = AllData.publishTime[0];
+    queryParams.value.planEndDatetime = AllData.publishTime[1];
+  }
   let res = await patrolTaskpage(queryParams.value);
   dataList.value = res.data;
   total.value = res.total;
@@ -351,6 +361,8 @@
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
     if (valid) {
+      form.value.planStartDatetime = AllData.publishTime1[0];
+      form.value.planEndDatetime = AllData.publishTime1[1];
       form.value.basicInfoId = '1686274734091489284';
       patrolTaskadd(form.value).then(response => {
         proxy.$modal.msgSuccess('新增成功');
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index 8c9a132..7b4d09d 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -15,31 +15,45 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">任务开始时间</div>
-        <div class="detail-value flex flex-align-center">123</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.planStartDatetime }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">任务结束时间</div>
-        <div class="detail-value flex flex-align-center">123</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">123</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">123</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">123</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">123</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">123</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.projectLocationName }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查项目</div>
@@ -49,23 +63,58 @@
       </div>
     </div>
     <!-- 巡查照片 -->
-    <div>
-      <p>巡查照片</p>
-      <div>123</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>
+      <el-empty v-else description="暂无图片" :image-size="30" />
+    </div> -->
 
-    <el-table :data="dataListTwo" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px">
+    <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="taskName" />
-      <el-table-column label="检查项" prop="taskName" />
-      <el-table-column label="是否整改" prop="taskName" />
-      <el-table-column label="是否整改" prop="taskName" />
-      <el-table-column label="上报时间" prop="taskName" />
+      <el-table-column label="问题类型" prop="problemType">
+        <!-- <template #default="scope">
+          <dict-tag :options="problem_type" :value="String(scope.row.problemType)" />
+        </template> -->
+      </el-table-column>
+      <el-table-column label="检查项" prop="checkItem" />
+      <el-table-column label="是否整改" prop="isRectification">
+        <template #default="scope">
+          <span>
+            {{
+              scope.row.isRectification == '1'
+                ? '无需整改'
+                : scope.row.isRectification == '2'
+                ? '待整改'
+                : scope.row.isRectification == '3'
+                ? '整改已完成'
+                : ''
+            }}
+          </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>
   </div>
 </template>
 
 <script setup>
+import { patrolProblempage } from '@/api/longoPeration/inspectiontasks';
 const props = defineProps({
   // 数据
   DataList: {
@@ -73,9 +122,30 @@
     default: null,
   },
 });
-onMounted(() => {
-  console.log(props.DataList, 'props');
-});
+const { proxy } = getCurrentInstance();
+const { problem_type } = proxy.useDict('problem_type'); //  巡查类型的字典
+const dataList = ref([]);
+const dataListPhone = ref([]);
+/** 查询列表 */
+const getList = async IdA => {
+  let res = await patrolProblempage({ patrolTaskId: IdA });
+  dataList.value = res.data;
+  res.data.forEach(element => {
+    dataListPhone.value = element.sysFileList;
+  });
+};
+
+watch(
+  () => props.DataList,
+  val => {
+    if (val) {
+      dataListPhone.value = [];
+      getList(props.DataList.id);
+    }
+  },
+  { deep: true, immediate: true }
+);
+onMounted(() => {});
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/publicService/lawRule.vue b/src/views/publicService/lawRule.vue
index 4b32c4e..d2fe6d0 100644
--- a/src/views/publicService/lawRule.vue
+++ b/src/views/publicService/lawRule.vue
@@ -23,11 +23,11 @@
       <el-table-column label="序号" type="index" width="55" />
       <el-table-column label="日期" prop="publishTime" />
       <el-table-column label="政策法规名称" prop="title" />
-      <el-table-column label="政策法规内容" prop="content" width="500" show-overflow-tooltip>
+      <!-- <el-table-column label="政策法规内容" prop="content" width="500" show-overflow-tooltip>
         <template #default="scope">
           <div v-html="scope.row.content"></div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
@@ -39,12 +39,11 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="240" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row)">详情</el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -59,7 +58,7 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm">
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm" :disabled="isDisab">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="政策法规名称:" prop="title">
@@ -103,7 +102,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="info" @click="cancelForm">取 消</el-button>
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm" v-show="!isDisab">确 定</el-button>
         </div>
       </template>
     </el-dialog>
@@ -114,16 +113,15 @@
 import { articlePage, articleAdd, articleDel, articleDetail, articleEdit } from '@/api/publicService/index';
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 import WangEditor from '@/components/WangEditor/index.vue'; //富文本编辑器
-
+import bus from '@/utils/mitt';
 const { proxy } = getCurrentInstance();
-
+const isDisab = ref(false);
 const tableData = ref([]);
 const tableLoading = ref(true);
 const total = ref(0);
 const dialogShow = ref(false);
 const dialogTitle = ref('');
 const showSearch = ref(true);
-
 const allData = reactive({
   formData: {
     articleType: 'policies',
@@ -172,15 +170,30 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
+  isDisab.value = false;
   dialogTitle.value = '添加政策法规';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
   articleDetail(row.id).then(response => {
     dialogShow.value = true;
+    isDisab.value = false;
     dialogTitle.value = '修改政策法规';
     nextTick(() => {
       formData.value = response.data;
+      bus.emit('changeEdit', true);
+    });
+  });
+}
+//详情按钮
+function handleDetail(row) {
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    isDisab.value = true;
+    dialogTitle.value = '查看通知公告';
+    nextTick(() => {
+      formData.value = response.data;
+      bus.emit('changeEdit', false);
     });
   });
 }
diff --git a/src/views/publicService/notices.vue b/src/views/publicService/notices.vue
index 4d3fed6..bf5ee49 100644
--- a/src/views/publicService/notices.vue
+++ b/src/views/publicService/notices.vue
@@ -21,20 +21,19 @@
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
       <el-table-column label="序号" type="index" width="55" />
-      <el-table-column label="发布日期" prop="publishTime" />
+      <el-table-column label="发布日期" prop="publishTime" width="170" />
       <el-table-column label="通知公告名称" prop="title"> </el-table-column>
-      <el-table-column label="通知内容" prop="content" width="500" show-overflow-tooltip>
+      <!-- <el-table-column label="通知内容" prop="content" width="500" show-overflow-tooltip>
         <template #default="scope">
           <div v-html="scope.row.content"></div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="跳转链接" prop="linkUrl" />
-      <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="240" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row)">详情</el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -49,7 +48,7 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm" :disabled="isDisab">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="发布日期:" prop="publishTime">
@@ -71,7 +70,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="通知内容" prop="content">
-              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
+              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal" ref="Editor"></WangEditor>
             </el-form-item>
           </el-col>
         </el-row>
@@ -79,7 +78,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="info" @click="cancelForm">取 消</el-button>
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm" v-show="!isDisab">确 定</el-button>
         </div>
       </template>
     </el-dialog>
@@ -88,19 +87,18 @@
 
 <script setup name="通知公告">
 import { articlePage, articleAdd, articleDel, articleDetail, articleEdit } from '@/api/publicService/index';
-
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 import WangEditor from '@/components/WangEditor/index.vue'; //富文本编辑器
-
+import bus from '@/utils/mitt';
 const { proxy } = getCurrentInstance();
-
+const isDisab = ref(false);
 const tableData = ref([]);
 const tableLoading = ref(true);
 const total = ref(0);
 const dialogShow = ref(false);
 const dialogTitle = ref('');
 const showSearch = ref(true);
-
+const Editor = ref(null);
 const allData = reactive({
   formData: {
     articleType: 'notice',
@@ -150,15 +148,30 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
+  isDisab.value = false;
   dialogTitle.value = '新增通知公告';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
   articleDetail(row.id).then(response => {
     dialogShow.value = true;
+    isDisab.value = false;
     dialogTitle.value = '修改通知公告';
     nextTick(() => {
       formData.value = response.data;
+      bus.emit('changeEdit', true);
+    });
+  });
+}
+//详情按钮
+function handleDetail(row) {
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    isDisab.value = true;
+    dialogTitle.value = '查看通知公告';
+    nextTick(() => {
+      formData.value = response.data;
+      bus.emit('changeEdit', false);
     });
   });
 }
diff --git a/src/views/publicService/publicmind.vue b/src/views/publicService/publicmind.vue
index d863a89..91fda0e 100644
--- a/src/views/publicService/publicmind.vue
+++ b/src/views/publicService/publicmind.vue
@@ -36,6 +36,7 @@
         <template #default="scope">
           <el-image style="width: 60px; height: 60px; margin: 5px" v-for="i in scope.row.filelist" :src="i.url" :preview-src-list="[i.url]">
           </el-image>
+          <span v-if="scope.row.filelist.length == ''">暂无照片</span>
         </template>
       </el-table-column>
       <el-table-column label="公众意见" prop="opinion" width="650" />

diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js
index 372ebb6..e837d13 100644
--- a/src/api/longoPeration/inspectiontasks.js
+++ b/src/api/longoPeration/inspectiontasks.js
@@ -25,19 +25,10 @@
   });
 }
 
-// // 修改排水防涝--市主干道积水点信息
-// export function waterloggedRoadedit(data) {
-//   return request({
-//     url: '/business/waterloggedRoad/edit',
-//     method: 'put',
-//     data: data,
-//   });
-// }
-
-// // 删除排水防涝--防汛物资
-// export function waterloggedRoaddelete(id) {
-//   return request({
-//     url: '/business/waterloggedRoad/' + id,
-//     method: 'delete',
-//   });
-// }
+export function patrolProblempage(query) {
+  return request({
+    url: '/business/patrolProblem/page',
+    method: 'get',
+    params: query,
+  });
+}
diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index d59f2b7..271ac3e 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -16,6 +16,7 @@
 import '@wangeditor/editor/dist/css/style.css'; // 引入 css
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
 import { sysUpload } from '@/api/login.js';
+import bus from '@/utils/mitt';
 
 const props = defineProps({
   modelValue: [String],
@@ -93,7 +94,12 @@
   { immediate: true, deep: true }
 );
 // 模拟 ajax 异步获取内容
-onMounted(() => {});
+onMounted(() => {
+  bus.on('changeEdit', i => {
+    if (!i) editorRef.value.disable();
+    else editorRef.value.enable();
+  });
+});
 // 组件销毁时，也及时销毁编辑器
 onBeforeUnmount(() => {
   const editor = editorRef.value;
diff --git a/src/views/login.vue b/src/views/login.vue
index 9ce6025..c709514 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -275,7 +275,7 @@
           background: url('@/assets/images/login/inputUser2.png') no-repeat;
           background-size: 100% 100%;
           position: relative;
-          left: 3px;
+          left: 0px;
           top: -2px;
         }
         .pass {
@@ -284,7 +284,7 @@
           background: url('@/assets/images/login/inputPass1.png') no-repeat;
           background-size: 100% 100%;
           position: relative;
-          left: 3px;
+          left: 0px;
           top: -2px;
         }
       }
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index 6a78290..dbd882b 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -2,7 +2,7 @@
   <!-- 日常巡查任务管理 -->
   <div class="publicContainer">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="任务名称11:" prop="taskName">
+      <el-form-item label="任务名称:" prop="taskName">
         <el-input v-model="queryParams.taskName" placeholder="请输入任务名称" clearable style="width: 180px" />
       </el-form-item>
       <el-form-item label="巡查人员:" prop="taskUserIdList">
@@ -10,10 +10,11 @@
           <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
         </el-select>
       </el-form-item>
-      <el-form-item label="任务日期" prop="reportTime">
+      <el-form-item label="任务日期" prop="publishTime">
         <el-date-picker
           style="width: 380px"
           format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           v-model="AllData.publishTime"
           type="daterange"
           range-separator="至"
@@ -34,9 +35,10 @@
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
+    <!--  -->
     <div class="whole">
       <div class="MainTask">
-        <el-table :data="dataList" v-loading="loading" stripe :max-height="295" @row-click="clickLogData">
+        <el-table :data="dataList" v-loading="loading" stripe :max-height="280" @row-click="clickLogData">
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -54,8 +56,8 @@
               <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
             </template>
           </el-table-column>
-          <el-table-column label="任务开始时间" prop="taskPlanStartDateFrom" />
-          <el-table-column label="任务结束时间" prop="taskPlanStartDateTo" />
+          <el-table-column label="任务开始时间" prop="planStartDatetime" />
+          <el-table-column label="任务结束时间" prop="planEndDatetime" />
           <el-table-column label="任务状态" prop="status">
             <template #default="scope">
               <span>
@@ -86,8 +88,8 @@
         />
       </div>
       <div class="SingleTask">
-        任务详情
-        <el-table :data="dataListTwo" v-loading="loadingTwo" stripe :max-height="295">
+        <div>任务详情</div>
+        <el-table :data="dataListTwo" v-loading="loadingTwo" stripe :max-height="280">
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -105,8 +107,8 @@
               <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
             </template>
           </el-table-column>
-          <el-table-column label="任务开始时间" prop="taskPlanStartDateFrom" />
-          <el-table-column label="任务结束时间" prop="taskPlanStartDateTo" />
+          <el-table-column label="任务开始时间" prop="planStartDatetime" />
+          <el-table-column label="任务结束时间" prop="planEndDatetime" />
           <el-table-column label="任务状态" prop="status">
             <template #default="scope">
               <span>
@@ -183,11 +185,12 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="20">
-            <el-form-item label="计划日期" prop="reportTime1">
+            <el-form-item label="计划日期" prop="publishTime1">
               <el-date-picker
                 style="width: 380px"
                 format="YYYY-MM-DD"
-                v-model="form.reportTime1"
+                value-format="YYYY-MM-DD"
+                v-model="AllData.publishTime1"
                 type="daterange"
                 range-separator="至"
                 start-placeholder="开始时间"
@@ -247,7 +250,8 @@
 const dataListTwo = ref([]);
 const DataList = ref([]);
 const AllData = reactive({
-  publishTime: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD ')],
+  publishTime: [],
+  publishTime1: [],
   form: {},
   queryParams: {
     pageNum: 1,
@@ -277,7 +281,7 @@
 }
 //重置
 function resetQuery() {
-  AllData.publishTime = [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD 23:59:59')];
+  AllData.publishTime = [];
   proxy.resetForm('queryRef');
   handleQuery();
 }
@@ -325,13 +329,19 @@
 
 //查看详情操作
 function handleDetail(row) {
-  DataList.value = row;
   opendetails.value = true;
+  DataList.value = { ...row };
+  // console.log(DataList.value, 'DataList.value');
 }
 
 /** 主任务查询列表 */
 const getList = async () => {
   loading.value = true;
+  console.log(AllData.publishTime, 'AllData.publishTime');
+  if (AllData.publishTime) {
+    queryParams.value.planStartDatetime = AllData.publishTime[0];
+    queryParams.value.planEndDatetime = AllData.publishTime[1];
+  }
   let res = await patrolTaskpage(queryParams.value);
   dataList.value = res.data;
   total.value = res.total;
@@ -351,6 +361,8 @@
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
     if (valid) {
+      form.value.planStartDatetime = AllData.publishTime1[0];
+      form.value.planEndDatetime = AllData.publishTime1[1];
       form.value.basicInfoId = '1686274734091489284';
       patrolTaskadd(form.value).then(response => {
         proxy.$modal.msgSuccess('新增成功');
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index 8c9a132..7b4d09d 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -15,31 +15,45 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">任务开始时间</div>
-        <div class="detail-value flex flex-align-center">123</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.planStartDatetime }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">任务结束时间</div>
-        <div class="detail-value flex flex-align-center">123</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">123</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">123</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">123</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">123</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">123</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.projectLocationName }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查项目</div>
@@ -49,23 +63,58 @@
       </div>
     </div>
     <!-- 巡查照片 -->
-    <div>
-      <p>巡查照片</p>
-      <div>123</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>
+      <el-empty v-else description="暂无图片" :image-size="30" />
+    </div> -->
 
-    <el-table :data="dataListTwo" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px">
+    <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="taskName" />
-      <el-table-column label="检查项" prop="taskName" />
-      <el-table-column label="是否整改" prop="taskName" />
-      <el-table-column label="是否整改" prop="taskName" />
-      <el-table-column label="上报时间" prop="taskName" />
+      <el-table-column label="问题类型" prop="problemType">
+        <!-- <template #default="scope">
+          <dict-tag :options="problem_type" :value="String(scope.row.problemType)" />
+        </template> -->
+      </el-table-column>
+      <el-table-column label="检查项" prop="checkItem" />
+      <el-table-column label="是否整改" prop="isRectification">
+        <template #default="scope">
+          <span>
+            {{
+              scope.row.isRectification == '1'
+                ? '无需整改'
+                : scope.row.isRectification == '2'
+                ? '待整改'
+                : scope.row.isRectification == '3'
+                ? '整改已完成'
+                : ''
+            }}
+          </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>
   </div>
 </template>
 
 <script setup>
+import { patrolProblempage } from '@/api/longoPeration/inspectiontasks';
 const props = defineProps({
   // 数据
   DataList: {
@@ -73,9 +122,30 @@
     default: null,
   },
 });
-onMounted(() => {
-  console.log(props.DataList, 'props');
-});
+const { proxy } = getCurrentInstance();
+const { problem_type } = proxy.useDict('problem_type'); //  巡查类型的字典
+const dataList = ref([]);
+const dataListPhone = ref([]);
+/** 查询列表 */
+const getList = async IdA => {
+  let res = await patrolProblempage({ patrolTaskId: IdA });
+  dataList.value = res.data;
+  res.data.forEach(element => {
+    dataListPhone.value = element.sysFileList;
+  });
+};
+
+watch(
+  () => props.DataList,
+  val => {
+    if (val) {
+      dataListPhone.value = [];
+      getList(props.DataList.id);
+    }
+  },
+  { deep: true, immediate: true }
+);
+onMounted(() => {});
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/publicService/lawRule.vue b/src/views/publicService/lawRule.vue
index 4b32c4e..d2fe6d0 100644
--- a/src/views/publicService/lawRule.vue
+++ b/src/views/publicService/lawRule.vue
@@ -23,11 +23,11 @@
       <el-table-column label="序号" type="index" width="55" />
       <el-table-column label="日期" prop="publishTime" />
       <el-table-column label="政策法规名称" prop="title" />
-      <el-table-column label="政策法规内容" prop="content" width="500" show-overflow-tooltip>
+      <!-- <el-table-column label="政策法规内容" prop="content" width="500" show-overflow-tooltip>
         <template #default="scope">
           <div v-html="scope.row.content"></div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
@@ -39,12 +39,11 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="240" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row)">详情</el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -59,7 +58,7 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm">
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm" :disabled="isDisab">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="政策法规名称:" prop="title">
@@ -103,7 +102,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="info" @click="cancelForm">取 消</el-button>
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm" v-show="!isDisab">确 定</el-button>
         </div>
       </template>
     </el-dialog>
@@ -114,16 +113,15 @@
 import { articlePage, articleAdd, articleDel, articleDetail, articleEdit } from '@/api/publicService/index';
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 import WangEditor from '@/components/WangEditor/index.vue'; //富文本编辑器
-
+import bus from '@/utils/mitt';
 const { proxy } = getCurrentInstance();
-
+const isDisab = ref(false);
 const tableData = ref([]);
 const tableLoading = ref(true);
 const total = ref(0);
 const dialogShow = ref(false);
 const dialogTitle = ref('');
 const showSearch = ref(true);
-
 const allData = reactive({
   formData: {
     articleType: 'policies',
@@ -172,15 +170,30 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
+  isDisab.value = false;
   dialogTitle.value = '添加政策法规';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
   articleDetail(row.id).then(response => {
     dialogShow.value = true;
+    isDisab.value = false;
     dialogTitle.value = '修改政策法规';
     nextTick(() => {
       formData.value = response.data;
+      bus.emit('changeEdit', true);
+    });
+  });
+}
+//详情按钮
+function handleDetail(row) {
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    isDisab.value = true;
+    dialogTitle.value = '查看通知公告';
+    nextTick(() => {
+      formData.value = response.data;
+      bus.emit('changeEdit', false);
     });
   });
 }
diff --git a/src/views/publicService/notices.vue b/src/views/publicService/notices.vue
index 4d3fed6..bf5ee49 100644
--- a/src/views/publicService/notices.vue
+++ b/src/views/publicService/notices.vue
@@ -21,20 +21,19 @@
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
       <el-table-column label="序号" type="index" width="55" />
-      <el-table-column label="发布日期" prop="publishTime" />
+      <el-table-column label="发布日期" prop="publishTime" width="170" />
       <el-table-column label="通知公告名称" prop="title"> </el-table-column>
-      <el-table-column label="通知内容" prop="content" width="500" show-overflow-tooltip>
+      <!-- <el-table-column label="通知内容" prop="content" width="500" show-overflow-tooltip>
         <template #default="scope">
           <div v-html="scope.row.content"></div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="跳转链接" prop="linkUrl" />
-      <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="240" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row)">详情</el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -49,7 +48,7 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm" :disabled="isDisab">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="发布日期:" prop="publishTime">
@@ -71,7 +70,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="通知内容" prop="content">
-              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
+              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal" ref="Editor"></WangEditor>
             </el-form-item>
           </el-col>
         </el-row>
@@ -79,7 +78,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="info" @click="cancelForm">取 消</el-button>
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm" v-show="!isDisab">确 定</el-button>
         </div>
       </template>
     </el-dialog>
@@ -88,19 +87,18 @@
 
 <script setup name="通知公告">
 import { articlePage, articleAdd, articleDel, articleDetail, articleEdit } from '@/api/publicService/index';
-
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 import WangEditor from '@/components/WangEditor/index.vue'; //富文本编辑器
-
+import bus from '@/utils/mitt';
 const { proxy } = getCurrentInstance();
-
+const isDisab = ref(false);
 const tableData = ref([]);
 const tableLoading = ref(true);
 const total = ref(0);
 const dialogShow = ref(false);
 const dialogTitle = ref('');
 const showSearch = ref(true);
-
+const Editor = ref(null);
 const allData = reactive({
   formData: {
     articleType: 'notice',
@@ -150,15 +148,30 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
+  isDisab.value = false;
   dialogTitle.value = '新增通知公告';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
   articleDetail(row.id).then(response => {
     dialogShow.value = true;
+    isDisab.value = false;
     dialogTitle.value = '修改通知公告';
     nextTick(() => {
       formData.value = response.data;
+      bus.emit('changeEdit', true);
+    });
+  });
+}
+//详情按钮
+function handleDetail(row) {
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    isDisab.value = true;
+    dialogTitle.value = '查看通知公告';
+    nextTick(() => {
+      formData.value = response.data;
+      bus.emit('changeEdit', false);
     });
   });
 }
diff --git a/src/views/publicService/publicmind.vue b/src/views/publicService/publicmind.vue
index d863a89..91fda0e 100644
--- a/src/views/publicService/publicmind.vue
+++ b/src/views/publicService/publicmind.vue
@@ -36,6 +36,7 @@
         <template #default="scope">
           <el-image style="width: 60px; height: 60px; margin: 5px" v-for="i in scope.row.filelist" :src="i.url" :preview-src-list="[i.url]">
           </el-image>
+          <span v-if="scope.row.filelist.length == ''">暂无照片</span>
         </template>
       </el-table-column>
       <el-table-column label="公众意见" prop="opinion" width="650" />
diff --git a/src/views/publicService/quesNaire.vue b/src/views/publicService/quesNaire.vue
index 9e986ce..2e96fa9 100644
--- a/src/views/publicService/quesNaire.vue
+++ b/src/views/publicService/quesNaire.vue
@@ -19,7 +19,7 @@
     <!-- 按钮区域 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-if="tableData.length == ''">新增</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
@@ -32,13 +32,13 @@
         </template>
       </el-table-column>
       <el-table-column label="创建时间" prop="createTime" />
-      <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="260" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button
             type="primary"
             icon="Edit"
             @click="handleUpdate(scope.row)"
-            v-if="scope.row.ifStart == 1 && scope.row.adjustmentStatus != 'ended'"
+            v-if="scope.row.ifStart == 0 && scope.row.adjustmentStatus != 'ended'"
           >
             修改
           </el-button>
@@ -90,7 +90,7 @@
               <dict-tag :options="typeList" :value="scope.row.problemType" />
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+          <el-table-column label="操作" width="240" class-name="small-padding fixed-width">
             <template #default="scope">
               <el-button type="primary" icon="Edit" @click="changeQues(scope.row)"> 修改 </el-button>
               <el-button type="danger" icon="Edit" @click="deleteQues(scope.row)"> 删除 </el-button>
@@ -228,9 +228,9 @@
 });
 const { queryParams, formData, rulesForm, formDataAns, rulesFormAns } = toRefs(allData);
 const statusList = ref([
-  { value: 'not_start', label: '未开始' },
-  { value: 'executing', label: '执行中' },
-  { value: 'ended', label: '已结束' },
+  { value: 1, label: '启用' },
+  // { value: 'executing', label: '执行中' },
+  { value: 0, label: '未启用' },
 ]);
 const typeList = ref([
   { value: 'radio', label: '单选' },

diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js
index 372ebb6..e837d13 100644
--- a/src/api/longoPeration/inspectiontasks.js
+++ b/src/api/longoPeration/inspectiontasks.js
@@ -25,19 +25,10 @@
   });
 }
 
-// // 修改排水防涝--市主干道积水点信息
-// export function waterloggedRoadedit(data) {
-//   return request({
-//     url: '/business/waterloggedRoad/edit',
-//     method: 'put',
-//     data: data,
-//   });
-// }
-
-// // 删除排水防涝--防汛物资
-// export function waterloggedRoaddelete(id) {
-//   return request({
-//     url: '/business/waterloggedRoad/' + id,
-//     method: 'delete',
-//   });
-// }
+export function patrolProblempage(query) {
+  return request({
+    url: '/business/patrolProblem/page',
+    method: 'get',
+    params: query,
+  });
+}
diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index d59f2b7..271ac3e 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -16,6 +16,7 @@
 import '@wangeditor/editor/dist/css/style.css'; // 引入 css
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
 import { sysUpload } from '@/api/login.js';
+import bus from '@/utils/mitt';
 
 const props = defineProps({
   modelValue: [String],
@@ -93,7 +94,12 @@
   { immediate: true, deep: true }
 );
 // 模拟 ajax 异步获取内容
-onMounted(() => {});
+onMounted(() => {
+  bus.on('changeEdit', i => {
+    if (!i) editorRef.value.disable();
+    else editorRef.value.enable();
+  });
+});
 // 组件销毁时，也及时销毁编辑器
 onBeforeUnmount(() => {
   const editor = editorRef.value;
diff --git a/src/views/login.vue b/src/views/login.vue
index 9ce6025..c709514 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -275,7 +275,7 @@
           background: url('@/assets/images/login/inputUser2.png') no-repeat;
           background-size: 100% 100%;
           position: relative;
-          left: 3px;
+          left: 0px;
           top: -2px;
         }
         .pass {
@@ -284,7 +284,7 @@
           background: url('@/assets/images/login/inputPass1.png') no-repeat;
           background-size: 100% 100%;
           position: relative;
-          left: 3px;
+          left: 0px;
           top: -2px;
         }
       }
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index 6a78290..dbd882b 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -2,7 +2,7 @@
   <!-- 日常巡查任务管理 -->
   <div class="publicContainer">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="任务名称11:" prop="taskName">
+      <el-form-item label="任务名称:" prop="taskName">
         <el-input v-model="queryParams.taskName" placeholder="请输入任务名称" clearable style="width: 180px" />
       </el-form-item>
       <el-form-item label="巡查人员:" prop="taskUserIdList">
@@ -10,10 +10,11 @@
           <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
         </el-select>
       </el-form-item>
-      <el-form-item label="任务日期" prop="reportTime">
+      <el-form-item label="任务日期" prop="publishTime">
         <el-date-picker
           style="width: 380px"
           format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           v-model="AllData.publishTime"
           type="daterange"
           range-separator="至"
@@ -34,9 +35,10 @@
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
+    <!--  -->
     <div class="whole">
       <div class="MainTask">
-        <el-table :data="dataList" v-loading="loading" stripe :max-height="295" @row-click="clickLogData">
+        <el-table :data="dataList" v-loading="loading" stripe :max-height="280" @row-click="clickLogData">
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -54,8 +56,8 @@
               <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
             </template>
           </el-table-column>
-          <el-table-column label="任务开始时间" prop="taskPlanStartDateFrom" />
-          <el-table-column label="任务结束时间" prop="taskPlanStartDateTo" />
+          <el-table-column label="任务开始时间" prop="planStartDatetime" />
+          <el-table-column label="任务结束时间" prop="planEndDatetime" />
           <el-table-column label="任务状态" prop="status">
             <template #default="scope">
               <span>
@@ -86,8 +88,8 @@
         />
       </div>
       <div class="SingleTask">
-        任务详情
-        <el-table :data="dataListTwo" v-loading="loadingTwo" stripe :max-height="295">
+        <div>任务详情</div>
+        <el-table :data="dataListTwo" v-loading="loadingTwo" stripe :max-height="280">
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -105,8 +107,8 @@
               <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
             </template>
           </el-table-column>
-          <el-table-column label="任务开始时间" prop="taskPlanStartDateFrom" />
-          <el-table-column label="任务结束时间" prop="taskPlanStartDateTo" />
+          <el-table-column label="任务开始时间" prop="planStartDatetime" />
+          <el-table-column label="任务结束时间" prop="planEndDatetime" />
           <el-table-column label="任务状态" prop="status">
             <template #default="scope">
               <span>
@@ -183,11 +185,12 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="20">
-            <el-form-item label="计划日期" prop="reportTime1">
+            <el-form-item label="计划日期" prop="publishTime1">
               <el-date-picker
                 style="width: 380px"
                 format="YYYY-MM-DD"
-                v-model="form.reportTime1"
+                value-format="YYYY-MM-DD"
+                v-model="AllData.publishTime1"
                 type="daterange"
                 range-separator="至"
                 start-placeholder="开始时间"
@@ -247,7 +250,8 @@
 const dataListTwo = ref([]);
 const DataList = ref([]);
 const AllData = reactive({
-  publishTime: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD ')],
+  publishTime: [],
+  publishTime1: [],
   form: {},
   queryParams: {
     pageNum: 1,
@@ -277,7 +281,7 @@
 }
 //重置
 function resetQuery() {
-  AllData.publishTime = [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD 23:59:59')];
+  AllData.publishTime = [];
   proxy.resetForm('queryRef');
   handleQuery();
 }
@@ -325,13 +329,19 @@
 
 //查看详情操作
 function handleDetail(row) {
-  DataList.value = row;
   opendetails.value = true;
+  DataList.value = { ...row };
+  // console.log(DataList.value, 'DataList.value');
 }
 
 /** 主任务查询列表 */
 const getList = async () => {
   loading.value = true;
+  console.log(AllData.publishTime, 'AllData.publishTime');
+  if (AllData.publishTime) {
+    queryParams.value.planStartDatetime = AllData.publishTime[0];
+    queryParams.value.planEndDatetime = AllData.publishTime[1];
+  }
   let res = await patrolTaskpage(queryParams.value);
   dataList.value = res.data;
   total.value = res.total;
@@ -351,6 +361,8 @@
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
     if (valid) {
+      form.value.planStartDatetime = AllData.publishTime1[0];
+      form.value.planEndDatetime = AllData.publishTime1[1];
       form.value.basicInfoId = '1686274734091489284';
       patrolTaskadd(form.value).then(response => {
         proxy.$modal.msgSuccess('新增成功');
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index 8c9a132..7b4d09d 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -15,31 +15,45 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">任务开始时间</div>
-        <div class="detail-value flex flex-align-center">123</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.planStartDatetime }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">任务结束时间</div>
-        <div class="detail-value flex flex-align-center">123</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">123</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">123</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">123</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">123</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">123</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.projectLocationName }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查项目</div>
@@ -49,23 +63,58 @@
       </div>
     </div>
     <!-- 巡查照片 -->
-    <div>
-      <p>巡查照片</p>
-      <div>123</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>
+      <el-empty v-else description="暂无图片" :image-size="30" />
+    </div> -->
 
-    <el-table :data="dataListTwo" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px">
+    <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="taskName" />
-      <el-table-column label="检查项" prop="taskName" />
-      <el-table-column label="是否整改" prop="taskName" />
-      <el-table-column label="是否整改" prop="taskName" />
-      <el-table-column label="上报时间" prop="taskName" />
+      <el-table-column label="问题类型" prop="problemType">
+        <!-- <template #default="scope">
+          <dict-tag :options="problem_type" :value="String(scope.row.problemType)" />
+        </template> -->
+      </el-table-column>
+      <el-table-column label="检查项" prop="checkItem" />
+      <el-table-column label="是否整改" prop="isRectification">
+        <template #default="scope">
+          <span>
+            {{
+              scope.row.isRectification == '1'
+                ? '无需整改'
+                : scope.row.isRectification == '2'
+                ? '待整改'
+                : scope.row.isRectification == '3'
+                ? '整改已完成'
+                : ''
+            }}
+          </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>
   </div>
 </template>
 
 <script setup>
+import { patrolProblempage } from '@/api/longoPeration/inspectiontasks';
 const props = defineProps({
   // 数据
   DataList: {
@@ -73,9 +122,30 @@
     default: null,
   },
 });
-onMounted(() => {
-  console.log(props.DataList, 'props');
-});
+const { proxy } = getCurrentInstance();
+const { problem_type } = proxy.useDict('problem_type'); //  巡查类型的字典
+const dataList = ref([]);
+const dataListPhone = ref([]);
+/** 查询列表 */
+const getList = async IdA => {
+  let res = await patrolProblempage({ patrolTaskId: IdA });
+  dataList.value = res.data;
+  res.data.forEach(element => {
+    dataListPhone.value = element.sysFileList;
+  });
+};
+
+watch(
+  () => props.DataList,
+  val => {
+    if (val) {
+      dataListPhone.value = [];
+      getList(props.DataList.id);
+    }
+  },
+  { deep: true, immediate: true }
+);
+onMounted(() => {});
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/publicService/lawRule.vue b/src/views/publicService/lawRule.vue
index 4b32c4e..d2fe6d0 100644
--- a/src/views/publicService/lawRule.vue
+++ b/src/views/publicService/lawRule.vue
@@ -23,11 +23,11 @@
       <el-table-column label="序号" type="index" width="55" />
       <el-table-column label="日期" prop="publishTime" />
       <el-table-column label="政策法规名称" prop="title" />
-      <el-table-column label="政策法规内容" prop="content" width="500" show-overflow-tooltip>
+      <!-- <el-table-column label="政策法规内容" prop="content" width="500" show-overflow-tooltip>
         <template #default="scope">
           <div v-html="scope.row.content"></div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
@@ -39,12 +39,11 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="240" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row)">详情</el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -59,7 +58,7 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm">
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm" :disabled="isDisab">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="政策法规名称:" prop="title">
@@ -103,7 +102,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="info" @click="cancelForm">取 消</el-button>
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm" v-show="!isDisab">确 定</el-button>
         </div>
       </template>
     </el-dialog>
@@ -114,16 +113,15 @@
 import { articlePage, articleAdd, articleDel, articleDetail, articleEdit } from '@/api/publicService/index';
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 import WangEditor from '@/components/WangEditor/index.vue'; //富文本编辑器
-
+import bus from '@/utils/mitt';
 const { proxy } = getCurrentInstance();
-
+const isDisab = ref(false);
 const tableData = ref([]);
 const tableLoading = ref(true);
 const total = ref(0);
 const dialogShow = ref(false);
 const dialogTitle = ref('');
 const showSearch = ref(true);
-
 const allData = reactive({
   formData: {
     articleType: 'policies',
@@ -172,15 +170,30 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
+  isDisab.value = false;
   dialogTitle.value = '添加政策法规';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
   articleDetail(row.id).then(response => {
     dialogShow.value = true;
+    isDisab.value = false;
     dialogTitle.value = '修改政策法规';
     nextTick(() => {
       formData.value = response.data;
+      bus.emit('changeEdit', true);
+    });
+  });
+}
+//详情按钮
+function handleDetail(row) {
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    isDisab.value = true;
+    dialogTitle.value = '查看通知公告';
+    nextTick(() => {
+      formData.value = response.data;
+      bus.emit('changeEdit', false);
     });
   });
 }
diff --git a/src/views/publicService/notices.vue b/src/views/publicService/notices.vue
index 4d3fed6..bf5ee49 100644
--- a/src/views/publicService/notices.vue
+++ b/src/views/publicService/notices.vue
@@ -21,20 +21,19 @@
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
       <el-table-column label="序号" type="index" width="55" />
-      <el-table-column label="发布日期" prop="publishTime" />
+      <el-table-column label="发布日期" prop="publishTime" width="170" />
       <el-table-column label="通知公告名称" prop="title"> </el-table-column>
-      <el-table-column label="通知内容" prop="content" width="500" show-overflow-tooltip>
+      <!-- <el-table-column label="通知内容" prop="content" width="500" show-overflow-tooltip>
         <template #default="scope">
           <div v-html="scope.row.content"></div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="跳转链接" prop="linkUrl" />
-      <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="240" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row)">详情</el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -49,7 +48,7 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm" :disabled="isDisab">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="发布日期:" prop="publishTime">
@@ -71,7 +70,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="通知内容" prop="content">
-              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
+              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal" ref="Editor"></WangEditor>
             </el-form-item>
           </el-col>
         </el-row>
@@ -79,7 +78,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="info" @click="cancelForm">取 消</el-button>
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm" v-show="!isDisab">确 定</el-button>
         </div>
       </template>
     </el-dialog>
@@ -88,19 +87,18 @@
 
 <script setup name="通知公告">
 import { articlePage, articleAdd, articleDel, articleDetail, articleEdit } from '@/api/publicService/index';
-
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 import WangEditor from '@/components/WangEditor/index.vue'; //富文本编辑器
-
+import bus from '@/utils/mitt';
 const { proxy } = getCurrentInstance();
-
+const isDisab = ref(false);
 const tableData = ref([]);
 const tableLoading = ref(true);
 const total = ref(0);
 const dialogShow = ref(false);
 const dialogTitle = ref('');
 const showSearch = ref(true);
-
+const Editor = ref(null);
 const allData = reactive({
   formData: {
     articleType: 'notice',
@@ -150,15 +148,30 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
+  isDisab.value = false;
   dialogTitle.value = '新增通知公告';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
   articleDetail(row.id).then(response => {
     dialogShow.value = true;
+    isDisab.value = false;
     dialogTitle.value = '修改通知公告';
     nextTick(() => {
       formData.value = response.data;
+      bus.emit('changeEdit', true);
+    });
+  });
+}
+//详情按钮
+function handleDetail(row) {
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    isDisab.value = true;
+    dialogTitle.value = '查看通知公告';
+    nextTick(() => {
+      formData.value = response.data;
+      bus.emit('changeEdit', false);
     });
   });
 }
diff --git a/src/views/publicService/publicmind.vue b/src/views/publicService/publicmind.vue
index d863a89..91fda0e 100644
--- a/src/views/publicService/publicmind.vue
+++ b/src/views/publicService/publicmind.vue
@@ -36,6 +36,7 @@
         <template #default="scope">
           <el-image style="width: 60px; height: 60px; margin: 5px" v-for="i in scope.row.filelist" :src="i.url" :preview-src-list="[i.url]">
           </el-image>
+          <span v-if="scope.row.filelist.length == ''">暂无照片</span>
         </template>
       </el-table-column>
       <el-table-column label="公众意见" prop="opinion" width="650" />
diff --git a/src/views/publicService/quesNaire.vue b/src/views/publicService/quesNaire.vue
index 9e986ce..2e96fa9 100644
--- a/src/views/publicService/quesNaire.vue
+++ b/src/views/publicService/quesNaire.vue
@@ -19,7 +19,7 @@
     <!-- 按钮区域 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-if="tableData.length == ''">新增</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
@@ -32,13 +32,13 @@
         </template>
       </el-table-column>
       <el-table-column label="创建时间" prop="createTime" />
-      <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="260" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button
             type="primary"
             icon="Edit"
             @click="handleUpdate(scope.row)"
-            v-if="scope.row.ifStart == 1 && scope.row.adjustmentStatus != 'ended'"
+            v-if="scope.row.ifStart == 0 && scope.row.adjustmentStatus != 'ended'"
           >
             修改
           </el-button>
@@ -90,7 +90,7 @@
               <dict-tag :options="typeList" :value="scope.row.problemType" />
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+          <el-table-column label="操作" width="240" class-name="small-padding fixed-width">
             <template #default="scope">
               <el-button type="primary" icon="Edit" @click="changeQues(scope.row)"> 修改 </el-button>
               <el-button type="danger" icon="Edit" @click="deleteQues(scope.row)"> 删除 </el-button>
@@ -228,9 +228,9 @@
 });
 const { queryParams, formData, rulesForm, formDataAns, rulesFormAns } = toRefs(allData);
 const statusList = ref([
-  { value: 'not_start', label: '未开始' },
-  { value: 'executing', label: '执行中' },
-  { value: 'ended', label: '已结束' },
+  { value: 1, label: '启用' },
+  // { value: 'executing', label: '执行中' },
+  { value: 0, label: '未启用' },
 ]);
 const typeList = ref([
   { value: 'radio', label: '单选' },
diff --git a/src/views/publicService/special.vue b/src/views/publicService/special.vue
index a60aef7..44b0c54 100644
--- a/src/views/publicService/special.vue
+++ b/src/views/publicService/special.vue
@@ -34,7 +34,7 @@
       <el-table-column label="序号" type="index" width="55" />
       <el-table-column label="培训日期" prop="trainTime" />
       <el-table-column label="培训地点" prop="address" />
-      <el-table-column label="请输入培训宣传名称" prop="title" />
+      <el-table-column label="培训宣传名称" prop="title" />
       <el-table-column label="参加人员" prop="people" />
       <el-table-column label="培训内容" prop="content" width="600" />
       <el-table-column label="跳转链接" prop="linkUrl" />

diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js
index 372ebb6..e837d13 100644
--- a/src/api/longoPeration/inspectiontasks.js
+++ b/src/api/longoPeration/inspectiontasks.js
@@ -25,19 +25,10 @@
   });
 }
 
-// // 修改排水防涝--市主干道积水点信息
-// export function waterloggedRoadedit(data) {
-//   return request({
-//     url: '/business/waterloggedRoad/edit',
-//     method: 'put',
-//     data: data,
-//   });
-// }
-
-// // 删除排水防涝--防汛物资
-// export function waterloggedRoaddelete(id) {
-//   return request({
-//     url: '/business/waterloggedRoad/' + id,
-//     method: 'delete',
-//   });
-// }
+export function patrolProblempage(query) {
+  return request({
+    url: '/business/patrolProblem/page',
+    method: 'get',
+    params: query,
+  });
+}
diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index d59f2b7..271ac3e 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -16,6 +16,7 @@
 import '@wangeditor/editor/dist/css/style.css'; // 引入 css
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
 import { sysUpload } from '@/api/login.js';
+import bus from '@/utils/mitt';
 
 const props = defineProps({
   modelValue: [String],
@@ -93,7 +94,12 @@
   { immediate: true, deep: true }
 );
 // 模拟 ajax 异步获取内容
-onMounted(() => {});
+onMounted(() => {
+  bus.on('changeEdit', i => {
+    if (!i) editorRef.value.disable();
+    else editorRef.value.enable();
+  });
+});
 // 组件销毁时，也及时销毁编辑器
 onBeforeUnmount(() => {
   const editor = editorRef.value;
diff --git a/src/views/login.vue b/src/views/login.vue
index 9ce6025..c709514 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -275,7 +275,7 @@
           background: url('@/assets/images/login/inputUser2.png') no-repeat;
           background-size: 100% 100%;
           position: relative;
-          left: 3px;
+          left: 0px;
           top: -2px;
         }
         .pass {
@@ -284,7 +284,7 @@
           background: url('@/assets/images/login/inputPass1.png') no-repeat;
           background-size: 100% 100%;
           position: relative;
-          left: 3px;
+          left: 0px;
           top: -2px;
         }
       }
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index 6a78290..dbd882b 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -2,7 +2,7 @@
   <!-- 日常巡查任务管理 -->
   <div class="publicContainer">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="任务名称11:" prop="taskName">
+      <el-form-item label="任务名称:" prop="taskName">
         <el-input v-model="queryParams.taskName" placeholder="请输入任务名称" clearable style="width: 180px" />
       </el-form-item>
       <el-form-item label="巡查人员:" prop="taskUserIdList">
@@ -10,10 +10,11 @@
           <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
         </el-select>
       </el-form-item>
-      <el-form-item label="任务日期" prop="reportTime">
+      <el-form-item label="任务日期" prop="publishTime">
         <el-date-picker
           style="width: 380px"
           format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           v-model="AllData.publishTime"
           type="daterange"
           range-separator="至"
@@ -34,9 +35,10 @@
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
+    <!--  -->
     <div class="whole">
       <div class="MainTask">
-        <el-table :data="dataList" v-loading="loading" stripe :max-height="295" @row-click="clickLogData">
+        <el-table :data="dataList" v-loading="loading" stripe :max-height="280" @row-click="clickLogData">
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -54,8 +56,8 @@
               <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
             </template>
           </el-table-column>
-          <el-table-column label="任务开始时间" prop="taskPlanStartDateFrom" />
-          <el-table-column label="任务结束时间" prop="taskPlanStartDateTo" />
+          <el-table-column label="任务开始时间" prop="planStartDatetime" />
+          <el-table-column label="任务结束时间" prop="planEndDatetime" />
           <el-table-column label="任务状态" prop="status">
             <template #default="scope">
               <span>
@@ -86,8 +88,8 @@
         />
       </div>
       <div class="SingleTask">
-        任务详情
-        <el-table :data="dataListTwo" v-loading="loadingTwo" stripe :max-height="295">
+        <div>任务详情</div>
+        <el-table :data="dataListTwo" v-loading="loadingTwo" stripe :max-height="280">
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -105,8 +107,8 @@
               <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
             </template>
           </el-table-column>
-          <el-table-column label="任务开始时间" prop="taskPlanStartDateFrom" />
-          <el-table-column label="任务结束时间" prop="taskPlanStartDateTo" />
+          <el-table-column label="任务开始时间" prop="planStartDatetime" />
+          <el-table-column label="任务结束时间" prop="planEndDatetime" />
           <el-table-column label="任务状态" prop="status">
             <template #default="scope">
               <span>
@@ -183,11 +185,12 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="20">
-            <el-form-item label="计划日期" prop="reportTime1">
+            <el-form-item label="计划日期" prop="publishTime1">
               <el-date-picker
                 style="width: 380px"
                 format="YYYY-MM-DD"
-                v-model="form.reportTime1"
+                value-format="YYYY-MM-DD"
+                v-model="AllData.publishTime1"
                 type="daterange"
                 range-separator="至"
                 start-placeholder="开始时间"
@@ -247,7 +250,8 @@
 const dataListTwo = ref([]);
 const DataList = ref([]);
 const AllData = reactive({
-  publishTime: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD ')],
+  publishTime: [],
+  publishTime1: [],
   form: {},
   queryParams: {
     pageNum: 1,
@@ -277,7 +281,7 @@
 }
 //重置
 function resetQuery() {
-  AllData.publishTime = [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD 23:59:59')];
+  AllData.publishTime = [];
   proxy.resetForm('queryRef');
   handleQuery();
 }
@@ -325,13 +329,19 @@
 
 //查看详情操作
 function handleDetail(row) {
-  DataList.value = row;
   opendetails.value = true;
+  DataList.value = { ...row };
+  // console.log(DataList.value, 'DataList.value');
 }
 
 /** 主任务查询列表 */
 const getList = async () => {
   loading.value = true;
+  console.log(AllData.publishTime, 'AllData.publishTime');
+  if (AllData.publishTime) {
+    queryParams.value.planStartDatetime = AllData.publishTime[0];
+    queryParams.value.planEndDatetime = AllData.publishTime[1];
+  }
   let res = await patrolTaskpage(queryParams.value);
   dataList.value = res.data;
   total.value = res.total;
@@ -351,6 +361,8 @@
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
     if (valid) {
+      form.value.planStartDatetime = AllData.publishTime1[0];
+      form.value.planEndDatetime = AllData.publishTime1[1];
       form.value.basicInfoId = '1686274734091489284';
       patrolTaskadd(form.value).then(response => {
         proxy.$modal.msgSuccess('新增成功');
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index 8c9a132..7b4d09d 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -15,31 +15,45 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">任务开始时间</div>
-        <div class="detail-value flex flex-align-center">123</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.planStartDatetime }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">任务结束时间</div>
-        <div class="detail-value flex flex-align-center">123</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">123</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">123</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">123</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">123</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">123</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.projectLocationName }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查项目</div>
@@ -49,23 +63,58 @@
       </div>
     </div>
     <!-- 巡查照片 -->
-    <div>
-      <p>巡查照片</p>
-      <div>123</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>
+      <el-empty v-else description="暂无图片" :image-size="30" />
+    </div> -->
 
-    <el-table :data="dataListTwo" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px">
+    <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="taskName" />
-      <el-table-column label="检查项" prop="taskName" />
-      <el-table-column label="是否整改" prop="taskName" />
-      <el-table-column label="是否整改" prop="taskName" />
-      <el-table-column label="上报时间" prop="taskName" />
+      <el-table-column label="问题类型" prop="problemType">
+        <!-- <template #default="scope">
+          <dict-tag :options="problem_type" :value="String(scope.row.problemType)" />
+        </template> -->
+      </el-table-column>
+      <el-table-column label="检查项" prop="checkItem" />
+      <el-table-column label="是否整改" prop="isRectification">
+        <template #default="scope">
+          <span>
+            {{
+              scope.row.isRectification == '1'
+                ? '无需整改'
+                : scope.row.isRectification == '2'
+                ? '待整改'
+                : scope.row.isRectification == '3'
+                ? '整改已完成'
+                : ''
+            }}
+          </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>
   </div>
 </template>
 
 <script setup>
+import { patrolProblempage } from '@/api/longoPeration/inspectiontasks';
 const props = defineProps({
   // 数据
   DataList: {
@@ -73,9 +122,30 @@
     default: null,
   },
 });
-onMounted(() => {
-  console.log(props.DataList, 'props');
-});
+const { proxy } = getCurrentInstance();
+const { problem_type } = proxy.useDict('problem_type'); //  巡查类型的字典
+const dataList = ref([]);
+const dataListPhone = ref([]);
+/** 查询列表 */
+const getList = async IdA => {
+  let res = await patrolProblempage({ patrolTaskId: IdA });
+  dataList.value = res.data;
+  res.data.forEach(element => {
+    dataListPhone.value = element.sysFileList;
+  });
+};
+
+watch(
+  () => props.DataList,
+  val => {
+    if (val) {
+      dataListPhone.value = [];
+      getList(props.DataList.id);
+    }
+  },
+  { deep: true, immediate: true }
+);
+onMounted(() => {});
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/publicService/lawRule.vue b/src/views/publicService/lawRule.vue
index 4b32c4e..d2fe6d0 100644
--- a/src/views/publicService/lawRule.vue
+++ b/src/views/publicService/lawRule.vue
@@ -23,11 +23,11 @@
       <el-table-column label="序号" type="index" width="55" />
       <el-table-column label="日期" prop="publishTime" />
       <el-table-column label="政策法规名称" prop="title" />
-      <el-table-column label="政策法规内容" prop="content" width="500" show-overflow-tooltip>
+      <!-- <el-table-column label="政策法规内容" prop="content" width="500" show-overflow-tooltip>
         <template #default="scope">
           <div v-html="scope.row.content"></div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
@@ -39,12 +39,11 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="240" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row)">详情</el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -59,7 +58,7 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm">
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm" :disabled="isDisab">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="政策法规名称:" prop="title">
@@ -103,7 +102,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="info" @click="cancelForm">取 消</el-button>
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm" v-show="!isDisab">确 定</el-button>
         </div>
       </template>
     </el-dialog>
@@ -114,16 +113,15 @@
 import { articlePage, articleAdd, articleDel, articleDetail, articleEdit } from '@/api/publicService/index';
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 import WangEditor from '@/components/WangEditor/index.vue'; //富文本编辑器
-
+import bus from '@/utils/mitt';
 const { proxy } = getCurrentInstance();
-
+const isDisab = ref(false);
 const tableData = ref([]);
 const tableLoading = ref(true);
 const total = ref(0);
 const dialogShow = ref(false);
 const dialogTitle = ref('');
 const showSearch = ref(true);
-
 const allData = reactive({
   formData: {
     articleType: 'policies',
@@ -172,15 +170,30 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
+  isDisab.value = false;
   dialogTitle.value = '添加政策法规';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
   articleDetail(row.id).then(response => {
     dialogShow.value = true;
+    isDisab.value = false;
     dialogTitle.value = '修改政策法规';
     nextTick(() => {
       formData.value = response.data;
+      bus.emit('changeEdit', true);
+    });
+  });
+}
+//详情按钮
+function handleDetail(row) {
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    isDisab.value = true;
+    dialogTitle.value = '查看通知公告';
+    nextTick(() => {
+      formData.value = response.data;
+      bus.emit('changeEdit', false);
     });
   });
 }
diff --git a/src/views/publicService/notices.vue b/src/views/publicService/notices.vue
index 4d3fed6..bf5ee49 100644
--- a/src/views/publicService/notices.vue
+++ b/src/views/publicService/notices.vue
@@ -21,20 +21,19 @@
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
       <el-table-column label="序号" type="index" width="55" />
-      <el-table-column label="发布日期" prop="publishTime" />
+      <el-table-column label="发布日期" prop="publishTime" width="170" />
       <el-table-column label="通知公告名称" prop="title"> </el-table-column>
-      <el-table-column label="通知内容" prop="content" width="500" show-overflow-tooltip>
+      <!-- <el-table-column label="通知内容" prop="content" width="500" show-overflow-tooltip>
         <template #default="scope">
           <div v-html="scope.row.content"></div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="跳转链接" prop="linkUrl" />
-      <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="240" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row)">详情</el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -49,7 +48,7 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm" :disabled="isDisab">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="发布日期:" prop="publishTime">
@@ -71,7 +70,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="通知内容" prop="content">
-              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
+              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal" ref="Editor"></WangEditor>
             </el-form-item>
           </el-col>
         </el-row>
@@ -79,7 +78,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="info" @click="cancelForm">取 消</el-button>
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm" v-show="!isDisab">确 定</el-button>
         </div>
       </template>
     </el-dialog>
@@ -88,19 +87,18 @@
 
 <script setup name="通知公告">
 import { articlePage, articleAdd, articleDel, articleDetail, articleEdit } from '@/api/publicService/index';
-
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 import WangEditor from '@/components/WangEditor/index.vue'; //富文本编辑器
-
+import bus from '@/utils/mitt';
 const { proxy } = getCurrentInstance();
-
+const isDisab = ref(false);
 const tableData = ref([]);
 const tableLoading = ref(true);
 const total = ref(0);
 const dialogShow = ref(false);
 const dialogTitle = ref('');
 const showSearch = ref(true);
-
+const Editor = ref(null);
 const allData = reactive({
   formData: {
     articleType: 'notice',
@@ -150,15 +148,30 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
+  isDisab.value = false;
   dialogTitle.value = '新增通知公告';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
   articleDetail(row.id).then(response => {
     dialogShow.value = true;
+    isDisab.value = false;
     dialogTitle.value = '修改通知公告';
     nextTick(() => {
       formData.value = response.data;
+      bus.emit('changeEdit', true);
+    });
+  });
+}
+//详情按钮
+function handleDetail(row) {
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    isDisab.value = true;
+    dialogTitle.value = '查看通知公告';
+    nextTick(() => {
+      formData.value = response.data;
+      bus.emit('changeEdit', false);
     });
   });
 }
diff --git a/src/views/publicService/publicmind.vue b/src/views/publicService/publicmind.vue
index d863a89..91fda0e 100644
--- a/src/views/publicService/publicmind.vue
+++ b/src/views/publicService/publicmind.vue
@@ -36,6 +36,7 @@
         <template #default="scope">
           <el-image style="width: 60px; height: 60px; margin: 5px" v-for="i in scope.row.filelist" :src="i.url" :preview-src-list="[i.url]">
           </el-image>
+          <span v-if="scope.row.filelist.length == ''">暂无照片</span>
         </template>
       </el-table-column>
       <el-table-column label="公众意见" prop="opinion" width="650" />
diff --git a/src/views/publicService/quesNaire.vue b/src/views/publicService/quesNaire.vue
index 9e986ce..2e96fa9 100644
--- a/src/views/publicService/quesNaire.vue
+++ b/src/views/publicService/quesNaire.vue
@@ -19,7 +19,7 @@
     <!-- 按钮区域 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-if="tableData.length == ''">新增</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
@@ -32,13 +32,13 @@
         </template>
       </el-table-column>
       <el-table-column label="创建时间" prop="createTime" />
-      <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="260" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button
             type="primary"
             icon="Edit"
             @click="handleUpdate(scope.row)"
-            v-if="scope.row.ifStart == 1 && scope.row.adjustmentStatus != 'ended'"
+            v-if="scope.row.ifStart == 0 && scope.row.adjustmentStatus != 'ended'"
           >
             修改
           </el-button>
@@ -90,7 +90,7 @@
               <dict-tag :options="typeList" :value="scope.row.problemType" />
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+          <el-table-column label="操作" width="240" class-name="small-padding fixed-width">
             <template #default="scope">
               <el-button type="primary" icon="Edit" @click="changeQues(scope.row)"> 修改 </el-button>
               <el-button type="danger" icon="Edit" @click="deleteQues(scope.row)"> 删除 </el-button>
@@ -228,9 +228,9 @@
 });
 const { queryParams, formData, rulesForm, formDataAns, rulesFormAns } = toRefs(allData);
 const statusList = ref([
-  { value: 'not_start', label: '未开始' },
-  { value: 'executing', label: '执行中' },
-  { value: 'ended', label: '已结束' },
+  { value: 1, label: '启用' },
+  // { value: 'executing', label: '执行中' },
+  { value: 0, label: '未启用' },
 ]);
 const typeList = ref([
   { value: 'radio', label: '单选' },
diff --git a/src/views/publicService/special.vue b/src/views/publicService/special.vue
index a60aef7..44b0c54 100644
--- a/src/views/publicService/special.vue
+++ b/src/views/publicService/special.vue
@@ -34,7 +34,7 @@
       <el-table-column label="序号" type="index" width="55" />
       <el-table-column label="培训日期" prop="trainTime" />
       <el-table-column label="培训地点" prop="address" />
-      <el-table-column label="请输入培训宣传名称" prop="title" />
+      <el-table-column label="培训宣传名称" prop="title" />
       <el-table-column label="参加人员" prop="people" />
       <el-table-column label="培训内容" prop="content" width="600" />
       <el-table-column label="跳转链接" prop="linkUrl" />
diff --git a/src/views/publicService/technical.vue b/src/views/publicService/technical.vue
index 1206899..4fab4d4 100644
--- a/src/views/publicService/technical.vue
+++ b/src/views/publicService/technical.vue
@@ -23,11 +23,11 @@
       <el-table-column label="序号" type="index" width="55" />
       <el-table-column label="发布日期" prop="publishTime" />
       <el-table-column label="技术标准名称" prop="title" />
-      <el-table-column label="技术标准内容" prop="content" width="500" show-overflow-tooltip>
+      <!-- <el-table-column label="技术标准内容" prop="content" width="500" show-overflow-tooltip>
         <template #default="scope">
           <div v-html="scope.row.content"></div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="封面缩略图" prop="coverPhotosFileList">
         <template #default="scope">
@@ -38,12 +38,11 @@
           ></ImagePreview>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="240" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row)">详情</el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -58,7 +57,7 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm">
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm" :disabled="isDisab">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="技术标准名称:" prop="title">
@@ -92,7 +91,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="info" @click="cancelForm">取 消</el-button>
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm" v-show="!isDisab">确 定</el-button>
         </div>
       </template>
     </el-dialog>
@@ -103,16 +102,15 @@
 import { articlePage, articleAdd, articleDel, articleDetail, articleEdit } from '@/api/publicService/index';
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 import WangEditor from '@/components/WangEditor/index.vue'; //富文本编辑器
-
+import bus from '@/utils/mitt';
 const { proxy } = getCurrentInstance();
-
+const isDisab = ref(false);
 const tableData = ref([]);
 const tableLoading = ref(true);
 const total = ref(0);
 const dialogShow = ref(false);
 const dialogTitle = ref('');
 const showSearch = ref(true);
-
 const allData = reactive({
   formData: {
     articleType: 'technical',
@@ -160,15 +158,30 @@
 function handleAdd() {
   proxy.resetForm('formRef'); //清空表单
   dialogShow.value = true;
+  isDisab.value = false;
   dialogTitle.value = '新增技术标准';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
   articleDetail(row.id).then(response => {
     dialogShow.value = true;
+    isDisab.value = false;
     dialogTitle.value = '修改技术标准';
     nextTick(() => {
       formData.value = response.data;
+      bus.emit('changeEdit', true);
+    });
+  });
+}
+//详情按钮
+function handleDetail(row) {
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    isDisab.value = true;
+    dialogTitle.value = '查看通知公告';
+    nextTick(() => {
+      formData.value = response.data;
+      bus.emit('changeEdit', false);
     });
   });
 }

diff --git a/src/api/longoPeration/inspectiontasks.js b/src/api/longoPeration/inspectiontasks.js
index 372ebb6..e837d13 100644
--- a/src/api/longoPeration/inspectiontasks.js
+++ b/src/api/longoPeration/inspectiontasks.js
@@ -25,19 +25,10 @@
   });
 }
 
-// // 修改排水防涝--市主干道积水点信息
-// export function waterloggedRoadedit(data) {
-//   return request({
-//     url: '/business/waterloggedRoad/edit',
-//     method: 'put',
-//     data: data,
-//   });
-// }
-
-// // 删除排水防涝--防汛物资
-// export function waterloggedRoaddelete(id) {
-//   return request({
-//     url: '/business/waterloggedRoad/' + id,
-//     method: 'delete',
-//   });
-// }
+export function patrolProblempage(query) {
+  return request({
+    url: '/business/patrolProblem/page',
+    method: 'get',
+    params: query,
+  });
+}
diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index d59f2b7..271ac3e 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -16,6 +16,7 @@
 import '@wangeditor/editor/dist/css/style.css'; // 引入 css
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
 import { sysUpload } from '@/api/login.js';
+import bus from '@/utils/mitt';
 
 const props = defineProps({
   modelValue: [String],
@@ -93,7 +94,12 @@
   { immediate: true, deep: true }
 );
 // 模拟 ajax 异步获取内容
-onMounted(() => {});
+onMounted(() => {
+  bus.on('changeEdit', i => {
+    if (!i) editorRef.value.disable();
+    else editorRef.value.enable();
+  });
+});
 // 组件销毁时，也及时销毁编辑器
 onBeforeUnmount(() => {
   const editor = editorRef.value;
diff --git a/src/views/login.vue b/src/views/login.vue
index 9ce6025..c709514 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -275,7 +275,7 @@
           background: url('@/assets/images/login/inputUser2.png') no-repeat;
           background-size: 100% 100%;
           position: relative;
-          left: 3px;
+          left: 0px;
           top: -2px;
         }
         .pass {
@@ -284,7 +284,7 @@
           background: url('@/assets/images/login/inputPass1.png') no-repeat;
           background-size: 100% 100%;
           position: relative;
-          left: 3px;
+          left: 0px;
           top: -2px;
         }
       }
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index 6a78290..dbd882b 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -2,7 +2,7 @@
   <!-- 日常巡查任务管理 -->
   <div class="publicContainer">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="任务名称11:" prop="taskName">
+      <el-form-item label="任务名称:" prop="taskName">
         <el-input v-model="queryParams.taskName" placeholder="请输入任务名称" clearable style="width: 180px" />
       </el-form-item>
       <el-form-item label="巡查人员:" prop="taskUserIdList">
@@ -10,10 +10,11 @@
           <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
         </el-select>
       </el-form-item>
-      <el-form-item label="任务日期" prop="reportTime">
+      <el-form-item label="任务日期" prop="publishTime">
         <el-date-picker
           style="width: 380px"
           format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           v-model="AllData.publishTime"
           type="daterange"
           range-separator="至"
@@ -34,9 +35,10 @@
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
+    <!--  -->
     <div class="whole">
       <div class="MainTask">
-        <el-table :data="dataList" v-loading="loading" stripe :max-height="295" @row-click="clickLogData">
+        <el-table :data="dataList" v-loading="loading" stripe :max-height="280" @row-click="clickLogData">
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -54,8 +56,8 @@
               <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
             </template>
           </el-table-column>
-          <el-table-column label="任务开始时间" prop="taskPlanStartDateFrom" />
-          <el-table-column label="任务结束时间" prop="taskPlanStartDateTo" />
+          <el-table-column label="任务开始时间" prop="planStartDatetime" />
+          <el-table-column label="任务结束时间" prop="planEndDatetime" />
           <el-table-column label="任务状态" prop="status">
             <template #default="scope">
               <span>
@@ -86,8 +88,8 @@
         />
       </div>
       <div class="SingleTask">
-        任务详情
-        <el-table :data="dataListTwo" v-loading="loadingTwo" stripe :max-height="295">
+        <div>任务详情</div>
+        <el-table :data="dataListTwo" v-loading="loadingTwo" stripe :max-height="280">
           <el-table-column type="index" width="55" label="序号" />
           <el-table-column label="任务名称" prop="taskName" />
           <el-table-column label="海绵项目名称" prop="projectList" show-overflow-tooltip width="300">
@@ -105,8 +107,8 @@
               <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
             </template>
           </el-table-column>
-          <el-table-column label="任务开始时间" prop="taskPlanStartDateFrom" />
-          <el-table-column label="任务结束时间" prop="taskPlanStartDateTo" />
+          <el-table-column label="任务开始时间" prop="planStartDatetime" />
+          <el-table-column label="任务结束时间" prop="planEndDatetime" />
           <el-table-column label="任务状态" prop="status">
             <template #default="scope">
               <span>
@@ -183,11 +185,12 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="20">
-            <el-form-item label="计划日期" prop="reportTime1">
+            <el-form-item label="计划日期" prop="publishTime1">
               <el-date-picker
                 style="width: 380px"
                 format="YYYY-MM-DD"
-                v-model="form.reportTime1"
+                value-format="YYYY-MM-DD"
+                v-model="AllData.publishTime1"
                 type="daterange"
                 range-separator="至"
                 start-placeholder="开始时间"
@@ -247,7 +250,8 @@
 const dataListTwo = ref([]);
 const DataList = ref([]);
 const AllData = reactive({
-  publishTime: [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD ')],
+  publishTime: [],
+  publishTime1: [],
   form: {},
   queryParams: {
     pageNum: 1,
@@ -277,7 +281,7 @@
 }
 //重置
 function resetQuery() {
-  AllData.publishTime = [proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD '), proxy.moment().format('YYYY-MM-DD 23:59:59')];
+  AllData.publishTime = [];
   proxy.resetForm('queryRef');
   handleQuery();
 }
@@ -325,13 +329,19 @@
 
 //查看详情操作
 function handleDetail(row) {
-  DataList.value = row;
   opendetails.value = true;
+  DataList.value = { ...row };
+  // console.log(DataList.value, 'DataList.value');
 }
 
 /** 主任务查询列表 */
 const getList = async () => {
   loading.value = true;
+  console.log(AllData.publishTime, 'AllData.publishTime');
+  if (AllData.publishTime) {
+    queryParams.value.planStartDatetime = AllData.publishTime[0];
+    queryParams.value.planEndDatetime = AllData.publishTime[1];
+  }
   let res = await patrolTaskpage(queryParams.value);
   dataList.value = res.data;
   total.value = res.total;
@@ -351,6 +361,8 @@
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
     if (valid) {
+      form.value.planStartDatetime = AllData.publishTime1[0];
+      form.value.planEndDatetime = AllData.publishTime1[1];
       form.value.basicInfoId = '1686274734091489284';
       patrolTaskadd(form.value).then(response => {
         proxy.$modal.msgSuccess('新增成功');
diff --git a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
index 8c9a132..7b4d09d 100644
--- a/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
+++ b/src/views/longoPeration/Patrolmanagement/pop-upbox.vue
@@ -15,31 +15,45 @@
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">任务开始时间</div>
-        <div class="detail-value flex flex-align-center">123</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.planStartDatetime }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">任务结束时间</div>
-        <div class="detail-value flex flex-align-center">123</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">123</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">123</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">123</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">123</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">123</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.projectLocationName }}</div>
       </div>
       <div class="flex flex-r">
         <div class="detail-label flex flex-align-center">巡查项目</div>
@@ -49,23 +63,58 @@
       </div>
     </div>
     <!-- 巡查照片 -->
-    <div>
-      <p>巡查照片</p>
-      <div>123</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>
+      <el-empty v-else description="暂无图片" :image-size="30" />
+    </div> -->
 
-    <el-table :data="dataListTwo" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px">
+    <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="taskName" />
-      <el-table-column label="检查项" prop="taskName" />
-      <el-table-column label="是否整改" prop="taskName" />
-      <el-table-column label="是否整改" prop="taskName" />
-      <el-table-column label="上报时间" prop="taskName" />
+      <el-table-column label="问题类型" prop="problemType">
+        <!-- <template #default="scope">
+          <dict-tag :options="problem_type" :value="String(scope.row.problemType)" />
+        </template> -->
+      </el-table-column>
+      <el-table-column label="检查项" prop="checkItem" />
+      <el-table-column label="是否整改" prop="isRectification">
+        <template #default="scope">
+          <span>
+            {{
+              scope.row.isRectification == '1'
+                ? '无需整改'
+                : scope.row.isRectification == '2'
+                ? '待整改'
+                : scope.row.isRectification == '3'
+                ? '整改已完成'
+                : ''
+            }}
+          </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>
   </div>
 </template>
 
 <script setup>
+import { patrolProblempage } from '@/api/longoPeration/inspectiontasks';
 const props = defineProps({
   // 数据
   DataList: {
@@ -73,9 +122,30 @@
     default: null,
   },
 });
-onMounted(() => {
-  console.log(props.DataList, 'props');
-});
+const { proxy } = getCurrentInstance();
+const { problem_type } = proxy.useDict('problem_type'); //  巡查类型的字典
+const dataList = ref([]);
+const dataListPhone = ref([]);
+/** 查询列表 */
+const getList = async IdA => {
+  let res = await patrolProblempage({ patrolTaskId: IdA });
+  dataList.value = res.data;
+  res.data.forEach(element => {
+    dataListPhone.value = element.sysFileList;
+  });
+};
+
+watch(
+  () => props.DataList,
+  val => {
+    if (val) {
+      dataListPhone.value = [];
+      getList(props.DataList.id);
+    }
+  },
+  { deep: true, immediate: true }
+);
+onMounted(() => {});
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/publicService/lawRule.vue b/src/views/publicService/lawRule.vue
index 4b32c4e..d2fe6d0 100644
--- a/src/views/publicService/lawRule.vue
+++ b/src/views/publicService/lawRule.vue
@@ -23,11 +23,11 @@
       <el-table-column label="序号" type="index" width="55" />
       <el-table-column label="日期" prop="publishTime" />
       <el-table-column label="政策法规名称" prop="title" />
-      <el-table-column label="政策法规内容" prop="content" width="500" show-overflow-tooltip>
+      <!-- <el-table-column label="政策法规内容" prop="content" width="500" show-overflow-tooltip>
         <template #default="scope">
           <div v-html="scope.row.content"></div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
@@ -39,12 +39,11 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="240" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row)">详情</el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -59,7 +58,7 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm">
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm" :disabled="isDisab">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="政策法规名称:" prop="title">
@@ -103,7 +102,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="info" @click="cancelForm">取 消</el-button>
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm" v-show="!isDisab">确 定</el-button>
         </div>
       </template>
     </el-dialog>
@@ -114,16 +113,15 @@
 import { articlePage, articleAdd, articleDel, articleDetail, articleEdit } from '@/api/publicService/index';
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 import WangEditor from '@/components/WangEditor/index.vue'; //富文本编辑器
-
+import bus from '@/utils/mitt';
 const { proxy } = getCurrentInstance();
-
+const isDisab = ref(false);
 const tableData = ref([]);
 const tableLoading = ref(true);
 const total = ref(0);
 const dialogShow = ref(false);
 const dialogTitle = ref('');
 const showSearch = ref(true);
-
 const allData = reactive({
   formData: {
     articleType: 'policies',
@@ -172,15 +170,30 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
+  isDisab.value = false;
   dialogTitle.value = '添加政策法规';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
   articleDetail(row.id).then(response => {
     dialogShow.value = true;
+    isDisab.value = false;
     dialogTitle.value = '修改政策法规';
     nextTick(() => {
       formData.value = response.data;
+      bus.emit('changeEdit', true);
+    });
+  });
+}
+//详情按钮
+function handleDetail(row) {
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    isDisab.value = true;
+    dialogTitle.value = '查看通知公告';
+    nextTick(() => {
+      formData.value = response.data;
+      bus.emit('changeEdit', false);
     });
   });
 }
diff --git a/src/views/publicService/notices.vue b/src/views/publicService/notices.vue
index 4d3fed6..bf5ee49 100644
--- a/src/views/publicService/notices.vue
+++ b/src/views/publicService/notices.vue
@@ -21,20 +21,19 @@
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
       <el-table-column label="序号" type="index" width="55" />
-      <el-table-column label="发布日期" prop="publishTime" />
+      <el-table-column label="发布日期" prop="publishTime" width="170" />
       <el-table-column label="通知公告名称" prop="title"> </el-table-column>
-      <el-table-column label="通知内容" prop="content" width="500" show-overflow-tooltip>
+      <!-- <el-table-column label="通知内容" prop="content" width="500" show-overflow-tooltip>
         <template #default="scope">
           <div v-html="scope.row.content"></div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="跳转链接" prop="linkUrl" />
-      <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="240" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row)">详情</el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -49,7 +48,7 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm" :disabled="isDisab">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="发布日期:" prop="publishTime">
@@ -71,7 +70,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="通知内容" prop="content">
-              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
+              <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal" ref="Editor"></WangEditor>
             </el-form-item>
           </el-col>
         </el-row>
@@ -79,7 +78,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="info" @click="cancelForm">取 消</el-button>
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm" v-show="!isDisab">确 定</el-button>
         </div>
       </template>
     </el-dialog>
@@ -88,19 +87,18 @@
 
 <script setup name="通知公告">
 import { articlePage, articleAdd, articleDel, articleDetail, articleEdit } from '@/api/publicService/index';
-
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 import WangEditor from '@/components/WangEditor/index.vue'; //富文本编辑器
-
+import bus from '@/utils/mitt';
 const { proxy } = getCurrentInstance();
-
+const isDisab = ref(false);
 const tableData = ref([]);
 const tableLoading = ref(true);
 const total = ref(0);
 const dialogShow = ref(false);
 const dialogTitle = ref('');
 const showSearch = ref(true);
-
+const Editor = ref(null);
 const allData = reactive({
   formData: {
     articleType: 'notice',
@@ -150,15 +148,30 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
+  isDisab.value = false;
   dialogTitle.value = '新增通知公告';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
   articleDetail(row.id).then(response => {
     dialogShow.value = true;
+    isDisab.value = false;
     dialogTitle.value = '修改通知公告';
     nextTick(() => {
       formData.value = response.data;
+      bus.emit('changeEdit', true);
+    });
+  });
+}
+//详情按钮
+function handleDetail(row) {
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    isDisab.value = true;
+    dialogTitle.value = '查看通知公告';
+    nextTick(() => {
+      formData.value = response.data;
+      bus.emit('changeEdit', false);
     });
   });
 }
diff --git a/src/views/publicService/publicmind.vue b/src/views/publicService/publicmind.vue
index d863a89..91fda0e 100644
--- a/src/views/publicService/publicmind.vue
+++ b/src/views/publicService/publicmind.vue
@@ -36,6 +36,7 @@
         <template #default="scope">
           <el-image style="width: 60px; height: 60px; margin: 5px" v-for="i in scope.row.filelist" :src="i.url" :preview-src-list="[i.url]">
           </el-image>
+          <span v-if="scope.row.filelist.length == ''">暂无照片</span>
         </template>
       </el-table-column>
       <el-table-column label="公众意见" prop="opinion" width="650" />
diff --git a/src/views/publicService/quesNaire.vue b/src/views/publicService/quesNaire.vue
index 9e986ce..2e96fa9 100644
--- a/src/views/publicService/quesNaire.vue
+++ b/src/views/publicService/quesNaire.vue
@@ -19,7 +19,7 @@
     <!-- 按钮区域 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-if="tableData.length == ''">新增</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
@@ -32,13 +32,13 @@
         </template>
       </el-table-column>
       <el-table-column label="创建时间" prop="createTime" />
-      <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="260" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button
             type="primary"
             icon="Edit"
             @click="handleUpdate(scope.row)"
-            v-if="scope.row.ifStart == 1 && scope.row.adjustmentStatus != 'ended'"
+            v-if="scope.row.ifStart == 0 && scope.row.adjustmentStatus != 'ended'"
           >
             修改
           </el-button>
@@ -90,7 +90,7 @@
               <dict-tag :options="typeList" :value="scope.row.problemType" />
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+          <el-table-column label="操作" width="240" class-name="small-padding fixed-width">
             <template #default="scope">
               <el-button type="primary" icon="Edit" @click="changeQues(scope.row)"> 修改 </el-button>
               <el-button type="danger" icon="Edit" @click="deleteQues(scope.row)"> 删除 </el-button>
@@ -228,9 +228,9 @@
 });
 const { queryParams, formData, rulesForm, formDataAns, rulesFormAns } = toRefs(allData);
 const statusList = ref([
-  { value: 'not_start', label: '未开始' },
-  { value: 'executing', label: '执行中' },
-  { value: 'ended', label: '已结束' },
+  { value: 1, label: '启用' },
+  // { value: 'executing', label: '执行中' },
+  { value: 0, label: '未启用' },
 ]);
 const typeList = ref([
   { value: 'radio', label: '单选' },
diff --git a/src/views/publicService/special.vue b/src/views/publicService/special.vue
index a60aef7..44b0c54 100644
--- a/src/views/publicService/special.vue
+++ b/src/views/publicService/special.vue
@@ -34,7 +34,7 @@
       <el-table-column label="序号" type="index" width="55" />
       <el-table-column label="培训日期" prop="trainTime" />
       <el-table-column label="培训地点" prop="address" />
-      <el-table-column label="请输入培训宣传名称" prop="title" />
+      <el-table-column label="培训宣传名称" prop="title" />
       <el-table-column label="参加人员" prop="people" />
       <el-table-column label="培训内容" prop="content" width="600" />
       <el-table-column label="跳转链接" prop="linkUrl" />
diff --git a/src/views/publicService/technical.vue b/src/views/publicService/technical.vue
index 1206899..4fab4d4 100644
--- a/src/views/publicService/technical.vue
+++ b/src/views/publicService/technical.vue
@@ -23,11 +23,11 @@
       <el-table-column label="序号" type="index" width="55" />
       <el-table-column label="发布日期" prop="publishTime" />
       <el-table-column label="技术标准名称" prop="title" />
-      <el-table-column label="技术标准内容" prop="content" width="500" show-overflow-tooltip>
+      <!-- <el-table-column label="技术标准内容" prop="content" width="500" show-overflow-tooltip>
         <template #default="scope">
           <div v-html="scope.row.content"></div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="跳转链接" prop="linkUrl" />
       <el-table-column label="封面缩略图" prop="coverPhotosFileList">
         <template #default="scope">
@@ -38,12 +38,11 @@
           ></ImagePreview>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="240" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['floodSys:jing:remove']">
-            删除
-          </el-button>
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row)">详情</el-button>
+          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -58,7 +57,7 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm">
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm" :disabled="isDisab">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="技术标准名称:" prop="title">
@@ -92,7 +91,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="info" @click="cancelForm">取 消</el-button>
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm" v-show="!isDisab">确 定</el-button>
         </div>
       </template>
     </el-dialog>
@@ -103,16 +102,15 @@
 import { articlePage, articleAdd, articleDel, articleDetail, articleEdit } from '@/api/publicService/index';
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
 import WangEditor from '@/components/WangEditor/index.vue'; //富文本编辑器
-
+import bus from '@/utils/mitt';
 const { proxy } = getCurrentInstance();
-
+const isDisab = ref(false);
 const tableData = ref([]);
 const tableLoading = ref(true);
 const total = ref(0);
 const dialogShow = ref(false);
 const dialogTitle = ref('');
 const showSearch = ref(true);
-
 const allData = reactive({
   formData: {
     articleType: 'technical',
@@ -160,15 +158,30 @@
 function handleAdd() {
   proxy.resetForm('formRef'); //清空表单
   dialogShow.value = true;
+  isDisab.value = false;
   dialogTitle.value = '新增技术标准';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
   articleDetail(row.id).then(response => {
     dialogShow.value = true;
+    isDisab.value = false;
     dialogTitle.value = '修改技术标准';
     nextTick(() => {
       formData.value = response.data;
+      bus.emit('changeEdit', true);
+    });
+  });
+}
+//详情按钮
+function handleDetail(row) {
+  articleDetail(row.id).then(response => {
+    dialogShow.value = true;
+    isDisab.value = true;
+    dialogTitle.value = '查看通知公告';
+    nextTick(() => {
+      formData.value = response.data;
+      bus.emit('changeEdit', false);
     });
   });
 }
diff --git a/vite.config.js b/vite.config.js
index 68f0eb0..06b69fe 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -8,7 +8,7 @@
 
 // const targetUrl = 'http://192.168.20.49:7200'; //谢斌斌
 // const targetUrl = 'http://192.168.20.52:7300'; //杨辉
-const targetUrl = 'http://kaifeng.wh-nf.cn/prod-api'; //线上
+const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode, command }) => {