diff --git a/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue b/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue index 97d3d60..ba864bf 100644 --- a/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue +++ b/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue @@ -135,8 +135,11 @@ export default { zxyg: null, activePower: null, reactivePower: null, - collectType: null, - monitorType: 3 + collectType: 3, + monitorType: 3, + energyTypeId: 3, + energyType: 3, + monitorTypeId: 3 }, // 表单参数 form: {}, @@ -146,9 +149,7 @@ export default { }, // 表单校验 rules: { - objId: [ - { required: true, message: '编号不能为空', trigger: 'blur' } - ] + }, columns: [ { key: 0, label: `主键标识`, visible: false }, @@ -245,7 +246,9 @@ export default { /** 查询计量设备信息下拉树结构 */ getTreeselect() { - getMonitorInfoTree({ monitorTypeList: [3]}).then(response => { + debugger + console.log(123213) + getMonitorInfoTree({monitorTypeList: [3]}).then(response => { this.monitorInfoOptions = response.data }) }, diff --git a/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring3/index.vue b/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring3/index.vue index 5dab568..68daeee 100644 --- a/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring3/index.vue +++ b/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring3/index.vue @@ -145,9 +145,9 @@ export default { }, // 表单校验 rules: { - objId: [ +/* objId: [ {required: true, message: '编号不能为空', trigger: 'blur'} - ] + ]*/ }, columns: [ {key: 0, label: `主键标识`, visible: false}, @@ -245,7 +245,7 @@ export default { /** 查询计量设备信息下拉树结构 */ getTreeselect() { getMonitorInfoTree({ - monitorTypeList: [5, 6, 7, 8, 9], + monitorTypeList: [3], monitorType: this.$route.query.monitorType }).then(response => { this.monitorInfoOptions = response.data