From d24b6fe16b7fa9aa608be207f6c9ab158d4e1196 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 12 九月 2023 16:32:22 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://139.186.142.91:29418/productDev/dmMes into dev
---
minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue b/minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue
index 77e834b..ef0cd69 100644
--- a/minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue
+++ b/minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue
@@ -70,7 +70,7 @@
<button class="box_footer_submit" v-preventReClick @click="submit">鎻愪氦</button>
</view>
<!-- 鏌ョ湅澶у浘 -->
- <Preview :list="form.files" :current="current" v-if="isOpen" />
+ <Preview :list="form.files.map(item => item.url)" :current="current" @close="isOpen = false" v-if="isOpen" />
<!-- 閫夋嫨璁惧 -->
<ytyDataPicker :show="show" :dataList="columns" @select="handleSelect" @search="handleSearch" @close="show = false" />
<!-- 閫夋嫨鏃堕棿 -->
@@ -91,11 +91,6 @@
export default {
data() {
return {
- list1: [
- 'https://cloudfactory.oss-cn-hangzhou.aliyuncs.com/deviceCheck/20230911/e228a809-0a6b-443c-9a2c-78d5c1b1b633.mp4',
- 'https://cdn.uviewui.com/uview/swiper/swiper2.png',
- 'https://cdn.uviewui.com/uview/swiper/swiper3.png',
- ],
status: [{
name: '姝ｅ父',
active: true,
@@ -108,6 +103,7 @@
}
],
columns: [],
+ isOpen: false,
path: '',
show: false,
showTime: false,
@@ -136,6 +132,11 @@
...mapState(['session'])
},
methods: {
+ // 鏌ョ湅澶у浘/瑙嗛
+ seeBigFile(i) {
+ this.current = i
+ this.isOpen = true
+ },
// 鍒犻櫎鎸囧畾鏂囦欢
dele(i) {
this.form.files.splice(i, 1)
--
Gitblit v1.9.3