1

sources/client/vrv-moblie/pages/device/device.vue

@@ -4,8 +4,8 @@
 		<view class="device" v-for="item in devices" :key="item.code">
 
 			<view class="col">
-				<view class="switch">
-					<switch checked color="#007AFE" @change="switchChange" />
+				<view class="switch" @click="changeStatus(item)">
+					<switch :checked="item.useStatus" color="#007AFE" @change="switchChange" />
 				</view>
 				<view class="list" @tap="showDetail" :data-code="item.code">查看 ></view>
 			</view>
@@ -48,6 +48,37 @@
 			});
 		},
 		methods: {
+			switchChange(e) {
+
+			},
+			async changeStatus(item) {
+
+				item.deviceStatus == 1 ? item.deviceStatus = 0 : item.deviceStatus = 1;
+				console.log(item.deviceStatus);
+
+				let vm = this;
+				let url = uni.$api.device.update;
+				let data = {
+					code: item.code,
+					deviceStatus: item.deviceStatus,
+					ip: item.ip,
+					name: item.name,
+					sn: item.sn,
+					type: item.type,
+					operatorNumber: item.operatorNumber,
+					projectNumber: item.projectNumber,
+					gatewayNumber: item.gatewayNumber,
+					operatorCode: item.operatorCode,
+					projectCode: item.projectCode,
+					gatewayCode: item.gatewayCode,
+
+				};
+
+				let res = await uni.$http.get(url, data);
+				console.log(res);
+
+			},
+
 			showDetail(e) {
 				console.log(e);
 				var code = e.currentTarget.dataset.code;

sources/client/vrv-moblie/pages/project/projectInfo/projectInfo.vue

@@ -39,8 +39,8 @@
 		<view class="gatewayList" v-for="item in gateways" :key="item.code">
 
 			<view class="col">
-				<view class="switch">
-					<switch :checked="gatewayData.useStatus" color="#007AFE" @change="switchChange" />
+				<view class="switch" @click="changeStatus(item)">
+					<switch :checked="item.useStatus" color="#007AFE" @change="switchChange" />
 				</view>
 				<view class="list" @tap="showDevice" :data-code="item.code">设备列表 ></view>
 			</view>
@@ -146,12 +146,30 @@
 			})
 		},
 		methods: {
+			async changeStatus(item) {
+
+				item.useStatus == 1 ? item.useStatus = 0 : item.useStatus = 1;
+				console.log(item.useStatus);
+
+				let vm = this;
+				let url = uni.$api.gateway.update;
+				let data = {
+					code: item.code,
+					useStatus: item.useStatus,
+					ip: item.ip,
+					location: item.location,
+					number: item.number,
+					operatorNumber: item.operatorNumber,
+					projectNumber: item.projectNumber,
+
+				};
+
+				let res = await uni.$http.get(url, data);
+				console.log(res);
+
+			},
 			switchChange(e) {
-				console.log(e.detail.value);
 
-				if (e.detail.value == true) {
-				} else {
-				}
 			},
 
 			showEdit(e) {

sources/client/vrv-moblie/pages/runningState/runningState.vue

@@ -122,7 +122,7 @@
 		</view>
 
 		<view class="stopButton">
-			<button class="button" @tap="stopAndStart" :class="{'KGJ_button': formData.JZ_KGJ == 1}">开关按钮</button>
+			<button class="button" @tap="stopAndStart" :class="{'KGJ_button': formData.JZ_KGJ == 0}">开关按钮</button>
 		</view>
 
 		<view class="anniu" @tap="back">
@@ -470,9 +470,6 @@
 
 				let res = await uni.$http.get(url, data);
 				console.log(res.data.data.value);
-
-
-
 			}
 
 		}

sources/client/vrv-moblie/pages/systemParameter/systemParameter.vue

@@ -6,13 +6,85 @@
 				<view class="tiao"></view>
 			</view>
 
+			<!-- 输入框WDXZ -->
+			<view>
+				<uni-popup ref="inputDialogWDXZ" type="dialog">
+					<uni-popup-dialog ref="inputClose" mode="input" title="(输入范围: -50 ~ 50)" :value="formData.WD1_XZ"
+						placeholder="输入范围: -50 ~ 50的值!" @confirm="dialogInputConfirmWDXZ"></uni-popup-dialog>
+				</uni-popup>
+			</view>
+			<!-- 输入框SDXZ -->
+			<view>
+				<uni-popup ref="inputDialogSDXZ" type="dialog">
+					<uni-popup-dialog ref="inputClose" mode="input" title="(输入范围: -100 ~ 100)" :value="formData.SD1_XZ"
+						placeholder="输入范围: -100 ~ 100的值!" @confirm="dialogInputConfirmSDXZ"></uni-popup-dialog>
+				</uni-popup>
+			</view>
+
+			<!-- 输入框JRP -->
+			<view>
+				<uni-popup ref="inputDialogJRP" type="dialog">
+					<uni-popup-dialog ref="inputClose" mode="input" title="(输入范围: -100 ~ 100)" :value="formData.JR_P"
+						placeholder="输入范围: -100 ~ 100的值!" @confirm="dialogInputConfirmJRP"></uni-popup-dialog>
+				</uni-popup>
+			</view>
+			<!-- 输入框JRI -->
+			<view>
+				<uni-popup ref="inputDialogJRI" type="dialog">
+					<uni-popup-dialog ref="inputClose" mode="input" title="(输入范围: -100 ~ 100)" :value="formData.JR_I"
+						placeholder="输入范围: -100 ~ 100的值!" @confirm="dialogInputConfirmJRI"></uni-popup-dialog>
+				</uni-popup>
+			</view>
+			<!-- 输入框ZLP -->
+			<view>
+				<uni-popup ref="inputDialogZLP" type="dialog">
+					<uni-popup-dialog ref="inputClose" mode="input" title="(输入范围: -100 ~ 100)" :value="formData.ZL_P"
+						placeholder="输入范围: -100 ~ 100的值!" @confirm="dialogInputConfirmZLP"></uni-popup-dialog>
+				</uni-popup>
+			</view>
+			<!-- 输入框ZLI -->
+			<view>
+				<uni-popup ref="inputDialogZLI" type="dialog">
+					<uni-popup-dialog ref="inputClose" mode="input" title="(输入范围: -100 ~ 100)" :value="formData.ZL_I"
+						placeholder="输入范围: -100 ~ 100的值!" @confirm="dialogInputConfirmZLI"></uni-popup-dialog>
+				</uni-popup>
+			</view>
+			<!-- 输入框JSP -->
+			<view>
+				<uni-popup ref="inputDialogJSP" type="dialog">
+					<uni-popup-dialog ref="inputClose" mode="input" title="(输入范围: -100 ~ 100)" :value="formData.JS_P"
+						placeholder="输入范围: -100 ~ 100的值!" @confirm="dialogInputConfirmJSP"></uni-popup-dialog>
+				</uni-popup>
+			</view>
+			<!-- 输入框JSI -->
+			<view>
+				<uni-popup ref="inputDialogJSI" type="dialog">
+					<uni-popup-dialog ref="inputClose" mode="input" title="(输入范围: -100 ~ 100)" :value="formData.JS_I"
+						placeholder="输入范围: -100 ~ 100的值!" @confirm="dialogInputConfirmJSI"></uni-popup-dialog>
+				</uni-popup>
+			</view>
+			<!-- 输入框CSP -->
+			<view>
+				<uni-popup ref="inputDialogCSP" type="dialog">
+					<uni-popup-dialog ref="inputClose" mode="input" title="(输入范围: -100 ~ 100)" :value="formData.CS_P"
+						placeholder="输入范围: -100 ~ 100的值!" @confirm="dialogInputConfirmCSP"></uni-popup-dialog>
+				</uni-popup>
+			</view>
+			<!-- 输入框CSI -->
+			<view>
+				<uni-popup ref="inputDialogCSI" type="dialog">
+					<uni-popup-dialog ref="inputClose" mode="input" title="(输入范围: -100 ~ 100)" :value="formData.CS_I"
+						placeholder="输入范围: -100 ~ 100的值!" @confirm="dialogInputConfirmCSI"></uni-popup-dialog>
+				</uni-popup>
+			</view>
+
 			<form>
 				<view class="setmenu">
 					<view class="setItem">
 						<view class="text">
 							<text>排风温度修正</text>
 						</view>
-						<view class="input">
+						<view class="input" @click="inputDialogToggleWDXZ()">
 							<input style="margin-left: 20rpx;" placeholder="请输入" v-model="formData.WD1_XZ" />
 							<view class="danwei">
 								<text style="margin-left: 10rpx;">℃</text>
@@ -23,7 +95,7 @@
 						<view class="text">
 							<text>排风湿度修正</text>
 						</view>
-						<view class="input">
+						<view class="input" @click="inputDialogToggleSDXZ()">
 							<input style="margin-left: 20rpx;" placeholder="请输入" v-model="formData.SD1_XZ" />
 							<view class="danwei"> <text style="margin-left: 14rpx;">%</text></view>
 						</view>
@@ -33,7 +105,7 @@
 						<view class="text">
 							<text>加热比例</text>
 						</view>
-						<view class="input">
+						<view class="input" @click="inputDialogToggleJRP()">
 							<input style="margin-left: 20rpx;" placeholder="请输入" v-model="formData.JR_P" />
 						</view>
 					</view>
@@ -41,7 +113,7 @@
 						<view class="text">
 							<text>加热积分</text>
 						</view>
-						<view class="input">
+						<view class="input" @click="inputDialogToggleJRI()">
 							<input style="margin-left: 20rpx;" placeholder="请输入" v-model="formData.JR_I" />
 						</view>
 					</view>
@@ -49,7 +121,7 @@
 						<view class="text">
 							<text>降温比例</text>
 						</view>
-						<view class="input">
+						<view class="input" @click="inputDialogToggleZLP()">
 							<input style="margin-left: 20rpx;" placeholder="请输入" v-model="formData.ZL_P" />
 						</view>
 					</view>
@@ -57,7 +129,7 @@
 						<view class="text">
 							<text>降温积分</text>
 						</view>
-						<view class="input">
+						<view class="input" @click="inputDialogToggleZLI()">
 							<input style="margin-left: 20rpx;" placeholder="请输入" v-model="formData.ZL_I" />
 						</view>
 					</view>
@@ -65,7 +137,7 @@
 						<view class="text">
 							<text>加湿比例</text>
 						</view>
-						<view class="input">
+						<view class="input" @click="inputDialogToggleJSP()">
 							<input style="margin-left: 20rpx;" placeholder="请输入" v-model="formData.JS_P" />
 						</view>
 					</view>
@@ -73,7 +145,7 @@
 						<view class="text">
 							<text>加湿积分</text>
 						</view>
-						<view class="input">
+						<view class="input" @click="inputDialogToggleJSI()">
 							<input style="margin-left: 20rpx;" placeholder="请输入" v-model="formData.JS_I" />
 						</view>
 					</view>
@@ -81,7 +153,7 @@
 						<view class="text">
 							<text>除湿比例</text>
 						</view>
-						<view class="input">
+						<view class="input" @click="inputDialogToggleCSP()">
 							<input style="margin-left: 20rpx;" placeholder="请输入" v-model="formData.CS_P" />
 						</view>
 					</view>
@@ -89,13 +161,14 @@
 						<view class="text">
 							<text>除湿积分</text>
 						</view>
-						<view class="input">
+						<view class="input" @click="inputDialogToggleCSI()">
 							<input style="margin-left: 20rpx;" placeholder="请输入" v-model="formData.CS_I" />
 						</view>
 					</view>
 
 					<view class="stopButton">
-						<button class="button" @tap="edit">修改按钮</button>
+						<button class="button" @tap="HFCC()"
+							:class="{'active_button': formData.HF_CC == 1}">恢复出厂设定</button>
 					</view>
 
 				</view>
@@ -131,6 +204,8 @@
 					JS_I: '0.0', //加湿积分时间I
 					WD1_XZ: '0.0', //排风温度修正(单位为℃)
 					SD1_XZ: '0.0', //排风湿度修正(单位为%RH)
+
+					HF_CC: '0', //恢复出厂
 				}
 			}
 		},
