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

zengyicheng 1 year ago
parent
57a57cd5ea 72e653f684
commit
6b1c23cefc
18 changed files with 1206 additions and 1101 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.43f0e1fcc71e5285724e4429b9df5ec3.css
  3. 0 0
      dist/static/css/app.43f0e1fcc71e5285724e4429b9df5ec3.css.map
  4. 0 0
      dist/static/css/app.6f1c24a8027a6f7c948089793c3690de.css
  5. 0 0
      dist/static/css/app.6f1c24a8027a6f7c948089793c3690de.css.map
  6. 0 0
      dist/static/js/app.ef2eaf8412e1c6ac68b4.js
  7. 0 0
      dist/static/js/app.ef2eaf8412e1c6ac68b4.js.map
  8. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  9. 68 21
      src/components/pages/kindStudentEva/panel/index.vue
  10. 134 46
      src/components/pages/kindStudentEva/test/component/popbox.vue
  11. 111 35
      src/components/pages/kindStudentEva/test/diary.vue
  12. 12 7
      src/components/pages/kindStudentEva/test/index.vue
  13. 22 17
      src/components/pages/kindStudentEva/test/report.vue
  14. 16 87
      src/components/pages/kindStudentEva/test/reportDialog/index.vue
  15. 94 35
      src/components/pages/kindStudentEva/test/score.vue
  16. 2 3
      src/components/pages/scourse.vue
  17. 744 847
      src/components/pages/student/addCourseXin.vue
  18. 2 2
      src/components/pages/student/course.vue

+ 1 - 1
dist/index.html
View File 

@@ -25,7 +25,7 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.43f0e1fcc71e5285724e4429b9df5ec3.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.76fd85af8d485ac3a12b.js></script><script type=text/javascript src=./static/js/app.bf1225bdcae19744b1f7.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.6f1c24a8027a6f7c948089793c3690de.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.76fd85af8d485ac3a12b.js></script><script type=text/javascript src=./static/js/app.ef2eaf8412e1c6ac68b4.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.43f0e1fcc71e5285724e4429b9df5ec3.css


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


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


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


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


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


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


+ 68 - 21
src/components/pages/kindStudentEva/panel/index.vue
View File 

