diff --git a/src/views/screenAdaptation/assets/images/teacher.svg b/src/views/screenAdaptation/assets/images/teacher.svg new file mode 100644 index 0000000..5a3771a --- /dev/null +++ b/src/views/screenAdaptation/assets/images/teacher.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/views/screenAdaptation/common/imgPreview.vue b/src/views/screenAdaptation/common/imgPreview.vue index d0a0bda..8ed8100 100644 --- a/src/views/screenAdaptation/common/imgPreview.vue +++ b/src/views/screenAdaptation/common/imgPreview.vue @@ -35,8 +35,14 @@ }, methods: { getImgURL: function () { - if (this.img && this.img.key && this.img.key !== "") { - return this.BaseConfig.url_path_down + this.img.key; + if (this.img) { + if(this.img.key && this.img.key !== ""){ + return this.BaseConfig.url_path_down + this.img.key; + }else if(this.img.url && this.img.url !== ""){ + console.log("imgUrl:",this.BaseConfig.url_path_down) + console.log("imgUrl:",this.BaseConfig.url_path_down + this.img.url) + return this.BaseConfig.url_path_down +"/"+ this.img.url; + } } else { //暂无图片 return require("../assets/images/noImg.png"); diff --git a/src/views/screenAdaptation/pages/adminCenter/mainCenter/dutyPatrol.vue b/src/views/screenAdaptation/pages/adminCenter/mainCenter/dutyPatrol.vue index f29c600..0343874 100644 --- a/src/views/screenAdaptation/pages/adminCenter/mainCenter/dutyPatrol.vue +++ b/src/views/screenAdaptation/pages/adminCenter/mainCenter/dutyPatrol.vue @@ -8,11 +8,13 @@
+
{{item.rotaName}}
- + +
{{person.staff_name}} @@ -23,6 +25,7 @@
+
@@ -51,9 +54,11 @@ import CommonBox from '../../secondPages/commonBox.vue'; import a from '../../../assets/images/dutyMember/duty1.png'; import {Spin, Empty} from 'ant-design-vue'; + import ImgPreview from '../../../common/imgPreview.vue' export default{ data(){ return { + listScroll:this.StaticParams.scrollOption, showData: false, spinning: false, weekList: [ @@ -183,9 +188,20 @@ 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) } }) }, + getImgObj:function (obj) { + console.log("obj:",obj) + let json = obj.id_photo_json; + if(json && json !== ""){ + return JSON.parse(json) + }else { + return {} + } +// return JSON.parse(json); + }, //分组整理数据结构 buildJsonList: function (dataList) { let dutyList = []; @@ -219,7 +235,8 @@ components: { CommonBox, ASpin: Spin, - AEmpty: Empty + AEmpty: Empty, + ImgPreview } } @@ -266,6 +283,7 @@ height: 100%; display: flex; justify-content: space-between; + margin-bottom: 10px; .title-style { width: 10%; border-radius: 5px; diff --git a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/administration/dutySetting.vue b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/administration/dutySetting.vue index 50fa863..0efdc3a 100644 --- a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/administration/dutySetting.vue +++ b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/administration/dutySetting.vue @@ -140,7 +140,8 @@ }) }, handleAdd() { - const {count, dataSource} = this; + //const {count, dataSource} = this; + //console.log("dataSource",dataSource) const newData = { rota_name: "自定义组名", staff_id_1: "", @@ -154,8 +155,8 @@ identity_id: this.BaseConfig.userInfo.identity_id_cookie, bureau_id: this.BaseConfig.person_info_my.bureau_id, }; - this.dataSource = [...dataSource, newData]; - this.count = count + 1; + this.dataSource = [...this.dataSource, newData]; + this.count = this.count + 1; this.param = newData; this.submitChoose(); }, @@ -169,7 +170,7 @@ } if (target) { target[dataIndex] = value; - this.dataSource = dataSource; + //this.dataSource = dataSource; this.param = target; this.submitChoose(); } diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/parentingClasses.vue b/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/parentingClasses.vue index 9f3a986..2b64ce6 100644 --- a/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/parentingClasses.vue +++ b/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/parentingClasses.vue @@ -439,6 +439,9 @@ } }) }, + closeInfo:function () { + + } }, components: { CommonBox, diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/recipes.vue b/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/recipes.vue index 8e1ceab..d249c20 100644 --- a/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/recipes.vue +++ b/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/recipes.vue @@ -99,7 +99,7 @@ }, mounted() { this.getRecipes() - this.getRecipesDate() + //this.getRecipesDate() }, methods: { //食谱 @@ -125,6 +125,7 @@ this.spinning = false; if (result[0].data.result.length != 0) { let res = JSON.parse(result[0].data.result) + console.log("食谱：",res) res.forEach(item => { this.selectOptions.push({ value: item.menu_id, @@ -132,10 +133,8 @@ }) }) this.defaultValue = this.selectOptions[0].value - } else { - + this.getRecipesDate() } - console.log('食谱1', this.defaultValue) console.log('食谱2', this.selectOptions) } @@ -149,7 +148,7 @@ "query": { "query_id": "query_deyu_shipu2", "query_param": [ - this.BaseConfig.person_info_my.bureau_id + "" + this.defaultValue + "" ] }, "query_cache": 0, diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/studentActivities.vue b/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/studentActivities.vue index c1edaca..5825450 100644 --- a/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/studentActivities.vue +++ b/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/studentActivities.vue @@ -73,6 +73,7 @@ }, components: { CommonBox, + CommonInfo, ASpin: Spin, }, mounted() { diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/headmasterManage.vue b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/headmasterManage.vue index adb83ce..743b6e8 100644 --- a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/headmasterManage.vue +++ b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/headmasterManage.vue @@ -385,8 +385,8 @@ "query": { "query_id": "query_deyu_pingyou2", "query_param": [ - this.excellent_id + "", - this.BaseConfig.person_info_my.bureau_id + "" + this.BaseConfig.person_info_my.bureau_id + "", + this.excellent_id + "" ] }, "query_cache": 0, diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue index be875d9..e5e8e81 100644 --- a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue +++ b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue @@ -208,7 +208,7 @@ 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/css/swiper.css' + //import 'swiper/css/swiper.css' import * as echarts from 'echarts' import ImgPreview from '../../../common/imgPreview.vue'; diff --git a/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/teacherArchives.vue b/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/teacherArchives.vue index a1b02a5..bdf6196 100644 --- a/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/teacherArchives.vue +++ b/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/teacherArchives.vue @@ -2,28 +2,31 @@
- - + + {{ item.subject_name }} +
-
-
- +
+
+ +
+
+
{{item.person_name}}
+
{{'授课班级/' + item.class_total}}
+
+
+
+
+ {{item.subject_name}} +
-
-
{{item.name}}
-
{{'授课班级/' + item.className}}
-
-
-
-
- {{item.projectName}} -
-
+
+
@@ -38,65 +41,24 @@ export default { data() { return { + listScroll:this.StaticParams.scrollOption, projectList: [], subjectId: 0, + subjectName:"", dataListEmpty: false, spinning: false, - dataList: [ - // { - // id: 1, - // imgSrc: require('../../../assets/images/teacherImg/teacherImg01.jpg'), - // name: "赵雪娇", - // className: "2019级01班", - // projectName: "语文" - // }, - // { - // id: 2, - // imgSrc: require('../../../assets/images/teacherImg/teacherImg02.jpg'), - // name: "张大鹏", - // className: "2021级04班", - // projectName: "语文" - // }, - // { - // id: 3, - // imgSrc: require('../../../assets/images/teacherImg/teacherImg03.jpg'), - // name: "于露", - // className: "2020级01班", - // projectName: "语文" - // }, - // { - // id: 4, - // imgSrc: require('../../../assets/images/teacherImg/teacherImg04.jpg'), - // name: "王爽", - // className: "2021级02班", - // projectName: "语文" - // }, - // { - // id: 5, - // imgSrc: require('../../../assets/images/teacherImg/teacherImg05.jpg'), - // name: "刘亚楠", - // className: "2020级02班", - // projectName: "语文" - // }, - // { - // id: 6, - // imgSrc: require('../../../assets/images/teacherImg/teacherImg06.jpg'), - // name: "李菲", - // className: "2018级01班", - // projectName: "语文" - // }, - ] + dataList: [] } }, mounted() { this.teacerArchivesSubject() - this.teacerArchivesTeacher() + }, methods: { projectChange: function (value) { console.log('valuea', value) - if (this.subjectId !== value) { - this.subjectId = value; + if (this.subjectName !== value) { + this.subjectName = value; } this.teacerArchivesTeacher() }, @@ -126,9 +88,12 @@ if (res !== "") { this.projectList = JSON.parse(res); this.projectList.forEach(item => { - item.id = item.subject_id + item.id = item.subject_id; + item.name = item.subject_name; }) this.subjectId = this.projectList[0].id + this.subjectName = this.projectList[0].name + this.teacerArchivesTeacher() } else { this.dataListEmpty = true } @@ -137,6 +102,7 @@ }, //教师档案2 teacerArchivesTeacher() { + console.log("this.subjectName:",this.subjectName) this.spinning = true let param = { "access_token": "system_01##20200102030405##a6ce11eab94df48a6ce11eab", @@ -144,7 +110,7 @@ "query_id": "query_jiaoshi_dangan2", "query_param": [ this.BaseConfig.person_info_my.bureau_id + "", - this.subjectId + "" + this.subjectName + "" ] }, "query_cache": 0, @@ -153,6 +119,7 @@ "query_group": [] } console.log('param', param) + this.dataList = []; this.DataexReportInterface.callInterface([{ params: param, method: "post", @@ -161,7 +128,8 @@ if (result[0].data.success) { let res = result[0].data.result; if (res !== "") { - let dataList = JSON.parse(res); + this.dataList.push(...JSON.parse(res)) + console.log("this.dataList:",this.dataList) } else { this.dataListEmpty = true } @@ -209,7 +177,7 @@ } - .content-style { + /deep/ .content-style { width: 100%; height: 215px; margin-top: 10px; @@ -224,7 +192,7 @@ } .teacher-box-style { - width: calc(50% - 10px); + width: calc(50% - 20px); height: 60px; margin-top: 10px; border: 1px solid $color-default-bright;