diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
new file mode 100644
index 0000000..629d407
--- /dev/null
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -0,0 +1,298 @@
+<template>
+  <!-- 日常巡查任务管理 -->
+  <div class="publicContainer">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <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="isRectification">
+        <el-select clearable v-model="queryParams.isRectification" style="width: 180px" placeholder="请选择整改状态">
+          <el-option v-for="item in case_level" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="巡查类型:" prop="patrolType">
+        <el-select clearable v-model="queryParams.patrolType" style="width: 180px" placeholder="请选择巡查类型">
+          <el-option v-for="item in patrol_type" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 按钮区域 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <!-- <el-button type="primary" icon="Plus" @click="handleAdd">新增</el-button> -->
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
+    </el-row>
+    <!-- 表格 -->
+    <el-table :data="dataList" v-loading="loading" stripe :max-height="280">
+      <el-table-column type="index" width="55" label="序号" />
+      <el-table-column label="巡查任务名称" prop="taskName" />
+      <el-table-column label="巡查人员" prop="taskUserIdList">
+        <template #default="scope">
+          <p v-for="item in scope.row.taskUserList">{{ item.userName }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目名称" prop="expiredDays" />
+      <el-table-column label="问题上报时间" prop="issuedDatetime" />
+      <el-table-column label="问题类型" prop="expiredDays" />
+      <el-table-column label="检查项" prop="issuedDatetime" />
+      <el-table-column label="整改状态" prop="expiredDays" />
+      <el-table-column label="巡查类型" prop="patrolType">
+        <template #default="scope">
+          <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
+        </template>
+      </el-table-column>
+      <el-table-column label="问题描述" prop="expiredDays" />
+      <el-table-column label="操作" width="350">
+        <template #default="scope">
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">发布整改通知</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">提交整改回复单</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 新增弹窗 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body :close-on-click-modal="false">
+      <el-form ref="roleRef" :model="form" :rules="rules" label-width="120px" :disabled="multiple">
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="巡查任务名称:" prop="taskName">
+              <el-input v-model="form.taskName" placeholder="请输入巡查任务名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="巡查项目:" prop="projectCodeList">
+              <el-select v-model="form.projectCodeList" multiple placeholder="请选择巡查项目" clearable style="width: 100%">
+                <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="巡查类型:" prop="patrolType">
+              <el-select v-model="form.patrolType" placeholder="请选择巡查类型" clearable style="width: 100%">
+                <el-option v-for="item in patrol_type" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="计划日期" prop="publishTime1">
+              <el-date-picker
+                style="width: 380px"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                v-model="AllData.publishTime1"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="巡查任务描述:" prop="taskDescribe">
+              <el-input v-model="form.taskDescribe" placeholder="请输入巡查任务描述" type="textarea" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!--详情弹框 -->
+    <el-dialog
+      title="查看案件巡查问题详情"
+      v-model="opendetails"
+      width="1200px"
+      append-to-body
+      class="dialog-detail-box"
+      :close-on-click-modal="false"
+    >
+      <anjianPopup :DataList="DataList" />
+    </el-dialog>
+  </div>
+</template>
+<script setup name="CaseIssues">
+import { patrolTaskpage, patrolTaskadd, patrolBasicInfopage } from '@/api/longoPeration/inspectiontasks';
+import { getProjectInfoList } from '@/api/preassess/targetManage';
+import { listUser } from '@/api/system/user';
+import anjianPopup from '../longoPeration/Patrolmanagement/anjianPopup.vue'; //详情弹框
+const { proxy } = getCurrentInstance();
+const { patrol_type } = proxy.useDict('patrol_type'); //  巡查类型的字典
+const open = ref(false);
+const opendetails = ref(false);
+const multiple = ref(false);
+const showSearch = ref(true);
+const case_level = ref([
+  {
+    value: '1',
+    label: '无需整改',
+  },
+  {
+    value: '2',
+    label: '待整改',
+  },
+  { value: '3', label: '整改已完成' },
+]);
+
+const projectTList = ref([]);
+const loading = ref(true);
+const loadingTwo = ref(false);
+const total = ref(0);
+const totaltwo = ref(0);
+const title = ref('');
+const dataList = ref([]);
+const dataListTwo = ref([]);
+const DataList = ref([]);
+const AllData = reactive({
+  publishTime: [],
+  publishTime1: [],
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    handleStatus: '',
+    taskName: '',
+    taskUserIdList: '',
+    fatherCode: 0,
+  },
+  queryParamstwo: {
+    pageNum: 1,
+    pageSize: 10,
+  },
+
+  rules: {
+    taskName: [{ required: true, message: '请输入巡查任务名称', trigger: 'blur' }],
+    projectCodeList: [{ required: true, message: '请选择巡查项目', trigger: 'blur' }],
+    taskUserIdList: [{ required: true, message: '请选择巡查人员', trigger: 'blur' }],
+    patrolType: [{ required: true, message: '请选择巡查类型', trigger: 'blur' }],
+  },
+});
+const { queryParams, form, rules, queryParamstwo } = toRefs(AllData);
+
+//搜索
+function handleQuery() {
+  getList();
+}
+//重置
+function resetQuery() {
+  AllData.publishTime = [];
+  proxy.resetForm('queryRef');
+  handleQuery();
+}
+
+// 项目接口
+async function projectTypeListM() {
+  let { data } = await getProjectInfoList();
+  projectTList.value = data;
+}
+
+//
+const BasicInfopage = ref('');
+function projectTypeListMPage() {
+  patrolBasicInfopage().then(res => {
+    BasicInfopage.value = res.data;
+    // console.log(BasicInfopage.value, 'res.data');
+  });
+}
+
+//表格点击事件
+function clickLogData(val) {
+  val.fatherCode = val.number;
+  getList1(val.fatherCode);
+}
+
+// 新增
+function handleAdd() {
+  title.value = '新增巡查任务';
+  open.value = true;
+  form.value = {};
+  multiple.value = false;
+}
+// 新增中取消事件
+function cancel() {
+  open.value = false;
+  proxy.resetForm('roleRef');
+}
+
+//查看详情操作
+function handleDetail(row) {
+  opendetails.value = true;
+  DataList.value = { ...row };
+  // console.log(DataList.value, 'DataList.value');
+}
+
+/** 主任务查询列表 */
+const getList = async () => {
+  loading.value = true;
+  console.log(AllData.publishTime, 'AllData.publishTime');
+  if (AllData.publishTime) {
+    queryParams.value.planStartDatetime = AllData.publishTime[0];
+    queryParams.value.planEndDatetime = AllData.publishTime[1];
+  }
+  let res = await patrolTaskpage(queryParams.value);
+  dataList.value = res.data;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 查询列表 */
+const getList1 = async code => {
+  loadingTwo.value = true;
+  let res = await patrolTaskpage({ ...queryParamstwo.value, fatherCode: code });
+  dataListTwo.value = res.data;
+  totaltwo.value = res.total;
+  loadingTwo.value = false;
+};
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs['roleRef'].validate(valid => {
+    if (valid) {
+      form.value.planStartDatetime = AllData.publishTime1[0];
+      form.value.planEndDatetime = AllData.publishTime1[1];
+      form.value.basicInfoId = '1686274734091489284';
+      patrolTaskadd(form.value).then(response => {
+        proxy.$modal.msgSuccess('新增成功');
+        open.value = false;
+        getList();
+      });
+    }
+  });
+}
+
+onMounted(() => {
+  getList();
+  projectTypeListM();
+  projectTypeListMPage();
+  // getList1();
+});
+</script>
+<style scoped lang="scss"></style>

diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
new file mode 100644
index 0000000..629d407
--- /dev/null
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -0,0 +1,298 @@
+<template>
+  <!-- 日常巡查任务管理 -->
+  <div class="publicContainer">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <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="isRectification">
+        <el-select clearable v-model="queryParams.isRectification" style="width: 180px" placeholder="请选择整改状态">
+          <el-option v-for="item in case_level" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="巡查类型:" prop="patrolType">
+        <el-select clearable v-model="queryParams.patrolType" style="width: 180px" placeholder="请选择巡查类型">
+          <el-option v-for="item in patrol_type" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 按钮区域 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <!-- <el-button type="primary" icon="Plus" @click="handleAdd">新增</el-button> -->
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
+    </el-row>
+    <!-- 表格 -->
+    <el-table :data="dataList" v-loading="loading" stripe :max-height="280">
+      <el-table-column type="index" width="55" label="序号" />
+      <el-table-column label="巡查任务名称" prop="taskName" />
+      <el-table-column label="巡查人员" prop="taskUserIdList">
+        <template #default="scope">
+          <p v-for="item in scope.row.taskUserList">{{ item.userName }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目名称" prop="expiredDays" />
+      <el-table-column label="问题上报时间" prop="issuedDatetime" />
+      <el-table-column label="问题类型" prop="expiredDays" />
+      <el-table-column label="检查项" prop="issuedDatetime" />
+      <el-table-column label="整改状态" prop="expiredDays" />
+      <el-table-column label="巡查类型" prop="patrolType">
+        <template #default="scope">
+          <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
+        </template>
+      </el-table-column>
+      <el-table-column label="问题描述" prop="expiredDays" />
+      <el-table-column label="操作" width="350">
+        <template #default="scope">
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">发布整改通知</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">提交整改回复单</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 新增弹窗 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body :close-on-click-modal="false">
+      <el-form ref="roleRef" :model="form" :rules="rules" label-width="120px" :disabled="multiple">
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="巡查任务名称:" prop="taskName">
+              <el-input v-model="form.taskName" placeholder="请输入巡查任务名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="巡查项目:" prop="projectCodeList">
+              <el-select v-model="form.projectCodeList" multiple placeholder="请选择巡查项目" clearable style="width: 100%">
+                <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="巡查类型:" prop="patrolType">
+              <el-select v-model="form.patrolType" placeholder="请选择巡查类型" clearable style="width: 100%">
+                <el-option v-for="item in patrol_type" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="计划日期" prop="publishTime1">
+              <el-date-picker
+                style="width: 380px"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                v-model="AllData.publishTime1"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="巡查任务描述:" prop="taskDescribe">
+              <el-input v-model="form.taskDescribe" placeholder="请输入巡查任务描述" type="textarea" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!--详情弹框 -->
+    <el-dialog
+      title="查看案件巡查问题详情"
+      v-model="opendetails"
+      width="1200px"
+      append-to-body
+      class="dialog-detail-box"
+      :close-on-click-modal="false"
+    >
+      <anjianPopup :DataList="DataList" />
+    </el-dialog>
+  </div>
+</template>
+<script setup name="CaseIssues">
+import { patrolTaskpage, patrolTaskadd, patrolBasicInfopage } from '@/api/longoPeration/inspectiontasks';
+import { getProjectInfoList } from '@/api/preassess/targetManage';
+import { listUser } from '@/api/system/user';
+import anjianPopup from '../longoPeration/Patrolmanagement/anjianPopup.vue'; //详情弹框
+const { proxy } = getCurrentInstance();
+const { patrol_type } = proxy.useDict('patrol_type'); //  巡查类型的字典
+const open = ref(false);
+const opendetails = ref(false);
+const multiple = ref(false);
+const showSearch = ref(true);
+const case_level = ref([
+  {
+    value: '1',
+    label: '无需整改',
+  },
+  {
+    value: '2',
+    label: '待整改',
+  },
+  { value: '3', label: '整改已完成' },
+]);
+
+const projectTList = ref([]);
+const loading = ref(true);
+const loadingTwo = ref(false);
+const total = ref(0);
+const totaltwo = ref(0);
+const title = ref('');
+const dataList = ref([]);
+const dataListTwo = ref([]);
+const DataList = ref([]);
+const AllData = reactive({
+  publishTime: [],
+  publishTime1: [],
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    handleStatus: '',
+    taskName: '',
+    taskUserIdList: '',
+    fatherCode: 0,
+  },
+  queryParamstwo: {
+    pageNum: 1,
+    pageSize: 10,
+  },
+
+  rules: {
+    taskName: [{ required: true, message: '请输入巡查任务名称', trigger: 'blur' }],
+    projectCodeList: [{ required: true, message: '请选择巡查项目', trigger: 'blur' }],
+    taskUserIdList: [{ required: true, message: '请选择巡查人员', trigger: 'blur' }],
+    patrolType: [{ required: true, message: '请选择巡查类型', trigger: 'blur' }],
+  },
+});
+const { queryParams, form, rules, queryParamstwo } = toRefs(AllData);
+
+//搜索
+function handleQuery() {
+  getList();
+}
+//重置
+function resetQuery() {
+  AllData.publishTime = [];
+  proxy.resetForm('queryRef');
+  handleQuery();
+}
+
+// 项目接口
+async function projectTypeListM() {
+  let { data } = await getProjectInfoList();
+  projectTList.value = data;
+}
+
+//
+const BasicInfopage = ref('');
+function projectTypeListMPage() {
+  patrolBasicInfopage().then(res => {
+    BasicInfopage.value = res.data;
+    // console.log(BasicInfopage.value, 'res.data');
+  });
+}
+
+//表格点击事件
+function clickLogData(val) {
+  val.fatherCode = val.number;
+  getList1(val.fatherCode);
+}
+
+// 新增
+function handleAdd() {
+  title.value = '新增巡查任务';
+  open.value = true;
+  form.value = {};
+  multiple.value = false;
+}
+// 新增中取消事件
+function cancel() {
+  open.value = false;
+  proxy.resetForm('roleRef');
+}
+
+//查看详情操作
+function handleDetail(row) {
+  opendetails.value = true;
+  DataList.value = { ...row };
+  // console.log(DataList.value, 'DataList.value');
+}
+
+/** 主任务查询列表 */
+const getList = async () => {
+  loading.value = true;
+  console.log(AllData.publishTime, 'AllData.publishTime');
+  if (AllData.publishTime) {
+    queryParams.value.planStartDatetime = AllData.publishTime[0];
+    queryParams.value.planEndDatetime = AllData.publishTime[1];
+  }
+  let res = await patrolTaskpage(queryParams.value);
+  dataList.value = res.data;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 查询列表 */
+const getList1 = async code => {
+  loadingTwo.value = true;
+  let res = await patrolTaskpage({ ...queryParamstwo.value, fatherCode: code });
+  dataListTwo.value = res.data;
+  totaltwo.value = res.total;
+  loadingTwo.value = false;
+};
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs['roleRef'].validate(valid => {
+    if (valid) {
+      form.value.planStartDatetime = AllData.publishTime1[0];
+      form.value.planEndDatetime = AllData.publishTime1[1];
+      form.value.basicInfoId = '1686274734091489284';
+      patrolTaskadd(form.value).then(response => {
+        proxy.$modal.msgSuccess('新增成功');
+        open.value = false;
+        getList();
+      });
+    }
+  });
+}
+
+onMounted(() => {
+  getList();
+  projectTypeListM();
+  projectTypeListMPage();
+  // getList1();
+});
+</script>
+<style scoped lang="scss"></style>
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index 65b64b3..1f0ce78 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -49,8 +49,12 @@
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="巡查计划名称" prop="planName" />
       <el-table-column label="项目名称" prop="project" />
