Home Explore Help
Sign In
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

lsc 2 weeks ago
parent
35014a276e 9332181279
commit
6887036677
21 changed files with 85 additions and 36 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.23fe87cb6a5987dc6626ea70c761cdab.css
  3. 0 0
      dist/static/css/app.23fe87cb6a5987dc6626ea70c761cdab.css.map
  4. 0 0
      dist/static/css/workPage.e4f995b0ca977279f09ecbe9e3504805.css
  5. 0 0
      dist/static/css/workPage.e4f995b0ca977279f09ecbe9e3504805.css.map
  6. 0 0
      dist/static/js/app.f6b118c3004cb4fe9b9c.js
  7. 0 0
      dist/static/js/app.f6b118c3004cb4fe9b9c.js.map
  8. 0 0
      dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map
  9. 0 0
      dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map
  10. 0 0
      dist/static/js/workPage.546692eb5acca5c2bbba.js
  11. 0 0
      dist/static/js/workPage.546692eb5acca5c2bbba.js.map
  12. 0 0
      dist/static/js/workPage.8a411b5a48dbe367f835.js
  13. 0 0
      dist/static/js/workPage.8a411b5a48dbe367f835.js.map
  14. 1 1
      dist/workPage.html
  15. 63 18
      src/components/pages/studentManageNew/component/addstu.vue
  16. 5 5
      src/components/pages/studentManageNew/component/table.vue
  17. 1 1
      src/components/pages/studentManageNew/index.vue
  18. 2 1
      src/components/pages/workPage/components/choiceQuestion.vue
  19. 3 2
      src/lang/cn.json
  20. 5 3
      src/lang/en.json
  21. 4 4
      src/lang/hk.json

+ 1 - 1
dist/index.html
View File 

@@ -37,7 +37,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.1bbd32fda653c17f5129326eebd62bef.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.714ff2bfc93f2f096b79.js></script><script type=text/javascript src=./static/js/app.a1769b4543c324b69287.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.23fe87cb6a5987dc6626ea70c761cdab.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.714ff2bfc93f2f096b79.js></script><script type=text/javascript src=./static/js/app.f6b118c3004cb4fe9b9c.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.23fe87cb6a5987dc6626ea70c761cdab.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.23fe87cb6a5987dc6626ea70c761cdab.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/workPage.e4f995b0ca977279f09ecbe9e3504805.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/workPage.e4f995b0ca977279f09ecbe9e3504805.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.f6b118c3004cb4fe9b9c.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.f6b118c3004cb4fe9b9c.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/workPage.546692eb5acca5c2bbba.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/workPage.546692eb5acca5c2bbba.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/workPage.8a411b5a48dbe367f835.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/workPage.8a411b5a48dbe367f835.js.map


+ 1 - 1
dist/workPage.html
View File 

@@ -1,4 +1,4 @@
 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>工作页面 - CocoFlow</title><link rel=icon href=../static/logo.ico><link href=./static/css/workPage.55d056a84d889305d0062550f70d674d.css rel=stylesheet></head><body><noscript><strong>We're sorry but this app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script type=text/javascript src=./static/js/workPage-manifest.2ece51fa34be51c8610a.js></script><script type=text/javascript src=./static/js/workPage-vendor.7b2c55096449c94cc8fd.js></script><script type=text/javascript src=./static/js/workPage.8a411b5a48dbe367f835.js></script></body></html><script>function stopSafari() {
 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>工作页面 - CocoFlow</title><link rel=icon href=../static/logo.ico><link href=./static/css/workPage.e4f995b0ca977279f09ecbe9e3504805.css rel=stylesheet></head><body><noscript><strong>We're sorry but this app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script type=text/javascript src=./static/js/workPage-manifest.2ece51fa34be51c8610a.js></script><script type=text/javascript src=./static/js/workPage-vendor.7b2c55096449c94cc8fd.js></script><script type=text/javascript src=./static/js/workPage.546692eb5acca5c2bbba.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

+ 63 - 18
src/components/pages/studentManageNew/component/addstu.vue
View File 

@@ -169,9 +169,12 @@
 
                 >{{ lang.ssDownloadTemp }}</span
 
               >
 
             </div>
 
-            <div style="margin-top: 10px">
 
+            <div v-if="boxType == 0" style="margin-top: 10px">
 
               {{ lang.ssUploadNote }}
 
             </div>
 
+            <div v-else style="margin-top: 10px">
 
