合并分支 'v4' 到 'v4_master'

V4

查看合并请求 !11

iframe/src/i18n/locales/en.js

 export default {
   common: {
+    是否启动瞄准镜: "Enable Targeting镜",
     截屏成功: "Screenshot Successful",
     拍照完成: "Photo Completed",
     截屏失败: "Screenshot Failed",

iframe/src/i18n/locales/ru.js

 export default {
   common: {
+    是否启动瞄准镜: "Включить целивание",
     截屏成功: "Скриншот успешен",
     截图: "Скриншот",
     拍照成功: "Фото успешно сделано!",

iframe/src/i18n/locales/zh.js

 export default {
   common: {
+    是否启动瞄准镜: "是否启动瞄准镜",
     截屏成功: "截屏成功",
     AI识别: "AI识别",
     变焦: "变焦",

src/components/MMCFlightControlCenter/components/cesiumLayer/index.vue

@@ -9,11 +9,21 @@ import _2dList from "./lib/2d";
 
 export default {
   name: "CesiumLayer",
+  props: {
+    latitude: {
+      type: Number,
+      default: null,
+    },
+    longitude: {
+      type: Number,
+      default: null,
+    },
+  },
   data() {
     return {
       viewer: null,
-      init_lng: 112.576667,
-      init_lat: 23.175833,
+      init_lng: 113.855071,
+      init_lat:22.555942,
       init_alt: 5000,
       imageryLayers: {
         night: null, // 夜景图
@@ -46,12 +56,12 @@ export default {
       this.$bus.$on("handlePositions", (e) => {
         this.init_lng = e[0];
         this.init_lat = e[1];
-        this.init_alt = 300000;
+        this.init_alt = 5000;
         this.viewer.scene.camera.flyTo({
           destination: Cesium.Cartesian3.fromDegrees(
-            this.init_lng,
-            this.init_lat,
-            this.init_alt
+           this.longitude || this.init_lng,
+          this.latitude  || this.init_lat,
+          this.init_alt
           ),
         });
       });
@@ -169,11 +179,12 @@ export default {
       this.imageryLayers.night.show = false;
       this.imageryLayers.street.show = false;
       this.imageryLayers.star_satellite.show = false;
-
+        console.log('xxx',this.latitude,this.longitude);
+        
       this.viewer.scene.camera.flyTo({
         destination: Cesium.Cartesian3.fromDegrees(
-          this.init_lng,
-          this.init_lat,
+      this.longitude || this.init_lng,
+          this.latitude  || this.init_lat,
           this.init_alt
         ),
       });

src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlLeft/components/airwayList/components/normalTask/index.vue

@@ -3,12 +3,12 @@
     <el-form class="task-main" label-width="120px">
       <el-form-item :label="$t('common.任务库') + '：'" v-if="useTask">
         <el-select v-model="selectedTaskId" clearable>
-          <el-option v-for="(item, i) in taskList" :label="item.name" :value="item.id"></el-option>
+          <el-option v-for="(item) in taskList" :label="item.name" :key="item.id" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('common.航线') + '：'">
         <el-select v-model="selectedAirwayId">
-          <el-option v-for="(item, i) in airwayList" :label="item.name" :value="item.id"></el-option>
+          <el-option v-for="(item) in airwayList" :label="item.name" :key="item.id" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
     </el-form>

src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlLeft/components/airwayList/index.vue

@@ -10,9 +10,10 @@
       <el-form-item :label="$t('common.任务库')" v-if="useTask">
         <el-select v-model="selectedTaskId" clearable>
           <el-option
-            v-for="(item, i) in taskList"
+            v-for="(item) in taskList"
             :label="item.name"
             :value="item.id"
+            :key="item.id"
           ></el-option>
         </el-select>
       </el-form-item>
@@ -23,8 +24,9 @@
           clearable
         >
           <el-option
-            v-for="(item, i) in airwayList"
+            v-for="(item) in airwayList"
             :label="item.name"
+            :key="item.id"
             :value="item.id"
           ></el-option>
         </el-select>
@@ -218,7 +220,7 @@ export default {
           // taskStatus: 1, // 任务状态 0：待审批 1：待执行 2：执行中 3：执行完成 4:审批不通过
           callback: (res) => {
             this.taskList = res?.records.filter(
-              (item) => item.status != "已完成"
+              (item) => item.status == "待执行"
             );
             this.$nextTick(() => {
               if (id) {
@@ -283,7 +285,7 @@ export default {
         return this.$message.warning(this.$t('common.设备暂无备降点无法进行一键任务，请前往后台管理设置备降点！'));
       }
       let data = this.taskList.filter((item) => item.id == this.selectedTaskId);
-      if (data && data[0].status == "执行中") {
+      if (data && data[0] && data[0].status == "执行中") {
         return this.$message.warning(this.$t('common.当前任务执行中'));
       }
   

src/components/MMCFlightControlCenter/index.vue

 <template>
   <div class="mmc-filght-control-center mmc">
     <!-- cesium地图层 -->
-    <CesiumLayout v-if="!cesiumViewer"></CesiumLayout>
+    <CesiumLayout v-if="!cesiumViewer" :latitude="parseFloat(userInfo.latitude)" :longitude="parseFloat(userInfo.longitude)"></CesiumLayout>
     <!-- 地图切换组件 -->
     <MapImageSwitch></MapImageSwitch>
     <MapSearch class="map-search"></MapSearch>
@@ -106,7 +106,8 @@ export default {
   watch: {
     userInfo: {
       immediate: true,
-      handler() {
+      handler(value) {
+          console.log(value.latitude, value.longitude,'xxx');
         this.$store.commit("MMCFlightControlCenter/setState", {
           key: "token",
           value: this.userInfo.token,