From ceb66442df7361a0247ebe7a6b12ad04e8b89c8c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 14 十月 2024 09:32:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/operation/HiddenDangerParam.vue | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/admin/src/components/operation/HiddenDangerParam.vue b/admin/src/components/operation/HiddenDangerParam.vue
index c0de303..0205647 100644
--- a/admin/src/components/operation/HiddenDangerParam.vue
+++ b/admin/src/components/operation/HiddenDangerParam.vue
@@ -105,7 +105,6 @@
import { allList, memberList } from '@/api/business/hiddenDangerParam'
import { create } from '@/api/business/hiddenDanger'
export default {
- name: 'OperaVisitsHkWindow',
extends: BaseOpera,
components: {
GlobalWindow
@@ -158,6 +157,8 @@
const memberNames = item.memberNames.split(',')
if (memberIds && memberIds.length === 1) {
this.$set(this.param, 'checkUserId', memberIds[0])
+ } else {
+ this.$set(this.param, 'checkUserId', '')
}
memberIds.forEach((mem, i) => {
arr.push({
@@ -176,15 +177,15 @@
uploadAvatarSuccess (file) {
console.log('file', file)
const item = file.data[0]
- if (['.mp4', '.avi', '.flv', '.wmv'].indexOf(item.imgaddr) === -1) {
+ if (['.mp4', '.avi', '.flv', '.wmv'].some(char => item.imgaddr.includes(char))) {
this.fileList.push({
- type: 0,
+ type: 1,
fileurl: item.imgaddr,
fileurlFull: item.url
})
} else {
this.fileList.push({
- type: 1,
+ type: 0,
fileurl: item.imgaddr,
fileurlFull: item.url
})
@@ -255,10 +256,15 @@
display: flex;
flex-wrap: wrap;
.item {
- width: 90px;
- max-height: 90px;
+ width: 92px;
+ max-height: 92px;
margin-left: 10px;
position: relative;
+ border: 1px dashed #d9d9d9;
+ border-radius: 4px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
.close{
font-size: 20px;
position: absolute;
@@ -269,8 +275,8 @@
cursor: pointer;
}
.img {
- width: 90px;
- max-height: 90px;
+ width: 92px;
+ max-height: 92px;
}
}
}
--
Gitblit v1.9.3