From 12f1bbfa48c12675c8fab813426db4e68b2328c0 Mon Sep 17 00:00:00 2001 From: zhusiyu <410827992@qq.com> Date: Thu, 3 Nov 2022 00:02:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AB=E5=A4=A7=E4=B8=AD=E5=BF=83-=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/centerCommonInfo.vue | 14 +++-- .../common/commonClubInfo.vue | 11 ++-- .../adminCenter/mainCenter/dutyPatrol.vue | 60 ++++++++++--------- .../adminCenter/mainCenter/meetingDynamic.vue | 45 ++++++++++++-- .../calendar/schoolCalendarFromNew.vue | 6 +- .../calendar/weekCalendarFromNew.vue | 6 +- .../teacherStudents/studentInfo.vue | 7 ++- .../virtueBodyHealthArt/artWork.vue | 16 +++-- .../teacherAdminCenter/overViewTeam.vue | 30 ++++++---- 9 files changed, 125 insertions(+), 70 deletions(-) diff --git a/src/views/screenAdaptation/common/centerCommonInfo.vue b/src/views/screenAdaptation/common/centerCommonInfo.vue index 0e33b0c..5ab66a8 100644 --- a/src/views/screenAdaptation/common/centerCommonInfo.vue +++ b/src/views/screenAdaptation/common/centerCommonInfo.vue @@ -42,7 +42,8 @@ * */ import {Modal} from 'ant-design-vue'; import ModalPanel from "../../../components/common/modal/centerModalPanel.vue"; - export default{ + + export default { props: { show: { type: Boolean, @@ -66,7 +67,7 @@ default: "" }, }, - data(){ + data() { return { infoId: this.$props.commonId, title: this.modalTitle, //弹出框标题 @@ -99,7 +100,7 @@ this.contentHtml = newData.content; }, $route: { - handler(val, oldval){ + handler(val, oldval) { if (val.path === '/partyCenter/party') { this.isPartyCenter = true } else { @@ -108,14 +109,14 @@ }, }, }, - mounted(){ + mounted() { this.getHref() // if (this.infoId && this.infoId !== "") { // this.getDataInfo(); // } }, methods: { - getHref(){ + getHref() { this.href = window.location.hash if (this.href === '#/partyCenter/party') { this.isPartyCenter = true @@ -228,6 +229,9 @@ height: 100% !important; p { line-height: 30px !important; + span { + color: #fff !important; + } } span { line-height: 30px !important; diff --git a/src/views/screenAdaptation/common/commonClubInfo.vue b/src/views/screenAdaptation/common/commonClubInfo.vue index 548cc6f..e6ddded 100644 --- a/src/views/screenAdaptation/common/commonClubInfo.vue +++ b/src/views/screenAdaptation/common/commonClubInfo.vue @@ -18,11 +18,11 @@
社团信息
-
团员人数 /
+
团员人数 /
{{memberNum + '人'}}
-
社团简介 /
+
社团简介 /
{{clubDescribe}} @@ -92,7 +92,8 @@ import "swiper/dist/css/swiper.css"; import ImgPreview from '../common/imgPreview.vue'; import moment from 'moment'; - export default{ + + export default { props: { show: { type: Boolean, @@ -116,7 +117,7 @@ default: "" }, }, - data(){ + data() { return { spinning: false, infoId: this.$props.commonId, @@ -203,7 +204,7 @@ this.getDataexReport2(); } }, - mounted(){ + mounted() { // if (this.infoId && this.infoId !== "") { // this.getDataInfo(); // } diff --git a/src/views/screenAdaptation/pages/adminCenter/mainCenter/dutyPatrol.vue b/src/views/screenAdaptation/pages/adminCenter/mainCenter/dutyPatrol.vue index 0343874..a930102 100644 --- a/src/views/screenAdaptation/pages/adminCenter/mainCenter/dutyPatrol.vue +++ b/src/views/screenAdaptation/pages/adminCenter/mainCenter/dutyPatrol.vue @@ -8,26 +8,28 @@
- -
-
{{item.rotaName}}
-
-
- - -
-
- {{person.staff_name}} -
-
-
{{'<' + person.position + '>'}}
-
{{person.telephone}}
+ +
+
{{item.rotaName}}
+
+
+ + +
+
+ {{person.staff_name}} +
+
+
{{'<' + person.position + '>'}}
+
{{person.telephone}}
+
-
-
+
+ +
@@ -55,10 +57,11 @@ import a from '../../../assets/images/dutyMember/duty1.png'; import {Spin, Empty} from 'ant-design-vue'; import ImgPreview from '../../../common/imgPreview.vue' - export default{ - data(){ + + export default { + data() { return { - listScroll:this.StaticParams.scrollOption, + listScroll: this.StaticParams.scrollOption, showData: false, spinning: false, weekList: [ @@ -162,7 +165,7 @@ dutyList: [], } }, - mounted(){ + mounted() { this.getDataexReport(); }, methods: { @@ -188,16 +191,17 @@ if (result[0].data.success) { let dataList = JSON.parse(result[0].data.result); this.dutyList.push(...this.buildJsonList(dataList)); - console.log("this.dutyList:",this.dutyList) + // console.log("this.dutyList:", this.dutyList) + // console.log('json', JSON.parse(this.dutyList[0].dutyList[0].id_photo_json)) } }) }, - getImgObj:function (obj) { - console.log("obj:",obj) + getImgObj: function (obj) { + // console.log("obj:", obj) let json = obj.id_photo_json; - if(json && json !== ""){ + if (json && json !== "") { return JSON.parse(json) - }else { + } else { return {} } // return JSON.parse(json); @@ -254,7 +258,7 @@ display: flex; flex-direction: column; margin-top: 5px; - /deep/ .ant-spin-container{ + /deep/ .ant-spin-container { width: 100%; height: 100%; .week-content-style { @@ -274,7 +278,7 @@ text-align: center; } } - .content-list-box-style{ + .content-list-box-style { width: 100%; height: 175px; padding: 2px 0; @@ -333,7 +337,7 @@ } } } - .no-data-content-style{ + .no-data-content-style { width: 100%; height: calc(100% - 50px); padding: 2px 0; diff --git a/src/views/screenAdaptation/pages/adminCenter/mainCenter/meetingDynamic.vue b/src/views/screenAdaptation/pages/adminCenter/mainCenter/meetingDynamic.vue index f02ad01..0af0c18 100644 --- a/src/views/screenAdaptation/pages/adminCenter/mainCenter/meetingDynamic.vue +++ b/src/views/screenAdaptation/pages/adminCenter/mainCenter/meetingDynamic.vue @@ -24,8 +24,14 @@ {{item.theme}}
- {{item.building_info}} - {{item.person_names}} + + + {{item.building_info}} + + + + {{item.person_names}} +
进行中 @@ -70,7 +76,8 @@ "query": { "query_id": "query_xingzheng_huiyi", "query_param": [ - this.BaseConfig.person_info_my.bureau_id + "" + // this.BaseConfig.person_info_my.bureau_id + "" + "900008135" ] }, "query_cache": 0, @@ -83,6 +90,7 @@ params: param, method: "post", }], (result) => { + console.log('会议动态', result) this.showData = true; this.spinning = false; if (result[0].data.success) { @@ -112,12 +120,23 @@ width: 100%; height: 400px !important; position: relative; + .meeting-dynamic-box-style { + width: 100%; + height: 100%; + .ant-spin-container{ + overflow-x: hidden; + } + } .meeting-dynamic-content-style { width: 100%; height: 360px !important; display: flex; flex-direction: column; margin-top: 5px; + overflow-x: hidden !important; + /deep/ .__panel { + overflow-x: visible !important; + } .item-row-style { width: 100%; height: 80px; @@ -190,7 +209,8 @@ } } .content-right-style { - width: calc(100% - 200px); + /*width: calc(100% - 200px);*/ + width: 100%; height: 70px; transform: skewX(-20deg); background-image: linear-gradient(#806f44, #40424d); @@ -256,6 +276,23 @@ height: 35px; line-height: 35px; transform: skewX(20deg); + display: flex; + justify-content: center; + align-items: center; + } + .info_text_person_names { + display: inline-block; + width: 270px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + .info_text_building_info { + display: inline-block; + width: 50px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } } .state-style { diff --git a/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar/schoolCalendarFromNew.vue b/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar/schoolCalendarFromNew.vue index 5080eff..49fbffa 100644 --- a/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar/schoolCalendarFromNew.vue +++ b/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar/schoolCalendarFromNew.vue @@ -19,7 +19,7 @@
地点
对象
- +