From 9d001f79c28178e6b4d834b314c11b23c60303e8 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 13 Jun 2025 18:45:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5tongji?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/budget/components/payPlan.vue      |  8 ++-
 src/views/budget/seeBudget.vue               |  3 +-
 src/views/dashboard/components/LineChart.vue |  6 +--
 src/views/dashboard/index.vue                | 52 +++++++++++++++++---
 vue.config.js                                |  4 +-
 5 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/src/views/budget/components/payPlan.vue b/src/views/budget/components/payPlan.vue
index 68ea94b..dd642fa 100644
--- a/src/views/budget/components/payPlan.vue
+++ b/src/views/budget/components/payPlan.vue
@@ -61,7 +61,11 @@ export default {
       isShow: false,
       id: "",
       type: "",
-
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < new Date(new Date().getFullYear(), new Date().getMonth(), 1).getTime();
+        }
+      },
       itemTable: [
         {
           prop: "paid_money",
@@ -78,6 +82,7 @@ export default {
                 v-model={row.paid_money}
                 size="small"
                 clearable={true}
+
                 on={{
                   ['change']:e => {
                     if (row.id) {
@@ -104,6 +109,7 @@ export default {
                 v-model={row.paid_plan_date}
                 size="mini"
                 clearable={true}
+                pickerOptions={this.pickerOptions}
                 on={{
                   ['change']:e => {
                     if (row.id) {
diff --git a/src/views/budget/seeBudget.vue b/src/views/budget/seeBudget.vue
index 93d3157..b4dd370 100644
--- a/src/views/budget/seeBudget.vue
+++ b/src/views/budget/seeBudget.vue
@@ -92,7 +92,8 @@
       <template v-slot:btns>
         <el-table-column header-align="center" align="left" :width="150" label="操作" >
           <template #default="{ row }">
-            <Button v-if="row.pid != 0" size="small" type="primary" @click="$refs['payPlan'].rowName = row.name,$refs['payPlan'].setId(row.id),$refs['payPlan'].show();">预算执行计划填报</Button>
+            <Button v-if="row.pid != 0" size="small" type="primary" @click="$refs['payPlan'].rowName = row.name,$refs['payPlan'].setId(row.id),$refs['payPlan'].show();">
+              预算执行计划填报</Button>
             <Button
               v-if="row.pid == 0"
               class="slot-btns-item"
diff --git a/src/views/dashboard/components/LineChart.vue b/src/views/dashboard/components/LineChart.vue
index 5c697bf..00091bd 100644
--- a/src/views/dashboard/components/LineChart.vue
+++ b/src/views/dashboard/components/LineChart.vue
@@ -116,10 +116,10 @@
             bottom: '3%',
             data:chartdata.legendArr
           },
-            tooltip: {
+          tooltip: chartdata.tooltip?chartdata.tooltip:{
               trigger: 'axis'
-            },
-            backgroundColor:"#fff",
+          },
+          backgroundColor:"#fff",
           grid: {
             top: '3%',
             left: '2%',
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 23b5054..5d1abb7 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -594,21 +594,33 @@ export default {
       let curPlan = res?.map(i => {
         const { use_money_total,paid_plan_total,money_total_2,money_total_1 } = i
         let curPlan_total = Math.round(Number(paid_plan_total||0)) + Math.round(Number(use_money_total||0))
-        return  Number(money_total_2) ? ((( curPlan_total / Number(money_total_2 ||0)) * 10000) / 100).toFixed(2) :
-        ((( curPlan_total / Number(money_total_1 ||0)) * 10000) / 100).toFixed(2)
+        return {
+          value:Number(money_total_2) ? ((( curPlan_total / Number(money_total_2 ||0)) * 10000) / 100).toFixed(2) :
+        ((( curPlan_total / Number(money_total_1 ||0)) * 10000) / 100).toFixed(2),
+          money:paid_plan_total
+        }
       });
 
       let curAct = res?.map(i => {
         const { use_money_total,money_total_2,money_total_1 } = i
-        return Number(money_total_2) ? (Math.round((Number(use_money_total||0) / Number(money_total_2||0)) * 10000) / 100).toFixed(2) :
-         (Math.round((Number(use_money_total||0) / Number(money_total_1||0)) * 10000) / 100).toFixed(2);
+        return {
+          value:Number(money_total_2) ? (Math.round((Number(use_money_total||0) / Number(money_total_2||0)) * 10000) / 100).toFixed(2) :
+         (Math.round((Number(use_money_total||0) / Number(money_total_1||0)) * 10000) / 100).toFixed(2),
+         money:use_money_total
+        }
       });
 
       let nextPlan = res?.map(i => {
         const { use_money_total,use_money_total_next,paid_plan_total_next,money_total_2,money_total_1 } = i
+        if(Number(paid_plan_total_next)===0){
+          return 0
+        }
         let nextPlan_total = Math.round(Number(paid_plan_total_next||0)) + Math.round(Number(use_money_total||0))
-        return  Number(money_total_2) ? (((nextPlan_total / Number(money_total_2||0)) * 10000) / 100).toFixed(2) :
-         (((nextPlan_total / Number(money_total_1||0)) * 10000) / 100).toFixed(2);
+        return {
+          value:Number(money_total_2) ? (((nextPlan_total / Number(money_total_2||0)) * 10000) / 100).toFixed(2) :
+         (((nextPlan_total / Number(money_total_1||0)) * 10000) / 100).toFixed(2),
+         money:paid_plan_total_next
+        }
       });
 
       let barWidth = 23;
@@ -626,6 +638,7 @@ export default {
       let colorArr1 = ["#345A8B", "#387ABD", "#398ac4"];
       let colorArr2 = ["#51C0DB", "#42D9D6", "#45F5F1"];
       let colorArr3 = ['#559372','#7ab798','#9edebc']
+      let spanColor = ["#345A8B","#51C0DB",'#559372']
 
       let color1 = setColor(colorArr1)
       let color2 = setColor(colorArr2)
@@ -634,6 +647,28 @@ export default {
       this.lineChartData = {
         rotate: 54,
         xArr: res?.map(i => i.plan_department?.name),
+        tooltip: {
+            show:true,
+            trigger: 'axis', // 触发方式为鼠标悬浮在图形上
+            formatter: function (params) {
+                // 自定义悬浮窗的内容和样式
+                 let result = `<div style=" padding: 10px;">`;
+                  // 获取当前悬浮的部门名称
+                  const departmentName = params[0].name;
+                  result += `<div style="font-weight: bold; margin-bottom: 5px;">${departmentName}</div>`;
+
+                  // 遍历所有参数，找到三个主要柱状图的数据
+                  params.forEach((param,index) => {
+                      // 只处理主要的柱状图数据（z值为1、4、7的系列）
+                    result += `<div style="margin: 3px 0;">
+                        <span style="display: inline-block; width: 10px; height: 10px; background-color: ${spanColor[index]}; margin-right: 5px;"></span>
+                        <span>${param.seriesName}: ${param.value}%-${param.data.money?param.data.money+'元':0+'元'}</span>
+                    </div>`;
+                  });
+                  result += `</div>`;
+                  return result
+            }
+        },
         series: [
           {
             z: 1,
@@ -654,7 +689,7 @@ export default {
                 color: '#4d8bdc',
               },
               formatter: params => `${params.value}%`
-            }
+            },
           },
           {
             z: 2,
@@ -704,11 +739,12 @@ export default {
             },
             data: curAct,
             label: {
+              offset:[0,-15],
               show: true,
               position: 'top',
               textStyle: {//数值样式
                 fontSize: 12,
-                color: '#4d8bdc',
+                // color: 'red',
               },
               formatter: params => `${params.value}%`
             }
diff --git a/vue.config.js b/vue.config.js
index 7920f4d..9dac60b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -26,7 +26,9 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath:  process.env.ENV === 'staging' ? '/admin_test' : '/admin',
-  outputDir: '/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hjjc-hdcontract/public/admin',
+  // outputDir: '/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hjjc-hdcontract/public/admin',
+  outputDir: '/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hetong/public/admin',
+  // /Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hetong/public
   assetsDir: 'static',
   lintOnSave: false,
   productionSourceMap: false,