diff --git a/src/views/Statistics/BuildingContrast.vue b/src/views/Statistics/BuildingContrast.vue index da3099c..9f0d48b 100644 --- a/src/views/Statistics/BuildingContrast.vue +++ b/src/views/Statistics/BuildingContrast.vue @@ -65,7 +65,7 @@ - + - +
-
+ +
+
购买服务项目数
+
+
{{ thirdTab.houseQuantity || 0 }}
+
+ + 环比:{{ sysCompare.houseQuantity || 0 }} + + + {{ orderBy.houseQuantity || 0 }} + + + + {{ orderBy.houseQuantity || 0 }} + +
+
+
+
+
活跃用户数
+
+
{{ thirdTab.activeUserQuantity || 0 }}
+
+ + 环比:{{ sysCompare.activeUserQuantity || 0 }} + + + {{ orderBy.activeUserQuantity || 0 }} + + + + {{ orderBy.activeUserQuantity || 0 }} + +
+
+
+
+
新增用户数
+
+
{{ thirdTab.userCountWithNewJoin || 0 }}
+
+ + 环比:{{ sysCompare.userCountWithNewJoin || 0 }} + + + {{ orderBy.userCountWithNewJoin || 0 }} + + + + {{ orderBy.userCountWithNewJoin || 0 }} + +
+
+
+
+
接待量
+
+
{{ thirdTab.receptionQuantity || 0 }}
+
+ + 环比:{{ sysCompare.receptionQuantity || 0 }} + + + {{ orderBy.receptionQuantity || 0 }} + + + + {{ orderBy.receptionQuantity || 0 }} + +
+
+
+
+
平均接待时长
+
+
{{ thirdTab.receptionTimeWithAvg || 0 }}
+
+ + 环比:{{ sysCompare.receptionTimeWithAvg || 0 }} + + + {{ orderBy.receptionTimeWithAvg || 0 }} + + + + {{ orderBy.receptionTimeWithAvg || 0 }} + +
+
+
+
+
活跃设备数
+
+
{{ thirdTab.activeEquipmentQuantity || 0 }}
+
+ + 环比:{{ sysCompare.activeEquipmentQuantity || 0 }} + + + {{ orderBy.activeEquipmentQuantity || 0 }} + + + + {{ orderBy.activeEquipmentQuantity || 0 }} + +
+
+
+
+
销售设备数
+
+
{{ thirdTab.buyEquipQuantity || 0 }}
+
+ + 环比:{{ sysCompare.buyEquipQuantity || 0 }} + + + {{ orderBy.buyEquipQuantity || 0 }} + + + + {{ orderBy.buyEquipQuantity || 0 }} + +
+
-
+
@@ -506,6 +639,8 @@ export default { firstTab: {}, secondTab: {}, thirdTab: {}, + sysCompare:{}, + orderBy:{}, selValue: "1", houseTypes:'0,1', operaFlag: true, @@ -859,7 +994,9 @@ export default { }) .then((res) => { console.log(res); - this.thirdTab = res.data; + this.thirdTab = res.data.resultA; + this.sysCompare = res.data.resultB; + this.orderBy = res.data.contrast; this.getChars2(1); }); }, @@ -1167,6 +1304,58 @@ export default { grid-template-columns: repeat(6, 16%); grid-column-gap: 8px; grid-row-gap: 18px; + .pagechen { + background: #ffffff; + border-radius: 4px; + padding: 15px; + border: 1px solid #e0e0e0; + + .pageboxtitle1 { + width: 100%; + font-size: 16px; + font-weight: 400; + color: #666666; + line-height: 16px; + } + .pageboxtitle2 { + width: 100%; + margin-top: 14px; + display: flex; + flex-wrap: wrap; + .span1 { + width: 100px; + height: 30px; + font-size: 30px; + font-weight: normal; + color: #32363d; + line-height: 30px; + } + .span2 { + height: 30px; + font-size: 16px; + display: flex; + align-items: flex-end; + .span2-1 { + color: #424d64; + margin-right: 15px; + font-weight: 400; + } + .span2-2 { + font-weight: 600; + color: #e6273a; + } + .span2-3 { + font-weight: 600; + color: #25ceba; + } + } + } + .pageboxtitle3 { + text-align: center; + font-size: 30px; + line-height: 44px; + } + } } // 进度条 @@ -1328,7 +1517,7 @@ export default { background: #2671e2; } .tophovese { - color: #2671e2; + color: #2671e2 !important; } .app-top { width: 100%; diff --git a/src/views/Statistics/dataScreeOrg.vue b/src/views/Statistics/dataScreeOrg.vue index 964098d..4ea46f7 100644 --- a/src/views/Statistics/dataScreeOrg.vue +++ b/src/views/Statistics/dataScreeOrg.vue @@ -366,7 +366,7 @@ {{ thirdTab.userCountWithNewJoin || 0 }}
--> -
{{ thirdTab.receptionQuantity || 0 }}
+ --> +
+
接待量
+
+
{{ thirdTab.receptionQuantity || 0 }}
+
+ + 环比:{{ sysCompare.receptionQuantity || 0 }} + + + {{ orderBy.receptionQuantity || 0 }} + + + + {{ orderBy.receptionQuantity || 0 }} + +
+
-
+
平均接待时长
+
+
{{ thirdTab.receptionTimeWithAvg || 0 }}
+
+ + 环比:{{ sysCompare.receptionTimeWithAvg || 0 }} + + + {{ orderBy.receptionTimeWithAvg || 0 }} + + + + {{ orderBy.receptionTimeWithAvg || 0 }} + +
+
+
+
+
活跃设备数
+
+
{{ thirdTab.activeEquipmentQuantity || 0 }}
+
+ + 环比:{{ sysCompare.activeEquipmentQuantity || 0 }} + + + {{ orderBy.activeEquipmentQuantity || 0 }} + + + + {{ orderBy.activeEquipmentQuantity || 0 }} + +
+
+
+ +
@@ -594,6 +651,8 @@ export default { firstTab: {}, secondTab: {}, thirdTab: {}, + sysCompare:{}, + orderBy:{}, selValue: "1", choicValue: localStorage.getItem("orgCode"), houseList: [], @@ -943,7 +1002,9 @@ export default { }) .then((res) => { console.log(res); - this.thirdTab = res.data; + this.thirdTab = res.data.resultA; + this.sysCompare = res.data.resultB; + this.orderBy = res.data.contrast; this.getChars2(this.cardindex); }); }, @@ -1250,6 +1311,58 @@ export default { grid-template-columns: repeat(6, 16%); grid-column-gap: 12px; grid-row-gap: 18px; + .pagechen { + background: #ffffff; + border-radius: 4px; + padding: 15px; + border: 1px solid #e0e0e0; + + .pageboxtitle1 { + width: 100%; + font-size: 16px; + font-weight: 400; + color: #666666; + line-height: 16px; + } + .pageboxtitle2 { + width: 100%; + margin-top: 14px; + display: flex; + flex-wrap: wrap; + .span1 { + width: 100px; + height: 30px; + font-size: 30px; + font-weight: normal; + color: #32363d; + line-height: 30px; + } + .span2 { + height: 30px; + font-size: 16px; + display: flex; + align-items: flex-end; + .span2-1 { + color: #424d64; + margin-right: 15px; + font-weight: 400; + } + .span2-2 { + font-weight: 600; + color: #e6273a; + } + .span2-3 { + font-weight: 600; + color: #25ceba; + } + } + } + .pageboxtitle3 { + text-align: center; + font-size: 30px; + line-height: 44px; + } + } } // 进度条 @@ -1411,7 +1524,7 @@ export default { background: #2671e2; } .tophovese { - color: #2671e2; + color: #2671e2 !important; } .app-top { width: 100%; diff --git a/src/views/Statistics/dataScreeSys.vue b/src/views/Statistics/dataScreeSys.vue index 9903b1c..ddf2e48 100644 --- a/src/views/Statistics/dataScreeSys.vue +++ b/src/views/Statistics/dataScreeSys.vue @@ -336,8 +336,9 @@ +
-
{{ thirdTab.houseQuantity || 0 }}
+
--> + +
+
购买服务项目数
+
+
{{ thirdTab.houseQuantity || 0 }}
+
+ + 环比:{{ sysCompare.houseQuantity || 0 }} + + + {{ orderBy.houseQuantity || 0 }} + + + + {{ orderBy.houseQuantity || 0 }} + +
+
+
+
+
活跃用户数
+
+
{{ thirdTab.activeUserQuantity || 0 }}
+
+ + 环比:{{ sysCompare.activeUserQuantity || 0 }} + + + {{ orderBy.activeUserQuantity || 0 }} + + + + {{ orderBy.activeUserQuantity || 0 }} + +
+
+
+
+
新增用户数
+
+
{{ thirdTab.userCountWithNewJoin || 0 }}
+
+ + 环比:{{ sysCompare.userCountWithNewJoin || 0 }} + + + {{ orderBy.userCountWithNewJoin || 0 }} + + + + {{ orderBy.userCountWithNewJoin || 0 }} + +
+
+
+
+
接待量
+
+
{{ thirdTab.receptionQuantity || 0 }}
+
+ + 环比:{{ sysCompare.receptionQuantity || 0 }} + + + {{ orderBy.receptionQuantity || 0 }} + + + + {{ orderBy.receptionQuantity || 0 }} + +
+
+
+
+
平均接待时长
+
+
{{ thirdTab.receptionTimeWithAvg || 0 }}
+
+ + 环比:{{ sysCompare.receptionTimeWithAvg || 0 }} + + + {{ orderBy.receptionTimeWithAvg || 0 }} + + + + {{ orderBy.receptionTimeWithAvg || 0 }} + +
+
+
+
+
活跃设备数
+
+
{{ thirdTab.activeEquipmentQuantity || 0 }}
+
+ + 环比:{{ sysCompare.activeEquipmentQuantity || 0 }} + + + {{ orderBy.activeEquipmentQuantity || 0 }} + + + + {{ orderBy.activeEquipmentQuantity || 0 }} + +
+
+
+
+
销售设备数
+
+
{{ thirdTab.buyEquipQuantity || 0 }}
+
+ + 环比:{{ sysCompare.buyEquipQuantity || 0 }} + + + {{ orderBy.buyEquipQuantity || 0 }} + + + + {{ orderBy.buyEquipQuantity || 0 }} + +
+
-
+
+
+
+
+
{{ thirdTab.buyEquipQuantity || 0 }}
- + --> +
@@ -634,6 +775,8 @@ export default { firstTab: {}, secondTab: {}, thirdTab: {}, + sysCompare:{}, + orderBy:{}, selValue: "0", houseTypes: "0,1", operaFlag: true, @@ -1022,7 +1165,9 @@ export default { }) .then((res) => { // console.log(res); - this.thirdTab = res.data; + this.thirdTab = res.data.resultA; + this.sysCompare = res.data.resultB; + this.orderBy = res.data.contrast; this.getChars2(this.cardindex); }); }, @@ -1324,6 +1469,62 @@ export default { grid-template-columns: repeat(6, 16%); grid-column-gap: 12px; grid-row-gap: 18px; + + .pagechen { + background: #ffffff; + border-radius: 4px; + padding: 15px; + border: 1px solid #e0e0e0; + + .pageboxtitle1 { + width: 100%; + font-size: 16px; + font-weight: 400; + color: #666666; + line-height: 16px; + } + .pageboxtitle2 { + width: 100%; + margin-top: 14px; + display: flex; + flex-wrap: wrap; + .span1 { + width: 100px; + height: 30px; + font-size: 30px; + font-weight: normal; + color: #32363d; + line-height: 30px; + } + .span2 { + height: 30px; + font-size: 16px; + display: flex; + align-items: flex-end; + justify-content: space-between; + width: 100%; + .span2-1 { + color: #424d64; + margin-right: 15px; + font-weight: 400; + } + .span2-2 { + font-weight: 600; + color: #e6273a; + } + .span2-3 { + font-weight: 600; + color: #25ceba; + } + } + } + .pageboxtitle3 { + text-align: center; + font-size: 30px; + line-height: 44px; + } + } + } // 进度条 @@ -1485,7 +1686,7 @@ export default { background: #2671e2; } .tophovese { - color: #2671e2; + color: #2671e2 !important; } .app-top { width: 100%; diff --git a/vue.config.js b/vue.config.js index 71589bb..3cef54e 100644 --- a/vue.config.js +++ b/vue.config.js @@ -7,9 +7,10 @@ // const url = 'http://192.168.31.167:9999' //长龙 // const url = 'http://192.168.31.134:9999' //嘉豪 // const url = 'http://192.168.31.100:9999' //王笑 -const url = 'http://62.234.122.43:9999' //正式 +// const url = 'http://62.234.122.43:9999' //正式 // const url = 'http://192.168.31.89:9999' //sh // const url = 'https://zanyong.hfju.com' // 正式域名 +const url = 'http://81.70.55.170:9999' // 新测试 const CompressionWebpackPlugin = require('compression-webpack-plugin') const productionGzipExtensions = ['js', 'css'] module.exports = {