diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/classManage.vue b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/classManage.vue
index f517912..bb18ba2 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/classManage.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/classManage.vue
@@ -10,21 +10,66 @@
-
-
-
-
-
- 进入>>
-
-
-
+
+
-
+
+
+
< 2021-2022学年度上学期-09月-红旗班评比结果 >
+
<< 返回
+
+
+
+
+
+
+
+
+
+ 
+
+
+ 班主任
+
{{bestHeadMasterName}}
+
+
+
+ {{bestHeadMasterClass}}
+
+
+
+ 排名/1
+
+ 积分/{{bestHeadMasterScore}}
+
+
+
+
+
@@ -39,14 +84,14 @@
- ![]()
- ![]()
- ![]()
- ![]()
- ![]()
- ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
`${index + 1}`
+ },
+ ],
//班级文化
dotposition: 'right',
- classCulture: [
- // [
- // {src: require('../images/classCulture1.png')},
- // {src: require('../images/classCulture2.png')},
- // {src: require('../images/classCulture3.png')},
- // {src: require('../images/classCulture4.png')},
- // {src: require('../images/classCulture5.png')},
- // {src: require('../images/classCulture6.png')},
- // ],
- // [
- // {src: require('../images/classCulture5.png')},
- // {src: require('../images/classCulture4.png')},
- // {src: require('../images/classCulture2.png')},
- // {src: require('../images/classCulture1.png')},
- // {src: require('../images/classCulture6.png')},
- // {src: require('../images/classCulture3.png')},
- // ],
- ],
- currentP: '',
+ classCulture:
+ [
+ // [
+ // {src: require('../images/classCulture1.png')},
+ // {src: require('../images/classCulture2.png')},
+ // {src: require('../images/classCulture3.png')},
+ // {src: require('../images/classCulture4.png')},
+ // {src: require('../images/classCulture5.png')},
+ // {src: require('../images/classCulture6.png')},
+ // ],
+ // [
+ // {src: require('../images/classCulture5.png')},
+ // {src: require('../images/classCulture4.png')},
+ // {src: require('../images/classCulture2.png')},
+ // {src: require('../images/classCulture1.png')},
+ // {src: require('../images/classCulture6.png')},
+ // {src: require('../images/classCulture3.png')},
+ // ],
+ ],
+ currentP:
+ '',
//时事新闻数据
- eventData: [
- // {content: '洋浦薛小平小学部开展班级文化展示活动', date: '2022/01/22'},
- // {content: '“你好2022！”元旦班级联欢活动', date: '2022/01/22'},
- // {content: '2021年12月12日文景小学503班秋游活动…', date: '2022/01/22'},
- // {content: '走进童话，幸福牵手', date: '2022/01/22'},
- // {content: '2021年青少年公益培训班新春嘉年华暨青…', date: '2022/01/22'},
- // {content: '开展“开学100天，有你真好”班级活动', date: '2022/01/22'},
- ],
+ eventData:
+ [
+ // {content: '洋浦薛小平小学部开展班级文化展示活动', date: '2022/01/22'},
+ ],
//时事新闻的轮播图
- carousel3dData: [
- {src: require('../images/newsPic1.png')},
- {src: require('../images/newsPic2.png')},
- {src: require('../images/newsPic3.png')},
- {src: require('../images/newsPic4.png')},
- {src: require('../images/newsPic5.png')},
- ],
- swiperOption: {
- speed: 400,
- loop: true,
- }
+ carousel3dData:
+ [
+ {src: require('../images/newsPic1.png')},
+ {src: require('../images/newsPic2.png')},
+ {src: require('../images/newsPic3.png')},
+ {src: require('../images/newsPic4.png')},
+ {src: require('../images/newsPic5.png')},
+ ],
+ swiperOption:
+ {
+ speed: 400,
+ loop:
+ true,
+ },
}
- },
- created() {
-
},
mounted() {
- //红旗班评比
- this.getClassManageTableData()
//班级文化
this.getClassCulture()
//时事新闻
this.getEventData()
+ //获取年级数据
+ this.getClassManageTableData();
},
methods: {
getCustomRow() {
@@ -210,6 +260,37 @@
},
//红旗班评比
getClassManageTableData() {
+ let param = {
+ "access_token": "system_01##20200102030405##a6ce11eab94df48a6ce11eab",
+ "query": {
+ "query_id": "query_deyu_hongqiban2",
+ "query_param": [
+ this.BaseConfig.person_info_my.bureau_id + ""
+ ]
+ },
+ "query_cache": 0,
+ "query_count": [],
+ "query_format": "json",
+ "query_group": []
+ }
+ this.spinning = true;
+ this.DataexReportInterface.callInterface([{
+ params: param,
+ method: "post",
+ }], (result) => {
+ let gradeName = []
+ this.spinning = false;
+ this.classManageTableData = JSON.parse(result[0].data.result)
+ //console.log('classManageTableData', this.classManageTableData);
+ //获取班级数据
+ this.getDetailTableData();
+ }
+ )
+
+ },
+
+ //红旗班评比详情接口调用
+ getDetailTableData() {
let param = {
"access_token": "system_01##20200102030405##a6ce11eab94df48a6ce11eab",
"query": {
@@ -229,10 +310,58 @@
method: "post",
}], (result) => {
this.spinning = false;
- //this.classManageTableData = JSON.parse(result[0].data.result)
- //console.log('红旗班评比', JSON.parse(result[0].data.result))
+ this.detailTableData = JSON.parse(result[0].data.result)
+ //console.log("班级数据：", this.detailTableData)
+ this.buildGrageData();
})
},
+ //整合班级 年级数据结构
+ buildGrageData() {
+ for (let i = 0; i < this.classManageTableData.length; i++) {
+ let grade_name = this.classManageTableData[i].grade_name.substring(0, 4);//2019
+ let class_list = [];
+ for (let j = 0; j < this.detailTableData.length; j++) {
+ let create_year = this.detailTableData[j].create_year;
+ if (parseInt(grade_name) === parseInt(create_year)) {
+ class_list.push(this.detailTableData[j])
+ }
+ }
+ //console.log("class_list", class_list);
+ this.classManageTableData[i]["class_list"] = class_list;
+
+ }
+ //console.log("构造后的数据结构：", this.classManageTableData)
+ for (let i = 0; i < this.classManageTableData.length; i++) {
+ let itemScore = this.classManageTableData[i].score
+ let flagClass = []
+ for (let j = 0; j < this.classManageTableData[i].class_list.length; j++) {
+ let item1Score = this.classManageTableData[i].class_list[j].score
+ if (parseInt(item1Score) == parseInt(itemScore)) {
+ flagClass.push(this.classManageTableData[i].class_list[j].class_name.slice(5))
+ }
+ }
+ flagClass = flagClass.join(' ')
+ this.classManageTableData[i]["flagClass"] = flagClass;
+ }
+ //console.log("y构造后的数据结构：", this.classManageTableData)
+ },
+ //红旗班评比详情
+ handleEdit(item) {
+ this.classManageTableBody = false
+ //console.log('item', item.class_list)
+ this.detailTableData = item.class_list
+ //班主任卡片内容赋值 分数、班级、班主任姓名
+ this.bestHeadMasterScore = item.score
+ this.bestHeadMasterClass = item.class_name
+ this.bestHeadMasterName = this.detailTableData[0].class_teacher_name
+ }
+ ,
+ //退出表格详情页
+ exitdetail() {
+ this.classManageTableBody = true
+ this.detailTableData = []
+ }
+ ,
//班级文化
getClassCulture() {
let param = {
@@ -254,11 +383,12 @@
method: "post",
}], (result) => {
this.spinning = false;
- this.classCulture = JSON.parse(result[0].data.result)
+ //this.classCulture = JSON.parse(result[0].data.result)
//console.log('班级文化', result)//result 空
//console.log('班级文化', JSON.parse(result[0].data.result))
})
- },
+ }
+ ,
//时事新闻
getEventData() {
let param = {
@@ -281,19 +411,26 @@
}], (result) => {
this.spinning = false;
//this.eventData = JSON.parse(result[0].data.result)
- console.log('时事新闻', result)//result空
+ //console.log('时事新闻', result)//result空
//console.log('时事新闻', JSON.parse(result[0].data.result))
})
- },
+ }
+ ,
},
components: {
CommonBox,
- ARow: Row,
- ACol: Col,
- ATable: Table,
- ACarousel: Carousel,
- AEmpty: Empty,
- ASpin: Spin,
+ ARow:
+ Row,
+ ACol:
+ Col,
+ ATable:
+ Table,
+ ACarousel:
+ Carousel,
+ AEmpty:
+ Empty,
+ ASpin:
+ Spin,
//时事新闻轮播图
Carousel3d,
Slide,
@@ -324,10 +461,6 @@
overflow: hidden;
margin-bottom: 10px;
- .classManage-table-title {
-
- }
-
.score-list-div {
width: 100%;
height: 23rem;
@@ -336,61 +469,123 @@
margin-top: 0;
overflow: hidden;
- .classManage-tableBody {
- margin-bottom: 15px;
+ }
- /deep/ .ant-table-wrapper {
- width: 100%;
- }
+ .classManage-tableBody, .detailTable {
+ margin-bottom: 15px;
- /deep/ .ant-table-placeholder {
- /*background-color: transparent !important;*/
- /*border-top: none !important;*/
- /*border-bottom: none !important;*/
- }
+ /deep/ .ant-table-wrapper {
+ width: 100%;
+ }
- /deep/ .ant-table-body {
- .ant-table-thead > tr > th {
- background-color: #1c3369;
- color: white;
- border: 1px solid #4e9fb4;
- padding: 2px !important;
- }
- }
+ /deep/ .ant-table-placeholder {
+ /*background-color: transparent !important;*/
+ /*border-top: none !important;*/
+ /*border-bottom: none !important;*/
+ }
- /deep/ .ant-table-thead > tr > th {
- padding: 0 !important;
+ /deep/ .ant-table-body {
+ .ant-table-thead > tr > th {
+ background-color: #1c3369;
+ color: white;
+ border: 1px solid #4e9fb4;
+ padding: 2px !important;
}
+ }
- /deep/ .ant-table-tbody > tr > td {
- padding: 0 !important;
- background: none !important;
- }
+ /deep/ .ant-table-thead > tr > th {
+ padding: 0 !important;
+ }
- /deep/ .ant-table-tbody > tr > td {
- border: 1px solid #4e9fb4;
- }
+ /deep/ .ant-table-tbody > tr > td {
+ padding: 0 !important;
+ background: none !important;
+ }
- /deep/ .ant-table-tbody > tr > td:nth-child(2) {
- color: #F59A23;
- }
+ /deep/ .ant-table-tbody > tr > td {
+ border: 1px solid #4e9fb4;
+ }
- /deep/ .ant-table-tbody > tr > td:nth-child(3) {
- color: #fff;
- /*#02A7F0*/
- }
+ /deep/ .ant-table-tbody > tr > td:nth-child(2) {
+ color: #F59A23;
+ }
+
+ /deep/ .ant-table-tbody > tr > td:nth-child(3) {
+ color: #fff;
+ /*#02A7F0*/
+ }
+
+ /deep/ .ant-table-tbody > tr > td:nth-child(4) > span > a {
+ color: #02A7F0;
+ }
+
+ /deep/ .ant-table-tbody > tr > td:nth-child(4) > span > a:hover {
+ color: #fff;
+ text-decoration: underline;
+ }
+ }
+
+ .detailTable {
+ width: 100%;
+ position: relative;
+ z-index: 9999;
+ display: flex;
- /deep/ .ant-table-tbody > tr > td:nth-child(4) > span > a {
- color: #02A7F0;
+ .detailTable-title {
+ display: inline-block;
+ color: #fff;
+ position: absolute;
+ top: -20px;
+ left: 170px;
+ z-index: 99;
+ font-size: 14px;
+ }
+
+ .detailTable-back {
+ display: inline-block;
+ position: absolute;
+ top: 5px;
+ left: 2px;
+ color: #fff;
+ cursor: pointer;
+ width: 61px;
+ height: 20px;
+ z-index: 99;
+ }
+
+ .detailTableBox {
+ width: 180px;
+ height: 175px;
+ background: #3B446A;
+ border-radius: 5px;
+ position: relative;
+ overflow: hidden;
+ margin-left: 20px;
+ margin-top: 20px;
+
+ img {
+ width: 100%;
+ height: 70px;
+ position: absolute;
+ top: 0;
+ left: 0;
}
- /deep/ .ant-table-tbody > tr > td:nth-child(4) > span > a:hover {
- color: #fff;
- text-decoration: underline;
+ .detailTableBox-text {
+ position: absolute;
+ width: 180px;
+ height: 100px;
+ bottom: 0;
+ left: 0;
}
}
}
+ .classManage-table-title {
+
+ }
+
+
}
.classManage-bot {