From d1c6fa3e2e7ef9a5009e798909ed80aecf2eb1db Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 29 十一月 2022 11:40:30 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/video/index.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/views/operate/video/index.vue b/src/views/operate/video/index.vue
index c19bd91..30d0cf2 100644
--- a/src/views/operate/video/index.vue
+++ b/src/views/operate/video/index.vue
@@ -25,7 +25,7 @@
<el-button type="primary" @click="searchVideoList">鏌ヨ</el-button>
</div>
<div class="findBtn">
- <el-button type="primary" @click="handleOpera(null, 'create')">娣诲姞瑙嗛</el-button>
+ <el-button class="button-addition" type="primary" @click="handleOpera(null, 'create')">娣诲姞瑙嗛</el-button>
</div>
</div>
</div>
@@ -62,12 +62,12 @@
</el-table-column>
<el-table-column prop="category" label="闂绫诲埆" min-width="8">
<template slot-scope="scope">
- <span>{{ getCategory(scope.row.category).label }}</span>
+ <span>{{ getCategory(scope.row.category)?.label }}</span>
</template>
</el-table-column>
<el-table-column prop="eventSource" label="浜嬩欢鏉ユ簮" min-width="8">
<template slot-scope="scope">
- <span>{{ getEventSource(scope.row.eventSource).label }}</span>
+ <span>{{ getEventSource(scope.row.eventSource)?.label }}</span>
</template>
</el-table-column>
<el-table-column prop="regionName" label="绀惧尯鍚嶇О" min-width="8">
@@ -96,9 +96,11 @@
<!-- 鏌ョ湅淇敼椤甸潰 -->
<el-dialog
:visible.sync="isShowDialog"
+ :destroy-on-close="true"
+ :key="dialogTitle"
width="40%"
:title="dialogTitle">
- <updateInterface :isUpdate="isUpdate" :dialogData="dialogData" />
+ <updateInterface v-if="isShowDialog" :isUpdate="isUpdate" :dialogData="dialogData" @closeDialog="closeDialog" />
</el-dialog>
<div class="tools">
@@ -340,10 +342,7 @@
// 鍏抽棴涓婁紶鐣岄潰
closeDialog() {
this.isShowDialog = false;
- },
- // 澶勭悊鏃堕棿
- filterTime(time) {
- return helper(time);
+ this.searchVideoList();
},
getCategory(value) {
@@ -436,8 +435,9 @@
margin-bottom: 10px;
.type-item {
- width: 80px;
+ min-width: 80px;
text-align: center;
+ padding-right: 10px;
&:hover {
cursor: pointer;
--
Gitblit v1.8.0