From 92a25393f38d9877aeefca3bcc0f6574b7dff6d4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 17 十月 2023 17:55:40 +0800
Subject: [PATCH] 基于新的云端录像实现页面功能
---
src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java | 6
src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java | 35 +++-
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 2
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java | 2
src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java | 2
src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java | 5
web_src/src/components/dialog/recordDownload.vue | 2
web_src/src/components/CloudRecord.vue | 385 +++++++++++++++++++++++++++--------------------
8 files changed, 257 insertions(+), 182 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
index e385ad7..9bff21f 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -291,7 +291,7 @@
}
// 濡傛灉鏄綍鍍忎笅杞藉氨璁剧疆瑙嗛闂撮殧鍗佺
if (ssrcTransactionForAll.get(0).getType() == InviteSessionType.DOWNLOAD) {
- result.setMp4_max_second(10);
+ result.setMp4_max_second(30);
result.setEnable_mp4(true);
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java b/src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
index 5a5eb65..10a58c6 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
@@ -18,7 +18,7 @@
/**
* 鍒嗛〉鍥炲幓浜戠褰曞儚鍒楄〃
*/
- PageInfo<CloudRecordItem> getList(int page, int count, String app, String stream, String startTime, String endTime, List<MediaServerItem> mediaServerItems);
+ PageInfo<CloudRecordItem> getList(int page, int count, String query, String app, String stream, String startTime, String endTime, List<MediaServerItem> mediaServerItems);
/**
* 鏍规嵁hook娑堟伅澧炲姞涓�鏉¤褰�
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
index 1d8a537..5af3d64 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
@@ -50,7 +50,7 @@
private VideoStreamSessionManager streamSession;
@Override
- public PageInfo<CloudRecordItem> getList(int page, int count, String app, String stream, String startTime, String endTime, List<MediaServerItem> mediaServerItems) {
+ public PageInfo<CloudRecordItem> getList(int page, int count, String query, String app, String stream, String startTime, String endTime, List<MediaServerItem> mediaServerItems) {
// 寮�濮嬫椂闂村拰缁撴潫鏃堕棿鍦ㄦ暟鎹簱涓兘鏄互绉掍负鍗曚綅鐨�
Long startTimeStamp = null;
Long endTimeStamp = null;
@@ -69,7 +69,7 @@
}
PageHelper.startPage(page, count);
- List<CloudRecordItem> all = cloudRecordServiceMapper.getList(app, stream, startTimeStamp, endTimeStamp,
+ List<CloudRecordItem> all = cloudRecordServiceMapper.getList(query, app, stream, startTimeStamp, endTimeStamp,
null, mediaServerItems);
return new PageInfo<>(all);
}
@@ -85,7 +85,7 @@
}
long startTimeStamp = startDate.atStartOfDay().toInstant(ZoneOffset.ofHours(8)).getEpochSecond();
long endTimeStamp = endDate.atStartOfDay().toInstant(ZoneOffset.ofHours(8)).getEpochSecond();
- List<CloudRecordItem> cloudRecordItemList = cloudRecordServiceMapper.getList(app, stream, startTimeStamp,
+ List<CloudRecordItem> cloudRecordItemList = cloudRecordServiceMapper.getList(null, app, stream, startTimeStamp,
endTimeStamp, null, mediaServerItems);
if (cloudRecordItemList.isEmpty()) {
return new ArrayList<>();
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
index eb9e2ef..87b839f 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
@@ -765,7 +765,7 @@
}
// 涓轰簡鏀寔澶氫釜鏁版嵁搴擄紝杩欓噷涓嶈兘浣跨敤姹傚拰鍑芥暟鏉ョ洿鎺ヨ幏鍙栨�绘暟浜�
- List<CloudRecordItem> cloudRecordItemList = cloudRecordServiceMapper.getList("rtp", inviteInfo.getStream(), null, null, ssrcTransaction.getCallId(), null);
+ List<CloudRecordItem> cloudRecordItemList = cloudRecordServiceMapper.getList(null, "rtp", inviteInfo.getStream(), null, null, ssrcTransaction.getCallId(), null);
if (cloudRecordItemList.isEmpty()) {
logger.warn("[鑾峰彇涓嬭浇杩涘害]锛屾湭鎵惧埌涓嬭浇瑙嗛淇℃伅");
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
index d5a0859..49ba89e 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
@@ -44,6 +44,7 @@
"select * " +
" from wvp_cloud_record " +
" where 0 = 0" +
+ " <if test='query != null'> AND (app LIKE concat('%',#{query},'%') OR stream LIKE concat('%',#{query},'%') )</if> " +
" <if test= 'app != null '> and app=#{app}</if>" +
" <if test= 'stream != null '> and stream=#{stream}</if>" +
" <if test= 'startTimeStamp != null '> and end_time >= #{startTimeStamp}</if>" +
@@ -52,8 +53,10 @@
" <if test= 'mediaServerItemList != null ' > and media_server_id in " +
" <foreach collection='mediaServerItemList' item='item' open='(' separator=',' close=')' > #{item.id}</foreach>" +
" </if>" +
+ " order by start_time DESC" +
+
" </script>")
- List<CloudRecordItem> getList(@Param("app") String app, @Param("stream") String stream,
+ List<CloudRecordItem> getList(@Param("query") String query, @Param("app") String app, @Param("stream") String stream,
@Param("startTimeStamp")Long startTimeStamp, @Param("endTimeStamp")Long endTimeStamp,
@Param("callId")String callId, List<MediaServerItem> mediaServerItemList);
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
index 04778c3..cb731cd 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
@@ -105,20 +105,22 @@
@ResponseBody
@GetMapping("/list")
@Operation(summary = "鍒嗛〉鏌ヨ浜戠褰曞儚")
- @Parameter(name = "app", description = "搴旂敤鍚�", required = true)
- @Parameter(name = "stream", description = "娴両D", required = true)
+ @Parameter(name = "query", description = "妫�绱㈠唴瀹�", required = false)
+ @Parameter(name = "app", description = "搴旂敤鍚�", required = false)
+ @Parameter(name = "stream", description = "娴両D", required = false)
@Parameter(name = "page", description = "褰撳墠椤�", required = false)
@Parameter(name = "count", description = "姣忛〉鏌ヨ鏁伴噺", required = false)
- @Parameter(name = "startTime", description = "寮�濮嬫椂闂�(yyyy-MM-dd HH:mm:ss)", required = true)
- @Parameter(name = "endTime", description = "缁撴潫鏃堕棿(yyyy-MM-dd HH:mm:ss)", required = true)
+ @Parameter(name = "startTime", description = "寮�濮嬫椂闂�(yyyy-MM-dd HH:mm:ss)", required = false)
+ @Parameter(name = "endTime", description = "缁撴潫鏃堕棿(yyyy-MM-dd HH:mm:ss)", required = false)
@Parameter(name = "mediaServerId", description = "娴佸獟浣揑D锛岀疆绌哄垯鏌ヨ鍏ㄩ儴娴佸獟浣�", required = false)
public PageInfo<CloudRecordItem> openRtpServer(
- @RequestParam String app,
- @RequestParam String stream,
+ @RequestParam(required = false) String query,
+ @RequestParam(required = false) String app,
+ @RequestParam(required = false) String stream,
@RequestParam int page,
@RequestParam int count,
- @RequestParam String startTime,
- @RequestParam String endTime,
+ @RequestParam(required = false) String startTime,
+ @RequestParam(required = false) String endTime,
@RequestParam(required = false) String mediaServerId
) {
@@ -139,7 +141,22 @@
if (mediaServerItems.isEmpty()) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "褰撳墠鏃犳祦濯掍綋");
}
- return cloudRecordService.getList(page, count, app, stream, startTime, endTime, mediaServerItems);
+ if (query != null && ObjectUtils.isEmpty(query.trim())) {
+ query = null;
+ }
+ if (app != null && ObjectUtils.isEmpty(app.trim())) {
+ app = null;
+ }
+ if (stream != null && ObjectUtils.isEmpty(stream.trim())) {
+ stream = null;
+ }
+ if (startTime != null && ObjectUtils.isEmpty(startTime.trim())) {
+ startTime = null;
+ }
+ if (endTime != null && ObjectUtils.isEmpty(endTime.trim())) {
+ endTime = null;
+ }
+ return cloudRecordService.getList(page, count, query, app, stream, startTime, endTime, mediaServerItems);
}
@ResponseBody
diff --git a/web_src/src/components/CloudRecord.vue b/web_src/src/components/CloudRecord.vue
index c13cdc4..c47ce2f 100755
--- a/web_src/src/components/CloudRecord.vue
+++ b/web_src/src/components/CloudRecord.vue
@@ -1,5 +1,5 @@
<template>
- <div id="app" style="width: 100%">
+ <div id="app" style="width: 100%">
<div class="page-header">
<div class="page-title">
<el-page-header v-if="recordDetail" @back="backToList" content="浜戠褰曞儚"></el-page-header>
@@ -7,44 +7,82 @@
</div>
<div class="page-header-btn">
+ 鎼滅储:
+ <el-input @input="search" style="margin-right: 1rem; width: auto;" size="mini" placeholder="鍏抽敭瀛�"
+ prefix-icon="el-icon-search" v-model="search" clearable></el-input>
+ 寮�濮嬫椂闂�:
+ <el-date-picker
+ v-model="startTime"
+ type="datetime"
+ placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+ </el-date-picker>
+ 缁撴潫鏃堕棿:
+ <el-date-picker
+ v-model="endTime"
+ type="datetime"
+ placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+ </el-date-picker>
鑺傜偣閫夋嫨:
- <el-select size="mini" @change="chooseMediaChange" style="width: 16rem; margin-right: 1rem;" v-model="mediaServerId" placeholder="璇烽�夋嫨" :disabled="recordDetail">
+ <el-select size="mini" @change="chooseMediaChange" style="width: 16rem; margin-right: 1rem;"
+ v-model="mediaServerId" placeholder="璇烽�夋嫨" :disabled="recordDetail">
<el-option
- v-for="item in mediaServerList"
- :key="item.id"
- :label="item.id"
- :value="item.id">
+ v-for="item in mediaServerList"
+ :key="item.id"
+ :label="item.id"
+ :value="item.id">
</el-option>
</el-select>
- <el-button v-if="!recordDetail" icon="el-icon-refresh-right" circle size="mini" :loading="loading" @click="getRecordList()"></el-button>
+ <el-button size="mini" icon="el-icon-delete" type="danger" @click="deleteRecord()">鎵归噺鍒犻櫎</el-button>
+ <el-button v-if="!recordDetail" icon="el-icon-refresh-right" circle size="mini" :loading="loading"
+ @click="getRecordList()"></el-button>
</div>
</div>
<div v-if="!recordDetail">
<!--璁惧鍒楄〃-->
<el-table :data="recordList" style="width: 100%" :height="winHeight">
- <el-table-column prop="app" label="搴旂敤鍚�" >
+ <el-table-column prop="app" label="搴旂敤鍚�">
</el-table-column>
- <el-table-column prop="stream" label="娴両D" >
+ <el-table-column prop="stream" label="娴両D" width="380">
</el-table-column>
- <el-table-column prop="time" label="鏃堕棿" >
- </el-table-column>
- <el-table-column label="鎿嶄綔" width="360" fixed="right">
+ <el-table-column label="寮�濮嬫椂闂�">
<template slot-scope="scope">
- <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>-->
+ {{formatTimeStamp(scope.row.startTime)}}
+ </template>
+ </el-table-column>
+ <el-table-column label="缁撴潫鏃堕棿">
+ <template slot-scope="scope">
+ {{formatTimeStamp(scope.row.endTime)}}
+ </template>
+ </el-table-column>
+ <el-table-column label="鏃堕暱">
+ <template slot-scope="scope">
+ <el-tag>{{formatTime(scope.row.timeLen)}}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="fileName" label="鏂囦欢鍚嶇О">
+ </el-table-column>
+ <el-table-column prop="mediaServerId" label="娴佸獟浣�">
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" width="200" fixed="right">
+ <template slot-scope="scope">
+ <el-button size="medium" icon="el-icon-video-play" type="text" @click="showRecordDetail(scope.row)">鎾斁
+ </el-button>
+ <el-button size="medium" icon="el-icon-delete" type="text" style="color: #f56c6c"
+ @click="deleteRecord(scope.row)">鍒犻櫎
+ </el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
- style="float: right"
- @size-change="handleSizeChange"
- @current-change="currentChange"
- :current-page="currentPage"
- :page-size="count"
- :page-sizes="[15, 25, 35, 50]"
- layout="total, sizes, prev, pager, next"
- :total="total">
+ style="float: right"
+ @size-change="handleSizeChange"
+ @current-change="currentChange"
+ :current-page="currentPage"
+ :page-size="count"
+ :page-sizes="[15, 25, 35, 50]"
+ layout="total, sizes, prev, pager, next"
+ :total="total">
</el-pagination>
</div>
@@ -52,156 +90,173 @@
</template>
<script>
- import uiHeader from '../layout/UiHeader.vue'
- import MediaServer from './service/MediaServer'
- export default {
- name: 'app',
- components: {
- uiHeader
- },
- data() {
- return {
- mediaServerList: [], // 婊呬綋鑺傜偣鍒楄〃
- mediaServerId: null, // 濯掍綋鏈嶅姟
- mediaServerPath: null, // 濯掍綋鏈嶅姟鍦板潃
- recordList: [], // 璁惧鍒楄〃
- chooseRecord: null, // 濯掍綋鏈嶅姟
+import uiHeader from '../layout/UiHeader.vue'
+import MediaServer from './service/MediaServer'
+import moment from 'moment'
- updateLooper: 0, //鏁版嵁鍒锋柊杞鏍囧織
- winHeight: window.innerHeight - 250,
- currentPage:1,
- count:15,
- total:0,
- loading: false,
- mediaServerObj : new MediaServer(),
- recordDetail: false
+export default {
+ name: 'app',
+ components: {
+ uiHeader
+ },
+ data() {
+ return {
+ search: '',
+ startTime: '',
+ endTime: '',
+ mediaServerList: [], // 婊呬綋鑺傜偣鍒楄〃
+ mediaServerId: null, // 濯掍綋鏈嶅姟
+ mediaServerPath: null, // 濯掍綋鏈嶅姟鍦板潃
+ recordList: [], // 璁惧鍒楄〃
+ chooseRecord: null, // 濯掍綋鏈嶅姟
- };
- },
- computed: {
+ updateLooper: 0, //鏁版嵁鍒锋柊杞鏍囧織
+ winHeight: window.innerHeight - 250,
+ currentPage: 1,
+ count: 15,
+ total: 0,
+ loading: false,
+ mediaServerObj: new MediaServer(),
+ recordDetail: false
- },
- mounted() {
- this.initData();
- },
- destroyed() {
- // this.$destroy('videojs');
- },
- methods: {
- initData: function() {
- // 鑾峰彇濯掍綋鑺傜偣鍒楄〃
- this.getMediaServerList();
- // this.getRecordList();
- },
- currentChange: function(val){
- this.currentPage = val;
- this.getRecordList();
- },
- handleSizeChange: function(val){
- this.count = val;
- this.getRecordList();
- },
- getMediaServerList: function (){
- let that = this;
- that.mediaServerObj.getOnlineMediaServerList((data)=>{
- that.mediaServerList = data.data;
- if (that.mediaServerList.length > 0) {
- that.mediaServerId = that.mediaServerList[0].id
- that.setMediaServerPath(that.mediaServerId);
- that.getRecordList();
- }
- })
- },
- setMediaServerPath: function (serverId) {
- let that = this;
- let i;
- for (i = 0; i < that.mediaServerList.length; i++) {
- if (serverId === that.mediaServerList[i].id) {
- break;
- }
+ };
+ },
+ computed: {},
+ mounted() {
+ this.initData();
+ },
+ destroyed() {
+ // this.$destroy('videojs');
+ },
+ methods: {
+ initData: function () {
+ // 鑾峰彇濯掍綋鑺傜偣鍒楄〃
+ this.getMediaServerList();
+ // this.getRecordList();
+ },
+ currentChange: function (val) {
+ this.currentPage = val;
+ this.getRecordList();
+ },
+ handleSizeChange: function (val) {
+ this.count = val;
+ this.getRecordList();
+ },
+ getMediaServerList: function () {
+ let that = this;
+ that.mediaServerObj.getOnlineMediaServerList((data) => {
+ that.mediaServerList = data.data;
+ if (that.mediaServerList.length > 0) {
+ that.mediaServerId = that.mediaServerList[0].id
+ that.setMediaServerPath(that.mediaServerId);
+ that.getRecordList();
}
- let port = that.mediaServerList[i].httpPort;
- if (location.protocol === "https:" && that.mediaServerList[i].httpSSlPort) {
- port = that.mediaServerList[i].httpSSlPort
+ })
+ },
+ setMediaServerPath: function (serverId) {
+ let that = this;
+ let i;
+ for (i = 0; i < that.mediaServerList.length; i++) {
+ if (serverId === that.mediaServerList[i].id) {
+ break;
}
- that.mediaServerPath = location.protocol + "//" + that.mediaServerList[i].streamIp + ":" + port
- console.log(that.mediaServerPath)
- },
- getRecordList: function (){
- let that = this;
- this.$axios({
- method: 'get',
- url:`/record_proxy/${that.mediaServerId}/api/record/list`,
- params: {
- page: that.currentPage,
- count: that.count
- }
- }).then(function (res) {
- console.log(res)
- 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);
- that.loading = false;
- });
- },
- backToList(){
- this.recordDetail= false;
- },
- chooseMediaChange(val){
- console.log(val)
- this.total = 0;
- this.recordList = [];
- this.setMediaServerPath(val);
- this.getRecordList();
- },
- showRecordDetail(row){
- this.recordDetail = true;
- this.chooseRecord = row;
- // 鏌ヨ鏄惁瀛樺湪褰曞儚
- // this.$axios({
- // method: 'delete',
- // url:`/record_proxy/api/record/delete`,
- // params: {
- // page: this.currentPage,
- // count: this.count
- // }
- // }).then((res) => {
- // console.log(res)
- // this.total = res.data.data.total;
- // this.recordList = res.data.data.list;
- // }).catch(function (error) {
- // console.log(error);
- // });
- this.$router.push(`/cloudRecordDetail/${row.app}/${row.stream}`)
- },
- deleteRecord(){
- // TODO
- let that = this;
- this.$axios({
- method: 'delete',
- url:`/record_proxy/api/record/delete`,
- params: {
- page: that.currentPage,
- count: that.count
- }
- }).then(function (res) {
- console.log(res)
- if (res.data.code === 0) {
- that.total = res.data.data.total;
- that.recordList = res.data.data.list;
- }
- }).catch(function (error) {
- console.log(error);
- });
- },
+ }
+ let port = that.mediaServerList[i].httpPort;
+ if (location.protocol === "https:" && that.mediaServerList[i].httpSSlPort) {
+ port = that.mediaServerList[i].httpSSlPort
+ }
+ that.mediaServerPath = location.protocol + "//" + that.mediaServerList[i].streamIp + ":" + port
+ console.log(that.mediaServerPath)
+ },
+ getRecordList: function () {
+ this.$axios({
+ method: 'get',
+ url: `/api/cloud/record/list`,
+ params: {
+ app: '',
+ stream: '',
+ query: this.search,
+ startTime: this.startTime,
+ endTime: this.endTime,
+ mediaServerId: this.mediaServerId,
+ page: this.currentPage,
+ count: this.count
+ }
+ }).then((res) => {
+ console.log(res)
+ if (res.data.code === 0) {
+ this.total = res.data.data.total;
+ this.recordList = res.data.data.list;
+ }
+ this.loading = false;
+ }).catch((error) => {
+ console.log(error);
+ this.loading = false;
+ });
+ },
+ backToList() {
+ this.recordDetail = false;
+ },
+ chooseMediaChange(val) {
+ console.log(val)
+ this.total = 0;
+ this.recordList = [];
+ this.setMediaServerPath(val);
+ this.getRecordList();
+ },
+ showRecordDetail(row) {
+ this.recordDetail = true;
+ this.chooseRecord = row;
+ // 鏌ヨ鏄惁瀛樺湪褰曞儚
+ // this.$axios({
+ // method: 'delete',
+ // url:`/record_proxy/api/record/delete`,
+ // params: {
+ // page: this.currentPage,
+ // count: this.count
+ // }
+ // }).then((res) => {
+ // console.log(res)
+ // this.total = res.data.data.total;
+ // this.recordList = res.data.data.list;
+ // }).catch(function (error) {
+ // console.log(error);
+ // });
+ this.$router.push(`/cloudRecordDetail/${row.app}/${row.stream}`)
+ },
+ deleteRecord() {
+ // TODO
+ let that = this;
+ this.$axios({
+ method: 'delete',
+ url: `/record_proxy/api/record/delete`,
+ params: {
+ page: that.currentPage,
+ count: that.count
+ }
+ }).then(function (res) {
+ console.log(res)
+ if (res.data.code === 0) {
+ that.total = res.data.data.total;
+ that.recordList = res.data.data.list;
+ }
+ }).catch(function (error) {
+ console.log(error);
+ });
+ },
+ formatTime(time) {
+ const h = parseInt(time / 3600)
+ const minute = parseInt(time / 60 % 60)
+ const second = Math.ceil(time % 60)
+ return (h > 0 ? h + `灏忔椂` : '') + (minute > 0 ? minute + '鍒�' : '') + second + '绉�'
+ },
+ formatTimeStamp(time) {
+ return moment.unix(time).format('yyyy-MM-DD HH:mm:ss')
+ }
- }
- };
+ }
+};
</script>
<style>
diff --git a/web_src/src/components/dialog/recordDownload.vue b/web_src/src/components/dialog/recordDownload.vue
index 95a512e..220da8b 100755
--- a/web_src/src/components/dialog/recordDownload.vue
+++ b/web_src/src/components/dialog/recordDownload.vue
@@ -27,7 +27,7 @@
},
data() {
return {
- title: "鍥涘�嶉�熶笅杞戒腑...",
+ title: "涓嬭浇涓�...",
deviceId: "",
channelId: "",
app: "",
--
Gitblit v1.8.0