朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 08a76dfd94ad3d038cab1a6c02df7ab643fa3279 1 个父辈 65ad7136

公寓 绑定 水表信息

内嵌 并排对比
正在显示 4 个修改的文件 包含 60 行增加 和 8 行删除
@@ -5,6 +5,8 @@ let base = 'empt-location/water_meter'; @@ -5,6 +5,8 @@ let base = 'empt-location/water_meter';
5 5
6 export const getList = params => { return axios.get(`${base}/selectAll`, { params: params }); }; 6 export const getList = params => { return axios.get(`${base}/selectAll`, { params: params }); };
7 7
  8 +export const waterMeterAll = params => { return axios.get(`${base}/waterMeterAll`, { params: params }); };
  9 +
8 10
9 export const remove = params => { return axios({ 11 export const remove = params => { return axios({
10 method: 'DELETE', 12 method: 'DELETE',
@@ -5,12 +5,12 @@ export const getUserList = params => { return http.get(`${baseUrl}/list`, param @@ -5,12 +5,12 @@ export const getUserList = params => { return http.get(`${baseUrl}/list`, param
5 5
6 export const getUserListPage = params => { return http.get(`/user/list`,params) }; 6 export const getUserListPage = params => { return http.get(`/user/list`,params) };
7 7
8 -export const removeUser = params => { return http.del(`/user/del`,params)}; 8 +export const removeUser = params => { return http.del(`${baseUrl}/del`,params)};
9 9
10 -export const batchRemoveUser = params => { return http.del(`/user/batchremove`, { params: params }); }; 10 +export const batchRemoveUser = params => { return http.del(`${baseUrl}/batchremove`, { params: params }); };
11 11
12 -export const editUser = params => { return http.put(`/user/edit`,params)}; 12 +export const editUser = params => { return http.put(`${baseUrl}/edit`,params)};
13 13
14 -export const addUser = params => { return http.post(`/user/add`,params)}; 14 +export const addUser = params => { return http.post(`${baseUrl}/add`,params)};
15 15
16 -export const setUserRole = params => { return http.put(`/user/roleset`,params)};  
  16 +export const setUserRole = params => { return http.put(`${baseUrl}/roleset`,params)};
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <el-row class="container"> 2 <el-row class="container">
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 - {{collapsed?'':sysName}} 5 +<!-- {{collapsed?'':sysName}}-->水电费缴费平台
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">
@@ -274,6 +274,27 @@ @@ -274,6 +274,27 @@
274 <el-form-item label="公寓名称" prop="adrName"> 274 <el-form-item label="公寓名称" prop="adrName">
275 <el-input v-model="editLocationForm.adrname" auto-complete="off" placeholder="请输入名称"></el-input> 275 <el-input v-model="editLocationForm.adrname" auto-complete="off" placeholder="请输入名称"></el-input>
276 </el-form-item> 276 </el-form-item>
  277 +
  278 +
  279 + <el-form-item label="水表编号" prop="adrName" >
  280 +<!-- <el-input v-model="editLocationForm.adrname" auto-complete="off" placeholder=""></el-input>-->
  281 + <el-select style="height: 38px; width: 100%"
  282 + v-model="editLocationForm.wmid"
  283 + filterable
  284 + remote
  285 + default-first-option
  286 + placeholder="请输入关键词"
  287 + :remote-method="waterMeterAlls"
  288 + :loading="listLoading">
  289 + <el-option
  290 + v-for="item in waterMeterList"
  291 + :key="item.wmId" :label="item.wmId" :value="item.wmId">
  292 + </el-option>
  293 + </el-select>
  294 + </el-form-item>
  295 +
  296 +
  297 +
277 </el-form> 298 </el-form>
278 <div slot="footer" class="dialog-footer"> 299 <div slot="footer" class="dialog-footer">
279 <el-button @click.native="editFormLocationVisible = false">取消</el-button> 300 <el-button @click.native="editFormLocationVisible = false">取消</el-button>
@@ -299,7 +320,7 @@ @@ -299,7 +320,7 @@
299 <script> 320 <script>
300 import { getList,add, remove, edit as editLocation} from '@/api/empt/location_api'; 321 import { getList,add, remove, edit as editLocation} from '@/api/empt/location_api';
301 import {add as electicity, getEEModel, edit} from '@/api/empt/electricityParams'; 322 import {add as electicity, getEEModel, edit} from '@/api/empt/electricityParams';
302 - import {findRealTime } from '@/api/empt/waterMeter'; 323 + import {findRealTime, waterMeterAll } from '@/api/empt/waterMeter';
303 import moment from 'moment' 324 import moment from 'moment'
304 import parseTime from '@/utils' 325 import parseTime from '@/utils'
305 import loginUserInfo from '@/api/base' 326 import loginUserInfo from '@/api/base'
@@ -319,6 +340,12 @@ @@ -319,6 +340,12 @@
319 pageNum: 1, 340 pageNum: 1,
320 pageSize: 5, 341 pageSize: 5,
321 listLoading: false, 342 listLoading: false,
  343 + waterNumber: undefined,
  344 + waterMeterList:[],
  345 + restaurants: [],
  346 + state4: '',
  347 + timeout: null,
  348 +
322 sels: [],//列表选中列 349 sels: [],//列表选中列
323 //编辑界面是否显示 350 //编辑界面是否显示
324 editFormVisible: false, 351 editFormVisible: false,
@@ -426,7 +453,8 @@ @@ -426,7 +453,8 @@
426 editLocationForm:{ 453 editLocationForm:{
427 adrname: '', 454 adrname: '',
428 parent: '', 455 parent: '',
429 - type:'' 456 + type:'',
  457 + wmid:''
430 }, 458 },
431 centerDialogVisible: false, 459 centerDialogVisible: false,
432 dialogData:{ 460 dialogData:{
@@ -658,6 +686,10 @@ @@ -658,6 +686,10 @@
658 handleEdit: function (index, row) { 686 handleEdit: function (index, row) {
659 this.editFormLocationVisible = true; 687 this.editFormLocationVisible = true;
660 this.editLocationForm = row; 688 this.editLocationForm = row;
  689 + console.log(row)
  690 + // if (row.type == 3){
  691 + // this.waterNumber ='waterNum'
  692 + // }
661 }, 693 },
662 694
663 695
@@ -692,6 +724,24 @@ @@ -692,6 +724,24 @@
692 }); 724 });
693 }, 725 },
694 726
  727 + // 远程搜索水表
  728 + waterMeterAlls(query) {
  729 + this.waterMeterList = []
  730 + if (query !== '') {
  731 + this.listLoading = true
  732 + waterMeterAll({wmId: query}).then(res => {
  733 + if (res !== null) {
  734 + setTimeout(() => {
  735 + this.listLoading = false
  736 + this.waterMeterList = res.data.data
  737 + }, 200)
  738 + }
  739 + })
  740 + } else {
  741 + this.waterMeterList = []
  742 + }
  743 + },
  744 +
695 //电表参数配置新增界面，每次点开初始化数据 745 //电表参数配置新增界面，每次点开初始化数据
696 electrixityMeterConfiguration: function (row) { 746 electrixityMeterConfiguration: function (row) {
697 this.electrixityAddFormVisible = true; 747 this.electrixityAddFormVisible = true;