@@ -150,18 +225,259 @@
 		},
 
 		methods: {
-			async edit(e) {
+			//修改设置
+			//WDXZ
+			inputDialogToggleWDXZ() {
+				this.$refs.inputDialogWDXZ.open()
+			},
+			async dialogInputConfirmWDXZ(val) {
+				this.formData.WD1_XZ = val;
+				this.updateWDXZ()
+				console.log(this.formData.WD1_XZ);
+			},
+			async updateWDXZ(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.updateParam;
+				let data = {
+					id: "232",
+					sn: "CK1",
+					name: "WD1_XZ",
+					value: this.formData.WD1_XZ
+
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				console.log(res);
+			},
+
+			//SDXZ
+			inputDialogToggleSDXZ() {
+				this.$refs.inputDialogSDXZ.open()
+			},
+			async dialogInputConfirmSDXZ(val) {
+				this.formData.SD1_XZ = val;
+				this.updateSDXZ()
+				console.log(this.formData.SD1_XZ);
+			},
+			async updateSDXZ(e) {
 				let vm = this;
-				let url = uni.$api.deviceParam.update;
+				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					name: this.formData.name,
+					id: "278",
+					sn: "CK1",
+					name: "SD1_XZ",
+					value: this.formData.SD1_XZ
 				};
+
 				let res = await uni.$http.get(url, data);
-			
+
 				console.log(res);
-			
 			},
-			
+
+			//JRP
+			inputDialogToggleJRP() {
+				this.$refs.inputDialogJRP.open()
+			},
+			async dialogInputConfirmJRP(val) {
+				this.formData.JR_P = val;
+				this.updateJRP()
+				console.log(this.formData.JR_P);
+			},
+			async updateJRP(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.updateParam;
+				let data = {
+					id: "224",
+					sn: "CK1",
+					name: "JR_P",
+					value: this.formData.JR_P
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				console.log(res);
+			},
+			//JRI
+			inputDialogToggleJRI() {
+				this.$refs.inputDialogJRI.open()
+			},
+			async dialogInputConfirmJRI(val) {
+				this.formData.JR_I = val;
+				this.updateJRI()
+				console.log(this.formData.JR_I);
+			},
+			async updateJRI(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.updateParam;
+				let data = {
+					id: "218",
+					sn: "CK1",
+					name: "JR_I",
+					value: this.formData.JR_I
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				console.log(res);
+			},
+			//ZLP
+			inputDialogToggleZLP() {
+				this.$refs.inputDialogZLP.open()
+			},
+			async dialogInputConfirmZLP(val) {
+				this.formData.ZL_P = val;
+				this.updateZLP()
+				console.log(this.formData.ZL_P);
+			},
+			async updateZLP(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.updateParam;
+				let data = {
+					id: "267",
+					sn: "CK1",
+					name: "ZL_P",
+					value: this.formData.ZL_P
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				console.log(res);
+			},
+			//ZLI
+			inputDialogToggleZLI() {
+				this.$refs.inputDialogZLI.open()
+			},
+			async dialogInputConfirmZLI(val) {
+				this.formData.ZL_I = val;
+				this.updateZLI()
+				console.log(this.formData.ZL_I);
+			},
+			async updateZLI(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.updateParam;
+				let data = {
+					id: "233",
+					sn: "CK1",
+					name: "ZL_I",
+					value: this.formData.ZL_I
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				console.log(res);
+			},
+			//JSP
+			inputDialogToggleJSP() {
+				this.$refs.inputDialogJSP.open()
+			},
+			async dialogInputConfirmJSP(val) {
+				this.formData.JS_P = val;
+				this.updateJSP()
+				console.log(this.formData.JS_P);
+			},
+			async updateJSP(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.updateParam;
+				let data = {
+					id: "294",
+					sn: "CK1",
+					name: "JS_P",
+					value: this.formData.JS_P
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				console.log(res);
+			},
+			//JSI
+			inputDialogToggleJSI() {
+				this.$refs.inputDialogJSI.open()
+			},
+			async dialogInputConfirmJSI(val) {
+				this.formData.JS_I = val;
+				this.updateJSI()
+				console.log(this.formData.JS_I);
+			},
+			async updateJSI(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.updateParam;
+				let data = {
+					id: "290",
+					sn: "CK1",
+					name: "JS_I",
+					value: this.formData.JS_I
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				console.log(res);
+			},
+
+			//CSP
+			inputDialogToggleCSP() {
+				this.$refs.inputDialogCSP.open()
+			},
+			async dialogInputConfirmCSP(val) {
+				this.formData.CS_P = val;
+				this.updateCSP()
+				console.log(this.formData.CS_P);
+			},
+			async updateCSP(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.updateParam;
+				let data = {
+					id: "237",
+					sn: "CK1",
+					name: "CS_P",
+					value: this.formData.CS_P
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				console.log(res);
+			},
+
+			//CSI
+			inputDialogToggleCSI() {
+				this.$refs.inputDialogCSI.open()
+			},
+			async dialogInputConfirmCSI(val) {
+				this.formData.CS_I = val;
+				this.updateCSI()
+				console.log(this.formData.CS_I);
+			},
+			async updateCSI(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.updateParam;
+				let data = {
+					id: "216",
+					sn: "CK1",
+					name: "CS_I",
+					value: this.formData.CS_I
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				console.log(res);
+			},
+
+			async HFCC(e) {
+				this.formData.HF_CC == 1 ? this.formData.HF_CC = 0 : this.formData.HF_CC = 1;
+
+				let vm = this;
+				let url = uni.$api.deviceParam.updateParam;
+				let data = {
+					id: "234",
+					value: this.formData.HF_CC,
+					name: "HF_CC",
+					sn: "CK1"
+				};
+
+				let res = await uni.$http.get(url, data);
+				console.log(res.data.data.value);
+			},
+
 			back() {
 				uni.navigateTo({
 					url: '/pages/device/deviceInfo/deviceInfo'
@@ -323,6 +639,10 @@
 		flex-wrap: wrap;
 	}
 
+	.active_button {
+		background-color: crimson;
+	}
+
 	.setItem {
 		margin-left: 20rpx;
 	}

sources/client/vrv-moblie/uni_modules/uni-popup/changelog.md

@@ -0,0 +1,60 @@
+## 1.7.9（2022-04-02）
+- 修复 弹出层内部无法滚动的bug
+## 1.7.8（2022-03-28）
+- 修复 小程序中高度错误的bug
+## 1.7.7（2022-03-17）
+- 修复 快速调用open出现问题的Bug
+## 1.7.6（2022-02-14）
+- 修复 safeArea 属性不能设置为false的bug
+## 1.7.5（2022-01-19）
+- 修复 isMaskClick 失效的bug
+## 1.7.4（2022-01-19）
+- 新增 cancelText \ confirmText 属性 ，可自定义文本
+- 新增 maskBackgroundColor 属性 ，可以修改蒙版颜色
+- 优化 maskClick属性 更新为 isMaskClick ，解决微信小程序警告的问题
+## 1.7.3（2022-01-13）
+- 修复 设置 safeArea 属性不生效的bug
+## 1.7.2（2021-11-26）
+- 优化 组件示例
+## 1.7.1（2021-11-26）
+- 修复 vuedoc 文字错误
+## 1.7.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-popup](https://uniapp.dcloud.io/component/uniui/uni-popup)
+## 1.6.2（2021-08-24）
+- 新增 支持国际化
+## 1.6.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.6.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.5.0（2021-06-23）
+- 新增 mask-click 遮罩层点击事件
+## 1.4.5（2021-06-22）
+- 修复 nvue 平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.4（2021-06-18）
+- 修复 H5平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.3（2021-06-08）
+- 修复 错误的 watch 字段
+- 修复 safeArea 属性不生效的问题
+- 修复 点击内容，再点击遮罩无法关闭的Bug
+## 1.4.2（2021-05-12）
+- 新增 组件示例地址
+## 1.4.1（2021-04-29）
+- 修复 组件内放置 input 、textarea 组件，无法聚焦的问题
+## 1.4.0 （2021-04-29）
+- 新增 type 属性的 left\right 值，支持左右弹出
+- 新增 open(String:type) 方法参数 ，可以省略 type 属性 ，直接传入类型打开指定弹窗
+- 新增 backgroundColor 属性，可定义主窗口背景色,默认不显示背景色
+- 新增 safeArea 属性，是否适配底部安全区
+- 修复 App\h5\微信小程序底部安全区占位不对的Bug
+- 修复 App 端弹出等待的Bug
+- 优化 提升低配设备性能，优化动画卡顿问题
+- 优化 更简单的组件自定义方式
+## 1.2.9（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.2.8（2021-02-05）
+- 调整为uni_modules目录规范
+## 1.2.7（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 支持 PC 端
+- 新增 uni-popup-message 、uni-popup-dialog扩展组件支持 PC 端

sources/client/vrv-moblie/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js

@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    this.$once('hook:beforeDestroy', () => {
+      document.removeEventListener('keyup', listener)
+    })
+  },
+	render: () => {}
+}
+// #endif

sources/client/vrv-moblie/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue

@@ -0,0 +1,271 @@
+<template>
+	<view class="uni-popup-dialog">
+		<view class="uni-dialog-title">
+			<text class="uni-dialog-title-text" :class="['uni-popup__'+dialogType]">{{titleText}}</text>
+		</view>
+		<view v-if="mode === 'base'" class="uni-dialog-content">
+			<slot>
+				<text class="uni-dialog-content-text">{{content}}</text>
+			</slot>
+		</view>
+		<view v-else class="uni-dialog-content">
+			<slot>
+				<input class="uni-dialog-input" v-model="val" type="text" :placeholder="placeholderText" :focus="focus" >
+			</slot>
+		</view>
+		<view class="uni-dialog-button-group">
+			<view class="uni-dialog-button" @click="closeDialog">
+				<text class="uni-dialog-button-text">{{closeText}}</text>
+			</view>
+			<view class="uni-dialog-button uni-border-left" @click="onOk">
+				<text class="uni-dialog-button-text uni-button-color">{{okText}}</text>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from '../uni-popup/i18n/index.js'
+	const {	t } = initVueI18n(messages)
+	/**
+	 * PopUp 弹出层-对话框样式
+	 * @description 弹出层-对话框样式
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} value input 模式下的默认值
+	 * @property {String} placeholder input 模式下输入提示
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} mode = [base|input] 模式、
+	 * 	@value base 基础对话框
+	 * 	@value input 可输入对话框
+	 * @property {String} content 对话框内容
+	 * @property {Boolean} beforeClose 是否拦截取消事件
+	 * @event {Function} confirm 点击确认按钮触发
+	 * @event {Function} close 点击取消按钮触发
+	 */
+
+	export default {
+		name: "uniPopupDialog",
+		mixins: [popup],
+		emits:['confirm','close'],
+		props: {
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			placeholder: {
+				type: [String, Number],
+				default: ''
+			},
+			type: {
+				type: String,
+				default: 'error'
+			},
+			mode: {
+				type: String,
+				default: 'base'
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			content: {
+				type: String,
+				default: ''
+			},
+			beforeClose: {
+				type: Boolean,
+				default: false
+			},
+			cancelText:{
+				type: String,
+				default: ''
+			},
+			confirmText:{
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				dialogType: 'error',
+				focus: false,
+				val: ""
+			}
+		},
+		computed: {
+			okText() {
+				return this.confirmText || t("uni-popup.ok")
+			},
+			closeText() {
+				return this.cancelText || t("uni-popup.cancel")
+			},
+			placeholderText() {
+				return this.placeholder || t("uni-popup.placeholder")
+			},
+			titleText() {
+				return this.title || t("uni-popup.title")
+			}
+		},
+		watch: {
+			type(val) {
+				this.dialogType = val
+			},
+			mode(val) {
+				if (val === 'input') {
+					this.dialogType = 'info'
+				}
+			},
+			value(val) {
+				this.val = val
+			}
+		},
+		created() {
+			// 对话框遮罩不可点击
+			this.popup.disableMask()
+			// this.popup.closeMask()
+			if (this.mode === 'input') {
+				this.dialogType = 'info'
+				this.val = this.value
+			} else {
+				this.dialogType = this.type
+			}
+		},
+		mounted() {
+			this.focus = true
+		},
+		methods: {
+			/**
+			 * 点击确认按钮
+			 */
+			onOk() {
+				if (this.mode === 'input'){
+					this.$emit('confirm', this.val)
+				}else{
+					this.$emit('confirm')
+				}
+				if(this.beforeClose) return
+				this.popup.close()
+			},
+			/**
+			 * 点击取消按钮
+			 */
+			closeDialog() {
+				this.$emit('close')
+				if(this.beforeClose) return
+				this.popup.close()
+			},
+			close(){
+				this.popup.close()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-popup-dialog {
+		width: 300px;
+		border-radius: 11px;
+		background-color: #fff;
+	}
+
+	.uni-dialog-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 25px;
+	}
+
+	.uni-dialog-title-text {
+		font-size: 16px;
+		font-weight: 500;
+	}
+
+	.uni-dialog-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		padding: 20px;
+	}
+
+	.uni-dialog-content-text {
+		font-size: 14px;
+		color: #6C6C6C;
+	}
+
+	.uni-dialog-button-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		border-top-color: #f5f5f5;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-dialog-button {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+
+		flex: 1;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 45px;
+	}
+
+	.uni-border-left {
+		border-left-color: #f0f0f0;
+		border-left-style: solid;
+		border-left-width: 1px;
+	}
+
+	.uni-dialog-button-text {
+		font-size: 16px;
+		color: #333;
+	}
+
+	.uni-button-color {
+		color: #007aff;
+	}
+
+	.uni-dialog-input {
+		flex: 1;
+		font-size: 14px;
+		border: 1px #eee solid;
+		height: 40px;
+		padding: 0 10px;
+		border-radius: 5px;
+		color: #555;
+	}
+
+	.uni-popup__success {
+		color: #4cd964;
+	}
+
+	.uni-popup__warn {
+		color: #f0ad4e;
+	}
+
+	.uni-popup__error {
+		color: #dd524d;
+	}
+
+	.uni-popup__info {
+		color: #909399;
+	}
+</style>

sources/client/vrv-moblie/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue

@@ -0,0 +1,143 @@
+<template>
+	<view class="uni-popup-message">
+		<view class="uni-popup-message__box fixforpc-width" :class="'uni-popup__'+type">
+			<slot>
+				<text class="uni-popup-message-text" :class="'uni-popup__'+type+'-text'">{{message}}</text>
+			</slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	/**
+	 * PopUp 弹出层-消息提示
+	 * @description 弹出层-消息提示
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} message 消息提示文字
+	 * @property {String} duration 显示时间，设置为 0 则不会自动关闭
+	 */
+
+	export default {
+		name: 'uniPopupMessage',
+		mixins:[popup],
+		props: {
+			/**
+			 * 主题 success/warning/info/error	  默认 success
+			 */
+			type: {
+				type: String,
+				default: 'success'
+			},
+			/**
+			 * 消息文字
+			 */
+			message: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 显示时间，设置为 0 则不会自动关闭
+			 */
+			duration: {
+				type: Number,
+				default: 3000
+			},
+			maskShow:{
+				type:Boolean,
+				default:false
+			}
+		},
+		data() {
+			return {}
+		},
+		created() {
+			this.popup.maskShow = this.maskShow
+			this.popup.messageChild = this
+		},
+		methods: {
+			timerClose(){
+				if(this.duration === 0) return
+				clearTimeout(this.timer) 
+				this.timer = setTimeout(()=>{
+					this.popup.close()
+				},this.duration)
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-popup-message {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+	}
+
+	.uni-popup-message__box {
+		background-color: #e1f3d8;
+		padding: 10px 15px;
+		border-color: #eee;
+		border-style: solid;
+		border-width: 1px;
+		flex: 1;
+	}
+
+	@media screen and (min-width: 500px) {
+		.fixforpc-width {
+			margin-top: 20px;
+			border-radius: 4px;
+			flex: none;
+			min-width: 380px;
+			/* #ifndef APP-NVUE */
+			max-width: 50%;
+			/* #endif */
+			/* #ifdef APP-NVUE */
+			max-width: 500px;
+			/* #endif */
+		}
+	}
+
+	.uni-popup-message-text {
+		font-size: 14px;
+		padding: 0;
+	}
+
+	.uni-popup__success {
+		background-color: #e1f3d8;
+	}
+
+	.uni-popup__success-text {
+		color: #67C23A;
+	}
+
+	.uni-popup__warn {
+		background-color: #faecd8;
+	}
+
+	.uni-popup__warn-text {
+		color: #E6A23C;
+	}
+
+	.uni-popup__error {
+		background-color: #fde2e2;
+	}
+
+	.uni-popup__error-text {
+		color: #F56C6C;
+	}
+
+	.uni-popup__info {
+		background-color: #F2F6FC;
+	}
+
+	.uni-popup__info-text {
+		color: #909399;
+	}
+</style>

sources/client/vrv-moblie/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue

@@ -0,0 +1,187 @@
+<template>
+	<view class="uni-popup-share">
+		<view class="uni-share-title"><text class="uni-share-title-text">{{shareTitleText}}</text></view>
+		<view class="uni-share-content">
+			<view class="uni-share-content-box">
+				<view class="uni-share-content-item" v-for="(item,index) in bottomData" :key="index" @click.stop="select(item,index)">
+					<image class="uni-share-image" :src="item.icon" mode="aspectFill"></image>
+					<text class="uni-share-text">{{item.text}}</text>
+				</view>
+
+			</view>
+		</view>
+		<view class="uni-share-button-box">
+			<button class="uni-share-button" @click="close">{{cancelText}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from '../uni-popup/i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	export default {
+		name: 'UniPopupShare',
+		mixins:[popup],
+		emits:['select'],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			beforeClose: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				bottomData: [{
+						text: '微信',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/c2b17470-50be-11eb-b680-7980c8a877b8.png',
+						name: 'wx'
+					},
+					{
+						text: '支付宝',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/d684ae40-50be-11eb-8ff1-d5dcf8779628.png',
+						name: 'wx'
+					},
+					{
+						text: 'QQ',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/e7a79520-50be-11eb-b997-9918a5dda011.png',
+						name: 'qq'
+					},
+					{
+						text: '新浪',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/0dacdbe0-50bf-11eb-8ff1-d5dcf8779628.png',
+						name: 'sina'
+					},
+					// {
+					// 	text: '百度',
+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/1ec6e920-50bf-11eb-8a36-ebb87efcf8c0.png',
+					// 	name: 'copy'
+					// },
+					// {
+					// 	text: '其他',
+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/2e0fdfe0-50bf-11eb-b997-9918a5dda011.png',
+					// 	name: 'more'
+					// }
+				]
+			}
+		},
+		created() {},
+		computed: {
+			cancelText() {
+				return t("uni-popup.cancel")
+			},
+		shareTitleText() {
+				return this.title || t("uni-popup.shareTitle")
+			}
+		},
+		methods: {
+			/**
+			 * 选择内容
+			 */
+			select(item, index) {
+				this.$emit('select', {
+					item,
+					index
+				})
+				this.close()
+
+			},
+			/**
+			 * 关闭窗口
+			 */
+			close() {
+				if(this.beforeClose) return
+				this.popup.close()
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-popup-share {
+		background-color: #fff;
+		border-top-left-radius: 11px;
+		border-top-right-radius: 11px;
+	}
+	.uni-share-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		height: 40px;
+	}
+	.uni-share-title-text {
+		font-size: 14px;
+		color: #666;
+	}
+	.uni-share-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 10px;
+	}
+
+	.uni-share-content-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: wrap;
+		width: 360px;
+	}
+
+	.uni-share-content-item {
+		width: 90px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		padding: 10px 0;
+		align-items: center;
+	}
+
+	.uni-share-content-item:active {
+		background-color: #f5f5f5;
+	}
+
+	.uni-share-image {
+		width: 30px;
+		height: 30px;
+	}
+
+	.uni-share-text {
+		margin-top: 10px;
+		font-size: 14px;
+		color: #3B4144;
+	}
+
+	.uni-share-button-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		padding: 10px 15px;
+	}
+
+	.uni-share-button {
+		flex: 1;
+		border-radius: 50px;
+		color: #666;
+		font-size: 16px;
+	}
+
+	.uni-share-button::after {
+		border-radius: 50px;
+	}
+</style>

sources/client/vrv-moblie/uni_modules/uni-popup/components/uni-popup/i18n/en.json

@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "cancel",
+	"uni-popup.ok": "ok",
+	"uni-popup.placeholder": "pleace enter",
+	"uni-popup.title": "Hint",
+	"uni-popup.shareTitle": "Share to"
+}

sources/client/vrv-moblie/uni_modules/uni-popup/components/uni-popup/i18n/index.js

@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}

sources/client/vrv-moblie/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json

@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "取消",
+	"uni-popup.ok": "确定",
+	"uni-popup.placeholder": "请输入",
+		"uni-popup.title": "提示",
+		"uni-popup.shareTitle": "分享到"
+}

sources/client/vrv-moblie/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json

@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "取消",
+	"uni-popup.ok": "確定",
+	"uni-popup.placeholder": "請輸入",
+	"uni-popup.title": "提示",
+	"uni-popup.shareTitle": "分享到"
+}

sources/client/vrv-moblie/uni_modules/uni-popup/components/uni-popup/keypress.js

@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    // this.$once('hook:beforeDestroy', () => {
+    //   document.removeEventListener('keyup', listener)
+    // })
+  },
+	render: () => {}
+}
+// #endif

sources/client/vrv-moblie/uni_modules/uni-popup/components/uni-popup/popup.js

@@ -0,0 +1,26 @@
+
+export default {
+	data() {
+		return {
+			
+		}
+	},
+	created(){
+		this.popup = this.getParent()
+	},
+	methods:{
+		/**
+		 * 获取父元素实例
+		 */
+		getParent(name = 'uniPopup') {
+			let parent = this.$parent;
+			let parentName = parent.$options.name;
+			while (parentName !== name) {
+				parent = parent.$parent;
+				if (!parent) return false
+				parentName = parent.$options.name;
+			}
+			return parent;
+		},
+	}
+}

sources/client/vrv-moblie/uni_modules/uni-popup/components/uni-popup/uni-popup.vue

@@ -0,0 +1,474 @@
+<template>
+	<view v-if="showPopup" class="uni-popup" :class="[popupstyle, isDesktop ? 'fixforpc-z-index' : '']">
+		<view @touchstart="touchstart">
+			<uni-transition key="1" v-if="maskShow" name="mask" mode-class="fade" :styles="maskClass"
+				:duration="duration" :show="showTrans" @click="onTap" />
+			<uni-transition key="2" :mode-class="ani" name="content" :styles="transClass" :duration="duration"
+				:show="showTrans" @click="onTap">
+				<view class="uni-popup__wrapper" :style="{ backgroundColor: bg }" :class="[popupstyle]" @click="clear">
+					<slot />
+				</view>
+			</uni-transition>
+		</view>
+		<!-- #ifdef H5 -->
+		<keypress v-if="maskShow" @esc="onTap" />
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	// #ifdef H5
+	import keypress from './keypress.js'
+	// #endif
+
+	/**
+	 * PopUp 弹出层
+	 * @description 弹出层组件，为了解决遮罩弹层的问题
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [top|center|bottom|left|right|message|dialog|share] 弹出方式
+	 * 	@value top 顶部弹出
+	 * 	@value center 中间弹出
+	 * 	@value bottom 底部弹出
+	 * 	@value left		左侧弹出
+	 * 	@value right  右侧弹出
+	 * 	@value message 消息提示
+	 * 	@value dialog 对话框
+	 * 	@value share 底部分享示例
+	 * @property {Boolean} animation = [true|false] 是否开启动画
+	 * @property {Boolean} maskClick = [true|false] 蒙版点击是否关闭弹窗(废弃)
+	 * @property {Boolean} isMaskClick = [true|false] 蒙版点击是否关闭弹窗
+	 * @property {String}  backgroundColor 主窗口背景色
+	 * @property {String}  maskBackgroundColor 蒙版颜色
+	 * @property {Boolean} safeArea		   是否适配底部安全区
+	 * @event {Function} change 打开关闭弹窗触发，e={show: false}
+	 * @event {Function} maskClick 点击遮罩触发
+	 */
+
+	export default {
+		name: 'uniPopup',
+		components: {
+			// #ifdef H5
+			keypress
+			// #endif
+		},
+		emits: ['change', 'maskClick'],
+		props: {
+			// 开启动画
+			animation: {
+				type: Boolean,
+				default: true
+			},
+			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+			// message: 消息提示 ; dialog : 对话框
+			type: {
+				type: String,
+				default: 'center'
+			},
+			// maskClick
+			isMaskClick: {
+				type: Boolean,
+				default: null
+			},
+			// TODO 2 个版本后废弃属性 ，使用 isMaskClick
+			maskClick: {
+				type: Boolean,
+				default: null
+			},
+			backgroundColor: {
+				type: String,
+				default: 'none'
+			},
+			safeArea: {
+				type: Boolean,
+				default: true
+			},
+			maskBackgroundColor: {
+				type: String,
+				default: 'rgba(0, 0, 0, 0.4)'
+			},
+		},
+
+		watch: {
+			/**
+			 * 监听type类型
+			 */
+			type: {
+				handler: function(type) {
+					if (!this.config[type]) return
+					this[this.config[type]](true)
+				},
+				immediate: true
+			},
+			isDesktop: {
+				handler: function(newVal) {
+					if (!this.config[newVal]) return
+					this[this.config[this.type]](true)
+				},
+				immediate: true
+			},
+			/**
+			 * 监听遮罩是否可点击
+			 * @param {Object} val
+			 */
+			maskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			isMaskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			// H5 下禁止底部滚动
+			showPopup(show) {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible'
+				// #endif
+			}
+		},
+		data() {
+			return {
+				duration: 300,
+				ani: [],
+				showPopup: false,
+				showTrans: false,
+				popupWidth: 0,
+				popupHeight: 0,
+				config: {
+					top: 'top',
+					bottom: 'bottom',
+					center: 'center',
+					left: 'left',
+					right: 'right',
+					message: 'top',
+					dialog: 'center',
+					share: 'bottom'
+				},
+				maskClass: {
+					position: 'fixed',
+					bottom: 0,
+					top: 0,
+					left: 0,
+					right: 0,
+					backgroundColor: 'rgba(0, 0, 0, 0.4)'
+				},
+				transClass: {
+					position: 'fixed',
+					left: 0,
+					right: 0
+				},
+				maskShow: true,
+				mkclick: true,
+				popupstyle: this.isDesktop ? 'fixforpc-top' : 'top'
+			}
+		},
+		computed: {
+			isDesktop() {
+				return this.popupWidth >= 500 && this.popupHeight >= 500
+			},
+			bg() {
+				if (this.backgroundColor === '' || this.backgroundColor === 'none') {
+					return 'transparent'
+				}
+				return this.backgroundColor
+			}
+		},
+		mounted() {
+			const fixSize = () => {
+				const {
+					windowWidth,
+					windowHeight,
+					windowTop,
+					safeArea,
+					screenHeight,
+					safeAreaInsets
+				} = uni.getSystemInfoSync()
+				this.popupWidth = windowWidth
+				this.popupHeight = windowHeight + (windowTop || 0)
+				// TODO fix by mehaotian 是否适配底部安全区 ,目前微信ios 、和 app ios 计算有差异，需要框架修复
+				if (safeArea && this.safeArea) {
+					// #ifdef MP-WEIXIN
+					this.safeAreaInsets = screenHeight - safeArea.bottom
+					// #endif
+					// #ifndef MP-WEIXIN
+					this.safeAreaInsets = safeAreaInsets.bottom
+					// #endif
+				} else {
+					this.safeAreaInsets = 0
+				}
+			}
+			fixSize()
+			// #ifdef H5
+			// window.addEventListener('resize', fixSize)
+			// this.$once('hook:beforeDestroy', () => {
+			// 	window.removeEventListener('resize', fixSize)
+			// })
+			// #endif
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			this.setH5Visible()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.setH5Visible()
+		},
+		// #endif
+		created() {
+			// this.mkclick =  this.isMaskClick || this.maskClick
+			if (this.isMaskClick === null && this.maskClick === null) {
+				this.mkclick = true
+			} else {
+				this.mkclick = this.isMaskClick !== null ? this.isMaskClick : this.maskClick
+			}
+			if (this.animation) {
+				this.duration = 300
+			} else {
+				this.duration = 0
+			}
+			// TODO 处理 message 组件生命周期异常的问题
+			this.messageChild = null
+			// TODO 解决头条冒泡的问题
+			this.clearPropagation = false
+			this.maskClass.backgroundColor = this.maskBackgroundColor
+		},
+		methods: {
+			setH5Visible() {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = 'visible'
+				// #endif
+			},
+			/**
+			 * 公用方法，不显示遮罩层
+			 */
+			closeMask() {
+				this.maskShow = false
+			},
+			/**
+			 * 公用方法，遮罩层禁止点击
+			 */
+			disableMask() {
+				this.mkclick = false
+			},
+			// TODO nvue 取消冒泡
+			clear(e) {
+				// #ifndef APP-NVUE
+				e.stopPropagation()
+				// #endif
+				this.clearPropagation = true
+			},
+
+			open(direction) {
+				// fix by mehaotian 处理快速打开关闭的情况
+				if (this.showPopup) {
+					clearTimeout(this.timer)
+					this.showPopup = false
+				}
+				let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']
+				if (!(direction && innerType.indexOf(direction) !== -1)) {
+					direction = this.type
+				}
+				if (!this.config[direction]) {
+					console.error('缺少类型：', direction)
+					return
+				}
+				this[this.config[direction]]()
+				this.$emit('change', {
+					show: true,
+					type: direction
+				})
+			},
+			close(type) {
+				this.showTrans = false
+				this.$emit('change', {
+					show: false,
+					type: this.type
+				})
+				clearTimeout(this.timer)
+				// // 自定义关闭事件
+				// this.customOpen && this.customClose()
+				this.timer = setTimeout(() => {
+					this.showPopup = false
+				}, 300)
+			},
+			// TODO 处理冒泡事件，头条的冒泡事件有问题 ，先这样兼容
+			touchstart() {
+				this.clearPropagation = false
+			},
+
+			onTap() {
+				if (this.clearPropagation) {
+					// fix by mehaotian 兼容 nvue
+					this.clearPropagation = false
+					return
+				}
+				this.$emit('maskClick')
+				if (!this.mkclick) return
+				this.close()
+			},
+			/**
+			 * 顶部弹出样式处理
+			 */
+			top(type) {
+				this.popupstyle = this.isDesktop ? 'fixforpc-top' : 'top'
+				this.ani = ['slide-top']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					backgroundColor: this.bg
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+				this.$nextTick(() => {
+					if (this.messageChild && this.type === 'message') {
+						this.messageChild.timerClose()
+					}
+				})
+			},
+			/**
+			 * 底部弹出样式处理
+			 */
+			bottom(type) {
+				this.popupstyle = 'bottom'
+				this.ani = ['slide-bottom']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					bottom: 0,
+					paddingBottom: this.safeAreaInsets + 'px',
+					backgroundColor: this.bg
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			/**
+			 * 中间弹出样式处理
+			 */
+			center(type) {
+				this.popupstyle = 'center'
+				this.ani = ['zoom-out', 'fade']
+				this.transClass = {
+					position: 'fixed',
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column',
+					/* #endif */
+					bottom: 0,
+					left: 0,
+					right: 0,
+					top: 0,
+					justifyContent: 'center',
+					alignItems: 'center'
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			left(type) {
+				this.popupstyle = 'left'
+				this.ani = ['slide-left']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					bottom: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			right(type) {
+				this.popupstyle = 'right'
+				this.ani = ['slide-right']
+				this.transClass = {
+					position: 'fixed',
+					bottom: 0,
+					right: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	.uni-popup {
+		position: fixed;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+
+		/* #endif */
+		&.top,
+		&.left,
+		&.right {
+			/* #ifdef H5 */
+			top: var(--window-top);
+			/* #endif */
+			/* #ifndef H5 */
+			top: 0;
+			/* #endif */
+		}
+
+		.uni-popup__wrapper {
+			/* #ifndef APP-NVUE */
+			display: block;
+			/* #endif */
+			position: relative;
+
+			/* iphonex 等安全区设置，底部安全区适配 */
+			/* #ifndef APP-NVUE */
+			// padding-bottom: constant(safe-area-inset-bottom);
+			// padding-bottom: env(safe-area-inset-bottom);
+			/* #endif */
+			&.left,
+			&.right {
+				/* #ifdef H5 */
+				padding-top: var(--window-top);
+				/* #endif */
+				/* #ifndef H5 */
+				padding-top: 0;
+				/* #endif */
+				flex: 1;
+			}
+		}
+	}
+
+	.fixforpc-z-index {
+		/* #ifndef APP-NVUE */
+		z-index: 999;
+		/* #endif */
+	}
+
+	.fixforpc-top {
+		top: 0;
+	}
+</style>

sources/client/vrv-moblie/uni_modules/uni-popup/package.json

@@ -0,0 +1,90 @@
+{
+	"id": "uni-popup",
+	"displayName": "uni-popup 弹出层",
+	"version": "1.7.9",
+	"description": " Popup 组件，提供常用的弹层",
+	"keywords": [
+        "uni-ui",
+        "弹出层",
+        "弹窗",
+        "popup",
+        "弹框"
+    ],
+	"repository": "https://github.com/dcloudio/uni-ui",
+	"engines": {
+		"HBuilderX": ""
+	},
+	"directories": {
+		"example": "../../temps/example_temps"
+	},
+	"dcloudext": {
+		"category": [
+			"前端组件",
+			"通用组件"
+		],
+		"sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+		"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+	},
+	"uni_modules": {
+		"dependencies": [
+			"uni-scss",
+			"uni-transition"
+		],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"App": {
+					"app-vue": "y",
+					"app-nvue": "y"
+				},
+				"H5-mobile": {
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
+				},
+				"H5-pc": {
+					"Chrome": "y",
+					"IE": "y",
+					"Edge": "y",
+					"Firefox": "y",
+					"Safari": "y"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "y",
+					"百度": "y",
+					"字节跳动": "y",
+					"QQ": "y"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+                },
+                "Vue": {
+                    "vue2": "y",
+                    "vue3": "y"
+                }
+			}
+		}
+	}
+}

sources/client/vrv-moblie/uni_modules/uni-popup/readme.md

@@ -0,0 +1,17 @@
+
+
+## Popup 弹出层
+> **组件名：uni-popup**
+> 代码块： `uPopup`
+> 关联组件：`uni-transition`
+
+
+弹出层组件，在应用中弹出一个消息提示窗口、提示框等
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-popup)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
+
+
+

sources/client/vrv-moblie/uni_modules/uni-transition/changelog.md

@@ -0,0 +1,20 @@
+## 1.3.1（2021-11-23）
+- 修复 init 方法初始化问题
+## 1.3.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-transition](https://uniapp.dcloud.io/component/uniui/uni-transition)
+## 1.2.1（2021-09-27）
+- 修复 init 方法不生效的 Bug
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.1（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的 Bug
+## 1.1.0（2021-04-22）
+- 新增 通过方法自定义动画
+- 新增 custom-class 非 NVUE 平台支持自定义 class 定制样式
+- 优化 动画触发逻辑，使动画更流畅
+- 优化 支持单独的动画类型
+- 优化 文档示例
+## 1.0.2（2021-02-05）
+- 调整为 uni_modules 目录规范

sources/client/vrv-moblie/uni_modules/uni-transition/components/uni-transition/createAnimation.js

@@ -0,0 +1,128 @@
+// const defaultOption = {
+// 	duration: 300,
+// 	timingFunction: 'linear',
+// 	delay: 0,
+// 	transformOrigin: '50% 50% 0'
+// }
+// #ifdef APP-NVUE
+const nvueAnimation = uni.requireNativePlugin('animation')
+// #endif
+class MPAnimation {
+	constructor(options, _this) {
+		this.options = options
+		this.animation = uni.createAnimation(options)
+		this.currentStepAnimates = {}
+		this.next = 0
+		this.$ = _this
+
+	}
+
+	_nvuePushAnimates(type, args) {
+		let aniObj = this.currentStepAnimates[this.next]
+		let styles = {}
+		if (!aniObj) {
+			styles = {
+				styles: {},
+				config: {}
+			}
+		} else {
+			styles = aniObj
+		}
+		if (animateTypes1.includes(type)) {
+			if (!styles.styles.transform) {
+				styles.styles.transform = ''
+			}
+			let unit = ''
+			if(type === 'rotate'){
+				unit = 'deg'
+			}
+			styles.styles.transform += `${type}(${args+unit}) `
+		} else {
+			styles.styles[type] = `${args}`
+		}
+		this.currentStepAnimates[this.next] = styles
+	}
+	_animateRun(styles = {}, config = {}) {
+		let ref = this.$.$refs['ani'].ref
+		if (!ref) return
+		return new Promise((resolve, reject) => {
+			nvueAnimation.transition(ref, {
+				styles,
+				...config
+			}, res => {
+				resolve()
+			})
+		})
+	}
+
+	_nvueNextAnimate(animates, step = 0, fn) {
+		let obj = animates[step]
+		if (obj) {
+			let {
+				styles,
+				config
+			} = obj
+			this._animateRun(styles, config).then(() => {
+				step += 1
+				this._nvueNextAnimate(animates, step, fn)
+			})
+		} else {
+			this.currentStepAnimates = {}
+			typeof fn === 'function' && fn()
+			this.isEnd = true
+		}
+	}
+
+	step(config = {}) {
+		// #ifndef APP-NVUE
+		this.animation.step(config)
+		// #endif
+		// #ifdef APP-NVUE
+		this.currentStepAnimates[this.next].config = Object.assign({}, this.options, config)
+		this.currentStepAnimates[this.next].styles.transformOrigin = this.currentStepAnimates[this.next].config.transformOrigin
+		this.next++
+		// #endif
+		return this
+	}
+
+	run(fn) {
+		// #ifndef APP-NVUE
+		this.$.animationData = this.animation.export()
+		this.$.timer = setTimeout(() => {
+			typeof fn === 'function' && fn()
+		}, this.$.durationTime)
+		// #endif
+		// #ifdef APP-NVUE
+		this.isEnd = false
+		let ref = this.$.$refs['ani'] && this.$.$refs['ani'].ref
+		if(!ref) return
+		this._nvueNextAnimate(this.currentStepAnimates, 0, fn)
+		this.next = 0
+		// #endif
+	}
+}
+
+
+const animateTypes1 = ['matrix', 'matrix3d', 'rotate', 'rotate3d', 'rotateX', 'rotateY', 'rotateZ', 'scale', 'scale3d',
+	'scaleX', 'scaleY', 'scaleZ', 'skew', 'skewX', 'skewY', 'translate', 'translate3d', 'translateX', 'translateY',
+	'translateZ'
+]
+const animateTypes2 = ['opacity', 'backgroundColor']
+const animateTypes3 = ['width', 'height', 'left', 'right', 'top', 'bottom']
+animateTypes1.concat(animateTypes2, animateTypes3).forEach(type => {
+	MPAnimation.prototype[type] = function(...args) {
+		// #ifndef APP-NVUE
+		this.animation[type](...args)
+		// #endif
+		// #ifdef APP-NVUE
+		this._nvuePushAnimates(type, args)
+		// #endif
+		return this
+	}
+})
+
+export function createAnimation(option, _this) {
+	if(!_this) return
+	clearTimeout(_this.timer)
+	return new MPAnimation(option, _this)
+}

sources/client/vrv-moblie/uni_modules/uni-transition/components/uni-transition/uni-transition.vue

@@ -0,0 +1,277 @@
+<template>
+	<view v-if="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
+</template>
+
+<script>
+import { createAnimation } from './createAnimation'
+
+/**
+ * Transition 过渡动画
+ * @description 简单过渡动画组件
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=985
+ * @property {Boolean} show = [false|true] 控制组件显示或隐藏
+ * @property {Array|String} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
+ *  @value fade 渐隐渐出过渡
+ *  @value slide-top 由上至下过渡
+ *  @value slide-right 由右至左过渡
+ *  @value slide-bottom 由下至上过渡
+ *  @value slide-left 由左至右过渡
+ *  @value zoom-in 由小到大过渡
+ *  @value zoom-out 由大到小过渡
+ * @property {Number} duration 过渡动画持续时间
+ * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
+ */
+export default {
+	name: 'uniTransition',
+	emits:['click','change'],
+	props: {
+		show: {
+			type: Boolean,
+			default: false
+		},
+		modeClass: {
+			type: [Array, String],
+			default() {
+				return 'fade'
+			}
+		},
+		duration: {
+			type: Number,
+			default: 300
+		},
+		styles: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+		customClass:{
+			type: String,
+			default: ''
+		}
+	},
+	data() {
+		return {
+			isShow: false,
+			transform: '',
+			opacity: 1,
+			animationData: {},
+			durationTime: 300,
+			config: {}
+		}
+	},
+	watch: {
+		show: {
+			handler(newVal) {
+				if (newVal) {
+					this.open()
+				} else {
+					// 避免上来就执行 close,导致动画错乱
+					if (this.isShow) {
+						this.close()
+					}
+				}
+			},
+			immediate: true
+		}
+	},
+	computed: {
+		// 生成样式数据
+		stylesObject() {
+			let styles = {
+				...this.styles,
+				'transition-duration': this.duration / 1000 + 's'
+			}
+			let transform = ''
+			for (let i in styles) {
+				let line = this.toLine(i)
+				transform += line + ':' + styles[i] + ';'
+			}
+			return transform
+		},
+		// 初始化动画条件
+		transformStyles() {
+			return 'transform:' + this.transform + ';' + 'opacity:' + this.opacity + ';' + this.stylesObject
+		}
+	},
+	created() {
+		// 动画默认配置
+		this.config = {
+			duration: this.duration,
+			timingFunction: 'ease',
+			transformOrigin: '50% 50%',
+			delay: 0
+		}
+		this.durationTime = this.duration
+	},
+	methods: {
+		/**
+		 *  ref 触发 初始化动画
+		 */
+		init(obj = {}) {
+			if (obj.duration) {
+				this.durationTime = obj.duration
+			}
+			this.animation = createAnimation(Object.assign(this.config, obj),this)
+		},
+		/**
+		 * 点击组件触发回调
+		 */
+		onClick() {
+			this.$emit('click', {
+				detail: this.isShow
+			})
+		},
+		/**
+		 * ref 触发 动画分组
+		 * @param {Object} obj
+		 */
+		step(obj, config = {}) {
+			if (!this.animation) return
+			for (let i in obj) {
+				try {
+					if(typeof obj[i] === 'object'){
+						this.animation[i](...obj[i])
+					}else{
+						this.animation[i](obj[i])
+					}
+				} catch (e) {
+					console.error(`方法 ${i} 不存在`)
+				}
+			}
+			this.animation.step(config)
+			return this
+		},
+		/**
+		 *  ref 触发 执行动画
+		 */
+		run(fn) {
+			if (!this.animation) return
+			this.animation.run(fn)
+		},
+		// 开始过度动画
+		open() {
+			clearTimeout(this.timer)
+			this.transform = ''
+			this.isShow = true
+			let { opacity, transform } = this.styleInit(false)
+			if (typeof opacity !== 'undefined') {
+				this.opacity = opacity
+			}
+			this.transform = transform
+			// 确保动态样式已经生效后，执行动画，如果不加 nextTick ，会导致 wx 动画执行异常
+			this.$nextTick(() => {
+				// TODO 定时器保证动画完全执行，目前有些问题，后面会取消定时器
+				this.timer = setTimeout(() => {
+					this.animation = createAnimation(this.config, this)
+					this.tranfromInit(false).step()
+					this.animation.run()
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				}, 20)
+			})
+		},
+		// 关闭过度动画
+		close(type) {
+			if (!this.animation) return
+			this.tranfromInit(true)
+				.step()
+				.run(() => {
+					this.isShow = false
+					this.animationData = null
+					this.animation = null
+					let { opacity, transform } = this.styleInit(false)
+					this.opacity = opacity || 1
+					this.transform = transform
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				})
+		},
+		// 处理动画开始前的默认样式
+		styleInit(type) {
+			let styles = {
+				transform: ''
+			}
+			let buildStyle = (type, mode) => {
+				if (mode === 'fade') {
+					styles.opacity = this.animationType(type)[mode]
+				} else {
+					styles.transform += this.animationType(type)[mode] + ' '
+				}
+			}
+			if (typeof this.modeClass === 'string') {
+				buildStyle(type, this.modeClass)
+			} else {
+				this.modeClass.forEach(mode => {
+					buildStyle(type, mode)
+				})
+			}
+			return styles
+		},
+		// 处理内置组合动画
+		tranfromInit(type) {
+			let buildTranfrom = (type, mode) => {
+				let aniNum = null
+				if (mode === 'fade') {
+					aniNum = type ? 0 : 1
+				} else {
+					aniNum = type ? '-100%' : '0'
+					if (mode === 'zoom-in') {
+						aniNum = type ? 0.8 : 1
+					}
+					if (mode === 'zoom-out') {
+						aniNum = type ? 1.2 : 1
+					}
+					if (mode === 'slide-right') {
+						aniNum = type ? '100%' : '0'
+					}
+					if (mode === 'slide-bottom') {
+						aniNum = type ? '100%' : '0'
+					}
+				}
+				this.animation[this.animationMode()[mode]](aniNum)
+			}
+			if (typeof this.modeClass === 'string') {
+				buildTranfrom(type, this.modeClass)
+			} else {
+				this.modeClass.forEach(mode => {
+					buildTranfrom(type, mode)
+				})
+			}
+
+			return this.animation
+		},
+		animationType(type) {
+			return {
+				fade: type ? 1 : 0,
+				'slide-top': `translateY(${type ? '0' : '-100%'})`,
+				'slide-right': `translateX(${type ? '0' : '100%'})`,
+				'slide-bottom': `translateY(${type ? '0' : '100%'})`,
+				'slide-left': `translateX(${type ? '0' : '-100%'})`,
+				'zoom-in': `scaleX(${type ? 1 : 0.8}) scaleY(${type ? 1 : 0.8})`,
+				'zoom-out': `scaleX(${type ? 1 : 1.2}) scaleY(${type ? 1 : 1.2})`
+			}
+		},
+		// 内置动画类型与实际动画对应字典
+		animationMode() {
+			return {
+				fade: 'opacity',
+				'slide-top': 'translateY',
+				'slide-right': 'translateX',
+				'slide-bottom': 'translateY',
+				'slide-left': 'translateX',
+				'zoom-in': 'scale',
+				'zoom-out': 'scale'
+			}
+		},
+		// 驼峰转中横线
+		toLine(name) {
+			return name.replace(/([A-Z])/g, '-$1').toLowerCase()
+		}
+	}
+}
+</script>
+
+<style></style>

sources/client/vrv-moblie/uni_modules/uni-transition/package.json

@@ -0,0 +1,87 @@
+{
+  "id": "uni-transition",
+  "displayName": "uni-transition 过渡动画",
+  "version": "1.3.1",
+  "description": "元素的简单过渡动画",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "动画",
+    "过渡",
+    "过渡动画"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

sources/client/vrv-moblie/uni_modules/uni-transition/readme.md

@@ -0,0 +1,11 @@
+
+
+## Transition 过渡动画
+> **组件名：uni-transition**
+> 代码块： `uTransition`
+
+
+元素过渡动画
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-transition)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/parameterSetting/parameterSetting.json

@@ -1,5 +1,8 @@
 {
   "navigationBarTitleText": "参数设置",
   "enablePullDownRefresh": false,
-  "usingComponents": {}
+  "usingComponents": {
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup",
+    "uni-popup-dialog": "/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog"
+  }
 }

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/parameterSetting/parameterSetting.wxss

@@ -6,8 +6,8 @@
 	margin-right: 10rpx;
 }
 .four1 {
-	margin-right: 60rpx;
-	margin-left: 40rpx;
+	margin-right: 30rpx;
+	margin-left: 30rpx;
 }
 .four {
 	margin-right: 60rpx;
@@ -88,16 +88,17 @@
 	margin-top: 24rpx;
 	background-color: white;
 	width: 702rpx;
-	height: 1420rpx;
+	height: 1520rpx;
 	border-radius: 10rpx;
 }
 .buttonItem {
 	display: flex;
 	flex-direction: row;
 	margin-top: 5rpx;
+	justify-content: center;
 }
 .button {
-	width: 320rpx;
+	width: 208rpx;
 	height: 98rpx;
 	margin-top: 20rpx;
 	background-color: #007AFF;
@@ -163,4 +164,7 @@
 	font-weight: 550;
 	margin-top: 40rpx;
 }
+.active_button {
+	background-color: skyblue;
+}
 

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/project/projectInfo/projectInfo.js

@@ -280,12 +280,30 @@ var _default =
     });
   },
   methods: {
+    changeStatus: function changeStatus(item) {var _this2 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee() {var vm, url, data, res;return _regenerator.default.wrap(function _callee$(_context) {while (1) {switch (_context.prev = _context.next) {case 0:
+
+                item.useStatus == 1 ? item.useStatus = 0 : item.useStatus = 1;
+                console.log(item.useStatus);
+
+                vm = _this2;
+                url = uni.$api.gateway.update;
+                data = {
+                  code: item.code,
+                  useStatus: item.useStatus,
+                  ip: item.ip,
+                  location: item.location,
+                  number: item.number,
+                  operatorNumber: item.operatorNumber,
+                  projectNumber: item.projectNumber };_context.next = 7;return (
+
+
+
+                  uni.$http.get(url, data));case 7:res = _context.sent;
+                console.log(res);case 9:case "end":return _context.stop();}}}, _callee);}))();
+
+    },
     switchChange: function switchChange(e) {
-      console.log(e.detail.value);
 
-      if (e.detail.value == true) {
-      } else {
-      }
     },
 
     showEdit: function showEdit(e) {
@@ -297,33 +315,33 @@ var _default =
 
     },
 
-    del: function del(e) {var _this2 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee2() {var vm, url, data;return _regenerator.default.wrap(function _callee2$(_context2) {while (1) {switch (_context2.prev = _context2.next) {case 0:
-                vm = _this2;
+    del: function del(e) {var _this3 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee3() {var vm, url, data;return _regenerator.default.wrap(function _callee3$(_context3) {while (1) {switch (_context3.prev = _context3.next) {case 0:
+                vm = _this3;
                 url = uni.$api.project.delete;
                 data = {
-                  code: _this2.formData.code };
+                  code: _this3.formData.code };
 
 
                 uni.showModal({
                   title: '提示',
                   content: '确认删除此信息？',
-                  success: function success(e) {return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee() {var res;return _regenerator.default.wrap(function _callee$(_context) {while (1) {switch (_context.prev = _context.next) {case 0:
+                  success: function success(e) {return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee2() {var res;return _regenerator.default.wrap(function _callee2$(_context2) {while (1) {switch (_context2.prev = _context2.next) {case 0:
                               console.log(e);if (!
-                              e.confirm) {_context.next = 9;break;}_context.next = 4;return (
+                              e.confirm) {_context2.next = 9;break;}_context2.next = 4;return (
 
-                                uni.$http.get(url, data));case 4:res = _context.sent;
+                                uni.$http.get(url, data));case 4:res = _context2.sent;
 
                               //让返回的页面刷新
                               uni.$emit('flush');
 
                               uni.switchTab({
-                                url: '/pages/project/project' });_context.next = 9;break;case 9:case "end":return _context.stop();}}}, _callee);}))();
+                                url: '/pages/project/project' });_context2.next = 9;break;case 9:case "end":return _context2.stop();}}}, _callee2);}))();
 
 
 
 
 
-                  } });case 4:case "end":return _context2.stop();}}}, _callee2);}))();
+                  } });case 4:case "end":return _context3.stop();}}}, _callee3);}))();
 
     },
 

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/runningState/runningState.js

