perf: 优化重构app

@@ -93,50 +93,9 @@
 		onLoad(e) {
 			if (e.data !== null) {
 				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.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.formatAlarmValue(details)
 				this.formatAlarmCondition(details)
@@ -183,14 +142,14 @@
 					}, 500);
 				}
 			},
+			//告警值处理
 			async formatAlarmValue(e) {
 				const keys = Object.keys(e)
 				const dataFormat = await this.handleAlarmDetailFormat(keys);
 				const values = keys.reduce((acc, curr) => {
 					dataFormat.forEach((dataItem => {
 						if (dataItem.tbDeviceId === curr) {
-							const findAttribute = dataItem.attribute.find(findItem => findItem
-								.identifier === e[curr].key)
+							const findAttribute = dataItem.attribute.find(findItem => findItem.identifier === e[curr].key)
 							acc.push(
 								`${findAttribute.name}:${e[curr].realValue}${!findAttribute.detail?.dataType?.specs?.unit?.key?'':findAttribute.detail?.dataType?.specs?.unit?.key}`
 							)
@@ -200,6 +159,7 @@
 				}, [])
 				this.formatAlarmValueText = values.join(',')
 			},
+			//告警条件处理
 			formatAlarmCondition(e) {
 				const keys = Object.keys(e)
 				const values = keys.reduce((acc, curr) => {
@@ -215,8 +175,8 @@
 					return findOperation + item.logicValue
 				})
 				this.formatAlarmConditionText = format.filter(Boolean).join(',')
-				console.log(this.formatAlarmConditionText);
 			},
+			//告警设备处理
 			async formatAlarmDevice(e) {
 				const keys = Object.keys(e)
 				const dataFormat = await this.handleAlarmDetailFormat(keys);
@@ -229,9 +189,7 @@
 				for (let item of keys) {
 					if (item === 'key' || item === 'data') return; //旧数据则终止
 					const deviceDetailRes = await api.deviceApi.getDeviceDetail(item);
-					const {
-						deviceProfileId
-					} = deviceDetailRes;
+					const { deviceProfileId } = deviceDetailRes;
 					if (!deviceProfileId) return;
 					const attributeRes = await api.deviceApi.getAttribute(deviceProfileId);
 					const dataFormat = this.handleDataFormat(deviceDetailRes, attributeRes);
@@ -240,10 +198,7 @@
 				return temp;
 			},
 			handleDataFormat(deviceDetail, attributes) {
-				const {
-					name,
-					tbDeviceId
-				} = deviceDetail;
+				const { name,tbDeviceId } = deviceDetail;
 				const attribute = attributes.map((item) => ({
 					identifier: item.identifier,
 					name: item.name,

@@ -20,9 +20,16 @@ const getConfigurationApi = (params = {}) => {
 		.get('/yt/configuration/center', params)
 }
 
+//获取组织列表
+const getMeOrgListApi = () => {
+	return uni.$u.http
+		.get('/yt/organization/me/list')
+}
+
 export default {
 	getHomeStatisticsApi,
 	getCameraApi,
 	byCameraIdGetDetailApi,
-	getConfigurationApi
+	getConfigurationApi,
+	getMeOrgListApi
 }

+//上传图片大小
+const UPLOAD_FILE_SIZE = 5242880
+
+export {
+	UPLOAD_FILE_SIZE
+}
\ No newline at end of file

@@ -111,21 +111,13 @@
 </template>
 
 <script>
-	import {
-		formatToDate
-	} from '@/plugins/utils.js';
-	import {
-		issueCommand
-	} from '../api/index.js';
+	import {formatToDate} from '@/plugins/utils.js';
+	import {issueCommand} from '../api/index.js';
 	import api from '@/api/index.js';
 	import mpCommandIssuance from './mp-command-issuance.vue';
-	import {
-		commandTypeList
-	} from '../config/data.js'
-	import {
-		useShowModal
-	} from '@/plugins/utils.js'
-
+	import {commandTypeList} from '../config/data.js'
+	import {useShowModal} from '@/plugins/utils.js'
+	
 	export default {
 		components: {
 			mpCommandIssuance,

@@ -91,9 +91,7 @@
 			}
 		},
 		onLoad(options) {
-			const {
-				data
-			} = options;
+			const { data } = options;
 			this.commandDetail = JSON.parse(decodeURIComponent(data));
 			if (this.commandDetail.response.status === 'SUCCESS') return
 			this.failContent = JSON.stringify(this.commandDetail.response.error)
@@ -102,50 +100,5 @@
 </script>
 
 <style lang="scss" scoped>
-	.command-detail {
-		padding: 5rpx 30rpx;
-		height: 100vh;
-		background-color: #f8f9fa;
-
-		.detail-top {
-			height: 118rpx;
-			width: 690rpx;
-			display: flex;
-			align-items: center;
-			background-color: #fff;
-			color: #333;
-			border-radius: 20rpx;
-			font-size: 15px;
-			margin-top: 30rpx;
-			padding: 30rpx;
-		}
-
-		.detail {
-			background-color: #fff;
-			margin-top: 30rpx;
-			border-radius: 20rpx;
-			width: 690rpx;
-
-			.detail-item {
-				padding: 30rpx;
-				display: flex;
-				align-items: center;
-
-				.detail-label {
-					color: #333;
-					font-size: 15px;
-				}
-
-				.detail-value {
-					color: #666;
-					font-size: 14px;
-					margin-left: 30rpx;
-				}
-			}
-		}
-
-		.command {
-			margin: 30rpx 0;
-		}
-	}
+	@import "../static/command-detail.scss";
 </style>
\ No newline at end of file

@@ -229,109 +229,7 @@
 	};
 </script>
 
-<style lang="scss" scoped>
-	.command-record {
-		padding: 0 30rpx;
-		background: #f8f9fa;
-
-		.filter-button {
-			font-size: 12px;
-			width: 160rpx;
-			height: 64rpx;
-			border-radius: 32rpx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			background: #f0f1f2;
-			color: #666;
-
-			image {
-				width: 28rpx;
-				height: 28rpx;
-				margin-left: 4rpx;
-			}
-		}
-	}
-
-	.list-item {
-		width: 690rpx;
-		background-color: #fff;
-		border-radius: 20rpx;
-		margin: 20rpx auto;
-		color: #333;
-
-		.item {
-			.delivered-color {
-				color: blue;
-			}
-
-			padding: 30rpx;
-
-			view {
-				font-size: 14px;
-				margin-bottom: 10rpx;
-			}
-
-			.time {
-				margin-top: 20rpx;
-				color: #999;
-			}
-
-			.item-first {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				font-size: 15px;
-				font-weight: 500;
-				align-items: center;
-
-				.item-right {
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					width: 104rpx;
-					height: 36rpx;
-					font-size: 10px;
-					border-radius: 20rpx;
-				}
 
-				.item-fail {
-					color: #848383;
-					background-color: #84838325;
-				}
-
-				.item.success {
-					color: #00c9a7;
-					background-color: #00c9a725;
-				}
-			}
-		}
-	}
-
-	.filter {
-		padding: 0 30rpx;
-
-		.filter-title {
-			text-align: center;
-			margin-top: 14px;
-			font-size: 16px;
-			font-weight: 700;
-		}
-
-		.button-group {
-			display: flex;
-			margin-top: 40rpx;
-			justify-content: space-between;
-
-			view {
-				width: 330rpx;
-			}
-		}
-
-		.command-time-text {
-			color: #333;
-			font-size: 14px;
-			font-weight: 700;
-		}
-	}
+<style lang="scss" scoped>
+	@import "../static/command-record.scss";
 </style>
\ No newline at end of file

@@ -19,7 +19,6 @@
 						<u-icon v-if="!isShowTCP" @click="handleCopy(copyTextValue)" name="question-circle"
 							color="#2979ff" size="28" class="ml-10">
 						</u-icon>
-
 					</div>
 				</view>
 				<view class="button-group">

@@ -12,41 +12,16 @@
 </template>
 
 <script>
-export default {
-	props: {
-		recordList: {
-			type: Array,
-			default: () => []
+	export default {
+		props: {
+			recordList: {
+				type: Array,
+				default: () => []
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.realtime-page {
-	.item {
-		margin: 30rpx;
-		padding: 30rpx;
-		border-radius: 20rpx;
-		background-color: #fff;
-		height: 160rpx;
-		width: 690rpx;
-		.item-top {
-			display: flex;
-			justify-content: space-between;
-			color: #333;
-			font-size: 16px;
-			font-family: PingFangSC-Medium, PingFang SC;
-			font-weight: bold;
-			.item-value {
-				font-weight: bold;
-			}
-		}
-		.item-time {
-			margin-top: 4rpx;
-			font-size: 13px;
-			color: #999;
-		}
-	}
-}
-</style>
+	@import "../static/realtime-data.scss";
+</style>
\ No newline at end of file

@@ -25,19 +25,13 @@
 	import alarmHistory from "./components/alarm-history.vue";
 	import historyData from "./components/history-data.vue";
 	import commondRecord from "./components/command-record.vue";
-	import {
-		getDeviceKeys,
-		getHistoryData
-	} from "./api/index.js";
-	import {
-		formatToDate
-	} from "@/plugins/utils.js";
+	import { getDeviceKeys,getHistoryData } from "./api/index.js";
+	import {formatToDate} from "@/plugins/utils.js";
 	import MescrollCompMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mixins/mescroll-comp.js";
 	import moment from "moment";
 	import base from "@/config/baseUrl.js";
-	import {
-		list
-	} from './config/data.js'
+	import { list } from './config/data.js'
+	import api from '@/api'
 
 	export default {
 		mixins: [MescrollCompMixin],
@@ -81,16 +75,10 @@
 			uni.closeSocket();
 		},
 		async onLoad(options) {
-			const {
-				id,
-				alarmStatus,
-				lastOnlineTime,
-				tbDeviceId,
-				deviceProfileId
-			} =
-			options;
+			const {id,alarmStatus,lastOnlineTime,tbDeviceId,deviceProfileId} = options;
 			this.deviceId = id;
-			const res = await uni.$u.http.get(`/yt/device/${id}`);
+			const res = await api.deviceApi.getDeviceDetail(this.deviceId)
+			if(!res) return
 			this.deviceDetail = {
 				...res,
 				alarmStatus,
@@ -106,9 +94,7 @@
 			}
 			this.isScrollable = this.list.length > 4;
 			if (res.deviceProfileId) {
-				const getAttrList = await uni.$u.http.get(
-					`/yt/device/attributes/${res.deviceProfileId}`
-				);
+				const getAttrList = await api.deviceApi.getAttribute(res.deviceProfileId)
 				if (Array.isArray(getAttrList)) {
 					this.attrList = getAttrList.map(m => {
 						return m.identifier
@@ -117,8 +103,7 @@
 			}
 			// 连接webSockte
 			const socketTask = uni.connectSocket({
-				url: `${base.socketPrefix}://${base.baseWebSocketUrl}/api/ws/plugins/telemetry?token=` +
-					uni.getStorageSync("userInfo").isToken, //仅为示例，并非真实接口地址。
+				url: `${base.socketPrefix}://${base.baseWebSocketUrl}/api/ws/plugins/telemetry?token=` + uni.getStorageSync("userInfo").isToken, //仅为示例，并非真实接口地址。
 				complete: () => {},
 			});
 			uni.onSocketOpen((header) => {
@@ -144,17 +129,11 @@
 				});
 			});
 			socketTask.onMessage((msg) => {
-				const {
-					data
-				} = JSON.parse(msg.data);
+				const { data } = JSON.parse(msg.data);
 				const newArray = [];
 				for (const key in data) {
 					const [time, value] = data[key].flat(1);
-					let obj = {
-						key,
-						time,
-						value,
-					};
+					let obj = { key,time,value, };
 					if (this.recordList.length === 0) {
 						this.recordList.unshift(obj);
 					} else {
@@ -192,7 +171,6 @@
 			// 结束时间
 			this.endTs = moment().format("x");
 			this.entityId = tbDeviceId;
-
 			const data = await getHistoryData({
 				entityId: tbDeviceId,
 				startTs: this.startTs,

+.command-detail {
+		padding: 5rpx 30rpx;
+		height: 100vh;
+		background-color: #f8f9fa;
+
+		.detail-top {
+			height: 118rpx;
+			width: 690rpx;
+			display: flex;
+			align-items: center;
+			background-color: #fff;
+			color: #333;
+			border-radius: 20rpx;
+			font-size: 15px;
+			margin-top: 30rpx;
+			padding: 30rpx;
+		}
+
+		.detail {
+			background-color: #fff;
+			margin-top: 30rpx;
+			border-radius: 20rpx;
+			width: 690rpx;
+
+			.detail-item {
+				padding: 30rpx;
+				display: flex;
+				align-items: center;
+
+				.detail-label {
+					color: #333;
+					font-size: 15px;
+				}
+
+				.detail-value {
+					color: #666;
+					font-size: 14px;
+					margin-left: 30rpx;
+				}
+			}
+		}
+
+		.command {
+			margin: 30rpx 0;
+		}
+	}
\ No newline at end of file

+.command-record {
+		padding: 0 30rpx;
+		background: #f8f9fa;
+
+		.filter-button {
+			font-size: 12px;
+			width: 160rpx;
+			height: 64rpx;
+			border-radius: 32rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			background: #f0f1f2;
+			color: #666;
+
+			image {
+				width: 28rpx;
+				height: 28rpx;
+				margin-left: 4rpx;
+			}
+		}
+	}
+
+	.list-item {
+		width: 690rpx;
+		background-color: #fff;
+		border-radius: 20rpx;
+		margin: 20rpx auto;
+		color: #333;
+
+		.item {
+			.delivered-color {
+				color: blue;
+			}
+
+			padding: 30rpx;
+
+			view {
+				font-size: 14px;
+				margin-bottom: 10rpx;
+			}
+
+			.time {
+				margin-top: 20rpx;
+				color: #999;
+			}
+
+			.item-first {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				font-size: 15px;
+				font-weight: 500;
+				align-items: center;
+
+				.item-right {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					width: 104rpx;
+					height: 36rpx;
+					font-size: 10px;
+					border-radius: 20rpx;
+				}
+
+				.item-fail {
+					color: #848383;
+					background-color: #84838325;
+				}
+
+				.item.success {
+					color: #00c9a7;
+					background-color: #00c9a725;
+				}
+			}
+		}
+	}
+
+	.filter {
+		padding: 0 30rpx;
+
+		.filter-title {
+			text-align: center;
+			margin-top: 14px;
+			font-size: 16px;
+			font-weight: 700;
+		}
+
+		.button-group {
+			display: flex;
+			margin-top: 40rpx;
+			justify-content: space-between;
+
+			view {
+				width: 330rpx;
+			}
+		}
+
+		.command-time-text {
+			color: #333;
+			font-size: 14px;
+			font-weight: 700;
+		}
+	}
\ No newline at end of file

+.realtime-page {
+	.item {
+		margin: 30rpx;
+		padding: 30rpx;
+		border-radius: 20rpx;
+		background-color: #fff;
+		height: 160rpx;
+		width: 690rpx;
+		.item-top {
+			display: flex;
+			justify-content: space-between;
+			color: #333;
+			font-size: 16px;
+			font-family: PingFangSC-Medium, PingFang SC;
+			font-weight: bold;
+			.item-value {
+				font-weight: bold;
+			}
+		}
+		.item-time {
+			margin-top: 4rpx;
+			font-size: 13px;
+			color: #999;
+		}
+	}
+}
\ No newline at end of file

+const rules = {
+	'feedbackInfo.title': {
+		type: 'string',
+		required: true,
+		message: '请输入主题',
+		trigger: ['blur', 'change']
+	},
+	'feedbackInfo.name': {
+		type: 'string',
+		required: true,
+		message: '请输入姓名',
+		trigger: ['blur', 'change']
+	},
+	'feedbackInfo.message': {
+		type: 'string',
+		required: true,
+		message: '请输入意见反馈',
+		trigger: ['blur', 'change']
+	}
+}
+export {
+	rules
+}
\ No newline at end of file

 <template>
 	<view class="feedback-page">
-		<view style="overflow-y: scroll;overflow: hidden;height: 1500rpx;">
+		<view class="feedback-container">
 			<!-- 公共组件-每个页面必须引入 -->
 			<public-module></public-module>
 			<view class="form-page">
@@ -55,6 +55,8 @@
 		mapState
 	} from 'vuex';
 	import api from '@/api/index.js'
+	import { rules } from './config/data.js'
+	import { UPLOAD_FILE_SIZE } from '@/constant/index.js'
 
 	export default {
 		data() {
@@ -69,27 +71,7 @@
 					}
 				},
 				fileList1: [],
-				rules: {
-					'feedbackInfo.title': {
-						type: 'string',
-						required: true,
-						message: '请输入主题',
-						trigger: ['blur', 'change']
-					},
-					'feedbackInfo.name': {
-						type: 'string',
-						required: true,
-						message: '请输入姓名',
-						trigger: ['blur', 'change']
-					},
-					'feedbackInfo.message': {
-						type: 'string',
-						required: true,
-						message: '请输入意见反馈',
-						trigger: ['blur', 'change']
-					},
-
-				},
+				rules
 			};
 		},
 		onReady() {
@@ -113,7 +95,7 @@
 				let lists = [].concat(event.file);
 				let fileListLen = this[`fileList${event.name}`].length;
 				lists.map(item => {
-					if (item.size > 5242880) {
+					if (item.size > UPLOAD_FILE_SIZE) {
 						this[`fileList${event.name}`].push({
 							...item,
 							status: 'error',
@@ -129,7 +111,7 @@
 				});
 				for (let i = 0; i < lists.length; i++) {
 					const judgeImageSize = lists[0].size
-					if (judgeImageSize > 5242880) {
+					if (judgeImageSize > UPLOAD_FILE_SIZE) {
 						return uni.$u.toast('图片限定5M')
 					} else {
 						const result = await this.uploadFilePromise(lists[i].url);

@@ -5,6 +5,11 @@
 		padding-left: 27rpx;
 		overflow-y: scroll;
 		overflow: hidden;
+		.feedback-container{
+			overflow-y: scroll;
+			overflow: hidden;
+			height: 1500rpx;
+		}
 	}
 
 	.form-page {
@@ -12,8 +17,7 @@
 		background-color: #ffffff;
 		border-radius: 10px;
 		margin-top: 20rpx;
-		padding-left: 15rpx;
-		padding: 0 20rpx;
+		padding: 0 40rpx;
 		height: 860rpx;
 		.upload-text{
 			margin: 15px 0px 0px -16rpx;

@@ -29,16 +29,8 @@
 
 <script>
 	var clear;
-	import {
-		mapState,
-		mapMutations,
-		mapActions
-	} from 'vuex';
-	import {
-		useShowToast,
-		useNavigateTo,
-		useReLaunch
-	} from '@/plugins/utils.js'
+	import {mapState,mapMutations,mapActions} from 'vuex';
+	import {useShowToast,useNavigateTo,useReLaunch} from '@/plugins/utils.js'
 	import api from '@/api'
 
 	export default {

@@ -83,17 +83,10 @@
 		mapMutations
 	} from 'vuex';
 	import baseUrl from '@/config/baseUrl.js';
-	import {
-		mapState
-	} from 'vuex';
+	import {mapState} from 'vuex';
 	import api from '@/api/index.js'
 	import permission from '@/js_sdk/wa-permission/permission.js'
-	import {
-		useShowModal,
-		useUploadFile,
-		useChooseImage,
-		useFileValidate
-	} from '@/plugins/utils.js'
+	import {useShowModal,useUploadFile,useChooseImage,useFileValidate} from '@/plugins/utils.js'
 
 	export default {
 		data() {

@@ -47,26 +47,16 @@
 </template>
 
 <script>
-	import {
-		mapMutations,
-		mapActions,
-		mapState
-	} from "vuex";
+	import {mapMutations,mapActions,mapState} from "vuex";
 	import api from '@/api'
-	import {
-		loginPasswordReg,
-		useReLaunch,
-		useShowToast,
-		useShowModal,
-		useNavigateTo
-	} from '@/plugins/utils.js'
+	import {loginPasswordReg,useReLaunch,useShowToast,useShowModal,useNavigateTo} from '@/plugins/utils.js'
 
 	export default {
 		data() {
 			return {
 				loginForm: {
-					username: "",
-					password: "",
+					username: "fengtao",
+					password: "Aa123456@",
 				},
 				showPassword: true,
 				code: "",

@@ -39,19 +39,19 @@
 			}
 		},
 		{
-			"path": "pages/index/camera/camera",
+			"path": "pages/index/components/camera/camera",
 			"style": {
 				"navigationBarTitleText": "查看摄像头"
 			}
 		},
 		{
-			"path": "pages/index/configuration/configuration",
+			"path": "pages/index/components/configuration/configuration",
 			"style": {
 				"navigationBarTitleText": "查看组态"
 			}
 		},
 		{
-			"path": "pages/index/configuration/configuration-detail",
+			"path": "pages/index/components/configuration/configuration-detail",
 			"style": {
 				"navigationBarTitleText": "组态详情"
 			}

 <template>
-	<view class="alert-page" :class="pageDisableScroll">
+	<view class="alarm-page" :class="pageDisableScroll">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<!-- 告警头部 -->

 <template>
-	<view class="device-list">
+	<view class="alarm-list">
 		<view @click="$emit('openAlertDetail',item)" class="list-item" v-for="(item, index) in list" :key="index">
 			<view class="u-flex item">
 				<view class="item-text text-clip">
@@ -69,6 +69,7 @@
 			},
 			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}`)
 					return acc
@@ -80,7 +81,7 @@
 </script>
 
 <style lang="scss" scoped>
-	.device-list {
+	.alarm-list {
 		display: flex;
 		flex-direction: column;
 		padding-left: 18rpx;

-.alert-page {
+.alarm-page {
 	background: #f8f9fa;
 	.device-top {
 		padding: 10rpx 30rpx;

@@ -54,13 +54,8 @@
 				});
 			},
 			resetFilter() {
-				const {
-					deviceStatus,
-					alarmStatus,
-					typeStatus
-				} = this;
-				[deviceStatus, alarmStatus, typeStatus].forEach(item => item.map((item, index) => (item.checked = index ===
-					0)));
+				const {deviceStatus,alarmStatus,typeStatus} = this;
+				[deviceStatus, alarmStatus, typeStatus].forEach(item => item.map((item, index) => (item.checked = index ===0)));
 			},
 			confirmFilter() {
 				const deviceState = this.deviceStatus.find(item => item.checked);
@@ -70,7 +65,6 @@
 					deviceState: deviceState.type ? deviceState.type : undefined,
 					deviceType: deviceType.type ? deviceType.type : undefined,
 					alarmStatus: alarmStatus.type === 0 || alarmStatus.type === 1 ? alarmStatus.type : undefined
-
 				})
 			},
 		}

-<template>
-	<view class="camera-page">
-		<!-- 公共组件-每个页面必须引入 -->
-		<public-module></public-module>
-		<header-org @openOrg="openOrg" :total="cameraTotal" :imageSrc="imageSrc"></header-org>
-		<view style="height: 150rpx;"></view>
-		<!-- 自带分页组件 -->
-		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback"
-			@up="upCallback">
-			<view class="camera-container">
-				<view class="container-item">
-					<view v-for="(item, index) in list" :key="item.id" class="item">
-						<video :data-id="item.id" :data-accessMode="item.accessMode" :key="item.id" preload="none"
-							:id="'video' + item.id" class="video" :src="item.videoUrl" controls :title="item.name"
-							x5-video-player-type="h5" x5-video-orientation="portraint" show-mute-btn
-							:poster="item.avatar" @play="playVideo"></video>
-						<view style="width:300rpx" class="bottom-text text-clip">
-							<text class="text">{{ item.name }}</text>
-						</view>
-					</view>
-				</view>
-			</view>
-			<mescroll-empty v-if="!list.length" />
-		</mescroll-body>
-		<!-- 自带分页组件 -->
-		<view style="height: 60rpx;"></view>
-	</view>
-</template>
-
-<script>
-	import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
-	import api from '@/api/index.js'
-	import {
-		useNavigateTo
-	} from '@/plugins/utils.js'
-	import headerOrg from '@/components/common/header-org.vue'
-
-	export default {
-		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
-		components:{
-			headerOrg
-		},
-		data() {
-			return {
-				imageSrc:'/static/org.png',
-				page: {
-					num: 0,
-					size: 10
-				},
-				downOption: {
-					auto: true //是否在初始化后,自动执行downCallback; 默认true
-				},
-				upOption: {
-					auto: false // 不自动加载
-				},
-				current: 0,
-				cameraTotal: 0,
-				list: [],
-				ordId: '',
-			};
-		},
-		onShow() {
-			if (this.ordId) {
-				this.loadData(1, this.ordId);
-			}
-		},
-		onHide() {
-			this.ordId = '';
-		},
-		onLoad() {
-			// 隐藏原生的tabbar
-			uni.hideTabBar();
-		},
-		methods: {
-			/*下拉刷新的回调 */
-			downCallback() {
-				//联网加载数据
-				this.page.num = 1;
-				this.loadData(1);
-			},
-			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
-			upCallback() {
-				//联网加载数据
-				this.page.num += 1;
-				this.loadData(this.page.num);
-			},
-			async loadData(pageNo, organizationV) {
-				let httpData = {
-					page: pageNo,
-					pageSize: 10,
-					organizationId: organizationV
-				};
-				const res = await api.homeApi.getCameraApi({
-					params: httpData,
-					custom: {
-						load: false
-					}
-				})
-				if (res) {
-					uni.stopPullDownRefresh();
-					this.mescroll.endByPage(res.items.length, res.total);
-					this.cameraTotal = res.total;
-					if (pageNo == 1) {
-						this.list = res.items;
-					} else {
-						this.list = this.list.concat(res.items);
-					}
-				}
-			},
-			hideImageUrl(item, index) {
-				this.current = index;
-			},
-			async playVideo(e) {
-				const {
-					currentTarget: {
-						dataset: {
-							accessmode,
-							id
-						}
-					} = {}
-				} = e
-				const isExistVideoUrl = this.list.find(item => item.id == id).videoUrl
-				if (accessmode === 1 && !isExistVideoUrl) {
-					const res = api.homeApi.byCameraIdGetDetailApi(id)
-					if (res) {
-						const {
-							data: {
-								url
-							} = {}
-						} = res
-						const index = this.list.findIndex(item => item.id === id)
-						if (~index && url) {
-							this.list.splice(index, 1, {
-								...this.list[index],
-								videoUrl: url
-							})
-							this.$nextTick(() => {
-								let currentId = 'video' + id;
-								const videoContext = uni.createVideoContext(currentId, this);
-								videoContext.play()
-							})
-						}
-					}
-				}
-				/**
-				 * 点击全屏播放当前视频，暂停其余视频
-				 * 兼容APP和MP端
-				 */
-				let currentId = 'video' + id;
-				this.videoContent = uni.createVideoContext(currentId, this);
-				this.videoContent.requestFullScreen();
-				// 获取视频列表
-				let trailer = this.list;
-				trailer.forEach((item, index) => {
-					if (item.videoUrl != null && item.videoUrl != '') {
-						let temp = 'video' + item.id;
-						if (temp != currentId) {
-							//暂停不是当前的视频
-							uni.createVideoContext(temp, this).pause();
-						}
-					}
-				});
-			},
-			openOrg() {
-				useNavigateTo('/pages/organization/organization')
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	@import '../static/camera.scss';
+<template>
+	<view class="camera-page">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<header-org @openOrg="openOrg" :total="cameraTotal" :imageSrc="imageSrc"></header-org>
+		<view style="height: 150rpx;"></view>
+		<!-- 自带分页组件 -->
+		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback"
+			@up="upCallback">
+			<view class="camera-container">
+				<view class="container-item">
+					<view v-for="(item, index) in list" :key="item.id" class="item">
+						<video :data-id="item.id" :data-accessMode="item.accessMode" :key="item.id" preload="none"
+							:id="'video' + item.id" class="video" :src="item.videoUrl" controls :title="item.name"
+							x5-video-player-type="h5" x5-video-orientation="portraint" show-mute-btn
+							:poster="item.avatar" @play="playVideo"></video>
+						<view  class="bottom-text text-clip w-300">
+							<text class="text">{{ item.name }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<mescroll-empty v-if="!list.length" />
+		</mescroll-body>
+		<!-- 自带分页组件 -->
+		<view style="height: 60rpx;"></view>
+	</view>
+</template>
+
+<script>
+	import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
+	import api from '@/api/index.js'
+	import {
+		useNavigateTo
+	} from '@/plugins/utils.js'
+	import headerOrg from '@/components/common/header-org.vue'
+
+	export default {
+		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
+		components:{
+			headerOrg
+		},
+		data() {
+			return {
+				imageSrc:'/static/org.png',
+				page: {
+					num: 0,
+					size: 10
+				},
+				downOption: {
+					auto: true //是否在初始化后,自动执行downCallback; 默认true
+				},
+				upOption: {
+					auto: false // 不自动加载
+				},
+				current: 0,
+				cameraTotal: 0,
+				list: [],
+				ordId: '',
+			};
+		},
+		onShow() {
+			if (this.ordId) {
+				this.loadData(1, this.ordId);
+			}
+		},
+		onHide() {
+			this.ordId = '';
+		},
+		onLoad() {
+			// 隐藏原生的tabbar
+			uni.hideTabBar();
+		},
+		methods: {
+			/*下拉刷新的回调 */
+			downCallback() {
+				//联网加载数据
+				this.page.num = 1;
+				this.loadData(1);
+			},
+			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+			upCallback() {
+				//联网加载数据
+				this.page.num += 1;
+				this.loadData(this.page.num);
+			},
+			async loadData(pageNo, organizationId) {
+				let httpData = {
+					page: pageNo,
+					pageSize: 10,
+					organizationId
+				};
+				const res = await api.homeApi.getCameraApi({
+					params: httpData,
+					custom: {
+						load: false
+					}
+				})
+				if (res) {
+					uni.stopPullDownRefresh();
+					this.mescroll.endByPage(res.items.length, res.total);
+					this.cameraTotal = res.total;
+					if (pageNo == 1) {
+						this.list = res.items;
+					} else {
+						this.list = this.list.concat(res.items);
+					}
+				}
+			},
+			//播放视频
+			async playVideo(e) {
+				const {currentTarget: {dataset: {accessmode,id}} = {}} = e
+				const isExistVideoUrl = this.list.find(item => item.id == id).videoUrl
+				if (accessmode === 1 && !isExistVideoUrl) {
+					const res = api.homeApi.byCameraIdGetDetailApi(id)
+					if (res) {
+						const {data: {url} = {}} = res
+						const index = this.list.findIndex(item => item.id === id)
+						if (~index && url) {
+							this.list.splice(index, 1, {
+								...this.list[index],
+								videoUrl: url
+							})
+							this.$nextTick(() => {
+								let currentId = 'video' + id;
+								const videoContext = uni.createVideoContext(currentId, this);
+								videoContext.play()
+							})
+						}
+					}
+				}
+				/**
+				 * 点击全屏播放当前视频，暂停其余视频
+				 * 兼容APP和MP端
+				 */
+				let currentId = 'video' + id;
+				this.videoContent = uni.createVideoContext(currentId, this);
+				this.videoContent.requestFullScreen();
+				// 获取视频列表
+				let trailer = this.list;
+				trailer.forEach((item, index) => {
+					if (item.videoUrl != null && item.videoUrl != '') {
+						let temp = 'video' + item.id;
+						if (temp != currentId) {
+							//暂停不是当前的视频
+							uni.createVideoContext(temp, this).pause();
+						}
+					}
+				});
+			},
+			openOrg() {
+				useNavigateTo('/pages/organization/organization')
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import '../../static/camera.scss';
 </style>
\ No newline at end of file

 <template>
-	<view class="content">
+	<view class="configuation-detail-page">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<web-view :src="showConfiguration" bindload="bindload" binderror="binderror"></web-view>
+		<web-view :src="showConfiguration"></web-view>
 	</view>
 </template>
 
@@ -38,14 +38,6 @@
 			uni.removeStorageSync('config');
 		},
 		methods: {
-			// 网页加载成功时候触发此事件
-			bindload(res) {
-				console.log(res, res.detail);
-			},
-			// 网页加载失败的时候触发此事件
-			binderror(err) {
-				console.log(err, err.detail);
-			},
 			async requestUrl(e) {
 				const httpData = {
 					configurationId: e,
@@ -59,7 +51,6 @@
 				});
 				const pathUrl = uni.getStorageSync('config');
 				const userInfo = uni.getStorageSync('userInfo')
-				console.log(this.params)
 				this.showConfiguration = this.params
 			}
 		}
@@ -67,8 +58,5 @@
 </script>
 
 <style lang="scss" scoped>
-	.content {
-		background: #f8f9fa;
-		min-height: 100vh;
-	}
-</style>
+	@import '../../static/configuration.scss';
+</style>
\ No newline at end of file

 <template>
-	<view class="status-page">
-		<view style="margin-left:15rpx;background-color: #f8f9fa;position:fixed;top:0rpx;z-index: 99999;">
-			<view style="height:35rpx;background-color: #f8f9fa;"></view>
-			<view class="u-flex search-top">
+	<view class="configuation-page">
+		<view class="configuation-header">
+			<view class="header-gap"></view>
+			<view class="search-top">
 				<view class="search-main">
 					<u--input @change="inputChanged" prefixIcon="search" placeholder="请输入组态名称" border="surround"
 						shape="circle"></u--input>
@@ -41,7 +41,7 @@
 		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
 		data() {
 			return {
-				defaultConfigImage: '../../../static/test.png',
+				defaultConfigImage: '../../../../static/test.png',
 				page: {
 					num: 0,
 					size: 10
@@ -76,7 +76,7 @@
 			openConfigDetail(e) {
 				const href = createScadaPageLink(e)
 				uni.navigateTo({
-					url: 'configurationDetail?configurationHref=' + href
+					url: 'configuration-detail?configurationHref=' + href
 				});
 			},
 			/*下拉刷新的回调 */
@@ -120,5 +120,5 @@
 </script>
 
 <style lang="scss" scoped>
-	@import '../static/configuration.scss';
+	@import '../../static/configuration.scss';
 </style>
\ No newline at end of file

-import config from '../../../config/baseUrl.js'
-import {
-	atob,
-	btoa
-} from './weapp.atob.js'
-const getRandomString = () => Number(Math.random().toString().substring(2)).toString(36);
-
-export const ScadaModeEnum = {
-	PRIVATE_VIEW: 'PRIVATE_VIEW',
-	PUBLIC_VIEW: 'PUBLIC_VIEW',
-}
-
-export const encode = (record) => {
-	let hash = JSON.stringify(record);
-	const mixinString = getRandomString()
-		.slice(0, 10)
-		.padEnd(10, getRandomString())
-		.split('')
-		.map((item) => (Math.random() > 0.5 ? item.toUpperCase() : item))
-		.join('');
-	hash = btoa(hash);
-	hash = hash.substring(0, 6) + mixinString + hash.substring(6);
-	hash = btoa(hash);
-	return hash;
-};
-
-
-export const createScadaPageLink = (
-	record,
-	mode = ScadaModeEnum.PRIVATE_VIEW,
-	open = false
-) => {
-	const userInfo = uni.getStorageSync('userInfo')
-	const params = {
-		configurationId: record?.id,
-		organizationId: record?.organizationId,
-		mode: record?.viewType === ScadaModeEnum.PRIVATE_VIEW ? 'lightbox' : 'share',
+import config from '../../../../config/baseUrl.js'
+import {
+	atob,
+	btoa
+} from './weapp.atob.js'
+const getRandomString = () => Number(Math.random().toString().substring(2)).toString(36);
+
+export const ScadaModeEnum = {
+	PRIVATE_VIEW: 'PRIVATE_VIEW',
+	PUBLIC_VIEW: 'PUBLIC_VIEW',
+}
+
+export const encode = (record) => {
+	let hash = JSON.stringify(record);
+	const mixinString = getRandomString()
+		.slice(0, 10)
+		.padEnd(10, getRandomString())
+		.split('')
+		.map((item) => (Math.random() > 0.5 ? item.toUpperCase() : item))
+		.join('');
+	hash = btoa(hash);
+	hash = hash.substring(0, 6) + mixinString + hash.substring(6);
+	hash = btoa(hash);
+	return hash;
+};
+
+
+export const createScadaPageLink = (
+	record,
+	mode = ScadaModeEnum.PRIVATE_VIEW,
+	open = false
+) => {
+	const userInfo = uni.getStorageSync('userInfo')
+	const params = {
+		configurationId: record?.id,
+		organizationId: record?.organizationId,
+		mode: record?.viewType === ScadaModeEnum.PRIVATE_VIEW ? 'lightbox' : 'share',
 		platform: record?.platform,
-		userId: userInfo.userId
-	};
-
-	if (record?.viewType === ScadaModeEnum.PUBLIC_VIEW) {
-		params.publicId = record.publicId;
-	}
-
-	const hash = encode(params);
-
-	const href = `${config.baseDrawioUrl}#${hash}`
-
-	return href
+		userId: userInfo.userId
+	};
+
+	if (record?.viewType === ScadaModeEnum.PUBLIC_VIEW) {
+		params.publicId = record.publicId;
+	}
+
+	const hash = encode(params);
+
+	const href = `${config.baseDrawioUrl}#${hash}`
+
+	return href
 };
\ No newline at end of file

-var b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-var b64re = /^(?:[A-Za-z\d+\/]{4})*?(?:[A-Za-z\d+\/]{2}(?:==)?|[A-Za-z\d+\/]{3}=?)?$/;
-export const btoa = function(string) {
-	string = String(string);
-	var bitmap, a, b, c, result = "",
-		i = 0,
-		rest = string.length % 3;
-	for (; i < string.length;) {
-		if ((a = string.charCodeAt(i++)) > 255 ||
-			(b = string.charCodeAt(i++)) > 255 ||
-			(c = string.charCodeAt(i++)) > 255)
-			throw new TypeError(
-				"Failed to execute 'btoa' on 'Window': The string to be encoded contains characters outside of the Latin1 range."
-			);
-		bitmap = (a << 16) | (b << 8) | c;
-		result += b64.charAt(bitmap >> 18 & 63) + b64.charAt(bitmap >> 12 & 63) +
-			b64.charAt(bitmap >> 6 & 63) + b64.charAt(bitmap & 63);
-	}
-	return rest ? result.slice(0, rest - 3) + "===".substring(rest) : result;
-};
-
-export const atob = function(string) {
-	string = String(string).replace(/[\t\n\f\r ]+/g, "");
-	if (!b64re.test(string))
-		throw new TypeError(
-			"Failed to execute 'atob' on 'Window': The string to be decoded is not correctly encoded.");
-	string += "==".slice(2 - (string.length & 3));
-	var bitmap, result = "",
-		r1, r2, i = 0;
-	for (; i < string.length;) {
-		bitmap = b64.indexOf(string.charAt(i++)) << 18 | b64.indexOf(string.charAt(i++)) << 12 |
-			(r1 = b64.indexOf(string.charAt(i++))) << 6 | (r2 = b64.indexOf(string.charAt(i++)));
-		result += r1 === 64 ? String.fromCharCode(bitmap >> 16 & 255) :
-			r2 === 64 ? String.fromCharCode(bitmap >> 16 & 255, bitmap >> 8 & 255) :
-			String.fromCharCode(bitmap >> 16 & 255, bitmap >> 8 & 255, bitmap & 255);
-	}
-	return result;
-};
-
-function b64DecodeUnicode(str) {
-	return decodeURIComponent(exports.weAtob(str).replace(/(.)/g, function(p) {
-		var code = p.charCodeAt(0).toString(16).toUpperCase();
-		if (code.length < 2) {
-			code = "0" + code;
-		}
-		return "%" + code;
-	}));
-}
-
-function base64_url_decode(str) {
-	var output = str.replace(/-/g, "+").replace(/_/g, "/");
-	switch (output.length % 4) {
-		case 0:
-			break;
-		case 2:
-			output += "==";
-			break;
-		case 3:
-			output += "=";
-			break;
-		default:
-			throw "Illegal base64url string!";
-	}
-	try {
-		return b64DecodeUnicode(output);
-	} catch (err) {
-		return exports.weAtob(output);
-	}
-}
-
-function weappJwtDecode(token, options) {
-	if (typeof token !== "string") {
-		throw ("Invalid token specified");
-	}
-	options = options || {};
-	var pos = options.header === true ? 0 : 1;
-	try {
-		return JSON.parse(base64_url_decode(token.split(".")[pos]));
-	} catch (e) {
-		throw ("Invalid token specified: " + e.message);
-	}
+var b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+var b64re = /^(?:[A-Za-z\d+\/]{4})*?(?:[A-Za-z\d+\/]{2}(?:==)?|[A-Za-z\d+\/]{3}=?)?$/;
+export const btoa = function(string) {
+	string = String(string);
+	var bitmap, a, b, c, result = "",
+		i = 0,
+		rest = string.length % 3;
+	for (; i < string.length;) {
+		if ((a = string.charCodeAt(i++)) > 255 ||
+			(b = string.charCodeAt(i++)) > 255 ||
+			(c = string.charCodeAt(i++)) > 255)
+			throw new TypeError(
+				"Failed to execute 'btoa' on 'Window': The string to be encoded contains characters outside of the Latin1 range."
+			);
+		bitmap = (a << 16) | (b << 8) | c;
+		result += b64.charAt(bitmap >> 18 & 63) + b64.charAt(bitmap >> 12 & 63) +
+			b64.charAt(bitmap >> 6 & 63) + b64.charAt(bitmap & 63);
+	}
+	return rest ? result.slice(0, rest - 3) + "===".substring(rest) : result;
+};
+
+export const atob = function(string) {
+	string = String(string).replace(/[\t\n\f\r ]+/g, "");
+	if (!b64re.test(string))
+		throw new TypeError(
+			"Failed to execute 'atob' on 'Window': The string to be decoded is not correctly encoded.");
+	string += "==".slice(2 - (string.length & 3));
+	var bitmap, result = "",
+		r1, r2, i = 0;
+	for (; i < string.length;) {
+		bitmap = b64.indexOf(string.charAt(i++)) << 18 | b64.indexOf(string.charAt(i++)) << 12 |
+			(r1 = b64.indexOf(string.charAt(i++))) << 6 | (r2 = b64.indexOf(string.charAt(i++)));
+		result += r1 === 64 ? String.fromCharCode(bitmap >> 16 & 255) :
+			r2 === 64 ? String.fromCharCode(bitmap >> 16 & 255, bitmap >> 8 & 255) :
+			String.fromCharCode(bitmap >> 16 & 255, bitmap >> 8 & 255, bitmap & 255);
+	}
+	return result;
+};
+
+function b64DecodeUnicode(str) {
+	return decodeURIComponent(exports.weAtob(str).replace(/(.)/g, function(p) {
+		var code = p.charCodeAt(0).toString(16).toUpperCase();
+		if (code.length < 2) {
+			code = "0" + code;
+		}
+		return "%" + code;
+	}));
+}
+
+function base64_url_decode(str) {
+	var output = str.replace(/-/g, "+").replace(/_/g, "/");
+	switch (output.length % 4) {
+		case 0:
+			break;
+		case 2:
+			output += "==";
+			break;
+		case 3:
+			output += "=";
+			break;
+		default:
+			throw "Illegal base64url string!";
+	}
+	try {
+		return b64DecodeUnicode(output);
+	} catch (err) {
+		return exports.weAtob(output);
+	}
+}
+
+function weappJwtDecode(token, options) {
+	if (typeof token !== "string") {
+		throw ("Invalid token specified");
+	}
+	options = options || {};
+	var pos = options.header === true ? 0 : 1;
+	try {
+		return JSON.parse(base64_url_decode(token.split(".")[pos]));
+	} catch (e) {
+		throw ("Invalid token specified: " + e.message);
+	}
 }
\ No newline at end of file

@@ -12,6 +12,7 @@ const basicGridList = [{
 
 const basicStatistics = [{
 		text: '设备统计',
+		key: 'device',
 		icon: '/static/device-total.png',
 		leftParam: 'ONLINE',
 		centerParam: 'OFFLINE',
@@ -19,7 +20,7 @@ const basicStatistics = [{
 		value: {
 			leftValue: 0,
 			centerValue: 0,
-			rightrValue: 0
+			rightValue: 0
 		},
 		label: {
 			leftText: "在线",
@@ -29,6 +30,7 @@ const basicStatistics = [{
 	},
 	{
 		text: '告警统计',
+		key: 'alarm',
 		icon: '/static/alert.png',
 		leftParam: ['ACTIVE_ACK'],
 		centerParam: 'CLEARED_ACK',
@@ -36,7 +38,7 @@ const basicStatistics = [{
 		value: {
 			leftValue: 0,
 			centerValue: 0,
-			rightrValue: 0
+			rightValue: 0
 		},
 		label: {
 			leftText: "未处理",

@@ -4,7 +4,7 @@
 		<public-module></public-module>
 		<view>
 			<!-- 基础统计 -->
-			<view class="basic-sty">
+			<view class="basic-statistics">
 				<view class="basic-text"><text class="text text-bold">基础统计</text></view>
 				<view class="basic">
 					<view class="basic-item" v-for="(item,index) in basicStatistics" :key="index">
@@ -29,7 +29,7 @@
 							</view>
 							<view @click="navigatorPage(item,item.rightParam)" class="u-flex sigle-child">
 								<view class="sigle-text">
-									<text class="home-text-total">{{item.value.rightrValue}}</text>
+									<text class="home-text-total">{{item.value.rightValue}}</text>
 								</view>
 								<view class="sigle-value"><text
 										class="home-text-total-bottom">{{item.label.rightText}}</text></view>
@@ -96,33 +96,40 @@
 			setTimeout(function() {
 				uni.stopPullDownRefresh();
 				uni.$u.toast('下拉刷新成功...');
-			}, 800);
+			}, 200);
 		},
 		methods: {
 			...mapActions(['updateBadgeTotal']),
 			async getDeviceTotalData() {
 				const res = await api.homeApi.getHomeStatisticsApi()
 				if (res) {
-					this.basicStatistics[0].value.leftValue = res.totalDevice.onLine
-					this.basicStatistics[0].value.centerValue = res.totalDevice.offLine
-					this.basicStatistics[0].value.rightrValue = res.totalDevice.inActive
-					this.basicStatistics[1].value.leftValue = res.totalAlarm.activedAlarm
-					this.basicStatistics[1].value.centerValue = res.totalAlarm.clearedAck
-					this.basicStatistics[1].value.rightrValue = res.totalAlarm.clearedUnack
+					const { onLine,offLine,inActive } = res.totalDevice
+					const { activedAlarm,clearedAck,clearedUnack } = res.totalAlarm
+					this.basicStatistics.map(item=>{
+						const { key, value } = item
+						if(key === 'device'){
+							value.leftValue = onLine
+							value.centerValue =offLine
+							value.rightValue = inActive
+						}else{
+							value.leftValue = activedAlarm
+							value.centerValue =clearedAck
+							value.rightValue = clearedUnack
+						}
+					})
 					//异步实时更新告警徽标数
 					this.updateBadgeTotal(res.totalAlarm?.activedAlarm);
 				}
 			},
 			openCamera() {
-				useNavigateTo('camera/camera')
+				useNavigateTo('components/camera/camera')
 			},
 			openConfiguration() {
-				useNavigateTo('configuration/configuration')
+				useNavigateTo('components/configuration/configuration')
 			},
 			handleEvent(event) {
-				if (event === 'openCamera') {
-					this.openCamera()
-				} else {
+				if (event === 'openCamera') this.openCamera()
+				else {
 					this.openConfiguration()
 				}
 			},
@@ -130,9 +137,8 @@
 				const {
 					text
 				} = item
-				if (text === '设备统计') {
-					this.navigatorDeviceStatus(type)
-				} else {
+				if (text === '设备统计') this.navigatorDeviceStatus(type)
+				else {
 					this.navigatorAlarmStatus(type)
 				}
 			},

 <template>
-	<view class="container">
-		<view class="container-box">
-			<image v-if="mpOwnConfig.logo" :src="mpOwnConfig.logo"></image>
+	<view class="splash-container">
+		<view class="splash-container-box">
+			<image v-if="initConfig.logo" :src="initConfig.logo"></image>
 			<image v-else :src="staticLogo"></image>
 			<text class="splash-text-muted">连接世界 创造价值</text>
 		</view>
@@ -21,7 +21,7 @@
 		data() {
 			return {
 				staticLogo: '/static/logo.png',
-				mpOwnConfig: {}
+				initConfig: {}
 			};
 		},
 		onLoad() {
@@ -47,7 +47,7 @@
 		methods: {
 			async getPlateForm() {
 				const res = await api.loginApi.getPlateCustomApi()
-				this.mpOwnConfig = {
+				this.initConfig = {
 					bg: res.background,
 					logo: res.logo ? res.logo : this.staticLogo,
 					name: res.name
@@ -57,22 +57,7 @@
 	};
 </script>
 
-<style lang="scss">
-	.container {
-		width: 100%;
-		height: 100%;
-		margin-top: 300rpx;
 
-		.container-box {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			flex-direction: column;
-
-			image {
-				width: 100rpx;
-				height: 100rpx;
-			}
-		}
-	}
+<style lang="scss" scoped>
+	@import './static/splash.scss';
 </style>
\ No newline at end of file

@@ -55,3 +55,8 @@
 		}
 	}
 }
+
+.configuation-detail-page {
+		background: #f8f9fa;
+		min-height: 100vh;
+	}
\ No newline at end of file

@@ -56,7 +56,7 @@
 		}
 	}
 }
-.basic-sty {
+.basic-statistics {
 	padding: 0 10rpx;
 	.basic-text {
 		.text {

+.splash-container {
+		width: 100%;
+		height: 100%;
+		margin-top: 300rpx;
+
+		.splash-container-box {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			flex-direction: column;
+
+			image {
+				width: 100rpx;
+				height: 100rpx;
+			}
+		}
+	}
\ No newline at end of file

@@ -17,6 +17,7 @@
 
 <script>
 import { transOrgFunc } from '@/config/common.js';
+import api from '@/api/index.js'
 
 export default {
 	data() {
@@ -33,16 +34,12 @@ export default {
 		this.loadData();
 	},
 	methods: {
-		loadData() {
-			uni.$u.http
-				.get('/yt/organization/me/list')
-				.then(res => {
-					if (res) {
-						const list = transOrgFunc(res);
-						this.tree = list;
-					}
-				})
-				.catch(e => {});
+		async loadData() {
+			const res = await api.loginApi.getMeOrgListApi()
+			if (res) {
+				const list = transOrgFunc(res);
+				this.tree = list;
+			}
 		},
 		confirm(val) {
 			this.id = val[0].id;

+<template>
+	<view>
+		<u-popup bgColor="transparent" :overlay="true" :show="show" mode="bottom">
+			<view class="u-flex logout-main">
+				<view class="main"><text style="color: #999999">您确定要退出当前账号吗？</text></view>
+				<view @click="$emit('logoutBtn')" class="main"><text style="color: #f95e5a">退出登录</text></view>
+				<view class="cancel-text"><text @click="$emit('closeLogoutPopup')" style="color: #3478f7">取消</text>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			show: {
+				type: Boolean,
+				default: false
+			}
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import '../static/personal.scss';
+</style>
\ No newline at end of file

+const systemList = [{
+		url: '/sysnotify-subpackage/sys-notify/system-notify',
+		text: '系统通知',
+		leftIcon: '/static/sys-not.png',
+		rightIcon: '/static/arrow-right.png'
+	},
+	{
+		url: '/feedback-subpackage/feedback/feedback',
+		text: '意见反馈',
+		leftIcon: '/static/find-sugg.png',
+		rightIcon: '/static/arrow-right.png'
+	}
+]
+export {
+	systemList
+}
\ No newline at end of file

 <template>
-	<view class="personal">
+	<view class="personal-page">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<view class="head-box">
+		<view class="header-box">
 			<view class="u-flex u-p-l-30 u-p-r-20 u-p-t-75 u-p-b-30">
 				<block v-if="userInfo.isToken || userInfo.isThirdLogin">
 					<view @click.top="navigatorPersonal" class="u-m-r-20">
@@ -38,7 +38,7 @@
 		</view>
 		<view class="u-flex my-nav">
 			<view class="nav-main">
-				<view v-for="(item,index) in systemList" @click="onTokenJump(item.url)" class="u-flex nav-link">
+				<view v-for="(item,index) in systemList" :key="index" @click="onTokenJump(item.url)" class="u-flex nav-link">
 					<view class="nav-image">
 						<image class="image" :src="item.leftIcon"></image>
 					</view>
@@ -53,21 +53,9 @@
 			</view>
 		</view>
 		<!-- 绑定账号 -->
-		<view>
-			<bind-account-modal ref="bindAccountRef" :show="showBindAccount"
-				@cancelAccountModal="handleCancelAccountModal" />
-		</view>
+		<bind-account-modal ref="bindAccountRef" :show="showBindAccount" @cancelAccountModal="handleCancelAccountModal" />
 		<!-- 退出登录 -->
-		<view>
-			<u-popup bgColor="transparent" :overlay="true" :show="showLogout" mode="bottom">
-				<view class="u-flex logout-main">
-					<view class="main"><text style="color: #999999">您确定要退出当前账号？</text></view>
-					<view @click="logoutBtn" class="main"><text style="color: #f95e5a">退出登录</text></view>
-					<view class="cancel-text"><text @click="closeLogoutPopup" style="color: #3478f7">取消</text>
-					</view>
-				</view>
-			</u-popup>
-		</view>
+		<logout-account-modal ref="logoutAccountRef" :show="showLogout" @logoutBtn="logoutBtn"  @closeLogoutPopup="closeLogoutPopup"/>
 		<f-tabbar></f-tabbar>
 	</view>
 </template>
@@ -76,40 +64,24 @@
 	import fTabbar from '@/components/module/f-tabbar/f-tabbar';
 	import fNavbar from '@/components/module/f-navbar/f-navbar';
 	import bindAccountModal from './components/bind-account-modal.vue'
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import {
-		useNavigateTo,
-		useReLaunch,
-		useShowModal
-	} from '@/plugins/utils.js'
+	import logoutAccountModal from './components/logout-account-modal.vue'
+	import { mapState,mapMutations } from 'vuex';
+	import { useNavigateTo,useReLaunch,useShowModal } from '@/plugins/utils.js'
+	import { systemList } from './config/data.js'
 
 	export default {
 		components: {
 			fTabbar,
 			fNavbar,
-			bindAccountModal
+			bindAccountModal,
+			logoutAccountModal,
 		},
 		data() {
 			return {
 				showBindAccount: false,
 				showLogout: false,
 				thirdObj: {},
-				systemList: [{
-						url: '/sysnotify-subpackage/sys-notify/system-notify',
-						text: '系统通知',
-						leftIcon: '/static/sys-not.png',
-						rightIcon: '/static/arrow-right.png'
-					},
-					{
-						url: '/feedback-subpackage/feedback/feedback',
-						text: '意见反馈',
-						leftIcon: '/static/find-sugg.png',
-						rightIcon: '/static/arrow-right.png'
-					}
-				]
+				systemList,
 			};
 		},
 		onLoad(e) {
@@ -132,11 +104,13 @@
 			},
 			// 跳转前判断登录
 			onTokenJump(url) {
+				if(!url) return
 				this.judgeLogin(() => {
 					useNavigateTo(url)
 				});
 			},
 			onJump(url) {
+				if(!url) return
 				useNavigateTo(url)
 			},
 			navigatorLogin() {

-.personal {
+.personal-page {
 	background-color: #ffffff;
 	height: 100vh;
 }
-.head-box {
+.header-box {
 	background: linear-gradient(90deg, #8c9ef2 0%, #5f6ee6 100%);
 	border-top: 0.01px solid #f5f5f5;
 	height: 250rpx;

@@ -68,6 +68,9 @@ button {
 .mt-15{
 	margin-top: 15rpx;
 }
+.mt-20{
+	margin-top: 20rpx;
+}
 .mr-1{
 	margin-right: 10rpx;
 }
@@ -86,10 +89,21 @@ button {
 .w-100{
 	width: 100%;
 }
+.w-300{
+	width:300rpx;
+}
+.w-500{
+	width:500rpx;
+}
+.h-25{
+	height:25rpx;
+}
 .h-30{
 	height:30rpx;
 }
-
+.h-140{
+	height:140rpx;
+}
 //通用（设备、告警、摄像头分页头部组织和设备数和设备、告警里面的详情（左边的文本）
 .ml-10{
 	margin-left: 10rpx;

+const actions = [{
+		url: '/sysnotify-subpackage/sys-notify/system-notify',
+		text: '系统通知',
+		leftIcon: '/static/sys-not.png',
+		rightIcon: '/static/arrow-right.png'
+	},
+	{
+		url: '/feedback-subpackage/feedback/feedback',
+		text: '意见反馈',
+		leftIcon: '/static/find-sugg.png',
+		rightIcon: '/static/arrow-right.png'
+	}
+]
+export {
+	actions
+}
\ No newline at end of file

@@ -5,11 +5,11 @@
 		<view class="notify-column">
 			<view class="column-list">
 				<view class="column-title">
-					<view class="text-clip" style="width:500rpx">
+					<view class="text-clip w-500">
 						<text class="notify-detail-text ">{{ notifyList.title }}</text>
 					</view>
 				</view>
-				<view style="height: 25rpx;"></view>
+				<view class="h-25"></view>
 				<u-list height="140rpx">
 					<u-list-item>
 						<u-cell :value="`${notifyList.senderDate}`" :title="`${notifyList.senderName}`">
@@ -19,10 +19,9 @@
 				</u-list>
 				<view class="bottom-text">
 					<view class="u-flex column"></view>
-					<view style="margin-top: 21rpx;">
+					<view class="mt-20">
 						<!-- 富文本解析 -->
 						<u-parse :content="notifyList.content"></u-parse>
-						<!-- 富文本解析 -->
 					</view>
 				</view>
 			</view>

@@ -44,6 +44,7 @@
 	import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
 	import api from '@/api/index.js'
 	import { useNavigateTo } from '@/plugins/utils.js'
+	import { actions } from './config/data.js'
 
 	export default {
 		mixins: [MescrollMixin],
@@ -51,23 +52,7 @@
 			return {
 				notifyType:'',
 				showType: false,
-				actions: [{
-						name: '全部',
-						value: ''
-					},
-					{
-						name: '会议',
-						value: 'MEETING'
-					},
-					{
-						name: '公告',
-						value: 'NOTICE'
-					},
-					{
-						name: '其他',
-						value: 'OTHER'
-					}
-				],
+				actions,
 				page: {
 					page: 0,
 					pageSize: 10
@@ -86,7 +71,9 @@
 		},
 		methods: {
 			formatType(e) {
-				return this.actions.find((item)=>item.value===e && item.value!=='').name
+				const findName = this.actions.find((item)=>item.value===e && item.value!=='')
+				if(!findName) return
+				return findName.name
 			},
 			handleTypeClick() {
 				this.showType = true;