项目数据看板修改

src/renderer/src/api/modules/project/project.js

@@ -92,4 +92,12 @@ export default {
             responseType: 'blob',
         }, false)
     },
+    //获取年份
+    async getAllYear() {
+        return HcApi({
+            url: '/api/blade-attach/project/allYear',
+            method: 'get',
+            params: {},
+        }, false)
+    },
 }

src/renderer/src/styles/view/datav.scss

@@ -127,7 +127,8 @@
                 margin: 18px 0;
             }
             .hc-datav-table {
-                height: calc(100% - 240px);
+                // height: calc(100% - 240px);
+                  height: calc(100% - 38px);
                 overflow: hidden;
             }
             .hc-datav-table .hc-datav-table-main {
@@ -195,7 +196,8 @@
             }
         }
         .hc-datav-row-line {
-            height: calc(100% - 339px);
+            height: calc(100% - 73px);
+            margin-top: 40px;
             border-width: 50px 14px 14px 14px;
             border-style: solid;
             border-image-source: url(/src/assets/images/datav-3.png);

src/renderer/src/views/home/datav.vue

@@ -12,16 +12,16 @@
                 </div>
                 <div class="hc-datav-search-select hc-flex w-full">
                     <div ref="searchRef" class="relative">
-                        <HcDatavSelect v-model="searchForm.year" :datas="yearArr" :clearable="false" @change="searchChange" />
-                        <HcDatavSelect v-model="pageType" :datas="pageTypeArr" :clearable="false" @change="pageTypeChange" />
+                        <HcDatavSelect v-model="searchForm.year" :datas="yearArr" :clearable="false" class="w-100px" @change="searchChange" />
+                        <HcDatavSelect v-model="pageType" :datas="pageTypeArr" :clearable="false" class="w-120px" @change="pageTypeChange" />
                         <template v-if="pageType === '1'">
-                            <HcDatavSelect v-model="searchForm.month" :datas="monthArr" placeholder="时间" @change="searchChange" />
-                            <HcDatavSelect v-model="searchForm.projectScheduleType" :datas="lagArr" placeholder="项目状态" @change="searchChange" />
-                            <HcDatavSelect v-if="searchForm.projectScheduleType === '3'" v-model="searchForm.projectScheduleGrade" :datas="levelArr" placeholder="滞后等级" @change="searchChange" />
+                            <HcDatavSelect v-model="searchForm.month" :datas="monthArr" placeholder="时间" class="w-100px" @change="searchChange" />
+                            <HcDatavSelect v-model="searchForm.projectScheduleType" :datas="lagArr" placeholder="项目状态" class="w-120px" @change="searchChange" />
+                            <HcDatavSelect v-if="searchForm.projectScheduleType === '3'" v-model="searchForm.projectScheduleGrade" class="w-100px" :datas="levelArr" placeholder="滞后等级" @change="searchChange" />
                         </template>
-                        <HcDatavSelect v-model="searchForm.projectStage" :datas="stageArr" placeholder="项目阶段" @change="searchChange" />
-                        <HcDatavSelect v-if="pageType === '1'" v-model="searchForm.projectType" :datas="typeArr" placeholder="项目类型" @change="searchChange" />
-                        <HcDatavSelect v-else v-model="searchForm.quarter" :datas="quarterArr" placeholder="选择季度" :clearable="false" @change="searchQuarterChange" />
+                        <HcDatavSelect v-model="searchForm.projectStage" :datas="stageArr" placeholder="项目阶段" class="w-100px" @change="searchChange" />
+                        <HcDatavSelect v-if="pageType === '1'" v-model="searchForm.projectType" :datas="typeArr" placeholder="项目类型" class="w-100px" @change="searchChange" />
+                        <HcDatavSelect v-else v-model="searchForm.quarter" :datas="quarterArr" placeholder="选择季度" :clearable="false" class="w-100px" @change="searchQuarterChange" />
                     </div>
                     <div v-if="pageType === '1'" class="date flex-1">截止时间： {{ endDate }}</div>
                     <div v-if="pageType === '2'" class="date flex-1">截止时间： {{ workInfo.lastDate || '暂无填写记录' }}</div>
@@ -72,75 +72,120 @@
         </div>
         <div id="hc-datav-row-total-body" class="hc-datav-row-total relative p-[14px]">
             <el-row v-if="pageType === '1'" :gutter="24" class="h-full">
-                <el-col :span="8" class="h-full">
-                    <div class="hc-datav-row-column h-full">
-                        <div class="title">投资数据</div>
-                        <div class="notes">
-                            <span>(已完成/</span>
-                            <span class="red">未完成</span>
-                            <span>)</span>
-                        </div>
-                        <div class="gird-card-box relative mt-4">
-                            <hc-row :gutter="20">
-                                <hc-col :span="12">
-                                    <div class="gird-card hc-flex p-[14px]">
-                                        <div class="upper-num a1 hc-flex-center h-[52px] w-[52px] text-[30px]">Ⅰ</div>
-                                        <div class="content relative ml-[12px] h-[52px] flex-1">
-                                            <div class="name mb-[10px] text-center text-[16px]">一季度</div>
-                                            <div class="data text-center text-[24px]">
-                                                <span class="num font-bold">{{ investStat?.oneFinished || 0 }}</span>
-                                                <span class="line">/</span>
-                                                <span class="red font-bold">{{ investStat?.oneUnFinished || 0 }}</span>
-                                                <span class="unit ml-[5px] text-[14px]">(亿)</span>
+                <el-col :span="16" class="h-full">
+                    <el-row :gutter="24" class="mb-100px h-20%">
+                        <el-col :span="12" class="h-full">
+                            <div class="hc-datav-row-column">
+                                <div class="title">投资数据</div>
+                                <div class="notes">
+                                    <span>(已完成/</span>
+                                    <span class="red">未完成</span>
+                                    <span>)</span>
+                                </div>
+                                <div class="gird-card-box relative" style="height: 80%;">
+                                    <hc-row :gutter="20">
+                                        <hc-col :span="12">
+                                            <div class="gird-card hc-flex p-[11.2px]" style="height: 80%;">
+                                                <div class="upper-num a1 hc-flex-center h-[41.6px] w-[41.6px] text-[24px]">Ⅰ</div>
+                                                <div class="content relative ml-[9.6px] h-[41.6px] flex-1">
+                                                    <div class="name mb-[8px] text-center text-[12.8px]">一季度</div>
+                                                    <div class="data text-center text-[19.2px]">
+                                                        <span class="num font-bold">{{ investStat?.oneFinished || 0 }}</span>
+                                                        <span class="line">/</span>
+                                                        <span class="red font-bold">{{ investStat?.oneUnFinished || 0 }}</span>
+                                                        <span class="unit ml-[4px] text-[11.2px]">(亿)</span>
+                                                    </div>
+                                                </div>
                                             </div>
-                                        </div>
-                                    </div>
-                                </hc-col>
-                                <hc-col :span="12">
-                                    <div class="gird-card hc-flex p-[14px]">
-                                        <div class="upper-num a2 hc-flex-center h-[52px] w-[52px] text-[30px]">Ⅱ</div>
-                                        <div class="content relative ml-[12px] h-[52px] flex-1">
-                                            <div class="name mb-[10px] text-center text-[16px]">二季度</div>
-                                            <div class="data text-center text-[24px]">
-                                                <span class="num font-bold">{{ investStat?.twoFinished || 0 }}</span>
-                                                <span class="line">/</span>
-                                                <span class="red font-bold">{{ investStat?.twoUnFinished || 0 }}</span>
-                                                <span class="unit ml-[5px] text-[14px]">(亿)</span>
+                                        </hc-col>
+                                        <hc-col :span="12">
+                                            <div class="gird-card hc-flex p-[14px]">
+                                                <div class="upper-num a2 hc-flex-center h-[52px] w-[52px] text-[30px]">Ⅱ</div>
+                                                <div class="content relative ml-[12px] h-[52px] flex-1">
+                                                    <div class="name mb-[10px] text-center text-[16px]">二季度</div>
+                                                    <div class="data text-center text-[24px]">
+                                                        <span class="num font-bold">{{ investStat?.twoFinished || 0 }}</span>
+                                                        <span class="line">/</span>
+                                                        <span class="red font-bold">{{ investStat?.twoUnFinished || 0 }}</span>
+                                                        <span class="unit ml-[5px] text-[14px]">(亿)</span>
+                                                    </div>
+                                                </div>
                                             </div>
-                                        </div>
-                                    </div>
-                                </hc-col>
-                                <hc-col :span="12">
-                                    <div class="gird-card hc-flex p-[14px]">
-                                        <div class="upper-num a3 hc-flex-center h-[52px] w-[52px] text-[30px]">Ⅲ</div>
-                                        <div class="content relative ml-[12px] h-[52px] flex-1">
-                                            <div class="name mb-[10px] text-center text-[16px]">三季度</div>
-                                            <div class="data text-center text-[24px]">
-                                                <span class="num font-bold">{{ investStat?.threeFinished || 0 }}</span>
-                                                <span class="line">/</span>
-                                                <span class="red font-bold">{{ investStat?.threeUnFinished || 0 }}</span>
-                                                <span class="unit ml-[5px] text-[14px]">(亿)</span>
+                                        </hc-col>
+                                        <hc-col :span="12">
+                                            <div class="gird-card hc-flex p-[14px]">
+                                                <div class="upper-num a3 hc-flex-center h-[52px] w-[52px] text-[30px]">Ⅲ</div>
+                                                <div class="content relative ml-[12px] h-[52px] flex-1">
+                                                    <div class="name mb-[10px] text-center text-[16px]">三季度</div>
+                                                    <div class="data text-center text-[24px]">
+                                                        <span class="num font-bold">{{ investStat?.threeFinished || 0 }}</span>
+                                                        <span class="line">/</span>
+                                                        <span class="red font-bold">{{ investStat?.threeUnFinished || 0 }}</span>
+                                                        <span class="unit ml-[5px] text-[14px]">(亿)</span>
+                                                    </div>
+                                                </div>
                                             </div>
-                                        </div>
-                                    </div>
-                                </hc-col>
-                                <hc-col :span="12">
-                                    <div class="gird-card hc-flex p-[14px]">
-                                        <div class="upper-num a4 hc-flex-center h-[52px] w-[52px] text-[30px]">Ⅳ</div>
-                                        <div class="content relative ml-[12px] h-[52px] flex-1">
-                                            <div class="name mb-[10px] text-center text-[16px]">四季度</div>
-                                            <div class="data text-center text-[24px]">
-                                                <span class="num font-bold">{{ investStat?.fourFinished || 0 }}</span>
-                                                <span class="line">/</span>
-                                                <span class="red font-bold">{{ investStat?.fourUnFinished || 0 }}</span>
-                                                <span class="unit ml-[5px] text-[14px]">(亿)</span>
+                                        </hc-col>
+                                        <hc-col :span="12">
+                                            <div class="gird-card hc-flex p-[14px]">
+                                                <div class="upper-num a4 hc-flex-center h-[52px] w-[52px] text-[30px]">Ⅳ</div>
+                                                <div class="content relative ml-[12px] h-[52px] flex-1">
+                                                    <div class="name mb-[10px] text-center text-[16px]">四季度</div>
+                                                    <div class="data text-center text-[24px]">
+                                                        <span class="num font-bold">{{ investStat?.fourFinished || 0 }}</span>
+                                                        <span class="line">/</span>
+                                                        <span class="red font-bold">{{ investStat?.fourUnFinished || 0 }}</span>
+                                                        <span class="unit ml-[5px] text-[14px]">(亿)</span>
+                                                    </div>
+                                                </div>
                                             </div>
-                                        </div>
+                                        </hc-col>
+                                    </hc-row>
+                                </div>
+                            </div>
+                        </el-col>
+                        <el-col :span="12" class="h-full">
+                            <div class="hc-datav-row-charts relative text-center">
+                                <div class="row-charts relative inline-block h-[268px] w-[416px]">
+                                    <div class="a1 title-box">
+                                        <span>常规项目</span>
+                                        <span class="num">{{ projectStat.total1 }}</span>
+                                    </div>
+                                    <div class="title-box a2">
+                                        <span>超进度项目</span>
+                                        <span class="num">{{ projectStat.total2 }}</span>
                                     </div>
-                                </hc-col>
-                            </hc-row>
+                                    <div class="title-box a3">
+                                        <span>滞后项目</span>
+                                        <span class="num">{{ projectStat.total3 }}</span>
+                                    </div>
+                                </div>
+                            </div>
+                        </el-col>
+                    </el-row>
+                    <el-row :gutter="24" class="h-70%">
+                        <el-col :span="24" class="h-full">
+                            <div class="hc-datav-row-line relative h-full">
+                                <div class="title">项目投资走势</div>
+                                <div class="hc-full relative">
+                                    <HcDatavCharts v-if="isDatavCharts" :datas="chartsData" />
+                                </div>
+                            </div>
+                        </el-col>
+                    </el-row>
+                </el-col>
+                <el-col :span="8" class="h-full">
+                    <!-- <div class="hc-datav-row-line relative">
+                        <div class="title">项目投资走势</div>
+                        <div class="hc-full relative">
+                            <HcDatavCharts v-if="isDatavCharts" :datas="chartsData" />
                         </div>
+                    </div> -->
+                    <div class="hc-datav-row-column h-full">
+                        <div class="title">项目数据</div>
+                    
                         <div class="hc-datav-divider" />
+                
                         <div v-if="searchForm.projectScheduleType !== '3'" class="hc-datav-table relative">
                             <HcDatavTable :column="tableColumn1" :datas="tableData1" is-current @row-click="tableRowClick">
                                 <template #planAllMoney="{ row }">
@@ -169,124 +214,9 @@
                         </div>
                     </div>
                 </el-col>
-                <el-col :span="8" class="h-full">
-                    <div class="hc-datav-row-charts relative text-center">
-                        <div class="row-charts relative inline-block h-[335px] w-[520px]">
-                            <div class="a1 title-box">
-                                <span>常规项目</span>
-                                <span class="num">{{ projectStat.total1 }}</span>
-                            </div>
-                            <div class="title-box a2">
-                                <span>超进度项目</span>
-                                <span class="num">{{ projectStat.total2 }}</span>
-                            </div>
-                            <div class="title-box a3">
-                                <span>滞后项目</span>
-                                <span class="num">{{ projectStat.total3 }}</span>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="hc-datav-row-line relative">
-                        <div class="title">项目投资走势</div>
-                        <div class="hc-full relative">
-                            <HcDatavCharts v-if="isDatavCharts" :datas="chartsData" />
-                        </div>
-                    </div>
-                </el-col>
-                <el-col :span="8" class="h-full">
-                    <div class="hc-datav-row-column h-full">
-                        <div class="title">进度数据</div>
-                        <div class="notes">
-                            <span>(已完成/</span>
-                            <span class="red">未完成</span>
-                            <span>)</span>
-                        </div>
-                        <div class="gird-card-box relative mt-4">
-                            <hc-row :gutter="20">
-                                <hc-col :span="12">
-                                    <div class="gird-card hc-flex p-[14px]">
-                                        <div class="upper-num a1 hc-flex-center h-[52px] w-[52px] text-[30px]">Ⅰ</div>
-                                        <div class="content relative ml-[12px] h-[52px] flex-1">
-                                            <div class="name mb-[10px] text-center text-[16px]">一季度</div>
-                                            <div class="data text-center text-[24px]">
-                                                <span class="num font-bold">{{ scheduleStat?.oneFinished || 0 }}</span>
-                                                <span class="line">/</span>
-                                                <span class="red font-bold">{{ scheduleStat?.oneUnFinished || 0 }}</span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </hc-col>
-                                <hc-col :span="12">
-                                    <div class="gird-card hc-flex p-[14px]">
-                                        <div class="upper-num a2 hc-flex-center h-[52px] w-[52px] text-[30px]">Ⅱ</div>
-                                        <div class="content relative ml-[12px] h-[52px] flex-1">
-                                            <div class="name mb-[10px] text-center text-[16px]">二季度</div>
-                                            <div class="data text-center text-[24px]">
-                                                <span class="num font-bold">{{ scheduleStat?.twoFinished || 0 }}</span>
-                                                <span class="line">/</span>
-                                                <span class="red font-bold">{{ scheduleStat?.twoUnFinished || 0 }}</span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </hc-col>
-                                <hc-col :span="12">
-                                    <div class="gird-card hc-flex p-[14px]">
-                                        <div class="upper-num a3 hc-flex-center h-[52px] w-[52px] text-[30px]">Ⅲ</div>
-                                        <div class="content relative ml-[12px] h-[52px] flex-1">
-                                            <div class="name mb-[10px] text-center text-[16px]">三季度</div>
-                                            <div class="data text-center text-[24px]">
-                                                <span class="num font-bold">{{ scheduleStat?.threeFinished || 0 }}</span>
-                                                <span class="line">/</span>
-                                                <span class="red font-bold">{{ scheduleStat?.threeUnFinished || 0 }}</span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </hc-col>
-                                <hc-col :span="12">
-                                    <div class="gird-card hc-flex p-[14px]">
-                                        <div class="upper-num a4 hc-flex-center h-[52px] w-[52px] text-[30px]">Ⅳ</div>
-                                        <div class="content relative ml-[12px] h-[52px] flex-1">
-                                            <div class="name mb-[10px] text-center text-[16px]">四季度</div>
-                                            <div class="data text-center text-[24px]">
-                                                <span class="num font-bold">{{ scheduleStat?.fourFinished || 0 }}</span>
-                                                <span class="line">/</span>
-                                                <span class="red font-bold">{{ scheduleStat?.fourUnFinished || 0 }}</span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </hc-col>
-                            </hc-row>
-                        </div>
-                        <div class="hc-datav-divider" />
-                        <div v-if="searchForm.projectScheduleType !== '3'" class="hc-datav-table relative">
-                            <HcDatavTable :column="tableColumn2" :datas="tableData2">
-                                <template #projectTotal="{ row }">
-                                    <span style="color: #D8A70F;" class="font-bold">{{ row.projectTotal }}</span>
-                                </template>
-                                <template #finishedTotal="{ row }">
-                                    <span style="color: #0BD70E;" class="font-bold">{{ row.finishedTotal }}</span>
-                                </template>
-                                <template #unFinishedTotal="{ row }">
-                                    <span style="color: #FF0000;" class="font-bold">{{ row.unFinishedTotal }}</span>
-                                </template>
-                            </HcDatavTable>
-                        </div>
-                        <div v-else class="hc-datav-table relative">
-                            <HcDatavTable :column="lagColumn2" :datas="lagData2">
-                                <template #key3="{ row }">
-                                    <span style="color: #D8A70F;" class="font-bold">{{ row.key3 }}</span>
-                                </template>
-                                <template #key4="{ row }">
-                                    <span style="color: #0BD70E;" class="font-bold">{{ row.key4 }}</span>
-                                </template>
-                                <template #key5="{ row }">
-                                    <span style="color: #FF0000;" class="font-bold">{{ row.key5 }}</span>
-                                </template>
-                            </HcDatavTable>
-                        </div>
-                    </div>
-                </el-col>
             </el-row>
+           
+         
             <div v-else class="hc-datav-row-column work h-full">
                 <div class="title">工作要点</div>
                 <div class="hc-datav-table relative" style="height: 100%;">
@@ -365,7 +295,10 @@ const searchForm = ref({
 
 //下拉框
 const yearArr = [{ id: '2024', name: '2024年' }, { id: '2025', name: '2025年' }, { id: '2026', name: '2026年' }]
-const pageTypeArr = [{ id: '1', name: '投资计划' }, { id: '2', name: '工作要点' }]
+const pageTypeArr = [
+    { id: '1', name: '投资计划' }, 
+    // { id: '2', name: '工作要点' }
+]
 const monthArr = ref([])
 const lagArr = [{ id: '-1', name: '所有' }, { id: '1', name: '超进度项目' }, { id: '2', name: '常规项目' }, { id: '3', name: '滞后项目' }]
 const levelArr = [{ id: '1', name: '一级' }, { id: '2', name: '二级' }, { id: '3', name: '三级' }, { id: '-1', name: '所有' }]
@@ -538,7 +471,7 @@ const getScheduleStat = async ()=>{
 }
 //表格1
 const tableColumn1 = [
-    { key: 'projectStageName', name: '项目阶段' }, { key: 'projectTypeName', name: '项目类型' },
+{ key: 'projectTypeName', name: '项目类型' }, { key: 'projectStageName', name: '项目阶段' },
     { key: 'planAllMoney', name: '计划总投资' }, { key: 'investYearAll', name: '实际已投资' },
     { key: 'unFinishedMoney', name: '未完成投资' },
 ]

src/renderer/src/views/home/modules/charts.vue

@@ -48,7 +48,7 @@ const setClassifyChartsOption = (data) => {
         xAxis: {
             type: 'category',
             boundaryGap: false,
-            data: ['一季度', '二季度', '三季度', '四季度'],
+            data: ['1月', '2月', '3月', '4月, 5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
         },
         yAxis: {
             type: 'value',

src/renderer/src/views/home/modules/select.vue

@@ -88,7 +88,7 @@ const selectChange = (id) => {
         width: 100%;
         height: 100%;
         .el-select__wrapper {
-            font-size: 14px;
+            font-size: 20px;
             gap: unset;
             line-height: unset;
             min-height: unset;

src/renderer/src/views/project/admin/list.vue

@@ -15,6 +15,11 @@
         </template>
         <template #extraToHeader>
             <div class="w-[120px]">
+                <el-select v-model="searchForm.planYear" filterable clearable block placeholder="选择年份" @change="searchClick">
+                    <el-option v-for="item in yearOptions" :key="item.value" :label="item.value" :value="item.key" />
+                </el-select>
+            </div>
+            <div class="ml-2 w-[120px]">
                 <el-select v-model="searchForm.projectStage" filterable clearable block placeholder="项目阶段" @change="searchClick">
                     <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
@@ -95,6 +100,7 @@ import { useClick } from 'hc-vue3-ui'
 const emit = defineEmits(['edit'])
 //渲染完成
 onMounted(async () => {
+    await getYearStation()
     await getProStation()
     await getProType()
     getTableData().then()
@@ -120,6 +126,24 @@ const getTableData = async () => {
         buildTotal.value = 0
     }
 }
+
+//项目阶段
+const yearOptions = ref([])
+const getYearStation = async () => {
+    const { error, code, data } = await mainApi.getAllYear()
+    //处理数据
+    if (!error && code === 200) {
+        yearOptions.value = getArrValue(data)
+        const currentYear = new Date().getFullYear().toString()
+        const hasCurrentYear = yearOptions.value.some(option => option.key == currentYear)
+        searchForm.value.planYear = hasCurrentYear ? currentYear : yearOptions.value[0].key
+  
+    } else {
+        yearOptions.value = []
+       
+    }
+
+}
 //项目阶段
 const stateOptions = ref([])
 const getProStation = async () => {
@@ -131,9 +155,11 @@ const typeOptions = ref([])
 const getProType = async () => {
     typeOptions.value = await getDictionaryData('projectType', true)
   }
+
+  
 //搜索条件
 const searchForm = ref({
-    startYear: '', endYear: '', searchValue: '', year: '', projectStage:'', projectType:'',
+    startYear: '', endYear: '', searchValue: '', planYear: '', projectStage:'', projectType:'',
     current: 1, size: 20, total: 0,
 })
 const searchClick = () => {

src/renderer/src/views/project/modules/project-list.vue

@@ -295,17 +295,23 @@ onMounted(() => {
 
 //表头
 const tableColumn = ref([
-    { key: 'projectStageName', name: '项目阶段', width: 120, align: 'center' },
+   
     { key: 'projectTypeName', name: '项目类型', width: 120, align: 'center' },
+    { key: 'projectStageName', name: '项目阶段', width: 120, align: 'center' },
     { key: 'name', name: '项目名称' },
     { key: 'buildScaleName', name: '建设规模', width: 120, align: 'center' },
+    { key: 'startYear', name: '开工年', width: 100, align: 'center' },
+    { key: 'endYear', name: '完工年', width: 100, align: 'center' },
     { key: 'allInvestMoney', name: '总投资（亿元）', width: 100, align: 'center' },
-    { key: 'startYear', name: '计划开工年', width: 100, align: 'center' },
-    { key: 'endYear', name: '计划完工年', width: 100, align: 'center' },
-    { key: 'dutyUnit', name: '责任单位' },
-    { key: 'isPilotPlanName', name: '交通强国建设试点任务', width: 100, align: 'center' },
-    { key: 'investYearAll', name: '开工累计完成投资', width: 100, align: 'center' },
-    { key: 'progressRatio', name: '项目进展比例(%)', width: 100, align: 'center' },
+    // { key: 'dutyUnit', name: '责任单位' },
+
+  
+    { key: 'investYearAll', name: '项目累计完成投资（亿元）', width: 100, align: 'center' },
+    { key: 'investYearRate', name: '累计完成投资率', width: 100, align: 'center' },
+    { key: 'yearlyInvest', name: '今年计划投资（亿元）', width: 100, align: 'center' },
+    { key: 'investYear', name: '今年累计投资完成（亿元）', width: 100, align: 'center' },
+    { key: 'yearlyInvestRate', name: '今年投资完成率', width: 100, align: 'center' },
+ 
    /*{ key: 'fourteenFiveInvest', name: '\“十四五”\'计划投资（亿元)' },
    { key: 'isFocusProjectName', name: '市级重点项目' },
    { key: 'finishedInvestMoney', name: '完成投资金额(亿元)' },
@@ -336,6 +342,7 @@ const rowNameClick = (row) => {
 const isCompletionDrawer = ref(false)
 const completion = (row) => {
     isCompletionDrawer.value = true
+    
     emit('completion', row)
     getDetailData(row.id)
 }