From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/business/OperaHiddenDangerWindow.vue | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/admin/src/components/business/OperaHiddenDangerWindow.vue b/admin/src/components/business/OperaHiddenDangerWindow.vue
index a59097c..8281999 100644
--- a/admin/src/components/business/OperaHiddenDangerWindow.vue
+++ b/admin/src/components/business/OperaHiddenDangerWindow.vue
@@ -116,9 +116,9 @@
<div class="item" v-for="(item,index) in logList" :key="item.id">
<div class="separate" v-if="index < logList.length-1"></div>
<div class="info">
- <i class="el-icon-success icon" v-if="(model.status ==1) || index < logList.length-1"></i>
- <i class="el-icon-question icon1" v-if="(model.status==0) && index == logList.length-1"></i>
- <i class="el-icon-error icon2" v-if="(model.status==2) && index == logList.length-1"></i>
+ <img src="@/assets/icons/ic_tongguo.png" class="iconnew" v-if="(model.status ==1) || index < logList.length-1"/>
+ <img src="@/assets/icons/ic_dangqian.png" class="iconnew" v-if="(model.status==0) && index == logList.length-1"/>
+ <img src="@/assets/icons/ic_jujue.png" class="iconnew" v-if="(model.status==2) && index == logList.length-1"/>
<img v-if="item.avatar!=null && item.avatar !=''" :src="item.avatar" class="avatar" alt="" />
<img v-if="item.avatar ==null ||item.avatar ==''" src="@/assets/avatar/man.png" class="avatar" alt="" />
<div class="content">
@@ -266,7 +266,6 @@
import upload from '@/components/common/upload'
import { memberList } from '@/api/business/hiddenDangerParam'
import { mapState } from 'vuex'
-import { dealHiddenDanger } from '@/api/business/hiddenDanger'
export default {
components: { GlobalWindow, upload },
extends: BaseOpera,
@@ -306,7 +305,8 @@
rulesBack: {
checkDate: [
{ required: true, message: '璇烽�夋嫨閫�鍥炴椂闂�' }
- ]/*,
+ ]
+ /*,
dealBeforeFileList: [
{ required: true, message: '璇蜂笂浼犳暣鏀瑰墠鎯呭喌' }
]*/
@@ -455,13 +455,13 @@
this.memberList = []
this.transForm = {
memberId: null
- },
+ }
this.dealForm = {
checkDate: null,
checkInfo: null,
dealBeforeFileList: [],
dealAfterFileList: []
- },
+ }
this.backForm = {
checkDate: null,
checkInfo: null,
@@ -683,6 +683,11 @@
color: #53b76f;
font-size: 24px;
}
+
+ .iconnew{
+ width: 24px;
+ height: 24px;
+ }
.icon1 {
position: relative;
z-index: 11;
@@ -700,7 +705,7 @@
height: 40px;
border-radius: 50%;
margin: 0 12px 0 16px;
- border: 1px solid;
+ //border: 1px solid;
}
.content {
flex: 1;
--
Gitblit v1.9.3