Feat/i18n support

张峰林 · xp.Huang
1 parent 2ca927eb
Showing 95 changed files with 2939 additions and 1446 deletions
App.vue
alarm-subpackage/alarm-detail/alarm-detail.vue
alarm-subpackage/alarm-detail/static/alarmDetail.scss
components/common/header-org.vue
components/common/header-search.vue
components/common/loading.vue
components/module/f-tabbar/f-tabbar.vue
config/baseUrl.js
config/i18n.js
config/request.js
device-subpackage/device-detail/components/alarm-history.vue
device-subpackage/device-detail/components/basic-info.vue
device-subpackage/device-detail/components/command-detail.vue
device-subpackage/device-detail/components/command-issuance.vue
device-subpackage/device-detail/components/command-record.vue
device-subpackage/device-detail/components/history-data.vue
device-subpackage/device-detail/components/seriesForm.vue
device-subpackage/device-detail/config/data.js
device-subpackage/device-detail/device-detail.vue
device-subpackage/device-detail/device-position.vue
--- a/App.vue
View file @3276544
+++ b/App.vue
View file @3276544
@@ -7,6 +7,7 @@
 			openId: ''
 		},
 		onLaunch(e) {
+			this.setI18nLocale()
 			// #ifdef APP-PLUS
 			uni.reLaunch({
 				url: '/pages/index/splash'
@@ -28,6 +29,26 @@
 				const userInfo = JSON.parse(sessionStorage.getItem('userInfo') || localStorage.getItem('userInfo'));
 				// #endif
 				return userInfo.isThirdLogin
+			},
+
+			// 判断i18n是中文还是英文
+			async setI18nLocale(){
+				// uni.setLocale('en')
+				try{
+					const {appLanguage} = (await uni.getSystemInfo())?.[1] || {}
+					if(appLanguage){
+						const i18n = appLanguage.includes('zh')?'zh-CN':'en'
+					
+						this.$i18n.locale = i18n
+						uni.setLocale(appLanguage.includes('zh')?'zh-Hans':'en')
+						return
+					}
+					this.$i18n.locale = 'zh-CN'
+					uni.setLocale('zh-Hans')
+				}catch{
+					this.$i18n.locale = uni.getLocale()
+					uni.setLocale('zh-Hans')
+				}
 			}
 		}
 	};
--- a/alarm-subpackage/alarm-detail/alarm-detail.vue
View file @3276544
+++ b/alarm-subpackage/alarm-detail/alarm-detail.vue
View file @3276544
@@ -3,15 +3,16 @@
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<view class="alarm-detail-column">
-			<view class="u-flex detail-column">
-				<view class="column-line" v-for="(item,index) in alarmDetail" :key="index">
-					<view class="column">
-						<text class="text-org-bold">{{item.label}}</text>
+			<view class="detail-column">
+				<view class="column-line" v-for="(item, index) in alarmDetail" :key="index">
+					<view class="column" style="display: flex;justify-content: space-between;">
+						<text class="text-org-bold-alarm">{{ $t(item.label )}}</text>
 						<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==='触发属性：'?formatAttrText:item.label==='告警设备：'?formatDeviceText:item.value}}
+							:style="{ color: hasColor.includes(item.label) ? '#DE4437' : '' }">
+							{{ item.label === hasColor[0] ?
+								setAlarmStatus(item.value) : item.label === hasColor[1] ? setAlarmSeverity(item.value) :
+									item.label === 'alarm.value' ? formatAlarmValueText : item.label === 'alarm.condition' ? formatAlarmConditionText
+										: item.label === 'alarm.attribute' ? formatAttrText : item.label === 'alarm.device' ? formatDeviceText : item.value }}
 						</text>
 					</view>
 					<view class="bottom-line"></view>
@@ -19,13 +20,13 @@
 			</view>
 		</view>
 		<!-- #ifdef MP -->
-		<view class="handle-result text-org-bold" style="">处理结果</view>
+		<view class="handle-result text-org-bold" style="">{{ $t('alarm.processResult') }}</view>
 		<view class="hanle-main">
 			<u--form :label-style="{ 'font-size': '0rpx' }" style="padding-left: 26rpx;" labelPosition="left"
 				:model="formModel" ref="form1">
 				<u-form-item label="." prop="result" ref="item3">
 					<view style="position: relative;left: -60rpx;">
-						<u--textarea border="none" height="96" placeholder="请输入处理结果" v-model="formModel.result" count>
+						<u--textarea border="none" height="96" :placeholder="$t('alarm.pleaseResult')" v-model="formModel.result" count>
 						</u--textarea>
 					</view>
 				</u-form-item>
@@ -33,212 +34,230 @@
 		</view>
 		<!-- #endif -->
 		<!-- #ifdef APP-PLUS -->
-		<view class="handle-result text-org-bold">处理结果</view>
+		<view class="handle-result text-org-bold">{{ $t('alarm.processResult') }}</view>
 		<view class="hanle-main">
 			<view>
-				<u--textarea border="none" height="96" placeholder="请输入处理结果" v-model="formModel.result" count>
+				<u--textarea border="none" height="96" :placeholder="$t('alarm.pleaseResult')" v-model="formModel.result" count>
 				</u--textarea>
 			</view>
 		</view>
 		<!-- #endif -->
 		<view class="bottom-button">
 			<view v-if="handleText.includes(alarmDetail[8].value)" class="u-flex button-item">
-				<u-button @click="handleSubmit" type="primary" shape="circle" text="处理"></u-button>
+				<u-button @click="handleSubmit" type="primary" shape="circle" :text="$t('alarm.handle')"></u-button>
 			</view>
 			<view v-if="clearText.includes(alarmDetail[8].value)" class="u-flex button-item">
-				<u-button @click="handleRemove" type="error" shape="circle" text="清除"></u-button>
+				<u-button @click="handleRemove" type="error" shape="circle" :text="$t('alarm.cleanUp')"></u-button>
 			</view>
 		</view>
 	</view>
 </template>
 <script>