@@ -604,9 +604,6 @@ var _default =
 
                   uni.$http.get(url, data));case 6:res = _context22.sent;
                 console.log(res.data.data.value);case 8:case "end":return _context22.stop();}}}, _callee22);}))();
-
-
-
     } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/systemParameter/systemParameter.js

@@ -95,6 +95,32 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return recyclableRender; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "components", function() { return components; });
 var components
+try {
+  components = {
+    uniPopup: function() {
+      return __webpack_require__.e(/*! import() | uni_modules/uni-popup/components/uni-popup/uni-popup */ "uni_modules/uni-popup/components/uni-popup/uni-popup").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 200))
+    },
+    uniPopupDialog: function() {
+      return Promise.all(/*! import() | uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue */ 207))
+    }
+  }
+} catch (e) {
+  if (
+    e.message.indexOf("Cannot find module") !== -1 &&
+    e.message.indexOf(".vue") !== -1
+  ) {
+    console.error(e.message)
+    console.error("1. 排查组件名称拼写是否正确")
+    console.error(
+      "2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"
+    )
+    console.error(
+      "3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件"
+    )
+  } else {
+    throw e
+  }
+}
 var render = function() {
   var _vm = this
   var _h = _vm.$createElement
@@ -250,6 +276,79 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default =
 {
   data: function data() {
@@ -264,7 +363,9 @@ var _default =
         JS_P: '0.0', //加湿回路增益P
         JS_I: '0.0', //加湿积分时间I
         WD1_XZ: '0.0', //排风温度修正(单位为℃)
-        SD1_XZ: '0.0' //排风湿度修正(单位为%RH)
+        SD1_XZ: '0.0', //排风湿度修正(单位为%RH)
+
+        HF_CC: '0' //恢复出厂
       } };
 
   },