-      <el-table-column label="巡查人员" prop="user" />
-      <el-table-column label="巡查类型" prop="patrolType" />
+      <el-table-column label="巡查人员" prop="planUserIds" />
+      <el-table-column label="巡查类型" prop="patrolType">
+        <template #default="scope">
+          <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
+        </template>
+      </el-table-column>
       <el-table-column label="巡查公里数(km)" prop="num" />
       <el-table-column label="计划开始时间" prop="startTime" />
       <el-table-column label="计划结束时间" prop="endDate" />
@@ -171,6 +175,7 @@
   FloodPreventionMaterialdelete,
 } from '@/api/longoPeration/Inspectionplana';
 const { proxy } = getCurrentInstance();
+const { patrol_type } = proxy.useDict('patrol_type'); //  巡查类型的字典
 const open = ref(false);
 const multiple = ref(false);
 const showSearch = ref(true);

diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
new file mode 100644
index 0000000..629d407
--- /dev/null
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -0,0 +1,298 @@
+<template>
+  <!-- 日常巡查任务管理 -->
+  <div class="publicContainer">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <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="isRectification">
+        <el-select clearable v-model="queryParams.isRectification" style="width: 180px" placeholder="请选择整改状态">
+          <el-option v-for="item in case_level" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="巡查类型:" prop="patrolType">
+        <el-select clearable v-model="queryParams.patrolType" style="width: 180px" placeholder="请选择巡查类型">
+          <el-option v-for="item in patrol_type" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 按钮区域 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <!-- <el-button type="primary" icon="Plus" @click="handleAdd">新增</el-button> -->
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
+    </el-row>
+    <!-- 表格 -->
+    <el-table :data="dataList" v-loading="loading" stripe :max-height="280">
+      <el-table-column type="index" width="55" label="序号" />
+      <el-table-column label="巡查任务名称" prop="taskName" />
+      <el-table-column label="巡查人员" prop="taskUserIdList">
+        <template #default="scope">
+          <p v-for="item in scope.row.taskUserList">{{ item.userName }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目名称" prop="expiredDays" />
+      <el-table-column label="问题上报时间" prop="issuedDatetime" />
+      <el-table-column label="问题类型" prop="expiredDays" />
+      <el-table-column label="检查项" prop="issuedDatetime" />
+      <el-table-column label="整改状态" prop="expiredDays" />
+      <el-table-column label="巡查类型" prop="patrolType">
+        <template #default="scope">
+          <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
+        </template>
+      </el-table-column>
+      <el-table-column label="问题描述" prop="expiredDays" />
+      <el-table-column label="操作" width="350">
+        <template #default="scope">
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">发布整改通知</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">提交整改回复单</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 新增弹窗 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body :close-on-click-modal="false">
+      <el-form ref="roleRef" :model="form" :rules="rules" label-width="120px" :disabled="multiple">
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="巡查任务名称:" prop="taskName">
+              <el-input v-model="form.taskName" placeholder="请输入巡查任务名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="巡查项目:" prop="projectCodeList">
+              <el-select v-model="form.projectCodeList" multiple placeholder="请选择巡查项目" clearable style="width: 100%">
+                <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="巡查类型:" prop="patrolType">
+              <el-select v-model="form.patrolType" placeholder="请选择巡查类型" clearable style="width: 100%">
+                <el-option v-for="item in patrol_type" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="计划日期" prop="publishTime1">
+              <el-date-picker
+                style="width: 380px"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                v-model="AllData.publishTime1"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="巡查任务描述:" prop="taskDescribe">
+              <el-input v-model="form.taskDescribe" placeholder="请输入巡查任务描述" type="textarea" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!--详情弹框 -->
+    <el-dialog
+      title="查看案件巡查问题详情"
+      v-model="opendetails"
+      width="1200px"
+      append-to-body
+      class="dialog-detail-box"
+      :close-on-click-modal="false"
+    >
+      <anjianPopup :DataList="DataList" />
+    </el-dialog>
+  </div>
+</template>
+<script setup name="CaseIssues">
+import { patrolTaskpage, patrolTaskadd, patrolBasicInfopage } from '@/api/longoPeration/inspectiontasks';
+import { getProjectInfoList } from '@/api/preassess/targetManage';
+import { listUser } from '@/api/system/user';
+import anjianPopup from '../longoPeration/Patrolmanagement/anjianPopup.vue'; //详情弹框
+const { proxy } = getCurrentInstance();
+const { patrol_type } = proxy.useDict('patrol_type'); //  巡查类型的字典
+const open = ref(false);
+const opendetails = ref(false);
+const multiple = ref(false);
+const showSearch = ref(true);
+const case_level = ref([
+  {
+    value: '1',
+    label: '无需整改',
+  },
+  {
+    value: '2',
+    label: '待整改',
+  },
+  { value: '3', label: '整改已完成' },
+]);
+
+const projectTList = ref([]);
+const loading = ref(true);
+const loadingTwo = ref(false);
+const total = ref(0);
+const totaltwo = ref(0);
+const title = ref('');
+const dataList = ref([]);
+const dataListTwo = ref([]);
+const DataList = ref([]);
+const AllData = reactive({
+  publishTime: [],
+  publishTime1: [],
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    handleStatus: '',
+    taskName: '',
+    taskUserIdList: '',
+    fatherCode: 0,
+  },
+  queryParamstwo: {
+    pageNum: 1,
+    pageSize: 10,
+  },
+
+  rules: {
+    taskName: [{ required: true, message: '请输入巡查任务名称', trigger: 'blur' }],
+    projectCodeList: [{ required: true, message: '请选择巡查项目', trigger: 'blur' }],
+    taskUserIdList: [{ required: true, message: '请选择巡查人员', trigger: 'blur' }],
+    patrolType: [{ required: true, message: '请选择巡查类型', trigger: 'blur' }],
+  },
+});
+const { queryParams, form, rules, queryParamstwo } = toRefs(AllData);
+
+//搜索
+function handleQuery() {
+  getList();
+}
+//重置
+function resetQuery() {
+  AllData.publishTime = [];
+  proxy.resetForm('queryRef');
+  handleQuery();
+}
+
+// 项目接口
+async function projectTypeListM() {
+  let { data } = await getProjectInfoList();
+  projectTList.value = data;
+}
+
+//
+const BasicInfopage = ref('');
+function projectTypeListMPage() {
+  patrolBasicInfopage().then(res => {
+    BasicInfopage.value = res.data;
+    // console.log(BasicInfopage.value, 'res.data');
+  });
+}
+
+//表格点击事件
+function clickLogData(val) {
+  val.fatherCode = val.number;
+  getList1(val.fatherCode);
+}
+
+// 新增
+function handleAdd() {
+  title.value = '新增巡查任务';
+  open.value = true;
+  form.value = {};
+  multiple.value = false;
+}
+// 新增中取消事件
+function cancel() {
+  open.value = false;
+  proxy.resetForm('roleRef');
+}
+
+//查看详情操作
+function handleDetail(row) {
+  opendetails.value = true;
+  DataList.value = { ...row };
+  // console.log(DataList.value, 'DataList.value');
+}
+
+/** 主任务查询列表 */
+const getList = async () => {
+  loading.value = true;
+  console.log(AllData.publishTime, 'AllData.publishTime');
+  if (AllData.publishTime) {
+    queryParams.value.planStartDatetime = AllData.publishTime[0];
+    queryParams.value.planEndDatetime = AllData.publishTime[1];
+  }
+  let res = await patrolTaskpage(queryParams.value);
+  dataList.value = res.data;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 查询列表 */
+const getList1 = async code => {
+  loadingTwo.value = true;
+  let res = await patrolTaskpage({ ...queryParamstwo.value, fatherCode: code });
+  dataListTwo.value = res.data;
+  totaltwo.value = res.total;
+  loadingTwo.value = false;
+};
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs['roleRef'].validate(valid => {
+    if (valid) {
+      form.value.planStartDatetime = AllData.publishTime1[0];
+      form.value.planEndDatetime = AllData.publishTime1[1];
+      form.value.basicInfoId = '1686274734091489284';
+      patrolTaskadd(form.value).then(response => {
+        proxy.$modal.msgSuccess('新增成功');
+        open.value = false;
+        getList();
+      });
+    }
+  });
+}
+
+onMounted(() => {
+  getList();
+  projectTypeListM();
+  projectTypeListMPage();
+  // getList1();
+});
+</script>
+<style scoped lang="scss"></style>
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index 65b64b3..1f0ce78 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -49,8 +49,12 @@
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="巡查计划名称" prop="planName" />
       <el-table-column label="项目名称" prop="project" />
