|
...
|
...
|
@@ -51,6 +51,9 @@ |
|
|
|
<el-button v-if="scope.row.type=='3'" type="primary" size="small" @click="waterMeter(scope.row)">水表实时信息</el-button>
|
|
|
|
<el-button v-else disabled="" type="primary" size="small" @click="waterMeter(scope.row)">水表实时信息</el-button>
|
|
|
|
|
|
|
|
<el-button v-if="scope.row.type=='3'" type="primary" size="small" @click="electicityInfo(scope.row)">电表实时信息</el-button>
|
|
|
|
<el-button v-else disabled="" type="primary" size="small" @click="electicityInfo(scope.row)">电表实时信息</el-button>
|
|
|
|
|
|
|
|
<!--<el-button v-if="scope.row.type=='3'" type="primary" size="small" @click="electrixityMeterConfiguration(scope.row)">电表参数配置</el-button>-->
|
|
|
|
<!--<el-button v-else type="primary" disabled="" size="small" @click="electrixityMeterConfiguration(scope.row)">电表参数配置</el-button>-->
|
|
|
|
|
|
...
|
...
|
@@ -253,6 +256,36 @@ |
|
|
|
</div>
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
<!--电表实时信息-->
|
|
|
|
<el-dialog title="电表实施信息" :visible.sync="electrixityeditFormVisible" :close-on-click-modal="false">
|
|
|
|
<el-form :model="electricityForm" label-width="100px" ref="waterMaterForm">
|
|
|
|
<el-form-item label="电表编号" prop="deviceId">
|
|
|
|
<el-input v-model="electricityForm.deviceId" auto-complete="off" ></el-input>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="总" prop="totalEnergy">
|
|
|
|
<el-input v-model="electricityForm.totalEnergy" auto-complete="off" ></el-input>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="尖" prop="tipEnergy">
|
|
|
|
<el-input v-model="electricityForm.tipEnergy" auto-complete="off"></el-input>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="峰" prop="peakEnergy">
|
|
|
|
<el-input v-model="electricityForm.peakEnergy" auto-complete="off" ></el-input>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="谷" prop="valleyEnergy">
|
|
|
|
<el-input v-model="electricityForm.valleyEnergy" auto-complete="off"></el-input>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="平" prop="flatEnergy">
|
|
|
|
<el-input v-model="electricityForm.flatEnergy" auto-complete="off" ></el-input>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="余额" prop="balance">
|
|
|
|
<el-input v-model="electricityForm.balance" auto-complete="off"></el-input>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form>
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
|
<el-button @click.native="electrixityeditFormVisible = false">取消</el-button>
|
|
|
|
</div>
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
<!--location新增界面-->
|
|
|
|
<el-dialog title="新增" :visible.sync="addFormLocationVisible" :close-on-click-modal="false">
|
|
|
|
<el-form :model="addLocationForm" label-width="80px" :rules="addLocationFormRules" ref="addLocationForm">
|
|
...
|
...
|
@@ -322,7 +355,7 @@ |
|
|
|
</style>
|
|
|
|
<script>
|
|
|
|
import { getList,add, remove, edit as editLocation} from '@/api/empt/location_api';
|
|
|
|
import {add as electicity, getEEModel, edit} from '@/api/empt/electricityParams';
|
|
|
|
import {add as electicity, getEEModel, edit, electricityInfo} from '@/api/empt/electricityParams';
|
|
|
|
import {findRealTime, waterMeterAll } from '@/api/empt/waterMeter';
|
|
|
|
import moment from 'moment'
|
|
|
|
import parseTime from '@/utils'
|
|
...
|
...
|
@@ -356,6 +389,7 @@ |
|
|
|
// 水表实施信息
|
|
|
|
waterMeterVisible:false,
|
|
|
|
|
|
|
|
|
|
|
|
addFormLocationVisible: false,
|
|
|
|
|
|
|
|
editFormLocationVisible: false,
|
|
...
|
...
|
@@ -438,6 +472,16 @@ |
|
|
|
wmVoltage:'',
|
|
|
|
wmSignalpower:''
|
|
|
|
},
|
|
|
|
// 电表实施信息
|
|
|
|
electricityForm:{
|
|
|
|
deviceId:'',
|
|
|
|
totalEnergy:'',
|
|
|
|
tipEnergy:'',
|
|
|
|
peakEnergy:'',
|
|
|
|
valleyEnergy:'',
|
|
|
|
flatEnergy:'',
|
|
|
|
balance:''
|
|
|
|
},
|
|
|
|
|
|
|
|
permForm: {
|
|
|
|
roleId: 1,
|
|
...
|
...
|
@@ -777,7 +821,16 @@ |
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
// 电表实施信息查询
|
|
|
|
electicityInfo: function(row){
|
|
|
|
this.electrixityeditFormVisible=true;
|
|
|
|
var eeId = row.eeid;
|
|
|
|
let para = { eeId: eeId};
|
|
|
|
electricityInfo(para).then((res) => {
|
|
|
|
this.electricityForm = res.data;
|
|
|
|
|
|
|
|
});
|
|
|
|
},
|
|
|
|
|
|
|
|
//新增
|
|
|
|
addSubmit: function () {
|
...
|
...
|
|
