lrf402788946 4 tahun lalu
induk
melakukan
0e01fb68e3

+ 66 - 30
src/router/index.js

@@ -21,42 +21,79 @@ const routes = [
     component: () => import('@/views/index.vue'),
     children: [
       ...newPlan,
-      {
-        path: '/plan/index',
-        name: 'plan_list',
-        meta: { title: '计划', sub: '管理' },
-        component: () => import('@/views/plan/index.vue'),
-      },
-      {
-        path: '/plan/detail',
-        name: 'plan_detail',
-        meta: { title: '计划', sub: '详情' },
-        component: () => import('@/views/plan/detail.vue'),
-      },
       // {
       //   path: '/classes/index',
       //   name: 'classes_index',
       //   meta: { title: '班级管理' },
       //   component: () => import('@/views/classes/index.vue'),
       // },
+      // {
+      //   path: '/classes/index',
+      //   name: 'classes_list',
+      //   meta: { title: '班级列表' },
+      //   component: () => import('@/views/classes/classes.vue'),
+      // },
       {
-        path: '/classes/index',
-        name: 'classes_list',
-        meta: { title: '班级列表' },
+        path: '/train/plan/remind',
+        name: 'remind_index',
+        meta: { title: '班级列表', act: '通知' },
+        component: () => import('@/views/classes/classes.vue'),
+      },
+      {
+        path: '/student/index',
+        name: 'student_index',
+        meta: { title: '学生管理' },
+        component: () => import('@/views/classes/name-list.vue'),
+      },
+      {
+        path: '/train/plan/print',
+        name: 'print_index',
+        meta: { title: '班级列表', act: '打印' },
         component: () => import('@/views/classes/classes.vue'),
       },
       {
-        path: '/classes/qingjia',
-        name: 'classes_qingjia',
-        meta: { title: '请假管理' },
-        component: () => import('@/views/classes/qingjia.vue'),
+        path: '/train/plan/leave',
+        name: 'leave_index',
+        meta: { title: '请假查看' },
+        component: () => import('@/views/classes/leave.vue'),
       },
       {
-        path: '/classes/name/list',
-        name: 'classes_name_list',
-        meta: { title: '班级', sub: '名单' },
-        component: () => import('@/views/classes/name-list.vue'),
+        path: '/train/plan/attendance',
+        name: 'attendance_index',
+        meta: { title: '考勤管理' },
+        component: () => import('@/views/classes/attendance.vue'),
+      },
+      {
+        path: '/train/plan/score',
+        name: 'score_index',
+        meta: { title: '班级列表', act: '学生成绩' },
+        component: () => import('@/views/classes/classes.vue'),
+      },
+      {
+        path: '/statistics/question/index',
+        name: 'statistics_index',
+        meta: { title: '班级列表', act: '问卷统计' },
+        component: () => import('@/views/classes/classes.vue'),
+      },
+      // {
+      //   path: '/classes/leave',
+      //   name: 'classes_leave',
+      //   meta: { title: '请假管理' },
+      //   component: () => import('@/views/classes/leave.vue'),
+      // },
+
+      {
+        path: '/train/plan/leave',
+        name: 'leave_index',
+        meta: { title: '班级列表' },
+        component: () => import('@/views/classes/classes.vue'),
       },
+      // {
+      //   path: '/student/index',
+      //   name: 'student_index',
+      //   meta: { title: '班级', sub: '名单' },
+      //   component: () => import('@/views/classes/name-list.vue'),
+      // },
       {
         path: '/classes/lesson',
         name: 'classes_lesson',
@@ -77,12 +114,12 @@ const routes = [
         meta: { title: '班级', sub: '学生名单' },
         component: () => import('@/views/classes/namCard.vue'),
       },
-      {
-        path: '/classes/attendance',
-        name: 'classes_attendance',
-        meta: { title: '考勤管理', sub: '考勤' },
-        component: () => import('@/views/classes/attendance.vue'),
-      },
+      // {
+      //   path: '/classes/attendance',
+      //   name: 'classes_attendance',
+      //   meta: { title: '考勤管理', sub: '考勤' },
+      //   component: () => import('@/views/classes/attendance.vue'),
+      // },
       {
         path: '/student/detail',
         name: 'student_detail',
@@ -112,7 +149,6 @@ const router = new VueRouter({
   routes,
 });
 router.beforeEach((to, form, next) => {
-  console.log(store);
   store.commit('setUser');
   store.dispatch('setting/checkCache');
   if (to.name === 'login') {

+ 6 - 8
src/views/classes/attendance.vue

@@ -25,12 +25,11 @@ export default {
     options: [],
     dataList: [],
   }),
-  created() {
-    this.search();
-  },
+  created() {},
   computed: {
+    ...mapState(['user', 'defaultOption']),
     id() {
-      return this.$route.query.id;
+      return this.defaultOption.classid;
     },
     pageTitle() {
       return `${this.$route.meta.title}`;
@@ -121,11 +120,10 @@ export default {
     return { title: this.$route.meta.title };
   },
   watch: {
-    classId: {
+    id: {
       handler(val) {
-        if (val) {
-          this.search();
-        }
+        if (val) this.search();
+        else this.$set(this, `tableData`, []);
       },
       immediate: true,
     },

+ 62 - 49
src/views/classes/classes.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="index">
-    <list-frame title="班级管理" :needPage="false" :needFilter="false" :needAdd="false" :total="total">
+    <list-frame :title="pageTitle" :needPag="false" :needFilter="false" :needAdd="false">
       <el-card style="padding:10px">
         <data-table
           :fields="fields"
@@ -10,7 +10,7 @@
           @completion="toCompletion"
           @lesson="toLesson"
           @bedRoom="toBedRoom"
-          @qingjia="toQj"
+          @leave="toQj"
           @attendance="toAtt"
         ></data-table>
       </el-card>
@@ -32,51 +32,60 @@ export default {
     listFrame,
     dataTable,
   },
-  data: () => ({
-    selectInfo: {},
-    termList: [],
-    batchList: [],
-    list: [],
-    opera: [
-      {
-        label: '班级名单',
-        icon: 'el-icon-user',
-        method: 'edit',
-      },
-      {
-        label: '查看问卷进度',
-        icon: 'el-icon-s-order',
-        method: 'completion',
-      },
-      {
-        label: '查看课程表',
-        icon: 'el-icon-date',
-        method: 'lesson',
-      },
-      {
-        label: '查看寝室',
-        icon: 'el-icon-s-home',
-        method: 'bedRoom',
-      },
-      {
-        label: '请假管理',
-        icon: 'el-icon-timer',
-        method: 'qingjia',
-      },
-      {
-        label: '考勤管理',
-        icon: 'el-icon-map-location',
-        method: 'attendance',
-      },
-    ],
-    fields: [
-      { label: '批次', prop: 'batch' },
-      { label: '班级名称', prop: 'name' },
-      { label: '人数', prop: 'number' },
-      { label: '班级类型', prop: 'type', format: i => (i === '1' ? '特殊班级' : '正常班级') },
-    ],
-    total: 0,
-  }),
+  data: function() {
+    var that = this;
+    return {
+      selectInfo: {},
+      termList: [],
+      batchList: [],
+      list: [],
+      opera: [
+        {
+          label: '班级名单',
+          icon: 'el-icon-user',
+          display: () => that.whitchRouter('student'),
+          method: 'edit',
+        },
+        {
+          label: '查看问卷进度',
+          icon: 'el-icon-s-order',
+          display: () => that.whitchRouter('completion'),
+          method: 'completion',
+        },
+        {
+          label: '查看课程表',
+          icon: 'el-icon-date',
+          display: () => that.whitchRouter('lesson'),
+          method: 'lesson',
+        },
+        {
+          label: '查看寝室',
+          icon: 'el-icon-s-home',
+          display: () => that.whitchRouter('bedRoom'),
+          method: 'bedRoom',
+        },
+        {
+          label: '请假管理',
+          icon: 'el-icon-timer',
+          display: () => that.whitchRouter('leave'),
+          method: 'leave',
+        },
+        {
+          label: '考勤管理',
+          icon: 'el-icon-map-location',
+          display: () => that.whitchRouter('attendance'),
+          method: 'attendance',
+        },
+      ],
+      fields: [
+        { label: '批次', prop: 'batch' },
+        { label: '班级名称', prop: 'name' },
+        { label: '人数', prop: 'number' },
+        { label: '班级类型', prop: 'type', format: i => (i === '1' ? '特殊班级' : '正常班级') },
+      ],
+      total: 0,
+    };
+  },
   created() {
     this.getClasses();
   },
@@ -92,7 +101,7 @@ export default {
   methods: {
     ...trainPlan(['fetch']),
     ...classes(['query', 'delete']),
-    //根据批次id,查询下面的班级
+    //根据默认期,查询下面的班级
     async getClasses(data) {
       let res = {};
       if (this.defaultOption.termid) {
@@ -119,11 +128,15 @@ export default {
       this.$router.push({ path: '/classes/bedroom', query: { id: data.id } });
     },
     toQj({ data }) {
-      this.$router.push({ path: '/classes/qingjia', query: { id: data.id } });
+      this.$router.push({ path: '/classes/leave', query: { id: data.id } });
     },
     toAtt({ data }) {
       this.$router.push({ path: '/classes/attendance', query: { id: data.id } });
     },
+    whitchRouter(keyword) {
+      let name = this.$route.name;
+      return name.includes(keyword);
+    },
   },
   watch: {
     defaultOption: {

+ 10 - 11
src/views/classes/qingjia.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="qingjia">
+  <div id="leave">
     <listFrame :title="pageTitle" @query="search" :total="total" :needFilter="false" :returns="toreturn" :needAdd="false">
       <leaveInfo :tableData="tableData"></leaveInfo>
     </listFrame>
@@ -13,7 +13,7 @@ import leaveInfo from '@frame/parts/leave';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: leave } = createNamespacedHelpers('leave');
 export default {
-  name: 'qingjia',
+  name: 'leave',
   props: {},
   components: { leaveInfo, listFrame },
   data: function() {
@@ -23,17 +23,14 @@ export default {
       tableData: [],
     };
   },
-  created() {
-    this.search();
-  },
+  created() {},
   methods: {
     ...leave(['fetch', 'query']),
     async search({ skip = 0, limit = 10, ...info } = {}) {
+      if (!this.id) return;
       const leaveInfo = await this.query({ skip, limit, ...info, classid: this.id });
       if (leaveInfo.errcode == 0) {
         this.$set(this, `tableData`, leaveInfo.data);
-        console.log(this.tableData);
-
         this.$set(this, 'total', leaveInfo.total);
       }
     },
@@ -42,25 +39,27 @@ export default {
     },
   },
   computed: {
-    ...mapState(['user']),
+    ...mapState(['user', 'defaultOption']),
     pageTitle() {
       return `${this.$route.meta.title}`;
     },
     id() {
-      return this.$route.query.id;
+      return this.defaultOption.classid;
     },
   },
   metaInfo() {
     return { title: this.$route.meta.title };
   },
   watch: {
-    classId: {
+    id: {
       handler(val) {
+        console.log(val);
         if (val) {
           this.search();
-        }
+        } else this.$set(this, `tableData`, []);
       },
       immediate: true,
+      deep: true,
     },
   },
 };

+ 1 - 170
src/views/classes/namCard.vue

@@ -29,176 +29,7 @@ export default {
   },
   data: function() {
     return {
-      list: [
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟顾',
-        },
-        {
-          name: '顾红伟顾红',
-        },
-        {
-          name: '顾红伟顾红伟',
-        },
-        {
-          name: '顾红伟顾红伟顾',
-        },
-        {
-          name: '顾红伟顾红伟顾红',
-        },
-        {
-          name: '顾红伟顾红伟顾红伟',
-        },
-        {
-          name: '顾红伟顾红伟顾红伟顾',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-        {
-          name: '顾红伟',
-        },
-      ],
+      list: [],
     };
   },
   created() {},

+ 5 - 34
src/views/classes/name-list.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="name-list">
-    <list-frame :title="mainTitle" @query="search" :total="total" :needFilter="false" :returns="toreturn" :needAdd="false">
+    <list-frame :title="mainTitle" @query="search" :total="total" :needFilter="false" :needAdd="false">
       <el-col :span="24" class="printingBtn">
         <el-button type="primary" size="mini" @click="toPrint()">打印名牌</el-button>
       </el-col>
@@ -28,7 +28,7 @@
 import listFrame from '@frame/layout/admin/list-frame';
 import dataTable from '@frame/components/data-table';
 import dataForm from '@frame/components/form';
-import { createNamespacedHelpers } from 'vuex';
+import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions } = createNamespacedHelpers('student');
 export default {
   metaInfo: { title: '班级名单' },
@@ -61,43 +61,12 @@ export default {
     fields: [
       { label: '姓名', prop: 'name' },
       { label: '性别', prop: 'gender' },
-      // { label: '期', prop: 'term' },
-      // { label: '批次', prop: 'batch' },
-      // { label: '班级', prop: 'class' },
       { label: '民族', prop: 'nation' },
-      // { label: '身份证号', prop: 'id_number' },
       { label: '学校', prop: 'school_name' },
       { label: '院系', prop: 'yard' },
       { label: '专业', prop: 'major' },
       { label: '职务', prop: 'job' },
-      // { label: '入学年份', prop: 'entry_year' },
-      // { label: '毕业年份', prop: 'finish_year' },
-      // { label: '在校曾担任何种职务', prop: 'school_job' },
       { label: '手机号', prop: 'phone' },
-      // { label: 'QQ号', prop: 'qq' },
-      // { label: '邮箱', prop: 'email' },
-      // { label: '家庭所在地', prop: 'family_place' },
-      // {
-      //   label: '家庭是否困难',
-      //   prop: 'family_is_hard',
-      //   format: item => {
-      //     return item === '1' ? '是' : '否';
-      //   },
-      // },
-      // {
-      //   label: '是否获得过助学金',
-      //   prop: 'have_grant',
-      //   format: item => {
-      //     return item === '1' ? '是' : '否';
-      //   },
-      // },
-      // {
-      //   label: '是否优秀',
-      //   prop: 'is_fine',
-      //   format: item => {
-      //     return item === '1' ? '是' : '否';
-      //   },
-      // },
     ],
     list: [],
     total: 0,
@@ -146,8 +115,9 @@ export default {
     },
   },
   computed: {
+    ...mapState(['user', 'defaultOption']),
     id() {
-      return this.$route.query.id;
+      return this.defaultOption.classid;
     },
     mainTitle() {
       let meta = this.$route.meta;
@@ -161,6 +131,7 @@ export default {
     id: {
       handler(val) {
         if (val) this.search();
+        else this.$set(this, `list`, []);
       },
       immediate: true,
     },

+ 0 - 245
src/views/plan/detail.vue

@@ -1,245 +0,0 @@
-<template>
-  <div id="detail">
-    <detail-frame :title="mainTitle" returns="/plan/index">
-      <el-row :gutter="10" type="flex">
-        <el-col :span="12">
-          <el-card header="全年计划信息">
-            <el-form :model="info" label-width="60px" size="small" @submit.native.prevent>
-              <el-form-item label="年份">
-                {{ info.year }}
-              </el-form-item>
-              <el-form-item label="标题" prop="title">
-                {{ info.title }}
-              </el-form-item>
-              <!-- <el-form-item label="备注" prop="remark">
-                <el-input v-model="info.remark" type="textarea" :autosize="{ minRows: 3, maxRows: 5 }"></el-input>
-              </el-form-item> -->
-
-              <el-collapse v-model="collapse" accordion>
-                <el-collapse-item title="无法带班时间列表" name="1">
-                  <data-table :fields="fields" :data="selected" :opera="opera" @delete="toDelete" :height="heights"></data-table>
-                </el-collapse-item>
-              </el-collapse>
-              <el-form-item>
-                <el-row type="flex" align="middle" justify="space-around" style="margin-top:20px">
-                  <el-col :span="6">
-                    <el-button type="primary" @click="savePlan">上报时间</el-button>
-                  </el-col>
-                </el-row>
-              </el-form-item>
-            </el-form>
-          </el-card>
-        </el-col>
-        <el-col :span="16" :style="`width:${widths}px`">
-          <el-card ref="card">
-            <calendar :useDraft="false" @eventClick="eventClick" :events="events"></calendar>
-          </el-card>
-        </el-col>
-      </el-row>
-    </detail-frame>
-  </div>
-</template>
-
-<script>
-import detailFrame from '@frame/layout/admin/detail-frame';
-import calendar from '@frame/components/calendar';
-import dataTable from '@frame/components/data-table';
-import _ from 'lodash';
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions } = createNamespacedHelpers('trainplan');
-const { mapActions: dirPlan } = createNamespacedHelpers('dirPlan');
-export default {
-  metaInfo: { title: '计划详情' },
-  name: 'detail',
-  props: {},
-  components: { detailFrame, calendar, dataTable },
-  data: () => ({
-    info: {},
-    form: {},
-    events: [],
-    collapse: '1',
-    fields: [
-      { label: '名称', prop: 'name' },
-      { label: '期数', prop: 'term' },
-      { label: '班级类型', prop: 'type', format: item => (item === '0' ? '正常班级' : '特殊班级') },
-    ],
-    opera: [
-      {
-        label: '删除',
-        icon: 'el-icon-delete',
-        method: 'delete',
-        confirm: true,
-      },
-    ],
-    heights: 250,
-    selected: [],
-  }),
-  created() {
-    this.search();
-    this.searchDir();
-  },
-  mounted() {},
-  methods: {
-    ...mapActions(['fetch', 'create', 'update']),
-    ...dirPlan({
-      dirQuery: 'query',
-      dirCreatPlan: 'create',
-      dirUpdatePlan: 'update',
-    }),
-    async searchDir() {
-      let res = await this.dirQuery({ trainplanid: this.info.id, headteacherid: this.user.userid });
-      if (this.$checkRes(res)) {
-        let data = JSON.parse(JSON.stringify(res.data));
-        if (res.data.length > 0) {
-          this.$set(this.info, `teaplanid`, data[0]._id);
-          let nobatch = this.events.filter(f => _.find(_.flatten(data.map(i => i.nobatchid)), m => m === f.id));
-          this.$set(this, `selected`, nobatch);
-        }
-      }
-    },
-    //查询计划
-    async search() {
-      const res = await this.fetch(this.id);
-      if (this.$checkRes(res)) this.$set(this, `info`, res.data);
-      let midArr = JSON.parse(JSON.stringify(res.data));
-      let events = [];
-      events = _.flatten(
-        midArr.termnum.map(item => {
-          item.batchnum.map(i => {
-            i.term = item.term;
-            i.termid = item._id; //需要使用期id
-            i.id = i._id;
-            i.start = JSON.parse(JSON.stringify(i.startdate));
-            i.end = JSON.parse(JSON.stringify(i.enddate));
-            i.title = JSON.parse(JSON.stringify(i.name));
-            delete i.startdate, delete i.enddate;
-            return i;
-          });
-          return item.batchnum;
-        })
-      );
-      let vac = midArr.festivals.map(i => {
-        let object = {};
-        object.id = i._id;
-        object.start = i.begindate;
-        object.end = i.finishdate;
-        object.rendering = 'background';
-        object.color = 'red';
-        object.editable = false;
-        return object;
-      });
-      this.$set(this, `events`, events.concat(vac));
-    },
-    //日历事件点击事件
-    eventClick({ event }) {
-      let arr = this.events.filter(fil => fil.id == event.id);
-      let object = {};
-      if (arr.length > 0) {
-        object = arr[0];
-        if (_.has(object, 'editable')) {
-          this.$message.warning(`不能选择假期`);
-          return false;
-        }
-      } else {
-        console.warn(`无对应id事件`);
-        return;
-      }
-      let { id } = object;
-      //查重,查批数id是否存在,存在重复提示;不存在添加
-      let data = object;
-      let re = () => {
-        this.$notify({
-          title: '重复添加该批',
-        });
-      };
-      let push = data => {
-        this.selected.push(data);
-        this.$notify({
-          title: '已添加',
-        });
-      };
-      let res = _.find(this.selected, i => i.id === id);
-      if (!res) push(object);
-      else re();
-    },
-    //列表删除事件
-    toDelete({ data, index }) {
-      this.selected.splice(index, 1);
-    },
-    //保存计划事件
-    savePlan() {
-      // 获取已选择的时间
-      let arr = JSON.parse(JSON.stringify(this.selected));
-      //整理数据
-      let { _id, teaplanid } = this.info;
-      let object = { trainplanid: _id };
-      object.nobatchid = arr.map(i => i.id || i._id);
-      //修改班主任id为登录用户的id
-      object.headteacherid = this.user.userid;
-      let res;
-      let msg;
-      if (!teaplanid) {
-        res = this.dirCreatPlan(object);
-        msg = `时间上报成功`;
-      } else {
-        object.id = teaplanid;
-        res = this.dirUpdatePlan(object);
-        msg = `时间修改成功`;
-      }
-      if (this.$checkRes(res, msg)) this.$router.push({ path: '/plan/index' });
-    },
-    setHeight() {
-      let heights = this.$refs.card.$el.clientHeight * 0.63;
-      this.$set(this, `heights`, heights);
-    },
-    inEvents(start, end, selectStart, selectEnd) {
-      //选中的开始时间和结束时间任意一个时间在事件的范围内,则视为无法上课
-      //前提:开始时间,结束时间都是不能带班的;逐个事件判断,无需考虑当前事件之外的事件
-      //case1: 开始时间<事件开始时间;但是: 1,事件开始时间<=结束时间; 2,事件开始时间<=结束时间<=事件结束时间; 3,事件结束时间<结束时间 => 不能带班
-      //case2: 事件开始时间<=开始时间<=事件结束时间 => 不能带班
-      let s = new Date(start).getTime(), //事件的开始时间
-        e = new Date(end).getTime(), //事件的结束时间
-        ss = new Date(selectStart).getTime(), //选取的开始时间
-        se = new Date(selectEnd).setDate(new Date(selectEnd).getDate() - 1); //选取的结束时间
-      //-1:天是因为我认为教师画到哪天,其实之后那一天就没事了.不过组件 就返回选择结束的下一天,所以才出现-1天的问题
-      let res = s <= ss && ss <= e;
-      if (res) return true;
-      //case2
-      else if (ss < s) {
-        // 开始时间<事件开始时间
-        let res2 = s <= se;
-        //case1
-        if (res2) return true;
-        else return false;
-      } else return false;
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-    widths() {
-      let width = (document.body.clientWidth - 200) * 0.5;
-      return width > 400 ? width : 400;
-    },
-    id() {
-      return this.$route.query.id;
-    },
-    mainTitle() {
-      let meta = this.$route.meta;
-      let main = meta.title || '';
-      let sub = meta.sub || '';
-      return `${main}${sub}`;
-    },
-    keyWord() {
-      let meta = this.$route.meta;
-      let main = meta.title || '';
-      return main;
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-/deep/.el-divider--horizontal {
-  margin: 5px 0;
-}
-</style>

+ 0 - 68
src/views/plan/index.vue

@@ -1,68 +0,0 @@
-<template>
-  <div id="index">
-    <list-frame :title="mainTitle" @query="search" :total="total" :needFilter="false" :needAdd="false">
-      <data-table :fields="fields" :data="list" :opera="opera" @edit="toEdit"></data-table>
-    </list-frame>
-  </div>
-</template>
-
-<script>
-import listFrame from '@frame/layout/admin/list-frame';
-import dataTable from '@frame/components/data-table';
-import { createNamespacedHelpers } from 'vuex';
-const { mapActions } = createNamespacedHelpers('trainplan');
-
-export default {
-  metaInfo: { title: '计划管理' },
-  name: 'index',
-  props: {},
-  components: { listFrame, dataTable },
-  data: () => ({
-    opera: [
-      {
-        label: '查看全年计划',
-        icon: 'el-icon-date',
-        method: 'edit',
-      },
-    ],
-    fields: [
-      { label: '计划标题', prop: 'title' },
-      { label: '年度', prop: 'year' },
-    ],
-    list: [{ name: '2020年计划', time: '2020-2021' }],
-    total: 0,
-  }),
-  created() {
-    this.search();
-  },
-  computed: {
-    mainTitle() {
-      let meta = this.$route.meta;
-      let main = meta.title || '';
-      let sub = meta.sub || '';
-      let title = main + sub;
-      return title;
-    },
-    keyWord() {
-      let meta = this.$route.meta;
-      let main = meta.title || '';
-      return main;
-    },
-  },
-  methods: {
-    ...mapActions(['query', 'delete']),
-    async search({ skip = 0, limit = 10, ...info } = {}) {
-      const res = await this.query({ skip, limit, ...info });
-      if (this.$checkRes(res)) {
-        this.$set(this, `list`, res.data);
-        this.$set(this, `total`, res.total);
-      }
-    },
-    toEdit({ data }) {
-      this.$router.push({ path: '/plan/detail', query: { id: data.id } });
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped></style>