From 57bf0010961d651df7d571184ac26653250d8b85 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 19 十二月 2024 19:42:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/task/index.vue | 1
h5/pages/staffLogin/login.vue | 8 +++-
h5/pages/staff/index.vue | 27 ++++++++++---
h5/api/staff.js | 9 ++++
h5/utils/service.js | 3 +
h5/pages/driver/reserved.vue | 4 +
screen/src/views/LogisticsEfficiency.vue | 34 +++++++---------
screen/src/views/EnergyConsum.vue | 8 ++--
8 files changed, 61 insertions(+), 33 deletions(-)
diff --git a/h5/api/staff.js b/h5/api/staff.js
index f42beec..b7c9605 100644
--- a/h5/api/staff.js
+++ b/h5/api/staff.js
@@ -66,6 +66,15 @@
data
})
}
+// 瑙ｇ粦openId
+export const delHkUserOpenid = (data) => {
+ return http({
+ url: 'visitsAdmin/cloudService/business/hksync/delHkUserOpenid',
+ method: 'post',
+ data
+ })
+}
+
// 闅愭偅闅忔墜鎷� 鍒涘缓
export const DangerCreate = (data) => {
diff --git a/h5/pages/driver/reserved.vue b/h5/pages/driver/reserved.vue
index 038a5da..a491d06 100644
--- a/h5/pages/driver/reserved.vue
+++ b/h5/pages/driver/reserved.vue
@@ -188,7 +188,9 @@
setTimeout(() => {
this.showToast('棰勭害鐢宠鎴愬姛')
})
- this.$jump('/pages/driver/reservedRecord')
+ uni.redirectTo({
+ url: '/pages/driver/index'
+ })
}
})
},
diff --git a/h5/pages/staff/index.vue b/h5/pages/staff/index.vue
index 489dbec..20f1ebf 100644
--- a/h5/pages/staff/index.vue
+++ b/h5/pages/staff/index.vue
@@ -53,7 +53,8 @@
stagingHead,
wxAuthorize,
refreshToken,
- app_url
+ app_url,
+ delHkUserOpenid
} from '@/api'
export default {
data() {
@@ -172,11 +173,25 @@
loginOut() {
logoutPost({
isH5: 1
- }).then(res => {
- this.$store.commit('empty')
- setTimeout(() => {
- window.location.href = app_url
- }, 300)
+ }).then(res => {
+ const userInfo = uni.getStorageSync('userInfo')
+ const openId = uni.getStorageSync('openId')
+ this.$store.commit('empty')
+ if(openId){
+ delHkUserOpenid({
+ userName: userInfo.username,
+ openId
+ }).then(ress => {
+ setTimeout(() => {
+ window.location.href = app_url
+ }, 300)
+ })
+ }else{
+ setTimeout(() => {
+ window.location.href = app_url
+ }, 300)
+ }
+
})
},
getTaskInfo() {
diff --git a/h5/pages/staff/task/index.vue b/h5/pages/staff/task/index.vue
index b29b5df..3939f35 100644
--- a/h5/pages/staff/task/index.vue
+++ b/h5/pages/staff/task/index.vue
@@ -542,6 +542,7 @@
font-weight: 400;
color: #999999;
width: 120rpx;
+ text-align: right;
}
.loading {
color: $uni-color-primary;
diff --git a/h5/pages/staffLogin/login.vue b/h5/pages/staffLogin/login.vue
index 3681b31..ddde42d 100644
--- a/h5/pages/staffLogin/login.vue
+++ b/h5/pages/staffLogin/login.vue
@@ -157,8 +157,12 @@
})
})
saveHkUserOpenid({})
- }
- })
+ }else{
+ this.initCaptcha()
+ }
+ }, () => {
+ this.initCaptcha()
+ })
}
}
}
diff --git a/h5/utils/service.js b/h5/utils/service.js
index 0539bd3..a0df64f 100644
--- a/h5/utils/service.js
+++ b/h5/utils/service.js
@@ -48,7 +48,8 @@
fail: (err) => {
// 椤甸潰涓脊妗嗘樉绀哄け璐�
uni.showToast({
- title: '璇锋眰鎺ュ彛澶辫触'
+ title: '璇锋眰鎺ュ彛澶辫触',
+ icon:"none"
})
// 杩斿洖閿欒娑堟伅
diff --git a/screen/src/views/EnergyConsum.vue b/screen/src/views/EnergyConsum.vue
index 846561a..9229a23 100644
--- a/screen/src/views/EnergyConsum.vue
+++ b/screen/src/views/EnergyConsum.vue
@@ -347,7 +347,7 @@
xAxis: {
type: 'category',
boundaryGap: false,
- data: data5.value.map(i => i.timeData)
+ data: data5.value.map(i => dayjs(i.timeData).format('M'))
},
tooltip: {
trigger: 'axis',
@@ -483,7 +483,7 @@
}
},
grid: {
- top: '26%',
+ top: '18%',
left: '4%',
right: '2%',
bottom: '2%',
@@ -577,7 +577,7 @@
myChart.setOption({
grid: {
- top: '24%',
+ top: '20%',
left: '6%',
right: '2%',
bottom: '4%',
@@ -591,7 +591,7 @@
},
xAxis: {
type: 'category',
- data: data2.value.map(i => i.timeData)
+ data: data2.value.map(i => dayjs(i.timeData).format('M'))
},
yAxis: {
type: 'value',
diff --git a/screen/src/views/LogisticsEfficiency.vue b/screen/src/views/LogisticsEfficiency.vue
index ea7a49a..fa890af 100644
--- a/screen/src/views/LogisticsEfficiency.vue
+++ b/screen/src/views/LogisticsEfficiency.vue
@@ -47,7 +47,7 @@
data1.monthLastOutTotal) / data1.monthLastOutTotal) * 100).toFixed(1)) }}%</span>
<span v-else-if="activeTab1 == 1 && data1.yearLastOutTotal">{{ Math.abs((((data1.yearOutTotal -
data1.yearLastOutTotal) / data1.yearLastOutTotal) * 100).toFixed(1)) }}%</span>
- <span v-else>-</span>
+ <span v-else style="margin-left: 10px;">-</span>
</div>
</div>
<div class="train_wrap">
@@ -137,22 +137,26 @@
<img src="@/assets/images/energy_ef/ic_renwuzongliang@2x.png" alt="">
<div class="content">
<div class="name">褰撳墠浠诲姟閲�</div>
- <div class="num"><span>{{ data4.planTaskNum }}</span>涓囨敮</div>
+ <div class="num"><span>{{ activeTab4 == 0 ? data1.currentOutNum : data1.currentInNum }}</span>涓囨敮</div>
</div>
</div>
<div class="item">
<img src="@/assets/images/energy_ef/ic_wanchengrenwu@2x.png" alt="">
<div class="content">
<div class="name">褰撴棩瀹屾垚浠诲姟鎬婚噺</div>
- <div class="num"><span class="today">{{ data4.finishTaskNum }}</span>涓囨敮</div>
+ <div class="num"><span v-if="data1.currentOutDoneNum || data1.currentInDoneNum" class="today">{{ activeTab4 == 0 ? data1.currentOutDoneNum :
+ data1.currentInDoneNum
+ }}</span>涓囨敮</div>
</div>
</div>
<div class="item">
<img src="@/assets/images/energy_ef/ic_bili@2x.png" alt="">
<div class="content">
<div class="name">宸插畬鎴愭瘮渚�</div>
- <div class="num" v-if="data4.finishTaskNum && data4.planTaskNum"><span class="finish">{{ ((
- data4.finishTaskNum / data4.planTaskNum) * 100).toFixed(1) }}%</span>涓囨敮</div>
+ <div class="num">
+ <span v-if="activeTab4 == 0 && data1.currentOutNum" class="finish">{{ ((data1.currentOutDoneNum / data1.currentOutNum) * 100).toFixed(1) }}%</span>
+ <span v-if="activeTab4 == 1 && data1.currentInNum" class="finish">{{ ((data1.currentInDoneNum / data1.currentInNum) * 100).toFixed(1) }}%</span>
+ </div>
</div>
</div>
</div>
@@ -870,17 +874,9 @@
dataList3.value = result
})
}
-const data4 = ref({})
const activeTab4 = ref(0)
const tabClick4 = (val) => {
activeTab4.value = val
- getData4()
-}
-const getData4 = () => {
- wljobData({ queryType: activeTab4.value }).then(res => {
- const result = res.data
- data4.value = result
- })
}
const dataList5 = ref([])
const data5 = ref(0)
@@ -947,7 +943,7 @@
getData1()
getData2()
getData3()
- getData4()
+ // getData4()
getData5()
getData6()
getData7()
@@ -994,15 +990,15 @@
.num {
margin-right: 10px;
font-weight: bold;
- font-size: 46px;
- height: 44px;
- line-height: 52px;
+ font-size: 44px;
+ height: 48px;
+ line-height: 50px;
font-weight: bold;
color: #00F2F3;
letter-spacing: 3px;
background-image: -webkit-linear-gradient(top,
- #01D9FE 0%,
- #0177FE 60%,
+ #1cdafb 0%,
+ #0177FE 70%,
#0177FE 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
--
Gitblit v1.9.3