src/components/map/fssm-map.vue

@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-10-14 10:46:23
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2025-04-14 09:54:46
+ * @LastEditTime: 2025-03-31 13:02:21
  * @FilePath: \znxjxt-ui\src\components\map\fssm-map.vue
  * @Description: 公共地图
 -->
@@ -541,18 +541,6 @@ export default {
       this.selectSingClick.getFeatures().clear();
     },
 
-    /**
-     * @description: 清除地图上的选中事件
-     * @return {void}
-     */
-    clearSelectInteraction() {
-      if (this.selectSingClick) {
-        const map = this.instance.get("map");
-        map.removeInteraction(this.selectSingClick);
-        this.selectSingClick = null;
-      }
-    },
-
     /**
      * @description: 绘制多边形地图
      * @return {*}

src/layout/components/Navbar.vue

@@ -16,9 +16,9 @@
 
     <div class="right-menu">
       <template v-if="device !== 'mobile'">
-        <!-- <div class="menu-return right-menu-item">
+        <div class="menu-return right-menu-item">
           <i class="el-icon-data-analysis" @click="goBigScreen"></i>
-        </div> -->
+        </div>
         <!-- <search id="header-search" class="right-menu-item" /> -->
         <div class="header-news">
           <el-popover

src/layout/components/Sidebar/Logo.vue

@@ -1,19 +1,11 @@
-<!--
- * @Author: SunTao 328867980@qq.com
- * @Date: 2025-05-06 09:14:47
- * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2025-05-06 10:19:36
- * @FilePath: \znxjxt-copy\src\layout\components\Sidebar\Logo.vue
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--->
 <template>
   <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
     <transition name="sidebarLogoFade">
-      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/index">
+      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
         <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
       </router-link>
-      <router-link v-else key="expand" class="sidebar-logo-link" to="/index">
+      <router-link v-else key="expand" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
         <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
       </router-link>

src/views/login.vue

@@ -184,7 +184,7 @@ export default {
           this.$store
             .dispatch("Login", this.loginForm)
             .then(() => {
-              this.$router.push({ path: "/index" }).catch(() => {});
+              this.$router.push({ path: "/screen" }).catch(() => {});
             })
             .catch(() => {
               this.loading = false;

src/views/xj/document/maintenance-notice/components/edit-dialog.vue

@@ -2,49 +2,25 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-11-20 11:58:33
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2025-04-21 14:12:13
+ * @LastEditTime: 2025-03-10 11:27:58
  * @FilePath: \znxjxt-ui\src\views\xj\document\maintenance-notice\components\edit-dialog.vue
  * @Description: 养护通知单编辑弹窗
 -->
 <template>
   <div class="edit-dialog">
-    <el-form
+    <el-form class="editForm" ref="editForm" :model="editForm" :rules="rules" label-width="8rem">
-      class="editForm"
-      ref="editForm"
-      :model="editForm"
-      :rules="rules"
-      label-width="8rem"
-    >
       <el-row :gutter="24">
         <el-col :span="6">
           <el-form-item label="路段类型:" prop="diseRoadPosiType">
-            <el-select
+            <el-select v-model="editForm.diseRoadPosiType" placeholder="请选择路段类型" clearable>
-              v-model="editForm.diseRoadPosiType"
+              <el-option v-for="item in segmentTypeList" :key="item.value" :label="item.label" :value="item.value" />
-              placeholder="请选择路段类型"
-              clearable
-            >
-              <el-option
-                v-for="item in segmentTypeList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="病害成因:" prop="diseCauses">
-            <el-select
+            <el-select v-model="editForm.diseCauses" placeholder="请选择病害成因" clearable>
-              v-model="editForm.diseCauses"
+              <el-option v-for="item in causesList" :key="item.value" :label="item.label" :value="item.value" />
-              placeholder="请选择病害成因"
-              clearable
-            >
-              <el-option
-                v-for="item in causesList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
             </el-select>
           </el-form-item>
         </el-col>
@@ -57,39 +33,17 @@
         </el-col> -->
         <el-col :span="6">
           <el-form-item label="所在路段:" prop="diseRoadPart">
-            <el-select
+            <el-select v-model="editForm.diseRoadPart" placeholder="请选择所在路段" filterable remote clearable reserve-keyword
-              v-model="editForm.diseRoadPart"
+              :filter-method="handleDiseRoadPart" @change="changeDiseRoadPart">
-              placeholder="请选择所在路段"
+              <el-option v-for="(item, index) in roadPartList" :key="`diseRoadPart-name-${index}`" :label="item.label"
-              filterable
+                :value="item.value"></el-option>
-              remote
-              clearable
-              reserve-keyword
-              :filter-method="handleDiseRoadPart"
-              @change="changeDiseRoadPart"
-            >
-              <el-option
-                v-for="(item, index) in roadPartList"
-                :key="`diseRoadPart-name-${index}`"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="病害类型:" prop="diseFirstType">
-            <el-select
+            <el-select v-model="editForm.diseFirstType" placeholder="请选择病害类型" clearable @change="changeDetailed">
-              v-model="editForm.diseFirstType"
+              <el-option v-for="item in diseFirstType" :key="item.value" :label="item.label" :value="item.value" />
-              placeholder="请选择病害类型"
-              clearable
-              @change="changeDetailed"
-            >
-              <el-option
-                v-for="item in diseFirstType"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
             </el-select>
           </el-form-item>
         </el-col>
@@ -97,192 +51,83 @@
       <el-row :gutter="24">
         <el-col :span="6">
           <el-form-item label="病害二级类型:">
-            <el-select
+            <el-select v-model="editForm.diseTypeDetailed" placeholder="请选择病害二级类型" filterable clearable>
-              v-model="editForm.diseTypeDetailed"
+              <el-option v-for="item in diseTypeDetailedList" :key="item.value" :label="item.label"
-              placeholder="请选择病害二级类型"
+                :value="item.value" />
-              filterable
-              clearable
-            >
-              <el-option
-                v-for="item in diseTypeDetailedList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="工区:" prop="matTaskAreaId">
-            <el-select
+            <el-select v-model="editForm.matTaskAreaId" placeholder="请选择工区" filterable remote clearable reserve-keyword
-              v-model="editForm.matTaskAreaId"
+              :filter-method="handleMatTaskArea" @change="changeMatTaskArea">
-              placeholder="请选择工区"
+              <el-option v-for="(item, index) in taskAreaList" :key="`taskAreaList-name-${index}`" :label="item.label"
-              filterable
+                :value="item.value"></el-option>
-              remote
-              clearable
-              reserve-keyword
-              :filter-method="handleMatTaskArea"
-              @change="changeMatTaskArea"
-            >
-              <el-option
-                v-for="(item, index) in taskAreaList"
-                :key="`taskAreaList-name-${index}`"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="工作站:" prop="matTWorkStationId">
-            <el-select
+            <el-select v-model="editForm.matTWorkStationId" placeholder="请选择工作站" filterable remote clearable
-              v-model="editForm.matTWorkStationId"
+              reserve-keyword :filter-method="handleMatWorkStation" @change="changeMatWorkStation">
-              placeholder="请选择工作站"
+              <el-option v-for="(item, index) in matWorkStationList" :key="`WorkStationId-name-${index}`"
-              filterable
+                :label="item.label" :value="item.value"></el-option>
-              remote
-              clearable
-              reserve-keyword
-              :filter-method="handleMatWorkStation"
-              @change="changeMatWorkStation"
-            >
-              <el-option
-                v-for="(item, index) in matWorkStationList"
-                :key="`WorkStationId-name-${index}`"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="车道:" prop="diseRoadLine">
-            <el-input
+            <el-input v-model="editForm.diseRoadLine" placeholder="请填写车道" clearable>
-              v-model="editForm.diseRoadLine"
-              placeholder="请填写车道"
-              clearable
-            >
             </el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="6">
-          <el-form-item
+          <el-form-item label="桥梁:" prop="connBridge" v-if="editForm.diseRoadPosiType !== '2'">
-            label="桥梁:"
+            <el-select v-model="editForm.connBridge" placeholder="请选择桥梁" filterable remote clearable reserve-keyword
-            prop="connBridge"
+              :filter-method="handleConnBridge" @change="changeConnBridge">
-            v-if="editForm.diseRoadPosiType !== '2'"
+              <el-option v-for="(item, index) in connBridgeList" :key="`connBridge-name-${index}`" :label="item.label"
-          >
+                :value="item.value"></el-option>
-            <el-select
-              v-model="editForm.connBridge"
-              placeholder="请选择桥梁"
-              filterable
-              remote
-              clearable
-              reserve-keyword
-              :filter-method="handleConnBridge"
-              @change="changeConnBridge"
-            >
-              <el-option
-                v-for="(item, index) in connBridgeList"
-                :key="`connBridge-name-${index}`"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item
+          <el-form-item label="隧道:" prop="connTunnel" v-if="editForm.diseRoadPosiType !== '2'">
-            label="隧道:"
+            <el-select v-model="editForm.connTunnel" placeholder="请选择隧道" filterable remote clearable reserve-keyword
-            prop="connTunnel"
+              :filter-method="handleConnTunnel" @change="changeConnTunnel">
-            v-if="editForm.diseRoadPosiType !== '2'"
+              <el-option v-for="(item, index) in connTunnelList" :key="`connTunnel-name-${index}`" :label="item.label"
-          >
+                :value="item.value"></el-option>
-            <el-select
-              v-model="editForm.connTunnel"
-              placeholder="请选择隧道"
-              filterable
-              remote
-              clearable
-              reserve-keyword
-              :filter-method="handleConnTunnel"
-              @change="changeConnTunnel"
-            >
-              <el-option
-                v-for="(item, index) in connTunnelList"
-                :key="`connTunnel-name-${index}`"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item
+          <el-form-item label="收费站:" prop="stationCode" v-if="editForm.diseRoadPosiType === '2'">
-            label="收费站:"
+            <el-select v-model="editForm.stationCode" placeholder="请选择收费站" filterable remote clearable reserve-keyword
-            prop="stationCode"
+              :filter-method="handleStationCode" @change="changeStationCode">
-            v-if="editForm.diseRoadPosiType === '2'"
+              <el-option v-for="(item, index) in stationCodeList" :key="`stationCode-name-${index}`" :label="item.label"
-          >
+                :value="item.value"></el-option>
-            <el-select
-              v-model="editForm.stationCode"
-              placeholder="请选择收费站"
-              filterable
-              remote
-              clearable
-              reserve-keyword
-              :filter-method="handleStationCode"
-              @change="changeStationCode"
-            >
-              <el-option
-                v-for="(item, index) in stationCodeList"
-                :key="`stationCode-name-${index}`"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item
+          <el-form-item label="收费站位置:" prop="stationLocation" v-if="editForm.diseRoadPosiType === '2'">
-            label="收费站位置:"
+            <el-select v-model="editForm.stationLocation" placeholder="请选择收费站位置" clearable>
-            prop="stationLocation"
+              <el-option v-for="item in stationLocationList" :key="item.value" :label="item.label"
-            v-if="editForm.diseRoadPosiType === '2'"
+                :value="item.value" />
-          >
-            <el-select
-              v-model="editForm.stationLocation"
-              placeholder="请选择收费站位置"
-              clearable
-            >
-              <el-option
-                v-for="item in stationLocationList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="方向:" prop="diseRoadDirec">
-            <el-select
+            <el-select v-model="editForm.diseRoadDirec" placeholder="请选择方向" clearable>
-              v-model="editForm.diseRoadDirec"
+              <el-option v-for="item in roadDirectionList" :key="item.value" :label="item.label" :value="item.value" />
-              placeholder="请选择方向"
-              clearable
-            >
-              <el-option
-                v-for="item in roadDirectionList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="开始桩号:" prop="diseStartStake">
-            <el-input
+            <el-input v-model="editForm.diseStartStake" placeholder="K0000+000" />
-              v-model="editForm.diseStartStake"
-              placeholder="K0000+000"
-            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -293,81 +138,33 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item
+          <el-form-item label="匝道类型:" prop="rampType" v-if="editForm.diseRoadPosiType === '3'">
-            label="匝道类型:"
+            <el-select v-model="editForm.rampType" placeholder="请选择匝道类型" clearable>
-            prop="rampType"
+              <el-option v-for="item in rampTypeList" :key="item.value" :label="item.label" :value="item.value" />
-            v-if="editForm.diseRoadPosiType === '3'"
-          >
-            <el-select
-              v-model="editForm.rampType"
-              placeholder="请选择匝道类型"
-              clearable
-            >
-              <el-option
-                v-for="item in rampTypeList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item
+          <el-form-item label="匝道立交:" prop="rampInterchangeCode" v-if="editForm.diseRoadPosiType === '3'">
-            label="匝道立交:"
+            <el-select v-model="editForm.rampInterchangeCode" placeholder="请选择匝道立交" filterable remote clearable
-            prop="rampInterchangeCode"
+              reserve-keyword :filter-method="handleRampIntOrientation" @change="changeRampIntOrientation">
-            v-if="editForm.diseRoadPosiType === '3'"
+              <el-option v-for="(item, index) in rampIntOrientationList" :key="`rampInterchangeCode-name-${index}`"
-          >
+                :label="item.label" :value="item.value"></el-option>
-            <el-select
-              v-model="editForm.rampInterchangeCode"
-              placeholder="请选择匝道立交"
-              filterable
-              remote
-              clearable
-              reserve-keyword
-              :filter-method="handleRampIntOrientation"
-              @change="changeRampIntOrientation"
-            >
-              <el-option
-                v-for="(item, index) in rampIntOrientationList"
-                :key="`rampInterchangeCode-name-${index}`"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item
+          <el-form-item label="匝道立交方向:" prop="rampIntOrientation" v-if="editForm.diseRoadPosiType === '3'">
-            label="匝道立交方向:"
+            <el-select v-model="editForm.rampIntOrientation" placeholder="请选择匝道立交方向" clearable>
-            prop="rampIntOrientation"
+              <el-option v-for="item in rampInterchangeCodeList" :key="item.value" :label="item.label"
-            v-if="editForm.diseRoadPosiType === '3'"
+                :value="item.value" />
-          >
-            <el-select
-              v-model="editForm.rampIntOrientation"
-              placeholder="请选择匝道立交方向"
-              clearable
-            >
-              <el-option
-                v-for="item in rampInterchangeCodeList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
-        <el-col :span="24"
+        <el-col :span="24"><el-form-item label="详细说明:" prop="diseElaDecs">
-          ><el-form-item label="详细说明:" prop="diseElaDecs">
+            <el-input v-model="editForm.diseElaDecs" type="textarea" :rows="3" placeholder="请输入内容" resize="none">
-            <el-input
-              v-model="editForm.diseElaDecs"
-              type="textarea"
-              :rows="3"
-              placeholder="请输入内容"
-              resize="none"
-            >
             </el-input>
           </el-form-item>
         </el-col>
@@ -376,50 +173,21 @@
     <el-card shadow="never">
       <div slot="header" class="clearfix">
         <span style="font-size: 1.2rem">病害列表</span>
-        <el-button
+        <el-button style="float: right; padding: 3px 0" type="text" @click="viewSelected">选择病害</el-button>
-          style="float: right; padding: 3px 0"
+        <el-button style="float: right; padding: 3px 1rem" type="text" v-if="mapTip"
-          type="text"
+          @click="viewMapSelected(false)">地图查看</el-button>
-          @click="viewSelected"
+        <el-button style="float: right; padding: 3px 1rem" type="text" v-if="!mapTip"
-          >选择病害</el-button
+          @click="viewMapSelected(true)">列表查看</el-button>
-        >
-        <el-button
-          style="float: right; padding: 3px 1rem"
-          type="text"
-          v-if="mapTip"
-          @click="viewMapSelected(false)"
-          >地图查看</el-button
-        >
-        <el-button
-          style="float: right; padding: 3px 1rem"
-          type="text"
-          v-if="!mapTip"
-          @click="viewMapSelected(true)"
-          >列表查看</el-button
-        >
       </div>
       <div style="height: 33rem">
         <!-- 列表 -->
-        <el-table
+        <el-table v-if="mapTip" ref="roadTable" :data="checkedDiseaseList" :row-key="getRowKey" height="33rem"
-          v-if="mapTip"
+          style="width: 100%">
-          ref="roadTable"
-          :data="checkedDiseaseList"
-          :row-key="getRowKey"
-          height="33rem"
-          style="width: 100%"
-        >
           <!-- <el-table-column type="selection" :reserve-selection="true" width="55" align="center" /> -->
           <el-table-column label="路段名称" align="center" prop="segmentName" />
-          <el-table-column
+          <el-table-column label="采集时间" align="center" prop="createdTimeLocal">
-            label="采集时间"
-            align="center"
-            prop="createdTimeLocal"
-          >
           </el-table-column>
-          <el-table-column
+          <el-table-column label="病害类型" align="center" prop="defectTypeName">
-            label="病害类型"
-            align="center"
-            prop="defectTypeName"
-          >
           </el-table-column>
           <!-- <el-table-column label="病害状态" align="center" prop="state">
             <template slot-scope="scope">
@@ -430,89 +198,44 @@
           <el-table-column label="结束桩号" align="center" prop="stakeEnd" />
           <el-table-column label="病害图片" align="center" prop="media">
             <template slot-scope="scope">
-              <img
+              <img @click="showScreenImg(scope.row)" height="50" :src="scope.row.mediaUrl" />
-                @click="showScreenImg(scope.row)"
-                height="50"
-                :src="scope.row.mediaUrl"
-              />
             </template>
           </el-table-column>
           <el-table-column label="病害长度" align="center" prop="targetLen">
             <template slot-scope="scope">
               {{
-                scope.row.targetLen * 1 <= 0 ? "" : `${scope.row.targetLen}米`
+                scope.row.targetLen * 1 <= 0 ? "" : `${scope.row.targetLen}米` }} </template>
-              }}
-            </template>
           </el-table-column>
           <el-table-column label="病害面积" align="center" prop="targetArea" />
-          <el-table-column
+          <el-table-column label="道路方向" align="center" prop="inspectDirection">
-            label="道路方向"
-            align="center"
-            prop="inspectDirection"
-          >
             <template slot-scope="scope">
               <span>{{
                 scope.row.inspectDirection === "0" ? "上行" : "下行"
-              }}</span>
+                }}</span>
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            label="操作"
-            align="center"
-            class-name="small-padding fixed-width"
-          >
             <template slot-scope="scope">
-              <el-button
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.$index)">删除
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.$index)"
-                >删除
               </el-button>
             </template>
           </el-table-column>
         </el-table>
         <!-- 地图 -->
-        <fssm-map
+        <fssm-map ref="diseaseMap" v-if="!mapTip" @map-zoom="getZoom" @feature-select="featureSelect"></fssm-map>
-          ref="diseaseMap"
-          v-if="!mapTip"
-          @map-zoom="getZoom"
-          @feature-select="featureSelect"
-        ></fssm-map>
       </div>
     </el-card>
     <div slot="footer" class="dialog-footer">
-      <el-button
+      <el-button type="primary" @click="submitForm">确 定</el-button>
-        type="primary"
-        @click="submitForm"
-        v-loading.fullscreen.lock="fullscreenLoading"
-        >确 定</el-button
-      >
       <el-button @click="cancel">取 消</el-button>
     </div>
 
     <!-- 查看图片大图 -->
-    <el-dialog
+    <el-dialog title="查看图片" :visible.sync="showImageDialog" width="85rem" append-to-body destroy-on-close
-      title="查看图片"
+      @close="imgCancel">
-      :visible.sync="showImageDialog"
-      width="85rem"
-      append-to-body
-      destroy-on-close
-      @close="imgCancel"
-    >
       <div class="image-container" ref="imageContainer">
-        <img
+        <img :src="currentImageItem.mediaUrl" alt="Main Image" ref="mainImage" @load="updateRects" />
-          :src="currentImageItem.mediaUrl"
+        <div v-for="(rect, index) in rects" :key="index" class="rect-overlay" :style="getRectStyle(rect)"></div>
-          alt="Main Image"
-          ref="mainImage"
-          @load="updateRects"
-        />
-        <div
-          v-for="(rect, index) in rects"
-          :key="index"
-          class="rect-overlay"
-          :style="getRectStyle(rect)"
-        ></div>
         <div class="rect-image">
           采集时间:
           {{ new Date(currentImageItem.createdTime).toLocaleString() }}
@@ -521,33 +244,15 @@
           病害类型：
           {{ currentImageItem.defectTypeName || "暂无数据" }}
           病害面积：{{ currentImageItem.targetArea }}平方米 病害长度：{{
-            currentImageItem.targetLen * 1 <= 0
+            currentImageItem.targetLen * 1 <= 0 ? "暂无数据" : `${currentImageItem.targetLen}米` }} </div>
-              ? "暂无数据"
-              : `${currentImageItem.targetLen}米`
-          }}
         </div>
-      </div>
     </el-dialog>
 
     <!-- 选择病害弹窗 -->
-    <el-dialog
+    <el-dialog title="选择病害" :visible.sync="diseaseVisible" width="90%" append-to-body :close-on-click-modal="false"
-      title="选择病害"
+      destroy-on-close @close="diseaseCancel">
-      :visible.sync="diseaseVisible"
+      <disease-dialog v-if="diseaseVisible" :diseaseData="diseaseData" :checkedDiseaseList="checkedDiseaseList"
-      width="90%"
+        :segmentList="segmentList" :tableDefect="tableDefect" @cancel="diseaseCancel" @checkedList="getCheckedList" />
-      append-to-body
-      :close-on-click-modal="false"
-      destroy-on-close
-      @close="diseaseCancel"
-    >
-      <disease-dialog
-        v-if="diseaseVisible"
-        :diseaseData="diseaseData"
-        :checkedDiseaseList="checkedDiseaseList"
-        :segmentList="segmentList"
-        :tableDefect="tableDefect"
-        @cancel="diseaseCancel"
-        @checkedList="getCheckedList"
-      />
     </el-dialog>
   </div>
 </template>
@@ -586,7 +291,7 @@ export default {
     // 传过来的表单信息
     dialogItemObj: {
       type: Object,
-      default: () => {},
+      default: () => { },
     },
     // 传过来的列表信息
     dialogItem: {
@@ -722,9 +427,7 @@ export default {
       // 选择病害弹窗显隐控制
       diseaseVisible: false,
       // 传选择病害弹窗数据
-      diseaseData: {},
+      diseaseData: {}
-      // 全屏加载
-      fullscreenLoading: false,
     };
   },
   computed: {
@@ -803,9 +506,9 @@ export default {
         diseRoadPart: [
           { required: true, message: "请选择所在路段", trigger: "change" },
         ],
-        diseElaDecs: [
+        diseElaDecs:[
-          { required: true, message: "请填写详细说明", trigger: "blur" },
+        { required: true, message: "请填写详细说明", trigger: "blur" },
-        ],
+        ]
       };
     },
     isStakeStartRequired() {
@@ -826,10 +529,10 @@ export default {
           this.handleDiseRoadPart(val.diseRoadPartName);
           this.handleMatTaskArea(val.matTaskAreaIdName);
           this.handleMatWorkStation(val.matTWorkStationIdName);
-          this.handleConnBridge(val.connBridgeName);
+          this.handleConnBridge(val.connBridgeName)
-          this.handleConnTunnel(val.connTunnelName);
+          this.handleConnTunnel(val.connTunnelName)
-          this.handleStationCode(val.stationCodename);
+          this.handleStationCode(val.stationCodename)
-          this.handleRampIntOrientation(val.rampInterchangeName);
+          this.handleRampIntOrientation(val.rampInterchangeName)
           if (val.diseFirstType) {
             this.changeDetailed(val.diseFirstType);
           }
@@ -852,7 +555,7 @@ export default {
       immediate: true,
     },
   },
-  mounted() {},
+  mounted() { },
   methods: {
     /**
      * @description: 获取所在路段下拉数据
@@ -1085,20 +788,17 @@ export default {
     submitForm() {
       this.$refs.editForm.validate((valid) => {
         if (valid) {
-          this.fullscreenLoading = true;
           const defectId = this.checkedDiseaseList?.map((item) => item.id);
-          addMaintenanceNotice({ ...this.editForm, defectId })
+          addMaintenanceNotice({ ...this.editForm, defectId }).then(
-            .then(({ code, data }) => {
+            ({ code, data }) => {
               if (code === 200) {
                 this.$message.success("生成成功");
                 this.$emit("cancel");
               } else {
                 this.$message.error(data);
               }
-            })
+            }
-            .finally(() => {
+          );
-              this.fullscreenLoading = false;
-            });
         }
       });
     },
@@ -1226,10 +926,9 @@ export default {
             return new Style({
               image: new Icon({
                 crossOrigin: "anonymous",
-                src: require(`@/assets/screen/index/${
+                src: require(`@/assets/screen/index/${feature.getProperties().features[0].get("data")
-                  feature.getProperties().features[0].get("data")
+                  .defectTypeName || "龟裂"
-                    .defectTypeName || "龟裂"
+                  }.png`),
-                }.png`),
                 // 图标缩放比例
                 scale: 0.5,
                 displacement: [0, 30],
@@ -1298,7 +997,7 @@ export default {
         diseRoadPart: this.editForm.diseRoadPart,
         diseStartStake: this.editForm.diseStartStake,
         diseEndStake: this.editForm.diseEndStake,
-      };
+      }
       this.diseaseVisible = true;
     },
 
@@ -1319,7 +1018,7 @@ export default {
      */
     diseaseCancel() {
       this.diseaseVisible = false;
-      this.diseaseData = {};
+      this.diseaseData = {}
     },
 
     /**
@@ -1429,7 +1128,7 @@ export default {
       color: #f01515;
     }
 
-    > div {
+    >div {
       margin: 0.5rem 0;
     }
   }

src/views/xj/document/maintenance-notice/index.vue

@@ -2,156 +2,75 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-11-20 11:58:33
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2025-04-16 16:10:25
+ * @LastEditTime: 2025-03-10 10:46:02
  * @FilePath: \znxjxt-ui\src\views\xj\document\maintenance-notice\index.vue
  * @Description: 养护通知单
 -->
 <template>
   <div class="content">
-    <el-form
+    <el-form :model="noticeForm" :rules="noticeFormRules" ref="noticeForm" size="small" :inline="true"
-      :model="noticeForm"
+      label-width="5rem">
-      :rules="noticeFormRules"
-      ref="noticeForm"
-      size="small"
-      :inline="true"
-      label-width="5rem"
-    >
       <el-form-item label="道路名称" prop="segmentId">
-        <el-select
+        <el-select v-model="noticeForm.segmentId" placeholder="请选择路段" clearable filterable>
-          v-model="noticeForm.segmentId"
+          <el-option v-for="item in segmentList" :key="item.value" :label="item.label" :value="item.value" />
-          placeholder="请选择路段"
-          clearable
-          filterable
-        >
-          <el-option
-            v-for="item in segmentList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
         </el-select>
       </el-form-item>
       <el-form-item label="采集时间" prop="dateTime">
-        <el-date-picker
+        <el-date-picker v-model="dateTime" type="daterange" start-placeholder="开始日期" end-placeholder="结束日期"
-          v-model="dateTime"
+          format="yyyy-MM-dd" value-format="yyyy-MM-dd" clearable />
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          clearable
-        />
       </el-form-item>
       <el-form-item label="病害类型" prop="paramsDefectType">
-        <el-cascader
+        <el-cascader v-model="paramsDefectType" :options="tableDefect" :props="{
-          v-model="paramsDefectType"
+          checkStrictly: true,
-          :options="tableDefect"
+          emitPath: true,
-          :props="{
+          children: 'subTypes',
-            checkStrictly: true,
+        }" clearable></el-cascader>
-            emitPath: true,
-            children: 'subTypes',
-          }"
-          clearable
-        ></el-cascader>
       </el-form-item>
       <el-form-item label="上下行" prop="inspectDirection">
-        <el-select
+        <el-select v-model="noticeForm.inspectDirection" placeholder="请选择" clearable>
-          v-model="noticeForm.inspectDirection"
-          placeholder="请选择"
-          clearable
-        >
           <el-option label="上行" value="0" />
           <el-option label="下行" value="1" />
         </el-select>
       </el-form-item>
       <el-form-item label="是否紧急" prop="urgentFlag">
-        <el-select
+        <el-select v-model="noticeForm.urgentFlag" placeholder="请选择" clearable>
-          v-model="noticeForm.urgentFlag"
+          <el-option label="紧急" value="1" />
-          placeholder="请选择"
-          clearable
-        >
-          <el-option label="紧急" value="0" />
           <el-option label="不紧急" value="2" />
         </el-select>
       </el-form-item>
       <el-form-item label="公里桩" prop="stakeRange">
-        <el-input
+        <el-input v-model="noticeForm.stakeStart" placeholder="起始公里桩" style="width: 10rem" clearable />
-          v-model="noticeForm.stakeStart"
-          placeholder="起始公里桩"
-          style="width: 10rem"
-          clearable
-        />
         <span style="margin: 0 5px">-</span>
-        <el-input
+        <el-input v-model="noticeForm.stakeEnd" placeholder="终止公里桩" style="width: 10rem" clearable />
-          v-model="noticeForm.stakeEnd"
+        <el-tooltip class="item" effect="dark" content="格式为K0000+000" placement="top">
-          placeholder="终止公里桩"
-          style="width: 10rem"
-          clearable
-        />
-        <el-tooltip
-          class="item"
-          effect="dark"
-          content="格式为K0000+000"
-          placement="top"
-        >
           <i class="el-icon-info"></i>
         </el-tooltip>
       </el-form-item>
       <el-form-item label="病害长度" prop="lengthRange">
-        <el-input-number
+        <el-input-number v-model="noticeForm.minLen" controls-position="right" placeholder="最小长度"
-          v-model="noticeForm.minLen"
+          :min="0"></el-input-number>
-          controls-position="right"
-          placeholder="最小长度"
-          :min="0"
-        ></el-input-number>
         <span style="margin: 0 5px">-</span>
-        <el-input-number
+        <el-input-number v-model="noticeForm.maxLen" controls-position="right" placeholder="最大长度"
-          v-model="noticeForm.maxLen"
+          :min="0"></el-input-number>
-          controls-position="right"
-          placeholder="最大长度"
-          :min="0"
-        ></el-input-number>
       </el-form-item>
 
       <el-form-item label="病害面积" prop="areaRange">
-        <el-input-number
+        <el-input-number v-model="noticeForm.minArea" controls-position="right" placeholder="最小面积"
-          v-model="noticeForm.minArea"
+          :min="0"></el-input-number>
-          controls-position="right"
-          placeholder="最小面积"
-          :min="0"
-        ></el-input-number>
         <span style="margin: 0 5px">-</span>
-        <el-input-number
+        <el-input-number v-model="noticeForm.maxArea" controls-position="right" placeholder="最大面积"
-          v-model="noticeForm.maxArea"
+          :min="0"></el-input-number>
-          controls-position="right"
-          placeholder="最大面积"
-          :min="0"
-        ></el-input-number>
       </el-form-item>
 
       <el-form-item>
-        <el-button
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          type="primary"
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
       </el-form-item>
     </el-form>
     <!-- 操作按钮 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          >新增
         </el-button>
       </el-col>
       <!-- <el-col :span="1.5">
@@ -159,23 +78,12 @@
           @click="handleDelete(null)">删除
         </el-button>
       </el-col> -->
-      <el-col :span="8"
+      <el-col :span="8"><span style="font-size: 1.2rem">病害长度：{{ lengthSum }}米；</span><span
-        ><span style="font-size: 1.2rem">病害长度：{{ lengthSum }}米；</span
+          style="margin-left: 1rem; font-size: 1.2rem">病害总面积：{{ areaSum }}平方米</span></el-col>
-        ><span style="margin-left: 1rem; font-size: 1.2rem"
-          >病害总面积：{{ areaSum }}平方米</span
-        ></el-col
-      >
     </el-row>
     <!-- 表格 -->
-    <el-table
+    <el-table class="notice-table" ref="noticeTable" :data="noticeList" @selection-change="handleSelectionChange"
-      class="notice-table"
+      :row-key="getRowKey" v-loading="loading" style="width: 100%">
-      ref="noticeTable"
-      :data="noticeList"
-      @selection-change="handleSelectionChange"
-      :row-key="getRowKey"
-      v-loading="loading"
-      style="width: 100%"
-    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号"> </el-table-column>
       <el-table-column label="路段名称" align="center" prop="segmentName" />
@@ -187,137 +95,66 @@
       <el-table-column label="结束桩号" align="center" prop="stakeEnd" />
       <el-table-column label="病害图片" align="center" prop="media">
         <template slot-scope="scope">
-          <img
+          <img @click="showScreenImg(scope.row)" height="50" :src="scope.row.mediaUrl" />
-            @click="showScreenImg(scope.row)"
-            height="50"
-            :src="scope.row.mediaUrl"
-          />
         </template>
       </el-table-column>
       <el-table-column label="病害长度" align="center" prop="targetLen">
         <template slot-scope="scope">
-          {{ scope.row.targetLen * 1 <= 0 ? "" : `${scope.row.targetLen}米` }}
+          {{ scope.row.targetLen * 1 <= 0 ? "" : `${scope.row.targetLen}米` }} </template>
-        </template>
       </el-table-column>
       <el-table-column label="病害面积" align="center" prop="targetArea" />
       <el-table-column label="道路方向" align="center" prop="inspectDirection">
         <template slot-scope="scope">
           <span>{{
             scope.row.inspectDirection === "0" ? "上行" : "下行"
-          }}</span>
+            }}</span>
         </template>
       </el-table-column>
       <el-table-column label="是否紧急" align="center" prop="urgentFlag">
         <template slot-scope="scope">
-          <el-button
+          <el-button v-if="scope.row.urgentFlag === 1" type="danger" plain disabled>紧急</el-button>
-            v-if="scope.row.urgentFlag === 0"
+          <el-button v-if="scope.row.urgentFlag === 2" type="warning" plain disabled>不紧急</el-button>
-            type="danger"
-            plain
-            disabled
-            >紧急</el-button
-          >
-          <el-button
-            v-if="scope.row.urgentFlag === 2"
-            type="warning"
-            plain
-            disabled
-            >不紧急</el-button
-          >
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
         <template slot-scope="scope">
-          <el-button
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">生成工单
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            >生成工单
           </el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
     <div class="pagination-part">
-      <el-pagination
+      <el-pagination background :current-page.sync="pagination.page" @current-change="handleCurrentChange"
-        background
+        :page-sizes="[10, 20, 30, 40]" :page-size.sync="pagination.size" @size-change="handleSizeChange"
-        :current-page.sync="pagination.page"
+        layout="total, sizes, prev, pager, next, jumper" :total="tableTotal">
-        @current-change="handleCurrentChange"
-        :page-sizes="[10, 20, 30, 40]"
-        :page-size.sync="pagination.size"
-        @size-change="handleSizeChange"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="tableTotal"
-      >
       </el-pagination>
     </div>
     <!-- 新增弹窗 -->
-    <el-dialog
+    <el-dialog title="生成表单" :visible.sync="addVisible" width="90%" append-to-body :close-on-click-modal="false"
-      title="生成表单"
+      destroy-on-close @close="addCancel">
-      :visible.sync="addVisible"
+      <edit-dialog v-if="addVisible" :causesList="causesList" :rampTypeList="rampTypeList"
-      width="90%"
+        :diseFirstType="diseFirstType" :stationLocationList="stationLocationList" :roadDirectionList="roadDirectionList"
-      append-to-body
+        :segmentTypeList="segmentTypeList" :segmentList="segmentList" :tableDefect="tableDefect"
-      :close-on-click-modal="false"
+        :dialogItem="dialogItem" :dialogItemObj="dialogItemObj" :dialogMsg="dialogMsg" @cancel="addCancel" />
-      destroy-on-close
-      @close="addCancel"
-    >
-      <edit-dialog
-        v-if="addVisible"
-        :causesList="causesList"
-        :rampTypeList="rampTypeList"
-        :diseFirstType="diseFirstType"
-        :stationLocationList="stationLocationList"
-        :roadDirectionList="roadDirectionList"
-        :segmentTypeList="segmentTypeList"
-        :segmentList="segmentList"
-        :tableDefect="tableDefect"
-        :dialogItem="dialogItem"
-        :dialogItemObj="dialogItemObj"
-        :dialogMsg="dialogMsg"
-        @cancel="addCancel"
-      />
     </el-dialog>
 
     <!-- 查看图片大图 -->
-    <el-dialog
+    <el-dialog title="查看图片" :visible.sync="showImageDialog" width="85rem" append-to-body destroy-on-close
-      title="查看图片"
+      @close="imgCancel">
-      :visible.sync="showImageDialog"
-      width="85rem"
-      append-to-body
-      destroy-on-close
-      @close="imgCancel"
-    >
       <div class="image-container" ref="imageContainer">
-        <img
+        <img :src="currentImageItem.mediaUrl" alt="Main Image" ref="mainImage" @load="updateRects" />
-          :src="currentImageItem.mediaUrl"
+        <div v-for="(rect, index) in rects" :key="index" class="rect-overlay" :style="getRectStyle(rect)"></div>
-          alt="Main Image"
-          ref="mainImage"
-          @load="updateRects"
-        />
-        <div
-          v-for="(rect, index) in rects"
-          :key="index"
-          class="rect-overlay"
-          :style="getRectStyle(rect)"
-        ></div>
         <div class="rect-image">
           采集时间:
-          {{ currentImageItem.createdTimeLocal }}
+          {{ new Date(currentImageItem.createdTime).toLocaleString() }}
           起始桩号： {{ currentImageItem.stakeStart || "暂无数据" }} 终止桩号：
           {{ currentImageItem.stakeEnd || "暂无数据" }}
           病害类型：
           {{ currentImageItem.defectTypeName || "暂无数据" }}
           病害面积：{{ currentImageItem.targetArea }}平方米 病害长度：{{
-            currentImageItem.targetLen * 1 <= 0
+            currentImageItem.targetLen * 1 <= 0 ? "暂无数据" : `${currentImageItem.targetLen}米` }} </div>
-              ? "暂无数据"
-              : `${currentImageItem.targetLen}米`
-          }}
         </div>
-      </div>
     </el-dialog>
   </div>
 </template>
@@ -673,17 +510,15 @@ export default {
      * @return {*}
      */
     handleAdd() {
-      getMaintenanceDetail(this.checkIds)
+      getMaintenanceDetail(this.checkIds).then(({ code, data, msg }) => {
-        .then(({ code, data, msg }) => {
+        if (code === 200) {
-          if (code === 200) {
+          this.dialogItemObj = data ? data : {};
-            this.dialogItemObj = data ? data : {};
+          this.dialogMsg = msg;
-            this.dialogMsg = msg;
-            this.addVisible = true;
-          }
-        })
-        .catch(() => {
           this.addVisible = true;
-        });
+        }
+      }).catch(() => {
+        this.addVisible = true;
+      })
     },
 
     /**
@@ -712,7 +547,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
 
     /**

src/views/xj/document/view-notification/index.vue

@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2025-02-10 11:02:50
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2025-04-16 10:43:54
+ * @LastEditTime: 2025-02-27 15:07:15
  * @FilePath: \znxjxt-ui\src\views\xj\document\view-notification\index.vue
  * @Description: 单据-查看通知单页面
 -->
@@ -107,7 +107,7 @@
       </el-form-item>
       <el-form-item label="是否紧急" prop="urgentFlag">
         <el-select v-model="noticeForm.urgentFlag" placeholder="请选择" clearable>
-          <el-option label="紧急" value="0" />
+          <el-option label="紧急" value="1" />
           <el-option label="不紧急" value="2" />
         </el-select>
       </el-form-item>

src/views/xj/inspection/disease-management/index.vue

@@ -2,7 +2,7 @@
  * @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
  * @Date: 2024-10-08 10:58:25
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2025-05-06 10:08:17
+ * @LastEditTime: 2025-01-15 15:42:04
  * @FilePath: \znxjxt-ui\src\views\xj\inspection\disease-management\index.vue
  * @Description: 巡检信息管理-病害管理
 -->

src/views/xj/inspection/map-diease/components/diease-view.vue

@@ -2,18 +2,18 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2025-04-10 16:44:08
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2025-04-10 17:19:54
+ * @LastEditTime: 2025-04-10 16:50:40
  * @FilePath: \znxjxt-ui\src\views\xj\inspection\map-diease\components\diease-view.vue
  * @Description: 巡检信息-地图展示1
 -->
 <template>
   <div class="view-diease">
-    <el-carousel class="view-carousel" arrow="always" height="45rem" :autoplay="false">
+    <el-carousel arrow="always" :autoplay="false">
       <el-carousel-item
         v-for="(item, index) in dislogItem"
         :key="`carousel-${index}`"
       >
-        <img :src="item.img" mode="scaleToFill" />
+        <image :src="item.img" mode="scaleToFill" />
       </el-carousel-item>
     </el-carousel>
   </div>
@@ -37,11 +37,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.view-carousel {
-  height: 45rem;
-
-  img {
-    height: 43rem;
-  }
-}
 </style>

src/views/xj/inspection/map-diease/index.vue

@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2025-03-25 11:10:16
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2025-04-15 17:13:01
+ * @LastEditTime: 2025-04-10 16:51:45
  * @FilePath: \znxjxt-ui\src\views\xj\inspection\map-diease\index.vue
  * @Description: 地图展示筛选病害-首页
 -->
@@ -50,7 +50,7 @@
         v-loading="loading"
         :data="tableList"
         style="width: 100%"
-        @row-dblclick="handleDbClick"
+        @row-dblclick="handleCurrentChange"
       >
         <el-table-column label="路段名称" align="center" prop="segmentName">
         </el-table-column>
@@ -62,9 +62,6 @@
           align="center"
           prop="createdTimeLocal"
         >
-          <template slot-scope="scope">
-            {{ scope.row.createdTimeLocal.replace("T", "  ") }}
-          </template>
         </el-table-column>
         <el-table-column
           label="操作"
@@ -101,8 +98,8 @@
       ref="mapDieaseMap"
       class="map-diease-map"
       :maxZoom="24"
+      @feature-select="featureSelect"
     ></fssm-map>
-    <!-- @feature-select="featureSelect" -->
     <!-- 查看弹窗 -->
     <el-dialog
       title="查看"
@@ -121,7 +118,8 @@
 <script>
 import { Feature } from "ol";
 import { Point } from "ol/geom";
-import { Style, Icon } from "ol/style";
+import { Style, Icon, Fill, Stroke, Circle, Text } from "ol/style";
+import Cluster from "ol/source/Cluster";
 import VectorSource from "ol/source/Vector";
 import VectorLayer from "ol/layer/Vector";
 import { getSegment, getDelineatorList } from "@/api/xj/mapDisease";
@@ -174,10 +172,6 @@ export default {
     this.getSegmentList();
     this.getTableList();
   },
-  mounted() {
-    // 去除选择事件
-    this.$refs.mapDieaseMap.clearSelectInteraction();
-  },
   methods: {
     /**
      * @description: 获取路段下拉数据
@@ -244,7 +238,7 @@ export default {
      * @param {*} e
      * @return {*}
      */
