From db1048aa1f389fe7bc9e94916fd7553baddb2cf6 Mon Sep 17 00:00:00 2001
From: "lj7788@126.com" <lj7788@126.com>
Date: Thu, 10 Jul 2025 16:36:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/indexCompents/navAttLaborerRate.vue           | 6 ++++--
 .../src/views/indexCompents/navAttManagerRate.vue           | 6 ++++--
 yanzhu-ui-vue3/src/views/indexCompents/navAttWokerProp.vue  | 6 ++++--
 .../src/views/indexCompents/navAttendanceRate.vue           | 6 ++++--
 yanzhu-ui-vue3/vite.config.js                               | 2 +-
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/yanzhu-ui-vue3/src/views/indexCompents/navAttLaborerRate.vue b/yanzhu-ui-vue3/src/views/indexCompents/navAttLaborerRate.vue
index 1c1ab773..185f33c7 100644
--- a/yanzhu-ui-vue3/src/views/indexCompents/navAttLaborerRate.vue
+++ b/yanzhu-ui-vue3/src/views/indexCompents/navAttLaborerRate.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="index-nav-body">
     <div class="index-nav-body-title">劳务人员出勤率</div>
-    <div class="chart-content" v-if="chartData.length > 0">
+    <div class="chart-content" v-if="sum > 0">
       <my-chart ref="chart" id="navAttLaborerRateChart" width="100%" height="100%" :render="renderChart" />
     </div>
-    <div class="no-data" v-if="chartData.length == 0">
+    <div class="no-data" v-if="sum == 0">
       <svg-icon icon-class="nodata" />
       <div>暂无数据</div>
     </div>
@@ -28,6 +28,7 @@ export default {
   data() {
     return {
       chartData: [],
+      sum:0
     };
   },
   mounted() {
@@ -91,6 +92,7 @@ export default {
       setTimeout(() => {
         let total = this.attInfo ? this.attInfo.job.worker : 0;
         let totalAtt = this.attInfo ? this.attInfo.att.worker : 0;
+        this.sum=totalAtt+total;
         this.chartData = [
           {
             name: "出勤人数",
diff --git a/yanzhu-ui-vue3/src/views/indexCompents/navAttManagerRate.vue b/yanzhu-ui-vue3/src/views/indexCompents/navAttManagerRate.vue
index b292d5e6..12608831 100644
--- a/yanzhu-ui-vue3/src/views/indexCompents/navAttManagerRate.vue
+++ b/yanzhu-ui-vue3/src/views/indexCompents/navAttManagerRate.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="index-nav-body">
     <div class="index-nav-body-title">管理人员出勤率</div>
-    <div class="chart-content" v-if="chartData.length > 0">
+    <div class="chart-content" v-if="sum > 0">
       <my-chart ref="chart" id="navAttManagerRateChart" width="100%" height="100%" :render="renderChart" />
     </div>
-    <div class="no-data" v-if="chartData.length == 0">
+    <div class="no-data" v-if="sum == 0">
       <svg-icon icon-class="nodata" />
       <div>暂无数据</div>
     </div>
@@ -27,6 +27,7 @@ export default {
   data() {
     return {
       chartData: [],
+      sum:0,
     };
   },
   mounted() {
@@ -90,6 +91,7 @@ export default {
       setTimeout(() => {
          let total=this.attInfo?this.attInfo.job.mgr:0;
         let totalAtt=this.attInfo?this.attInfo.att.mgr:0;
+        this.sum=totalAtt+total;
         this.chartData = [
           {
             name: "出勤人数",
diff --git a/yanzhu-ui-vue3/src/views/indexCompents/navAttWokerProp.vue b/yanzhu-ui-vue3/src/views/indexCompents/navAttWokerProp.vue
index 8333f761..fa99356c 100644
--- a/yanzhu-ui-vue3/src/views/indexCompents/navAttWokerProp.vue
+++ b/yanzhu-ui-vue3/src/views/indexCompents/navAttWokerProp.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="index-nav-body">
     <div class="index-nav-body-title">劳务人员完成三级安全教育比例</div>
-    <div class="chart-content" v-if="chartData.length > 0">
+    <div class="chart-content" v-if="sum > 0">
       <my-chart ref="chart" id="navAttWokerPropChart" width="100%" height="100%" :render="renderChart" />
     </div>
-    <div class="no-data" v-if="chartData.length == 0">
+    <div class="no-data" v-if="sum == 0">
       <svg-icon icon-class="nodata" />
       <div>暂无数据</div>
     </div>
@@ -28,6 +28,7 @@ export default {
   data() {
     return {
       chartData: [],
+      sum:0,
     };
   },
   mounted() {
@@ -91,6 +92,7 @@ export default {
       setTimeout(() => {
         let total = this.attInfo ? this.attInfo.job.total : 0;
         let edu = this.attInfo ? this.attInfo.edu : 0;
+        this.sum=total+edu;
         this.chartData = [
           {
             name: "参与人数",
diff --git a/yanzhu-ui-vue3/src/views/indexCompents/navAttendanceRate.vue b/yanzhu-ui-vue3/src/views/indexCompents/navAttendanceRate.vue
index 3238fdd9..e9d7a745 100644
--- a/yanzhu-ui-vue3/src/views/indexCompents/navAttendanceRate.vue
+++ b/yanzhu-ui-vue3/src/views/indexCompents/navAttendanceRate.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="index-nav-body">
     <div class="index-nav-body-title">今日出勤率</div>
-    <div class="chart-content" v-if="chartData.length > 0">
+    <div class="chart-content" v-if="sum> 0">
       <my-chart ref="chart" id="navAttendanceRateChart" width="100%" height="100%" :render="renderChart" />
     </div>
-    <div class="no-data" v-if="chartData.length == 0">
+    <div class="no-data" v-if="sum == 0">
       <svg-icon icon-class="nodata" />
       <div>暂无数据</div>
     </div>
@@ -28,6 +28,7 @@ export default {
   data() {
     return {
       chartData: [],
+      sum:0,
     };
   },
   mounted() {
@@ -90,6 +91,7 @@ export default {
       setTimeout(() => {
         let total=this.attInfo?this.attInfo.job.total:0;
         let totalAtt=this.attInfo?this.attInfo.att.total:0;
+        this.sum=total+totalAtt
         this.chartData = [
           {
             name: "出勤人数",
diff --git a/yanzhu-ui-vue3/vite.config.js b/yanzhu-ui-vue3/vite.config.js
index ebe529c0..4087664f 100644
--- a/yanzhu-ui-vue3/vite.config.js
+++ b/yanzhu-ui-vue3/vite.config.js
@@ -10,7 +10,7 @@ export default defineConfig(({ mode, command }) => {
     // 部署生产环境和开发环境下的URL。
     // 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上
     // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-    base: VITE_APP_ENV === "production" ? "./xd/" : "./xd/",
+    base: VITE_APP_ENV === "production" ? "/xd/" : "./xd/",
     plugins: createVitePlugins(env, command === "build"),
     resolve: {
       // https://cn.vitejs.dev/config/#resolve-alias