Merge branch 'fix/DEFECT-1835' into 'main_dev'

fix: 修复小程序告警记录中，设备全部为暂无数据，暂无数据，告警条件和值都为空

See merge request yunteng/thingskit-app!124

@@ -94,6 +94,7 @@
 			if (e.data !== null) {
 			if (e.data !== null) {
 				let params = JSON.parse(decodeURIComponent(e.data));
 				let params = JSON.parse(decodeURIComponent(e.data));
 				const {deviceName,severity,organizationName,details,type,createdTime,status,id} = params
 				const {deviceName,severity,organizationName,details,type,createdTime,status,id} = params
+				
 				this.detailId = id
 				this.detailId = id
 				this.alarmDetail = [{label: '告警场景：',value: type},{label: '告警级别：',value: severity},{label: '所属组织：',value: organizationName},{label: '告警设备：',value: ''},{label: '告警条件：',value: ''},{label: '告警值：',value: ''},{label: '告警时间：',value: createdTime},{label: '告警状态：',value: status},]
 				this.alarmDetail = [{label: '告警场景：',value: type},{label: '告警级别：',value: severity},{label: '所属组织：',value: organizationName},{label: '告警设备：',value: ''},{label: '告警条件：',value: ''},{label: '告警值：',value: ''},{label: '告警时间：',value: createdTime},{label: '告警状态：',value: status},]
 				this.formatAlarmDevice(details)
 				this.formatAlarmDevice(details)
@@ -147,11 +148,13 @@
 				const keys = Object.keys(e)
 				const keys = Object.keys(e)
 				const dataFormat = await this.handleAlarmDetailFormat(keys);
 				const dataFormat = await this.handleAlarmDetailFormat(keys);
 				const values = keys.reduce((acc, curr) => {
 				const values = keys.reduce((acc, curr) => {
+					const items = e[curr]?.triggerData
 					dataFormat.forEach((dataItem => {
 					dataFormat.forEach((dataItem => {
 						if (dataItem.tbDeviceId === curr) {
 						if (dataItem.tbDeviceId === curr) {
-							const findAttribute = dataItem.attribute.find(findItem => findItem.identifier === e[curr].key)
+							const findAttribute = dataItem.attribute.find(findItem => findItem.identifier === items?.key)
+							if(!items?.realValue && !findAttribute.name) return
 							acc.push(
 							acc.push(
-								`${findAttribute.name}:${e[curr].realValue}${!findAttribute.detail?.dataType?.specs?.unit?.key?'':findAttribute.detail?.dataType?.specs?.unit?.key}`
+								`${findAttribute.name}:${items.realValue}${!findAttribute.detail?.dataType?.specs?.unit?.key?'':findAttribute.detail?.dataType?.specs?.unit?.key}`
 							)
 							)
 						}
 						}
 					}))
 					}))
@@ -164,8 +167,8 @@
 				const keys = Object.keys(e)
 				const keys = Object.keys(e)
 				const values = keys.reduce((acc, curr) => {
 				const values = keys.reduce((acc, curr) => {
 					acc.push({
 					acc.push({
-						login: e[curr].logic,
-						logicValue: e[curr].logicValue
+						login: e[curr]?.triggerData?.logic,
+						logicValue: e[curr]?.triggerData?.logicValue
 					})
 					})
 					return acc
 					return acc
 				}, [])
 				}, [])
@@ -221,4 +224,4 @@
 		background-color: #377dff !important;
 		background-color: #377dff !important;
 		border-color: #377dff !important;
 		border-color: #377dff !important;
 	}
 	}
-</style>
+</style>

@@ -216,4 +216,4 @@
 	/deep/ button {
 	/deep/ button {
 		background: rgba(0, 0, 0, 0);
 		background: rgba(0, 0, 0, 0);
 	}
 	}
-</style>
+</style>

@@ -3,7 +3,7 @@
 		<view @click="$emit('openAlertDetail',item)" class="list-item" v-for="(item, index) in list" :key="index">
 		<view @click="$emit('openAlertDetail',item)" class="list-item" v-for="(item, index) in list" :key="index">
 			<view class="u-flex item">
 			<view class="u-flex item">
 				<view class="item-text text-clip">
 				<view class="item-text text-clip">
-					<text class="text-bold">{{ item.deviceName == null ? '暂无数据' : item.deviceName }}</text>
+					<text class="text-bold">{{ item.deviceAlias || item.deviceName || '暂无数据' }}</text>
 				</view>
 				</view>
 				<view class="item-text text-clip">
 				<view class="item-text text-clip">
 					<text class="text-muted">{{ item.details == null ? '暂无数据' : formatDetailText(item.details) }}</text>
 					<text class="text-muted">{{ item.details == null ? '暂无数据' : formatDetailText(item.details) }}</text>
@@ -36,6 +36,7 @@
 		alarmSeverity,
 		alarmSeverity,
 		alarmStatus
 		alarmStatus
 	} from '../config/data.js';
 	} from '../config/data.js';
+	import {findLogin} from './config'
 
 
 	export default {
 	export default {
 		props: {
 		props: {
@@ -67,11 +68,14 @@
 			bindImageUrl(e) {
 			bindImageUrl(e) {
 				return this.alarmSeverity.find(item => item.value === e).icon
 				return this.alarmSeverity.find(item => item.value === e).icon
 			},
 			},
-			formatDetailText(e) {
-				const keys = Object.keys(e)
-				if(!keys) return
-				const values = keys.reduce((acc, curr) => {
-					acc.push(`${!e[curr].key?'暂无数据':e[curr].key}:${!e[curr].realValue?'暂无数据':e[curr].realValue}`)
+		 formatDetailText(details) {
+				const deviceIdKeys = Object.keys(details)
+				if(!deviceIdKeys) return
+				const values = deviceIdKeys.reduce((acc, curr) => {
+					const items = details[curr]?.triggerData
+					if(items?.key && items?.logicValue && items.realValue){
+						acc.push(`触发属性:${items.key ||'暂无数据'} 触发条件:${findLogin(items)+items.logicValue || '暂无数据'} 触发值:${items?.realValue || '暂无数据'} `)
+					}
 					return acc
 					return acc
 				}, [])
 				}, [])
 				return values.join(',')
 				return values.join(',')
@@ -103,10 +107,10 @@
 				align-items: center;
 				align-items: center;
 				height: 211rpx;
 				height: 211rpx;
 				margin-top: 8rpx;
 				margin-top: 8rpx;
-				margin-left: 37rpx;
+				margin-left: 20rpx;
 
 
 				.item-text {
 				.item-text {
-					width: 400rpx;
+					width: 500rpx;
 					text-align: left;
 					text-align: left;
 					margin-top: 13rpx;
 					margin-top: 13rpx;
 					line-height: 40rpx;
 					line-height: 40rpx;
@@ -149,4 +153,4 @@
 			}
 			}
 		}
 		}
 	}
 	}
-</style>
+</style>

+
+export const StringOperationEnum = {
+  EQUAL : 'EQUAL',
+  NOT_EQUAL : 'NOT_EQUAL',
+  STARTS_WITH : 'STARTS_WITH',
+  ENDS_WITH : 'ENDS_WITH',
+  CONTAINS : 'CONTAINS',
+  NOT_CONTAINS : 'NOT_CONTAINS',
+}
+export const BooleanOperationEnum = {
+  EQUAL : 'EQUAL',
+  NOT_EQUAL : 'NOT_EQUAL',
+}
+
+export const operationNumber_OR_TIME = [
+  { label: '等于', value: 'EQUAL', symbol: '=' },
+  { label: '不等于', value: 'NOT_EQUAL', symbol: '!=' },
+  { label: '小于', value: 'LESS', symbol: '<' },
+  { label: '小于等于', value: 'LESS_OR_EQUAL', symbol: '<=' },
+  { label: '大于', value: 'GREATER', symbol: '>' },
+  { label: '大于等于', value: 'GREATER_OR_EQUAL', symbol: '>=' },
+];
+export const operationString = [
+  { label: '等于', value: StringOperationEnum.EQUAL, symbol: '=' },
+  { label: '不等于', value: StringOperationEnum.NOT_EQUAL, symbol: '!=' },
+  { label: '开始于', value: StringOperationEnum.STARTS_WITH, symbol: '开始于' },
+  { label: '结束于', value: StringOperationEnum.ENDS_WITH, symbol: '结束于' },
+  { label: '包含', value: StringOperationEnum.CONTAINS, symbol: '包含' },
+  { label: '不包含', value: StringOperationEnum.NOT_CONTAINS, symbol: '不包含' },
+];
+export const operationBoolean = [
+  { label: '等于', value: BooleanOperationEnum.EQUAL, symbol: '=' },
+  { label: '不等于', value: BooleanOperationEnum.NOT_EQUAL, symbol: '!=' },
+];
+
+export const findLogin = (curr) =>{
+  return [...operationNumber_OR_TIME, ...operationString, ...operationBoolean].find(
+    (item) => item.value === curr?.logic
+  )?.symbol;
+}

@@ -42,7 +42,7 @@
 		},
 		},
 		data() {
 		data() {
 			return {
 			return {
-				imageSrc:'/static/org.png',
+				imageSrc:'/static/camer.png',
 				page: {
 				page: {
 					num: 0,
 					num: 0,
 					size: 10
 					size: 10
@@ -157,4 +157,4 @@
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 	@import '../../static/camera.scss';
 	@import '../../static/camera.scss';
-</style>
+</style>

 <template>
 <template>
-	<view>
+	<view class="configuation-detail-page">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
 		<web-view :src="visualBoardUrl"></web-view>
 		<web-view :src="visualBoardUrl"></web-view>
 	</view>
 	</view>
-
 </template>
 </template>
 
 
 <script>
 <script>
@@ -26,12 +27,12 @@
 			async createShareUrl(record){
 			async createShareUrl(record){
 				const userInfo = uni.getStorageSync('userInfo')
 				const userInfo = uni.getStorageSync('userInfo')
 				const { id } = record;
 				const { id } = record;
-				// http://192.168.10.131:8083
 				return `${config.baseVisualUrl}${this.getUrl(id,userInfo.userId)}`;
 				return `${config.baseVisualUrl}${this.getUrl(id,userInfo.userId)}`;
 			}
 			}
 		}
 		}
 	}
 	}
 </script>
 </script>
 
 
-<style>
+<style lang="scss" scoped>
+	@import '../../static/configuration.scss';
 </style>
 </style>