From e5fb95f3abd7dbc42fc6a7a556d95a7045d06520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Tue, 27 Sep 2022 09:05:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/baseurl.js | 2 +- src/views/system/station/index.vue | 254 ++++++------------------- src/views/system/stationItem/index.vue | 20 +- 3 files changed, 76 insertions(+), 200 deletions(-) diff --git a/src/api/baseurl.js b/src/api/baseurl.js index abb555c..a56555f 100644 --- a/src/api/baseurl.js +++ b/src/api/baseurl.js @@ -1,3 +1,3 @@ -var baseurl = "http://192.168.16.81:8082"; +var baseurl = "http://192.168.16.81:8080"; export default baseurl \ No newline at end of file diff --git a/src/views/system/station/index.vue b/src/views/system/station/index.vue index 4ccc672..385d699 100644 --- a/src/views/system/station/index.vue +++ b/src/views/system/station/index.vue @@ -207,11 +207,11 @@ > - + + + - { - console.log(res); this.citylist = res.data; }); }, /** 查询护理站信息列表 */ getList() { - this.loading = true; this.liststationinfo(); - getFirstLevelInfo().then((res) => { this.provincelist = res.data; }); getInfoList().then((res) => { this.nurseStationTypelist = res.data; }); + this.loading = true; }, // 取消按钮 cancel() { @@ -1088,8 +945,23 @@ export default { /** 搜索按钮操作 */ liststationinfo() { listStation(this.queryParams).then((response) => { + response.rows.forEach((e) => { + if (e.sysAreaVOList == []) { + } else if (e.sysAreaVOList == null) { + } else if (!e.sysAreaVOList) { + } else if (e.sysAreaVOList.length == 0) { + } else if (e.sysAreaVOList.length > 0) { + e.area = + e.sysAreaVOList[0].provinceName + + "-" + + e.sysAreaVOList[0].cityName + + "-" + + e.sysAreaVOList[0].regionName + + "-" + + e.sysAreaVOList[0].streetName; + } + }); this.stationList = response.rows; - console.log("this.stationList :>> ", this.stationList); this.total = response.total; this.loading = false; }); @@ -1174,16 +1046,17 @@ export default { // this.form.nurseStationLabelList = []; this.title = "修改护理站信息"; getSubordinateRegions(response.data.areaCode).then((res) => { - this.value = res.data.provinceCode; + this.value = String(res.data.provinceCode); this.value1 = res.data.cityName; this.value2 = res.data.regionName; this.value3 = res.data.streetName; + console.log(typeof this.value); }); }) .then(() => { + this.looknurseStationLabel = []; getLabelList(this.resid).then((res) => { this.looknurseStationLabel = res; - if (this.looknurseStationLabel.length == 0) { var obj = { labelDescription: "", @@ -1206,8 +1079,6 @@ export default { }; this.looknurseStationLabel.push(obj); } - console.log(this.looknurseStationLabel); - // console.log(this.form); // console.log(this.form.nurseStationLabelList); // this.form.nurseStationLabelList = obj; @@ -1216,7 +1087,6 @@ export default { // this.form.nurseStationLabelList.push(e); // }); }); - console.log(this.form); this.open = true; }); }, @@ -1311,9 +1181,7 @@ export default { //权限列表 info() { getListByUser(this.getListByUserquery).then((res) => { - console.log(res); if (res.rows[0].isAdmin == "1") { - console.log(true); this.nurseStationlist = res.rows; this.total2 = res.total; } else { diff --git a/src/views/system/stationItem/index.vue b/src/views/system/stationItem/index.vue index 62f6297..957145c 100644 --- a/src/views/system/stationItem/index.vue +++ b/src/views/system/stationItem/index.vue @@ -287,7 +287,10 @@ > - + - + - +