10

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

@@ -61,7 +61,7 @@
 					<view class="text">
 						<text>故障复位</text>
 					</view>
-					<button class="button" :class="{'Red_button': formData.GZ_FW == 0}"
+					<button class="button" :class="{'Red_button': formData.GZ_FW == 1}"
 						@tap="GZFW()">{{formData.GZ_FW == 0?"关闭":"打开"}}</button>
 				</view>
 			</view>
@@ -262,9 +262,9 @@
 				deviceParams: [],
 
 				formData: {
-					GZ_FW: '0',
-					JZ_XZ: '0',
-					MS_XZ: '0',
+					GZ_FW: '',
+					JZ_XZ: '',
+					MS_XZ: '',
 
 					RSF: '',
 					LSF: '',
@@ -276,38 +276,38 @@
 					LSF_SDKD: '', //冷水温度手动_设定(0~100,单位为%)
 					JSF_SDKD: '', //电加湿手动_设定(0~100,单位为%)
 
-					LSF_SZXZ: '0',
-					RSF_SZXZ: '0',
-					JSF_SZXZ: '0',
+					LSF_SZXZ: '',
+					RSF_SZXZ: '',
+					JSF_SZXZ: '',
 
 					//下部按钮参数
-					SFF_SZXZ: '0',
-					SFF_SDQD: '0',
-					PFF_SZXZ: '0',
-					PFF_SDQD: '0',
-					SFJ_SZXZ: '0',
-					SFJ_SZXZ: '0',
-					SFJ_SDQD: '0',
-					PFJ_SZXZ: '0',
-					PFJ_SDQD: '0',
-					FLZJ_SZXZ: '0',
-					FLZJ_SDQD: '0',
-					YJDJR_SZXZ: '0',
-					YJDJR_SDQD: '0',
-					EJDJR_SZXZ: '0',
-					EJDJR_SDQD: '0',
-					SJDJR_SZXZ: '0',
-					SJDJR_SDQD: '0',
+					SFF_SZXZ: '',
+					SFF_SDQD: '',
+					PFF_SZXZ: '',
+					PFF_SDQD: '',
+					SFJ_SZXZ: '',
+					SFJ_SZXZ: '',
+					SFJ_SDQD: '',
+					PFJ_SZXZ: '',
+					PFJ_SDQD: '',
+					FLZJ_SZXZ: '',
+					FLZJ_SDQD: '',
+					YJDJR_SZXZ: '',
+					YJDJR_SDQD: '',
+					EJDJR_SZXZ: '',
+					EJDJR_SDQD: '',
+					SJDJR_SZXZ: '',
+					SJDJR_SDQD: '',
 
 					//第四列实时反馈
-					SFJ_QT: '1', //送风机工频启动(0:停止,1:启动)
-					PFJ_QT: '0', //排风机工频启动(0:停止,1:启动)
-					YJDJR_QT: '0', //一级电加热启停(0:停止,1:启动)
-					EJDJR_QT: '0', //二级电加热启停(0:停止,1:启动)
-					SJDJR_QT: '0', //三级电加热启停(0:停止,1:启动)
-					SFF_KGKZ: '0', //送风阀开关控制(0:关闭,1:打开)
-					PFF_KGKZ: '0', //排风阀开关控制(0:关闭,1:打开)
-					FLZJ_QT: '0', //风冷主机启停(0:停止,1:启动)
+					SFJ_QT: '', //送风机工频启动(:停止,1:启动)
+					PFJ_QT: '', //排风机工频启动(0:停止,1:启动)
+					YJDJR_QT: '', //一级电加热启停(0:停止,1:启动)
+					EJDJR_QT: '', //二级电加热启停(0:停止,1:启动)
+					SJDJR_QT: '', //三级电加热启停(0:停止,1:启动)
+					SFF_KGKZ: '', //送风阀开关控制(0:关闭,1:打开)
+					PFF_KGKZ: '', //排风阀开关控制(0:关闭,1:打开)
+					FLZJ_QT: '', //风冷主机启停(0:停止,1:启动)
 
 					//上部三个按钮
 				}
