From e5e5a84d84e7a2b4715bd58096043e565ae0e107 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 21 五月 2025 09:14:04 +0800
Subject: [PATCH] 提交
---
admin/src/views/index.vue | 28 ++++++++++++++++++++++++++--
h5/pages/appointmentDetails/appointmentDetails.vue | 2 +-
h5/api/visitor.js | 4 ++--
h5/pages/staff/vehicle/sendACarDetail.vue | 2 +-
screen/vite.config.js | 4 ++--
screen/src/views/TaskEfficiency.vue | 2 +-
6 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/index.vue b/admin/src/views/index.vue
index cf2594d..6ea8f86 100644
--- a/admin/src/views/index.vue
+++ b/admin/src/views/index.vue
@@ -563,7 +563,15 @@
// 杩欓噷杈撳叆绾挎潯鐨勬牱寮�
color: 'rgba(255,255,255,0.14)'
}
- }
+ },
+ axisLabel: {
+ formatter: function(value) {
+ const intValue = Math.round(value);
+ return intValue > 0 ? intValue : '';
+ }
+ },
+ minInterval: 1,
+ min: 1
},
yAxis: {
type: 'category',
@@ -626,6 +634,14 @@
nameTextStyle: {
padding: [0, 0, 4, -30] // 鍥涗釜鏁板瓧鍒嗗埆涓轰笂鍙充笅宸︿笌鍘熶綅缃窛绂�
},
+ axisLabel: {
+ formatter: function(value) {
+ const intValue = Math.round(value);
+ return intValue > 0 ? intValue : '';
+ }
+ },
+ minInterval: 1,
+ min: 1,
splitLine: {
show: true,
lineStyle: {
@@ -732,7 +748,15 @@
// 杩欓噷杈撳叆绾挎潯鐨勬牱寮�
color: 'rgba(255,255,255,0.14)'
}
- }
+ },
+ axisLabel: {
+ formatter: function(value) {
+ const intValue = Math.round(value);
+ return intValue > 0 ? intValue : '';
+ }
+ },
+ minInterval: 1,
+ min: 1
},
grid: {
top: '16%',
diff --git a/h5/api/visitor.js b/h5/api/visitor.js
index dfc7f13..a8e0aef 100644
--- a/h5/api/visitor.js
+++ b/h5/api/visitor.js
@@ -88,9 +88,9 @@
})
}
// 鍙栨秷棰勭害--璁垮
-export const visitsSelfCancel = (visitId, memberId) => {
+export const visitsSelfCancel = (visitId, openid) => {
return http({
- url: `visitsAdmin/cloudService/web/visitor/visitsSelfCancel?visitId=${visitId}&memberId=${memberId}`,
+ url: `visitsAdmin/cloudService/web/visitor/visitsSelfCancel?visitId=${visitId}&openid=${openid}`,
method: 'get'
})
}
diff --git a/h5/pages/appointmentDetails/appointmentDetails.vue b/h5/pages/appointmentDetails/appointmentDetails.vue
index 181a827..b28a825 100644
--- a/h5/pages/appointmentDetails/appointmentDetails.vue
+++ b/h5/pages/appointmentDetails/appointmentDetails.vue
@@ -153,7 +153,7 @@
// 鍙栨秷棰勭害
cancel() {
const member = uni.getStorageSync('member');
- visitsSelfCancel(this.id, member.id).then(res => {
+ visitsSelfCancel(this.id, member.openId).then(res => {
this.cancelShow = false
this.getDetail(this.id)
})
diff --git a/h5/pages/staff/vehicle/sendACarDetail.vue b/h5/pages/staff/vehicle/sendACarDetail.vue
index 10bc94a..9656fa0 100644
--- a/h5/pages/staff/vehicle/sendACarDetail.vue
+++ b/h5/pages/staff/vehicle/sendACarDetail.vue
@@ -130,7 +130,7 @@
<u-icon v-if="info.approveDateVO.driverParam == 1" class="ml12" name="arrow-right" color="#999999" />
</view>
<textarea v-model="param.checkInfo" :placeholder="
- param.status == 2 ? '鍚屾剰璇存槑锛岄潪蹇呭～' : '鎷掔粷璇存槑锛屽繀濉�'
+ param.status == 2 ? '鍚屾剰璇存槑锛岄潪蹇呭～' : '鎷掔粷璇存槑锛岄潪蹇呭～'
" placeholder-class="placeholder9" />
<view class="main_footer">
<view class="btn" @click="showApprModal = false">鍙栨秷</view>
diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue
index e78f9de..30fdf76 100644
--- a/screen/src/views/TaskEfficiency.vue
+++ b/screen/src/views/TaskEfficiency.vue
@@ -765,7 +765,7 @@
cnplatformWorkData().then(res => {
const result = res.data || []
dataList5.value = result.map(i => {
- i.statusTemp = i.status == 0 ? '浣滀笟涓�' : i.status == 1 ? '绌洪棽涓�' : '浣滀笟瓒呮椂'
+ i.statusTemp = i.status == 0 ? '浣滀笟涓�' : i.status == 1 ? '绌洪棽涓�' : i.status == 2 ? '浣滀笟瓒呮椂' : '鍙彿涓�'
if (i.workTime) {
// i.workTime = dayjs.duration(i.workTime * 1000).format('HH灏忔椂mm鍒�')
i.workTime = (i.workTime / 60).toFixed(0)
diff --git a/screen/vite.config.js b/screen/vite.config.js
index 31658b3..ff40646 100644
--- a/screen/vite.config.js
+++ b/screen/vite.config.js
@@ -26,8 +26,8 @@
proxy: {
"/gateway_interface": {
// target: "http://192.168.0.104:10010",
- target: "http://10.50.250.253:8088/gateway_interface",
- // target: "https://atwl.ahzyssl.com/zhyq_interface",
+ // target: "http://10.50.250.253:8088/gateway_interface",
+ target: "https://atwl.ahzyssl.com/zhyq_interface",
changeOrigin: true,
rewrite: (path) => path.replace(/^\/gateway_interface/, ""),
},
--
Gitblit v1.9.3