Commit 03bce0467bc146f478c8d5955c3e751e4dcfdb10
1 parent
77ebf04d
个人版调整
Showing
25 changed files
with
518 additions
and
322 deletions
src/api/apis/apis.js
@@ -42,8 +42,10 @@ export default { | @@ -42,8 +42,10 @@ export default { | ||
42 | data, | 42 | data, |
43 | }); | 43 | }); |
44 | }, | 44 | }, |
45 | - //班主任-查询管理的班级 | ||
46 | - cTClassList(data) { | 45 | + |
46 | + | ||
47 | + //班主任-查询管理的班级 | ||
48 | + cTClassList(data) { | ||
47 | return service({ | 49 | return service({ |
48 | url: setUpUrls.cTClassList, | 50 | url: setUpUrls.cTClassList, |
49 | method: "POST", | 51 | method: "POST", |
@@ -110,8 +112,8 @@ export default { | @@ -110,8 +112,8 @@ export default { | ||
110 | }); | 112 | }); |
111 | }, | 113 | }, |
112 | 114 | ||
113 | - //任课老师-查询管理的班级 | ||
114 | - tClassList(data) { | 115 | + //任课老师-查询管理的班级 |
116 | + tClassList(data) { | ||
115 | return service({ | 117 | return service({ |
116 | url: setUpUrls.tClassList, | 118 | url: setUpUrls.tClassList, |
117 | method: "POST", | 119 | method: "POST", |
@@ -277,8 +279,8 @@ export default { | @@ -277,8 +279,8 @@ export default { | ||
277 | url: setUpUrls.exportData, | 279 | url: setUpUrls.exportData, |
278 | method: "POST", | 280 | method: "POST", |
279 | responseType: 'arraybuffer', | 281 | responseType: 'arraybuffer', |
280 | - headers:{ | ||
281 | - 'Content-Type':'application/octet-stream' | 282 | + headers: { |
283 | + 'Content-Type': 'application/octet-stream' | ||
282 | } | 284 | } |
283 | }); | 285 | }); |
284 | }, | 286 | }, |
@@ -790,4 +792,332 @@ export default { | @@ -790,4 +792,332 @@ export default { | ||
790 | method: "POST", | 792 | method: "POST", |
791 | }); | 793 | }); |
792 | }, | 794 | }, |
795 | + | ||
796 | + /** 个人版 */ | ||
797 | + // 修改个人信息 | ||
798 | + modifyInfo(data) { | ||
799 | + return service({ | ||
800 | + url: setUpUrls.modifyInfo, | ||
801 | + method: "POST", | ||
802 | + data | ||
803 | + }); | ||
804 | + }, | ||
805 | + // 查询班级列表 | ||
806 | + pClassList(data) { | ||
807 | + return service({ | ||
808 | + url: setUpUrls.pClassList, | ||
809 | + method: "POST", | ||
810 | + data | ||
811 | + }); | ||
812 | + }, | ||
813 | + // 查询科目列表 | ||
814 | + pSubjectList(data) { | ||
815 | + return service({ | ||
816 | + url: setUpUrls.pSubjectList, | ||
817 | + method: "POST", | ||
818 | + data | ||
819 | + }); | ||
820 | + }, | ||
821 | + // 查询学生列表 | ||
822 | + pStudentList(data) { | ||
823 | + return service({ | ||
824 | + url: setUpUrls.pStudentList, | ||
825 | + method: "POST", | ||
826 | + data | ||
827 | + }); | ||
828 | + }, | ||
829 | + // 新增或修改班级 | ||
830 | + pSaveClass(data) { | ||
831 | + return service({ | ||
832 | + url: setUpUrls.pSaveClass, | ||
833 | + method: "POST", | ||
834 | + data | ||
835 | + }); | ||
836 | + }, | ||
837 | + // 增加学生 | ||
838 | + pAddStudent(data) { | ||
839 | + return service({ | ||
840 | + url: setUpUrls.pAddStudent, | ||
841 | + method: "POST", | ||
842 | + data | ||
843 | + }); | ||
844 | + }, | ||
845 | + // 删除学生 | ||
846 | + pDelStudent(data) { | ||
847 | + return service({ | ||
848 | + url: setUpUrls.pDelStudent, | ||
849 | + method: "POST", | ||
850 | + data | ||
851 | + }); | ||
852 | + }, | ||
853 | + // 查询答题卡类型列表 | ||
854 | + pPaperTagList(data) { | ||
855 | + return service({ | ||
856 | + url: setUpUrls.pPaperTagList, | ||
857 | + method: "POST", | ||
858 | + data | ||
859 | + }); | ||
860 | + }, | ||
861 | + // 查询答题卡列表 | ||
862 | + pPaperList(data) { | ||
863 | + return service({ | ||
864 | + url: setUpUrls.pPaperList, | ||
865 | + method: "POST", | ||
866 | + data | ||
867 | + }); | ||
868 | + }, | ||
869 | + // 查询答题卡详情 | ||
870 | + pPaperDetail(data) { | ||
871 | + return service({ | ||
872 | + url: setUpUrls.pPaperDetail, | ||
873 | + method: "POST", | ||
874 | + data | ||
875 | + }); | ||
876 | + }, | ||
877 | + // 增加答题卡 | ||
878 | + pAddPaper(data) { | ||
879 | + return service({ | ||
880 | + url: setUpUrls.pAddPaper, | ||
881 | + method: "POST", | ||
882 | + data | ||
883 | + }); | ||
884 | + }, | ||
885 | + // 修改答题卡 | ||
886 | + pModifyPaper(data) { | ||
887 | + return service({ | ||
888 | + url: setUpUrls.pModifyPaper, | ||
889 | + method: "POST", | ||
890 | + data | ||
891 | + }); | ||
892 | + }, | ||
893 | + // 删除答题卡 | ||
894 | + pDelPaper(data) { | ||
895 | + return service({ | ||
896 | + url: setUpUrls.pDelPaper, | ||
897 | + method: "POST", | ||
898 | + data | ||
899 | + }); | ||
900 | + }, | ||
901 | + // 增加答题卡类型 | ||
902 | + pAddPaperType(data) { | ||
903 | + return service({ | ||
904 | + url: setUpUrls.pAddPaperType, | ||
905 | + method: "POST", | ||
906 | + data | ||
907 | + }); | ||
908 | + }, | ||
909 | + // 修改答题卡类型 | ||
910 | + pModifyPaperType(data) { | ||
911 | + return service({ | ||
912 | + url: setUpUrls.pModifyPaperType, | ||
913 | + method: "POST", | ||
914 | + data | ||
915 | + }); | ||
916 | + }, | ||
917 | + // 删除答题卡类型 | ||
918 | + pDelPaperType(data) { | ||
919 | + return service({ | ||
920 | + url: setUpUrls.pDelPaperType, | ||
921 | + method: "POST", | ||
922 | + data | ||
923 | + }); | ||
924 | + }, | ||
925 | + // 分页查询课时报表列表 | ||
926 | + pPersonal(data) { | ||
927 | + return service({ | ||
928 | + url: setUpUrls.pPersonal, | ||
929 | + method: "POST", | ||
930 | + data | ||
931 | + }); | ||
932 | + }, | ||
933 | + // 查询阶段问答报表 | ||
934 | + pPhaseAnswerReport(data) { | ||
935 | + return service({ | ||
936 | + url: setUpUrls.pPhaseAnswerReport, | ||
937 | + method: "POST", | ||
938 | + data | ||
939 | + }); | ||
940 | + }, | ||
941 | + // 查询阶段互动报表 | ||
942 | + pPhaseInteractiveReport(data) { | ||
943 | + return service({ | ||
944 | + url: setUpUrls.pPhaseInteractiveReport, | ||
945 | + method: "POST", | ||
946 | + data | ||
947 | + }); | ||
948 | + }, | ||
949 | + // 查询课时题目列表 | ||
950 | + pPeriodQuestionList(data) { | ||
951 | + return service({ | ||
952 | + url: setUpUrls.pPeriodQuestionList, | ||
953 | + method: "POST", | ||
954 | + data | ||
955 | + }); | ||
956 | + }, | ||
957 | + // 设置课时报表答案 | ||
958 | + pSetPeriodAnswer(data) { | ||
959 | + return service({ | ||
960 | + url: setUpUrls.pSetPeriodAnswer, | ||
961 | + method: "POST", | ||
962 | + data | ||
963 | + }); | ||
964 | + }, | ||
965 | + // 查询课时报表详情 | ||
966 | + pPeriodDetail(data) { | ||
967 | + return service({ | ||
968 | + url: setUpUrls.pPeriodDetail, | ||
969 | + method: "POST", | ||
970 | + data | ||
971 | + }); | ||
972 | + }, | ||
973 | + // 分页查询课时题目统计列表 | ||
974 | + pPeriodQuestionReport(data) { | ||
975 | + return service({ | ||
976 | + url: setUpUrls.pPeriodQuestionReport, | ||
977 | + method: "POST", | ||
978 | + data | ||
979 | + }); | ||
980 | + }, | ||
981 | + // 查询课时学生答题明细 | ||
982 | + pPeriodStudentReport(data) { | ||
983 | + return service({ | ||
984 | + url: setUpUrls.pPeriodStudentReport, | ||
985 | + method: "POST", | ||
986 | + data | ||
987 | + }); | ||
988 | + }, | ||
989 | + // 导出阶段报表 | ||
990 | + pExportPhaseReport(data) { | ||
991 | + return service({ | ||
992 | + url: setUpUrls.pExportPhaseReport, | ||
993 | + method: "POST", | ||
994 | + data, | ||
995 | + responseType: 'arraybuffer', | ||
996 | + }); | ||
997 | + }, | ||
998 | + // 分页查询即时测报表 | ||
999 | + pExamReportList(data) { | ||
1000 | + return service({ | ||
1001 | + url: setUpUrls.pExamReportList, | ||
1002 | + method: "POST", | ||
1003 | + data | ||
1004 | + }); | ||
1005 | + }, | ||
1006 | + // 查询阶段测练报表 | ||
1007 | + pPhaseExamReport(data) { | ||
1008 | + return service({ | ||
1009 | + url: setUpUrls.pPhaseExamReport, | ||
1010 | + method: "POST", | ||
1011 | + data | ||
1012 | + }); | ||
1013 | + }, | ||
1014 | + // 查询即时测报表题目列表 | ||
1015 | + pExamQuestionList(data) { | ||
1016 | + return service({ | ||
1017 | + url: setUpUrls.pExamQuestionList, | ||
1018 | + method: "POST", | ||
1019 | + data | ||
1020 | + }); | ||
1021 | + }, | ||
1022 | + // 设置即时测报表答案 | ||
1023 | + pSetExamAnswer(data) { | ||
1024 | + return service({ | ||
1025 | + url: setUpUrls.pSetExamAnswer, | ||
1026 | + method: "POST", | ||
1027 | + data | ||
1028 | + }); | ||
1029 | + }, | ||
1030 | + // 查询即时测报表详情 | ||
1031 | + pExamDetail(data) { | ||
1032 | + return service({ | ||
1033 | + url: setUpUrls.pExamDetail, | ||
1034 | + method: "POST", | ||
1035 | + data | ||
1036 | + }); | ||
1037 | + }, | ||
1038 | + // 下载导入主观题分模板 | ||
1039 | + pSubjectiveScoreTemplate(data) { | ||
1040 | + return service({ | ||
1041 | + url: setUpUrls.pSubjectiveScoreTemplate, | ||
1042 | + method: "POST", | ||
1043 | + data, | ||
1044 | + responseType: 'arraybuffer', | ||
1045 | + }); | ||
1046 | + }, | ||
1047 | + // 导入主观题得分 | ||
1048 | + pImportSubjectiveScore(data) { | ||
1049 | + return service({ | ||
1050 | + url: setUpUrls.pImportSubjectiveScore, | ||
1051 | + method: "POST", | ||
1052 | + data | ||
1053 | + }); | ||
1054 | + }, | ||
1055 | + // 分页查询即时测题目统计 | ||
1056 | + pExamQuestionReport(data) { | ||
1057 | + return service({ | ||
1058 | + url: setUpUrls.pExamQuestionReport, | ||
1059 | + method: "POST", | ||
1060 | + data | ||
1061 | + }); | ||
1062 | + }, | ||
1063 | + // 查询即时测学生统计 | ||
1064 | + pExamStudentReport(data) { | ||
1065 | + return service({ | ||
1066 | + url: setUpUrls.pExamStudentReport, | ||
1067 | + method: "POST", | ||
1068 | + data | ||
1069 | + }); | ||
1070 | + }, | ||
1071 | + // 重新判分 | ||
1072 | + pReScore(data) { | ||
1073 | + return service({ | ||
1074 | + url: setUpUrls.pReScore, | ||
1075 | + method: "POST", | ||
1076 | + data | ||
1077 | + }); | ||
1078 | + }, | ||
1079 | + // 导出单课时报表 | ||
1080 | + pExportPeriodReport(data) { | ||
1081 | + return service({ | ||
1082 | + url: setUpUrls.pExportPeriodReport, | ||
1083 | + method: "POST", | ||
1084 | + data, | ||
1085 | + responseType: 'arraybuffer', | ||
1086 | + }); | ||
1087 | + }, | ||
1088 | + // 导出阶段测练报表 | ||
1089 | + pExportPhaseExamReport(data) { | ||
1090 | + return service({ | ||
1091 | + url: setUpUrls.pExportPhaseExamReport, | ||
1092 | + method: "POST", | ||
1093 | + data, | ||
1094 | + responseType: 'arraybuffer', | ||
1095 | + }); | ||
1096 | + }, | ||
1097 | + // 导出单卷测练报表 | ||
1098 | + pExportExamReport(data) { | ||
1099 | + return service({ | ||
1100 | + url: setUpUrls.pExportExamReport, | ||
1101 | + method: "POST", | ||
1102 | + data, | ||
1103 | + responseType: 'arraybuffer', | ||
1104 | + }); | ||
1105 | + }, | ||
1106 | + // 数据导出 | ||
1107 | + pExportData(data) { | ||
1108 | + return service({ | ||
1109 | + url: setUpUrls.pExportData, | ||
1110 | + method: "POST", | ||
1111 | + data, | ||
1112 | + responseType: 'arraybuffer', | ||
1113 | + }); | ||
1114 | + }, | ||
1115 | + // 数据导入 | ||
1116 | + pImportData(data) { | ||
1117 | + return service({ | ||
1118 | + url: setUpUrls.pImportData, | ||
1119 | + method: "POST", | ||
1120 | + data | ||
1121 | + }); | ||
1122 | + }, | ||
793 | }; | 1123 | }; |
src/api/urls/apis.js
@@ -202,5 +202,100 @@ export default { | @@ -202,5 +202,100 @@ export default { | ||
202 | 202 | ||
203 | 203 | ||
204 | // 个人版首页统计数据 | 204 | // 个人版首页统计数据 |
205 | - personalIndex:"/api_html/personal/classList" | 205 | + personalIndex:"/api_html/personal/index", |
206 | + // 修改个人信息 | ||
207 | + modifyInfo:"/api_html/personal/modifyInfo", | ||
208 | + // 查询班级列表 | ||
209 | + pClassList:"/api_html/personal/classList", | ||
210 | + // 查询科目列表 | ||
211 | + pSubjectList:"/api_html/personal/subjectList", | ||
212 | + // 查询学生列表 | ||
213 | + pStudentList:"/api_html/personal/studentList", | ||
214 | + // 新增或修改班级 | ||
215 | + pSaveClass:"/api_html/personal/saveClass", | ||
216 | + // 增加学生 | ||
217 | + pAddStudent:"/api_html/personal/addStudent", | ||
218 | + // 删除学生 | ||
219 | + pDelStudent:"/api_html/personal/delStudent", | ||
220 | + // 查询答题卡类型列表 | ||
221 | + pPaperTagList:"/api_html/personal/paperTagList", | ||
222 | + // 查询答题卡列表 | ||
223 | + pPaperList:"/api_html/personal/paperList", | ||
224 | + // 查询答题卡详情 | ||
225 | + pPaperDetail:"/api_html/personal/paperDetail", | ||
226 | + // 增加答题卡 | ||
227 | + pAddPaper:"/api_html/personal/addPaper", | ||
228 | + // 修改答题卡 | ||
229 | + pModifyPaper:"/api_html/personal/modifyPaper", | ||
230 | + // 删除答题卡 | ||
231 | + pDelPaper:"/api_html/personal/delPaper", | ||
232 | + // 增加答题卡类型 | ||
233 | + pAddPaperType:"/api_html/personal/addPaperType", | ||
234 | + // 修改答题卡类型 | ||
235 | + pModifyPaperType:"/api_html/personal/modifyPaperType", | ||
236 | + // 删除答题卡类型 | ||
237 | + pDelPaperType:"/api_html/personal/delPaperType", | ||
238 | + // 分页查询课时报表列表 | ||
239 | + pPeriodReportList:"/api_html/personal/periodReportList", | ||
240 | + // 查询阶段问答报表 | ||
241 | + pPhaseAnswerReport:"/api_html/personal/phaseAnswerReport", | ||
242 | + // 查询阶段互动报表 | ||
243 | + pPhaseInteractiveReport:"/api_html/personal/phaseInteractiveReport", | ||
244 | + // 查询课时题目列表 | ||
245 | + pPeriodQuestionList:"/api_html/personal/periodQuestionList", | ||
246 | + // 设置课时报表答案 | ||
247 | + pSetPeriodAnswer:"/api_html/personal/setPeriodAnswer", | ||
248 | + // 查询课时报表详情 | ||
249 | + pPeriodDetail:"/api_html/personal/periodDetail", | ||
250 | + // 分页查询课时题目统计列表 | ||
251 | + pPeriodQuestionReport:"/api_html/personal/periodQuestionReport", | ||
252 | + // 查询课时学生答题明细 | ||
253 | + pPeriodStudentReport:"/api_html/personal/periodStudentReport", | ||
254 | + // 导出阶段报表 | ||
255 | + pExportPhaseReport:"/api_html/personal/exportPhaseReport", | ||
256 | + // 分页查询即时测报表 | ||
257 | + pExamReportList:"/api_html/personal/examReportList", | ||
258 | + // 查询阶段测练报表 | ||
259 | + pPhaseExamReport:"/api_html/personal/phaseExamReport", | ||
260 | + // 查询即时测报表题目列表 | ||
261 | + pExamQuestionList:"/api_html/personal/examQuestionList", | ||
262 | + // 设置即时测报表答案 | ||
263 | + pSetExamAnswer:"/api_html/personal/setExamAnswer", | ||
264 | + // 查询即时测报表详情 | ||
265 | + pExamDetail:"/api_html/personal/examDetail", | ||
266 | + // 下载导入主观题分模板 | ||
267 | + pSubjectiveScoreTemplate:"/api_html/personal/subjectiveScoreTemplate", | ||
268 | + // 导入主观题得分 | ||
269 | + pImportSubjectiveScore:"/api_html/personal/importSubjectiveScore", | ||
270 | + // 分页查询即时测题目统计 | ||
271 | + pExamQuestionReport:"/api_html/personal/examQuestionReport", | ||
272 | + // 查询即时测学生统计 | ||
273 | + pExamStudentReport:"/api_html/personal/examStudentReport", | ||
274 | + // 重新判分 | ||
275 | + pReScore:"/api_html/personal/reScore", | ||
276 | + // 导出单课时报表 | ||
277 | + pExportPeriodReport:"/api_html/personal/exportPeriodReport", | ||
278 | + // 导出阶段测练报表 | ||
279 | + pExportPhaseExamReport:"/api_html/personal/exportPhaseExamReport", | ||
280 | + // 导出单卷测练报表 | ||
281 | + pExportExamReport:"/api_html/personal/exportExamReport", | ||
282 | + // 数据导出 | ||
283 | + pExportData:"/api_html/personal/exportData", | ||
284 | + // 数据导入 | ||
285 | + pImportData:"/api_html/personal/importData", | ||
286 | + | ||
287 | + | ||
288 | + /** 平台管理 */ | ||
289 | + //账户管理 | ||
290 | + tenantPage:"/api_html/system/tenantPage", | ||
291 | + //修改账号 | ||
292 | + updateTenant:"/api_html/system/updateTenant", | ||
293 | + //新增租户账号 | ||
294 | + addTenant:"/api_html/system/addTenant", | ||
295 | + // 授课端版本管理 | ||
296 | + versionPage:"/api_html/system/versionPage", | ||
297 | + // 新增授课端版本 | ||
298 | + addVersion:"/api_html/system/addVersion", | ||
299 | + // 文件上传 | ||
300 | + uploadApp:"/file/uploadApp", | ||
206 | } | 301 | } |
src/router/index.js
@@ -375,6 +375,22 @@ let addrouters = [ //测试用,后续后端获取 | @@ -375,6 +375,22 @@ let addrouters = [ //测试用,后续后端获取 | ||
375 | 375 | ||
376 | const addroutersPersonal = [ | 376 | const addroutersPersonal = [ |
377 | { | 377 | { |
378 | + path: "/setUpStudent", | ||
379 | + iconCls: "fa fa-mortar-board", | ||
380 | + name: '班级名单', | ||
381 | + component: Layout, | ||
382 | + alone: true, | ||
383 | + children: [ | ||
384 | + { | ||
385 | + path: "/setUpStudent", | ||
386 | + iconCls: "a fa-mortar-board", | ||
387 | + name: '', | ||
388 | + component: PersonalSetUpStudent, | ||
389 | + children: [] | ||
390 | + }, | ||
391 | + ] | ||
392 | + }, | ||
393 | + { | ||
378 | path: "/examinationPaper", | 394 | path: "/examinationPaper", |
379 | iconCls: "fa fa-file-text", // 图标样式class | 395 | iconCls: "fa fa-file-text", // 图标样式class |
380 | name: "备题组卷", | 396 | name: "备题组卷", |
@@ -499,19 +515,19 @@ const addroutersPersonal = [ | @@ -499,19 +515,19 @@ const addroutersPersonal = [ | ||
499 | ] | 515 | ] |
500 | }, | 516 | }, |
501 | { | 517 | { |
502 | - path: "/setUpStudent", | ||
503 | - iconCls: "fa fa-mortar-board", | ||
504 | - name: '班级名单', | 518 | + path: "/dataSync", |
519 | + iconCls: "fa fa-random", // 图标样式class | ||
520 | + name: "数据同步", | ||
505 | component: Layout, | 521 | component: Layout, |
506 | alone: true, | 522 | alone: true, |
507 | children: [ | 523 | children: [ |
508 | { | 524 | { |
509 | - path: "/setUpStudent", | ||
510 | - iconCls: "a fa-mortar-board", | ||
511 | - name: '', | ||
512 | - component: PersonalSetUpStudent, | 525 | + path: "/dataSync", |
526 | + iconCls: "fa fa-random", // 图标样式class | ||
527 | + name: "", | ||
528 | + component: PersonalDataSync, | ||
513 | children: [] | 529 | children: [] |
514 | - }, | 530 | + } |
515 | ] | 531 | ] |
516 | }, | 532 | }, |
517 | { | 533 | { |
@@ -530,25 +546,6 @@ const addroutersPersonal = [ | @@ -530,25 +546,6 @@ const addroutersPersonal = [ | ||
530 | } | 546 | } |
531 | ] | 547 | ] |
532 | }, | 548 | }, |
533 | - { | ||
534 | - path: "/dataSync", | ||
535 | - iconCls: "fa fa-random", // 图标样式class | ||
536 | - name: "数据同步", | ||
537 | - component: Layout, | ||
538 | - alone: true, | ||
539 | - children: [ | ||
540 | - { | ||
541 | - path: "/dataSync", | ||
542 | - iconCls: "fa fa-random", // 图标样式class | ||
543 | - name: "", | ||
544 | - component: PersonalDataSync, | ||
545 | - children: [] | ||
546 | - } | ||
547 | - ] | ||
548 | - }, | ||
549 | - | ||
550 | - | ||
551 | - | ||
552 | ] | 549 | ] |
553 | 550 | ||
554 | const addRoutersAdmin = [ | 551 | const addRoutersAdmin = [ |
src/views/index/mainIndex.vue
@@ -278,13 +278,7 @@ export default { | @@ -278,13 +278,7 @@ export default { | ||
278 | }); | 278 | }); |
279 | }, | 279 | }, |
280 | _Init(val) { | 280 | _Init(val) { |
281 | - let type = ""; | ||
282 | - this.$store.getters.info.permissions.map((item) => { | ||
283 | - if (item.roleName == val) { | ||
284 | - type = item.role; | ||
285 | - } | ||
286 | - }); | ||
287 | - this.type = type ? type : this.$store.getters.info.permissions[0].role; | 281 | + this.type = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role; |
288 | this.type = 'ROLE_PINGTAI' | 282 | this.type = 'ROLE_PINGTAI' |
289 | this.navList = this.$store.getters.addRouters.map((item) => { | 283 | this.navList = this.$store.getters.addRouters.map((item) => { |
290 | return { | 284 | return { |
src/views/layout/header/header.vue
@@ -105,13 +105,7 @@ export default { | @@ -105,13 +105,7 @@ export default { | ||
105 | }, | 105 | }, |
106 | created() { | 106 | created() { |
107 | this.code = localStorage.getItem("csCode") || ""; | 107 | this.code = localStorage.getItem("csCode") || ""; |
108 | - let role = ""; | ||
109 | - this.$store.getters.info.permissions.map((item) => { | ||
110 | - if (item.roleName == this.$store.getters.info.showRoleName) { | ||
111 | - role = item.role; | ||
112 | - } | ||
113 | - }); | ||
114 | - this.role = role ? role : this.$store.getters.info.permissions[0].role; | 108 | + this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role; |
115 | this.isCollapse = this.$store.getters.isCollapse; | 109 | this.isCollapse = this.$store.getters.isCollapse; |
116 | }, | 110 | }, |
117 | methods: { | 111 | methods: { |
src/views/personal/ask/analysis.vue
@@ -420,7 +420,7 @@ export default { | @@ -420,7 +420,7 @@ export default { | ||
420 | this._QueryData(); | 420 | this._QueryData(); |
421 | }, | 421 | }, |
422 | async periodDetail() { | 422 | async periodDetail() { |
423 | - let { data, info, status } = await this.$request.periodDetail({ | 423 | + let { data, info, status } = await this.$request.pPeriodDetail({ |
424 | periodId: this.id, | 424 | periodId: this.id, |
425 | }); | 425 | }); |
426 | if (status == 0) { | 426 | if (status == 0) { |
@@ -438,8 +438,8 @@ export default { | @@ -438,8 +438,8 @@ export default { | ||
438 | async _QueryData() { | 438 | async _QueryData() { |
439 | const queryData = | 439 | const queryData = |
440 | this.type == 1 | 440 | this.type == 1 |
441 | - ? this.$request.periodQuestionReport | ||
442 | - : this.$request.periodStudentReport; | 441 | + ? this.$request.pPeriodQuestionReport |
442 | + : this.$request.pPeriodStudentReport; | ||
443 | let query = {}; | 443 | let query = {}; |
444 | if (this.type == 2) { | 444 | if (this.type == 2) { |
445 | query.type = 1; | 445 | query.type = 1; |
@@ -494,7 +494,7 @@ export default { | @@ -494,7 +494,7 @@ export default { | ||
494 | async exportData() { | 494 | async exportData() { |
495 | if (this.exportLoading == true) return; | 495 | if (this.exportLoading == true) return; |
496 | this.exportLoading = true; | 496 | this.exportLoading = true; |
497 | - const data = await this.$request.exportPeriodReport({ | 497 | + const data = await this.$request.pExportPeriodReport({ |
498 | periodId: this.id, | 498 | periodId: this.id, |
499 | }); | 499 | }); |
500 | this.exportLoading = false; | 500 | this.exportLoading = false; |
src/views/personal/ask/index.vue
@@ -517,7 +517,7 @@ export default { | @@ -517,7 +517,7 @@ export default { | ||
517 | this._QueryData(); | 517 | this._QueryData(); |
518 | }, | 518 | }, |
519 | async _QueryClassList() { | 519 | async _QueryClassList() { |
520 | - const { data, status, info } = await this.$request.tClassList(); | 520 | + const { data, status, info } = await this.$request.pClassList(); |
521 | if (status === 0) { | 521 | if (status === 0) { |
522 | this.classList = data.list.map((item) => { | 522 | this.classList = data.list.map((item) => { |
523 | return { | 523 | return { |
@@ -531,7 +531,7 @@ export default { | @@ -531,7 +531,7 @@ export default { | ||
531 | } | 531 | } |
532 | }, | 532 | }, |
533 | async _QuerySubjectList() { | 533 | async _QuerySubjectList() { |
534 | - const { data, status, info } = await this.$request.tSubjectList({ | 534 | + const { data, status, info } = await this.$request.pSubjectList({ |
535 | classId: this.query.classId, | 535 | classId: this.query.classId, |
536 | }); | 536 | }); |
537 | if (status === 0) { | 537 | if (status === 0) { |
@@ -588,7 +588,7 @@ export default { | @@ -588,7 +588,7 @@ export default { | ||
588 | this.$message.warning("请选择科目"); | 588 | this.$message.warning("请选择科目"); |
589 | return; | 589 | return; |
590 | } | 590 | } |
591 | - const { data, status, info } = await this.$request.periodReportList({ | 591 | + const { data, status, info } = await this.$request.pPeriodReportList({ |
592 | ...query, | 592 | ...query, |
593 | page: this.page, | 593 | page: this.page, |
594 | size: this.size, | 594 | size: this.size, |
@@ -624,7 +624,7 @@ export default { | @@ -624,7 +624,7 @@ export default { | ||
624 | this.$message.warning("请选择科目"); | 624 | this.$message.warning("请选择科目"); |
625 | return; | 625 | return; |
626 | } | 626 | } |
627 | - const { data, status, info } = await this.$request.phaseAnswerReport({ | 627 | + const { data, status, info } = await this.$request.pPhaseAnswerReport({ |
628 | ...query, | 628 | ...query, |
629 | }); | 629 | }); |
630 | this.loading = false; | 630 | this.loading = false; |
@@ -683,7 +683,7 @@ export default { | @@ -683,7 +683,7 @@ export default { | ||
683 | this.$message.warning("请选择科目"); | 683 | this.$message.warning("请选择科目"); |
684 | return; | 684 | return; |
685 | } | 685 | } |
686 | - const { data, status, info } = await this.$request.phaseInteractiveReport( | 686 | + const { data, status, info } = await this.$request.pPhaseInteractiveReport( |
687 | { | 687 | { |
688 | ...query, | 688 | ...query, |
689 | } | 689 | } |
@@ -743,7 +743,7 @@ export default { | @@ -743,7 +743,7 @@ export default { | ||
743 | return; | 743 | return; |
744 | } | 744 | } |
745 | this.exportLoading = true; | 745 | this.exportLoading = true; |
746 | - const data = await this.$request.exportPhaseAnswerReport({ ...query }); | 746 | + const data = await this.$request.pExportPhaseReport({ ...query }); |
747 | this.exportLoading = false; | 747 | this.exportLoading = false; |
748 | if (data) { | 748 | if (data) { |
749 | let blob = new Blob([data], { | 749 | let blob = new Blob([data], { |
src/views/personal/dataSync/index.vue
@@ -62,7 +62,7 @@ export default { | @@ -62,7 +62,7 @@ export default { | ||
62 | data() { | 62 | data() { |
63 | return { | 63 | return { |
64 | downLoading: false, | 64 | downLoading: false, |
65 | - url: "/api_html/teaching/importData", | 65 | + url: "/api_html/personal/importData", |
66 | file: {}, | 66 | file: {}, |
67 | dialogVisible: false, | 67 | dialogVisible: false, |
68 | tipData: { | 68 | tipData: { |
@@ -76,7 +76,7 @@ export default { | @@ -76,7 +76,7 @@ export default { | ||
76 | async downloadFile() { | 76 | async downloadFile() { |
77 | if (this.downLoading) return; | 77 | if (this.downLoading) return; |
78 | this.downLoading = true; | 78 | this.downLoading = true; |
79 | - const data = await this.$request.exportData(); | 79 | + const data = await this.$request.pExportData(); |
80 | this.downLoading = false; | 80 | this.downLoading = false; |
81 | console.log(data); | 81 | console.log(data); |
82 | if (data) { | 82 | if (data) { |
src/views/personal/examinationPaper/add.vue
@@ -1592,7 +1592,7 @@ export default { | @@ -1592,7 +1592,7 @@ export default { | ||
1592 | return; | 1592 | return; |
1593 | } | 1593 | } |
1594 | //修改测验类型 | 1594 | //修改测验类型 |
1595 | - const { data, status, info } = await this.$request.editPaperType({ | 1595 | + const { data, status, info } = await this.$request.pModifyPaperType({ |
1596 | tagId: obj.id, | 1596 | tagId: obj.id, |
1597 | tag: obj.typeName, | 1597 | tag: obj.typeName, |
1598 | }); | 1598 | }); |
@@ -1606,7 +1606,7 @@ export default { | @@ -1606,7 +1606,7 @@ export default { | ||
1606 | }, | 1606 | }, |
1607 | async removeTypeName(obj) { | 1607 | async removeTypeName(obj) { |
1608 | //删除测验类型 | 1608 | //删除测验类型 |
1609 | - const { data, status, info } = await this.$request.delPaperType({ | 1609 | + const { data, status, info } = await this.$request.pDelPaper({ |
1610 | tagId: obj.id, | 1610 | tagId: obj.id, |
1611 | }); | 1611 | }); |
1612 | if (status == 0) { | 1612 | if (status == 0) { |
@@ -1634,7 +1634,7 @@ export default { | @@ -1634,7 +1634,7 @@ export default { | ||
1634 | return; | 1634 | return; |
1635 | } | 1635 | } |
1636 | //添加测验类型 | 1636 | //添加测验类型 |
1637 | - const { data, status, info } = await this.$request.addPaperType({ | 1637 | + const { data, status, info } = await this.$request.pAddPaperType({ |
1638 | tag: this.answerTypeName, | 1638 | tag: this.answerTypeName, |
1639 | }); | 1639 | }); |
1640 | if (status == 0) { | 1640 | if (status == 0) { |
@@ -1655,7 +1655,7 @@ export default { | @@ -1655,7 +1655,7 @@ export default { | ||
1655 | for (let i = 0; i < formDatas.questionList.length; i++) { | 1655 | for (let i = 0; i < formDatas.questionList.length; i++) { |
1656 | delete formDatas.questionList[i].show; | 1656 | delete formDatas.questionList[i].show; |
1657 | } | 1657 | } |
1658 | - const { data, status, info } = await this.$request.addPaper({ | 1658 | + const { data, status, info } = await this.$request.pAddPaper({ |
1659 | ...formDatas, | 1659 | ...formDatas, |
1660 | }); | 1660 | }); |
1661 | this.saveLoading = false; | 1661 | this.saveLoading = false; |
@@ -1669,7 +1669,7 @@ export default { | @@ -1669,7 +1669,7 @@ export default { | ||
1669 | }, | 1669 | }, |
1670 | async _TypeList() { | 1670 | async _TypeList() { |
1671 | //测验类型查询 | 1671 | //测验类型查询 |
1672 | - const { data, status, info } = await this.$request.fetchTypeNames({ | 1672 | + const { data, status, info } = await this.$request.pPaperTagList({ |
1673 | type: 1, | 1673 | type: 1, |
1674 | }); | 1674 | }); |
1675 | if (status == 0) { | 1675 | if (status == 0) { |
@@ -1690,7 +1690,7 @@ export default { | @@ -1690,7 +1690,7 @@ export default { | ||
1690 | 1690 | ||
1691 | async _QuerySubjectList() { | 1691 | async _QuerySubjectList() { |
1692 | //查询科目列表 | 1692 | //查询科目列表 |
1693 | - const { data, status, info } = await this.$request.fetchSubjectList(); | 1693 | + const { data, status, info } = await this.$request.pSubjectList(); |
1694 | if (status === 0) { | 1694 | if (status === 0) { |
1695 | this.subjectList = | 1695 | this.subjectList = |
1696 | data.subjectNames?.map((item) => { | 1696 | data.subjectNames?.map((item) => { |
@@ -1709,8 +1709,8 @@ export default { | @@ -1709,8 +1709,8 @@ export default { | ||
1709 | } | 1709 | } |
1710 | }, | 1710 | }, |
1711 | async _QueryDetail() { | 1711 | async _QueryDetail() { |
1712 | - //查询年级列表 | ||
1713 | - const { data, status, info } = await this.$request.fetchPaperDetail({ | 1712 | + //查询答题卡详情 |
1713 | + const { data, status, info } = await this.$request.pPaperDetail({ | ||
1714 | paperId: this.$route.query.paperId, | 1714 | paperId: this.$route.query.paperId, |
1715 | }); | 1715 | }); |
1716 | if (status == 0) { | 1716 | if (status == 0) { |
src/views/personal/examinationPaper/detail.vue deleted
1 | -<template> | ||
2 | - <div> | ||
3 | - <back-box> | ||
4 | - <template slot="title"> | ||
5 | - <span>修改答案</span> | ||
6 | - </template> | ||
7 | - </back-box> | ||
8 | - <div class="content"> | ||
9 | - <p class="tips"> | ||
10 | - <i class="fa fa-bell-o"></i> 2022-11-24 14:30张老师修改了答案。 | ||
11 | - </p> | ||
12 | - <div class="answer-title"> | ||
13 | - <p class="name">{{ form.title }}</p> | ||
14 | - <p class="totals">卷面总分:{{ allScore }}分</p> | ||
15 | - </div> | ||
16 | - <div v-for="(question, index) in form.questionList" :key="index"> | ||
17 | - <p class="question-title"> | ||
18 | - <span>{{ setBigNum(index) }}、</span> | ||
19 | - <span class="title-txt">{{ question.questionTitle }}</span> | ||
20 | - <span>共 {{ question.score }} 分</span> | ||
21 | - </p> | ||
22 | - <ul class="questions-ul"> | ||
23 | - <li class="sub-questions"> | ||
24 | - <div class="qs-num">题号</div> | ||
25 | - <div class="qs-type">题型</div> | ||
26 | - <div class="qs-score">分数</div> | ||
27 | - <div class="qs-partScore">部分分值</div> | ||
28 | - <div class="qs-answer">答案</div> | ||
29 | - </li> | ||
30 | - <li | ||
31 | - class="sub-questions" | ||
32 | - v-for="(subQuestions, indexs) in question.subQuestions" | ||
33 | - :key="indexs" | ||
34 | - > | ||
35 | - <div class="qs-num">{{ subQuestions.questionIndex }}</div> | ||
36 | - <div class="qs-type"> | ||
37 | - {{ setSubPro(subQuestions.questionType) }} | ||
38 | - </div> | ||
39 | - <div class="qs-score"> | ||
40 | - {{ subQuestions.score }} | ||
41 | - </div> | ||
42 | - <div class="qs-partScore"> | ||
43 | - {{ subQuestions.partScore }} | ||
44 | - </div> | ||
45 | - <div class="qs-answer"> | ||
46 | - {{ setAns(subQuestions.correctAnswer) }} | ||
47 | - </div> | ||
48 | - </li> | ||
49 | - </ul> | ||
50 | - </div> | ||
51 | - <div class="btn-box"> | ||
52 | - <el-button type="danger" plain round @click="linkBack">取消</el-button> | ||
53 | - <el-button type="primary" round @click="save">保存</el-button> | ||
54 | - </div> | ||
55 | - </div> | ||
56 | - </div> | ||
57 | -</template> | ||
58 | - | ||
59 | -<script> | ||
60 | -export default { | ||
61 | - methods: { | ||
62 | - setSubPro(type) { | ||
63 | - let tit; | ||
64 | - switch (type) { | ||
65 | - case 2: | ||
66 | - tit = "单选题"; | ||
67 | - break; | ||
68 | - case 3: | ||
69 | - tit = "多选题"; | ||
70 | - break; | ||
71 | - case 4: | ||
72 | - tit = "判断题"; | ||
73 | - break; | ||
74 | - case 5: | ||
75 | - tit = "主观题"; | ||
76 | - break; | ||
77 | - } | ||
78 | - return tit; | ||
79 | - }, | ||
80 | - setBigNum(num) { | ||
81 | - let txt = ""; | ||
82 | - let bigNum = [ | ||
83 | - "一", | ||
84 | - "二", | ||
85 | - "三", | ||
86 | - "四", | ||
87 | - "五", | ||
88 | - "六", | ||
89 | - "七", | ||
90 | - "八", | ||
91 | - "九", | ||
92 | - "十", | ||
93 | - "十一", | ||
94 | - "十二", | ||
95 | - "十三", | ||
96 | - "十四", | ||
97 | - "十五", | ||
98 | - "十六", | ||
99 | - "十七", | ||
100 | - "十八", | ||
101 | - "十九", | ||
102 | - "二十", | ||
103 | - ]; | ||
104 | - txt = bigNum[num]; | ||
105 | - | ||
106 | - return txt; | ||
107 | - }, | ||
108 | - setAns(answer) { | ||
109 | - let txt; | ||
110 | - switch (answer) { | ||
111 | - case 1: | ||
112 | - case "1": | ||
113 | - txt = "✓"; | ||
114 | - break; | ||
115 | - case 2: | ||
116 | - case "2": | ||
117 | - txt = "✗"; | ||
118 | - break; | ||
119 | - case "": | ||
120 | - txt = "--"; | ||
121 | - break; | ||
122 | - default: | ||
123 | - txt = answer; | ||
124 | - } | ||
125 | - return txt | ||
126 | - }, | ||
127 | - }, | ||
128 | -}; | ||
129 | -</script> | ||
130 | - | ||
131 | -<style lang="scss" scoped> | ||
132 | -.content { | ||
133 | - width: 100%; | ||
134 | - box-sizing: border-box; | ||
135 | - padding: 0 50px; | ||
136 | - .ml-20 { | ||
137 | - margin-left: 20px; | ||
138 | - } | ||
139 | - .btn-box { | ||
140 | - text-align: right; | ||
141 | - margin-left: 140px; | ||
142 | - } | ||
143 | - .tips { | ||
144 | - height: 48px; | ||
145 | - line-height: 48px; | ||
146 | - padding: 0 16px; | ||
147 | - border: 1px solid #fac7cc; | ||
148 | - background-color: #ffebec; | ||
149 | - font-size: 14px; | ||
150 | - color: #fd9795; | ||
151 | - margin: 10px 0 20px 0; | ||
152 | - .fa-bell-o { | ||
153 | - font-size: 18px; | ||
154 | - margin-right: 5px; | ||
155 | - } | ||
156 | - } | ||
157 | -} | ||
158 | -.answer-title { | ||
159 | - text-align: center; | ||
160 | - font-size: 20px; | ||
161 | - color: #333; | ||
162 | - font-weight: 700; | ||
163 | - padding-bottom: 20px; | ||
164 | - .totals { | ||
165 | - font-size: 16px; | ||
166 | - color: #888; | ||
167 | - font-weight: normal; | ||
168 | - } | ||
169 | -} | ||
170 | -.question-title { | ||
171 | - line-height: 40px; | ||
172 | - .ipt { | ||
173 | - width: 300px; | ||
174 | - margin: 0 16px 0 10px; | ||
175 | - :deep(.el-input__inner) { | ||
176 | - border-radius: 20px; | ||
177 | - border-color: #667ffd; | ||
178 | - background: rgba($color: #667ffd, $alpha: 0.05); | ||
179 | - } | ||
180 | - } | ||
181 | - .delete { | ||
182 | - margin-right: 8px; | ||
183 | - } | ||
184 | - .title-txt { | ||
185 | - margin-right: 20px; | ||
186 | - font-size: 16px; | ||
187 | - font-weight: 700; | ||
188 | - } | ||
189 | -} | ||
190 | -</style> | ||
191 | \ No newline at end of file | 0 | \ No newline at end of file |
src/views/personal/examinationPaper/edit.vue
@@ -758,19 +758,19 @@ export default { | @@ -758,19 +758,19 @@ export default { | ||
758 | //更新答题卡 | 758 | //更新答题卡 |
759 | let modifyPaper, params; | 759 | let modifyPaper, params; |
760 | if (this.type == 1) { | 760 | if (this.type == 1) { |
761 | - modifyPaper = this.$request.modifyPaper; | 761 | + modifyPaper = this.$request.pModifyPaper; |
762 | params = { | 762 | params = { |
763 | paperId: this.$route.query.paperId, | 763 | paperId: this.$route.query.paperId, |
764 | questionList: questionList, | 764 | questionList: questionList, |
765 | }; | 765 | }; |
766 | } else if (this.type == 2) { | 766 | } else if (this.type == 2) { |
767 | - modifyPaper = this.$request.setExamAnswer; | 767 | + modifyPaper = this.$request.pSetExamAnswer; |
768 | params = { | 768 | params = { |
769 | examId: this.$route.query.paperId, | 769 | examId: this.$route.query.paperId, |
770 | questionList: questionList, | 770 | questionList: questionList, |
771 | }; | 771 | }; |
772 | } else { | 772 | } else { |
773 | - modifyPaper = this.$request.setPeriodAnswer; | 773 | + modifyPaper = this.$request.pSetPeriodAnswer; |
774 | params = { | 774 | params = { |
775 | periodId: this.$route.query.paperId, | 775 | periodId: this.$route.query.paperId, |
776 | questionList: questionList, | 776 | questionList: questionList, |
@@ -787,10 +787,10 @@ export default { | @@ -787,10 +787,10 @@ export default { | ||
787 | //查询详情 | 787 | //查询详情 |
788 | let detail = | 788 | let detail = |
789 | this.type == 1 | 789 | this.type == 1 |
790 | - ? this.$request.fetchPaperDetail | 790 | + ? this.$request.pPaperDetail |
791 | : this.type == 2 | 791 | : this.type == 2 |
792 | - ? this.$request.examQuestionList | ||
793 | - : this.$request.periodQuestionList; | 792 | + ? this.$request.pExamQuestionList |
793 | + : this.$request.pPeriodQuestionList; | ||
794 | let params = | 794 | let params = |
795 | this.type == 1 | 795 | this.type == 1 |
796 | ? { paperId: this.$route.query.paperId } | 796 | ? { paperId: this.$route.query.paperId } |
src/views/personal/examinationPaper/index.vue
@@ -217,7 +217,7 @@ export default { | @@ -217,7 +217,7 @@ export default { | ||
217 | }, | 217 | }, |
218 | async recovery(item) { | 218 | async recovery(item) { |
219 | //归档 | 219 | //归档 |
220 | - const { data, status, info } = await this.$request.modifyPaper({ | 220 | + const { data, status, info } = await this.$request.pModifyPaper({ |
221 | paperId: item.id, | 221 | paperId: item.id, |
222 | status: 2, | 222 | status: 2, |
223 | }); | 223 | }); |
@@ -236,7 +236,7 @@ export default { | @@ -236,7 +236,7 @@ export default { | ||
236 | }, | 236 | }, |
237 | // 查找答题卡类型 | 237 | // 查找答题卡类型 |
238 | async _QueryTypeList() { | 238 | async _QueryTypeList() { |
239 | - const { data, status, info } = await this.$request.fetchTypeNames({ | 239 | + const { data, status, info } = await this.$request.pPaperTagList({ |
240 | classId: this.query.classId, | 240 | classId: this.query.classId, |
241 | type: 0, | 241 | type: 0, |
242 | }); | 242 | }); |
@@ -259,7 +259,7 @@ export default { | @@ -259,7 +259,7 @@ export default { | ||
259 | // 查找班级 | 259 | // 查找班级 |
260 | async _QueryClassList() { | 260 | async _QueryClassList() { |
261 | this.loading = true; | 261 | this.loading = true; |
262 | - const { data, status, info } = await this.$request.fetchClassList(); | 262 | + const { data, status, info } = await this.$request.pClassList(); |
263 | console.log(status); | 263 | console.log(status); |
264 | if (status === 0) { | 264 | if (status === 0) { |
265 | if (!!data.list) { | 265 | if (!!data.list) { |
@@ -278,7 +278,7 @@ export default { | @@ -278,7 +278,7 @@ export default { | ||
278 | }, | 278 | }, |
279 | // 查找科目 | 279 | // 查找科目 |
280 | async _QuerySubjectList() { | 280 | async _QuerySubjectList() { |
281 | - const { data, status, info } = await this.$request.fetchSubjectList({ | 281 | + const { data, status, info } = await this.$request.pSubjectList({ |
282 | classId: this.query.classId, | 282 | classId: this.query.classId, |
283 | }); | 283 | }); |
284 | if (status === 0) { | 284 | if (status === 0) { |
@@ -320,7 +320,7 @@ export default { | @@ -320,7 +320,7 @@ export default { | ||
320 | return; | 320 | return; |
321 | } | 321 | } |
322 | this.loading = true; | 322 | this.loading = true; |
323 | - const { data, status, info } = await this.$request.fetchPaperList({ | 323 | + const { data, status, info } = await this.$request.pPaperList({ |
324 | ...query, | 324 | ...query, |
325 | status: 1, | 325 | status: 1, |
326 | page: this.page, | 326 | page: this.page, |
src/views/personal/examinationPaper/recycle.vue
@@ -200,7 +200,7 @@ export default { | @@ -200,7 +200,7 @@ export default { | ||
200 | methods: { | 200 | methods: { |
201 | async modify(obj) { | 201 | async modify(obj) { |
202 | //恢复答题卡 | 202 | //恢复答题卡 |
203 | - const { data, status, info } = await this.$request.modifyPaper({ | 203 | + const { data, status, info } = await this.$request.pModifyPaper({ |
204 | paperId: obj.id, | 204 | paperId: obj.id, |
205 | status: 1, | 205 | status: 1, |
206 | }); | 206 | }); |
@@ -213,7 +213,7 @@ export default { | @@ -213,7 +213,7 @@ export default { | ||
213 | }, | 213 | }, |
214 | async remove(obj) { | 214 | async remove(obj) { |
215 | //删除答题卡 | 215 | //删除答题卡 |
216 | - const { data, status, info } = await this.$request.delPaper({ | 216 | + const { data, status, info } = await this.$request.pDelPaper({ |
217 | paperId: obj.id, | 217 | paperId: obj.id, |
218 | }); | 218 | }); |
219 | if (status == 0) { | 219 | if (status == 0) { |
@@ -250,7 +250,7 @@ export default { | @@ -250,7 +250,7 @@ export default { | ||
250 | query[key] = null; | 250 | query[key] = null; |
251 | } | 251 | } |
252 | } | 252 | } |
253 | - const { data, status, info } = await this.$request.fetchPaperList({ | 253 | + const { data, status, info } = await this.$request.pPaperList({ |
254 | ...query, | 254 | ...query, |
255 | status:2, | 255 | status:2, |
256 | page:this.page, | 256 | page:this.page, |
@@ -266,7 +266,7 @@ export default { | @@ -266,7 +266,7 @@ export default { | ||
266 | }, | 266 | }, |
267 | // 查找班级 | 267 | // 查找班级 |
268 | async _QueryClassList() { | 268 | async _QueryClassList() { |
269 | - const { data, status, info } = await this.$request.fetchClassList(); | 269 | + const { data, status, info } = await this.$request.pClassList(); |
270 | console.log(status); | 270 | console.log(status); |
271 | if (status === 0) { | 271 | if (status === 0) { |
272 | if (!!data.list) { | 272 | if (!!data.list) { |
@@ -284,7 +284,7 @@ export default { | @@ -284,7 +284,7 @@ export default { | ||
284 | }, | 284 | }, |
285 | // 查找科目 | 285 | // 查找科目 |
286 | async _QuerySubjectList() { | 286 | async _QuerySubjectList() { |
287 | - const { data, status, info } = await this.$request.fetchSubjectList({ | 287 | + const { data, status, info } = await this.$request.pSubjectList({ |
288 | classId: this.query.classId, | 288 | classId: this.query.classId, |
289 | }); | 289 | }); |
290 | if (status === 0) { | 290 | if (status === 0) { |
@@ -301,7 +301,7 @@ export default { | @@ -301,7 +301,7 @@ export default { | ||
301 | }, | 301 | }, |
302 | // 查找答题卡类型 | 302 | // 查找答题卡类型 |
303 | async _QueryTypeList() { | 303 | async _QueryTypeList() { |
304 | - const { data, status, info } = await this.$request.fetchTypeNames({ | 304 | + const { data, status, info } = await this.$request.pPaperTagList({ |
305 | classId: this.query.classId, | 305 | classId: this.query.classId, |
306 | tyle:0 | 306 | tyle:0 |
307 | }); | 307 | }); |
src/views/personal/portrait/detail.vue
@@ -307,7 +307,7 @@ export default { | @@ -307,7 +307,7 @@ export default { | ||
307 | } | 307 | } |
308 | }, | 308 | }, |
309 | async _QuerySubjectList() { | 309 | async _QuerySubjectList() { |
310 | - const { data, status, info } = await this.$request.tSubjectList({ | 310 | + const { data, status, info } = await this.$request.pSubjectList({ |
311 | classId: this.classId, | 311 | classId: this.classId, |
312 | }); | 312 | }); |
313 | if (status === 0) { | 313 | if (status === 0) { |
src/views/personal/portrait/index.vue
@@ -224,7 +224,7 @@ export default { | @@ -224,7 +224,7 @@ export default { | ||
224 | } | 224 | } |
225 | }, | 225 | }, |
226 | async _QueryClassList() { | 226 | async _QueryClassList() { |
227 | - const { data, status, info } = await this.$request.tClassList(); | 227 | + const { data, status, info } = await this.$request.pClassList(); |
228 | if (status === 0) { | 228 | if (status === 0) { |
229 | this.classList = data.list.map((item) => { | 229 | this.classList = data.list.map((item) => { |
230 | return { | 230 | return { |
@@ -246,7 +246,7 @@ export default { | @@ -246,7 +246,7 @@ export default { | ||
246 | } | 246 | } |
247 | } | 247 | } |
248 | return; | 248 | return; |
249 | - const { data, status, info } = await this.$request.studentList({ | 249 | + const { data, status, info } = await this.$request.pStudentList({ |
250 | ...query, | 250 | ...query, |
251 | page: this.page, | 251 | page: this.page, |
252 | size: this.size, | 252 | size: this.size, |
src/views/personal/setUp/student.vue
@@ -322,7 +322,7 @@ export default { | @@ -322,7 +322,7 @@ export default { | ||
322 | this.loadingDown = false; | 322 | this.loadingDown = false; |
323 | if (status == 0) { | 323 | if (status == 0) { |
324 | getBlob(data.downloadUrl).then((res) => { | 324 | getBlob(data.downloadUrl).then((res) => { |
325 | - downloadFile("学生答题器绑定模板", res); | 325 | + downloadFile("学生模板", res); |
326 | }); | 326 | }); |
327 | } else { | 327 | } else { |
328 | this.$message.error(info); | 328 | this.$message.error(info); |
src/views/personal/test/analysis.vue
@@ -535,7 +535,7 @@ export default { | @@ -535,7 +535,7 @@ export default { | ||
535 | this.examQuestionReport(); | 535 | this.examQuestionReport(); |
536 | }, | 536 | }, |
537 | async downExcel() { | 537 | async downExcel() { |
538 | - let data = await this.$request.subjectiveScoreTemplate({ | 538 | + let data = await this.$request.pSubjectiveScoreTemplate({ |
539 | examId: this.id, | 539 | examId: this.id, |
540 | }); | 540 | }); |
541 | if (data && !data.code) { | 541 | if (data && !data.code) { |
@@ -555,7 +555,7 @@ export default { | @@ -555,7 +555,7 @@ export default { | ||
555 | async examDetail() { | 555 | async examDetail() { |
556 | //详情 | 556 | //详情 |
557 | this.loading = true; | 557 | this.loading = true; |
558 | - let { data, info, status } = await this.$request.examDetail({ | 558 | + let { data, info, status } = await this.$request.pExamDetail({ |
559 | examId: this.id, | 559 | examId: this.id, |
560 | }); | 560 | }); |
561 | this.loading = false; | 561 | this.loading = false; |
@@ -571,7 +571,7 @@ export default { | @@ -571,7 +571,7 @@ export default { | ||
571 | async _ReScore() { | 571 | async _ReScore() { |
572 | //重新记分 | 572 | //重新记分 |
573 | this.loading = true; | 573 | this.loading = true; |
574 | - let { data, info, status } = await this.$request.reScore({ | 574 | + let { data, info, status } = await this.$request.pReScore({ |
575 | examId: this.id, | 575 | examId: this.id, |
576 | }); | 576 | }); |
577 | this.loading = false; | 577 | this.loading = false; |
@@ -587,7 +587,7 @@ export default { | @@ -587,7 +587,7 @@ export default { | ||
587 | async examStudentReport() { | 587 | async examStudentReport() { |
588 | //成绩排名-小题分-作答明细 | 588 | //成绩排名-小题分-作答明细 |
589 | this.loading = true; | 589 | this.loading = true; |
590 | - let { data, info, status } = await this.$request.examStudentReport({ | 590 | + let { data, info, status } = await this.$request.pExamStudentReport({ |
591 | examId: this.id, | 591 | examId: this.id, |
592 | }); | 592 | }); |
593 | this.loading = false; | 593 | this.loading = false; |
@@ -626,7 +626,7 @@ export default { | @@ -626,7 +626,7 @@ export default { | ||
626 | async examQuestionReport() { | 626 | async examQuestionReport() { |
627 | //试题分析 | 627 | //试题分析 |
628 | this.loading = true; | 628 | this.loading = true; |
629 | - let { data, info, status } = await this.$request.examQuestionReport({ | 629 | + let { data, info, status } = await this.$request.pExamQuestionReport({ |
630 | examId: this.id, | 630 | examId: this.id, |
631 | page: this.page, | 631 | page: this.page, |
632 | // size: this.size, | 632 | // size: this.size, |
@@ -690,7 +690,7 @@ export default { | @@ -690,7 +690,7 @@ export default { | ||
690 | async exportData() { | 690 | async exportData() { |
691 | if (this.exportLoading == true) return; | 691 | if (this.exportLoading == true) return; |
692 | this.exportLoading = true; | 692 | this.exportLoading = true; |
693 | - const data = await this.$request.exportExamReport({ | 693 | + const data = await this.$request.pExportExamReport({ |
694 | examId: this.id, | 694 | examId: this.id, |
695 | }); | 695 | }); |
696 | this.exportLoading = false; | 696 | this.exportLoading = false; |
src/views/personal/test/index.vue
@@ -625,7 +625,7 @@ export default { | @@ -625,7 +625,7 @@ export default { | ||
625 | }, | 625 | }, |
626 | async downExcel() { | 626 | async downExcel() { |
627 | this.loadingDown = true; | 627 | this.loadingDown = true; |
628 | - let data = await this.$request.subjectiveScoreTemplate({ | 628 | + let data = await this.$request.pSubjectiveScoreTemplate({ |
629 | examId: this.examId, | 629 | examId: this.examId, |
630 | }); | 630 | }); |
631 | this.loadingDown = false; | 631 | this.loadingDown = false; |
@@ -644,7 +644,7 @@ export default { | @@ -644,7 +644,7 @@ export default { | ||
644 | await this._QueryData(); | 644 | await this._QueryData(); |
645 | }, | 645 | }, |
646 | async _QueryClassList() { | 646 | async _QueryClassList() { |
647 | - const { data, status, info } = await this.$request.tClassList(); | 647 | + const { data, status, info } = await this.$request.pClassList(); |
648 | if (status === 0) { | 648 | if (status === 0) { |
649 | this.classList = data.list.map((item) => { | 649 | this.classList = data.list.map((item) => { |
650 | return { | 650 | return { |
@@ -658,7 +658,7 @@ export default { | @@ -658,7 +658,7 @@ export default { | ||
658 | } | 658 | } |
659 | }, | 659 | }, |
660 | async _QuerySubjectList() { | 660 | async _QuerySubjectList() { |
661 | - const { data, status, info } = await this.$request.tSubjectList({ | 661 | + const { data, status, info } = await this.$request.pSubjectList({ |
662 | classId: this.query.classId, | 662 | classId: this.query.classId, |
663 | }); | 663 | }); |
664 | if (status === 0) { | 664 | if (status === 0) { |
@@ -711,7 +711,7 @@ export default { | @@ -711,7 +711,7 @@ export default { | ||
711 | this.$message.warning("请选择科目"); | 711 | this.$message.warning("请选择科目"); |
712 | return; | 712 | return; |
713 | } | 713 | } |
714 | - const { data, status, info } = await this.$request.examReportList({ | 714 | + const { data, status, info } = await this.$request.pExamReportList({ |
715 | ...query, | 715 | ...query, |
716 | page: this.page, | 716 | page: this.page, |
717 | size: this.size, | 717 | size: this.size, |
@@ -748,7 +748,7 @@ export default { | @@ -748,7 +748,7 @@ export default { | ||
748 | query["subjectName"] = "政治"; | 748 | query["subjectName"] = "政治"; |
749 | delete query["subjectNames"]; | 749 | delete query["subjectNames"]; |
750 | // end | 750 | // end |
751 | - const { data, status, info } = await this.$request.phaseExamReport({ | 751 | + const { data, status, info } = await this.$request.pPhaseExamReport({ |
752 | ...query, | 752 | ...query, |
753 | }); | 753 | }); |
754 | this.loading = false; | 754 | this.loading = false; |
@@ -799,7 +799,7 @@ export default { | @@ -799,7 +799,7 @@ export default { | ||
799 | this.$message.warning("请选择科目"); | 799 | this.$message.warning("请选择科目"); |
800 | return; | 800 | return; |
801 | } | 801 | } |
802 | - const data = await this.$request.exportPhaseExamReport({ ...query }); | 802 | + const data = await this.$request.pExportPhaseExamReport({ ...query }); |
803 | this.exportLoading = false; | 803 | this.exportLoading = false; |
804 | if (data) { | 804 | if (data) { |
805 | let blob = new Blob([data], { | 805 | let blob = new Blob([data], { |
src/views/standard/analysis/index.vue
@@ -172,9 +172,7 @@ export default { | @@ -172,9 +172,7 @@ export default { | ||
172 | }; | 172 | }; |
173 | }, | 173 | }, |
174 | created() { | 174 | created() { |
175 | - this.role = this.$store.getters.info.permissions.find( | ||
176 | - (item) => item.roleName == this.$store.getters.info.showRoleName | ||
177 | - )?.role; | 175 | + this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role; |
178 | this._QueryGradeList(); | 176 | this._QueryGradeList(); |
179 | this.setDate(1); | 177 | this.setDate(1); |
180 | let startDay = this.query?.startDay; | 178 | let startDay = this.query?.startDay; |
src/views/standard/ask/index.vue
@@ -506,9 +506,7 @@ export default { | @@ -506,9 +506,7 @@ export default { | ||
506 | }; | 506 | }; |
507 | }, | 507 | }, |
508 | async created() { | 508 | async created() { |
509 | - this.role = this.$store.getters.info.permissions.find( | ||
510 | - (item) => item.roleName == this.$store.getters.info.showRoleName | ||
511 | - )?.role; | 509 | + this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role; |
512 | this.query.subjectNames = this.role == "ROLE_BANZHUREN" ? [] : ""; | 510 | this.query.subjectNames = this.role == "ROLE_BANZHUREN" ? [] : ""; |
513 | await this._QueryClassList(); | 511 | await this._QueryClassList(); |
514 | await this._QuerySubjectList(); | 512 | await this._QuerySubjectList(); |
src/views/standard/device/index.vue
@@ -585,13 +585,7 @@ export default { | @@ -585,13 +585,7 @@ export default { | ||
585 | }, | 585 | }, |
586 | created() { | 586 | created() { |
587 | this.code = localStorage.getItem("csCode") || ""; | 587 | this.code = localStorage.getItem("csCode") || ""; |
588 | - let role = ""; | ||
589 | - this.$store.getters.info.permissions.map((item) => { | ||
590 | - if (item.roleName == this.$store.getters.info.showRoleName) { | ||
591 | - role = item.role; | ||
592 | - } | ||
593 | - }); | ||
594 | - this.role = role ? role : this.$store.getters.info.permissions[0].role; | 588 | + this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role; |
595 | if (this.role == "ROLE_JITUAN") { | 589 | if (this.role == "ROLE_JITUAN") { |
596 | (this.props.lazy = true), | 590 | (this.props.lazy = true), |
597 | (this.props.lazyLoad = function (node, resolve) { | 591 | (this.props.lazyLoad = function (node, resolve) { |
src/views/standard/examinationPaper/add.vue
@@ -1699,7 +1699,7 @@ export default { | @@ -1699,7 +1699,7 @@ export default { | ||
1699 | } | 1699 | } |
1700 | }, | 1700 | }, |
1701 | async _QueryDetail() { | 1701 | async _QueryDetail() { |
1702 | - //查询年级列表 | 1702 | + //查询答题卡详情 |
1703 | const { data, status, info } = await this.$request.fetchPaperDetail({ | 1703 | const { data, status, info } = await this.$request.fetchPaperDetail({ |
1704 | paperId: this.$route.query.paperId, | 1704 | paperId: this.$route.query.paperId, |
1705 | }); | 1705 | }); |
src/views/standard/setUp/account.vue
@@ -429,13 +429,7 @@ export default { | @@ -429,13 +429,7 @@ export default { | ||
429 | }, | 429 | }, |
430 | created() { | 430 | created() { |
431 | this.code = localStorage.getItem("csCode") || ""; | 431 | this.code = localStorage.getItem("csCode") || ""; |
432 | - let role = ""; | ||
433 | - this.$store.getters.info.permissions.map((item) => { | ||
434 | - if (item.roleName == this.$store.getters.info.showRoleName) { | ||
435 | - role = item.role; | ||
436 | - } | ||
437 | - }); | ||
438 | - this.role = role ? role : this.$store.getters.info.permissions[0].role; | 432 | + this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role; |
439 | if (this.role == "ROLE_JITUAN") { | 433 | if (this.role == "ROLE_JITUAN") { |
440 | this._TenantRoleList(); | 434 | this._TenantRoleList(); |
441 | this._RegionList(); | 435 | this._RegionList(); |
src/views/standard/setUp/student.vue
@@ -288,13 +288,7 @@ export default { | @@ -288,13 +288,7 @@ export default { | ||
288 | }, | 288 | }, |
289 | async created() { | 289 | async created() { |
290 | this.code = localStorage.getItem("csCode") || ""; | 290 | this.code = localStorage.getItem("csCode") || ""; |
291 | - let role = ""; | ||
292 | - this.$store.getters.info.permissions.map((item) => { | ||
293 | - if (item.roleName == this.$store.getters.info.showRoleName) { | ||
294 | - role = item.role; | ||
295 | - } | ||
296 | - }); | ||
297 | - this.role = role ? role : this.$store.getters.info.permissions[0].role; | 291 | + this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role; |
298 | await this._QueryDataGrade(); | 292 | await this._QueryDataGrade(); |
299 | await this._QueryClass(); | 293 | await this._QueryClass(); |
300 | this._QueryData(3); | 294 | this._QueryData(3); |
src/views/standard/test/index.vue
@@ -506,9 +506,7 @@ export default { | @@ -506,9 +506,7 @@ export default { | ||
506 | }; | 506 | }; |
507 | }, | 507 | }, |
508 | async created() { | 508 | async created() { |
509 | - this.role = this.$store.getters.info.permissions.find( | ||
510 | - (item) => item.roleName == this.$store.getters.info.showRoleName | ||
511 | - )?.role; | 509 | + this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role; |
512 | await this._QueryClassList(); | 510 | await this._QueryClassList(); |
513 | await this._QuerySubjectList(); | 511 | await this._QuerySubjectList(); |
514 | await this.setDate(1); | 512 | await this.setDate(1); |