From 73c602c2c0bef6b42ae5ee9fe52ee45765964dc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Wed, 9 Aug 2023 12:39:29 +0800
Subject: [PATCH] up

---
 package.json                                |  2 +-
 src/layout/index.vue                        |  2 +-
 src/views/budget/budgetList.vue             | 12 ++++++-----
 src/views/contract/contractList.vue         |  2 +-
 src/views/dashboard/components/PieChart.vue |  2 +-
 src/views/dashboard/index.vue               | 24 ++++++++++++++-------
 src/views/inOut/expenseAccount.vue          |  4 +++-
 vue.config.js                               |  2 +-
 8 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index d2fdcdb..3e47794 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@vue/cli-service": "4.4.4",
     "@vue/test-utils": "1.0.0-beta.29",
     "autoprefixer": "9.5.1",
-    "babel-eslint": "10.1.0",
+    "babel-eslint": "^8.2.2",
     "babel-jest": "23.6.0",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "chalk": "2.4.2",
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 3b3c032..34c3fdb 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -4,7 +4,7 @@
 <!--    最顶部导航栏-->
     <div class="top-head-bar">
       <div class="top-head-bar__logo">
-        <img style="height: 20px" src="../assets/logo_test.png" alt="logo" />
+        <img style="height: 20px" src="../assets/logo.png" alt="logo" />
       </div>
 
       <ul>
diff --git a/src/views/budget/budgetList.vue b/src/views/budget/budgetList.vue
index 1b00328..ec9705f 100644
--- a/src/views/budget/budgetList.vue
+++ b/src/views/budget/budgetList.vue
@@ -743,11 +743,11 @@ export default {
           prop: "year",
           width: 105,
         },
-        {
-          label: "相关科室",
-          prop: "plan_department.name",
-          width: 110,
-        },
+        // {
+        //   label: "相关科室",
+        //   prop: "plan_department.name",
+        //   width: 110,
+        // },
         {
           label: "年初预算金额（元）",
           prop: "money",
@@ -788,6 +788,7 @@ export default {
         year: "",
         type: "",
         department: "",
+        is_auth:0
       },
       departments: [], //部门类型
 
@@ -931,6 +932,7 @@ export default {
         plan_department_id: this.select.department,
         is_tree: this.isTree ? 1 : "",
         top_pid: !this.isTree ? 1 : "",
+        is_auth:this.select.is_auth
       }).then((res) => {
         if (this.isTree) this.treeData = res.list;
         else {
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index 7394875..998a3eb 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -1210,7 +1210,7 @@ export default {
         plan_name: "请选择预算计划",
         start_plan_price: undefined,
         end_plan_price: undefined,
-        is_myself: 0,
+        is_myself: 0
       },
       selectCopy: {
         keyword: "",
diff --git a/src/views/dashboard/components/PieChart.vue b/src/views/dashboard/components/PieChart.vue
index b8e0683..c03a28a 100644
--- a/src/views/dashboard/components/PieChart.vue
+++ b/src/views/dashboard/components/PieChart.vue
@@ -90,7 +90,7 @@
             labelLine: {
               show: true
             },
-            center: ['50%', '45%'],
+            center: ['50%', '50%'],
             data: chartdata.yArr,
             animationDuration
           }]
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 5d1de8e..1e1bd8a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -448,17 +448,25 @@ export default {
       this.getStatistic();
     },
     async getStatistic() {
-      const res = await statistic(this.select);
-      console.log(res);
-      this.statistic = res;
-
+            const res = await statistic(this.select);
+            console.log(res);
+            this.statistic = res;
+            let m2 = res.progress.money_total_2;
+            let m1 = res.progress.money_total_1;
+            var user_m = res.progress.use_money_total;
+            var m3=m1-user_m
+            if (m2 != 0) {
+              m3=m2-user_m;
+            } else if (m1 != 0) {
+              m3=m1-user_m;
+            }
       this.rptChartData = {
-        xArr: ["预算合计金额", "预算已执行金额"],
+        xArr: ["预算未执行金额", "预算已执行金额"],
         radiusArr: "50%",
         yArr: [
           {
-            value: res.progress.money_total_1,
-            name: "预算合计金额",
+            value: m3,
+            name: "预算未执行金额",
             label: {
               show: false, //这个数据高亮时不显示label，就不会显示替遮住第一个数据的label值了
             },
@@ -468,7 +476,7 @@ export default {
               },
             },
           },
-          { value: res.progress.use_money_total, name: "预算已执行金额" },
+          { value: user_m, name: "预算已执行金额" },
         ],
       };
     },
diff --git a/src/views/inOut/expenseAccount.vue b/src/views/inOut/expenseAccount.vue
index 2fe61b1..5fdfe72 100644
--- a/src/views/inOut/expenseAccount.vue
+++ b/src/views/inOut/expenseAccount.vue
@@ -316,8 +316,10 @@ export default {
         {
           prop: "name",
           label: "项目名称",
-          width: 190,
+          width: 290,
           fixed: "left",
+          align:"left"
+
         },
         {
           label: this.$route.path.split("_")[1] == 2 ? "报销类型" : "支出类型",
diff --git a/vue.config.js b/vue.config.js
index cf152d1..3d5fdff 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -26,7 +26,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath: '/admin/',
-  outputDir: './dist',
+  outputDir: '/Users/liuxiangyu/Work/h-huanjingjiance/app/hjjc-workbench-service/public/admin',
   assetsDir: 'static',
   lintOnSave: false,
   productionSourceMap: false,