diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/classManage.vue b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/classManage.vue index ba265f4..8ae5349 100644 --- a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/classManage.vue +++ b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/classManage.vue @@ -140,8 +140,8 @@
- - + + @@ -412,8 +412,8 @@ // this.BaseConfig.person_info_my.bureau_id + "" // ] "query_param": [ - //this.BaseConfig.person_info_my.bureau_id + "" - "900008135" + this.BaseConfig.person_info_my.bureau_id + "" + // "900008135" ] }, "query_cache": 0, @@ -458,8 +458,8 @@ // this.BaseConfig.person_info_my.bureau_id + "" // ] "query_param": [ - //this.BaseConfig.person_info_my.bureau_id + "" - "900008135" + this.BaseConfig.person_info_my.bureau_id + "" + // "900008135" ] }, "query_cache": 0, diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/activityTab/laborEducation.vue b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/activityTab/laborEducation.vue index 6d3be71..946792f 100644 --- a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/activityTab/laborEducation.vue +++ b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/activityTab/laborEducation.vue @@ -27,13 +27,14 @@ import {Spin, Empty} from 'ant-design-vue'; import ImgPreview from '../../../../common/imgPreview.vue'; import CommonInfo from '../../../../common/centerCommonInfo.vue'; - export default{ + + export default { props: { infoId: { type: Number, } }, - data(){ + data() { return { showData: false, spinning: false, @@ -49,19 +50,19 @@ // this.getDataexReport(newVal); // } }, - mounted(){ + mounted() { this.getDataexReport(this.$props.infoId); }, methods: { getDataexReport: function (infoId) { let queryId = ""; - if(infoId === 1){ + if (infoId === 1) { queryId = "query_deyu_laodong"; - }else if(infoId === 2){ + } else if (infoId === 2) { queryId = "query_deyu_suzhi"; - }else if(infoId === 3){ + } else if (infoId === 3) { queryId = "query_deyu_aiguo"; - }else if(infoId === 4){ + } else if (infoId === 4) { queryId = "query_deyu_daode"; } let param = { @@ -70,6 +71,7 @@ "query_id": queryId, "query_param": [ this.BaseConfig.person_info_my.bureau_id + "" + // "900008135" ] }, "query_cache": 0, @@ -85,6 +87,7 @@ params: param, method: "post", }], (result) => { + // console.log('实践活动', result) this.showData = true; this.spinning = false; if (result[0].data.success) { diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/artWork.vue b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/artWork.vue index 43b4342..56ffbe1 100644 --- a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/artWork.vue +++ b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/artWork.vue @@ -79,7 +79,7 @@ {{"+" + (item.member_number > 99 ? '99' : item.member_number)}}
-
+ @@ -96,12 +96,13 @@ import CommonBox from '../../secondPages/commonBox.vue'; import VueSeamlessScroll from 'vue-seamless-scroll'; import {swiper, swiperSlide} from "vue-awesome-swiper"; - import "swiper/dist/css/swiper.css"; + // import "swiper/dist/css/swiper.css"; import ImgPreview from '../../../common/imgPreview.vue'; import CommonInfo from '../../../common/centerCommonInfo.vue'; import CommonClubInfo from '../../../common/commonClubInfo.vue'; - export default{ - data(){ + + export default { + data() { return { spinning: false, beautifulShow: [], @@ -210,7 +211,8 @@ "query": { "query_id": "query_deyu_meiyu", "query_param": [ - this.BaseConfig.person_info_my.bureau_id + "" + // this.BaseConfig.person_info_my.bureau_id + "" + "900008135" ] }, "query_cache": 0, @@ -226,17 +228,30 @@ params: param, method: "post", }], (result) => { + //console.log('美育展示', JSON.parse(result[0].data.result)) if (result[0].data.success) { let res = result[0].data.result; if (res !== "") { let dataList = JSON.parse(res); - if (dataList && dataList.length > 0) { - for (let i = 0; i < 5; i++) { - this.beautifulShow.push(dataList[i] ? dataList[i] : null); - } - } + dataList.forEach(item => { + item.attachment_json = item.attachment_json.substr(1) + item.attachment_json = JSON.parse(item.attachment_json) + this.beautifulShow.push(item.attachment_json) + }) + // console.log('datadata', this.beautifulShow) } } + // if (result[0].data.success) { + // let res = result[0].data.result; + // if (res !== "") { + // let dataList = JSON.parse(res); + // if (dataList && dataList.length > 0) { + // for (let i = 0; i < 5; i++) { + // this.beautifulShow.push(dataList[i] ? dataList[i] : null); + // } + // } + // } + // } }) }, getDataexReport02: function () { @@ -287,6 +302,7 @@ "query_id": "query_deyu_shetuan", "query_param": [ this.BaseConfig.person_info_my.bureau_id + "" + // "900008135" ] }, "query_cache": 0, @@ -300,6 +316,7 @@ params: param, method: "post", }], (result) => { + // console.log('社团风暴', JSON.parse(result[0].data.result)) 返回数据里没有图片 this.spinning = false; if (result[0].data.success) { let res = result[0].data.result; @@ -406,6 +423,13 @@ width: 600px !important; height: 450px !important; display: flex; + > > > .banner { + .swiper-wrapper { + width: calc(100% - 50px) !important; + display: flex !important; + overflow: hidden !important; + } + } .art-work-content-style { width: 100%; height: 415px; @@ -504,7 +528,8 @@ } .community-storm-content { display: flex; - justify-content: space-between; + /*justify-content: space-between;*/ + overflow: hidden; .club-box-style { width: 90px !important; height: 100%; @@ -514,6 +539,7 @@ border-radius: 5px; position: relative; cursor: pointer; + float: left; .img-box-style { width: 100%; height: 90px; diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/healthWork.vue b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/healthWork.vue index 20bd1e4..b3bbca2 100644 --- a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/healthWork.vue +++ b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/healthWork.vue @@ -6,8 +6,8 @@