From 9cc59c17892a7e69de54e06b5931e78c9b05551c Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期二, 02 九月 2025 09:24:34 +0800
Subject: [PATCH] 添加mqtt登出
---
pages/tabBar/warning.vue | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/pages/tabBar/warning.vue b/pages/tabBar/warning.vue
index 590c26f..7ecc874 100644
--- a/pages/tabBar/warning.vue
+++ b/pages/tabBar/warning.vue
@@ -4,7 +4,7 @@
<!-- 闇�瑕佸浐瀹氬湪椤堕儴涓嶆粴鍔ㄧ殑view鏀惧湪slot="top"鐨剉iew涓紝濡傛灉闇�瑕佽窡鐫�婊氬姩锛屽垯涓嶈璁剧疆slot="top" -->
<template #top>
<cu-custom bgColor="bg-gradual-blue" :isBack="false" :isRight="true" @rightclick="rclick">
- <block slot="content">鎶ヨ</block>
+ <block slot="content">鎶ヨ缁熻</block>
</cu-custom>
@@ -33,6 +33,7 @@
</view>
</view>
+
<view class="flex flex-direction padding-xs">
<view class="flex">
<view class="flex-sub flex flex-direction">
@@ -114,23 +115,23 @@
</view>
<!-- 濡傛灉甯屾湜鍏朵粬view璺熺潃椤甸潰婊氬姩锛屽彲浠ユ斁鍦▃-paging鏍囩鍐� -->
- <real-warning ref="realWarining" v-if="tabCurrent === 0" @handleData="realHandleData"></real-warning>
- <his-warning ref="hisWarining" v-else @handleData="hisHandleData"></his-warning>
+ <!-- <real-warning ref="realWarining" v-if="tabCurrent === 0" @handleData="realHandleData"></real-warning> -->
+ <!-- <his-warning ref="hisWarining" v-if="tabCurrent === 0" @handleData="hisHandleData"></his-warning> -->
-
+ <view style="z-index: 1;">
+ <his-warning ref="hisWarining" v-if="tabCurrent === 0" @handleData="hisHandleData"></his-warning>
+ </view>
</z-paging>
</view>
</template>
<script>
import dropdownMenu from '@/components/drop-down-menu/index.vue'
- import realWarning from './components/realWarning.vue'
import hisWarning from './components/hisWarning.vue'
import dayjs from 'dayjs'
export default {
components: {
dropdownMenu,
- realWarning,
hisWarning
},
data() {
@@ -139,18 +140,20 @@
// v-model缁戝畾鐨勮繖涓彉閲忎笉瑕佸湪鍒嗛〉璇锋眰缁撴潫涓嚜宸辫祴鍊硷紒锛侊紒
dataList: [],
curDate: dayjs().format('YYYY-MM-DD'),
- tabList: [{
- name: '瀹炴椂鎶ヨ',
- // badge: {
- // count: 6
- // }
- }, {
+ tabList: [
+ // {
+ // name: '瀹炴椂鎶ヨ',
+ // // badge: {
+ // // count: 6
+ // // }
+ // },
+ {
name: '鎶ヨ缁熻',
}],
- equList: [{
+ equList: [/* {
code: 1,
name: '1#骞茬嚗鏈�'
- },
+ }, */
{
code: 2,
name: '2#骞茬嚗鏈�'
--
Gitblit v1.9.3