From e942711179e56aefdf5895cc9b4ea9040cc84b9a Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 14 Aug 2025 15:38:55 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.2' into feature/v5.0/5.0.3
---
src/views/tickets/ticket.vue | 3 ++-
src/api/algorithm.js | 4 ++--
src/assets/images/dataCenter/qrCode.png | 0
src/views/algorithmRepository/algorithmRepository.vue | 10 ++++++++--
src/assets/images/dataCenter/qrCode.svg | 17 +++++++++++++++++
5 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/src/api/algorithm.js b/src/api/algorithm.js
index 0543cdf..1b72eea 100644
--- a/src/api/algorithm.js
+++ b/src/api/algorithm.js
@@ -10,10 +10,10 @@
})
}
//机巢查询
-export const selectDeviceList = data => {
+export const selectDeviceList = params => {
return request({
url: `/drone-device-core/aiTmp/devices`,
method: 'get',
- data: data,
+ params,
})
}
\ No newline at end of file
diff --git a/src/assets/images/dataCenter/qrCode.png b/src/assets/images/dataCenter/qrCode.png
new file mode 100644
index 0000000..fd402f0
--- /dev/null
+++ b/src/assets/images/dataCenter/qrCode.png
Binary files differ
diff --git a/src/assets/images/dataCenter/qrCode.svg b/src/assets/images/dataCenter/qrCode.svg
new file mode 100644
index 0000000..0ec5174
--- /dev/null
+++ b/src/assets/images/dataCenter/qrCode.svg
@@ -0,0 +1,17 @@
+<svg width="14" height="15" viewBox="0 0 14 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1321315688">
+<g id="Frame" clip-path="url(#clip0_1238_1817)">
+<g id="Frame_2" clip-path="url(#clip1_1238_1817)">
+<path id="Vector" d="M4.83697 10.163H3.10692V8.43298H1.37593V11.029H3.10692V11.894H4.83697V11.029H6.56795V8.43298H4.83697V10.163ZM12.625 8.43298H7.43298V13.625H12.625V8.43298ZM10.894 10.164V11.8949H9.16303V10.163L10.894 10.164ZM12.625 2.375H7.43298V7.56982H12.625V2.375ZM10.894 4.10598V5.83697H9.16303V4.10598H10.894ZM6.56702 2.375H1.375V7.56982H6.56795L6.56702 2.375ZM4.83604 4.10598V5.83697H3.10692V4.10598H4.83604ZM3.10692 11.894H1.37593V13.625H3.10692V11.894ZM6.56795 11.894H4.83697V13.625H6.56795V11.894Z" fill="#212121"/>
+</g>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_1238_1817">
+<rect width="11" height="11" fill="white" transform="translate(1.5 2.13086)"/>
+</clipPath>
+<clipPath id="clip1_1238_1817">
+<rect width="12" height="12" fill="white" transform="matrix(-1 0 0 1 13 2)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/views/algorithmRepository/algorithmRepository.vue b/src/views/algorithmRepository/algorithmRepository.vue
index 1ff0359..c64cedb 100644
--- a/src/views/algorithmRepository/algorithmRepository.vue
+++ b/src/views/algorithmRepository/algorithmRepository.vue
@@ -107,11 +107,12 @@
</template>
<script setup>
-
+import { useStore } from 'vuex';
import { getDictionaryByCode } from '@/api/system/dictbiz';
import { getalgorithmList, selectDeviceList } from '@/api/algorithm';
import { getSmallImg,getShowImg } from '@/utils/util';
import { useRouter } from 'vue-router';
+const store = useStore();
const router = useRouter();
const baseUrl = import.meta.env.VITE_APP_PICTURE_URL;
const showDetail = ref(false);
@@ -120,6 +121,7 @@
const jcoptions = ref([]);
const total = ref(0);
const loading = ref(true);
+const userAreaCode = computed(() => store.getters.userInfo.detail.areaCode);
const params = ref({
ai_type_key: '',
start_date: null,
@@ -175,8 +177,12 @@
};
// 机巢查询
const getDeviceList = () => {
- selectDeviceList().then(res => {
+console.log('userAreaCode',userAreaCode.value);
+// { areaCode: userAreaCode.value }
+ selectDeviceList({ areaCode: userAreaCode.value }).then(res => {
jcoptions.value = res.data.data;
+ console.log('机巢数',jcoptions.value );
+
});
};
// 日期选择
diff --git a/src/views/tickets/ticket.vue b/src/views/tickets/ticket.vue
index c5febfd..4d5397b 100644
--- a/src/views/tickets/ticket.vue
+++ b/src/views/tickets/ticket.vue
@@ -649,7 +649,7 @@
>
<template #reference>
- <img @click.stop="handleQRCode(currentDetail)" class="QRCodeImg" src="@/assets/images/dataCenter/positionicon.png" alt="" title="事件导航" />
+ <img @click.stop="handleQRCode(currentDetail)" class="QRCodeImg" src="@/assets/images/dataCenter/qrCode.svg" alt="" title="事件导航" />
</template>
<div class="qrcode-content">
<CreateQRcode v-if="currentDetail.showQR && detailVisible" :latAndLon="currentDetail.location"></CreateQRcode>
@@ -3447,6 +3447,7 @@
width: 18px;
height: 18px;
cursor: pointer;
+ padding-bottom: 1px;
}
}
--
Gitblit v1.9.3