From 2ca94de8ede18ac07ccfd8dec7b6f6a707adde9b Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 01 Sep 2025 11:20:24 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management
---
src/views/algorithmRepository/algorithmRepository.vue | 63 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 14 deletions(-)
diff --git a/src/views/algorithmRepository/algorithmRepository.vue b/src/views/algorithmRepository/algorithmRepository.vue
index adadf1a..7aaa36d 100644
--- a/src/views/algorithmRepository/algorithmRepository.vue
+++ b/src/views/algorithmRepository/algorithmRepository.vue
@@ -42,11 +42,14 @@
v-model="taskData"
placeholder="请选择日期"
@change="changeselect"
+ clearable
+
/>
+ <!-- @clear="handleDateClear" -->
</div>
<div class="item">
<div class="itemchild">机巢查询：</div>
- <el-select v-model="params.device_name" placeholder="请选择" class="filter-item">
+ <el-select v-model="params.device_name" placeholder="请选择" class="filter-item" @change="handleSearch">
<el-option v-for="item in jcoptions" :key="item" :label="item" :value="item" />
</el-select>
</div>
@@ -58,9 +61,10 @@
</div>
</div>
- <div
+ <div v-if="detailData.length > 0" class="pictureBox">
+ <div
class="pictureitem"
- v-if="detailData.length > 0"
+
v-loading="loading"
element-loading-text="加载中"
>
@@ -69,7 +73,7 @@
ref="imageRef"
:src="getSmallImg(item.url)"
show-progress
- :preview-src-list="detailData.map(i => i.url)"
+ :preview-src-list="[getShowImg(item.url)]"
fit="cover"
/>
@@ -79,6 +83,7 @@
</div>
</div>
</div>
+ </div>
<el-empty class="custom-empty" v-else>
<template #description>
<span class="custom-text">暂无数据</span>
@@ -88,7 +93,7 @@
<el-pagination
class="pageStyle"
background
- :page-sizes="[10, 20, 30, 50]"
+ :page-sizes="[15, 20, 30, 50]"
v-model:current-page="params.current"
v-model:page-size="params.size"
layout="total, prev, pager, next,sizes, jumper"
@@ -102,11 +107,12 @@
</template>
<script setup>
-
+import { useStore } from 'vuex';
import { getDictionaryByCode } from '@/api/system/dictbiz';
import { getalgorithmList, selectDeviceList } from '@/api/algorithm';
-import { getSmallImg } from '@/utils/util';
+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);
@@ -115,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,
@@ -160,9 +167,6 @@
}
getalgorithmList(detailParams,{ current: params.value.current,
size: params.value.size,}).then(res => {
-
- console.log('算法仓库',res.data.data);
-
loading.value = true;
detailData.value = res.data.data.records;
total.value = res.data.data.total;
@@ -173,28 +177,52 @@
};
// 机巢查询
const getDeviceList = () => {
+console.log('userAreaCode',userAreaCode.value);
+// { areaCode: userAreaCode.value }
selectDeviceList().then(res => {
jcoptions.value = res.data.data;
+ console.log('机巢数',jcoptions.value );
+
});
};
// 日期选择
const changeselect = () => {
- params.value.start_date = taskData.value.length ? `${taskData.value[0]} 00:00:00` : null;
- params.value.end_date = taskData.value.length ? `${taskData.value[1]} 23:59:59` : null;
+ params.value.start_date = taskData.value?.length ? `${taskData.value[0]} 00:00:00` : null;
+ params.value.end_date = taskData.value?.length ? `${taskData.value[1]} 23:59:59` : null;
+ handleSearch()
};
-const handleSearch = () => {
+// 处理日期清空
+const handleDateClear = () => {
+ taskData.value = ''; // 清空绑定的日期数据
+ params.value.start_date = null; // 重置开始日期参数
+ params.value.end_date = null; // 重置结束日期参数
getList();
};
+const handleSearch = () => {
+// console.log('taskData',taskData.value);
+if(taskData.value === null){
+ params.value.start_date = null; // 重置开始日期参数
+ params.value.end_date = null; // 重置结束日期参数
+}
+
+ getList();
+
+};
const handleReset = () => {
+taskData.value =''
params.value.start_date = null;
params.value.end_date = null;
params.value.device_name = '';
params.value.name = '';
getList();
+
};
const goback = () => {
showDetail.value = false;
activeItem.value = null;
+ params.value.current =1
+ params.value.size=15
+ params.value.name=''
};
// 分页大小改变
const handleSizeChange = val => {
@@ -245,6 +273,7 @@
&:hover {
background: url('/src/assets/images/ht-sfbg-hover.png') no-repeat center;
background-size: 100% 100%;
+ cursor: pointer;
}
&.active-bg {
background: url('/src/assets/images/ht-sfbg-click.png') no-repeat center;
@@ -284,8 +313,14 @@
}
.algorithItemDetail {
padding: 20px;
-
+
+ .pictureBox {
+ // height: 625px;
+ height: pxToVh(760);
+ overflow: auto;
+ }
.pictureitem {
+
display: grid;
grid-template-columns: repeat(5, 1fr);
gap: 14px;
--
Gitblit v1.9.3