From d367e13021af5fa2bcbf93ea63ec368927fac111 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Mon, 14 Jul 2025 19:44:29 +0800
Subject: [PATCH] 巡检功能测试

---
 src/components/inspection/ChooseInspectionRoutePoint.vue | 74 ++++++++++++++++----------------------------------------------------------
 src/components/inspection/DeleteInspectionRoute.vue      | 12 ++----------
 src/components/inspection/EditInspectionRoute.vue        | 60 +++++++++++++-----------------------------------------------
 src/components/inspection/inspectionRouteMap.vue         | 18 ++----------------
 src/components/inspection/pointRoute.vue                 |  2 +-
 src/views/inspection/addInspectionPlanList.vue           |  4 ++--
 src/views/inspection/inspectionPlanList.vue              | 89 ++++++++++++++++++++++++++++++-----------------------------------------------------------
 src/views/inspection/inspectionPointList.vue             | 21 ++++++++++++---------
 src/views/inspection/inspectionRouteList.vue             | 16 ++++++++--------
 9 files changed, 86 insertions(+), 210 deletions(-)

diff --git a/src/components/inspection/ChooseInspectionRoutePoint.vue b/src/components/inspection/ChooseInspectionRoutePoint.vue
index 3794534..e7b96f9 100644
--- a/src/components/inspection/ChooseInspectionRoutePoint.vue
+++ b/src/components/inspection/ChooseInspectionRoutePoint.vue
@@ -1,83 +1,41 @@
 <template>
-  <el-dialog
-    :title="$t('inspectionRoute.choosePointTitle')"
-    :visible.sync="visible"
-    width="70%"
-    @close="handleClose"
-  >
+  <el-dialog :title="$t('inspectionRoute.choosePointTitle')" :visible.sync="visible" width="70%" @close="handleClose">
     <el-row :gutter="20">
       <el-col :span="24">
-        <el-card>
+
           <el-row :gutter="20" class="margin-bottom">
             <el-col :span="18"></el-col>
             <el-col :span="6">
-              <el-input
-                v-model="chooseInspectionRoutePointInfo.inspectionName"
-                :placeholder="$t('inspectionRoute.pointNamePlaceholder')"
-                clearable
-                class="search-input"
-              >
-                <el-button
-                  slot="append"
-                  type="primary"
-                  @click="queryPoints"
-                >
+              <el-input v-model="chooseInspectionRoutePointInfo.inspectionName"
+                :placeholder="$t('inspectionRoute.pointNamePlaceholder')" clearable class="search-input">
+                <el-button slot="append" type="primary" @click="queryPoints">
                   <i class="el-icon-search"></i>
                 </el-button>
-                <el-button
-                  slot="append"
-                  type="primary"
-                  @click="resetPoints"
-                >
+                <el-button slot="append" type="primary" @click="resetPoints">
                   <i class="el-icon-refresh"></i>
                 </el-button>
               </el-input>
             </el-col>
           </el-row>
 
-          <el-table
-            :data="chooseInspectionRoutePointInfo.points"
-            border
-            style="width: 100%"
-            @selection-change="handleSelectionChange"
-          >
-            <el-table-column
-              type="selection"
-              width="55"
-              align="center"
-            />
-            <el-table-column
-              prop="inspectionId"
-              :label="$t('inspectionRoute.pointId')"
-              align="center"
-            />
-            <el-table-column
-              prop="inspectionName"
-              :label="$t('inspectionRoute.pointName')"
-              align="center"
-            />
+          <el-table :data="chooseInspectionRoutePointInfo.points" border style="width: 100%"
+            @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column prop="inspectionId" :label="$t('inspectionRoute.pointId')" align="center" />
+            <el-table-column prop="inspectionName" :label="$t('inspectionRoute.pointName')" align="center" />
           </el-table>
 
-          <el-pagination
-            :current-page.sync="page.current"
-            :page-size="page.size"
-            :total="page.total"
-            layout="total, prev, pager, next"
-            @current-change="handlePageChange"
-          />
+          <el-pagination :current-page.sync="page.current" :page-size="page.size" :total="page.total"
+            layout="total, prev, pager, next" @current-change="handlePageChange" />
 
           <div class="text-right margin-top">
             <el-button @click="handleClose">
               {{ $t('common.cancel') }}
             </el-button>
