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

fix: 修改小程序告警和首页看板组态添加组织关系

See merge request yunteng/thingskit-app!127

@@ -10,8 +10,8 @@
 						<text class="text-device-muted text-clip  alarm-text"
 							:style="{color:hasColor.includes(item.label)?'#DE4437':''}">
 							{{item.label===hasColor[0]? setAlarmStatus(item.value):item.label===hasColor[1]?setAlarmSeverity(item.value):
-							item.label==='告警值：'?formatAlarmValueText:item.label==='告警条件：'?formatAlarmConditionText
-							:item.label==='告警设备：'?formatDeviceText:item.value}}
+							item.label==='触发值：'?formatAlarmValueText:item.label==='触发条件：'?formatAlarmConditionText
+							:item.label==='触发属性：'?formatAttrText:item.label==='告警设备：'?formatDeviceText:item.value}}
 						</text>
 					</view>
 					<view class="bottom-line"></view>
@@ -42,10 +42,10 @@
 		</view>
 		<!-- #endif -->
 		<view class="bottom-button">
-			<view v-if="handleText.includes(alarmDetail[7].value)" class="u-flex button-item">
+			<view v-if="handleText.includes(alarmDetail[8].value)" class="u-flex button-item">
 				<u-button @click="handleSubmit" type="primary" shape="circle" text="处理"></u-button>
 			</view>
-			<view v-if="clearText.includes(alarmDetail[7].value)" class="u-flex button-item">
+			<view v-if="clearText.includes(alarmDetail[8].value)" class="u-flex button-item">
 				<u-button @click="handleRemove" type="error" shape="circle" text="清除"></u-button>
 			</view>
 		</view>
@@ -88,18 +88,23 @@
 				formatDeviceText: '',
 				formatAlarmValueText: '',
 				formatAlarmConditionText: '',
+				formatAttrText:'',
 			};
 		},
-		onLoad(e) {
+		async onLoad(e) {
 			if (e.data !== null) {
 				let params = JSON.parse(decodeURIComponent(e.data));
 				const {deviceName,severity,organizationName,details,type,createdTime,status,id} = params
 				
 				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.formatAlarmDevice(details)
-				this.formatAlarmValue(details)
-				this.formatAlarmCondition(details)
+				this.alarmDetail = [{label: '告警场景：',value: type},{label: '告警级别：',value: severity},{label: '所属组织：',value: organizationName},{label: '告警设备：',value: ''},{label:'触发属性：',value:''},{label: '触发条件：',value: ''},{label: '触发值：',value: ''},{label: '告警时间：',value: createdTime},{label: '告警状态：',value: status},]
+				
+				const keys = Object.keys(details)
+				const dataFormat = await this.handleAlarmDetailFormat(keys);
+				this.formatAlarmDevice(details,dataFormat)
+				this.formatAlarmValue(details,dataFormat)
+				this.formatAlarmCondition(details,dataFormat)
+				this.formatAttr(details,dataFormat)
 			}
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
@@ -143,18 +148,16 @@
 					}, 500);
 				}
 			},
