.env.development

@@ -1,11 +1,3 @@
-###
- # @Descripttion: 
- # @version: 
- # @Author: JC9527
- # @Date: 2024-12-13 10:59:59
- # @LastEditors: JC9527
- # @LastEditTime: 2025-01-09 09:42:36
-### 
 # 页面标题
 VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
 
@@ -23,13 +15,3 @@ VUE_APP_BASE_API = 'http://39.101.188.84:9040'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
-
-#吕天方项目对接注意点 —— 金鸡湖PC端   总结人：许宏杰
-#0.脱敏环境已关闭
-#1.本地运行地址：http://localhost/#/login。
-#2.项目中存在不同环境的下载路径，全局搜素"/demo/JinJiHu",对应位置有各个环境下载路径代码注释。
-#3.测试与正式环境的登录页不同，需要到router.js对应的登录页组件位置根据环境不同注释掉对应组件。
-#4.部署环境
-# 堡垒机地址：https://58.209.81.144:9443/  用户名：admin47   密码：Jinjihu@123456
-# 登录后选择IP地址为：192.114.0.197:22  用户名：root   密码：Cloud@1234
-# 登录IP地址后进入部署/var/www/html文件夹

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "1.0.202501061704",
+  "version": "1.0.202412311311",
   "description": "金鸡湖现代服务业品牌管理系统",
   "author": "若依",
   "license": "MIT",

src/views/workbenchPro/components/BJinsannianzijin/index.vue

@@ -12,15 +12,15 @@
         <div class="BJinsannianzijinchart-right">
           <div class="yushuan">
             <span>资金预算</span>
-            <div class="number-box">{{ obj.fundBudget ? obj.fundBudget : 0 }} <span class="number-unit-box">万元</span></div>
+            <div class="number-box">{{ obj.fundBudget }} <span class="number-unit-box">万元</span></div>
           </div>
           <div class="yushuan">
             <span>追加预算</span>
-            <div class="bottom_number number-box">{{ obj.additionBudget ? obj.additionBudget : 0 }} <span class="number-unit-box">万元</span></div>
+            <div class="bottom_number number-box">{{ obj.additionBudget }} <span class="number-unit-box">万元</span></div>
           </div>
         </div>
       </div>
-      <div class="echart_boxs_bottom">拨付资金 <span>{{ obj.appropriationFund ? obj.appropriationFund : 0 }}</span>万元  (执行率 <span>{{ obj.implementationRate ? obj.implementationRate : 0 }}</span>% )</div>
+      <div class="echart_boxs_bottom">拨付资金 <span>{{ obj.appropriationFund }}</span>万元  (执行率 <span>{{ obj.implementationRate }}</span>% )</div>
     </div>
     <div class="echart_boxs echart_boxs_right">
       <div class="echart_boxs_top">
@@ -34,15 +34,15 @@
         <div class="BJinsannianzijinchart-right">
           <div class="yushuan">
             <span>资金预算</span>
-            <div class="number-box">{{ objTwo.fundBudget ? objTwo.fundBudget : 0 }} <span class="number-unit-box">万元</span></div>
+            <div class="number-box">{{ objTwo.fundBudget }} <span class="number-unit-box">万元</span></div>
           </div>
           <div class="yushuan">
             <span>追加预算</span>
-            <div class="bottom_number number-box">{{ objTwo.additionBudget ? objTwo.additionBudget : 0 }} <span class="number-unit-box">万元</span></div>
+            <div class="bottom_number number-box">{{ objTwo.additionBudget }} <span class="number-unit-box">万元</span></div>
           </div>
         </div>
       </div>
-      <div class="echart_boxs_bottom">拨付资金 <span>{{ objTwo.appropriationFund ? objTwo.appropriationFund : 0 }}</span>万元  (执行率 <span>{{ objTwo.implementationRate ? objTwo.implementationRate : 0 }}</span>% )</div>
+      <div class="echart_boxs_bottom">拨付资金 <span>{{ objTwo.appropriationFund }}</span>万元  (执行率 <span>{{ objTwo.implementationRate }}</span>% )</div>
     </div>
   </div>
 </template>
