|
|
|
@ -1,6 +1,6 @@
|
|
|
|
|
<template>
|
|
|
|
|
<el-dialog
|
|
|
|
|
title="荣誉情况"
|
|
|
|
|
title="荣誉情况"
|
|
|
|
|
:visible.sync="infoVisible"
|
|
|
|
|
:close-on-click-modal="false"
|
|
|
|
|
:close-on-press-escape="false"
|
|
|
|
@ -11,12 +11,12 @@
|
|
|
|
|
>
|
|
|
|
|
<div>
|
|
|
|
|
<section>
|
|
|
|
|
<el-table
|
|
|
|
|
v-loading="loading"
|
|
|
|
|
<el-table
|
|
|
|
|
v-loading="loading"
|
|
|
|
|
border
|
|
|
|
|
class="dataMap-two-table"
|
|
|
|
|
:data="tableData"
|
|
|
|
|
:cell-class-name="tableRowClassName"
|
|
|
|
|
class="dataMap-two-table"
|
|
|
|
|
:data="tableData"
|
|
|
|
|
:cell-class-name="tableRowClassName"
|
|
|
|
|
:cell-style="tableCellStyle"
|
|
|
|
|
:header-cell-style="{background:'#D1D9E6'}"
|
|
|
|
|
:span-method="objectSpanMethod"
|
|
|
|
@ -40,7 +40,7 @@
|
|
|
|
|
<div class="project-trace-table-number" :class="scope.row.count3 == '-' ? 'grey-number' : ''" @click="smallNumber(scope.row)">{{ scope.row.count3 }}</div>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="2024年新增" prop="currentYearAdd" align="center" width="100">
|
|
|
|
|
<el-table-column label="2025年新增" prop="currentYearAdd" align="center" width="100">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<div class="project-trace-table-number" :class="scope.row.currentYearAdd == '-' ? 'grey-number' : ''" @click="YrarNumber(scope.row)">{{ scope.row.currentYearAdd }}</div>
|
|
|
|
|
</template>
|
|
|
|
@ -68,7 +68,7 @@ export default {
|
|
|
|
|
projectBigName: ['projectMiddleName'], //一月和地理区域值都相同的时候, 大类和小类值都相同的时候
|
|
|
|
|
//可以合并一月这一列,其余情况不合并
|
|
|
|
|
projectSmallName: [], //三月值相同的时候合并这一列,不受其他的影响,可以跨地理区域进行合并
|
|
|
|
|
projectBigName: [] //三月值相同的时候合并这一列,不受其他的影响,可以跨地理区域进行合并 大类值相同的时候合并这一列
|
|
|
|
|
projectBigName: [] //三月值相同的时候合并这一列,不受其他的影响,可以跨地理区域进行合并 大类值相同的时候合并这一列
|
|
|
|
|
};
|
|
|
|
|
this.setTabelRowSpan(this.tableData, ['projectBigName', 'count1', 'projectMiddleName', 'count2', 'projectSmallName', 'count3', 'currentYearAdd'], effectMerge);
|
|
|
|
|
},
|
|
|
|
|