@@ -320,6 +320,39 @@
 			this.getSD_SD()
 			this.getWD_SD()
 
+			//三个按钮
+			this.getJZXZ()
+			this.getMSXZ()
+			this.getGZFW()
+
+			//控制模式
+			this.getSFJSZXZ()
+			this.getPFJSZXZ()
+			this.getFLZJSZXZ()
+			this.getYJSZXZ()
+			this.getEJSZXZ()
+			this.getSJSZXZ()
+			this.getSFFSZXZ()
+			this.getPFFSZXZ()
+			this.getLSFSZXZ()
+			this.getRSFSZXZ()
+			this.getJSFSZXZ()
+
+			//手动命令
+			this.getSFJSDQD()
+			this.getPFJSDQD()
+			this.getFLZJSDQD()
+			this.getYJSDQD()
+			this.getEJSDQD()
+			this.getSJSDQD()
+			this.getSFFSDQD()
+			this.getPFFSDQD()
+			this.getLSFSDQD()
+			this.getRSFSDQD()
+			this.getJSFSDQD()
+
+
+			//实时反馈
 			this.getJSF_SDKD()
 			this.getLSF_SDKD()
 			this.getRSF_SDKD()
@@ -385,6 +418,311 @@
 				console.log(res.data.data.value);
 			},
 
