优化图片不显示以及删掉多余的代码

This commit is contained in:
wzclm 2025-03-08 16:02:01 +08:00
parent d0eca2f2ca
commit d7dbc3f585
10 changed files with 278 additions and 498 deletions

View File

@ -134,18 +134,6 @@ const getList = async () => {
}
}
//
const handleSizeChange = (val) => {
pagination.value.page_size = val
pagination.value.page = 1
getList()
}
const handleCurrentChange = (val) => {
pagination.value.page = val
getList()
}
//
const handleAdd = () => {
dialogTitle.value = '新增摄像头'

View File

@ -2,7 +2,7 @@
import { ref, onMounted } from 'vue'
import { Plus, Monitor, Timer } from '@element-plus/icons-vue'
import { ElMessage } from 'element-plus'
import { getDeviceList, addDevice, updateDevice, deleteDevice } from '@/api/device'
import { getDeviceList, deleteDevice } from '@/api/device'
//
const loading = ref(false)

View File

@ -2,7 +2,7 @@
import { ref, reactive, onMounted, computed, shallowRef, onBeforeUnmount, watch } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { Plus, Edit, Delete } from '@element-plus/icons-vue'
import { getParkGuidelinesList, addParkGuidelines, updateParkGuidelines, deleteParkGuidelines, updateParkGuidelinesStatus, updateParkGuidelinesSort } from '@/api/about/parkGuidelines'
import { getParkGuidelinesList, addParkGuidelines, updateParkGuidelines, deleteParkGuidelines } from '@/api/about/parkGuidelines'
import { formatDateTime } from '@/utils/format'
import '@wangeditor/editor/dist/css/style.css'
import { Editor, Toolbar } from '@wangeditor/editor-for-vue'

View File

@ -209,21 +209,6 @@ const handleDelete = async (row) => {
}
}
//
const handleSortChange = async (row) => {
try {
await updateProjectSort({
id: row.id,
sort_order: row.sort_order
})
ElMessage.success('更新排序成功')
getList()
} catch (error) {
console.error('更新排序失败:', error)
ElMessage.error('更新排序失败')
}
}
//
const handleImageTypeChange = () => {
formData.value.cover_image = ''

View File

@ -123,21 +123,6 @@ const getList = async () => {
}
}
//
const handleCurrentChange = (val) => {
currentPage.value = val
const start = (val - 1) * pageSize.value
const end = start + pageSize.value
tableData.value = filteredData.value.slice(start, end)
}
const handleSizeChange = (val) => {
pageSize.value = val
currentPage.value = 1
const end = pageSize.value
tableData.value = filteredData.value.slice(0, end)
}
//
watch([() => searchForm.value.title, () => searchForm.value.category, () => searchForm.value.status], () => {
currentPage.value = 1 //
@ -308,72 +293,6 @@ const handleDelete = (row) => {
}).catch(() => {})
}
//
const handleBatchDelete = () => {
if (selectedRows.value.length === 0) {
ElMessage.warning('请选择要删除的知识条目')
return
}
ElMessageBox.confirm(`确认删除选中的 ${selectedRows.value.length} 个知识条目吗?此操作不可恢复`, '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
try {
const ids = selectedRows.value.map(row => row.id)
const res = await batchDeleteKnowledge(ids)
if (res.success) {
ElMessage.success('批量删除成功')
getList()
} else {
ElMessage.error(res.message || '批量删除失败')
}
} catch (error) {
console.error('批量删除知识条目错误:', error)
ElMessage.error('批量删除失败')
}
}).catch(() => {})
}
//
const handleStatusChange = async (row) => {
try {
const res = await updateKnowledgeStatus(row.id, row.status)
if (res.success) {
ElMessage.success('状态更新成功')
getList()
} else {
ElMessage.error(res.message || '状态更新失败')
}
} catch (error) {
console.error('更新知识状态错误:', error)
ElMessage.error('状态更新失败')
}
}
//
const handleBatchUpdateStatus = async (status) => {
if (selectedRows.value.length === 0) {
ElMessage.warning('请选择要更新的知识条目')
return
}
try {
const ids = selectedRows.value.map(row => row.id)
const res = await batchUpdateKnowledgeStatus(ids, status)
if (res.success) {
ElMessage.success('批量更新状态成功')
getList()
} else {
ElMessage.error(res.message || '批量更新状态失败')
}
} catch (error) {
console.error('批量更新知识状态错误:', error)
ElMessage.error('批量更新状态失败')
}
}
//
const handleSelectionChange = (rows) => {
selectedRows.value = rows
@ -391,18 +310,6 @@ const tagOptions = [
{ label: '生态修复', value: '生态修复' }
]
//
const handleTagsInput = (value) => {
form.value.tags = value
}
const formatTagsForDisplay = (tags) => {
if (Array.isArray(tags)) {
return tags.join(', ')
}
return ''
}
//
const beforeImageUpload = (file) => {
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png'

View File

@ -1,5 +1,5 @@
<script setup>
import { ref, reactive, onMounted, watch } from 'vue'
import { ref, reactive, onMounted, watch, computed } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { Plus, Edit, Delete, Search, Refresh } from '@element-plus/icons-vue'
import { formatDateTime } from '@/utils/format'
@ -10,8 +10,6 @@ import {
updateActivity,
cancelActivity,
batchCancelActivities,
updateActivityStatus,
checkActivityCapacity,
getActivityEnrollments,
updateEnrollmentStatus
} from '@/api/activity/study'
@ -84,7 +82,7 @@ const getList = async () => {
created_at: item.created_at,
updated_at: item.updated_at,
activity_code: item.activity_code,
image: item.image
image_url: item.image_url
}))
//
@ -127,19 +125,6 @@ const getList = async () => {
}
}
//
const handleCurrentChange = (val) => {
currentPage.value = val
getList()
}
//
const handleSizeChange = (val) => {
pageSize.value = val
currentPage.value = 1
getList()
}
//
const handleSearch = () => {
currentPage.value = 1 //
@ -184,9 +169,13 @@ const handleRefresh = () => {
// /
const dialogVisible = ref(false)
const dialogTitle = ref('')
const dialogTitle = ref('新增活动')
const dialogType = ref('add')
const formMode = ref('create')
const formRef = ref()
const fileList = ref([])
//
const form = ref({
title: '',
category: 'field_study',
@ -198,39 +187,34 @@ const form = ref({
requirements: '',
cost: 50.00,
status: 1,
image_url: null,
imageUrl: ''
imageUrl: '',
image_url: null
})
//
//
const formRules = {
title: [
{ required: true, message: '请输入活动名称', trigger: 'blur' },
{ min: 2, max: 50, message: '长度在 2 到 50 个字符', trigger: 'blur' }
],
category: [
{ required: true, message: '请选择活动类型', trigger: 'change' }
],
location: [
{ required: true, message: '请输入活动地点', trigger: 'blur' }
],
capacity: [
{ required: true, message: '请输入人数上限', trigger: 'blur' },
{ type: 'number', min: 1, message: '人数上限必须大于0', trigger: 'blur' }
],
start_time: [
{ required: true, message: '请选择开始时间', trigger: 'change' }
],
end_time: [
{ required: true, message: '请选择结束时间', trigger: 'change' }
],
cost: [
{ required: true, message: '请输入活动费用', trigger: 'blur' },
{ type: 'number', min: 0, message: '费用不能小于0', trigger: 'blur' }
],
image_url: [
{ required: true, message: '请上传活动图片', trigger: 'change' }
]
}
//
//
const beforeImageUpload = (file) => {
const isImage = file.type.startsWith('image/')
const isLt2M = file.size / 1024 / 1024 < 2
@ -243,17 +227,16 @@ const beforeImageUpload = (file) => {
ElMessage.error('图片大小不能超过 2MB')
return false
}
return true
}
//
const handleImageChange = (uploadFile) => {
const file = uploadFile.raw
if (!file) return
const handleImageChange = (file) => {
const isValid = beforeImageUpload(file.raw)
if (!isValid) return
form.value.image_url = file
form.value.imageUrl = URL.createObjectURL(file)
form.value.image_url = file.raw
form.value.imageUrl = URL.createObjectURL(file.raw)
}
//
@ -268,8 +251,9 @@ const handleImageRemove = () => {
//
const handleAdd = () => {
formMode.value = 'create'
dialogTitle.value = '新增研学活动'
dialogType.value = 'add'
formMode.value = 'create'
form.value = {
title: '',
category: 'field_study',
@ -284,20 +268,52 @@ const handleAdd = () => {
image_url: null,
imageUrl: ''
}
fileList.value = []
dialogVisible.value = true
}
//
//
const handleEdit = (row) => {
dialogTitle.value = '编辑活动'
dialogType.value = 'edit'
formMode.value = 'edit'
dialogTitle.value = '编辑研学活动'
dialogVisible.value = true
//
form.value = {
...row,
category: row.category || 'field_study',
imageUrl: row.image || '',
image_url: null //
start_time: row.start_time ? new Date(row.start_time) : null,
end_time: row.end_time ? new Date(row.end_time) : null,
image: undefined //
}
dialogVisible.value = true
// URL
if (row.image_url) {
const fullImageUrl = getImageUrl(row.image_url)
form.value.imageUrl = fullImageUrl
//
fileList.value = [{
name: row.image_url.split('/').pop(),
url: fullImageUrl
}]
} else {
form.value.imageUrl = ''
fileList.value = []
}
}
// URL
const baseUrl = computed(() => import.meta.env.VITE_API_BASE_URL || '')
const getImageUrl = (url) => {
if (!url) return ''
if (url.startsWith('http')) return url
if (url.startsWith('data:')) return url
if (url.startsWith('blob:')) return url
// URL
const cleanUrl = url.startsWith('/') ? url.slice(1) : url
return `${baseUrl.value}/${cleanUrl}`
}
//
@ -459,22 +475,6 @@ const handleBatchCancel = () => {
}).catch(() => {})
}
//
const handleStatusChange = async (row) => {
try {
const res = await updateActivityStatus(row.id, row.status)
if (res.success) {
ElMessage.success('状态更新成功')
getList()
} else {
ElMessage.error(res.message || '状态更新失败')
}
} catch (error) {
console.error('更新研学活动状态错误:', error)
ElMessage.error('状态更新失败')
}
}
//
const enrollmentDialogVisible = ref(false)
const enrollmentLoading = ref(false)
@ -511,26 +511,6 @@ const getEnrollmentDetails = async (row) => {
}
}
//
const getEnrollmentStatusType = (status) => {
const statusMap = {
0: 'info',
1: 'success',
2: 'warning'
}
return statusMap[status] || 'info'
}
//
const getEnrollmentStatusText = (status) => {
const statusMap = {
0: '已取消',
1: '已报名',
2: '已完成'
}
return statusMap[status] || '未知'
}
// checkCapacity
const checkCapacity = async (row) => {
if (!row || !row.id) {
@ -843,7 +823,14 @@ onMounted(() => {
:auto-upload="false"
accept="image/*"
>
<img v-if="form.imageUrl" :src="form.imageUrl" class="activity-image" />
<el-image
v-if="form.imageUrl"
:src="form.imageUrl"
class="activity-image"
fit="cover"
crossorigin="anonymous"
referrerpolicy="no-referrer"
/>
<el-icon v-else class="activity-image-uploader-icon"><Plus /></el-icon>
</el-upload>
<div v-if="form.imageUrl" class="image-actions">

View File

@ -133,15 +133,6 @@ const handleSizeChange = (val) => {
getList()
}
// watch 使
const watchStopHandle = watch(
[() => searchForm.value.title, () => searchForm.value.category, () => searchForm.value.status],
() => {
currentPage.value = 1
getList()
}
)
//
const handleSearch = () => {
currentPage.value = 1
@ -434,14 +425,6 @@ const handleVideoSuccess = (response) => {
video_size: response.data.size || 0,
duration: Math.ceil((response.data.duration || 0) / 60) //
}
console.log('设置后的视频信息:', {
video: form.value.video,
video_url: form.value.video_url,
video_duration: form.value.video_duration,
video_size: form.value.video_size,
duration: form.value.duration
})
ElMessage.success('视频上传成功')
} else {
form.value.video = ''

View File

@ -236,47 +236,6 @@ const fetchDeviceData = async () => {
}
}
//
const getCategoryName = (key) => {
const categoryNames = {
bird: '鸟类',
mammal: '哺乳类',
fish: '鱼类',
amphibian: '两栖类',
reptile: '爬行类',
insect: '昆虫类',
plant: '植物'
}
return categoryNames[key] || key
}
//
const getCategoryColor = (key) => {
const categoryColors = {
bird: '#409EFF',
mammal: '#67C23A',
fish: '#E6A23C',
amphibian: '#F56C6C',
reptile: '#909399',
insect: '#9B59B6',
plant: '#2ECC71'
}
return categoryColors[key] || '#409EFF'
}
//
const updateDistributionChart = (data) => {
const chartDom = document.getElementById("distributionChart");
if (!chartDom) return;
const myChart = echarts.init(chartDom);
myChart.setOption({
series: [{
data: data
}]
})
}
//
const initProtectionChart = () => {
if (!protectionChartRef.value) return

View File

@ -1,3 +1,211 @@
<script setup>
import { ref, reactive, onMounted } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { getObservationList, reviewObservation, deleteObservation } from '@/api/monitor/observation'
import { formatDateTime } from '@/utils/format'
import { sortArrayByField } from '@/utils/sort'
//
const queryParams = reactive({
page: 1,
page_size: 10,
title: '',
status: undefined
})
//
const loading = ref(false)
const observationList = ref([])
const total = ref(0)
//
const speciesList = ref([
{ id: 1, name: '东方白鹳' },
//
])
//
const picturePreviewVisible = ref(false)
const picturePreviewUrl = ref('')
//
const viewDialogVisible = ref(false)
const viewForm = ref({})
//
const reviewDialogVisible = ref(false)
const reviewFormRef = ref()
const reviewForm = ref({})
//
const reviewRules = {
review_status: [{ required: true, message: '请选择审核结果', trigger: 'change' }],
review_comment: [{ required: true, message: '请输入审核意见', trigger: 'blur' }]
}
//
const getList = async () => {
loading.value = true
try {
//
const params = {
page: queryParams.page,
page_size: queryParams.page_size
}
if (queryParams.title) {
params.title = queryParams.title
}
if (queryParams.status !== undefined) {
params.status = queryParams.status
}
const res = await getObservationList(params)
if (res.success) {
//
observationList.value = sortArrayByField(res.data.list, 'created_at', 'asc')
total.value = res.data.pagination.total
} else {
ElMessage.error(res.message || '获取数据失败')
}
} catch (error) {
console.error('获取观察记录列表失败:', error)
ElMessage.error('获取数据失败')
}
loading.value = false
}
//
const handleQuery = () => {
queryParams.page = 1
getList()
}
//
const resetQuery = () => {
queryParams.title = ''
queryParams.status = undefined
queryParams.page = 1
queryParams.page_size = 10
getList()
}
//
const handleDelete = (row) => {
ElMessageBox.confirm(
`确认要删除观察记录"${row.title}"吗?`,
'警告',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}
).then(async () => {
try {
await deleteObservation(row.id)
ElMessage.success('删除成功')
//
if (observationList.value.length === 1 && queryParams.page > 1) {
queryParams.page--
}
getList()
} catch (error) {
console.error('删除失败:', error)
ElMessage.error('删除失败')
}
}).catch(() => {
//
})
}
//
const getStatusType = (status) => {
const statusMap = {
0: 'warning',
1: 'success',
2: 'danger'
}
return statusMap[status]
}
const getStatusText = (status) => {
const statusMap = {
0: '待审核',
1: '已通过',
2: '已拒绝'
}
return statusMap[status]
}
//
const handleSizeChange = (val) => {
queryParams.page_size = val
getList()
}
//
const handleCurrentChange = (val) => {
queryParams.page = val
getList()
}
//
const getSpeciesName = (id) => {
const species = speciesList.value.find(item => item.id === id)
return species ? species.name : ''
}
//
const handleView = (row) => {
viewForm.value = { ...row }
viewDialogVisible.value = true
}
//
const handleReview = (row) => {
reviewForm.value = {
id: row.id,
title: row.title,
species_id: row.species_id,
content: row.content,
location_description: row.location_description,
longitude: Number(row.longitude),
latitude: Number(row.latitude),
weather: row.weather,
temperature: Number(row.temperature),
image_urls: [...(row.image_urls || [])],
video_urls: [...(row.video_urls || [])],
status: row.status,
review_status: 1,
review_comment: ''
}
reviewDialogVisible.value = true
}
//
const submitReview = async () => {
await reviewFormRef.value.validate()
try {
const formData = {
status: reviewForm.value.review_status,
review_comment: reviewForm.value.review_comment
}
await reviewObservation(reviewForm.value.id, formData)
ElMessage.success('审核成功')
reviewDialogVisible.value = false
getList()
} catch (error) {
console.error('审核失败:', error)
ElMessage.error('审核失败')
}
}
onMounted(() => {
getList()
})
</script>
<template>
<div class="app-container">
<!-- 搜索条件 -->
@ -236,220 +444,6 @@
</div>
</template>
<script setup>
import { ref, reactive, onMounted } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { getObservationList, reviewObservation, deleteObservation } from '@/api/monitor/observation'
import { formatDateTime } from '@/utils/format'
import { sortArrayByField } from '@/utils/sort'
//
const queryParams = reactive({
page: 1,
page_size: 10,
title: '',
status: undefined
})
//
const loading = ref(false)
const observationList = ref([])
const total = ref(0)
//
const speciesList = ref([
{ id: 1, name: '东方白鹳' },
//
])
//
const picturePreviewVisible = ref(false)
const picturePreviewUrl = ref('')
//
const viewDialogVisible = ref(false)
const viewForm = ref({})
//
const reviewDialogVisible = ref(false)
const reviewFormRef = ref()
const reviewForm = ref({})
//
const reviewRules = {
review_status: [{ required: true, message: '请选择审核结果', trigger: 'change' }],
review_comment: [{ required: true, message: '请输入审核意见', trigger: 'blur' }]
}
//
const getList = async () => {
loading.value = true
try {
//
const params = {
page: queryParams.page,
page_size: queryParams.page_size
}
if (queryParams.title) {
params.title = queryParams.title
}
if (queryParams.status !== undefined) {
params.status = queryParams.status
}
const res = await getObservationList(params)
if (res.success) {
//
observationList.value = sortArrayByField(res.data.list, 'created_at', 'asc')
total.value = res.data.pagination.total
} else {
ElMessage.error(res.message || '获取数据失败')
}
} catch (error) {
console.error('获取观察记录列表失败:', error)
ElMessage.error('获取数据失败')
}
loading.value = false
}
//
const handleQuery = () => {
queryParams.page = 1
getList()
}
//
const resetQuery = () => {
queryParams.title = ''
queryParams.status = undefined
queryParams.page = 1
queryParams.page_size = 10
getList()
}
//
const handleDelete = (row) => {
ElMessageBox.confirm(
`确认要删除观察记录"${row.title}"吗?`,
'警告',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}
).then(async () => {
try {
await deleteObservation(row.id)
ElMessage.success('删除成功')
//
if (observationList.value.length === 1 && queryParams.page > 1) {
queryParams.page--
}
getList()
} catch (error) {
console.error('删除失败:', error)
ElMessage.error('删除失败')
}
}).catch(() => {
//
})
}
//
const getStatusType = (status) => {
const statusMap = {
0: 'warning',
1: 'success',
2: 'danger'
}
return statusMap[status]
}
const getStatusText = (status) => {
const statusMap = {
0: '待审核',
1: '已通过',
2: '已拒绝'
}
return statusMap[status]
}
//
const handleSizeChange = (val) => {
queryParams.page_size = val
getList()
}
//
const handleCurrentChange = (val) => {
queryParams.page = val
getList()
}
//
const handlePictureCardPreview = (file) => {
picturePreviewUrl.value = file.url
picturePreviewVisible.value = true
}
//
const getSpeciesName = (id) => {
const species = speciesList.value.find(item => item.id === id)
return species ? species.name : ''
}
//
const handleView = (row) => {
viewForm.value = { ...row }
viewDialogVisible.value = true
}
//
const handleReview = (row) => {
reviewForm.value = {
id: row.id,
title: row.title,
species_id: row.species_id,
content: row.content,
location_description: row.location_description,
longitude: Number(row.longitude),
latitude: Number(row.latitude),
weather: row.weather,
temperature: Number(row.temperature),
image_urls: [...(row.image_urls || [])],
video_urls: [...(row.video_urls || [])],
status: row.status,
review_status: 1,
review_comment: ''
}
reviewDialogVisible.value = true
}
//
const submitReview = async () => {
await reviewFormRef.value.validate()
try {
const formData = {
status: reviewForm.value.review_status,
review_comment: reviewForm.value.review_comment
}
await reviewObservation(reviewForm.value.id, formData)
ElMessage.success('审核成功')
reviewDialogVisible.value = false
getList()
} catch (error) {
console.error('审核失败:', error)
ElMessage.error('审核失败')
}
}
onMounted(() => {
getList()
})
</script>
<style scoped>
.filter-container {
margin-bottom: 20px;

View File

@ -4,7 +4,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
import { Plus, PictureFilled, Delete } from '@element-plus/icons-vue'
import * as echarts from 'echarts'
import { sortArrayByField, reverseArray } from '@/utils/sort'
import { getSpeciesList, addSpecies, updateSpecies, getSpeciesStatistics, updateSpeciesStatus } from '@/api/monitor/species'
import { getSpeciesList, addSpecies, updateSpecies, getSpeciesStatistics } from '@/api/monitor/species'
import { ElImageViewer } from 'element-plus'
//
@ -296,20 +296,6 @@ const getStatistics = async () => {
console.error('获取统计信息失败:', error)
}
}
//
const handleStatusChange = async (row) => {
const newStatus = row.status === 1 ? 0 : 1
try {
await updateSpeciesStatus(row.id, { status: newStatus })
ElMessage.success('状态更新成功')
getList()
} catch (error) {
console.error('状态更新失败:', error)
ElMessage.error('状态更新失败')
}
}
//
const handleCurrentChange = (val) => {
queryParams.page = Number(val)
@ -323,15 +309,6 @@ const handleSizeChange = (val) => {
getList()
}
//
const handleSortChange = ({ prop, order }) => {
if (prop && order) {
const sortOrder = order === 'ascending' ? 'asc' : 'desc'
const sortedList = sortArrayByField(speciesList.value, prop, sortOrder)
speciesList.value = sortedList
}
}
// URL
const baseUrl = computed(() => import.meta.env.VITE_API_BASE_URL || '')