@@ -284,16 +385,257 @@ var _default =
   },
 
   methods: {
-    edit: function edit(e) {var _this = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee() {var vm, url, data, res;return _regenerator.default.wrap(function _callee$(_context) {while (1) {switch (_context.prev = _context.next) {case 0:
-                vm = _this;
-                url = uni.$api.deviceParam.update;
+    //修改设置
+    //WDXZ
+    inputDialogToggleWDXZ: function inputDialogToggleWDXZ() {
+      this.$refs.inputDialogWDXZ.open();
+    },
+    dialogInputConfirmWDXZ: function dialogInputConfirmWDXZ(val) {var _this = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee() {return _regenerator.default.wrap(function _callee$(_context) {while (1) {switch (_context.prev = _context.next) {case 0:
+                _this.formData.WD1_XZ = val;
+                _this.updateWDXZ();
+                console.log(_this.formData.WD1_XZ);case 3:case "end":return _context.stop();}}}, _callee);}))();
+    },
+    updateWDXZ: function updateWDXZ(e) {var _this2 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee2() {var vm, url, data, res;return _regenerator.default.wrap(function _callee2$(_context2) {while (1) {switch (_context2.prev = _context2.next) {case 0:
+                vm = _this2;
+                url = uni.$api.deviceParam.updateParam;
+                data = {
+                  id: "232",
+                  sn: "CK1",
+                  name: "WD1_XZ",
+                  value: _this2.formData.WD1_XZ };_context2.next = 5;return (
+
+
+
+                  uni.$http.get(url, data));case 5:res = _context2.sent;
+
+                console.log(res);case 7:case "end":return _context2.stop();}}}, _callee2);}))();
+    },
+
+    //SDXZ
+    inputDialogToggleSDXZ: function inputDialogToggleSDXZ() {
+      this.$refs.inputDialogSDXZ.open();
+    },
+    dialogInputConfirmSDXZ: function dialogInputConfirmSDXZ(val) {var _this3 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee3() {return _regenerator.default.wrap(function _callee3$(_context3) {while (1) {switch (_context3.prev = _context3.next) {case 0:
+                _this3.formData.SD1_XZ = val;
+                _this3.updateSDXZ();
+                console.log(_this3.formData.SD1_XZ);case 3:case "end":return _context3.stop();}}}, _callee3);}))();
+    },
+    updateSDXZ: function updateSDXZ(e) {var _this4 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee4() {var vm, url, data, res;return _regenerator.default.wrap(function _callee4$(_context4) {while (1) {switch (_context4.prev = _context4.next) {case 0:
+                vm = _this4;
+                url = uni.$api.deviceParam.updateParam;
+                data = {
+                  id: "278",
+                  sn: "CK1",
+                  name: "SD1_XZ",
+                  value: _this4.formData.SD1_XZ };_context4.next = 5;return (
+
+
+                  uni.$http.get(url, data));case 5:res = _context4.sent;
+
+                console.log(res);case 7:case "end":return _context4.stop();}}}, _callee4);}))();
+    },
+
+    //JRP
+    inputDialogToggleJRP: function inputDialogToggleJRP() {
+      this.$refs.inputDialogJRP.open();
+    },
+    dialogInputConfirmJRP: function dialogInputConfirmJRP(val) {var _this5 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee5() {return _regenerator.default.wrap(function _callee5$(_context5) {while (1) {switch (_context5.prev = _context5.next) {case 0:
+                _this5.formData.JR_P = val;
+                _this5.updateJRP();
+                console.log(_this5.formData.JR_P);case 3:case "end":return _context5.stop();}}}, _callee5);}))();
+    },
+    updateJRP: function updateJRP(e) {var _this6 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee6() {var vm, url, data, res;return _regenerator.default.wrap(function _callee6$(_context6) {while (1) {switch (_context6.prev = _context6.next) {case 0:
+                vm = _this6;
+                url = uni.$api.deviceParam.updateParam;
+                data = {
+                  id: "224",
+                  sn: "CK1",
+                  name: "JR_P",
+                  value: _this6.formData.JR_P };_context6.next = 5;return (
+
+
+                  uni.$http.get(url, data));case 5:res = _context6.sent;
+
+                console.log(res);case 7:case "end":return _context6.stop();}}}, _callee6);}))();
+    },
+    //JRI
+    inputDialogToggleJRI: function inputDialogToggleJRI() {
+      this.$refs.inputDialogJRI.open();
+    },
+    dialogInputConfirmJRI: function dialogInputConfirmJRI(val) {var _this7 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee7() {return _regenerator.default.wrap(function _callee7$(_context7) {while (1) {switch (_context7.prev = _context7.next) {case 0:
+                _this7.formData.JR_I = val;
+                _this7.updateJRI();
+                console.log(_this7.formData.JR_I);case 3:case "end":return _context7.stop();}}}, _callee7);}))();
+    },
+    updateJRI: function updateJRI(e) {var _this8 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee8() {var vm, url, data, res;return _regenerator.default.wrap(function _callee8$(_context8) {while (1) {switch (_context8.prev = _context8.next) {case 0:
+                vm = _this8;
+                url = uni.$api.deviceParam.updateParam;
+                data = {
+                  id: "218",
+                  sn: "CK1",
+                  name: "JR_I",
+                  value: _this8.formData.JR_I };_context8.next = 5;return (
+
+
+                  uni.$http.get(url, data));case 5:res = _context8.sent;
+
+                console.log(res);case 7:case "end":return _context8.stop();}}}, _callee8);}))();
+    },
+    //ZLP
+    inputDialogToggleZLP: function inputDialogToggleZLP() {
+      this.$refs.inputDialogZLP.open();
+    },
+    dialogInputConfirmZLP: function dialogInputConfirmZLP(val) {var _this9 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee9() {return _regenerator.default.wrap(function _callee9$(_context9) {while (1) {switch (_context9.prev = _context9.next) {case 0:
+                _this9.formData.ZL_P = val;
+                _this9.updateZLP();
+                console.log(_this9.formData.ZL_P);case 3:case "end":return _context9.stop();}}}, _callee9);}))();
+    },
+    updateZLP: function updateZLP(e) {var _this10 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee10() {var vm, url, data, res;return _regenerator.default.wrap(function _callee10$(_context10) {while (1) {switch (_context10.prev = _context10.next) {case 0:
+                vm = _this10;
+                url = uni.$api.deviceParam.updateParam;
+                data = {
+                  id: "267",
+                  sn: "CK1",
+                  name: "ZL_P",
+                  value: _this10.formData.ZL_P };_context10.next = 5;return (
+
+
+                  uni.$http.get(url, data));case 5:res = _context10.sent;
+
+                console.log(res);case 7:case "end":return _context10.stop();}}}, _callee10);}))();
+    },
+    //ZLI
+    inputDialogToggleZLI: function inputDialogToggleZLI() {
+      this.$refs.inputDialogZLI.open();
+    },
+    dialogInputConfirmZLI: function dialogInputConfirmZLI(val) {var _this11 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee11() {return _regenerator.default.wrap(function _callee11$(_context11) {while (1) {switch (_context11.prev = _context11.next) {case 0:
+                _this11.formData.ZL_I = val;
+                _this11.updateZLI();
+                console.log(_this11.formData.ZL_I);case 3:case "end":return _context11.stop();}}}, _callee11);}))();
+    },
+    updateZLI: function updateZLI(e) {var _this12 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee12() {var vm, url, data, res;return _regenerator.default.wrap(function _callee12$(_context12) {while (1) {switch (_context12.prev = _context12.next) {case 0:
+                vm = _this12;
+                url = uni.$api.deviceParam.updateParam;
+                data = {
+                  id: "233",
+                  sn: "CK1",
+                  name: "ZL_I",
+                  value: _this12.formData.ZL_I };_context12.next = 5;return (
+
+
+                  uni.$http.get(url, data));case 5:res = _context12.sent;
+
+                console.log(res);case 7:case "end":return _context12.stop();}}}, _callee12);}))();
+    },
+    //JSP
+    inputDialogToggleJSP: function inputDialogToggleJSP() {
+      this.$refs.inputDialogJSP.open();
+    },
+    dialogInputConfirmJSP: function dialogInputConfirmJSP(val) {var _this13 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee13() {return _regenerator.default.wrap(function _callee13$(_context13) {while (1) {switch (_context13.prev = _context13.next) {case 0:
+                _this13.formData.JS_P = val;
+                _this13.updateJSP();
+                console.log(_this13.formData.JS_P);case 3:case "end":return _context13.stop();}}}, _callee13);}))();
+    },
+    updateJSP: function updateJSP(e) {var _this14 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee14() {var vm, url, data, res;return _regenerator.default.wrap(function _callee14$(_context14) {while (1) {switch (_context14.prev = _context14.next) {case 0:
+                vm = _this14;
+                url = uni.$api.deviceParam.updateParam;
+                data = {
+                  id: "294",
+                  sn: "CK1",
+                  name: "JS_P",
+                  value: _this14.formData.JS_P };_context14.next = 5;return (
+
+
+                  uni.$http.get(url, data));case 5:res = _context14.sent;
+
+                console.log(res);case 7:case "end":return _context14.stop();}}}, _callee14);}))();
+    },
+    //JSI
+    inputDialogToggleJSI: function inputDialogToggleJSI() {
+      this.$refs.inputDialogJSI.open();
+    },
+    dialogInputConfirmJSI: function dialogInputConfirmJSI(val) {var _this15 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee15() {return _regenerator.default.wrap(function _callee15$(_context15) {while (1) {switch (_context15.prev = _context15.next) {case 0:
+                _this15.formData.JS_I = val;
+                _this15.updateJSI();
+                console.log(_this15.formData.JS_I);case 3:case "end":return _context15.stop();}}}, _callee15);}))();
+    },
+    updateJSI: function updateJSI(e) {var _this16 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee16() {var vm, url, data, res;return _regenerator.default.wrap(function _callee16$(_context16) {while (1) {switch (_context16.prev = _context16.next) {case 0:
+                vm = _this16;
+                url = uni.$api.deviceParam.updateParam;
                 data = {
-                  name: _this.formData.name };_context.next = 5;return (
+                  id: "290",
+                  sn: "CK1",
+                  name: "JS_I",
+                  value: _this16.formData.JS_I };_context16.next = 5;return (
 
-                  uni.$http.get(url, data));case 5:res = _context.sent;
 
-                console.log(res);case 7:case "end":return _context.stop();}}}, _callee);}))();
+                  uni.$http.get(url, data));case 5:res = _context16.sent;
 
