From 7df781c76f651d21cac02bcdae7f7b3f9e41e275 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 27 十二月 2024 17:47:41 +0800
Subject: [PATCH] ll
---
h5/pages/staff/task/index.vue | 5 +-
pda/pages/index/index.vue | 2
h5/pages/staffLogin/login.vue | 4 -
pda/utils/config.js | 4 +-
screen/src/views/LogisticsCenter.vue | 6 +-
h5/utils/service.js | 2
h5/manifest.json | 4 +-
screen/src/views/EnergyConsum.vue | 58 +++++++++++++++++++++--------
8 files changed, 55 insertions(+), 30 deletions(-)
diff --git a/h5/manifest.json b/h5/manifest.json
index d3fa7f7..1367de7 100644
--- a/h5/manifest.json
+++ b/h5/manifest.json
@@ -128,9 +128,9 @@
"/zhyq_interface" : {
// 杩欎釜瀛楁鍚嶉渶涓庝綘閰嶇疆鐨刡asePrefixUrl涓�鑷达紝绯荤粺璇嗗埆鍒板甫鏈�/dev-api璇锋眰鐨勫湴鍧�鏃讹紝浼氬湪鍓嶉潰鎷兼帴涓婁唬鐞嗘湇鍔″櫒鍦板潃
// "target" : "http://172.20.10.7:10010", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
- "target" : "http://192.168.0.102:10010", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
+ // "target" : "http://192.168.0.102:10010", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
// "target" : "http://10.50.250.253:8088/gateway_interface", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
- // "target" : "https://atwl.ahzyssl.com/zhyq_interface", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
+ "target" : "https://atwl.ahzyssl.com/zhyq_interface", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
"changeOrigin" : true, // 鍏佽璺ㄥ煙
"pathRewrite" : {
"^/zhyq_interface" : ""
diff --git a/h5/pages/staff/task/index.vue b/h5/pages/staff/task/index.vue
index 0636047..619ff2b 100644
--- a/h5/pages/staff/task/index.vue
+++ b/h5/pages/staff/task/index.vue
@@ -249,6 +249,7 @@
{ name: '鐢ㄨ溅鐢宠', id: 2 },
{ name: '闅愭偅闅忔墜鎷�', id: 3 },
{ name: '鐗╂祦杞︾敵璇�', id: 4 },
+ { name: '鑰冨嫟浠ｅ姙', id: 7 },
],
startDate: dayjs().format('YYYY-MM-DD'),
}
@@ -275,8 +276,7 @@
onShow() {
this.pagination.page = 0
this.dataList = []
- this.getHeadList()
- this.getList()
+ this.getHeadList()
},
methods: {
statusClick(val) {
@@ -339,6 +339,7 @@
isDetail: '1'
}).then(res => {
this.headData = res.data
+ this.getList()
})
},
handleReady() {
diff --git a/h5/pages/staffLogin/login.vue b/h5/pages/staffLogin/login.vue
index 6e6aa57..af0b5a4 100644
--- a/h5/pages/staffLogin/login.vue
+++ b/h5/pages/staffLogin/login.vue
@@ -168,9 +168,7 @@
}else{
this.initCaptcha()
}
- }, () => {
- this.initCaptcha()
- })
+ })
}
}
}
diff --git a/h5/utils/service.js b/h5/utils/service.js
index a0df64f..1ecf79c 100644
--- a/h5/utils/service.js
+++ b/h5/utils/service.js
@@ -40,7 +40,7 @@
url: '/pages/login/login'
})
}
- return
+ return resolve(data)
}
resolve(data)
// return response.data
diff --git a/pda/pages/index/index.vue b/pda/pages/index/index.vue
index ce712bb..04c7012 100644
--- a/pda/pages/index/index.vue
+++ b/pda/pages/index/index.vue
@@ -18,7 +18,7 @@
</view>
<view class="item" @click="jump('/pages/index/queueup')">
<image src="@/static/ic_cheliangpaidui@2x.png" mode=""></image>
- <view class="text">杞﹂槦鎺掗槦鎯呭喌</view>
+ <view class="text">杞﹁締鎺掗槦鎯呭喌</view>
</view>
<view class="item" @click="jump('/pages/index/control')">
<image src="@/static/ic_qiyong@2x.png" mode=""></image>
diff --git a/pda/utils/config.js b/pda/utils/config.js
index 4803406..0d82c16 100644
--- a/pda/utils/config.js
+++ b/pda/utils/config.js
@@ -1,6 +1,6 @@
-export const baseUrl = 'gateway_interface/'
-// export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/'
+// export const baseUrl = 'gateway_interface/'
+export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/'
export const uploadAvatar = `${baseUrl}visitsAdmin/cloudService/web/public/uploadFtp.do`
export const uploadUrl = `${baseUrl}visitsAdmin/cloudService/public/uploadBatch`
diff --git a/screen/src/views/EnergyConsum.vue b/screen/src/views/EnergyConsum.vue
index 419ae85..76eaed1 100644
--- a/screen/src/views/EnergyConsum.vue
+++ b/screen/src/views/EnergyConsum.vue
@@ -252,18 +252,17 @@
<div class="tabs">娌硅�楋細L</div>
<img src="@/assets/images/title@2x.png" class="bg" alt="" />
</div>
- <div v-if="data3 && data3.length > 0" class="list">
- <template v-for="item, i in data3">
- <div v-if="i < 6" class="line">
- <div class="top" :class="{top3: i < 3}"><span v-if="i < 3">top</span>{{ i + 1 }}</div>
+ <div v-if="data3 && data3.length > 0" class="list one-swiper">
+ <div class="swiper-wrapper">
+ <div class="line one-swiper-slide swiper-slide" v-for="item, i in data3">
+ <div class="top" :class="{ top3: i < 3 }"><span v-if="i < 3">top</span>{{ i + 1 }}</div>
<div class="id_card">{{ item.carNo }}</div>
<div class="wrap">
<ChargeRate :rate="item.rate" :color="i > 2 ? 'cyan' : '#e3a83a'" />
</div>
<div class="num">{{ item.quantity }}</div>
</div>
- </template>
-
+ </div>
</div>
<div v-if="data3.length == 0" class="empty_wrap list">
<img src="@/assets/images/default_empty.png" alt="">
@@ -293,6 +292,8 @@
import ChargeRate from '@/components/ChargeRate.vue'
import * as echarts from 'echarts'
import VScaleScreen from 'v-scale-screen'
+import 'swiper/css/swiper.min.css'
+import Swiper from 'swiper'
import {
zxcenterData,
zxenergyDataList,
@@ -345,7 +346,7 @@
type: 'category',
boundaryGap: false,
axisLabel: {
- color: '#D2E0FF'
+ color: '#D2E0FF'
},
data: data5.value.map(i => dayjs(i.timeData).format('M'))
},
@@ -359,7 +360,7 @@
type: 'value',
name: '鍗曚綅锛歀',
axisLabel: {
- color: '#D2E0FF'
+ color: '#D2E0FF'
},
nameTextStyle: {
color: '#D2E0FF',
@@ -469,7 +470,7 @@
type: 'category',
boundaryGap: false,
axisLabel: {
- color: '#D2E0FF'
+ color: '#D2E0FF'
},
data: data4.value.map(i => i.timeData)
},
@@ -490,7 +491,7 @@
splitNumber: 4
},
axisLabel: {
- color: '#D2E0FF'
+ color: '#D2E0FF'
}
},
grid: {
@@ -603,7 +604,7 @@
xAxis: {
type: 'category',
axisLabel: {
- color: '#D2E0FF'
+ color: '#D2E0FF'
},
data: data2.value.map(i => dayjs(i.timeData).format('M'))
},
@@ -611,7 +612,7 @@
type: 'value',
name: unit,
axisLabel: {
- color: '#D2E0FF'
+ color: '#D2E0FF'
},
nameTextStyle: {
color: '#D2E0FF',
@@ -690,6 +691,23 @@
})
}
+const autoplayFlag = (list = [], leng = 4, time = 2000) => {
+ if (list.length > leng) {
+ return { delay: time, disableOnInteraction: false }
+ } else {
+ return false
+ }
+}
+const loopFn1 = () => {
+ var newSwiper1 = new Swiper('.one-swiper', {
+ initialSlide: 0,
+ direction: 'vertical', //绔栫洿鏂瑰悜
+ slidesPerView: 6,
+ autoplay: autoplayFlag(data3.value, 6, 4000),
+ observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
+ })
+}
+
onMounted(() => {
getData1()
getData2()
@@ -707,6 +725,10 @@
getData5()
getData6()
}, 1000 * 60 * 60)
+
+ setTimeout(() => {
+ loopFn1()
+ }, 12000)
})
@@ -994,13 +1016,16 @@
margin-bottom: 20px;
.list {
- padding: 20px 24px 4px;
- height: 250px;
+ padding: 0px 24px;
+ height: 228px;
+ margin: 20px 0 0;
+ overflow: auto;
.line {
display: flex;
align-items: center;
- margin-bottom: 16px;
+ /* margin-bottom: 16px; */
+ height: 38px !important;
.top {
font-weight: 500;
@@ -1013,7 +1038,8 @@
box-shadow: inset 0px 0px 3px 0px #01D9FE;
margin-right: 10px;
}
- .top3{
+
+ .top3 {
box-shadow: inset 0px 0px 3px 0px #FEAF01;
}
diff --git a/screen/src/views/LogisticsCenter.vue b/screen/src/views/LogisticsCenter.vue
index 67df9d5..c371f99 100644
--- a/screen/src/views/LogisticsCenter.vue
+++ b/screen/src/views/LogisticsCenter.vue
@@ -1154,7 +1154,7 @@
// icon: 'circle',
right: '12%',
top: '0%',
- data: ['鎬诲簱瀛�', '褰撳墠搴撳瓨', '搴撳瓨鍒╃敤鐜�'],
+ data: ['鎬诲簱瀹�', '褰撳墠搴撳瓨', '搴撳瓨鍒╃敤鐜�'],
itemWidth: 20,
itemHeight: 10,
textStyle: {
@@ -1175,7 +1175,7 @@
// 閬嶅巻鎮诞鏃剁殑鎵�鏈夌偣锛屽畾鍒跺寲鏄剧ず鍐呭
let result = `<div style="width: 160px">${params[0].name}</div>`
params.forEach((item) => {
- if (item.seriesName === '鎬诲簱瀛�') {
+ if (item.seriesName === '鎬诲簱瀹�') {
result += `
<div style="display: flex;align-items: center;justify-content: space-between;margin-top: 2px;">
<div style="display: flex;align-items: center;"><div style="width: 10px;height: 10px; border-radius: 50%;background-color: #5e9bca;margin-right: 4px;"></div><div>${item.seriesName}</div></div>
@@ -1256,7 +1256,7 @@
],
series: [
{
- name: '鎬诲簱瀛�',
+ name: '鎬诲簱瀹�',
type: 'bar',
barWidth: 10,
barGap: '60%',
--
Gitblit v1.9.3