朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 52248c6c2599b9958406244f4819e582b3e004ab 1 个父辈 ef8cc2a8

websocket消息推送 展示支付二维码 添加package一个jar包 

电表实施信息查询
内嵌 并排对比
正在显示 5 个修改的文件 包含 71 行增加 和 3 行删除
@@ -10678,6 +10678,11 @@ @@ -10678,6 +10678,11 @@
10678 } 10678 }
10679 } 10679 }
10680 }, 10680 },
  10681 + "qrcodejs2": {
  10682 + "version": "0.0.2",
  10683 + "resolved": "https://registry.npmjs.org/qrcodejs2/-/qrcodejs2-0.0.2.tgz",
  10684 + "integrity": "sha1-Rlr+Xjnxn6zsuTLBH3oYYQkUauE="
  10685 + },
10681 "qs": { 10686 "qs": {
10682 "version": "6.7.0", 10687 "version": "6.7.0",
10683 "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", 10688 "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
@@ -36,6 +36,15 @@ export const add = params => { return axios({ @@ -36,6 +36,15 @@ export const add = params => { return axios({
36 } 36 }
37 })}; 37 })};
38 38
  39 +export const electricityInfo = params => { return axios({
  40 + method: 'POST',
  41 + url: `${base}/getEnergyInfoForRealTime`,
  42 + params: params,
  43 + headers: {
  44 + 'Content-Type': 'application/json;charset=UTF-8'
  45 + }
  46 +})};
  47 +
