diff --git a/components/uni-popup.vue b/components/uni-popup.vue
index 3f07cbf..3789166 100644
--- a/components/uni-popup.vue
+++ b/components/uni-popup.vue
@@ -1,7 +1,7 @@
-
-
+
+
@@ -27,11 +27,15 @@
round: {
type: Boolean,
default: false
- }
+ },
+ showIndex:{
+ type: Number,
+ default: 0
+ }
},
data() {
let offsetTop = 0;
-
+
return {
offsetTop: offsetTop
}
@@ -40,7 +44,7 @@
hide: function() {
this.$emit('hidePopup');
},
-
+
doNotMove: function () {
console.log('stop user scroll it!');
return;
diff --git a/package-lock.json b/package-lock.json
index c968fc6..1fb0bce 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,6 +5,7 @@
"packages": {
"": {
"dependencies": {
+ "moment": "^2.25.3",
"sass": "^1.45.1",
"sass-loader": "^10.3.1",
"vuex-persistedstate": "^4.1.0"
@@ -752,6 +753,14 @@
"node": ">= 0.6"
}
},
+ "node_modules/moment": {
+ "version": "2.29.4",
+ "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+ "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
+ "engines": {
+ "node": "*"
+ }
+ },
"node_modules/neo-async": {
"version": "2.6.2",
"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
@@ -1771,6 +1780,11 @@
"mime-db": "1.52.0"
}
},
+ "moment": {
+ "version": "2.29.4",
+ "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+ "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
+ },
"neo-async": {
"version": "2.6.2",
"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
diff --git a/package.json b/package.json
index 7b3f319..a3d34d5 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,7 @@
"dependencies": {
"sass": "^1.45.1",
"sass-loader": "^10.3.1",
- "vuex-persistedstate": "^4.1.0"
+ "vuex-persistedstate": "^4.1.0",
+ "moment": "^2.25.3"
}
}
diff --git a/pages/commercialBI/carPortrait.vue b/pages/commercialBI/carPortrait.vue
index d234324..37eb0de 100644
--- a/pages/commercialBI/carPortrait.vue
+++ b/pages/commercialBI/carPortrait.vue
@@ -382,11 +382,11 @@ export default {
this.backType = option.type
},
onShow(){
- this.carTypeList.forEach(item=>{
- item.select = false
- })
- this.selectProvinceName = ''
- this.carType = ''
+ this.carTypeList.forEach(item=>{
+ item.select = false
+ })
+ this.selectProvinceName = ''
+ this.carType = ''
this.isFirst = true
// 总的来说商业bi的五个页面都是 往组件里面传值 就可以出现图表和要求的东西
// 外面的一层页面主要用于处理数据
@@ -405,6 +405,7 @@ export default {
this.searchText = this.time
const date = new Date(this.time)
//设置日期选择器的开始时间和结束时间
+ let searchYear = date.getFullYear()
let m = date.getMonth() + 1
if (m<10){
m = '0' + m
@@ -413,7 +414,8 @@ export default {
if (d<10){
d = '0'+ d
}
- this.thisMonth = m
+ this.thisMonth = m
+
let systemInfo = uni.getSystemInfoSync()
// 获取手机参数对页面进行适配
this.statusBarHeight = Number(systemInfo.statusBarHeight)
@@ -435,8 +437,8 @@ export default {
ProvinceCode: 340000,
ServerpartIds: "",
ShopAnalysisType: 0,
- month: `${y}${m}`,
- time: `${y}-${m}-${d}`,
+ month: `${searchYear}${m}`,
+ time: `${searchYear}-${m}-${d}`,
}
if (this.serviceInfo.SERVERPART_NAME==='安徽驿达' || this.isShowAllProvince==='true'){
this.isShowAllProvince = true
diff --git a/pages/commercialBI/components/guest/customerFirst.vue b/pages/commercialBI/components/guest/customerFirst.vue
index 2c251db..5e806bb 100644
--- a/pages/commercialBI/components/guest/customerFirst.vue
+++ b/pages/commercialBI/components/guest/customerFirst.vue
@@ -123,7 +123,7 @@ export default {
handler(value) {
console.log('value',value)
this.info = value
- this.addAreaCarNumber = Math.abs((this.info.VehicleCount / this.info.MonthVehicleCount - 1)*100).toFixed(2)
+ this.addAreaCarNumber = this.info.VehicleCount ? Math.abs((this.info.VehicleCount / this.info.MonthVehicleCount - 1)*100).toFixed(2):''
this.oneCarPrice = this.info.MonthVehicleAmount?Math.abs(((this.info.AvgVehicleAmount / this.info.MonthVehicleAmount) - 1) *100).toFixed(2):''
this.$forceUpdate()
},
diff --git a/pages/commercialBI/guestPortrait.vue b/pages/commercialBI/guestPortrait.vue
index 72ab1cc..8e29999 100644
--- a/pages/commercialBI/guestPortrait.vue
+++ b/pages/commercialBI/guestPortrait.vue
@@ -117,6 +117,7 @@ export default {
this.time = storeTime
}
this.single = this.$util.getThisMonthHave(this.time)
+ console.log('this.single',this.single)
const date = new Date(this.single)
//设置日期选择器的开始时间和结束时间
let m = date.getMonth() + 1
@@ -203,7 +204,7 @@ export default {
const date = new Date(this.single)
let y = date.getFullYear()
let m = date.getMonth() + 1
- const nowDate = new Date()
+ const nowDate = new Date(this.time)
let nowYear = nowDate.getFullYear()
let nowMonth = nowDate.getMonth() + 1
if (y===nowYear && m===nowMonth){
@@ -211,6 +212,7 @@ export default {
}else{
time = this.endTime
}
+ console.log('time',time)
const req = {
Province_Code:'340000',
Statistics_Date:time,
@@ -229,7 +231,7 @@ export default {
const date = new Date(this.single)
let y = date.getFullYear()
let m = date.getMonth() + 1
- const nowDate = new Date()
+ const nowDate = new Date(this.time)
let nowYear = nowDate.getFullYear()
let nowMonth = nowDate.getMonth() + 1
if (y===nowYear && m===nowMonth){
@@ -283,7 +285,7 @@ export default {
const date = new Date(this.single)
let y = date.getFullYear()
let m = date.getMonth() + 1
- const nowDate = new Date()
+ const nowDate = new Date(this.time)
let nowYear = nowDate.getFullYear()
let nowMonth = nowDate.getMonth() + 1
if (y===nowYear && m===nowMonth){
@@ -334,7 +336,7 @@ export default {
const date = new Date(this.single)
let y = date.getFullYear()
let m = date.getMonth() + 1
- const nowDate = new Date()
+ const nowDate = new Date(this.time)
let nowYear = nowDate.getFullYear()
let nowMonth = nowDate.getMonth() + 1
if (y===nowYear && m===nowMonth){
@@ -363,7 +365,7 @@ export default {
const date = new Date(this.single)
let y = date.getFullYear()
let m = date.getMonth() + 1
- const nowDate = new Date()
+ const nowDate = new Date(this.time)
let nowYear = nowDate.getFullYear()
let nowMonth = nowDate.getMonth() + 1
if (y===nowYear && m===nowMonth){
diff --git a/pages/examine/index.vue b/pages/examine/index.vue
index f726750..19e6089 100644
--- a/pages/examine/index.vue
+++ b/pages/examine/index.vue
@@ -103,7 +103,7 @@
-
+
{{subItem.REGION_NAME}}区
({{subItem.SERVERPARTList.length}})
@@ -190,7 +190,7 @@
-
+
+
+
+
+
+
+
+
+ 整改前
+
+ 整改后
+
+ 暂未整改完成
+
+
+