Merge branch 'sqy_dev' into 'main'

'fix:修改设备相关代码'

See merge request huang/thingskit-app!15

@@ -2,3 +2,4 @@
 unpackage/
 unpackage/
 .DS_Store
 .DS_Store
 dist/
 dist/
+node_modules/

-{
-    "id": "yyh-tab",
-    "name": "tab切换，自定义位置、颜色、数据",
-    "version": "1.0.1",
-    "description": "tab切换，自定义位置、颜色、数据(小程序、app、h5)",
-    "keywords": [
-        "tab切换",
-        "自定义位置",
-        "颜色",
-        "数据"
-    ]
-}
+{
+	"name": "thingskit-app",
+	"version": "1.0.0",
+	"description": "### 项目结构",
+	"main": "main.js",
+	"scripts": {
+		"test": "echo \"Error: no test specified\" && exit 1"
+	},
+	"repository": {
+		"type": "git",
+		"url": "http://git.yuntengiot.com/huang/thingskit-app.git"
+	},
+	"keywords": [],
+	"author": "",
+	"license": "ISC",
+	"dependencies": {
+		"moment": "^2.29.2"
+	}
+}

@@ -23,9 +23,9 @@
 				<image @click="openOrg" style="width: 6px;height: 10px;float: right; margin-right: 34rpx; margin-top: 58rpx;" src="../../static/right-arrow.png" />
 				<image @click="openOrg" style="width: 6px;height: 10px;float: right; margin-right: 34rpx; margin-top: 58rpx;" src="../../static/right-arrow.png" />
 			</view>
 			</view>
 		</view>
 		</view>
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback" >
 			<view class="device-list">
 			<view class="device-list">
-				<view @click="openDeviceDetail(item.id)" class="list-item" v-for="item in list" :key="item.id">
+				<view @click="openDeviceDetail(item.id, item.alarmStatus, item.lastOnlineTime)" class="list-item" v-for="item in list" :key="item.id">
 					<view class="u-flex item" style="justify-content: flex-start;flex-direction: column;align-items: center;">
 					<view class="u-flex item" style="justify-content: flex-start;flex-direction: column;align-items: center;">
 						<view style="width: 450rpx;text-align: left;">
 						<view style="width: 450rpx;text-align: left;">
 							<text style="color:#333;font-size: 15px;">{{ item.name ? `设备名称:${item.name}` : '' }}</text>
 							<text style="color:#333;font-size: 15px;">{{ item.name ? `设备名称:${item.name}` : '' }}</text>
@@ -77,7 +77,7 @@ import fTabbar from '@/components/module/f-tabbar/f-tabbar';
 import fNavbar from '@/components/module/f-navbar/f-navbar';
 import fNavbar from '@/components/module/f-navbar/f-navbar';
 import FilterItem from './FilterItem.vue';
 import FilterItem from './FilterItem.vue';
 import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
 import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
-import {debounce} from '@/plugins/throttle.js'
+import { debounce } from '@/plugins/throttle.js';
 export default {
 export default {
 	mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
 	mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
 	components: {
 	components: {
@@ -153,7 +153,7 @@ export default {
 				}
 				}
 			],
 			],
 			total: 0,
 			total: 0,
-			list: [],
+			list: []
 		};
 		};
 	},
 	},
 	onLoad() {
 	onLoad() {
@@ -216,9 +216,9 @@ export default {
 		openSearchDialog() {
 		openSearchDialog() {
 			this.show = true;
 			this.show = true;
 		},
 		},
-		openDeviceDetail(id) {
+		openDeviceDetail(id, alarmStatus, lastOnlineTime) {
 			uni.navigateTo({
 			uni.navigateTo({
-				url: `deviceDetail?id=${id}`
+				url: `deviceDetail?id=${id}&alarmStatus=${alarmStatus}&lastOnlineTime=${lastOnlineTime}`
 			});
 			});
 		},
 		},
 		handleClickTag(currentIndex, list) {
 		handleClickTag(currentIndex, list) {
@@ -241,11 +241,11 @@ export default {
 			});
 			});
 			this.show = false;
 			this.show = false;
 		},
 		},
