From e32a673ec0b2b0f064c83aacb53444b84028c341 Mon Sep 17 00:00:00 2001 From: lancer <1905818361@qq.com> Date: Tue, 14 Dec 2021 16:22:28 +0800 Subject: [PATCH 1/3] init --- src/page/check/chose.vue | 12 +++---- src/views/Equipment/equipmentDetailList.vue | 37 ++++++++++++++++----- src/views/Equipment/index.vue | 1 + src/views/Equipment/state.vue | 8 ++--- src/views/building/Count.vue | 8 ++--- vue.config.js | 4 +-- 6 files changed, 46 insertions(+), 24 deletions(-) diff --git a/src/page/check/chose.vue b/src/page/check/chose.vue index 856ff8b..df02e4b 100644 --- a/src/page/check/chose.vue +++ b/src/page/check/chose.vue @@ -134,9 +134,9 @@ > @@ -149,7 +149,7 @@ > { console.log(res); - this.options = res.data.records; + this.options = res.data; }); }, zkhousePage() { @@ -342,7 +342,7 @@ export default { if (this.info.selectHouseType == 2) { this.$api.api .findHouseByArea({ - id: this.area, + provinceItem: this.area, ...obj }) .then((res) => { diff --git a/src/views/Equipment/equipmentDetailList.vue b/src/views/Equipment/equipmentDetailList.vue index 0f90ca7..e7cb784 100644 --- a/src/views/Equipment/equipmentDetailList.vue +++ b/src/views/Equipment/equipmentDetailList.vue @@ -10,6 +10,16 @@ " > 楼盘名称： +
{ console.log(res,'获取数据') this.allCompare = res; - this.total = res.data.first.totalRecord; + this.total = res.data.firstPage.total; // 数据处理 let arr = []; if (this.pageNum == 1) { @@ -1070,15 +1091,15 @@ export default { }; arr.push(obj1); } - res.data.first.records.map((item, index) => { + res.data.firstPage.records.map((item, index) => { let obj = {}; //当他为0的时候 obj.name = - res.data.first.records[index].createTime.substring(5, 10) + + res.data.firstPage.records[index].createTime.substring(5, 10) + "VS" + - res.data.second.records[index].createTime.substring(5, 10); - obj.first = res.data.first.records[index]; - obj.second = res.data.second.records[index]; + res.data.secondPage.records[index].createTime.substring(5, 10); + obj.first = res.data.firstPage.records[index]; + obj.second = res.data.secondPage.records[index]; obj.contrast = res.data.contrast[index]; // obj.time='' // obj.time1='' @@ -1241,7 +1262,7 @@ export default { // console.log(this.allCompare,"第一种"); let timeDate = []; let arr1 = []; - this.allCompare.data.first.records.map(item=>{ + this.allCompare.data.first.map(item=>{ timeDate.push(item.createTime.substring(5)) arr1.push(item[str]) }) diff --git a/src/views/Equipment/index.vue b/src/views/Equipment/index.vue index 614b65a..82cb345 100644 --- a/src/views/Equipment/index.vue +++ b/src/views/Equipment/index.vue @@ -1200,6 +1200,7 @@ export default { this.$api.api .findHouseByUser({ orgType: localStorage.getItem("orgType"), + houseTypes:'0,1,2,3' }) .then((res) => { // console.log(res) diff --git a/src/views/Equipment/state.vue b/src/views/Equipment/state.vue index db2c931..b0b11ea 100644 --- a/src/views/Equipment/state.vue +++ b/src/views/Equipment/state.vue @@ -2,7 +2,7 @@
-
+
-
+
系统运营：
- +
diff --git a/vue.config.js b/vue.config.js index db6248b..f361a46 100644 --- a/vue.config.js +++ b/vue.config.js @@ -3,8 +3,8 @@ * https://cli.vuejs.org/zh/config/ */ // const url = 'http://pigx-gateway' -const url = 'http://39.97.167.65:9999' //测试 -// const url = 'http://192.168.31.169:9999' //长龙 +// const url = 'http://39.97.167.65:9999' //测试 +const url = 'http://192.168.31.169:9999' //长龙 // const url = 'http://192.168.31.134:9999' //嘉豪 // const url = 'http://192.168.31.100:9999' //王笑 // const url = 'http://nitu5e.natappfree.cc' //王笑 From c7b2cd694ba8e3a8ffe87667d9c6651a3b2099dc Mon Sep 17 00:00:00 2001 From: lancer <1905818361@qq.com> Date: Tue, 14 Dec 2021 16:49:11 +0800 Subject: [PATCH 2/3] init --- src/views/Equipment/equipmentDetailList.vue | 20 +++++++++++++------- src/views/Equipment/state.vue | 2 +- vue.config.js | 4 ++-- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/views/Equipment/equipmentDetailList.vue b/src/views/Equipment/equipmentDetailList.vue index e7cb784..ebd7188 100644 --- a/src/views/Equipment/equipmentDetailList.vue +++ b/src/views/Equipment/equipmentDetailList.vue @@ -979,13 +979,13 @@ export default { }, screening() { this.page.pageNum = 1; - this.page.pageSize = 6; + this.page.pageSize = 10; this.getTableList(); }, empty() { this.page = { pageNum: 1, - pageSize: 6, + pageSize: 10, openTime: "", closeTime: "", houseName: "", @@ -1170,12 +1170,18 @@ export default { item.time = item.first[str]; item.time1 = item.second[str]; item.time2 = item.contrast[str] + ""; - if (index > 0) { - timeDate.push(item.name); - arr1.push(item.first[str]); - arr2.push(item.second[str]); - } + + // if (index > 0) { + // timeDate.push(item.name); + // arr1.push(item.first[str]); + // arr2.push(item.second[str]); + // } }); + this.allCompare.data.first.map((item,idx)=>{ + timeDate.push(item.createTime.substring(5)+'VS'+this.allCompare.data.second[idx].createTime.substring(5)) + arr1.push(item[str]) + arr2.push(this.allCompare.data.second[idx][str]) + }) this.compareList = Object.assign([], this.compareList); this.$forceUpdate(); var chartDom = document.getElementById("compare"); diff --git a/src/views/Equipment/state.vue b/src/views/Equipment/state.vue index b0b11ea..7fbc212 100644 --- a/src/views/Equipment/state.vue +++ b/src/views/Equipment/state.vue @@ -1006,7 +1006,7 @@ export default { .then((res) => { this.$message({ type: "success", - message: "操作成功!", + message: res.msg, }); this.getTableList(); }); diff --git a/vue.config.js b/vue.config.js index f361a46..db6248b 100644 --- a/vue.config.js +++ b/vue.config.js @@ -3,8 +3,8 @@ * https://cli.vuejs.org/zh/config/ */ // const url = 'http://pigx-gateway' -// const url = 'http://39.97.167.65:9999' //测试 -const url = 'http://192.168.31.169:9999' //长龙 +const url = 'http://39.97.167.65:9999' //测试 +// const url = 'http://192.168.31.169:9999' //长龙 // const url = 'http://192.168.31.134:9999' //嘉豪 // const url = 'http://192.168.31.100:9999' //王笑 // const url = 'http://nitu5e.natappfree.cc' //王笑 From 423826418d9bb0879dbe9547e3b6e0874cecf47c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=B6=E4=BD=B3=E8=B1=AA?= <2044682269@qq.com> Date: Tue, 14 Dec 2021 16:51:12 +0800 Subject: [PATCH 3/3] bug --- src/page/check/chose.vue | 2 +- src/views/Customer/AgentManagement.vue | 3 ++- src/views/Customer/CompanyRecord.vue | 3 ++- src/views/Customer/Companymanagement.vue | 3 ++- src/views/building/index.vue | 3 ++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/page/check/chose.vue b/src/page/check/chose.vue index df02e4b..4b22b56 100644 --- a/src/page/check/chose.vue +++ b/src/page/check/chose.vue @@ -113,7 +113,7 @@
- 区域: + 片区： + +