Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-...

chenyao

2025-04-19 bdbc09270be8590d9b5a4837501074dfc338d34b

 src/views/TaskManage/TaskIntermediateContent/AddTask.vue

@@ -19,6 +19,7 @@
               </div>
               <div class="item">
                  <el-date-picker
                     popper-class="custom-date-picker"
                     class="ztzf-date-picker"
                     v-model="taskData"
                     type="daterange"
@@ -31,6 +32,7 @@
               <div class="item">
                  <div class="itemchild">任务时间：</div>
                  <el-time-picker
                   popper-class="custom-time-picker"
                     class="ztzf-date-picker tasktimer"
                     v-model="timeSlot"
                     placeholder="请选择"
@@ -40,8 +42,9 @@
               </div>
               <div class="item">
                  <div class="itemchild">选择航线：</div>
						

                  <el-select
                     :teleported="false"
                     class="ztzf-select"
                     v-model="searchForm.file_id"
                     @change="getWayLineFile"
@@ -57,12 +60,10 @@
                  </el-select>
               </div>
               <div class="item">
						
                  <div class="itemchild">关联算法：</div>
                  <TaskAlgorithmBusiness  :setWidth="200" :showAlgorithm="true" @algorithmChange="algorithmChange" />
                  <TaskAlgorithmBusiness :setWidth="200" :showAlgorithm="true" @algorithmChange="algorithmChange" />
               </div>
               <div class="item">
						
                  <div class="itemchild">任务描述：</div>
                  <el-input class="ztzf-input" v-model="searchForm.remark" placeholder="请输入任务名称"></el-input>
               </div>
@@ -84,7 +85,7 @@
               />
            </div>
         </div>
         <div class="right ">
         <div class="right">
            <TaskTable
               ref="taskTableRef"
               :waylineId="waylineId"
@@ -94,9 +95,8 @@
               @update:selected="handleSelected"
            />
            <div class="btn">
               <img @click="cancel" style="margin-right:23px" src="@/assets/images/task/cancel.png" alt="">
               <img @click="submitClick" src="@/assets/images/task/publish.png" alt="">
					
               <img @click="cancel" style="margin-right: 23px" src="@/assets/images/task/cancel.png" alt="" />
               <img @click="submitClick" src="@/assets/images/task/publish.png" alt="" />
            </div>
         </div>
      </div>
@@ -181,7 +181,7 @@
   waylineType.value = 0
   waylineId.value = val
   const currentRoute = routeOptions.value.find(item => item.wayline_id === val)
   wayLineFile.value = currentRoute?.object_key || '';
   wayLineFile.value = currentRoute?.object_key || ''
}

// 获取选中机场列表数据,并且发布
@@ -250,10 +250,10 @@
      })
      return
   }
	

   searchForm.begin_time = `${taskData.value[0]} 00:00:00`
   searchForm.end_time = `${taskData.value[1]} 23:59:59`
   searchForm.execute_time_arr = timeSlot.value ? [timeSlot.value] : [];
   searchForm.execute_time_arr = timeSlot.value ? [timeSlot.value] : []
   createTask(searchForm).then(res => {
      if (res.data.code === 0) {
         ElMessage.success('任务创建成功')
@@ -294,6 +294,12 @@
      padding: 20px;
   }
}
/* 修改日期单元格背景色 */
.custom-date-picker .el-picker-panel__body {
   background: #012350 !important;
   color: #fff !important;
}

</style>

<style lang="scss" scoped>
@@ -316,14 +322,13 @@
            font-size: 16px;
            color: #ffffff;
            .itemchild {
            width: 68px;
             white-space: nowrap;
            margin-right: 5px;
               width: 68px;
               white-space: nowrap;
               margin-right: 5px;
            }
            :deep(.el-date-editor.el-input__wrapper) {
               width: 200px; // 调整日期选择器宽度
            }
				
         }
      }
   }
@@ -338,17 +343,15 @@
         justify-content: center;
         align-items: center;
         img {
         width: 137px;
         height: 32px;
         cursor: pointer;
            width: 137px;
            height: 32px;
            cursor: pointer;
         }
		
      }
   }
   :deep(.tasktimer .el-input__wrapper) {
      background: none !important;
      color: #8ac3fd !important;
		 
   }
   :deep(.el-input__inner) {
      color: #8ac3fd !important;
@@ -356,15 +359,15 @@
         color: #8ac3fd !important;
      }
   }
   :deep(.el-radio__inner){
   background: none !important;
   border: 1px solid #1B5D9A !important;
   :deep(.el-radio__inner) {
      background: none !important;
      border: 1px solid #1b5d9a !important;
   }
   :deep(.el-radio__label){
   color: #fff !important;
   :deep(.el-radio__label) {
      color: #fff !important;
   }
   :deep(.el-radio__inner:after ){
   background: #65B5FF !important;
   :deep(.el-radio__inner:after) {
      background: #65b5ff !important;
   }
}
</style>