-		inputChanged:debounce(function(name){
-			this.loadData(1,{
+		inputChanged: debounce(function(name) {
+			this.loadData(1, {
 				name
 				name
-			})
-		},500)
+			});
+		}, 500)
 	}
 	}
 };
 };
 </script>
 </script>

@@ -3,11 +3,13 @@
 		<!-- 公共组件-每个页面必须引入 -->
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<public-module></public-module>
 		<u-sticky bgColor="#fff"><u-tabs :list="list" :current="currentTab" @click="handleTabClick"></u-tabs></u-sticky>
 		<u-sticky bgColor="#fff"><u-tabs :list="list" :current="currentTab" @click="handleTabClick"></u-tabs></u-sticky>
-		<view style="margin-top:30rpx;" v-show="currentTab == 0"><basicInfo /></view>
-		<view style="margin-top:30rpx;" v-show="currentTab == 1"><realTimeData /></view>
-		<view style="margin-top:30rpx;" v-show="currentTab == 2"><historyData /></view>
-		<view style="margin-top:30rpx;" v-show="currentTab == 3"><alertHistory /></view>
-		<view style="margin-top:30rpx;" v-show="currentTab == 4"><commondRecord /></view>
+		<view style="margin-top:30rpx;">
+			<basicInfo v-show="currentTab == 0" :deviceDetail="deviceDetail" />
+			<realTimeData v-show="currentTab === 1" />
+			<historyData v-show="currentTab == 2" />
+			<alarmHistory v-show="currentTab == 3" />
+			<commondRecord v-show="currentTab == 4" />
+		</view>
 		<f-tabbar></f-tabbar>
 		<f-tabbar></f-tabbar>
 	</view>
 	</view>
 </template>
 </template>
@@ -17,7 +19,7 @@ import fTabbar from '@/components/module/f-tabbar/f-tabbar';
 import Tab from '@/components/yyh-tab/Tab.vue';
 import Tab from '@/components/yyh-tab/Tab.vue';
 import basicInfo from './tabDetail/basicInfo.vue';
 import basicInfo from './tabDetail/basicInfo.vue';
 import realTimeData from './tabDetail/realtimeData.vue';
 import realTimeData from './tabDetail/realtimeData.vue';
-import alertHistory from './tabDetail/alertHistory.vue';
+import alarmHistory from './tabDetail/alarmHistory.vue';
 import historyData from './tabDetail/historyData.vue';
 import historyData from './tabDetail/historyData.vue';
 import commondRecord from './tabDetail/commondRecord.vue';
 import commondRecord from './tabDetail/commondRecord.vue';
 
 
@@ -27,28 +29,63 @@ export default {
 		Tab,
 		Tab,
 		basicInfo,
 		basicInfo,
 		realTimeData,
 		realTimeData,
-		alertHistory,
+		alarmHistory,
 		historyData,
 		historyData,
 		commondRecord
 		commondRecord
 	},
 	},
 	data() {
 	data() {
 		return {
 		return {
 			list: [{ name: '基础信息' }, { name: '实时数据' }, { name: '历史数据' }, { name: '告警记录' }, { name: '命令记录' }],
 			list: [{ name: '基础信息' }, { name: '实时数据' }, { name: '历史数据' }, { name: '告警记录' }, { name: '命令记录' }],
-			currentTab:0,
+			currentTab: 2,
 			id: '',
 			id: '',
+			deviceDetail: {}
 		};
 		};
 	},
 	},
-	onLoad(options) {
-		const { id } = options;
-		this.id = id;
-		console.log(this.id);
-		// 隐藏原生的tabbar
+	async onLoad(options) {
+		const { id, alarmStatus, lastOnlineTime } = options;
+		const res = await uni.$u.http.get(`/yt/device/${id}`);
+		this.deviceDetail = { ...res, alarmStatus, lastOnlineTime };
+
+		var socketTask = uni.connectSocket({
+			url: 'wss://dev.thingskit.com:8080/api/ws/plugins/telemetry?token=' + uni.getStorageSync('userInfo').isToken, //仅为示例，并非真实接口地址。
+			complete: ()=> {}
+		});
+		uni.onSocketOpen((header)=>{
+			console.log('连接成功',header)
+		})
+		// socketTask.onMessage(function(data) {
+		// 	console.log('收到消息了', data);
+		// });
+		socketTask.send({ 
+			data: JSON.stringify({
+				attrSubCmds: [],
+				tsSubCmds: [
+					{
+						entityType: 'DEVICE',
+						entityId: id,
+						scope: 'LATEST_TELEMETRY',
+						cmdId: 1
+					}
+				],
+				historyCmds: [],
+				entityDataCmds: [],
+				entityDataUnsubscribeCmds: [],
+				alarmDataCmds: [],
+				alarmDataUnsubscribeCmds: [],
+				entityCountCmds: [],
+				entityCountUnsubscribeCmds: []
+			}),
+			success() {
+				console.log('发送成功了');
+			}
+		});
+		// 隐藏原生的tabbar'
 		uni.hideTabBar();
 		uni.hideTabBar();
 	},
 	},
 	methods: {
 	methods: {
-		handleTabClick({index}){
+		handleTabClick({ index }) {
 			this.currentTab = index;
 			this.currentTab = index;
 		}
 		}
 	}
 	}
 };
 };
