更新

src/layout/class/jiaoshistu.vue

@@ -1,100 +0,0 @@
-<template>
-  <div id="stuleaveList">
-    <el-row>
-      <el-col :span="24">
-        <el-col :span="24" class="list">
-          <el-col :span="18" class="name">
-            <p>班主任姓名:{{ teacherinfo.name }}</p>
-          </el-col>
-          <el-col :span="6" class="btn">
-            <el-link :underline="false" @click="clicktea(teacherinfo.id)">详情</el-link>
-          </el-col>
-        </el-col>
-        <el-col :span="24" class="list" v-for="(item, index) in newclassList" :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="clickShows(item.id)">详情</el-link>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-<script>
-export default {
-  name: 'stuleaveList',
-  props: {
-    newclassList: null,
-    leaveInfo: null,
-    show: null,
-    headinfo: null,
-    teacherinfo: null,
-  },
-  components: {},
-  data: () => ({}),
-  created() {},
-  computed: {},
-  methods: {
-    clickShows(id) {
-      this.$router.push({ path: '/class/stuDetail', query: { id } });
-    },
-    clicktea(id) {
-      console.log(id);
-
-      this.$router.push({ path: '/class/stuDetail', query: { id } });
-    },
-  },
-};
-</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/layout/class/jiaoshistuwork.vue

@@ -1,135 +0,0 @@
-<template>
-  <div id="stuleaveList">
-    <el-row>
-      <el-col :span="24">
-        <el-col :span="24" class="list" v-for="(item, index) in newclassList" :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()">作业信息</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="date" v-for="(acc, index) in leaveInfo" :key="index">
-                <el-col :span="18">
-                  <p>作业名称：{{ acc.name }}</p>
-                  <p>分数：{{ acc.score }}</p>
-                </el-col>
-                <el-col :span="6" v-for="(acc, index) in leaveInfo" :key="index" class="fen">
-                  <p>上分</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: {
-    newclassList: null,
-    leaveInfo: null,
-    show: null,
-    headinfo: null,
-    teacherinfo: null,
-  },
-  components: {},
-  data: () => ({}),
-  created() {},
-  computed: {},
-  methods: {
-    clickShow() {
-      this.$emit('clickShow');
-    },
-    clickDown() {
-      this.$emit('clickDown');
-    },
-    clickShows(id) {
-      this.$router.push({ path: '/class/stuDetail', query: { id } });
-    },
-    clicktea(id) {
-      console.log(id);
-
-      this.$router.push({ path: '/class/stuDetail', query: { id } });
-    },
-  },
-};
-</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;
-}
-.date {
-  background-color: #66b3ff;
-  color: #ffffff;
-  padding: 0 10px 10px 10px;
-  height: 70px;
-  line-height: 35px;
-}
-.fen {
-  font-size: 22px;
-  height: 70px;
-  line-height: 60px;
-}
-</style>

src/layout/class/nameList/stuNameList.vue

@@ -135,7 +135,9 @@ export default {
     },
 
     onConfirm(job) {
-      this.$set(this.form, `job`, job);
+      console.log(job);
+
+      this.$set(this.newform, `job`, job);
 
       this.showPicker = false;
     },

src/layout/class/teaStudentList.vue

