Browse Source

Revert "班主任分班--选中"

This reverts commit 44ea4b2ddaccd09d7446b3654e032cb09b0d9032.
shilipojs 2 years ago
parent
commit
ba41784271

+ 5 - 1
src/views/elective/master/components/choose-class.vue

@@ -41,7 +41,11 @@ export default{
   },
   methods: {
     confirm() {
-      // todo 接口
+      this.activeClass.newClassId =  this.value
+      this.activeClass.newClassName =  this.getClassName(this.value)
+      this.activeClass.newMasterId =  this.activeClass.prevMasterId
+      this.activeClass.newMasterName =  this.activeClass.prevMasterName
+      this.dialogVisible = false
     },
     enable(row){
       console.log(row)

+ 2 - 8
src/views/elective/master/components/choose-master-teacher.vue

@@ -3,7 +3,7 @@
     :visible.sync="dialogVisible"
     width="80%"
   >
-    <teacher-manage v-model="activeTeacherHead"></teacher-manage>
+    <teacher-manage></teacher-manage>
     <span slot="footer" class="dialog-footer">
       <el-button @click="dialogVisible = false">取 消</el-button>
       <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
@@ -19,13 +19,7 @@ export default  {
   },
   data() {
     return {
-      dialogVisible: false,
-      activeTeacherHead: {}
-    }
-  },
-  methods: {
-    open(row){
-      this.activeTeacherHead = row
+      dialogVisible: false
     }
   }
 }

+ 2 - 18
src/views/permission/components/mx-teacher-info.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-card shadow="hover" class="selected relative">
+  <el-card shadow="hover">
     <div class="fx-row fx-bet-cen">
       <div class="fx-column fx-cen-cen">
         <el-image :src="avatar||defaultAvatar" class="icon80 rd40 mb10"></el-image>
@@ -11,10 +11,6 @@
         <div v-if="classes" class="light f13 f-999 mt5" style="word-break: break-all">{{ classes }}</div>
       </div>
     </div>
-    <div class="icon-wrap">
-      <i class="el-icon-success active" v-if="selected"></i>
-      <i class="el-icon-success" v-else></i>
-    </div>
   </el-card>
 </template>
 
@@ -26,10 +22,6 @@ export default {
       type: String,
       default: ''
     },
-    selected: {
-      type: Boolean,
-      default: false
-    },
     name: {
       type: String,
       default: ''
@@ -56,13 +48,5 @@ export default {
 </script>
 
 <style scoped>
-.icon-wrap{
-  position: absolute;
-  right: 8px;
-  cursor: pointer;
-  top: 8px;
-}
-.active{
-  color: #42b983;
-}
+
 </style>

+ 1 - 4
src/views/permission/teacher-manage.vue

@@ -11,7 +11,7 @@
               <div class="f14 f-666 mb5">班主任</div>
               <el-row :gutter="12">
                 <el-col :span="6" v-for="(item,index) in group.headteachers" :key="index" class="mb12">
-                  <mx-teacher-info :selected="true" :avatar="item.avatar" :name="item.nickName" content-height="90px"
+                  <mx-teacher-info :avatar="item.avatar" :name="item.nickName" content-height="90px"
                                    :classes="intersectGradeClass(item.headteacherClassNames, group.grade).toString()">
                   </mx-teacher-info>
                 </el-col>
@@ -51,9 +51,6 @@ export default {
     MxCondition,
     MxTeacherInfo
   },
-  props: {
-    activeTeacherHead: {} // 激活的班主任
-  },
   data() {
     return {
       queryParams: {