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

src/views/demo/workmanagement/workplan/actionComponents/gimbalRotate.vue

@@ -12,6 +12,17 @@
           {{ props.params.gimbalPitchRotateAngle }} °
         </div>
     </div>
+    <div class="params-item" style="justify-content: flex-end;">
+      <div class="params-label">&nbsp;</div>
+      <div class="params-value-text">
+        <a-input-number 
+          v-model:value="props.params.gimbalPitchRotateAngle" 
+          style="width:50px;margin-top:20px;" 
+          :min="-90"
+          :max="30"
+          @change="paramChagne"></a-input-number>
+      </div>
+    </div>
 </template>
 
 <script lang="ts" setup>

src/views/demo/workmanagement/workplan/actionComponents/rotateYaw.vue

@@ -11,6 +11,20 @@
           {{ props.params.aircraftHeading }} °
         </div>
     </div>
+
+    <div class="params-item" style="justify-content: flex-end;">
+      <div class="params-label">&nbsp;</div>
+      <div class="params-value-text">
+        <a-input-number 
+          v-model:value="props.params.aircraftHeading" 
+          style="width:50px;margin-top:20px;" 
+          :min="-180" 
+          :max="180"
+          @change="paramChagne" 
+        ></a-input-number>
+      </div>
+    </div>
+
 </template>
 
 <script lang="ts" setup>

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

@@ -2,6 +2,7 @@
     <div class="container">
         <div class="title">
             <LeftOutlined @click="backPage" />
+
             <div style="flex:1;">
                 <a-input v-model:value="props.airLineForm.airLineName"  size="middle" placeholder="航线名称" />
             </div>
@@ -42,8 +43,6 @@
 
         <!-- 航点列表 -->
         <div class="air-point-list">
-            
-
             <div class="air-point-item" v-for="(item,index) in props.airPoints" :key="index">
                 <!-- <div class="cel">{{item.lng}}</div>
                 <div class="cel">{{item.lat}}</div> -->
@@ -962,7 +961,7 @@ const handlerByPass = (e) => {
 
 .title{
     padding:20px;
-    font-size:16px;
+    font-size:14px;
     color:#ffffff;
     display:flex;
     gap:12px;

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

@@ -231,21 +231,17 @@
                 </a-select>
               </div>
             </a-form-item>
-  
-            <a-form-item ref="name" label="警告提示标题" name="">
+            <!-- <a-form-item ref="name" label="警告提示标题" name="">
               <a-input v-model:value="submitForm.warningTitle" placeholder="请输入警告提示标题" :disabled="props.workPlanStatus === 'detail'" />
             </a-form-item>
   
             <a-form-item ref="name" label="警告提示内容" name="">
               <a-textarea  rows="4" v-model:value="submitForm.warningContent" style="resize: none;" placeholder="请输入警告提示内容" :disabled="props.workPlanStatus === 'detail'" />
-            </a-form-item>
+            </a-form-item> -->
           </div>
-
         </div>
 
         <div class="group-container">
-          
-
           <a-form-item ref="outOfContact" label="返航高度（相对机场返航高度）" name="outOfContact">
             <div class="return-height">
               <div @click="submitForm.returnAltitude -= 100">-100</div>
@@ -490,7 +486,7 @@
 
     workspaceList.value = res;
 
-    if (res) {
+    if (res && props.workPlanStatus === 'create') {
       submitForm.value.workspaceId = res[0].Id;
       props.formData.workspaceId = res[0].Id;
     }

src/views/demo/workmanagement/workplan/index.vue

@@ -242,10 +242,11 @@ const checkDronePort = (item)=>{
     }
 }
 
-
 const toCreateWorkPlan = (data)=> { 
     if(data){
         formData.value = data;
+    }else{
+        formData.value = null;
     }
     workPlanFormShow.value = true;
     if(data){