@@ -68,14 +68,14 @@
 
 export default {
 
   props: {
 
     userid: {
 
-      type: String,
 
+      type: String
 
     },
 
     oid: {
 
-      type: String,
 
+      type: String
 
     },
 
     org: {
 
-      type: String,
 
-    },
 
+      type: String
 
+    }
 
   },
 
   data() {
 
     return {
 
@@ -87,7 +87,7 @@ export default {
 
       // count3: 0,
 
       // count4: 0,
 
       // count5: 0,
 
-      typeList: [],
 
+      typeList: []
 
     };
 
   },
 
   methods: {
 
@@ -95,11 +95,12 @@ export default {
 
       let params = {
 
         uid: this.userid,
 
         oid: this.oid,
 
-        org: this.org,
 
+        org: this.org
 
       };
 
       this.ajax
 
         .get(this.$store.state.api + "selectSRecordY", params)
 
-        .then((res) => {
 
+        .then(res => {
 
+          console.log("总学习记录数量", res);
 
           this.count = res.data[0].length; //总学习记录数量
 
           var data = res.data[0]; //总学习记录
 
           var ftype = res.data[1]; //公共父级分类
 
@@ -153,30 +154,73 @@ export default {
 
               }
 
             }
 
           }
 
+          // 是按照，上面总条数来循环下面的数据的条数的，只用父级循环，不能用子集，
 
+          //不然子集的循环数据会重复，导致数据重复
 
+          // console.log('allfType',allfType);
 
+          // console.log('stype',stype);
 
+
 
+          // 将每个大分类下的小分类数据提取出来，在大分类下创建一个child来存储
 
+          allfType.forEach(e => {
 
+            e.child = [];
 
+            stype.forEach(i => {
 
+              if (e.id == i.pid) {
 
+                e.child.push(i.id);
 
+              }
 
+            });
 
+          });
 
+
 
+          // console.log("allfType1111111111", allfType);
 
+
 
+          // 将数据所选的小分类变成数组
 
+          data.forEach(e => {
 
+            e.type = e.type.split(",");
 
+          });
 
+          // console.log("data", data);
 
+
 
           var ftypeList1 = [];
 
-          for (var i = 0; i < allfType.length; i++) {
 
+
 
+          allfType.forEach(e => {
 
             var count = 0;
 
-            for (var j = 0; j < typeList1.length; j++) {
 
-              if (allfType[i].id == typeList1[j].pid) {
 
+            data.forEach(d => {
 
+              let arr = [];
 
+              arr = e.child.filter(value => d.type.includes(value));
 
+              if (arr.length > 0) {
 
                 count++;
 
               }
 
-            }
 
+            });
 
             ftypeList1.push({
 
-              id: allfType[i].id,
 
-              name: allfType[i].name,
 
-              count: count,
 
+              id: e.id,
 
+              name: e.name,
 
+              count: count
 
             });
 
-          }
 
+          });
 
+          // console.log("ftypeList1", ftypeList1);
 
+
 
+          // var ftypeList1 = [];
 
+          // for (var i = 0; i < allfType.length; i++) {
 
+          //   var count = 0;
 
+          //   for (var j = 0; j < typeList1.length; j++) {
 
+          //     if (allfType[i].id == typeList1[j].pid) {
 
+          //       count++;
 
+          //     }
 
+          //   }
 
+          //   ftypeList1.push({
 
+          //     id: allfType[i].id,
 
+          //     name: allfType[i].name,
 
+          //     count: count,
 
+          //   });
 
+          // }
 
           this.typeList = ftypeList1;
 
+          // console.log('this.typeList',this.typeList);
 
         })
 
-        .catch((err) => {
 
+        .catch(err => {
 
           console.error(err);
 
         });
 
-    },
 
+    }
 
   },
 
   mounted() {
 
     this.getData();
 
-  },
 
+  }
 
 };
 
 </script>
 
 
@@ -187,8 +231,11 @@ export default {
 
   min-height: 420px;
 
   background: #fff;
 
   border-radius: 10px;
 
-  margin-bottom: 10px;
 
-  overflow: hidden;
 
+  /* margin-bottom: 10px; */
 
+  box-sizing: border-box;
 
+  padding-bottom: 30px;
 
+  overflow: auto;
 
+  /* padding-bottom: 60px; */
 
 }
 
 
 .i_body_title {
 
@@ -297,4 +344,4 @@ export default {
 
   font-size: 12px;
 
   margin-top: 0px;
 
 }
 
-</style>
 
+</style>

+ 134 - 46
src/components/pages/kindStudentEva/test/component/popbox.vue
View File 

@@ -1,8 +1,5 @@
 
 <template>
 
-  <div class="popbox">
 
-    <div class="tit">
 
-      <h2>{{ judgeNum ? "修改" : "查看" }}</h2>
 
-    </div>
 
+  <div>
 
     <div class="cellBlock">
 
       <div class="username">姓名</div>
 
       <div class="cellInp">
 
@@ -34,7 +31,6 @@
 
           collapse-tags
 
           v-model="recordData.contact"
 
           placeholder="请选择关联同学"
 
-          style="width: 200px"
 
         >
 
           <el-option
 
             v-for="(item, index) in studentList"
 
@@ -48,11 +44,7 @@
 
     <div class="cellBlock">
 
       <div class="username">学期</div>
 
       <div>
 
-        <el-select
 
-          v-model="recordData.term"
 
-          style="width: 200px"
 
-          placeholder="请选择"
 
-        >
 
+        <el-select v-model="recordData.term" placeholder="请选择">
 
           <el-option
 
             v-for="item in termList"
 
             :key="item.id"
 
@@ -68,14 +60,13 @@
 
       </div>
 
     </div>
 
     <div class="cellBlock">
 
-      <div class="username">纬度</div>
 
+      <div class="username">维度</div>
 
       <div>
 
         <el-select
 
           multiple
 
           collapse-tags
 
           v-model="recordData.type"
 
           placeholder="请选择教研室"
 
-          style="width: 200px"
 
         >
 
           <el-option
 
             v-for="(item, index) in weiList"
 
@@ -94,7 +85,7 @@
 
           type="datetime"
 
           value-format="yyyy-MM-dd HH:mm"
 
           placeholder="选择日期时间"
 
-          style="width: 200px"
 
+          style="width: 400px;"
 
         >
 
         </el-date-picker>
 
       </div>
 
@@ -117,10 +108,10 @@
 
         ></el-input>
 
       </div>
 
     </div>
 
-    <div style="margin: 15px 0;">
 
+    <div style="margin: 15px 0;width: 70px;font-size: 16px;text-align: right;">
 
       观察记录
 
     </div>
 
-    <div>
 
+    <div style="width: 500px;">
 
       <el-input
 
         type="textarea"
 
         placeholder="请输入内容"
 
@@ -131,11 +122,16 @@
 
       </el-input>
 
     </div>
 
 
-    <div style="margin: 15px 0;">
 
+    <div style="margin: 15px 0;width: 70px;font-size: 16px;">
 
       图片
 
     </div>
 
     <div class="imgBlock">
 
-      <div class="imgCell" v-if="judgeNum" @click.stop="addImg($event)">
 
+      <div
 
+        class="imgCell"
 
+        v-if="judgeNum"
 
+        @click.stop="addImg($event)"
 
+        style="cursor: pointer;"
 
+      >
 
         +
 
         <input
 
           type="file"
 
@@ -148,20 +144,40 @@
 
         class="imgCell"
 
         v-for="(i, index) in recordData.recordImg"
 
         :key="index"
 
+        @click.stop="previewImg(i)"
 
       >
 
         <img class="imgCellCon" :src="i" alt="" />
 
-        <div v-if="judgeNum" class="imgDelBtn" @click="delImg(i)">
 
+        <div v-if="judgeNum" class="imgDelBtn" @click.stop="delImg(i)">
 
           ×
 
         </div>
 
       </div>
 
     </div>
 
 
-    <div class="updateCordSty">
 
-      <el-button v-if="judgeNum" style="color: #fff;" type="text" @click="open"
 
-        >修改</el-button
 
-      >
 
+    <div
 
+      style="width: 500px;display: flex;justify-content: flex-end;"
 
+      v-if="judgeNum"
 
+    >
 
+      <div class="updateCordSty" @click="open">修改</div>
 
+    </div>
 
+
 
+    <div v-if="proVisible" class="mask">
 
+      <div class="progressBox">
 
+        <div class="lbox">
 
+          <img src="@/assets/loading.gif" />上传中，请稍后
 
+        </div>
 
+        <div style="margin-bottom: 10px">
 
+          <span>{{ isFinishSize }}M</span>
 
+          /
 
+          <span>{{ isAllSize }}M</span>
 
+        </div>
 
+        <el-progress
 
+          :text-inside="true"
 
+          :stroke-width="20"
 
+          :percentage="progress ? progress : 0"
 
+          style="width: 80%"
 
+        ></el-progress>
 
+      </div>
 
     </div>
 
-    <!-- <div v-if="isShadow" @click="isShadowShow" class="shadow"></div> -->
 
   </div>
 
 </template>
 
 
@@ -199,16 +215,21 @@ export default {
 
   },
 
   data() {
 
     return {
 
-      // popType: this.recordDataCopy.type,
 
-      // popTact: this.recordDataCopy.contact,
 
-      // ico: false,
 
-      // gIco: false,
 
       recordData: {},
 
-      // isShadow: false,
 
-      imgList: []
 
+      imgList: [],
 
+      uploadProgress: 0,
 
+      // Progress: false,
 
+      proVisible: false,
 
+      progress: 0,
 
+      inputShow: false,
 
+      isFinishSize: 0,
 
+      isAllSize: 0
 
     };
 
   },
 
   methods: {
 
+    previewImg(url) {
 
+      this.$hevueImgPreview(url);
 
+    },
 
     // 确认修改记录提示?
 
     open() {
 
       // console.log(this.recordData);
 
@@ -264,7 +285,7 @@ export default {
 
         .then(res => {
 
           console.log(res);
 
           this.$emit("closePop");
 
-          // this.$emit("selectData");
 
+          this.$emit("getData");
 
         });
 
       // updateRecordData
 
     },
 
@@ -313,6 +334,13 @@ export default {
 
       this.imgLoading = true;
 
       var _this = this;
 
 
+      this.inputShow = false;
 
+      this.progress = 0;
 
+      this.proVisible = true;
 
+      this.isFinishSize = 0;
 
+      this.isAllSize = (file.size / 1024 / 1024).toFixed(2);
 
+      _this.$forceUpdate();
 
+
 
       if (file) {
 
         var params = {
 
           Key:
 
@@ -334,11 +362,22 @@ export default {
 
           .upload(params, options)
 
           .on("httpUploadProgress", function(evt) {
 
             //这里可以写进度条
 
-            // console.log("Uploaded : " + parseInt((evt.loaded * 80) / evt.total) + '%');
 
+            _this.progress = parseInt((evt.loaded / evt.total) * 100);
 
+            _this.isFinishSize = (evt.loaded / 1024 / 1024).toFixed(2);
 
+            _this.$forceUpdate();
 
           })
 
           .send(function(err, data) {
 
             _this.imgLoading = false;
 
             // loading.close();
 
+            _this.progress = 100;
 
+            _this.isFinishSize = _this.isAllSize;
 
+            _this.$forceUpdate();
 
+            setTimeout(() => {
 
+              _this.proVisible = false;
 
+              _this.$forceUpdate();
 
+            }, 1000);
 
+            _this.inputShow = true;
 
+
 
             if (err) {
 
               _this.$message.error("上传失败");
 
             } else {
 
@@ -352,6 +391,14 @@ export default {
 
       }
 
     }
 
   },
 
+  watch: {
 
+    recordDataCopy: {
 
+      handler: function(newVal, oldVal) {
 
+        this.recordData = JSON.parse(JSON.stringify(this.recordDataCopy));
 
+      },
 
+      deep: true
 
+    }
 
+  },
 
   mounted() {
 
     this.recordData = JSON.parse(JSON.stringify(this.recordDataCopy));
 
     // console.log("??????????????????????????????????", this.recordData);
 
@@ -361,18 +408,54 @@ export default {
 
 
 <style scoped>
 
 .popbox {
 
-  width: 500px;
 
-  background-color: #fff;
 
-  /* height: 500px; */
 
   padding: 10px;
 
-  position: absolute;
 
-  top: 50%;
 
-  left: 50%;
 
-  transform: translate(-50%, -50%);
 
-  z-index: 3;
 
   border-radius: 10px;
 
   box-shadow: 0 0 10px #ccc;
 
 }
 
+.mask {
 
+  background-color: rgb(0 0 0 / 30%);
 
+  /* position: fixed; */
 
+  position: absolute;
 
+  top: 0;
 
+  left: 0;
 
+  width: 100%;
 
+  height: 100%;
 
+  z-index: 90;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: center;
 
+}
 
+
 
+.progressBox {
 
+  width: 300px;
 
+  height: 150px;
 
+  background: #fff;
 
+  border-radius: 10px;
 
+  box-shadow: 0 0 6px 1px #bfbfbf;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: center;
 
+  flex-direction: column;
 
+  position: relative;
 
+  color: #6c6c6c;
 
+}
 
+
 
+.progressBox >>> .el-progress-bar__outer {
 
+  background-color: #d1dfff !important;
 
+}
 
+
 
+.progressBox .lbox {
 
+  height: 50px;
 
+  font-size: 19px;
 
+  display: flex;
 
+  align-items: center;
 
+  color: #747474;
 
+}
 
+
 
+.progressBox .lbox img {
 
+  width: 40px;
 
+  margin-right: 20px;
 
+}
 
 
 .tit {
 
   width: 100%;
 
@@ -380,24 +463,28 @@ export default {
 
   margin-bottom: 10px;
 
 }
 
 .cellBlock {
 
-  width: 100%;
 
+  width: 500px;
 
   box-sizing: border-box;
 
   padding: 10px 0;
 
   display: flex;
 
-  justify-content: center;
 
+  /* justify-content: center; */
 
   align-items: center;
 
 }
 
 .cellBlock > .username {
 
   width: 70px;
 
   flex-shrink: 0;
 
+  font-size: 16px;
 
   text-align: right;
 
   margin-right: 10px;
 
   display: flex;
 
   justify-content: flex-end;
 
   /* justify-content: space-between; */
 
 }
 
+/deep/ .el-input__inner {
 
+  width: 400px;
 
+}
 
 .imgBlock {
 
-  width: 100%;
 
+  width: 500px;
 
   display: flex;
 
   justify-content: flex-start;
 
   flex-wrap: wrap;
 
@@ -432,8 +519,11 @@ export default {
 
   display: block;
 
 }
 
 .updateCordSty {
 
+  cursor: pointer;
 
+  padding: 10px 0;
 
   width: 120px;
 
-  float: right;
 
+  transform: translate(50%, 0%);
 
+  /* float: right; */
 
   background-color: rgba(17, 61, 221, 0.5);
 
   border-radius: 5px;
 
   color: #fff;
 
@@ -451,9 +541,7 @@ export default {
 
 /* ::v-deep .el-input__inner {
 
   width: 200px;
 
 }
 
-::v-deep .el-input {
 
-  width: 200px;
 
-}
 
+
 
 ::v-deep .el-select {
 
   width: 200px !important;
 
 } */

+ 111 - 35
src/components/pages/kindStudentEva/test/diary.vue
View File 

@@ -1,17 +1,22 @@
 
 <template>
 
   <div class="diary">
 
-    <div
 
-      style="
 
-        background-color: #fff;
 
-        width: 100%;
 
-        height: 100%;
 
-        box-sizing: border-box;
 
-        padding: 15px;
 
-      "
 
-    >
 
+    <div class="diary-content">
 
       <!-- 分类与导出 -->
 
-      <div class="top">
 
+      <div class="top" :style="{ marginBottom: !ftypeId ? 0 : 80 + 'px' }">
 
         <div class="oneType">
 
+          <div class="all_choose" style="margin: 0;">
 
+            <div
 
+              @click="clickFtypeId('')"
 
+              :class="ftypeId == '' ? 'onTypeTxt' : 'onTypeTxt2'"
 
+              style="position: relative;"
 
+            >
 
+              <span>全部</span>
 
+              <div
 
+                class="line"
 
+                :style="{ display: ftypeId == '' ? 'block' : 'none' }"
 
+              ></div>
 
+            </div>
 
+          </div>
 
           <div
 
             class="all_choose"
 
             v-for="(item, index) in VeidooList"
 
@@ -52,6 +57,7 @@
 
         </div>
 
         <div class="wordBtn" @click="judgeExport">导出Excel</div>
 
       </div>
 
+
 
       <div class="selectSty">
 
         <div style="margin-right: 10px">学期</div>
 
         <el-select v-model="termId" placeholder="请选择" @change="getData">
 
@@ -154,24 +160,38 @@
 
       <el-pagination
 
         @current-change="handleCurrentChange"
 
         background
 
-        :page-size="8"
 
+        :page-size="10"
 
         layout="prev, pager, next"
 
         :total="total"
 
         class="pagination"
 
       >
 
       </el-pagination>
 
     </div>
 
-    <div v-if="isPop" @click="closePop" class="shade"></div>
 
-    <popbox
 
-      ref="refPop"
 
-      v-if="isPop"
 
-      :judgeNum="judgeNum"
 
-      :recordDataCopy="recordData"
 
-      :termList="termList"
 
-      :weiList="weiList"
 
-      :studentList="studentList"
 
-      @closePop="closePop"
 
-    ></popbox>
 
+    <!-- <div v-if="isPop" @click="closePop" class="shade"></div> -->
 
+
 
+    <!-- v-if="isPop" -->
 
+
 
+    <el-dialog
 
+      :title="judgeNum ? '修改' : '查看'"
 
+      :visible.sync="isPop"
 
+      :append-to-body="true"
 
+      width="700px"
 
+      :destroy-on-close="true"
 
+      :close-on-click-modal="true"
 
+      :before-close="closePop"
 
+      class="dialog_diy"
 
+    >
 
+      <popbox
 
+        ref="refPop"
 
+        :judgeNum="judgeNum"
 
+        :recordDataCopy="recordData"
 
+        :termList="termList"
 
+        :weiList="weiList"
 
+        :studentList="studentList"
 
+        @closePop="closePop"
 
+        @getData="getData"
 
+      ></popbox>
 
+    </el-dialog>
 
   </div>
 
 </template>
 
 
@@ -239,6 +259,8 @@ export default {
 
     clickFtypeId(e) {
 
       this.ftypeId = e;
 
       this.stypeId = "";
 
+      this.page = 1;
 
+      this.total = 0;
 
       this.getData();
 
     },
 
     clickStypeId(e) {
 
@@ -252,8 +274,6 @@ export default {
 
     },
 
     closePop() {
 
       this.isPop = false;
 
-      // console.log('关了');
 
-      // this.$refs.refPop.fuClick(this.recordData);
 
     },
 
 
     // 切换页
 
@@ -304,9 +324,11 @@ export default {
 
               allsType.push(sctysotypepe[[i]]);
 
             }
 
           }
 
+          this.ftypeId = "";
 
+          this.sftypeId = "";
 
+          this.page = 1;
 
           var VeidooJson = {};
 
           for (var i = 0; i < allfType.length; i++) {
 
-            this.ftypeId = allfType[0].id;
 
             if (!VeidooJson[allfType[i].id]) {
 
               VeidooJson[allfType[i].id] = [];
 
             }
 
@@ -348,7 +370,7 @@ export default {
 
           this.isLoading = false;
 
           this.tableData = res.data[0];
 
           this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
 
-          console.log(" 获取筛选数据", res.data[0]);
 
+          // console.log(" 获取筛选数据", res.data[0]);
 
         })
 
         .catch((err) => {
 
           this.isLoading = false;
 
@@ -360,8 +382,9 @@ export default {
 
       this.multipleSelection = val;
 
       // console.log(this.multipleSelection);
 
     },
 
-    // 修改记录
 
+    // 修改与查看记录
 
     updateCred(e, t) {
 
+      console.log("eeeeeeeeeeee", e);
 
       this.judgeNum = t;
 
       if (!Array.isArray(e.type)) {
 
         if (!e.type) {
 
@@ -385,6 +408,7 @@ export default {
 
         }
 
       }
 
       this.recordData = e;
 
+      this.$forceUpdate();
 
       this.isPop = true;
 
     },
 
     // 获取纬度列表
 
@@ -408,11 +432,11 @@ export default {
 
       const data2 = {
 
         uid: this.userid,
 
       };
 
-      console.log("获取班学生列表", data2);
 
+      // console.log("获取班学生列表", data2);
 
       this.ajax
 
         .get(this.$store.state.api + "selectStudentDetail", data2)
 
-        .then((res) => {
 
-          console.log(res);
 
+        .then(res => {
 
+          // console.log(res);
 
           this.classid = res.data[0][0].classid;
 
           this.getClassStudent();
 
 
@@ -523,7 +547,7 @@ export default {
 
             .then((res) => {
 
               // console.log(res);
 
               // this.selectData();
 
-
 
+              this.getData();
 
               this.$message({
 
                 type: "success",
 
                 message: "已删除",
 
@@ -556,6 +580,51 @@ export default {
 
 </script>
 
 
 <style scoped>
 
+.dialog_diy {
 
+  box-sizing: border-box;
 
+  /* padding: 0 10px 10px 10px; */
 
+}
 
+.dialog_diy >>> .el-dialog {
 
+  /* height: 100%; */
 
+  margin: 10vh auto !important;
 
+}
 
+
 
+.dialog_diy >>> .el-dialog__header {
 
+  background: #454545 !important;
 
+  padding: 15px 20px;
 
+}
 
+
 
+.dialog_diy >>> .el-dialog__body {
 
+  height: calc(100% - 124px);
 
+  box-sizing: border-box;
 
+  display: flex;
 
+  align-items: center;
 
+  flex-direction: column;
 
+  justify-content: space-between;
 
+  /* padding: 0px; */
 
+}
 
+
 
+.dialog_diy >>> .el-dialog__title {
 
+  color: #fff;
 
+}
 
+
 
+.dialog_diy >>> .el-dialog__headerbtn {
 
+  top: 19px;
 
+}
 
+
 
+.dialog_diy >>> .el-dialog__headerbtn .el-dialog__close {
 
+  color: #fff;
 
+}
 
+
 
+.dialog_diy >>> .el-dialog__headerbtn .el-dialog__close:hover {
 
+  color: #fff;
 
+}
 
+
 
+.dialog_diy >>> .el-dialog__body,
 
+.dialog_diy >>> .el-dialog__footer {
 
+  background: #fafafa;
 
+}
 
+
 
 .shade {
 
   position: fixed;
 
   top: 0;
 
@@ -580,7 +649,14 @@ export default {
 
   box-sizing: border-box;
 
   padding: 15px;
 
   height: 100%;
 
-  overflow-y: scroll;
 
+}
 
+.diary > .diary-content {
 
+  background-color: #fff;
 
+  width: 100%;
 
+  height: 100%;
 
+  box-sizing: border-box;
 
+  padding: 15px;
 
+  overflow: auto;
 
 }
 
 .top {
 
   width: 100%;
 
@@ -622,11 +698,11 @@ export default {
 
 .line {
 
   position: absolute;
 
   left: 50%;
 
-  bottom: 0;
 
   transform: translate(-50%, 0);
 
+  bottom: 0;
 
   height: 3px;
 
   background-color: #3681fc;
 
-  width: 50%;
 
+  width: 70%;
 
 }
 
 .wordBtn {
 
   cursor: pointer;
 
@@ -686,7 +762,7 @@ export default {
 
   justify-content: flex-start;
 
   align-items: center;
 
   /* margin-top: 60px; */
 
-  margin: 80px 10px 40px 0;
 
+  margin: 10px 10px 40px 0;
 
 }
 
 .evaluate {
 
   text-align: center;

+ 12 - 7
src/components/pages/kindStudentEva/test/index.vue
View File 

@@ -76,19 +76,21 @@ export default {
 
   data() {
 
     return {
 
       type: 1,
 
-      role:'',
 
+      role: ""
 
     };
 
   },
 
   methods: {
 
     checkType(type) {
 
       this.type = type;
 
     },
 
-    backClaBtn(){
 
-      this.$router.push(`/studentEva?userid=${this.userid}&oid=${this.oid}&org=${this.org}&cid=${this.cid}&role=${this.role}`)
 
+    backClaBtn() {
 
+      this.$router.push(
 
+        `/studentEva?userid=${this.userid}&oid=${this.oid}&org=${this.org}&cid=${this.cid}&role=${this.role}`
 
+      );
 
     }
 
   },
 
   mounted() {
 
-    this.role=this.$route.query.role;
 
+    this.role = this.$route.query.role;
 
     // console.log('this.$route.query',this.$route.query);
 
   }
 
 };
 
@@ -115,7 +117,9 @@ export default {
 
   align-items: center;
 
   justify-content: space-between;
 
   margin-left: 20px;
 
-  width: 95%;
 
+  box-sizing: border-box;
 
+  width: calc(100% - 25px);
 
+  padding-right: 45px;
 
 }
 
 .i_body_title > .title_box {
 
   display: flex;
 
@@ -129,8 +133,9 @@ export default {
 
   color: #fff;
 
   padding: 5px 20px;
 
   display: flex;
 
-  justify-content: center;align-items: center;
 
-  border-radius: 5px;
 
+  justify-content: center;
 
+  align-items: center;
 
+  border-radius: 3px;
 
   cursor: pointer;
 
 }
 
 .i_body_title > .title_box > .title_item {

+ 22 - 17
src/components/pages/kindStudentEva/test/report.vue
View File 

@@ -1,8 +1,6 @@
 
 <template>
 
   <div class="report">
 
-    <div
 
-      style="background-color: #fff;width: 100%;height: 100%;box-sizing: border-box; padding: 15px;"
 
-    >
 
+    <div class="reportContent">
 
       <div class="top">
 
         <div style="width: 348px;height: 40px;flex-shrink: 0;">
 
           <el-select
 
@@ -59,19 +57,18 @@
 
         </div>
 
       </div>
 
       <div></div>
 
-    </div>
 
-
 
 
-    <div v-if="!isShow">
 
-      <div v-for="(i, index) in VeidooList" :key="i.id">
 
-        <fieldMap
 
-          :tid="i.id"
 
-          :tit="i.name"
 
-          :userid="userid"
 
-          :year="year"
 
-          :radarData="radarData"
 
-          :key="radarData.toString()"
 
-        ></fieldMap>
 
+      <div v-if="!isShow">
 
+        <div v-for="(i, index) in VeidooList" :key="i.id">
 
+          <fieldMap
 
+            :tid="i.id"
 
+            :tit="i.name"
 
+            :userid="userid"
 
+            :year="year"
 
+            :radarData="radarData"
 
+            :key="radarData.toString()"
 
+          ></fieldMap>
 
+        </div>
 
       </div>
 
     </div>
 
   </div>
 
@@ -121,13 +118,11 @@ export default {
 
       VeidooList: [], //大分类
 
       VeidooJsonList: [], //小分类
 
 
-     
       // 后端获取的数据
 
       radarData: {},
 
 
       // 判断无数据的显示
 
       isShow: false
 
-      
     };
 
   },
 
   methods: {
 
@@ -452,7 +447,17 @@ export default {
 
   box-sizing: border-box;
 
   padding: 15px;
 
   height: 100%;
 
+}
 
+.report > .reportContent {
 
+  background-color: #fff;
 
+  width: 100%;
 
+  height: 100%;
 
+  box-sizing: border-box;
 
+  padding: 15px;
 
+  
   overflow-y: scroll;
 
+  overflow-x: hidden;
 
+  /* overflow: hidden; */
 
 }
 
 .top {
 
   display: flex;

+ 16 - 87
src/components/pages/kindStudentEva/test/reportDialog/index.vue
View File 

@@ -1,12 +1,13 @@
 
 <template>
 
-  <el-dialog
 
+  <!-- <el-dialog
 
     title="已关联证据"
 
     :visible.sync="dialogVisibleReport"
 
     :append-to-body="true"
 
     width="1000px"
 
     :before-close="handleClose"
 
     class="dialog_diy"
 
-  >
 
+  > -->
 
+  <div>
 
     <el-table
 
       ref="multipleTable"
 
       :data="tableData"
 
@@ -58,45 +59,20 @@
 
         show-overflow-tooltip
 
       >
 
       </el-table-column>
 
-      <!-- <el-table-column label="操作" align="center" width="175px">
 
-        <template slot-scope="scope">
 
-          <div class="evaluate">
 
-            <div
 
-              class="TableBtn"
 
-              style="color: #3681fc"
 
-              @click="updateCred(scope.row, 0)"
 
-            >
 
-              查看
 
-            </div>
 
-            <div
 
-              class="TableBtn"
 
-              style="color: #3681fc"
 
-              @click="updateCred(scope.row, 1)"
 
-            >
 
-              修改
 
-            </div>
 
-            <div
 
-              class="TableBtn"
 
-              style="color: #ee3e3e"
 
-              @click="delRecord(scope.row)"
 
-            >
 
-              删除
 
-            </div>
 
-          </div>
 
-        </template>
 
-      </el-table-column> -->
 
     </el-table>
 
     <!-- 分页 -->
 
     <el-pagination
 
       @current-change="handleCurrentChange"
 
       background
 
-      :page-size="8"
 
+      :page-size="10"
 
       layout="prev, pager, next"
 
       :total="total"
 
       class="pagination"
 
     >
 
     </el-pagination>
 
-  </el-dialog>
 
+  </div>
 
+
 
+  <!-- </el-dialog> -->
 
 </template>
 
 
 <script>
 
@@ -133,29 +109,22 @@ export default {
 
       total: 0,
 
       // 当前页
 
       page: 1,
 
-      isLoading: true,
 
-
 
+      isLoading: true
 
     };
 
   },
 
   watch: {
 
-    dialogVisibleReport(newVal) {
 
-      if (newVal) {
 
-        this.getData();
 
-      }
 
-    }
 
+    // tid(newVal) {
 
+    //   if (newVal) {
 
+    //     this.getData();
 
+    //   }
 
+    // }
 
   },
 
   methods: {
 
-    handleClose(done) {
 
-      this.close();
 
-      done();
 
-    },
 
-    close() {
 
-      this.$emit("update:dialogVisibleReport", false);
 
-    },
 
     // 获取数据
 
     getData() {
 
+      // console.log(8888888888);
 
       this.isLoading = true;
 
-      this.tableData=[]
 
+      this.tableData = [];
 
       // 获取筛选框数据
 
       let params = {
 
         uid: this.userid,
 
@@ -165,7 +134,7 @@ export default {
 
         cm: this.year,
 
         page: this.page
 
       };
 
-      console.log(params);
 
+      // console.log('// 获取数据', params);
 
       this.ajax
 
         .get(this.$store.state.api + "selectVeidooType", params)
 
         .then(res => {
 
@@ -194,46 +163,6 @@ export default {
 
 </script>
 
 
 <style scoped>
 
-.dialog_diy {
 
-  box-sizing: border-box;
 
-  /* padding: 0 10px 10px 10px; */
 
-}
 
-.dialog_diy >>> .el-dialog {
 
-  /* height: 100%; */
 
-  margin: 10vh auto !important;
 
-}
 
-
 
-.dialog_diy >>> .el-dialog__header {
 
-  background: #454545 !important;
 
-  padding: 15px 20px;
 
-}
 
-
 
-.dialog_diy >>> .el-dialog__body {
 
-  height: calc(100% - 124px);
 
-  box-sizing: border-box;
 
-  /* padding: 0px; */
 
-}
 
-
 
-.dialog_diy >>> .el-dialog__title {
 
-  color: #fff;
 
-}
 
-
 
-.dialog_diy >>> .el-dialog__headerbtn {
 
-  top: 19px;
 
-}
 
-
 
-.dialog_diy >>> .el-dialog__headerbtn .el-dialog__close {
 
-  color: #fff;
 
-}
 
-
 
-.dialog_diy >>> .el-dialog__headerbtn .el-dialog__close:hover {
 
-  color: #fff;
 
-}
 
-
 
-.dialog_diy >>> .el-dialog__body,
 
-.dialog_diy >>> .el-dialog__footer {
 
-  background: #fafafa;
 
-}
 
 .pagination {
 
   display: flex;
 
   justify-content: flex-end;

+ 94 - 35
src/components/pages/kindStudentEva/test/score.vue
View File 

@@ -41,7 +41,7 @@
 
             class="ftype_name"
 
             :style="{
 
               minHeight: scoreJson[item.id].length * 50 + 'px',
 
-              lineHeight: scoreJson[item.id].length * 50 + 'px',
 
+              lineHeight: scoreJson[item.id].length * 50 + 'px'
 
             }"
 
           >
 
             {{ item.name }}
 
@@ -94,15 +94,27 @@
 
         </div>
 
       </div>
 
     </div>
 
-    <reportDialog
 
-      :dialogVisibleReport.sync="dialogVisibleReport"
 
-      :userid="userid"
 
-      :fid="fid"
 
-      :tid="tid"
 
-      :cid="cid"
 
-      :oid="oid"
 
-      :year="year"
 
-    ></reportDialog>
 
+    <el-dialog
 
+      title="已关联证据"
 
+      :visible.sync="dialogVisibleReport"
 
+      :append-to-body="true"
 
+      width="1000px"
 
+      :close-on-click-modal="true"
 
+      :before-close="closePop"
 
+      class="dialog_diy"
 
+    >
 
+      <!-- :dialogVisibleReport.sync="dialogVisibleReport" -->
 
+
 
+      <reportDialog
 
+        ref="dialogRef"
 
+        :userid="userid"
 
+        :fid="fid"
 
+        :tid="tid"
 
+        :cid="cid"
 
+        :oid="oid"
 
+        :year="year"
 
+      ></reportDialog>
 
+    </el-dialog>
 
   </div>
 
 </template>
 
 
@@ -110,21 +122,21 @@
 
 import reportDialog from "./reportDialog/index.vue";
 
 export default {
 
   components: {
 
-    reportDialog,
 
+    reportDialog
 
   },
 
   props: {
 
     userid: {
 
-      type: String,
 
+      type: String
 
     },
 
     oid: {
 
-      type: String,
 
+      type: String
 
     },
 
     org: {
 
-      type: String,
 
+      type: String
 
     },
 
     cid: {
 
-      type: String,
 
-    },
 
+      type: String
 
+    }
 
   },
 
   data() {
 
     return {
 
@@ -135,12 +147,12 @@ export default {
 
       scoreJson: {},
 
       dialogVisibleReport: false,
 
       fid: "",
 
-      tid: "",
 
+      tid: ""
 
     };
 
   },
 
   computed: {
 
     getStarSum() {
 
-      return function (id, iid, i) {
 
+      return function(id, iid, i) {
 
         let sum = 0;
 
         for (var k = 0; k < this.scoreJson[id][i][iid].length; k++) {
 
           sum += this.scoreJson[id][i][iid][k];
 
@@ -148,9 +160,12 @@ export default {
 
 
         return (sum / this.scoreJson[id][i][iid].length).toFixed(1);
 
       };
 
-    },
 
+    }
 
   },
 
   methods: {
 
+    closePop() {
 
+      this.dialogVisibleReport = false;
 
+    },
 
     searchStudentScore() {
 
       this.isLoading = true;
 
       this.scoreType = [];
 
@@ -159,11 +174,11 @@ export default {
 
         uid: this.userid,
 
         oid: this.oid,
 
         org: this.org,
 
-        cu: this.year,
 
+        cu: this.year
 
       };
 
       this.ajax
 
         .get(this.$store.state.api + "selectSETable", params)
 
-        .then((res) => {
 
+        .then(res => {
 
           var table = res.data[0]; //个人学期评分
 
           var ftype = res.data[1]; //公共父级分类
 
           var stype = res.data[2]; //公共子级分类
 
@@ -202,14 +217,14 @@ export default {
 
             this.scoreJson = JSON.parse(table[0].json);
 
           } else {
 
             var scoreJson = {};
 
-            allfType.forEach((itemA) => {
 
+            allfType.forEach(itemA => {
 
               scoreJson[itemA.id] = [];
 
-              allsType.forEach((itemB) => {
 
+              allsType.forEach(itemB => {
 
                 if (itemB.pid === itemA.id) {
 
                   scoreJson[itemA.id].push({
 
                     [itemB.id]: [0, 0, 0],
 
                     sname: itemB.name,
 
-                    id: itemB.id,
 
+                    id: itemB.id
 
                   });
 
                 }
 
               });
 
@@ -218,7 +233,7 @@ export default {
 
           }
 
           this.scoreType = allfType;
 
         })
 
-        .catch((err) => {
 
+        .catch(err => {
 
           this.isLoading = false;
 
           console.error(err);
 
         });
 
@@ -227,7 +242,7 @@ export default {
 
       this.isLoading = true;
 
       this.ajax
 
         .get(this.$store.state.api + "selectTerm")
 
-        .then((res) => {
 
+        .then(res => {
 
           this.isLoading = false;
 
           var yearJuri = res.data[0];
 
           for (var i = 0; i < yearJuri.length; i++) {
 
@@ -237,10 +252,8 @@ export default {
 
           }
 
           this.yearJuri = yearJuri;
 
           this.searchStudentScore();
 
-
 
-
 
         })
 
-        .catch((err) => {
 
+        .catch(err => {
 
           this.isLoading = false;
 
           console.error(err);
 
         });
 
@@ -253,31 +266,77 @@ export default {
 
       this.fid = fid;
 
       this.tid = tid;
 
       this.dialogVisibleReport = true;
 
+      this.$nextTick(() => {
 
+        this.$refs.dialogRef.getData();
 
+      });
 
     },
 
     saveSRJson() {
 
       let params = {
 
         uid: this.userid,
 
         j: JSON.stringify(this.scoreJson),
 
-        t: this.year,
 
+        t: this.year
 
       };
 
       this.ajax
 
         .get(this.$store.state.api + "addSRScore", params)
 
-        .then((res) => {
 
+        .then(res => {
 
           this.$message.success("保存成功!");
 
           this.searchStudentScore();
 
         })
 
-        .catch((err) => {
 
+        .catch(err => {
 
           console.error(err);
 
         });
 
-    },
 
+    }
 
   },
 
   mounted() {
 
+    // this.$nextTick(()=>{
 
+    //   console.log(this.$refs.dialogRef);
 
+    // })
 
     this.getYear();
 
-  },
 
+  }
 
 };
 
 </script>
 
 
 <style scoped>
 
+.dialog_diy {
 
+  box-sizing: border-box;
 
+  /* padding: 0 10px 10px 10px; */
 
+}
 
+.dialog_diy >>> .el-dialog {
 
+  /* height: 100%; */
 
+  margin: 10vh auto !important;
 
+}
 
+
 
+.dialog_diy >>> .el-dialog__header {
 
+  background: #454545 !important;
 
+  padding: 15px 20px;
 
+}
 
+
 
+.dialog_diy >>> .el-dialog__body {
 
+  height: calc(100% - 124px);
 
+  box-sizing: border-box;
 
+  /* padding: 0px; */
 
+}
 
+
 
+.dialog_diy >>> .el-dialog__title {
 
+  color: #fff;
 
+}
 
+
 
+.dialog_diy >>> .el-dialog__headerbtn {
 
+  top: 19px;
 
+}
 
+
 
+.dialog_diy >>> .el-dialog__headerbtn .el-dialog__close {
 
+  color: #fff;
 
+}
 
+
 
+.dialog_diy >>> .el-dialog__headerbtn .el-dialog__close:hover {
 
+  color: #fff;
 
+}
 
+
 
+.dialog_diy >>> .el-dialog__body,
 
+.dialog_diy >>> .el-dialog__footer {
 
+  background: #fafafa;
 
+}
 
 .scoreBox {
 
   background: #fff;
 
   border-radius: 10px;
 
@@ -477,4 +536,4 @@ export default {
 
   border-radius: 5px;
 
   float: right;
 
 }
 
-</style>
 
+</style>

+ 2 - 3
src/components/pages/scourse.vue
View File 

@@ -147,7 +147,6 @@
 
         </div>
 
       </div>
 
     </div>
 
-    <div class="line"></div>
 
     <div class="student_page">
 
       <el-pagination background layout="prev, pager, next" :page-size="pageSize" :total="total"
 
         v-if="page && course.length" style="padding-bottom: 20px" @current-change="handleCurrentChange"></el-pagination>
 
@@ -888,7 +887,7 @@ export default {
 
 }
 
 
 .student_table {
 
-  padding: 20px 0;
 
+  padding: 20px 0 0;
 
   height: 100%;
 
   /* overflow: auto; */
 
   min-height: 360px;
 
@@ -952,7 +951,7 @@ export default {
 
 }
 
 
 .student_page {
 
-  width: 95%;
 
+  width: 100%;
 
   margin: 0 auto;
 
 }

File diff suppressed because it is too large
+ 744 - 847
src/components/pages/student/addCourseXin.vue


+ 2 - 2
src/components/pages/student/course.vue
View File 

@@ -880,7 +880,7 @@ export default {
 
 }
 
 
 .student_table {
 
-  padding: 20px 0;
 
+  padding: 20px 0 0;
 
   height: 100%;
 
   /* overflow: auto; */
 
   min-height: 360px;
 
@@ -944,7 +944,7 @@ export default {
 
 }
 
 
 .student_page {
 
-  width: 95%;
 
+  width: 100%;
 
   margin: 0 auto;
 
 }

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