111

sources/client/vrv-moblie/main.js

@@ -1,26 +1,30 @@
 import App from './App'
 import http from './utils/http.js'
 import api from './config/api.js'
+import moment from './utils/moment.js'
 
 uni.$http = http;
 uni.$api = api;
+uni.$moment = moment;
 
 // #ifndef VUE3
 import Vue from 'vue'
 Vue.config.productionTip = false
 App.mpType = 'app'
 const app = new Vue({
-    ...App
+	...App
 })
 app.$mount()
 // #endif
 
 // #ifdef VUE3
-import { createSSRApp } from 'vue'
+import {
+	createSSRApp
+} from 'vue'
 export function createApp() {
-  const app = createSSRApp(App)
-  return {
-    app
-  }
+	const app = createSSRApp(App)
+	return {
+		app
+	}
 }
-// #endif
+// #endif

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

@@ -7,7 +7,7 @@
 				<text>地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;区：</text> 
 				<text>客户名称：</text>
 				<text>报警类型：{{item.alarmType}}</text>
-				<text>报警时间：{{item.createTime}}</text>
+				<text>报警时间：{{item.createTime | timeFilter}}</text>
 			</view>
 
 
@@ -22,6 +22,14 @@
 				deviceAlarmRecords: [],
 			}
 		},
