|
@@ -16,7 +16,6 @@
|
|
|
<el-select
|
|
|
class="ml10"
|
|
|
style="width: 90px"
|
|
|
- v-if="tabType == 1"
|
|
|
v-model="queryParams.teamType"
|
|
|
size="mini"
|
|
|
@change="getList"
|
|
@@ -53,8 +52,11 @@
|
|
|
<span v-else> {{ scope.row["rankNum"] }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="teamName" label="队伍名称" align="center">
|
|
|
- </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ :prop="queryParams.teamType == 1 ? 'teamName' : 'companyName'"
|
|
|
+ label="队伍名称"
|
|
|
+ align="center"
|
|
|
+ />
|
|
|
<el-table-column prop="score" label="得分" align="center">
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -77,6 +79,11 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="companyName" label="单位" align="center">
|
|
|
</el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ :prop="queryParams.teamType == 1 ? 'teamName' : 'companyName'"
|
|
|
+ label="队伍名称"
|
|
|
+ align="center"
|
|
|
+ />
|
|
|
<el-table-column prop="managerName" label="负责人名称" align="center">
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="score" label="得分" align="center">
|
|
@@ -101,6 +108,11 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="companyName" label="单位" align="center">
|
|
|
</el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ :prop="queryParams.teamType == 1 ? 'teamName' : 'companyName'"
|
|
|
+ label="队伍名称"
|
|
|
+ align="center"
|
|
|
+ />
|
|
|
<el-table-column prop="workUserName" label="作业人员" align="center">
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="score" label="得分" align="center">
|
|
@@ -172,6 +184,9 @@ export default {
|
|
|
width: 100%;
|
|
|
}
|
|
|
::v-deep {
|
|
|
+ .el-table__body-wrapper {
|
|
|
+ height: calc(100% - 20px) !important;
|
|
|
+ }
|
|
|
.el-table__empty-text {
|
|
|
color: #fff;
|
|
|
}
|