合并

src/layout/class/achieveList.vue

@@ -0,0 +1,92 @@
+<template>
+  <div id="achieveList">
+    <el-row>
+      <el-col :span="24" class="list">
+        <van-collapse v-model="openCollapse">
+          <van-collapse-item :name="index" v-for="(item, index) in achieveList" :key="index">
+            <div slot="title" class="title">
+              <span class="name">{{ item.studentid }}</span>
+              <van-button type="primary" size="mini" @click="clickBtn()">上成绩</van-button>
+            </div>
+            <van-row v-for="(tag, index) in item.lesson" :key="index">
+              <van-col :span="14" class="score"> 课程名称：{{ tag.lessonid }} </van-col>
+              <van-col :span="10" class="score"> 作业分：{{ tag.score }} 分</van-col>
+            </van-row>
+          </van-collapse-item>
+        </van-collapse>
+      </el-col>
+    </el-row>
+    <van-dialog v-model="show" title="学生成绩上传" :showConfirmButton="false">
+      <van-form @submit="onSubmit">
+        <van-field v-model="form.name" name="学生名称" disabled />
+        <van-field v-model="form.lessonid" name="课程名称" label="课程名称" placeholder="请输入课程名称" />
+        <van-field v-model="form.score" name="作业分数" label="作业分数" placeholder="请输入作业分数" />
+        <div style="margin: 16px;">
+          <van-button round block type="info" native-type="submit">
+            提交
+          </van-button>
+        </div>
+      </van-form>
+    </van-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'achieveList',
+  props: {
+    achieveList: null,
+    show: null,
+    form: null,
+    lessonList: null,
+  },
+  components: {},
+  data: () => ({
+    openCollapse: [],
+    option1: [
+      { text: '全部商品', value: 0 },
+      { text: '新款商品', value: 1 },
+    ],
+  }),
+  created() {},
+  computed: {},
+  methods: {
+    clickBtn() {
+      this.$emit('clickDialog');
+    },
+    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;
+}
+.list .title {
+  float: left;
+  width: 100%;
+}
+.list .name {
+  float: left;
+  width: 80%;
+  font-size: 20px;
+}
+/deep/.el-collapse-item__content {
+  padding: 10px 0 10px 0;
+}
+.list .score {
+  padding: 10px 0;
+  font-size: 18px;
+}
+</style>

src/layout/class/groupList.vue

@@ -0,0 +1,50 @@
+<template>
+  <div id="groupList">
+    <el-row>
+      <el-col :span="24" class="list" v-for="(item, index) in groupList" :key="index">
+        <el-col :span="20" class="name"> 组名：{{ item.name }} </el-col>
+        <el-col :span="4" class="name">
+          <el-button type="success" size="mini" @click="$router.push({ path: '/class/joinGroup', query: { id: item.id } })">加入</el-button>
+          <!-- <el-button type="success" size="mini" @click="deteles(item.id)">删除</el-button> -->
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'groupList',
+  props: {
+    groupList: null,
+  },
+  components: {},
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {
+    // 删除组
+    // deteles(id) {
+    //   this.$emit('shanchu', id);
+    // },
+  },
+};
+</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;
+}
+.list .name {
+  padding: 15px 0;
+  font-size: 18px;
+}
+</style>

src/layout/class/groupStuList.vue

@@ -0,0 +1,54 @@
+<template>
+  <div id="groupStuList">
+    <el-row>
+      <el-col :span="24" class="list" v-for="(item, index) in groupStuList" :key="index">
+        <van-swipe-cell>
+          <van-cell :border="false" :title="'学生姓名：' + item.name" />
+          <template slot="right">
+            <van-button square type="primary" text="指派" @click="clickLeader()" />
+            <van-button square type="danger" text="退出" @click="clickOut()" />
+          </template>
+        </van-swipe-cell>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'groupStuList',
+  props: {
+    groupStuList: null,
+  },
+  components: {},
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {
+    clickOut() {
+      this.$emit('clickOut');
+    },
+    clickLeader() {
+      this.$emit('clickLeader');
+    },
+  },
+};
+</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;
+}
+.list .name {
+  padding: 15px 0;
+  font-size: 18px;
+}
+</style>

