From 4a4bd1d5546197b6f1bcd5fa317458dd5e969d3d Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 28 Apr 2025 20:38:07 +0800
Subject: [PATCH] Merge branch 'test' of http://139.196.74.78:10010/r/drone/drone-web-manage into test
---
src/views/tickets/ticket.vue | 83 +++++++++++++++++++----------------------
1 files changed, 39 insertions(+), 44 deletions(-)
diff --git a/src/views/tickets/ticket.vue b/src/views/tickets/ticket.vue
index dda13ce..d5715fd 100644
--- a/src/views/tickets/ticket.vue
+++ b/src/views/tickets/ticket.vue
@@ -5,26 +5,26 @@
<div class="tab-content">
<!-- 查询条件筛选栏 -->
<div class="filter-bar">
- <el-input v-model="filters.keyword" placeholder="请输入关键字" class="filter-item" size="small" clearable
+ <el-input v-model="filters.keyword" placeholder="请输入关键字" class="filter-item" clearable
@keyup.enter="handleSearch" />
- <el-select v-model="filters.department" placeholder="请选择所属单位" class="filter-item" size="small" clearable>
+ <el-select v-model="filters.department" placeholder="请选择所属单位" class="filter-item" clearable>
<el-option v-for="item in departments" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
- <el-select v-model="filters.type" placeholder="请选择工单类型" class="filter-item" size="small" clearable>
+ <el-select v-model="filters.type" placeholder="请选择工单类型" class="filter-item" clearable>
<el-option v-for="item in types" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
- <el-date-picker v-model="filters.dateRange" type="daterange" class="filter-item" size="small"
+ <el-date-picker v-model="filters.dateRange" type="daterange" class="filter-item"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
- <el-select v-model="filters.status" placeholder="请选择状态" class="filter-item" size="small" clearable>
+ <el-select v-model="filters.status" placeholder="请选择状态" class="filter-item" clearable>
<el-option v-for="item in statuses" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
- <el-select v-model="filters.algorithm" placeholder="请选择关联算法" class="filter-item" size="small" clearable>
+ <el-select v-model="filters.algorithm" placeholder="请选择关联算法" class="filter-item" clearable>
<el-option v-for="item in algorithms" :key="item.dict_key" :label="item.dict_value"
:value="item.dict_key" />
</el-select>
- <el-button type="primary" icon="el-icon-search" size="small" @click="handleSearch">查询</el-button>
- <el-button icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+ <el-button type="primary" icon="el-icon-search" @click="handleSearch">查询</el-button>
+ <el-button icon="el-icon-refresh" @click="handleReset">重置</el-button>
</div>
<!-- 表格部分 -->
@@ -328,8 +328,7 @@
<div class="media-title">工单处理图片</div>
<div class="media-content">
<el-image v-if="currentDetail.updatePhotoUrl" :src="getThumbUrl(currentDetail.updatePhotoUrl)"
- :preview-src-list="[getPreviewUrl(currentDetail.updatePhotoUrl)]" fit="fill"
- style="width: 700px; height: 520px; cursor: pointer;">
+ :preview-src-list="[getPreviewUrl(currentDetail.updatePhotoUrl)]" fit="fill">
<template #placeholder>
<div class="image-placeholder">
<i class="el-icon-picture-outline"></i>
@@ -349,9 +348,7 @@
<template v-else>
<div class="media-title">地图标记事件点</div>
<div class="media-content">
- <div id="map-container" style="width: 700px; height: 520px; background: #f5f5f5;">
- <map-container v-if='detailVisible' ref="MapContainer"></map-container>
- </div>
+ <map-container v-if='detailVisible' ref="MapContainer"></map-container>
</div>
</template>
</div>
@@ -2360,20 +2357,20 @@
color: #606266;
}
- :deep(.el-input__inner) {
- height: 36px;
- line-height: 36px;
- }
+ // :deep(.el-input__inner) {
+ // height: 36px;
+ // line-height: 36px;
+ // }
:deep(.el-textarea__inner) {
padding: 8px 12px;
}
- :deep(.el-input__inner),
- :deep(.el-select),
- :deep(.el-select .el-input) {
- width: 100%; // 确保所有输入框和选择框宽度一致
- }
+ // :deep(.el-input__inner),
+ // :deep(.el-select),
+ // :deep(.el-select .el-input) {
+ // width: 100%; // 确保所有输入框和选择框宽度一致
+ // }
.full-width {
width: 100%;
@@ -2544,20 +2541,32 @@
}
.media-box {
+ width: 100%;
border: 1px solid #dcdfe6;
border-radius: 4px;
padding: 10px;
background: #fff;
-}
+ box-sizing: border-box;
-.media-title {
- font-weight: bold;
- margin-bottom: 10px;
-}
+ .media-title {
+ font-weight: bold;
+ margin-bottom: 10px;
+ }
-.media-content {
- position: relative;
- // height: 300px;
+ .media-content {
+ position: relative;
+ height: 500px;
+
+ :deep(.el-image) {
+ width: 100% !important;
+
+ .el-image__inner {
+ width: 100%;
+ height: 100%;
+ object-fit: contain;
+ }
+ }
+ }
}
.image-placeholder,
@@ -2846,20 +2855,6 @@
:deep(.el-upload-list--picture-card .el-upload-list__item) {
width: 120px;
height: 100px;
- }
-}
-
-/* 事件图片和处理图片的预览样式 */
-.media-content {
- :deep(.el-image) {
- width: 700px !important;
- height: 520px !important;
-
- .el-image__inner {
- width: 100%;
- height: 100%;
- object-fit: contain;
- }
}
}
--
Gitblit v1.9.3