@@ -1,92 +0,0 @@
-<template>
-  <div id="teaStudentList">
-    <el-row>
-      <el-col :span="24" class="list" v-for="(item, index) in studentList" :key="index">
-        <el-col :span="18" class="name">
-          <p>{{ item.name }}</p>
-          <p>{{ item.faculty }}&nbsp;{{ item.major }}</p>
-        </el-col>
-        <el-col :span="3" class="gender">
-          <p>{{ item.gender }}</p>
-          <p v-if="item.job">{{ item.job }}</p>
-        </el-col>
-        <el-col :span="3" class="btn">
-          <el-link :underline="false" @click="onClick()">指派</el-link>
-        </el-col>
-      </el-col>
-      <van-dialog v-model="show" title="指派学生职务" :showConfirmButton="false">
-        <van-form @submit="onSubmit">
-          <van-field v-model="form.name" name="学生名称" disabled />
-          <van-field name="radio" label="学生职务">
-            <van-radio-group v-model="form.job" direction="horizontal" slot="input">
-              <van-radio name="班长">班长</van-radio>
-              <van-radio name="学委">学委</van-radio>
-            </van-radio-group>
-          </van-field>
-          <div style="margin: 16px;">
-            <van-button round block type="info" native-type="submit">
-              提交
-            </van-button>
-          </div>
-        </van-form>
-      </van-dialog>
-    </el-row>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'teaStudentList',
-  props: {
-    studentList: null,
-    show: null,
-    form: null,
-  },
-  components: {},
-  data: () => ({}),
-  created() {},
-  computed: {},
-  methods: {
-    onClick() {
-      this.$emit('clickUpdate');
-    },
-    onSubmit() {
-      this.$emit('submit', { data: this.form });
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-p {
-  padding: 0;
-  margin: 0;
-}
-.list {
-  background: #fff;
-  margin: 0 5px 5px 5px;
-  width: 97%;
-  padding: 0 10px;
-  border-radius: 15px;
-}
-.name {
-  padding: 10px 0 0 0;
-}
-.name p {
-  padding: 0 0 10px 0;
-}
-.gender {
-  padding: 10px 0 0 0;
-}
-.gender p {
-  padding: 0 0 10px 0;
-}
-.btn {
-  padding: 22px 0;
-  text-align: center;
-}
-/deep/.btn .el-link {
-  color: #1e90ff;
-  font-size: 18px;
-}
-</style>

src/layout/user/checkList.vue

@@ -10,16 +10,18 @@
             </div>
             <van-row class="attend" v-for="(tag, index) in checkWorkList" :key="index">
               <template v-for="(item, indexs) in tag.attend">
-                <van-col :span="16" class="dateTime" :key="'aa' + indexs">
-                  <p>{{ item.date }}</p>
-                  <p>{{ item.time }}</p>
-                </van-col>
+                <van-col :span="24" class="dateTime" :key="indexs">
+                  <el-col :span="18">
+                    <p>{{ item.date }}</p>
+                    <p>{{ item.time }}</p>
+                  </el-col>
 
-                <van-col :span="6" class="status" :key="'bb' + indexs">
-                  {{ item.type === '0' ? '上课考勤' : item.type === '1' ? '寝室考勤' : '' }}
-                </van-col>
-                <van-col :span="2" class="status" :key="'bb' + indexs">
-                  {{ item.status === '0' ? '未签到' : item.status === '1' ? '签到' : '迟到' }}
+                  <el-col :span="4">
+                    <p>{{ item.type === '0' ? '上课考勤' : item.type === '1' ? '寝室考勤' : '' }}</p>
+                  </el-col>
+                  <el-col :span="2">
+                    <p>{{ item.status === '0' ? '未签到' : item.status === '1' ? '签到' : '迟到' }}</p>
+                  </el-col>
                 </van-col>
               </template>
             </van-row>

src/layout/user/studentInfo.vue

@@ -7,7 +7,7 @@
             <div class="block"><el-avatar :size="163" :src="circleUrl"></el-avatar></div>
           </div>
         </el-col>
-        <span v-if="this.user.type === '4'">
+        <span>
           <el-col :span="24" class="mess">
             <el-col :span="22" class="info">
               <p class="title">姓名</p>
@@ -135,156 +135,6 @@
             </el-col>
           </el-col>
         </span>
-
-        <span v-else-if="this.user.type === '3'">
-          <el-col :span="24" class="mess">
-            <el-col :span="22" class="info">
-              <p class="title">姓名</p>
-              <p class="name">{{ jianshiinfo.name }}</p>
-            </el-col>
-            <el-col :span="2" class="icon">
-              <van-icon name="arrow" />
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="mess">
-            <el-col :span="22" class="info">
-              <p class="title">性别</p>
-              <p class="name">{{ jianshiinfo.gender }}</p>
-            </el-col>
-            <el-col :span="2" class="icon">
-              <van-icon name="arrow" />
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="mess">
-            <el-col :span="22" class="info">
-              <p class="title">年龄</p>
-              <p class="name">{{ jianshiinfo.age }}</p>
-            </el-col>
-            <el-col :span="2" class="icon">
-              <van-icon name="arrow" />
-            </el-col>
-          </el-col>
-
-          <el-col :span="24" class="mess">
-            <el-col :span="22" class="info">
-              <p class="title">手机号</p>
-              <p class="name">{{ jianshiinfo.phone }}</p>
-            </el-col>
-            <el-col :span="2" class="icon">
-              <van-icon name="arrow" />
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="mess">
-            <el-col :span="22" class="info">
-              <p class="title">学校名称</p>
-              <p class="name">{{ jianshiinfo.schname }}</p>
-            </el-col>
-            <el-col :span="2" class="icon">
-              <van-icon name="arrow" />
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="mess">
-            <el-col :span="22" class="info">
-              <p class="title">邮箱</p>
-              <p class="name">{{ jianshiinfo.email }}</p>
-            </el-col>
-            <el-col :span="2" class="icon">
-              <van-icon name="arrow" />
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="mess">
-            <el-col :span="22" class="info">
-              <p class="title">资料评分</p>
-              <p class="name">{{ jianshiinfo.zlscore }}</p>
-            </el-col>
-            <el-col :span="2" class="icon">
-              <van-icon name="arrow" />
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="mess">
-            <el-col :span="22" class="info">
-              <p class="title">面试评分</p>
-              <p class="name">{{ jianshiinfo.msscore }}</p>
-            </el-col>
-            <el-col :span="2" class="icon">
-              <van-icon name="arrow" />
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="mess">
-            <el-col :span="22" class="info">
-              <p class="title">学生评分</p>
-              <p class="name">{{ jianshiinfo.xsscore }}</p>
-            </el-col>
-            <el-col :span="2" class="icon">
-              <van-icon name="arrow" />
-            </el-col>
-          </el-col>
-        </span>
-        <span v-else>
-          <el-col :span="24" class="mess">
-            <el-col :span="22" class="info">
-              <p class="title">姓名</p>
-              <p class="name">{{ teainfo.name }}</p>
-            </el-col>
-            <el-col :span="2" class="icon">
-              <van-icon name="arrow" />
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="mess">
-            <el-col :span="22" class="info">
-              <p class="title">性别</p>
-              <p class="name">{{ teainfo.gender }}</p>
-            </el-col>
-            <el-col :span="2" class="icon">
-              <van-icon name="arrow" />
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="mess">
-            <el-col :span="22" class="info">
-              <p class="title">年龄</p>
-              <p class="name">{{ teainfo.age }}</p>
-            </el-col>
-            <el-col :span="2" class="icon">
-              <van-icon name="arrow" />
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="mess">
-            <el-col :span="22" class="info">
-              <p class="title">出生年月</p>
-              <p class="name">{{ teainfo.birthday }}</p>
-            </el-col>
-            <el-col :span="2" class="icon">
-              <van-icon name="arrow" />
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="mess">
-            <el-col :span="22" class="info">
-              <p class="title">手机号</p>
-              <p class="name">{{ teainfo.phone }}</p>
-            </el-col>
-            <el-col :span="2" class="icon">
-              <van-icon name="arrow" />
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="mess">
-            <el-col :span="22" class="info">
-              <p class="title">所在部门</p>
-              <p class="name">{{ teainfo.department }}</p>
-            </el-col>
-            <el-col :span="2" class="icon">
-              <van-icon name="arrow" />
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="mess">
-            <el-col :span="22" class="info">
-              <p class="title">是否可讲礼仪课</p>
-              <p class="name">{{ teainfo.islyteacher === 0 ? '否' : '是' }}</p>
-            </el-col>
-            <el-col :span="2" class="icon">
-              <van-icon name="arrow" />
-            </el-col>
-          </el-col>
-        </span>
       </el-col>
     </el-row>
   </div>

src/layout/user/tea.vue

@@ -1,89 +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>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'stuleaveList',
-  props: {
-    stuleaveList: null,
-    leaveInfo: null,
-    show: null,
-  },
-  components: {},
-  data: () => ({}),
-  created() {},
-  computed: {},
-  methods: {
-    clickShow(id) {
-      this.$router.push({ path: '/user/teacherdetail', query: { 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/layout/user/teaLeaveList.vue

@@ -1,54 +0,0 @@
-<template>
-  <div id="teaLeaveList">
-    <el-row>
-      <el-col :span="24">
-        <el-col :span="24" class="list" v-for="(item, index) in classList" :key="index">
-          <el-col :span="18" class="mess">
-            <p>班级：{{ item.name }}</p>
-            <p>班级人数：{{ item.number }}</p>
-          </el-col>
-          <el-col :span="6" class="btn">
-            <el-link :underline="false" @click="$router.push({ path: '/user/stuLeave', query: { id: item.id } })">请假管理</el-link>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'teaLeaveList',
-  props: {
-    classList: null,
-  },
-  components: {},
-  data: () => ({
-    openCollapse: [],
-  }),
-  created() {},
-  computed: {},
-  methods: {},
-};
-</script>
-
-<style lang="less" scoped>
-p {
-  padding: 0;
-  margin: 0;
-}
-.list {
-  background: #fff;
-  margin: 10px;
-  width: 94%;
-  padding: 10px;
-  border-radius: 20px;
-}
-.list .mess p {
-  padding: 5px 0;
-}
-.list .btn {
-  padding: 20px 0;
-  text-align: center;
-}
-</style>

src/layout/user/teacherdetail.vue

@@ -1,150 +0,0 @@
-<template>
-  <div id="studentInfo">
-    <el-row>
-      <el-col :span="24" class="messageInfo">
-        <el-col :span="24" class="images">
-          <div class="demo-basic--circle">
-            <div class="block"><el-avatar :size="163" :src="circleUrl"></el-avatar></div>
-          </div>
-        </el-col>
-        <el-col :span="24" class="mess">
-          <el-col :span="22" class="info">
-            <p class="title">姓名</p>
-            <p class="name">{{ teainfo.name }}</p>
-          </el-col>
-          <el-col :span="2" class="icon">
-            <van-icon name="arrow" />
-          </el-col>
-        </el-col>
-        <el-col :span="24" class="mess">
-          <el-col :span="22" class="info">
-            <p class="title">性别</p>
-            <p class="name">{{ teainfo.gender }}</p>
-          </el-col>
-          <el-col :span="2" class="icon">
-            <van-icon name="arrow" />
-          </el-col>
-        </el-col>
-        <el-col :span="24" class="mess">
-          <el-col :span="22" class="info">
-            <p class="title">年龄</p>
-            <p class="name">{{ teainfo.age }}</p>
-          </el-col>
-          <el-col :span="2" class="icon">
-            <van-icon name="arrow" />
-          </el-col>
-        </el-col>
-
-        <el-col :span="24" class="mess">
-          <el-col :span="22" class="info">
-            <p class="title">手机号</p>
-            <p class="name">{{ teainfo.phone }}</p>
-          </el-col>
-          <el-col :span="2" class="icon">
-            <van-icon name="arrow" />
-          </el-col>
-        </el-col>
-        <el-col :span="24" class="mess">
-          <el-col :span="22" class="info">
-            <p class="title">学校名称</p>
-            <p class="name">{{ teainfo.schname }}</p>
-          </el-col>
-          <el-col :span="2" class="icon">
-            <van-icon name="arrow" />
-          </el-col>
-        </el-col>
-        <el-col :span="24" class="mess">
-          <el-col :span="22" class="info">
-            <p class="title">邮箱</p>
-            <p class="name">{{ teainfo.email }}</p>
-          </el-col>
-          <el-col :span="2" class="icon">
-            <van-icon name="arrow" />
-          </el-col>
-        </el-col>
-        <el-col :span="24" class="mess">
-          <el-col :span="22" class="info">
-            <p class="title">资料评分</p>
-            <p class="name">{{ teainfo.zlscore }}</p>
-          </el-col>
-          <el-col :span="2" class="icon">
-            <van-icon name="arrow" />
-          </el-col>
-        </el-col>
-        <el-col :span="24" class="mess">
-          <el-col :span="22" class="info">
-            <p class="title">面试评分</p>
-            <p class="name">{{ teainfo.msscore }}</p>
-          </el-col>
-          <el-col :span="2" class="icon">
-            <van-icon name="arrow" />
-          </el-col>
-        </el-col>
-        <el-col :span="24" class="mess">
-          <el-col :span="22" class="info">
-            <p class="title">学生评分</p>
-            <p class="name">{{ teainfo.xsscore }}</p>
-          </el-col>
-          <el-col :span="2" class="icon">
-            <van-icon name="arrow" />
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
-export default {
-  name: 'studentInfo',
-  props: {
-    messInfo: null,
-    teainfo: null,
-  },
-  components: {},
-  data: () => ({
-    circleUrl: require('@/assets/circle.png'),
-  }),
-  created() {},
-  computed: {
-    ...mapState(['user']),
-  },
-  methods: {},
-};
-</script>
-
-<style lang="less" scoped>
-p {
-  padding: 0;
-  margin: 0;
-}
-.messageInfo {
-  margin: 0 0 10px 0;
-}
-.images {
-  text-align: center;
-  padding: 15px 0;
-}
-.mess {
-  min-height: 50px;
-  border-bottom: 1px solid #efeff4;
-}
-.info {
-  padding: 0 15px;
-}
-.info .title {
-  font-size: 14px;
-  color: #92a1b1;
-  padding: 4px 0;
-}
-.info .name {
-  font-size: 16px;
-  color: #000;
-}
-.icon {
-  padding: 11px 0;
-  font-size: 20px;
-  color: #ccc;
-}
-</style>

src/layout/user/teaquitList.vue

@@ -1,54 +0,0 @@
-<template>
-  <div id="teaLeaveList">
-    <el-row>
-      <el-col :span="24">
-        <el-col :span="24" class="list" v-for="(item, index) in classList" :key="index">
-          <el-col :span="18" class="mess">
-            <p>班级：{{ item.name }}</p>
-            <p>班级人数：{{ item.number }}</p>
-          </el-col>
-          <el-col :span="6" class="btn">
-            <el-link :underline="false" @click="$router.push({ path: '/user/stuquit', query: { id: item.id } })">退出管理</el-link>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'teaLeaveList',
-  props: {
-    classList: null,
-  },
-  components: {},
-  data: () => ({
-    openCollapse: [],
-  }),
-  created() {},
-  computed: {},
-  methods: {},
-};
-</script>
-
-<style lang="less" scoped>
-p {
-  padding: 0;
-  margin: 0;
-}
-.list {
-  background: #fff;
-  margin: 10px;
-  width: 94%;
-  padding: 10px;
-  border-radius: 20px;
-}
-.list .mess p {
-  padding: 5px 0;
-}
-.list .btn {
-  padding: 20px 0;
-  text-align: center;
-}
-</style>

src/router/index.js

@@ -63,13 +63,7 @@ const routes = [
     path: '/class/joinGroup',
     component: () => import('../views/class/joinGroup.vue'),
   },
-  //教师班级名单
 
-  {
-    path: '/class/teaclass',
-    meta: { title: '班级信息', isleftarrow: true },
-    component: () => import('../views/class/teaclass.vue'),
-  },
   //教师学生详情
   {
     path: '/class/stuDetail',
@@ -77,13 +71,6 @@ const routes = [
     component: () => import('../views/class/stuDetail.vue'),
   },
 
-  //教师学生作业列表
-  {
-    path: '/class/teastuwork',
-    meta: { title: '学生作业列表', isleftarrow: true },
-    component: () => import('../views/class/teastuwork.vue'),
-  },
-
   // 问卷调查
   {
     path: '/question/index',
@@ -97,17 +84,17 @@ const routes = [
     component: () => import('../views/question/question.vue'),
   },
   // 班主任查看班级问卷调查
-  {
-    path: '/question/teaProgress',
-    meta: { title: '问卷调查-班级问卷', isleftarrow: true },
-    component: () => import('../views/question/teaProgress.vue'),
-  },
+  // {
+  //   path: '/question/teaProgress',
+  //   meta: { title: '问卷调查-班级问卷', isleftarrow: true },
+  //   component: () => import('../views/question/teaProgress.vue'),
+  // },
   // 班主任查看班级问卷调查答题进度
-  {
-    path: '/question/classProgress',
-    meta: { title: '问卷调查-班级问卷答题进度', isleftarrow: true },
-    component: () => import('../views/question/classProgress.vue'),
-  },
+  // {
+  //   path: '/question/classProgress',
+  //   meta: { title: '问卷调查-班级问卷答题进度', isleftarrow: true },
+  //   component: () => import('../views/question/classProgress.vue'),
+  // },
 
   // 个人信息
   {
@@ -145,12 +132,7 @@ const routes = [
     meta: { title: '考勤管理', isleftarrow: true },
     component: () => import('../views/user/checkWork.vue'),
   },
-  // 个人信息(班主任)-请假管理
-  {
-    path: '/user/teaLeave',
-    meta: { title: '请假管理-班级列表', isleftarrow: true },
-    component: () => import('../views/user/teaLeave.vue'),
-  },
+
   // 个人信息(班主任)-学生请假列表
   {
     path: '/user/stuLeave',
@@ -200,12 +182,6 @@ const routes = [
     meta: { title: '退出', isleftarrow: true },
     component: () => import('../views/user/quit.vue'),
   },
-  //个人信息-班主任退出管理
-  {
-    path: '/user/teaquit',
-    meta: { title: '退出管理', isleftarrow: true },
-    component: () => import('../views/user/teaquit.vue'),
-  },
 
   //个人信息-班主任退出管理学生列表
   {
@@ -214,19 +190,6 @@ const routes = [
     component: () => import('../views/user/stuquit.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: '/user/quitReason',

src/views/class/achieve.vue

@@ -103,8 +103,7 @@ export default {
     // 平时成绩学生名单查询+作业成绩学生名单查询
     async search() {
       let classid;
-      if (this.user.type === '1') classid = this.classid;
-      else classid = this.user.classid;
+      classid = this.user.classid;
       const res = await this.list({ classid });
 
       this.$set(this, `peaceAchieveList`, res.data);

src/views/class/group.vue

@@ -26,9 +26,7 @@
       <van-form @submit="onSubmit">
         <van-field v-model="form.name" name="组名" label="组名" placeholder="请输入小组名称" />
         <div style="margin: 16px;">
-          <van-button round block type="info" native-type="submit">
-            提交
-          </van-button>
+         <el-button type="primary" @click="onSubmit">提交</el-button>
         </div>
       </van-form>
     </van-dialog>
@@ -38,7 +36,7 @@
 <script>
 import footInfo from '@/layout/common/footInfo.vue';
 import groupList from '@/layout/class/groupList.vue';
-import { createNamespacedHelpers, mapGetters } from 'vuex';
+import { createNamespacedHelpers, mapState, mapGetters } from 'vuex';
 const { mapActions: mapGroup } = createNamespacedHelpers('group');
 export default {
   name: 'achieve',
@@ -57,6 +55,7 @@ export default {
     this.searchInfo();
   },
   computed: {
+    ...mapState(['user']),
     keyWord() {
       let meta = this.$route.meta;
       let main = meta.title || '';
@@ -73,7 +72,14 @@ 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;
+      this.form.classid = this.user.classid;
       let data = this.form;
+      console.log(this.form);
+
       let res = await this.create(data);
       let msg = `${this.keyWord}创建分组成功`;
       if (this.$checkRes(res, msg)) this.show = false;

src/views/class/index.vue

@@ -43,8 +43,6 @@
 <script>
 import NavBar from '@/layout/common/topInfo.vue';
 import footInfo from '@/layout/common/footInfo.vue';
-// import headClassList from '@/layout/class/headClassList.vue';
-// import teacherClassList from '@/layout/class/teacherClassList.vue';
 import classList from '@/layout/class/classList.vue';
 import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
 const { mapActions: mapGroup } = createNamespacedHelpers('group');
@@ -184,6 +182,10 @@ export default {
     },
     // 提交创建分组-班长职责
     async saveGroup({ data }) {
+      data.termid = this.user.termid;
+      data.batchid = this.user.batchid;
+      data.classid = this.user.classid;
+
       const result = await this.create(data);
       if (result.errcode == 0) {
         this.createGroupDialog = false;

src/views/class/teaclass.vue

@@ -1,98 +0,0 @@
-<template>
-  <div id="teaLeave">
-    <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">
-          <jiaoshistu :newclassList="newclassList" :teacherinfo="teacherinfo"></jiaoshistu>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import NavBar from '@/layout/common/topInfo.vue';
-import jiaoshistu from '@/layout/class/jiaoshistu.vue';
-import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
-const { mapActions: mapClass } = createNamespacedHelpers('classes');
-const { mapActions: mapStudent } = createNamespacedHelpers('student');
-const { mapActions: mapHeadteacher } = createNamespacedHelpers('director');
-
-export default {
-  name: 'leave',
-  props: {},
-  components: {
-    NavBar, //头部导航
-    jiaoshistu, //班主任学生请假列表
-  },
-  data: () => ({
-    newclassList: [],
-    isleftarrow: '',
-    title: '',
-    isleftarrow: '',
-    teacherinfo: {},
-
-    navShow: true,
-  }),
-  created() {
-    this.searchInfo();
-  },
-  computed: {
-    ...mapState(['user']),
-    id() {
-      return this.$route.query.id;
-    },
-    headteacherid() {
-      return this.$route.query.headteacherid;
-    },
-  },
-  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({ stuQuery: 'query', stuFetch: 'fetch' }),
-    ...mapHeadteacher({ teaQuery: 'query', stuFetch: 'fetch' }),
-
-    async searchInfo({ ...info } = {}) {
-      let classid = this.id;
-      const res = await this.stuQuery({ classid });
-      console.log(this.headteacherid);
-      let headteacherid = this.headteacherid;
-      if (headteacherid) {
-        const val = await this.teaQuery({ headteacherid });
-        for (const acc of val.data) {
-          this.$set(this, `teacherinfo`, acc);
-        }
-      }
-      this.$set(this, `newclassList`, res.data);
-    },
-  },
-};
-</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/teastuwork.vue

@@ -1,104 +0,0 @@
-<template>
-  <div id="teaLeave">
-    <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">
-          <jiaoshistuwork
-            :newclassList="newclassList"
-            :teacherinfo="teacherinfo"
-            @clickDown="clickDown"
-            :leaveInfo="leaveInfo"
-            :show="show"
-            @clickShow="clickShow"
-          ></jiaoshistuwork>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import NavBar from '@/layout/common/topInfo.vue';
-import jiaoshistuwork from '@/layout/class/jiaoshistuwork.vue';
-import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
-const { mapActions: mapClass } = createNamespacedHelpers('classes');
-const { mapActions: mapStudent } = createNamespacedHelpers('student');
-const { mapActions: mapHeadteacher } = createNamespacedHelpers('director');
-
-export default {
-  name: 'leave',
-  props: {},
-  components: {
-    NavBar, //头部导航
-    jiaoshistuwork, //班主任学生请假列表
-  },
-  data: () => ({
-    newclassList: [{ name: '测试学生1', socre: '1' }],
-    isleftarrow: '',
-    title: '',
-    isleftarrow: '',
-    teacherinfo: {},
-    leaveInfo: [{ score: '1', name: '测试作业' }],
-    show: false,
-
-    navShow: true,
-  }),
-  created() {
-    this.searchInfo();
-  },
-  computed: {
-    ...mapState(['user']),
-    id() {
-      return this.$route.query.id;
-    },
-    headteacherid() {
-      return this.$route.query.headteacherid;
-    },
-  },
-  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({ stuQuery: 'query', stuFetch: 'fetch' }),
-    ...mapHeadteacher({ teaQuery: 'query', stuFetch: 'fetch' }),
-
-    async searchInfo({ ...info } = {}) {},
-
-    async clickShow() {
-      console.log('a');
-
-      this.show = true;
-    },
-    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>

src/views/index.vue

@@ -58,14 +58,9 @@ export default {
     this.$set(this.today, `day`, today);
 
     if (this.user !== undefined) {
-      if (this.user.type === '1') {
-        this.view = 'class';
-        this.getClass();
-      } else {
-        this.$set(this, `classid`, this.user.classid);
-        this.searchInfo();
-        this.view = 'arrange';
-      }
+      this.$set(this, `classid`, this.user.classid);
+      this.searchInfo();
+      this.view = 'arrange';
     }
   },
   computed: {

src/views/question/classProgress.vue

@@ -1,83 +0,0 @@
-<template>
-  <div id="classProgress">
-    <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">
-          <classProgressList :progressInfo="progressInfo"></classProgressList>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import NavBar from '@/layout/common/topInfo.vue';
-import classProgressList from '@/layout/question/classProgress.vue';
-import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
-const { mapActions: completion } = createNamespacedHelpers('completion');
-import _ from 'lodash';
-export default {
-  name: 'classProgress',
-  props: {},
-  components: {
-    NavBar, //头部导航
-    classProgressList, //班级问卷进度
-  },
-  data: () => ({
-    progressInfo: {},
-    title: '',
-    isleftarrow: '',
-    navShow: true,
-  }),
-  created() {
-    this.searchInfo();
-  },
-  computed: {
-    questionnaireid() {
-      return this.$route.query.questionnaireid;
-    },
-    classid() {
-      return this.$route.query.classid;
-    },
-    ...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: {
-    ...completion({ getCompletion: 'query' }),
-    async searchInfo() {
-      const termFetch = await this.getCompletion({ type: '2', typeid: this.classid, questionnaireid: this.questionnaireid });
-      if (this.$checkRes(termFetch)) {
-        this.$set(this, `progressInfo`, termFetch);
-      }
-    },
-  },
-};
-</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

@@ -6,10 +6,10 @@
           <nav-bar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </nav-bar>
         </el-col>
         <el-col :span="24" class="main">
-          <span v-if="this.user.type === '1'">
+          <!-- <span v-if="this.user.type === '1'">
             <teaClass :classList="classList" @turnto="turnto" title="班级问卷进度"></teaClass>
-          </span>
-          <span v-else>
+          </span> -->
+          <span>
             <questionnaire-info :questionnaireList="questionnaireList"></questionnaire-info>
           </span>
         </el-col>
@@ -24,7 +24,7 @@
 <script>
 import NavBar from '@/layout/common/topInfo.vue';
 import footInfo from '@/layout/common/footInfo.vue';
-import teaClass from '@/layout/question/teaClass.vue';
+// import teaClass from '@/layout/question/teaClass.vue';
 import questionnaireInfo from '@question/src/views/index.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: termquest } = createNamespacedHelpers('termquest');
@@ -39,7 +39,7 @@ export default {
     NavBar, //头部导航
     footInfo, //底部导航
     questionnaireInfo, //问卷调查
-    teaClass, //班主任班级名单
+    // teaClass, //班主任班级名单
   },
   data: () => ({
     questionnaireList: [],
@@ -49,7 +49,6 @@ export default {
     navShow: true,
   }),
   created() {
-    this.searchInfo();
     this.search();
   },
   computed: {
@@ -85,11 +84,7 @@ export default {
       console.log(news);
       this.$set(this, `questionnaireList`, news);
     },
-    // 班主任查询管理班级列表
-    async searchInfo({ ...info } = {}) {
-      const res = await this.classinfo({ headteacherid: this.user.userid });
-      this.$set(this, `classList`, res.data);
-    },
+
     turnto(data) {
       this.$router.push({ path: '/question/teaProgress', query: { classid: data.id } });
     },

src/views/question/teaProgress.vue

@@ -1,98 +0,0 @@
-<template>
-  <div id="teaProgress">
-    <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">
-          <quesProgress :quesProgress="quesProgress"></quesProgress>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import NavBar from '@/layout/common/topInfo.vue';
-import quesProgress from '@/layout/question/quesProgress.vue';
-import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
-const { mapActions: classes } = createNamespacedHelpers('classes');
-const { mapActions: questionnaire } = createNamespacedHelpers('questionnaire');
-const { mapActions: termquest } = createNamespacedHelpers('termquest');
-import _ from 'lodash';
-export default {
-  name: 'teaProgress',
-  props: {},
-  components: {
-    NavBar, //头部导航
-    quesProgress, //班级问卷进度
-  },
-  data: () => ({
-    classInfo: {},
-    quest: [],
-    quesProgress: [],
-    title: '',
-    isleftarrow: '',
-    navShow: true,
-  }),
-  created() {
-    this.searchInfo();
-  },
-  computed: {
-    id() {
-      return this.$route.query.classid;
-    },
-    ...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: {
-    ...classes({ classFectch: 'fetch' }),
-    ...questionnaire({ getQuestionnaireList: 'query' }),
-    ...termquest({ getTermQuestList: 'query' }),
-    // 查询班级信息，全部问卷，当前期问卷
-    async searchInfo() {
-      // 班级信息
-      let classInfo = await this.classFectch(this.id);
-      if (this.$checkRes(classInfo)) {
-        this.$set(this, `classInfo`, classInfo.data);
-      }
-      //查询所有问卷
-      const quest = await this.getQuestionnaireList();
-      if (this.$checkRes(quest)) {
-        this.$set(this, `quest`, quest.data);
-      }
-      //查询这期的所有问卷,id=>数据
-      const res = await this.getTermQuestList({ termid: this.classInfo.termid });
-      let { questionnaireid, termid, ...othrers } = res.data[0];
-      let newArr = this.quest.filter(q => (_.find(questionnaireid, sq => sq === q.id) ? q : ''));
-      this.$set(this, `quesProgress`, newArr);
-    },
-  },
-};
-</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/user/personalDetail.vue

@@ -19,9 +19,8 @@ import NavBar from '@/layout/common/topInfo.vue';
 import studentInfo from '@/layout/user/studentInfo.vue';
 
 import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
-const { mapActions: mapDirectors } = createNamespacedHelpers('director');
+
 const { mapActions: mapStudent } = createNamespacedHelpers('student');
-const { mapActions: mapteacher } = createNamespacedHelpers('teacher');
 const { mapActions: mapDept } = createNamespacedHelpers('dept');
 export default {
   name: 'personalDetail',
@@ -59,24 +58,13 @@ export default {
     },
   },
   methods: {
-    ...mapDirectors({ directorQuery: 'query', directorFetch: 'fetch' }),
     ...mapStudent({ studentQuery: 'query', studentFetch: 'fetch' }),
     ...mapDept({ deptFetch: 'fetch' }),
-    ...mapteacher({ teacherFether: 'fetch' }),
+
     // 1:班主任，4:学生
     async searchInfo() {
-      if (this.user.type === '1') {
-        const res = await this.directorFetch(this.id);
-        const arr = await this.deptFetch(res.data.department);
-        res.data.department = arr.data.name;
-        this.$set(this, `teainfo`, res.data);
-      } else if (this.user.type === '4') {
-        const res = await this.studentFetch(this.id);
-        this.$set(this, `messInfo`, res.data);
-      } else if (this.user.type === '3') {
-        const res = await this.teacherFether(this.id);
-        this.$set(this, `jianshiinfo`, res.data);
-      }
+      const res = await this.studentFetch(this.id);
+      this.$set(this, `messInfo`, res.data);
     },
   },
 };

src/views/user/socre.vue

@@ -70,8 +70,8 @@ export default {
     // 平时成绩学生名单查询+作业成绩学生名单查询
     async search() {
       let classid;
-      if (this.user.type === '1') classid = this.classid;
-      else classid = this.classid;
+
+      classid = this.classid;
       const res = await this.list({ classid });
       console.log(res.data);
       let name = res.data.map(i => i.name);

src/views/user/teaLeave.vue

@@ -1,77 +0,0 @@
-<template>
-  <div id="teaLeave">
-    <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">
-          <teaLeaveList :classList="classList"></teaLeaveList>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import NavBar from '@/layout/common/topInfo.vue';
-import teaLeaveList from '@/layout/user/teaLeaveList.vue';
-import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
-const { mapActions: mapClass } = createNamespacedHelpers('classes');
-const { mapActions: mapStudent } = createNamespacedHelpers('student');
-export default {
-  name: 'leave',
-  props: {},
-  components: {
-    NavBar, //头部导航
-    teaLeaveList, //班主任学生请假列表
-  },
-  data: () => ({
-    classList: [],
-    title: '',
-    isleftarrow: '',
-    navShow: true,
-  }),
-  created() {
-    this.searchInfo();
-  },
-  computed: {
-    ...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' }),
-    ...mapStudent({ stuQuery: 'query', stuFetch: 'fetch' }),
-    async searchInfo({ ...info } = {}) {
-      const res = await this.classinfo({ ...info });
-      var result = res.data.filter(item => item.headteacherid === this.user.userid);
-      this.$set(this, `classList`, result);
-    },
-  },
-};
-</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/user/teacher.vue

@@ -1,91 +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">
-          <tea :stuleaveList="stuleaveList" :leaveInfo="leaveInfo" :show="show"></tea>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import NavBar from '@/layout/common/topInfo.vue';
-import tea from '@/layout/user/tea.vue';
-import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
-const { mapActions: mapClass } = createNamespacedHelpers('classes');
-const { mapActions: mapStudent } = createNamespacedHelpers('student');
-const { mapActions: mapteacher } = createNamespacedHelpers('teacher');
-export default {
-  name: 'stuLeave',
-  props: {},
-  components: {
-    NavBar, //头部导航
-    tea, //学生請假列表
-  },
-  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' }),
-    ...mapteacher({ teacherlist: 'query', leaveFetch: 'fetch' }),
-    // 查询学生列表
-    async searchInfo({ ...info } = {}) {
-      const res = await this.teacherlist();
-      console.log(res.data);
-      var result = res.data.filter(item => item.status === '4');
-
-      this.$set(this, `stuleaveList`, result);
-    },
-  },
-};
-</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/user/teacherdetail.vue

@@ -1,80 +0,0 @@
-<template>
-  <div id="personalDetail">
-    <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">
-          <teacherdetail :teainfo="teainfo"></teacherdetail>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import NavBar from '@/layout/common/topInfo.vue';
-import teacherdetail from '@/layout/user/teacherdetail.vue';
-import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
-const { mapActions: mapteacher } = createNamespacedHelpers('teacher');
-
-export default {
-  name: 'personalDetail',
-  props: {},
-  components: {
-    NavBar, //头部导航
-    teacherdetail, //学生详细信息
-  },
-  data: () => ({
-    teainfo: {},
-    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: {
-    ...mapteacher({ teacherlist: 'query', teacherfetch: 'fetch' }),
-
-    async searchInfo() {
-      const res = await this.teacherfetch(this.id);
-      this.$set(this, `teainfo`, res.data);
-      console.log(res.data);
-    },
-  },
-};
-</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/user/teaquit.vue

@@ -1,77 +0,0 @@
-<template>
-  <div id="teaLeave">
-    <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">
-          <teaquitList :classList="classList"></teaquitList>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import NavBar from '@/layout/common/topInfo.vue';
-import teaquitList from '@/layout/user/teaquitList.vue';
-import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
-const { mapActions: mapClass } = createNamespacedHelpers('classes');
-const { mapActions: mapStudent } = createNamespacedHelpers('student');
-export default {
-  name: 'leave',
-  props: {},
-  components: {
-    NavBar, //头部导航
-    teaquitList, //班主任学生请假列表
-  },
-  data: () => ({
-    classList: [],
-    title: '',
-    isleftarrow: '',
-    navShow: true,
-  }),
-  created() {
-    this.searchInfo();
-  },
-  computed: {
-    ...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' }),
-    ...mapStudent({ stuQuery: 'query', stuFetch: 'fetch' }),
-    async searchInfo({ ...info } = {}) {
-      const res = await this.classinfo({ ...info });
-      var result = res.data.filter(item => item.headteacherid === this.user.userid);
-      this.$set(this, `classList`, result);
-    },
-  },
-};
-</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>