src/layout/class/teaStudentList.vue

@@ -17,7 +17,12 @@
       <van-dialog v-model="show" title="指派学生职务" :showConfirmButton="false">
         <van-form @submit="onSubmit">
           <van-field v-model="form.name" name="学生名称" disabled />
-          <van-field v-model="form.job" placeholder="请输入职务" />
+          <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">
               提交

src/layout/index/footInfo.vue

@@ -1,32 +1,6 @@
 <template>
   <div id="footInfo">
     <el-row>
-      <!-- <el-col :span="24">
-        <el-col :span="6" class="link">
-          <el-link :underline="false" @click="$router.push({ path: '/' })">
-            <i class="el-icon-s-home"></i>
-            <p>首页</p>
-          </el-link>
-        </el-col>
-        <el-col :span="6" class="link">
-          <el-link :underline="false" @click="$router.push({ path: '/class/index' })">
-            <i class="el-icon-user-solid"></i>
-            <p>班级名单</p>
-          </el-link>
-        </el-col>
-        <el-col :span="6" class="link">
-          <el-link :underline="false" @click="$router.push({ path: '/question/index' })">
-            <i class="el-icon-s-promotion"></i>
-            <p>问卷调查</p>
-          </el-link>
-        </el-col>
-        <el-col :span="6" class="link">
-          <el-link :underline="false" @click="$router.push({ path: '/user/index' })">
-            <i class="el-icon-s-custom"></i>
-            <p>个人信息</p>
-          </el-link>
-        </el-col>
-      </el-col> -->
       <van-tabbar v-model="active">
         <van-tabbar-item to="/" icon="home-o">首页</van-tabbar-item>
         <van-tabbar-item to="/class/index" icon="friends-o">班级名单</van-tabbar-item>

src/layout/index/topInfo.vue

@@ -2,7 +2,7 @@
   <div id="topInfo">
     <el-row>
       <el-col :span="24" class="topInfos">
-        <el-image :src="logoPic" style="width:100%;height:200px;"></el-image>
+        <van-nav-bar title="日程安排" left-text="返回" left-arrow @click-left="onClickLeft" />
       </el-col>
     </el-row>
   </div>