-            <el-button
-              type="primary"
-              @click="_chooseInspectionRoutePoint"
-            >
+            <el-button type="primary" @click="_chooseInspectionRoutePoint">
               {{ $t('common.confirm') }}
             </el-button>
           </div>
-        </el-card>
       </el-col>
     </el-row>
   </el-dialog>
@@ -126,8 +84,8 @@ export default {
           inspectionRouteId: this.chooseInspectionRoutePointInfo.inspectionRouteId,
           communityId: this.communityId
         }
-        const { data, total } = await listInspectionPoints(params)
-        this.chooseInspectionRoutePointInfo.points = data
+        const { inspectionPoints, total } = await listInspectionPoints(params)
+        this.chooseInspectionRoutePointInfo.points = inspectionPoints
         this.page.total = total
       } catch (error) {
         console.error('获取巡检点列表失败:', error)
diff --git a/src/components/inspection/DeleteInspectionRoute.vue b/src/components/inspection/DeleteInspectionRoute.vue
index 8f2ef7d..2faf1f0 100644
--- a/src/components/inspection/DeleteInspectionRoute.vue
+++ b/src/components/inspection/DeleteInspectionRoute.vue
@@ -1,10 +1,5 @@
 <template>
-  <el-dialog
-    :title="$t('common.confirmOperation')"
-    :visible.sync="visible"
-    width="30%"
-    @close="handleClose"
-  >
+  <el-dialog :title="$t('common.confirmDelete')" :visible.sync="visible" width="30%" @close="handleClose">
     <div class="text-center">
       <p>{{ $t('inspectionRoute.confirmDeleteRoute') }}</p>
     </div>
@@ -12,10 +7,7 @@
       <el-button @click="handleClose">
         {{ $t('common.cancel') }}
       </el-button>
-      <el-button
-        type="primary"
-        @click="deleteInspectionRoute"
-      >
+      <el-button type="primary" @click="deleteInspectionRoute">
         {{ $t('common.confirm') }}
       </el-button>
     </div>
diff --git a/src/components/inspection/EditInspectionRoute.vue b/src/components/inspection/EditInspectionRoute.vue
index 48f67fb..585c5a1 100644
--- a/src/components/inspection/EditInspectionRoute.vue
+++ b/src/components/inspection/EditInspectionRoute.vue
@@ -1,57 +1,24 @@
 <template>
-  <el-dialog
-    :title="$t('inspectionRoute.editRouteTitle')"
-    :visible.sync="visible"
-    width="50%"
-    @close="handleClose"
-  >
-    <el-form
-      ref="form"
-      :model="editInspectionRouteInfo"
-      :rules="rules"
-      label-width="120px"
-    >
-      <el-form-item
-        :label="$t('inspectionRoute.routeName')"
-        prop="routeName"
-      >
-        <el-input
-          v-model.trim="editInspectionRouteInfo.routeName"
-          :placeholder="$t('inspectionRoute.routeNamePlaceholder')"
-          clearable
-        />
+  <el-dialog :title="$t('inspectionRoute.editRouteTitle')" :visible.sync="visible" width="40%" @close="handleClose">
+    <el-form ref="form" :model="editInspectionRouteInfo" :rules="rules" label-width="120px">
+      <el-form-item :label="$t('inspectionRoute.routeName')" prop="routeName">
+        <el-input v-model.trim="editInspectionRouteInfo.routeName"
+          :placeholder="$t('inspectionRoute.routeNamePlaceholder')" clearable />
       </el-form-item>
-      <el-form-item
-        :label="$t('inspectionRoute.sequence')"
-        prop="seq"
-      >
-        <el-input
-          v-model.number="editInspectionRouteInfo.seq"
-          :placeholder="$t('inspectionRoute.sequencePlaceholder')"
-          clearable
-        />
+      <el-form-item :label="$t('inspectionRoute.sequence')" prop="seq">
+        <el-input v-model.number="editInspectionRouteInfo.seq" :placeholder="$t('inspectionRoute.sequencePlaceholder')"
+          clearable />
       </el-form-item>
-      <el-form-item
-        :label="$t('inspectionRoute.remark')"
-        prop="remark"
-      >
-        <el-input
-          v-model.trim="editInspectionRouteInfo.remark"
-          :placeholder="$t('inspectionRoute.remarkPlaceholder')"
-          type="textarea"
-          :rows="3"
-          clearable
-        />
+      <el-form-item :label="$t('inspectionRoute.remark')" prop="remark">
+        <el-input v-model.trim="editInspectionRouteInfo.remark" :placeholder="$t('inspectionRoute.remarkPlaceholder')"
+          type="textarea" :rows="3" clearable />
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="handleClose">
         {{ $t('common.cancel') }}
       </el-button>
-      <el-button
-        type="primary"
-        @click="editInspectionRoute"
-      >
+      <el-button type="primary" @click="editInspectionRoute">
         {{ $t('common.save') }}
       </el-button>
     </div>
@@ -81,7 +48,6 @@ export default {
         ],
         seq: [
           { required: true, message: this.$t('inspectionRoute.sequenceRequired'), trigger: 'blur' },
-          { type: 'number', message: this.$t('inspectionRoute.sequenceMustBeNumber'), trigger: 'blur' }
         ],
         remark: [
           { max: 200, message: this.$t('inspectionRoute.remarkMaxLength'), trigger: 'blur' }
@@ -107,7 +73,7 @@ export default {
     async editInspectionRoute() {
       try {
         await this.$refs.form.validate()
-        
+
         await updateInspectionRoute(this.editInspectionRouteInfo)
         this.$message.success(this.$t('inspectionRoute.editSuccess'))
         this.$emit('success')
diff --git a/src/components/inspection/inspectionRouteMap.vue b/src/components/inspection/inspectionRouteMap.vue
index e7cdc24..822d117 100644
--- a/src/components/inspection/inspectionRouteMap.vue
+++ b/src/components/inspection/inspectionRouteMap.vue
@@ -19,29 +19,15 @@ export default {
   },
   async mounted() {
     this.communityId = getCommunityId()
-    await this.loadQQMapScript()
     // 延迟初始化地图，确保DOM已经渲染
-    setTimeout(() => {
-      this.initMap()
-    }, 500)
   },
   methods: {
     loadData(route) {
+      this.initMap()
+
       this.loadRoute(route)
     },
-    loadQQMapScript() {
-      if (window.TMap) {
-        return Promise.resolve();
-      }
 
-      return new Promise((resolve, reject) => {
-        const script = document.createElement('script');
-        script.src = `https://map.qq.com/api/gljs?v=1.exp&key=您的腾讯地图KEY`;
-        script.onload = resolve;
-        script.onerror = reject;
-        document.head.appendChild(script);
-      });
-    },
     initMap() {
       // 默认中心点（北京）
       const center = new window.TMap.LatLng(39.916527, 116.397128)
diff --git a/src/components/inspection/pointRoute.vue b/src/components/inspection/pointRoute.vue
index 0a23a13..84d4276 100644
--- a/src/components/inspection/pointRoute.vue
+++ b/src/components/inspection/pointRoute.vue
@@ -78,7 +78,7 @@ export default {
       // 通知地图组件加载路线
       this.$nextTick(() => {
         if (this.$refs.inspectionRouteMap) {
-          this.$refs.inspectionRouteMap.loadRoute(route)
+          this.$refs.inspectionRouteMap.loadData(route)
         }
       })
     }
diff --git a/src/views/inspection/addInspectionPlanList.vue b/src/views/inspection/addInspectionPlanList.vue
index 5721937..fce756d 100644
--- a/src/views/inspection/addInspectionPlanList.vue
+++ b/src/views/inspection/addInspectionPlanList.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="add-inspection-plan-container">
     <el-card class="box-card">
-      <div slot="header">
-        <h5>{{ $t('addInspectionPlan.title') }}</h5>
+      <div slot="header" class="text-left">
+        <span>{{ $t('addInspectionPlan.title') }}</span>
       </div>
 
       <el-form ref="form" :model="form" label-width="150px" label-position="right">
diff --git a/src/views/inspection/inspectionPlanList.vue b/src/views/inspection/inspectionPlanList.vue
index 3f595d3..1892703 100644
--- a/src/views/inspection/inspectionPlanList.vue
+++ b/src/views/inspection/inspectionPlanList.vue
@@ -7,38 +7,21 @@
       <div class="card-content">
         <el-row :gutter="20">
           <el-col :span="5">
-            <el-input
-              :placeholder="$t('inspectionPlan.inspectionPlanIdPlaceholder')"
-              v-model="searchConditions.inspectionPlanId"
-              clearable
-            />
+            <el-input :placeholder="$t('inspectionPlan.inspectionPlanIdPlaceholder')"
+              v-model="searchConditions.inspectionPlanId" clearable />
           </el-col>
           <el-col :span="5">
-            <el-input
-              :placeholder="$t('inspectionPlan.inspectionPlanNamePlaceholder')"
-              v-model="searchConditions.inspectionPlanName"
-              clearable
-            />
+            <el-input :placeholder="$t('inspectionPlan.inspectionPlanNamePlaceholder')"
+              v-model="searchConditions.inspectionPlanName" clearable />
           </el-col>
           <el-col :span="5">
-            <el-input
-              :placeholder="$t('inspectionPlan.staffNamePlaceholder')"
-              v-model="searchConditions.staffNameLike"
-              clearable
-            />
+            <el-input :placeholder="$t('inspectionPlan.staffNamePlaceholder')" v-model="searchConditions.staffNameLike"
+              clearable />
           </el-col>
           <el-col :span="5">
-            <el-select 
-              v-model="searchConditions.state" 
-              :placeholder="$t('inspectionPlan.statePlaceholder')"
-              style="width:100%"
-            >
-              <el-option
-                v-for="(item, index) in stateOptions"
-                :key="index"
-                :label="item.name"
-                :value="item.statusCd"
-              />
+            <el-select v-model="searchConditions.state" :placeholder="$t('inspectionPlan.statePlaceholder')"
+              style="width:100%">
+              <el-option v-for="(item, index) in stateOptions" :key="index" :label="item.name" :value="item.statusCd" />
             </el-select>
           </el-col>
           <el-col :span="4">
@@ -97,18 +80,11 @@
               <el-button size="mini" @click="openDeleteModal(scope.row)">
                 {{ $t('inspectionPlan.delete') }}
               </el-button>
-              <el-button 
-                v-if="scope.row.state === '2020025'" 
-                size="mini" 
-                @click="openStateModal(scope.row, '2020026', $t('inspectionPlan.disable'))"
-              >
+              <el-button v-if="scope.row.state === '2020025'" size="mini"
+                @click="openStateModal(scope.row, '2020026', $t('inspectionPlan.disable'))">
                 {{ $t('inspectionPlan.disable') }}
               </el-button>
-              <el-button 
-                v-else 
-                size="mini" 
-                @click="openStateModal(scope.row, '2020025', $t('inspectionPlan.enable'))"
-              >
+              <el-button v-else size="mini" @click="openStateModal(scope.row, '2020025', $t('inspectionPlan.enable'))">
                 {{ $t('inspectionPlan.enable') }}
               </el-button>
               <el-button size="mini" @click="viewDetail(scope.row)">
@@ -118,21 +94,15 @@
           </template>
         </el-table-column>
       </el-table>
-      
+
       <el-row class="margin-top">
-        <el-col :span="18">
+        <el-col :span="18" class="text-left table-desc">
           <div>{{ $t('inspectionPlan.note') }}</div>
         </el-col>
         <el-col :span="6">
-          <el-pagination
-            :current-page.sync="pagination.current"
-            :page-sizes="[10, 20, 30, 50]"
-            :page-size="pagination.size"
-            layout="total, sizes, prev, pager, next"
-            :total="pagination.total"
-            @size-change="handleSizeChange"
-            @current-change="handlePageChange"
-          />
+          <el-pagination :current-page.sync="pagination.current" :page-sizes="[10, 20, 30, 50]"
+            :page-size="pagination.size" layout="total, sizes, prev, pager, next" :total="pagination.total"
+            @size-change="handleSizeChange" @current-change="handlePageChange" />
         </el-col>
       </el-row>
     </el-card>
@@ -148,7 +118,7 @@ import { listInspectionPlans } from '@/api/inspection/inspectionPlanApi'
 import EditInspectionPlan from '@/components/inspection/editInspectionPlan'
 import DeleteInspectionPlan from '@/components/inspection/deleteInspectionPlan'
 import InspectionPlanState from '@/components/inspection/inspectionPlanState'
-import {getDict} from '@/api/community/communityApi'
+import { getDict } from '@/api/community/communityApi'
 export default {
   name: 'InspectionPlanList',
   components: {
@@ -185,7 +155,7 @@ export default {
         console.error('Failed to load dictionary data:', error)
       }
     },
-    
+
     async fetchInspectionPlans() {
       try {
         const params = {
@@ -193,7 +163,7 @@ export default {
           page: this.pagination.current,
           row: this.pagination.size
         }
-        
+
         const { data, total } = await listInspectionPlans(params)
         this.planList = data
         this.pagination.total = total
@@ -201,7 +171,7 @@ export default {
         this.$message.error(this.$t('inspectionPlan.fetchError'))
       }
     },
-    
+
     resetSearch() {
       this.searchConditions = {
         inspectionPlanId: '',
@@ -212,29 +182,29 @@ export default {
       this.pagination.current = 1
       this.fetchInspectionPlans()
     },
-    
+
     handleSizeChange(size) {
       this.pagination.size = size
       this.fetchInspectionPlans()
     },
-    
+
     handlePageChange(page) {
       this.pagination.current = page
       this.fetchInspectionPlans()
     },
-    
+
     openAddModal() {
       this.$router.push({ path: '/views/inspection/addInspectionPlan' })
     },
-    
+
     openEditModal(plan) {
       this.$refs.editModal.open(plan)
     },
-    
+
     openDeleteModal(plan) {
       this.$refs.deleteModal.open(plan)
     },
-    
+
     openStateModal(plan, state, stateName) {
       this.$refs.stateModal.open({
         inspectionPlanId: plan.inspectionPlanId,
@@ -242,11 +212,11 @@ export default {
         stateName
       })
     },
-    
+
     viewDetail(plan) {
       window.open(`/#/pages/inspection/inspectionPlanDetail?inspectionPlanId=${plan.inspectionPlanId}`)
     },
-    
+
     handleSuccess() {
       this.fetchInspectionPlans()
     }
@@ -258,6 +228,7 @@ export default {
 .margin-top {
   margin-top: 20px;
 }
+
 .card-content {
   padding: 20px;
 }
diff --git a/src/views/inspection/inspectionPointList.vue b/src/views/inspection/inspectionPointList.vue
index 28f9966..c65be0a 100644
--- a/src/views/inspection/inspectionPointList.vue
+++ b/src/views/inspection/inspectionPointList.vue
@@ -18,7 +18,8 @@
 
           <div class="vc-org margin-top">
             <ul class="point-list">
-              <li v-for="(point, index) in inspectionPointInfo.points" :key="index" @click="_switchInspectionPoint(point)"
+              <li v-for="(point, index) in inspectionPointInfo.points" :key="index"
+                @click="_switchInspectionPoint(point)"
                 :class="{ 'active': point.inspectionId == inspectionPointInfo.point.inspectionId }">
                 {{ point.inspectionName }}
               </li>
@@ -98,9 +99,11 @@
         <el-row v-if="inspectionPointInfo.point.inspectionId" class="margin-top">
           <el-col :span="24">
             <el-card>
-              <el-tabs v-model="inspectionPointInfo._currentTab" @tab-click="changeTab(inspectionPointInfo._currentTab)">
+              <el-tabs v-model="inspectionPointInfo._currentTab"
+                @tab-click="changeTab(inspectionPointInfo._currentTab)">
                 <el-tab-pane name="pointTaskDetail" :label="$t('inspectionPoint.tabs.pointTaskDetail')">
-                  <point-task-detail v-if="inspectionPointInfo._currentTab === 'pointTaskDetail'" ref="pointTaskDetail" />
+                  <point-task-detail v-if="inspectionPointInfo._currentTab === 'pointTaskDetail'"
+                    ref="pointTaskDetail" />
                 </el-tab-pane>
                 <el-tab-pane name="pointRoute" :label="$t('inspectionPoint.tabs.pointRoute')">
                   <point-route v-if="inspectionPointInfo._currentTab === 'pointRoute'" ref="pointRoute" />
@@ -118,10 +121,10 @@
       </el-col>
     </el-row>
     <!-- 模态框组件 -->
-    <add-inspection-point ref="addInspectionPoint" @success="_listInspectionPoints"/>
-    <edit-inspection-point ref="editInspectionPoint" @success="_listInspectionPoints"/>
-    <delete-inspection-point ref="deleteInspectionPoint" @success="_listInspectionPoints"/>
-    <inspection-point-qr-code ref="inspectionPointQrCode" @success="_listInspectionPoints"/>
+    <add-inspection-point ref="addInspectionPoint" @success="_listInspectionPoints" />
+    <edit-inspection-point ref="editInspectionPoint" @success="_listInspectionPoints" />
+    <delete-inspection-point ref="deleteInspectionPoint" @success="_listInspectionPoints" />
+    <inspection-point-qr-code ref="inspectionPointQrCode" @success="_listInspectionPoints" />
   </div>
 </template>
 
@@ -220,8 +223,8 @@ export default {
         if (this.$refs[tab]) {
           this.$refs[tab].loadData(this.inspectionPointInfo.point)
         }
-      },500)
-     
+      }, 500)
+
     },
     _openAddInspectionPointModal() {
       this.$refs.addInspectionPoint.open()
diff --git a/src/views/inspection/inspectionRouteList.vue b/src/views/inspection/inspectionRouteList.vue
index 0086417..4395dd0 100644
--- a/src/views/inspection/inspectionRouteList.vue
+++ b/src/views/inspection/inspectionRouteList.vue
@@ -6,10 +6,10 @@
           <div class="flex justify-start">
             <el-input v-model="inspectionRouteInfo.conditions.routeName"
               :placeholder="$t('inspectionRoute.routeNamePlaceholder')" class="search-input" clearable />
-            <el-button type="primary" class="margin-left-xs" size="small" @click="_queryInspectionRouteMethod">
+            <el-button type="text" class="margin-left-xs" size="small" @click="_queryInspectionRouteMethod">
               {{ $t('common.search') }}
             </el-button>
-            <el-button type="primary" class="margin-left-xs" size="small" @click="_openAddInspectionRouteModal">
+            <el-button type="text" class="margin-left-xs" size="small" @click="_openAddInspectionRouteModal">
               {{ $t('common.add') }}
             </el-button>
           </div>
@@ -42,7 +42,7 @@
             </div>
           </div>
 
-          <el-row>
+          <el-row class="text-left">
             <el-col :span="6">
               <div class="form-group">
                 <label class="col-form-label">
@@ -81,16 +81,16 @@
         <el-card class="tab-card margin-top">
           <el-tabs v-model="inspectionRouteInfo._currentTab" @tab-click="changeTab(inspectionRouteInfo._currentTab)">
             <el-tab-pane label="巡检点" name="inspectionRoutePoint">
-              <inspection-route-point ref="inspectionRoutePoint"/>
+              <inspection-route-point ref="inspectionRoutePoint" />
             </el-tab-pane>
             <el-tab-pane label="巡检地图" name="inspectionRouteMap">
-              <inspection-route-map ref="inspectionRouteMap"/>
+              <inspection-route-map ref="inspectionRouteMap" />
             </el-tab-pane>
             <el-tab-pane label="巡检计划" name="routePlan">
-              <route-plan ref="routePlan"/>
+              <route-plan ref="routePlan" />
             </el-tab-pane>
             <el-tab-pane label="巡检任务" name="routeTask">
-              <route-task ref="routeTask"/>
+              <route-task ref="routeTask" />
             </el-tab-pane>
           </el-tabs>
         </el-card>
@@ -187,7 +187,7 @@ export default {
         if (this.$refs[tab]) {
           this.$refs[tab].loadData(this.inspectionRouteInfo.route)
         }
-      },500)
+      }, 500)
     },
     handleSuccess() {
       this._listInspectionRoutes(1, 10)
--
libgit2 0.21.4