From 0e555ff7887e46c5bdd9d8ca237f7ed1e1634c0f Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 24 九月 2025 13:53:55 +0800
Subject: [PATCH] 优化
---
h5/pages/waybill/waybillDetail.vue | 2 +-
h5/pages/waybill/list.vue | 11 ++++++++---
admin/src/views/vehicle/cars.vue | 2 +-
admin/src/views/business/dangerStatic.vue | 2 +-
h5/pages/staff/snapshot.vue | 8 ++++----
admin/public/template/member.xlsx | 0
screen/src/views/SecurityControl.vue | 7 ++++---
admin/src/components/business/OperaCarsWindow.vue | 2 +-
screen/src/views/FireFighting.vue | 11 ++++++++---
9 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/admin/public/template/member.xlsx b/admin/public/template/member.xlsx
index 1e0a152..b2f83b7 100644
--- a/admin/public/template/member.xlsx
+++ b/admin/public/template/member.xlsx
Binary files differ
diff --git a/admin/src/components/business/OperaCarsWindow.vue b/admin/src/components/business/OperaCarsWindow.vue
index 376a3da..4d74438 100644
--- a/admin/src/components/business/OperaCarsWindow.vue
+++ b/admin/src/components/business/OperaCarsWindow.vue
@@ -187,7 +187,7 @@
},
getCate () {
fetchList({
- model: {},
+ model: { type: 1 },
capacity: 1000,
page: 1
}).then(res => {
diff --git a/admin/src/views/business/dangerStatic.vue b/admin/src/views/business/dangerStatic.vue
index b43d2af..26cb9dc 100644
--- a/admin/src/views/business/dangerStatic.vue
+++ b/admin/src/views/business/dangerStatic.vue
@@ -154,7 +154,7 @@
this.yearList = res.yearList
- this.departmentList = res.departmentList.slice(0, 10)
+ this.departmentList = res.departmentSortList.slice(0, 10)
this.typeList = res.cateList || []
this.deptList = res.departmentList || []
diff --git a/admin/src/views/vehicle/cars.vue b/admin/src/views/vehicle/cars.vue
index a4fcc63..0efe4d6 100644
--- a/admin/src/views/vehicle/cars.vue
+++ b/admin/src/views/vehicle/cars.vue
@@ -198,7 +198,7 @@
},
getCate() {
fetchList({
- model: {},
+ model: { type: 1 },
capacity: 1000,
page: 1,
}).then(res => {
diff --git a/h5/pages/staff/snapshot.vue b/h5/pages/staff/snapshot.vue
index 6e01c08..99c17cd 100644
--- a/h5/pages/staff/snapshot.vue
+++ b/h5/pages/staff/snapshot.vue
@@ -234,10 +234,10 @@
title: '璇疯緭鍏ユ儏鍐佃鏄�',
icon: 'none'
})
- if (param.content.length < 10) return uni.showToast({
- title: '鎯呭喌璇存槑涓嶅緱灏忎簬10涓瓧',
- icon: 'none'
- })
+ // if (param.content.length < 10) return uni.showToast({
+ // title: '鎯呭喌璇存槑涓嶅緱灏忎簬10涓瓧',
+ // icon: 'none'
+ // })
DangerCreate({
...param,
diff --git a/h5/pages/waybill/list.vue b/h5/pages/waybill/list.vue
index bde7310..26406b0 100644
--- a/h5/pages/waybill/list.vue
+++ b/h5/pages/waybill/list.vue
@@ -19,9 +19,10 @@
<scroll-view scroll-y="true" class="scroll_Y" @scrolltolower="scrolltolower">
<view class="main_list">
<view class="item" v-for="item,index in list" :key="index">
- <view class="head">
+ <view class="head"
+ :style="{ backgroundColor: item.orderStatus === 9 ? 'linear-gradient(270deg, #FEFEFF 0%, #FEE1E1 100%)' : 'linear-gradient(270deg, #FEFEFF 0%, #E1F7FE 100%)' }">
<view class="code">{{item.contractNumber}}</view>
- <view class="status">{{item.orderStatusDesc }}</view>
+ <view :class="item.orderStatus === 9 ? 'error' : 'status'">{{item.orderStatusDesc }}</view>
</view>
<view class="content">
<view class="line">
@@ -347,7 +348,7 @@
width: 690rpx;
height: 84rpx;
margin: 0 -30rpx;
- background: linear-gradient(270deg, #FEFEFF 0%, #E1F7FE 100%);
+ // background: linear-gradient(270deg, #FEFEFF 0%, #E1F7FE 100%);
.code {
font-weight: 500;
@@ -358,6 +359,10 @@
.status {
color: $uni-color-primary;
}
+
+ .error {
+ color: #EE3821;
+ }
}
.content {
diff --git a/h5/pages/waybill/waybillDetail.vue b/h5/pages/waybill/waybillDetail.vue
index 2eb8433..805453f 100644
--- a/h5/pages/waybill/waybillDetail.vue
+++ b/h5/pages/waybill/waybillDetail.vue
@@ -85,7 +85,7 @@
</view>
<view v-else class="icon_wrap"></view>
<view class="text" :class="{placeholder3: k==0 && i== 0}">
- {{item.orderStatusDes}}
+ <text :style="{ color: item.orderStatus === 9 ? 'red' : '#666666'}">{{item.orderStatusDes}}</text>
<text v-if="item.tel">锛屽彂璐т粨搴撶數璇濓細</text>
<template v-if="item.tel">
<text v-for="phone,p in item.tel.split(',')" @click="callPhone(phone)" class="primaryColor">{{phone}}<text v-if="p < item.tel.split(',').length - 1">,</text></text>
diff --git a/screen/src/views/FireFighting.vue b/screen/src/views/FireFighting.vue
index 04190af..a92a142 100644
--- a/screen/src/views/FireFighting.vue
+++ b/screen/src/views/FireFighting.vue
@@ -400,7 +400,7 @@
grid: {
top: '0%',
left: '0%',
- right: '%',
+ right: '0%',
bottom: '0%',
containLabel: true
},
@@ -561,7 +561,12 @@
let minNum = item.min
let conNum = maxNum
let acNum = item.obj.value.replaceAll('M', '')
- var data = (((acNum - minNum) / conNum) * 100).toFixed(0)
+ var data = 0
+ if (acNum > conNum) {
+ data = 100
+ } else{
+ data = ((acNum / conNum) * 100).toFixed(0)
+ }
console.log('data', data)
const option = {
@@ -1093,7 +1098,7 @@
setInterval(() => {
changeData8(1)
changeData9(1)
- }, 1000 * 5)
+ }, 1000 * 10)
setTimeout(() => {
loopFn1()
loopFn2()
diff --git a/screen/src/views/SecurityControl.vue b/screen/src/views/SecurityControl.vue
index b16eb42..c358cb6 100644
--- a/screen/src/views/SecurityControl.vue
+++ b/screen/src/views/SecurityControl.vue
@@ -99,7 +99,7 @@
<div class="safe_left_dian" :style="{ backgroundColor: item.color }"></div>
<div class="safe_left_name">{{item.name}}</div>
</div>
- <div class="safe_num" :style="{ color: item.color }">{{item.total}}</div>
+ <div class="safe_num" :style="{ color: item.color }">{{item.value}}</div>
</div>
<!-- <div class="safe_chat_info_row">-->
<!-- <div class="safe_left">-->
@@ -312,7 +312,7 @@
<div class="com_header">
<div class="title">
<img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
- <div>闅愭偅闅忔墜鎷�</div>
+ <div>鏈湀闅愭偅闅忔墜鎷�</div>
</div>
<img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
</div>
@@ -816,6 +816,7 @@
CarList.value = []
getEnergyCenterData().then(res => {
if (res.code == 200) {
+ totalCar.value = 0
const result = res.data
data.value = result
res.data.inParkCarList.forEach(item => {
@@ -829,7 +830,7 @@
} else if (item.name === '璐ц繍杞﹁締') {
CarList.value.push({ name: '璐ц繍杞﹁締', value: item.total, color: '#01ABFE' })
} else if (item.name === '鏈煡杞﹁締') {
- CarList.value.push({ name: '鏈煡杞﹁締', value: item.total, color: '#0028ff' })
+ CarList.value.push({ name: '鏈煡杞﹁締', value: item.total, color: '#cccccc' })
}
})
nextTick(() => {
--
Gitblit v1.9.3