04/21 10:50

111

dist/static/css/chunk-1d38d566.184e5f43.css → dist/static/css/chunk-6b228c42.f732baea.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.wrap[data-v-4d83a936]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-4d83a936]{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-4d83a936],.wrap .rightCell[data-v-4d83a936]{width:300px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;line-height:50px}.wrap .rightCell[data-v-4d83a936]{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap .rightCell p[data-v-4d83a936]{margin-right:30px}[data-v-4d83a936] .el-tag{cursor:pointer}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.wrap[data-v-46d18c34]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-46d18c34]{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-46d18c34],.wrap .rightCell[data-v-46d18c34]{width:300px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;line-height:50px}.wrap .rightCell[data-v-46d18c34]{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap .rightCell p[data-v-46d18c34]{margin-right:30px}[data-v-46d18c34] .el-tag{cursor:pointer}

src/views/afterSchoolManager/afterSchoolTeach.vue

@@ -168,7 +168,8 @@ export default {
         actualExercisesNumIsAchieve: null, // 训练次数
         exercisesMessageNumIsAchieve: null, //评价
         exercisesMessageTimelyNumIsAchieve: null, //及时评价
-        exercisesReplyNumIsAchieve: null // 提交次数
+        exercisesReplyNumIsAchieve: null, // 提交次数
+        teacherId:null
       },
       organList: [],
       teacherList: [],
@@ -204,8 +205,10 @@ export default {
   },
   methods: {
     init() {
-      if(this.$route.query.teacherName){
-        this.searchForm.search = this.$route.query.teacherName
+      if(this.$route.query.teacherId){
+        this.searchForm.teacherId = this.$route.query.teacherId
+      }else{
+        this.searchForm.teacherId = null
       }
       this.getList();
     },
@@ -221,6 +224,7 @@ export default {
         exercisesReplyNumIsAchieve:
           this.searchForm.exercisesReplyNumIsAchieve || null, // 提交次数
         organIdList: this.searchForm.organIdList || null,
+        teacherId:this.searchForm.teacherId,
         page: this.rules.page,
         rows: this.rules.limit
       };
@@ -251,7 +255,8 @@ export default {
         actualExercisesNumIsAchieve: null, // 训练次数
         exercisesMessageNumIsAchieve: null, //评价
         exercisesMessageTimelyNumIsAchieve: null, //及时评价
-        exercisesReplyNumIsAchieve: null // 提交次数
+        exercisesReplyNumIsAchieve: null, // 提交次数
+        teacherId:null
       };
       this.search();
     },

src/views/evaluateManager/networkList.vue

@@ -78,6 +78,12 @@
       </el-form-item>
       <!-- homeWorkReplied -->
       <el-form-item>
+        <el-select placeholder="布置作业" v-model="searchForm.assignHomework" clearable>
+          <el-option label="是" value="1"></el-option>
+          <el-option label="否" value="0"></el-option>
+        </el-select>
+      </el-form-item>
+          <el-form-item>
         <el-select placeholder="回复作业" v-model="searchForm.homeWorkReplied" clearable>
           <el-option label="是" value="1"></el-option>
           <el-option label="否" value="0"></el-option>
@@ -135,6 +141,11 @@
             <div>{{scope.row.reviewId>0?'是':'否'}}</div>
           </template>
         </el-table-column>
+         <el-table-column align="center" label="布置作业">
+          <template slot-scope="scope">
+            <div>{{scope.row.assignHomework?'是':'否'}}</div>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="提交作业">
           <template slot-scope="scope">
             <div>{{scope.row.handHomework?'是':'否'}}</div>
@@ -312,6 +323,7 @@ export default {
         courseReview: null,
         hasArrived: null,
         homeWorkReplied: null,
+        assignHomework:null,
         month: []
       },
       organList: [],
@@ -397,6 +409,7 @@ export default {
       obj.courseReview = this.searchForm.courseReview || null;
       obj.hasArrived = this.searchForm.hasArrived || null;
       obj.homeWorkReplied = this.searchForm.homeWorkReplied || null;
+      obj.assignHomework = this.searchForm.assignHomework || null;
       obj.search = this.searchForm.search;
       if (this.searchForm.month&&this.searchForm.month.length > 0) {
         obj.startTime = this.searchForm.month[0];
@@ -466,7 +479,8 @@ export default {
         courseReview: null,
         month: null,
         hasArrived: null,
-        homeWorkReplied: null
+        homeWorkReplied: null,
+        assignHomework:null
       };
       var now = new Date();
 
@@ -516,6 +530,7 @@ export default {
       this.searchForm.homeWorkReplied
         ? (obj.homeWorkReplied = this.searchForm.homeWorkReplied)
         : null;
+      this.searchForm.assignHomework?obj.assignHomework=this.searchForm.assignHomework:null
      if (this.searchForm.month&&this.searchForm.month.length > 0) {
         obj.startTime = this.searchForm.month[0];
         obj.endTime = this.searchForm.month[1];

src/views/teacherManager/teacherList.vue

@@ -455,7 +455,7 @@ export default {
       // 需要的参数 id
       this.$router.push({
         path: "/business/afterSchoolManager",
-        query: { teacherName: row.realName, activeIndex: "2" }
+        query: { teacherId: row.id, activeIndex: "2" } 
       });
     },
     gotoOperating(row) {