@@ -237,50 +237,40 @@ export default {
         ]
       };
       threeYearsFund(Year).then(res=>{
-        if(res.data.length == 0) {
+        res.data.map(item=>{
-          let color = [ [1, '#00AEFF']]  // 第二个颜色
+          if(item.serviceType == "1") {
-          option.series[0].axisLine.lineStyle.color = color
+            this.obj = item;
-          optionTwo.series[0].axisLine.lineStyle.color = color
+            option.series[0].data[0].value = item.implementationRate
-          option.series[0].data[0].value = 0
+            // 资金预算 fundBudget  追加预算 additionBudget
-          optionTwo.series[0].data[0].value = 0
+            if(item.fundBudget <= 0) {
-          this.obj = {}
+              let color = [ [0, '#00AEFF'], [1, '#FFA42B ']]  // 第二个颜色
-          this.objTwo = {}
+              option.series[0].axisLine.lineStyle.color = color
-        } else {
+            } else if(item.additionBudget <= 0) {
-          res.data.map(item=>{
+              let color = [ [1, '#00AEFF'], [1, '#FFA42B ']]  // 第二个颜色
-            if(item.serviceType == "1") {
+              option.series[0].axisLine.lineStyle.color = color
-              this.obj = item;
-              option.series[0].data[0].value = item.implementationRate
-              // 资金预算 fundBudget  追加预算 additionBudget
-              if(item.fundBudget <= 0) {
-                let color = [ [0, '#00AEFF'], [1, '#FFA42B ']]  // 第二个颜色
-                option.series[0].axisLine.lineStyle.color = color
-              } else if(item.additionBudget <= 0) {
-                let color = [ [1, '#00AEFF'], [1, '#FFA42B ']]  // 第二个颜色
-                option.series[0].axisLine.lineStyle.color = color
-              } else {
-                let count = item.fundBudget + item.additionBudget;
-                const percentage = (item.fundBudget / count);
-                let color = [ [Number(percentage.toFixed(1)), '#00AEFF'], [Number(percentage.toFixed(1)) + 0.03, '#F5F8FA'], [1, '#FFA42B ']]
-                option.series[0].axisLine.lineStyle.color = color;
-              }
             } else {
-              this.objTwo = item;
+              let count = item.fundBudget + item.additionBudget;
-              optionTwo.series[0].data[0].value = item.implementationRate
+              const percentage = (item.fundBudget / count);
-              if(item.fundBudget <= 0) {
+              let color = [ [Number(percentage.toFixed(1)), '#00AEFF'], [Number(percentage.toFixed(1)) + 0.03, '#F5F8FA'], [1, '#FFA42B ']]
-                let color = [ [0, '#00AEFF'], [1, '#FFA42B ']]  // 第二个颜色
+              option.series[0].axisLine.lineStyle.color = color;
-                optionTwo.series[0].axisLine.lineStyle.color = color
-              } else if(item.additionBudget <= 0) {
-                let color = [ [1, '#00AEFF'], [1, '#FFA42B ']]  // 第二个颜色
-                optionTwo.series[0].axisLine.lineStyle.color = color
-              } else {
-                let count = item.fundBudget + item.additionBudget;
-                const percentage = (item.fundBudget / count);
-                let color = [ [Number(percentage.toFixed(1)), '#00AEFF'], [Number(percentage.toFixed(1)) + 0.03, '#F5F8FA'], [1, '#FFA42B ']]
-                optionTwo.series[0].axisLine.lineStyle.color = color;
-              }
             }
-          })
+          } else {
-        }
+            this.objTwo = item;
+            optionTwo.series[0].data[0].value = item.implementationRate
+            if(item.fundBudget <= 0) {
+              let color = [ [0, '#00AEFF'], [1, '#FFA42B ']]  // 第二个颜色
+              optionTwo.series[0].axisLine.lineStyle.color = color
+            } else if(item.additionBudget <= 0) {
+              let color = [ [1, '#00AEFF'], [1, '#FFA42B ']]  // 第二个颜色
+              optionTwo.series[0].axisLine.lineStyle.color = color
+            } else {
+              let count = item.fundBudget + item.additionBudget;
+              const percentage = (item.fundBudget / count);
+              let color = [ [Number(percentage.toFixed(1)), '#00AEFF'], [Number(percentage.toFixed(1)) + 0.03, '#F5F8FA'], [1, '#FFA42B ']]
+              optionTwo.series[0].axisLine.lineStyle.color = color;
+            }
+          }
+        })
         this.chart.setOption(option)
         this.chartTwo.setOption(optionTwo)
       })