-	import {
-		mapActions
-	} from 'vuex'
-	import api from '@/api/index.js'
-	import {
-		alarmSeverity,
-		alarmStatus,
-		operationNumberOrDate,
-		operationString,
-		operationBoolean
-	} from '@/pages/alarm/config/data.js';
-	import {
-		useShowToast,
-		useNavigateBack
-	} from '@/plugins/utils.js'
+import {
+	mapActions
+} from 'vuex'
+import api from '@/api/index.js'
+import {
+	alarmSeverity,
+	alarmStatus,
+	operationNumberOrDate,
+	operationString,
+	operationBoolean
+} from '@/pages/alarm/config/data.js';
+import {
+	useShowToast,
+	useNavigateBack
+} from '@/plugins/utils.js'
-	export default {
-		data() {
-			return {
-				handleText: ['ACTIVE_UNACK', 'CLEARED_UNACK'],
-				clearText: [ 'ACTIVE_ACK'],
-				hasColor: ['告警级别：', '告警状态：'],
-				alarmSeverity,
-				alarmStatus,
-				operationNumberOrDate,
-				operationString,
-				operationBoolean,
-				formModel: {
-					result: ''
-				},
-				detailId: '',
-				alarmDetail: [],
-				formatDeviceText: '',
-				formatAlarmValueText: '',
-				formatAlarmConditionText: '',
-				formatAttrText:'',
-			};
+export default {
+	data() {
+		return {
+			handleText: ['ACTIVE_UNACK', 'CLEARED_UNACK'],
+			clearText: ['ACTIVE_ACK'],
+			hasColor: ['alarm.level', 'alarm.status'],
+			alarmSeverity,
+			alarmStatus,
+			operationNumberOrDate,
+			operationString,
+			operationBoolean,
+			formModel: {
+				result: ''
+			},
+			detailId: '',
+			alarmDetail: [],
+			formatDeviceText: '',
+			formatAlarmValueText: '',
+			formatAlarmConditionText: '',
+			formatAttrText: '',
+		};
+	},
+	onShow() {
+		this.$nextTick(() => {
+			uni.setNavigationBarTitle({
+				title: this.$t('menu.alarmDetail')
+			})
+		})
+	},
+	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: 'alarm.scenario', value: type },
+				{ label: 'alarm.level', value: severity },
+				{ label: 'alarm.organization', value: organizationName },
+				{ label: 'alarm.device', value: '' },
+				{ label: 'alarm.attribute', value: '' },
+				{ label: 'alarm.condition', value: '' },
+				{ label: 'alarm.value', value: '' },
+				{ label: 'alarm.time', value: createdTime },
+				{ label: 'alarm.status', 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();
+	},
+	methods: {
+		...mapActions(['updateBadgeTotal']),
+		setAlarmStatus(value) {
+			const values = this.alarmSeverity.find(item => item.value === value).label
+			return values?this.$t(values):values
+		},
+		setAlarmSeverity(value) {
+			const values = this.alarmStatus.find(item => item.value === value).label
+			return values?this.$t(values):''
+		},
+		returnPrevPage(title) {
+			useShowToast(title)
+			let pages = getCurrentPages(); //获取所有页面栈实例列表
+			let nowPage = pages[pages.length - 1]; //当前页页面实例
+			let prevPage = pages[pages.length - 2]; //上一页页面实例
+			prevPage.$vm.detailStatus = true;
 		},
-		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: ''},{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)
+		async handleSubmit() {
+			if (this.formModel.result == '') return uni.$u.toast(this.$t('alarm.pleaseResult'));
+			const res = await api.alarmApi.postAlarmAckApi(this.detailId)
+			if (res == '') {
+				this.returnPrevPage(this.$t('common.processSuccess'))
+				setTimeout(() => {
+					useNavigateBack(1)
+				}, 500);
 			}
-			// 隐藏原生的tabbar
-			uni.hideTabBar();
 		},
-		methods: {
-			...mapActions(['updateBadgeTotal']),
-			setAlarmStatus(value) {
-				return this.alarmSeverity.find(item => item.value === value).label
-			},
-			setAlarmSeverity(value) {
-				return this.alarmStatus.find(item => item.value === value).label
-			},
-			returnPrevPage(title) {
-				useShowToast(title)
-				let pages = getCurrentPages(); //获取所有页面栈实例列表
-				let nowPage = pages[pages.length - 1]; //当前页页面实例
-				let prevPage = pages[pages.length - 2]; //上一页页面实例
-				prevPage.$vm.detailStatus = true;
-			},
-			async handleSubmit() {
-				if (this.formModel.result == '') return uni.$u.toast('请输入处理结果');
-				const res = await api.alarmApi.postAlarmAckApi(this.detailId)
-				if (res == '') {
-					this.returnPrevPage('处理成功~')
-					setTimeout(() => {
-						useNavigateBack(1)
-					}, 500);
-				}
-			},
-			async handleRemove() {
-				const res = await api.alarmApi.postAlarmClearApi(this.detailId)
-				if (res == '') {
-					this.returnPrevPage('清除成功~')
-					setTimeout(async () => {
-						useNavigateBack(1)
-						const res = await uni.$u.http.get('/yt/homepage/app?login=true');
-						if (res) {
-							//异步实时更新告警徽标数
-							await this.updateBadgeTotal(res.totalAlarm?.activedAlarm);
-						}
-					}, 500);
-				}
-			},
-			//触发值处理
-			 formatAlarmValue(e,dataFormat) {
-				const keys = Object.keys(e)
-				const values = keys.reduce((acc, curr) => {
-					const items = e[curr]?.triggerData
-					dataFormat.forEach((dataItem => {
-						if (dataItem.tbDeviceId === curr) {
-							if(!items?.realValue) return
-							acc.push(
-								`${items.realValue}`
-							)
-						}
-					}))
-					return acc
-				}, [])
-				this.formatAlarmValueText = values.join(',')
-			},
-			//触发条件处理
-			formatAlarmCondition(e) {
-				const keys = Object.keys(e)
-				const values = keys.reduce((acc, curr) => {
-					acc.push({
-						login: e[curr]?.triggerData?.logic,
-						logicValue: e[curr]?.triggerData?.logicValue
-					})
-					return acc
-				}, [])
-				const operation = [...operationNumberOrDate, ...operationString, ...operationBoolean]
-				const format = values.map(item => {
-					const findOperation = operation.find(findItem => findItem.value === item.login)?.symbol
-					return findOperation + item.logicValue
+		async handleRemove() {
+			const res = await api.alarmApi.postAlarmClearApi(this.detailId)
+			if (res == '') {
+				this.returnPrevPage(this.$t('common.clearSuccess'))
+				setTimeout(async () => {
+					useNavigateBack(1)
+					const res = await uni.$u.http.get('/yt/homepage/app?login=true');
+					if (res) {
+						//异步实时更新告警徽标数
+						await this.updateBadgeTotal(res.totalAlarm?.activedAlarm);
+					}
+				}, 500);
+			}
+		},
+		//触发值处理
+		formatAlarmValue(e, dataFormat) {
+			const keys = Object.keys(e)
+			const values = keys.reduce((acc, curr) => {
+				const items = e[curr]?.triggerData
+				dataFormat.forEach((dataItem => {
+					if (dataItem.tbDeviceId === curr) {
+						if (!items?.realValue) return
+						acc.push(
+							`${items.realValue}`
+						)
+					}
+				}))
+				return acc
+			}, [])
+			this.formatAlarmValueText = values.join(',')
+		},
+		//触发条件处理
+		formatAlarmCondition(e) {
+			const keys = Object.keys(e)
+			const values = keys.reduce((acc, curr) => {
+				acc.push({
+					login: e[curr]?.triggerData?.logic,
+					logicValue: e[curr]?.triggerData?.logicValue
 				})
-				this.formatAlarmConditionText = format.filter(Boolean).join(',')
-			},
-			// 触发属性
-			formatAttr(e,dataFormat){
-				const keys = Object.keys(e)
-				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(',')
-			},
-			async handleAlarmDetailFormat(keys) {
-				const temp = [];
-				for (let item of keys) {
-					if (item === 'key' || item === 'data') return; //旧数据则终止
-					const deviceDetailRes = await api.deviceApi.getDeviceDetail(item);
-					const { deviceProfileId } = deviceDetailRes;
-					if (!deviceProfileId) return;
-					const attributeRes = await api.deviceApi.getAttribute(deviceProfileId);
-					const dataFormat = this.handleDataFormat(deviceDetailRes, attributeRes);
-					temp.push(dataFormat);
-				}
-				return temp;
-			},
-			handleDataFormat(deviceDetail, attributes) {
-				const { name,tbDeviceId } = deviceDetail;
-				const attribute = attributes.map((item) => ({
-					identifier: item.identifier,
-					name: item.name,
-					detail: item.detail
-				}));
-				return {
-					name,
-					tbDeviceId,
-					attribute,
-				};
+				return acc
+			}, [])
+			const operation = [...operationNumberOrDate, ...operationString, ...operationBoolean]
+			const format = values.map(item => {
+				const findOperation = operation.find(findItem => findItem.value === item.login)?.symbol
+				return findOperation + item.logicValue
+			})
+			this.formatAlarmConditionText = format.filter(Boolean).join(',')
+		},
+		// 触发属性
+		formatAttr(e, dataFormat) {
+			const keys = Object.keys(e)
+			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(',')
+		},
+		async handleAlarmDetailFormat(keys) {
+			const temp = [];
+			for (let item of keys) {
+				if (item === 'key' || item === 'data') return; //旧数据则终止
+				const deviceDetailRes = await api.deviceApi.getDeviceDetail(item);
+				const { deviceProfileId } = deviceDetailRes;
+				if (!deviceProfileId) return;
+				const attributeRes = await api.deviceApi.getAttribute(deviceProfileId);
+				const dataFormat = this.handleDataFormat(deviceDetailRes, attributeRes);
+				temp.push(dataFormat);
 			}
+			return temp;
+		},
+		handleDataFormat(deviceDetail, attributes) {
+			const { name, tbDeviceId } = deviceDetail;
+			const attribute = attributes.map((item) => ({
+				identifier: item.identifier,
+				name: item.name,
+				detail: item.detail
+			}));
+			return {
+				name,
+				tbDeviceId,
+				attribute,
+			};
 		}
-	};
+	}
+};
 </script>
 <style lang="scss" scoped>
-	@import './static/alarmDetail.scss';
+@import './static/alarmDetail.scss';
-	/deep/ .u-button--primary {
-		background-color: #377dff !important;
-		border-color: #377dff !important;
-	}
+/deep/ .u-button--primary {
+	background-color: #377dff !important;
+	border-color: #377dff !important;
+}
 </style>
--- a/alarm-subpackage/alarm-detail/static/alarmDetail.scss
View file @3276544
+++ b/alarm-subpackage/alarm-detail/static/alarmDetail.scss
View file @3276544
@@ -3,15 +3,23 @@
 	height: 100vh;
 	background-color: #f8f9fa;
 }
+.text-org-bold-alarm {
+	min-width:200rpx;
+	color: #333333;
+	font-family: PingFangSC-Medium, PingFang SC;
+	font-weight: 400;
+	font-size: 15px;
+}
 .alarm-detail-column {
 	border-radius: 10px;
 	width: 688rpx;
 	height: 780rpx;
 	background-color: #ffffff;
 	.detail-column {
-		width:750rpx;
+		width:688rpx;
 		flex-direction: column;
 		align-items: center;
+		padding:0 12rpx;
 		.column-line{
 			display:flex;
 			flex-direction: column;
@@ -19,15 +27,16 @@
 				display:flex;
 				margin-top: 10rpx;
 				line-height: 68rpx;
-				width:700rpx;
+				width:664rpx;
 				height: 74rpx;
 				align-items: center;
 				.device-name{
 					width:222rpx;
 				}
 				.alarm-text{
-					width:460rpx;
+					width:330rpx;
 					overflow-x: scroll;
+					text-overflow: ellipsis;
 				}
 				.text {
--- a/components/common/header-org.vue
View file @3276544
+++ b/components/common/header-org.vue
View file @3276544
 <template>
 	<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-contact"><text class="text">{{ $t('common.organizationalRelation') }}</text></view>
 			<view class="u-flex org-device">
 				<image class="device-image" :src="imageSrc"></image>
 				<text class="device-text">{{title}}  {{ total }}</text>
@@ -37,7 +37,7 @@
 		// top: 75rpx;
 		.org-item {
-			width: 350rpx;
+			// width: 350rpx;
 			height: 200rpx;
 			.org-contact {
--- a/components/common/header-search.vue
View file @3276544
+++ b/components/common/header-search.vue
View file @3276544
@@ -8,13 +8,13 @@
 					</view>
 				</view>
 				<view @click="$emit('openSearchDialog')" class="search-right">
-					<text>筛选</text>
+					<text>{{ $t('common.screen') }}</text>
 					<image src="../../static/shaixuan.png" />
 				</view>
 			</view>
 			<u-line />
 			<view class="org">
-				<u-cell @click="$emit('openOrg')" isLink title="组织关系" :border="false">
+				<u-cell @click="$emit('openOrg')" isLink :title="$t('common.organizationalRelateion')" :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;">
@@ -94,4 +94,4 @@
 			}
 		}
 	}
-</style>
+</style>
--- a/components/common/loading.vue
View file @3276544
+++ b/components/common/loading.vue
View file @3276544
@@ -11,7 +11,7 @@
           </view>
 		</view>
 		<!-- 加载动画结束 -->
-		<view class="title">加载中...</view>
+		<view class="title">{{ $t('common.loading') }}</view>
 	</view>
 </template>
--- a/components/module/f-tabbar/f-tabbar.vue
View file @3276544
+++ b/components/module/f-tabbar/f-tabbar.vue
View file @3276544
@@ -6,7 +6,7 @@
 				:safeAreaInsetBottom="false" :activeColor="activeColor" :inactiveColor="inactiveColor" :border="border">
 				<block v-for="(item, index) in list" :key="index">
 					<!-- 自定义icon -->
-					<u-tabbar-item :text="item.name" :badge="item.badge" :dot="item.dot" :badgeStyle="item.badgeStyle">
+					<u-tabbar-item :text="$t(item.name)" :badge="item.badge" :dot="item.dot" :badgeStyle="item.badgeStyle">
 						<view slot="active-icon">
 							<image style="width:50rpx;height: 50rpx;" :src="item.iconFill" mode=""></image>
 						</view>
@@ -81,26 +81,26 @@
 				path: '', //当前路径
 				//#ifdef MP
 				list: [{
-						name: '首页',
+						name: 'menu.homePage',
 						url: 'pages/index/index',
 						icon: '../../../static/home-un.png',
 						iconFill: '../../../static/home-yes.png'
 					},
 					{
-						name: '设备',
+						name: 'menu.device',
 						url: 'pages/device/device',
 						icon: '../../../static/device-un.png',
 						iconFill: '../../../static/device-yes.png'
 					},
 					{
-						name: '告警',
+						name: 'menu.alarm',
 						url: 'pages/alarm/alarm',
 						icon: '../../../static/alert-un.png',
 						iconFill: '../../../static/alert-yes.png',
 						badge: this.$store.state.badgeInfo
 					},
 					{
-						name: '我的',
+						name: 'menu.my',
 						url: 'pages/personal/personal',
 						icon: '../../../static/my-un.png',
 						iconFill: '../../../static/my-yes.png'
@@ -109,26 +109,26 @@
 				//#endif
 				//#ifdef APP-PLUS
 				list: [{
-						name: '首页',
+						name: 'menu.homePage',
 						url: 'pages/index/index',
 						icon: '/static/home-un.png',
 						iconFill: '/static/home-yes.png'
 					},
 					{
-						name: '设备',
+						name: 'menu.device',
 						url: 'pages/device/device',
 						icon: '/static/device-un.png',
 						iconFill: '/static/device-yes.png'
 					},
 					{
-						name: '告警',
+						name: 'menu.alarm',
 						url: 'pages/alarm/alarm',
 						icon: '/static/alert-un.png',
 						iconFill: '/static/alert-yes.png',
 						badge: this.$store.state.badgeInfo
 					},
 					{
-						name: '我的',
+						name: 'menu.my',
 						url: 'pages/personal/personal',
 						icon: '/static/my-un.png',
 						iconFill: '/static/my-yes.png'
@@ -189,4 +189,4 @@
 		right: 0;
 		z-index: 1000;
 	}
-</style>
+</style>
--- a/config/baseUrl.js
View file @3276544
+++ b/config/baseUrl.js
View file @3276544
-import {
-	getTabbarHeight
-} from "@/plugins/utils";
+import { getTabbarHeight } from '@/plugins/utils'
 /**
  * 服务端配置项
  * baseUrl 服务端 api地址
@@ -9,49 +7,50 @@ import {
  * baseWebSocketUrl 服务端 websocket地址
  * socketPrefix websocket前缀 ((https, wss),( http, ws))
  */
-const baseUrl = "http://localhost:8080/api";
-const baseVisualUrl = "http://localhost:9527"
+const baseUrl = 'http://localhost:8080/api'
+// const baseUrl = 'http://192.168.1.9:8080/api'
+const baseVisualUrl = 'http://localhost:9527'
 // const baseVisualUrl = "http://192.168.1.4:8083"
-const baseDrawioUrl = "http://localhost:9527/thingskit-scada";
-const baseWebSocketUrl = "localhost:8080";
-const socketPrefix = "ws";
+const baseDrawioUrl = 'http://localhost:9527/thingskit-scada'
+const baseWebSocketUrl = 'localhost:8080'
+const socketPrefix = 'ws'
 let systemInfo = {
-	...getTabbarHeight(),
-	// #ifdef MP-ALIPAY
-	navBarH: uni.getSystemInfoSync().statusBarHeight +
-		uni.getSystemInfoSync().titleBarHeight, //菜单栏总高度--单位px
-	titleBarHeight: uni.getSystemInfoSync().titleBarHeight, //标题栏高度--单位px
-	// #endif
-	// #ifndef MP-ALIPAY
-	navBarH: uni.getSystemInfoSync().statusBarHeight + 44, //菜单栏总高度--单位px
-	titleBarHeight: 44, //标题栏高度--单位px
-	// #endif
-};
+  ...getTabbarHeight(),
+  // #ifdef MP-ALIPAY
+  navBarH: uni.getSystemInfoSync().statusBarHeight + uni.getSystemInfoSync().titleBarHeight, //菜单栏总高度--单位px
+  titleBarHeight: uni.getSystemInfoSync().titleBarHeight, //标题栏高度--单位px
+  // #endif
+  // #ifndef MP-ALIPAY
+  navBarH: uni.getSystemInfoSync().statusBarHeight + 44, //菜单栏总高度--单位px
+  titleBarHeight: 44, //标题栏高度--单位px
+  // #endif
+}
 // 平台
 // #ifdef MP-WEIXIN
-systemInfo.platform = "weixin";
+systemInfo.platform = 'weixin'
 // #endif
 // #ifdef MP-ALIPAY
-systemInfo.platform = "alipay";
+systemInfo.platform = 'alipay'
 // #endif
 // #ifdef MP-TOUTIAO
-systemInfo.platform = "toutiao";
+systemInfo.platform = 'toutiao'
 // #endif
 // #ifdef APP-PLUS
-systemInfo.platform = "plus";
+systemInfo.platform = 'plus'
 // #endif
 const courtConfig = {
-	publicAppId: "", //公众号appId
-	baseUrl, //服务端地址
-	baseVisualUrl,//服务端看板地址
-	baseDrawioUrl, //服务端组态地址
-	baseWebSocketUrl, //服务端websocket地址
-	socketPrefix, //websocket前缀
-	systemInfo: systemInfo, //系统信息
-	mapData: {
-		key: "", //地图key
-		sk: "",
-	},
-};
-export default Object.assign({}, courtConfig);
+  publicAppId: '', //公众号appId
+  baseUrl, //服务端地址
+  baseVisualUrl, //服务端看板地址
+  baseDrawioUrl, //服务端组态地址
+  baseWebSocketUrl, //服务端websocket地址
+  socketPrefix, //websocket前缀
+  systemInfo: systemInfo, //系统信息
+  mapData: {
+    key: '', //地图key
+    sk: '',
+  },
+}
+export default Object.assign({}, courtConfig)
+
--- a/config/i18n.js 0 → 100644
View file @3276544
+++ b/config/i18n.js 0 → 100644
View file @3276544
+import Vue from 'vue'
+import VueI18n from 'vue-i18n'
+import zh from '@/locale/lang/zh-CN'
+import en from '@/locale/lang/en'
+Vue.use(VueI18n)
+let i18n = new VueI18n({
+  locale: uni.getLocale() || 'zh-CN',
+  messages: {
+    'zh-CN': zh,
+    'en': en
+  }
+})
+
+export default i18n
--- a/config/request.js
View file @3276544
+++ b/config/request.js
View file @3276544
 import base from "@/config/baseUrl";
 import store from "@/store";
+import i18n from '@/config/i18n.js'
 import {
 	judgeLogin
 } from "@/config/login";
+const BackEndLocaleMapping = {
+	'en': 'en_US ',
+	'zhCN': 'zh_CN',
+	'zh-Hans': 'zh_CN'
+};
+
 // 初始化请求配置
 uni.$u.http.setConfig((config) => {
 	const token =
@@ -49,6 +56,7 @@ uni.$u.http.interceptors.request.use(
 				"Bearer " + store.state.userInfo.isToken ||
 				uni.getStorageSync("userInfo").isToken ||
 				undefined;
+			config.header['Language'] = BackEndLocaleMapping[uni.getLocale()] || 'zh_CN'
 			config.baseURL =
 				getConfiguration == true ? base.baseDrawioUrl : base.baseUrl;
 		}
@@ -83,20 +91,25 @@ uni.$u.http.interceptors.response.use(
 			store.commit("emptyUserInfo");
 			// 20秒节流，弹窗登录
 			uni.$u.throttle(judgeLogin(), 20000);
-			return new Promise(() => {});
-		} else {}
+			return new Promise(() => { });
+		} else { }
 	},
 	(response) => {
+		console.log(response, 'response2', i18n.t('common.cancelText'))
+		if (!response) {
+			uni.$u.toast(i18n.t('login.pleaseNetwork'))
+			return
+		}
 		// 关闭加载动画
 		store.commit("setLoadingShow", false);
 		let show = true;
-		let errorData = "请检查网络或服务器";
+		let errorData = i18n.t('login.pleaseNetwork');
 		let message =
 			response.data?.message || response.data?.msg || response?.errMsg;
 		if (message == "request:fail url not in domain list") {
-			errorData = "检查请求域名是否添加了域名白名单";
+			errorData = i18n.t('login.inspectDomain');
 		} else if (message == "request:fail timeout") {
-			errorData = "请求超时:请检查网络";
+			errorData = i18n.t('login.requestTimeout');
 		} else if (response.data.status == 401) {
 			const isLoginFlag = uni.getStorageSync("userInfo");
 			if (!store.state.userInfo.isThirdLogin) {
@@ -125,10 +138,10 @@ uni.$u.http.interceptors.response.use(
 			errorData = message || "";
 		}
 		// console.log('errorData', errorData);
-		if(message != "request:ok"){
+		if (message != "request:ok") {
 			uni.$u.toast(message);
 		}
 		// if (show) uni.$u.toast(errorData);
 		return Promise.reject(response);
 	}
-);
+);
--- a/device-subpackage/device-detail/components/alarm-history.vue
View file @3276544
+++ b/device-subpackage/device-detail/components/alarm-history.vue
View file @3276544
@@ -2,7 +2,7 @@
 	<view class="alert-page">
 		<!-- 告警头部 -->
 		<view class="filter-button" @click="openSearchDialog">
-			<text>筛选</text>
+			<text>{{ $t('common.screen') }}</text>
 			<image src="/static/shaixuan.png" />
 		</view>
 		<!-- 告警分页 -->
@@ -159,4 +159,4 @@
 			margin-left: 4rpx;
 		}
 	}
-</style>
+</style>
--- a/device-subpackage/device-detail/components/basic-info.vue
View file @3276544
+++ b/device-subpackage/device-detail/components/basic-info.vue
View file @3276544
@@ -20,39 +20,39 @@
 			<view class="mr-2"
 				v-if="deviceDetail.deviceState === 'ONLINE' && deviceDetail.transportType !== deviceTypeNum.GBT">
 				<view class="cu-item" @tap="handleAppShowModal" data-target="Modal">
-					<text>命令下发</text>
+					<text>{{ $t('device.commandIssuance') }}</text>
 				</view>
 			</view>
 		</view>
 		<!-- 设备详情 -->
 		<view class="detail">
 			<view class="detail-item">
-				<view class="detail-label">设备编号</view>
+				<view class="detail-label">{{ $t('device.deviceNumber') }}</view>
 				<view class="detail-value">{{ deviceDetail.sn }}</view>
 			</view>
 			<u-line length="90%" margin="0 auto"></u-line>
 			<view class="detail-item">
-				<view class="detail-label">设备类型</view>
+				<view class="detail-label">{{ $t('device.deviceType') }}</view>
 				<view class="detail-value">{{ deviceType }}</view>
 			</view>
 			<u-line length="90%" margin="0 auto"></u-line>
 			<view class="detail-item">
-				<view class="detail-label">所属组织</view>
+				<view class="detail-label">{{ $t('common.belongingOrganization') }}</view>
 				<view class="detail-value">{{ deviceDetail.organizationDTO.name }}</view>
 			</view>
 			<u-line length="90%" margin="0 auto"></u-line>
 			<view class="detail-item">
-				<view class="detail-label">最后连接时间</view>
+				<view class="detail-label">{{ $t('device.lastConnectionTime') }}</view>
 				<view class="detail-value">{{ formatLastOnlineTime }}</view>
 			</view>
 			<u-line length="90%" margin="0 auto"></u-line>
 			<view class="detail-item">
-				<view class="detail-label">是否告警</view>
+				<view class="detail-label">{{ $t('device.isAlarm') }}</view>
 				<view class="detail-value">{{ alarmStatus }}</view>
 			</view>
 			<u-line length="90%" margin="0 auto"></u-line>
 			<view class="detail-item">
-				<view class="detail-label">设备描述</view>
+				<view class="detail-label">{{ $t('device.deviceRemark') }}</view>
 				<view class="detail-value">{{ deviceDetail.description }}</view>
 			</view>
 		</view>
@@ -118,20 +118,20 @@
 		},
 		computed: {
 			deviceStatus() {
-				return this.deviceDetail.deviceState === 'INACTIVE' ? '待激活' : this.deviceDetail.deviceState === 'ONLINE' ?
-					'在线' : '离线';
+				return this.deviceDetail.deviceState === 'INACTIVE' ? this.$t('common.toBeActivated') : this.deviceDetail.deviceState === 'ONLINE' ?
+					this.$t('common.onLine') : this.$t('common.offLine');
 			},
 			deviceType() {
 				return this.deviceDetail.deviceType === 'DIRECT_CONNECTION' ?
-					'直连设备' :
+					this.$t('common.directlyDevice') :
 					this.deviceDetail.deviceType === 'GATEWAY' ?
-					'网关设备' :
+					this.$t('common.gatewayDevice') :
 					this.deviceDetail.deviceType === 'SENSOR' ?
-					'网关子设备' :
+					this.$t('common.sensorDevice') :
 					'';
 			},
 			alarmStatus() {
-				return this.deviceDetail.alarmStatus === '0' ? '否' : '是';
+				return this.deviceDetail.alarmStatus === '0' ? this.$t('common.noText') : this.$t('common.yesText');
 			},
 			formatLastOnlineTime() {
 				return formatToDate(Number(this.deviceDetail.lastOnlineTime), 'YYYY-MM-DD HH:mm:ss');
@@ -147,12 +147,12 @@
 		},
 		methods: {
 			handleCopy(value) {
-				useShowModal(JSON.stringify(value), '命令下发', '复制内容').then(res => {
+				useShowModal(JSON.stringify(value), this.$t('device.commandIssuance'), this.$t('common.copyContent')).then(res => {
 					uni.setClipboardData({
 						data: JSON.stringify(value),
 						success: () => {
 							uni.showToast({
-								title: '复制成功'
+								title: this.$t('common.copyOk')
 							})
 						}
 					});
@@ -216,12 +216,12 @@
 				this.handleCommand(this.commandTypeStr, this.commandTypeStr, this.inputCommandContent)
 			},
 			async handleCommand(commandType, callType, values) {
-				if (!values) return uni.$u.toast('请输入下发内容~');
+				if (!values) return uni.$u.toast(this.$t('device.pleaseEnterCommandContent'));
 				if (callType == 'TwoWay') {
 					const result = await api.deviceApi.getDeviceActiveTime(this.deviceDetail.tbDeviceId)
 					const [firsetItem] = result || []
 					if (!firsetItem.value) {
-						return uni.$u.toast('当前设备不在线~')
+						return uni.$u.toast(this.$t('device.currentDeviceNotOnLine'))
 					}
 				}
@@ -236,7 +236,7 @@
 						//TCP的格式只能是字符串
 						const zg = /^[0-9a-zA-Z]*$/;
 						if (!zg.test(values)) {
-							uni.$u.toast('输入的内容只能是字母和数字的组合');
+							uni.$u.toast(this.$t('device.pleaseCommandRule'));
 							return;
 						}
 						this.commandValue.params = values;
@@ -247,7 +247,7 @@
 				await api.deviceApi.issueCommand(callType, this.deviceDetail.tbDeviceId, this.commandValue);
 				this.cancelCommand();
-				uni.$u.toast('下发成功~');
+				uni.$u.toast(this.$t('device.issuedSuccess'));
 			},
 		}
@@ -392,4 +392,4 @@
 	/deep/ .u-modal__content {
 		padding: 30rpx 0 !important;
 	}
-</style>
+</style>
--- a/device-subpackage/device-detail/components/command-detail.vue
View file @3276544
+++ b/device-subpackage/device-detail/components/command-detail.vue
View file @3276544
@@ -3,47 +3,47 @@
 		<view class="detail-top">{{ commandDetail.deviceName }}</view>
 		<view class="detail">
 			<view class="detail-item">
-				<view class="detail-label">设备类型</view>
-				<view class="detail-value">{{ deviceType }}</view>
+				<view class="detail-label">{{ $t('device.deviceType') }}</view>
+				<view class="detail-value">{{ $t(deviceType) }}</view>
 			</view>
 			<u-line length="90%" margin="0 auto"></u-line>
 			<view class="detail-item">
-				<view class="detail-label">设备编号</view>
+				<view class="detail-label">{{$t('device.deviceNumber')}}</view>
 				<view class="detail-value">{{ commandDetail.deviceSn }}</view>
 			</view>
 			<u-line length="90%" margin="0 auto"></u-line>
-			<view class="detail-item">
-				<view class="detail-label">所属组织</view>
+			<view class="detail-item">s
+				<view class="detail-label">{{ $t('common.belongingOrganization') }}</view>
 				<view class="detail-value">{{ commandDetail.organizationName }}</view>
 			</view>
 			<u-line length="90%" margin="0 auto"></u-line>
 			<view class="detail-item">
-				<view class="detail-label">命令下发时间</view>
+				<view class="detail-label">{{ $t('device.commandTime') }}</view>
 				<view class="detail-value">{{ format(commandDetail.createTime) }}</view>
 			</view>
 			<u-line length="90%" margin="0 auto"></u-line>
 			<view class="detail-item">
-				<view class="detail-label">命令类型</view>
-				<view class="detail-value">{{ commandDetail.additionalInfo.cmdType===1?'服务':'自定义' }}</view>
+				<view class="detail-label">{{ $t('device.commandType') }}</view>
+				<view class="detail-value">{{ commandDetail.additionalInfo.cmdType===1?$t('device.service'):$t('common.customText') }}</view>
 			</view>
 			<u-line length="90%" margin="0 auto" v-if="commandDetail.additionalInfo.cmdType"></u-line>
 			<view class="detail-item">
-				<view class="detail-label">响应类型</view>
-				<view class="detail-value">{{ commandDetail.request.oneway ? '单向' : '双向' }}</view>
+				<view class="detail-label">{{ $t('device.responseType') }}</view>
+				<view class="detail-value">{{ commandDetail.request.oneway ? $t('device.oneWay') : $t('device.twoWay') }}</view>
 			</view>
 			<u-line length="90%" margin="0 auto"></u-line>
 			<view class="detail-item">
-				<view class="detail-label">命令状态</view>
+				<view class="detail-label">{{ $t('device.commandStatus') }}</view>
 				<view class="detail-value">{{ commandDetail.statusName }}</view>
 			</view>
 			<u-line length="90%" margin="0 auto"></u-line>
 			<view class="detail-item" v-if="!commandDetail.request.oneway">
-				<view class="detail-label">响应结果</view>
-				<view class="detail-value">{{ commandDetail.response?JSON.stringify(commandDetail.response):'无' }}
+				<view class="detail-label">{{ $t('device.responseResults') }}</view>
+				<view class="detail-value">{{ commandDetail.response?JSON.stringify(commandDetail.response):$t('common.noText') }}
 				</view>
 			</view>
 		</view>
-		<view class="command">命令内容</view>
+		<view class="command">{{ $t('device.commandContent') }}</view>
 		<u-textarea :value="formatValue(commandDetail.request.body)" disabled></u-textarea>
 		<view style="height: 50rpx;"></view>
 	</view>
@@ -62,12 +62,13 @@
 		},
 		computed: {
 			deviceType() {
+				
 				return this.commandDetail.deviceType === 'DIRECT_CONNECTION' ?
-					'直连设备' :
+					'common.directlyDevice' :
 					this.commandDetail.deviceType === 'GATEWAY' ?
-					'网关设备' :
+					'common.gatewayDevice' :
 					this.commandDetail.deviceType === 'SENSOR' ?
-					'网关子设备' :
+					'common.sensorDevice' :
 					'';
 			}
 		},
@@ -90,6 +91,13 @@
 				}
 			}
 		},
+		onShow(){
+			this.$nextTick(()=>{
+				uni.setNavigationBarTitle({
+					title:this.$t('menu.commandDetail')
+				})
+			})	
+		},
 		onLoad(options) {
 			const { data } = options;
 			this.commandDetail = JSON.parse(decodeURIComponent(data));
@@ -101,4 +109,4 @@
 <style lang="scss" scoped>
 	@import "../static/command-detail.scss";
-</style>
+</style>
--- a/device-subpackage/device-detail/components/command-issuance.vue
View file @3276544
+++ b/device-subpackage/device-detail/components/command-issuance.vue
View file @3276544
@@ -2,26 +2,26 @@
 	<view class="w-100 modal-content">
 		<view>
 			<view style="max-height: 560rpx; overflow-y: scroll">
-				<view class="header-title">命令下发</view>
+				<view class="header-title">{{ $t('device.commandIssuance') }}</view>
 				<view class="u-flex">
-					<text class="type-text">下发类型:</text>
+					<text class="type-text">{{ $t('device.issuanceType') }}:</text>
 					<u-radio-group v-model="commandType" placement="row" @change="handleCommand">
 						<u-radio :customStyle="{ marginRight: '20rpx' }" v-for="item in commandTypeList"
 							activeColor="#3388FF" :label="item.label" :name="item.value" :key="item.value"></u-radio>
 					</u-radio-group>
 				</view>
 				<view class="u-flex" style="margin-top: 28rpx" v-if="commandType == 0">
-					<text class="type-text">单向/双向:</text>
+					<text class="type-text">{{ $t('device.oneTwoWay') }}:</text>
 					<u-radio-group v-model="callType" placement="row">
-						<u-radio activeColor="#3388FF" label="单向" name="OneWay"></u-radio>
+						<u-radio activeColor="#3388FF" :label="$t('device.oneWay')" name="OneWay"></u-radio>
 						<view style="margin: 0 20rpx"></view>
-						<u-radio activeColor="#3388FF" label="双向" name="TwoWay"></u-radio>
+						<u-radio activeColor="#3388FF" :label="$t('device.twoWay')" name="TwoWay"></u-radio>
 					</u-radio-group>
 				</view>
 				<view class="u-flex" style="margin-top: 28rpx" v-else>
-					<text class="type-text">服务:</text>
+					<text class="type-text">{{ $t('device.service') }}:</text>
 					<view @click="openService">
-						<u-input shape="circle" v-model="serviceName" placeholder="请选择服务" disabled disabledColor="#fff"
+						<u-input shape="circle" v-model="serviceName" :placeholder="$t('device.pleaseSelectService')" disabled disabledColor="#fff"
 							suffixIcon="arrow-down" />
 					</view>
 				</view>
@@ -30,14 +30,14 @@
             flex-direction: column;
             align-items: flex-start;
           " v-if="isShowServiceFunctionName && commandType == 1">
-					<text class="type-text">输入参数:</text>
+					<text class="type-text">{{ $t('device.inputParameter') }}:</text>
 					<seriesForm ref="seriesFormRef" :seriesInputData="seriesInputData" :isTCPTransport="isTCPTransport">
 					</seriesForm>
 				</view>
 				<view class="content-body" v-if="commandType == 0">
 					<div class="u-flex u-row-between">
-						<u--textarea :placeholder="`请输入下发内容${
-                isShowTCP ? '(字符串格式)' : '(json格式)'
+						<u--textarea :placeholder="`${$t('device.pleaseEnterCommandContent')}${
+                isShowTCP ? `${$t('device.stringFormat')}` : `${$t('device.jsonFormat')}`
               }`" v-model="inputCommandVal" />
 						<u-icon v-if="!isShowTCP" @click="handleCopy(copyTextValue)" name="question-circle"
 							color="#2979ff" size="28" class="ml-10">
@@ -47,16 +47,16 @@
 			</view>
 			<view class="button-group">
 				<view>
-					<u-button :customStyle="{ color: '#333' }" color="#e3e3e5" shape="circle" text="取消"
+					<u-button :customStyle="{ color: '#333' }" color="#e3e3e5" shape="circle" :text="$t('common.cancelText')"
 						@click="cancelCommand"></u-button>
 				</view>
 				<view>
-					<u-button color="#3388ff" shape="circle" text="确认" @click="confirmCommand"></u-button>
+					<u-button color="#3388ff" shape="circle" :text="$t('common.confirm')" @click="confirmCommand"></u-button>
 				</view>
 			</view>
 		</view>
 		<u-picker :show="isShowService" :columns="[
-        seriesList.map((item) => ({
+        (seriesList || []).map((item) => ({
           label: item.functionName,
           value: item.identifier,
           callType: item.callType,
@@ -100,7 +100,7 @@
 					},
 				},
 				commandTypeList: [{
-					label: "自定义",
+					label:this.$t('common.customText'),
 					value: 0
 				}],
 				seriesList: [], //服务下拉框的数据
@@ -150,16 +150,18 @@
 				}
 			},
 			handleCopy(value) {
-				useShowModal(JSON.stringify(value), "命令下发", "复制内容").then(
+				useShowModal(JSON.stringify(value), this.$t('device.commandIssuance'), this.$t('common.copyContent')).then(
 					(res) => {
-						uni.setClipboardData({
+						if(res?.confirm){
+							uni.setClipboardData({
 							data: JSON.stringify(value),
 							success: () => {
 								uni.showToast({
-									title: "复制成功",
+									title: this.$t('common.copyOk'),
 								});
 							},
 						});
+						}
 					}
 				);
 			},
@@ -187,7 +189,7 @@
 						this.commandTypeList;
 				} else {
 					this.commandTypeList.push({
-						label: "服务",
+						label: this.$t('device.service'),
 						value: 1
 					});
 					this.seriesList = await api.deviceApi.getModelServices(
@@ -283,4 +285,4 @@
 			}
 		}
 	}
-</style>
+</style>
--- a/device-subpackage/device-detail/components/command-record.vue
View file @3276544
+++ b/device-subpackage/device-detail/components/command-record.vue
View file @3276544
@@ -2,7 +2,7 @@
 	<view class="command-record">
 		<!-- 命令记录筛选-->
 		<view class="filter-button" @click="openSearchDialog">
-			<text>筛选</text>
+			<text>{{ $t('common.screen') }}</text>
 			<image src="/static/shaixuan.png" />
 		</view>
 		<!-- 命令记录分页 -->
@@ -14,24 +14,24 @@
 						<text>{{ item.deviceName }}</text>
 						<!-- 业务 单向是没有响应状态 -->
 						<view v-if="!item.request.oneway">
-							<view class="item-right item-success" v-if="item.response">响应成功</view>
-							<view class="item-right item-fail" v-else>响应失败</view>
+							<view class="item-right item-success" v-if="item.response">{{ $t('device.responseSuccess') }}</view>
+							<view class="item-right item-fail" v-else>{{ $t('device.ResponseFailed') }}</view>
 						</view>
 					</view>
 					<view>
-						命令类型:
-						<text class="ml-16">{{ item.additionalInfo.cmdType===1?'服务':'自定义' }}</text>
+						{{$t('device.commandType')}}:
+						<text class="ml-16">{{ item.additionalInfo.cmdType===1?$t('device.service'):$t('common.customText') }}</text>
 					</view>
 					<view v-if="item.statusName">
-						命令状态:
+						{{ $t('device.commandStatus') }}:
 						<text :style="{color:formatCommandStatus(item.status)}" class="ml-16">
 							{{ item.statusName }}
 						</text>
 					</view>
 					<view class="item-first">
 						<view>
-							响应类型:
-							<text class="ml-16">{{ !item.request.oneway?'双向':'单向' }}</text>
+							{{ $t('device.responseType') }}:
+							<text class="ml-16">{{ !item.request.oneway?$t('device.twoWay'):$t('device.oneWay') }}</text>
 						</view>
 						<view class="time">{{ format(item.createTime) }}</view>
 					</view>
@@ -41,24 +41,24 @@
 		<!-- 命令记录弹窗筛选 -->
 		<u-popup  @close="close" closeable bgColor="#fff" :show="show" mode="bottom" :round="20">
 			<view class="filter" @touchmove.stop.prevent="disabledScroll">
-				<view class="filter-title"><text>筛选条件</text></view>
-				<query-item :filterList="issueStatus" title="下发状态"
+				<view class="filter-title"><text>{{ $t('common.filterCriteria') }}</text></view>
+				<query-item :filterList="issueStatus" :title="$t('device.issuanceStatus')"
 					@clickTag="currentIndex => handleClickTag(currentIndex, issueStatus)"></query-item>
 				<view class="flex-column">
-					<view class="mt-3 command-time-text">命令下发时间</view>
+					<view class="mt-3 command-time-text">{{ $t('device.commandTime') }}</view>
 					<view class="mt-3">
 						<uni-datetime-picker return-type="timestamp" v-model="range" type="datetimerange"
-							rangeSeparator="至" />
+							:rangeSeparator="$t('common.toText')" />
 					</view>
 				</view>
 				<view class="h-30"></view>
 				<view class="button-group">
 					<view>
-						<u-button :customStyle="{ color: '#333' }" color="#e3e3e5" shape="circle" text="重置"
+						<u-button :customStyle="{ color: '#333' }" color="#e3e3e5" shape="circle" :text="$t('common.resetting')"
 							@click="resetFilter"></u-button>
 					</view>
 					<view>
-						<u-button color="#3388ff" shape="circle" text="确认" @click="confirmFilter"></u-button>
+						<u-button color="#3388ff" shape="circle" :text="$t('common.confirm')" @click="confirmFilter"></u-button>
 					</view>
 				</view>
 			</view>
@@ -232,4 +232,4 @@
 <style lang="scss" scoped>
 	@import "../static/command-record.scss";
-</style>
+</style>
--- a/device-subpackage/device-detail/components/history-data.vue
View file @3276544
+++ b/device-subpackage/device-detail/components/history-data.vue
View file @3276544
@@ -5,7 +5,7 @@
 		<view class="historyData-top">
 			<u-form :label-style="{ 'font-size': '0rpx' }">
 				<u-form-item @click="openCalendar">
-					<u-input v-model="timeData.selectTime" disabled disabledColor="#fff" placeholder="请选择日期"
+					<u-input v-model="timeData.selectTime" disabled disabledColor="#fff" :placeholder="$t('device.pleaseSelectDate')"
 						border="none" suffixIcon="arrow-down">
 						<template slot="prefix">
 							<image class="icon" src="../../../static/can-der.png"></image>
@@ -13,7 +13,7 @@
 					</u-input>
 				</u-form-item>
 				<u-form-item @click="openTimeGap">
-					<u-input v-model="timeData.getTimeGap" disabled disabledColor="#fff" placeholder="请选择时间区间"
+					<u-input v-model="timeData.getTimeGap" disabled disabledColor="#fff" :placeholder="$t('device.pleaseSelectTimeInterval')"
 						border="none" suffixIcon="arrow-down">
 						<template slot="prefix">
 							<image class="icon" src="../../../static/time.png"></image>
@@ -21,18 +21,18 @@
 					</u-input>
 				</u-form-item>
 				<u-form-item @click="openAvg">
-					<u-input shape="circle" v-model="aggText" placeholder="请选择数据聚合功能" disabled disabledColor="#377DFF0D"
+					<u-input shape="circle" v-model="aggText" :placeholder="$t('device.pleaseSelectDataAgg')" disabled disabledColor="#377DFF0D"
 						suffixIcon="arrow-down" />
 				</u-form-item>
 				<u-form-item @click="openTimeGap" v-if="limitFlag">
 					<view class="u-flex">
-						<text>最大条数</text>
+						<text>{{ $t('device.maximumNumber') }}</text>
 						<u-number-box style="margin-left:30rpx" class="ml-10" v-model="timeData.limit" :min="7"
 							:max="50000"></u-number-box>
 					</view>
 				</u-form-item>
 				<u-form-item @click="openType">
-					<u-input shape="circle" v-model="timeData.getType" placeholder="请选择属性" disabled
+					<u-input shape="circle" v-model="timeData.getType" :placeholder="$t('device.pleaseSelectAttribute')" disabled
 						disabledColor="#377DFF0D" suffixIcon="arrow-down" />
 				</u-form-item>
 			</u-form>
@@ -47,8 +47,8 @@
 		<view class="historyData-bottom" v-show="historyData.length">
 			<view class="table">
 				<view class="tr bg-w" v-if="historyData.length">
-					<view class="th">变量值</view>
-					<view class="th">更新时间</view>
+					<view class="th">{{ $t('device.variableValue') }}</view>
+					<view class="th">{{ $t('device.updateTime') }}</view>
 				</view>
 				<view class="tr bg-g" :class="{ odd: index % 2 === 0 }" v-for="(item, index) in historyData"
 					:key="index">
@@ -57,14 +57,15 @@
 				</view>
 			</view>
 		</view>
-		<u-calendar :show="showCalendar" :defaultDate="defaultDate" closeOnClickOverlay mode="range" startText="开始时间"
-			endText="结束时间" confirmDisabledText="请选择日期" :minDate="minDate" :maxDate="maxDate" @confirm="calendarConfirm"
+		<!-- :cancelText="$t('common.cancelText')" :confirmText="$('common.confirm')" -->
+		<u-calendar :show="showCalendar" :title="$t('components.calender.title')" :confirmText="$t('components.calender.confirmText')"  :defaultDate="defaultDate" closeOnClickOverlay mode="range" :startText="$t('device.startTime')"
+			:endText="$t('device.entTime')" :confirmDisabledText="$t('device.pleaseSelectDate')" :minDate="minDate" :maxDate="maxDate" @confirm="calendarConfirm"
 			@close="calendarClose"></u-calendar>
-		<u-picker :show="showTimeGap" :columns="columns" keyName="label" closeOnClickOverlay @confirm="confirmTimeGap"
+		<u-picker :cancelText="$t('common.cancelText')" :confirmText="$t('common.confirm')" :show="showTimeGap" :columns="columns" keyName="label" closeOnClickOverlay @confirm="confirmTimeGap"
 			@cancel="cancelTimeGap" @close="cancelTimeGap" :defaultIndex="[3]"></u-picker>
-		<u-picker :show="showSelectType" :columns="[keys.map(item=>({label:item.name,value:item.identifier}))]" keyName="label" closeOnClickOverlay @confirm="confirmTypeGap"
+		<u-picker :cancelText="$t('common.cancelText')" :confirmText="$t('common.confirm')" :show="showSelectType" :columns="[keys.map(item=>({label:item.name,value:item.identifier}))]" keyName="label" closeOnClickOverlay @confirm="confirmTypeGap"
 			@cancel="cancelTypeGap" @close="cancelTypeGap"></u-picker>
-		<u-picker :show="showSelectAvg" :columns="avgColumns" keyName="label" closeOnClickOverlay
+		<u-picker :cancelText="$t('common.cancelText')" :confirmText="$t('common.confirm')" :show="showSelectAvg" :columns="avgColumns" keyName="label" closeOnClickOverlay
 			@confirm="confirmAvgGap" @cancel="showSelectAvg=false" @close="showSelectAvg=false"></u-picker>
 	</view>
 </template>
@@ -127,26 +128,26 @@
 				limitFlag: true,
 				avgColumns: [
 					[{
-							label: '最小值',
+							label: this.$t('common.minText'),
 							value: 'MIN'
 						}, {
-							label: '最大值',
+							label: this.$t('common.maxText'),
 							value: 'MAX'
 						},
 						{
-							label: '平均值',
+							label: this.$t('common.averageText'),
 							value: 'AVG'
 						},
 						{
-							label: '求和',
+							label: this.$t('common.summationText'),
 							value: 'SUM'
 						},
 						{
-							label: '计数',
+							label: this.$t('common.countText'),
 							value: 'COUNT'
 						},
 						{
-							label: '空',
+							label: this.$t('common.emptyText'),
 							value: 'NONE'
 						},
 					]
@@ -169,41 +170,41 @@
 				},
 				columns: [
 					[{
-							label: '5分钟',
+							label: '5' + this.$t('common.minuteText'),
 							value: 300000
 						},
 						{
-							label: '10分钟',
+							label: '10' + this.$t('common.minuteText'),
 							value: 600000
 						},
 						{
-							label: '15分钟',
+							label: '15' + this.$t('common.minuteText'),
 							value: 900000
 						},
 						{
-							label: '30分钟',
+							label: '30' + this.$t('common.minuteText'),
 							value: 1800000
 						},
 						{
-							label: '1小时',
+							label: '1' + this.$t('common.hourText'),
 							value: 3600000
 						},
 						{
-							label: '2小时',
+							label: '2' + this.$t('common.hourText'),
 							value: 7200000
 						}
 					]
 				],
 				timeData: {
-					selectTime: this.yesterday + ' 至 ' + this.today,
+					selectTime: this.yesterday + this.$t('common.toText') + this.today,
 					getTimeGap: this.timeDiff,
 					getType: this.keys[0].name,
 					limit: 7,
 					agg: 'NONE'
 				},
-				aggText: '空'
+				aggText: this.$t('common.emptyText')
 			};
 		},
 		watch: {
@@ -227,27 +228,27 @@
 					// 小于7天
 					return [
 						[{
-								label: '5分钟',
+								label: '5' + this.$t('common.minuteText'),
 								value: 300000
 							},
 							{
-								label: '10分钟',
+								label: '10' + this.$t('common.minuteText'),
 								value: 600000
 							},
 							{
-								label: '15分钟',
+								label: '15' + this.$t('common.minuteText'),
 								value: 900000
 							},
 							{
-								label: '30分钟',
+								label: '30' + this.$t('common.minuteText'),
 								value: 1800000
 							},
 							{
-								label: '1小时',
+								label: '1' + this.$t('common.hourText'),
 								value: 3600000
 							},
 							{
-								label: '2小时',
+								label: '2' + this.$t('common.hourText'),
 								value: 7200000
 							}
 						]
@@ -256,31 +257,31 @@
 					// 小于30天
 					return [
 						[{
-								label: '30分钟',
+								label: '30' + this.$t('common.minuteText'),
 								value: 1800000
 							},
 							{
-								label: '1小时',
+								label: '1' + this.$t('common.hourText'),
 								value: 3600000
 							},
 							{
-								label: '2小时',
+								label: '2' + this.$t('common.hourText'),
 								value: 7200000
 							},
 							{
-								label: '5小时',
+								label: '5' + this.$t('common.hourText'),
 								value: 18000000
 							},
 							{
-								label: '10小时',
+								label: '10' + this.$t('common.hourText'),
 								value: 36000000
 							},
 							{
-								label: '12小时',
+								label: '12' + this.$t('common.hourText'),
 								value: 43200000
 							},
 							{
-								label: '1天',
+								label: '1' + this.$t('common.dayText'),
 								value: 86400000
 							}
 						]
@@ -289,23 +290,23 @@
 					// 大于30天
 					return [
 						[{
-								label: '2小时',
+								label: '2' + this.$t('common.hourText'),
 								value: 7200000
 							},
 							{
-								label: '5小时',
+								label: '5' + this.$t('common.hourText'),
 								value: 18000000
 							},
 							{
-								label: '10小时',
+								label: '10' + this.$t('common.hourText'),
 								value: 36000000
 							},
 							{
-								label: '12小时',
+								label: '12' + this.$t('common.hourText'),
 								value: 43200000
 							},
 							{
-								label: '1天',
+								label: '1' + this.$t('common.dayText'),
 								value: 86400000
 							}
 						]
--- a/device-subpackage/device-detail/components/seriesForm.vue
View file @3276544
+++ b/device-subpackage/device-detail/components/seriesForm.vue
View file @3276544
@@ -10,7 +10,7 @@
             shape="circle"
             type="number"
             v-model.number="seriesForm[item.identifier]"
-            :placeholder="`请输入${item.functionName}`"
+            :placeholder="`${$t('common.inputText')}${item.functionName}`"
             @blur="(e)=>handleBlur(e,item.identifier)"
           />
           <u-input v-if="item.dataType.type == 'TEXT'" shape="circle" type="text" v-model="seriesForm[item.identifier]" :placeholder="`请输入${item.functionName}`" />
@@ -18,7 +18,7 @@
             <u-input
               shape="circle"
               v-model="seriesForm[item.identifier]"
-              :placeholder="`请选择${item.functionName}`"
+              :placeholder="`${$t('common.chooseText')}${item.functionName}`"
               disabled
               disabledColor="#fff"
               suffixIcon="arrow-down"
@@ -36,7 +36,7 @@
             <u-input
               shape="circle"
               v-model="seriesForm[item.identifier]"
-              :placeholder="`请选择${item.functionName}`"
+              :placeholder="`${$t('common.chooseText')}${item.functionName}`"
               disabled
               disabledColor="#fff"
               suffixIcon="arrow-down"
@@ -55,7 +55,7 @@
           </template>
         </view>
         <view v-else class="positionLeft" style=" border: 1px dashed #f0f0f0; padding: 20rpx;">
-          <view class="text">服务命令</view>
+          <view class="text">{{ $t('device.serviceCommand') }}</view>
           <u-input v-model="seriesForm.serviceCommand" type="text" shape="circle" :disabled="true"></u-input>
         </view>
       </u-form-item>
@@ -139,15 +139,15 @@ export default {
         const { max = 2147483647, min = -2147483647 } = valueRange || {}
         if (type !== 'STRUCT') {
           this.seriesRules[identifier] = [
-            { required: true, message: type == 'BOOL' || type == 'ENUM' ? '请选择' : '请输入' + functionName },
+            { required: true, message: type == 'BOOL' || type == 'ENUM' ? this.$t('common.chooseText') : this.$t('common.inputText') + functionName },
             type == 'INT' || type == 'DOUBLE'
               ? {
                   type: 'number',
                   trigger: 'change',
                   validator: (_rule, value) => {
                     const reg = /^[0-9]*$/
-                    if (!reg.test(value)) return Promise.reject(new Error(`${functionName}不是一个有效的数字`))
-                    if (value < min || value > max) return Promise.reject(new Error(`${functionName}取值范围在${min}~${max}之间`))
+                    if (!reg.test(value)) return Promise.reject(new Error(`${functionName}${this.$t('device.notANumber')}`))
+                    if (value < min || value > max) return Promise.reject(new Error(`${functionName}${this.$t('device.rangeValues',{min,max})}`))
                     return Promise.resolve(value)
                   },
@@ -157,7 +157,7 @@ export default {
                   type: 'string',
                   trigger: 'change',
                   validator: (_rule, value) => {
-                    if ((value?.length || 0) > length) return Promise.reject(new Error(`${functionName}数据长度应该小于${length}`))
+                    if ((value?.length || 0) > length) return Promise.reject(new Error(`${functionName}${this.$t('device.dataLengthLess')}${length}`))
                     return Promise.resolve(value)
                   },
@@ -186,7 +186,7 @@ export default {
       const { specs } = dataType || {}
       const { boolClose, boolOpen } = specs || {}
       if(!boolClose&&!boolOpen){
-        uni.$u.toast(`暂无可选的${name}`)
+        uni.$u.toast(this.$t('device.noCurrently') + name)
         this.boolList = []
         return 
       }
@@ -217,7 +217,7 @@ export default {
       this.enumList = specsList || []
       console.log(this.enumList,'enumInfo')
       if(!this.enumList.length){
-        return uni.$u.toast(`暂无可选的${name}`)
+        return uni.$u.toast(this.$t('device.noCurrently') + name)
       }
       this.seriesFunctionList.forEach((item, index) => {
         if (index == num) {
--- a/device-subpackage/device-detail/config/data.js
View file @3276544
+++ b/device-subpackage/device-detail/config/data.js
View file @3276544
 const list = [
   {
-    name: '基础信息',
+    name: 'device.basicInfo',
   },
   {
-    name: '实时数据',
+    name: 'device.realTime',
   },
   {
-    name: '历史数据',
+    name: 'device.historyTime',
   },
   {
-    name: '告警记录',
+    name: 'device.alarmLog',
   },
 ]
 const issueStatus = [
   {
     checked: true,
-    name: '全部',
+    name: 'common.allText',
     type: '',
   },
   {
     checked: false,
-    name: '队列中',
+    name: 'device.inQueue',
     type: 'QUEUED',
   },
   {
     checked: false,
-    name: '已发送',
+    name: 'device.hasBeenSent',
     type: 'SENT',
   },
   {
     checked: false,
-    name: '发送成功',
+    name: 'device.successSent',
     type: 'DELIVERED',
   },
   {
     checked: false,
-    name: '响应成功',
+    name: 'device.responseSuccess',
     type: 'SUCCESSFUL',
   },
   {
     checked: false,
-    name: '超时',
+    name: 'device.timeout',
     type: 'TIMEOUT',
   },
   {
     checked: false,
-    name: '已过期',
+    name: 'device.expired',
     type: 'EXPIRED',
   },
   {
     checked: false,
-    name: '响应失败',
+    name: 'device.ResponseFailed',
     type: 'FAILED',
   },
   {
     checked: false,
-    name: '已删除',
+    name: 'device.deletedText',
     type: 'DELETED',
   },
 ]
@@ -64,11 +64,11 @@ const issueStatus = [
 const commandTypeList = [
   {
     value: 'OneWay',
-    name: '单向',
+    name: 'device.onwWay',
   },
   {
     value: 'TwoWay',
-    name: '双向',
+    name: 'device.twoWay',
   },
 ]
--- a/device-subpackage/device-detail/device-detail.vue
View file @3276544
+++ b/device-subpackage/device-detail/device-detail.vue
View file @3276544
@@ -3,13 +3,13 @@
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<u-sticky :bgColor="bgColor">
-			<u-tabs :list="list" :current="currentTab" :lineWidth="transportType == deviceTypeNum.GBT?0:30" @click=" handleTabClick " :activeStyle="{activeColor}"
+			<u-tabs :list="list.map(item=>({...item,name:$t(item.name)}))" :current="currentTab" :lineWidth="transportType == deviceTypeNum.GBT?0:30" @click=" handleTabClick " :activeStyle="{activeColor}"
 				:inactiveStyle="inActiveColor" :scrollable="isScrollable" itemStyle="padding: 0 11px;display:flex;flex-direction:row;align-items:center;justify-content:start;height:44px" />
 		</u-sticky>
 		<view class="mt-3">
-			<basic-info v-show=" currentTab == 0 " :deviceDetail=" deviceDetail " />
+			<basic-info v-show="currentTab == 0" :deviceDetail=" deviceDetail " />
 			<realtime-data v-show=" currentTab === 1 " :recordList=" recordList " />
-			<history-data v-if=" currentTab === 2 " :keys=" keys " :yesterday=" yesterday " :today=" today " :timeDiff=" timeDiff "
+			<history-data v-if=" currentTab === 2 " :keys=" keys " :yesterday=" yesterday " :today=" today " :timeDiff="timeDiff"
 				:historyData=" historyData " :entityId=" entityId " :start=" startTs " :end=" endTs " @update=" handleUpdate " />
 			<alarm-history v-show=" currentTab === 3 " :deviceId=" deviceId " />
 			<commond-record v-if=" currentTab === 4 " :tbDeviceId=" entityId " />
@@ -77,6 +77,13 @@ export default {
 		// 页面关闭时,销毁webSocket连接,否则第二次会存在连接不到的情况
 		uni.closeSocket();
 	},
+	onShow(){
+		this.$nextTick(()=>{
+			uni.setNavigationBarTitle({
+				title:this.$t('menu.deviceDetail')
+			})
+		})
+	},
 	async onLoad(options) {
 		const { id, alarmStatus, lastOnlineTime, tbDeviceId, deviceProfileId, transportType } = options;
 		this.deviceId = id;
@@ -92,17 +99,17 @@ export default {
 		// 设备类型不是网关子设备的添加一个命令记录的选项卡
 		if (this.deviceDetail.deviceType !== "SENSOR") {
 			this.list.push({
-				name: "命令记录",
+				name: 'device.commandRecord',
 			});
 			const res = new Map()
 			this.list = this.list.filter((item) => !res.has(item.name) && res.set(item.name, 1))
 		} else {
-			this.list = this.list.filter(item => item.name !== '命令记录')
+			this.list = this.list.filter(item => item.name !== 'device.commandRecord')
 		}
 		if (transportType === deviceTypeNum.GBT) {
-			this.list = this.list.filter(item => item.name == '基础信息')
+			this.list = this.list.filter(item => item.name == 'device.basicInfo')
 		}
-		this.isScrollable = this.list.length > 4;
+		this.isScrollable =this.$i18n.locale!=='en'?this.list.length > 4:true;
 		if (res.deviceProfileId) {
 			this.getAttrList = await api.deviceApi.getAttribute(res.deviceProfileId)
 			if (Array.isArray(this.getAttrList)) {
@@ -199,7 +206,7 @@ export default {
 			limit: 7,
 			agg: 'NONE'
 		});
-		this.timeDiff = "30分钟";
+		this.timeDiff = 30 + this.$t('common.minuteText');
 		if (!Object.keys(data).length) return;
 		this.historyData = data[keys[0]].map((item) => {
 			return {
--- a/device-subpackage/device-detail/device-position.vue
View file @3276544
+++ b/device-subpackage/device-detail/device-position.vue
View file @3276544
@@ -38,6 +38,13 @@ export default {
 			]
 		};
 	},
+	onShow(){
+		this.$nextTick(()=>{
+			uni.setNavigationBarTitle({
+				title:this.$t('menu.deviceLocation')
+			})
+		})
+	},
 	onLoad(e) {
 		let params = null;
 		if (e.data !== null) {
--- a/device-subpackage/device-detail/static/command-record.scss
View file @3276544
+++ b/device-subpackage/device-detail/static/command-record.scss
View file @3276544
@@ -65,7 +65,7 @@
 				.item-fail {
 					color: #848383;
-					background-color: #84838325;
+					// background-color: #84838325;
 				}
 				.item.success {
@@ -101,4 +101,4 @@
 			font-size: 14px;
 			font-weight: 700;
 		}
-	}
+	}
--- a/feedback-subpackage/feedback/config/data.js deleted 100644 → 0
View file @2ca927e
+++ b/feedback-subpackage/feedback/config/data.js deleted 100644 → 0
View file @2ca927e
-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
-}
--- a/feedback-subpackage/feedback/feedback.vue
View file @3276544
+++ b/feedback-subpackage/feedback/feedback.vue
View file @3276544
@@ -4,33 +4,33 @@
 			<!-- 公共组件-每个页面必须引入 -->
 			<public-module></public-module>
 			<view class="form-page">
-				<u--form labelPosition="left" :model="feedbackData" :rules="rules" ref="myfeedBackFormRef">
-					<u-form-item required label="主题" prop="feedbackInfo.title" borderBottom>
-						<u--input placeholder="请输入主题" v-model="feedbackData.feedbackInfo.title" border="none">
+				<u--form :labelStyle="{minWidth:'120rpx'}" :labelWidth="60" labelPosition="left" :model="feedbackData" :rules="rules" ref="myfeedBackFormRef">
+					<u-form-item required :label="$t('userCenter.theme')" prop="feedbackInfo.title" borderBottom>
+						<u--input :placeholder="$t('userCenter.pleaseEnterTheme')" v-model="feedbackData.feedbackInfo.title" border="none">
 						</u--input>
 					</u-form-item>
-					<u-form-item required label="姓名" prop="feedbackInfo.name" borderBottom>
-						<u--input placeholder="请输入姓名" v-model="feedbackData.feedbackInfo.name" border="none"></u--input>
+					<u-form-item required :label="$t('userCenter.fullName')" prop="feedbackInfo.name" borderBottom>
+						<u--input :placeholder="$t('userCenter.pleaseEnterName')" v-model="feedbackData.feedbackInfo.name" border="none"></u--input>
 					</u-form-item>
-					<u-form-item required label="反馈" prop="feedbackInfo.message" borderBottom>
-						<u--textarea placeholder="请输入反馈信息" v-model="feedbackData.feedbackInfo.message" count>
+					<u-form-item required :label="$t('userCenter.feedText')" prop="feedbackInfo.message" borderBottom>
+						<u--textarea :placeholder="$t('userCenter.pleaseFeed')" v-model="feedbackData.feedbackInfo.message" count>
 						</u--textarea>
 					</u-form-item>
-					<view class="feed-back-text upload-text">上传图片(最多6张)</view>
+					<view class="feed-back-text upload-text">{{ $t('userCenter.uploadImage6') }}</view>
 					<view class="info">
 						<view class="info-contain">
-							<u-form-item label="图片" prop="feedbackInfo.images" borderBottom>
+							<u-form-item :label="$t('userCenter.image')" prop="feedbackInfo.images" borderBottom>
 								<u-upload :capture="capture" :fileList="fileList1" @afterRead="afterRead"
 									@delete="deletePic" name="1" multiple :maxCount="6"></u-upload>
 							</u-form-item>
 						</view>
 						<view class="info-button">
 							<!-- #ifdef MP -->
-							<u-button class="buttonSty button-sty" shape="circle" type="primary" text="提交"
+							<u-button class="buttonSty button-sty" shape="circle" type="primary" :text="$t('userCenter.submit')"
 								customStyle="margin-top: 280rpx" @click="submit"></u-button>
 							<!-- #endif -->
 							<!-- #ifdef APP-PLUS -->
-							<u-button class="buttonSty button-sty" shape="circle" type="primary" text="提交"
+							<u-button class="buttonSty button-sty" shape="circle" type="primary" :text="$t('userCenter.submit')"
 								customStyle="margin-top: 880rpx" @click="submit"></u-button>
 							<!-- #endif -->
 						</view>
@@ -46,7 +46,6 @@
 		</view>
 		<view style="height: 20rpx;"></view>
 	</view>
-	</view>
 </template>
 <script>
@@ -55,7 +54,6 @@
 		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 {
@@ -71,9 +69,16 @@
 					}
 				},
 				fileList1: [],
-				rules
+				rules:{}
 			};
 		},
+		onShow(){
+			this.$nextTick(()=>{
+				uni.setNavigationBarTitle({
+					title:this.$t('menu.feedback')
+				})
+			})
+		},
 		onReady() {
 			// 如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则
 			this.$refs.myfeedBackFormRef.setRules(this.rules);
@@ -81,6 +86,26 @@
 		onLoad() {
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
+			this.rules ={
+				'feedbackInfo.title': {
+					type: 'string',
+					required: true,
+					message: this.$t('userCenter.pleaseEnterTheme'),
+					trigger: ['blur', 'change']
+				},
+				'feedbackInfo.name': {
+					type: 'string',
+					required: true,
+					message: this.$t('userCenter.pleaseEnterName'),
+					trigger: ['blur', 'change']
+				},
+				'feedbackInfo.message': {
+					type: 'string',
+					required: true,
+					message: this.$t('userCenter.pleaseFeed'),
+					trigger: ['blur', 'change']
+				}
+			}
 		},
 		computed: {
 			...mapState(['userInfo'])
@@ -99,20 +124,20 @@
 						this[`fileList${event.name}`].push({
 							...item,
 							status: 'error',
-							message: '上传失败'
+							message: this.$t('userCenter.uploadFailed')
 						});
 					} else {
 						this[`fileList${event.name}`].push({
 							...item,
 							status: 'uploading',
-							message: '上传中'
+							message: this.$t('userCenter.uploading')
 						});
 					}
 				});
 				for (let i = 0; i < lists.length; i++) {
 					const judgeImageSize = lists[0].size
 					if (judgeImageSize > UPLOAD_FILE_SIZE) {
-						return uni.$u.toast('图片限定5M')
+						return uni.$u.toast(this.$t('userCenter.image5m'))
 					} else {
 						const result = await this.uploadFilePromise(lists[i].url);
 						let item = this[`fileList${event.name}`][fileListLen];
@@ -135,7 +160,7 @@
 				// #ifdef H5
 				token = window.sessionStorage.getItem('userInfo').isToken;
 				// #endif
-				if (!token) return uni.$u.toast('请登录后上传图片');
+				if (!token) return uni.$u.toast(this.$t('userCenter.pleaseLogUpload'));
 				return new Promise((resolve, reject) => {
 					uni.uploadFile({
 						url: `${baseUrl.baseUrl}/yt/oss/upload`,
@@ -158,7 +183,7 @@
 										resolve(res.data?.fileStaticUri);
 									}
 								} else {
-									return uni.$u.toast('图片上传失败')
+									return uni.$u.toast(this.$t('userCenter.imageUploadFail'))
 								}
 							}, 1000);
 						}
@@ -179,14 +204,14 @@
 								message: this.feedbackData.feedbackInfo.message
 							};
 							const res = await api.feedbackApi.postFeedBackApi(data)
-							uni.$u.toast('意见反馈提交成功~');
+							uni.$u.toast(this.$t('userCenter.feedbacksubmitSuccess'));
 							setTimeout(() => {
 								uni.navigateBack();
 							}, 500);
 						}
 					})
 					.catch(errors => {
-						uni.$u.toast('请填写或者请填写正确格式的数据');
+						uni.$u.toast(this.$t('userCenter.pleaseEnterformatCorrect'));
 					});
 			}
 		}
@@ -202,4 +227,4 @@
 	}
 	//#endif
-</style>
+</style>
--- a/locale/en.json 0 → 100644
View file @3276544
+++ b/locale/en.json 0 → 100644
View file @3276544
+{
+  "homePage": "Home page",
+  "device": "Device",
+  "alarm": "Alarm",
+  "userCenter": "Personal Center",
+  "viewCamera": "View camera",
+  "viewConfiguration": "View configuration",
+  "configurationDetail": "Configuration details",
+  "organizationScreening": "Organizational screening",
+  "viewBoard": "View bulletin board",
+  "boardDetail": "Bulletin board detail",
+  "languageSetting": "Language settings",
+  "alarmDetail": "Alarm details",
+  "deviceDetail": "Device detail",
+  "commandDetail": "Command detail",
+  "deviceLocation": "Geographical location of equipment",
+  "systemNot": "System notification",
+  "notDetails": "Notification Details",
+  "feedback": "Feedback",
+  "login": "Login",
+  "personalData": "Personal data",
+  "phoneLogin": "Mobile verification code login",
+  "forgotPassword": "Forgot password",
+  "my": "mine"
+}
--- a/locale/lang/en/alarm.js 0 → 100644
View file @3276544
+++ b/locale/lang/en/alarm.js 0 → 100644
View file @3276544
+export default {
+  scenario: 'Alarm scenario:',
+  level: 'Alarm level:',
+  organization: 'Belonging organization:',
+  device: 'Alarm device:',
+  attribute: 'Trigger attribute:',
+  condition: 'Trigger condition:',
+  value: 'Trigger value:',
+  time: 'Alarm time:',
+  status: 'Alarm status:',
+  pleaseResult: 'Please enter the processing result',
+  processResult: 'Processing results',
+  handle: 'Handle',
+  cleanUp: 'Clean up',
+  alarmNum: 'Number of alarms',
+  pleaseEnterDevice: 'Please enter the alarm device',
+
+}
--- a/locale/lang/en/common.js 0 → 100644
View file @3276544
+++ b/locale/lang/en/common.js 0 → 100644
View file @3276544
+export default {
+  inputText: 'Please enter',
+  chooseText: 'Please select',
+  belongingOrganization: 'Organization',
+  filterCriteria: 'Filter Criteria',
+  confirm: 'Confirm',
+  resetting: 'Resetting',
+  allText: 'All',
+  onLine: 'Online',
+  offLine: 'Offline',
+  toBeActivated: 'To be toBeActivated',
+  alarm: 'Alarm',
+  normal: 'Normal',
+  directlyDevice: 'Directly connected devices',
+  gatewayDevice: 'Gateway device',
+  sensorDevice: 'Internet gateway sub device',
+  yesText: 'Yes',
+  noText: 'No',
+  screen: 'Screen',
+  copyContent: 'Copy content',
+  copyOk: 'Copy Ok',
+  organizationalRelateion: 'Organizational relationships',
+  pleaseEnterContent: 'Please enter search content',
+  issuedSuccess: 'Issued successfully',
+  cancelText: 'Cancel',
+  customText: 'Custom',
+  minText: 'Minimum',
+  maxText: 'Maximum',
+  averageText: 'Average value',
+  summationText: 'Sumation',
+  countText: 'Count',
+  emptyText: 'Empty',
+  minuteText: 'Minute',
+  hourText: 'Hour',
+  hour: 'Hour',
+  minute: 'Minute',
+  toText: 'To',
+  dayText: 'Day',
+  attributeText: 'Attribute',
+  noData: 'No Data',
+  organizationalRelation: 'Organizational relationships',
+  one: 'one',
+  two: 'two',
+  three: 'three',
+  four: 'four',
+  five: 'five',
+  six: 'six',
+  day: 'day',
+  year: 'Year',
+  month: 'Month',
+  processSuccess: 'Processing successful',
+  clearSuccess: 'Clear successfully',
+  pleaseBindAccount: 'Please bind your account',
+  loading: 'Loading...',
+  refreshSuccess: 'Dropdown refresh successful',
+  noText: '无'
+
+
+}
--- a/locale/lang/en/components.js 0 → 100644
View file @3276544
+++ b/locale/lang/en/components.js 0 → 100644
View file @3276544
+export default {
+  calender: {
+    title: 'Date selection',
+    startText: 'Start',
+    endText: 'End',
+    confirmText: 'Determine',
+    confirmDisabledText: 'Determine'
+  }
+}
--- a/locale/lang/en/device.js 0 → 100644
View file @3276544
+++ b/locale/lang/en/device.js 0 → 100644
View file @3276544
+export default {
+  pleaseEnterDeviceName: 'Please enter the device name or alias to search',
+  deviceNum: 'Device number',
+  pleaseBindAccount: 'Please bind your account',
+  deviceNumber: 'Device Number',
+  deviceStatus: 'Device status',
+  alarmStatus: 'Alarm status',
+  deviceType: 'Device type',
+  isDeviceCollect: 'Is the device collect',
+  basicInfo: 'Basic information',
+  realTime: 'Real time Data',
+  historyTime: 'History time Data',
+  alarmLog: 'Alarm log',
+  commandRecord: 'Command record',
+  inQueue: 'In Queue',
+  hasBeenSent: 'Has been sent',
+  successSent: 'Successfully sent',
+  responseSuccess: 'Response successful',
+  timeout: 'Timeout',
+  expired: 'Expired',
+  ResponseFailed: "Response failed",
+  deletedText: 'Deleted',
+  oneWay: 'One-way',
+  twoWay: 'Two-way',
+  lastConnectionTime: 'Last connection time',
+  isAlarm: 'Is there an alarm',
+  deviceRemark: 'Device Description',
+  commandIssuance: 'Command issuance',
+  issuanceType: 'Type of issuance',
+  pleaseEnterCommandContent: 'Please enter the content to be issued',
+  currentDeviceNotOnLine: 'The current device is not online',
+  pleaseCommandRule: "pleaseCommandRule",
+  issuedSuccess: 'Issued successfully',
+  oneTwoWay: 'One/Two way',
+  service: 'Service',
+  inputParameter: "input parameter",
+  stringFormat: 'String format',
+  jsonFormat: 'JSON format',
+  pleaseSelectService: 'Please select a service',
+  pleaseSelectDate: 'Please select a date',
+  pleaseSelectTimeInterval: 'Please select a time interval',
+  pleaseSelectDataAgg: 'Please select the data aggregation function',
+  pleaseSelectAttribute: 'Please select attributes',
+  variableValue: 'Variable value',
+  updateTime: 'Update time',
+  startTime: 'Start time',
+  entTime: 'End time',
+  maximumNumber: 'Maximum number of items',
+  triggerAttribute: 'Trigger attribute',
+  triggerCondition: 'Trigger condition',
+  triggerValue: 'Trigger value',
+  rangeValues: 'The value range is between {min} and {max}',
+  dataLengthLess: 'The data length should be less than',
+  noCurrently: 'There are currently no options available',
+  serviceCommand: 'Service command',
+  alarmStatus: 'Alarm status :',
+  activationNotConfirmed: "Activation not confirmed",
+  activationConfirmed: 'Activation confirmed',
+  clearUnconfirmed: 'Clear unconfirmed',
+  clearConfirmed: 'Clear Confirmed',
+  urgent: 'Urgent',
+  important: 'Important',
+  secondary: 'Secondary',
+  warning: 'Warning',
+  uncertain: 'Uncertain',
+  equal: 'be equal to',
+  notEqual: 'Not equal to',
+  less: 'less than',
+  lessOfEqual: 'Less than or equal to',
+  greater: 'greater than',
+  greaterOrEqual: 'Greater than or equal to',
+  starting: 'Starting from',
+  ending: 'Ending at',
+  contain: 'contain',
+  notIncluded: 'Not included',
+  minutes30: '30 Minutes',
+  hour1: '1 hour',
+  hours2: '2 hours',
+  pastDay: 'In the past day',
+  alarmFiltering: 'Alarm filtering',
+  selectDate: 'Select Date',
+  alarmLevel: 'Alarm level',
+  selectTime: 'Select time',
+  commandType: 'Command type',
+  commandStatus: 'Command status',
+  responseType: 'Response type',
+  issuanceStatus: 'Issuance status',
+  commandTime: 'Command issuance time',
+  responseResults: 'Response results',
+  commandContent: 'Command content'
+}
--- a/locale/lang/en/homePage.js 0 → 100644
View file @3276544
+++ b/locale/lang/en/homePage.js 0 → 100644
View file @3276544
+export default {
+  basicstatistics: 'Basic statistics',
+  deviceStatistics: 'Device statistics',
+  deviceLabel: {
+    onLine: 'Online',
+    offLine: 'Offline',
+    beActivated: 'Inactive',
+  },
+  alarmStatistics: 'Alarm statistics',
+  alarmLabel: {
+    untreated: 'Untreated',
+    processed: 'Processed',
+    falseAlarm: 'False alarm',
+  },
+  cameraManagement: 'Camera management',
+  configuration: 'Configuration',
+  bulletinBoard: 'Bulletin board',
+  cameraNum: 'Number of cameras:',
+  configurationNum: 'Number of configurations:',
+  pleaseConfigurationname: 'Please enter the configuration name',
+  bulletionBoard: "Number of bulletin boards:",
+  pleaseVisualBoard: 'Please enter the name of the board'
+}
--- a/locale/lang/en/index.js 0 → 100644
View file @3276544
+++ b/locale/lang/en/index.js 0 → 100644
View file @3276544
+import homePage from './homePage'
+import common from './common'
+import login from './login'
+import device from './device'
+import menu from './menu'
+import components from './components'
+import alarm from './alarm'
+import userCenter from './userCenter'
+export default {
+  homePage, common, login, device, menu, components, alarm, userCenter,
+  spreadTail: 'Connecting the world to create value'
+}
--- a/locale/lang/en/login.js 0 → 100644
View file @3276544
+++ b/locale/lang/en/login.js 0 → 100644
View file @3276544
+export default {
+  hello: 'Hello!',
+  welcomeTo: 'welcome to',
+  pleaseEnterAccount: 'Please enter your login account',
+  pleaseEnterPassword: 'Please enter your login password',
+  login: 'Login',
+  phoneLogin: 'Mobile verification code login',
+  forgotPassword: 'Forgot password',
+  thirdAccountLogin: 'Third party account login',
+  passwordRule: 'The password format is incorrect (at least one uppercase English letter, at least one lowercase English letter, at least one digit, at least one special character, at least eight characters)',
+  loginSuccess: 'Login succeeded',
+  thirdAccountLoginSuccess: 'Third party account login successful',
+  isLoginPut: 'Are you sure you want to log out?',
+  loginOut: 'Log out and log in',
+  bindAccount: 'Bind account',
+  pleaseClickLogin: 'Please click login',
+  accountOut: 'Exit account',
+  phoneBind: 'Mobile binding',
+  PleaseEnterPhone: 'Please enter your phone number',
+  PleaseEnterCode: "Please enter the verification code",
+  accountBind: 'Account binding',
+  obtainCode: 'Obtain verification code',
+  accountBindSuccess: 'Account binding successful',
+  phoneFormatFail: 'The format of the phone number is incorrect',
+  codeFormatFail: 'The verification code format is incorrect',
+  phoneBindSuccess: 'Mobile phone binding successful',
+  codeAfterSeconds: 'Retrieve after {number} seconds',
+  codeBeenSend: 'Verification code has been sent',
+  accountPasswordLogin: 'Account password login',
+  sendCode: 'Send verification code',
+  verifyPhone: 'Verify phone number',
+  settingsNewPassword: 'Set a new password',
+  pleaseSettingsPassword: 'Please set a new login password of 6-20 characters',
+  pleaseNewPassword: 'Please enter the new login password again',
+  pleasePassword: 'Please input a password',
+  twoPasswordFail: 'The password entered twice is inconsistent',
+  resetPasswordSuccess: 'Reset password successful',
+  nextStep: 'Next step',
+  pleaseNetwork: 'Please check the network or server',
+  inspectDomain: 'Check if the requested domain name has been added to the domain whitelist',
+  requestTimeout: 'Request timeout: Please check the network'
+}
--- a/locale/lang/en/menu.js 0 → 100644
View file @3276544
+++ b/locale/lang/en/menu.js 0 → 100644
View file @3276544
+export default {
+  homePage: 'Home page',
+  device: 'Device',
+  alarm: 'Alarm',
+  userCenter: 'Personal Center',
+  viewCamera: 'View camera',
+  viewConfiguration: 'View configuration',
+  configurationDetail: 'Configuration details',
+  organizationScreening: 'Organizational screening',
+  viewBoard: 'View bulletin board',
+  boardDetail: 'Bulletin board detail',
+  languageSettings: 'Language settings',
+  alarmDetail: 'Alarm details',
+  deviceDetail: 'Device detail',
+  commandDetail: 'Command detail',
+  deviceLocation: 'Geographical location of equipment',
+  systemNot: 'System notification',
+  notDetails: 'Notification Details',
+  feedback: 'Feedback',
+  login: 'Login',
+  personalData: 'Personal data',
+  phoneLogin: 'Mobile verification code login',
+  forgotPassword: 'Forgot password',
+  my: 'mine'
+}
--- a/locale/lang/en/userCenter.js 0 → 100644
View file @3276544
+++ b/locale/lang/en/userCenter.js 0 → 100644
View file @3276544
+export default {
+  basicInfomation: 'Basic Information',
+  realName: 'Real name',
+  phoneNumber: 'phone number',
+  userAccount: 'User account',
+  periodValidity: 'term of validity',
+  emailAddress: 'e-mail address',
+  unBind: 'Unbind',
+  isUnbind: 'Do you need to unbind the account?',
+  camera: 'camera',
+  album: 'album',
+  pleaseEnterCCorrectPhone: 'Please enter the correct phone number',
+  permissionUseRequired: 'The following permissions are required for normal use',
+  goToOpen: 'Go to Open',
+  pleaseLogUpload: 'Please log in and upload pictures',
+  avatarUploadSuccess: 'Avatar uploaded successfully',
+  youCancelImage: 'You have unselected the image',
+  unbindSuccess: 'Unbind successfully',
+  unbindFail: 'Unbinding failed',
+  cameraPermission: 'Camera permission (for shooting avatars)',
+  storagePermission: 'Storage permission (read album)',
+  uploadInfoSuccess: 'Successfully updated personal information',
+  validationFail: 'Verification failed',
+  systemNotification: 'System notification',
+  feedback: 'Feedback on opinions',
+  languageSettings: 'Language settings',
+  pleaseSelectType: 'Please select type',
+  meeting: 'Meeting',
+  notice: 'Notice',
+  other: 'other',
+  theme: 'theme',
+  pleaseEnterTheme: 'Please enter the theme',
+  fullName: 'Name',
+  pleaseEnterName: 'Please enter your name',
+  feedText: 'Feedback',
+  pleaseFeed: 'Please enter feedback information',
+  uploadImage6: 'Upload images (up to 6)',
+  image: 'picture',
+  submit: 'Submit',
+  uploadFailed: 'Upload failed',
+  uploading: 'Uploading in progress',
+  image5m: 'Image limited to 5M',
+  imageUploadFail: 'Image upload failed',
+  feedbacksubmitSuccess: 'Feedback submitted successfully',
+  pleaseEnterformatCorrect: 'Please fill in or provide data in the correct format',
+  switchLanguages: 'Switching languages ...',
+  switchRestLanguage: 'Switching languages requires restarting the application. Do you want to switch'
+}
--- a/locale/lang/zh-CN/alarm.js 0 → 100644
View file @3276544
+++ b/locale/lang/zh-CN/alarm.js 0 → 100644
View file @3276544
+export default {
+  scenario: '告警场景：',
+  level: '告警级别：',
+  organization: '所属组织：',
+  device: '告警设备：',
+  attribute: '触发属性：',
+  condition: '触发条件：',
+  value: '触发值：',
+  time: '告警时间：',
+  status: '告警状态：',
+  pleaseResult: '请输入处理结果',
+  processResult: '处理结果',
+  handle: '处理',
+  cleanUp: '清除',
+  alarmNum: '告警数:',
+  pleaseEnterDevice: '请输入告警设备',
+}
--- a/locale/lang/zh-CN/common.js 0 → 100644
View file @3276544
+++ b/locale/lang/zh-CN/common.js 0 → 100644
View file @3276544
+export default {
+  inputText: '请输入',
+  chooseText: '请选择',
+  belongingOrganization: '所属组织',
+  filterCriteria: '筛选条件',
+  resetting: '重置',
+  confirm: '确认',
+  allText: '全部',
+  onLine: '在线',
+  offLine: '离线',
+  toBeActivated: '待激活',
+  alarm: '告警',
+  normal: '正常',
+  directlyDevice: '直连设备',
+  gatewayDevice: '网关设备',
+  sensorDevice: '网关子设备',
+  yesText: '是',
+  noText: '否',
+  screen: '筛选',
+  copyContent: '复制内容',
+  copyOk: '复制成功',
+  organizationalRelateion: '组织关系',
+  pleaseEnterContent: '请输入搜索内容',
+  issuedSuccess: "下发成功",
+  cancelText: '取消',
+  customText: '自定义',
+  minText: '最小值',
+  maxText: '最大值',
+  averageText: '平均值',
+  summationText: '求和',
+  countText: '计数',
+  emptyText: '空',
+  minuteText: '分钟',
+  hourText: '小时',
+  hour: '时',
+  minute: '分',
+  toText: '至',
+  dayText: '天',
+  attributeText: '属性',
+  noData: '暂无数据',
+  organizationalRelation: '组织关系',
+  one: '一',
+  two: '二',
+  three: '三',
+  four: '四',
+  five: '五',
+  six: '六',
+  day: '日',
+  year: '年',
+  month: '月',
+  processSuccess: '处理成功',
+  clearSuccess: '清除成功',
+  pleaseBindAccount: '请进行账号绑定',
+  loading: '加载中...',
+  refreshSuccess: '下拉刷新成功',
+  noText: '无'
+}
--- a/locale/lang/zh-CN/components.js 0 → 100644
View file @3276544
+++ b/locale/lang/zh-CN/components.js 0 → 100644
View file @3276544
+export default {
+  calender: {
+    title: '日期选择',
+    startText: '开始',
+    endText: '结束',
+    confirmText: '确定',
+    confirmDisabledText: '确定'
+  }
+}
--- a/locale/lang/zh-CN/device.js 0 → 100644
View file @3276544
+++ b/locale/lang/zh-CN/device.js 0 → 100644
View file @3276544
+export default {
+  pleaseEnterDeviceName: '请输入设备名称或别名搜索',//Please enter the device name or alias to search
+  deviceNum: '设备数',
+  pleaseBindAccount: '请进行账号绑定',
+  deviceNumber: '设备编号',
+  deviceStatus: '设备状态',
+  alarmStatus: '告警状态',
+  deviceType: '设备类型',
+  isDeviceCollect: '设备是否收藏',
+  basicInfo: '基础信息',
+  realTime: '实时数据',
+  historyTime: '历史数据',
+  alarmLog: '告警记录',
+  commandRecord: '命令记录',
+  inQueue: '队列中',
+  hasBeenSent: '已发送',
+  successSent: '发送成功',
+  responseSuccess: '响应成功',
+  timeout: '超时',
+  expired: '已过期',
+  ResponseFailed: "响应失败",
+  deletedText: '已删除',
+  oneWay: '单向',
+  twoWay: '双向',
+  lastConnectionTime: '最后连接时间',
+  isAlarm: '是否告警',
+  deviceRemark: '设备描述',
+  commandIssuance: '命令下发',
+  issuanceType: '下发类型',
+  pleaseEnterCommandContent: '请输入下发内容',
+  currentDeviceNotOnLine: '当前设备不在线',
+  pleaseCommandRule: '输入的内容只能是字母和数字的组合',
+  issuedSuccess: "下发成功",
+  oneTwoWay: '单向/双向',
+  service: '服务',
+  inputParameter: '输入参数',
+  stringFormat: '字符串格式',
+  jsonFormat: 'JSON格式',
+  pleaseSelectService: '请选择服务',
+  pleaseSelectDate: '请选择日期',
+  pleaseSelectTimeInterval: '请选择时间区间',
+  pleaseSelectDataAgg: '请选择数据聚合功能',
+  pleaseSelectAttribute: '请选择属性',
+  variableValue: '变量值',
+  updateTime: '更新时间',
+  startTime: '开始时间',
+  entTime: '结束时间',
+  maximumNumber: '最大条数',
+  triggerAttribute: '触发属性',
+  triggerCondition: '触发条件',
+  triggerValue: '触发值',
+  notANumber: '不是一个有效的数字',
+  rangeValues: '取值范围在{min}~{max}之间',
+  dataLengthLess: '数据长度应该小于',
+  noCurrently: '暂无可选的',
+  serviceCommand: '服务命令',
+  alarmStatus: '告警状态：',
+  activationNotConfirmed: "激活未确认",
+  activationConfirmed: '激活已确认',
+  clearUnconfirmed: '清除未确认',
+  clearConfirmed: '清除已确认',
+  urgent: '紧急',
+  important: '重要',
+  secondary: '次要',
+  warning: '警告',
+  uncertain: '不确定',
+  equal: '等于',
+  notEqual: '不等于',
+  less: '小于',
+  lessOfEqual: '小于等于',
+  greater: '大于',
+  greaterOrEqual: '大于等于',
+  starting: '开始于',
+  ending: '结束于',
+  contain: '包含',
+  notIncluded: '不包含',
+  minutes30: '30分钟',
+  hour1: '1小时',
+  hours2: '2小时',
+  pastDay: '近一天',
+  alarmFiltering: '告警筛选',
+  selectDate: '选择日期',
+  alarmLevel: '告警等级',
+  selectTime: '选择时间',
+  commandType: '命令类型',
+  commandStatus: '命令状态',
+  responseType: '响应类型',
+  issuanceStatus: '下发状态',
+  commandTime: '命令下发时间',
+  responseResults: '响应结果',
+  commandContent: '命令内容',
+}
--- a/locale/lang/zh-CN/homePage.js 0 → 100644
View file @3276544
+++ b/locale/lang/zh-CN/homePage.js 0 → 100644
View file @3276544
+export default {
+  basicstatistics: '基础统计',
+  deviceStatistics: '设备统计',
+  deviceLabel: {
+    onLine: '在线',
+    offLine: '离线',
+    beActivated: '待激活',//To be activated
+  },
+  alarmStatistics: '告警统计',
+  alarmLabel: {
+    untreated: '未处理',
+    processed: '已处理',
+    falseAlarm: '误报',
+  },
+  cameraManagement: '摄像头管理',
+  configuration: '组态',
+  bulletinBoard: '看板',
+  cameraNum: '摄像头数：',
+  configurationNum: '组态数：',
+  pleaseConfigurationname: '请输入组态名称',
+  bulletionBoard: '看板数：',
+  pleaseVisualBoard: '请输入看板名称',
+}
--- a/locale/lang/zh-CN/index.js 0 → 100644
View file @3276544
+++ b/locale/lang/zh-CN/index.js 0 → 100644
View file @3276544
+import homePage from './homePage'
+import common from './common'
+import login from './login'
+import device from './device'
+import menu from './menu'
+import components from './components'
+import alarm from './alarm'
+import userCenter from './userCenter'
+export default {
+  homePage, common, login, device, menu, components, alarm, userCenter,
+  spreadTail: '连接世界 创造价值',
+}
--- a/locale/lang/zh-CN/login.js 0 → 100644
View file @3276544
+++ b/locale/lang/zh-CN/login.js 0 → 100644
View file @3276544
+export default {
+  hello: '您好,',
+  welcomeTo: '欢迎来到',
+  pleaseEnterAccount: '请输入登录账号',
+  pleaseEnterPassword: '请输入登录密码',
+  login: '登录',
+  phoneLogin: '手机验证码登录',
+  forgotPassword: '忘记密码',
+  thirdAccountLogin: '第三方账号登录',
+  passwordRule: '密码格式不正确（至少一个大写英文字母、至少一个小写英文字母、至少一位数字、至少一个特殊字符、最少八个字符）',
+  loginSuccess: '登录成功',
+  thirdAccountLoginSuccess: '第三方账号登录成功',
+  isLoginPut: '您确定要退出登录吗？',
+  loginOut: '退出登录',
+  bindAccount: '绑定账号',
+  pleaseClickLogin: '请点击登录',
+  accountOut: '退出账号',
+  phoneBind: '手机绑定',
+  PleaseEnterPhone: '请输入手机号码',
+  PleaseEnterCode: "请输入验证码",
+  accountBind: '账号绑定',
+  obtainCode: '获取验证码',
+  accountBindSuccess: '账号绑定成功',
+  phoneFormatFail: '手机号格式不正确',
+  codeFormatFail: '验证码格式不正确',
+  phoneBindSuccess: '手机绑定成功',
+  codeAfterSeconds: '{number}S后重新获取',
+  codeBeenSend: '验证码已发送',
+  accountPasswordLogin: '账号密码登录',
+  sendCode: '发送验证码',
+  switchLanguages: '切换语言中...',
+  verifyPhone: '验证手机号码',
+  settingsNewPassword: '设置新密码',
+  pleaseSettingsPassword: '请设置6-20位新的登录密码',
+  pleaseNewPassword: '请再次输入新的登录密码',
+  pleasePassword: '请输入密码',
+  twoPasswordFail: '两次输入密码不一致',
+  resetPasswordSuccess: '重置密码成功',
+  nextStep: '下一步',
+  pleaseNetwork: '请检查网络或服务器',
+  inspectDomain: '检查请求域名是否添加了域名白名单',
+  requestTimeout: '请求超时:请检查网络',
+
+}
--- a/locale/lang/zh-CN/menu.js 0 → 100644
View file @3276544
+++ b/locale/lang/zh-CN/menu.js 0 → 100644
View file @3276544
+export default {
+  homePage: '首页',
+  device: '设备',
+  alarm: '告警',
+  userCenter: '个人中心',
+  viewCamera: '查看摄像头',
+  viewConfiguration: '查看组态',
+  configurationDetail: "组态详情",
+  organizationScreening: '组织筛选',
+  viewBoard: '查看看板',
+  boardDetail: '看板详情',
+  languageSettings: '语言设置',
+  alarmDetail: '告警详情',
+  deviceDetail: '设备详情',
+  commandDetail: '命令详情',
+  deviceLocation: '设备地理位置',
+  systemNot: '系统通知',
+  notDetails: '通知详情',
+  feedback: '意见反馈',
+  login: '登录',
+  personalData: '个人资料',
+  phoneLogin: '手机验证码登录',
+  forgotPassword: '忘记密码',
+  my: "我的",
+}
--- a/locale/lang/zh-CN/userCenter.js 0 → 100644
View file @3276544
+++ b/locale/lang/zh-CN/userCenter.js 0 → 100644
View file @3276544
+export default {
+  basicInfomation: '基本资料',
+  realName: '真实姓名',
+  phoneNumber: '手机号码',
+  userAccount: '用户账号',
+  periodValidity: '有效期',
+  emailAddress: '邮箱地址',
+  unBind: '解绑',
+  isUnbind: '是否需要解除绑定的账号？',
+  camera: '相机',
+  album: '相册',
+  pleaseEnterCCorrectPhone: '请输入正确的手机号码',
+  permissionUseRequired: '需要下列权限才可以正常使用',
+  goToOpen: '前往开启',
+  pleaseLogUpload: '请登录后上传图片',
+  avatarUploadSuccess: '头像上传成功',
+  youCancelImage: '您取消选择图片',
+  unbindSuccess: '解绑成功',
+  unbindFail: '解绑失败',
+  cameraPermission: '摄像头权限(拍摄头像)',
+  storagePermission: '存储权限(读取相册)',
+  uploadInfoSuccess: '更新个人资料成功',
+  validationFail: '校验失败',
+  systemNotification: '系统通知',
+  feedback: '意见反馈',
+  languageSettings: '切换语言',
+  pleaseSelectType: '请选择类型',
+  meeting: '会议',
+  notice: '公告',
+  other: '其他',
+  theme: '主题',
+  pleaseEnterTheme: '请输入主题',
+  fullName: '姓名',
+  pleaseEnterName: '请输入姓名',
+  feedText: '反馈',
+  pleaseFeed: '请输入反馈信息',
+  uploadImage6: '上传图片(最多6张)',
+  image: '图片',
+  submit: '提交',
+  uploadFailed: '上传失败',
+  uploading: '上传中',
+  image5m: '图片限定5M',
+  imageUploadFail: '图片上传失败',
+  feedbacksubmitSuccess: '意见反馈提交成功',
+  pleaseEnterformatCorrect: '请填写或者请填写正确格式的数据',
+  switchRestLanguage: '切换语言需要重启应用，是否切换',
+}
--- a/locale/zh-Hans.json 0 → 100644
View file @3276544
+++ b/locale/zh-Hans.json 0 → 100644
View file @3276544
+ {
+  "homePage": "首页",
+  "device": "设备",
+  "alarm": "告警",
+  "userCenter": "个人中心",
+  "viewCamera": "查看摄像头",
+  "viewConfiguration": "查看组态",
+  "configurationDetail": "组态详情",
+  "organizationScreening": "组织筛选",
+  "viewBoard": "查看看板",
+  "boardDetail": "看板详情",
+  "languageSettings": "语言设置",
+  "alarmDetail": "告警详情",
+  "deviceDetail": "设备详情",
+  "commandDetail": "命令详情",
+  "deviceLocation": "设备地理位置",
+  "systemNot": "系统通知",
+  "notDetails": "通知详情",
+  "feedback": "意见反馈",
+  "login": "登录",
+  "personalData": "个人资料",
+  "phoneLogin": "手机验证码登录",
+  "forgotPassword": "忘记密码",
+  "my": "我的"
+}
--- a/login-subpackage/other/code.vue
View file @3276544
+++ b/login-subpackage/other/code.vue
View file @3276544
@@ -5,21 +5,21 @@
 		<view class="login-body">
 			<view class="login-phone">
 				<view class="phone-main">
-					<text class="text">手机验证码登录</text>
+					<text class="text">{{ $t('login.phoneLogin') }}</text>
 					<view class="circleStyle"></view>
 				</view>
-				<view class="form-row"><u-input v-model="loginForm.phoneNumber" type="number" placeholder="请输入手机号码"
+				<view class="form-row"><u-input v-model="loginForm.phoneNumber" type="number" :placeholder="$t('login.PleaseEnterPhone')"
 						border="bottom"></u-input></view>
 				<view class="form-row">
-					<u-input type="number" v-model="loginForm.code" placeholder="请输入验证码" border="bottom">
+					<u-input type="number" v-model="loginForm.code" :placeholder="$t('login.PleaseEnterCode')" border="bottom">
 						<template slot="suffix">
 							<view @click="getVerifyCode" class="verify-code">{{ codeText }}</view>
 						</template>
 					</u-input>
 				</view>
-				<button class="submit" size="default" @click="onSubmit"><text class="text">登录</text></button>
+				<button class="submit" size="default" @click="onSubmit"><text class="text">{{ $t('login.login') }}</text></button>
 				<view class="u-flex account-style">
-					<view class="content" @click="openAccountFunc">账号密码登录</view>
+					<view class="content" @click="openAccountFunc">{{ $t('login.accountPasswordLogin') }}</view>
 				</view>
 				<view class="circleStyleBottom"></view>
 			</view>
@@ -41,9 +41,19 @@
 					code: ''
 				},
 				readonly: false,
-				codeText: '发送验证码',
+				codeText:'',
 			};
 		},
+		onShow(){
+			this.$nextTick(()=>{
+				uni.setNavigationBarTitle({
+					title:this.$t('menu.phoneLogin')
+				})
+			})
+		},
+		onLoad(){
+			this.codeText = this.$t('login.obtainCode')
+		},
 		methods: {
 			...mapMutations(['setUserInfo']),
 			...mapActions(['updateBadgeTotal']),
@@ -51,14 +61,14 @@
 			codeCountdownText() {
 				const _this = this;
 				this.readonly = true;
-				this.codeText = '60s后重新获取';
+				this.codeText = this.$t('login.codeAfterSeconds',{number:60});
 				var s = 60;
 				clear = setInterval(() => {
 					s--;
-					_this.codeText = s + 's后重新获取';
+					_this.codeText = this.$t('login.codeAfterSeconds',{number:s});
 					if (s <= 0) {
 						clearInterval(clear);
-						_this.codeText = '发送验证码';
+						_this.codeText = this.$t('login.obtainCode');
 						_this.readonly = false;
 					}
 				}, 1000);
@@ -71,10 +81,10 @@
 					return
 				}
 				if (!this.loginForm.phoneNumber) {
-					return useShowToast('请输入手机号~')
+					return useShowToast(this.$t('login.PleaseEnterPhone'))
 				}
 				if (!phoneRegular.test(this.loginForm.phoneNumber)) {
-					return useShowToast('手机号格式不正确~')
+					return useShowToast(this.$t('login.phoneFormatFail'))
 				}
 				// 获取验证码接口
 				await api.loginApi.postPhoneCodeApi(this.loginForm.phoneNumber)
@@ -84,10 +94,10 @@
 				const phoneRegular = /^1\d{10}$/;
 				const verifyCodeReg = /^\d{6}$/;
 				const validateValue = Object.values(this.loginForm)
-				if (!validateValue[0]) return uni.$u.toast("请输入手机号码~");
-				if (!validateValue[1]) return uni.$u.toast("请输入验证码~");
-				if (!phoneRegular.test(validateValue[0])) return uni.$u.toast("手机号格式不正确~");
-				if (!verifyCodeReg.test(validateValue[1])) return uni.$u.toast("验证码格式不正确~");
+				if (!validateValue[0]) return uni.$u.toast(this.$t('login.PleaseEnterPhone'));
+				if (!validateValue[1]) return uni.$u.toast(this.$t('login.PleaseEnterCode'));
+				if (!phoneRegular.test(validateValue[0])) return uni.$u.toast(this.$t('login.phoneFormatFail'));
+				if (!verifyCodeReg.test(validateValue[1])) return uni.$u.toast(this.$t('login.codeFormatFail'));
 				const res = await api.loginApi.postPhoneLoginApi(this.loginForm)
 				if (res) {
 					// 储存登录信息
@@ -103,7 +113,7 @@
 					if (userInfo.token) {
 						this.setUserInfo(userInfo);
 					}
-					useShowToast('登录成功~').then(async (res) => {
+					useShowToast(this.$t('login.loginSuccess')).then(async (res) => {
 						this.saveUserInfo();
 						await this.getAlarmTotalData();
 						useReLaunch("/pages/index/index")
--- a/login-subpackage/other/find-password.vue
View file @3276544
+++ b/login-subpackage/other/find-password.vue
View file @3276544
@@ -2,28 +2,28 @@
 	<view class="find-password-page">
 		<public-module></public-module>
 		<view class="top u-flex">
-			<view @click="showPhone" :style="{ color: phoneNumberColor }" class="item">1.验证手机号码</view>
-			<view :style="{ color: passwordColor }" class="item">2.设置新密码</view>
+			<view @click="showPhone" :style="{ color: phoneNumberColor }" class="item">1.{{ $t('login.verifyPhone') }}</view>
+			<view :style="{ color: passwordColor }" class="item">2.{{ $t('login.settingsNewPassword') }}</view>
 		</view>
 		<view v-if="!nextStatus" class="login-body">
 			<view class="login-phone">
 				<view class="form-row">
-					<u-input v-model="forgetForm.phone" type="number" placeholder="请输入手机号码" border="bottom" />
+					<u-input v-model="forgetForm.phone" type="number" :placeholder="$t('login.PleaseEnterPhone')" border="bottom" />
 				</view>
 				<view class="form-row">
-					<u-input type="number" v-model="forgetForm.verifyCode" placeholder="请输入验证码" border="bottom">
+					<u-input type="number" v-model="forgetForm.verifyCode" :placeholder="$t('login.PleaseEnterCode')" border="bottom">
 						<template slot="suffix">
 							<view @click="getVerifyCode" class="verify-code">{{ codeText }}</view>
 						</template>
 					</u-input>
 				</view>
-				<button class="submit" size="default" @click="onNextSubmit"><text style="color:#fff">下一步</text></button>
+				<button class="submit" size="default" @click="onNextSubmit"><text style="color:#fff">{{ $t('login.nextStep') }}</text></button>
 			</view>
 		</view>
 		<view v-else class="login-body">
 			<view class="login-phone">
 				<view class="form-row u-flex">
-					<u-input v-model="forgetForm.password" :password="showPassword" placeholder="请设置6-20位新的登录密码" border="bottom">
+					<u-input v-model="forgetForm.password" :password="showPassword" :placeholder="$t('login.pleaseSettingsPassword')" border="bottom">
 						<template slot="suffix">
 							<view @click="showPasswordMode" style="padding: 10rpx">
 								<u-icon width="18" height="14" :name="passwordModeIcon"></u-icon>
@@ -32,7 +32,7 @@
 					</u-input>
 				</view>
 				<view class="form-row u-flex">
-					<u-input v-model="forgetForm.repeatPassword" :password="showPasswordRepeat" placeholder="请再次输入新的登录密码" border="bottom">
+					<u-input v-model="forgetForm.repeatPassword" :password="showPasswordRepeat" :placeholder="$t('login.pleaseNewPassword')" border="bottom">
 						<template slot="suffix">
 							<view @click="showPasswordModeRepeat" style="padding: 10rpx">
 								<u-icon width="18" height="14" :name="passwordModeRepeatIcon"></u-icon>
@@ -40,7 +40,7 @@
 						</template>
 					</u-input>
 				</view>
-				<button class="submit" size="default" @click="onSubmit"><text style="color:#fff">确定</text></button>
+				<button class="submit" size="default" @click="onSubmit"><text style="color:#fff">{{ $t('common.confirm') }}</text></button>
 			</view>
 		</view>
 	</view>
@@ -62,7 +62,7 @@
 					repeatPassword: '',
 				},
 				readonly: false,
-				codeText: '发送验证码',
+				codeText: '',
 				nextStatus: false,
 				showPassword: true,
 				showPasswordRepeat: true
@@ -82,19 +82,29 @@
 				return this.showPasswordRepeat ? '/static/eye-hide.png' : '/static/eye.png'
 			}
 		},
+		onShow(){
+			this.$nextTick(()=>{
+				uni.setNavigationBarTitle({
+					title:this.$t('menu.forgotPassword')
+				})
+			})
+		},
+		onLoad(){
+			this.codeText = this.$t('login.sendCode')
+		},
 		methods: {
 			//验证码按钮文字状态
 			verifyCodeCountDown() {
 				const _this = this;
 				this.readonly = true;
-				this.codeText = '60s后重新获取';
+				this.codeText = this.$t('login.codeAfterSeconds',{number:60});
 				var s = 60;
 				clear = setInterval(() => {
 					s--;
-					_this.codeText = s + 's后重新获取';
+					_this.codeText = this.$t('login.codeAfterSeconds',{number:s});
 					if (s <= 0) {
 						clearInterval(clear);
-						_this.codeText = '发送验证码';
+						_this.codeText = this.$t('login.sendCode');
 						_this.readonly = false;
 					}
 				}, 1000);
@@ -103,14 +113,13 @@
 			getVerifyCode() {
 				const phoneRegular = /^1\d{10}$/;
 				if (this.readonly) {
-					useShowToast('验证码已发送~')
+					useShowToast(this.$t('login.codeBeenSend'))
 				}
-				console.log(this.forgetForm.phone);
 				if (!this.forgetForm.phone) {
-					return useShowToast('请输入手机号~')
+					return useShowToast(this.$t('login.PleaseEnterPhone'))
 				}
 				if (!phoneRegular.test(this.forgetForm.phone)) {
-					return useShowToast('手机号格式不正确~')
+					return useShowToast(this.$t('login.phoneFormatFail'))
 				}
 				api.loginApi.postCodeApi(this.forgetForm.phone)
 					.then(res => {
@@ -121,10 +130,10 @@
 				const phoneRegular = /^1\d{10}$/;
 				const verifyCodeReg=/^\d{6}$/;
 				const validateValue = Object.values(this.forgetForm)
-				if(!validateValue[0]) return uni.$u.toast("请输入手机号码~");
-				if(!validateValue[1]) return uni.$u.toast("请输入验证码~");
-				if(!phoneRegular.test(validateValue[0])) return uni.$u.toast("手机号格式不正确~");
-				if(!verifyCodeReg.test(validateValue[1])) return uni.$u.toast("验证码格式不正确~");
+				if(!validateValue[0]) return uni.$u.toast(this.$t('login.PleaseEnterPhone'));
+				if(!validateValue[1]) return uni.$u.toast(this.$t('login.PleaseEnterCode'));
+				if(!phoneRegular.test(validateValue[0])) return uni.$u.toast(this.$t('login.phoneFormatFail'));
+				if(!verifyCodeReg.test(validateValue[1])) return uni.$u.toast(this.$t('login.codeFormatFail'));
 				this.nextStatus = true;
 			},
 			showPhone() {
@@ -132,11 +141,11 @@
 			},
 			onSubmit() {
 				const validateValue = Object.values(this.forgetForm)
-				if(!validateValue[2]) return uni.$u.toast("请输入密码~");
-				if(!validateValue[3]) return uni.$u.toast("请输入密码~");
-				if(!loginPasswordReg.test(validateValue[2])) return useShowModal('密码格式不正确（至少一个大写英文字母、至少一个小写英文字母、至少一位数字、至少一个特殊字符、最少八个字符）~')
-				if(!loginPasswordReg.test(validateValue[3])) return useShowModal('密码格式不正确（至少一个大写英文字母、至少一个小写英文字母、至少一位数字、至少一个特殊字符、最少八个字符）~')
-				if (validateValue[2] !== validateValue[3]) return uni.$u.toast('两次输入密码不一致');
+				if(!validateValue[2]) return uni.$u.toast(this.$t('login.pleasePassword'));
+				if(!validateValue[3]) return uni.$u.toast(this.$t('login.pleasePassword'));
+				if(!loginPasswordReg.test(validateValue[2])) return useShowModal(this.$t('login.passwordRule'))
+				if(!loginPasswordReg.test(validateValue[3])) return useShowModal(this.$t('login.passwordRule'))
+				if (validateValue[2] !== validateValue[3]) return uni.$u.toast(this.$t('login.twoPasswordFail'));
 				let httpData = {
 					password: this.forgetForm.password,
 					phoneNumber: this.forgetForm.phone,
@@ -144,7 +153,7 @@
 				};
 				const res = api.loginApi.postResetCodeApi(this.forgetForm.phone, httpData)
 				if (res) {
-					useShowToast( '重置密码成功~').then(res => {
+					useShowToast(this.$t('login.resetPasswordSuccess')).then(res => {
 						useReLaunch('/publicLoginSubPage/public/login')
 					});
 				}
--- a/login-subpackage/other/set.vue
View file @3276544
+++ b/login-subpackage/other/set.vue
View file @3276544
@@ -23,37 +23,37 @@
 			</view>
 		</view>
 		<!-- #endif -->
-		<view class="u-m-t-20 basic-text"><text class="text">基本资料</text></view>
+		<view class="u-m-t-20 basic-text"><text class="text">{{$t('userCenter.basicInfomation')}}</text></view>
 		<view class="basic-main">
 			<u--form labelPosition="left" :model="myInfoModel" ref="myForm">
-				<u-form-item labelWidth="80px" label="真实姓名" prop="realName" borderBottom>
-					<u--input placeholder="请输入真实姓名" v-model="myInfoModel.realName" border="none"></u--input>
+				<u-form-item labelWidth="80px" :label="$t('userCenter.realName')" prop="realName" borderBottom>
+					<u--input :placeholder="$t('common.inputText') + $t('userCenter.realName')" v-model="myInfoModel.realName" border="none"></u--input>
 				</u-form-item>
-				<u-form-item labelWidth="80px" label="手机号码" prop="phoneNumber" borderBottom>
-					<u--input placeholder="请输入手机号码" v-model="myInfoModel.phoneNumber" border="none"></u--input>
+				<u-form-item labelWidth="80px" :label="$t('userCenter.phoneNumber')" prop="phoneNumber" borderBottom>
+					<u--input :placeholder="$t('common.inputText') + $t('userCenter.phoneNumber')"  v-model="myInfoModel.phoneNumber" border="none"></u--input>
 				</u-form-item>
-				<u-form-item labelWidth="80px" label="用户账号" prop="username" borderBottom>
-					<u--input disabled placeholder="请输入用户账号 " v-model="myInfoModel.username" border="none"></u--input>
+				<u-form-item labelWidth="80px" :label="$t('userCenter.userAccount')" prop="username" borderBottom>
+					<u--input disabled :placeholder="$t('common.inputText') + $t('userCenter.userAccount')" v-model="myInfoModel.username" border="none"></u--input>
 				</u-form-item>
-				<u-form-item labelWidth="80px" label="有效期" prop="accountExpireTime" borderBottom>
+				<u-form-item labelWidth="80px" :label="$t('userCenter.periodValidity')" prop="accountExpireTime" borderBottom>
 					<u--input disabled v-model="myInfoModel.accountExpireTime"  border="none"></u--input>
 				</u-form-item>
-				<u-form-item labelWidth="80px" label="邮箱地址" prop="email" borderBottom>
-					<u--input placeholder="请输入邮箱地址" v-model="myInfoModel.email" border="none"></u--input>
+				<u-form-item labelWidth="80px" :label="$t('userCenter.emailAddress')" prop="email" borderBottom>
+					<u--input :placeholder="$t('common.inputText') + $t('userCenter.emailAddress')" v-model="myInfoModel.email" border="none"></u--input>
 				</u-form-item>
 			</u--form>
 		</view>
 		<view class="basic-bottom u-flex">
 			<view class="item" v-if="info.data.isThirdLoginAndNoDind && isJudgeBindBtn">
 				<button class="submit" size="default" @click="clearAccountFunc" :style="{ background: InfoColor }"><text
-						class="un-bind-text">解绑</text></button>
+						class="un-bind-text">{{ $t('userCenter.unBind') }}</text></button>
 			</view>
 			<view class="item" style="margin-right: 60rpx;" :style="[
 					{ position: info.data.isThirdLoginAndNoDind && isJudgeBindBtn ? '' : 'relative' },
 					{ right: info.data.isThirdLoginAndNoDind && isJudgeBindBtn ? '' : '-190rpx' }
 				]">
 				<button class="submit" size="default" @click="onSubmitFunc" :style="{ background: PrimaryColor }"><text
-						class="un-bind-text">确认</text></button>
+						class="un-bind-text">{{$t('common.confirm')}}</text></button>
 			</view>
 		</view>
 		<!-- #ifdef MP-WEIXIN -->
@@ -63,14 +63,14 @@
 		<view>
 			<u-popup bgColor="transparent" :overlay="true" :show="showBind" mode="bottom">
 				<view class="u-flex logout-main">
-					<view class="main"><text style="color: #999999">是否需要解除绑定的账号？</text></view>
-					<view @click="confrimBind(info)" class="main"><text style="color: #f95e5a">是</text></view>
-					<view @click="showBind = false" class="main1"><text style="color: #3478f7">否</text></view>
+					<view class="main"><text style="color: #999999">{{ $t('userCenter.isUnbind') }}</text></view>
+					<view @click="confrimBind(info)" class="main"><text style="color: #f95e5a">{{ $t('common.yesText') }}</text></view>
+					<view @click="showBind = false" class="main1"><text style="color: #3478f7">{{ $t('common.noText') }}</text></view>
 				</view>
 			</u-popup>
 		</view>
 		<!-- 解绑账号 -->
-		<u-picker :show="showSelectType" :columns="avgColumns" keyName="label" closeOnClickOverlay
+		<u-picker :show="showSelectType" :columns="avgColumns.map(item=>({...item,label:$t(item.label)}))" keyName="label" closeOnClickOverlay
 			@confirm="confirmAvgGap" @cancel="showSelectType=false" @close="showSelectType=false"></u-picker>
 	</view>
 </template>
@@ -90,10 +90,10 @@
 			return {
 				avgColumns: [
 					[{
-						label: '相机',
+						label: 'userCenter.camera',
 						value: 1
 					}, {
-						label: '相册',
+						label: 'userCenter.album',
 						value: 2
 					}, ]
 				],
@@ -108,28 +108,6 @@
 					email: '',
 					accountExpireTime: ''
 				},
-				rules: {
-					phoneNumber: [{
-							required: true,
-							message: '请输入正确的手机号码',
-							trigger: 'change'
-						},
-						{
-							pattern: /^1[3-9][0-9]{9}$/,
-							message: '请输入正确的手机号码'
-						}
-					],
-					// email: [{
-					// 		required: true,
-					// 		message: '请输入正确的邮箱号',
-					// 		trigger: 'change'
-					// 	},
-					// 	{
-					// 		pattern: /^[0-9a-zA-Z]+@(([0-9a-zA-Z]+)[.])+[a-z]{3}$/,
-					// 		message: '请输入正确的邮箱号'
-					// 	}
-					// ]
-				},
 				showDate: false,
 				dateTime: Number(new Date()),
 				avatar: '',
@@ -142,7 +120,29 @@
 			};
 		},
 		onReady() {
-			this.$refs.myForm.setRules(this.rules);
+			// const rules = {
+			// 		phoneNumber: [{
+			// 				required: true,
+			// 				message: this.$t('userCenter.pleaseEnterCCorrectPhone'),
+			// 				trigger: 'change'
+			// 			},
+			// 			{
+			// 				pattern: /^1[3-9][0-9]{9}$/,
+			// 				message: this.$t('userCenter.pleaseEnterCCorrectPhone')
+			// 			}
+			// 		],
+			// 		// email: [{
+			// 		// 		required: true,
+			// 		// 		message: '请输入正确的邮箱号',
+			// 		// 		trigger: 'change'
+			// 		// 	},
+			// 		// 	{
+			// 		// 		pattern: /^[0-9a-zA-Z]+@(([0-9a-zA-Z]+)[.])+[a-z]{3}$/,
+			// 		// 		message: '请输入正确的邮箱号'
+			// 		// 	}
+			// 		// ]
+			// 	}
+			// this.$refs.myForm.setRules(rules);
 		},
 		onLoad(e) {
 			if (e.data !== null) {
@@ -154,6 +154,11 @@
 			}
 		},
 		onShow() {
+			this.$nextTick(()=>{
+				uni.setNavigationBarTitle({
+					title:this.$t('menu.personalData')
+				})
+			})
 			let getOpenId = getApp().globalData.openId;
 			if (getOpenId) {
 				this.openIds = getOpenId;
@@ -168,7 +173,7 @@
 			...mapState(['userInfo']),
 			...mapMutations(['setUserInfo', 'emptyUserInfo']),
 			modify() {
-				useShowModal(this.modify_content, '需要下列权限才可以正常使用', '前往开启').then((res) => {
+				useShowModal(this.modify_content, this.$t('userCenter.permissionUseRequired'), this.$t('userCenter.goToOpen')).then((res) => {
 					if (res.confirm) {
 						permission.gotoAppPermissionSetting(); //动态修改权限
 					}
@@ -193,7 +198,7 @@
 				// #ifdef H5
 				token = window.sessionStorage.getItem('userInfo').isToken;
 				// #endif
-				if (!token) return uni.$u.toast('请登录后上传图片');
+				if (!token) return uni.$u.toast(this.$t('userCenter.pleaseLogUpload'));
 				var cmr = plus.camera.getCamera();
 				var res = cmr.supportedImageResolutions[0];
 				var fmt = cmr.supportedImageFormats[0];
@@ -207,7 +212,7 @@
 							.then(res => {
 								let objImage = JSON.parse(res.data);
 								this.avatar = objImage.fileStaticUri;
-								uni.$u.toast('头像上传成功');
+								uni.$u.toast(this.$t('userCenter.avatarUploadSuccess'));
 							})
 					},
 					function(error) {
@@ -225,7 +230,7 @@
 				// #ifdef H5
 				token = window.sessionStorage.getItem('userInfo').isToken;
 				// #endif
-				if (!token) return uni.$u.toast('请登录后上传图片');
+				if (!token) return uni.$u.toast(this.$t('userCenter.pleaseLogUpload'));
 				plus.gallery.pick(
 					(path) => {
 						this.showSelectType = false
@@ -236,11 +241,11 @@
 							.then(res => {
 								let objImage = JSON.parse(res.data);
 								this.avatar = objImage.fileStaticUri;
-								uni.$u.toast('头像上传成功');
+								uni.$u.toast(this.$t('userCenter.avatarUploadSuccess'));
 							})
 					},
 					function(e) {
-						uni.$u.toast('您取消选择图片');
+						uni.$u.toast(this.$t('userCenter.youCancelImage'));
 					}, {
 						filter: 'image'
 					}
@@ -255,7 +260,7 @@
 					};
 					api.loginApi.deleteBindApi(httpData).then(res => {
 						if (res) {
-							uni.$u.toast('解绑成功');
+							uni.$u.toast(this.$t('userCenter.unbindSuccess'));
 							this.showBind = false;
 							this.isJudgeBindBtn = false;
 							uni.reLaunch({
@@ -263,7 +268,7 @@
 							});
 							this.emptyUserInfo();
 						} else {
-							uni.$u.toast('解绑失败');
+							uni.$u.toast(this.$t('userCenter.unbindFail'));
 							this.showBind = false;
 						}
 					});
@@ -277,7 +282,7 @@
 			},
 			confirmAvgGap(e) {
 				if (e.value[0].value == 1) {
-					this.modify_content = '摄像头权限(拍摄头像)';
+					this.modify_content = this.$t('userCenter.cameraPermission');
 					//相机
 					switch (uni.getSystemInfoSync().platform) {
 						case 'android':
@@ -285,7 +290,7 @@
 							break;
 					}
 				} else {
-					this.modify_content = '存储权限(读取相册)';
+					this.modify_content = this.$t('userCenter.storagePermission');
 					//相册
 					switch (uni.getSystemInfoSync().platform) {
 						case 'android':
@@ -303,7 +308,7 @@
 				// #ifdef H5
 				token = window.sessionStorage.getItem('userInfo').isToken;
 				// #endif
-				if (!token) return uni.$u.toast('请登录后上传图片');
+				if (!token) return uni.$u.toast(this.$t('userCenter.pleaseLogUpload'));
 				useChooseImage({
 					count: 1,
 					sizeType: ['compressed'],
@@ -317,7 +322,7 @@
 						.then(res => {
 							let objImage = JSON.parse(res.data);
 							this.avatar = objImage.fileStaticUri;
-							uni.$u.toast('头像上传成功');
+							uni.$u.toast(this.$t('userCenter.avatarUploadSuccess'));
 						})
 				})
 			},
@@ -338,11 +343,11 @@
 							uni.navigateBack({
 								delta: 1
 							});
-							uni.$u.toast('更新个人资料成功~');
+							uni.$u.toast(this.$t('userCenter.uploadInfoSuccess'));
 						}
 					})
 					.catch(errors => {
-						uni.$u.toast('校验失败');
+						uni.$u.toast(this.$t('userCenter.validationFail'));
 					});
 			},
 			dateClose() {
@@ -354,19 +359,19 @@
 			},
 			formatter(type, value) {
 				if (type === 'year') {
-					return `${value}年`;
+					return `${value} ${this.$t('common.year')}`;
 				}
 				if (type === 'month') {
-					return `${value}月`;
+					return `${value} ${this.$t('common.month')}`;
 				}
 				if (type === 'day') {
-					return `${value}日`;
+					return `${value} ${this.$t('common.day')}`;
 				}
 				if (type === 'hour') {
-					return `${value}时`;
+					return `${value}${this.$t('common.hour')}`;
 				}
 				if (type === 'minute') {
-					return `${value}分`;
+					return `${value}${this.$t('common.minute')}`;
 				}
 				return value;
 			},
--- a/login-subpackage/public/login.vue
View file @3276544
+++ b/login-subpackage/public/login.vue
View file @3276544
@@ -4,20 +4,20 @@
 		<public-module></public-module>
 		<view class="u-flex login-main">
 			<view class="content">
-				<view class="hello login-text-muted">您好,</view>
-				<view style="width: 587rpx;" class="text-clip hello-welcome login-text-muted">欢迎来到{{setHeadTitle}}!
+				<view class="hello login-text-muted">{{ $t('login.hello') }}</view>
+				<view style="width: 587rpx;" class="text-clip hello-welcome login-text-muted">{{$t('login.welcomeTo')}} {{setHeadTitle}}
 				</view>
 			</view>
 		</view>
 		<view class="login-body">
 			<view class="login-phone">
 				<view class="form-row u-flex">
-					<u-input :adjust-position="false" v-model="loginForm.username" type="text" placeholder="请输入登录账号"
+					<u-input :adjust-position="false" v-model="loginForm.username" type="text" :placeholder="$t('login.pleaseEnterAccount')"
 						border="bottom" />
 				</view>
 				<view class="form-row u-flex">
 					<u-input :adjust-position="false" v-model="loginForm.password" :password="showPassword"
-						placeholder="请输入登录密码" border="bottom">
+						:placeholder="$t('login.pleaseEnterPassword')" border="bottom">
 						<template slot="suffix">
 							<view @click="showPasswordMode" style="padding: 10rpx">
 								<u-icon width="18" height="14" :name="passwordIcon"></u-icon>
@@ -26,15 +26,15 @@
 					</u-input>
 				</view>
 				<button class="submit" size="default" @click="onSubmitFunc">
-					<text class="text">登录</text>
+					<text class="text">{{ $t('login.login') }}</text>
 				</button>
 				<view class="u-flex row-item">
-					<view class="row-phone login-text-gray" @click="openCodeFunc">手机验证码登录</view>
-					<view class="row-reset login-text-gray" @click="findPassrordFunc">忘记密码</view>
+					<view class="row-phone login-text-gray" @click="openCodeFunc">{{ $t('login.phoneLogin') }}</view>
+					<view class="row-reset login-text-gray" @click="findPassrordFunc">{{ $t('login.forgotPassword') }}</view>
 				</view>
 				<view class="u-flex link-login">
 					<!-- #ifdef MP-WEIXIN -->
-					<view class="link-text login-text-gray">第三方账号登录</view>
+					<view class="link-text login-text-gray">{{ $t('login.thirdAccountLogin') }}</view>
 					<view style="height: 20rpx"></view>
 					<button class="link-image" @tap="handleWenxinAuthorization">
 						<image class="image" src="/static/weixin.png" mode="aspectFill"></image>
@@ -91,6 +91,11 @@
 			}
 		},
 		onShow() {
+			this.$nextTick(()=>{
+				uni.setNavigationBarTitle({
+					title:this.$t('menu.login')
+				})
+			})
 			uni.setStorageSync('getConfiguration', {
 				isConfiguration: false
 			});
@@ -161,7 +166,7 @@
 								useReLaunch("/pages/index/index")
 							} else {
 								// 不需要绑定,直接第三方登录使用
-								this.saveLoginInfo(res, true, null, "第三方账号登录成功")
+								this.saveLoginInfo(res, true, null, this.$t('login.thirdAccountLoginSuccess'))
 							}
 						}
 					},
@@ -187,14 +192,13 @@
 			},
 			async onSubmitFunc() {
 				const validateValue = Object.values(this.loginForm)
-				if (!validateValue[0]) return uni.$u.toast("请输入登录账号~");
-				if (!validateValue[1]) return uni.$u.toast("请输入登录密码~");
-				if (!loginPasswordReg.test(validateValue[1])) return useShowModal(
-					"密码格式不正确（至少一个大写英文字母、至少一个小写英文字母、至少一位数字、至少一个特殊字符、最少八个字符）~", )
+				if (!validateValue[0]) return uni.$u.toast(this.$t('login.pleaseEnterAccount'));
+				if (!validateValue[1]) return uni.$u.toast($t('login.pleaseEnterPassword'));
+				if (!loginPasswordReg.test(validateValue[1])) return useShowModal(this.$t('login.passwordRule'))
 				const res = await api.loginApi.postLoginApi(this.loginForm)
 				if (res) {
 					// 储存登录信息
-					this.saveLoginInfo(res, false, false, "登录成功~")
+					this.saveLoginInfo(res, false, false, this.$t('login.loginSuccess'))
 				}
 			},
 			openCodeFunc() {
--- a/main.js
View file @3276544
+++ b/main.js
View file @3276544
@@ -26,6 +26,9 @@ Vue.use(f_show_modal)
 import uView from '@/uni_modules/uview-ui'
 Vue.use(uView)
+//i18n
+import i18n from '@/config/i18n.js'
+
 // 公共组件注册
 import publicModule from "@/components/common/public-module.vue";
 Vue.component("public-module", publicModule);
@@ -37,6 +40,7 @@ App.mpType = 'app'
 const app = new Vue({
     store,
+    i18n,
     ...App
 })
--- a/manifest.json
View file @3276544
+++ b/manifest.json
View file @3276544
@@ -105,7 +105,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wx3a36e5189b607150",
+        "appid" : "wx99c411dc3c5571ef",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,
--- a/package-lock.json 0 → 100644
View file @3276544
+++ b/package-lock.json 0 → 100644
View file @3276544
+{
+	"name": "thingskit-app",
+	"version": "1.0.0",
+	"lockfileVersion": 3,
+	"requires": true,
+	"packages": {
+		"": {
+			"name": "thingskit-app",
+			"version": "1.0.0",
+			"license": "ISC",
+			"dependencies": {
+				"moment": "^2.29.2",
+				"vue-i18n": "^9.1.9"
+			}
+		},
+		"node_modules/@babel/helper-string-parser": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz",
+			"integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==",
+			"peer": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-validator-identifier": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz",
+			"integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==",
+			"peer": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/parser": {
+			"version": "7.25.8",
+			"resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.25.8.tgz",
+			"integrity": "sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==",
+			"peer": true,
+			"dependencies": {
+				"@babel/types": "^7.25.8"
+			},
+			"bin": {
+				"parser": "bin/babel-parser.js"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@babel/types": {
+			"version": "7.25.8",
+			"resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.25.8.tgz",
+			"integrity": "sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==",
+			"peer": true,
+			"dependencies": {
+				"@babel/helper-string-parser": "^7.25.7",
+				"@babel/helper-validator-identifier": "^7.25.7",
+				"to-fast-properties": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@intlify/core-base": {
+			"version": "9.1.9",
+			"resolved": "https://registry.npmmirror.com/@intlify/core-base/-/core-base-9.1.9.tgz",
+			"integrity": "sha512-x5T0p/Ja0S8hs5xs+ImKyYckVkL4CzcEXykVYYV6rcbXxJTe2o58IquSqX9bdncVKbRZP7GlBU1EcRaQEEJ+vw==",
+			"dependencies": {
+				"@intlify/devtools-if": "9.1.9",
+				"@intlify/message-compiler": "9.1.9",
+				"@intlify/message-resolver": "9.1.9",
+				"@intlify/runtime": "9.1.9",
+				"@intlify/shared": "9.1.9",
+				"@intlify/vue-devtools": "9.1.9"
+			},
+			"engines": {
+				"node": ">= 10"
+			}
+		},
+		"node_modules/@intlify/devtools-if": {
+			"version": "9.1.9",
+			"resolved": "https://registry.npmmirror.com/@intlify/devtools-if/-/devtools-if-9.1.9.tgz",
+			"integrity": "sha512-oKSMKjttG3Ut/1UGEZjSdghuP3fwA15zpDPcjkf/1FjlOIm6uIBGMNS5jXzsZy593u+P/YcnrZD6cD3IVFz9vQ==",
+			"dependencies": {
+				"@intlify/shared": "9.1.9"
+			},
+			"engines": {
+				"node": ">= 10"
+			}
+		},
+		"node_modules/@intlify/message-compiler": {
+			"version": "9.1.9",
+			"resolved": "https://registry.npmmirror.com/@intlify/message-compiler/-/message-compiler-9.1.9.tgz",
+			"integrity": "sha512-6YgCMF46Xd0IH2hMRLCssZI3gFG4aywidoWQ3QP4RGYQXQYYfFC54DxhSgfIPpVoPLQ+4AD29eoYmhiHZ+qLFQ==",
+			"dependencies": {
+				"@intlify/message-resolver": "9.1.9",
+				"@intlify/shared": "9.1.9",
+				"source-map": "0.6.1"
+			},
+			"engines": {
+				"node": ">= 10"
+			}
+		},
+		"node_modules/@intlify/message-resolver": {
+			"version": "9.1.9",
+			"resolved": "https://registry.npmmirror.com/@intlify/message-resolver/-/message-resolver-9.1.9.tgz",
+			"integrity": "sha512-Lx/DBpigeK0sz2BBbzv5mu9/dAlt98HxwbG7xLawC3O2xMF9MNWU5FtOziwYG6TDIjNq0O/3ZbOJAxwITIWXEA==",
+			"engines": {
+				"node": ">= 10"
+			}
+		},
+		"node_modules/@intlify/runtime": {
+			"version": "9.1.9",
+			"resolved": "https://registry.npmmirror.com/@intlify/runtime/-/runtime-9.1.9.tgz",
+			"integrity": "sha512-XgPw8+UlHCiie3fI41HPVa/VDJb3/aSH7bLhY1hJvlvNV713PFtb4p4Jo+rlE0gAoMsMCGcsiT982fImolSltg==",
+			"dependencies": {
+				"@intlify/message-compiler": "9.1.9",
+				"@intlify/message-resolver": "9.1.9",
+				"@intlify/shared": "9.1.9"
+			},
+			"engines": {
+				"node": ">= 10"
+			}
+		},
+		"node_modules/@intlify/shared": {
+			"version": "9.1.9",
+			"resolved": "https://registry.npmmirror.com/@intlify/shared/-/shared-9.1.9.tgz",
+			"integrity": "sha512-xKGM1d0EAxdDFCWedcYXOm6V5Pfw/TMudd6/qCdEb4tv0hk9EKeg7lwQF1azE0dP2phvx0yXxrt7UQK+IZjNdw==",
+			"engines": {
+				"node": ">= 10"
+			}
+		},
+		"node_modules/@intlify/vue-devtools": {
+			"version": "9.1.9",
+			"resolved": "https://registry.npmmirror.com/@intlify/vue-devtools/-/vue-devtools-9.1.9.tgz",
+			"integrity": "sha512-YPehH9uL4vZcGXky4Ev5qQIITnHKIvsD2GKGXgqf+05osMUI6WSEQHaN9USRa318Rs8RyyPCiDfmA0hRu3k7og==",
+			"dependencies": {
+				"@intlify/message-resolver": "9.1.9",
+				"@intlify/runtime": "9.1.9",
+				"@intlify/shared": "9.1.9"
+			},
+			"engines": {
+				"node": ">= 10"
+			}
+		},
+		"node_modules/@jridgewell/sourcemap-codec": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+			"integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+			"peer": true
+		},
+		"node_modules/@vue/compiler-core": {
+			"version": "3.5.11",
+			"resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.5.11.tgz",
+			"integrity": "sha512-PwAdxs7/9Hc3ieBO12tXzmTD+Ln4qhT/56S+8DvrrZ4kLDn4Z/AMUr8tXJD0axiJBS0RKIoNaR0yMuQB9v9Udg==",
+			"peer": true,
+			"dependencies": {
+				"@babel/parser": "^7.25.3",
+				"@vue/shared": "3.5.11",
+				"entities": "^4.5.0",
+				"estree-walker": "^2.0.2",
+				"source-map-js": "^1.2.0"
+			}
+		},
+		"node_modules/@vue/compiler-dom": {
+			"version": "3.5.11",
+			"resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.5.11.tgz",
+			"integrity": "sha512-pyGf8zdbDDRkBrEzf8p7BQlMKNNF5Fk/Cf/fQ6PiUz9at4OaUfyXW0dGJTo2Vl1f5U9jSLCNf0EZJEogLXoeew==",
+			"peer": true,
+			"dependencies": {
+				"@vue/compiler-core": "3.5.11",
+				"@vue/shared": "3.5.11"
+			}
+		},
+		"node_modules/@vue/compiler-sfc": {
+			"version": "3.5.11",
+			"resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.5.11.tgz",
+			"integrity": "sha512-gsbBtT4N9ANXXepprle+X9YLg2htQk1sqH/qGJ/EApl+dgpUBdTv3yP7YlR535uHZY3n6XaR0/bKo0BgwwDniw==",
+			"peer": true,
+			"dependencies": {
+				"@babel/parser": "^7.25.3",
+				"@vue/compiler-core": "3.5.11",
+				"@vue/compiler-dom": "3.5.11",
+				"@vue/compiler-ssr": "3.5.11",
+				"@vue/shared": "3.5.11",
+				"estree-walker": "^2.0.2",
+				"magic-string": "^0.30.11",
+				"postcss": "^8.4.47",
+				"source-map-js": "^1.2.0"
+			}
+		},
+		"node_modules/@vue/compiler-ssr": {
+			"version": "3.5.11",
+			"resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.5.11.tgz",
+			"integrity": "sha512-P4+GPjOuC2aFTk1Z4WANvEhyOykcvEd5bIj2KVNGKGfM745LaXGr++5njpdBTzVz5pZifdlR1kpYSJJpIlSePA==",
+			"peer": true,
+			"dependencies": {
+				"@vue/compiler-dom": "3.5.11",
+				"@vue/shared": "3.5.11"
+			}
+		},
+		"node_modules/@vue/devtools-api": {
+			"version": "6.6.4",
+			"resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.6.4.tgz",
+			"integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g=="
+		},
+		"node_modules/@vue/reactivity": {
+			"version": "3.5.11",
+			"resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.5.11.tgz",
+			"integrity": "sha512-Nqo5VZEn8MJWlCce8XoyVqHZbd5P2NH+yuAaFzuNSR96I+y1cnuUiq7xfSG+kyvLSiWmaHTKP1r3OZY4mMD50w==",
+			"peer": true,
+			"dependencies": {
+				"@vue/shared": "3.5.11"
+			}
+		},
+		"node_modules/@vue/runtime-core": {
+			"version": "3.5.11",
+			"resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.5.11.tgz",
+			"integrity": "sha512-7PsxFGqwfDhfhh0OcDWBG1DaIQIVOLgkwA5q6MtkPiDFjp5gohVnJEahSktwSFLq7R5PtxDKy6WKURVN1UDbzA==",
+			"peer": true,
+			"dependencies": {
+				"@vue/reactivity": "3.5.11",
+				"@vue/shared": "3.5.11"
+			}
+		},
+		"node_modules/@vue/runtime-dom": {
+			"version": "3.5.11",
+			"resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.5.11.tgz",
+			"integrity": "sha512-GNghjecT6IrGf0UhuYmpgaOlN7kxzQBhxWEn08c/SQDxv1yy4IXI1bn81JgEpQ4IXjRxWtPyI8x0/7TF5rPfYQ==",
+			"peer": true,
+			"dependencies": {
+				"@vue/reactivity": "3.5.11",
+				"@vue/runtime-core": "3.5.11",
+				"@vue/shared": "3.5.11",
+				"csstype": "^3.1.3"
+			}
+		},
+		"node_modules/@vue/server-renderer": {
+			"version": "3.5.11",
+			"resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.5.11.tgz",
+			"integrity": "sha512-cVOwYBxR7Wb1B1FoxYvtjJD8X/9E5nlH4VSkJy2uMA1MzYNdzAAB//l8nrmN9py/4aP+3NjWukf9PZ3TeWULaA==",
+			"peer": true,
+			"dependencies": {
+				"@vue/compiler-ssr": "3.5.11",
+				"@vue/shared": "3.5.11"
+			},
+			"peerDependencies": {
+				"vue": "3.5.11"
+			}
+		},
+		"node_modules/@vue/shared": {
+			"version": "3.5.11",
+			"resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.11.tgz",
+			"integrity": "sha512-W8GgysJVnFo81FthhzurdRAWP/byq3q2qIw70e0JWblzVhjgOMiC2GyovXrZTFQJnFVryYaKGP3Tc9vYzYm6PQ==",
+			"peer": true
+		},
+		"node_modules/csstype": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz",
+			"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+			"peer": true
+		},
+		"node_modules/entities": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmmirror.com/entities/-/entities-4.5.0.tgz",
+			"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+			"peer": true,
+			"engines": {
+				"node": ">=0.12"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/entities?sponsor=1"
+			}
+		},
+		"node_modules/estree-walker": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz",
+			"integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+			"peer": true
+		},
+		"node_modules/magic-string": {
+			"version": "0.30.11",
+			"resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.11.tgz",
+			"integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
+			"peer": true,
+			"dependencies": {
+				"@jridgewell/sourcemap-codec": "^1.5.0"
+			}
+		},
+		"node_modules/moment": {
+			"version": "2.30.1",
+			"resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+			"integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/nanoid": {
+			"version": "3.3.7",
+			"resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.7.tgz",
+			"integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"peer": true,
+			"bin": {
+				"nanoid": "bin/nanoid.cjs"
+			},
+			"engines": {
+				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+			}
+		},
+		"node_modules/picocolors": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.0.tgz",
+			"integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
+			"peer": true
+		},
+		"node_modules/postcss": {
+			"version": "8.4.47",
+			"resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.47.tgz",
+			"integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/postcss/"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/postcss"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"peer": true,
+			"dependencies": {
+				"nanoid": "^3.3.7",
+				"picocolors": "^1.1.0",
+				"source-map-js": "^1.2.1"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14"
+			}
+		},
+		"node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/source-map-js": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz",
+			"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+			"peer": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/to-fast-properties": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+			"integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+			"peer": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/vue": {
+			"version": "3.5.11",
+			"resolved": "https://registry.npmmirror.com/vue/-/vue-3.5.11.tgz",
+			"integrity": "sha512-/8Wurrd9J3lb72FTQS7gRMNQD4nztTtKPmuDuPuhqXmmpD6+skVjAeahNpVzsuky6Sy9gy7wn8UadqPtt9SQIg==",
+			"peer": true,
+			"dependencies": {
+				"@vue/compiler-dom": "3.5.11",
+				"@vue/compiler-sfc": "3.5.11",
+				"@vue/runtime-dom": "3.5.11",
+				"@vue/server-renderer": "3.5.11",
+				"@vue/shared": "3.5.11"
+			},
+			"peerDependencies": {
+				"typescript": "*"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/vue-i18n": {
+			"version": "9.1.9",
+			"resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-9.1.9.tgz",
+			"integrity": "sha512-JeRdNVxS2OGp1E+pye5XB6+M6BBkHwAv9C80Q7+kzoMdUDGRna06tjC0vCB/jDX9aWrl5swxOMFcyAr7or8XTA==",
+			"dependencies": {
+				"@intlify/core-base": "9.1.9",
+				"@intlify/shared": "9.1.9",
+				"@intlify/vue-devtools": "9.1.9",
+				"@vue/devtools-api": "^6.0.0-beta.7"
+			},
+			"engines": {
+				"node": ">= 10"
+			},
+			"peerDependencies": {
+				"vue": "^3.0.0"
+			}
+		}
+	}
+}
--- a/package.json
View file @3276544
+++ b/package.json
View file @3276544
@@ -12,6 +12,7 @@
 	"author": "",
 	"license": "ISC",
 	"dependencies": {
-		"moment": "^2.29.2"
+		"moment": "^2.29.2",
+		"vue-i18n": "^9.1.9"
 	}
 }
--- a/pages.json
View file @3276544
+++ b/pages.json
View file @3276544
@@ -15,63 +15,69 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "首页",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/device/device",
 			"style": {
-				"navigationBarTitleText": "设备"
+				"navigationBarTitleText": ""
 			}
 		},
 		{
 			"path": "pages/alarm/alarm",
 			"style": {
-				"navigationBarTitleText": "告警"
+				"navigationBarTitleText": ""
 			}
 		},
 		{
 			"path": "pages/personal/personal",
 			"style": {
-				"navigationBarTitleText": "个人中心",
+				"navigationBarTitleText": "",
 				"disableScroll": true
 			}
 		},
 		{
 			"path": "pages/index/components/camera/camera",
 			"style": {
-				"navigationBarTitleText": "查看摄像头"
+				"navigationBarTitleText": ""
 			}
 		},
 		{
 			"path": "pages/index/components/configuration/configuration",
 			"style": {
-				"navigationBarTitleText": "查看组态"
+				"navigationBarTitleText": ""
 			}
 		},
 		{
 			"path": "pages/index/components/configuration/configuration-detail",
 			"style": {
-				"navigationBarTitleText": "组态详情"
+				"navigationBarTitleText": ""
 			}
 		},
 		{
 			"path": "pages/organization/organization",
 			"style": {
-				"navigationBarTitleText": "组织筛选"
+				"navigationBarTitleText": ""
 			}
 		},
 		{
 			"path": "pages/index/components/visualBoard/index",
 			"style": {
-				"navigationBarTitleText": "查看看板"
+				"navigationBarTitleText": ""
 			}
 		},
 		{
 			"path": "pages/index/components/visualBoard/detail",
 			"style": {
-				"navigationBarTitleText": "看板详情"
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/personal/components/switchLocales",
+			"style": {
+				"navigationBarTitleText": ""
 			}
 		}
 	],
@@ -80,7 +86,7 @@
 			"pages": [{
 				"path": "alarm-detail/alarm-detail",
 				"style": {
-					"navigationBarTitleText": "告警详情"
+					"navigationBarTitleText": ""
 				}
 			}]
 		},
@@ -89,19 +95,19 @@
 			"pages": [{
 					"path": "device-detail/device-detail",
 					"style": {
-						"navigationBarTitleText": "设备详情"
+						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "device-detail/components/command-detail",
 					"style": {
-						"navigationBarTitleText": "命令详情"
+						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "device-detail/device-position",
 					"style": {
-						"navigationBarTitleText": "设备地理位置"
+						"navigationBarTitleText": ""
 					},
 					"permission": {
 						"scope.userLocation": {
@@ -119,13 +125,13 @@
 			"pages": [{
 					"path": "sys-notify/system-notify",
 					"style": {
-						"navigationBarTitleText": "系统通知"
+						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "sys-notify/notify-detail",
 					"style": {
-						"navigationBarTitleText": "通知详情"
+						"navigationBarTitleText": ""
 					}
 				}
 			]
@@ -135,7 +141,7 @@
 			"pages": [{
 				"path": "feedback/feedback",
 				"style": {
-					"navigationBarTitleText": "意见反馈"
+					"navigationBarTitleText": ""
 				}
 			}]
 		},
@@ -144,25 +150,25 @@
 			"pages": [{
 					"path": "public/login",
 					"style": {
-						"navigationBarTitleText": "登录"
+						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "other/set",
 					"style": {
-						"navigationBarTitleText": "个人资料"
+						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "other/code",
 					"style": {
-						"navigationBarTitleText": "手机验证码登录"
+						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "other/find-password",
 					"style": {
-						"navigationBarTitleText": "忘记密码"
+						"navigationBarTitleText": ""
 					}
 				}
 			]
--- a/pages/alarm/alarm.vue
View file @3276544
+++ b/pages/alarm/alarm.vue
View file @3276544
@@ -4,9 +4,9 @@
 		<public-module></public-module>
 		<!-- 告警头部 -->
 		<header-search @openOrg="openOrg" @openSearchDialog="openSearchDialog" :total="alarmTotal"
-			:totalText="totalText">
+			:totalText="$t(totalText)">
 			<!-- 不能写在封装组件里传placeholder，mp-wenxin端编译要报错 -->
-			<u--input prefixIcon="search" placeholder="请输入告警设备" shape="circle" @change="inputChanged">
+			<u--input prefixIcon="search" :placeholder="$t('alarm.pleaseEnterDevice')" shape="circle" @change="inputChanged">
 			</u--input>
 		</header-search>
 		<!-- 告警分页 -->
@@ -44,7 +44,7 @@ import {mapActions } from 'vuex'
 		},
 		data() {
 			return {
-				totalText: '告警数:',
+				totalText: 'alarm.alarmNum',
 				page: {
 					num: 0,
 					size: 10
@@ -67,6 +67,11 @@ import {mapActions } from 'vuex'
 			};
 		},
 		onShow() {
+			this.$nextTick(()=>{
+			uni.setNavigationBarTitle({
+				title:this.$t('menu.alarm')
+			})
+		})
 			if (getApp().getBindNot()) {
 				return
 			}
@@ -218,7 +223,7 @@ import {mapActions } from 'vuex'
 			},
 			openSearchDialog() {
 				if (getApp().getBindNot()) {
-					uni.$u.toast('请进行账号绑定')
+					uni.$u.toast(this.$t('common.pleaseBindAccount'))
 					return
 				}
 				this.show = true;
@@ -228,7 +233,7 @@ import {mapActions } from 'vuex'
 			},
 			openOrg() {
 				if (getApp().getBindNot()) {
-					uni.$u.toast('请进行账号绑定')
+					uni.$u.toast(this.$t('common.pleaseBindAccount'))
 					return
 				}
 				useNavigateTo('/pages/organization/organization')
--- a/pages/alarm/components/alarm-item.vue
View file @3276544
+++ b/pages/alarm/components/alarm-item.vue
View file @3276544
@@ -3,20 +3,20 @@
 		<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">
-					<text class="text-bold">{{ item.deviceAlias || item.deviceName || '暂无数据' }}</text>
+					<text class="text-bold">{{ item.deviceAlias || item.deviceName || $t('common.noData') }}</text>
 				</view>
 				<view class="item-text text-clip">
-					<text class="text-muted">{{ item.details == null ? '暂无数据' : getAttrText(item.details) }}</text>
+					<text class="text-muted">{{ item.details == null ? $t('common.noData') : getAttrText(item.details) }}</text>
 				</view>
 				<view class="item-text text-clip">
-					<text class="text-muted">{{ item.details == null ? '暂无数据' : getConditionText(item.details) }}</text>
+					<text class="text-muted">{{ item.details == null ? $t('common.noData') : getConditionText(item.details) }}</text>
 				</view>
 				<view class="item-text text-clip">
-					<text class="text-muted">{{ item.details == null ? '暂无数据' : getValuesText(item.details) }}</text>
+					<text class="text-muted">{{ item.details == null ? $t('common.noData') : getValuesText(item.details) }}</text>
 				</view>
 				<view class="item-text">
 					<text class="text-muted">
-						告警状态：{{item.status | setAlarmStatus(alarmStatus)}}
+						{{$t('device.alarmStatus')}} {{ setAlarmStatus(item.status,alarmStatus)}}
 					</text>
 				</view>
 				<view class="item-text">
@@ -28,7 +28,7 @@
 					<image class="right-image" :src="bindImageUrl(item.severity)"></image>
 					<view class="right-text">
 						<text class="text-no-color" :style="[setAlarmSeverityColor(item.severity,alarmSeverity)]">
-							{{item.severity | setAlarmSeverity(alarmSeverity)}}
+							{{ setAlarmSeverity(item.severity,alarmSeverity)}}
 						</text>
 					</view>
 				</view>
@@ -57,15 +57,14 @@
 				alarmStatus
 			}
 		},
-		filters: {
+		methods: {
+
 			setAlarmStatus(value, list) {
-				return list.find(item => item.value === value).label
+				return this.$t(list.find(item => item.value === value).label)
 			},
 			setAlarmSeverity(value, list) {
-				return list.find(item => item.value === value).label
-			}
-		},
-		methods: {
+				return this.$t(list.find(item => item.value === value).label)
+			},
 			setAlarmSeverityColor(value, list) {
 				return {
 					color: list.find(item => item.value === value).color
@@ -91,11 +90,11 @@
 					const items = details[curr]?.triggerData
 					if(items?.key && items?.logicValue && items.realValue){
 						if(type==0){
-							acc.push(`触发属性:${items.key ||'暂无数据'}`)
+							acc.push(`${this.$t('device.triggerAttribute')}:${items.key || this.$t('common.noData')}`)
 						}else if (type ==1){
-							acc.push(`触发条件:${findLogin(items)+items.logicValue || '暂无数据'}`)
+							acc.push(`${this.$t('device.triggerCondition')}:${findLogin(items)+items.logicValue ||  this.$t('common.noData')}`)
 						}else if(type==2){
-							acc.push(`触发值:${items?.realValue || '暂无数据'}`)
+							acc.push(`${this.$t('device.triggerValue')}:${items?.realValue ||  this.$t('common.noData')}`)
 						}
 					}
 					return acc
--- a/pages/alarm/components/alarm-popup.vue
View file @3276544
+++ b/pages/alarm/components/alarm-popup.vue
View file @3276544
 <template>
-	<u-popup @close="$emit('close')" closeable bgColor="transparent" :overlay="true" :show="show" mode="bottom">
+	<u-popup @close="$emit('close')" closeable  bgColor="transparent" :overlay="true" :show="show" mode="bottom">
 		<view class="popup-page">
-			<view class="popup-text"><text class="text">告警筛选</text></view>
+			<view class="popup-text"><text class="text">{{$t('device.alarmFiltering')}}</text></view>
 			<view class="popup-alarm-page u-flex">
 				<view>
-					<query-item ref="queryItemAlarmStatusRef" :leftText="leftAlarmStatusText" :queryStatus="alertStatus"
+					<query-item ref="queryItemAlarmStatusRef" :leftText="$t(leftAlarmStatusText)" :queryStatus="alertStatus.map(item=>({...item,name:$t(item.name)}))"
 						@currentClick="getAlarmStatus"></query-item>
-					<query-item ref="queryDeviceTypeStatusRef" :leftText="leftDeviceTypeText" :queryStatus="deviceType"
+					<query-item ref="queryDeviceTypeStatusRef" :leftText="$t(leftDeviceTypeText)" :queryStatus="deviceType.map(item=>({...item,name:$t(item.name)}))"
 						@currentClick="getDeviceType"></query-item>
-					<query-item ref="queryItemAlarmLevelRef" :leftText="leftAlarmLevelText" :queryStatus="alertLevel"
+					<query-item ref="queryItemAlarmLevelRef" :leftText="$t(leftAlarmLevelText)" :queryStatus="alertLevel.map(item=>({...item,name:$t(item.name)}))"
 						@currentClick="getAlarmLevel"></query-item>
-					<query-item ref="queryItemSelectTimeRef" :leftText="leftSelectTimeText" :queryStatus="timeArea"
+					<query-item ref="queryItemSelectTimeRef" :leftText="$t(leftSelectTimeText)" :queryStatus="timeArea.map(item=>({...item,name:$t(item.name)}))"
 						@currentClick="getSelectTime"></query-item>
 					<view class="select-date">
-						<view class="home-text-muted">选择日期</view>
+						<view class="home-text-muted">{{ $t('device.selectDate') }}</view>
 						<view class="datetime-picker">
 							<uni-datetime-picker return-type="timestamp" v-model="range" type="datetimerange"
-								rangeSeparator="至" />
+								:rangeSeparator="$t('common.toText')" />
 						</view>
 					</view>
 					<view class="h-30"></view>
 					<view class="u-flex bottom-button">
 						<view class="button-item">
-							<u-button @click="resetQuery" type="info" shape="circle" text="重置">
+							<u-button @click="resetQuery" type="info" shape="circle" :text="$t('common.resetting')">
 							</u-button>
 						</view>
 						<view class="button-item" style="margin-left: 46rpx">
-							<u-button @click="confirmQuery" type="primary" shape="circle" text="确认">
+							<u-button @click="confirmQuery" type="primary" shape="circle" :text="$t('common.confirm')">
 							</u-button>
 						</view>
 					</view>
@@ -56,10 +56,10 @@
 		data() {
 			return {
 				totalText: '告警数:',
-				leftAlarmStatusText: '告警状态',
-				leftDeviceTypeText: '设备类型',
-				leftAlarmLevelText: '告警等级',
-				leftSelectTimeText: '选择时间',
+				leftAlarmStatusText: 'device.alarmStatus',
+				leftDeviceTypeText: 'device.deviceType',
+				leftAlarmLevelText: 'device.alarmLevel',
+				leftSelectTimeText: 'device.selectTime',
 				range: [],
 				alertStatus,
 				deviceType,
@@ -176,4 +176,4 @@
 			}
 		}
 	}
-</style>
+</style>
--- a/pages/alarm/components/query-item.vue
View file @3276544
+++ b/pages/alarm/components/query-item.vue
View file @3276544
@@ -8,7 +8,7 @@
 					class="text">{{ item.name }}</text>
 			</view>
 		</view>
-		<view style="height:180rpx"></view>
+		<!-- <view style="height:180rpx"></view> -->
 	</view>
 </template>
@@ -57,7 +57,7 @@
 	.popup-alarm-child {
 		margin-top: 15rpx;
 		width: 750rpx;
-		height: 60rpx;
+		min-height: 60rpx;
 		flex-wrap: wrap;
 		margin-left: -10rpx;
@@ -65,7 +65,8 @@
 			margin: 25rpx;
 			line-height: 50rpx;
 			text-align: center;
-			width: 180rpx;
+			min-width: 168rpx;
+			padding: 0 12rpx;
 			height: 60rpx;
 			background-color: #f6f6f6;
 			border-radius: 32px;
@@ -76,4 +77,4 @@
 			}
 		}
 	}
-</style>
+</style>
--- a/pages/alarm/config/data.js
View file @3276544
+++ b/pages/alarm/config/data.js
View file @3276544
 const alertStatus = [{
-		index: 0,
-		name: '全部',
-		value: '',
-		bgColor: '#377DFF',
-		textColor: '#377DFF'
-	},
-	{
-		index: 1,
-		name: '激活未确认',
-		value: 'ACTIVE_UNACK',
-		bgColor: '#F6F6F6',
-		textColor: '#F6F6F6'
-	},
-	{
-		index: 2,
-		name: '激活已确认',
-		value: 'ACTIVE_ACK',
-		bgColor: '#F6F6F6',
-		textColor: '#F6F6F6'
-	},
-	{
-		index: 3,
-		name: '清除未确认',
-		value: 'CLEARED_UNACK',
-		bgColor: '#F6F6F6',
-		textColor: '#F6F6F6'
-	},
-	{
-		index: 4,
-		name: '清除已确认',
-		value: 'CLEARED_ACK',
-		bgColor: '#F6F6F6',
-		textColor: '#F6F6F6'
-	},
+	index: 0,
+	name: 'common.allText',
+	value: '',
+	bgColor: '#377DFF',
+	textColor: '#377DFF'
+},
+{
+	index: 1,
+	name: 'device.activationNotConfirmed',
+	value: 'ACTIVE_UNACK',
+	bgColor: '#F6F6F6',
+	textColor: '#F6F6F6'
+},
+{
+	index: 2,
+	name: 'device.activationConfirmed',
+	value: 'ACTIVE_ACK',
+	bgColor: '#F6F6F6',
+	textColor: '#F6F6F6'
+},
+{
+	index: 3,
+	name: 'device.clearUnconfirmed',
+	value: 'CLEARED_UNACK',
+	bgColor: '#F6F6F6',
+	textColor: '#F6F6F6'
+},
+{
+	index: 4,
+	name: 'device.clearConfirmed',
+	value: 'CLEARED_ACK',
+	bgColor: '#F6F6F6',
+	textColor: '#F6F6F6'
+},
 ]
 const deviceType = [{
-		index: 1,
-		name: '全部',
-		value: '',
-		bgColor: '#377DFF',
-		textColor: '#377DFF'
-	},
-	{
-		index: 2,
-		name: '网关设备',
-		value: 'GATEWAY',
-		bgColor: '#F6F6F6',
-		textColor: '#F6F6F6'
-	},
-	{
-		index: 3,
-		name: '网关子设备',
-		value: 'SENSOR',
-		bgColor: '#F6F6F6',
-		textColor: '#F6F6F6'
-	},
-	{
-		index: 4,
-		name: '直连设备',
-		value: 'DIRECT_CONNECTION',
-		bgColor: '#F6F6F6',
-		textColor: '#F6F6F6'
-	}
+	index: 1,
+	name: 'common.allText',
+	value: '',
+	bgColor: '#377DFF',
+	textColor: '#377DFF'
+},
+{
+	index: 2,
+	name: 'common.gatewayDevice',
+	value: 'GATEWAY',
+	bgColor: '#F6F6F6',
+	textColor: '#F6F6F6'
+},
+{
+	index: 3,
+	name: 'common.sensorDevice',
+	value: 'SENSOR',
+	bgColor: '#F6F6F6',
+	textColor: '#F6F6F6'
+},
+{
+	index: 4,
+	name: 'common.directlyDevice',
+	value: 'DIRECT_CONNECTION',
+	bgColor: '#F6F6F6',
+	textColor: '#F6F6F6'
+}
 ]
 const alertLevel = [{
-		index: 1,
-		name: '全部',
-		value: '',
-		bgColor: '#377DFF',
-		textColor: '#377DFF'
-	},
-	{
-		index: 2,
-		name: '紧急',
-		value: 'CRITICAL',
-		bgColor: '#F6F6F6',
-		textColor: '#F6F6F6'
-	},
-	{
-		index: 3,
-		name: '重要',
-		value: 'MAJOR',
-		bgColor: '#F6F6F6',
-		textColor: '#F6F6F6'
-	},
-	{
-		index: 4,
-		name: '次要',
-		value: 'MINOR',
-		bgColor: '#F6F6F6',
-		textColor: '#F6F6F6'
-	},
-	{
-		index: 5,
-		name: '警告',
-		value: 'WARNING',
-		bgColor: '#F6F6F6',
-		textColor: '#F6F6F6'
-	},
-	{
-		index: 6,
-		name: '不确定',
-		value: 'INDETERMINATE',
-		bgColor: '#F6F6F6',
-		textColor: '#F6F6F6'
-	}
+	index: 1,
+	name: 'common.allText',
+	value: '',
+	bgColor: '#377DFF',
+	textColor: '#377DFF'
+},
+{
+	index: 2,
+	name: 'device.urgent',
+	value: 'CRITICAL',
+	bgColor: '#F6F6F6',
+	textColor: '#F6F6F6'
+},
+{
+	index: 3,
+	name: 'device.important',
+	value: 'MAJOR',
+	bgColor: '#F6F6F6',
+	textColor: '#F6F6F6'
+},
+{
+	index: 4,
+	name: 'device.secondary',
+	value: 'MINOR',
+	bgColor: '#F6F6F6',
+	textColor: '#F6F6F6'
+},
+{
+	index: 5,
+	name: 'device.warning',
+	value: 'WARNING',
+	bgColor: '#F6F6F6',
+	textColor: '#F6F6F6'
+},
+{
+	index: 6,
+	name: 'device.uncertain',
+	value: 'INDETERMINATE',
+	bgColor: '#F6F6F6',
+	textColor: '#F6F6F6'
+}
 ]
 const timeArea = [{
-		index: 1,
-		name: '全部',
-		value: 0,
-		bgColor: '#F6F6F6',
-		textColor: '#F6F6F6'
-	},
-	{
-		index: 2,
-		name: '30分钟',
-		value: 30,
-		bgColor: '#F6F6F6',
-		textColor: '#F6F6F6'
-	},
-	{
-		index: 3,
-		name: '1小时',
-		value: 60,
-		bgColor: '#F6F6F6',
-		textColor: '#F6F6F6'
-	},
-	{
-		index: 4,
-		name: '2小时',
-		value: 120,
-		bgColor: '#F6F6F6',
-		textColor: '#F6F6F6'
-	},
-	{
-		index: 5,
-		name: '近一天',
-		value: 1440,
-		bgColor: '#F6F6F6',
-		textColor: '#F6F6F6'
-	}
+	index: 1,
+	name: 'common.allText',
+	value: 0,
+	bgColor: '#F6F6F6',
+	textColor: '#F6F6F6'
+},
+{
+	index: 2,
+	name: 'device.minutes30',
+	value: 30,
+	bgColor: '#F6F6F6',
+	textColor: '#F6F6F6'
+},
+{
+	index: 3,
+	name: 'device.hour1',
+	value: 60,
+	bgColor: '#F6F6F6',
+	textColor: '#F6F6F6'
+},
+{
+	index: 4,
+	name: 'device.hours2',
+	value: 120,
+	bgColor: '#F6F6F6',
+	textColor: '#F6F6F6'
+},
+{
+	index: 5,
+	name: 'device.pastDay',
+	value: 1440,
+	bgColor: '#F6F6F6',
+	textColor: '#F6F6F6'
+}
 ]
 const alarmSeverity = [{
-		label: '紧急',
-		value: 'CRITICAL',
-		color: '#DE4437',
-		icon: '/static/danger.png',
-	},
-	{
-		label: '重要',
-		value: 'MAJOR',
-		color: '#DE7337',
-		icon: '/static/major.png',
-	},
-	{
-		label: '次要',
-		value: 'MINOR',
-		color: '#FFC107',
-		icon: '/static/secondary.png',
-	},
-	{
-		label: '警告',
-		value: 'WARNING',
-		color: '#DE4437',
-		icon: '/static/danger.png',
-	},
-	{
-		label: '不确定',
-		value: 'INDETERMINATE',
-		color: '#00C9A7',
-		icon: '/static/noshue.png',
-	},
+	label: 'device.urgent',
+	value: 'CRITICAL',
+	color: '#DE4437',
+	icon: '/static/danger.png',
+},
+{
+	label: 'device.important',
+	value: 'MAJOR',
+	color: '#DE7337',
+	icon: '/static/major.png',
+},
+{
+	label: 'device.secondary',
+	value: 'MINOR',
+	color: '#FFC107',
+	icon: '/static/secondary.png',
+},
+{
+	label: 'device.warning',
+	value: 'WARNING',
+	color: '#DE4437',
+	icon: '/static/danger.png',
+},
+{
+	label: 'device.uncertain',
+	value: 'INDETERMINATE',
+	color: '#00C9A7',
+	icon: '/static/noshue.png',
+},
 ]
 const alarmStatus = [{
-		label: '清除未确认',
-		value: 'CLEARED_UNACK'
-	},
-	{
-		label: '激活未确认',
-		value: 'ACTIVE_UNACK'
-	},
-	{
-		label: '清除已确认',
-		value: 'CLEARED_ACK'
-	},
-	{
-		label: '激活已确认',
-		value: 'ACTIVE_ACK'
-	},
+	label: 'device.clearUnconfirmed',
+	value: 'CLEARED_UNACK'
+},
+{
+	label: 'device.activationNotConfirmed',
+	value: 'ACTIVE_UNACK'
+},
+{
+	label: 'device.clearConfirmed',
+	value: 'CLEARED_ACK'
+},
+{
+	label: 'device.activationConfirmed',
+	value: 'ACTIVE_ACK'
+},
 ]
 const operationNumberOrDate = [{
-		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: '>='
-	},
+	label: 'device.equal',
+	value: 'EQUAL',
+	symbol: '='
+},
+{
+	label: 'device.notEqual',
+	value: 'NOT_EQUAL',
+	symbol: '!='
+},
+{
+	label: 'device.less',
+	value: 'LESS',
+	symbol: '<'
+},
+{
+	label: 'device.lessOfEqual',
+	value: 'LESS_OR_EQUAL',
+	symbol: '<='
+},
+{
+	label: 'device.greater',
+	value: 'GREATER',
+	symbol: '>'
+},
+{
+	label: 'device.greaterOrEqual',
+	value: 'GREATER_OR_EQUAL',
+	symbol: '>='
+},
 ];
 const operationString = [{
-		label: '等于',
-		value: 'EQUAL',
-		symbol: '='
-	},
-	{
-		label: '不等于',
-		value: 'NOT_EQUAL',
-		symbol: '!='
-	},
-	{
-		label: '开始于',
-		value: 'STARTS_WITH',
-		symbol: '开始于'
-	},
-	{
-		label: '结束于',
-		value: 'ENDS_WITH',
-		symbol: '结束于'
-	},
-	{
-		label: '包含',
-		value: 'CONTAINS',
-		symbol: '包含'
-	},
-	{
-		label: '不包含',
-		value: 'NOT_CONTAINS',
-		symbol: '不包含'
-	},
+	label: 'device.equal',
+	value: 'EQUAL',
+	symbol: '='
+},
+{
+	label: 'device.notEqual',
+	value: 'NOT_EQUAL',
+	symbol: '!='
+},
+{
+	label: 'device.starting',
+	value: 'STARTS_WITH',
+	symbol: 'device.starting'
+},
+{
+	label: 'device.ending',
+	value: 'ENDS_WITH',
+	symbol: 'device.ending'
+},
+{
+	label: 'device.contain',
+	value: 'CONTAINS',
+	symbol: 'device.contain'
+},
+{
+	label: 'device.notIncluded',
+	value: 'NOT_CONTAINS',
+	symbol: 'device.notIncluded'
+},
 ];
 const operationBoolean = [{
-		label: '等于',
-		value: 'EQUAL',
-		symbol: '='
-	},
-	{
-		label: '不等于',
-		value: 'NOT_EQUAL',
-		symbol: '!='
-	},
+	label: 'device.equal',
+	value: 'EQUAL',
+	symbol: '='
+},
+{
+	label: 'device.notEqual',
+	value: 'NOT_EQUAL',
+	symbol: '!='
+},
 ];
 export {
@@ -280,4 +280,4 @@ export {
 	operationNumberOrDate,
 	operationString,
 	operationBoolean
-}
+}
--- a/pages/device/components/device-item.vue
View file @3276544
+++ b/pages/device/components/device-item.vue
View file @3276544
@@ -10,13 +10,13 @@
 				</view>
 				<view class="item-text text-clip">
 					<view class="text-container">
-						设备编号:
+						{{$t('device.deviceNumber')}}:
 						<text class="text-span">{{ item.sn }}</text>
 					</view>
 				</view>
 				<view class="item-text text-clip">
 					<view class="text-container">
-						所属组织:
+						{{$t('common.belongingOrganization')}}:
 						<text class="text-span">{{ item.organizationDTO.name }}</text>
 					</view>
 				</view>
@@ -52,7 +52,7 @@
 					'/static/baojing.png'
 			},
 			formatText(deviceState) {
-				return deviceState === 'ONLINE' ? '在线' : deviceState === 'INACTIVE' ? '待激活' : '离线'
+				return deviceState === 'ONLINE' ? this.$t('homePage.deviceLabel.onLine') : deviceState === 'INACTIVE' ? this.$t('homePage.deviceLabel.beActivated') : this.$t('homePage.deviceLabel.offLine')
 			},
 			formatColor(deviceState) {
 				return deviceState === 'ONLINE' ? '#377DFF' : deviceState === 'INACTIVE' ? '#666666' : '#DE4437'
@@ -82,7 +82,7 @@
 				justify-content: space-between;
 				.item-text {
-					width: 450rpx;
+					width: 480rpx;
 					.text-container {
 						display: flex;
--- a/pages/device/components/device-popup.vue
View file @3276544
+++ b/pages/device/components/device-popup.vue
View file @3276544
@@ -2,22 +2,22 @@
 	<u-popup @close="$emit('close')" closeable bgColor="#fff" :show="show" mode="bottom" :round="20"
 		@touchmove.stop.prevent="disabledScroll">
 		<view class="filter" @touchmove.stop.prevent="disabledScroll">
-			<view class="filter-title"><text>筛选条件</text></view>
-			<query-item :filterList="deviceStatus" title="设备状态"
+			<view class="filter-title"><text>{{ $t('common.filterCriteria') }}</text></view>
+			<query-item :filterList="deviceStatus" :title="$t('device.deviceStatus')"
 				@clickTag="currentIndex => handleClickTag(currentIndex, deviceStatus)"></query-item>
-			<query-item :filterList="alarmStatus" title="告警状态"
+			<query-item :filterList="alarmStatus" :title="$t('device.alarmStatus')"
 				@clickTag="currentIndex => handleClickTag(currentIndex, alarmStatus)"></query-item>
-			<query-item :filterList="typeStatus" title="设备类型"
+			<query-item :filterList="typeStatus" :title="$t('device.deviceType')"
 				@clickTag="currentIndex => handleClickTag(currentIndex, typeStatus)"></query-item>
-			<query-item :filterList="collectStatus" title="设备是否收藏"
+			<query-item :filterList="collectStatus" :title="$t('device.isDeviceCollect')"
 				@clickTag="currentIndex => handleClickTag(currentIndex, collectStatus)"></query-item>
 			<view class="button-group">
 				<view>
-					<u-button :customStyle="{ color: '#333' }" color="#e3e3e5" shape="circle" text="重置"
+					<u-button :customStyle="{ color: '#333' }" color="#e3e3e5" shape="circle" :text="$t('common.resetting')"
 						@click="resetFilter"></u-button>
 				</view>
 				<view>
-					<u-button color="#3388ff" shape="circle" text="确认" @click="confirmFilter"></u-button>
+					<u-button color="#3388ff" shape="circle" :text="$t('common.confirm')" @click="confirmFilter"></u-button>
 				</view>
 			</view>
 		</view>
--- a/pages/device/components/query-item.vue
View file @3276544
+++ b/pages/device/components/query-item.vue
View file @3276544
@@ -6,7 +6,7 @@
 		<view class="query-list">
 			<view v-for="(item, index) in filterList" :key="index" @click="itemClick(index)"
 				:class="['tag-item', { checked: item.checked, 'mr-30': (index + 1) % 3 !== 0 }]">
-				{{ item.name }}
+				{{ $t(item.name) }}
 			</view>
 		</view>
 	</view>
@@ -48,7 +48,8 @@
 			.tag-item {
 				margin-top: 30rpx;
-				width: 210rpx;
+				min-width: 198rpx;
+				padding: 0 12rpx;
 				height: 68rpx;
 				border-radius: 32rpx;
 				display: flex;
@@ -71,4 +72,4 @@
 			}
 		}
 	}
-</style>
+</style>
--- a/pages/device/config/data.js
View file @3276544
+++ b/pages/device/config/data.js
View file @3276544
 const deviceStatus = [{
-		checked: true,
-		name: '全部',
-		type: ''
-	},
-	{
-		checked: false,
-		name: '在线',
-		type: 'ONLINE'
-	},
-	{
-		checked: false,
-		name: '离线',
-		type: 'OFFLINE'
-	},
-	{
-		checked: false,
-		name: '待激活',
-		type: 'INACTIVE'
-	}
+	checked: true,
+	name: 'common.allText',
+	type: ''
+},
+{
+	checked: false,
+	name: 'common.onLine',
+	type: 'ONLINE'
+},
+{
+	checked: false,
+	name: 'common.offLine',
+	type: 'OFFLINE'
+},
+{
+	checked: false,
+	name: 'common.toBeActivated',
+	type: 'INACTIVE'
+}
 ]
 const alarmStatus = [{
-		checked: true,
-		name: '全部',
-		type: ''
-	},
-	{
-		checked: false,
-		name: '告警',
-		type: 1
-	},
-	{
-		checked: false,
-		name: '正常',
-		type: 0
-	}
+	checked: true,
+	name: 'common.allText',
+	type: ''
+},
+{
+	checked: false,
+	name: 'common.alarm',
+	type: 1
+},
+{
+	checked: false,
+	name: 'common.normal',
+	type: 0
+}
 ]
 const typeStatus = [{
-		checked: true,
-		name: '全部',
-		type: ''
-	},
+	checked: true,
+	name: 'common.allText',
+	type: ''
+},
-	{
-		checked: false,
-		name: '直连设备',
-		type: 'DIRECT_CONNECTION'
-	},
-	{
-		checked: false,
-		name: '网关设备',
-		type: 'GATEWAY'
-	},
-	{
-		checked: false,
-		name: '网关子设备',
-		type: 'SENSOR'
-	}
+{
+	checked: false,
+	name: 'common.directlyDevice',
+	type: 'DIRECT_CONNECTION'
+},
+{
+	checked: false,
+	name: 'common.gatewayDevice',
+	type: 'GATEWAY'
+},
+{
+	checked: false,
+	name: 'common.sensorDevice',
+	type: 'SENSOR'
+}
 ]
 const collectStatus = [
 	{
 		checked: true,
-		name: '全部',
+		name: 'common.allText',
 		type: ''
 	},
 	{
 		checked: false,
-		name: '是',
+		name: 'common.yesText',
 		type: '1'
 	},
 	{
 		checked: false,
-		name: '否',
+		name: 'common.noText',
 		type: '0'
 	},
 ]
--- a/pages/device/device.vue
View file @3276544
+++ b/pages/device/device.vue
View file @3276544
 <template>
 	<view class="device-page">
 		<!-- 设备头部 -->
-		<header-search @openOrg="openOrg" @openSearchDialog="openSearchDialog" :total="total" :totalText="totalText">
+		<header-search @openOrg="openOrg" @openSearchDialog="openSearchDialog" :total="total" :totalText="$t(totalText)">
 			<!-- 不能写在封装组件里传placeholder，mp-wenxin端编译要报错 -->
-			<u--input prefixIcon="search" placeholder="请输入设备名称或别名搜索" shape="circle" @change="inputChanged">
+			<u--input prefixIcon="search" :placeholder="$t('device.pleaseEnterDeviceName')" shape="circle"
+				@change="inputChanged">
 			</u--input>
 		</header-search>
 		<!-- 设备分页 -->
@@ -13,237 +14,240 @@
 		</mescroll-body>
 		<view style="height: 20rpx"></view>
 		<!-- 设备筛选 -->
-		<device-popup ref="devicePopupRef" :show="show" @close="close"
-			@queryCondition="getQueryCondition"></device-popup>
+		<device-popup ref="devicePopupRef" :show="show" @close="close" @queryCondition="getQueryCondition"></device-popup>
 		<f-tabbar></f-tabbar>
 	</view>
 </template>
 <script>
-	import fTabbar from '@/components/module/f-tabbar/f-tabbar';
-	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 deviceItem from './components/device-item.vue'
-	import devicePopup from './components/device-popup.vue'
+import fTabbar from '@/components/module/f-tabbar/f-tabbar';
+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 deviceItem from './components/device-item.vue'
+import devicePopup from './components/device-popup.vue'
-	export default {
-		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
-		components: {
-			fTabbar,
-			deviceItem,
-			devicePopup
-		},
-		data() {
-			return {
-				totalText: '设备数',
-				downOption: {
-					auto: false //是否在初始化后,自动执行downCallback; 默认true
-				},
-				upOption: {
-					isBounce: false,
-					auto: false // 不自动加载
-				},
-				show: false,
-				total: 0,
-				list: [],
-				page: {
-					num: 0,
-					size: 10
-				},
-				deviceName: '',
-				ordId: '',
-				conditions: {}
-			};
-		},
-		onLoad(e) {
-			// 隐藏原生的tabbar
-			uni.hideTabBar();
+export default {
+	mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
+	components: {
+		fTabbar,
+		deviceItem,
+		devicePopup
+	},
+	data() {
+		return {
+			totalText: 'device.deviceNum',
+			downOption: {
+				auto: false //是否在初始化后,自动执行downCallback; 默认true
+			},
+			upOption: {
+				isBounce: false,
+				auto: false // 不自动加载
+			},
+			show: false,
+			total: 0,
+			list: [],
+			page: {
+				num: 0,
+				size: 10
+			},
+			deviceName: '',
+			ordId: '',
+			conditions: {}
+		};
+	},
+	onLoad(e) {
+		// 隐藏原生的tabbar
+		uni.hideTabBar();
+		if (getApp().getBindNot()) {
+			return
+		}
+		if (e.deviceState) {
+			let params = JSON.parse(e.deviceState);
+			this.conditions = {
+				deviceState: params
+			}
+			// this.loadData(1, {
+			// 	deviceState: params
+			// });
+		}
+	},
+	onShow() {
+		this.$nextTick(()=>{
+			uni.setNavigationBarTitle({
+				title:this.$t('menu.device')
+			})
+		})
+		if (getApp().getBindNot()) {
+			return
+		}
+		this.page.num = 1
+		if (this.ordId) {
+			this.loadData(1, {
+				organizationId: this.ordId
+			});
+			this.conditions = {
+				organizationId: this.ordId
+			}
+			return
+		}
+		this.loadData(this.page.num, this.conditions);
+	},
+	methods: {
+		inputChanged(e) {
 			if (getApp().getBindNot()) {
 				return
 			}
-			if (e.deviceState) {
-				let params = JSON.parse(e.deviceState);
-				this.conditions = {
-					deviceState: params
-				}
-				// this.loadData(1, {
-				// 	deviceState: params
-				// });
+			this.page.num = 1;
+			this.deviceName = e;
+			this.conditions = {
+				deviceName: e
 			}
+			this.loadData(1, {
+				name: this.deviceName
+			});
 		},
-		onShow() {
-			console.log(2)
+		resetQuery() {
+			this.$refs.devicePopupRef.resetFilter()
+			this.ordId = ''
+			this.deviceName = ''
+			this.conditions = {}
+		},
+		getQueryCondition(value) {
+			const condition = Object.values(value)
+			this.page.num = 1;
+			this.loadData(this.page.num, value);
+			this.conditions = value
+			this.close()
+		},
+		downCallback() {
 			if (getApp().getBindNot()) {
+				setTimeout(() => {
+					this.mescroll.endByPage(0, 0)
+				}, 200)
 				return
 			}
-			this.page.num=1
-			if (this.ordId) {
-				this.loadData(1, {
-					organizationId: this.ordId
-				});
-				this.conditions = {
-					organizationId: this.ordId
-				}
+			this.list = [];
+			this.page.num = 1;
+			this.loadData(this.page.num);
+			this.resetQuery();
+		},
+		upCallback() {
+			if (getApp().getBindNot()) {
+				setTimeout(() => {
+					this.mescroll.endByPage(0, 0)
+				}, 200)
 				return
 			}
-			this.loadData(this.page.num,this.conditions);
-		},
-		methods: {
-			inputChanged(e) {
-				if (getApp().getBindNot()) {
-					return
-				}
-				this.page.num = 1;
-				this.deviceName = e;
-				this.conditions = {
-					deviceName: e
-				}
-				this.loadData(1, {
-					name: this.deviceName
-				});
-			},
-			resetQuery() {
-				this.$refs.devicePopupRef.resetFilter()
-				this.ordId = ''
-				this.deviceName = ''
-				this.conditions = {}
-			},
-			getQueryCondition(value) {
-				const condition = Object.values(value)
-				this.page.num = 1;
-				this.loadData(this.page.num, value);
-				this.conditions = value
-				this.close()
-			},
-			downCallback() {
-				if (getApp().getBindNot()) {
-					setTimeout(()=>{
-						this.mescroll.endByPage(0,0)
-					},200)
-					return 
-				}
-				this.list = [];
-				this.page.num = 1;
+			const condition = Object.values(this.conditions)
+			if (condition.length === 0) {
+				this.page.num += 1;
 				this.loadData(this.page.num);
-				this.resetQuery();
-			},
-			upCallback() {
-				if (getApp().getBindNot()) {
-					setTimeout(()=>{
-						this.mescroll.endByPage(0,0)
-					},200)
-					return 
+			} else if (condition.filter(Boolean).length > 0) {
+				this.page.num += 1;
+				this.loadData(this.page.num, this.conditions);
+			} else {
+				this.page.num += 1;
+				this.loadData(this.page.num);
+			}
+		},
+		//获取设备
+		async loadData(pageNo, params = {}) {
+			try {
+				let httpData = {
+					page: pageNo,
+					pageSize: 10,
+					custom: {
+						load: false
+					},
+				};
+				const httpPostData = {
+					"deviceProfileIds": null,
+					...params
 				}
-				const condition = Object.values(this.conditions)
-				if (condition.length === 0) {
-					this.page.num += 1;
-					this.loadData(this.page.num);
-				} else if (condition.filter(Boolean).length > 0) {
-					this.page.num += 1;
-					this.loadData(this.page.num, this.conditions);
+				const {
+					total,
+					items
+				} = await api.deviceApi.getDeviceApi(httpData, httpPostData)
+				this.total = total;
+				uni.stopPullDownRefresh();
+				this.mescroll.endByPage(items.length, total); //必传参数(当前页的数据个数, 总页数)
+				if (pageNo == 1) {
+					this.list = items;
 				} else {
-					this.page.num += 1;
-					this.loadData(this.page.num);
-				}
-			},
-			//获取设备
-			async loadData(pageNo, params = {}) {
-				try {
-					let httpData = {
-						page: pageNo,
-						pageSize: 10,
-						custom: {
-							load: false
-						},
-					};
-					const httpPostData = {
-						"deviceProfileIds": null,
-						...params
-					}
-					const {
-						total,
-						items
-					} = await api.deviceApi.getDeviceApi(httpData, httpPostData)
-					this.total = total;
-					uni.stopPullDownRefresh();
-					this.mescroll.endByPage(items.length, total); //必传参数(当前页的数据个数, 总页数)
-					if (pageNo == 1) {
-						this.list = items;
-					} else {
-						this.list = this.list.concat(items);
-					}
-				} catch {
-					this.mescroll.endErr();
+					this.list = this.list.concat(items);
 				}
-			},
-			openOrg() {
-				if (getApp().getBindNot()) {
-					uni.$u.toast('请进行账号绑定')
-					return
-				}
-				useNavigateTo('/pages/organization/organization')
-			},
-			close() {
-				this.show = false;
-			},
-			openSearchDialog() {
-				if (getApp().getBindNot()) {
-					uni.$u.toast('请进行账号绑定')
-					return
-				}
-				this.show = true;
-				this.$nextTick(() => {
-					this.resetQuery();
-				})
-			},
-			openDeviceDetail(values) {
-				const {id, alarmStatus, lastOnlineTime, tbDeviceId,transportType} = values || {}
-				uni.navigateTo({
-					url: `/device-subpackage/device-detail/device-detail?id=${id}&alarmStatus=${alarmStatus}&lastOnlineTime=${lastOnlineTime}&tbDeviceId=${tbDeviceId}&transportType=${transportType}`
-				});
-			},
-		}
-	};
+			} catch {
+				this.mescroll.endErr();
+			}
+		},
+		openOrg() {
+			if (getApp().getBindNot()) {
+				uni.$u.toast(this.$t('device.pleaseBindAccount'))
+				return
+			}
+			useNavigateTo('/pages/organization/organization')
+		},
+		close() {
+			this.show = false;
+		},
+		openSearchDialog() {
+			if (getApp().getBindNot()) {
+				uni.$u.toast(this.$t('device.pleaseBindAccount'))
+				return
+			}
+			this.show = true;
+			this.$nextTick(() => {
+				this.resetQuery();
+			})
+		},
+		openDeviceDetail(values) {
+			const { id, alarmStatus, lastOnlineTime, tbDeviceId, transportType } = values || {}
+			uni.navigateTo({
+				url: `/device-subpackage/device-detail/device-detail?id=${id}&alarmStatus=${alarmStatus}&lastOnlineTime=${lastOnlineTime}&tbDeviceId=${tbDeviceId}&transportType=${transportType}`
+			});
+		},
+	}
+};
 </script>
 <style lang="scss" scoped>
-	.device-page {
-		min-height: 100vh;
-		background-color: #f8f9fa;
-	}
+.device-page {
+	min-height: 100vh;
+	background-color: #f8f9fa;
+}
-	.device-top {
-		padding: 10rpx 30rpx;
-		background-color: #fff;
+.device-top {
+	padding: 10rpx 30rpx;
+	background-color: #fff;
-		.search {
-			display: flex;
-			justify-content: space-between;
-			padding-bottom: 10rpx;
+	.search {
+		display: flex;
+		justify-content: space-between;
+		padding-bottom: 10rpx;
-			.search-left {
-				width: 580rpx;
-				background-color: #f8f9fa;
-				border-radius: 200rpx;
-			}
+		.search-left {
+			width: 580rpx;
+			background-color: #f8f9fa;
+			border-radius: 200rpx;
+		}
-			.search-right {
-				display: flex;
-				align-items: center;
+		.search-right {
+			display: flex;
+			align-items: center;
-				text {
-					color: #333;
-					font-size: 14px;
-				}
+			text {
+				color: #333;
+				font-size: 14px;
+			}
-				image {
-					width: 40rpx;
-					height: 40rpx;
-				}
+			image {
+				width: 40rpx;
+				height: 40rpx;
 			}
 		}
 	}
+}
 </style>
--- a/pages/index/components/camera/camera.vue
View file @3276544
+++ b/pages/index/components/camera/camera.vue
View file @3276544
@@ -2,7 +2,7 @@
 	<view class="camera-page">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<header-org @openOrg="openOrg" :total="cameraTotal" title="摄像头数：" :imageSrc="imageSrc"></header-org>
+		<header-org @openOrg="openOrg" :total="cameraTotal" :title="$t('homePage.cameraNum')" :imageSrc="imageSrc"></header-org>
 		<view style="height: 150rpx"></view>
 		<!-- 自带分页组件 -->
 		<mescroll-body height="80%" ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption"
@@ -72,6 +72,12 @@ export default {
 		}
 	},
 	onShow() {
+		this.$nextTick(()=>{
+			uni.setNavigationBarTitle({
+				title:this.$t('menu.viewCamera')
+			})
+		})
+		
 		if (this.ordId) {
 			this.loadData(1, this.ordId)
 		}
@@ -147,8 +153,21 @@ export default {
 				}
 			}
 		},
+		isRtspProtocol  (url) {
+			const reg = /^rtsp:\/\//g;
+			return reg.test(url);
+		},
 		 getPlaySource(items) {
 			for (let item of items) {
+				// if(item.accessMode === 0) {
+				// 	// const {videoUrl} = items || {}
+				// 	// if(videoUrl){
+				// 	// const isRTSPPlay = isRtspProtocol(videoUrl)
+
+				// 	// 	const 
+				// 	// }
+				// 	item
+				// }
 				if (item.accessMode === 1) {
 					api.homeApi.byCameraIdGetDetailApi(item.id).then(res => {
 						item.videoUrl = res.data.url
--- a/pages/index/components/configuration/configuration-detail.vue
View file @3276544
+++ b/pages/index/components/configuration/configuration-detail.vue
View file @3276544
@@ -27,6 +27,11 @@
 			uni.hideTabBar();
 		},
 		onShow() {
+			this.$nextTick(()=>{
+				uni.setNavigationBarTitle({
+					title:this.$t('menu.configurationDetail')
+				})
+			})
 			uni.setStorageSync('getConfiguration', {
 				isConfiguration: true
 			});
--- a/pages/index/components/configuration/configuration.vue
View file @3276544
+++ b/pages/index/components/configuration/configuration.vue
View file @3276544
@@ -4,11 +4,11 @@
 			<view class="header-gap"></view>
 			<view class="search-top">
 				<view class="search-main">
-					<u--input @change="inputChanged" prefixIcon="search" placeholder="请输入组态名称" border="surround"
+					<u--input @change="inputChanged" prefixIcon="search" :placeholder="$t('homePage.pleaseConfigurationname')" border="surround"
 						shape="circle"></u--input>
 				</view>
 			</view>
-			<header-org @openOrg="openOrg" :total="total" title="组态数：" :imageSrc="imageSrc"></header-org>
+			<header-org @openOrg="openOrg" :total="total" :title="$t('homePage.configurationNum')" :imageSrc="imageSrc"></header-org>
 		</view>
 		<view style="height:128rpx"></view>
 		<!-- 公共组件-每个页面必须引入 -->
@@ -74,6 +74,12 @@
 			});
 		},
 		onShow() {
+			this.$nextTick(()=>{
+				uni.setNavigationBarTitle({
+					title:this.$t('menu.viewConfiguration')
+				})
+			})
+
 			if (this.ordId) {
 				this.page.num = 1
 				this.loadData(1,null, this.ordId);
--- a/pages/index/components/visualBoard/detail.vue
View file @3276544
+++ b/pages/index/components/visualBoard/detail.vue
View file @3276544
@@ -20,6 +20,13 @@
 			const url = await this.createShareUrl({id:e.id})
 			this.visualBoardUrl = url
 		},
+		onShow(){
+			this.$nextTick(()=>{
+				uni.setNavigationBarTitle({
+					title:this.$t('menu.boardDetail')
+				})
+			})
+		},
 		methods:{
 			getUrl(id,userId){
 				return `/appPage/${id}/${userId}`
--- a/pages/index/components/visualBoard/index.vue
View file @3276544
+++ b/pages/index/components/visualBoard/index.vue
View file @3276544
@@ -4,11 +4,11 @@
 			<view class="header-gap"></view>
 			<view class="search-top">
 				<view class="search-main">
-					<u--input @change="inputChanged" prefixIcon="search" placeholder="请输入看板名称" border="surround"
+					<u--input @change="inputChanged" prefixIcon="search" :placeholder="$t('homePage.pleaseVisualBoard')" border="surround"
 						shape="circle"></u--input>
 				</view>
 			</view>
-			<header-org @openOrg="openOrg" :total="total" title="看板数：" :imageSrc="imageSrc"></header-org>
+			<header-org @openOrg="openOrg" :total="total" :title="$t('homePage.bulletionBoard')" :imageSrc="imageSrc"></header-org>
 		</view>
 		<view style="height:128rpx"></view>
 		<!-- 公共组件-每个页面必须引入 -->
@@ -70,7 +70,10 @@
 				isConfiguration: false
 			});
 		},
-		onShow() {
+		onShow(){
+			uni.setNavigationBarTitle({
+				title:this.$t('menu.viewBoard')
+			})
 			if (this.ordId) {
 				this.loadData(1,null, this.ordId);
 			}
--- a/pages/index/config/data.js
View file @3276544
+++ b/pages/index/config/data.js
View file @3276544
 const basicGridList = [{
-		event: 'openCamera',
-		icon: '/static/camer.png',
-		text: '摄像头管理'
-	},
-	{
-		event: 'openConfiguration',
-		icon: '/static/status.png',
-		text: '组态'
-	},
-	{
-		event: 'visualBoard',
-		icon: '/static/visual-board.png',
-		text: '看板'
-	},
+	event: 'openCamera',
+	icon: '/static/camer.png',
+	text: 'homePage.cameraManagement'
+},
+{
+	event: 'openConfiguration',
+	icon: '/static/status.png',
+	text: 'homePage.configuration'
+},
+{
+	event: 'visualBoard',
+	icon: '/static/visual-board.png',
+	text: 'homePage.bulletinBoard'
+},
 ]
 const basicStatistics = [{
-		text: '设备统计',
-		key: 'device',
-		icon: '/static/device-total.png',
-		leftParam: 'ONLINE',
-		centerParam: 'OFFLINE',
-		rightParam: 'INACTIVE',
-		value: {
-			leftValue: 0,
-			centerValue: 0,
-			rightValue: 0
-		},
-		label: {
-			leftText: "在线",
-			centerText: "离线",
-			rightText: "待激活"
-		}
+	text: 'homePage.deviceStatistics',
+	key: 'device',
+	icon: '/static/device-total.png',
+	leftParam: 'ONLINE',
+	centerParam: 'OFFLINE',
+	rightParam: 'INACTIVE',
+	value: {
+		leftValue: 0,
+		centerValue: 0,
+		rightValue: 0
 	},
-	{
-		text: '告警统计',
-		key: 'alarm',
-		icon: '/static/alert.png',
-		leftParam: ['ACTIVE_UNACK'],
-		centerParam: 'CLEARED_ACK',
-		rightParam: 'CLEARED_UNACK',
-		value: {
-			leftValue: 0,
-			centerValue: 0,
-			rightValue: 0
-		},
-		label: {
-			leftText: "未处理",
-			centerText: "已处理",
-			rightText: "误报"
-		}
+	label: {
+		leftText: "homePage.deviceLabel.onLine",
+		centerText: "homePage.deviceLabel.offLine",
+		rightText: "homePage.deviceLabel.beActivated"
+	}
+},
+{
+	text: 'homePage.alarmStatistics',
+	key: 'alarm',
+	icon: '/static/alert.png',
+	leftParam: ['ACTIVE_UNACK'],
+	centerParam: 'CLEARED_ACK',
+	rightParam: 'CLEARED_UNACK',
+	value: {
+		leftValue: 0,
+		centerValue: 0,
+		rightValue: 0
 	},
+	label: {
+		leftText: "homePage.alarmLabel.untreated",
+		centerText: "homePage.alarmLabel.processed",
+		rightText: "homePage.alarmLabel.falseAlarm"
+	}
+},
 ]
 export {
--- a/pages/index/index.vue
View file @3276544
+++ b/pages/index/index.vue
View file @3276544
@@ -5,34 +5,33 @@
 		<view>
 			<!-- 基础统计 -->
 			<view class="basic-statistics">
-				<view class="basic-text"><text class="text text-bold">基础统计</text></view>
+				<view class="basic-text"><text class="text text-bold">{{ $t('homePage.basicstatistics') }}</text></view>
 				<view class="basic">
-					<view class="basic-item" v-for="(item,index) in basicStatistics" :key="index">
+					<view class="basic-item" v-for="(item, index) in basicStatistics" :key="index">
 						<view class="item-child-top u-flex">
 							<image class="item-image" :src="item.icon"></image>
-							<text class="item-text home-text-muted">{{item.text}}</text>
+							<text class="item-text home-text-muted">{{ $t(item.text) }}</text>
 						</view>
 						<view class="item-child-bottom u-flex">
-							<view @click="navigatorPage(item,item.leftParam)" class="u-flex sigle-child">
+							<view @click="navigatorPage(item, item.leftParam)" class="u-flex sigle-child">
 								<view class="sigle-text">
-									<text class="home-text-total">{{item.value.leftValue}}</text>
+									<text class="home-text-total">{{ item.value.leftValue }}</text>
 								</view>
-								<view class="sigle-value"><text
-										class="home-text-total-bottom">{{item.label.leftText}}</text></view>
+								<view class="sigle-value"><text class="home-text-total-bottom">{{ $t(item.label.leftText) }}</text></view>
 							</view>
-							<view @click="navigatorPage(item,item.centerParam)" class="u-flex sigle-child">
+							<view @click="navigatorPage(item, item.centerParam)" class="u-flex sigle-child">
 								<view class="sigle-text">
-									<text class="home-text-total">{{item.value.centerValue}}</text>
+									<text class="home-text-total">{{ item.value.centerValue }}</text>
+								</view>
+								<view class="sigle-value"><text class="home-text-total-bottom">{{ $t(item.label.centerText) }}</text>
 								</view>
-								<view class="sigle-value"><text
-										class="home-text-total-bottom">{{item.label.centerText}}</text></view>
 							</view>
-							<view @click="navigatorPage(item,item.rightParam)" class="u-flex sigle-child">
+							<view @click="navigatorPage(item, item.rightParam)" class="u-flex sigle-child">
 								<view class="sigle-text">
-									<text class="home-text-total">{{item.value.rightValue}}</text>
+									<text class="home-text-total">{{ item.value.rightValue }}</text>
+								</view>
+								<view class="sigle-value"><text class="home-text-total-bottom">{{ $t(item.label.rightText) }}</text>
 								</view>
-								<view class="sigle-value"><text
-										class="home-text-total-bottom">{{item.label.rightText}}</text></view>
 							</view>
 						</view>
 					</view>
@@ -40,13 +39,12 @@
 			</view>
 			<!-- 网格信息 -->
 			<view class="grid-container">
-				<view v-for="(item,index) in basicGridList" :key="index" @click="handleEvent(item.event)"
-					class="grid-item">
+				<view v-for="(item, index) in basicGridList" :key="index" @click="handleEvent(item.event)" class="grid-item">
 					<view class="item-center">
 						<view class="center">
 							<image class="image" :src="item.icon"></image>
 						</view>
-						<view class="center-text"><text class="text text-muted" style="">{{item.text}}</text></view>
+						<view class="center-text"><text class="text text-muted" style="">{{ $t(item.text) }}</text></view>
 					</view>
 				</view>
 			</view>
@@ -56,134 +54,144 @@
 </template>
 <script>
-	import fTabbar from '@/components/module/f-tabbar/f-tabbar';
-	import {
-		mapActions
-	} from 'vuex';
-	import api from '@/api/index.js'
-	import {
-		useNavigateTo
-	} from '@/plugins/utils.js'
-	import {
-		basicGridList,
-		basicStatistics
-	} from './config/data.js'
+import fTabbar from '@/components/module/f-tabbar/f-tabbar';
+import {
+	mapActions
+} from 'vuex';
+import api from '@/api/index.js'
+import {
+	useNavigateTo
+} from '@/plugins/utils.js'
+import {
+	basicGridList,
+	basicStatistics
+} from './config/data.js'
-	export default {
-		components: {
-			fTabbar
+export default {
+	components: {
+		fTabbar
+	},
+	data() {
+		return {
+			basicGridList,
+			basicStatistics,
+		};
+	},
+	onReady(){
+		console.log(123,'123')
+	},
+	onLoad() {
+		// 隐藏原生的tabbar
+		uni.hideTabBar()
+	},
+	onShow() {
+		this.$nextTick(()=>{
+			uni.setNavigationBarTitle({
+				title:this.$t('menu.homePage')
+			})
+		})
+		
+		if (getApp().getBindNot()) {
+			this.basicStatistics.map(item => {
+				const { key, value } = item
+				if (key === 'device') {
+					value.leftValue = 0
+					value.centerValue = 0
+					value.rightValue = 0
+				} else {
+					value.leftValue = 0
+					value.centerValue = 0
+					value.rightValue = 0
+				}
+			})
+			return
+		}
+		this.getDeviceTotalData();
+		uni.setStorageSync('getConfiguration', {
+			isConfiguration: false
+		});
+		uni.removeStorageSync('getConfiguration');
+		
+	},
+	onPullDownRefresh() {
+		if (getApp().getBindNot()) {
+			return
+		}
+		this.getDeviceTotalData();
+		setTimeout(function () {
+			uni.stopPullDownRefresh();
+			uni.$u.toast(this.$t('common.refreshSuccess'));
+		}, 200);
+	},
+	methods: {
+		...mapActions(['updateBadgeTotal']),
+		async getDeviceTotalData() {
+			const res = await api.homeApi.getHomeStatisticsApi()
+			if (res) {
+				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);
+			}
 		},
-		data() {
-			return {
-				basicGridList,
-				basicStatistics,
-			};
+		openCamera() {
+			useNavigateTo('components/camera/camera')
 		},
-		onLoad() {
-			// 隐藏原生的tabbar
-			uni.hideTabBar();
+		openConfiguration() {
+			useNavigateTo('components/configuration/configuration')
 		},
-		onShow(){	
-			if (getApp().getBindNot()) {
-				this.basicStatistics.map(item=>{
-						const { key, value } = item
-						if(key === 'device'){
-							value.leftValue = 0
-							value.centerValue =0
-							value.rightValue = 0
-						}else{
-							value.leftValue = 0
-							value.centerValue =0
-							value.rightValue = 0
-						}
-					})
-				return
-			}
-			this.getDeviceTotalData();
-			uni.setStorageSync('getConfiguration', {
-				isConfiguration: false
-			});
-			uni.removeStorageSync('getConfiguration');
+		openVisualBoard() {
+			useNavigateTo('components/visualBoard/index')
 		},
-		onPullDownRefresh() {
+		handleEvent(event) {
 			if (getApp().getBindNot()) {
+				uni.$u.toast(this.$t('common.pleaseBindAccount'))
 				return
 			}
-			this.getDeviceTotalData();
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-				uni.$u.toast('下拉刷新成功...');
-			}, 200);
+			if (event === 'visualBoard') {
+				this.openVisualBoard()
+			} else if (event === 'openCamera') this.openCamera()
+			else {
+				this.openConfiguration()
+			}
 		},
-		methods: {
-			...mapActions(['updateBadgeTotal']),
-			async getDeviceTotalData() {
-				const res = await api.homeApi.getHomeStatisticsApi()
-				if (res) {
-					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('components/camera/camera')
-			},
-			openConfiguration() {
-				useNavigateTo('components/configuration/configuration')
-			},
-			openVisualBoard() {
-				useNavigateTo('components/visualBoard/index')
-			},
-			handleEvent(event) {
-				if (getApp().getBindNot()) {
-					uni.$u.toast('请进行账号绑定')
-					return
-				}
-				if(event==='visualBoard') {
-					this.openVisualBoard()
-				}else if (event === 'openCamera') this.openCamera()
-				else {
-					this.openConfiguration()
-				}
-			},
-			navigatorPage(item, type) {
-				const {
-					text
-				} = item
-				if (text === '设备统计') this.navigatorDeviceStatus(type)
-				else {
-					this.navigatorAlarmStatus(type)
-				}
-			},
-			//告警状态查询
-			navigatorAlarmStatus(e) {
-				uni.reLaunch({
-					url: '../alarm/alarm?type=' + JSON.stringify(e)
-				});
-			},
-			//设备状态查询
-			navigatorDeviceStatus(e) {
-				uni.reLaunch({
-					url: '../device/device?deviceState=' + JSON.stringify(e)
-				});
+		navigatorPage(item, type) {
+			const {
+				text
+			} = item
+			if (text === 'homePage.deviceStatistics') this.navigatorDeviceStatus(type)
+			else {
+				this.navigatorAlarmStatus(type)
 			}
+		},
+		//告警状态查询
+		navigatorAlarmStatus(e) {
+			uni.reLaunch({
+				url: '../alarm/alarm?type=' + JSON.stringify(e)
+			});
+		},
+		//设备状态查询
+		navigatorDeviceStatus(e) {
+			uni.reLaunch({
+				url: '../device/device?deviceState=' + JSON.stringify(e)
+			});
 		}
-	};
+	}
+};
 </script>
 <style lang="scss" scoped>
-	@import './static/index.scss';
+@import './static/index.scss';
 </style>
--- a/pages/index/splash.vue
View file @3276544
+++ b/pages/index/splash.vue
View file @3276544
@@ -3,7 +3,7 @@
 		<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>
+			<text class="splash-text-muted">{{ $t('spreadTail') }}</text>
 		</view>
 	</view>
 </template>
@@ -60,4 +60,4 @@
 <style lang="scss" scoped>
 	@import './static/splash.scss';
-</style>
+</style>
--- a/pages/organization/organization.vue
View file @3276544
+++ b/pages/organization/organization.vue
View file @3276544
@@ -3,7 +3,7 @@
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<view>
-			<luyj-tree @sendValue="confirm" :is-check="isCheck" search-placeholder="请输入搜索内容" :search-if="true" v-slot:default="{ item }" :max="max" :trees="tree">
+			<luyj-tree @sendValue="confirm" :is-check="isCheck" :search-placeholder="$t('common.pleaseEnterContent')" :search-if="true" v-slot:default="{ item }" :max="max" :trees="tree">
 				<view>
 					<view class="content-item">
 						<view class="word">{{ item.name }}</view>
@@ -28,6 +28,11 @@ export default {
 			id: ''
 		};
 	},
+	onShow(){
+		uni.setNavigationBarTitle({
+			title:this.$t('menu.organizationScreening')
+		})
+	},
 	onLoad(e) {
 		// 隐藏原生的tabbar
 		uni.hideTabBar();
--- a/pages/personal/components/bind-account-modal.vue
View file @3276544
+++ b/pages/personal/components/bind-account-modal.vue
View file @3276544
 <template>
 	<view>
-		<u-modal :showConfirmButton="false" :show="show" :title="title">
+		<u-modal :showConfirmButton="false" :show="show" :title="$t(title)">
 			<view v-if="!bindPhone" class="login-phone">
 				<view class="form-row">
-					<u--input shape="circle" class="input" prefixIcon="account-fill" type="text" placeholder="请输入登录账号"
+					<u--input shape="circle" class="input" prefixIcon="account-fill" type="text" :placeholder="$t('login.pleaseEnterAccount')"
 						v-model="bindAccountForm.appUserKey"></u--input>
 				</view>
 				<view class="form-row item-bind">
 					<u--input class="input" shape="circle" prefixIcon="lock-fill" suffixIconStyle="color: #909399"
-						type="password" placeholder="请输入登录密码" v-model="bindAccountForm.appUserSecret"></u--input>
+						type="password" :placeholder="$t('login.pleaseEnterPassword')" v-model="bindAccountForm.appUserSecret"></u--input>
 				</view>
 				<view class="u-flex item-phone">
-					<view class="bind-phone-text" @click="openBindPhone">手机绑定</view>
+					<view class="bind-phone-text" @click="openBindPhone">{{ $t('login.phoneBind') }}</view>
 				</view>
 			</view>
 			<view v-else class="login-phone">
 				<view class="form-row">
 					<u--input shape="circle" class="input" type="text" v-model="bindPhoneForm.appUserKey"
-						placeholder="请输入手机号码" placeholder-style="font-weight:normal;color:#bbbbbb;"></u--input>
+						:placeholder="$t('login.PleaseEnterPhone')" placeholder-style="font-weight:normal;color:#bbbbbb;"></u--input>
 				</view>
 				<view class="form-row row-top">
 					<u--input shape="circle" class="input" type="text" v-model="bindPhoneForm.appUserSecret"
-						placeholder="请输入验证码" placeholder-style="font-weight:normal;color:#bbbbbb;"></u--input>
+						:placeholder="$t('login.PleaseEnterCode')" placeholder-style="font-weight:normal;color:#bbbbbb;"></u--input>
 					<view style="color: #377dff" class="verify-code" :class="{ forhidden: readonly }"
 						@click="getVerifyCode">
 						{{ codeText }}
 					</view>
 				</view>
 				<view class="u-flex item-phone">
-					<view class="bind-phone-text" @click="openBindAccount">账号绑定</view>
+					<view class="bind-phone-text" @click="openBindAccount">{{ $t('login.accountBind') }}</view>
 				</view>
 			</view>
 			<view class="bottom-content">
 				<view class="u-flex content">
 					<view class="cancel">
-						<u-button @click="$emit('cancelAccountModal')" type="info" shape="circle" text="取消"></u-button>
+						<u-button @click="$emit('cancelAccountModal')" type="info" shape="circle" :text="$t('common.cancelText')"></u-button>
 					</view>
 					<view class="confrim">
-						<u-button @click="handleConfirm" type="primary" shape="circle" text="确认"></u-button>
+						<u-button @click="handleConfirm" type="primary" shape="circle" :text="$t('common.confirm')"></u-button>
 					</view>
 				</view>
 			</view>
@@ -68,9 +68,9 @@
 		data() {
 			return {
 				readonly: false,
-				codeText: '获取验证码',
+				codeText:'',
 				bindPhone: false,
-				title: '绑定账号',
+				title: 'login.bindAccount',
 				bindAccountForm: {
 					appUserKey: '',
 					appUserSecret: ''
@@ -85,6 +85,7 @@
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
 			this.getOpenId = getApp().globalData.openId;
+			this.codeText = this.$t('login.obtainCode')
 		},
 		methods: {
 			...mapMutations(["setUserInfo", "setPlateInfo"]),
@@ -125,21 +126,20 @@
 				//账号绑定
 				if (!this.bindPhone) {
 					const validateValue = Object.values(this.bindAccountForm)
-					if (!validateValue[0]) return uni.$u.toast("请输入登录账号~");
-					if (!validateValue[1]) return uni.$u.toast("请输入登录密码~");
-					if (!loginPasswordReg.test(validateValue[1])) return useShowModal(
-						"密码格式不正确（至少一个大写英文字母、至少一个小写英文字母、至少一位数字、至少一个特殊字符、最少八个字符）~", )
-					this.handleBindForm('ACCOUNT', this.bindAccountForm, '账号绑定成功~')
+					if (!validateValue[0]) return uni.$u.toast(this.$t('login.pleaseEnterAccount'));
+					if (!validateValue[1]) return uni.$u.toast(this.$t('login.pleaseEnterPassword'));
+					if (!loginPasswordReg.test(validateValue[1])) return useShowModal(this.$t('login.passwordRule'))
+					this.handleBindForm('ACCOUNT', this.bindAccountForm, this.$t('login.accountBindSuccess'))
 				} else {
 					//手机绑定
 					const phoneRegular = /^1\d{10}$/;
 					const verifyCodeReg = /^\d{6}$/;
 					const validateValue = Object.values(this.bindPhoneForm)
-					if (!validateValue[0]) return uni.$u.toast("请输入手机号码~");
-					if (!validateValue[1]) return uni.$u.toast("请输入验证码~");
-					if (!phoneRegular.test(validateValue[0])) return uni.$u.toast("手机号格式不正确~");
-					if (!verifyCodeReg.test(validateValue[1])) return uni.$u.toast("验证码格式不正确~");
-					this.handleBindForm('PHONE', this.bindPhoneForm, '手机绑定成功~')
+					if (!validateValue[0]) return uni.$u.toast(this.$t('login.PleaseEnterPhone'));
+					if (!validateValue[1]) return uni.$u.toast(this.$t('login.PleaseEnterCode'));
+					if (!phoneRegular.test(validateValue[0])) return uni.$u.toast(this.$t('login.phoneFormatFail'));
+					if (!verifyCodeReg.test(validateValue[1])) return uni.$u.toast(this.$t('login.codeFormatFail'));
+					this.handleBindForm('PHONE', this.bindPhoneForm, this.$t('login.phoneBindSuccess'))
 				}
 			},
 			async saveUserInfo() {
@@ -160,14 +160,14 @@
 			verifyCodeCountDown() {
 				const _this = this;
 				this.readonly = true;
-				this.codeText = '60S后重新获取';
+				this.codeText = this.$t('login.codeAfterSeconds',{number:60});
 				var s = 60;
 				clear = setInterval(() => {
 					s--;
-					_this.codeText = s + 'S后重新获取';
+					_this.codeText =this.$t('login.codeAfterSeconds',{number:s});
 					if (s <= 0) {
 						clearInterval(clear);
-						_this.codeText = '获取验证码';
+						_this.codeText = this.$t('login.obtainCode');
 						_this.readonly = false;
 					}
 				}, 1000);
@@ -175,9 +175,9 @@
 			//获取验证码
 			async getVerifyCode() {
 				const phoneRegular = /^1\d{10}$/;
-				if (this.readonly) useShowToast('验证码已发送~')
-				if (!this.bindPhoneForm.appUserKey) return useShowToast('请输入手机号~')
-				if (!phoneRegular.test(this.bindPhoneForm.appUserKey)) return useShowToast('手机号格式不正确~')
+				if (this.readonly) useShowToast(this.$t('login.codeBeenSend'))
+				if (!this.bindPhoneForm.appUserKey) return useShowToast(this.$t('login.PleaseEnterPhone'))
+				if (!phoneRegular.test(this.bindPhoneForm.appUserKey)) return useShowToast(this.$t('login.phoneFormatFail'))
 				await api.loginApi.postCodeApi(this.bindPhoneForm.appUserKey)
 				this.verifyCodeCountDown(); //开始倒计时
 			},
--- a/pages/personal/components/logout-account-modal.vue
View file @3276544
+++ b/pages/personal/components/logout-account-modal.vue
View file @3276544
@@ -2,9 +2,9 @@
 	<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 class="main"><text style="color: #999999">{{ $t('login.isLoginPut') }}</text></view>
+				<view @click="$emit('logoutBtn')" class="main"><text style="color: #f95e5a">{{ $t('login.loginOut') }}</text></view>
+				<view class="cancel-text"><text @click="$emit('closeLogoutPopup')" style="color: #3478f7">{{ $t('common.cancelText') }}</text>
 				</view>
 			</view>
 		</u-popup>
@@ -24,4 +24,4 @@
 <style lang="scss" scoped>
 	@import '../static/personal.scss';
-</style>
+</style>
--- a/pages/personal/components/switchLocales.vue 0 → 100644
View file @3276544
+++ b/pages/personal/components/switchLocales.vue 0 → 100644
View file @3276544
+<template>
+  <view style="padding:24rpx;background: #f8f9fa;height: 100vh;">
+    <view class="center">
+      <view v-for="(item, index) in languageData" :key="item.value" class="flex justify-between"
+        :class="index == 0 ? 'v-label' : ''" @click="handleChange(item.value)">
+        <view>{{ item.label }}</view>
+        <image v-if="language === item.value" class="image" src="/static/languageSelect.png"></image>
+      </view>
+      
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  onLoad() {
+    this.getLocale()
+  },
+  data() {
+    return {
+      language: 'zh-CN',
+      languageData: [
+        { label: '中文简体', value: 'zh-CN' },
+        { label: 'English', value: 'en' }
+      ]
+    }
+  },
+  onShow() {
+    this.$nextTick(() => {
+      uni.setNavigationBarTitle({
+        title: this.$t('menu.languageSettings')
+      })
+    })
+  },
+  methods: {
+    getLocale() {
+      const locale = uni.getLocale()
+      if (locale) {
+        this.language = locale.includes('zh')?'zh-CN' : locale
+      }
+    },
+	
+    handleChange(name) {
+      //App会重启应用
+     // #ifdef APP-PLUS || APP
+     uni.showModal({
+        title:this.$t('userCenter.switchRestLanguage'),
+        success:(res)=>{
+          if(res.confirm){
+            this.$i18n.locale = name
+            this.language = name
+            uni.setNavigationBarTitle({
+              title: this.$t('menu.languageSettings')
+            })
+            // setLocale设置的语言需要对照到uniapp上的默认配置语言来设置
+            uni.setLocale(name.includes('zh')?'zh-Hans':'en')
+          }
+        }
+      })
+			// #endif
+     // #ifdef MP-WEIXIN
+      uni.showLoading({
+        title:this.$t('userCenter.switchLanguages')
+      })
+      const timeOut = setTimeout(()=>{
+        this.$i18n.locale = name
+        this.language = name
+        uni.setNavigationBarTitle({
+          title: this.$t('menu.languageSettings')
+        })
+        uni.setLocale(name.includes('zh')?'zh-Hans':'en')
+        uni.hideLoading()
+        clearTimeout(timeOut)
+      },500)
+      // #endif
+     
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.center {
+  background: #fff;
+  padding: 24rpx;
+  border-radius: 24rpx;
+
+}
+
+.flex {
+  display: flex;
+}
+
+.justify-between {
+  justify-content: space-between;
+}
+
+.v-label {
+  border-bottom: 1rpx solid #ecedee;
+  padding-bottom: 6rpx;
+  margin-bottom: 8rpx
+}
+
+.image {
+  width: 44rpx;
+  height: 44rpx;
+  // margin-top: 20rpx;
+  // border-radius: 32rpx;
+}
+</style>
--- a/pages/personal/config/data.js
View file @3276544
+++ b/pages/personal/config/data.js
View file @3276544
 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'
-	}
+	url: '/sysnotify-subpackage/sys-notify/system-notify',
+	text: 'userCenter.systemNotification',
+	leftIcon: '/static/sys-not.png',
+	rightIcon: '/static/arrow-right.png'
+},
+{
+	url: '/feedback-subpackage/feedback/feedback',
+	text: 'userCenter.feedback',
+	leftIcon: '/static/find-sugg.png',
+	rightIcon: '/static/arrow-right.png'
+},
+{
+	url: '/pages/personal/components/switchLocales',
+	text: 'userCenter.languageSettings',
+	leftIcon: '/static/language.png',
+	rightIcon: '/static/arrow-right.png'
+},
 ]
 export {
 	systemList
-}
+}
--- a/pages/personal/personal.vue
View file @3276544
+++ b/pages/personal/personal.vue
View file @3276544
@@ -14,7 +14,7 @@
 								<text class="nick-name">{{ userInfo.realName || userInfo.nickName }}</text>
 							</view>
 							<view v-if="userInfo.isThirdLogin" @click.stop="openBindAccountModal" class="detail"><text
-									class="text">绑定账号</text></view>
+									class="text">{{ $t('login.bindAccount') }}</text></view>
 						</view>
 						<view class="phone-number" v-if="userInfo.phoneNumber">
 							{{ handlePhoneFunc(userInfo.phoneNumber || '') }}
@@ -28,7 +28,7 @@
 						</view>
 					</view>
 					<view class="u-flex-1">
-						<view @click="navigatorLogin" class="u-font-lg click-login login-btn">请点击登录</view>
+						<view @click="navigatorLogin" class="u-font-lg click-login login-btn">{{ $t('login.pleaseClickLogin') }}</view>
 					</view>
 				</block>
 				<view v-if="userInfo.isToken" @click="navigatorPersonal">
@@ -42,14 +42,14 @@
 					<view class="nav-image">
 						<image class="image" :src="item.leftIcon"></image>
 					</view>
-					<view class="nav-center"><text class="text">{{item.text}}</text></view>
+					<view class="nav-center"><text class="text">{{$t(item.text)}}</text></view>
 					<view class="nav-right">
 						<image class="image" :src="item.rightIcon"></image>
 					</view>
 				</view>
 			</view>
 			<view @click="openLogoutPopup" class="u-flex logout-text">
-				<button class="submit" size="default" @click="openLogoutPopup"><text class="text">退出账号</text></button>
+				<button class="submit" size="default" @click="openLogoutPopup"><text class="text">{{ $t('login.accountOut') }}</text></button>
 			</view>
 		</view>
 		<!-- 绑定账号 -->
@@ -86,6 +86,13 @@
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
 		},
+		onShow(){
+			this.$nextTick(()=>{
+				uni.setNavigationBarTitle({
+					title:this.$t('menu.userCenter')
+				})
+			})
+		},
 		computed: {
 			...mapState(['userInfo', 'plateInfo']),
 			setHeadImage() {
@@ -133,7 +140,7 @@
 			},
 			logoutBtn() {
 				const that = this
-				useShowModal('您确定要退出登录吗？', '退出登录', '确定').then(res => {
+				useShowModal(this.$t('login.isLoginPut'), this.$t('login.loginOut'), this.$t('common.confirm'),this.$t('common.cancelText')).then(res => {
 					if (res.confirm) {
 						that.emptyUserInfo();
 						that.showLogout = false;
@@ -151,4 +158,4 @@
 <style lang="scss" scoped>
 	@import './static/personal.scss';
-</style>
+</style>
--- a/plugins/utils.js
View file @3276544
+++ b/plugins/utils.js
View file @3276544
@@ -3,25 +3,25 @@ import moment from "moment";
 const DATE_TIME_FORMAT = "YYYY-MM-DD HH:mm:ss";
 /**
-   登录密码正则验证
-   最短8位，最长16位
-   必须包含1个数字
-   必须包含1个小写字母
-   必须包含1个大写字母
-   必须包含1个特殊字符
+	 登录密码正则验证
+	 最短8位，最长16位
+	 必须包含1个数字
+	 必须包含1个小写字母
+	 必须包含1个大写字母
+	 必须包含1个特殊字符
  */
 export const loginPasswordReg =
 	/^.*(?=.{6,16})(?=.*\d)(?=.*[A-Z]{1,})(?=.*[a-z]{1,})(?=.*[_!@#$%^&*?\(\)]).*$/;
 //手机号中间4位为*
-Vue.filter("phone", function(val) {
+Vue.filter("phone", function (val) {
 	var tel = val;
 	tel = "" + tel;
 	var telShort = tel.replace(tel.substring(3, 7), "****");
 	return telShort;
 });
 //获取系统信息、判断ipX安全距离
-export const getTabbarHeight = function() {
+export const getTabbarHeight = function () {
 	var systemInfo = uni.getSystemInfoSync();
 	var data = {
 		...systemInfo,
@@ -58,7 +58,7 @@ export const getTabbarHeight = function() {
 };
 // px转upx
-export const px2upx = function(n) {
+export const px2upx = function (n) {
 	return n / (uni.upx2px(n) / n);
 };
@@ -101,7 +101,7 @@ function getMpLocation(successCallback, errCallback, isOpenSetting) {
 }
 // 获取地址信息
 let locationAuthorize = true;
-export const getAppLatLon = function(
+export const getAppLatLon = function (
 	successCallback,
 	errCallback,
 	isOpenSetting
@@ -192,12 +192,13 @@ export const useShowToast = (title, duration = 500, mask = false) => {
 };
 //封装uniapp showModal
-export const useShowModal = (content, title = "提示", confirmText = "确定") => {
+export const useShowModal = (content, title = "提示", confirmText = "确定", cancelText = "取消") => {
 	return new Promise((resolve, reject) => {
 		uni.showModal({
 			title,
 			content: content,
 			confirmText,
+			cancelText,
 			success: (res) => {
 				resolve(res);
 			},
@@ -216,7 +217,7 @@ export const useUploadFile = (
 	formData,
 	header
 ) => {
-	return new Promise(function(resolve, reject) {
+	return new Promise(function (resolve, reject) {
 		uni.uploadFile({
 			url, //请求接口地址
 			filePath, //文件地址
@@ -240,7 +241,7 @@ export const useChooseImage = (data) => {
 			count: data.count || 1, //默认1
 			sizeType: data.sizeType || ["original", "compressed"], //可以指定是原图还是压缩图，默认二者都有
 			sourceType: data.sourceType || ["album", "camera"], //从相册选择
-			success: function(res) {
+			success: function (res) {
 				resolve(res.tempFiles);
 			},
 			fail: (err) => {
@@ -281,4 +282,4 @@ export const useNavigateBack = (delta) => {
 	uni.navigateBack({
 		delta
 	});
-};
+};
--- a/static/language.png 0 → 100644
View file @3276544
+++ b/static/language.png 0 → 100644
View file @3276544
--- a/static/languageSelect.png 0 → 100644
View file @3276544
+++ b/static/languageSelect.png 0 → 100644
View file @3276544
--- a/sysnotify-subpackage/sys-notify/config/data.js
View file @3276544
+++ b/sysnotify-subpackage/sys-notify/config/data.js
View file @3276544
 const actions = [{
-		name: '全部',
-		value: ''
-	},
-	{
-		name: '会议',
-		value: 'MEETING'
-	},
-	{
-		name: '公告',
-		value: 'NOTICE'
-	},
-	{
-		name: '其他',
-		value: 'OTHER'
-	}
+	name: 'common.allText',
+	value: ''
+},
+{
+	name: 'userCenter.meeting',
+	value: 'MEETING'
+},
+{
+	name: 'userCenter.notice',
+	value: 'NOTICE'
+},
+{
+	name: 'userCenter.other',
+	value: 'OTHER'
+}
 ]
 export {
 	actions
-}
+}
--- a/sysnotify-subpackage/sys-notify/notify-detail.vue
View file @3276544
+++ b/sysnotify-subpackage/sys-notify/notify-detail.vue
View file @3276544
@@ -36,6 +36,13 @@ export default {
 			notifyList: {}
 		};
 	},
+	onShow(){
+		this.$nextTick(()=>{
+			uni.setNavigationBarTitle({
+				title:this.$t('menu.notDetails')
+			})
+		})
+	},
 	onLoad(e) {
 		// 隐藏原生的tabbar
 		uni.hideTabBar();
--- a/sysnotify-subpackage/sys-notify/system-notify.vue
View file @3276544
+++ b/sysnotify-subpackage/sys-notify/system-notify.vue
View file @3276544
@@ -5,8 +5,8 @@
 		<view class="notify-page-top-select">
 			<view @click="handleTypeClick" class="top-select">
 				<u--input suffixIcon="arrow-down" shape="circle" disabled v-model="notifyType"
-					placeholder="请选择类型" border="surround"></u--input>
-				<u-action-sheet safe-area-inset-bottom :show="showType" :actions="actions" title="请选择类型" @close="showType = false"
+					:placeholder="$t('userCenter.pleaseSelectType')" border="surround"></u--input>
+				<u-action-sheet safe-area-inset-bottom :show="showType" :actions="actions.map(item=>({...item,name:$t(item.name)}))" :title="$t('userCenter.pleaseSelectType')" @close="showType = false"
 					@select="handleTypeSelect"></u-action-sheet>
 			</view>
 		</view>
@@ -65,6 +65,13 @@
 				distance: 0,
 			};
 		},
+		onShow(){
+			this.$nextTick(()=>{
+				uni.setNavigationBarTitle({
+					title:this.$t('menu.systemNot')
+				})
+			})
+		},
 		onLoad(e) {
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
@@ -73,7 +80,7 @@
 			formatType(e) {
 				const findName = this.actions.find((item)=>item.value===e && item.value!=='')
 				if(!findName) return
-				return findName.name
+				return this.$t(findName.name)
 			},
 			handleTypeClick() {
 				this.showType = true;
--- a/uni_modules/luyj-tree/components/luyj-tree-navigation/luyj-tree-navigation.vue
View file @3276544
+++ b/uni_modules/luyj-tree/components/luyj-tree-navigation/luyj-tree-navigation.vue
View file @3276544
@@ -3,8 +3,8 @@
 		<scroll-view ref="sea" scroll-x style="width: 100%;white-space: nowrap;">
 			<!-- 全部 -->
 			<view class="inline-item" @click="clickItem(null,-1)">
-				<text v-if="!isre && treeStack.length == 0" class="none">全部</text>
-				<text v-else class="active">全部</text>
+				<text v-if="!isre && treeStack.length == 0" class="none">{{ $t('common.allText') }}</text>
+				<text v-else class="active">{{ $t('common.allText') }}</text>
 			</view>
 			<!-- 全部 -->
 			<!-- 搜索结果 -->
--- a/uni_modules/luyj-tree/components/luyj-tree/luyj-tree.vue
View file @3276544
+++ b/uni_modules/luyj-tree/components/luyj-tree/luyj-tree.vue
View file @3276544
@@ -53,7 +53,7 @@
 					align-items: center;
 					justify-content: center;"
 		>
-			<button class="sureBtn" type="primary" @click="backConfirm">确认</button>
+			<button class="sureBtn" type="primary" @click="backConfirm">{{ $t('common.confirm') }}</button>
 		</view>
 	</view>
 </template>
--- a/uni_modules/mescroll-uni/components/mescroll-body/mescroll-body.vue
View file @3276544
+++ b/uni_modules/mescroll-uni/components/mescroll-body/mescroll-body.vue
View file @3276544
@@ -366,6 +366,25 @@
 			if (vm.up && vm.up.toTop && vm.up.toTop.safearea != null) {} else {
 				vm.mescroll.optUp.toTop.safearea = vm.safearea;
 			}
+
+			uni.onLocaleChange((res) => {
+			let i18nType = mescrollI18n.getType()
+			let i18nOption = { type: i18nType }
+			if (res && vm.mescroll.i18n.type != mescrollI18n.getType()) {
+				vm.mescroll.i18n.type = mescrollI18n.getType()
+				mescrollI18n.setType(i18nType)
+				MeScroll.extend(i18nOption, vm.mescroll.i18n[i18nType])
+				if (i18nOption.down) {
+					let down = MeScroll.extend({}, i18nOption.down)
+					vm.mescroll.optDown = MeScroll.extend(down, vm.mescroll.optDown)
+				}
+				if (i18nOption.up) {
+					let up = MeScroll.extend({}, i18nOption.up)
+					vm.mescroll.optUp = MeScroll.extend(up, vm.mescroll.optUp)
+				}
+			}
+
+		})
 			// 全局配置监听
 			uni.$on("setMescrollGlobalOption", options=>{
@@ -397,4 +416,4 @@
 	@import "../mescroll-body/mescroll-body.css";
 	@import "../mescroll-uni/components/mescroll-down.css";
 	@import "../mescroll-uni/components/mescroll-up.css";
-</style>
+</style>
--- a/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-i18n.js
View file @3276544
+++ b/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-i18n.js
View file @3276544
@@ -3,11 +3,11 @@ const mescrollI18n = {
 	// 默认语言
 	def: "zh",
 	// 获取当前语言类型
-	getType(){
-		return uni.getStorageSync("mescroll-i18n") || this.def
+	getType() {
+		return uni.getLocale().includes('zh') ? 'zh' : 'en'
 	},
 	// 设置当前语言类型
-	setType(type){
+	setType(type) {
 		uni.setStorageSync("mescroll-i18n", type)
 	}
 }
--- a/uni_modules/tn-popup/components/tn-popup/tn-popup.vue
View file @3276544
+++ b/uni_modules/tn-popup/components/tn-popup/tn-popup.vue
View file @3276544
@@ -283,7 +283,6 @@
     watch: {
       value(val) {
         if (val) {
-          // console.log(this.visibleSync);
           if (this.visibleSync) {
             this.visibleSync = false
             return
--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
View file @3276544
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
View file @3276544
@@ -10,7 +10,7 @@
 				</view>
 				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
 					<text
-						class="uni-calendar__header-text">{{ (nowDate.year||'') + ' 年 ' + ( nowDate.month||'') +' 月'}}</text>
+						class="uni-calendar__header-text">{{ (nowDate.year||'') + yearText + ( nowDate.month||'') + monthText}}</text>
 				</picker>
 				<view v-if="right" class="uni-calendar__header-btn-box" @click.stop="next">
 					<view class="uni-calendar__header-btn uni-calendar--right"></view>
@@ -86,7 +86,7 @@
 				<!-- <view class="uni-calendar__header-btn-box">
 					<text class="uni-calendar__button-text uni-calendar--fixed-width">{{okText}}</text>
 				</view> -->
-				<view class="uni-datetime-picker--btn" @click="confirm">确认</view>
+				<view class="uni-datetime-picker--btn" @click="confirm">{{$t('common.confirm')}}</view>
 			</view>
 		</view>
 	</view>
@@ -320,6 +320,13 @@
 			/**
 			 * for i18n
 			 */
+			yearText(){
+				return t('uni-calender.YEAR')
+			},
+			monthText(){
+				return t('uni-calender.MONTH')
+			},
+
 			selectDateText() {
 				return t("uni-datetime-picker.selectDate")
 			},
@@ -332,6 +339,9 @@
 			okText() {
 				return t("uni-datetime-picker.ok")
 			},
+			cancelText() {
+				return t("uni-datetime-picker.cancel")
+			},
 			monText() {
 				return t("uni-calender.MON")
 			},
@@ -887,7 +897,7 @@
 		background-color: #007aff;
 		color: #fff;
 		font-size: 16px;
-		letter-spacing: 5px;
+		// letter-spacing: 5px;
 	}
 	/* #ifndef APP-NVUE */
--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json
View file @3276544
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json
View file @3276544
@@ -15,5 +15,7 @@
 	"uni-calender.THU": "THU",
 	"uni-calender.FRI": "FRI",
 	"uni-calender.SAT": "SAT",
-	"uni-calender.SUN": "SUN"
+	"uni-calender.SUN": "SUN",
+	"uni-calender.YEAR":"Year",
+	"uni-calender.MONTH":"Month"
 }
--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
View file @3276544
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
View file @3276544
@@ -15,5 +15,7 @@
 	"uni-calender.WED": "三",
 	"uni-calender.THU": "四",
 	"uni-calender.FRI": "五",
-	"uni-calender.SAT": "六"
+	"uni-calender.SAT": "六",
+	"uni-calender.YEAR":"年",
+	"uni-calender.MONTH":"月"
 }
--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json
View file @3276544
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json
View file @3276544
@@ -15,5 +15,7 @@
 	"uni-calender.WED": "三",
 	"uni-calender.THU": "四",
 	"uni-calender.FRI": "五",
-	"uni-calender.SAT": "六"
+	"uni-calender.SAT": "六",
+	"uni-calender.YEAR":"年",
+	"uni-calender.MONTH":"月"
 }
--- a/uni_modules/uview-ui/components/u-calendar/header.vue
View file @3276544
+++ b/uni_modules/uview-ui/components/u-calendar/header.vue
View file @3276544
@@ -9,13 +9,13 @@
 			v-if="showSubtitle"
 		>{{ subtitle }}</text>
 		<view class="u-calendar-header__weekdays">
-			<text class="u-calendar-header__weekdays__weekday">一</text>
-			<text class="u-calendar-header__weekdays__weekday">二</text>
-			<text class="u-calendar-header__weekdays__weekday">三</text>
-			<text class="u-calendar-header__weekdays__weekday">四</text>
-			<text class="u-calendar-header__weekdays__weekday">五</text>
-			<text class="u-calendar-header__weekdays__weekday">六</text>
-			<text class="u-calendar-header__weekdays__weekday">日</text>
+			<text class="u-calendar-header__weekdays__weekday">{{ $t('common.one') }}</text>
+			<text class="u-calendar-header__weekdays__weekday">{{ $t('common.two') }}</text>
+			<text class="u-calendar-header__weekdays__weekday">{{ $t('common.three') }}</text>
+			<text class="u-calendar-header__weekdays__weekday">{{ $t('common.four') }}</text>
+			<text class="u-calendar-header__weekdays__weekday">{{ $t('common.five') }}</text>
+			<text class="u-calendar-header__weekdays__weekday">{{ $t('common.six') }}</text>
+			<text class="u-calendar-header__weekdays__weekday">{{ $t('common.day') }}</text>
 		</view>
 	</view>
 </template>
--- a/uni_modules/uview-ui/components/u-calendar/u-calendar.vue
View file @3276544
+++ b/uni_modules/uview-ui/components/u-calendar/u-calendar.vue
View file @3276544
@@ -165,9 +165,9 @@ export default {
 		subtitle() {
 			// 初始化时，this.months为空数组，所以需要特别判断处理
 			if (this.months.length) {
-				return `${this.months[this.monthIndex].year}年${
+				return `${this.months[this.monthIndex].year}${this.$t('common.year')}${
 					this.months[this.monthIndex].month
-				}月`
+				}${this.$t('common.month')}`
 			} else {
 				return ''
 			}
--- a/uni_modules/uview-ui/components/u-loading-page/u-loading-page.vue
View file @3276544
+++ b/uni_modules/uview-ui/components/u-loading-page/u-loading-page.vue
View file @3276544
@@ -34,7 +34,7 @@
                             fontSize: $u.addUnit(fontSize),
                             color: color,
                         }"
-                        >{{ loadingText }}</text
+                        >{{ $t(loadingText) }}</text
                     >
                 </slot>
             </view>
--- a/uni_modules/uview-ui/libs/config/props/loadingPage.js
View file @3276544
+++ b/uni_modules/uview-ui/libs/config/props/loadingPage.js
View file @3276544
@@ -10,7 +10,7 @@
 export default {
     // loading-page组件
     loadingPage: {
-        loadingText: '正在加载',
+        loadingText: 'common.loading',
         image: '',
         loadingMode: 'circle',
         loading: false,