d

sources/client/vrv-moblie/pages.json

@@ -1,19 +1,20 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-			"path": "pages/operator/operator",
+			"path": "pages/login/login",
 			"style": {
-				"navigationBarTitleText": "运营商管理",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path": "pages/login/login",
+			"path": "pages/operator/operator",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "运营商管理",
 				"enablePullDownRefresh": false
 			}
 		},
+
 		{
 			"path": "pages/operator/operatorInfo/operatorInfo",
 			"style": {
@@ -125,16 +126,16 @@
 
 		}, {
 			"path": "pages/rolePower/rolePower",
-		 "style": {
+			"style": {
 				"navigationBarTitleText": "角色管理",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-		 "path": "pages/roleShowPower/roleShowPower",
+			"path": "pages/roleShowPower/roleShowPower",
 			"style": {
 				"navigationBarTitleText": "角色权限管理",
-		 	"enablePullDownRefresh": false
+				"enablePullDownRefresh": false
 			}
 
 		}, {

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

@@ -70,6 +70,29 @@
 		data() {
 			let _width = uni.upx2px(350);
 			return {
+				timeData: {
+					time1: '',
+					time2: '',
+					time3: '',
+					time4: '',
+					time5: ''
+				},
+				WDdata: {
+					WD1: '',
+					WD2: '',
+					WD3: '',
+					WD4: '',
+					WD5: '',
+				},
+				SDdata: {
+					SD1: '',
+					SD2: '',
+					SD3: '',
+					SD4: '',
+					SD5: '',
+				},
+
+
 				formData: {
 					WD_1: '',
 					SD_1: '',
@@ -102,26 +125,27 @@
 
 				//温度
 				data: { //数据
-					categories: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"],
+					categories: ["10:58:12", "11:58:12", "12:58:12", "13:58:12", "14:58:12"],
 					series: [{
 						name: "温度实际值",
-						data: [40, 30, 36, 44, 34, 30, 22],
+
+						data: [40, 30, 36, 44, 34],
 					}, {
 						name: "温度设定值",
-						data: [10, 25, 23, 33, 23, 35, 56],
+						data: [10, 25, 23, 33, 23],
 						color: "#336633"
 					}]
 				},
 
 				//湿度
 				data11: { //数据
-					categories11: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"],
+					categories11: ["10:58:12", "11:58:12", "12:58:12", "13:58:12", "14:58:12"],
 					series11: [{
 						name: "湿度实际值",
-						data: [40, 30, 36, 44, 38, 34, 30],
+						data: [40, 30, 36, 44, 38],
 					}, {
 						name: "湿度设定值",
-						data: [10, 25, 23, 33, 23, 35, 56],
+						data: [10, 25, 23, 33, 23],
 						color: "red"
 					}]
 				},

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

@@ -22,7 +22,7 @@
 						<view class="uni-form-item">
 							<view class="titleA">密码</view>
 							<view class="input">
-								<input type="text" placeholder="请输入密码" v-model="formData.password"
+								<input type="password" placeholder="请输入密码" v-model="formData.password"
 									style="margin-left: 30rpx;" />
 								<!-- 	<input placeholder="请输入密码" v-model="formData.password" style="margin-left: 30rpx;" />
 								<view class="icon">

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

@@ -256,7 +256,7 @@
 	export default {
 		data() {
 			return {
-				value: '',
+				// value: '',
 
 				deviceParams: [],
 
@@ -309,10 +309,6 @@
 					FLZJ_QT: '0', //风冷主机启停(0:停止,1:启动)
 
 					//上部三个按钮
-
-
-
-
 				}
 			}
 		},

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

@@ -152,7 +152,6 @@
 					HSL: '',
 					HSL_SD: '',
 					JZ_YSTZ: '',
-					JZ_KGJ: '',
 					Id: '',
 					code: '',
 

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

@@ -1,7 +1,7 @@
 {
   "pages": [
-    "pages/operator/operator",
     "pages/login/login",
+    "pages/operator/operator",
     "pages/operator/operatorInfo/operatorInfo",
     "pages/device/device",
     "pages/device/deviceInfo/deviceInfo",

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

@@ -227,6 +227,29 @@ var _default =
   data: function data() {
     var _width = uni.upx2px(350);
     return {
+      timeData: {
+        time1: '',
+        time2: '',
+        time3: '',
+        time4: '',
+        time5: '' },
+
+      WDdata: {
+        WD1: '',
+        WD2: '',
+        WD3: '',
+        WD4: '',
+        WD5: '' },
+
+      SDdata: {
+        SD1: '',
+        SD2: '',
+        SD3: '',
+        SD4: '',
+        SD5: '' },
+
+
+
       formData: {
         WD_1: '',
         SD_1: '',
@@ -259,26 +282,27 @@ var _default =
 
       //温度
       data: { //数据
-        categories: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"],
+        categories: ["10:58:12", "11:58:12", "12:58:12", "13:58:12", "14:58:12"],
         series: [{
           name: "温度实际值",
-          data: [40, 30, 36, 44, 34, 30, 22] },
+
+          data: [40, 30, 36, 44, 34] },
         {
           name: "温度设定值",
-          data: [10, 25, 23, 33, 23, 35, 56],
+          data: [10, 25, 23, 33, 23],
           color: "#336633" }] },
 
 
 
       //湿度
       data11: { //数据
-        categories11: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"],
+        categories11: ["10:58:12", "11:58:12", "12:58:12", "13:58:12", "14:58:12"],
         series11: [{
           name: "湿度实际值",
-          data: [40, 30, 36, 44, 38, 34, 30] },
+          data: [40, 30, 36, 44, 38] },
         {
           name: "湿度设定值",
-          data: [10, 25, 23, 33, 23, 35, 56],
+          data: [10, 25, 23, 33, 23],
           color: "red" }] } };
 
 

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

@@ -416,7 +416,7 @@ var _default =
 {
   data: function data() {var _formData;
     return {
-      value: '',
+      // value: '',
 
       deviceParams: [],
 
@@ -471,10 +471,6 @@ var _default =
 
 
 
-
-
-
-
   },
   onLoad: function onLoad(e) {
     console.log(e);

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

@@ -9,8 +9,22 @@
             "list": [
                 {
                     "name": "",
-                    "pathName": "pages/device/deviceInfo/deviceInfo",
-                    "query": "code=2d7b1ddcdb3d4567a85ea85de677c67b",
+                    "pathName": "pages/runningState/runningState",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/parameterSetting/parameterSetting",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/dataCurve/dataCurve",
+                    "query": "",
                     "launchMode": "default",
                     "scene": null
                 }

sources/client/vrv-platform/src/config/api.js

@@ -54,6 +54,7 @@ const api = {
             detail: `${root}/deviceParam/detail`,
             delete: `${root}/deviceParam/delete`,
             batchDelete: `${root}/deviceParam/batchDelete`,
+            updateParam: `${root}/deviceParam/updateParam`,
         },
         deviceAlarmRecord: {
             list: `${root}/deviceAlarmRecord/list`,

sources/client/vrv-platform/src/main.js

@@ -3,12 +3,15 @@ import App from './App.vue'
 // import _ from 'lodash'
 import router from './router'
 import store from './store'
+import echarts from 'echarts'
+
 console.log(router);
 
 //引入element
 import ElementUI from 'element-ui';
 import {Message} from 'element-ui';
 import 'element-ui/lib/theme-chalk/index.css';
+
 Vue.use(ElementUI);
 
 
@@ -47,9 +50,10 @@ import moment from 'moment'
 // import utils from './util/utils'
 
 Vue.prototype.$moment = moment;
-Vue.prototype.$api = api ;
+Vue.prototype.$api = api;
 Vue.prototype.$http = axios;
 Vue.prototype.$qs = qs;
+Vue.prototype.$echarts = echarts
 // Vue.prototype.$utils = utils;
 axios.defaults.withCredentials = true;
 
@@ -90,61 +94,56 @@ Vue.config.productionTip = false
 // });
 
 
-
-
-
-
 //路由拦截器
-router.beforeEach((to,form,next)=>{
+router.beforeEach((to, form, next) => {
 
 
-  if(to.path.startsWith('/update-user-password')){
-    next();
-    if(window.updatePassword){
-      Message.warning("请修改密码再进行操作！");
+    if (to.path.startsWith('/update-user-password')) {
+        next();
+        if (window.updatePassword) {
+            Message.warning("请修改密码再进行操作！");
+        }
+        return;
     }
-    return;
-  }
 
 
-  if(sessionStorage.getItem("login-user-info") != null){
+    if (sessionStorage.getItem("login-user-info") != null) {
 
 
-    let userInfo = JSON.parse(sessionStorage.getItem("login-user-info"));
+        let userInfo = JSON.parse(sessionStorage.getItem("login-user-info"));
 
 
-    if(window.appSetting && window.appSetting["UPDATE_PWD_INTERVAL"] && window.appSetting["UPDATE_PWD_INTERVAL"].value !== "0"){
+        if (window.appSetting && window.appSetting["UPDATE_PWD_INTERVAL"] && window.appSetting["UPDATE_PWD_INTERVAL"].value !== "0") {
 
-      if(!userInfo.lastUpdatePwdTime){
-        window.updatePassword = true;
+            if (!userInfo.lastUpdatePwdTime) {
+                window.updatePassword = true;
 
-        next('/update-user-password')
-        return ;
-      }
+                next('/update-user-password')
+                return;
+            }
 
-      if(userInfo.lastUpdatePwdTime <= parseInt(window.appSetting["UPDATE_PWD_INTERVAL"]) * 24 * 60 * 60 * 1000){
-        next('/update-user-password');
-        return;
-      }
+            if (userInfo.lastUpdatePwdTime <= parseInt(window.appSetting["UPDATE_PWD_INTERVAL"]) * 24 * 60 * 60 * 1000) {
+                next('/update-user-password');
+                return;
+            }
 
-      next();
+            next();
 
 
+        } else {
+            next();
+        }
 
-    }else{
-      next();
+    } else {
+        next();
     }
 
-  }else{
-    next();
-  }
-
 });
 
 window.routeViewType = 'route';
 
 new Vue({
-  router,
-  store,
-  render: h => h(App)
+    router,
+    store,
+    render: h => h(App)
 }).$mount('#app');

sources/client/vrv-platform/src/router/index.js

@@ -8,7 +8,7 @@ export default new Router({
     routes: [
         {
 
-            path: '/',
+            path: '/menu',
             name: 'menu',
             component: () => import(/* webpackChunkName: "views" */ '../views/menu/menu'),
             children: [
@@ -164,7 +164,7 @@ export default new Router({
         },
 
         {
-            path: '/login',
+            path: '/',
             name: 'login',
             meta: {title: '登录', tab: true, keepAlive: true},
             component: () => import(/* webpackChunkName: "views" */ '../views/login/login'),

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

@@ -0,0 +1,308 @@
+<template>
+  <div id="dataCurve">
+    <el-main>
+
+      <div style="margin-bottom: 10px">
+        <el-button size="medium" icon="el-icon-back" type="text" @click="back">返回</el-button>
+        <span style="margin-left: 20px; font-size: 18px">数据曲线</span>
+      </div>
+
+      <div style="display: flex;flex-direction: row;margin-left: 530px">
+        <div id="myChartWD" style="width: 250px;height: 250px"></div>
+
+        <div id="myChartSD" style="width: 250px;height: 250px"></div>
+      </div>
+      <div id="chartLineBox" style="width: 96%;margin-left: 30px;height: 500px;background-color: white"></div>
+
+
+    </el-main>
+
+
+  </div>
+
+</template>
+
+<script>
+
+export default {
+  name: 'dataCurve',
+  data() {
+    return {
+      formData: {
+        WD_1: '',
+        SD_1: '',
+        QX: '2', //星期
+        WD_SJ: '12',
+        SD_SJ: '23',
+        WD_SD: '34',
+        SD_SD: '45',
+      },
+
+      WDdata: {
+        WD1: '',
+        WD2: '',
+        WD3: '',
+        WD4: '',
+        WD5: '',
+      },
+
+      SDdata: {
+        SD1: '',
+        SD2: '',
+        SD3: '',
+        SD4: '',
+        SD5: '',
+      },
+    }
+  },
+
+  created() {
+    this.getWD_1()
+    this.getSD_1()
+
+    this.getWD_SJ()
+    this.getSD_SJ()
+  },
+
+  mounted: function () {
+  },
+
+  methods: {
+    back() {
+      let vm = this;
+      vm.$router.back()
+    },
+    getWD_1() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '207'
+        }
+      }).then((res) => {
+        this.formData.WD_1 = res.data.data.deviceParam.value;
+        this.myChartWD()
+      })
+    },
+    getSD_1() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '293'
+        }
+      }).then((res) => {
+        this.formData.SD_1 = res.data.data.deviceParam.value;
+        console.log(this.formData.SD_1)
+        this.myChartSD()
+      })
+    },
+    getWD_SJ() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '292'
+        }
+      }).then((res) => {
+        this.formData.WD_SJ = res.data.data.deviceParam.value;
+
+        this.WDdata.WD1 = res.data.data.deviceParam.value;
+        this.WDdata.WD2 = res.data.data.deviceParam.value;
+        this.WDdata.WD3 = res.data.data.deviceParam.value;
+        this.WDdata.WD4 = res.data.data.deviceParam.value;
+        this.WDdata.WD5 = res.data.data.deviceParam.value;
+
+        this.myChartLine()
+      })
+    },
+    getSD_SJ() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '280'
+        }
+      }).then((res) => {
+        this.formData.SD_SJ = res.data.data.deviceParam.value;
+      })
+    },
+
+    myChartWD() {
+      let myChart = this.$echarts.init(document.getElementById('myChartWD'));
+      // 绘制图表
+      myChart.setOption({
+        tooltip: {
+          formatter: "{a} <br/>{b} : {c}%",
+        },
+        toolbox: {
+          show: false,
+          feature: {
+            restore: {},
+            saveAsImage: {},
+          },
+        },
+        // 配置
+        series: [
+          {
+            name: "CK1排风温度显示",
+            type: "gauge",
+            axisLabel: {distance: 0, fontWeight: 100, shadowOffsetY: 100, height: 100},
+            axisLine: {
+              lineStyle: {
+                width: 12 // 修改仪表盘宽度的属性
+              }
+            },
+            splitLine: {//分隔线样式相关
+              length: 15,//分割线的长度
+              lineStyle: {
+                width: 1,
+                color: '#b0b3b8'
+              }
+            },
+            title: {offsetCenter: [0, '85%'], color: 'cornflowerblue'},
+            detail: {formatter: "{value}%", offsetCenter: [0, '65%'], fontStyle: "oblique", fontSize: 16},
+            pointer: {width: 4},
+            data: [{value: this.formData.WD_1, name: "CK1排风温度显示"}]
+          },
+        ],
+      });
+    },
+
+    myChartSD() {
+      let myChart = this.$echarts.init(document.getElementById('myChartSD'));
+      // 绘制图表
+      myChart.setOption({
+        tooltip: {
+          formatter: "{a} <br/>{b} : {c}%",
+        },
+        toolbox: {
+          show: false,
+          feature: {
+            restore: {},
+            saveAsImage: {},
+          },
+        },
+        // 配置
+        series: [
+          {
+            name: "CK1排风湿度显示",
+            type: "gauge",
+            axisLabel: {distance: 0, fontWeight: 100, shadowOffsetY: 100, height: 100},
+            axisLine: {
+              lineStyle: {
+                width: 12 // 修改仪表盘宽度的属性
+              }
+            },
+            splitLine: {//分隔线样式相关
+              length: 15,//分割线的长度
+              lineStyle: {
+                width: 1,
+                color: '#b0b3b8'
+              }
+            },
+            title: {offsetCenter: [0, '85%'], color: 'cornflowerblue'},
+            detail: {formatter: "{value}%", offsetCenter: [0, '65%'], fontStyle: "oblique", fontSize: 16},
+            pointer: {width: 4},
+            data: [{value: this.formData.SD_1, name: "CK1排风湿度显示"}]
+          },
+        ],
+      });
+    },
+
+    myChartLine() {
+      this.chartLine = this.$echarts.init(document.getElementById('chartLineBox'));
+
+      // 指定图表的配置项和数据
+      var option = {
+        tooltip: {              //设置tip提示
+          trigger: 'axis'
+        },
+
+        legend: {               //设置区分（哪条线属于什么）
+          data: ['排风温度变化', '排风湿度变化', '排风温度设定', '排风湿度设定']
+        },
+        color: ['#8AE09F', '#FA6F53', '#007AFF', '#AA6F46'],       //设置区分（每条线是什么颜色，和 legend 一一对应）
+        xAxis: {                //设置x轴
+          type: 'category',
+          boundaryGap: false,     //坐标轴两边不留白
+          data: ['0时', '1时', '2时', '3时', '4时', '5时', '6时', '7时', '8时', '9时', '10时', '11时', '12时', '13时', '14时', '15时', '16时', '17时', '18时', '19时', '20时', '21时', '22时', '23时', '24时'],
+          name: '',           //X轴 name
+          nameTextStyle: {        //坐标轴名称的文字样式
+            color: 'black',
+            fontSize: 16,
+            padding: [0, 0, 0, 20]
+          },
+          axisLine: {             //坐标轴轴线相关设置。
+            lineStyle: {
+              color: 'black',
+            }
+          }
+        },
+        yAxis: {
+          nameTextStyle: {
+            color: 'black',
+            fontSize: 16,
+            padding: [0, 0, 10, 0]
+          },
+          axisLine: {
+            lineStyle: {
+              color: 'black',
+            }
+          },
+          type: 'value'
+        },
+        series: [
+          {
+            name: '排风温度变化',
+            data: [this.WDdata.WD1, this.WDdata.WD2, this.WDdata.WD3, this.WDdata.WD4, this.WDdata.WD5, 26, 28],
+            type: 'line',               // 类型为折线图
+            lineStyle: {                // 线条样式 => 必须使用normal属性
+              normal: {
+                color: '#11E09F',
+              }
+            },
+          },
+          {
+            name: '排风湿度变化',
+            data: [55, 59, 64, 69, 57, 60, 66],
+            type: 'line',
+            lineStyle: {
+              normal: {
+                color: '#FA6F53',
+              }
+            },
+          }
+          ,
+          {
+            name: '排风温度设定',
+            data: [25, 25, 25, 25, 25, 25, 25],
+            type: 'line',
+            lineStyle: {
+              normal: {
+                color: '#007AFF',
+              }
+            },
+          }
+          ,
+          {
+            name: '排风湿度设定',
+            data: [55, 55, 55, 55, 55, 55, 55],
+            type: 'line',
+            lineStyle: {
+              normal: {
+                color: '#AA6F46',
+              }
+            },
+          }
+        ]
+      };
+
+      // 使用刚指定的配置项和数据显示图表。
+      this.chartLine.setOption(option);
+    },
+  }
+}
+</script>
+
+<style scoped>
+.button {
+  background-color: cornflowerblue;
+}
+</style>

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

@@ -109,7 +109,7 @@ export default {
 
 
           vm.$router.push({
-            path: '/',
+            path: '/menu',
             query: {userBean: resp.data.data.userBean}
           });
 

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

@@ -3,37 +3,34 @@
     <el-main>
 
       <div style="margin-bottom: 10px">
-        <el-button size="medium" icon="el-icon-back" type="text">返回</el-button>
+        <el-button size="medium" icon="el-icon-back" type="text" @click="back">返回</el-button>
         <span style="margin-left: 20px; font-size: 18px">运行状态</span>
       </div>
 
       <div style="padding: 10px">
 
         <div style="float:left; width: 600px;">
-          <el-table :data="tableData">
-            <el-table-column prop="deviceId" label="设备名称"></el-table-column>
-            <el-table-column prop="temp" label="温度"></el-table-column>
-            <el-table-column prop="humidity" label="湿度"></el-table-column>
-            <el-table-column prop="caa" label="含湿量"></el-table-column>
+          <el-table :data="formData" :header-cell-style="{background:'#007AFF',color:'white'}">
+            <el-table-column prop="sn" label="设备名称"></el-table-column>
+            <el-table-column prop="WD_1" label="温度（℃）"></el-table-column>
+            <el-table-column prop="SD_1" label="湿度（%）"></el-table-column>
+            <el-table-column prop="HSL" label="含湿量（g/kg）"></el-table-column>
           </el-table>
         </div>
 
         <!--        设置表-->
         <div class="setTable">
-          <el-table :data="setTableData" :header-cell-style="{'text-align':'center'}"
+          <el-table :data="setTableData" :header-cell-style="{'text-align':'center',background:'#007AFF',color:'white'}"
                     :cell-style="{'text-align':'center'}">
-            <el-table-column prop="pfwd" label="排风温度设定"></el-table-column>
-            <el-table-column prop="pfsd" label="排风湿度设定"></el-table-column>
-            <el-table-column prop="pfhsl" label="排风含湿量设定"></el-table-column>
-            <el-table-column prop="tjys" label="停机延时"></el-table-column>
+            <el-table-column prop="WD_SD" label="排风温度设定（℃）"></el-table-column>
+            <el-table-column prop="SD_SD" label="排风湿度设定（%）"></el-table-column>
+            <el-table-column prop="HSL_SD" label="排风含湿量设定（g/kg）"></el-table-column>
+            <el-table-column prop="JZ_YSTZ" label="停机延时（s）"></el-table-column>
             <el-table-column label="操作">
-              <template slot-scope="scope">
-
-                <el-button type="primary" style="background-color: #545c64;color: white;border: 0px" size="mini"
-                           @click="showEdit(scope.row)">编辑
-                </el-button>
-
-                <el-button type="danger" size="mini" @click="stop(scope.row)" style="background-color: brown;color: white;border: 0px">停止
+              <template>
+                <el-button type="danger" size="mini" @click="stopAndStart"
+                           class="Moren_button"
+                           :class="{'KGJ_button' :setTableData[0].JZ_KGJ == 1}">开关按钮
                 </el-button>
               </template>
             </el-table-column>
@@ -43,26 +40,29 @@
 
         <!--        状态表-->
         <div class="stateTable">
-          <el-table :data="stateTable" :header-cell-style="{'text-align':'center'}"
+          <el-table :data="stateTable" :header-cell-style="{'text-align':'center',background:'#007AFF',color:'white'}"
                     :cell-style="{'text-align':'center'}">
-            <el-table-column prop="rsf" label="热水阀"></el-table-column>
-            <el-table-column prop="lsf" label="冷水阀"></el-table-column>
-            <el-table-column prop="djr" label="电加热" width="220">
+            <el-table-column prop="RSF" label="热水阀"></el-table-column>
+            <el-table-column prop="LSF" label="冷水阀"></el-table-column>
+            <el-table-column prop="JSF" label="电加热" width="220">
               <template>
                 <el-button
-                    style="color:white;background-color: green;border: 0px"
+                    class="Moren_button"
+                    :class="{'KGJ_button' :stateTable[0].YJDJR_QT == 1}"
                     type="primary"
                     size="small">
                   一
                 </el-button>
                 <el-button
-                    style="color:white;background-color: green;border: 0px"
+                    class="Moren_button"
+                    :class="{'KGJ_button' :stateTable[0].EJDJR_QT == 1}"
                     type="primary"
                     size="small">
                   二
                 </el-button>
                 <el-button
-                    style="color:white;background-color: green;border: 0px"
+                    class="Moren_button"
+                    :class="{'KGJ_button' :stateTable[0].SJDJR_QT == 1}"
                     type="primary"
                     size="small">
                   三
@@ -71,53 +71,49 @@
             </el-table-column>
             <el-table-column prop="jsq" label="加湿器"></el-table-column>
             <el-table-column prop="cxlw" label="初效滤网">
-              <template slot-scope="scope">
+              <template>
                 <el-button
-                    style="color:white;background-color: green;border: 0px"
+                    class="Moren_button"
+                    :class="{'KGJ_button' :stateTable[0].LWDS_CX == 1}"
                     type="primary"
-                    size="small"
-                    @click="statusHandle(scope.row)"
-                >
-                  {{ scope.row.status == '正常' ? '正常' : '异常' }}
+                    size="small">
+                  {{ this.stateTable[0].LWDS_CX == 0 ? "正常" : "报警" }}
                 </el-button>
               </template>
             </el-table-column>
 
             <el-table-column prop="zxlw" label="中效滤网">
-              <template slot-scope="scope">
+              <template>
                 <el-button
-                    style="color:white;background-color: green;border: 0px"
+                    class="Moren_button"
+                    :class="{'KGJ_button' :stateTable[0].LWDS_ZX == 1}"
                     type="primary"
-                    size="small"
-                    @click="statusHandle(scope.row)"
-                >
-                  {{ scope.row.status == '正常' ? '正常' : '异常' }}
+                    size="small">
+                  {{ this.stateTable[0].LWDS_ZX == 0 ? "正常" : "报警" }}
                 </el-button>
               </template>
             </el-table-column>
 
             <el-table-column prop="gwbj" label="高温报警">
-              <template slot-scope="scope">
+              <template>
                 <el-button
-                    style="color:white;background-color: green;border: 0px"
+                    class="Moren_button"
+                    :class="{'KGJ_button' :stateTable[0].GW_BJ == 1}"
                     type="primary"
-                    size="small"
-                    @click="statusHandle(scope.row)"
-                >
-                  {{ scope.row.status == '正常' ? '正常' : '异常' }}
+                    size="small">
+                  {{ this.stateTable[0].GW_BJ == 0 ? "正常" : "报警" }}
                 </el-button>
               </template>
             </el-table-column>
 
             <el-table-column prop="qfyc" label="缺风压差">
-              <template slot-scope="scope">
+              <template>
                 <el-button
-                    style="color:white;background-color: green;border: 0px"
+                    class="Moren_button"
+                    :class="{'KGJ_button' :stateTable[0].QFYC_BJ == 1}"
                     type="primary"
-                    size="small"
-                    @click="statusHandle(scope.row)"
-                >
-                  {{ scope.row.status == '正常' ? '正常' : '异常' }}
+                    size="small">
+                  {{ this.stateTable[0].QFYC_BJ == 0 ? "正常" : "报警" }}
                 </el-button>
               </template>
             </el-table-column>
@@ -125,37 +121,6 @@
           </el-table>
         </div>
       </div>
-
-      <div>
-        <el-dialog title="参数设定" :visible.sync="dialogFormVisible" style="width: 70% ; margin-left: 300px ;">
-          <el-form inline="true" :model="formData" label-width="100px" label-position="left">
-
-            <el-row style="margin-left: 14px">
-              <el-form-item label="排风温度" prop="pfwd">
-                <el-input v-model="formData.pfwd"></el-input>
-              </el-form-item>
-              <el-form-item label="排风湿度" prop="pfsd">
-                <el-input v-model="formData.pfsd"></el-input>
-              </el-form-item>
-            </el-row>
-
-            <el-row style="margin-left: 14px">
-              <el-form-item label="排风含湿量" prop="pfhsl">
-                <el-input v-model="formData.pfhsl"></el-input>
-              </el-form-item>
-              <el-form-item label="停机延时" prop="tjys">
-                <el-input v-model="formData.tjys"></el-input>
-              </el-form-item>
-            </el-row>
-          </el-form>
-
-          <div slot="footer" class="dialog-footer" style="text-align: center">
-            <el-button @click="cancel()">取 消</el-button>
-            <el-button type="primary" @click="edit()">确 定</el-button>
-          </div>
-        </el-dialog>
-      </div>
-
     </el-main>
   </div>
 
@@ -168,38 +133,46 @@ export default {
     return {
       dialogFormVisible: false,
 
-      tableData:
-          [{
-            deviceId: 'SMART_KTX',
-            temp: '36℃',
-            humidity: '20%',
-            caa: '20g/kg'
-          }],
-
-      formData: {
-        pfwd: '',
-        pfsd: '',
-        pfhsl: '',
-        tjys: ''
-      },
+
+      formData: [{
+
+        sn: 'CK1',
+        WD_1: '',
+        SD_1: '545',
+        HSL: '45',
+
+        Id: '',
+        code: '',
+
+
+      }, {
+        sn: 'CK2',
+        WD_1: '',
+        SD_1: '',
+        HSL: '0'
+      }],
 
       setTableData: [{
-        pfwd: '36℃',
-        pfsd: '20%',
-        pfhsl: '9.6/kg',
-        tjys: '180s',
-        deviceState: '1'
+        WD_SD: '',
+        SD_SD: '',
+        HSL_SD: '',
+        JZ_YSTZ: '',
+        JZ_KGJ: '0', //设备开关机(0:停止,1:启动)
       }],
 
       stateTable: [{
-        lsf: '94%',
-        rsf: '97%',
-        djr: '',
-        jsq: '0%',
-        gwbj: '',
-        cxlw: '',
-        zxlw: '',
-        cfyc: ''
+        RSF: '',
+        LSF: '',
+        JSF: '',
+
+        GW_BJ: '0', //高温报警(0:正常,1:报警)
+        QFYC_BJ: '1', //缺风压差(0:正常,1:报警)
+        LWDS_CX: '0', //初效故障报警(0:正常,1:故障)
+        LWDS_ZX: '1', //中效故障报警(0:正常,1:故障)
+
+        YJDJR_QT: '', //一级电加热启停(0:停止,1:启动)
+        EJDJR_QT: '', //二级电加热启停(0:停止,1:启动)
+        SJDJR_QT: '', //三级电加热启停(0:停止,1:启动)
       }]
 
 
@@ -207,10 +180,265 @@ export default {
   },
 
   created: function () {
-    this.loadData();
+    this.getWD_1()
+    this.getSD_1()
+    this.getHSL()
+    this.getWD_2()
+    this.getSD_2()
+
+    this.getYSTZ()
+    this.getWD_SD()
+    this.getSD_SD()
+    this.getHSL_SD()
+
+    this.getRSF()
+    this.getLSF()
+    this.getJSF()
+
+    this.getGWBJ()
+    this.getQFYC()
+    this.getCXLW()
+    this.getZXLW()
+
+    this.getYJDJR()
+    this.getEJDJR()
+    this.getSJDJR()
+    this.getJZ_KGJ()
   },
 
   methods: {
+    stopAndStart() {
+      this.setTableData[0].JZ_KGJ == 1 ? this.setTableData[0].JZ_KGJ = 0 : this.setTableData[0].JZ_KGJ = 1;
+      console.log(this.setTableData[0].JZ_KGJ)
+
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.updateParam, {
+        params: {
+          id: '267',
+          value: this.setTableData[0].JZ_KGJ,
+          name: "JZ_KGJ",
+          sn: "CK1"
+        }
+      }).then((res) => {
+        console.log(res);
+      })
+    },
+    getJZ_KGJ() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '267'
+        }
+      }).then((res) => {
+        this.setTableData[0].JZ_KGJ = res.data.data.deviceParam.value;
+        console.log(this.setTableData[0].JZ_KGJ);
+      })
+    },
+    getWD_1() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '207'
+        }
+      }).then((res) => {
+        this.formData[0].WD_1 = res.data.data.deviceParam.value;
+        console.log(this.formData[0].WD_1);
+      })
+    },
+
+    getSD_1() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '293'
+        }
+      }).then((res) => {
+        this.formData[0].SD_1 = res.data.data.deviceParam.value;
+        console.log(this.formData[0].SD_1);
+      })
+    },
+
+    getHSL() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '269'
+        }
+      }).then((res) => {
+        this.formData[0].HSL = res.data.data.deviceParam.value;
+        console.log(this.formData[0].HSL);
+      })
+    },
+
+    getWD_2() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '308'
+        }
+      }).then((res) => {
+        this.formData[1].WD_1 = res.data.data.deviceParam.value;
+      })
+    },
+
+    getSD_2() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '309'
+        }
+      }).then((res) => {
+        this.formData[1].SD_1 = res.data.data.deviceParam.value;
+      })
+    },
+
+    getWD_SD() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '296'
+        }
+      }).then((res) => {
+        this.setTableData[0].WD_SD = res.data.data.deviceParam.value;
+      })
+    },
+    getSD_SD() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '231'
+        }
+      }).then((res) => {
+        this.setTableData[0].SD_SD = res.data.data.deviceParam.value;
+      })
+    },
+    getYSTZ() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '219'
+        }
+      }).then((res) => {
+        this.setTableData[0].JZ_YSTZ = res.data.data.deviceParam.value;
+      })
+    },
+    getHSL_SD() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '227'
+        }
+      }).then((res) => {
+        this.setTableData[0].HSL_SD = res.data.data.deviceParam.value;
+      })
+    },
+
+    getJSF() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '212'
+        }
+      }).then((res) => {
+        this.stateTable[0].JSF = res.data.data.deviceParam.value;
+      })
+    },
+
+    getRSF() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '216'
+        }
+      }).then((res) => {
+        this.stateTable[0].RSF = res.data.data.deviceParam.value;
+      })
+    },
+
+    getLSF() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '268'
+        }
+      }).then((res) => {
+        this.stateTable[0].LSF = res.data.data.deviceParam.value;
+      })
+    },
+
+
+    getGWBJ() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '294'
+        }
+      }).then((res) => {
+        this.stateTable[0].GW_BJ = res.data.data.deviceParam.value;
+      })
+    },
+    getZXLW() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '303'
+        }
+      }).then((res) => {
+        this.stateTable[0].LWDS_ZX = res.data.data.deviceParam.value;
+      })
+    },
+    getQFYC() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '306'
+        }
+      }).then((res) => {
+        this.stateTable[0].QFYC_BJ = res.data.data.deviceParam.value;
+      })
+    },
+    getCXLW() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '283'
+        }
+      }).then((res) => {
+        this.stateTable[0].LWDS_CX = res.data.data.deviceParam.value;
+      })
+    },
+
+    getSJDJR() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '213'
+        }
+      }).then((res) => {
+        this.stateTable[0].SJDJR_QT = res.data.data.deviceParam.value;
+      })
+    },
+    getEJDJR() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '211'
+        }
+      }).then((res) => {
+        this.stateTable[0].EJDJR_QT = res.data.data.deviceParam.value;
+      })
+    },
+    getYJDJR() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '215'
+        }
+      }).then((res) => {
+        this.stateTable[0].YJDJR_QT = res.data.data.deviceParam.value;
+      })
+    },
+
     cancel() {
       this.$message({
         message: '操作取消',
@@ -220,14 +448,10 @@ export default {
 
       this.dialogFormVisible = false;
     },
-
-    showEdit(row) {
-      this.dialogFormVisible = true;
-
-      this.editRow = JSON.parse(JSON.stringify(row));
-      this.formData = this.editRow
-
-    }
+    back() {
+      let vm = this;
+      vm.$router.back()
+    },
   }
 }
 </script>
@@ -239,6 +463,16 @@ export default {
 
 }
 
+.Moren_button {
+  background-color: #007AFF;
+  color: white;
+  border: 0px
+}
+
+.KGJ_button {
+  background-color: brown;
+}
+
 .setTable {
   float: right;
   width: 900px;
@@ -248,4 +482,5 @@ export default {
   width: 200px
 }
 
+
 </style>

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

@@ -3,54 +3,284 @@
     <el-main>
 
       <div style="margin-bottom: 10px">
-        <el-button size="medium" icon="el-icon-back" type="text">返回</el-button>
+        <el-button size="medium" icon="el-icon-back" type="text" @click="back">返回</el-button>
         <span style="margin-left: 20px; font-size: 18px">参数设定</span>
       </div>
 
-      <div style="background-color: white;padding: 20px">
-        &nbsp; &nbsp;&nbsp; &nbsp; 排风温度修正：23.0℃ &nbsp; &nbsp;&nbsp; &nbsp;
-        &nbsp; &nbsp;&nbsp; &nbsp;
-        排风湿度修正：55.0%
-      </div>
+      <div style="display: flex;flex-direction: row">
+        <div class="divdiv">
+          <el-header style="margin-top: 20px">参数修正</el-header>
+          <el-form label-position="left" label-width="120px" :model="formData">
+            <el-form-item label="排风温度修正">
+              <el-input v-model="formData.WD1_XZ" readonly style="width: 240px;" @click.native="dialog1"></el-input>
+            </el-form-item>
 
-      <div class="divdiv">
-        <el-header style="margin-top: 20px">PID控制参数</el-header>
-        <el-form label-position="left" label-width="80px" :model="formData">
-          <el-form-item label="加热比例">
-            <el-input v-model="formData.jrbl" readonly></el-input>
-          </el-form-item>
-          <el-form-item label="加热积分">
-            <el-input v-model="formData.jrjf" readonly></el-input>
-          </el-form-item>
-          <el-form-item label="降温比例">
-            <el-input v-model="formData.jwbl" readonly></el-input>
-          </el-form-item>
-          <el-form-item label="降温积分">
-            <el-input v-model="formData.jwjf" readonly></el-input>
-          </el-form-item>
-          <el-form-item label="加湿比例">
-            <el-input v-model="formData.jsbl" readonly></el-input>
-          </el-form-item>
-          <el-form-item label="加湿积分">
-            <el-input v-model="formData.jsjf" readonly></el-input>
-          </el-form-item>
-          <el-form-item label="除湿比例">
-            <el-input v-model="formData.csbl" readonly></el-input>
-          </el-form-item>
-          <el-form-item label="除湿积分">
-            <el-input v-model="formData.csjf" readonly></el-input>
-          </el-form-item>
-        </el-form>
-
-        <div>
-          <el-button type="primary" style="  background-color: #545c64;
-  color: white;border: 0px">恢复出厂设置
-          </el-button>
+            <el-form-item label="排风湿度修正">
+              <el-input v-model="formData.SD1_XZ" readonly style="width: 240px;" @click.native="dialog2"></el-input>
+            </el-form-item>
+          </el-form>
         </div>
-      </div>
 
+        <div class="divdiv">
+          <el-header style="margin-top: 20px">PID控制参数</el-header>
+          <el-form label-position="left" label-width="80px" :model="formData">
+            <el-form-item label="加热比例">
+              <el-input v-model="formData.JR_P" readonly @click.native="dialogA"></el-input>
+            </el-form-item>
+            <el-form-item label="加热积分">
+              <el-input v-model="formData.JR_I" readonly @click.native="dialogB"></el-input>
+            </el-form-item>
+            <el-form-item label="降温比例">
+              <el-input v-model="formData.ZL_P" readonly @click.native="dialogC"></el-input>
+            </el-form-item>
+            <el-form-item label="降温积分">
+              <el-input v-model="formData.ZL_I" readonly @click.native="dialogD"></el-input>
+            </el-form-item>
+            <el-form-item label="加湿比例">
+              <el-input v-model="formData.JS_P" readonly @click.native="dialogE"></el-input>
+            </el-form-item>
+            <el-form-item label="加湿积分">
+              <el-input v-model="formData.JS_I" readonly @click.native="dialogF"></el-input>
+            </el-form-item>
+            <el-form-item label="除湿比例">
+              <el-input v-model="formData.CS_P" readonly @click.native="dialogG"></el-input>
+            </el-form-item>
+            <el-form-item label="除湿积分">
+              <el-input v-model="formData.CS_I" readonly @click.native="dialogH"></el-input>
+            </el-form-item>
+          </el-form>
+
+          <div>
+            <el-button type="primary" class="button" :class="{'Active_button' :formData.HF_CC == 1}"
+                       @click="updateHFCC">恢复出厂设置
+            </el-button>
+          </div>
+        </div>
+      </div>
 
     </el-main>
+
+    <!-- 输入框1 -->
+    <div>
+      <el-dialog
+          title="（输入范围：-50.0至50.0）"
+          :visible.sync="dialogVisible1"
+          width="25%"
+          style="margin-left: 160px;margin-top: 120px"
+      >
+        <div class="dialog">
+          排风温度修正：
+          <el-input v-model="objectWD_XZ" placeholder="请输入内容" size="small"
+                    style="width: 160px;"></el-input>&nbsp;℃
+        </div>
+        <div class="dialog">
+                <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible1 = false">取 消</el-button>
+    <el-button type="primary" @click="dialogConfirm1">确 定</el-button>
+  </span>
+        </div>
+      </el-dialog>
+    </div>
+
+    <!-- 输入框2 -->
+    <div>
+      <el-dialog
+          title="（输入范围：-100至100）"
+          :visible.sync="dialogVisible2"
+          width="25%"
+          style="margin-left: 160px;margin-top: 120px"
+      >
+        <div class="dialog">
+          排风湿度修正：
+          <el-input v-model="objectSD_XZ" placeholder="请输入内容" size="small"
+                    style="width: 160px;"></el-input>&nbsp;℃
+        </div>
+        <div class="dialog">
+                <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible2 = false">取 消</el-button>
+    <el-button type="primary" @click="dialogConfirm2">确 定</el-button>
+  </span>
+        </div>
+      </el-dialog>
+    </div>
+
+    <!-- 输入框JRP -->
+    <div>
+      <el-dialog
+          title="（输入范围：-999至999）"
+          :visible.sync="dialogVisibleA"
+          width="25%"
+          style="margin-left: 160px;margin-top: 120px"
+      >
+        <div class="dialog">
+          加热比例：
+          <el-input v-model="objecJRP" placeholder="请输入内容" size="small"
+                    style="width: 160px;"></el-input>&nbsp;℃
+        </div>
+        <div class="dialog">
+                <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisibleA = false">取 消</el-button>
+    <el-button type="primary" @click="dialogConfirmA">确 定</el-button>
+  </span>
+        </div>
+      </el-dialog>
+    </div>
+
+    <!-- 输入框JRI -->
+    <div>
+      <el-dialog
+          title="（输入范围：0至999）"
+          :visible.sync="dialogVisibleB"
+          width="25%"
+          style="margin-left: 160px;margin-top: 120px"
+      >
+        <div class="dialog">
+          加热积分：
+          <el-input v-model="objectJRI" placeholder="请输入内容" size="small"
+                    style="width: 160px;"></el-input>&nbsp;℃
+        </div>
+        <div class="dialog">
+                <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisibleB = false">取 消</el-button>
+    <el-button type="primary" @click="dialogConfirmB">确 定</el-button>
+  </span>
+        </div>
+      </el-dialog>
+    </div>
+
+    <!-- 输入框ZLP -->
+    <div>
+      <el-dialog
+          title="（输入范围：-999至999）"
+          :visible.sync="dialogVisibleC"
+          width="25%"
+          style="margin-left: 160px;margin-top: 120px"
+      >
+        <div class="dialog">
+          降温比例：
+          <el-input v-model="objectZLP" placeholder="请输入内容" size="small"
+                    style="width: 160px;"></el-input>&nbsp;℃
+        </div>
+        <div class="dialog">
+                <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisibleC = false">取 消</el-button>
+    <el-button type="primary" @click="dialogConfirmC">确 定</el-button>
+  </span>
+        </div>
+      </el-dialog>
+    </div>
+
+    <!-- 输入框ZLI -->
+    <div>
+      <el-dialog
+          title="（输入范围：0至999）"
+          :visible.sync="dialogVisibleD"
+          width="25%"
+          style="margin-left: 160px;margin-top: 120px"
+      >
+        <div class="dialog">
+          降温积分：
+          <el-input v-model="objectZLI" placeholder="请输入内容" size="small"
+                    style="width: 160px;"></el-input>&nbsp;℃
+        </div>
+        <div class="dialog">
+                <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisibleD = false">取 消</el-button>
+    <el-button type="primary" @click="dialogConfirmD">确 定</el-button>
+  </span>
+        </div>
+      </el-dialog>
+    </div>
+
+    <!-- 输入框JSP -->
+    <div>
+      <el-dialog
+          title="（输入范围：-999至999）"
+          :visible.sync="dialogVisibleE"
+          width="25%"
+          style="margin-left: 160px;margin-top: 120px"
+      >
+        <div class="dialog">
+          加湿比例：
+          <el-input v-model="objectJSP" placeholder="请输入内容" size="small"
+                    style="width: 160px;"></el-input>&nbsp;℃
+        </div>
+        <div class="dialog">
+                <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisibleE = false">取 消</el-button>
+    <el-button type="primary" @click="dialogConfirmE">确 定</el-button>
+  </span>
+        </div>
+      </el-dialog>
+    </div>
+
+    <!-- 输入框JSI -->
+    <div>
+      <el-dialog
+          title="（输入范围：0至999）"
+          :visible.sync="dialogVisibleF"
+          width="25%"
+          style="margin-left: 160px;margin-top: 120px"
+      >
+        <div class="dialog">
+          加湿积分：
+          <el-input v-model="objectJSI" placeholder="请输入内容" size="small"
+                    style="width: 160px;"></el-input>&nbsp;℃
+        </div>
+        <div class="dialog">
+                <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisibleF = false">取 消</el-button>
+    <el-button type="primary" @click="dialogConfirmF">确 定</el-button>
+  </span>
+        </div>
+      </el-dialog>
+    </div>
+
+    <!-- 输入框CSP -->
+    <div>
+      <el-dialog
+          title="（输入范围：-999至999）"
+          :visible.sync="dialogVisibleG"
+          width="25%"
+          style="margin-left: 160px;margin-top: 120px"
+      >
+        <div class="dialog">
+          除湿比例：
+          <el-input v-model="objectCSP" placeholder="请输入内容" size="small"
+                    style="width: 160px;"></el-input>&nbsp;℃
+        </div>
+        <div class="dialog">
+                <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisibleG = false">取 消</el-button>
+    <el-button type="primary" @click="dialogConfirmG">确 定</el-button>
+  </span>
+        </div>
+      </el-dialog>
+    </div>
+
+    <!-- 输入框CSI -->
+    <div>
+      <el-dialog
+          title="（输入范围：0至999）"
+          :visible.sync="dialogVisibleH"
+          width="25%"
+          style="margin-left: 160px;margin-top: 120px"
+      >
+        <div class="dialog">
+          除湿积分：
+          <el-input v-model="objectCSI" placeholder="请输入内容" size="small"
+                    style="width: 160px;"></el-input>&nbsp;℃
+        </div>
+        <div class="dialog">
+                <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisibleH = false">取 消</el-button>
+    <el-button type="primary" @click="dialogConfirmH">确 定</el-button>
+  </span>
+        </div>
+      </el-dialog>
+    </div>
+
+
   </div>
 
 </template>
@@ -60,56 +290,462 @@ export default {
   name: 'paramSetting',
   data() {
     return {
-      dialogFormVisible: false,
-
-      tableData:
-          [{
-            deviceId: '空调送风机',
-            kzms: '自动',
-            sdml: '停止',
-            ssfk: '运行'
-          }, {
-            deviceId: '空调排风机',
-            kzms: '自动',
-            sdml: '停止',
-            ssfk: '运行'
-          }, {
-            deviceId: '一级电加热',
-            kzms: '自动',
-            sdml: '停止',
-            ssfk: '开启'
-          }, {
-            deviceId: '二级电加热',
-            kzms: '自动',
-            sdml: '停止',
-            ssfk: '开启'
-          }, {
-            deviceId: '三级电加热',
-            kzms: '自动',
-            sdml: '停止',
-            ssfk: '关闭'
-          }],
+      dialogVisible1: false,
+      dialogFormVisible1: false,
+      dialogVisible2: false,
+      dialogFormVisible2: false,
+
+      dialogVisibleA: false,
+      dialogFormVisibleA: false,
+      dialogVisibleB: false,
+      dialogFormVisibleB: false,
+
+      dialogVisibleC: false,
+      dialogFormVisibleC: false,
+      dialogVisibleD: false,
+      dialogFormVisibleD: false,
+      dialogVisibleE: false,
+      dialogFormVisibleE: false,
+      dialogVisibleF: false,
+      dialogFormVisibleF: false,
+      dialogVisibleG: false,
+      dialogFormVisibleG: false,
+      dialogVisibleH: false,
+      dialogFormVisibleH: false,
+
+      objectWD_XZ: '',
+      objectSD_XZ: '',
+
+      objectZLP: '',
+      objectZLI: '',
+      objecJRP: '',
+      objectJRI: '',
+      objectJSP: '',
+      objectJSI: '',
+      objectCSP: '',
+      objectCSI: '',
 
       formData: {
-        jrbl: '14.0',
-        jrjf: '8.0%',
-        jwbl: '-15.0',
-        jwjf: '15.0',
-        jsbl: '10.0',
-        jsjf: '7.0',
-        csbl: '-18.0',
-        csjf: '40.0',
-      },
+        ZL_P: '0.0', //制冷回路增益P
+        ZL_I: '0.0', //制冷积分时间I
+        CS_P: '0.0', //除湿回路增益P
+        CS_I: '0.0', //除湿积分时间I
+        JR_P: '0.0', //加热回路增益P
+        JR_I: '0.0', //加热积分时间I
+        JS_P: '0.0', //加湿回路增益P
+        JS_I: '0.0', //加湿积分时间I
+
+        WD1_XZ: '0.0', //排风温度修正(单位为℃)
+        SD1_XZ: '0.0', //排风湿度修正(单位为%RH)
+
+        HF_CC: '0', //恢复出厂
+      }
 
 
     }
   },
 
   created: function () {
+    this.getWDXZ()
+    this.getSDXZ()
+    this.getJR_I()
+    this.getJR_P()
+    this.getJW_I()
+    this.getJW_P()
+    this.getJS_I()
+    this.getJS_P()
+    this.getCS_I()
+    this.getCS_P()
 
+    this.getHF_CC()
   },
 
-  methods: {}
+  methods: {
+    //两个修正
+    getWDXZ() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '235'
+        }
+      }).then((res) => {
+        this.formData.WD1_XZ = res.data.data.deviceParam.value;
+      })
+    },
+    getSDXZ() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '287'
+        }
+      }).then((res) => {
+        this.formData.SD1_XZ = res.data.data.deviceParam.value;
+        console.log(this.formData.SD1_XZ)
+      })
+    },
+
+    getHF_CC() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '237'
+        }
+      }).then((res) => {
+        this.formData.HF_CC = res.data.data.deviceParam.value;
+        console.log(this.formData.HF_CC)
+      })
+    },
+
+    //8个比例积分
+    getJR_P() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '226'
+        }
+      }).then((res) => {
+        this.formData.JR_P = res.data.data.deviceParam.value;
+      })
+    },
+    getJR_I() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '220'
+        }
+      }).then((res) => {
+        this.formData.JR_I = res.data.data.deviceParam.value;
+      })
+    },
+    getJW_P() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '275'
+        }
+      }).then((res) => {
+        this.formData.ZL_P = res.data.data.deviceParam.value;
+      })
+    },
+    getJW_I() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '236'
+        }
+      }).then((res) => {
+        this.formData.ZL_I = res.data.data.deviceParam.value;
+      })
+    },
+    getJS_P() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '304'
+        }
+      }).then((res) => {
+        this.formData.JS_P = res.data.data.deviceParam.value;
+      })
+    },
+    getJS_I() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '299'
+        }
+      }).then((res) => {
+        this.formData.JS_I = res.data.data.deviceParam.value;
+      })
+    },
+    getCS_P() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '240'
+        }
+      }).then((res) => {
+        this.formData.CS_P = res.data.data.deviceParam.value;
+      })
+    },
+    getCS_I() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '217'
+        }
+      }).then((res) => {
+        this.formData.CS_I = res.data.data.deviceParam.value;
+      })
+    },
+
+    dialog1() {
+      this.dialogVisible1 = true;
+
+      this.objectWD_XZ = this.formData.WD1_XZ
+    },
+    dialogConfirm1() {
+      this.dialogVisible1 = false;
+      this.updateWDXZ()
+    },
+    updateWDXZ() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.updateParam, {
+        params: {
+          id: '235',
+          value: this.objectWD_XZ,
+          name: "WD1_XZ",
+          sn: "CK1"
+        }
+      }).then((res) => {
+        this.getWDXZ()
+        console.log(res)
+      })
+    },
+
+    dialog2() {
+      this.dialogVisible2 = true;
+
+      this.objectSD_XZ = this.formData.SD1_XZ
+    },
+    dialogConfirm2() {
+      this.dialogVisible2 = false;
+      this.updateSDXZ()
+    },
+    updateSDXZ() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.updateParam, {
+        params: {
+          id: '287',
+          value: this.objectSD_XZ,
+          name: "SD1_XZ",
+          sn: "CK1"
+        }
+      }).then((res) => {
+        this.getSDXZ()
+        console.log(res)
+      })
+    },
+
+    dialogA() {
+      this.dialogVisibleA = true;
+
+      this.objecJRP = this.formData.JR_P
+    },
+    dialogConfirmA() {
+      this.dialogVisibleA = false;
+      this.updateJRP()
+    },
+    updateJRP() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.updateParam, {
+        params: {
+          id: '226',
+          value: this.objecJRP,
+          name: "JR_P",
+          sn: "CK1"
+        }
+      }).then((res) => {
+        this.getJR_P()
+        console.log(res)
+      })
+    },
+
+    dialogB() {
+      this.dialogVisibleB = true;
+
+      this.objectJRI = this.formData.JR_I
+    },
+    dialogConfirmB() {
+      this.dialogVisibleB = false;
+      this.updateJRI()
+    },
+    updateJRI() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.updateParam, {
+        params: {
+          id: '220',
+          value: this.objectJRI,
+          name: "JR_I",
+          sn: "CK1"
+        }
+      }).then((res) => {
+        this.getJR_I()
+        console.log(res)
+      })
+    },
+
+    //ZLP
+    dialogC() {
+      this.dialogVisibleC = true;
+
+      this.objectZLP = this.formData.ZL_P
+    },
+    dialogConfirmC() {
+      this.dialogVisibleC = false;
+      this.updateZLP()
+    },
+    updateZLP() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.updateParam, {
+        params: {
+          id: '275',
+          value: this.objectZLP,
+          name: "ZL_P",
+          sn: "CK1"
+        }
+      }).then((res) => {
+        this.getJW_P()
+        console.log(res)
+      })
+    },
+
+    //ZLI
+    dialogD() {
+      this.dialogVisibleD = true;
+
+      this.objectZLI = this.formData.ZL_I
+    },
+    dialogConfirmD() {
+      this.dialogVisibleD = false;
+      this.updateZLI()
+    },
+    updateZLI() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.updateParam, {
+        params: {
+          id: '236',
+          value: this.objectZLI,
+          name: "ZL_I",
+          sn: "CK1"
+        }
+      }).then((res) => {
+        this.getJW_I()
+        console.log(res)
+      })
+    },
+
+    //JSP
+    dialogE() {
+      this.dialogVisibleE = true;
+
+      this.objectJSP = this.formData.JS_P
+    },
+    dialogConfirmE() {
+      this.dialogVisibleE = false;
+      this.updateJSP()
+    },
+    updateJSP() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.updateParam, {
+        params: {
+          id: '304',
+          value: this.objectJSP,
+          name: "JS_P",
+          sn: "CK1"
+        }
+      }).then((res) => {
+        this.getJS_P()
+        console.log(res)
+      })
+    },
+
+    //JSI
+    dialogF() {
+      this.dialogVisibleF = true;
+
+      this.objectJSI = this.formData.JS_I
+    },
+    dialogConfirmF() {
+      this.dialogVisibleF = false;
+      this.updateJSI()
+    },
+    updateJSI() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.updateParam, {
+        params: {
+          id: '299',
+          value: this.objectJSI,
+          name: "JS_I",
+          sn: "CK1"
+        }
+      }).then((res) => {
+        this.getJS_I()
+        console.log(res)
+      })
+    },
+
+    //CSP
+    dialogG() {
+      this.dialogVisibleG = true;
+
+      this.objectCSP = this.formData.CS_P
+    },
+    dialogConfirmG() {
+      this.dialogVisibleG = false;
+      this.updateCSP()
+    },
+    updateCSP() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.updateParam, {
+        params: {
+          id: '240',
+          value: this.objectCSP,
+          name: "CS_P",
+          sn: "CK1"
+        }
+      }).then((res) => {
+        this.getCS_P()
+        console.log(res)
+      })
+    },
+
+    //CSI
+    dialogH() {
+      this.dialogVisibleH = true;
+
+      this.objectCSI = this.formData.CS_I
+    },
+    dialogConfirmH() {
+      this.dialogVisibleH = false;
+      this.updateCSI()
+    },
+    updateCSI() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.updateParam, {
+        params: {
+          id: '217',
+          value: this.objectCSI,
+          name: "CS_I",
+          sn: "CK1"
+        }
+      }).then((res) => {
+        this.getCS_I()
+        console.log(res)
+      })
+    },
+
+    updateHFCC() {
+      this.formData.HF_CC == 1 ? this.formData.HF_CC = 0 : this.formData.HF_CC = 1;
+
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.updateParam, {
+        params: {
+          id: '237',
+          value: this.formData.HF_CC,
+          name: "HF_CC",
+          sn: "CK1"
+        }
+      }).then((res) => {
+        this.getHF_CC()
+        console.log(res)
+      })
+    },
+
+    back() {
+      let vm = this;
+      vm.$router.back()
+    },
+  }
 }
 </script>
 
