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

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

@@ -130,7 +130,7 @@
   const pageWidth = document.documentElement.clientWidth;
   const width = ref(300);
   const height = ref(550);
-  const left = ref(pageWidth - 620);
+  const left = ref(0);
   const top = ref(100);
   const zIndex = ref(props.zIndex);
   const data = reactive({

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

@@ -701,7 +701,7 @@ watch(
     onceTime: [{ required: true, message: '时间不能为空！', trigger: 'blur' }],
   };
 
-  const onSubmit = () => {
+  const onSubmit =async () => {
     isSubmit.value = true;
 
     formRef.value

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

@@ -123,7 +123,6 @@
     })
 
     const getTaskList = async ()=>{
-
         let res = await  getTaskPageList(pageQuery.value);
         ariLineList.value = res.items;
         lineListTotal.value = res.total;

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

@@ -45,8 +45,8 @@
                 ></createWorkPlan>
             </div>
              <!-- 智能巡检 -->
-            <div v-if="patrolShow" class="patrol-box">
-                <Patrol type="plan" @changePatrol="patrolShow = false"/>
+            <div  class="patrol-box" v-if="patrolShow">
+                <Patrol  type="plan" @changePatrol="patrolShow = false"/>
             </div>
 
             <!-- 航线库 -->
@@ -519,13 +519,11 @@ onMounted(()=>{
 .patrol-box{
     width:360px;
     height: calc( 100vh - 144px);
-    flex:1;
-    position: relative;
+    position:relative;
 }
 .patrol-box ::v-deep .airport-information{
     right: 0;
     left: 0;
-    top: 200px;
-
+    top: 0px;
 }
 </style>