-      <el-table-column label="巡查人员" prop="user" />
-      <el-table-column label="巡查类型" prop="patrolType" />
+      <el-table-column label="巡查人员" prop="planUserIds" />
+      <el-table-column label="巡查类型" prop="patrolType">
+        <template #default="scope">
+          <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
+        </template>
+      </el-table-column>
       <el-table-column label="巡查公里数(km)" prop="num" />
       <el-table-column label="计划开始时间" prop="startTime" />
       <el-table-column label="计划结束时间" prop="endDate" />
@@ -171,6 +175,7 @@
   FloodPreventionMaterialdelete,
 } from '@/api/longoPeration/Inspectionplana';
 const { proxy } = getCurrentInstance();
+const { patrol_type } = proxy.useDict('patrol_type'); //  巡查类型的字典
 const open = ref(false);
 const multiple = ref(false);
 const showSearch = ref(true);
diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
new file mode 100644
index 0000000..79636fc
--- /dev/null
+++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
@@ -0,0 +1,153 @@
+<template>
+  <div class="first">
+    <!-- 类容 -->
+    <div class="dialog-form-detail flex flex-r flex-wrap" style="margin-top: 5px">
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">巡查任务名称</div>
+        <div class="detail-value flex flex-align-center">
+          {{ props.DataList.taskName }}
+        </div>
+      </div>
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">巡查人员</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.taskUserList[0].userName }}</div>
+      </div>
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">任务开始时间</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.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">{{ props.DataList.planEndDatetime }}</div>
+      </div>
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">任务状态</div>
+        <div class="detail-value flex flex-align-center">
+          <span>
+            {{
+              props.DataList.status == 'to_start'
+                ? '未开始'
+                : props.DataList.status == 'proceed'
+                ? '进行中'
+                : props.DataList.status == 'done'
+                ? '已完成'
+                : props.DataList.status == 'expired'
+                ? '超时'
+                : ''
+            }}
+          </span>
+        </div>
+      </div>
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">超时时间</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.expiredDays }}</div>
+      </div>
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">任务下发时间</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.issuedDatetime }}</div>
+      </div>
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">巡查任务描述</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.taskDescribe }}</div>
+      </div>
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">巡查位置</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.projectLocationName }}</div>
+      </div>
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">巡查项目</div>
+        <div class="detail-value flex flex-align-center">
+          {{ props.DataList.projectList[0].projectAbbreviation }}
+        </div>
+      </div>
+    </div>
+    <!-- 巡查照片 -->
+    <!-- <div>
+      <p style="color: aliceblue">巡查照片</p>
+      <div v-if="dataListPhone.length">
+        <el-image style="width: 150px; height: 60px; margin: 5px" v-for="i in dataListPhone" :src="i.url" :preview-src-list="[i.url]">
+        </el-image>
+      </div>
+      <el-empty v-else description="暂无图片" :image-size="30" />
+    </div> -->
+
+    <el-table :data="dataList" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px">
+      <el-table-column type="index" width="55" label="序号" />
+      <el-table-column label="问题类型" prop="problemType">
+        <!-- <template #default="scope">
+          <dict-tag :options="problem_type" :value="String(scope.row.problemType)" />
+        </template> -->
+      </el-table-column>
+      <el-table-column label="检查项" prop="checkItem" />
+      <el-table-column label="是否整改" prop="isRectification">
+        <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: {
+    type: Array,
+    default: null,
+  },
+});
+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">
+.first {
+}
+</style>

diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue
new file mode 100644
index 0000000..629d407
--- /dev/null
+++ b/src/views/longoPeration/CaseIssues.vue
@@ -0,0 +1,298 @@
+<template>
+  <!-- 日常巡查任务管理 -->
+  <div class="publicContainer">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <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="isRectification">
+        <el-select clearable v-model="queryParams.isRectification" style="width: 180px" placeholder="请选择整改状态">
+          <el-option v-for="item in case_level" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="巡查类型:" prop="patrolType">
+        <el-select clearable v-model="queryParams.patrolType" style="width: 180px" placeholder="请选择巡查类型">
+          <el-option v-for="item in patrol_type" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 按钮区域 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <!-- <el-button type="primary" icon="Plus" @click="handleAdd">新增</el-button> -->
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
+    </el-row>
+    <!-- 表格 -->
+    <el-table :data="dataList" v-loading="loading" stripe :max-height="280">
+      <el-table-column type="index" width="55" label="序号" />
+      <el-table-column label="巡查任务名称" prop="taskName" />
+      <el-table-column label="巡查人员" prop="taskUserIdList">
+        <template #default="scope">
+          <p v-for="item in scope.row.taskUserList">{{ item.userName }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目名称" prop="expiredDays" />
+      <el-table-column label="问题上报时间" prop="issuedDatetime" />
+      <el-table-column label="问题类型" prop="expiredDays" />
+      <el-table-column label="检查项" prop="issuedDatetime" />
+      <el-table-column label="整改状态" prop="expiredDays" />
+      <el-table-column label="巡查类型" prop="patrolType">
+        <template #default="scope">
+          <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
+        </template>
+      </el-table-column>
+      <el-table-column label="问题描述" prop="expiredDays" />
+      <el-table-column label="操作" width="350">
+        <template #default="scope">
+          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">发布整改通知</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">提交整改回复单</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 新增弹窗 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body :close-on-click-modal="false">
+      <el-form ref="roleRef" :model="form" :rules="rules" label-width="120px" :disabled="multiple">
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="巡查任务名称:" prop="taskName">
+              <el-input v-model="form.taskName" placeholder="请输入巡查任务名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="巡查项目:" prop="projectCodeList">
+              <el-select v-model="form.projectCodeList" multiple placeholder="请选择巡查项目" clearable style="width: 100%">
+                <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="巡查类型:" prop="patrolType">
+              <el-select v-model="form.patrolType" placeholder="请选择巡查类型" clearable style="width: 100%">
+                <el-option v-for="item in patrol_type" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="计划日期" prop="publishTime1">
+              <el-date-picker
+                style="width: 380px"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                v-model="AllData.publishTime1"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="巡查任务描述:" prop="taskDescribe">
+              <el-input v-model="form.taskDescribe" placeholder="请输入巡查任务描述" type="textarea" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!--详情弹框 -->
+    <el-dialog
+      title="查看案件巡查问题详情"
+      v-model="opendetails"
+      width="1200px"
+      append-to-body
+      class="dialog-detail-box"
+      :close-on-click-modal="false"
+    >
+      <anjianPopup :DataList="DataList" />
+    </el-dialog>
+  </div>
+</template>
+<script setup name="CaseIssues">
+import { patrolTaskpage, patrolTaskadd, patrolBasicInfopage } from '@/api/longoPeration/inspectiontasks';
+import { getProjectInfoList } from '@/api/preassess/targetManage';
+import { listUser } from '@/api/system/user';
+import anjianPopup from '../longoPeration/Patrolmanagement/anjianPopup.vue'; //详情弹框
+const { proxy } = getCurrentInstance();
+const { patrol_type } = proxy.useDict('patrol_type'); //  巡查类型的字典
+const open = ref(false);
+const opendetails = ref(false);
+const multiple = ref(false);
+const showSearch = ref(true);
+const case_level = ref([
+  {
+    value: '1',
+    label: '无需整改',
+  },
+  {
+    value: '2',
+    label: '待整改',
+  },
+  { value: '3', label: '整改已完成' },
+]);
+
+const projectTList = ref([]);
+const loading = ref(true);
+const loadingTwo = ref(false);
+const total = ref(0);
+const totaltwo = ref(0);
+const title = ref('');
+const dataList = ref([]);
+const dataListTwo = ref([]);
+const DataList = ref([]);
+const AllData = reactive({
+  publishTime: [],
+  publishTime1: [],
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    handleStatus: '',
+    taskName: '',
+    taskUserIdList: '',
+    fatherCode: 0,
+  },
+  queryParamstwo: {
+    pageNum: 1,
+    pageSize: 10,
+  },
+
+  rules: {
+    taskName: [{ required: true, message: '请输入巡查任务名称', trigger: 'blur' }],
+    projectCodeList: [{ required: true, message: '请选择巡查项目', trigger: 'blur' }],
+    taskUserIdList: [{ required: true, message: '请选择巡查人员', trigger: 'blur' }],
+    patrolType: [{ required: true, message: '请选择巡查类型', trigger: 'blur' }],
+  },
+});
+const { queryParams, form, rules, queryParamstwo } = toRefs(AllData);
+
+//搜索
+function handleQuery() {
+  getList();
+}
+//重置
+function resetQuery() {
+  AllData.publishTime = [];
+  proxy.resetForm('queryRef');
+  handleQuery();
+}
+
+// 项目接口
+async function projectTypeListM() {
+  let { data } = await getProjectInfoList();
+  projectTList.value = data;
+}
+
+//
+const BasicInfopage = ref('');
+function projectTypeListMPage() {
+  patrolBasicInfopage().then(res => {
+    BasicInfopage.value = res.data;
+    // console.log(BasicInfopage.value, 'res.data');
+  });
+}
+
+//表格点击事件
+function clickLogData(val) {
+  val.fatherCode = val.number;
+  getList1(val.fatherCode);
+}
+
+// 新增
+function handleAdd() {
+  title.value = '新增巡查任务';
+  open.value = true;
+  form.value = {};
+  multiple.value = false;
+}
+// 新增中取消事件
+function cancel() {
+  open.value = false;
+  proxy.resetForm('roleRef');
+}
+
+//查看详情操作
+function handleDetail(row) {
+  opendetails.value = true;
+  DataList.value = { ...row };
+  // console.log(DataList.value, 'DataList.value');
+}
+
+/** 主任务查询列表 */
+const getList = async () => {
+  loading.value = true;
+  console.log(AllData.publishTime, 'AllData.publishTime');
+  if (AllData.publishTime) {
+    queryParams.value.planStartDatetime = AllData.publishTime[0];
+    queryParams.value.planEndDatetime = AllData.publishTime[1];
+  }
+  let res = await patrolTaskpage(queryParams.value);
+  dataList.value = res.data;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 查询列表 */
+const getList1 = async code => {
+  loadingTwo.value = true;
+  let res = await patrolTaskpage({ ...queryParamstwo.value, fatherCode: code });
+  dataListTwo.value = res.data;
+  totaltwo.value = res.total;
+  loadingTwo.value = false;
+};
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs['roleRef'].validate(valid => {
+    if (valid) {
+      form.value.planStartDatetime = AllData.publishTime1[0];
+      form.value.planEndDatetime = AllData.publishTime1[1];
+      form.value.basicInfoId = '1686274734091489284';
+      patrolTaskadd(form.value).then(response => {
+        proxy.$modal.msgSuccess('新增成功');
+        open.value = false;
+        getList();
+      });
+    }
+  });
+}
+
+onMounted(() => {
+  getList();
+  projectTypeListM();
+  projectTypeListMPage();
+  // getList1();
+});
+</script>
+<style scoped lang="scss"></style>
diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
index 65b64b3..1f0ce78 100644
--- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
+++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue
@@ -49,8 +49,12 @@
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="巡查计划名称" prop="planName" />
       <el-table-column label="项目名称" prop="project" />
