Merge remote-tracking branch 'origin/dev' into dev

src/views/globalMap/RightMenu/UAV/index.vue

@@ -11,7 +11,7 @@
     </div>
     <div class="flex-box" style="align-items: center; margin-top: 40px">
       <el-input v-model="queryParams.keyword" class="custom-input" placeholder="请输入" @confirm="initData" />
-      <div class="common-btn-primary2" style="margin-left: 20px">搜索</div>
+      <div class="common-btn-primary2" style="margin-left: 20px" @onclick="initData" >搜索</div>
     </div>
     <div class="flex-box" style="margin-top: 40px; margin-bottom: 40px; position: relative">
       <div class="flex-title1">
@@ -28,7 +28,7 @@
         无人机状态
         <i class="icon-info" />
         <div class="flex-content">
-          <el-checkbox-group v-model="queryParams.status_list" class="custom-checkbox-group">
+          <el-checkbox-group v-model="queryParams.status_list" class="custom-checkbox-group" @change="handleStatusChange" >
             <el-checkbox v-for="item in drone_status" :key="item.value" :label="item.label" :value="item.value" />
           </el-checkbox-group>
         </div>
@@ -38,7 +38,7 @@
       <div class="table-content">
         <div v-for="(item, index) in droneResourcesData.listData" :key="index" class="tr" @click="handleItem(item.id)">
           <div class="td">{{ item.drone_name }}</div>
-          <div class="td" style="width: 150px; flex: unset; text-align: center">飞行中</div>
+          <div class="td" style="width: 150px; flex: unset; text-align: center">{{item.status_text}}</div>
         </div>
       </div>
     </div>
@@ -47,7 +47,7 @@
 </template>
 
 <script setup lang="ts" name="UAV">
-import { getDroneResourcesList } from '@/api/globalMap/UAV';
+import { getDroneResourcesList, getRoughTimeStatusList } from '@/api/globalMap/UAV';
 import DroneTags from '@/views/globalMap/RightMenu/UAV/DroneTags.vue';
 import RegionalSelect from '@/views/globalMap/RightMenu/UAV/RegionalSelect.vue';
 import DroneDetail from '@/views/globalMap/RightMenu/UAV/DroneDetail.vue';
@@ -74,7 +74,9 @@ const droneResourcesData = reactive({
 
 // 无人机区域变化
 const handleRegionalChange = (id) => {
+  // console.log('handleRegionalChange:', id);
   queryParams.area = id;
+  initData();
 };
 
 // 无人机标签变化
@@ -82,6 +84,7 @@ const handleDroneTagsConfirm = (data) => {
   queryParams.time = data.timeData;
   queryParams.mode = data.modeData.toString();
   queryParams.type = data.typeData.toString();
+  console.log('handleDroneTagsConfirm:', queryParams);
   initData();
 };
 
@@ -92,9 +95,17 @@ const handleStatusChange = (data) => {
 
 // 获取数据
 const initData = async () => {
+  const params = {...queryParams, status: queryParams.status_list.join(",")};
+  delete params['status_list'];
+  console.log(params);
+  getRoughTimeStatusList(params).then((res) => {
+    droneResourcesData.listData = res.data.list;
+  });
+  /*
   getDroneResourcesList({ area: '', drone_type: '' }).then((res) => {
     droneResourcesData.listData = res.data.list;
   });
+  */
 };
 
 // 详情