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

src/api/demo/device.ts

@@ -6,6 +6,7 @@ enum Api {
   GetUavPageList = '/api/Manage/GetUavPageList',
   EditUav = '/api/Manage/EditUav',
   DeleteUav = '/api/Manage/DeleteUav',
+  GetGateway = '/api/AirportMaintenance/GetGateway',
 }
 
 export function GetDataList(params) {
@@ -41,4 +42,9 @@ export function DeleteUav(id: string) {
   return defHttp.post({
     url: `${Api.DeleteUav}?id=${id}`,
   });
+}
+export function GetGateway() {
+  return defHttp.post({
+    url:  Api.GetGateway,
+  });
 }

src/views/demo/workmanagement/device/Airport/DeviceBindModal/index.vue

@@ -5,21 +5,29 @@
     </p>
     <div class="show-item">
       <div class="item-label">组织名称</div>
-      <div class="item-value">TEST</div>
+      <div class="item-value">{{data?.orgName}}</div>
     </div>
     <div class="show-item">
       <div class="item-label">组织 ID</div>
-      <div class="item-value">XDX9VU</div>
+      <div class="item-value">{{data.orgId}}</div>
     </div>
     <div class="show-item">
       <div class="item-label">设备绑定码</div>
-      <div class="item-value">6473D312</div>
+      <div class="item-value">{{data.gatewaySn}}</div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import {} from "vue"
+import { onMounted, ref } from "vue"
+import { GetGateway } from '@/api/demo/device'
+const data = ref({})
+onMounted(() => {
+  GetGateway().then(res => {
+    console.log('GetGateway',res)
+    data.value = res
+  })
+})
 </script>
 
 <style lang="scss" scoped>

src/views/demo/workmanagement/projecthome/ProjectList/AddProject/DeviceSetting/index.vue

@@ -23,7 +23,7 @@
       <div class="user-icon" v-if="props.userId == item.id"></div>
     </div>
     <div class="table-item-col" style="width: 121px;">
-      {{ item.account }}
+      {{ item.typeId }}
     </div>
   </div>
 </template>

src/views/demo/workmanagement/projecthome/ProjectList/AddProject/index.vue

@@ -178,7 +178,7 @@
             <div class="time-icon"></div>
           </div>
           <div class="table-item-col" style="width: 94px;">
-            {{item.type}}
+            {{item.typeId}}
           </div>
           <div class="table-item-col" style="width: 57px;">
             <div class="list-del" @click="delDevice(item)"></div>