-			//告警值处理
-			async formatAlarmValue(e) {
+			//触发值处理
+			 formatAlarmValue(e,dataFormat) {
 				const keys = Object.keys(e)
-				const dataFormat = await this.handleAlarmDetailFormat(keys);
 				const values = keys.reduce((acc, curr) => {
 					const items = e[curr]?.triggerData
 					dataFormat.forEach((dataItem => {
 						if (dataItem.tbDeviceId === curr) {
-							const findAttribute = dataItem.attribute.find(findItem => findItem.identifier === items?.key)
-							if(!items?.realValue && !findAttribute.name) return
+							if(!items?.realValue) return
 							acc.push(
-								`${findAttribute.name}:${items.realValue}${!findAttribute.detail?.dataType?.specs?.unit?.key?'':findAttribute.detail?.dataType?.specs?.unit?.key}`
+								`${items.realValue}`
 							)
 						}
 					}))
@@ -162,7 +165,7 @@
 				}, [])
 				this.formatAlarmValueText = values.join(',')
 			},
-			//告警条件处理
+			//触发条件处理
 			formatAlarmCondition(e) {
 				const keys = Object.keys(e)
 				const values = keys.reduce((acc, curr) => {
@@ -179,10 +182,24 @@
 				})
 				this.formatAlarmConditionText = format.filter(Boolean).join(',')
 			},
-			//告警设备处理
-			async formatAlarmDevice(e) {
+			// 触发属性
+			formatAttr(e,dataFormat){
 				const keys = Object.keys(e)
-				const dataFormat = await this.handleAlarmDetailFormat(keys);
+				const values = keys.reduce((acc, curr) => {
+					const items = e[curr]?.triggerData
+					dataFormat.forEach((dataItem => {
+						if (dataItem.tbDeviceId === curr) {
+							const findAttribute = dataItem.attribute.find(findItem => findItem.identifier === items?.key)
+							if(!findAttribute?.name && !items?.key) return
+							acc.push(`${findAttribute?.name || items?.key || ' '}`)
+						}
+					}))
+					return acc
+				}, [])
+				this.formatAttrText = values.join(',')
+			},
+			//告警设备处理
+			async formatAlarmDevice(e,dataFormat) {
 				if (!dataFormat) this.formatDeviceText = ''
 				if (Array.isArray(dataFormat) && dataFormat.length === 0) this.formatDeviceText = ''
 				this.formatDeviceText = dataFormat.map(item => item.name).join(',')

@@ -6,7 +6,7 @@
 .alarm-detail-column {
 	border-radius: 10px;
 	width: 688rpx;
-	height: 688rpx;
+	height: 780rpx;
 	background-color: #ffffff;
 	.detail-column {
 		width:750rpx;
@@ -84,4 +84,4 @@
 	.button-item{
 		width: 260rpx;
 	}
-}
\ No newline at end of file
+}

 <template>
-	<view class="header-org">
-		<view @click="$emit('openOrg')" class="org-item">
+	<view class="header-org"  @click="$emit('openOrg')">
+		<view class="org-item">
 			<view class="u-flex org-contact"><text class="text">组织关系</text></view>
 			<view class="u-flex org-device">
 				<image class="device-image" :src="imageSrc"></image>
-				<text class="device-text">摄像头数：{{ total }}</text>
+				<text class="device-text">{{title}}  {{ total }}</text>
 			</view>
 		</view>
 		<view class="org-item">
@@ -17,7 +17,8 @@
 	export default {
 		props: {
 			total: Number,
-			imageSrc: String
+			imageSrc: String,
+			title:String
 		}
 	}
 </script>
@@ -32,8 +33,8 @@
 		flex-direction: row;
 		justify-content: space-between;
 		position: fixed;
-		z-index: 999999;
-		top: -1rpx;
+		// z-index: 999999;
+		// top: 75rpx;
 
 		.org-item {
 			width: 350rpx;
@@ -78,4 +79,4 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>

@@ -62,6 +62,7 @@
 				},
 				conditions: {},
 				ordId: '',
+				paramsStaus:null
 			};
 		},
 		onShow() {
@@ -75,7 +76,11 @@
 				this.conditions = {
 					organizationId: this.ordId
 				}
+				return
 			}
+			this.loadData(1, {
+					status:this.paramsStaus
+			});
 		},
 		onHide() {
 			this.ordId = ''
@@ -85,18 +90,16 @@
 				this.loadData(1);
 			} else {
 				let params = JSON.parse(e.type);
-				let status = null
+				 this.parmasStatus = null
 				if (Array.isArray(params)) {
-					status = params.join(',');
+					this.paramsStaus = params.join(',');
 				} else {
-					status = params;
+					this.paramsStaus = params;
 				}
 				this.conditions = {
-					status
+					status:this.paramsStaus
 				}
-				this.loadData(1, {
-					status
-				});
+				
 			}
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
@@ -229,4 +232,4 @@
 		height: 100%;
 		width: 100%;
 	}
-</style>
\ No newline at end of file
+</style>

@@ -6,7 +6,13 @@
 					<text class="text-bold">{{ item.deviceAlias || item.deviceName || '暂无数据' }}</text>
 				</view>
 				<view class="item-text text-clip">
-					<text class="text-muted">{{ item.details == null ? '暂无数据' : formatDetailText(item.details) }}</text>
+					<text class="text-muted">{{ item.details == null ? '暂无数据' : getAttrText(item.details) }}</text>
+				</view>
+				<view class="item-text text-clip">
+					<text class="text-muted">{{ item.details == null ? '暂无数据' : getConditionText(item.details) }}</text>
+				</view>
+				<view class="item-text text-clip">
+					<text class="text-muted">{{ item.details == null ? '暂无数据' : getValuesText(item.details) }}</text>
 				</view>
 				<view class="item-text">
 					<text class="text-muted">