-</script>
+</script>

-<template>
-	<view class="basic-page">
-		<!-- 公共组件-每个页面必须引入 -->
-		<public-module />
+<template>
+	<view class="basic-page">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module />
 		<view class="u-flex" style="justify-content: space-between;height: 140rpx;background-color: #fff;border-radius: 18px;">
 		<view class="u-flex" style="justify-content: space-between;height: 140rpx;background-color: #fff;border-radius: 18px;">
 			<view class="u-flex">
 			<view class="u-flex">
 				<view style="margin-left: 20rpx;">
 				<view style="margin-left: 20rpx;">
-						网关设备1
+						{{deviceDetail.name}}
 				</view>
 				</view>
-				<view style="margin-left: 20rpx; font-size: 14px;color:#377DFF;">
-					在线
+				<view style="margin-left: 20rpx; font-size: 14px;" :style="{color:deviceDetail.deviceState==='INACTIVE'?'#666':deviceDetail.deviceState==='ONLINE'?'#377DFF':'#DE4437'}">
+					{{deviceDetail.deviceState==='INACTIVE'?'未激活':deviceDetail.deviceState==='ONLINE'?'在线':'离线'}}
 				</view>
 				</view>
 			</view>
 			</view>
 			<view style="margin-right: 20rpx;">
 			<view style="margin-right: 20rpx;">
 				<u-button type="primary" shape="circle" size="mini" text="下发命令" @click="showModal"/>
 				<u-button type="primary" shape="circle" size="mini" text="下发命令" @click="showModal"/>
-			</view>
-		</view>
-		<view style="margin-top: 40rpx;height: 577rpx;background-color: #fff;border-radius: 20px;">
-			<u-list>
-				<u-list-item v-for="(item, index) in indexList" :key="index">
-					<u-cell  :title="item.name1">
-						<view slot="icon">{{item.name1}}</view>
+			</view>
+		</view>
+		<view style="margin-top: 40rpx;height: 577rpx;background-color: #fff;border-radius: 20px;">
+			<u-list>
+				<u-list-item>
+				
+					<u-cell  :title="deviceDetail.sn">
+						<view slot="icon">设备编号</view>
+					</u-cell>
+				</u-list-item>
+				<u-list-item>
+					<u-cell  :title="deviceType">
+						<view slot="icon">设备类型</view>
+					</u-cell>
+				</u-list-item>
+				<u-list-item>
+					<u-cell  :title="deviceDetail.organizationDTO.name">
+						<view slot="icon">所属组织</view>
+					</u-cell>
+				</u-list-item>
+				<u-list-item>
+					<u-cell  :title="formatLastOnlineTime">
+						<view slot="icon">最后连接时间</view>
+					</u-cell>
+				</u-list-item>
+				<u-list-item>
+					<u-cell  :title="alarmStatus">
+						<view slot="icon">是否告警</view>
 					</u-cell>
 					</u-cell>