-      <el-table-column label="巡查人员" prop="user" />
-      <el-table-column label="巡查类型" prop="patrolType" />
+      <el-table-column label="巡查人员" prop="planUserIds" />
+      <el-table-column label="巡查类型" prop="patrolType">
+        <template #default="scope">
+          <dict-tag :options="patrol_type" :value="String(scope.row.patrolType)" />
+        </template>
+      </el-table-column>
       <el-table-column label="巡查公里数(km)" prop="num" />
       <el-table-column label="计划开始时间" prop="startTime" />
       <el-table-column label="计划结束时间" prop="endDate" />
@@ -171,6 +175,7 @@
   FloodPreventionMaterialdelete,
 } from '@/api/longoPeration/Inspectionplana';
 const { proxy } = getCurrentInstance();
+const { patrol_type } = proxy.useDict('patrol_type'); //  巡查类型的字典
 const open = ref(false);
 const multiple = ref(false);
 const showSearch = ref(true);
diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
new file mode 100644
index 0000000..79636fc
--- /dev/null
+++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue
@@ -0,0 +1,153 @@
+<template>
+  <div class="first">
+    <!-- 类容 -->
+    <div class="dialog-form-detail flex flex-r flex-wrap" style="margin-top: 5px">
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">巡查任务名称</div>
+        <div class="detail-value flex flex-align-center">
+          {{ props.DataList.taskName }}
+        </div>
+      </div>
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">巡查人员</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.taskUserList[0].userName }}</div>
+      </div>
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">任务开始时间</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.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">{{ props.DataList.planEndDatetime }}</div>
+      </div>
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">任务状态</div>
+        <div class="detail-value flex flex-align-center">
+          <span>
+            {{
+              props.DataList.status == 'to_start'
+                ? '未开始'
+                : props.DataList.status == 'proceed'
+                ? '进行中'
+                : props.DataList.status == 'done'
+                ? '已完成'
+                : props.DataList.status == 'expired'
+                ? '超时'
+                : ''
+            }}
+          </span>
+        </div>
+      </div>
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">超时时间</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.expiredDays }}</div>
+      </div>
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">任务下发时间</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.issuedDatetime }}</div>
+      </div>
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">巡查任务描述</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.taskDescribe }}</div>
+      </div>
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">巡查位置</div>
+        <div class="detail-value flex flex-align-center">{{ props.DataList.projectLocationName }}</div>
+      </div>
+      <div class="flex flex-r">
+        <div class="detail-label flex flex-align-center">巡查项目</div>
+        <div class="detail-value flex flex-align-center">
+          {{ props.DataList.projectList[0].projectAbbreviation }}
+        </div>
+      </div>
+    </div>
+    <!-- 巡查照片 -->
+    <!-- <div>
+      <p style="color: aliceblue">巡查照片</p>
+      <div v-if="dataListPhone.length">
+        <el-image style="width: 150px; height: 60px; margin: 5px" v-for="i in dataListPhone" :src="i.url" :preview-src-list="[i.url]">
+        </el-image>
+      </div>
+      <el-empty v-else description="暂无图片" :image-size="30" />
+    </div> -->
+
+    <el-table :data="dataList" v-loading="loadingTwo" stripe style="margin-bottom: 20px; margin-top: 10px">
+      <el-table-column type="index" width="55" label="序号" />
+      <el-table-column label="问题类型" prop="problemType">
+        <!-- <template #default="scope">
+          <dict-tag :options="problem_type" :value="String(scope.row.problemType)" />
+        </template> -->
+      </el-table-column>
+      <el-table-column label="检查项" prop="checkItem" />
+      <el-table-column label="是否整改" prop="isRectification">
+        <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: {
+    type: Array,
+    default: null,
+  },
+});
+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">
+.first {
+}
+</style>
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index dbd882b..d22c3a1 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -158,8 +158,21 @@
         <el-row :gutter="20">
           <el-col :span="20">
             <el-form-item label="巡查项目:" prop="projectCodeList">
