diff --git a/public/img/nullnull.png b/public/img/nullnull.png new file mode 100644 index 0000000..da4ea6a Binary files /dev/null and b/public/img/nullnull.png differ diff --git a/src/page/check/chose.vue b/src/page/check/chose.vue index 7f2378b..80875bf 100644 --- a/src/page/check/chose.vue +++ b/src/page/check/chose.vue @@ -332,6 +332,7 @@ export default { propertyName: this.propertyName, provinceId :this.provinceId , cityId:this.cityId, + sortBy:1, ...obj }).then((res) => { // console.log(res) diff --git a/src/views/Customer/AgentManagement.vue b/src/views/Customer/AgentManagement.vue index 2b5eca7..dbd75ad 100644 --- a/src/views/Customer/AgentManagement.vue +++ b/src/views/Customer/AgentManagement.vue @@ -1079,7 +1079,7 @@ export default { contractEndDate:this.contractEndDate, serviceStatus:this.serviceStatus, agentName:this.agentName, - operationalId:this.operationalId, + operationStaffId:this.operationalId, provinceId:this.provinceId, cityId:this.cityId, operationalName:this.operationalName, diff --git a/src/views/Equipment/equipmentDetailList.vue b/src/views/Equipment/equipmentDetailList.vue index 2a9cc14..9113c87 100644 --- a/src/views/Equipment/equipmentDetailList.vue +++ b/src/views/Equipment/equipmentDetailList.vue @@ -9,8 +9,8 @@ padding-top: 18px; " > - 楼盘名称： - + - --> -
- + + +
+ + + + +
+ +
+ + + + +
+
+ + + +
@@ -697,7 +745,11 @@ export default { houseId: "", timeType: 0, orgType: localStorage.getItem("orgType"), - selValue:'0', + selValue: localStorage.getItem("orgType") == 0 + ? "0" + : localStorage.getItem("orgType") == 1 + ? "1" + : "2", time: "", compareFlag: "0", selectTime: "", @@ -828,11 +880,12 @@ export default { selChange() { this.choicValue = ""; this.timeType = 4; - // this.getList(); - this.getTableList(); - this.getdetail(); - // 获取对比列表 - this.getcompare(); + this.houseId=''; + this.getHouseList(); + // this.getTableList(); + // this.getdetail(); + // // 获取对比列表 + // this.getcompare(); }, // 没有对比时的折线图 getNoCompare(){ @@ -842,7 +895,9 @@ export default { // pageSize: this.pageNum, startDate: this.page.openTime, endDate: this.page.closeTime, - houseId: this.houseId, + agentId: localStorage.getItem("orgType")==1?localStorage.getItem("agentId"):this.selValue == 0 ? this.houseId : 'null', + orgCode: localStorage.getItem("orgType")==2?localStorage.getItem("orgCode"):this.selValue == 1 ? this.houseId : 'null', + houseId: localStorage.getItem("orgType")==3?localStorage.getItem("houseId"):this.selValue == 2 ? this.houseId : 'null', timeType: this.timeType, contrastStartDate: this.selectTime, contrastEndDate: this.selectTime1, @@ -1019,26 +1074,57 @@ export default { }, //获取楼盘数据 getHouseList() { - this.$api.api - .findHouseByUser({ - orgType: localStorage.getItem("orgType"), - agentId: localStorage.getItem("agentId"), - }) - .then((res) => { - this.houseList = res.data; - if (!this.flag) { - // console.log(this.flag, "12"); - if (localStorage.getItem("orgType") == 3) { - this.houseId = localStorage.getItem("houseId"); - } else { - this.houseId = res.data[0].id; - } - } - // console.log(this.flag,'12') - this.tabtimetap(this.timeType); - // return - this.getTableList(); - }); + if (this.selValue == 1) { + this.$api.api + .findMyOrg({ + orgType: localStorage.getItem("orgType"), + agentId: localStorage.getItem("agentId"), + }) + .then((res) => { + this.houseList = res.data; + this.tabtimetap(this.timeType); + this.getTableList(); + }); + } else if (this.selValue == 2) { + this.$api.api + .findHouseByUser({ + orgType: localStorage.getItem("orgType"), + houseId: localStorage.getItem("houseId"), + }) + .then((res) => { + this.houseList = res.data; + this.tabtimetap(this.timeType); + this.getTableList(); + }); + } else { + this.$api.api + .findMyAgent({ + orgType: localStorage.getItem("orgType"), + }) + .then((res) => { + this.houseList = res.data; + this.tabtimetap(this.timeType); + this.getTableList(); + }); + } + + + // this.$api.api.findHouseByUser({ + // orgType: localStorage.getItem("orgType"), + // agentId: localStorage.getItem("agentId"), + // }) + // .then((res) => { + // this.houseList = res.data; + // if (!this.flag) { + // if (localStorage.getItem("orgType") == 3) { + // this.houseId = localStorage.getItem("houseId"); + // } else { + // this.houseId = res.data[0].id; + // } + // } + // this.tabtimetap(this.timeType); + // this.getTableList(); + // }); }, handleSizeChange(val) { console.log("每页条" + val); @@ -1068,7 +1154,9 @@ export default { size: this.pageSize, startDate: this.page.openTime, endDate: this.page.closeTime, - houseId: this.houseId, + agentId: localStorage.getItem("orgType")==1?localStorage.getItem("agentId"):this.selValue == 0 ? this.houseId : 'null', + orgCode: localStorage.getItem("orgType")==2?localStorage.getItem("orgCode"):this.selValue == 1 ? this.houseId : 'null', + houseId: localStorage.getItem("orgType")==3?localStorage.getItem("houseId"):this.selValue == 2 ? this.houseId : 'null', timeType: this.timeType, contrastStartDate: this.selectTime, contrastEndDate: this.selectTime1, @@ -1405,7 +1493,9 @@ export default { let obj = { startDate: this.page.openTime, endDate: this.page.closeTime, - houseId: this.houseId, + agentId: localStorage.getItem("orgType")==1?localStorage.getItem("agentId"):this.selValue == 0 ? this.houseId : 'null', + orgCode: localStorage.getItem("orgType")==2?localStorage.getItem("orgCode"):this.selValue == 1 ? this.houseId : 'null', + houseId: localStorage.getItem("orgType")==3?localStorage.getItem("houseId"):this.selValue == 2 ? this.houseId : 'null', timeType: this.timeType, contrastStartDate: this.selectTime, contrastEndDate: this.selectTime1, @@ -1564,7 +1654,9 @@ export default { pageSize: this.page.pageSize, startDate: this.page.openTime, endDate: this.page.closeTime, - houseId: this.houseId, + agentId: localStorage.getItem("orgType")==1?localStorage.getItem("agentId"):this.selValue == 0 ? this.houseId : 'null', + orgCode: localStorage.getItem("orgType")==2?localStorage.getItem("orgCode"):this.selValue == 1 ? this.houseId : 'null', + houseId: localStorage.getItem("orgType")==3?localStorage.getItem("houseId"):this.selValue == 2 ? this.houseId : 'null', timeType: this.timeType, orgType: localStorage.getItem("orgType"), }; diff --git a/src/views/Equipment/index.vue b/src/views/Equipment/index.vue index 82cb345..1624981 100644 --- a/src/views/Equipment/index.vue +++ b/src/views/Equipment/index.vue @@ -260,7 +260,7 @@ --> - {{ row.autoSwitch == 0 ? "已关闭" : "已开启" }} - + --> - 归还 - 转写设置 + 保存 + + + +
+ 转写方式： + + 关闭转写 + 科大讯飞 + 思必驰 + +
+
+ 取 消 + 保存 +
+ @@ -750,18 +770,6 @@ export default { value: "1", label: "未验收", }, - // { - // value: "2", - // label: "维修中", - // }, - // { - // value: "3", - // label: "更换中", - // }, - // { - // value: "4", - // label: "已报损", - // }, ], offStatusList: [ { @@ -853,6 +861,9 @@ export default { { color: "#1989fa", percentage: 80 }, { color: "#6f7ad3", percentage: 100 }, ], + radioindex:'', + radioindexid:'', + receiveVisiblescd:false }; }, computed: { @@ -880,6 +891,26 @@ export default { this.zkhousePage(); }, methods: { + //转写设置 + zhuanxeishezhi(row){ + this.radioindexid=row.id; + this.radioindex=row.transliterationMethod; + this.receiveVisiblescd=true; + }, + //转写设置确认 + shezhizhuanxei(){ + this.$api.api.updateTranslationMethod({ + id: this.radioindexid, + transliterationMethod:this.radioindex, + }).then((res) => { + this.receiveVisiblescd=false; + this.$message({ + type: "success", + message: "修改成功!", + }); + this.equipmentManagement(); + }); + }, // 获取批次列表 zkequipmentbatchList() { this.$api.api.zkequipmentbatchList().then((res) => { @@ -1325,12 +1356,10 @@ export default { } ) .then(() => { - this.$api.api - .updateTranslationMethod({ + this.$api.api.updateTranslationMethod({ id: row.id, defaultTransliteration: row.defaultTransliteration == 0 ? 1 : 0, - }) - .then((res) => { + }).then((res) => { this.$message({ type: "success", message: "修改成功!", diff --git a/src/views/Statistics/ConsultantBrand.vue b/src/views/Statistics/ConsultantBrand.vue index 6039d72..f4a7748 100644 --- a/src/views/Statistics/ConsultantBrand.vue +++ b/src/views/Statistics/ConsultantBrand.vue @@ -177,7 +177,7 @@
{{avg1}}次
-
@@ -191,6 +191,12 @@
{{ item.zxl }}
+
+
+ +
暂无数据
+
+
@@ -211,7 +217,7 @@
{{Math.floor(avg2/60)}}分钟
-
@@ -225,7 +231,12 @@
{{ item.zxl }}
- +
+
+ +
暂无数据
+
+
@@ -260,7 +271,7 @@
{{avg3}}%
-
@@ -274,6 +285,12 @@
{{ item.zxl }}%
+
+
+ +
暂无数据
+
+
@@ -309,7 +326,7 @@
{{avg4}}次
-
@@ -323,6 +340,12 @@
{{ item.zxl }}
+
+
+ +
暂无数据
+
+
diff --git a/src/views/building/Count.vue b/src/views/building/Count.vue index 05632ac..38ac5a8 100644 --- a/src/views/building/Count.vue +++ b/src/views/building/Count.vue @@ -158,13 +158,31 @@ clearable > -
+ +
+
运营人员：
+ + + +
@@ -188,11 +206,14 @@ + + + - + @@ -242,6 +263,12 @@ + + + + + + - + + + + + + @@ -382,11 +413,13 @@ export default { dateType: "4", startDate: "", endDate: "", + operationStaffId:'' }, currentPage: 1, selflag: "1", size: 10, total: 10, + operaList:[] }; }, computed: { @@ -401,10 +434,26 @@ export default { } // 获取楼盘列表 this.tabtimetap(4); + this.getOperaList() this.houseStatistics(); }, methods: { + getOperaList(){ + if (this.orgType == 1) { + this.$api.http + .getAllOperationsStaffByAgent({ + agentId: localStorage.getItem('agentId'), + }) + .then((res) => { + this.operaList = res.data; + }); + } else { + this.$api.http.getAllOperationsStaff().then((res) => { + this.operaList = res.data; + }); + } + }, selectChange(e) { this.searchForm.equipImei = ""; this.searchForm.userName = ""; @@ -523,6 +572,13 @@ export default { orgType:localStorage.getItem('orgType'), }; if(this.activeTotal==0){ + if(this.orgType==0){ + obj.operationType=1 + }else if(this.orgType==1){ + obj.operationType=2 + }else{ + obj.operationType=null + } // 楼盘 this.$api.api.houseStatistics1(obj).then((res) => { // console.log(res); @@ -530,6 +586,7 @@ export default { this.total = res.data.total; }); }else if(this.activeTotal==1){ + obj.operationType=null; // 代理商 this.$api.api.agentStatistics(obj).then((res) => { // console.log(res); @@ -537,6 +594,13 @@ export default { this.total = res.data.total; }); }else{ + if(this.orgType==0){ + obj.operationType=1 + }else if(this.orgType==1){ + obj.operationType=2 + }else{ + obj.operationType=null + } // 公司 this.$api.api.companyStatistics(obj).then((res) => { // console.log(res); diff --git a/src/views/building/index.vue b/src/views/building/index.vue index b6610a6..80fcdc6 100644 --- a/src/views/building/index.vue +++ b/src/views/building/index.vue @@ -258,6 +258,7 @@ prop="provinceName,cityName" label="楼盘地址" align="center" + :key="Math.random()" > @@ -267,21 +268,25 @@ prop="linkman" label="联系人信息" align="center" + :key="Math.random()" > - - - + + + + +