-    handleDbClick(e) {
+    handleCurrentChange(e) {
       if (this.clusters) {
         const map = this.$refs.mapDieaseMap.instance.get("map");
         map.removeLayer(this.clusters);
@@ -258,22 +252,22 @@ export default {
             flag: "nomal",
           };
         }),
-        {
+        ...e.endCoordinates?.map((item) => {
-          geometry: e.endCoordinates,
+          return {
-          flag: "green",
+            geometry: item,
-        },
+            flag: "green",
-        {
+          };
-          geometry: e.startCoordinates,
+        }),
-          flag: "green",
+        ...e.startCoordinates?.map((item) => {
-        },
+          return {
+            geometry: item,
+            flag: "green",
+          };
+        }),
       ].filter((item) => {
         return item.geometry;
       });
-      this.fitMapToPoints([
+      this.fitMapToPoints(e.defectLocation);
-        ...e.defectLocation,
-        e.endCoordinates,
-        e.startCoordinates,
-      ]);
       this.drawPoint();
     },
 
@@ -311,7 +305,7 @@ export default {
         // 使用 fit 方法根据边界框计算最佳缩放级别
         map.getView().fit(extent, {
           duration: 500, // 动画持续时间
-          padding: [200, 200, 200, 200], // 边缘填充
+          padding: [100, 100, 100, 100], // 边缘填充
         });
       }
     },