Merge branch 'main' of http://123.132.248.154:10000/gitY/DiKongGanZhiPingTai

src/views/demo/workmanagement/flightoperation/src/Patrol.vue

@@ -194,7 +194,7 @@
 
   const submit = () => {
     console.log(props.type);
-    if (!instantiateItem.value) {
+    if (!instantiateItem.value.id) {
       createMessage.warning('请选择AI算法实例');
       return;
     }

src/views/demo/workmanagement/workplan/components/map.vue

@@ -60,21 +60,21 @@
     <!-- 航线预览信息 -->
     <div class="airline-preview-container" v-if="props.editMode == 'detail'">
       <div class="info-item">
-        <div class="info-value">46461m²</div>
+        <div class="info-value">{{airInfo.area}} ㎡</div>
         <div class="info-label">区域面积</div>
       </div>
       <div class="info-item">
-        <div class="info-value">46461m²</div>
+        <div class="info-value">{{airInfo.length}} km</div>
         <div class="info-label">航线长度</div>
       </div>
       <div class="info-item">
-        <div class="info-value">34分钟</div>
+        <div class="info-value">{{(props.waylineWpmlConfig.Folder.distance/props.waylineWpmlConfig.Folder.autoFlightSpeed*2/60).toFixed(2)}} mins</div>
         <div class="info-label">预计时间</div>
       </div>
-      <div class="info-item">
+      <!-- <div class="info-item">
         <div class="info-value">78张</div>
         <div class="info-label">照片数量</div>
-      </div>
+      </div> -->
       <div class="info-item">
         <div>
           <a-button type="primary" danger size="small" @click="exitDraw">

src/views/demo/workmanagement/workplan/lib/generateMapping2d.ts

@@ -13,6 +13,9 @@
 
  import { calculateGsd,calculateSpacing,calculateInterval,uavModel } from './calculateAirLine'
 
+ /**
+  * 航线航线计算
+  */
 export default class Mapping2d {
 
     /**
@@ -24,7 +27,9 @@ export default class Mapping2d {
 
 
     /**
-     * 构造方法
+     * 面状航线计算构造方法
+     * @param templateKmlConfig template.kml配置
+     * @param waylineWpmlConfig wayline.wpml配置
      */
     constructor(templateKmlConfig:Object,waylineWpmlConfig:Object){
         this.templateKmlConfig = templateKmlConfig;
@@ -33,7 +38,10 @@ export default class Mapping2d {
 
 
      /**
-      * 计算获取结果
+      * 根据传入的template.kml、wayline.wpml配置信息计算返回航线文件
+      * 
+      * @Result 航线文件的Blob对象
+      * 
       */
     generateAirLine(){
 
@@ -59,16 +67,10 @@ export default class Mapping2d {
     }
 
     /**
-     * 根据航线文件高度计算gsd
-     * 
-     * 根据gsd 和 航线文件中重叠率 计算航线间距
+     * 解析template.kml测区范围信息
      * 
+     * @returns 测区范围面状geojson数据
      */
-     
-
-     /**
-      * 处理测区范围
-      */
     handlerCalculateParams(){
 
         let coordinateArray =this.templateKmlConfig.Folder.Placemark.Polygon.outerBoundaryIs.LinearRing.coordinates.split('\n');
@@ -102,9 +104,13 @@ export default class Mapping2d {
 
     }
 
-     /**
-      * 生成航线
-      */
+    /**
+     * 航线计算核心方法
+     * @param polygon 测区边界geojson
+     * @param spacing 航线间距
+     * @param angle 航线角度，默认0度为正北方向
+     * @returns 航点
+     */
     generateScanLines(polygon, spacing, angle = 0) {
 
         if (!turf.booleanValid(polygon)) throw new Error('无效的多边形');
@@ -881,9 +887,8 @@ export default class Mapping2d {
 
     /**
      * xml文件转换为 kml、wpml文件
-     */
-     async convertXmlToKmz(templateXml,waylineXml){
-
+    */
+    async convertXmlToKmz(templateXml,waylineXml){
 
         const zip = new JSZip();
     

src/views/demo/workmanagement/workplan/waylineConfig/mapping2dConfig.ts

@@ -33,8 +33,8 @@ export const templateKml  = {
       "templateType": "mapping2d",
       "templateId": 0,
       "overlapRate":{
-        "lateral":77,
-        "heading":88
+        "lateral":70,
+        "heading":80
       },
       "waylineCoordinateSysParam": {
         "coordinateMode": "WGS84",