39 export const getEEModel = params => { return axios({ 48 export const getEEModel = params => { return axios({
40 method: 'POST', 49 method: 'POST',
41 url: `${base}/getEEModel`, 50 url: `${base}/getEEModel`,
@@ -62,7 +62,8 @@ let setIntervalWesocketPush = null @@ -62,7 +62,8 @@ let setIntervalWesocketPush = null
62 62
63 /**建立连接 */ 63 /**建立连接 */
64 export function createSocket() { 64 export function createSocket() {
65 - var socketUrl="http://localhost:10003/imserver"; 65 + // var socketUrl="http://localhost:10003/imserver";
  66 + var socketUrl="http://10.5.10.98:10003/imserver";
66 socketUrl=socketUrl.replace("https","ws").replace("http","ws"); 67 socketUrl=socketUrl.replace("https","ws").replace("http","ws");
67 68
68 console.log(socketUrl); 69 console.log(socketUrl);
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <el-row class="container darkmenu" style="margin-top: 0px;"> 2 <el-row class="container darkmenu" style="margin-top: 0px;">
3 <el-col :span="24" class="header"> 3 <el-col :span="24" class="header">
4 <el-col :span="10" class="logo" :class="collapsed?'logo-collapse-width':'logo-width'"> 4 <el-col :span="10" class="logo" :class="collapsed?'logo-collapse-width':'logo-width'">
5 - 水电集中缴费平台 5 + 水电缴费平台
6 </el-col> 6 </el-col>
7 <el-col :span="10"> 7 <el-col :span="10">
8 <div class="tools" @click.prevent="collapse"> 8 <div class="tools" @click.prevent="collapse">
@@ -51,6 +51,9 @@ @@ -51,6 +51,9 @@
51 <el-button v-if="scope.row.type=='3'" type="primary" size="small" @click="waterMeter(scope.row)">水表实时信息</el-button> 51 <el-button v-if="scope.row.type=='3'" type="primary" size="small" @click="waterMeter(scope.row)">水表实时信息</el-button>
52 <el-button v-else disabled="" type="primary" size="small" @click="waterMeter(scope.row)">水表实时信息</el-button> 52 <el-button v-else disabled="" type="primary" size="small" @click="waterMeter(scope.row)">水表实时信息</el-button>
53 53
  54 + <el-button v-if="scope.row.type=='3'" type="primary" size="small" @click="electicityInfo(scope.row)">电表实时信息</el-button>
  55 + <el-button v-else disabled="" type="primary" size="small" @click="electicityInfo(scope.row)">电表实时信息</el-button>
  56 +
54 <!--<el-button v-if="scope.row.type=='3'" type="primary" size="small" @click="electrixityMeterConfiguration(scope.row)">电表参数配置</el-button>--> 57 <!--<el-button v-if="scope.row.type=='3'" type="primary" size="small" @click="electrixityMeterConfiguration(scope.row)">电表参数配置</el-button>-->
55 <!--<el-button v-else type="primary" disabled="" size="small" @click="electrixityMeterConfiguration(scope.row)">电表参数配置</el-button>--> 58 <!--<el-button v-else type="primary" disabled="" size="small" @click="electrixityMeterConfiguration(scope.row)">电表参数配置</el-button>-->
56 59
@@ -253,6 +256,36 @@ @@ -253,6 +256,36 @@
253 </div> 256 </div>
254 </el-dialog> 257 </el-dialog>
255 258
  259 + <!--电表实时信息-->
  260 + <el-dialog title="电表实施信息" :visible.sync="electrixityeditFormVisible" :close-on-click-modal="false">
  261 + <el-form :model="electricityForm" label-width="100px" ref="waterMaterForm">
  262 + <el-form-item label="电表编号" prop="deviceId">
  263 + <el-input v-model="electricityForm.deviceId" auto-complete="off" ></el-input>
  264 + </el-form-item>
  265 + <el-form-item label="总" prop="totalEnergy">
  266 + <el-input v-model="electricityForm.totalEnergy" auto-complete="off" ></el-input>
  267 + </el-form-item>
  268 + <el-form-item label="尖" prop="tipEnergy">
  269 + <el-input v-model="electricityForm.tipEnergy" auto-complete="off"></el-input>
  270 + </el-form-item>
  271 + <el-form-item label="峰" prop="peakEnergy">
  272 + <el-input v-model="electricityForm.peakEnergy" auto-complete="off" ></el-input>
  273 + </el-form-item>
  274 + <el-form-item label="谷" prop="valleyEnergy">
  275 + <el-input v-model="electricityForm.valleyEnergy" auto-complete="off"></el-input>
  276 + </el-form-item>
  277 + <el-form-item label="平" prop="flatEnergy">
  278 + <el-input v-model="electricityForm.flatEnergy" auto-complete="off" ></el-input>
  279 + </el-form-item>
  280 + <el-form-item label="余额" prop="balance">
  281 + <el-input v-model="electricityForm.balance" auto-complete="off"></el-input>
  282 + </el-form-item>
  283 + </el-form>
  284 + <div slot="footer" class="dialog-footer">
  285 + <el-button @click.native="electrixityeditFormVisible = false">取消</el-button>
  286 + </div>
  287 + </el-dialog>
  288 +
256 <!--location新增界面--> 289 <!--location新增界面-->
257 <el-dialog title="新增" :visible.sync="addFormLocationVisible" :close-on-click-modal="false"> 290 <el-dialog title="新增" :visible.sync="addFormLocationVisible" :close-on-click-modal="false">
258 <el-form :model="addLocationForm" label-width="80px" :rules="addLocationFormRules" ref="addLocationForm"> 291 <el-form :model="addLocationForm" label-width="80px" :rules="addLocationFormRules" ref="addLocationForm">
@@ -322,7 +355,7 @@ @@ -322,7 +355,7 @@
322 </style> 355 </style>
323 <script> 356 <script>
324 import { getList,add, remove, edit as editLocation} from '@/api/empt/location_api'; 357 import { getList,add, remove, edit as editLocation} from '@/api/empt/location_api';
325 - import {add as electicity, getEEModel, edit} from '@/api/empt/electricityParams'; 358 + import {add as electicity, getEEModel, edit, electricityInfo} from '@/api/empt/electricityParams';
326 import {findRealTime, waterMeterAll } from '@/api/empt/waterMeter'; 359 import {findRealTime, waterMeterAll } from '@/api/empt/waterMeter';
327 import moment from 'moment' 360 import moment from 'moment'
328 import parseTime from '@/utils' 361 import parseTime from '@/utils'
@@ -356,6 +389,7 @@ @@ -356,6 +389,7 @@
356 // 水表实施信息 389 // 水表实施信息
357 waterMeterVisible:false, 390 waterMeterVisible:false,
358 391
  392 +
359 addFormLocationVisible: false, 393 addFormLocationVisible: false,
360 394
361 editFormLocationVisible: false, 395 editFormLocationVisible: false,
@@ -438,6 +472,16 @@ @@ -438,6 +472,16 @@
438 wmVoltage:'', 472 wmVoltage:'',
439 wmSignalpower:'' 473 wmSignalpower:''
440 }, 474 },
  475 + // 电表实施信息
  476 + electricityForm:{
  477 + deviceId:'',
  478 + totalEnergy:'',
  479 + tipEnergy:'',
  480 + peakEnergy:'',
  481 + valleyEnergy:'',
  482 + flatEnergy:'',
  483 + balance:''
  484 + },
441 485
442 permForm: { 486 permForm: {
443 roleId: 1, 487 roleId: 1,
@@ -777,7 +821,16 @@ @@ -777,7 +821,16 @@
777 821
778 }, 822 },
779 823
  824 + // 电表实施信息查询
  825 + electicityInfo: function(row){
  826 + this.electrixityeditFormVisible=true;
  827 + var eeId = row.eeid;
  828 + let para = { eeId: eeId};
  829 + electricityInfo(para).then((res) => {
  830 + this.electricityForm = res.data;
780 831
  832 + });
  833 + },
781 834
782 //新增 835 //新增
783 addSubmit: function () { 836 addSubmit: function () {