@@ -11,15 +11,30 @@
 <script>
 export default {
   name: 'topInfo',
-  props: {
-    logoPic: null,
-  },
+  props: {},
   components: {},
   data: () => ({}),
   created() {},
   computed: {},
-  methods: {},
+  methods: {
+    onClickLeft() {
+      Toast('返回');
+    },
+  },
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+/deep/.van-nav-bar {
+  background: #2c69fe;
+}
+/deep/.van-nav-bar__title {
+  color: #fff;
+}
+/deep/.van-nav-bar__text {
+  color: #fff;
+}
+/deep/.van-nav-bar .van-icon {
+  color: #fff;
+}
+</style>

src/layout/user/checkList.vue

@@ -1,31 +1,13 @@
 <template>
   <div id="checkList">
-    <el-row>
-      <el-col :span="24" class="top">
-        <el-col :span="18" class="title textOver"> {{ info.classid }}考勤管理 </el-col>
-        <el-col :span="6" class="btn">
-          <el-button type="primary" @click="$router.push({ path: '/user/checkDetail' })">考勤</el-button>
-        </el-col>
-      </el-col>
-      <el-col :span="24" class="list" v-for="(item, index) in info.attend" :key="index">
-        <el-col :span="20" class="picker">
-          <p>{{ item.date }}</p>
-          <p>{{ item.time }}</p>
-        </el-col>
-        <el-col :span="4" class="status">
-          {{ item.status === '0' ? '未签到' : item.status === '1' ? '签到' : item.status === '2' ? '迟到' : '缺勤' }}
-        </el-col>
-      </el-col>
-    </el-row>
+    <p>checkList</p>
   </div>
 </template>
 
 <script>
 export default {
   name: 'checkList',
-  props: {
-    info: null,
-  },
+  props: {},
   components: {},
   data: () => ({}),
   created() {},
@@ -34,36 +16,4 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
-p {
-  padding: 0;
-  margin: 0;
-}
-.top {
-  height: 50px;
-  line-height: 50px;
-  background-color: #fff;
-  margin: 0 0 10px 0;
-  border-bottom: 1px solid #ccc;
-}
-.top .title {
-  padding: 0 15px;
-  font-size: 20px;
-}
-.top .btn {
-  text-align: center;
-}
-.list {
-  width: 97%;
-  padding: 15px;
-  background-color: #fff;
-  border-radius: 15px;
-  margin: 0 5px 5px 5px;
-}
-.picker p {
-  padding: 2px 0;
-}
-.status {
-  padding: 15px 0;
-}
-</style>
+<style lang="less" scoped></style>

src/layout/user/messageInfo.vue

@@ -0,0 +1,187 @@
+<template>
+  <div id="messageInfo">
+    <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">{{ messInfo.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">{{ messInfo.id_number }}</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">{{ messInfo.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">{{ messInfo.nation }}</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">{{ messInfo.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">QQ</p>
+            <p class="name">{{ messInfo.qq }}</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">{{ messInfo.school_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">{{ messInfo.faculty }}</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">{{ messInfo.major }}</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">{{ messInfo.entry_year }}</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">{{ messInfo.finish_year }}</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">{{ messInfo.school_job }}</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">e-mail</p>
+            <p class="name">{{ messInfo.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">{{ messInfo.family_place }}</p>
+          </el-col>
+          <el-col :span="2" class="icon">
+            <van-icon name="arrow" />
+          </el-col>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'messageInfo',
+  props: {
+    messInfo: null,
+  },
+  components: {},
+  data: () => ({
+    circleUrl: require('@/assets/circle.png'),
+  }),
+  created() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped>
+p {
+  padding: 0;
+  margin: 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/topInfo.vue

@@ -8,7 +8,7 @@
         <el-col :span="18" class="mess">
           <p>{{ info.school_name }}</p>
           <p>{{ info.faculty }}&nbsp;&nbsp;{{ info.major }}</p>
-          <p>民族:{{ info.nation }}&nbsp;性别:{{ info.gender }}&nbsp;QQ:{{ info.qq }}</p>
+          <p>民族:{{ info.nation }}&nbsp;性别:{{ info.gender }}</p>
         </el-col>
       </el-col>
     </el-row>

src/router/index.js

@@ -16,6 +16,24 @@ const routes = [
     name: 'class',
     component: () => import('../views/class/index.vue'),
   },
+  // 班级名单-上成绩
+  {
+    path: '/class/achieve',
+    name: 'class',
+    component: () => import('../views/class/achieve.vue'),
+  },
+  // 班级名单-分组
+  {
+    path: '/class/group',
+    name: 'class',
+    component: () => import('../views/class/group.vue'),
+  },
+  // 班级名单-加入组
+  {
+    path: '/class/joinGroup',
+    name: 'class',
+    component: () => import('../views/class/joinGroup.vue'),
+  },
   // 问卷调查
   {
     path: '/question/index',

src/store/group.js

@@ -0,0 +1,48 @@
+import Vue from 'vue';
+import Vuex from 'vuex';
+import _ from 'lodash';
+Vue.use(Vuex);
+const api = {
+  groupInfo: `/api/train/group`,
+  // insertInfo: `/api/train/group/insert`,
+  // exitInfo: `/api/train/group/exit`,
+};
+const state = () => ({});
+const mutations = {};
+
+const actions = {
+  async query({ commit }, { skip = 0, limit, ...info } = {}) {
+    const res = await this.$axios.$get(`${api.groupInfo}`, { skip, limit, ...info });
+    return res;
+  },
+  async create({ commit }, payload) {
+    const res = await this.$axios.$post(`${api.groupInfo}`, payload);
+    return res;
+  },
+  async fetch({ commit }, payload) {
+    const res = await this.$axios.$get(`${api.groupInfo}/${payload}`);
+    return res;
+  },
+  async update({ commit }, { id, ...data }) {
+    const res = await this.$axios.$post(`${api.groupInfo}/update/${id}`, data);
+    return res;
+  },
+  async delete({ commit }, payload) {
+    const res = await this.$axios.$delete(`${api.groupInfo}/${payload}`);
+    return res;
+  },
+  async insert({ commit }, payload) {
+    const res = await this.$axios.$post(`${api.groupInfo}/insert`, payload);
+    return res;
+  },
+  async exit({ commit }, payload) {
+    const res = await this.$axios.$delete(`${api.groupInfo}/exit`, payload);
+    return res;
+  },
+};
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+};

src/store/index.js

@@ -2,14 +2,14 @@ import Vue from 'vue';
 import Vuex from 'vuex';
 import leave from './leave';
 import attendance from './attendance';
-import questionnaire from './questionnaire';
+import group from './group';
 Vue.use(Vuex);
 
 export default new Vuex.Store({
   modules: {
     leave,
     attendance,
-    questionnaire,
+    group,
   },
   state: {}, //变量
   mutations: {}, //同步方法

src/util/axios-wrapper.js

@@ -45,7 +45,10 @@ export default class AxiosWrapper {
   $post(uri, data = {}, query, options) {
     return this.$request(uri, data, query, options);
   }
-
+  $delete(uri, data = {}, router, query, options = {}) {
+    options = { ...options, method: 'delete' };
+    return this.$request(uri, data, query, options, router);
+  }
   async $request(uri, data, query, options) {
     // TODO: 合并query和options
     if (_.isObject(query) && _.isObject(options)) {

src/views/class/achieve.vue

@@ -0,0 +1,91 @@
+<template>
+  <div id="achieve">
+    <el-row>
+      <el-col :span="24" class="info">
+        <el-col :span="24" class="top">
+          <el-col :span="15" class="title">
+            班级学生成绩
+          </el-col>
+        </el-col>
+        <el-col :span="24" class="main">
+          <achieveList :achieveList="achieveList" :show="show" :form="form" @clickDialog="clickAchieve" @submit="submitAchieve"></achieveList>
+        </el-col>
+        <el-col :span="24" class="foot">
+          <footInfo></footInfo>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import footInfo from '@/layout/index/footInfo.vue';
+import achieveList from '@/layout/class/achieveList.vue';
+
+export default {
+  name: 'achieve',
+  props: {},
+  components: {
+    footInfo, //底部信息
+    achieveList, //学生成绩列表
+  },
+  data: () => ({
+    achieveList: [
+      {
+        studentid: '刘裕',
+        lesson: [
+          {
+            lessonid: '拓展训练',
+            score: '20',
+          },
+          {
+            lessonid: '简历制作',
+            score: '20',
+          },
+        ],
+      },
+    ],
+    show: false,
+    form: {
+      name: '刘裕',
+    },
+  }),
+  created() {},
+  computed: {},
+  methods: {
+    clickAchieve() {
+      this.show = true;
+    },
+    submitAchieve(form) {
+      console.log(form);
+      this.show = false;
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.info {
+  width: 100%;
+  min-height: 667px;
+  position: relative;
+  background-color: #edeae8;
+}
+.top {
+  height: 50px;
+  line-height: 50px;
+  margin: 0 0 10px 0;
+  background: #fff;
+}
+.top .title {
+  padding: 0 15px;
+  font-size: 20px;
+}
+.top .btn {
+  text-align: right;
+  padding: 0 30px;
+}
+.main {
+  margin: 0 0 50px 0;
+}
+</style>

src/views/class/group.vue

@@ -0,0 +1,117 @@
+<template>
+  <div id="group">
+    <el-row>
+      <el-col :span="24" class="info">
+        <el-col :span="24" class="top">
+          <el-col :span="15" class="title">
+            班级分组名单
+          </el-col>
+          <span v-if="role === '4'">
+            <el-col :span="9" class="btn">
+              <el-button type="primary" @click="clickAdd()">创建组</el-button>
+            </el-col>
+          </span>
+        </el-col>
+        <el-col :span="24" class="main">
+          <groupList :groupList="groupList"></groupList>
+          <!-- 删除组 -->
+          <!-- @shanchu="shanchu" -->
+        </el-col>
+        <el-col :span="24" class="foot">
+          <footInfo></footInfo>
+        </el-col>
+      </el-col>
+    </el-row>
+    <van-dialog v-model="show" title="创建小组" :showConfirmButton="false">
+      <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>
+        </div>
+      </van-form>
+    </van-dialog>
+  </div>
+</template>
+
+<script>
+import footInfo from '@/layout/index/footInfo.vue';
+import groupList from '@/layout/class/groupList.vue';
+import { createNamespacedHelpers, mapGetters } from 'vuex';
+const { mapActions: mapGroup } = createNamespacedHelpers('group');
+export default {
+  name: 'achieve',
+  props: {},
+  components: {
+    footInfo, //底部信息
+    groupList, //分组列表
+  },
+  data: () => ({
+    role: '4',
+    groupList: [],
+    form: {},
+    show: false,
+  }),
+  created() {
+    this.searchInfo();
+  },
+  computed: {
+    keyWord() {
+      let meta = this.$route.meta;
+      let main = meta.title || '';
+      return main;
+    },
+  },
+  methods: {
+    ...mapGroup(['query', 'create', 'delete']),
+    clickAdd() {
+      this.show = true;
+    },
+    async searchInfo({ ...info } = {}) {
+      const res = await this.query({ ...info });
+      this.$set(this, `groupList`, res.data);
+    },
+    async onSubmit(form) {
+      let data = this.form;
+      let res = await this.create(data);
+      let msg = `${this.keyWord}创建分组成功`;
+      if (this.$checkRes(res, msg)) this.show = false;
+      this.searchInfo();
+    },
+    // 删除组
+    // async shanchu(id) {
+    //   console.log(id);
+    //   const res = await this.delete(id);
+    //   this.$checkRes(res, '删除成功', '删除失败');
+    //   this.searchInfo();
+    // },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.info {
+  width: 100%;
+  min-height: 667px;
+  position: relative;
+  background-color: #edeae8;
+}
+.top {
+  height: 50px;
+  line-height: 50px;
+  margin: 0 0 10px 0;
+  background: #fff;
+}
+.top .title {
+  padding: 0 15px;
+  font-size: 20px;
+}
+.top .btn {
+  text-align: right;
+  padding: 0 30px;
+}
+.main {
+  margin: 0 0 50px 0;
+}
+</style>

src/views/class/index.vue

@@ -3,18 +3,23 @@
     <el-row>
       <el-col :span="24" class="info">
         <el-col :span="24" class="top">
-          <el-col :span="15" class="title">
+          <el-col :span="10" class="title">
             班级学生名单
           </el-col>
-          <el-col :span="9" class="btn">
-            <el-button type="primary" @click="$router.push({ path: '/' })">上成绩</el-button>
+          <el-col :span="7" class="btn">
+            <el-button type="primary" @click="$router.push({ path: '/class/group' })">分组</el-button>
           </el-col>
+          <span v-if="role === '4'">
+            <el-col :span="7" class="btn">
+              <el-button type="primary" @click="$router.push({ path: '/class/achieve' })">上成绩</el-button>
+            </el-col>
+          </span>
         </el-col>
         <el-col :span="24" class="main">
-          <span v-if="role === '学生'">
+          <span v-if="role === '4'">
             <studentList :studentList="studentList"></studentList>
           </span>
-          <span v-if="role === '班主任'">
+          <span v-if="role === '1'">
             <teaStudentList :studentList="studentList" :show="show" :form="form" @clickUpdate="clickDialog" @submit="submitUpdate"></teaStudentList>
           </span>
         </el-col>
@@ -62,7 +67,7 @@ export default {
         major: '应用软件技术专业',
       },
     ],
-    role: '班主任',
+    role: '4',
     show: false,
     form: {
       name: '流域',
@@ -101,8 +106,7 @@ export default {
   font-size: 20px;
 }
 .top .btn {
-  text-align: right;
-  padding: 0 30px;
+  text-align: center;
 }
 .main {
   margin: 0 0 50px 0;

src/views/class/joinGroup.vue

@@ -0,0 +1,113 @@
+<template>
+  <div id="joinGroup">
+    <el-row>
+      <el-col :span="24" class="info">
+        <el-col :span="24" class="top">
+          <el-col :span="15" class="title">
+            {{ groupName }}
+          </el-col>
+          <el-col :span="9" class="btn">
+            <el-button type="primary" @click="joinGroup()">进组</el-button>
+          </el-col>
+        </el-col>
+        <el-col :span="24" class="main">
+          <groupStuList :groupStuList="groupStuList" @clickLeader="clickLeader" @clickOut="clickOut"></groupStuList>
+        </el-col>
+        <el-col :span="24" class="foot">
+          <footInfo></footInfo>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import footInfo from '@/layout/index/footInfo.vue';
+import groupStuList from '@/layout/class/groupStuList.vue';
+
+import { createNamespacedHelpers, mapGetters } from 'vuex';
+const { mapActions: mapGroup } = createNamespacedHelpers('group');
+export default {
+  name: 'joinGroup',
+  props: {},
+  components: {
+    footInfo, //底部信息
+    groupStuList, //组学生列表
+  },
+  data: () => ({
+    groupName: '',
+    groupStuList: [
+      {
+        name: '流域',
+      },
+    ],
+  }),
+  created() {
+    this.searchInfo();
+  },
+  computed: {
+    id() {
+      return this.$route.query.id;
+    },
+    keyWord() {
+      let meta = this.$route.meta;
+      let main = meta.title || '';
+      return main;
+    },
+  },
+  methods: {
+    ...mapGroup(['query', 'create', 'delete', 'fetch', 'update', 'insert', 'exit']),
+    async searchInfo() {
+      if (this.$route.query.id) {
+        const res = await this.fetch(this.id);
+        this.$set(this, `groupName`, res.data.name);
+        // this.$set(this, `groupStuList`, res.data.studentid);
+        for (const val of res.data.studentid) {
+          console.log(val);
+        }
+      }
+    },
+    async joinGroup() {
+      const res = await this.insert({ groupid: this.id, studentid: '20200220' });
+      const msg = `${this.keyWord}进组成功`;
+      if (this.$checkRes(res, msg));
+      this.searchInfo();
+    },
+    async clickOut() {
+      const res = await this.exit({ groupid: this.id, studentid: '20200220' });
+      const msg = `${this.keyWord}退组成功`;
+      if (this.$checkRes(res, msg));
+      this.searchInfo();
+    },
+    clickLeader() {
+      console.log('指派组长');
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.info {
+  width: 100%;
+  min-height: 667px;
+  position: relative;
+  background-color: #edeae8;
+}
+.top {
+  height: 50px;
+  line-height: 50px;
+  margin: 0 0 10px 0;
+  background: #fff;
+}
+.top .title {
+  padding: 0 15px;
+  font-size: 20px;
+}
+.top .btn {
+  text-align: right;
+  padding: 0 30px;
+}
+.main {
+  margin: 0 0 50px 0;
+}
+</style>

src/views/index.vue

@@ -2,7 +2,7 @@
   <div id="index">
     <el-row class="info">
       <el-col :span="24" class="top">
-        <topInfo :logoPic="logoPic"></topInfo>
+        <topInfo></topInfo>
       </el-col>
       <el-col :span="24" class="main">
         <tableData :timeTable="timeTable"></tableData>
@@ -27,7 +27,6 @@ export default {
     footInfo, //底部信息
   },
   data: () => ({
-    logoPic: require('@/assets/1.jpg'),
     timeTable: {
       term: '1',
       class: '一班',
@@ -76,7 +75,7 @@ export default {
 }
 .top {
   width: 100%;
-  height: 200px;
+  height: 46px;
   overflow: hidden;
 }
 .main {

src/views/user/checkWork.vue

@@ -2,8 +2,19 @@
   <div id="checkWork">
     <el-row>
       <el-col :span="24" class="info">
+        <el-col :span="24" class="top">
+          <el-col :span="15" class="title">
+            学生考勤情况
+          </el-col>
+          <el-col :span="9" class="btn">
+            <el-button type="primary" @click="checkClick()">考勤</el-button>
+          </el-col>
+        </el-col>
         <el-col :span="24" class="main">
-          <checkList :info="info"></checkList>
+          <checkList></checkList>
+        </el-col>
+        <el-col :span="24" class="foot">
+          <footInfo></footInfo>
         </el-col>
       </el-col>
     </el-row>
@@ -12,26 +23,17 @@
 
 <script>
 import checkList from '@/layout/user/checkList.vue';
+import footInfo from '@/layout/index/footInfo.vue';
 import { createNamespacedHelpers, mapGetters } from 'vuex';
 const { mapActions: mapCheck } = createNamespacedHelpers('attendance');
 export default {
   name: 'checkWork',
   props: {},
   components: {
-    checkList,
+    checkList, //考勤列表
+    footInfo, //底部信息
   },
-  data: () => ({
-    info: {
-      classid: '1234560',
-      attend: [
-        {
-          date: '2020-02-19',
-          time: '8:30',
-          status: '0',
-        },
-      ],
-    },
-  }),
+  data: () => ({}),
   created() {
     this.searchInfo();
   },
@@ -43,6 +45,9 @@ export default {
       console.log(res.data);
       // this.$set(this, `leaveList`, res.data);
     },
+    checkClick() {
+      console.log('考勤管理');
+    },
   },
 };
 </script>
@@ -54,4 +59,21 @@ export default {
   position: relative;
   background-color: #edeae8;
 }
+.top {
+  height: 50px;
+  line-height: 50px;
+  margin: 0 0 10px 0;
+  background: #fff;
+}
+.top .title {
+  padding: 0 15px;
+  font-size: 20px;
+}
+.top .btn {
+  text-align: right;
+  padding: 0 30px;
+}
+.main {
+  margin: 0 0 50px 0;
+}
 </style>

src/views/user/index.vue

@@ -2,6 +2,9 @@
   <div id="index">
     <el-row>
       <el-col :span="24" class="info">
+        <el-col :span="24" class="native">
+          <topNative></topNative>
+        </el-col>
         <el-col :span="24" class="top">
           <topInfo :info="info"></topInfo>
         </el-col>
@@ -17,6 +20,7 @@
 </template>
 
 <script>
+import topNative from '@/layout/index/topInfo.vue';
 import topInfo from '@/layout/user/topInfo.vue';
 import clickBtn from '@/layout/user/clickBtn.vue';
 import footInfo from '@/layout/index/footInfo.vue';
@@ -24,6 +28,7 @@ export default {
   name: 'index',
   props: {},
   components: {
+    topNative, //头部导航
     topInfo, //个人信息
     clickBtn, //功能按钮
     footInfo, //底部信息

src/views/user/personalDetail.vue

@@ -3,66 +3,10 @@
     <el-row>
       <el-col :span="24" class="info">
         <el-col :span="24" class="top">
-          学生个人信息
+          <topNative></topNative>
         </el-col>
         <el-col :span="24" class="message">
-          <p>
-            <span class="title">姓名:</span><span class="content">{{ messInfo.name }}</span>
-          </p>
-          <p>
-            <span class="title">身份证号:</span><span class="content">{{ messInfo.id_number }}</span>
-          </p>
-          <p>
-            <span class="title">性别:</span><span class="content">{{ messInfo.gender }}</span>
-          </p>
-          <p>
-            <span class="title">民族:</span><span class="content">{{ messInfo.nation }}</span>
-          </p>
-          <p>
-            <span class="title">手机号:</span><span class="content">{{ messInfo.phone }}</span>
-          </p>
-          <p>
-            <span class="title">学校名称:</span><span class="content">{{ messInfo.school_name }}</span>
-          </p>
-          <p>
-            <span class="title">院系:</span><span class="content">{{ messInfo.faculty }}</span>
-          </p>
-          <p>
-            <span class="title">专业:</span><span class="content">{{ messInfo.major }}</span>
-          </p>
-          <p>
-            <span class="title">入学年份:</span><span class="content">{{ messInfo.entry_year }}</span>
-          </p>
-          <p>
-            <span class="title">毕业年份:</span><span class="content">{{ messInfo.finish_year }}</span>
-          </p>
-          <p>
-            <span class="title">在校担任职务:</span><span class="content">{{ messInfo.school_job }}</span>
-          </p>
-          <p>
-            <span class="title">QQ:</span><span class="content">{{ messInfo.qq }}</span>
-          </p>
-          <p>
-            <span class="title">E-mail:</span><span class="content">{{ messInfo.email }}</span>
-          </p>
-          <p>
-            <span class="title" style="position: relative;top: -20px;">家庭所在地:</span><span class="content">{{ messInfo.family_place }}</span>
-          </p>
-          <p>
-            <span class="title">职务:</span><span class="content">{{ messInfo.job }}</span>
-          </p>
-          <p>
-            <span class="title">所在期数:</span><span class="content">{{ messInfo.termid }}</span>
-          </p>
-          <p>
-            <span class="title">所在批次:</span><span class="content">{{ messInfo.batchid }}</span>
-          </p>
-          <p>
-            <span class="title">所在班级:</span><span class="content">{{ messInfo.classid }}</span>
-          </p>
-          <p>
-            <span class="title">所在寝室:</span><span class="content">{{ messInfo.bedroomid }}</span>
-          </p>
+          <messageInfo :messInfo="messInfo"></messageInfo>
         </el-col>
       </el-col>
     </el-row>
@@ -70,10 +14,16 @@
 </template>
 
 <script>
+import topNative from '@/layout/index/topInfo.vue';
+import messageInfo from '@/layout/user/messageInfo.vue';
+
 export default {
   name: 'personalDetail',
   props: {},
-  components: {},
+  components: {
+    topNative, //头部导航
+    messageInfo, //学生信息
+  },
   data: () => ({
     messInfo: {
       name: '刘裕',
@@ -111,27 +61,27 @@ p {
 .info {
   width: 100%;
   height: 100%;
-  background-color: #edeae8;
+  background-color: #f9fafc;
 }
-.info .top {
-  text-align: center;
-  padding: 15px 0;
-  font-size: 30px;
+.top {
+  height: 46px;
+  background-color: #fff;
+  overflow: hidden;
 }
 .message {
-  padding: 0 0 10px 15px;
-}
-.message p {
-  padding: 5px 0;
-}
-.message p .title {
-  display: inline-block;
-  text-align: left;
-  width: 110px;
-}
-.message p .content {
-  display: inline-block;
-  text-align: left;
-  width: 235px;
+  min-height: 667px;
 }
+// .message p {
+//   padding: 5px 0;
+// }
+// .message p .title {
+//   display: inline-block;
+//   text-align: left;
+//   width: 110px;
+// }
+// .message p .content {
+//   display: inline-block;
+//   text-align: left;
+//   width: 235px;
+// }
 </style>

vue.config.js

@@ -1,4 +1,5 @@
 const path = require('path');
+const question = path.resolve(__dirname, '../question-examine');
 module.exports = {
   publicPath: '/',
   configureWebpack: config => {
@@ -9,6 +10,7 @@ module.exports = {
           '@': path.resolve(__dirname, './src'),
           '@c': path.resolve(__dirname, './src/components'),
           '@a': path.resolve(__dirname, './src/assets'),
+          '@question': question,
         },
       },
     });