diff --git a/src/views/screenAdaptation/pages/adminCenter/mainCenter/meetingDynamic.vue b/src/views/screenAdaptation/pages/adminCenter/mainCenter/meetingDynamic.vue
index 5a13816..f02ad01 100644
--- a/src/views/screenAdaptation/pages/adminCenter/mainCenter/meetingDynamic.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/mainCenter/meetingDynamic.vue
@@ -37,7 +37,9 @@
-
+
@@ -48,16 +50,17 @@
* */
import CommonBox from '../../secondPages/commonBox.vue';
import {Icon, Spin, List, Empty} from 'ant-design-vue'
- export default{
- data(){
+
+ export default {
+ data() {
return {
- showData:false,
+ showData: false,
spinning: false,
listScroll: this.StaticParams.scrollOption,
dataList: [],
}
},
- mounted(){
+ mounted() {
this.getDataexReport();
},
methods: {
@@ -280,10 +283,11 @@
}
}
}
- .no-data-content-style{
+ .no-data-content-style {
width: 100%;
height: 100%;
display: flex;
+ margin-top: 100px;
}
}
}
diff --git a/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/teacherStudents/studentInfo.vue b/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/teacherStudents/studentInfo.vue
index be8bfe8..461201b 100644
--- a/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/teacherStudents/studentInfo.vue
+++ b/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/teacherStudents/studentInfo.vue
@@ -112,11 +112,11 @@
"query_format": "json",
"query_group": []
}
- this.spinning = true;
this.DataexReportInterface.callInterface([{
params: param,
method: "post",
}], (result) => {
+ this.spinning = false
if (result[0].data.success) {
this.smallClassNum = this.middleClassNum = this.totalClassNum = this.totalSmallStudentNum = this.totalMiddleStudentNum = 0
let res = JSON.parse(result[0].data.result)
@@ -155,7 +155,6 @@
break
}
this.totalClassNum = this.smallClassNum + this.middleClassNum
- this.spinning = false
//console.log('学生tab表格信息', res)
}
}
diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue
index 39cac95..be875d9 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue
@@ -131,7 +131,8 @@
v-for='(item,index) in honorDataSourse' :key='index'>
- 
+
+
{{item.student_name}}
@@ -139,7 +140,7 @@
{{item.class_name}}
-
+
{{item.reward_name}}
@@ -207,8 +208,9 @@
import CommonInfo from '../../../common/commonInfo.vue'
import {Carousel, Table, Row, Col, Collapse, Spin, Empty} from 'ant-design-vue';
import {swiper, swiperSlide} from 'vue-awesome-swiper'
- import 'swiper/dist/css/swiper.css'
+ import 'swiper/css/swiper.css'
import * as echarts from 'echarts'
+ import ImgPreview from '../../../common/imgPreview.vue';
export default {
data() {
@@ -246,7 +248,7 @@
loop: true, //循环
autoplay: true, //每张播放时长3秒，自动播放
speed: 800,//滑动速度
- slidesPerView: 4,
+ slidesPerView: 4,//每次滑动图片一张
},
dotposition: 'right',
@@ -258,7 +260,7 @@
headText: '',
tableData: [],
columns: [
- {title: '年级', dataIndex: 'stage_name', key: 'stage_name', align: "center",},
+ {title: '年级', dataIndex: 'ENTRANCE_YEAR', key: 'ENTRANCE_YEAR', align: "center",},
{title: '人数', dataIndex: 'total', key: 'total', align: "center",},
{title: '男生', dataIndex: 'nan_total', key: 'nan_total', align: "center",},
{title: '女生', dataIndex: 'nv_total', key: 'nv_total', align: "center",},
@@ -269,7 +271,7 @@
headText: '',
tableData: [],
columns: [
- {title: '年级', dataIndex: 'stage_name', key: 'stage_name', align: "center",},
+ {title: '年级', dataIndex: 'ENTRANCE_YEAR', key: 'ENTRANCE_YEAR', align: "center",},
{title: '人数', dataIndex: 'total', key: 'total', align: "center",},
{title: '男生', dataIndex: 'nan_total', key: 'nan_total', align: "center",},
{title: '女生', dataIndex: 'nv_total', key: 'nv_total', align: "center",},
@@ -279,7 +281,7 @@
headText: '',
tableData: [],
columns: [
- {title: '年级', dataIndex: 'stage_name', key: 'stage_name', align: "center",},
+ {title: '年级', dataIndex: 'ENTRANCE_YEAR', key: 'ENTRANCE_YEAR', align: "center",},
{title: '人数', dataIndex: 'total', key: 'total', align: "center",},
{title: '男生', dataIndex: 'nan_total', key: 'nan_total', align: "center",},
{title: '女生', dataIndex: 'nv_total', key: 'nv_total', align: "center",},
@@ -293,7 +295,6 @@
honorDataSourseEmpty: false,
studentNoticeDataEmpty: false,
collapseDataEmpty: false,
-
}
},
computed: {},
@@ -492,9 +493,13 @@
params: param,
method: "post",
}], (result) => {
+ this.honorDataSourse = []
this.spinning = false;
if (result[0].data.result.length != 0) {
this.honorDataSourse = JSON.parse(result[0].data.result)
+ if (this.honorDataSourse.length <= 4) {
+ this.swiperOption.autoplay = false
+ }
} else {
this.honorDataSourseEmpty = true
}
@@ -651,7 +656,7 @@
// this.modalContent = accept.punish_context
// this.modalContentName = accept.punish_students
},
- closeInfo () {
+ closeInfo() {
this.infoId = "";
this.visible = false;
}
@@ -671,6 +676,7 @@
swiper,
swiperSlide,
CommonInfo,
+ ImgPreview,
}
}
diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/psychicBuild.vue b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/psychicBuild.vue
index e355bea..cf2070f 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/psychicBuild.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/psychicBuild.vue
@@ -160,7 +160,7 @@
import CommonBox from '../../secondPages/commonBox.vue';
import {Icon, Tabs, row, col, Empty, Spin} from 'ant-design-vue';
import {swiper, swiperSlide} from "vue-awesome-swiper";
- import "swiper/dist/css/swiper.css";
+// import "swiper/dist/css/swiper.css";
import moment from 'moment';
import ImgPreview from '../../../common/imgPreview.vue';
import CommonInfo from '../../../common/commonInfo.vue';
@@ -560,7 +560,7 @@
}
.tab-content-style {
width: 100%;
- height: calc(100% - 20px);
+ height: 100%;
.ant-tabs {
height: 100%;
.ant-tabs-content {