From a27ffbdd8353c381312839a0c00ae7444c7a381c Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期四, 30 五月 2024 15:40:49 +0800
Subject: [PATCH] 修改完bug
---
ruoyi-ui/src/views/meeting/approve.vue | 31 +++++-----
ruoyi-ui/src/views/travel/index.vue | 4
ruoyi-ui/src/views/contacts/index.vue | 41 +++++++++++++
ruoyi-ui/src/views/clean/index.vue | 41 +++++++++++++
ruoyi-ui/src/views/healthy/healthYear.vue | 1
ruoyi-ui/src/views/honor/honorInfo.vue | 1
ruoyi-ui/src/router/index.js | 2
ruoyi-ui/src/views/meeting/meetingInfo.vue | 11 +++
ruoyi-ui/src/views/meeting/index.vue | 2
9 files changed, 111 insertions(+), 23 deletions(-)
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index dbc362c..c755a4a 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -681,7 +681,7 @@
path: 'healthYear',
component: () => import('@/views/healthy/healthYear'),
name: 'healthYear',
- meta: { title: '骞村害鍋ュ悍鎶ュ憡'}
+ meta: { title: '鐜扮姸鍋ュ悍鎯呭喌'}
}
]
},
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index 211262e..da60d35 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -312,10 +312,49 @@
<!--
<el-button type="primary">鐐瑰嚮涓婁紶</el-button>
<div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div> -->
- <template #tip>
+ <!-- <template #tip>
<div class="el-upload__tip">
</div>
</template>
+ </el-upload> -->
+ <i slot="default" class="el-icon-plus"></i>
+ <div slot="file" slot-scope="{file}">
+ <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+ <video
+ v-if="file.url.includes('.mp4')"
+ class="el-upload-list__item-thumbnail"
+ :src="file.url"
+ style="width: 147px; height: 147px"
+ fit="cover"
+ ></video>
+ <img v-else
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceLis.png"
+ alt=""
+ style="width: 100%; height: 100%"
+ fit="cover"></img>
+
+ <span class="el-upload-list__item-actions">
+ <span class="el-upload-list__item-name">{{ file.name }}</span>
+ <!-- <span
+ class="el-upload-list__item-preview"
+ @click="handleFileCardPreview(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span> -->
+
+ <span
+
+ class="el-upload-list__item-delete"
+ @click="handleRemoveFile(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
+
+ </div>
+
+
</el-upload>
<el-button
style="margin-left: 10px"
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index 692fc15..1192a26 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -368,10 +368,49 @@
list-type="picture-card"
>
- <template #tip>
+ <!-- <template #tip>
<div class="el-upload__tip">
</div>
</template>
+ </el-upload> -->
+ <i slot="default" class="el-icon-plus"></i>
+ <div slot="file" slot-scope="{file}">
+ <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+ <video
+ v-if="file.url.includes('.mp4')"
+ class="el-upload-list__item-thumbnail"
+ :src="file.url"
+ style="width: 147px; height: 147px"
+ fit="cover"
+ ></video>
+ <img v-else
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceLis.png"
+ alt=""
+ style="width: 100%; height: 100%"
+ fit="cover"></img>
+
+ <span class="el-upload-list__item-actions">
+ <span class="el-upload-list__item-name">{{ file.name }}</span>
+ <!-- <span
+ class="el-upload-list__item-preview"
+ @click="handleFileCardPreview(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span> -->
+
+ <span
+
+ class="el-upload-list__item-delete"
+ @click="handleRemoveFile(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
+
+ </div>
+
+
</el-upload>
<el-button
style="margin-left: 10px"
diff --git a/ruoyi-ui/src/views/healthy/healthYear.vue b/ruoyi-ui/src/views/healthy/healthYear.vue
index a2b7370..6e3ff87 100644
--- a/ruoyi-ui/src/views/healthy/healthYear.vue
+++ b/ruoyi-ui/src/views/healthy/healthYear.vue
@@ -1040,6 +1040,7 @@
created() {
this.getList()
this.$route.meta.title = "鐜扮姸鍋ュ悍鎯呭喌";
+ this.$route.meta.title = "鐜扮姸鍋ュ悍鎯呭喌";
},
methods: {
diff --git a/ruoyi-ui/src/views/honor/honorInfo.vue b/ruoyi-ui/src/views/honor/honorInfo.vue
index 5e3f2ba..062deff 100644
--- a/ruoyi-ui/src/views/honor/honorInfo.vue
+++ b/ruoyi-ui/src/views/honor/honorInfo.vue
@@ -432,6 +432,7 @@
// this.getCateInfor()
}
+ console.log(this.fileListOther,'this.fileListOtherthis.fileListOtherthis.fileListOther')
},
mounted() {},
diff --git a/ruoyi-ui/src/views/meeting/approve.vue b/ruoyi-ui/src/views/meeting/approve.vue
index 44ff390..5e385e6 100644
--- a/ruoyi-ui/src/views/meeting/approve.vue
+++ b/ruoyi-ui/src/views/meeting/approve.vue
@@ -176,21 +176,21 @@
meetingList: [],
formDat:{
id: undefined,
- title: undefined,
- place: undefined,
- conPeople: undefined,
- partPeople: undefined,
- applyPerson: undefined,
- applyApart: undefined,
- startTime: undefined,
- endTime: undefined,
- happenStartTime: undefined,
- happenEndTime: undefined,
- isPlacebrand: undefined,
- connPerson: undefined,
- connPhone: undefined,
+ // title: undefined,
+ // place: undefined,
+ // conPeople: undefined,
+ // partPeople: undefined,
+ // applyPerson: undefined,
+ // applyApart: undefined,
+ // startTime: undefined,
+ // endTime: undefined,
+ // happenStartTime: undefined,
+ // happenEndTime: undefined,
+ // isPlacebrand: undefined,
+ // connPerson: undefined,
+ // connPhone: undefined,
statu: undefined,
- createTime: undefined
+ // createTime: undefined
},
queryParams: {
pageNum: 1,
@@ -227,6 +227,7 @@
},
methods: {
agree(row){
+ // console.log(row,'rowrowrow')
this.formDat1.id = row.id
this.formDat1.statu = 1
// this.$refs['elForm'].validate(valid => {
@@ -271,7 +272,7 @@
this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
listMeeting2(this.queryParams).then(response => {
this.meetingList = response.data.data;
-
+ // console.log(this.meetingList,'meetingmeeting')
this.total = response.data.total;
this.loading = false;
}
diff --git a/ruoyi-ui/src/views/meeting/index.vue b/ruoyi-ui/src/views/meeting/index.vue
index 859efee..abce3f0 100644
--- a/ruoyi-ui/src/views/meeting/index.vue
+++ b/ruoyi-ui/src/views/meeting/index.vue
@@ -419,7 +419,7 @@
isPlacebrand: [{
required: true,
message: '璇烽�夋嫨鏄惁鎽嗘斁姘寸墝',
- trigger: 'blur'
+ trigger: 'change'
}],
connPerson: [{
required: true,
diff --git a/ruoyi-ui/src/views/meeting/meetingInfo.vue b/ruoyi-ui/src/views/meeting/meetingInfo.vue
index 407e8b9..fda5ce5 100644
--- a/ruoyi-ui/src/views/meeting/meetingInfo.vue
+++ b/ruoyi-ui/src/views/meeting/meetingInfo.vue
@@ -130,6 +130,13 @@
</el-select>
</el-form-item>
</el-cow>
+ <!-- <el-cow>
+ <el-form-item label="鐘舵��" prop="statu" label-width="90px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-if="!dsb" v-model="formData.connPhone" placeholder="寰呭鎵�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ <el-input v-if="dsb" v-model="formData.connPhone" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ </el-form-item>
+ </el-cow> -->
</el-row>
</el-container>
@@ -255,9 +262,9 @@
trigger: 'blur'
}],
statu: [{
- // required: true,
+ required: true,
message: '璇烽�夋嫨鐘舵��',
- trigger: 'blur'
+ trigger: 'change'
}],
},
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index 0f687f9..7e0221e 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -120,15 +120,15 @@
alt=""
style="width: 35px; height: 35px;"
fit="cover"
- v-if="scope.row.url"
+ v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
>
<img
+ v-else
class="el-upload-list__item-thumbnail"
src="../../assets/images/deviceA.png"
alt=""
style="width: 35px; height: 35px;"
fit="cover"
- v-if="!scope.row.url"
>
</template>
</el-table-column>
--
Gitblit v1.9.1