From e6520ae727facdad0cb8c24a7c6f2ca533d86c9d Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 26 Jun 2025 08:33:12 +0800
Subject: [PATCH] Merge branch 'test'
---
src/store/modules/user.js | 2 +-
src/views/algorithmRepository/algorithmRepository.vue | 6 +-----
src/views/device/airport.vue | 8 ++++----
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 3b6a410..ee2940d 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -39,7 +39,7 @@
token: getStore({ name: 'token' }) || '',
refreshToken: getStore({ name: 'refreshToken' }) || '',
parentDeptInfo: getStore({ name: 'parentDeptInfo' }) || '',
-
+
},
actions: {
//根据用户名登录
diff --git a/src/views/algorithmRepository/algorithmRepository.vue b/src/views/algorithmRepository/algorithmRepository.vue
index 5561427..285f004 100644
--- a/src/views/algorithmRepository/algorithmRepository.vue
+++ b/src/views/algorithmRepository/algorithmRepository.vue
@@ -107,7 +107,7 @@
});
import { getDictionaryByCode } from '@/api/system/dictbiz';
import { getalgorithmList, selectDeviceList } from '@/api/algorithm';
-// import { getSmallImg } from '@/utils/util';
+import { getSmallImg } from '@/utils/util';
import { useRouter } from 'vue-router';
const router = useRouter();
const baseUrl = import.meta.env.VITE_APP_PICTURE_URL;
@@ -127,10 +127,6 @@
size: 10,
});
-const getSmallImg = (url) => {
-
- return url ? encodeURI(url.substring(0, url.lastIndexOf('.')) + '_small' + url.substring(url.lastIndexOf('.'))) : ''
-}
// 请求字典字段
let AlgorithmData = ref([]);
const detailData = ref([]);
diff --git a/src/views/device/airport.vue b/src/views/device/airport.vue
index e10e4f0..11c0259 100644
--- a/src/views/device/airport.vue
+++ b/src/views/device/airport.vue
@@ -507,10 +507,10 @@
...mapGetters(['permission']),
permissionList () {
return {
- addBtn: this.validData(this.permission.airport_add, true),
- viewBtn: this.validData(this.permission.airport_view, true),
- delBtn: this.validData(this.permission.airport_delete, true),
- editBtn: this.validData(this.permission.airport_edit, true),
+ addBtn: this.validData(this.permission.air_add, true),
+ viewBtn: this.validData(this.permission.air_view, true),
+ delBtn: this.validData(this.permission.air_delete, true),
+ editBtn: this.validData(this.permission.air_edit, true),
}
},
ids () {
--
Gitblit v1.9.3