123

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

@@ -12,6 +12,34 @@ export default new Router({
             name: 'menu',
             component: () => import(/* webpackChunkName: "views" */ '../views/menu/menu'),
             children: [
+                {
+                    path: '/runningState',
+                    name: 'runningState',
+                    meta: {title: '运行状态', tab: true, keepAlive: true},
+                    component: () => import(/* webpackChunkName: "views" */ '../views/runningState/runningState'),
+
+                },
+                {
+                    path: '/dataCurve',
+                    name: 'dataCurve',
+                    meta: {title: '数据曲线', tab: true, keepAlive: true},
+                    component: () => import(/* webpackChunkName: "views" */ '../views/dataCurve/dataCurve'),
+
+                },
+                {
+                    path: '/paramSetting',
+                    name: 'paramSetting',
+                    meta: {title: '参数设定', tab: true, keepAlive: true},
+                    component: () => import(/* webpackChunkName: "views" */ '../views/paramSetting/paramSetting'),
+
+                },
+                {
+                    path: '/systemParam',
+                    name: 'systemParam',
+                    meta: {title: '系统参数', tab: true, keepAlive: true},
+                    component: () => import(/* webpackChunkName: "views" */ '../views/systemParam/systemParam'),
+
+                },
                 {
                     path: '/userInfo',
                     name: 'userInfo',

sources/client/vrv-platform/src/views/device/gatewayList.vue

@@ -272,13 +272,19 @@ export default {
 
       this.getGateway();
     },
+
     'formData.operatorNumber'(oldValue, newValue) {
 
       console.log(oldValue)
       console.log(newValue)
 
 
-      this.operatorProject = oldValue;
+      if (newValue == '') {
+        this.operatorProject = oldValue;
+      } else {
+        this.operatorProject = oldValue;
+        this.formData.projectNumber = ''
+      }
 
       console.log(this.operatorProject)
 
@@ -290,8 +296,12 @@ export default {
       console.log(oldValue)
       console.log(newValue)
 
-
-      this.projectGateway = oldValue;
+      if (newValue == '') {
+        this.projectGateway = oldValue;
+      } else {
+        this.projectGateway = oldValue;
+        this.formData.gatewayNumber = ''
+      }
 
       console.log(this.projectGateway)
 
@@ -523,6 +533,10 @@ export default {
         showClose: true,
         type: 'info'
       });
+      this.formData.operatorNumber = '';
+      this.formData.projectNumber = '';
+      this.formData.gatewayNumber = '';
+
 
       this.$refs.formData.clearValidate();
       this.dialogFormVisible = false;

sources/client/vrv-platform/src/views/device/list.vue

@@ -287,13 +287,19 @@ export default {
 
       this.getGateway();
     },
+
     'formData.operatorNumber'(oldValue, newValue) {
 
       console.log(oldValue)
       console.log(newValue)
 
 
-      this.operatorProject = oldValue;
+      if (newValue == '') {
+        this.operatorProject = oldValue;
+      } else {
+        this.operatorProject = oldValue;
+        this.formData.projectNumber = ''
+      }
 
       console.log(this.operatorProject)
 
@@ -305,8 +311,12 @@ export default {
       console.log(oldValue)
       console.log(newValue)
 
-
-      this.projectGateway = oldValue;
+      if (newValue == '') {
+        this.projectGateway = oldValue;
+      } else {
+        this.projectGateway = oldValue;
+        this.formData.gatewayNumber = ''
+      }
 
       console.log(this.projectGateway)
 
@@ -421,7 +431,7 @@ export default {
                 ip: this.formData.ip,
                 sn: this.formData.sn,
                 type: this.formData.type,
-                deviceStatus:1,
+                deviceStatus: 1,
 
                 operatorNumber: this.formData.operatorNumber,
                 projectNumber: this.formData.projectNumber,
@@ -528,6 +538,10 @@ export default {
         showClose: true,
         type: 'info'
       });
+      this.formData.operatorNumber = '';
+      this.formData.projectNumber = '';
+      this.formData.gatewayNumber = '';
+
 
       this.$refs.formData.clearValidate();
       this.dialogFormVisible = false;

sources/client/vrv-platform/src/views/deviceAlarmConfig/list.vue

@@ -43,7 +43,7 @@
                   </el-form-item>
                 </el-row>
 
-                <el-row style="margin-left: 14px">
+                <el-row style="margin-left: 30px">
                   <el-form-item label="变量Id" prop="variableId">
                     <el-input v-model="formData.variableId"></el-input>
                   </el-form-item>
@@ -53,6 +53,41 @@
                 </el-row>
               </el-form>
 
+              <el-row>
+                <el-form-item label="运营商编号" prop="operatorNumber">
+                  <el-select v-model="formData.operatorNumber" placeholder="运营商编号" style="width: 202px"
+                             clearable>
+                    <el-option :value="i.number" v-for="(i,index) in operators" :key="index"
+                               :label="i.number"></el-option>
+                  </el-select>
+                </el-form-item>
+
+                <el-form-item label="项目编号" prop="projectNumber">
+                  <el-select v-model="formData.projectNumber" placeholder="项目编号" style="width: 202px"
+                             :disabled="!formData.operatorNumber" clearable>
+                    <el-option :value="i.number" v-for="(i,index) in projects" :key="index"
+                               :label="i.number"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-row>
+
+              <el-row style="margin-left: 14px">
+                <el-form-item label="网关编号" prop="gatewayNumber" style="margin-right: 22px">
+                  <el-select v-model="formData.gatewayNumber" placeholder="网关编号" style="width: 202px"
+                             :disabled="!formData.projectNumber" clearable>
+                    <el-option :value="i.number" v-for="(i,index) in gateways" :key="index"
+                               :label="i.number"></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="设备sn" prop="sn">
+                  <el-select v-model="formData.sn" placeholder="设备sn" style="width: 202px"
+                             :disabled="!formData.gatewayNumber" clearable>
+                    <el-option :value="i.sn" v-for="(i,index) in devices" :key="index"
+                               :label="i.sn"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-row>
+
               <div slot="footer" class="dialog-footer" style="text-align: center">
                 <el-button @click="cancel()">取 消</el-button>
                 <el-button type="primary" @click="addOrEditMehtond()">确 定</el-button>
@@ -64,6 +99,7 @@
 
           <el-table :data="tableData">
             <el-table-column type="selection"></el-table-column>
+            <el-table-column prop="sn" label="设备sn"></el-table-column>
             <el-table-column prop="alarmName" label="报警名称"></el-table-column>
             <el-table-column prop="alarmType" label="报警类型"></el-table-column>
             <el-table-column prop="variableId" label="变量Id"></el-table-column>
@@ -103,6 +139,10 @@ export default {
   name: 'deviceAlarmConfig',
   data() {
     return {
+      gateways: [],
+      projects: [],
+      operators: [],
+      devices: [],
 
       api: {
         list: this.$api.deviceAlarmConfig.list,
@@ -128,14 +168,20 @@ export default {
             alarmName: '',
             alarmType: '',
             condition: '',
-            variableId: ''
+            variableId: '',
+            sn: '',
           }],
 
       formData: {
         alarmName: '',
         alarmType: '',
         condition: '',
-        variableId: ''
+        variableId: '',
+
+        sn: '',
+        operatorNumber: '',
+        projectNumber: '',
+        gatewayNumber: ''
       },
 
       searchFormData:
@@ -150,8 +196,106 @@ export default {
 
   created: function () {
     this.loadData();
+    this.getOperator();
   },
 
+  watch: {
+
+    'searchFormData.operatorNumber'(oldValue, newValue) {
+
+      console.log(oldValue)
+      console.log(newValue)
+
+      this.searchFormData.projectNumber = ''
+
+      this.operatorProject = oldValue;
+
+      console.log(this.operatorProject)
+
+      this.getProjectNumber();
+    },
+
+    'searchFormData.projectNumber'(oldValue, newValue) {
+
+      console.log(oldValue)
+      console.log(newValue)
+
+      this.searchFormData.gatewayNumber = ''
+
+      this.projectGateway = oldValue;
+
+      console.log(this.projectGateway)
+
+      this.getGateway();
+    },
+    'searchFormData.gatewayNumber'(oldValue, newValue) {
+
+      console.log(oldValue)
+      console.log(newValue)
+
+      this.searchFormData.sn = ''
+
+      this.gatewayDevice = oldValue;
+
+      console.log(this.gatewayDevice)
+
+      this.getDevice();
+    },
+
+
+    'formData.operatorNumber'(oldValue, newValue) {
+
+      console.log(oldValue)
+      console.log(newValue)
+
+
+      if (newValue == '') {
+        this.operatorProject = oldValue;
+      } else {
+        this.operatorProject = oldValue;
+        this.formData.projectNumber = ''
+      }
+
+      console.log(this.operatorProject)
+
+      this.getProjectNumber();
+    },
+
+    'formData.projectNumber'(oldValue, newValue) {
+
+      console.log(oldValue)
+      console.log(newValue)
+
+
+      if (newValue == '') {
+        this.projectGateway = oldValue;
+      } else {
+        this.projectGateway = oldValue;
+        this.formData.gatewayNumber = ''
+      }
+
+      console.log(this.projectGateway)
+
+      this.getGateway();
+    },
+
+    'formData.gatewayNumber'(oldValue, newValue) {
+
+      console.log(oldValue)
+      console.log(newValue)
+
+      if (newValue == '') {
+        this.gatewayDevice = oldValue;
+      } else {
+        this.gatewayDevice = oldValue;
+        this.formData.sn = ''
+      }
+
+      console.log(this.gatewayDevice)
+
+      this.getDevice();
+    }
+  },
 
   methods: {
     //切换页码
@@ -159,6 +303,49 @@ export default {
       this.loadData(index)
     },
 
+    getOperator() {
+      const vm = this;
+      vm.$http.get(vm.$api.operator.list).then((resp) => {
+        vm.operators = resp.data.data.operators
+      })
+    },
+
+    getProjectNumber() {
+      const vm = this;
+      vm.$http.get(vm.$api.project.list, {
+        params: {
+          operatorNumber: this.operatorProject,
+        }
+      }).then((resp) => {
+        console.log(resp.data.data.projects)
+        vm.projects = resp.data.data.projects
+      })
+    },
+
+    getGateway() {
+      const vm = this;
+      vm.$http.get(vm.$api.gateway.list, {
+        params: {
+          projectNumber: this.projectGateway,
+        }
+      }).then((resp) => {
+        console.log(resp.data.data.gateways)
+        vm.gateways = resp.data.data.gateways
+      })
+    },
+
+    getDevice() {
+      const vm = this;
+      vm.$http.get(vm.$api.device.list, {
+        params: {
+          gatewayNumber: this.gatewayDevice,
+        }
+      }).then((resp) => {
+        console.log(resp.data.data.devices)
+        vm.devices = resp.data.data.devices
+      })
+    },
+
     loadData(index) {
       const vm = this;
       vm.$http.get(vm.api.list, {
@@ -191,8 +378,11 @@ export default {
       this.formData.alarmName = '',
           this.formData.alarmType = '',
           this.formData.variableId = '',
-          this.formData.condition = ''
-
+          this.formData.condition = '',
+          this.formData.operatorNumber = '',
+          this.formData.projectNumber = '',
+          this.formData.gatewayNumber = '',
+          this.formData.sn = ''
     },
 
     showEdit(row) {
@@ -214,10 +404,21 @@ export default {
         vm.$http.get(vm.api.update, {
           params: {
             code: this.editRow.code,
+
             alarmName: this.formData.alarmName,
             alarmType: this.formData.alarmType,
             variableId: this.formData.variableId,
             configCondition: this.formData.condition,
+            sn: this.formData.sn,
+
+            operatorNumber: this.formData.operatorNumber,
+            projectNumber: this.formData.projectNumber ,
+            gatewayNumber: this.formData.gatewayNumber,
+
+            deviceCode: this.editRow.deviceCode,
+            operatorCode: this.editRow.operatorCode,
+            projectCode: this.editRow.projectCode,
+            gatewayCode: this.editRow.gatewayCode,
           }
         })
             .then((response) => {
@@ -248,6 +449,10 @@ export default {
             alarmType: this.formData.alarmType,
             variableId: this.formData.variableId,
             configCondition: this.formData.condition,
+            operatorNumber: this.formData.operatorNumber,
+            projectNumber: this.formData.projectNumber,
+            gatewayNumber: this.formData.gatewayNumber,
+            sn: this.formData.sn,
           }
         })
             .then((response) => {
@@ -305,6 +510,10 @@ export default {
         showClose: true,
         type: 'info'
       });
+      this.formData.operatorNumber = '';
+      this.formData.projectNumber = '';
+      this.formData.gatewayNumber = '';
+      this.formData.sn = '';
 
       this.dialogFormVisible = false;
     },

sources/client/vrv-platform/src/views/deviceAlarmRecord/detail.vue

@@ -71,8 +71,6 @@
             </el-row>
 
 
-
-
             <el-dialog title="报警记录" :visible.sync="dialogFormVisible" style="width: 70% ; margin-left: 300px ;">
               <el-form label-position="left" :model="formData" :rules="rules" ref="formData">
                 <el-row style="margin-left: 30px">
@@ -341,7 +339,12 @@ export default {
       console.log(newValue)
 
 
-      this.operatorProject = oldValue;
+      if (newValue == '') {
+        this.operatorProject = oldValue;
+      } else {
+        this.operatorProject = oldValue;
+        this.formData.projectNumber = ''
+      }
 
       console.log(this.operatorProject)
 
@@ -354,7 +357,12 @@ export default {
       console.log(newValue)
 
 
-      this.projectGateway = oldValue;
+      if (newValue == '') {
+        this.projectGateway = oldValue;
+      } else {
+        this.projectGateway = oldValue;
+        this.formData.gatewayNumber = ''
+      }
 
       console.log(this.projectGateway)
 
@@ -366,8 +374,12 @@ export default {
       console.log(oldValue)
       console.log(newValue)
 
-
-      this.gatewayDevice = oldValue;
+      if (newValue == '') {
+        this.gatewayDevice = oldValue;
+      } else {
+        this.gatewayDevice = oldValue;
+        this.formData.sn = ''
+      }
 
       console.log(this.gatewayDevice)
 
@@ -493,7 +505,6 @@ export default {
     },
 
 
-
     addOrEditMehtond(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
@@ -622,6 +633,11 @@ export default {
         showClose: true,
         type: 'info'
       });
+      this.formData.operatorNumber = '';
+      this.formData.projectNumber = '';
+      this.formData.gatewayNumber = '';
+      this.formData.sn = '';
+
       this.$refs.formData.clearValidate();
       this.dialogFormVisible = false;
     },

sources/client/vrv-platform/src/views/deviceAlarmRecord/list.vue

@@ -71,8 +71,6 @@
             </el-row>
 
 
-
-
             <el-dialog title="报警记录" :visible.sync="dialogFormVisible" style="width: 70% ; margin-left: 300px ;">
               <el-form label-position="left" :model="formData" :rules="rules" ref="formData">
                 <el-row style="margin-left: 30px">
@@ -341,7 +339,12 @@ export default {
       console.log(newValue)
 
 
-      this.operatorProject = oldValue;
+      if (newValue == '') {
+        this.operatorProject = oldValue;
+      } else {
+        this.operatorProject = oldValue;
+        this.formData.projectNumber = ''
+      }
 
       console.log(this.operatorProject)
 
@@ -354,7 +357,12 @@ export default {
       console.log(newValue)
 
 
-      this.projectGateway = oldValue;
+      if (newValue == '') {
+        this.projectGateway = oldValue;
+      } else {
+        this.projectGateway = oldValue;
+        this.formData.gatewayNumber = ''
+      }
 
       console.log(this.projectGateway)
 
@@ -366,8 +374,12 @@ export default {
       console.log(oldValue)
       console.log(newValue)
 
-
-      this.gatewayDevice = oldValue;
+      if (newValue == '') {
+        this.gatewayDevice = oldValue;
+      } else {
+        this.gatewayDevice = oldValue;
+        this.formData.sn = ''
+      }
 
       console.log(this.gatewayDevice)
 
@@ -493,95 +505,94 @@ export default {
     },
 
 
+    addOrEditMehtond(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          const vm = this;
+          if (this.addOrEdit == 2) {
+            vm.$http.get(vm.api.update, {
+              params: {
+                alarmName: this.formData.alarmName,
+                alarmType: this.formData.alarmType,
+                content: this.formData.content,
+                startTime: this.formData.startTime,
+                endTime: this.formData.endTime,
+
+                status: '1',
+
+                operatorNumber: this.formData.operatorNumber,
+                projectNumber: this.formData.projectNumber,
+                gatewayNumber: this.formData.gatewayNumber,
+                sn: this.formData.sn,
+                variableId: this.formData.variableId,
+
+                operatorCode: this.formData.operatorCode,
+                projectCode: this.formData.projectCode,
+                gatewayCode: this.formData.gatewayCode,
+              }
+            })
+                .then((response) => {
+                  console.log(response)
+
+                  if (response.data.status == 200) {
+
+                    this.$message({
+                      type: 'success',
+                      showClose: true,
+                      message: response.data.desc
+                    })
+                  }
 
-      addOrEditMehtond(formName) {
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-            const vm = this;
-            if (this.addOrEdit == 2) {
-              vm.$http.get(vm.api.update, {
-                params: {
-                  alarmName: this.formData.alarmName,
-                  alarmType: this.formData.alarmType,
-                  content: this.formData.content,
-                  startTime: this.formData.startTime,
-                  endTime: this.formData.endTime,
-
-                  status: '1',
-
-                  operatorNumber: this.formData.operatorNumber,
-                  projectNumber: this.formData.projectNumber,
-                  gatewayNumber: this.formData.gatewayNumber,
-                  sn: this.formData.sn,
-                  variableId: this.formData.variableId,
-
-                  operatorCode: this.formData.operatorCode,
-                  projectCode: this.formData.projectCode,
-                  gatewayCode: this.formData.gatewayCode,
-                }
-              })
-                  .then((response) => {
-                    console.log(response)
-
-                    if (response.data.status == 200) {
-
-                      this.$message({
-                        type: 'success',
-                        showClose: true,
-                        message: response.data.desc
-                      })
-                    }
+                  this.dialogFormVisible = false;
+
+                  this.loadData();
+
+                })
+                .catch(() => {
+                });
+          }
+
+          if (this.addOrEdit == 1) {
+            vm.$http.get(vm.api.add, {
+              params: {
+                alarmName: this.formData.alarmName,
+                alarmType: this.formData.alarmType,
+                content: this.formData.content,
+                startTime: this.formData.startTime,
+                endTime: this.formData.endTime,
+
+                operatorNumber: this.formData.operatorNumber,
+                projectNumber: this.formData.projectNumber,
+                gatewayNumber: this.formData.gatewayNumber,
+                sn: this.formData.sn,
+                variableId: this.formData.variableId,
+
+                operatorCode: this.formData.operatorCode,
+                projectCode: this.formData.projectCode,
+                gatewayCode: this.formData.gatewayCode,
+              }
+            })
+                .then((response) => {
+                  if (response.data.status == 200) {
 
                     this.dialogFormVisible = false;
 
-                    this.loadData();
+                    this.$message({
+                      type: 'success',
+                      showClose: true,
+                      message: response.data.desc
+                    })
 
-                  })
-                  .catch(() => {
-                  });
-            }
-
-            if (this.addOrEdit == 1) {
-              vm.$http.get(vm.api.add, {
-                params: {
-                  alarmName: this.formData.alarmName,
-                  alarmType: this.formData.alarmType,
-                  content: this.formData.content,
-                  startTime: this.formData.startTime,
-                  endTime: this.formData.endTime,
-
-                  operatorNumber: this.formData.operatorNumber,
-                  projectNumber: this.formData.projectNumber,
-                  gatewayNumber: this.formData.gatewayNumber,
-                  sn: this.formData.sn,
-                  variableId: this.formData.variableId,
-
-                  operatorCode: this.formData.operatorCode,
-                  projectCode: this.formData.projectCode,
-                  gatewayCode: this.formData.gatewayCode,
-                }
-              })
-                  .then((response) => {
-                    if (response.data.status == 200) {
-
-                      this.dialogFormVisible = false;
-
-                      this.$message({
-                        type: 'success',
-                        showClose: true,
-                        message: response.data.desc
-                      })
-
-                      this.loadData();
-                    }
-                  })
-            }
-          } else {
-            console.log('error submit!!');
-            return false;
+                    this.loadData();
+                  }
+                })
           }
-        });
-      },
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
 
 
     del(row) {
@@ -622,6 +633,11 @@ export default {
         showClose: true,
         type: 'info'
       });
+      this.formData.operatorNumber = '';
+      this.formData.projectNumber = '';
+      this.formData.gatewayNumber = '';
+      this.formData.sn = '';
+
       this.$refs.formData.clearValidate();
       this.dialogFormVisible = false;
     },

sources/client/vrv-platform/src/views/deviceAlarmRepairRecord/list.vue

@@ -29,7 +29,7 @@
               <el-input placeholder="提醒周期" size="mini" v-model="searchFormData.promptInterval"></el-input>
             </el-form-item>
 
-            <el-row>
+            <el-row style="margin-top: 0px">
               <el-form-item label="运营商编号" style="margin-top: 6px" size="mini">
                 <el-select v-model="searchFormData.operatorNumber" placeholder="运营商编号" style="width: 180px"
                            clearable>
@@ -63,21 +63,21 @@
             <el-dialog title="维保记录" :visible.sync="dialogFormVisible" style="width: 70% ; margin-left: 300px ;">
               <el-form label-position="left" :model="formData" :rules="rules" ref="formData">
                 <el-row style="margin-left: 14px">
-                <el-form-item label="维保名称" prop="repairName">
-                  <el-input placeholder="维保名称" v-model="formData.repairName"></el-input>
-                </el-form-item>
-                <el-form-item label="维保类型" prop="repairType">
-                  <el-input placeholder="维保类型" v-model="formData.repairType"></el-input>
-                </el-form-item>
+                  <el-form-item label="维保名称" prop="repairName">
+                    <el-input placeholder="维保名称" v-model="formData.repairName"></el-input>
+                  </el-form-item>
+                  <el-form-item label="维保类型" prop="repairType">
+                    <el-input placeholder="维保类型" v-model="formData.repairType"></el-input>
+                  </el-form-item>
                 </el-row>
 
                 <el-row style="margin-left: 14px">
-                <el-form-item label="变量名称" prop="variableId">
-                  <el-input placeholder="变量名称" v-model="formData.variableId"></el-input>
-                </el-form-item>
-                <el-form-item label="提醒周期" prop="promptInterval">
-                  <el-input placeholder="提醒周期" v-model="formData.promptInterval"></el-input>
-                </el-form-item>
+                  <el-form-item label="变量名称" prop="variableId">
+                    <el-input placeholder="变量名称" v-model="formData.variableId"></el-input>
+                  </el-form-item>
+                  <el-form-item label="提醒周期" prop="promptInterval">
+                    <el-input placeholder="提醒周期" v-model="formData.promptInterval"></el-input>
+                  </el-form-item>
                 </el-row>
 
                 <el-row>
@@ -99,20 +99,20 @@
                 </el-row>
 
                 <el-row style="margin-left: 14px">
-                <el-form-item label="网关编号"  prop="gatewayNumber" style="margin-right: 22px">
-                  <el-select v-model="formData.gatewayNumber" placeholder="网关编号" style="width: 202px"
-                             :disabled="!formData.projectNumber" clearable>
-                    <el-option :value="i.number" v-for="(i,index) in gateways" :key="index"
-                               :label="i.number"></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="设备sn"  prop="sn">
-                  <el-select v-model="formData.sn" placeholder="设备sn" style="width: 202px"
-                             :disabled="!formData.gatewayNumber" clearable>
-                    <el-option :value="i.sn" v-for="(i,index) in devices" :key="index"
-                               :label="i.sn"></el-option>
-                  </el-select>
-                </el-form-item>
+                  <el-form-item label="网关编号" prop="gatewayNumber" style="margin-right: 22px">
+                    <el-select v-model="formData.gatewayNumber" placeholder="网关编号" style="width: 202px"
+                               :disabled="!formData.projectNumber" clearable>
+                      <el-option :value="i.number" v-for="(i,index) in gateways" :key="index"
+                                 :label="i.number"></el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item label="设备sn" prop="sn">
+                    <el-select v-model="formData.sn" placeholder="设备sn" style="width: 202px"
+                               :disabled="!formData.gatewayNumber" clearable>
+                      <el-option :value="i.sn" v-for="(i,index) in devices" :key="index"
+                                 :label="i.sn"></el-option>
+                    </el-select>
+                  </el-form-item>
                 </el-row>
 
               </el-form>
@@ -278,6 +278,7 @@ export default {
   },
 
   watch: {
+
     'searchFormData.operatorNumber'(oldValue, newValue) {
 
       console.log(oldValue)
@@ -326,7 +327,12 @@ export default {
       console.log(newValue)
 
 
-      this.operatorProject = oldValue;
+      if (newValue == '') {
+        this.operatorProject = oldValue;
+      } else {
+        this.operatorProject = oldValue;
+        this.formData.projectNumber = ''
+      }
 
       console.log(this.operatorProject)
 
@@ -339,7 +345,12 @@ export default {
       console.log(newValue)
 
 
-      this.projectGateway = oldValue;
+      if (newValue == '') {
+        this.projectGateway = oldValue;
+      } else {
+        this.projectGateway = oldValue;
+        this.formData.gatewayNumber = ''
+      }
 
       console.log(this.projectGateway)
 
@@ -351,8 +362,12 @@ export default {
       console.log(oldValue)
       console.log(newValue)
 
-
-      this.gatewayDevice = oldValue;
+      if (newValue == '') {
+        this.gatewayDevice = oldValue;
+      } else {
+        this.gatewayDevice = oldValue;
+        this.formData.sn = ''
+      }
 
       console.log(this.gatewayDevice)
 
@@ -590,6 +605,11 @@ export default {
         showClose: true,
         type: 'info'
       });
+      this.formData.operatorNumber = '';
+      this.formData.projectNumber = '';
+      this.formData.gatewayNumber = '';
+      this.formData.sn = '';
+
 
       this.$refs.formData.clearValidate();
       this.dialogFormVisible = false;
@@ -667,7 +687,7 @@ export default {
   margin-top: 0px;
 }
 
-.el-row{
+.el-row {
   margin-top: 20px;
 }
 

sources/client/vrv-platform/src/views/gateway/list.vue

@@ -142,6 +142,8 @@
 
 <script>
 
+import areas from "../../util/area.json";
+
 export default {
   name: 'project',
   data() {
@@ -241,7 +243,12 @@ export default {
       console.log(oldValue)
       console.log(newValue)
 
-      this.operatorProject = oldValue;
+      if (newValue == '') {
+        this.operatorProject = oldValue;
+      } else {
+        this.operatorProject = oldValue;
+        this.formData.projectNumber = ''
+      }
 
       console.log(this.operatorProject)
 
@@ -446,6 +453,10 @@ export default {
         type: 'info'
       });
 
+      this.formData.projectNumber='',
+      this.formData.operatorNumber='',
+
+
       this.$refs.formData.clearValidate();
       this.dialogFormVisible = false;
     },

sources/client/vrv-platform/src/views/gateway/projectList.vue

@@ -9,8 +9,8 @@
         </div>
 
         <div style="margin-bottom: 12px">
-          <span style="margin-left: 3px; font-size: 16px; color: #545c64">项目编号：{{projectData.number}}</span>
-          <span style="margin-left: 20px; font-size: 16px;color: #545c64">项目名称：{{projectData.name}}</span>
+          <span style="margin-left: 3px; font-size: 16px; color: #545c64">项目编号：{{ projectData.number }}</span>
+          <span style="margin-left: 20px; font-size: 16px;color: #545c64">项目名称：{{ projectData.name }}</span>
         </div>
 
         <el-button size="medium" icon="el-icon-search" style="margin-bottom: 15px" @click="search(searchFormData)">
@@ -152,10 +152,10 @@ export default {
         update: this.$api.gateway.update,
       },
 
-      projectData:{
-        name:'',
-        number:'',
-        code:'',
+      projectData: {
+        name: '',
+        number: '',
+        code: '',
       },
 
 
@@ -204,6 +204,26 @@ export default {
     this.loadData();
   },
 
+  watch: {
+    'formData.operatorNumber'(oldValue, newValue) {
+
+      console.log(oldValue)
+      console.log(newValue)
+
+      if (newValue == '') {
+        this.operatorProject = oldValue;
+      } else {
+        this.operatorProject = oldValue;
+        this.formData.projectNumber = ''
+      }
+
+      console.log(this.operatorProject)
+
+      this.getProjectNumber();
+
+    },
+  },
+
   methods: {
     //切换页码
     handleCurrentChange(index) {
@@ -243,11 +263,7 @@ export default {
 
     getOperatorNumber() {
       const vm = this;
-      vm.$http.get(vm.$api.operator.list, {
-        params: {
-          number: this.searchFormData.operatorNumber,
-        }
-      }).then((resp) => {
+      vm.$http.get(vm.$api.operator.list).then((resp) => {
         console.log(resp.data.data.operators)
         vm.operators = resp.data.data.operators
       })
@@ -257,7 +273,7 @@ export default {
       const vm = this;
       vm.$http.get(vm.$api.project.list, {
         params: {
-          number: this.searchFormData.projectNumber,
+          operatorNumber: this.operatorProject,
         }
       }).then((resp) => {
         console.log(resp.data.data.projects)
@@ -396,6 +412,7 @@ export default {
         showClose: true,
         type: 'info'
       });
+      this.formData.operatorNumber = ''
 
       this.dialogFormVisible = false;
     },
@@ -454,7 +471,7 @@ export default {
       })
     },
 
-     back() {
+    back() {
       let vm = this;
       vm.$router.back()
     }

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

@@ -49,10 +49,10 @@
             </template>
 
             <el-menu-item-group>
-              <el-menu-item index="/">运行状态</el-menu-item>
-              <el-menu-item index="/">数据曲线</el-menu-item>
-              <el-menu-item index="/">参数设定</el-menu-item>
-              <el-menu-item index="/">系统参数</el-menu-item>
+              <el-menu-item index="/runningState">运行状态</el-menu-item>
+              <el-menu-item index="/dataCurve">数据曲线</el-menu-item>
+              <el-menu-item index="/paramSetting">参数设定</el-menu-item>
+              <el-menu-item index="/systemParam">系统参数</el-menu-item>
               <el-menu-item index="/deviceAlarmConfig">报警设置</el-menu-item>
               <el-menu-item index="/detail">报警记录</el-menu-item>
               <el-menu-item index="/deviceAlarmRepairRecord">维保记录</el-menu-item>
@@ -117,16 +117,16 @@
             </el-dropdown-menu>
           </el-dropdown>
 
-          <el-dialog title="修改密码" :visible.sync="dialogFormVisible" style="width: 71% ; margin-left: 300px ;">
+          <el-dialog title="修改密码" :visible.sync="dialogFormVisible" style="width: 55% ; margin-left: 480px ;">
 
             <el-form label-position="left" :model="formData" :rules="rules" ref="formData">
 
               <el-row style="margin-left: 15px">
-                <el-form-item label="原密码" style="margin-left: 0px" prop="oldPassword">
-                  <el-input v-model="formData.oldPassword"></el-input>
+                <el-form-item label="新密码" prop="newPassword">
+                  <el-input style="width: 70%" v-model="formData.newPassword"></el-input>
                 </el-form-item>
-                <el-form-item label="新密码" style="" prop="newPassword">
-                  <el-input v-model="formData.newPassword"></el-input>
+                <el-form-item label="原密码" prop="oldPassword">
+                  <el-input style="width: 70%" v-model="formData.oldPassword"></el-input>
                 </el-form-item>
               </el-row>
 
@@ -259,11 +259,37 @@ export default {
           const vm = this;
           vm.$http.get(vm.$api.auth.updateUserPassword, {
             params: {
-              oldPassword: '',
-              newPassword: ''
+              newPassword: this.formData.newPassword,
+              oldPassword: this.formData.oldPassword
             }
           }).then((resp) => {
             console.log(resp)
+
+            if (resp.data.status === 400) {
+              vm.$message({
+                type: "error",
+                showClose: true,
+                message: resp.data.data.errorFields[0].message
+              });
+            }
+
+            if (resp.data.status == 200) {
+              vm.$message({
+                type: 'success',
+                showClose: true,
+                message: resp.data.desc
+              })
+
+              vm.$router.push('/login')
+            }
+            if (resp.data.status == 401) {
+              vm.$message({
+                type: 'error',
+                showClose: true,
+                message: resp.data.desc
+              })
+            }
+
           })
         } else {
           console.log('error submit!!');
@@ -350,4 +376,9 @@ export default {
 .el-button {
   color: black;
 }
+
+.el-form-item {
+  margin-left: 30px;
+}
+
 </style>

sources/client/vrv-platform/src/views/operator/list.vue

@@ -55,38 +55,38 @@
               <el-form label-position="left" :model="formData" :rules="rules" ref="formData">
 
                 <el-row style="margin-left: 15px">
-                <el-form-item label="运营商名称" style="margin-left: 0px" prop="name">
-                  <el-input v-model="formData.name"></el-input>
-                </el-form-item>
-                <el-form-item label="运营商编号" style="" prop="number">
-                  <el-input v-model="formData.number"></el-input>
-                </el-form-item>
+                  <el-form-item label="运营商名称" style="margin-left: 0px" prop="name">
+                    <el-input v-model="formData.name"></el-input>
+                  </el-form-item>
+                  <el-form-item label="运营商编号" style="" prop="number">
+                    <el-input v-model="formData.number"></el-input>
+                  </el-form-item>
                 </el-row>
 
                 <el-row style="margin-left: 15px ;margin-top: 20px">
-                <el-form-item label="联系人" style="margin-left: 28px;margin-right: 24px" prop="contact">
-                  <el-input v-model="formData.contact"></el-input>
-                </el-form-item>
-                <el-form-item label="联系电话" style="" prop="tel">
-                  <el-input v-model="formData.tel"></el-input>
-                </el-form-item>
+                  <el-form-item label="联系人" style="margin-left: 28px;margin-right: 24px" prop="contact">
+                    <el-input v-model="formData.contact"></el-input>
+                  </el-form-item>
+                  <el-form-item label="联系电话" style="" prop="tel">
+                    <el-input v-model="formData.tel"></el-input>
+                  </el-form-item>
                 </el-row>
 
                 <el-row style="margin-left: 15px;margin-top: 20px;margin-bottom: 20px">
-                <el-form-item label="省份" style="margin-left: 42px;margin-right: 50px" prop="province">
-                  <el-select v-model="formData.province" placeholder="省份" style="width: 202px" clearable>
-                    <el-option v-for="item in areas" :value="item.label" :label="item.label"
-                               :key="item.code"></el-option>
-                  </el-select>
-                </el-form-item>
-
-                <el-form-item label="城市" prop="city">
-                  <el-select v-model="formData.city" placeholder="城市" style="width: 202px"
-                             :disabled="!formData.province" clearable>
-                    <el-option v-for="item in cityArr" :value="item.label" :label="item.label"
-                               :key="item.code"></el-option>
-                  </el-select>
-                </el-form-item>
+                  <el-form-item label="省份" style="margin-left: 42px;margin-right: 50px" prop="province">
+                    <el-select v-model="formData.province" placeholder="省份" style="width: 202px" clearable>
+                      <el-option v-for="item in areas" :value="item.label" :label="item.label"
+                                 :key="item.code"></el-option>
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item label="城市" prop="city">
+                    <el-select v-model="formData.city" placeholder="城市" style="width: 202px"
+                               :disabled="!formData.province" clearable>
+                      <el-option v-for="item in cityArr" :value="item.label" :label="item.label"
+                                 :key="item.code"></el-option>
+                    </el-select>
+                  </el-form-item>
                 </el-row>
 
 
@@ -265,6 +265,8 @@ export default {
   },
 
   watch: {
+    immediate:true,
+
     'searchFormData.province'(oldValue, newValue) {
 
       console.log(oldValue)
@@ -272,17 +274,23 @@ export default {
 
       this.searchFormData.city = ''
 
-      this.cityArr = areas.find(item => item.label == oldValue).children
-      console.log(this.cityArr)
-
-
+      if (oldValue) {
+        this.cityArr = areas.find(item => item.label == oldValue).children
+        console.log(this.cityArr)
+      }
     },
 
     'formData.province'(oldValue, newValue) {
-      console.log(oldValue)
       console.log(newValue)
 
-      if (oldValue) {
+      if (newValue == '') {
+
+        this.cityArr = areas.find(item => item.label == oldValue).children
+        console.log(this.cityArr)
+
+      } else {
+        this.formData.city = ''
+
         this.cityArr = areas.find(item => item.label == oldValue).children
         console.log(this.cityArr)
       }
@@ -424,7 +432,6 @@ export default {
       });
 
 
-
     },
 
     del(row) {
@@ -466,6 +473,9 @@ export default {
         type: 'info'
       });
 
+      this.formData.province = '';
+      this.formData.city = '';
+
       this.$refs.formData.clearValidate();
       this.dialogFormVisible = false;
     },

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

@@ -0,0 +1,122 @@
+<template>
+  <div id="paramSetting">
+    <el-main>
+
+      <div style="margin-bottom: 10px">
+        <el-button size="medium" icon="el-icon-back" type="text">返回</el-button>
+        <span style="margin-left: 20px; font-size: 18px">参数设定</span>
+      </div>
+
+      <div style="background-color: white;padding: 20px;height: 75px ;">
+        &nbsp; &nbsp;&nbsp; &nbsp; 排风温度：{{ this.setTableData[0].pfwd }} &nbsp; &nbsp;&nbsp; &nbsp;
+        &nbsp; &nbsp;&nbsp; &nbsp;
+        排风湿度：{{ this.setTableData[0].pfsd }}&nbsp; &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;
+        停机延时设定：{{ this.setTableData[0].tjys }}
+
+
+        <el-col style="float: right;width: 300px">
+
+          <div>
+            控制选择模式：
+            <el-button
+                style="color:white;background-color: green;border: 0px"
+                type="primary"
+                size="small">
+              CK-1
+            </el-button>
+          </div>
+
+          <div style="margin-top: 20px">
+            控制选择复位：
+            <el-button
+                style="color:white;background-color: green;border: 0px"
+                type="primary"
+                size="small">
+              复位
+            </el-button>
+          </div>
+
+        </el-col>
+
+      </div>
+
+      <div style="padding: 10px">
+
+        <div>
+          <el-table :data="tableData" :header-cell-style="{'text-align':'center'}"
+                    :cell-style="{'text-align':'center'}">
+            <el-table-column prop="deviceId" label="设备名称" style="margin-left: 40px"></el-table-column>
+            <el-table-column prop="kzms" label="控制模式"></el-table-column>
+            <el-table-column prop="sdml" label="手动命令"></el-table-column>
+            <el-table-column prop="ssfk" label="实时反馈"></el-table-column>
+          </el-table>
+        </div>
+
+
+      </div>
+
+
+    </el-main>
+  </div>
+
+</template>
+
+<script>
+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: '关闭'
+          }],
+
+      setTableData: [{
+        pfwd: '36℃',
+        pfsd: '20%',
+        pfhsl: '9.6/kg',
+        tjys: '180s',
+        deviceState: '1'
+      }],
+
+
+    }
+  },
+
+  created: function () {
+    this.loadData();
+  },
+
+  methods: {}
+}
+</script>
+
+<style scoped>
+
+
+</style>

sources/client/vrv-platform/src/views/project/list.vue

@@ -48,7 +48,8 @@
             </el-form-item>
 
             <el-form-item label="运营商编号" style="margin-top: 6px" size="mini">
-              <el-select v-model="searchFormData.operatorNumber" placeholder="运营商编号" style="width: 180px" clearable>
+              <el-select v-model="searchFormData.operatorNumber" placeholder="运营商编号" style="width: 180px"
+                         clearable>
 
                 <el-option :value="i.number" v-for="(i,index) in operators" :key="index" :label="i.number"></el-option>
 
@@ -56,7 +57,6 @@
             </el-form-item>
 
 
-
             <!--            编辑弹窗-->
             <el-dialog title="项目" :visible.sync="dialogFormVisible" style="width: 70% ; margin-left: 300px ;">
               <el-form label-position="left" :model="formData" :rules="rules" ref="formData">
@@ -79,7 +79,8 @@
 
                 <el-row style="margin-left: 0px ;margin-top: 20px">
                   <el-form-item label="运营商编号" prop="operatorNumber">
-                    <el-select v-model="formData.operatorNumber" placeholder="运营商编号" style="width: 202px" clearable>
+                    <el-select v-model="formData.operatorNumber" placeholder="运营商编号" style="width: 202px"
+                               clearable>
 
                       <el-option :value="i.number" v-for="(i,index) in operators" :key="index"
                                  :label="i.number"></el-option>
@@ -92,7 +93,9 @@
                   </el-form-item>
                 </el-row>
 
-                <el-form-item label="省份" style="margin-top: 20px; text-align: right;margin-right: 38px;margin-left: 52px ;" prop="province">
+                <el-form-item label="省份"
+                              style="margin-top: 20px; text-align: right;margin-right: 38px;margin-left: 52px ;"
+                              prop="province">
                   <el-select v-model="formData.province" placeholder="省份" style="width: 202px" clearable>
                     <el-option v-for="item in areas" :value="item.label" :label="item.label"
                                :key="item.code"></el-option>
@@ -206,6 +209,8 @@ export default {
       //省份
       areas: areas,
 
+      newValue: '',
+
       api: {
         listOperator: this.$api.operator.list,
 
@@ -235,8 +240,8 @@ export default {
             description: '1',
             customer: '1',
             customerTel: '1',
-            province: '1',
-            city: '1',
+            province: '',
+            city: '',
             address: '1',
           }],
       formData: {
@@ -245,8 +250,8 @@ export default {
         description: '1',
         customer: '1',
         customerTel: '1',
-        province: '1',
-        city: '1',
+        province: '',
+        city: '',
         address: '1',
         operatorNumber: '',
         code: '',
@@ -288,10 +293,15 @@ export default {
       console.log(oldValue)
       console.log(newValue)
 
-      if (oldValue) {
+      if (newValue == '') {
+        this.cityArr = areas.find(item => item.label == oldValue).children
+        console.log(this.cityArr)
+      } else {
+        this.formData.city = ''
         this.cityArr = areas.find(item => item.label == oldValue).children
         console.log(this.cityArr)
       }
+
     },
     deep: true  // 深度监听
   },
@@ -352,15 +362,15 @@ export default {
       this.dialogFormVisible = true;
 
       this.formData.name = '';
-      this.formData.province = '';
       this.formData.description = '';
+      this.formData.province = '';
       this.formData.city = '';
+      this.formData.operatorNumber = '';
+      this.formData.description = '';
       this.formData.customer = '';
       this.formData.customerTel = '';
       this.formData.address = '';
       this.formData.number = '';
-      this.formData.operatorNumber = '',
-          this.formData.description = '';
 
       this.addOrEdit = 1
     }
@@ -511,8 +521,13 @@ export default {
         type: 'info'
       });
 
+      this.formData.province = '';
+      this.formData.city = '';
+
       this.$refs.formData.clearValidate();
       this.dialogFormVisible = false;
+      console.log(this.newValue)
+      this.newValue == ''
     }
     ,
 
@@ -522,7 +537,7 @@ export default {
       vm.$router.push('/gateway')
     }
     ,
-    back(){
+    back() {
       let vm = this;
       vm.$router.back()
     },

sources/client/vrv-platform/src/views/project/operatorList.vue

@@ -254,17 +254,23 @@ export default {
 
       this.cityArr = areas.find(item => item.label == oldValue).children
       console.log(this.cityArr)
-
-
     },
 
     'formData.province'(oldValue, newValue) {
       console.log(oldValue)
       console.log(newValue)
 
+      if (newValue == '') {
 
-      this.cityArr = areas.find(item => item.label == oldValue).children
-      console.log(this.cityArr)
+        this.cityArr = areas.find(item => item.label == oldValue).children
+        console.log(this.cityArr)
+
+      } else {
+        this.formData.city = ''
+
+        this.cityArr = areas.find(item => item.label == oldValue).children
+        console.log(this.cityArr)
+      }
     },
     deep: true  // 深度监听
   },
@@ -483,6 +489,8 @@ export default {
         showClose: true,
         type: 'info'
       });
+      this.formData.province = '';
+      this.formData.city = '';
 
       this.dialogFormVisible = false;
     }

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

@@ -0,0 +1,251 @@
+<template>
+  <div id="runningState">
+    <el-main>
+
+      <div style="margin-bottom: 10px">
+        <el-button size="medium" icon="el-icon-back" type="text">返回</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>
+        </div>
+
+        <!--        设置表-->
+        <div class="setTable">
+          <el-table :data="setTableData" :header-cell-style="{'text-align':'center'}"
+                    :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 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">停止
+                </el-button>
+              </template>
+            </el-table-column>
+
+          </el-table>
+        </div>
+
+        <!--        状态表-->
+        <div class="stateTable">
+          <el-table :data="stateTable" :header-cell-style="{'text-align':'center'}"
+                    :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">
+              <template>
+                <el-button
+                    style="color:white;background-color: green;border: 0px"
+                    type="primary"
+                    size="small">
+                  一
+                </el-button>
+                <el-button
+                    style="color:white;background-color: green;border: 0px"
+                    type="primary"
+                    size="small">
+                  二
+                </el-button>
+                <el-button
+                    style="color:white;background-color: green;border: 0px"
+                    type="primary"
+                    size="small">
+                  三
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="jsq" label="加湿器"></el-table-column>
+            <el-table-column prop="cxlw" label="初效滤网">
+              <template slot-scope="scope">
+                <el-button
+                    style="color:white;background-color: green;border: 0px"
+                    type="primary"
+                    size="small"
+                    @click="statusHandle(scope.row)"
+                >
+                  {{ scope.row.status == '正常' ? '正常' : '异常' }}
+                </el-button>
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="zxlw" label="中效滤网">
+              <template slot-scope="scope">
+                <el-button
+                    style="color:white;background-color: green;border: 0px"
+                    type="primary"
+                    size="small"
+                    @click="statusHandle(scope.row)"
+                >
+                  {{ scope.row.status == '正常' ? '正常' : '异常' }}
+                </el-button>
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="gwbj" label="高温报警">
+              <template slot-scope="scope">
+                <el-button
+                    style="color:white;background-color: green;border: 0px"
+                    type="primary"
+                    size="small"
+                    @click="statusHandle(scope.row)"
+                >
+                  {{ scope.row.status == '正常' ? '正常' : '异常' }}
+                </el-button>
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="qfyc" label="缺风压差">
+              <template slot-scope="scope">
+                <el-button
+                    style="color:white;background-color: green;border: 0px"
+                    type="primary"
+                    size="small"
+                    @click="statusHandle(scope.row)"
+                >
+                  {{ scope.row.status == '正常' ? '正常' : '异常' }}
+                </el-button>
+              </template>
+            </el-table-column>
+
+          </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>
+
+</template>
+
+<script>
+export default {
+  name: 'runningState',
+  data() {
+    return {
+      dialogFormVisible: false,
+
+      tableData:
+          [{
+            deviceId: 'SMART_KTX',
+            temp: '36℃',
+            humidity: '20%',
+            caa: '20g/kg'
+          }],
+
+      formData: {
+        pfwd: '',
+        pfsd: '',
+        pfhsl: '',
+        tjys: ''
+      },
+
+      setTableData: [{
+        pfwd: '36℃',
+        pfsd: '20%',
+        pfhsl: '9.6/kg',
+        tjys: '180s',
+        deviceState: '1'
+      }],
+
+      stateTable: [{
+        lsf: '94%',
+        rsf: '97%',
+        djr: '',
+        jsq: '0%',
+        gwbj: '',
+        cxlw: '',
+        zxlw: '',
+        cfyc: ''
+      }]
+
+
+    }
+  },
+
+  created: function () {
+    this.loadData();
+  },
+
+  methods: {
+    cancel() {
+      this.$message({
+        message: '操作取消',
+        showClose: true,
+        type: 'info'
+      });
+
+      this.dialogFormVisible = false;
+    },
+
+    showEdit(row) {
+      this.dialogFormVisible = true;
+
+      this.editRow = JSON.parse(JSON.stringify(row));
+      this.formData = this.editRow
+
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+.stateTable {
+  padding-top: 180px;
+
+}
+
+.setTable {
+  float: right;
+  width: 900px;
+}
+
+.el-form-item {
+  width: 200px
+}
+
+</style>

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

@@ -0,0 +1,132 @@
+<template>
+  <div id="paramSetting">
+    <el-main>
+
+      <div style="margin-bottom: 10px">
+        <el-button size="medium" icon="el-icon-back" type="text">返回</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 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>
+        </div>
+      </div>
+
+
+    </el-main>
+  </div>
+
+</template>
+
+<script>
+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: '关闭'
+          }],
+
+      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',
+      },
+
+
+    }
+  },
+
+  created: function () {
+
+  },
+
+  methods: {}
+}
+</script>
+
+<style scoped>
+.el-form-item {
+  width: 350px;
+}
+
+.divdiv {
+  margin-top: 20px;
+  text-align: center;
+  width: 420px;
+  height: 640px;
+
+  margin-left: 550px;
+  border: solid 3px gray;
+}
+
+
+</style>

sources/server/vrv/run/application.pid

@@ -1 +1 @@
-12384
+12256