+			//三个按钮数据
+			async getJZXZ(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "247",
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				this.formData.JZ_XZ = res.data.data.deviceParam.value;
+				console.log("JZXZ==" + this.formData.JZ_XZ);
+			},
+			async getMSXZ(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "242",
+				};
+
+				let res = await uni.$http.get(url, data);
+				this.formData.MS_XZ = res.data.data.deviceParam.value;
+				console.log("MSXZ==" + this.formData.MS_XZ);
+			},
+			async getGZFW(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "260",
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				this.formData.GZ_FW = res.data.data.deviceParam.value;
+				console.log("GZFW==" + this.formData.GZ_FW);
+			},
+
+			//控制模式
+			async getSFJSZXZ(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "204",
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				this.formData.SFJ_SZXZ = res.data.data.deviceParam.value;
+				console.log("SFJ_SZXZ==" + this.formData.SFJ_SZXZ);
+			},
+			async getPFJSZXZ(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "203",
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				this.formData.PFJ_SZXZ = res.data.data.deviceParam.value;
+				console.log("PFJ_SZXZ==" + this.formData.PFJ_SZXZ);
+			},
+			async getFLZJSZXZ(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "305",
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				this.formData.FLZJ_SZXZ = res.data.data.deviceParam.value;
+				console.log("FLZJ_SZXZ==" + this.formData.FLZJ_SZXZ);
+			},
+			async getYJSZXZ(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "249",
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				this.formData.YJDJR_SZXZ = res.data.data.deviceParam.value;
+				console.log("YJDJR_SZXZ==" + this.formData.YJDJR_SZXZ);
+			},
+			async getEJSZXZ(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "214",
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				this.formData.EJDJR_SZXZ = res.data.data.deviceParam.value;
+				console.log("EJDJR_SZXZ==" + this.formData.EJDJR_SZXZ);
+			},
+			async getSJSZXZ(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "265",
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				this.formData.SJDJR_SZXZ = res.data.data.deviceParam.value;
+				console.log("SJDJR_SZXZ==" + this.formData.SJDJR_SZXZ);
+			},
+			async getSFFSZXZ(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "290",
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				this.formData.SFF_SZXZ = res.data.data.deviceParam.value;
+				console.log("SFF_SZXZ==" + this.formData.SFF_SZXZ);
+			},
+			async getPFFSZXZ(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "242",
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				this.formData.PFF_SZXZ = res.data.data.deviceParam.value;
+				console.log("PFF_SZXZ==" + this.formData.PFF_SZXZ);
+			},
+			async getLSFSZXZ(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "209",
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				this.formData.LSF_SZXZ = res.data.data.deviceParam.value;
+				console.log("LSF_SZXZ==" + this.formData.LSF_SZXZ);
+			},
+			async getRSFSZXZ(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "208",
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				this.formData.RSF_SZXZ = res.data.data.deviceParam.value;
+				console.log("RSF_SZXZ==" + this.formData.RSF_SZXZ);
+			},
+			async getJSFSZXZ(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "210",
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				this.formData.JSF_SZXZ = res.data.data.deviceParam.value;
+				console.log("JSF_SZXZ==" + this.formData.JSF_SZXZ);
+			},
+
+			//手动命令
+			async getSFJSDQD(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "261",
+				};
+
+				let res = await uni.$http.get(url, data);
+
+				this.formData.SFJ_SDQD = res.data.data.deviceParam.value;
+				console.log("SFJ_SDQD==" + this.formData.SFJ_SDQD);
+			},
+			async getPFJSDQD(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "263",
+				};
+			
+				let res = await uni.$http.get(url, data);
+			
+				this.formData.PFJ_SDQD = res.data.data.deviceParam.value;
+				console.log("PFJ_SDQD==" + this.formData.PFJ_SDQD);
+			},
+			async getFLZJSDQD(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "244",
+				};
+			
+				let res = await uni.$http.get(url, data);
+			
+				this.formData.FLZJ_SDQD = res.data.data.deviceParam.value;
+				console.log("FLZJ_SDQD==" + this.formData.FLZJ_SDQD);
+			},
+			async getYJSDQD(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "301",
+				};
+			
+				let res = await uni.$http.get(url, data);
+			
+				this.formData.YJDJR_SDQD = res.data.data.deviceParam.value;
+				console.log("YJDJR_SDQD==" + this.formData.YJDJR_SDQD);
+			},
+			async getEJSDQD(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "272",
+				};
+			
+				let res = await uni.$http.get(url, data);
+			
+				this.formData.EJDJR_SDQD = res.data.data.deviceParam.value;
+				console.log("EJDJR_SDQD==" + this.formData.EJDJR_SDQD);
+			},
+			async getSJSDQD(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "202",
+				};
+			
+				let res = await uni.$http.get(url, data);
+			
+				this.formData.SJDJR_SDQD = res.data.data.deviceParam.value;
+				console.log("SJDJR_SDQD==" + this.formData.SJDJR_SDQD);
+			},
+			async getSFFSDQD(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "239",
+				};
+			
+				let res = await uni.$http.get(url, data);
+			
+				this.formData.SFF_SDQD = res.data.data.deviceParam.value;
+				console.log("SFF_SDQD==" + this.formData.SFF_SDQD);
+			},
+			async getPFFSDQD(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "284",
+				};
+			
+				let res = await uni.$http.get(url, data);
+			
+				this.formData.PFF_SDQD = res.data.data.deviceParam.value;
+				console.log("PFF_SDQD==" + this.formData.PFF_SDQD);
+			},
+			async getLSFSDQD(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "238",
+				};
+			
+				let res = await uni.$http.get(url, data);
+			
+				this.formData.LSF_SDKD = res.data.data.deviceParam.value;
+				console.log("LSF_SDKD==" + this.formData.LSF_SDKD);
+			},
+			async getRSFSDQD(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "289",
+				};
+			
+				let res = await uni.$http.get(url, data);
+			
+				this.formData.RSF_SDKD = res.data.data.deviceParam.value;
+				console.log("RSF_SDKD==" + this.formData.RSF_SDKD);
+			},
+			async getJSFSDQD(e) {
+				let vm = this;
+				let url = uni.$api.deviceParam.detail;
+				let data = {
+					id: "288",
+				};
+			
+				let res = await uni.$http.get(url, data);
+			
+				this.formData.JSF_SDKD = res.data.data.deviceParam.value;
+				console.log("JSF_SDKD==" + this.formData.JSF_SDKD);
+			},
+
 
 
 			async shouZiDong(e) {
@@ -393,7 +731,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "209",
+					id: "210",
 					value: this.formData.JSF_SZXZ,
 					name: "JSF_SZXZ",
 					sn: "CK1"
@@ -408,7 +746,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "210",
+					id: "209",
 					value: this.formData.LSF_SZXZ,
 					name: "LSF_SZXZ",
 					sn: "CK1"
@@ -485,7 +823,7 @@
 				let vm = this;
 				let url = uni.$api.deviceParam.updateParam;
 				let data = {
-					id: "241",
+					id: "242",
 					value: this.formData.PFF_SZXZ,
 					name: "PFF_SZXZ",
 					sn: "CK1"

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

@@ -1,74 +1,73 @@
 {
-    "pages": [
-        "pages/operator/operator",
-        "pages/login/login",
-        "pages/operator/operatorInfo/operatorInfo",
-        "pages/device/device",
-        "pages/device/deviceInfo/deviceInfo",
-        "pages/staticProject/staticProject",
-        "pages/project/project",
-        "pages/project/projectInfo/projectInfo",
-        "pages/alarm/alarm",
-        "pages/operatorLog/operatorLog",
-        "pages/systemSet/systemSet",
-        "pages/error/error",
-        "pages/parameterSetting/parameterSetting",
-        "pages/systemParameter/systemParameter",
-        "pages/alarmRecord/alarmRecord",
-        "pages/maintenanceRecord/maintenanceRecord",
-        "pages/user/user",
-        "pages/rolePower/rolePower",
-        "pages/roleShowPower/roleShowPower",
-        "pages/runningState/runningState",
-        "pages/dataCurve/dataCurve",
-        "pages/power/power",
-        "pages/project/projectEdit/projectEdit"
-    ],
-    "subPackages": [],
-    "window": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "uni-app",
-        "navigationBarBackgroundColor": "#F8F8F8",
-        "backgroundColor": "#F8F8F8"
-    },
-    "tabBar": {
-        "color": "#7A7E83",
-        "selectedColor": "#3cc51f",
-        "borderStyle": "black",
-        "backgroundColor": "#ffffff",
-        "list": [
-            {
-                "pagePath": "pages/operator/operator",
-                "iconPath": "static/底部按钮/项目管理@2x.png",
-                "selectedIconPath": "static/底部按钮/项目管理@2x.png",
-                "text": "运营商管理"
-            },
-            {
-                "pagePath": "pages/project/project",
-                "iconPath": "static/底部按钮/项目管理@2x.png",
-                "selectedIconPath": "static/底部按钮/项目管理@2x.png",
-                "text": "项目管理"
-            },
-            {
-                "pagePath": "pages/alarm/alarm",
-                "iconPath": "static/底部按钮/报警管理@2x.png",
-                "selectedIconPath": "static/底部按钮/报警管理@2x.png",
-                "text": "报警管理"
-            },
-            {
-                "pagePath": "pages/operatorLog/operatorLog",
-                "iconPath": "static/底部按钮/操作日志@2x.png",
-                "selectedIconPath": "static/底部按钮/操作日志@2x.png",
-                "text": "操作日志"
-            },
-            {
-                "pagePath": "pages/systemSet/systemSet",
-                "iconPath": "static/底部按钮/系统设置@2x.png",
-                "selectedIconPath": "static/底部按钮/系统设置@2x.png",
-                "text": "系统设置"
-            }
-        ]
-    },
-    "usingComponents": {},
-    "sitemapLocation": "sitemap.json"
+  "pages": [
+    "pages/operator/operator",
+    "pages/login/login",
+    "pages/operator/operatorInfo/operatorInfo",
+    "pages/device/device",
+    "pages/device/deviceInfo/deviceInfo",
+    "pages/staticProject/staticProject",
+    "pages/project/project",
+    "pages/project/projectInfo/projectInfo",
+    "pages/alarm/alarm",
+    "pages/operatorLog/operatorLog",
+    "pages/systemSet/systemSet",
+    "pages/error/error",
+    "pages/parameterSetting/parameterSetting",
+    "pages/systemParameter/systemParameter",
+    "pages/alarmRecord/alarmRecord",
+    "pages/maintenanceRecord/maintenanceRecord",
+    "pages/user/user",
+    "pages/rolePower/rolePower",
+    "pages/roleShowPower/roleShowPower",
+    "pages/runningState/runningState",
+    "pages/dataCurve/dataCurve",
+    "pages/power/power",
+    "pages/project/projectEdit/projectEdit"
+  ],
+  "subPackages": [],
+  "window": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "uni-app",
+    "navigationBarBackgroundColor": "#F8F8F8",
+    "backgroundColor": "#F8F8F8"
+  },
+  "tabBar": {
+    "color": "#7A7E83",
+    "selectedColor": "#3cc51f",
+    "borderStyle": "black",
+    "backgroundColor": "#ffffff",
+    "list": [
+      {
+        "pagePath": "pages/operator/operator",
+        "iconPath": "static/底部按钮/项目管理@2x.png",
+        "selectedIconPath": "static/底部按钮/项目管理@2x.png",
+        "text": "运营商管理"
+      },
+      {
+        "pagePath": "pages/project/project",
+        "iconPath": "static/底部按钮/项目管理@2x.png",
+        "selectedIconPath": "static/底部按钮/项目管理@2x.png",
+        "text": "项目管理"
+      },
+      {
+        "pagePath": "pages/alarm/alarm",
+        "iconPath": "static/底部按钮/报警管理@2x.png",
+        "selectedIconPath": "static/底部按钮/报警管理@2x.png",
+        "text": "报警管理"
+      },
+      {
+        "pagePath": "pages/operatorLog/operatorLog",
+        "iconPath": "static/底部按钮/操作日志@2x.png",
+        "selectedIconPath": "static/底部按钮/操作日志@2x.png",
+        "text": "操作日志"
+      },
+      {
+        "pagePath": "pages/systemSet/systemSet",
+        "iconPath": "static/底部按钮/系统设置@2x.png",
+        "selectedIconPath": "static/底部按钮/系统设置@2x.png",
+        "text": "系统设置"
+      }
+    ]
+  },
+  "usingComponents": {}
 }

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