@@ -68,13 +74,29 @@
 			bindImageUrl(e) {
 				return this.alarmSeverity.find(item => item.value === e).icon
 			},
-		 formatDetailText(details) {
+
+			getAttrText(details){
+				return this.formatDetailText(details,0)
+			},
+			getConditionText(detail){
+				return this.formatDetailText(detail,1)
+			},
+			getValuesText(detail){
+				return this.formatDetailText(detail,2)
+			},
+		 formatDetailText(details,type) {
 				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 || '暂无数据'} `)
+						if(type==0){
+							acc.push(`触发属性:${items.key ||'暂无数据'}`)
+						}else if (type ==1){
+							acc.push(`触发条件:${findLogin(items)+items.logicValue || '暂无数据'}`)
+						}else if(type==2){
+							acc.push(`触发值:${items?.realValue || '暂无数据'}`)
+						}
 					}
 					return acc
 				}, [])
@@ -93,7 +115,7 @@
 
 		.list-item {
 			width: 713rpx;
-			height: 233rpx;
+			height: 340rpx;
 			background-color: #fff;
 			margin-top: 24rpx;
 			display: flex;
@@ -105,7 +127,7 @@
 				justify-content: flex-start;
 				flex-direction: column;
 				align-items: center;
-				height: 211rpx;
+				height: 311rpx;
 				margin-top: 8rpx;
 				margin-left: 20rpx;
 

@@ -2,7 +2,7 @@
 	<view class="camera-page">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<header-org @openOrg="openOrg" :total="cameraTotal" :imageSrc="imageSrc"></header-org>
+		<header-org @openOrg="openOrg" :total="cameraTotal" title="摄像头数：" :imageSrc="imageSrc"></header-org>
 		<view style="height: 150rpx;"></view>
 		<!-- 自带分页组件 -->
 		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback"

@@ -8,14 +8,15 @@
 						shape="circle"></u--input>
 				</view>
 			</view>
+			<header-org @openOrg="openOrg" :total="total" title="组态数：" :imageSrc="imageSrc"></header-org>
 		</view>
-		<view style="height:35rpx"></view>
+		<view style="height:128rpx"></view>
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<!-- 自带分页组件 -->
 		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback"
 			@up="upCallback">
-			<view class="configuation-container">
+			<view class="configuation-container" v-if="list.length">
 				<view class="configuation-item">
 					<view @click="openConfigDetail(item)" v-for="(item, index) in list" :key="index" class="item">
 						<image class="image" :src="item.icon || defaultConfigImage"></image>
@@ -23,7 +24,7 @@
 					</view>
 				</view>
 			</view>
-			<mescroll-empty v-if="!list.length" />
+			<!-- <mescroll-empty v-if="!list.length" /> -->
 		</mescroll-body>
 		<!-- 自带分页组件 -->
 		<view style="height: 60rpx;"></view>
@@ -36,12 +37,20 @@
 	import {
 		createScadaPageLink
 	} from '../config/help.js';
+	import headerOrg from '@/components/common/header-org.vue'
+	import {
+		useNavigateTo
+	} from '@/plugins/utils.js'
 
 	export default {
 		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
+		components:{
+			headerOrg
+		},
 		data() {
 			return {
 				defaultConfigImage: '../../../../static/test.png',
+				imageSrc:'/static/status.png',
 				page: {
 					num: 0,
 					size: 10
@@ -52,7 +61,9 @@
 				upOption: {
 					auto: false // 不自动加载
 				},
-				list: []
+				list: [],
+				total:0,
+				ordId:''
 			};
 		},
 		onLoad() {
@@ -62,6 +73,14 @@
 				isConfiguration: false
 			});
 		},
+		onShow() {
+			if (this.ordId) {
+				this.loadData(1,null, this.ordId);
+			}
+		},
+		onHide() {
+			this.ordId = '';
+		},
 		onUnload() {
 			uni.setStorageSync('getConfiguration', {
 				isConfiguration: false
@@ -91,11 +110,12 @@
 				this.page.num += 1;
 				this.loadData(this.page.num);
 			},
-			async loadData(pageNo, organizationV) {
+			async loadData(pageNo, name,organizationId) {
 				let httpData = {
 					page: pageNo,
 					pageSize: 10,
-					name: organizationV,
+					name,
+					organizationId,
 					platform: 'phone',
 					isTemplate:0
 				};
@@ -108,13 +128,16 @@
 				if (res) {
 					uni.stopPullDownRefresh();
 					this.mescroll.endByPage(res.items.length, res.total);
-					this.cameraTotal = res.total;
+					this.total = res.total;
 					if (pageNo == 1) {
 						this.list = res.items;
 					} else {
 						this.list = this.list.concat(res.items);
 					}
 				}
+			},
+			openOrg() {
+				useNavigateTo('/pages/organization/organization')
 			}
 		}
 	};
@@ -122,4 +145,4 @@
 
 <style lang="scss" scoped>
 	@import '../../static/configuration.scss';
-</style>
\ No newline at end of file
+</style>

@@ -8,8 +8,9 @@
 						shape="circle"></u--input>
 				</view>
 			</view>
+			<header-org @openOrg="openOrg" :total="total" title="看板数：" :imageSrc="imageSrc"></header-org>
 		</view>
-		<view style="height:35rpx"></view>
+		<view style="height:128rpx"></view>
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<!-- 自带分页组件 -->
@@ -33,15 +34,20 @@
 <script>
 	import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
 	import api from '@/api/index.js'
+	import headerOrg from '@/components/common/header-org.vue'
 	import {
-		createScadaPageLink
-	} from '../config/help.js';
+		useNavigateTo
+	} from '@/plugins/utils.js'
 
 	export default {
 		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
+		components:{
+			headerOrg
+		},
 		data() {
 			return {
 				defaultConfigImage: '../../../../static/test.png',
+				imageSrc:'/static/visual-board.png',
 				page: {
 					num: 0,
 					size: 10
@@ -52,7 +58,9 @@
 				upOption: {
 					auto: false // 不自动加载
 				},
-				list: []
+				list: [],
+				total:0,
+				ordId:''
 			};
 		},
 		onLoad() {
@@ -62,6 +70,14 @@
 				isConfiguration: false
 			});
 		},
+		onShow() {
+			if (this.ordId) {
+				this.loadData(1,null, this.ordId);
+			}
+		},
+		onHide() {
+			this.ordId = '';
+		},
 		onUnload() {
 			uni.setStorageSync('getConfiguration', {
 				isConfiguration: false
@@ -74,7 +90,6 @@
 				this.loadData(1, e);
 			},
 			openConfigDetail(e) {
-				console.log(e,'e')
 				uni.navigateTo({
 					url: 'detail?id=' + e.id
 				});
@@ -91,11 +106,12 @@
 				this.page.num += 1;
 				this.loadData(this.page.num);
 			},
-			async loadData(pageNo, name) {
+			async loadData(pageNo, name,organizationId) {
 				let httpData = {
 					page: pageNo,
 					pageSize: 10,
 					name,
+					organizationId,
 					platform: 'phone'
 				};
 				const res = await api.homeApi.getVisualBoardApi({
@@ -107,13 +123,16 @@
 				if (res) {
 					uni.stopPullDownRefresh();
 					this.mescroll.endByPage(res.items.length, res.total);
-					this.cameraTotal = res.total;
+					this.total = res.total;
 					if (pageNo == 1) {
 						this.list = res.items;
 					} else {
 						this.list = this.list.concat(res.items);
 					}
 				}
+			},
+			openOrg() {
+				useNavigateTo('/pages/organization/organization')
 			}
 		}
 	};

 .configuation-page {
 	background: #f8f9fa;
-	padding: 15rpx 15rpx;
 	min-height: 100vh;
 	.configuation-header{
-		margin-left:15rpx;
-		background-color: #f8f9fa;
+		background-color: #fff;
 		position:fixed;
 		top:0rpx;
 		z-index: 99999;
@@ -16,19 +14,22 @@
 			justify-content: space-between;
 			flex-direction: row;
 			.search-main {
-				width: 700rpx;
+				background: #fff;
+				width: 750rpx;
+				padding:0 25rpx;
 				margin-top: -34rpx;
 			}
 		}
 	}
 	
 	.configuation-container {
+		padding: 15rpx 15rpx;
 		.configuation-item {
 			width: 750rpx;
 			display: flex;
 			justify-content: space-between;
 			flex-wrap: wrap;
-			margin: 58rpx 0rpx 0rpx 6rpx;
+			margin: 128rpx 0rpx 0rpx 6rpx;
 			.item {
 				width: 330rpx;
 				height: 288rpx;
@@ -59,4 +60,4 @@
 .configuation-detail-page {
 		background: #f8f9fa;
 		min-height: 100vh;
-	}
\ No newline at end of file
+	}