-				</u-list-item>
-			</u-list>
-		</view>
-		<!-- 下发指令 -->
-		<u-modal  :show="showModel" title="命令下发" closeOnClickOverlay showCancelButton @close="hiddenModal" @cancel="hiddenModal" @confirm="handleConfirm" >
-			<u--textarea placeholder="请输入命令内容" v-model="formModel.intro" count />
-		</u-modal>
-		<f-tabbar />
-	</view>
-</template>
-
-<script>
-
-export default {
-	data() {
-		return {
-			formModel: {
-				intro: ''
-			},
-			showModel: false,
-			indexList: [
-				{
-					id: 1,
-					name1: '设备编号',
-					value1: 'SN98652320AOL5'
-				},
-				{
-					name1: '设备类型',
-					value1: '网关子设备'
-				},
-				{
-					name1: '所属组织',
-					value1: '1-59-25栏位'
-				},
-				{
-					name1: '最后连接时间',
-					value1: '2022-01-25 12:53:22'
-				},
-				{
-					name1: '是否告警',
-					value1: '否'
-				},
-				{
-					name1: '设备描述',
-					value1: '设备无任何问题，运行稳定'
-				}
-			]
-		};
-	},
-	onLoad(e) {
-		// 隐藏原生的tabbar
-		uni.hideTabBar();
-	},
-	methods: {
-		showModal() {
-			this.showModel = true;
+				</u-list-ite>
+					<u-cell  :title="deviceDetail.description">
+						<view slot="icon">设备描述</view>
+					</u-cell>
+				</u-list-item>
+			</u-list>
+		</view>
+		<!-- 下发指令 -->
+		<u-modal  :show="showModel" title="命令下发" closeOnClickOverlay showCancelButton @close="hiddenModal" @cancel="hiddenModal" @confirm="handleConfirm" >
+			<u--textarea placeholder="请输入命令内容" v-model="formModel.intro" count />
+		</u-modal>
+		<f-tabbar />
+	</view>
+</template>
+
+<script>
+import {formatToDate} from '@/plugins/utils.js';
+export default {
+	props:{
+		deviceDetail:{
+			type:Object,
+			default:()=>({}),
+		}
+	},
+	data() {
+		return {
+			showModel: false,
+		};
+	},
+	computed:{
+		deviceType(){
+			return this.deviceDetail.deviceType==='DIRECT_CONNECTION'?'直连设备':this.deviceDetail.deviceType==='GATEWAY'?'网关设备':this.deviceDetail.deviceType==='SENSOR'?'网关子设备':''
+		},
+		alarmStatus(){
+			return this.deviceDetail.alarmStatus === '0'?'否':'是'
+		},
+		formatLastOnlineTime(){
+			return formatToDate(Number(this.deviceDetail.lastOnlineTime),'YYYY-MM-DD HH:mm:ss')
+		}
+	},
+	onLoad(e) {
+		// 隐藏原生的tabbar
+		uni.hideTabBar();
+	},
+	onMounted(){
+		console.log(this.deviceDetail)
+		
+	},
+	methods: {
+		showModal() {
+			this.showModel = true;
 		},
 		},
 		hiddenModal(){
 		hiddenModal(){
 			this.showModel = false;
 			this.showModel = false;
-		},
+		},
 		handleConfirm(){
 		handleConfirm(){
 			console.log('确定')
 			console.log('确定')
-		}
-	}
-};
-</script>
+		}
+	}
+};
+</script>

-import Vue from 'vue';
+import Vue from 'vue';
+import moment from 'moment';
 // #ifdef APP-PLUS
 // #ifdef APP-PLUS
 import {judgePermission} from './permission'
 import {judgePermission} from './permission'
 // #endif
 // #endif
+const DATE_TIME_FORMAT = 'YYYY-MM-DD HH:mm:ss';
 //金额过滤
 //金额过滤
 Vue.filter('money', function(val) {
 Vue.filter('money', function(val) {
 	if (val) {
 	if (val) {
@@ -230,4 +232,8 @@ export const getAppLatLon = function(successCallback, errCallback, isOpenSetting
 		}
 		}
 	});
 	});
 	// #endif
 	// #endif
+}
+
+export function formatToDate(date = undefined, format = DATE_TIME_FORMAT) {
+  return moment(date).format(format);
 }
 }

@@ -90,7 +90,8 @@ export default {
 
 
 .mescroll-empty .empty-icon {
 .mescroll-empty .empty-icon {
 	width: 280rpx;
 	width: 280rpx;
-	height: 280rpx;
+	height: 280rpx;
+	margin: 0 auto;
 }
 }
 
 
 .mescroll-empty .empty-tip {
 .mescroll-empty .empty-tip {