diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/service/impl/BlTeacherAnswerServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/service/impl/BlTeacherAnswerServiceImpl.java index e8158e7..740fb26 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/service/impl/BlTeacherAnswerServiceImpl.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/service/impl/BlTeacherAnswerServiceImpl.java @@ -68,73 +68,73 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl threadService = ThreadUtil.newCompletionService(Executors.newFixedThreadPool(100)); List> calls = com.google.common.collect.Lists.newArrayList(); - calls.add(() -> { - res1(blTeacherMain, result); - return true; - }); - - calls.add(() -> { - res2(blTeacherMain, result); - return true; - }); - - calls.add(() -> { - res3(blTeacherMain, result); - return true; - }); - - calls.add(() -> { - res4(blTeacherMain, result); - return true; - }); - - calls.add(() -> { - res5(blTeacherMain, result); - return true; - }); - - //-----------------堆叠图------------------------ - calls.add(() -> { - tj1(blTeacherMain, result); - return true; - }); - calls.add(() -> { - tj3(blTeacherMain, result); - return true; - }); - calls.add(() -> { - tj5(blTeacherMain, result); - return true; - }); - calls.add(() -> { - tj16(blTeacherMain, result); - return true; - }); - calls.add(() -> { - tj24(blTeacherMain, result); - return true; - }); - calls.add(() -> { - tj26(blTeacherMain, result); - return true; - }); - calls.add(() -> { - tj28(blTeacherMain, result); - return true; - }); - calls.add(() -> { - tj30(blTeacherMain, result); - return true; - }); - calls.add(() -> { - tj32(blTeacherMain, result); - return true; - }); - calls.add(() -> { - tj34(blTeacherMain, result); - return true; - }); - //-----------------堆叠图------------------------ +// calls.add(() -> { +// res1(blTeacherMain, result); +// return true; +// }); +// +// calls.add(() -> { +// res2(blTeacherMain, result); +// return true; +// }); +// +// calls.add(() -> { +// res3(blTeacherMain, result); +// return true; +// }); +// +// calls.add(() -> { +// res4(blTeacherMain, result); +// return true; +// }); +// +// calls.add(() -> { +// res5(blTeacherMain, result); +// return true; +// }); +// +// //-----------------堆叠图------------------------ +// calls.add(() -> { +// tj1(blTeacherMain, result); +// return true; +// }); +// calls.add(() -> { +// tj3(blTeacherMain, result); +// return true; +// }); +// calls.add(() -> { +// tj5(blTeacherMain, result); +// return true; +// }); +// calls.add(() -> { +// tj16(blTeacherMain, result); +// return true; +// }); +// calls.add(() -> { +// tj24(blTeacherMain, result); +// return true; +// }); +// calls.add(() -> { +// tj26(blTeacherMain, result); +// return true; +// }); +// calls.add(() -> { +// tj28(blTeacherMain, result); +// return true; +// }); +// calls.add(() -> { +// tj30(blTeacherMain, result); +// return true; +// }); +// calls.add(() -> { +// tj32(blTeacherMain, result); +// return true; +// }); +// calls.add(() -> { +// tj34(blTeacherMain, result); +// return true; +// }); +// //-----------------堆叠图------------------------ //----------------雷达图------------------------- @@ -179,263 +179,263 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl { - tj8(blTeacherMain, result); - return true; - }); - calls.add(() -> { - tj9(blTeacherMain, result); - return true; - }); - calls.add(() -> { - tj11(blTeacherMain, result); - return true; - }); - - calls.add(() -> { - tj12(blTeacherMain, result); - return true; - }); - calls.add(() -> { - tj15(blTeacherMain, result); - return true; - }); - calls.add(() -> { - tj14(blTeacherMain, result); - return true; - }); - calls.add(() -> { - tj19(blTeacherMain, result); - return true; - }); - - calls.add(() -> { - tj20(blTeacherMain, result); - return true; - }); - calls.add(() -> { - tj21(blTeacherMain, result); - return true; - }); - - calls.add(() -> { - tj22(blTeacherMain, result); - return true; - }); - - calls.add(() -> { - tj23(blTeacherMain, result); - return true; - }); - //----------------多柱图------------------------- - - //----------------单柱图------------------------- - calls.add(() -> { - tj7(blTeacherMain, result); - return true; - }); - calls.add(() -> { - tj10(blTeacherMain, result); - return true; - }); - - calls.add(() -> { - tj13(blTeacherMain, result); - return true; - }); - - calls.add(() -> { - tj18(blTeacherMain, result); - return true; - }); - calls.add(() -> { - tj35(blTeacherMain, result); - return true; - }); - calls.add(() -> { - tj36(blTeacherMain, result); - - return true; - }); - //----------------单柱图------------------------- - - //----------------插入表格及文字----------------------- - calls.add(() -> { - tab1(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - tab2(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - tab3(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - tab4(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - tab5(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - tab6(wo, blTeacherMain); - return true; - }); - calls.add(() -> { - tab7(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - tab8(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - tab9(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - res6(blTeacherMain, result); - return true; - }); - - calls.add(() -> { - tab10(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - res7(blTeacherMain, result); - return true; - }); - calls.add(() -> { - tab11(wo, blTeacherMain); - return true; - }); - calls.add(() -> { - tab12(wo, blTeacherMain); - return true; - }); - calls.add(() -> { - tab13(wo, blTeacherMain); - return true; - }); - calls.add(() -> { - tab14(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - tab15(wo, blTeacherMain); - return true; - }); - - - calls.add(() -> { - tab16(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - res8(blTeacherMain, result); - return true; - }); - - - calls.add(() -> { - tab17(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - tab18(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - tab19(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - tab20(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - tab21(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - tab22(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - tab23(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - tab24(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - tab25(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - tab26(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - tab27(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - tab28(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - tab29(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - tab30(wo, blTeacherMain); - return true; - }); - - calls.add(() -> { - tab31(wo, blTeacherMain); - return true; - }); - calls.add(() -> { - tab32(wo, blTeacherMain); - return true; - }); - calls.add(() -> { - tab33(wo, blTeacherMain); - return true; - }); - //----------------插入表格----------------------- +// //----------------多柱图------------------------- +// calls.add(() -> { +// tj8(blTeacherMain, result); +// return true; +// }); +// calls.add(() -> { +// tj9(blTeacherMain, result); +// return true; +// }); +// calls.add(() -> { +// tj11(blTeacherMain, result); +// return true; +// }); +// +// calls.add(() -> { +// tj12(blTeacherMain, result); +// return true; +// }); +// calls.add(() -> { +// tj15(blTeacherMain, result); +// return true; +// }); +// calls.add(() -> { +// tj14(blTeacherMain, result); +// return true; +// }); +// calls.add(() -> { +// tj19(blTeacherMain, result); +// return true; +// }); +// +// calls.add(() -> { +// tj20(blTeacherMain, result); +// return true; +// }); +// calls.add(() -> { +// tj21(blTeacherMain, result); +// return true; +// }); +// +// calls.add(() -> { +// tj22(blTeacherMain, result); +// return true; +// }); +// +// calls.add(() -> { +// tj23(blTeacherMain, result); +// return true; +// }); +// //----------------多柱图------------------------- +// +// //----------------单柱图------------------------- +// calls.add(() -> { +// tj7(blTeacherMain, result); +// return true; +// }); +// calls.add(() -> { +// tj10(blTeacherMain, result); +// return true; +// }); +// +// calls.add(() -> { +// tj13(blTeacherMain, result); +// return true; +// }); +// +// calls.add(() -> { +// tj18(blTeacherMain, result); +// return true; +// }); +// calls.add(() -> { +// tj35(blTeacherMain, result); +// return true; +// }); +// calls.add(() -> { +// tj36(blTeacherMain, result); +// +// return true; +// }); +// //----------------单柱图------------------------- +// +// //----------------插入表格及文字----------------------- +// calls.add(() -> { +// tab1(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// tab2(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// tab3(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// tab4(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// tab5(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// tab6(wo, blTeacherMain); +// return true; +// }); +// calls.add(() -> { +// tab7(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// tab8(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// tab9(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// res6(blTeacherMain, result); +// return true; +// }); +// +// calls.add(() -> { +// tab10(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// res7(blTeacherMain, result); +// return true; +// }); +// calls.add(() -> { +// tab11(wo, blTeacherMain); +// return true; +// }); +// calls.add(() -> { +// tab12(wo, blTeacherMain); +// return true; +// }); +// calls.add(() -> { +// tab13(wo, blTeacherMain); +// return true; +// }); +// calls.add(() -> { +// tab14(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// tab15(wo, blTeacherMain); +// return true; +// }); +// +// +// calls.add(() -> { +// tab16(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// res8(blTeacherMain, result); +// return true; +// }); +// +// +// calls.add(() -> { +// tab17(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// tab18(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// tab19(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// tab20(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// tab21(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// tab22(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// tab23(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// tab24(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// tab25(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// tab26(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// tab27(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// tab28(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// tab29(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// tab30(wo, blTeacherMain); +// return true; +// }); +// +// calls.add(() -> { +// tab31(wo, blTeacherMain); +// return true; +// }); +// calls.add(() -> { +// tab32(wo, blTeacherMain); +// return true; +// }); +// calls.add(() -> { +// tab33(wo, blTeacherMain); +// return true; +// }); +// //----------------插入表格----------------------- calls.forEach(threadService::submit); calls.forEach(fn -> { @@ -466,14 +466,18 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl "+JSONObject.toJSONString(jsfz2Data)+"[i]}\n" + + " }," + + "radar: { radius: '50%',axisName: { fontSize: 20, color: '#000', padding: 50,fontFamily: '仿宋', formatter: function (value) { let list = value.split(''); let result = ''; for (let i = 1; i <= list.length; i++) { if (!(i % 10) && list[i] != undefined) { result += list[i - 1] + '\\n'; } else { result += list[i - 1];}}return result;}},indicator: [\n" + " { name: '学校重视教师培训与职业发展,相关制度完善', max: 100 },\n" + " { name: '教师发展举措得力,老教授“传帮带”作用充分发挥', max: 100 },\n" + " { name: '教师培训内容丰富,对教学和职业发展有帮助', max: 100 },\n" + " { name: '国际交流与培训活动', max: 100 },\n" + " ],name: {textStyle: {color: 'black',fontSize: 20,fontFamily:'宋体',lineHeight: 24,},\n" + " formatter: function (value) {let list = value.split(\"\");let result = \"\"; for (let i = 1; i <= list.length; i++) {if (!(i % 17) && list[i] != undefined) { result += list[i - 1] + '\\n';} else {result += list[i - 1];} }return result;},},},\n" + - " series: [{type: 'radar',data: [{value: \n" +JSONObject.toJSONString(jsfz2Data)+ " ,label:{show: true,position: 'outside',fontSize:20},},]}]}"; + " series: [{type: 'radar',data: [{value: \n" +JSONObject.toJSONString(jsfz2Data)+ " ,label:{show: false,position: 'outside',fontSize:20},},]}]}"; String jsfz27 = WebDriverUtil.getImgByte500(jsfz2optionsLdt); log.info("================================"); log.info(jsfz27); @@ -1337,7 +1341,11 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl "+JSONObject.toJSONString(zytjpj12Data)+"[i]}\n" + + " }," + + "radar: { radius: '50%',axisName: { fontSize: 20, color: '#000', padding: 50,fontFamily: '仿宋', formatter: function (value) { let list = value.split(''); let result = ''; for (let i = 1; i <= list.length; i++) { if (!(i % 10) && list[i] != undefined) { result += list[i - 1] + '\\n'; } else { result += list[i - 1];}}return result;}},indicator: [\n" + " { name: '教室及教学设备', max: 100 },\n" + " { name: '实验室条件', max: 100 },\n" + " { name: '图书馆资源', max: 100 },\n" + @@ -1345,7 +1353,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl "+JSONObject.toJSONString(zytjpj2Data)+"[i]}\n" + + " }," + + "radar: { radius: '50%',axisName: { fontSize: 20, color: '#000', padding: 50,fontFamily: '仿宋', formatter: function (value) { let list = value.split(''); let result = ''; for (let i = 1; i <= list.length; i++) { if (!(i % 10) && list[i] != undefined) { result += list[i - 1] + '\\n'; } else { result += list[i - 1];}}return result;}},indicator: [\n" + " { name: '教学评价体现学生中心,突出产出导向', max: 5 },\n" + " { name: '评价方式多样,评价主体多元,评价指标科学、具体可测', max: 5 },\n" + " { name: '教学评价针对性地改进了我的教学内容和方法', max: 5 },\n" + @@ -1430,7 +1442,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl "+JSONObject.toJSONString(zyfwyzc2Data)+"[i]}\n" + + " }," + + "radar: { radius: '50%',axisName: { fontSize: 20, color: '#000', padding: 50,fontFamily: '仿宋', formatter: function (value) { let list = value.split(''); let result = ''; for (let i = 1; i <= list.length; i++) { if (!(i % 10) && list[i] != undefined) { result += list[i - 1] + '\\n'; } else { result += list[i - 1];}}return result;}},indicator: [\n" + " { name: '我清楚自己的岗位职责和要求', max: 5 },\n" + " { name: '我周围的教授同事们都为本科生上课', max: 5 },\n" + " { name: '我和同事们都很乐意开展教学研究和改革', max: 5 },\n" + @@ -1516,7 +1532,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl "+JSONObject.toJSONString(ldtData)+"[i]}\n" + + " }," + + "radar: { radius: '50%',axisName: { fontSize: 20, color: '#000', padding: 50,fontFamily: '仿宋', formatter: function (value) { let list = value.split(''); let result = ''; for (let i = 1; i <= list.length; i++) { if (!(i % 10) && list[i] != undefined) { result += list[i - 1] + '\\n'; } else { result += list[i - 1];}}return result;}},indicator: [\n" + " { name: '课前运用网络课程平台、教材或资料进行自主预学,梳理知识并发现问题', max: 5 },\n" + " { name: '课堂上能跟上老师的讲解,主动提问或参与讨论,每节课学有所获', max: 5 },\n" + " { name: '课后复习笔记及总结课堂教学相关知识', max: 5 },\n" + " { name: '除了阅读教材,还延伸阅读教师推荐的其他相关书目', max: 5 },\n" + " ],name: {textStyle: {color: 'black',fontSize: 20,fontFamily:'宋体',lineHeight: 24,},\n" + " formatter: function (value) {let list = value.split(\"\");let result = \"\"; for (let i = 1; i <= list.length; i++) {if (!(i % 13) && list[i] != undefined) { result += list[i - 1] + '\\n';} else {result += list[i - 1];} }return result;},},},\n" + - " series: [{type: 'radar',data: [{value: \n" +JSONObject.toJSONString(ldtData)+ " ,label:{show: true,position: 'outside',fontSize:20},},]}]}"; + " series: [{type: 'radar',data: [{value: \n" +JSONObject.toJSONString(ldtData)+ " ,label:{show: false,position: 'outside',fontSize:20},},]}]}"; String xxzdxldt25 = WebDriverUtil.getImgByte500(xxzdxoptionsLdt); log.info("================================"); log.info(xxzdxldt25); @@ -2002,7 +2021,11 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl "+JSONObject.toJSONString(ldtLxydData)+"[i]}\n" + + " }," + + "radar: { radius: '50%',axisName: { fontSize: 20, color: '#000', padding: 50,fontFamily: '仿宋', formatter: function (value) { let list = value.split(''); let result = ''; for (let i = 1; i <= list.length; i++) { if (!(i % 10) && list[i] != undefined) { result += list[i - 1] + '\\n'; } else { result += list[i - 1];}}return result;}},indicator: [\n" + " { name: '课程将知识、能力、素养进行了有机融合', max: 5 },\n" + " { name: '课程教学培养了我解决复杂问题的综合能力', max: 5 },\n" + " { name: '课程内容注重学科间的交叉与融合', max: 5 },\n" + @@ -2011,7 +2034,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl "+JSONObject.toJSONString(ldt3Data)+"[i]}\n" + + " }," + + "radar: { radius: '50%',axisName: { fontSize: 20, color: '#000', padding: 50,fontFamily: '仿宋', formatter: function (value) { let list = value.split(''); let result = ''; for (let i = 1; i <= list.length; i++) { if (!(i % 10) && list[i] != undefined) { result += list[i - 1] + '\\n'; } else { result += list[i - 1];}}return result;}},indicator: [\n" + " { name: '教学认知能力', max: 5 },\n" + " { name: '教学设计能力', max: 5 },\n" + " { name: '教学调控能力', max: 5 },\n" + @@ -2470,7 +2497,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl "+JSONObject.toJSONString(ldt2Data)+"[i]}\n" + + " }," + + "radar: { radius: '50%',axisName: { fontSize: 20, color: '#000', padding: 50,fontFamily: '仿宋', formatter: function (value) { let list = value.split(''); let result = ''; for (let i = 1; i <= list.length; i++) { if (!(i % 10) && list[i] != undefined) { result += list[i - 1] + '\\n'; } else { result += list[i - 1];}}return result;}},indicator: [\n" + " { name: '热爱工作,能以最大的热情投身教育行业,积极主动学习', max: 5 },\n" + " { name: '关爱学生,积极帮助学生解决生活或学习上的困难', max: 5 },\n" + " { name: '关注学生的心理健康状况', max: 5 },\n" + @@ -2553,7 +2584,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl "+JSONObject.toJSONString(ldt1Data)+"[i]}\n" + + " }," + + "radar: { radius: '50%',axisName: { fontSize: 20, color: '#000', padding: 50,fontFamily: '仿宋', formatter: function (value) { let list = value.split(''); let result = ''; for (let i = 1; i <= list.length; i++) { if (!(i % 10) && list[i] != undefined) { result += list[i - 1] + '\\n'; } else { result += list[i - 1];}}return result;}},indicator: [\n" + " { name: '依法依规,履行教师职责', max: 5 },\n" + " { name: '关心爱护学生', max: 5 },\n" + " { name: '精神面貌及品德修养良好', max: 5 },\n" + " ],name: {textStyle: {color: 'black',fontSize: 20,fontFamily:'宋体',lineHeight: 24,},\n" + " formatter: function (value) {let list = value.split(\"\");let result = \"\"; for (let i = 1; i <= list.length; i++) {if (!(i % 17) && list[i] != undefined) { result += list[i - 1] + '\\n';} else {result += list[i - 1];} }return result;},},},\n" + - " series: [{type: 'radar',data: [{value: \n" +JSONObject.toJSONString(ldt1Data)+ " ,label:{show: true,position: 'outside',fontSize:20},},]}]}"; + " series: [{type: 'radar',data: [{value: \n" +JSONObject.toJSONString(ldt1Data)+ " ,label:{show: false,position: 'outside',fontSize:20},},]}]}"; String sdsfhpLdtImg2 = WebDriverUtil.getImgByte500(sdsfhpLdtImg2Ldt); log.info("================================"); log.info(sdsfhpLdtImg2); diff --git a/jeecgboot-vue3/src/views/bl/blTeacherInfo/components/BlTeacherInfoV2Form.vue b/jeecgboot-vue3/src/views/bl/blTeacherInfo/components/BlTeacherInfoV2Form.vue index 03d2b71..e987a1c 100644 --- a/jeecgboot-vue3/src/views/bl/blTeacherInfo/components/BlTeacherInfoV2Form.vue +++ b/jeecgboot-vue3/src/views/bl/blTeacherInfo/components/BlTeacherInfoV2Form.vue @@ -14,27 +14,27 @@ --> - + - + - + - + - + @@ -52,6 +52,7 @@ v-model:value="formData.minNum" placeholder="请输入最小有效样本数" style="width: 100%" + @change="handleZxybs" > @@ -178,6 +179,14 @@ const disabled = computed(() => { return props.formDisabled; }); +function handleZxybs(){ + var jszrs = formData.teacherSumno; + var zxybs = formData.minNum; + if(zxybs>jszrs){ + createMessage.warning('最小有效样本数不能大于教师总人数'); + formData.minNum = 1; + } +} /** * 新增 */