Merge branch 'master' of http://git.cc-lotus.info/new_train/train-student

src/layout/class/achieveList/homeworkAchiece.vue

@@ -69,7 +69,6 @@ export default {
       this.showPicker = false;
     },
     clickcds(id) {
-      console.log(id);
       this.$emit('submitss', { id: id });
     },
     clickBtn(id, name, score) {

src/layout/class/groupList.vue

@@ -38,19 +38,13 @@
             </template>
             <el-col :span="8" class="studentslist" v-for="(itemStrudent, indexStudent) in item.students" :key="indexStudent">
               <el-col :span="24" @click.native="openClick(item, itemStrudent)">
-                {{ itemStrudent.stuname }}({{ itemStrudent.type == '1' ? ' 组长' : '组员' }})
+                <span> {{ itemStrudent.stuname }}({{ itemStrudent.type == '1' ? ' 组长' : '组员' }})</span>
               </el-col>
             </el-col>
             <van-dialog v-model="show" title="选择组长" :showConfirmButton="false">
               <van-form @submit="onSubmit">
-                <van-field readonly clickable name="picker" :value="value" label="选择器" placeholder="点击选择组长" @click="showPicker = true" />
+                <van-field readonly clickable name="picker" :value="value" label="选择组长" placeholder="点击选择组长" @click="showPicker = true" />
 
-                <van-field name="radio" label="学生职务">
-                  <van-radio-group v-model="form.type" direction="horizontal" slot="input">
-                    <van-radio name="0">组员</van-radio>
-                    <van-radio name="1">组长</van-radio>
-                  </van-radio-group>
-                </van-field>
                 <div style="margin:16px,16px,0,16px;text-align:center">
                   <van-button type="info">提交</van-button>
                 </div>
@@ -87,9 +81,7 @@ export default {
     column: ['组员', '组长'],
     showPicker: false,
   }),
-  created() {
-    console.log(this.user.job);
-  },
+  created() {},
   computed: {
     ...mapState(['user']),
     userid() {
@@ -136,22 +128,17 @@ export default {
           // on cancel
         });
     },
-
     openClick(item) {
       this.$emit('opanSubmit', item);
     },
     onSubmit() {
       this.$emit('onSubmit', { data: this.form });
     },
-
     onConfirm(value, index) {
-      console.log(value);
       this.value = value.stuname;
-      console.log(this.value);
       this.showPicker = false;
       this.$emit('onvalue', { value });
     },
-
     onConfirms(value) {},
   },
 };

src/layout/class/headStuList.vue

