From 25aaab3aabb463d73015a1d051799692a24ed04d Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Thu, 23 Nov 2023 09:48:20 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/toCarryOutLegislativeReforms/summaryPage/index.vue | 53 +++++++++++++++++++++++++++++++----------------------
1 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/src/views/toCarryOutLegislativeReforms/summaryPage/index.vue b/src/views/toCarryOutLegislativeReforms/summaryPage/index.vue
index d53fbe1..bc4adb2 100644
--- a/src/views/toCarryOutLegislativeReforms/summaryPage/index.vue
+++ b/src/views/toCarryOutLegislativeReforms/summaryPage/index.vue
@@ -2,11 +2,21 @@
<div class="main">
<div class="timeSelect">
<el-radio-group v-model="searchForm.number" style="margin-left:20px" @input="changeNumber('timeMouted')">
- <el-radio-button label="1">���1������</el-radio-button>
- <el-radio-button label="2">���2������</el-radio-button>
- <el-radio-button label="3">���3������</el-radio-button>
- <el-radio-button label="6">���6������</el-radio-button>
- <el-radio-button label="12">���12������</el-radio-button>
+ <el-radio-button label="1">
+ ���1������
+ </el-radio-button>
+ <el-radio-button label="2">
+ ���2������
+ </el-radio-button>
+ <el-radio-button label="3">
+ ���3������
+ </el-radio-button>
+ <el-radio-button label="6">
+ ���6������
+ </el-radio-button>
+ <el-radio-button label="12">
+ ���12������
+ </el-radio-button>
</el-radio-group>
<el-date-picker v-model="timeInterval" el-time-picker type="daterange" value-format="yyyy-MM-dd" range-separator="���" start-placeholder="������������" end-placeholder="������������" @change="changeNumber('timeValue')" />
</div>
@@ -31,20 +41,20 @@
<div class="overviewAndDetails">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="������" name="first">
+ <div class="tit">
+ <span>
+ ���������������������������
+ </span>
+ <el-button type="primary" plain size="small" style="float: right;" @click="ecxport">
+ ������
+ </el-button>
+ </div>
<div>
- <div class="tit">
- <span>
- ���������������������������
- </span>
- <el-button type="primary" plain size="small" style="float: right;" @click="ecxport">
- ������
- </el-button>
- </div>
<div class="min">
<div class="tab" style="display: inline-block; width: 100%">
- <el-table :data="tableData" class="top" border style="width: 100%" :header-cell-style="{
- background: '#99D4FF', color: '#101111', fontSize: '16px'
- }">
+ <el-table :data="tableData" class="topTable" border style="width: 100%" :header-cell-style="{
+ background: '#99D4FF', color: '#101111', fontSize: '16px'
+ }">
<el-table-column align="center" type="index" width="60" label="������" />
<el-table-column align="center" prop="unitName" label="������������" />
<el-table-column align="center" prop="total" label="���������" />
@@ -55,8 +65,8 @@
<el-table-column align="center" prop="marks" label="������" />
<el-table-column align="center" prop="totalPoints" label="���������" />
</el-table>
- <vueSeamless :data="tableData" v-if="tableData.length>5" ref="scroll3" :pause="true" class="seamless-warp" style="width: 100%;" :class-option="classOption">
- <el-table :data="tableData" v-if="tableData.length>0" class="bottom" border style="width: 100%;margin-bottom:50px">
+ <vueSeamless v-if="tableData.length>5" ref="scroll3" :data="tableData" :pause="true" class="seamless-warp" style="width: 100%;" :class-option="classOption">
+ <el-table v-if="tableData.length>0" :data="tableData" class="bottom" border style="width: 100%;margin-bottom:50px">
<el-table-column align="center" type="index" width="60" />
<el-table-column align="center" prop="unitName" label="������������" />
<el-table-column align="center" prop="total" label="���������" />
@@ -68,7 +78,7 @@
<el-table-column align="center" prop="totalPoints" label="���������" />
</el-table>
</vueSeamless>
- <el-table :data="tableData" v-else class="bottom" border style="width: 100%;margin-bottom:50px">
+ <el-table v-else :data="tableData" class="bottomTable" border style="width: 100%;margin-bottom:50px">
<el-table-column align="center" type="index" width="60" />
<el-table-column align="center" prop="unitName" label="������������" />
<el-table-column align="center" prop="total" label="���������" />
@@ -81,7 +91,6 @@
</el-table>
</div>
</div>
-
</div>
</el-tab-pane>
<el-tab-pane label="������" name="second">
@@ -414,10 +423,10 @@
display: flex;
width: 100%;
}
- .top /deep/.el-table__body-wrapper {
+ .topTable /deep/.el-table__body-wrapper {
display: none;
}
- .bottom /deep/.el-table__header-wrapper {
+ .bottomTable /deep/.el-table__header-wrapper {
display: none;
width: 100%;
}
--
Gitblit v1.8.0