From d7a1b94f905c5f28c9c8f2d48c3f9e28ebcf9cc4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 24 九月 2022 21:04:58 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
web_src/src/components/CloudRecord.vue | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/web_src/src/components/CloudRecord.vue b/web_src/src/components/CloudRecord.vue
index 1d0819b..4784e05 100644
--- a/web_src/src/components/CloudRecord.vue
+++ b/web_src/src/components/CloudRecord.vue
@@ -1,7 +1,11 @@
<template>
<div id="app" style="width: 100%">
<div class="page-header">
- <div class="page-title">浜戠褰曞儚</div>
+ <div class="page-title">
+ <el-page-header v-if="recordDetail" @back="backToList" content="浜戠褰曞儚"></el-page-header>
+ <div v-if="!recordDetail">浜戠褰曞儚</div>
+ </div>
+
<div class="page-header-btn">
鑺傜偣閫夋嫨:
<el-select size="mini" @change="chooseMediaChange" style="width: 16rem; margin-right: 1rem;" v-model="mediaServerId" placeholder="璇烽�夋嫨" :disabled="recordDetail">
@@ -18,19 +22,17 @@
<div v-if="!recordDetail">
<!--璁惧鍒楄〃-->
- <el-table :data="recordList" border style="width: 100%" :height="winHeight">
- <el-table-column prop="app" label="搴旂敤鍚�" align="center">
+ <el-table :data="recordList" style="width: 100%" :height="winHeight">
+ <el-table-column prop="app" label="搴旂敤鍚�" >
</el-table-column>
- <el-table-column prop="stream" label="娴両D" align="center">
+ <el-table-column prop="stream" label="娴両D" >
</el-table-column>
- <el-table-column prop="time" label="鏃堕棿" align="center">
+ <el-table-column prop="time" label="鏃堕棿" >
</el-table-column>
- <el-table-column label="鎿嶄綔" width="360" align="center" fixed="right">
+ <el-table-column label="鎿嶄綔" width="360" fixed="right">
<template slot-scope="scope">
- <el-button-group>
- <el-button size="mini" icon="el-icon-video-camera-solid" type="primary" @click="showRecordDetail(scope.row)">鏌ョ湅</el-button>
- <!-- <el-button size="mini" icon="el-icon-delete" type="danger" @click="deleteRecord(scope.row)">鍒犻櫎</el-button>-->
- </el-button-group>
+ <el-button size="medium" icon="el-icon-folder-opened" type="text" @click="showRecordDetail(scope.row)">鏌ョ湅</el-button>
+ <!-- <el-button size="mini" icon="el-icon-delete" type="danger" @click="deleteRecord(scope.row)">鍒犻櫎</el-button>-->
</template>
</el-table-column>
</el-table>
@@ -127,8 +129,10 @@
}
}).then(function (res) {
console.log(res)
- that.total = res.data.data.total;
- that.recordList = res.data.data.list;
+ if (res.data.code === 0) {
+ that.total = res.data.data.total;
+ that.recordList = res.data.data.list;
+ }
that.loading = false;
}).catch(function (error) {
console.log(error);
@@ -176,12 +180,14 @@
}
}).then(function (res) {
console.log(res)
- that.total = res.data.data.total;
- that.recordList = res.data.data.list;
+ if (res.data.code === 0) {
+ that.total = res.data.data.total;
+ that.recordList = res.data.data.list;
+ }
}).catch(function (error) {
console.log(error);
});
- }
+ },
}
--
Gitblit v1.8.0