+		filters: {
+			timeFilter(data) {
+				if(data!=='') {
+					let time = uni.$moment(data).format("YYYY-MM-DD HH:mm:ss")
+					return time
+				}
+			}
+		},
 		onLoad() {
 			uni.request({
 				url: 'http://127.0.0.1:9999/deviceAlarmRecord/list',

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

@@ -4,10 +4,10 @@
 			<text class="title">{{item.alarmName}}</text>
 
 			<view class="content">
-				<text>报警时间：{{item.startTime}}</text>
+				<text>报警时间：{{item.createTime | timeFilter}}</text>
 				<text>变量ID：{{item.variableId}}</text>
 				<text>报警状态：{{item.status}}</text>
-				<text>持续时长：{{item.status}}</text>
+				<text>持续时长：{{item.createTime | timeFilter}}-{{item.endTime | timeFilter}}</text>
 
 			</view>
 		</view>
@@ -25,6 +25,14 @@
 				deviceAlarmRecords: [],
 			}
 		},
+		filters: {
+			timeFilter(data) {
+				if(data!=='') {
+					let time = uni.$moment(data).format("YYYY-MM-DD HH:mm:ss")
+					return time
+				}
+			}
+		},
 		onLoad() {
 			uni.request({
 				url: 'http://127.0.0.1:9999/deviceAlarmRecord/list',

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

@@ -73,6 +73,11 @@
 				formData: {
 					WD_1: '',
 					SD_1: '',
+					QX: '2', //星期
+					WD_SJ: '12',
+					SD_SJ: '23',
+					WD_SD: '34',
+					SD_SD: '45',
 				},
 
 				cWidth: '',
@@ -99,8 +104,12 @@
 				data: { //数据
 					categories: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"],
 					series: [{
-						name: "温度",
+						name: "温度实际值",
 						data: [40, 30, 36, 44, 34, 30, 22],
+					}, {
+						name: "温度设定值",
+						data: [10, 25, 23, 33, 23, 35, 56],
+						color: "#336633"
 					}]
 				},
 
@@ -108,14 +117,23 @@
 				data11: { //数据
 					categories11: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"],
 					series11: [{
-						name: "湿度",
+						name: "湿度实际值",
 						data: [40, 30, 36, 44, 38, 34, 30],
+					}, {
+						name: "湿度设定值",
+						data: [10, 25, 23, 33, 23, 35, 56],
+						color: "red"
 					}]
 				},
 			}
 		},
 
 		onLoad() {
+			this.getWD_SJ()
+			this.getSD_SJ()
+			this.getWD_SD()
+			this.getSD_SD()
+
 			this.getWD_1()
 			this.getSD_1()
 
@@ -128,7 +146,78 @@
 			_self11.showLineA11("canvasLineA11", _self11.data11); //触发执行函数
 		},
 
+
 		methods: {
+			async getWD_SJ(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "292",
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				this.formData.WD_SJ = res.data.data.deviceParam.value;
+				console.log(this.formData.WD_SJ);
+				this.data.series[0].data[0] = this.formData.WD_SJ
+				console.log("实际温度：" + this.data.series[0].data[0]);
+			},
+			async getSD_SJ(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "280",
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				this.formData.SD_SJ = res.data.data.deviceParam.value;
+				console.log(this.formData.SD_SJ);
+				this.data11.series11[0].data[0] = this.formData.SD_SJ
+				console.log("实际湿度：" + this.data11.series11[0].data[0]);
+			},
+			async getWD_SD(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "296",
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				this.formData.WD_SD = res.data.data.deviceParam.value;
+				console.log(this.formData.WD_SD);
+				this.data.series[1].data[0] = this.formData.WD_SD
+				console.log("设定温度：" + this.data.series[1].data[0]);
+			},
+			async getSD_SD(e) {
+				let vm = this;
+
+				var XQ = this.formData.QX;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "231",
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				this.formData.SD_SD = res.data.data.deviceParam.value;
+				console.log(this.formData.SD_SD);
+
+				if (XQ == 1) {
+					this.data11.series11[1].data[0] = this.formData.SD_SD
+					console.log("周一设定湿度：" + this.data11.series11[1].data[0]);
+
+				}
+
+				if (XQ == 2) {
+					this.data11.series11[1].data[1] = this.formData.SD_SD
+					console.log("周二设定湿度：" + this.data11.series11[1].data[1]);
+
+				}
+
+			},
+
 			back() {
 				uni.navigateTo({
 					url: '/pages/device/deviceInfo/deviceInfo'
@@ -228,7 +317,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "206",
+					id: "207",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -240,7 +329,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "284",
+					id: "293",
 				};
 
 				let res = await uni.$http.get(url, data);

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

@@ -5,7 +5,7 @@
 
 			<view class="col">
 				<view class="switch" @click="changeStatus(item)">
-					<switch :checked="item.useStatus" color="#007AFE" @change="switchChange" />
+					<switch checked color="#007AFE" @change="switchChange" />
 				</view>
 				<view class="list" @tap="showDetail" :data-code="item.code">查看 ></view>
 			</view>

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

@@ -9,7 +9,7 @@
 		
 			<view class="content">
 				<text>操 作 人：{{item.userRealname}}</text>
-				<text>操作时间：{{item.updateTime}}</text>
+				<text>操作时间：{{item.updateTime | timeFilter}}</text>
 			</view>
 
 
@@ -24,6 +24,14 @@
 				operatorLogs: [],
 			}
 		},
+		filters: {
+			timeFilter(data) {
+				if(data!=='') {
+					let time = uni.$moment(data).format("YYYY-MM-DD HH:mm:ss")
+					return time
+				}
+			}
+		},
 		onLoad() {
 			uni.request({
 				url: 'http://127.0.0.1:9999/operatorLog/list',

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

@@ -348,7 +348,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "244",
+					id: "247",
 					value: this.formData.JZ_XZ,
 					name: "JZ_XZ",
 					sn: "CK1"
@@ -363,7 +363,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "239",
+					id: "242",
 					value: this.formData.MS_XZ,
 					name: "MS_XZ",
 					sn: "CK1"
@@ -378,7 +378,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "254",
+					id: "260",
 					value: this.formData.GZ_FW,
 					name: "GZ_FW",
 					sn: "CK1"
@@ -396,7 +396,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "208",
+					id: "209",
 					value: this.formData.JSF_SZXZ,
 					name: "JSF_SZXZ",
 					sn: "CK1"
@@ -411,7 +411,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "209",
+					id: "210",
 					value: this.formData.LSF_SZXZ,
 					name: "LSF_SZXZ",
 					sn: "CK1"
@@ -426,7 +426,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "207",
+					id: "208",
 					value: this.formData.RSF_SZXZ,
 					name: "RSF_SZXZ",
 					sn: "CK1"
@@ -473,7 +473,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "281",
+					id: "290",
 					value: this.formData.SFF_SZXZ,
 					name: "SFF_SZXZ",
 					sn: "CK1"
@@ -488,7 +488,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "238",
+					id: "241",
 					value: this.formData.PFF_SZXZ,
 					name: "PFF_SZXZ",
 					sn: "CK1"
@@ -503,7 +503,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "246",
+					id: "249",
 					value: this.formData.YJDJR_SZXZ,
 					name: "YJDJR_SZXZ",
 					sn: "CK1"
@@ -518,7 +518,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "213",
+					id: "214",
 					value: this.formData.EJDJR_SZXZ,
 					name: "EJDJR_SZXZ",
 					sn: "CK1"
@@ -533,7 +533,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "258",
+					id: "265",
 					value: this.formData.SJDJR_SZXZ,
 					name: "SJDJR_SZXZ",
 					sn: "CK1"
@@ -548,7 +548,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "295",
+					id: "305",
 					value: this.formData.FLZJ_SZXZ,
 					name: "FLZJ_SZXZ",
 					sn: "CK1"
@@ -565,7 +565,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "256",
+					id: "262",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -576,7 +576,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "269",
+					id: "277",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -587,7 +587,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "291",
+					id: "300",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -598,7 +598,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "272",
+					id: "281",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -609,7 +609,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "222",
+					id: "224",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -620,7 +620,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "214",
+					id: "215",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -631,7 +631,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "210",
+					id: "211",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -642,7 +642,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "212",
+					id: "213",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -656,7 +656,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "215",
+					id: "216",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -668,7 +668,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "261",
+					id: "268",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -680,7 +680,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "211",
+					id: "212",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -761,7 +761,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "217",
+					id: "219",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -773,7 +773,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "287",
+					id: "296",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -785,7 +785,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "229",
+					id: "231",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -799,7 +799,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "287",
+					id: "296",
 					sn: "CK1",
 					name: "WD_SD",
 					value: this.formData.WD_SD
@@ -814,7 +814,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "229",
+					id: "231",
 					sn: "CK1",
 					name: "SD_SD",
 					value: this.formData.SD_SD
@@ -829,7 +829,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "217",
+					id: "219",
 					sn: "CK1",
 					name: "JZ_YSTZ",
 					value: this.formData.JZ_YSTZ
@@ -846,7 +846,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "235",
+					id: "238",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -858,7 +858,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "280",
+					id: "289",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -870,7 +870,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "279",
+					id: "288",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -884,7 +884,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "235",
+					id: "238",
 					sn: "CK1",
 					name: "LSF_SDKD",
 					value: this.formData.LSF_SDKD
@@ -899,7 +899,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "280",
+					id: "289",
 					sn: "CK1",
 					name: "RSF_SDKD",
 					value: this.formData.RSF_SDKD
@@ -914,7 +914,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "279",
+					id: "288",
 					sn: "CK1",
 					name: "JSF_SDKD",
 					value: this.formData.JSF_SDKD
@@ -933,7 +933,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "255",
+					id: "261",
 					value: this.formData.SFJ_SDQD,
 					name: "SFJ_SDQD",
 					sn: "CK1"
@@ -948,7 +948,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "257",
+					id: "263",
 					value: this.formData.PFJ_SDQD,
 					name: "PFJ_SDQD",
 					sn: "CK1"
@@ -963,7 +963,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "241",
+					id: "244",
 					value: this.formData.FLZJ_SDQD,
 					name: "FLZJ_SDQD",
 					sn: "CK1"
@@ -978,7 +978,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "275",
+					id: "284",
 					value: this.formData.PFF_SDQD,
 					name: "PFF_SDQD",
 					sn: "CK1"
@@ -993,7 +993,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "236",
+					id: "239",
 					value: this.formData.SFF_SDQD,
 					name: "SFF_SDQD",
 					sn: "CK1"
@@ -1008,7 +1008,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "292",
+					id: "301",
 					value: this.formData.YJDJR_SDQD,
 					name: "YJDJR_SDQD",
 					sn: "CK1"
@@ -1023,7 +1023,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "264",
+					id: "272",
 					value: this.formData.EJDJR_SDQD,
 					name: "EJDJR_SDQD",
 					sn: "CK1"

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

@@ -217,7 +217,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "206",
+					id: "207",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -229,7 +229,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "284",
+					id: "293",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -242,7 +242,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "262",
+					id: "269",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -254,7 +254,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "298",
+					id: "308",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -266,7 +266,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "299",
+					id: "309",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -279,7 +279,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "217",
+					id: "219",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -292,7 +292,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "287",
+					id: "296",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -304,7 +304,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "229",
+					id: "231",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -316,7 +316,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "225",
+					id: "227",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -329,7 +329,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "215",
+					id: "216",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -341,7 +341,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "261",
+					id: "268",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -353,7 +353,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "211",
+					id: "212",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -368,7 +368,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "285",
+					id: "294",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -379,7 +379,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "296",
+					id: "306",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -390,7 +390,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "274",
+					id: "283",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -401,7 +401,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "293",
+					id: "303",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -413,7 +413,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "214",
+					id: "215",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -424,7 +424,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "210",
+					id: "211",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -435,7 +435,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "212",
+					id: "213",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -447,7 +447,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "260",
+					id: "267",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -462,7 +462,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "260",
+					id: "267",
 					value: this.formData.JZ_KGJ,
 					name: "JZ_KGJ",
 					sn: "CK1"

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

@@ -239,7 +239,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "232",
+					id: "235",
 					sn: "CK1",
 					name: "WD1_XZ",
 					value: this.formData.WD1_XZ
@@ -264,7 +264,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "278",
+					id: "287",
 					sn: "CK1",
 					name: "SD1_XZ",
 					value: this.formData.SD1_XZ
@@ -288,7 +288,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "224",
+					id: "226",
 					sn: "CK1",
 					name: "JR_P",
 					value: this.formData.JR_P
@@ -311,7 +311,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "218",
+					id: "220",
 					sn: "CK1",
 					name: "JR_I",
 					value: this.formData.JR_I
@@ -334,7 +334,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "267",
+					id: "275",
 					sn: "CK1",
 					name: "ZL_P",
 					value: this.formData.ZL_P
@@ -357,7 +357,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "233",
+					id: "236",
 					sn: "CK1",
 					name: "ZL_I",
 					value: this.formData.ZL_I
@@ -380,7 +380,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "294",
+					id: "304",
 					sn: "CK1",
 					name: "JS_P",
 					value: this.formData.JS_P
@@ -403,7 +403,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "290",
+					id: "299",
 					sn: "CK1",
 					name: "JS_I",
 					value: this.formData.JS_I
@@ -427,7 +427,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "237",
+					id: "240",
 					sn: "CK1",
 					name: "CS_P",
 					value: this.formData.CS_P
@@ -451,7 +451,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "216",
+					id: "217",
 					sn: "CK1",
 					name: "CS_I",
 					value: this.formData.CS_I
@@ -468,7 +468,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "234",
+					id: "237",
 					value: this.formData.HF_CC,
 					name: "HF_CC",
 					sn: "CK1"
@@ -488,7 +488,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "232",
+					id: "235",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -499,7 +499,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "278",
+					id: "287",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -510,7 +510,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "224",
+					id: "226",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -521,7 +521,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "218",
+					id: "220",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -532,7 +532,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "267",
+					id: "275",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -543,7 +543,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "233",
+					id: "236",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -554,7 +554,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "294",
+					id: "304",
 				};
 
 
@@ -566,7 +566,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "290",
+					id: "299",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -577,7 +577,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "237",
+					id: "240",
 				};
 
 				let res = await uni.$http.get(url, data);
@@ -588,7 +588,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.detail;
 				let data = {
-					id: "216",
+					id: "217",
 				};
 
 				let res = await uni.$http.get(url, data);

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/alarm/alarm.wxml

@@ -1 +1 @@
-<view><block wx:for="{{deviceAlarmRecords}}" wx:for-item="item" wx:for-index="__i0__" wx:key="code"><view class="alarm"><text class="title">{{item.alarmName}}</text><view class="content"><text>地       区：</text><text>客户名称：</text><text>{{"报警类型："+item.alarmType}}</text><text>{{"报警时间："+item.createTime}}</text></view></view></block></view>
+<view><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="__i0__" wx:key="code"><view class="alarm"><text class="title">{{item.$orig.alarmName}}</text><view class="content"><text>地       区：</text><text>客户名称：</text><text>{{"报警类型："+item.$orig.alarmType}}</text><text>{{"报警时间："+item.f0}}</text></view></view></block></view>

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/operatorLog/operatorLog.wxml

@@ -1 +1 @@
-<view><block wx:for="{{operatorLogs}}" wx:for-item="item" wx:for-index="__i0__" wx:key="code"><view class="log"><view class="oper"><text class="title">{{"操作内容："+item.content}}</text></view><view class="content"><text>{{"操 作 人："+item.userRealname}}</text><text>{{"操作时间："+item.updateTime}}</text></view></view></block></view>
+<view><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="__i0__" wx:key="code"><view class="log"><view class="oper"><text class="title">{{"操作内容："+item.$orig.content}}</text></view><view class="content"><text>{{"操 作 人："+item.$orig.userRealname}}</text><text>{{"操作时间："+item.f0}}</text></view></view></block></view>

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

@@ -9,15 +9,8 @@
             "list": [
                 {
                     "name": "",
-                    "pathName": "pages/systemParameter/systemParameter",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/project/projectInfo/projectInfo",
-                    "query": "code=49f5c745a385475bb127bd4c81514451",
+                    "pathName": "pages/device/deviceInfo/deviceInfo",
+                    "query": "code=2d7b1ddcdb3d4567a85ea85de677c67b",
                     "launchMode": "default",
                     "scene": null
                 }

sources/server/vrv/run/application.pid

@@ -0,0 +1 @@
+15324

sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/controller/core/DeviceParamController.java

@@ -3,6 +3,7 @@ package com.kuyuntech.vrv.platform.controller.core;
 import com.alibaba.fastjson.JSONObject;
 import com.kuyuntech.vrv.coreapi.bean.core.DeviceParamBean;
 import com.kuyuntech.vrv.coreapi.service.core.DeviceParamService;
+import com.kuyuntech.vrv.platform.configuration.core.MqttGateway;
 import com.kuyuntech.vrv.platform.readJson.Test;
 import com.kuyuntech.vrv.platform.util.core.FileUtils;
 import com.wbspool.fastboot.core.common.bean.PagerBean;
@@ -19,6 +20,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -35,6 +37,8 @@ public class DeviceParamController {
 
     @Autowired
     DeviceParamService deviceParamService;
+    @Resource
+    private MqttGateway mqttGateway;
 
     /**
      * 新增
@@ -79,6 +83,7 @@ public class DeviceParamController {
 
         return ResponseBean.success("操作成功！").addData("code", deviceParamBean.getCode());
 
+
     }
 
     /**
@@ -99,7 +104,19 @@ public class DeviceParamController {
             return ResponseBean.serverError("操作失败！");
         }
 
-        return ResponseBean.success("操作成功！").addData("value", deviceParamBean.getValue());
+
+        // 发送消息到指定主题
+        String name = deviceParamBean.getName();
+        String value = deviceParamBean.getValue();
+
+        String content = name + ":" + value;
+
+
+        mqttGateway.sendToMqtt("collector", 1, content);
+        return "send topic: " + "collector" + ", message : " + content;
+
+//        return ResponseBean.success("操作成功！").addData("value", deviceParamBean.getValue());
+
 
     }