From b2d0ac2db80c08783fd848933230618cc30d76a2 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 30 八月 2023 11:38:24 +0800
Subject: [PATCH] 添加锦汇企业编码. 修复点位列表平铺的bug
---
src/views/dataPush/components/dataPush.vue | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/views/dataPush/components/dataPush.vue b/src/views/dataPush/components/dataPush.vue
index 35aca91..9504766 100644
--- a/src/views/dataPush/components/dataPush.vue
+++ b/src/views/dataPush/components/dataPush.vue
@@ -1,20 +1,22 @@
<template>
<div style="padding: 20px;">
<el-tabs v-model="activeName" @tab-click="handleClick">
- <el-tab-pane name="first">
- <span slot="label"><i class="el-icon-s-home"></i> 璁惧淇℃伅缁存姢</span>
+ <el-tab-pane name="device">
+ <span slot="label"><i class="el-icon-coin"></i> 璁惧淇℃伅缁存姢</span>
<device></device>
</el-tab-pane>
- <!-- <el-tab-pane label="璁惧淇℃伅缁存姢" name="first">
- <device></device>
- </el-tab-pane> -->
- <el-tab-pane name="second">
- <span slot="label"><i class="el-icon-s-platform"></i> 鐐逛綅淇℃伅缁存姢</span>
+ <el-tab-pane name="point">
+ <span slot="label"><i class="el-icon-place"></i> 鐐逛綅淇℃伅缁存姢</span>
<point></point>
</el-tab-pane>
- <!-- <el-tab-pane label="鐐逛綅淇℃伅缁存姢" name="second">
- <point></point>
- </el-tab-pane> -->
+ <el-tab-pane name="alarmPush">
+ <span slot="label"><i class="el-icon-position"></i> 鎶ヨ涓婃姤鏃ュ織</span>
+ <alarmPush></alarmPush>
+ </el-tab-pane>
+ <el-tab-pane name="smsLog">
+ <span slot="label"><i class="el-icon-chat-line-square"></i> 鐭俊鎺ㄩ�佹棩蹇�</span>
+ <smsLog></smsLog>
+ </el-tab-pane>
</el-tabs>
</div>
</template>
@@ -22,22 +24,26 @@
<script>
import device from "./device.vue"
import point from "./point.vue"
+import alarmPush from "./alarmPush.vue"
+import smsLog from "./smsLog.vue"
export default {
components: {
device,
- point
+ point,
+ alarmPush,
+ smsLog
},
data() {
return {
- activeName: "first"
+ activeName: "device"
}
},
created() {},
mounted() {},
methods: {
handleClick(tab, event) {
- console.log(tab, event, this.activeName)
+ // console.log(tab, event, this.activeName)
}
}
}
--
Gitblit v1.8.0