From b4d2703e653bf702d705b18c20d9edb9066c7c8a Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期三, 03 十一月 2021 17:35:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/vue-smart-ai
---
src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue b/src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue
index cc0bccd..1a5f8b3 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue
@@ -46,7 +46,7 @@
<el-table-column prop="tranferDevice" label="杞偍璁惧鍚嶇О">
<template slot-scope="scope">
<div>
- 璁惧{{scope.$index}}
+ 璁惧{{scope.row.DeviceID}}
</div>
</template>
</el-table-column>
@@ -127,7 +127,7 @@
PageIndex: 1,
pageSizes: [8, 15, 20],
PageSize: 8,
- searchTime: [this.$moment(new Date().getTime() - 3600 * 1000 * 24 * 5).format("YYYY-MM-DD HH:mm:ss"), this.$moment(new Date()).format("YYYY-MM-DD HH:mm:ss")],
+ searchTime: ["2020-01-01 00:00:00", this.$moment(new Date()).format("YYYY-MM-DD HH:mm:ss")],
}
},
mounted () {
--
Gitblit v1.8.0