diff --git a/src/api/modules/api.js b/src/api/modules/api.js index 7f9d080..2112543 100644 --- a/src/api/modules/api.js +++ b/src/api/modules/api.js @@ -1027,8 +1027,31 @@ export function templategetMarketingTree(query) { //导出文件 export function exportFile(data) { return request({ - url: 'autoSR/equipReceive/findByPage', + url: '/autoSR/equipReceive/findByPage', method:'post', data }) } +//表格一 +export function realTimeStatisticsOfTime(query) { + return request({ + url: '/autoSR/cusStageStatistics/realTimeStatisticsOfTime', + method:'get', + params:query + }) +} +//表格二 +export function dataOverviewWithSystemWithLookWithTable(query) { + return request({ + url: '/autoSR/cusStageStatistics/dataOverviewWithSystemWithLookWithTable', + method:'get', + params:query + }) +} +export function buyEquipmentQuantity(query) { + return request({ + url: '/autoSR/cusStageStatistics/buyEquipmentQuantity', + method:'get', + params:query + }) +} diff --git a/src/views/Statistics/dataScreeAge.vue b/src/views/Statistics/dataScreeAge.vue index 7d6e6d5..e6db22c 100644 --- a/src/views/Statistics/dataScreeAge.vue +++ b/src/views/Statistics/dataScreeAge.vue @@ -3,6 +3,22 @@
+ + + + + +
选择公司:
累计楼盘数
{{ firstTab.houseQuantity || 0 }}
+
+
试用楼盘数
+
{{ firstTab.houseQuantityOfTryOut || 0 }}
+
累计销售设备数
{{ firstTab.equipmentQuantityWithSold || 0 }}
@@ -70,7 +90,42 @@
-
今日实时状况
+ + +
+
时段统计
+
+
+
+
+ 近7天 +
+
+ 近15天 +
+
+ 近30天 +
+
+
+ + +
+
+
+
+ +
接待量
@@ -128,6 +183,19 @@ >
+ + + +
@@ -205,12 +273,16 @@ export default { secondTab: {}, thirdTab: {}, selValue: "1", + houseTypes:'0,1', choicValue: "", houseList: [], secindex: "1", dateType: 4, customtime: [], cardindex: "1", + dateType1: 1, + echarValue:'0', + customtime1:[], options: [ { label: "代理商", @@ -220,14 +292,39 @@ export default { label: "公司", value: "1", }, + ], + options1: [ + { + label: "趋势图", + value: "0", + }, + { + label: "表格", + value: "1", + }, + ], + options2: [ + { + label: "正式数据", + value: "0,1", + }, + { + label: "测试数据", + value: "2,3", + }, ], }; }, mounted() { this.getList(); - this.tabtimetap(4); + // this.tabtimetap(4); }, methods: { + sysChange(){ + this.dataOverViewWithSystem(); + this.dataOverviewWithSystemWithDay(); + this.dataOverviewWithSystemWithLook(); + }, valuechange() { this.dateType = 4; this.cardindex=1 @@ -280,6 +377,10 @@ export default { agentId: localStorage.getItem('agentId'), orgCode: this.selValue == 1 ? this.choicValue : null, orgType: localStorage.getItem("orgType"), + startDate: this.dateType1 ? "" : this.customtime1[0], + endDate: this.dateType1 ? "" : this.customtime1[1], + dateType: this.dateType1, + houseTypes:this.houseTypes, }) .then((res) => { console.log(res); @@ -302,6 +403,7 @@ export default { agentId: localStorage.getItem('agentId'), orgCode: this.selValue == 1 ? this.choicValue : null, orgType: localStorage.getItem("orgType"), + houseTypes:this.houseTypes, }) .then((res) => { console.log(res); @@ -312,7 +414,7 @@ export default { // echars生成 getChars1(idx) { console.log(idx); - let Strname = ["昨日", "今日"]; + let Strname = ["时段一", "时段二"]; let timeDate = []; // 判断是第几个然后对数据进行渲染 // 先处理时间 @@ -323,10 +425,10 @@ export default { // 接待量 this.secondTab.todayReceptionList.map((item) => { timeDate.push(item.time.substring(11, 16)); - arr2.push(item.data); + arr1.push(item.data); }); this.secondTab.yesterdayReceptionList.map((item) => { - arr1.push(item.data); + arr2.push(item.data); }); } if (idx == 2) { @@ -343,10 +445,10 @@ export default { // 活跃设备 this.secondTab.todayActiveEquipmentList.map((item) => { timeDate.push(item.time.substring(11, 16)); - arr2.push(item.data); + arr1.push(item.data); }); this.secondTab.yesterdayActiveEquipmentList.map((item) => { - arr1.push(item.data); + arr2.push(item.data); }); } let arr = [ @@ -431,6 +533,7 @@ export default { agentId: localStorage.getItem('agentId'), orgCode: this.selValue == 1 ? this.choicValue : null, orgType: localStorage.getItem("orgType"), + houseTypes:this.houseTypes, }) .then((res) => { // console.log(res); @@ -451,11 +554,17 @@ export default { }, tabtimetap(i) { this.dateType = i; - this.selectTime = ""; - this.selectTime1 = ""; this.customtime=[] this.dataOverviewWithSystemWithLook(); - + }, + confirmtime1(e) { + this.dateType1 = null; + this.dataOverviewWithSystemWithDay(); + }, + tabtimetap1(i) { + this.dateType1 = i; + this.customtime1 = []; + this.dataOverviewWithSystemWithDay(); }, //卡片下折线图 SwitchCARDS(arr, str, timeDate, Strname) { diff --git a/src/views/Statistics/dataScreeOrg.vue b/src/views/Statistics/dataScreeOrg.vue index bb4042f..bab923f 100644 --- a/src/views/Statistics/dataScreeOrg.vue +++ b/src/views/Statistics/dataScreeOrg.vue @@ -1,5 +1,23 @@