@@ -124,9 +760,24 @@ export default {
   width: 420px;
   height: 640px;
 
-  margin-left: 550px;
+  margin-left: 240px;
   border: solid 3px gray;
 }
 
+.dialog {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 30px;
+}
+
+.button {
+  background-color: #545c64;
+  color: white;
+  border: 0px
+}
 
+.Active_button {
+  background-color: crimson;
+}
 </style>

sources/server/vrv/run/application.pid

@@ -1 +1 @@
-15324
+6192

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

@@ -67,7 +67,7 @@ public class MqttConfiguration {
     public MessageProducer inbound() {
         // Paho客户端消息驱动通道适配器，主要用来订阅主题
         MqttPahoMessageDrivenChannelAdapter adapter = new MqttPahoMessageDrivenChannelAdapter("consumerClient-paho",
-                mqttClientFactory(), "mqtt/335102012203A500/data", "collector", "battery", "+/sensor");
+                mqttClientFactory(), "mqtt/335102012203A500/data", "mqtt/335102012203A500/cmd", "battery", "+/sensor");
         adapter.setCompletionTimeout(5000);
 
         // Paho消息转换器

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

@@ -1,5 +1,6 @@
 package com.kuyuntech.vrv.platform.controller.core;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.kuyuntech.vrv.coreapi.bean.core.DeviceParamBean;
 import com.kuyuntech.vrv.coreapi.service.core.DeviceParamService;
@@ -104,16 +105,18 @@ public class DeviceParamController {
             return ResponseBean.serverError("操作失败！");
         }
 
-
         // 发送消息到指定主题
         String name = deviceParamBean.getName();
         String value = deviceParamBean.getValue();
+        String sn = deviceParamBean.getSn();
+
+//{"devices":[{"deviceId":"CK1","deviceState":1,"deviceData":{"WD_1":29.50,"SD_1":67.94}}]}
 
-        String content = name + ":" + value;
+        String sendData = "{\"devices\":[{\"deviceId\":\"" + sn + "\",\"deviceState\":1,\"deviceData\":{\"" + name + "\":" + value + "}}]}";
 
 
-        mqttGateway.sendToMqtt("collector", 1, content);
-        return "send topic: " + "collector" + ", message : " + content;
+        mqttGateway.sendToMqtt("mqtt/335102012203A500/cmd", 0, sendData);
+        return "send topic: " + "mqtt/335102012203A500/cmd" + ", message : " + sendData;
 
 //        return ResponseBean.success("操作成功！").addData("value", deviceParamBean.getValue());
 

sources/server/vrv/vrv-platform/src/main/resources/application.properties

@@ -8,7 +8,7 @@ mybatis.configuration.map-underscore-to-camel-case=true
 spring.pid.file=./run/application.pid
 fastboot.auto-mapping-packages=com.wbspool,com.kuyuntech
 spring.resources.static-locations=classpath:/static/
-server.port=9999
+server.port=8888
 
 #dubbo\u76F8\u5173\u914D\u7F6E\u4FE1\u606F
 #fastboot.dubbo.config.type=file