+                console.log(res);case 7:case "end":return _context16.stop();}}}, _callee16);}))();
+    },
+
+    //CSP
+    inputDialogToggleCSP: function inputDialogToggleCSP() {
+      this.$refs.inputDialogCSP.open();
+    },
+    dialogInputConfirmCSP: function dialogInputConfirmCSP(val) {var _this17 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee17() {return _regenerator.default.wrap(function _callee17$(_context17) {while (1) {switch (_context17.prev = _context17.next) {case 0:
+                _this17.formData.CS_P = val;
+                _this17.updateCSP();
+                console.log(_this17.formData.CS_P);case 3:case "end":return _context17.stop();}}}, _callee17);}))();
+    },
+    updateCSP: function updateCSP(e) {var _this18 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee18() {var vm, url, data, res;return _regenerator.default.wrap(function _callee18$(_context18) {while (1) {switch (_context18.prev = _context18.next) {case 0:
+                vm = _this18;
+                url = uni.$api.deviceParam.updateParam;
+                data = {
+                  id: "237",
+                  sn: "CK1",
+                  name: "CS_P",
+                  value: _this18.formData.CS_P };_context18.next = 5;return (
+
+
+                  uni.$http.get(url, data));case 5:res = _context18.sent;
+
+                console.log(res);case 7:case "end":return _context18.stop();}}}, _callee18);}))();
+    },
+
+    //CSI
+    inputDialogToggleCSI: function inputDialogToggleCSI() {
+      this.$refs.inputDialogCSI.open();
+    },
+    dialogInputConfirmCSI: function dialogInputConfirmCSI(val) {var _this19 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee19() {return _regenerator.default.wrap(function _callee19$(_context19) {while (1) {switch (_context19.prev = _context19.next) {case 0:
+                _this19.formData.CS_I = val;
+                _this19.updateCSI();
+                console.log(_this19.formData.CS_I);case 3:case "end":return _context19.stop();}}}, _callee19);}))();
+    },
+    updateCSI: function updateCSI(e) {var _this20 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee20() {var vm, url, data, res;return _regenerator.default.wrap(function _callee20$(_context20) {while (1) {switch (_context20.prev = _context20.next) {case 0:
+                vm = _this20;
+                url = uni.$api.deviceParam.updateParam;
+                data = {
+                  id: "216",
+                  sn: "CK1",
+                  name: "CS_I",
+                  value: _this20.formData.CS_I };_context20.next = 5;return (
+
+
+                  uni.$http.get(url, data));case 5:res = _context20.sent;
+
+                console.log(res);case 7:case "end":return _context20.stop();}}}, _callee20);}))();
+    },
+
+    HFCC: function HFCC(e) {var _this21 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee21() {var vm, url, data, res;return _regenerator.default.wrap(function _callee21$(_context21) {while (1) {switch (_context21.prev = _context21.next) {case 0:
+                _this21.formData.HF_CC == 1 ? _this21.formData.HF_CC = 0 : _this21.formData.HF_CC = 1;
+
+                vm = _this21;
+                url = uni.$api.deviceParam.updateParam;
+                data = {
+                  id: "234",
+                  value: _this21.formData.HF_CC,
+                  name: "HF_CC",
+                  sn: "CK1" };_context21.next = 6;return (
+
+
+                  uni.$http.get(url, data));case 6:res = _context21.sent;
+                console.log(res.data.data.value);case 8:case "end":return _context21.stop();}}}, _callee21);}))();
     },
 
     back: function back() {
@@ -302,116 +644,116 @@ var _default =
 
     },
 
