From 081b2afc94c32a1c5e735e2f6b971d9fe1ff9b4f Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期日, 28 九月 2025 09:15:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
screen/src/views/SecurityControl.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/screen/src/views/SecurityControl.vue b/screen/src/views/SecurityControl.vue
index ea0268d..b16eb42 100644
--- a/screen/src/views/SecurityControl.vue
+++ b/screen/src/views/SecurityControl.vue
@@ -5,7 +5,7 @@
<img src="@/assets/images/ic_compass@2x.png" class="main_znz" alt="" />
<div class="main_header">
<img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
- <div class="title">瀹夋嘲鏅烘収鐗╂祦鍥尯-鏅鸿兘瀹夐槻鐩戞祴</div>
+ <div class="title">瀹夋嘲鏅烘収鐗╂祦鍥尯-鏅鸿兘瀹夐槻绠℃帶</div>
<div class="time_wrap">
<span class="date">{{ date }}</span>
<span class="week">{{ week }}</span>
@@ -130,10 +130,10 @@
<div class="safe_zhu_item_c">
<div class="safe_zhu_item_c_t">
<span>鎬昏溅浣嶏細{{data.outHyLotTotal || 0}}</span>
- <span>鍓╀綑杞︿綅锛歿{data.relatedJobCarTotal || 0}}</span>
+ <span>鍓╀綑杞︿綅锛歿{data.outHyLotTotal - data.relatedJobCarTotal || 0}}</span>
</div>
<div class="safe_zhu_item_c_b">
- <div class="safe_zhu_item_c_b_z" :style="{width: (data.relatedJobCarTotal / data.outHyLotTotal * 100) +'%'}"></div>
+ <div class="safe_zhu_item_c_b_z" :style="{width: ((data.outHyLotTotal - data.relatedJobCarTotal) / data.outHyLotTotal * 100) +'%'}"></div>
</div>
</div>
</div>
--
Gitblit v1.9.3