Browse Source

创建分支提交最新代码

TheLittlePrince 6 years ago
parent
commit
1abcc62002
100 changed files with 30 additions and 9 deletions
  1. 1 0
      index.html
  2. 4 3
      package.json
  3. 4 4
      src/ImgConfig/index.js
  4. 7 1
      src/api/index.js
  5. 14 1
      src/api/scheduling.js
  6. BIN
      src/assets/img/CodeLogin (1).png
  7. BIN
      src/assets/img/CodeLogin (2).png
  8. BIN
      src/assets/img/CodeLogin (3).png
  9. BIN
      src/assets/img/correct_true@2x.png
  10. BIN
      src/assets/img/drop.png
  11. BIN
      src/assets/img/englist_1.png
  12. BIN
      src/assets/img/englist_10.png
  13. BIN
      src/assets/img/englist_11.png
  14. BIN
      src/assets/img/englist_12.png
  15. BIN
      src/assets/img/englist_13.png
  16. BIN
      src/assets/img/englist_14.png
  17. BIN
      src/assets/img/englist_15.png
  18. BIN
      src/assets/img/englist_16.png
  19. BIN
      src/assets/img/englist_17.png
  20. BIN
      src/assets/img/englist_18.png
  21. BIN
      src/assets/img/englist_19.png
  22. BIN
      src/assets/img/englist_2.png
  23. BIN
      src/assets/img/englist_20.png
  24. BIN
      src/assets/img/englist_3.png
  25. BIN
      src/assets/img/englist_30.png
  26. BIN
      src/assets/img/englist_31.png
  27. BIN
      src/assets/img/englist_32.png
  28. BIN
      src/assets/img/englist_33.png
  29. BIN
      src/assets/img/englist_34.png
  30. BIN
      src/assets/img/englist_35.png
  31. BIN
      src/assets/img/englist_36.png
  32. BIN
      src/assets/img/englist_37.png
  33. BIN
      src/assets/img/englist_38.png
  34. BIN
      src/assets/img/englist_39.png
  35. BIN
      src/assets/img/englist_4.png
  36. BIN
      src/assets/img/englist_40.png
  37. BIN
      src/assets/img/englist_5.png
  38. BIN
      src/assets/img/englist_50.png
  39. BIN
      src/assets/img/englist_51.png
  40. BIN
      src/assets/img/englist_52.png
  41. BIN
      src/assets/img/englist_53.png
  42. BIN
      src/assets/img/englist_54.png
  43. BIN
      src/assets/img/englist_55.png
  44. BIN
      src/assets/img/englist_56.png
  45. BIN
      src/assets/img/englist_57.png
  46. BIN
      src/assets/img/englist_58.png
  47. BIN
      src/assets/img/englist_59.png
  48. BIN
      src/assets/img/englist_6.png
  49. BIN
      src/assets/img/englist_60.png
  50. BIN
      src/assets/img/englist_7.png
  51. BIN
      src/assets/img/englist_header.png
  52. BIN
      src/assets/img/ercode (1).png
  53. BIN
      src/assets/img/ercode (2).png
  54. BIN
      src/assets/img/ercode (3).png
  55. BIN
      src/assets/img/girl_selected.png
  56. BIN
      src/assets/img/icon_1.png
  57. BIN
      src/assets/img/icon_10.png
  58. BIN
      src/assets/img/icon_11.png
  59. BIN
      src/assets/img/icon_12.png
  60. BIN
      src/assets/img/icon_13.png
  61. BIN
      src/assets/img/icon_14.png
  62. BIN
      src/assets/img/icon_15.png
  63. BIN
      src/assets/img/icon_2.png
  64. BIN
      src/assets/img/icon_3.png
  65. BIN
      src/assets/img/icon_4.png
  66. BIN
      src/assets/img/icon_5.png
  67. BIN
      src/assets/img/icon_6.png
  68. BIN
      src/assets/img/icon_7.png
  69. BIN
      src/assets/img/icon_8.png
  70. BIN
      src/assets/img/icon_9.png
  71. BIN
      src/assets/img/logbc (2).png
  72. BIN
      src/assets/img/logbc.png
  73. BIN
      src/assets/img/logo2.png
  74. BIN
      src/assets/img/logoland (2).png
  75. BIN
      src/assets/img/logoland.png
  76. BIN
      src/assets/img/math_1.png
  77. BIN
      src/assets/img/math_10.png
  78. BIN
      src/assets/img/math_11.png
  79. BIN
      src/assets/img/math_12.png
  80. BIN
      src/assets/img/math_13.png
  81. BIN
      src/assets/img/math_14.png
  82. BIN
      src/assets/img/math_15.png
  83. BIN
      src/assets/img/math_16.png
  84. BIN
      src/assets/img/math_17.png
  85. BIN
      src/assets/img/math_18.png
  86. BIN
      src/assets/img/math_19.png
  87. BIN
      src/assets/img/math_2.png
  88. BIN
      src/assets/img/math_21.png
  89. BIN
      src/assets/img/math_22.png
  90. BIN
      src/assets/img/math_23.png
  91. BIN
      src/assets/img/math_24.png
  92. BIN
      src/assets/img/math_25.png
  93. BIN
      src/assets/img/math_26.png
  94. BIN
      src/assets/img/math_27.png
  95. BIN
      src/assets/img/math_28.png
  96. BIN
      src/assets/img/math_29.png
  97. BIN
      src/assets/img/math_3.png
  98. BIN
      src/assets/img/math_30.png
  99. BIN
      src/assets/img/math_4.png
  100. 0 0
      src/assets/img/math_41.png

