From 89311b0d8981e10c59e9b42f1a9edc2ce42efb56 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期二, 29 十一月 2022 11:18:51 +0800
Subject: [PATCH] 卡口管理修改
---
src/views/systemSetting/device/bayonet/index.vue | 2
src/api/system/bayonet.js | 2
src/views/operate/video/updateInterface/index.vue | 62 ++++++++++++++++++++-----------
3 files changed, 42 insertions(+), 24 deletions(-)
diff --git a/src/api/system/bayonet.js b/src/api/system/bayonet.js
index ca453b8..cf40d8b 100644
--- a/src/api/system/bayonet.js
+++ b/src/api/system/bayonet.js
@@ -4,7 +4,7 @@
return http.get('/sccg/equipment_bayonet/query', params);
},
exportBayonetList: (params) => {
- return http.post('/sccg/equipment_bayonet/export', params);
+ return http.downloadFile('/sccg/equipment_bayonet/export', params);
},
addBayonet: (params) => {
return http.post('/sccg/equipment_bayonet/addition', params);
diff --git a/src/views/operate/video/updateInterface/index.vue b/src/views/operate/video/updateInterface/index.vue
index 4d1d80c..d6f3380 100644
--- a/src/views/operate/video/updateInterface/index.vue
+++ b/src/views/operate/video/updateInterface/index.vue
@@ -22,14 +22,18 @@
<el-input v-model="videoData.id"></el-input>
</el-form-item>
<el-form-item prop="url" label="瑙嗛" min-width="8">
- <template v-if="videoList">
- <video controls v-for="video in videoList" :src="video" :key="video" width="300px" height="200px" />
+ <template v-if="videoList" >
+ <div class="video-cover" v-for="video in videoList" :key="video">
+ <i v-if="isUpdate" @click="handleDelete(video)" class="el-icon-delete video-delete-icon"></i>
+ <video controls :src="video" width="100%" height="100%"/>
+ </div>
</template>
<el-upload
v-if="isUpdate"
class="avatar-uploader"
action=""
ref="image"
+ limit="4"
:show-file-list="false"
:auto-upload="true"
:http-request="videoUpload">
@@ -69,13 +73,13 @@
belongToId: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ墍灞炰簨浠剁紪鍙�' }],
eventSource: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ヤ簨浠舵潵婧�' }],
regionName: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ョぞ鍖哄悕绉�' }],
- id: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ュ浘鐗嘔d' }],
+ id: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ヨ棰慖d' }],
category: [{ required: true, trigger: 'blue', message: '璇疯緭鍏ラ棶棰樼被鍨�' }],
url: [{ required: true, validator: validateVideoUrl }],
type: [{ required: true, trigger: ['blur', 'change'], message: '璇烽�夋嫨绫诲瀷' }]
},
isDisabled: false,
- videoList: null
+ videoList: []
}
},
@@ -121,8 +125,10 @@
formData.append('file', file.file);
imageManagement.importImage(formData)
.then(res => {
- this.$refs.image.clearFiles();
- this.$set(this.videoData, 'url', FILE_ORIGINAL_URL + res.url1);
+ const url = res.url1 ?? res.url2 ?? res.url3 ?? res.url4;
+ const videoUrl = FILE_ORIGINAL_URL + url;
+ this.videoList.push(videoUrl);
+ this.$set(this.videoData, 'url', this.videoList.join(','));
this.$message.success('涓婁紶鎴愬姛');
})
.catch(err => {
@@ -130,6 +136,12 @@
this.$refs.image.clearFiles();
})
},
+
+ handleDelete(data) {
+ this.videoList = this.videoList.filter(item => item !== data);
+ this.videoData.url = this.videoList.join(',');
+ },
+
getResourceType(value) {
return value ? RESOURCE_TYPE.find(item => item.value === value) : RESOURCE_TYPE;
}
@@ -153,23 +165,29 @@
display: flex;
justify-content: center;
align-items: center;
- .avatar-uploader .el-upload {
- border: 1px solid #ffffff;
- border-radius: 6px;
- cursor: pointer;
+
+ .video-cover {
+ height: 169px;
+ display: flex;
+ }
+
+ .video-cover:hover {
+ background-color: #ffffff;
+ opacity: .6;
+ .video-delete-icon {
+ display: inline;
+ opacity: 1;
+ }
+ }
+
+ .video-delete-icon {
position: relative;
- overflow: hidden;
- }
- .avatar-uploader .el-upload:hover {
- border-color: #409EFF;
- }
- .avatar-uploader-icon {
- font-size: 14px;
- color: #8c939d;
- width: 50px;
- height: 50px;
- line-height: 50px;
- text-align: center;
+ color: red;
+ left: calc(100% - 150px);
+ top: calc(100% - 95px);
+ z-index: 2;
+ height: 14px;
+ display: none;
}
.submit-button {
diff --git a/src/views/systemSetting/device/bayonet/index.vue b/src/views/systemSetting/device/bayonet/index.vue
index b2a50c0..635ad74 100644
--- a/src/views/systemSetting/device/bayonet/index.vue
+++ b/src/views/systemSetting/device/bayonet/index.vue
@@ -178,7 +178,7 @@
.exportBayonetList({
bayonetName: this.context,
current: this.current,
- size: this.size,
+ size: this.size
})
.then((res) => {
downloadFile(res);
--
Gitblit v1.8.0