From 4e5549bb2c7edd815cc37a18dc7469aad76c9c5c Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Fri, 26 Apr 2024 00:06:58 +0800
Subject: [PATCH] update code

---
 src/api/costOut/index.js      |  15 +++-
 src/components/header.vue     |   2 +-
 src/pages/index.vue           |   2 +-
 src/pages/index/indexDlg3.vue | 145 ++++++++++------------------------
 src/pages/projectEngin.vue    |   4 +-
 5 files changed, 56 insertions(+), 112 deletions(-)

diff --git a/src/api/costOut/index.js b/src/api/costOut/index.js
index 048e9d2..1f79c6a 100644
--- a/src/api/costOut/index.js
+++ b/src/api/costOut/index.js
@@ -90,8 +90,8 @@ const sumForBsEnginAuditing=data=>{
                 data4:getValue(4),
                 data5:getValue(5),
                 data6:getValue(6),
-            };
-            obj.percent=obj.data1==0?0:obj.data3*100.0/obj.data1;
+            };            
+            obj.percent=obj.data2==0?0:obj.data3*100.0/obj.data2;
             if(obj.percent>100){
                 obj.percent=100;
             }
@@ -137,10 +137,17 @@ const selectForBigEnginList=data=>{
     });
     });
 };
-
+const groupBYProject=data=>{
+    return request({
+        url:'/project/costOutput/groupBYProject',
+        method: 'post',
+        data:data
+    })
+}
 export default{
     selectYearAndMonth,
     sumByDeptId,
     sumForBsEnginAuditing,
-    selectForBigEnginList
+    selectForBigEnginList,
+    groupBYProject
 }
diff --git a/src/components/header.vue b/src/components/header.vue
index a04d539..d32b91d 100644
--- a/src/components/header.vue
+++ b/src/components/header.vue
@@ -52,7 +52,7 @@
                 </div>
             </div>
 
