@@ -7,7 +7,7 @@ | |||||
<div class="label">合同结束日期:</div> | <div class="label">合同结束日期:</div> | ||||
<div> | <div> | ||||
<el-date-picker | <el-date-picker | ||||
@change="confirmtime()" | |||||
@change="confirmtime" | |||||
v-model="timelist" | v-model="timelist" | ||||
type="daterange" | type="daterange" | ||||
style="width:250px;" | style="width:250px;" | ||||
@@ -379,7 +379,8 @@ export default { | |||||
if (res.data) { | if (res.data) { | ||||
// 由用户 | // 由用户 | ||||
this.$api.api.userVerify({ | this.$api.api.userVerify({ | ||||
orgType:localStorage.getItem('orgType'), | |||||
// orgType:localStorage.getItem('orgType'), | |||||
orgType:1, | |||||
accountId:res.data.sysUser.accountId, | accountId:res.data.sysUser.accountId, | ||||
username:res.data.sysUser.username, | username:res.data.sysUser.username, | ||||
agentId:localStorage.getItem('agentId'), | agentId:localStorage.getItem('agentId'), | ||||
@@ -838,9 +839,10 @@ export default { | |||||
//时间选择 | //时间选择 | ||||
confirmtime(e){ | confirmtime(e){ | ||||
// console.log(this.timelist) | // console.log(this.timelist) | ||||
console.log(e); | |||||
if(e){ | if(e){ | ||||
this.contractStartDate=this.timelist[0]; | |||||
this.contractEndDate=this.timelist[1]; | |||||
this.contractStartDate=e[0]; | |||||
this.contractEndDate=e[1]; | |||||
}else{ | }else{ | ||||
this.contractStartDate=''; | this.contractStartDate=''; | ||||
this.contractEndDate=''; | this.contractEndDate=''; | ||||
@@ -315,7 +315,8 @@ export default { | |||||
if (res.data) { | if (res.data) { | ||||
// 由用户 | // 由用户 | ||||
this.$api.api.userVerify({ | this.$api.api.userVerify({ | ||||
orgType:localStorage.getItem('orgType'), | |||||
// orgType:localStorage.getItem('orgType'), | |||||
orgType:2, | |||||
accountId:res.data.sysUser.accountId, | accountId:res.data.sysUser.accountId, | ||||
username:res.data.sysUser.username, | username:res.data.sysUser.username, | ||||
agentId:localStorage.getItem('agentId'), | agentId:localStorage.getItem('agentId'), | ||||
@@ -29,9 +29,9 @@ | |||||
> | > | ||||
<el-option | <el-option | ||||
v-for="item in houseList" | v-for="item in houseList" | ||||
:key="item.id" | |||||
:key="item.orgCode" | |||||
:label="item.name" | :label="item.name" | ||||
:value="item.id" | |||||
:value="item.orgCode" | |||||
> | > | ||||
</el-option> | </el-option> | ||||
</el-select> | </el-select> | ||||
@@ -152,14 +152,14 @@ | |||||
活跃楼盘数 | 活跃楼盘数 | ||||
</div> | </div> | ||||
<div class="text2" :class="{ tophovese: secindex == 1 }"> | <div class="text2" :class="{ tophovese: secindex == 1 }"> | ||||
{{ compare.houseQuantity || 0 }} | |||||
{{ compare.activeHouseQuantity || 0 }} | |||||
</div> | </div> | ||||
<div class="text33" v-if="selectTime1"> | <div class="text33" v-if="selectTime1"> | ||||
<div> | <div> | ||||
对比时段: <span style="text-indent: 20px;">{{compare1.houseQuantity||0}}</span> | |||||
对比时段: <span style="text-indent: 20px;">{{compare1.activeHouseQuantity||0}}</span> | |||||
</div> | </div> | ||||
<div :style="compare2.houseQuantity>=0 ? 'color:green;': 'color:red;'"> | |||||
{{compare2.houseQuantity||0}} | |||||
<div :style="compare2.activeHouseQuantity>=0 ? 'color:green;': 'color:red;'"> | |||||
{{compare2.activeHouseQuantity||0}} | |||||
</div> | </div> | ||||
</div> | </div> | ||||
</div> | </div> | ||||
@@ -274,7 +274,8 @@ export default { | |||||
houseDataAll() { | houseDataAll() { | ||||
this.$api.api | this.$api.api | ||||
.houseDataAll({ | .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, | orgCode: this.selValue == 1 ? this.choicValue : null, | ||||
}) | }) | ||||
.then((res) => { | .then((res) => { | ||||
@@ -291,7 +292,8 @@ export default { | |||||
contrastStartDate: this.selectTime, | contrastStartDate: this.selectTime, | ||||
contrastEndDate: this.selectTime1, | contrastEndDate: this.selectTime1, | ||||
dateType: this.dateType, | 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, | orgCode: this.selValue == 1 ? this.choicValue : null, | ||||
}) | }) | ||||
.then((res) => { | .then((res) => { | ||||
@@ -475,6 +477,7 @@ export default { | |||||
this.$api.api | this.$api.api | ||||
.findMyOrg({ | .findMyOrg({ | ||||
orgType: localStorage.getItem("orgType"), | orgType: localStorage.getItem("orgType"), | ||||
agentId:localStorage.getItem('agentId') | |||||
}) | }) | ||||
.then((res) => { | .then((res) => { | ||||
this.houseList = res.data; | this.houseList = res.data; | ||||
@@ -1255,7 +1255,7 @@ export default { | |||||
let info = getStore({ name: "userInfo" }); | let info = getStore({ name: "userInfo" }); | ||||
// this.sign=info.sign | // this.sign=info.sign | ||||
// this.orgCode = info.orgCode; | // this.orgCode = info.orgCode; | ||||
this.orgCode = this.losorgType.getItem('orgCode'); | |||||
this.orgCode = localStorage.getItem('orgCode'); | |||||
// 权限判断 | // 权限判断 | ||||
// 当他是系统用户时,显示所有,除系统用户之外只显示组织用户 | // 当他是系统用户时,显示所有,除系统用户之外只显示组织用户 | ||||
@@ -43,7 +43,7 @@ | |||||
</div> --> | </div> --> | ||||
<div class="div-lab"> | <div class="div-lab"> | ||||
<div class="label">筛选起止日期:</div> | |||||
<div class="label">合同起止日期:</div> | |||||
<el-date-picker | <el-date-picker | ||||
v-model="starTime" | v-model="starTime" | ||||
class="div-inp" | class="div-inp" | ||||
@@ -163,7 +163,7 @@ | |||||
<!-- 表格 --> | <!-- 表格 --> | ||||
<div class="cen-tab"> | <div class="cen-tab"> | ||||
<el-table :data="tableData" stripe style="width: 100%" border> | |||||
<el-table :data="tableData" stripe style="width: 100%" > | |||||
<el-table-column prop="propertyName" label="楼盘名称" align="center"> | <el-table-column prop="propertyName" label="楼盘名称" align="center"> | ||||
</el-table-column> | </el-table-column> | ||||
<el-table-column | <el-table-column | ||||
@@ -574,7 +574,8 @@ export default { | |||||
if (res.data) { | if (res.data) { | ||||
// 由用户 | // 由用户 | ||||
this.$api.api.userVerify({ | this.$api.api.userVerify({ | ||||
orgType:localStorage.getItem('orgType'), | |||||
// orgType:localStorage.getItem('orgType'), | |||||
orgType:3, | |||||
accountId:res.data.sysUser.accountId, | accountId:res.data.sysUser.accountId, | ||||
username:res.data.sysUser.username, | username:res.data.sysUser.username, | ||||
agentId:localStorage.getItem('agentId'), | agentId:localStorage.getItem('agentId'), | ||||
@@ -588,7 +589,6 @@ export default { | |||||
}else{ | }else{ | ||||
this.ruleForm.managerPassword=res.data.sysUser.resultPwd | this.ruleForm.managerPassword=res.data.sysUser.resultPwd | ||||
} | } | ||||
}) | }) | ||||
.catch(err=>{ | .catch(err=>{ | ||||
console.log(err) | console.log(err) | ||||
@@ -3,8 +3,8 @@ | |||||
* https://cli.vuejs.org/zh/config/ | * https://cli.vuejs.org/zh/config/ | ||||
*/ | */ | ||||
// const url = 'http://pigx-gateway' | // 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.134:9999' //嘉豪 | ||||
// const url = 'http://192.168.31.100:9999' //王笑 | // const url = 'http://192.168.31.100:9999' //王笑 | ||||
// const url = 'http://nitu5e.natappfree.cc' //王笑 | // const url = 'http://nitu5e.natappfree.cc' //王笑 | ||||