@@ -1,96 +0,0 @@
-<template>
-  <div id="headStuList">
-    <el-row type="flex" justify="center" style="padding:10px 0">
-      <el-col :span="6">
-        <el-button type="primary" plain size="mini" @click.native="$router.push({ path: '/class/achieve', query: { classid: $attrs.classid } })">
-          查看平时成绩
-        </el-button>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24" class="info">
-        <el-col :span="6" class="list" v-for="(item, index) in headStuList" :key="index" @click.native="clickAssign(item)">
-          <p class="name" :style="`font-size:${changeNum(item.name)}px`">{{ item.name }}</p>
-          <p class="job" v-if="item.job">{{ item.job }}<i class="el-icon-circle-check"></i></p>
-        </el-col>
-      </el-col>
-    </el-row>
-    <el-dialog title="指派职务" width="90%" :visible.sync="assignShow" :before-close="handleClose">
-      <el-form :model="assignForm">
-        <el-form-item label="学生姓名">
-          {{ assignForm.name }}
-        </el-form-item>
-        <el-form-item label="学生职务">
-          <el-select v-model="assignForm.job" placeholder="请选择学生职务">
-            <el-option v-for="(item, index) in job_list" :key="index" :label="item.name" :value="item.name"></el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="outAssignShow">取 消</el-button>
-        <el-button type="primary" @click="onAssignShow">确 定</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'headStuList',
-  props: {
-    headStuList: null,
-    assignForm: null,
-    assignShow: null,
-    job_list: null,
-  },
-  components: {},
-  data: () => ({}),
-  created() {},
-  computed: {},
-  methods: {
-    clickAssign(item) {
-      let id = item.id;
-
-      this.$emit('assign', { id, item });
-    },
-    outAssignShow() {
-      this.$emit('outForm');
-    },
-    onAssignShow(id) {
-      this.$emit('onForm', { data: this.assignForm });
-    },
-    handleClose() {
-      this.$emit('handleClose');
-    },
-    changeNum(name) {
-      if (name.length >= 5) {
-        return 10;
-      } else {
-        return 15;
-      }
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-p {
-  padding: 0;
-  margin: 0;
-}
-.info {
-  margin: 15px 0 0 0;
-}
-.list {
-  text-align: center;
-  border: 1px solid #2c69fe;
-  width: 70px;
-  margin: 0 11px 10px 12px;
-  padding: 5px 0px;
-  border-radius: 10px;
-}
-.list .job {
-  font-size: 10px;
-  color: #405ffe;
-}
-</style>

src/layout/class/nameList/stuNameList.vue

@@ -88,10 +88,10 @@ export default {
 
     submitinfo(item) {
       // this.value = item.job;
-      console.log(this.stuNameList);
+
       var wenyi = this.stuNameList.filter(item => item.job == '文艺委员');
       var anquan = this.stuNameList.filter(item => item.job == '安全委员');
-      console.log('ccc');
+
       // this.value = item.job;
       // this.columns = this.column1;
       if (wenyi.length == '1') {
@@ -99,12 +99,9 @@ export default {
           if (item.job == '文艺委员') {
             this.columns = this.column1;
           } else {
-            console.log('2313');
             this.columns = this.column3;
           }
         } else if (anquan.length == '1') {
-          console.log('c');
-
           if (item.job == '普通学生') {
             this.columns = this.column4;
           } else if (item.job == '安全委员') {
@@ -115,7 +112,6 @@ export default {
         }
       } else if (wenyi.length == '0') {
         if (anquan.length == '0') {
-          console.log('cc3123');
           this.columns = this.column1;
         } else if (anquan.length == 1) {
           if (item.job == '安全委员') {
@@ -135,8 +131,6 @@ export default {
     },
 
     onConfirm(job) {
-      console.log(job);
-
       this.$set(this.newform, `job`, job);
 
       this.showPicker = false;

src/layout/class/noGroup.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24" class="topTitle"><span>未分组学生</span></el-col>
       <el-col :span="6" class="list" v-for="(item, index) in noGroupStudentNames" :key="index">
-        {{ item }}
+        {{ item.name }}
       </el-col>
     </el-row>
   </div>

src/layout/common/classInfo.vue

@@ -1,108 +0,0 @@
-<template>
-  <div id="classInfo">
-    <el-row>
-      <el-col :span="24" class="info">
-        <el-col :span="24" class="top">
-          <span>第{{ info.termid }}期</span>
-          <span>第{{ info.batchid }}批次</span>
-          <span>{{ info.name }}班</span>
-        </el-col>
-        <el-col :span="24" class="lesson">
-          <el-table :data="info.lessonid" style="width: 100%" border>
-            <el-table-column prop="date" label="日期" width="100px" align="center"> </el-table-column>
-            <el-table-column prop="week" label="星期" align="center"> </el-table-column>
-            <el-table-column prop="subname" label="课程" align="center"> </el-table-column>
-            <el-table-column prop="teaname" label="任课教师" align="center"> </el-table-column>
-          </el-table>
-        </el-col>
-        <el-col :span="24" class="otherInfo">
-          <!-- <van-field v-model="info.headteacherid" label="班主任" readonly />
-          <van-field v-model="info.lyteacherid" label="礼仪课教师" readonly />
-          <van-field v-model="info.jslocationid" label="教室地点" readonly />
-          <van-field v-model="info.kbyslocationid" label="开班地点" readonly />
-          <van-field v-model="info.kzjhlocationid" label="拓展训练地点" readonly />
-          <van-field v-model="info.yclocationid" label="用餐地点" readonly /> -->
-          <p>
-            <span class="title">班主任：</span>
-            <span class="name">{{ info.headteacherid }}</span>
-          </p>
-          <p>
-            <span class="title">礼仪课教师：</span>
-            <span class="name">{{ info.lyteacherid }}</span>
-          </p>
-          <p>
-            <span class="title">教室地点：</span>
-            <span class="name">{{ info.jslocationid }}</span>
-          </p>
-          <p>
-            <span class="title">开班地点：</span>
-            <span class="name">{{ info.kbyslocationid }}</span>
-          </p>
-          <p>
-            <span class="title">拓展训练地点：</span>
-            <span class="name">{{ info.kzjhlocationid }}</span>
-          </p>
-          <p>
-            <span class="title">用餐地点：</span>
-            <span class="name">{{ info.yclocationid }}</span>
-          </p>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'classInfo',
-  props: {
-    info: null,
-  },
-  components: {},
-  data: () => ({}),
-  created() {},
-  computed: {},
-  methods: {},
-};
-</script>
-
-<style lang="less" scoped>
-p {
-  padding: 0;
-  margin: 0;
-}
-.info {
-  padding: 0 15px;
-}
-.top {
-  padding: 15px 0;
-}
-.top span {
-  font-size: 16px;
-}
-/deep/.el-table td {
-  padding: 10px 0;
-}
-/deep/.el-table th {
-  padding: 5px 0;
-  background-color: #f7f7f7;
-}
-.lesson {
-  margin: 0 0 15px 0;
-}
-/deep/.van-field__label {
-  width: 100px;
-}
-.otherInfo p {
-  padding: 14px 0;
-}
-.otherInfo p .title {
-  padding: 0 0 0 20px;
-  width: 120px;
-  display: inline-block;
-}
-.otherInfo p .name {
-  color: #616161;
-  padding: 0 0;
-}
-</style>

src/layout/common/topTitle.vue

@@ -22,7 +22,6 @@ export default {
   computed: {},
   methods: {
     onClickLeft() {
-      console.log('a');
       this.$router.push({ path: '/user/index' });
     },
   },

src/layout/user/clickBtn.vue

@@ -26,9 +26,7 @@ export default {
   props: {},
   components: {},
   data: () => ({}),
-  created() {
-    console.log(this.user.type);
-  },
+  created() {},
   computed: {
     ...mapState(['user']),
   },

src/layout/user/pingfen.vue

@@ -35,9 +35,7 @@ export default {
     column: ['杭州', '宁波', '温州', '嘉兴', '湖州'],
     showPicker: false,
   }),
-  created() {
-    console.log(this.user.job);
-  },
+  created() {},
   computed: {
     ...mapState(['user']),
     userid() {
@@ -53,15 +51,11 @@ export default {
     },
 
     onConfirm(value, index) {
-      console.log(value);
       this.value = value;
-      console.log(this.value);
       this.showPicker = false;
       this.$emit('onvalue', { value });
     },
     save(item) {
-      console.log();
-
       this.$emit('queren', item);
     },
     onConfirms(value) {},

src/layout/user/stuleaveList.vue

@@ -1,116 +0,0 @@
-<template>
-  <div id="stuleaveList">
-    <el-row>
-      <el-col :span="24">
-        <el-col :span="24" class="list" v-for="(item, index) in stuleaveList" :key="index">
-          <el-col :span="18" class="name">
-            <p>{{ item.name }}</p>
-          </el-col>
-          <el-col :span="6" class="btn">
-            <el-link :underline="false" @click="clickShow(item.id)">请假信息</el-link>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-    <van-overlay :show="show" @click="clickDown">
-      <div class="wrapper" @click="clickDown">
-        <el-col :span="24" class="leaveInfo">
-          <p class="jilu">请假记录</p>
-
-          <el-col :span="24" class="info">
-            <template v-if="leaveInfo.length > 0">
-              <el-col :span="24" class="leavelist" v-for="(item, index) in leaveInfo" :key="index">
-                <el-col :span="14" class="date">
-                  <p>开始时间：{{ item.starttime }}</p>
-                  <p>结束时间：{{ item.endtime }}</p>
-                </el-col>
-                <el-col :span="10" class="status"
-                  ><p>审核结果：{{ item.status == 0 ? '审核中' : item.status == 1 ? '通过' : '未通过' }}</p>
-                </el-col>
-              </el-col>
-            </template>
-
-            <template v-if="leaveInfo.length == 0">
-              <el-col :span="24" class="leavelist" style="text-align:center">
-                <p>暂无请假记录</p>
-              </el-col>
-            </template>
-          </el-col>
-        </el-col>
-      </div>
-    </van-overlay>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'stuleaveList',
-  props: {
-    stuleaveList: null,
-    leaveInfo: null,
-    show: null,
-  },
-  components: {},
-  data: () => ({}),
-  created() {},
-  computed: {},
-  methods: {
-    clickShow(id) {
-      this.$emit('clickShow', id);
-    },
-    clickDown() {
-      this.$emit('clickDown');
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-p {
-  padding: 0;
-  margin: 0;
-}
-.list {
-  margin: 10px 10px 0 10px;
-  background: #fff;
-  width: 95%;
-  padding: 10px;
-  border-radius: 10px;
-}
-.list .name {
-  padding: 5px 0;
-}
-.list .btn {
-  padding: 5px 0;
-  text-align: center;
-}
-.wrapper {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-}
-.leaveInfo {
-  width: 90%;
-  background: #ffffff;
-  padding: 0 0 10px 0;
-  border-radius: 10px;
-}
-.info {
-  height: 450px;
-  overflow-y: auto;
-}
-.jilu {
-  text-align: center;
-  padding: 10px 0;
-}
-.leavelist {
-  padding: 10px 10px 0 10px;
-}
-.leavelist .date p {
-  padding: 0;
-}
-.leavelist .status {
-  padding: 10px 0;
-}
-</style>

src/router/index.js

@@ -17,11 +17,7 @@ const routes = [
     meta: { title: '测试页', isleftarrow: true },
     component: () => import('../views/bind/confirm.vue'),
   },
-  // 班级信息
-  {
-    path: '/classinfo',
-    component: () => import('../views/classinfo.vue'),
-  },
+
   // 填写学生绑定信息
   {
     path: '/bind',
@@ -34,12 +30,7 @@ const routes = [
     meta: { title: '班級名单', isleftarrow: true },
     component: () => import('../views/class/index.vue'),
   },
-  // 班主任查看班级学生信息-指派学生职位
-  {
-    path: '/class/classStuList',
-    meta: { title: '班级信息', isleftarrow: true },
-    component: () => import('../views/class/classStuList.vue'),
-  },
+
   // 教师评分
   {
     path: '/teacherscore/index',
@@ -64,7 +55,7 @@ const routes = [
     component: () => import('../views/class/joinGroup.vue'),
   },
 
-  //教师学生详情
+  //学生详情
   {
     path: '/class/stuDetail',
     meta: { title: '学生详情', isleftarrow: true },
@@ -133,12 +124,6 @@ const routes = [
     component: () => import('../views/user/checkWork.vue'),
   },
 
-  // 个人信息(班主任)-学生请假列表
-  {
-    path: '/user/stuLeave',
-    meta: { title: '请假管理-学生请假列表', isleftarrow: true },
-    component: () => import('../views/user/stuLeave.vue'),
-  },
   //作业管理
   {
     path: '/user/homework',
@@ -176,47 +161,6 @@ const routes = [
     component: () => import('../views/user/pingfenclass.vue'),
   },
 
-  //个人信息-退出审请
-  // {
-  //   path: '/user/quit',
-  //   meta: { title: '退出', isleftarrow: true },
-  //   component: () => import('../views/user/quit.vue'),
-  // },
-
-  //个人信息-班主任退出管理学生列表
-  // {
-  //   path: '/user/stuquit',
-  //   meta: { title: '退出学生列表', isleftarrow: true },
-  //   component: () => import('../views/user/stuquit.vue'),
-  // },
-
-  // //学生退出申请
-  // {
-  //   path: '/user/quitReason',
-  //   meta: { title: '退出申请', isleftarrow: true },
-  //   component: () => import('../views/user/quitReason.vue'),
-  // },
-  // //个人信息-班主任退出管理
-  // {
-  //   path: '/user/teaquit',
-  //   meta: { title: '退出管理', isleftarrow: true },
-  //   component: () => import('../views/user/teaquit.vue'),
-  // },
-
-  // //个人信息-班主任查看任课教师
-  // {
-  //   path: '/user/teacher',
-  //   meta: { title: '任课教师列表', isleftarrow: true },
-  //   component: () => import('../views/user/teacher.vue'),
-  // },
-
-  // //个人信息-班主任查看任课教师
-  // {
-  //   path: '/user/teacherdetail',
-  //   meta: { title: '任课教师列表', isleftarrow: true },
-  //   component: () => import('../views/user/teacherdetail.vue'),
-  // },
-
   //正在登陆
   {
     path: '/login',

src/views/class/achieve.vue

@@ -112,7 +112,7 @@ export default {
 
       for (const accc of result.data) {
         var arr = res.data.filter(item => item.id === accc.studentid);
-        console.log(arr);
+
         this.$set(this, `achieveList`, arr);
       }
     },
@@ -159,9 +159,7 @@ export default {
           acc.stores = aaa.selfscore;
         }
         let asd = group.data.students.map(i => i.stores);
-        console.log(asd);
         let nes = asd.filter(d => d);
-        console.log(nes);
         let snewcore = eval(nes.join('+'));
         this.groupsocre = snewcore;
       }
@@ -214,15 +212,11 @@ export default {
     },
     //为了获取当前点击学生id和当前学生上传的作业
     async onsist({ id }) {
-      console.log(this.homework);
       const result = await this.uploadtasklist({ studentid: id });
-      console.log(result.data);
 
       this.$set(this, `lesson`, result.data);
     },
     async opensave({ id, name, score }) {
-      console.log(id);
-
       this.show = true;
       this.$set(this, `names`, name);
       this.$set(this.form, `score`, score);
@@ -230,7 +224,6 @@ export default {
     },
     async onsave(form) {
       this.form.id = this.taskid;
-      console.log(this.form);
 
       let res = await this.uploadtaskupdate(this.form);
       this.show = false;

src/views/class/classStuList.vue

@@ -1,202 +0,0 @@
-<template>
-  <div id="classStuList">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <headStuList
-            :headStuList="headStuList"
-            :assignShow="assignShow"
-            :assignForm="assignForm"
-            :job_list="job_list"
-            @assign="clickAssign"
-            @outForm="outAssignShow"
-            @onForm="onAssignShow"
-            @handleClose="handleClose"
-            :classid="this.id"
-          ></headStuList>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import NavBar from '@/layout/common/topInfo.vue';
-import headStuList from '@/layout/class/headStuList.vue';
-import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
-const { mapActions: mapStudent } = createNamespacedHelpers('student');
-export default {
-  name: 'classStuList',
-  props: {},
-  components: {
-    NavBar, //头部导航
-    headStuList, //学生列表
-  },
-  data: () => ({
-    headStuList: [],
-    assignShow: false,
-    assignForm: {},
-    job_list: [],
-
-    job1: [
-      {
-        name: '班长',
-      },
-      {
-        name: '学委',
-      },
-      {
-        name: '普通学生',
-      },
-    ],
-    job2: [
-      {
-        name: '班长',
-      },
-
-      {
-        name: '普通学生',
-      },
-    ],
-
-    job3: [
-      {
-        name: '学委',
-      },
-
-      {
-        name: '普通学生',
-      },
-    ],
-
-    job4: [
-      {
-        name: '普通学生',
-      },
-    ],
-
-    title: '',
-    isleftarrow: '',
-    navShow: true,
-  }),
-  created() {
-    this.searchInfo();
-  },
-  computed: {
-    id() {
-      return this.$route.query.id;
-    },
-    ...mapState(['user']),
-  },
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-  watch: {
-    $route(to, from) {
-      this.title = to.meta.title;
-      this.isleftarrow = to.meta.isleftarrow;
-    },
-  },
-  methods: {
-    ...mapStudent({ list: 'query', add: 'create', fet: 'fetch', updates: 'update' }),
-    // 查询学生列表-并带有职务
-    async searchInfo() {
-      let classid = this.id;
-      const res = await this.list({ classid });
-      console.log(res.data);
-
-      if (this.$checkRes(res)) {
-        this.$set(this, `headStuList`, res.data);
-      }
-    },
-    //点击派遣
-    async clickAssign({ id, item }) {
-      var banzhang = this.headStuList.filter(item => item.job == '班长');
-      var xuewei = this.headStuList.filter(item => item.job == '学委');
-      console.log(banzhang);
-      console.log(xuewei.length);
-
-      if (xuewei.length == '1') {
-        if (banzhang.length == '2') {
-          if (item.job == '班长') {
-            this.$set(this, `job_list`, this.job2);
-          } else if (item.job == '学委') {
-            this.$set(this, `job_list`, this.job3);
-          } else {
-            this.$set(this, `job_list`, this.job4);
-          }
-        } else if (banzhang.length < '2') {
-          console.log('cc');
-
-          if (item.job == '学委') {
-            this.$set(this, `job_list`, this.job1);
-          } else {
-            this.$set(this, `job_list`, this.job2);
-          }
-        } else if (xuewei.length == '0') {
-        }
-      } else if (xuewei.length == '0') {
-        console.log('a');
-
-        if (banzhang.length == '0') {
-          this.$set(this, `job_list`, this.job1);
-        } else if (banzhang.length == '2') {
-          if (item.job == '班长') {
-            this.$set(this, `job_list`, this.job1);
-          } else {
-            this.$set(this, `job_list`, this.job3);
-          }
-        } else {
-          this.$set(this, `job_list`, this.job1);
-        }
-      }
-
-      this.assignShow = true;
-      const res = await this.fet(id);
-      this.$set(this, `assignForm`, res.data);
-    },
-    //指派职务
-    async onAssignShow(assignForm) {
-      console.log(assignForm);
-
-      let data = this.assignForm;
-
-      let res = await this.updates(data);
-      if (this.$checkRes(res)) {
-        this.$message({
-          message: '成功',
-          type: 'success',
-        });
-      }
-      this.outAssignShow();
-      this.searchInfo();
-    },
-    outAssignShow() {
-      this.assignShow = false;
-    },
-    handleClose() {
-      this.assignShow = false;
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-}
-.main {
-  min-height: 570px;
-}
-</style>

src/views/class/group.vue

@@ -72,7 +72,7 @@ export default {
       this.$set(this, `groupList`, res.data);
     },
     async onSubmit(form) {
-      console.log('cc');
+
 
       this.form.termid = this.user.termid;
       this.form.batchid = this.user.batchid;

src/views/class/index.vue

@@ -79,6 +79,8 @@ export default {
     title: '',
     isleftarrow: '',
     navShow: true,
+    //组中学生信息
+    gstuList: [],
   }),
   async created() {
     await this.searchstu();
@@ -112,7 +114,6 @@ export default {
     },
     //班长分配班委会成员
     async newsubmit({ data }) {
-      console.log(data);
       let res = await this.updates(data);
 
       this.$checkRes(res, '分配成功', '分配失败');
@@ -139,7 +140,7 @@ export default {
         });
         return v != -1;
       });
-      console.log(studentIds);
+
       if (i != -1) {
         groupId = groupList[i].id;
       }
@@ -149,32 +150,44 @@ export default {
       stuIdAndGroupId.stuid = stuid;
       // 登陆者属于哪个组id
       stuIdAndGroupId.groupId = groupId;
-      // 登陆者身份是否为班长
-      // let job = this.user.job;
-      // console.log(stuIdAndGroupId.job);
-      //   stuIdAndGroupId.job = job;
 
       this.$set(this, 'stuIdAndGroupId', stuIdAndGroupId);
-      console.log(stuIdAndGroupId);
+      console.log(stuIdAndGroupId.stuid);
 
       let studentList = this.stuNameList;
-      // 没有组的学生名字
-      let noGroupStudentNames = [];
-      // 循环所有学生id
-      for (let i = 0; i < studentList.length; i++) {
-        if (studentIds.length === 0) {
-          noGroupStudentNames.push(studentList[i].name);
-        } else {
-          // 循环有组学生id
-          for (let j = 0; j < studentIds.length; j++) {
-            if (studentList[i].id != studentIds[j]) {
-              noGroupStudentNames.push(studentList[i].name);
-            }
-          }
-        }
+      // // 没有组的学生名字
+      // let noGroupStudentNames = [];
+      // // 循环所有学生id
+      // for (let i = 0; i < studentList.length; i++) {
+      //   if (studentIds.length === 0) {
+      //     noGroupStudentNames.push(studentList[i].name);
+      //   } else {
+      //     // 循环有组学生id
+      //     for (let j = 0; j < studentIds.length; j++) {
+      //       if (studentList[i].id != studentIds[j]) {
+      //         noGroupStudentNames.push(studentList[i].name);
+      //       }
+      //     }
+      //   }
+      // }
+
+      // 所有有组学生id
+      var is = groupList.map(value => {
+        var v = value.students.map(value => {
+          studentIds.push(value.stuid);
+        });
+        return studentIds;
+      });
+      let havegroupstuid = is[0];
+      var data = studentList.map(item => item.id);
+      let stuidlist = _.xorWith(data, havegroupstuid, _.isEqual);
+      let arr = [];
+      let stus = [];
+      for (const stuid of stuidlist) {
+        arr = studentList.filter(item => item.id === stuid);
+        stus = [...arr, ...stus];
       }
-      // 未分组学生id(studentIds(有组学生id))(studentList所有学生)(noGroupStudentNames没有组的学生名字)
-      this.$set(this, 'noGroupStudentNames', noGroupStudentNames);
+      this.$set(this, 'noGroupStudentNames', stus);
     },
     // 创建分组-打開dialog
     createGroup() {
@@ -222,19 +235,27 @@ export default {
     },
     async openClick() {},
     async onSubmit({ data }) {
-      console.log(data);
+      console.log(this.gstuList);
+      var stu = this.gstuList.filter(item => item.type == '1');
+      console.log(stu);
+      for (const val of stu) {
+        val.type = 0;
+        val.groupid = data.groupid;
+        let res = await this.Setheadupdates(val);
+      }
+
+      data.type = 1;
       let res = await this.Setheadupdates(data);
-      console.log(res);
+      this.findGroup();
       this.show = false;
     },
     opanSubmit(item) {
-      this.form.groupid = item.id;
-      console.log(item);
       console.log(item.students);
-      // var stu = item.students.filter(item => item.job == '普通学生');
-      // console.log(stu);
+      this.$set(this, 'gstuList', item.students);
 
-      // this.$set(this, 'columns', stu);
+      this.form.groupid = item.id;
+      var stu = item.students.filter(item => item.job == '普通学生');
+      this.$set(this, 'columns', stu);
       if (this.user.job === '班长') {
         if (item.status != '1') {
           this.show = true;
@@ -246,7 +267,6 @@ export default {
     },
     async queren(item) {
       item.status = '1';
-      console.log(item);
       const res = await this.update(item);
     },
 

src/views/class/joinGroup.vue

@@ -63,7 +63,6 @@ export default {
         this.$set(this, `groupName`, res.data.name);
         // this.$set(this, `groupStuList`, res.data.studentid);
         for (const val of res.data.studentid) {
-          console.log(val);
         }
       }
     },
@@ -79,9 +78,7 @@ export default {
       if (this.$checkRes(res, msg));
       this.searchInfo();
     },
-    clickLeader() {
-      console.log('指派组长');
-    },
+    clickLeader() {},
   },
 };
 </script>

src/views/class/stuDetail.vue

@@ -68,7 +68,6 @@ export default {
       const res = await this.studentFetch(this.id);
       this.$set(this, `messInfo`, res.data);
       const val = await this.directorFetch(this.id);
-      console.log(val);
       if (val.data != null) {
         const arr = await this.deptFetch(val.data.department);
         val.data.department = arr.data.name;

src/views/classinfo.vue

@@ -1,92 +0,0 @@
-<template>
-  <div id="classinfo">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <topInfo></topInfo>
-        </el-col>
-        <el-col :span="24" class="main">
-          <classInfo :info="info"></classInfo>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import topInfo from '@/layout/common/topInfo.vue';
-import classInfo from '@/layout/common/classInfo.vue';
-
-export default {
-  name: 'classinfo',
-  props: {},
-  components: {
-    topInfo, //头部信息
-    classInfo, //班级信息
-  },
-  data: () => ({
-    info: {
-      termid: '1',
-      batchid: '1',
-      name: '1',
-      headteacherid: '班主任',
-      lyteacherid: '礼仪课教师',
-      jslocationid: '教室地点',
-      kbyslocationid: '开班地点',
-      kzjhlocationid: '拓展训练地点',
-      yclocationid: '用餐地点',
-      lessonid: [
-        {
-          date: '2020-02-28',
-          week: '五',
-          subname: '拓展训练',
-          teaname: '测试教师',
-        },
-        {
-          date: '2020-02-28',
-          week: '五',
-          subname: '拓展训练',
-          teaname: '测试教师',
-        },
-        {
-          date: '2020-02-28',
-          week: '五',
-          subname: '拓展训练',
-          teaname: '测试教师',
-        },
-        {
-          date: '2020-02-28',
-          week: '五',
-          subname: '拓展训练',
-          teaname: '测试教师',
-        },
-        {
-          date: '2020-02-28',
-          week: '五',
-          subname: '拓展训练',
-          teaname: '测试教师',
-        },
-      ],
-    },
-  }),
-  created() {},
-  computed: {},
-  methods: {},
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-}
-.main {
-  min-height: 570px;
-}
-</style>

src/views/question/index.vue

@@ -76,12 +76,9 @@ export default {
       let termid = this.user.termid;
       let ress = await this.query({ termid });
       let ids = _.flattenDeep(ress.data.map(i => i.questionnaireid));
-      console.log(ids);
       let quest = await this.getQuestMerge({ method: 'fetch', data: ids });
-      console.log(quest);
       let news = [];
       news = [...res.data, ...quest];
-      console.log(news);
       this.$set(this, `questionnaireList`, news);
     },
 

src/views/question/question.vue

@@ -78,7 +78,7 @@ export default {
       result.data.question.map(i => {
         if (!i.answer) i.type === '1' ? (i.answer = []) : '';
         let mid = asArr.find(f => f.questionid === i._id);
-        console.log(mid);
+
         if (_.get(mid, `answer`)) {
           i.answer = JSON.parse(mid.answer);
         }
@@ -98,12 +98,7 @@ export default {
       });
       let object = { termid, batchid, classid, studentid, questionnaireid: this.id, answers };
       let res;
-
-      console.log(object);
-      console.log(answerid);
-
       if (!answerid) {
-        console.log('ccc');
         res = await this.sendAnswer(object);
       } else {
         object.id = answerid;

src/views/user/stuLeave.vue

@@ -1,112 +0,0 @@
-<template>
-  <div id="stuLeave">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <stuleaveList :stuleaveList="stuleaveList" @clickShow="clickShow" @clickDown="clickDown" :leaveInfo="leaveInfo" :show="show"></stuleaveList>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import NavBar from '@/layout/common/topInfo.vue';
-import stuleaveList from '@/layout/user/stuleaveList.vue';
-import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
-const { mapActions: mapClass } = createNamespacedHelpers('classes');
-const { mapActions: mapStudent } = createNamespacedHelpers('student');
-const { mapActions: mapLeave } = createNamespacedHelpers('leave');
-export default {
-  name: 'stuLeave',
-  props: {},
-  components: {
-    NavBar, //头部导航
-    stuleaveList, //学生請假列表
-  },
-  data: () => ({
-    stuleaveList: [],
-    leaveInfo: [
-      {
-        name: '你好',
-      },
-    ],
-    show: false,
-    title: '',
-    isleftarrow: '',
-    navShow: true,
-  }),
-  created() {
-    this.searchInfo();
-  },
-  computed: {
-    id() {
-      return this.$route.query.id;
-    },
-    ...mapState(['user']),
-  },
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-  watch: {
-    $route(to, from) {
-      this.title = to.meta.title;
-      this.isleftarrow = to.meta.isleftarrow;
-    },
-  },
-  methods: {
-    ...mapClass({ classinfo: 'query', classFetch: 'fetch' }),
-    ...mapStudent({ list: 'query', add: 'create', fet: 'fetch', updates: 'update' }),
-    ...mapLeave({ leaveinfo: 'query', leaveFetch: 'fetch' }),
-    // 查询学生列表
-    async searchInfo({ ...info } = {}) {
-      let classid = this.id;
-      const stus = await this.leaveinfo({ classid });
-      var acc = stus.data.filter(item => item.type === '0');
-      let ids = acc.map(i => {
-        i.ids = i.studentid;
-        return i.ids;
-      });
-      let newid = _.uniq(ids);
-      console.log(newid);
-      const stu = await this.list({ classid });
-      for (const studentid of newid) {
-        var results = stu.data.filter(item => item.id === studentid);
-        console.log(results);
-        this.$set(this, `stuleaveList`, results);
-      }
-    },
-    async clickShow(id) {
-      this.show = true;
-      const leaveList = await this.leaveinfo(id);
-      var result = leaveList.data.filter(item => item.studentid === id);
-      var acc = result.filter(item => item.type === '0');
-      console.log();
-      this.$set(this, `leaveInfo`, acc);
-    },
-    clickDown() {
-      this.show = false;
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-}
-.main {
-  min-height: 570px;
-}
-</style>