@@ -19,7 +19,24 @@
     "libVersion": "2.26.0",
     "appid": "wx95c3daeeb44f85f6",
     "projectname": "vrv-platform",
-    "condition": {},
+    "condition": {
+        "search": {
+            "current": -1,
+            "list": []
+        },
+        "conversation": {
+            "current": -1,
+            "list": []
+        },
+        "game": {
+            "current": -1,
+            "list": []
+        },
+        "miniprogram": {
+            "current": -1,
+            "list": []
+        }
+    },
     "editorSetting": {
         "tabIndent": "insertSpaces",
         "tabSize": 4

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

@@ -3,5 +3,18 @@
     "projectname": "vrv-platform",
     "setting": {
         "compileHotReLoad": true
+    },
+    "condition": {
+        "miniprogram": {
+            "list": [
+                {
+                    "name": "",
+                    "pathName": "pages/parameterSetting/parameterSetting",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                }
+            ]
+        }
     }
 }

sources/client/vrv-platform/src/views/paramSetting/paramSetting.vue

@@ -856,7 +856,7 @@ export default {
       const vm = this;
       vm.$http.get(vm.$api.deviceParam.detail, {
         params: {
-          id: '241'
+          id: '242'
         }
       }).then((res) => {
         this.formData.PFF_SZXZ = res.data.data.deviceParam.value;

sources/server/vrv/run/application.pid

@@ -1 +0,0 @@
-5776