diff --git a/src/views/screenAdaptation/common/commonClubInfo.vue b/src/views/screenAdaptation/common/commonClubInfo.vue index e6ddded..177c4fb 100644 --- a/src/views/screenAdaptation/common/commonClubInfo.vue +++ b/src/views/screenAdaptation/common/commonClubInfo.vue @@ -239,8 +239,16 @@ for (let i = 0, len = dataList.length; i < len; i++) { let imgJson = dataList[i].attachment_json; if (imgJson !== "") { + if(imgJson[0] != "{"){ + imgJson = imgJson.substring(1); + } let imgArr = JSON.parse(imgJson); - this.imgList.push(imgArr); + if(Array.isArray(imgArr)){ + this.imgList.push(...imgArr); + }else { + this.imgList.push(imgArr); + } + } } } diff --git a/src/views/screenAdaptation/pages/adminCenter/SystemList.vue b/src/views/screenAdaptation/pages/adminCenter/SystemList.vue index 5ae7e50..e5cb33a 100644 --- a/src/views/screenAdaptation/pages/adminCenter/SystemList.vue +++ b/src/views/screenAdaptation/pages/adminCenter/SystemList.vue @@ -16,7 +16,7 @@
{{system.title}}
-
您的当前角色暂未被开放任何系统功能，请联系管理员
+
您的当前角色暂未被开放任何系统功能，请联系管理员
@@ -29,12 +29,14 @@ data: function () { return { systemList: _.cloneDeep(systemConfigData), - systemCenterList: systemCenterConfig, + systemCenterList: [], crm: this.crmData, } }, mounted() { this.calculateData() + //角色八大中心菜单逻辑关系 + this.calulateCenterData() }, methods: { accessSubsystem: function (system) { @@ -85,6 +87,22 @@ } else { this.systemList = []; } + }, + calulateCenterData:function () { + let roles = this.BaseConfig.person_info_my.roles; + let centerSourceData = _.cloneDeep(systemCenterConfig); + if(roles && roles.length > 0){ + for(let i = 0,len = roles.length;i < len;i ++){ + let role_code = roles[i].role_code; + for(let j = 0,mLen = centerSourceData.length;j < mLen;j ++){ + let roleCode = centerSourceData[j].roleCode; + if(role_code === roleCode){ + this.systemCenterList.push(centerSourceData[j]); + break + } + } + } + } } }, watch: { diff --git a/src/views/screenAdaptation/pages/adminCenter/systemConfig.js b/src/views/screenAdaptation/pages/adminCenter/systemConfig.js index 5b64b8e..4eedb49 100644 --- a/src/views/screenAdaptation/pages/adminCenter/systemConfig.js +++ b/src/views/screenAdaptation/pages/adminCenter/systemConfig.js @@ -156,6 +156,7 @@ export const systemCenterConfig = [ { id: 'dangjianyinling', title: '党建引领', + roleCode:"partyBuildAdmin",//党建引领中心管理员 menus: [ { id: "1", @@ -186,6 +187,7 @@ export const systemCenterConfig = [ { id: "xingzhengguanli", title: '行政管理', + roleCode:"administrationAdmin",//行政管理中心管理员 menus: [ { id: "admin-1", @@ -216,6 +218,7 @@ export const systemCenterConfig = [ { id: "yunxingshuju", title: '运行数据', + roleCode:"runDataAdmin",//运行数据中心管理员 menus: [ { id: "operationData-1", @@ -254,6 +257,7 @@ export const systemCenterConfig = [ { id: "jiaoxue", title: '教学管理', + roleCode:"teachingManageAdmin",//教学管理中心管理员 menus: [ { id: "teaching-1", @@ -324,6 +328,7 @@ export const systemCenterConfig = [ { id: "deyu", title: '德育管理', + roleCode:"moralEducationAdmin",//德育管理中心管理员 menus: [ { id: "moralEducation-1", diff --git a/src/views/screenAdaptation/pages/homePages/login/login.vue b/src/views/screenAdaptation/pages/homePages/login/login.vue index bee8794..8352de5 100644 --- a/src/views/screenAdaptation/pages/homePages/login/login.vue +++ b/src/views/screenAdaptation/pages/homePages/login/login.vue @@ -109,6 +109,36 @@ return } this.isLogining = true; + +// //199登录逻辑 +// this.InterfaceConfig.callInterface([{ +// url: CommonInter.checkLoginStatus.url, +// params: {user: this.account, pwd: this.password}, +// method: CommonInter.checkLoginStatus.method, +// isTestLogin: CommonInter.checkLoginStatus.isTestLogin, +// }], (result) => { +// if (result[0].status === 200) { +// let data = result[0].data; +// if (data.success) { +// //cookie存储 +// this.Cookie.set("person_id", data.person_id); +// this.Cookie.set("identity_id", data.identity_id); +// this.Cookie.set("token", "48d7648c7d2c281d01d1efe9dbee0d76"); +// +// //构建BaseConfig基本信息 +// this.buildBaseInfo(); +// } else { +// this.passwordErrorTips = result[0].data.info?result[0].data.info:""; +// this.isLogining = false; +// this.closePanel(); +// } +// } else { +// this.isLogining = false; +// this.closePanel(); +// } +// }) + + //190登录逻辑 this.InterfaceConfig.callInterface([{ url: CommonInter.localLogin.url, params: {login_name: Base64.encode(this.account), login_pwd: Base64.encode(this.password)}, @@ -125,20 +155,6 @@ //构建BaseConfig基本信息 this.buildBaseInfo(); - -// console.log(this.BaseConfig) -// -// //获取个人信息 -// //将个人信息添加到store中，重定向router -// new Promise(function (resolve, reject) { -// _this.getPersonInfo(resolve); -// }).then(function (res) { -// if (res[0].status === 200 && res[0].data.success) { -// _this.setUserStore(res[0].data.table_List); -// }else { -// this.isLogining = false; -// } -// }) } else { this.passwordErrorTips = result[0].data.info?result[0].data.info:""; this.isLogining = false; diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/headmasterManage.vue b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/headmasterManage.vue index 743b6e8..fb6cc37 100644 --- a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/headmasterManage.vue +++ b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/headmasterManage.vue @@ -13,17 +13,19 @@ + - + -

{{item.time}}

+

{{item.create_time.substring(0,10)}}

- {{item.content}}

+ {{item.info_title}}

 + @@ -69,14 +71,17 @@ + - - + - {{item.time}} - + {{item.create_time.substring(0,10)}} + + + @@ -103,25 +108,39 @@ - - - -

{{item.name}}

-

{{item.class}}

- - - - - - -

{{item.name}}

-

{{item.class}}

- - +
+ +
+
+ + +
{{item.teacher_name}}
+
{{item.class_names}}
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + @@ -136,7 +155,7 @@ import {Carousel, Timeline, Table, Spin, Row, Col, Collapse, Empty} from 'ant-design-vue'; import {swiper, swiperSlide} from 'vue-awesome-swiper' import 'swiper/dist/css/swiper.css' - + import ImgPreview from '../../../common/imgPreview.vue'; export default { data() { return { @@ -235,6 +254,7 @@ swiper, swiperSlide, CommonInfo, + ImgPreview }, created() { }, @@ -271,6 +291,7 @@ "query": { "query_id": "query_deyu_duiwu", "query_param": [ + //"900008135", this.BaseConfig.person_info_my.bureau_id + "" ] }, @@ -284,10 +305,19 @@ params: param, method: "post", }], (result) => { + console.log("队伍建设：",result) this.spinning = false; - if (result[0].data.result.length != 0) { - this.teamBuildData = JSON.parse(result[0].data.result) - } else { + if(result[0].data.success){ + let res = result[0].data.result; + if(res && res !== ""){ + let arr = JSON.parse(res); + if(arr && arr.length > 0){ + this.teamBuildData.push(...arr) + } + }else { + this.teamBuildDataEmpty = true + } + }else { this.teamBuildDataEmpty = true } }) @@ -328,6 +358,7 @@ "query_id": "query_deyu_peixun", "query_param": [ this.BaseConfig.person_info_my.bureau_id + "" + //"900008135", ] }, "query_cache": 0, @@ -341,9 +372,28 @@ method: "post", }], (result) => { this.spinning = false; - if (result[0].data.result.length != 0) { - this.headMasterTrainData = JSON.parse(result[0].data.result) - } else { + if(result[0].data.success){ + let res = result[0].data.result; + if(res && res !== ""){ + let arr = JSON.parse(res); + if(arr && arr.length > 0){ + this.headMasterTrainData.push(...arr) + console.log("班主任培训数据",this.headMasterTrainData) + for(let i = 0,len = this.headMasterTrainData.length;i < len;i ++){ + let json = this.headMasterTrainData[i].cover_json; + if(json && json !== ""){ + let arr = JSON.parse(json); + if(arr.length > 3){ + arr = arr.slice(0,3) + } + this.headMasterTrainData[i]["imgs"] = arr; + } + } + } + }else { + this.headMasterTrainDataEmpty = true + } + }else { this.headMasterTrainDataEmpty = true } }) @@ -356,6 +406,7 @@ "query_id": "query_deyu_pingyou", "query_param": [ this.BaseConfig.person_info_my.bureau_id + "" + //"900008135" ] }, "query_cache": 0, @@ -369,13 +420,23 @@ method: "post", }], (result) => { this.spinning = false; - if (result[0].data.result.length != 0) { - this.titleData = JSON.parse(result[0].data.result) - this.excellent_id = this.titleData[0].excellent_id - } - if(this.excellent_id !== ""){ - this.getMasterBextData2()//班主任评优2 + if(result[0].data.success){ + let res = result[0].data.result; + if(res && res !== ""){ + let arr = JSON.parse(res); + if(arr && arr.length > 0){ + if(arr && arr.length > 0){ + this.titleData.push(...arr); + console.log("this.titleData:",this.titleData) + this.excellent_id = this.titleData[0].excellent_id + if(this.excellent_id !== ""){ + this.getMasterBextData2()//班主任评优2 + } + } + } + } } + }) }, //班主任评优2 @@ -386,6 +447,7 @@ "query_id": "query_deyu_pingyou2", "query_param": [ this.BaseConfig.person_info_my.bureau_id + "", + //"900008135", this.excellent_id + "" ] }, @@ -400,14 +462,20 @@ method: "post", }], (result) => { this.spinning = false; - if (result[0].data.result.length != 0) { - this.masterListData = JSON.parse(result[0].data.result) - } else { - this.bestHeadMaster1Empty = true - this.bestHeadMaster2Empty = true - } - (this.bestHeadMaster2.length == 0) - { + if(result[0].data.success) { + let res = result[0].data.result; + if (res && res !== "") { + let arr = JSON.parse(res); + console.log("班主任评优数据：",arr) + if (arr && arr.length > 0) { + if (arr && arr.length > 0) { + this.bestHeadMaster1.push(...arr); + } + } else { + this.bestHeadMaster1Empty = true + this.bestHeadMaster2Empty = true + } + } } }) }, @@ -568,7 +636,7 @@ } .timeLine { - + height: 200px; .ant-timeline, .ant-timeline-reverse { margin-top: -10px; @@ -576,6 +644,9 @@ padding: 10px 0 0; border-radius: 5px; cursor: pointer; + .ant-timeline-item-content{ + top: 0 !important; + } .ant-timeline-item-tail { border-left: 2px dashed #80FFFF; @@ -589,6 +660,7 @@ } /deep/ .ant-timeline-item-content { + top: 0 !important; min-height: 0 !important; } @@ -678,6 +750,7 @@ width: 100%; /deep/ .ant-timeline-item-last > .ant-timeline-item-content { + top: 0 !important; min-height: 0 !important; } } @@ -686,6 +759,9 @@ padding: 15px 0 0; border-bottom: 1px solid #80FFFF; width: 100%; + .ant-timeline-item-content{ + top: 0 !important; + } .ant-timeline-item-tail { height: 0; @@ -720,6 +796,39 @@ height: 20px; text-align: center; } + .teacher-py-box-style{ + width: 100%; + height: 200px; + /deep/ .content-style{ + width: 100%; + height: 100%; + display: flex; + flex-wrap: wrap; + .teacher-box-style{ + border: 1px solid #4e9fb4; + border-radius: 5px; + height: 94px; + width: 67px !important; + margin-right: 5px; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + .item-title-style{ + width: 100%; + height: 20px; + font-size: 12px; + display: flex; + justify-content: center; + align-items: center; + padding: 0 2px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + } + } + } .masterBest-row { height: 95px; @@ -756,7 +865,7 @@ .masterList { width: 359px; - height: 100%; + height: 220px; border: none; /deep/ .ant-collapse { @@ -800,10 +909,10 @@ } .ant-collapse-item > .ant-collapse-header { - padding: 9px 122px; + width: 50%; overflow: hidden; - white-space: nowrap; text-overflow: ellipsis; + white-space: nowrap; padding-left: 8px; color: #fff; line-height: 10px; diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue index e5e8e81..1028812 100644 --- a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue +++ b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue @@ -693,7 +693,7 @@ .studentManageBox { width: 100%; - height: 100%; + height: 550px; display: flex; justify-content: space-between; diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/artWork.vue b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/artWork.vue index 72bc527..ae5eb02 100644 --- a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/artWork.vue +++ b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/artWork.vue @@ -69,8 +69,9 @@