From e6a40dffefa8a2be2b91744909286197ff2659fd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 10 四月 2025 11:24:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/business/OperaWorkorderDetailSheWindow.vue | 57 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/admin/src/components/business/OperaWorkorderDetailSheWindow.vue b/admin/src/components/business/OperaWorkorderDetailSheWindow.vue
index 4adb1a4..fb1b6db 100644
--- a/admin/src/components/business/OperaWorkorderDetailSheWindow.vue
+++ b/admin/src/components/business/OperaWorkorderDetailSheWindow.vue
@@ -28,7 +28,7 @@
</div>
<div class="item">
<div class="label">涓婃姤鏃堕棿</div>
- <div class="value">{{ info.createDate }}</div>
+ <div class="value">{{ info.submitDate +' '}}</div>
</div>
<div class="item">
<div class="label">娑夊強浜哄憳</div>
@@ -41,11 +41,11 @@
<div class="value">{{ info.locationName }}</div>
</div>
<div class="item">
- <div class="label">鏄惁澶栭儴灏卞尰</div>
+ <div class="label">澶栭儴灏卞尰</div>
<div class="value">{{ info.outJiuyi == "0" ? "鍚�" : "鏄�" }}</div>
</div>
<div class="item" v-if="info.outJiuyi == '0'">
- <div class="label">鏄惁鍖诲姟瀹�</div>
+ <div class="label">鍖诲姟瀹�</div>
<div class="value">{{ info.isYiwushi == "0" ? "鍚�" : "鏄�" }}</div>
</div>
<div class="item" v-if="info.isYiwushi == '0'">
@@ -56,37 +56,38 @@
<div class="label">浼ゅ绫诲瀷</div>
<div class="value">{{ info.typeName }}</div>
</div>
- <div class="label">鏄惁鍜屽伐浣滅浉鍏�</div>
- <div class="value">{{ info.workRelated == "0" ? "鍚�" : "鏄�" }}</div>
- </div>
+ <div class="item">
+ <div class="label">鍜屽伐浣滅浉鍏�</div>
+ <div class="value">{{ info.workRelated == "0" ? "鍚�" : "鏄�" }}</div>
+ </div>
<div class="item">
<div class="label">浜嬩欢璇存槑</div>
- <div class="value">{{ info.constructionReason }}</div>
+ <div class="value">{{ info.eventInfo || '-'}}</div>
+ </div>
+ <div class="item" style="width: 100%">
+ <div class="label">鍥剧墖</div>
+ <div class="value" v-if="info.multifileList ==null || !info.multifileList.length">鏃�</div>
+ <div class="value" v-if="info.multifileList !=null && info.multifileList.length">
+ <div v-for="item in info.multifileList" :key="item.id" style="display: inline;margin-right: 20px">
+ <video
+ v-if="item.fileurlFull && item.fileurlFull.endsWith('.mp4')"
+ ref="videoRef"
+ controls
+ preload="auto"
+ style="width: 80px;height: 80px;object-fit: contain;"
+ :src="item.fileurlFull"
+ />
+ <el-image
+ v-else-if="item.fileurlFull"
+ style="width:80px; height: 80px"
+ :src="item.fileurlFull"
+ :preview-src-list="[item.fileurlFull]">
+ </el-image>
</div>
</div>
</div>
- <div class="item" style="width: 100%">
- <div class="label">鍥剧墖</div>
- <div class="value" v-if="info.multifileList ==null || !info.multifileList.length">鏃�</div>
- <div class="value" v-if="info.multifileList !=null && info.multifileList.length">
- <div v-for="item in info.multifileList" :key="item.id" style="display: inline;margin-right: 20px">
- <video
- v-if="item.fileurlFull && item.fileurlFull.endsWith('.mp4')"
- ref="videoRef"
- controls
- preload="auto"
- style="width: 80px;height: 80px;object-fit: contain;"
- :src="item.fileurlFull"
- />
- <el-image
- v-else-if="item.fileurlFull"
- style="width:80px; height: 80px"
- :src="item.fileurlFull"
- :preview-src-list="[item.fileurlFull]">
- </el-image>
</div>
</div>
- </div>
</div>
<div class="side">
<div class="side_title">鎿嶄綔鍘嗗彶</div>
@@ -281,6 +282,7 @@
.item {
display: flex;
width: 40%;
+ font-size: 14px;
margin-bottom: 20px;
&:nth-of-type(2n) {
@@ -303,6 +305,7 @@
display: flex;
justify-content: space-between;
align-items: center;
+ vertical-align: center;
padding: 20px 30px;
margin: 0 -30px;
border-radius: 8px 8px 0 0;
--
Gitblit v1.9.3