-              <el-select v-model="form.projectCodeList" multiple placeholder="请选择巡查项目" clearable style="width: 100%">
-                <el-option v-for="proj in projectTList" :key="proj.projectNo" :label="proj.projectName" :value="proj.projectNo" />
+              <el-select
+                v-model="form.projectCodeList"
+                multiple
+                placeholder="请选择巡查项目"
+                clearable
+                style="width: 100%"
+                value-key="projectNo"
+                label="projectName"
+              >
+                <el-option
+                  v-for="proj in projectTList"
+                  :key="proj.projectNo"
+                  :label="proj.projectName"
+                  :value="{ projectNo: proj.projectNo, projectName: proj.projectName }"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -167,8 +180,21 @@
         <el-row :gutter="20">
           <el-col :span="20">
             <el-form-item label="巡查人员:" prop="taskUserIdList">
-              <el-select v-model="form.taskUserIdList" multiple placeholder="请选择巡查人员" clearable style="width: 100%">
-                <el-option v-for="item in userList" :key="String(item.userId)" :label="item.nickName" :value="String(item.userId)" />
+              <el-select
+                v-model="form.taskUserIdList"
+                multiple
+                placeholder="请选择巡查人员"
+                clearable
+                style="width: 100%"
+                value-key="userId"
+                label="nickName"
+              >
+                <el-option
+                  v-for="item in userList"
+                  :key="String(item.userId)"
+                  :label="item.nickName"
+                  :value="{ userId: String(item.userId) }"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -282,6 +308,7 @@
 //重置
 function resetQuery() {
   AllData.publishTime = [];
+  dataListTwo.value = [];
   proxy.resetForm('queryRef');
   handleQuery();
 }
@@ -361,6 +388,7 @@
 function submitForm() {
   proxy.$refs['roleRef'].validate(valid => {
     if (valid) {
+      // console.log(form.value, 'form.value');
       form.value.planStartDatetime = AllData.publishTime1[0];
       form.value.planEndDatetime = AllData.publishTime1[1];
       form.value.basicInfoId = '1686274734091489284';