Merge remote-tracking branch 'origin/sqy_dev'

# Conflicts:
#	pages.json
#	pages/device/device.vue

@@ -46,7 +46,7 @@ export default {
 	data() {
 		return {
 			list: [{ name: '基础信息' }, { name: '实时数据' }, { name: '历史数据' }, { name: '告警记录' }, { name: '命令记录' }],
-			currentTab: 3,
+			currentTab: 0,
 			deviceId: '',
 			deviceDetail: {},
 			keys: [],

@@ -20,8 +20,9 @@
 				</u-form-item>
 				<u-form-item @click="openType"><u-input shape="circle" v-model="timeData.getType" placeholder="请选择属性" disabled disabledColor="#377DFF0D" /></u-form-item>
 			</u-form>
-			<view class="charts-box" v-if="historyData.length"><qiun-data-charts type="area" :chartData="chartData" :opts="{ xAxis: { disabled: true }, legend: { show: false } }" /></view>
-			<view v-else style="display: flex;justify-content: center; align-items: center;">
+			<view class="charts-box" v-show="historyData.length"><qiun-data-charts type="area" canvas2d canvasId="daskujdhasljkdcnzjkdfhuoqwlqwjhkdsamjczxnmdasd123321" :chartData="chartData" :opts="{ xAxis: { disabled: true }, legend: { show: false } }"  /></view>
+			<view v-if="!historyData.length" style="display: flex;justify-content: center; align-items: center;">
+				{{historyData.length}}
 				<view>
 					<image src="../../../static/empty.png" style="width: 160rpx;height: 160rpx;" />
 					<view style="text-align: center; color:#e8e8e8;padding-bottom: 30rpx;">暂无数据</view>

@@ -23,7 +23,7 @@
 		{
 			"path": "pages/alarm/alarm",
 			"style": {
-				"navigationStyle": "custom", // 隐藏系统导航栏
+				"navigationStyle": "custom",
 				"navigationBarTitleText": "告警"
 			}
 		},
@@ -180,4 +180,4 @@
 			}
 		]
 	}
-}
+}

 <template>
 	<view class="device-page">
-		<f-navbar>
-			<view slot="left">
-				<view style="width: 580rpx">
-					<u--input prefixIcon="search" placeholder="输入设备SN或名称搜索" border="surround" shape="circle" @change="inputChanged"></u--input>
-				</view>
-			</view>
-			<view @click="openSearchDialog" slot="right" class="u-flex">
-				<text style="color: #333; font-size: 14px">筛选</text>
-				<image style="width: 40rpx; height: 40rpx" src="../../static/shaixuan.png" />
-			</view>
-		</f-navbar>
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<view class="org-sty" @click="openOrg">
-			<view class="org-item">
-				<view class="u-flex" style="margin-top: 26rpx; margin-left: 15rpx"><text style="color: #333; font-size: 15px; margin-left: 14rpx">组织关系</text></view>
-				<view style="margin-top: 20rpx; margin-left: 15rpx" class="u-flex" v-if="total">
-					<image style="margin-left: 14rpx; width: 30rpx; height: 30rpx" src="../../static/org.png" />
-					<text style="margin-left: 10rpx; color: #666; font-size: 12px">设备数 : {{ total }}</text>
+		<u-sticky>
+			<view class="device-top">
+				<view class="search">
+					<view>
+						<view class="search-left"><u--input prefixIcon="search" placeholder="输入设备SN或名称搜索" shape="circle" @change="inputChanged"></u--input></view>
+					</view>
+					<view @click="openSearchDialog" class="search-right">
+						<text>筛选</text>
+						<image src="../../static/shaixuan.png" />
+					</view>
+				</view>
+				<view class="org">
+					<u-cell @click="openOrg" isLink title="组织关系" :border="false">
+						<view slot="label" class="label" style="display: flex; align-items: center;margin-top: 20rpx;">
+							<image src="../../static/org.png" style="width: 24rpx;height: 28rpx;"></image>
+							<view style="margin-left: 10rpx; color: #666;">
+								设备数:
+								<text style="margin-left: 20rpx;">{{ total }}</text>
+							</view>
+						</view>
+					</u-cell>
 				</view>
 			</view>
-			<view class="org-item">
-				<image
-					style="
-            width: 6px;
-            height: 10px;
-            float: right;
-            margin-right: 34rpx;
-            margin-top: 58rpx;
-          "
-					src="../../static/right-arrow.png"
-				/>
-			</view>
-		</view>
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" :up="upOption" :down="downOption" @down="downCallback" @up="upCallback">
+		</u-sticky>
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
 			<view class="device-list">
 				<view @click="openDeviceDetail(item.id, item.alarmStatus, item.lastOnlineTime, item.tbDeviceId)" class="list-item" v-for="item in list" :key="item.id">
 					<view
@@ -70,13 +62,7 @@
                   margin-top: 5rpx;
                   margin-right: 5rpx;
                 "
-								:src="
-									item.deviceState === 'ONLINE'
-										? '../../static/online.png'
-										: item.deviceState === 'INACTIVE'
-										? '../../static/unonline.png'
-										: '../../static/baojing.png'
-								"
+								:src="item.deviceState === 'ONLINE' ? '../../static/online.png' : item.deviceState === 'INACTIVE' ? '../../static/unonline.png' : '../../static/baojing.png'"
 							/>
 
 							<view>
@@ -120,6 +106,7 @@ import fTabbar from '@/components/module/f-tabbar/f-tabbar';
 import fNavbar from '@/components/module/f-navbar/f-navbar';
 import FilterItem from './FilterItem.vue';
 import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
+
 import { debounce } from '@/plugins/throttle.js';
 export default {
 	mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
@@ -358,4 +345,4 @@ export default {
 		}
 	}
 }
-</style>
+</style>