-    getWDXZ: function getWDXZ(e) {var _this2 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee2() {var vm, url, data, res;return _regenerator.default.wrap(function _callee2$(_context2) {while (1) {switch (_context2.prev = _context2.next) {case 0:
-                vm = _this2;
+    getWDXZ: function getWDXZ(e) {var _this22 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee22() {var vm, url, data, res;return _regenerator.default.wrap(function _callee22$(_context22) {while (1) {switch (_context22.prev = _context22.next) {case 0:
+                vm = _this22;
                 url = uni.$api.deviceParam.detail;
                 data = {
-                  id: "232" };_context2.next = 5;return (
+                  id: "232" };_context22.next = 5;return (
 
 
-                  uni.$http.get(url, data));case 5:res = _context2.sent;
+                  uni.$http.get(url, data));case 5:res = _context22.sent;
 
-                _this2.formData.WD1_XZ = res.data.data.deviceParam.value;case 7:case "end":return _context2.stop();}}}, _callee2);}))();
+                _this22.formData.WD1_XZ = res.data.data.deviceParam.value;case 7:case "end":return _context22.stop();}}}, _callee22);}))();
     },
-    getSDXZ: function getSDXZ(e) {var _this3 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee3() {var vm, url, data, res;return _regenerator.default.wrap(function _callee3$(_context3) {while (1) {switch (_context3.prev = _context3.next) {case 0:
-                vm = _this3;
+    getSDXZ: function getSDXZ(e) {var _this23 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee23() {var vm, url, data, res;return _regenerator.default.wrap(function _callee23$(_context23) {while (1) {switch (_context23.prev = _context23.next) {case 0:
+                vm = _this23;
                 url = uni.$api.deviceParam.detail;
                 data = {
-                  id: "278" };_context3.next = 5;return (
+                  id: "278" };_context23.next = 5;return (
 
 
-                  uni.$http.get(url, data));case 5:res = _context3.sent;
+                  uni.$http.get(url, data));case 5:res = _context23.sent;
 
-                _this3.formData.SD1_XZ = res.data.data.deviceParam.value;case 7:case "end":return _context3.stop();}}}, _callee3);}))();
+                _this23.formData.SD1_XZ = res.data.data.deviceParam.value;case 7:case "end":return _context23.stop();}}}, _callee23);}))();
     },
