fix:

1. 增加是否定支持定时任务的判断
2.【机库-定时和周期】增加日期限制

iframe/src/App.vue

@@ -8,6 +8,7 @@
     :hangarTaskList="hangarTaskList"
     :scene="scene"
     :useSTLAirway="useSTLAirway"
+    :useTimedTask="useTimedTask"
     @uavChange="dispatchEvent('uavChange', $event)"
     @uavTaskStart="dispatchEvent('uavTaskStart', $event)"
     @uavTaskAdd="dispatchEvent('uavTaskAdd', $event)"
@@ -33,6 +34,7 @@ export default {
       password: "test@Admin001",
       userInfo: null,
       useSTLAirway: true, // 使用标准航线
+      useTimedTask: false, // 使用定时任务
       uavTaskList: [
       ],
       hangarTaskList: {

src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlLeft/components/taskList/components/periodTask/components/taskAdd/index.vue

@@ -18,6 +18,7 @@
             size="mini"
             popper-class="mmc"
             value-format="yyyy-MM-dd"
+            :picker-options="pickerOptions"
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="执行时间" prop="time" required>
@@ -60,6 +61,12 @@ export default {
         time: ['00:00:00', '00:00:00'],
         normalTaskId: "",
       },
+      pickerOptions: {
+        disabledDate: (time) => {
+          // 日期选择限制
+          return time.getTime() < Date.now() - 8.64e7;
+        },
+      }
     };
   },
   computed: {

src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlLeft/components/taskList/components/timedTask/components/taskAdd/index.vue

@@ -18,6 +18,7 @@
           type="datetime"
           placeholder="选择时间"
           value-format="yyyy-MM-dd HH:mm:ss"
+          :picker-options="pickerOptions"
         ></el-date-picker>任务名称
         <el-select
           v-model="item.normalTaskId"
@@ -66,6 +67,12 @@ export default {
         } */
       ],
       showMore: false,
+      pickerOptions: {
+        disabledDate: (time) => {
+          // 日期选择限制
+          return time.getTime() < Date.now() - 8.64e7;
+        },
+      }
     };
   },
   computed: {

src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlLeft/components/taskList/components/timedTask/index.vue

@@ -60,7 +60,7 @@ export default {
   data() {
     return {
       showTaskAdd: false,
-      taskListAll: []
+      taskListAll: [],
     };
   },
   computed: {

src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlLeft/components/taskList/index.vue

@@ -6,16 +6,18 @@
         :class="{active: tabIndex === 0}"
         @click="tabIndex = 0"
       >常态飞行</div>
-      <div
-        class="task-list-header__item"
-        :class="{active: tabIndex === 1}"
-        @click="tabIndex = 1"
-      >定时飞行</div>
-      <div
-        class="task-list-header__item"
-        :class="{active: tabIndex === 2}"
-        @click="tabIndex = 2"
-      >周期飞行</div>
+      <template v-if="useTimedTask">
+        <div
+          class="task-list-header__item"
+          :class="{active: tabIndex === 1}"
+          @click="tabIndex = 1"
+        >定时飞行</div>
+        <div
+          class="task-list-header__item"
+          :class="{active: tabIndex === 2}"
+          @click="tabIndex = 2"
+        >周期飞行</div>
+      </template>
     </div>
     <div class="task-list-main">
       <!-- 常态任务 -->
@@ -29,28 +31,35 @@
 </template>
 
 <script>
-import NormalTask from './components/normalTask';
-import TimedTask from './components/timedTask';
-import PeriodTask from './components/periodTask';
+import NormalTask from "./components/normalTask";
+import TimedTask from "./components/timedTask";
+import PeriodTask from "./components/periodTask";
+import { mapState } from 'vuex';
 
 export default {
   name: "hangarTaskList",
   components: {
     NormalTask,
     TimedTask,
-    PeriodTask
+    PeriodTask,
   },
   data() {
     return {
       tabIndex: 0,
     };
   },
-  mounted(){
-
+  computed: {
+    ...mapState('MMCFlightControlCenter', ['useTimedTask'])
   },
-  methods: {
-
-  }
+  watch: {
+    useTimedTask(){
+      if(!this.useTimedTask){
+        this.tabIndex = 0;
+      }
+    }
+  },
+  mounted() {},
+  methods: {},
 };
 </script>
 

src/components/MMCFlightControlCenter/index.vue

@@ -120,6 +120,11 @@ export default {
       type: Boolean,
       default: true,
     },
+    // 使用定时任务
+    useTimedTask: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -161,6 +166,15 @@ export default {
         });
       },
     },
+    useTimedTask: {
+      immediate: true,
+      handler(newVal) {
+        this.$store.commit("MMCFlightControlCenter/setState", {
+          key: "useTimedTask",
+          value: newVal,
+        });
+      },
+    },
   },
   beforeCreate() {
     Vue.component("SymbolIcon", SymbolIcon);

src/components/MMCFlightControlCenter/store/index.js

@@ -33,6 +33,7 @@ export default {
     listCollapse: false, //无人机或机库列表是否折叠
     airwayEntities: [], //航线实体集合, 元素为new Cesium.EntityCollection()创建
     useSTLAirway: true, //是否使用标准航线库
+    useTimedTask: false, //是否使用定时任务
   },
   mutations: {
     /**

vue2/src/views/fkzxIframe/demo.vue

@@ -10,7 +10,9 @@
       <el-form-item label="使用标准航线库">
         <el-switch v-model="useSTLAirway" active-text="启用" inactive-text="关闭"></el-switch>
       </el-form-item>
-
+      <el-form-item label="使用定时任务">
+        <el-switch v-model="useTimedTask" active-text="启用" inactive-text="关闭"></el-switch>
+      </el-form-item>
       <el-form-item label="账号">
         <el-input v-model="account"></el-input>
       </el-form-item>
@@ -84,8 +86,9 @@ export default {
       isIframeReady: false, //是否接收到iframe里的ready事件
       baseUrl: "https://test.tmj.mmcuav.cn",
       devMode: false,
-      scene1: null, // 场景类型 true: 无人机 false: 机库
-      useSTLAirway: null, // 使用标准航线库
+      scene1: false, // 场景类型 true: 无人机 false: 机库
+      useSTLAirway: false, // 使用标准航线库
+      useTimedTask: false, // 使用定时任务
       account: "mmctest@admin",
       password: "test@Admin001",
       userInfo: null,
@@ -213,12 +216,15 @@ export default {
       },
     },
     // 场景
-    scene() {
-      this.postIframe({
-        type: "param",
-        param: "scene",
-        data: this.scene,
-      });
+    scene: {
+      immediate: true,
+      handler() {
+        this.postIframe({
+          type: "param",
+          param: "scene",
+          data: this.scene,
+        });
+      },
     },
     userInfo() {
       this.postIframe({
@@ -234,6 +240,13 @@ export default {
         data: this.useSTLAirway,
       });
     },
+    useTimedTask() {
+      this.postIframe({
+        type: "param",
+        param: "useTimedTask",
+        data: this.useTimedTask,
+      });
+    },
   },
   async mounted() {
     window.postIframe = this.postIframe;
@@ -553,6 +566,7 @@ export default {
       }
     },
     init() {
+      this.scene1 = true;
       this.useSTLAirway = false;
       this.uavTaskList = [
         {