-            <div :class="(nav >=70 && nav <80) || nav==7? 'head-nav active' : 'head-nav'" style="position: relative;"
+            <div v-if="!isTypeBuser" :class="(nav >=70 && nav <80) || nav==7? 'head-nav active' : 'head-nav'" style="position: relative;"
                 class="has-submenu">
                 <div  @click="pageJump(7, '#/engin')">工程管理</div>
                 <div class="header-btn-list">
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 3219692..884fb8c 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -668,7 +668,7 @@ export default {
             return x;
         },
         doShowDlg3() {
-            this.$refs.dlg3.showDialog()
+            this.$refs.dlg3.showDialog(this.deptInfo?.id || 0)
         },
         doShowDlg1() {
             this.$refs.dlg1.showDialog()
diff --git a/src/pages/index/indexDlg3.vue b/src/pages/index/indexDlg3.vue
index f5ebdd8..24612c7 100644
--- a/src/pages/index/indexDlg3.vue
+++ b/src/pages/index/indexDlg3.vue
@@ -1,85 +1,35 @@
 <template>
     <MyDialog v-if="show" v-model="show" width="1000px" ref="dlg">
-        <template slot="title">
-            <div class="warning-info-title" style="padding-left: 20px;" v-if="1==2">
-                <div :class="nav == 0 ? 'active' : ''" class="nav-item" @click="toggleNav(0)">重点项目计划汇总</div>
-                <div :class="nav == 1 ? 'active' : ''" class="nav-item" @click="toggleNav(1)">按续建、新建、前期项目分类</div>
-                <div :class="nav == 2 ? 'active' : ''" class="nav-item" @click="toggleNav(2)">按省、市、新区、新城级分类</div>
-            </div>
-            <el-tabs v-model="nav" class="my-tabs" >
-    <el-tab-pane label="重点项目计划汇总" name="0"></el-tab-pane>
-    <el-tab-pane label="按续建、新建、前期项目分类" name="1"></el-tab-pane>
-    <el-tab-pane label="按省、市、新区、新城级分类" name="2"></el-tab-pane>
-  </el-tabs>
+        <template slot="title">            
+            <el-tabs v-model="nav" class="my-tabs" @tab-click="handleClick">    
+                <el-tab-pane label="按续建、新建、前期项目分类" name="a1"></el-tab-pane>
+                <el-tab-pane label="按省、市、新区、新城级分类" name="a2"></el-tab-pane>
+            </el-tabs>
         </template>
-        <h1 v-if="1==2">产业发展集团2023年重点项目计划概述2023.4.12.xlsx</h1>
-        <el-table v-show="nav == 0" :data="tableData1" class="mytable" height="500" style="width: 100%;background: transparent;">
-
-            <el-table-column prop="prj" label="重点项目计划项目个数" width="200"> </el-table-column>
-            <el-table-column prop="node" label="总投资(亿元)" width="150">
+        <el-table :data="tableData" class="mytable" height="500" style="width: 100%;background: transparent;">
+            <el-table-column prop="remark" label="分类项" > </el-table-column>
+            <el-table-column prop="money" label="项目数" >
                 <template slot-scope="scope">
-                    <span style="color:#01A9FF;font-size: 12px;">{{ scope.row.node }}</span>
+                    <span style="color:#01A9FF;font-size: 12px;">{{ scope.row.month }}</span>
                 </template>
             </el-table-column>
-            <el-table-column prop="days" label="年度投资(亿元)" width="120">
+            <el-table-column prop="money" label="总投资(亿元)" >
                 <template slot-scope="scope">
-                    <span style="color:red">{{ scope.row.days }}</span>
+                    <span style="color:red;font-size: 12px;">{{ scope.row.money.toFixed(2) }}</span>
                 </template>
             </el-table-column>
-            <el-table-column prop="date" label="备注"  class-name="text-left">
-            </el-table-column>
-        </el-table>
-
-        <el-table v-show="nav == 1" :data="tableData2" class="mytable  my-data2" style="width: 100%;background: transparent;"
-            ref="fbsubordinateUnit">
-
-            <el-table-column prop="prj" label="分类项" class-name="text-left" width="150">
+            <el-table-column prop="money2" label="年度投资(亿元)" >
                 <template slot-scope="scope">
-                    <span style="font-size: 16px;font-weight: bold;">{{ scope.row.prj }}</span>
-                </template>
-                 </el-table-column>
-            <el-table-column prop="node" label="项目数" width="150" >
-                <template slot-scope="scope">
-                    <span style="color:#01A9FF;font-size: 12px;">{{ scope.row.node }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column prop="days" label="总投资（亿元）">
-                <template slot-scope="scope">
-                    <span style="color:red">{{ scope.row.days }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column prop="date" label="年度投资（亿元）">
-
-            </el-table-column>
-        </el-table>
-
-
-        <el-table v-show="nav == 2" :data="tableData3" class="mytable  my-data2" style="width: 100%;background: transparent;"
-            ref="fbsubordinateUnit">
-
-            <el-table-column prop="prj" label="分类项" class-name="text-left" width="150">
-                <template slot-scope="scope">
-                    <span style="font-size: 16px;font-weight: bold;">{{ scope.row.prj }}</span>
-                </template>
-                 </el-table-column>
-            <el-table-column prop="node" label="项目数" width="150" >
-                <template slot-scope="scope">
-                    <span style="color:#01A9FF;font-size: 12px;">{{ scope.row.node }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column prop="days" label="总投资（亿元）" width="150">
-                <template slot-scope="scope">
-                    <span style="color:red">{{ scope.row.days }}</span>
+                    <span style="color:#fff">{{ scope.row.money2.toFixed(2) }}</span>
                 </template>
             </el-table-column>            
-            <el-table-column prop="date" label="年度投资（亿元）" width="150">
-
-            </el-table-column>
-            <el-table-column prop="bak" label="备注" class-name="text-left">
-
-            </el-table-column>
         </el-table>
 
+       
+
+
+        
+
     </MyDialog>
 </template>
 
@@ -92,52 +42,39 @@ export default {
     },
     data() {
         return {
-            activeName: 'second',
-            nav: 0,
+            nav: "a1",
+            dept:0,
             show: false,
-            tableData1: [],
-            tableData2: [],
-            tableData3: [],
+            tableData: []
         };
     },
 
 
 
-    mounted() {
-        window.dlg2 = this
-        this.tableData1 = [
-            { prj: '65', node: '515.97', days: 134.86, date: '投资说明：芯片项目总投26亿元，年度投资20亿元；置业6宗住宅用地及城投3宗娱乐用地总投33亿元，协同创新基地总投5亿元。' },
-
-           
-        ]
-
-        this.tableData2 = [
-            { prj: '续建项目', node: '15', days: 183.28, date: '71.32' },
-            { prj: '新建项目', node: '34', days: 273.93, date: '63.54' },
-            { prj: '前期项目', node: '16', days: 58.76	, date: '' },
-            { prj: '合计', node: '65', days: 515.97	, date: '134.86' },
-           
-        ]
-
-
-        this.tableData3 = [
-            { prj: '省级重点项目', node: '9', days: 215.26, date: '60.67' ,bak:'创维、1980泾造中心二期、智谷二期、智谷一期、锦越坊、泊创广场、城市阳台院士坊、文化艺术中心、交大医院'},
-            { prj: '市级重点项目', node: '10', days: 72.29, date: '40.97' ,bak:'小动力电池一、二期、芯片产业园、创普斯二期、隆基100GW、50GW、泊跃人工智能产业园、荟锦坊一、二期、市政道路'},
-            { prj: '新区重点项目', node: '7', days: 52.44	, date: '11.39' ,bak:'城市阳台公园、崇文商业、泊湾中心、云和悦、云如逸、云雨间、泊域人才中心'},
-            { prj: '新城重点项目', node: '38', days: 175.98	, date: '21.83' },
-            { prj: '合计', node: '64', days: 515.97	, date: '134.86' },
-
-           
-        ]
-
-    },
+    mounted() {},
 
     methods: {
-        toggleNav(n) {
-            this.nav = n;
+        handleClick(tab){
+            this.loadData();
         },
-        showDialog() {
+        loadData(){
+            let postData={
+                id:this.dept,
+                costType:this.nav=="a1"?1:2,
+                year:new Date().getFullYear()
+            };
+            this.$api.costOut.groupBYProject(postData).then(d=>{
+                this.tableData=(d.data||[]).map(it=>{
+                    it.money=(it.money||0)/10000.0/10000.0;
+                    it.money2=(it.money2||0)/10000.0/10000.0;
+                    return it;
+                });
+            });
+        },
+        showDialog(dept) {
+            this.dept=dept;
             this.show = true
+            this.loadData();
         }
     },
 };
diff --git a/src/pages/projectEngin.vue b/src/pages/projectEngin.vue
index 321b54a..3d1445a 100644
--- a/src/pages/projectEngin.vue
+++ b/src/pages/projectEngin.vue
@@ -76,7 +76,7 @@
                                         {{ row.mag }}
                                     </template>
                                 </el-table-column>
-                                <el-table-column v-for="(it, idx) in dataListTitles" :label="it">
+                                <el-table-column v-for="(it, idx) in dataListTitles" :label="it" :key="idx">
                                     <template slot-scope="{row}">
                                         <span style="cursor: pointer;" @click="showMagDlg(row,idx)">{{ row.list[idx].cnt }}</span>
                                     </template>
@@ -169,7 +169,7 @@
                                 </el-table-column>
                                 <el-table-column prop="remark" label="项目名称"/>
                                 <el-table-column prop="costName" label="成本名称"/>
-                                <el-table-column prop="money" label="付款金额(万元)">
+                                <el-table-column prop="money" label="申报金额(万元)">
                                     <template slot-scope="{row}">
                                         {{ (row.money||0).toFixed(2) }}
                                     </template>