-    getJR_P: function getJR_P(e) {var _this4 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee4() {var vm, url, data, res;return _regenerator.default.wrap(function _callee4$(_context4) {while (1) {switch (_context4.prev = _context4.next) {case 0:
-                vm = _this4;
+    getJR_P: function getJR_P(e) {var _this24 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee24() {var vm, url, data, res;return _regenerator.default.wrap(function _callee24$(_context24) {while (1) {switch (_context24.prev = _context24.next) {case 0:
+                vm = _this24;
                 url = uni.$api.deviceParam.detail;
                 data = {
-                  id: "224" };_context4.next = 5;return (
+                  id: "224" };_context24.next = 5;return (
 
 
-                  uni.$http.get(url, data));case 5:res = _context4.sent;
+                  uni.$http.get(url, data));case 5:res = _context24.sent;
 
-                _this4.formData.JR_P = res.data.data.deviceParam.value;case 7:case "end":return _context4.stop();}}}, _callee4);}))();
+                _this24.formData.JR_P = res.data.data.deviceParam.value;case 7:case "end":return _context24.stop();}}}, _callee24);}))();
     },
-    getJR_I: function getJR_I(e) {var _this5 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee5() {var vm, url, data, res;return _regenerator.default.wrap(function _callee5$(_context5) {while (1) {switch (_context5.prev = _context5.next) {case 0:
-                vm = _this5;
+    getJR_I: function getJR_I(e) {var _this25 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee25() {var vm, url, data, res;return _regenerator.default.wrap(function _callee25$(_context25) {while (1) {switch (_context25.prev = _context25.next) {case 0:
+                vm = _this25;
                 url = uni.$api.deviceParam.detail;
                 data = {
-                  id: "218" };_context5.next = 5;return (
+                  id: "218" };_context25.next = 5;return (
 
 
-                  uni.$http.get(url, data));case 5:res = _context5.sent;
+                  uni.$http.get(url, data));case 5:res = _context25.sent;
 
-                _this5.formData.JR_I = res.data.data.deviceParam.value;case 7:case "end":return _context5.stop();}}}, _callee5);}))();
+                _this25.formData.JR_I = res.data.data.deviceParam.value;case 7:case "end":return _context25.stop();}}}, _callee25);}))();
     },
