From 1d74fcbfa6c5581ec50255eab5504f161b6da325 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Tue, 22 Apr 2025 20:29:44 +0800
Subject: [PATCH] Merge branch 'test' into prod
---
src/views/tickets/ticket.vue | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/views/tickets/ticket.vue b/src/views/tickets/ticket.vue
index 413c262..d47f2cf 100644
--- a/src/views/tickets/ticket.vue
+++ b/src/views/tickets/ticket.vue
@@ -291,8 +291,8 @@
<div class="media-title">事件图片</div>
<div class="media-content">
<el-image v-if="currentDetail.mediaUrl" :src="getThumbUrl(currentDetail.mediaUrl)"
- :preview-src-list="[currentDetail.mediaUrl]" fit="cover"
- style="width: 100%; height: 300px; cursor: pointer;">
+ :preview-src-list="[currentDetail.mediaUrl]" fit="contain"
+ style="width: 700px; height: 520px; cursor: pointer;">
<template #placeholder>
<div class="image-placeholder">
<i class="el-icon-picture-outline"></i>
@@ -317,8 +317,8 @@
<div class="media-title">工单处理图片</div>
<div class="media-content">
<el-image v-if="currentDetail.updatePhotoUrl" :src="getThumbUrl(currentDetail.updatePhotoUrl)"
- :preview-src-list="[currentDetail.updatePhotoUrl]" fit="cover"
- style="width: 100%; height: 300px; cursor: pointer;">
+ :preview-src-list="[currentDetail.updatePhotoUrl]" fit="fill"
+ style="width: 700px; height: 520px; cursor: pointer;">
<template #placeholder>
<div class="image-placeholder">
<i class="el-icon-picture-outline"></i>
@@ -338,7 +338,7 @@
<template v-else>
<div class="media-title">地图标记事件点</div>
<div class="media-content">
- <div id="map-container" style="width: 100%; height: 300px; background: #f5f5f5;">
+ <div id="map-container" style="width: 700px; height: 520px; background: #f5f5f5;">
<map-container v-if='detailVisible' ref="MapContainer"></map-container>
</div>
</div>
@@ -415,7 +415,7 @@
</div>
<div class="review-image-container">
- <el-image v-if="currentReviewImage" :src="getThumbUrl(currentReviewImage)" fit="cover"
+ <el-image v-if="currentReviewImage" :src="getThumbUrl(currentReviewImage)" fit="fill"
:preview-src-list="getImageList()" :initial-index="currentImageIndex - 1" class="preview-image"
style="cursor: pointer;">
<template #error>
@@ -1733,7 +1733,7 @@
try {
// 检查是否上传了图片
if (!this.currentDetail.photos || !this.currentDetail.photos.length) {
- this.$message.warning('请上传处理图片');
+ this.$message.warning('请上传事件处理照片，或飞行任务结束核验工单是否完结');
return;
}
@@ -1966,7 +1966,6 @@
isPass: 0,
eventNum: currentItem.orderNumber,
eventName: currentItem.orderName,
- eventType: currentItem.type,
};
console.log('删除前：', this.selections)
const response = await flowEvent(data);
@@ -2024,7 +2023,7 @@
return;
}
- await this.$confirm('确认驳回当前工单?', '提示', {
+ await this.$confirm('确认该工单审核不通过?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@@ -2036,7 +2035,6 @@
isPass: 1,
eventNum: currentItem.orderNumber,
eventName: currentItem.orderName,
- eventType: currentItem.type,
};
const response = await flowEvent(data);
@@ -2294,7 +2292,7 @@
}
.dialog-footer {
- text-align: right;
+ text-align: center;
padding-top: 16px;
border-top: 1px solid #ebeef5;
@@ -2470,7 +2468,7 @@
.media-content {
position: relative;
- height: 300px;
+ // height: 300px;
}
.image-placeholder,
--
Gitblit v1.9.3