+              {{ lang.ssSyncImportClassInfo }}
 
+            </div>
 
             <!-- <div style="margin-top: 10px">
 
               学生列表批量上传需表格需添加“班级”列
 
             </div> -->
 
@@ -433,7 +436,7 @@ export default {
 
         var wb; //读取完成的数据
 
         var outdata;
 
         var reader = new FileReader();
 
-        reader.onload = function (e) {
 
+        reader.onload = async function (e) {
 
           var bytes = new Uint8Array(reader.result);
 
           var length = bytes.byteLength;
 
           for (var i = 0; i < length; i++) {
 
@@ -473,7 +476,7 @@ export default {
 
               } else {
 
                 obj.mail = uuidv4() + "@" + _this.userSuffix;
 
               }
 
-              obj.class = _this.boxType == 2 ? v[_this.lang.Class] : _this.classInfo.name;
 
+              obj.class = _this.boxType == 2 ? v[_this.lang.Class] : _this.classInfo.id;
 
               arr.push(obj);
 
             }else{
 
               _this.$message.error(_this.lang.ssCheckStuNameCol);
 
@@ -481,22 +484,35 @@ export default {
 
             }
 
           });
 
           console.log(arr);
 
-          // if (arr.length > 70) {
 
-          //   _this.$message.error(_this.lang.Limitmore);
 
-          //   return;
 
-          // }
 
-
 
-          if (this.boxType == 2 && arr.filter(e => e.class) != arr.length) {
 
-            _this.$message.error(_this.lang.ssCheckClassCol);
 
-            return;
 
-          }
 
-
 
           if (!arr.length) {
 
             _this.$message.error(
 
               _this.lang.ssParseStuFail
 
             );
 
             return;
 
           }
 
+         
+          if (_this.boxType == 2) {
 
+            let stuClassInfo = await _this.getClassInfo();
 
+            console.log(stuClassInfo, "stuClassInfo");
 
+            arr.forEach((e) => {
 
+              let classInfo = stuClassInfo.find(item => item.name == e.class);
 
+              if (classInfo) {
 
+                e.class = classInfo.id;
 
+              } else {
 
+                e.class = '';
 
+              }
 
+            });
 
+          }
 
+          console.log(arr, "arr");
 
+          
+         
+
 
+          if (_this.boxType == 2 && arr.filter(e => e.class).length !== arr.length) {
 
+            _this.$message.error(_this.lang.ssCheckClassCol);
 
+            return;
 
+          }
 
+
 
+          
           _this.deltypy = 1;
 
           _this.popBoxdia= true;
 
           _this.stuexcel = arr;
 
@@ -511,6 +527,37 @@ export default {
 
         reader.readAsBinaryString(f);
 
       }
 
     },
 
+    async getClassInfo() {
 
+      return new Promise((resolve, reject) => {
 
+        let params = {
 
+          oid: this.oid,
 
+        };
 
+        this.ajax
 
+          .get(this.$store.state.api + "selectGradeNew", params)
 
+          .then((res) => {
 
+            let box1 = JSON.parse(JSON.stringify(res.data[0]));
 
+            let box2 = JSON.parse(JSON.stringify(res.data[1]));
 
+          
+            // box1.push({id:0,name:this.lang.ssInterestClass});
 
+
 
+            const gradeIds = box1.filter(e => e.id !== 0).map(e => e.id);
 
+
 
+            let box3 = [];
 
+
 
+            box2.forEach((e) => {
 
+              if (gradeIds.includes(e.pid)) {
 
+                e.name = box1.find(item => item.id == e.pid).name + e.name;
 
+                box3.push(e);
 
+              }
 
+            });
 
+            resolve(box3);
 
+          })
 
+          .catch((err) => {
 
+            console.error(err);
 
+            reject(err);
 
+          });
 
+      });
 
+    },
 
     // 手动输入添加学生
 
     addStu() {
 
       this.selectedStuData = this.selectedStuData.filter((item) => item != "");
 
@@ -550,15 +597,13 @@ export default {
 
       if (this.boxType == 2) {
 
         classInfo = this.cascaderData.flatMap((item) => item.children).filter((item) => this.cascaderDataPath[1]==item.id)[0];
 
       }
 
-      // console.log(classInfo, "classInfo");
 
       let box = this.selectedStuData.map((item) => {
 
         return {
 
           name: item,
 
           mail: uuidv4() + mail,
 
-          class: classInfo.name,
 
+          class: classInfo.id,
 
         };
 
       });
 
-      // console.log(box, "box");
 
 
       this.accUpdate(box);
 
     },
 
@@ -606,10 +651,10 @@ export default {
 
             oid: this.oid,
 
           },
 
         ];
 
-      console.log(params, "batchRegistrationMoreCopy");
 
+      console.log(params, "batchRegistrationMoreCopyNew");
 
       // batchRegistrationMoreCopy
 
         this.ajax
 
-          .post(this.$store.state.api + "batchRegistrationMoreCopy", params)
 
+          .post(this.$store.state.api + "batchRegistrationMoreCopyNew", params)
 
           .then((res) => {
 
             console.log(res, "res");
 
             if (res.data.type == 1) {

+ 5 - 5
src/components/pages/studentManageNew/component/table.vue
View File 

@@ -204,7 +204,7 @@
 
         <el-table-column
 
           v-for="(item, index) in tableColumns"
 
           :key="index"
 
-          :width="item.wid"
 
+          :min-width="item.wid"
 
           show-overflow-tooltip
 
           :label="item.label"
 
         >
 
@@ -786,9 +786,9 @@ export default {
 
     },
 
     studentColumns() {
 
       return [
 
-        { label: this.lang.StudentName, prop: "username" },
 
-        { label: this.lang.Account, prop: "acc" },
 
-        { label: this.lang.Class, prop: "classname", wid: "360" }
 
+        { label: this.lang.StudentName, prop: "username",wid:'30%' },
 
+        { label: this.lang.Account, prop: "acc",wid:'30%' },
 
+        { label: this.lang.Class, prop: "classname" }
 
       ];
 
     },
 
     tableInterestClaColumns() {
 
@@ -1419,7 +1419,7 @@ export default {
 
       console.log(params);
 
 
       this.ajax
 
-        .post(this.$store.state.api + "addClassgra", params)
 
+        .post(this.$store.state.api + "addClassgraNew", params)
 
         .then(res => {
 
           if (res.data[0] && res.data[0][0].classname == 1) {
 
             this.$message({

+ 1 - 1
src/components/pages/studentManageNew/index.vue
View File 

@@ -508,7 +508,7 @@ export default {
 
       console.log(params);
 
 
       this.ajax
 
-        .post(this.$store.state.api + "addClassgra", params)
 
+        .post(this.$store.state.api + "addClassgraNew", params)
 
         .then((res) => {
 
           if (res.data[0] && res.data[0][0].classname == 1) {
 
             this.$message({

+ 2 - 1
src/components/pages/workPage/components/choiceQuestion.vue
View File 

@@ -13,7 +13,8 @@
 
     <img class="cq_image" v-if="work.testJson[showIndex] && work.testJson[showIndex].timuList && work.testJson[showIndex].timuList.length>0" :src="work.testJson[showIndex].timuList[0].src" @click="$hevueImgPreview(work.testJson[showIndex].timuList[0].src)">
 
 
     <div class="cq_type" v-if="work.testJson[showIndex]">
 
-      {{ work.testJson[showIndex].type == '1' ? lang.SingleChoice : lang.MultipleChoice }}
 
+      {{lang.ssChoice}}
 
+      <!-- {{ work.testJson[showIndex].type == '1' ? lang.SingleChoice : lang.MultipleChoice }} -->
 
       <!-- <span v-if="work.testJson.length>1">（{{showIndex+1}}/{{work.testJson.length}}）</span> -->
 
 
     </div>

+ 3 - 2
src/lang/cn.json
View File 

@@ -2008,11 +2008,11 @@
 
   "ssUploadTip":"支持格式：.xlsx，.xls，大小不超过10MB",
 
   "ssUploadTempLbl":"上传模板：",
 
   "ssDownloadTemp":"下载模板",
 
-  "ssUploadNote":"注意：请按照模板格式填写学生信息,避免导入失败",
 
+  "ssUploadNote":"提示：请按照模板格式填写学生信息并导入。",
 
   "ssGetSuffixReUp":"正在获取后缀，请重新上传",
 
   "ssGetSuffixReAdd":"正在获取后缀，请重新添加",
 
   "ssCheckStuNameCol":"请检查上传文件学生姓名列是否填写正确",
 
-  "ssCheckClassCol":"请检查上传文件班级列是否填写正确",
 
+  "ssCheckClassCol":"有同学班级信息有误，请检查",
 
   "ssParseStuFail":"未能提取上传学生信息，请检查数据格式，使用模板文件格式上传",
 
   "ssEnterStu":"请输入学生",
 
   "ssAddStuMax70":"一次最多添加70人",
 
@@ -2044,5 +2044,6 @@
 
   "ssSelectCourseType":"请选择课程类型",
 
   "ssSelectedCourse":"已选择 * 个课程",
 
   "ssSelectedApp":"已选择 * 个应用",
 
+  "ssSyncImportClassInfo":"提示： 如需同步导入班级信息，请于此处下载导入模板，并于【班级】列准确输入年级+班级名称作为学生班级（兴趣班不支持导入学生）。",
 
   "ssNoSettingAnswer":"未设置正确答案"
 
 }

+ 5 - 3
src/lang/en.json
View File 

@@ -2007,11 +2007,11 @@
 
   "ssUploadTip":"Supported: xlsx, xls , up to 10MB",
 
   "ssUploadTempLbl":"Upload template:",
 
   "ssDownloadTemp":"Download template",
 
-  "ssUploadNote":"Note: Please fill in student information according to the template format to avoid import failure",
 
+  "ssUploadNote":"Tip: Please fill in student information according to the template format to avoid import failure",
 
   "ssGetSuffixReUp":"Getting suffix, please re-upload",
 
   "ssGetSuffixReAdd":"Getting suffix, please re-add",
 
   "ssCheckStuNameCol":"Please check whether the student name column in the uploaded file is correct",
 
-  "ssCheckClassCol":"Please check whether the class column in the uploaded file is correct",
 
+  "ssCheckClassCol":"Some students have incorrect class information, please check",
 
   "ssParseStuFail":"Failed to parse student information. Please check the data format and use the template file format",
 
   "ssEnterStu":"Please enter student",
 
   "ssAddStuMax70":"You can add up to 70 students at a time",
 
@@ -2043,6 +2043,8 @@
 
   "ssSelectCourseType":"Please select course type",
 
   "ssSelectedCourse":"Selected * courses",
 
   "ssSelectedApp":"Selected * apps",
 
-  "ssNoSettingAnswer":"No correct answer set"
 
+  "ssNoSettingAnswer":"No correct answer set",
 
+  "ssSyncImportClassInfo":"Tip: If you need to synchronize import class information, please download the import template here, and accurately enter the grade + class name as the student class in the [Class] column (interest classes do not support importing students)."
 
+
 
 
 }

+ 4 - 4
src/lang/hk.json
View File 

@@ -2007,11 +2007,11 @@
 
   "ssUploadTip":"支持格式：.xlsx，.xls，大小不超過10MB",
 
   "ssUploadTempLbl":"上傳模板：",
 
   "ssDownloadTemp":"下載模板",
 
-  "ssUploadNote":"注意：請按照模板格式填寫學生信息,避免導入失敗",
 
+  "ssUploadNote":"提示：請按照模板格式填寫學生信息,避免導入失敗",
 
   "ssGetSuffixReUp":"正在獲取後綴，請重新上傳",
 
   "ssGetSuffixReAdd":"正在獲取後綴，請重新添加",
 
   "ssCheckStuNameCol":"請檢查上傳文件學生姓名列是否填寫正確",
 
-  "ssCheckClassCol":"請檢查上傳文件班級列是否填寫正確",
 
+  "ssCheckClassCol":"有同學班級信息有誤，請檢查",
 
   "ssParseStuFail":"未能提取上傳學生信息，請檢查數據格式，使用模板文件格式上傳",
 
   "ssEnterStu":"請輸入學生",
 
   "ssAddStuMax70":"一次最多添加70人",
 
@@ -2044,6 +2044,6 @@
 
   "ssSelectedCourse":"已選擇 * 個課程",
 
   "ssSelectedApp":"已選擇 * 個應用",
 
   "ssCocoNoteUpdateTips":"協同建構不支持修改基本信息，只支持加入分組。",
 
-  "ssNoSettingAnswer":"未設置正確答案"
 
-
 
+  "ssNoSettingAnswer":"未設置正確答案",
 
+  "ssSyncImportClassInfo":"提示: 如需同步導入班級信息，請於此處下載導入模板，並於【班級】列準確輸入年級+班級名稱作為學生班級（興趣班不支持導入學生）。"
 
 }

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