diff --git a/src/views/Customer/AgentManagement.vue b/src/views/Customer/AgentManagement.vue index cd0c64b..21ddcef 100644 --- a/src/views/Customer/AgentManagement.vue +++ b/src/views/Customer/AgentManagement.vue @@ -7,7 +7,7 @@
合同结束日期:
@@ -152,14 +152,14 @@ 活跃楼盘数
- {{ compare.houseQuantity || 0 }} + {{ compare.activeHouseQuantity || 0 }}
- 对比时段: {{compare1.houseQuantity||0}} + 对比时段: {{compare1.activeHouseQuantity||0}}
-
- {{compare2.houseQuantity||0}} +
+ {{compare2.activeHouseQuantity||0}}
@@ -274,7 +274,8 @@ export default { houseDataAll() { this.$api.api .houseDataAll({ - agentId: this.selValue == 0 ? this.choicValue : null, + // agentId: this.selValue == 0 ? this.choicValue : null, + agentId: this.orgType==0?(this.selValue == 0 ? this.choicValue : null):localStorage.getItem('agentId'), orgCode: this.selValue == 1 ? this.choicValue : null, }) .then((res) => { @@ -291,7 +292,8 @@ export default { contrastStartDate: this.selectTime, contrastEndDate: this.selectTime1, dateType: this.dateType, - agentId: this.selValue == 0 ? this.choicValue : null, + // agentId: this.selValue == 0 ? this.choicValue : null, + agentId: this.orgType==0?(this.selValue == 0 ? this.choicValue : null):localStorage.getItem('agentId'), orgCode: this.selValue == 1 ? this.choicValue : null, }) .then((res) => { @@ -475,6 +477,7 @@ export default { this.$api.api .findMyOrg({ orgType: localStorage.getItem("orgType"), + agentId:localStorage.getItem('agentId') }) .then((res) => { this.houseList = res.data; diff --git a/src/views/admin/user/index.vue b/src/views/admin/user/index.vue index b4a3c8b..c8b5355 100644 --- a/src/views/admin/user/index.vue +++ b/src/views/admin/user/index.vue @@ -1255,7 +1255,7 @@ export default { let info = getStore({ name: "userInfo" }); // this.sign=info.sign // this.orgCode = info.orgCode; - this.orgCode = this.losorgType.getItem('orgCode'); + this.orgCode = localStorage.getItem('orgCode'); // 权限判断 // 当他是系统用户时,显示所有,除系统用户之外只显示组织用户 diff --git a/src/views/building/index.vue b/src/views/building/index.vue index 189e1c9..aba112c 100644 --- a/src/views/building/index.vue +++ b/src/views/building/index.vue @@ -43,7 +43,7 @@ -->
-
筛选起止日期:
+
合同起止日期:
- + { console.log(err) 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' //王笑