From f02fde734aba50a4d5b5f89d88c075e6e93cb499 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 12 九月 2024 09:28:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/task/visReportDetail.vue | 53 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/admin/src/views/task/visReportDetail.vue b/admin/src/views/task/visReportDetail.vue
index 2ef8471..cfa2f3d 100644
--- a/admin/src/views/task/visReportDetail.vue
+++ b/admin/src/views/task/visReportDetail.vue
@@ -3,11 +3,19 @@
<div class="modal_wrap">
<div class="modal_content">
<div class="header">
+ <img v-if="info.businessStatus == '3'" class="head_bg" src="@/assets/task/bg_shenhe_fail@2x.png"
+ alt="">
+ <img v-else-if="info.businessStatus == '2'" class="head_bg"
+ src="@/assets/task/bg_shenhe_pass@2x.png" alt="">
+ <img v-else-if="info.businessStatus == '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.businessStatus == '2', msg: info.businessStatus == '3' }">{{
+ statusMap[info.businessStatus] }}</div>
</div>
<div class="info">
<div class="title">璁垮鎶ュ淇℃伅</div>
@@ -73,7 +81,7 @@
<div class="company">
{{ item.memberName }}
<div style="display: inline" v-if="item.statusInfo != null && item.statusInfo != ''">
- 锛�<span class="status-green">{{
+ 锛�<span :class="{ padding: item.statusInfo == '澶勭悊涓�' || item.status == '1' }">{{
item.statusInfo || ""
}}</span>锛�
</div>
@@ -184,10 +192,10 @@
checkInfo: [{ required: true, message: '璇疯緭鍏�', trigger: 'blur' }]
},
statusMap: {
- 0: '寰呭鎵�',
- 1: '瀹℃壒涓�',
- 2: '瀹℃壒閫氳繃',
- 3: '瀹℃壒鏈�氳繃',
+ 0: '寰呭鏍�',
+ 1: '澶勭悊涓�',
+ 2: '宸查�氳繃',
+ 3: '宸叉嫆缁�',
4: '宸插彇娑�',
5: '浠栦汉鎴栫',
6: '浠栦汉鎷掔粷'
@@ -253,6 +261,8 @@
</script>
<style lang="scss" scoped>
+@import "@/assets/style/variables.scss";
+
.upload_box {
width: 84px;
height: 84px;
@@ -335,7 +345,16 @@
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;
@@ -358,6 +377,16 @@
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;
}
}
@@ -405,7 +434,7 @@
position: absolute;
border-left: 2px dashed #cccccc;
left: 31px;
- height: calc(100% - 36px);
+ height: calc(100% - 30px);
top: 49px;
}
@@ -487,6 +516,14 @@
align-content: center;
margin-bottom: 6px;
+ .status {
+ color: #888888;
+ }
+
+ .padding {
+ color: $primaryColor;
+ }
+
.name {
font-weight: 600;
font-size: 16px;
--
Gitblit v1.9.3