+ 1 - 0
index.html

@@ -9,6 +9,7 @@
   <!-- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />  -->
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" href="static/favicon.ico">
   <script>
     window.onload = function () {
       // js增加svg的outerHTML

+ 4 - 3
package.json

@@ -55,7 +55,7 @@
     "connect-history-api-fallback": "^1.3.0",
     "copy-webpack-plugin": "^4.0.1",
     "cross-spawn": "^5.0.1",
-    "css-loader": "^0.28.0",
+    "css-loader": "^0.28.11",
     "css-mqpacker": "^7.0.0",
     "cssnano": "^4.1.10",
     "eslint": "^3.19.0",
@@ -87,8 +87,9 @@
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.2",
     "url-loader": "^0.5.8",
-    "vue-loader": "^13.0.4",
-    "vue-style-loader": "^3.0.1",
+    "vue-html-loader": "^1.2.4",
+    "vue-loader": "^13.7.3",
+    "vue-style-loader": "^3.1.2",
     "vue-template-compiler": "^2.4.2",
     "webpack": "^2.6.1",
     "webpack-bundle-analyzer": "^2.2.1",

+ 4 - 4
src/ImgConfig/index.js

@@ -4,11 +4,11 @@ if (process.env.NODE_ENV === 'development') {
     IMG_BASE_URL = 'https://xtimg.sharingschool.com/' //测试环境图片地址
     APPOR_BASE_URL = 'https://xtkmt.sharingschool.com/kmt/index.html#/' //测试环境作业批改地址
 } else {
-    IMG_BASE_URL = 'https://img.sharingschool.com'; //正式环境图片地址;
-    // IMG_BASE_URL = 'https://xtimg.sharingschool.com' //实习,测试环境图片地址;
+    // IMG_BASE_URL = 'https://img.sharingschool.com'; //正式环境图片地址;
+    IMG_BASE_URL = 'https://xtimg.sharingschool.com' //实习,测试环境图片地址;
 
-    // APPOR_BASE_URL = 'https://xtkmt.sharingschool.com/kmt/index.html#/' //测试环境作业批改地址
-    APPOR_BASE_URL = 'https://kmt.sharingschool.com/aijia/kmt/index.html#/'; //正式环境作业批改地址地址;
+    APPOR_BASE_URL = 'https://xtkmt.sharingschool.com/kmt/index.html#/' //测试环境作业批改地址
+    // APPOR_BASE_URL = 'https://kmt.sharingschool.com/aijia/kmt/index.html#/'; //正式环境作业批改地址地址;
     // APPOR_BASE_URL = 'https://aikmt.sharingschool.com/kmt/index.html#/'; //oss正式环境作业批改地址地址;
     // APPOR_BASE_URL = 'http://sxkmt.sharingschool.com/kmt/index.html#/' //实习环境作业批改地址
 }

+ 7 - 1
src/api/index.js

@@ -6,6 +6,10 @@ const urlFn = v => BASE_URL + v
 const GET_TOKEN = urlFn('/api/kmt/login/wxlogin/newscanlogin')
 // Uniconid登录
 const GET_UUIONID_TOKEN = urlFn('/api/kmt/login/unionidlogin')
+// 手机号验证吗登陆
+const GET_PHONE_TOKEN = urlFn('/api/kmt/login/phoneLogin')
+// 获取手机验证码
+const GET_VERIFICATION_CODE = urlFn('/api/kmt/login/getVerificationCode')
 // 获取用户信息
 const GetInfo = urlFn('/api/kmt/correctSys/getMyInfo')
 // 校区群管理员数据监控
@@ -73,6 +77,8 @@ const UnmatchHomeworkList = urlFn('/api/kmt/correctSys/unmatchHomeworkList')
 export {
     GET_TOKEN,
     GET_UUIONID_TOKEN,
+    GET_VERIFICATION_CODE,
+    GET_PHONE_TOKEN,
     GetInfo,
     InfoWatch,
     InfoWatchDay,
@@ -104,5 +110,5 @@ export {
     MonitorKnowTeacherList,
     MonitorKnowTeacherOneDayList,
     MonitorKnowTeacherOneMonthList,
-    UnmatchHomeworkList
+    UnmatchHomeworkList,
 }

+ 14 - 1
src/api/scheduling.js

@@ -19,6 +19,14 @@ const TeacherThisMonthDutyList = urlFn('/api/kmt/arrange/teacherThisMonthDutyLis
 const SaveSysTeacherDuty = urlFn('/api/kmt/arrange/saveSysTeacherDuty')
 // 排班设置接口
 const DutyTemplateList = urlFn('/api/kmt/arrange/dutyTemplateList')
+//校区群管理员列表(质检员角色查看)
+const GetManagerListForChecker = urlFn('/api/kmt/correctSys/getManagerListForChecker')
+//校区群管理员列表(质检员角色查看)老师列表
+const TeacherListForChecker = urlFn('/api/kmt/correctSys/teacherListForChecker')
+//校区群管理员列表(质检员角色查看)查看老师批改完的作业列表
+const TeacherHomeworkListForChecker = urlFn('/api/kmt/correctSys/teacherHomeworkListForChecker')
+const FindArrangeTemplateIntervalList = urlFn('/api/kmt/arrange/findArrangeTemplateIntervalList')
+//
 export {
     FindCalendarList,
     FindHaveTeacherList,
@@ -28,5 +36,10 @@ export {
     FindTeamTeacherList,
     TeacherThisMonthDutyList,
     SaveSysTeacherDuty,
-    DutyTemplateList
+    DutyTemplateList,
+    GetManagerListForChecker,
+    TeacherListForChecker,
+    TeacherHomeworkListForChecker,
+    FindArrangeTemplateIntervalList
+
 }

BIN
src/assets/img/CodeLogin (1).png


BIN
src/assets/img/CodeLogin (2).png


BIN
src/assets/img/CodeLogin (3).png


BIN
src/assets/img/correct_true@2x.png


BIN
src/assets/img/drop.png


BIN
src/assets/img/englist_1.png


BIN
src/assets/img/englist_10.png


BIN
src/assets/img/englist_11.png


BIN
src/assets/img/englist_12.png


BIN
src/assets/img/englist_13.png


BIN
src/assets/img/englist_14.png


BIN
src/assets/img/englist_15.png


BIN
src/assets/img/englist_16.png


BIN
src/assets/img/englist_17.png


BIN
src/assets/img/englist_18.png


BIN
src/assets/img/englist_19.png


BIN
src/assets/img/englist_2.png


BIN
src/assets/img/englist_20.png


BIN
src/assets/img/englist_3.png


BIN
src/assets/img/englist_30.png


BIN
src/assets/img/englist_31.png


BIN
src/assets/img/englist_32.png


BIN
src/assets/img/englist_33.png


BIN
src/assets/img/englist_34.png


BIN
src/assets/img/englist_35.png


BIN
src/assets/img/englist_36.png


BIN
src/assets/img/englist_37.png


BIN
src/assets/img/englist_38.png


BIN
src/assets/img/englist_39.png


BIN
src/assets/img/englist_4.png


BIN
src/assets/img/englist_40.png


BIN
src/assets/img/englist_5.png


BIN
src/assets/img/englist_50.png


BIN
src/assets/img/englist_51.png


BIN
src/assets/img/englist_52.png


BIN
src/assets/img/englist_53.png


BIN
src/assets/img/englist_54.png


BIN
src/assets/img/englist_55.png


BIN
src/assets/img/englist_56.png


BIN
src/assets/img/englist_57.png


BIN
src/assets/img/englist_58.png


BIN
src/assets/img/englist_59.png


BIN
src/assets/img/englist_6.png


BIN
src/assets/img/englist_60.png


BIN
src/assets/img/englist_7.png


BIN
src/assets/img/englist_header.png


BIN
src/assets/img/ercode (1).png


BIN
src/assets/img/ercode (2).png


BIN
src/assets/img/ercode (3).png


BIN
src/assets/img/girl_selected.png


BIN
src/assets/img/icon_1.png


BIN
src/assets/img/icon_10.png


BIN
src/assets/img/icon_11.png


BIN
src/assets/img/icon_12.png


BIN
src/assets/img/icon_13.png


BIN
src/assets/img/icon_14.png


BIN
src/assets/img/icon_15.png


BIN
src/assets/img/icon_2.png


BIN
src/assets/img/icon_3.png


BIN
src/assets/img/icon_4.png


BIN
src/assets/img/icon_5.png


BIN
src/assets/img/icon_6.png


BIN
src/assets/img/icon_7.png


BIN
src/assets/img/icon_8.png


BIN
src/assets/img/icon_9.png


BIN
src/assets/img/logbc (2).png


BIN
src/assets/img/logbc.png


BIN
src/assets/img/logo2.png


BIN
src/assets/img/logoland (2).png


BIN
src/assets/img/logoland.png


BIN
src/assets/img/math_1.png


BIN
src/assets/img/math_10.png


BIN
src/assets/img/math_11.png


BIN
src/assets/img/math_12.png


BIN
src/assets/img/math_13.png


BIN
src/assets/img/math_14.png


BIN
src/assets/img/math_15.png


BIN
src/assets/img/math_16.png


BIN
src/assets/img/math_17.png


BIN
src/assets/img/math_18.png


BIN
src/assets/img/math_19.png


BIN
src/assets/img/math_2.png


BIN
src/assets/img/math_21.png


BIN
src/assets/img/math_22.png


BIN
src/assets/img/math_23.png


BIN
src/assets/img/math_24.png


BIN
src/assets/img/math_25.png


BIN
src/assets/img/math_26.png


BIN
src/assets/img/math_27.png


BIN
src/assets/img/math_28.png


BIN
src/assets/img/math_29.png


BIN
src/assets/img/math_3.png


BIN
src/assets/img/math_30.png


BIN
src/assets/img/math_4.png


+ 0 - 0
src/assets/img/math_41.png


Some files were not shown because too many files changed in this diff