-    getJW_P: function getJW_P(e) {var _this6 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee6() {var vm, url, data, res;return _regenerator.default.wrap(function _callee6$(_context6) {while (1) {switch (_context6.prev = _context6.next) {case 0:
-                vm = _this6;
+    getJW_P: function getJW_P(e) {var _this26 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee26() {var vm, url, data, res;return _regenerator.default.wrap(function _callee26$(_context26) {while (1) {switch (_context26.prev = _context26.next) {case 0:
+                vm = _this26;
                 url = uni.$api.deviceParam.detail;
                 data = {
-                  id: "267" };_context6.next = 5;return (
+                  id: "267" };_context26.next = 5;return (
 
 
-                  uni.$http.get(url, data));case 5:res = _context6.sent;
+                  uni.$http.get(url, data));case 5:res = _context26.sent;
 
-                _this6.formData.ZL_P = res.data.data.deviceParam.value;case 7:case "end":return _context6.stop();}}}, _callee6);}))();
+                _this26.formData.ZL_P = res.data.data.deviceParam.value;case 7:case "end":return _context26.stop();}}}, _callee26);}))();
     },
-    getJW_I: function getJW_I(e) {var _this7 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee7() {var vm, url, data, res;return _regenerator.default.wrap(function _callee7$(_context7) {while (1) {switch (_context7.prev = _context7.next) {case 0:
-                vm = _this7;
+    getJW_I: function getJW_I(e) {var _this27 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee27() {var vm, url, data, res;return _regenerator.default.wrap(function _callee27$(_context27) {while (1) {switch (_context27.prev = _context27.next) {case 0:
+                vm = _this27;
                 url = uni.$api.deviceParam.detail;
                 data = {
-                  id: "233" };_context7.next = 5;return (
+                  id: "233" };_context27.next = 5;return (
 
 
-                  uni.$http.get(url, data));case 5:res = _context7.sent;
+                  uni.$http.get(url, data));case 5:res = _context27.sent;
 
-                _this7.formData.ZL_I = res.data.data.deviceParam.value;case 7:case "end":return _context7.stop();}}}, _callee7);}))();
+                _this27.formData.ZL_I = res.data.data.deviceParam.value;case 7:case "end":return _context27.stop();}}}, _callee27);}))();
     },
-    getJS_P: function getJS_P(e) {var _this8 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee8() {var vm, url, data, res;return _regenerator.default.wrap(function _callee8$(_context8) {while (1) {switch (_context8.prev = _context8.next) {case 0:
-                vm = _this8;
+    getJS_P: function getJS_P(e) {var _this28 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee28() {var vm, url, data, res;return _regenerator.default.wrap(function _callee28$(_context28) {while (1) {switch (_context28.prev = _context28.next) {case 0:
+                vm = _this28;
                 url = uni.$api.deviceParam.detail;
                 data = {
-                  id: "294" };_context8.next = 5;return (
+                  id: "294" };_context28.next = 5;return (
 
 
 
-                  uni.$http.get(url, data));case 5:res = _context8.sent;
+                  uni.$http.get(url, data));case 5:res = _context28.sent;
 
-                _this8.formData.JS_P = res.data.data.deviceParam.value;case 7:case "end":return _context8.stop();}}}, _callee8);}))();
+                _this28.formData.JS_P = res.data.data.deviceParam.value;case 7:case "end":return _context28.stop();}}}, _callee28);}))();
     },
-    getJS_I: function getJS_I(e) {var _this9 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee9() {var vm, url, data, res;return _regenerator.default.wrap(function _callee9$(_context9) {while (1) {switch (_context9.prev = _context9.next) {case 0:
-                vm = _this9;
+    getJS_I: function getJS_I(e) {var _this29 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee29() {var vm, url, data, res;return _regenerator.default.wrap(function _callee29$(_context29) {while (1) {switch (_context29.prev = _context29.next) {case 0:
+                vm = _this29;
                 url = uni.$api.deviceParam.detail;
                 data = {
-                  id: "290" };_context9.next = 5;return (
+                  id: "290" };_context29.next = 5;return (
 
 
-                  uni.$http.get(url, data));case 5:res = _context9.sent;
+                  uni.$http.get(url, data));case 5:res = _context29.sent;
 
-                _this9.formData.JS_I = res.data.data.deviceParam.value;case 7:case "end":return _context9.stop();}}}, _callee9);}))();
+                _this29.formData.JS_I = res.data.data.deviceParam.value;case 7:case "end":return _context29.stop();}}}, _callee29);}))();
     },
-    getCS_P: function getCS_P(e) {var _this10 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee10() {var vm, url, data, res;return _regenerator.default.wrap(function _callee10$(_context10) {while (1) {switch (_context10.prev = _context10.next) {case 0:
-                vm = _this10;
+    getCS_P: function getCS_P(e) {var _this30 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee30() {var vm, url, data, res;return _regenerator.default.wrap(function _callee30$(_context30) {while (1) {switch (_context30.prev = _context30.next) {case 0:
+                vm = _this30;
                 url = uni.$api.deviceParam.detail;
                 data = {
-                  id: "237" };_context10.next = 5;return (
+                  id: "237" };_context30.next = 5;return (
 
 
-                  uni.$http.get(url, data));case 5:res = _context10.sent;
+                  uni.$http.get(url, data));case 5:res = _context30.sent;
 
-                _this10.formData.CS_P = res.data.data.deviceParam.value;case 7:case "end":return _context10.stop();}}}, _callee10);}))();
+                _this30.formData.CS_P = res.data.data.deviceParam.value;case 7:case "end":return _context30.stop();}}}, _callee30);}))();
     },
-    getCS_I: function getCS_I(e) {var _this11 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee11() {var vm, url, data, res;return _regenerator.default.wrap(function _callee11$(_context11) {while (1) {switch (_context11.prev = _context11.next) {case 0:
-                vm = _this11;
+    getCS_I: function getCS_I(e) {var _this31 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee31() {var vm, url, data, res;return _regenerator.default.wrap(function _callee31$(_context31) {while (1) {switch (_context31.prev = _context31.next) {case 0:
+                vm = _this31;
                 url = uni.$api.deviceParam.detail;
                 data = {
-                  id: "216" };_context11.next = 5;return (
+                  id: "216" };_context31.next = 5;return (
 
 
-                  uni.$http.get(url, data));case 5:res = _context11.sent;
+                  uni.$http.get(url, data));case 5:res = _context31.sent;
 
-                _this11.formData.CS_I = res.data.data.deviceParam.value;case 7:case "end":return _context11.stop();}}}, _callee11);}))();
+                _this31.formData.CS_I = res.data.data.deviceParam.value;case 7:case "end":return _context31.stop();}}}, _callee31);}))();
     } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/systemParameter/systemParameter.json

@@ -1,5 +1,8 @@
 {
   "navigationBarTitleText": "系统参数",
   "enablePullDownRefresh": false,
-  "usingComponents": {}
+  "usingComponents": {
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup",
+    "uni-popup-dialog": "/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog"
+  }
 }

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/systemParameter/systemParameter.wxss

@@ -33,6 +33,9 @@
 	display: flex;
 	flex-wrap: wrap;
 }
+.active_button {
+	background-color: crimson;
+}
 .setItem {
 	margin-left: 20rpx;
 }

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -9,22 +9,15 @@
             "list": [
                 {
                     "name": "",
-                    "pathName": "pages/runningState/runningState",
-                    "query": "code=undefined",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/dataCurve/dataCurve",
+                    "pathName": "pages/systemParameter/systemParameter",
                     "query": "",
                     "launchMode": "default",
                     "scene": null
                 },
                 {
                     "name": "",
-                    "pathName": "pages/systemParameter/systemParameter",
-                    "query": "",
+                    "pathName": "pages/project/projectInfo/projectInfo",
+                    "query": "code=49f5c745a385475bb127bd4c81514451",
                     "launchMode": "default",
                     "scene": null
                 }

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.wxss

@@ -0,0 +1,101 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.uni-popup-dialog {
+  width: 300px;
+  border-radius: 11px;
+  background-color: #fff;
+}
+.uni-dialog-title {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  padding-top: 25px;
+}
+.uni-dialog-title-text {
+  font-size: 16px;
+  font-weight: 500;
+}
+.uni-dialog-content {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  padding: 20px;
+}
+.uni-dialog-content-text {
+  font-size: 14px;
+  color: #6C6C6C;
+}
+.uni-dialog-button-group {
+  display: flex;
+  flex-direction: row;
+  border-top-color: #f5f5f5;
+  border-top-style: solid;
+  border-top-width: 1px;
+}
+.uni-dialog-button {
+  display: flex;
+  flex: 1;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  height: 45px;
+}
+.uni-border-left {
+  border-left-color: #f0f0f0;
+  border-left-style: solid;
+  border-left-width: 1px;
+}
+.uni-dialog-button-text {
+  font-size: 16px;
+  color: #333;
+}
+.uni-button-color {
+  color: #007aff;
+}
+.uni-dialog-input {
+  flex: 1;
+  font-size: 14px;
+  border: 1px #eee solid;
+  height: 40px;
+  padding: 0 10px;
+  border-radius: 5px;
+  color: #555;
+}
+.uni-popup__success {
+  color: #4cd964;
+}
+.uni-popup__warn {
+  color: #f0ad4e;
+}
+.uni-popup__error {
+  color: #dd524d;
+}
+.uni-popup__info {
+  color: #909399;
+}
+

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "uni-transition": "/uni_modules/uni-transition/components/uni-transition/uni-transition"
+  },
+  "component": true
+}

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxss

@@ -0,0 +1,49 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.uni-popup {
+  position: fixed;
+  z-index: 99;
+}
+.uni-popup.top, .uni-popup.left, .uni-popup.right {
+  top: 0;
+}
+.uni-popup .uni-popup__wrapper {
+  display: block;
+  position: relative;
+  /* iphonex 等安全区设置，底部安全区适配 */
+}
+.uni-popup .uni-popup__wrapper.left, .uni-popup .uni-popup__wrapper.right {
+  padding-top: 0;
+  flex: 1;
+}
+.fixforpc-z-index {
+  z-index: 999;
+}
+.fixforpc-top {
+  top: 0;
+}
+

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.wxml

@@ -0,0 +1 @@
+<block wx:if="{{isShow}}"><view class="{{['vue-ref',customClass]}}" style="{{(transformStyles)}}" animation="{{animationData}}" data-ref="ani" data-event-opts="{{[['tap',[['onClick',['$event']]]]]}}" bindtap="__e"><slot></slot></view></block>

sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/configuration/core/MqttConfiguration.java

@@ -119,7 +119,7 @@ public class MqttConfiguration {
                 HashMap<String, String> deviceData2 = list.get(1).getDeviceData();
 
                 //存入数据库的新增方法,将第一次读取到的数据存入数据库
-                DeviceParamBean deviceParamBean = new DeviceParamBean();
+
 
                 //先将数据存入redis，检验所有数据，如果出现数据改变，就执行update更新数据库，并更新redis
 
@@ -194,21 +194,29 @@ public class MqttConfiguration {
                         System.out.println("重新存入redis成功！");
                     }
 
+                    long id = 199;
+
                     //更新数据库
                     for (Map.Entry<String, String> entry : deviceData.entrySet()) {
-                        deviceParamBean.setSn(deviceId);
+                        DeviceParamBean deviceParamBean = new DeviceParamBean();
 
-                        for (long i = 199; i < 298; i++) {
-                            deviceParamBean.setId(i);
-                        }
+                        deviceParamBean.setSn(deviceId);
 
                         String name = entry.getKey();
                         String value = entry.getValue();
 
+
+                        deviceParamBean.setId(id);
+
+                        id = id + 1;
+
                         deviceParamBean.setName(name);
                         deviceParamBean.setValue(value);
 
                         deviceParamBean = this.deviceParamService.updateParam(deviceParamBean);
+
+                        System.out.println("id为：" + id + "-- 更新后的数据：" + deviceParamBean);
+
                     }
                 }
 
@@ -231,6 +239,7 @@ public class MqttConfiguration {
 
                     //更新数据库
                     for (Map.Entry<String, String> entry : deviceData2.entrySet()) {
+                        DeviceParamBean deviceParamBean = new DeviceParamBean();
                         deviceParamBean.setSn(deviceId2);
 
                         for (long i = 298; i < 300; i++) {