feat:修改新建任务的问题

frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.js

@@ -497,6 +497,7 @@ export default {
         }
       ],
       emptyImg: require('@/assets/img/common/empty.svg'),
+      noAllowDraw: true
     }
   },
   computed: {
@@ -902,17 +903,25 @@ export default {
       }
 
     },
-    loaderChange() {
+    uavLoaderChange() {
-      getLastStatus({ payloadId: this.form.loader }).then(res => {
+      if (this.form.uav && this.form.loader) {
-        const data = res.data.data
+        getLastStatus({ payloadId: this.form.loader }).then(res => {
-        console.log(data, '载荷状态信息');
+          const data = res.data.data
-
+          this.form.targetList.forEach(el => {
-        let position = DT.Cesium.Cartesian3.fromDegrees(data.longitude, data.latitude, 2000)
+            theViewerTools.removeByName(el.targetName)
-        viewer.cesiumViewer.scene.camera.flyTo({
+          })
-          destination: position,
+          this.noAllowDraw = false
-          duration: 1
+          this.removePreviewLine()
+          this.form.targetList = []
+          // 清楚当前目标
+          console.log(data, '载荷状态信息');
+          let position = DT.Cesium.Cartesian3.fromDegrees(data.longitude, data.latitude, 2000)
+          viewer.cesiumViewer.scene.camera.flyTo({
+            destination: position,
+            duration: 1
+          })
         })
-      })
+      }
     },
     getLoaderData(type) {
       // getLoaderList
@@ -1162,13 +1171,19 @@ export default {
         flyHeight: 300,
         initSpeed: 10,
         targetList: [],
-        loader: this.loaderOptions[0].id,
+        loader: undefined,
-        uav: this.uavOptions[0].id,
+        uav: undefined,
         routepoints: [],
         waveAngle: 20,
         waveRotation: 20,
 
       }
+      if (this.loaderOptions.length) {
+        this.form.loader = this.loaderOptions[0].id
+      }
+      if (this.uavOptions.length) {
+        this.form.uav = this.uavOptions[0].id
+      }
       this.calculateLimit()
       this.getUavList()
       this.getLoaderData()

frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.vue

@@ -75,17 +75,17 @@
                   @click.stop="makeTaskUavFly(item, index)"
                 ></i>
               </el-tooltip>
-               <el-tooltip
+              <el-tooltip
-                  effect="dark"
+                effect="dark"
-                  content="重新执行"
+                content="重新执行"
-                  placement="top"
+                placement="top"
-                  v-if="item.status === 2"
+                v-if="item.status === 2"
-                >
+              >
-                  <i
+                <i
-                    class="ri-restart-line"
+                  class="ri-restart-line"
-                    @click.stop="reRunTask(item, index)"
+                  @click.stop="reRunTask(item, index)"
-                  ></i>
+                ></i>
-                </el-tooltip>
+              </el-tooltip>
               <el-dropdown
                 @command="handleCommand($event, item)"
                 placement="bottom"
@@ -165,6 +165,36 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item prop="uav" label="无人机">
+            <el-select
+              popper-class="form-light"
+              size="small"
+              v-model="form.uav"
+              @change="uavLoaderChange"
+            >
+              <el-option
+                v-for="item in uavOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="loader" label="载荷">
+            <el-select
+              popper-class="form-light"
+              size="small"
+              v-model="form.loader"
+              @change="uavLoaderChange"
+            >
+              <el-option
+                v-for="item in loaderOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item
             label="任务目标"
             v-if="form.mode === '1'"
@@ -174,7 +204,7 @@
               <el-select
                 popper-class="form-light"
                 size="small"
-                :disabled="duringDraw"
+                :disabled="duringDraw || noAllowDraw"
                 v-model="form.targetChoose"
               >
                 <el-option
@@ -289,50 +319,6 @@
           </el-table>
         </div>-->
 
-          <el-form-item prop="uav" label="无人机">
-            <el-select
-              popper-class="form-light"
-              size="small"
-              v-model="form.uav"
-            >
-              <el-option
-                v-for="item in uavOptions"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <!--        <el-form-item prop="loaderType" label="载荷类型">-->
-          <!--          <el-select-->
-          <!--            size="small"-->
-          <!--            @change="onLoaderTypeChange"-->
-          <!--            v-model="form.loaderType"-->
-          <!--          >-->
-          <!--            <el-option-->
-          <!--              v-for="item in loaderTypeOptions"-->
-          <!--              :key="item.value"-->
-          <!--              :label="item.label"-->
-          <!--              :value="item.value"-->
-
-          <!--            ></el-option>-->
-          <!--          </el-select>-->
-          <!--        </el-form-item>-->
-          <el-form-item prop="loader" label="载荷">
-            <el-select
-              popper-class="form-light"
-              size="small"
-              v-model="form.loader"
-              @change="loaderChange"
-            >
-              <el-option
-                v-for="item in loaderOptions"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
           <el-form-item prop="startAltitude" label="起飞点高度">
             <div class="input-command">
               <el-input