From 51e18e190dafdec70dc1f4a3a9ecd76fb2116726 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 12 十月 2024 16:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/task/dangetDetail.vue | 50 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/admin/src/views/task/dangetDetail.vue b/admin/src/views/task/dangetDetail.vue
index 76d3a71..34ba35b 100644
--- a/admin/src/views/task/dangetDetail.vue
+++ b/admin/src/views/task/dangetDetail.vue
@@ -3,11 +3,15 @@
<div class="modal_wrap">
<div class="modal_content">
<div class="header">
+ <img v-if="info.status == '3' || info.status == '6'" class="head_bg" src="@/assets/task/bg_shenhe_fail@2x.png" alt="">
+ <img v-else-if="info.status == '2' || info.status == '5'" class="head_bg" src="@/assets/task/bg_shenhe_pass@2x.png" alt="">
+ <img v-else-if="info.status == '4'" class="head_bg" src="@/assets/task/bg_shenhe_chexiao@2x.png" alt="">
+ <img v-else class="head_bg" src="@/assets/task/bg_shenhe@2x.png" alt="">
<div class="left">
<div class="h1">{{ cateList[type] }}</div>
<div class="time">鎻愪氦鏃堕棿锛歿{ info.createDate }}</div>
</div>
- <div class="right">{{ statusMap[info.status] }}</div>
+ <div class="right" :class="{ scs: info.status == '2' || info.status == '5', msg: info.status == '3' || info.status == '6' }">{{ statusMap[info.status] }}</div>
</div>
<div class="info">
<div class="title">闅愭偅闅忔墜鎷嶄俊鎭�</div>
@@ -34,7 +38,7 @@
<div class="label">鐜板満鎯呭喌</div>
<div class="value">
<div class="file_list">
- <template v-for="item in info.submitFileList">
+ <div class="file" v-for="item in info.submitFileList">
<img
v-if="item.type == 0"
:key="item.id"
@@ -49,7 +53,7 @@
class="img"
controls
/>
- </template>
+ </div>
</div>
</div>
</div>
@@ -441,10 +445,10 @@
dealAfterFileList: [{ type: 'array', required: true, message: '璇烽�夋嫨', trigger: 'change' }]
},
statusMap: {
- 0: '寰呭鎵�',
- 1: '瀹℃壒涓�',
- 2: '瀹℃壒閫氳繃',
- 3: '瀹℃壒鏈�氳繃',
+ 0: '寰呭鏍�',
+ 1: '澶勭悊涓�',
+ 2: '宸查�氳繃',
+ 3: '宸叉嫆缁�',
4: '宸插彇娑�',
5: '浠栦汉鎴栫',
6: '浠栦汉鎷掔粷'
@@ -458,7 +462,7 @@
}
}
},
- created() {
+ created () {
this.getMemberList()
},
methods: {
@@ -666,10 +670,14 @@
}
.file_list {
display: flex;
- .img {
- width: 200px;
+ .file {
+ width: 92px;
margin-right: 12px;
margin-bottom: 12px;
+ .img{
+ max-height: 92px;
+ max-width: 92px;
+ }
}
}
.value {
@@ -689,8 +697,15 @@
padding: 20px 30px;
margin: 0 -30px;
border-radius: 8px 8px 0 0;
- background: linear-gradient(to right, #f2f6fe, #cadffa);
-
+ position: relative;
+ .head_bg{
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ left: 0;
+ top: 0;
+ z-index: 9;
+ }
.h1 {
font-weight: 600;
font-size: 22px;
@@ -702,7 +717,6 @@
font-size: 14px;
color: #999999;
}
-
.right {
height: 40px;
font-size: 16px;
@@ -712,6 +726,14 @@
background: #207ff7;
box-shadow: 4px 4px 0px 0px rgba(32, 127, 247, 0.16);
border-radius: 16px 0px 16px 0px;
+ position: relative;
+ z-index: 99;
+ }
+ .scs{
+ background-color: #00BA67;
+ }
+ .msg{
+ background-color: #ED4545;
}
}
.table_info {
@@ -753,7 +775,7 @@
position: absolute;
border-left: 2px dashed #cccccc;
left: 31px;
- height: calc(100% - 36px);
+ height: calc(100% - 30px);
top: 49px;
}
.avatar {
--
Gitblit v1.9.3