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

src/router/index.js

@@ -60,6 +60,16 @@ const routes = [
         name: 'index_index',
         component: () => import('@/views/work/index.vue'),
       },
+      {
+        path: '/subject/index',
+        name: 'index_index',
+        component: () => import('@/views/subject/index.vue'),
+      },
+      {
+        path: '/subject/detail',
+        name: 'teacher_detail',
+        component: () => import('@/views/subject/detail.vue'),
+      },
     ],
   },
 ];

src/views/Itembank/index.vue

@@ -76,7 +76,15 @@ export default {
   }),
   created() {},
   computed: {},
-  methods: {},
+  methods: {
+    search({ skip = 0, limit = 15, ...info } = {}) {
+      console.log(`in search`);
+    },
+    toEdit(data) {
+      console.log(`in toEdit`);
+      console.log(data);
+    },
+  },
 };
 </script>
 

src/views/questionnaire/index.vue

@@ -42,7 +42,15 @@ export default {
 
   created() {},
   computed: {},
-  methods: {},
+  methods: {
+    search({ skip = 0, limit = 15, ...info } = {}) {
+      console.log(`in search`);
+    },
+    toEdit(data) {
+      console.log(`in toEdit`);
+      console.log(data);
+    },
+  },
 };
 </script>
 

src/views/subject/detail.vue

@@ -0,0 +1,19 @@
+<template>
+  <div id="detail">
+    <p>detail</p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'detail',
+  props: {},
+  components: {},
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>

src/views/subject/index.vue

@@ -0,0 +1,55 @@
+<template>
+  <div id="index">
+    <list-frame title="科目列表页" @query="search" :filter="filFields">
+      <data-table :fields="fields" :data="index" :opera="opera" @edit="toEdit"></data-table>
+    </list-frame>
+  </div>
+</template>
+
+<script>
+import listFrame from '@frame/layout/admin/list-frame';
+import dataTable from '@frame/layout/admin/data-table';
+export default {
+  name: 'index',
+  props: {},
+  components: {
+    dataTable,
+    listFrame,
+  },
+  data: () => ({
+    opera: [
+      {
+        label: '编辑',
+        icon: 'el-icon-edit',
+        method: 'edit',
+      },
+    ],
+    fields: [
+      { label: '科目名称', prop: 'name' },
+      { label: '科目代码', prop: 'code' },
+    ],
+    index: [
+      { name: '问卷1', code: '12' },
+      { name: '问卷2', code: '12' },
+      { name: '问卷3', code: '12' },
+    ],
+    filFields: [
+      { label: '科目名称', model: 'name' },
+      { label: '科目代码', model: 'code' },
+    ],
+  }),
+  created() {},
+  computed: {},
+  methods: {
+    search({ skip = 0, limit = 15, ...info } = {}) {
+      console.log(`in search`);
+    },
+    toEdit(data) {
+      console.log(`in toEdit`);
+      console.log(data);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>

src/views/teacher/index.vue

@@ -127,7 +127,15 @@ export default {
   }),
   created() {},
   computed: {},
-  methods: {},
+  methods: {
+    search({ skip = 0, limit = 15, ...info } = {}) {
+      console.log(`in search`);
+    },
+    toEdit(data) {
+      console.log(`in toEdit`);
+      console.log(data);
+    },
+  },
 };
 </script>
 

src/views/work/detail.vue

@@ -1,19 +1,168 @@
 <template>
   <div id="detail">
-    <p>detail</p>
+    <detail-frame title="作业详情页" returns="./index">
+      <data-form :fields="fields" :rules="rules" @save="handleSave" :isNew="isNew">
+        <template #options="{item}">
+          <template v-if="item.model === 'state'">
+            <el-option label="注册" value="0"></el-option>
+            <el-option label="确认身份" value="1"></el-option>
+            <el-option label="资料评分" value="2"></el-option>
+            <el-option label="面试评分" value="3"></el-option>
+            <el-option label="确认入库" value="4"></el-option>
+          </template>
+          <template v-if="item.model === 'tltype'">
+            <el-option label="ppt" value="0"></el-option>
+            <el-option label="视频" value="1"></el-option>
+            <el-option label="教案" value="2"></el-option>
+          </template>
+        </template>
+        <template #radios="{item}">
+          <template v-if="item.model === 'sex'">
+            <el-radio label="0">男</el-radio>
+            <el-radio label="1">女</el-radio>
+          </template>
+          <template v-if="item.model === 'tea'">
+            <el-radio label="1">是</el-radio>
+            <el-radio label="0">否</el-radio>
+          </template>
+        </template>
+        <template #custom="{ item, form, fieldChange }">
+          <el-button type="text" @click="dialogFormVisible = true">选择题类型</el-button>
+          <el-dialog title="选择题类型" :visible.sync="dialogFormVisible">
+            <el-form :model="form">
+              <template>
+                <el-tabs v-model="activeName" @tab-click="handleClick">
+                  <el-tab-pane label="单选" name="first">
+                    <data-table :fields="fieldss" :data="index" :opera="opera" @edit="toEdit"></data-table>
+                  </el-tab-pane>
+                  <el-tab-pane label="多选" name="first"></el-tab-pane>
+                  <el-tab-pane label="问答" name="third">
+                    <el-form ref="form" :model="form" label-width="80px">
+                      <el-form-item label="问答">
+                        <el-input v-model="form.duoxuan" placeholder="请输入问答题"></el-input>
+                      </el-form-item>
+                    </el-form>
+                  </el-tab-pane>
+                </el-tabs>
+              </template>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+              <el-button @click="dialogFormVisible = false">取 消</el-button>
+              <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
+            </div>
+          </el-dialog>
+        </template>
+      </data-form>
+    </detail-frame>
   </div>
 </template>
 
 <script>
+import dataTable from '@frame/layout/admin/data-table';
+import detailFrame from '@frame/layout/admin/detail-frame';
+import dataForm from '@frame/components/form';
+import upload from '@frame/components/upload';
 export default {
+  metaInfo: { title: '题库详情页' },
   name: 'detail',
   props: {},
-  components: {},
-  data: () => ({}),
+  components: {
+    detailFrame,
+    dataForm,
+    dataTable,
+  },
+  data: () => ({
+    opera: [
+      {
+        label: '编辑',
+        icon: 'el-icon-edit',
+        method: 'edit',
+      },
+    ],
+
+    activeName: '',
+    dialogTableVisible: false,
+    dialogFormVisible: false,
+    form: {
+      duoxuan: '',
+      name: '',
+      region: '',
+      date1: '',
+      date2: '',
+      delivery: false,
+      type: [],
+      resource: '',
+      desc: '',
+    },
+    formLabelWidth: '120px',
+    fieldss: [
+      { label: '序号', required: true, model: 'zuoyeid' },
+      { label: '名称', required: true, model: 'zuoyename' },
+      { label: '答案', required: true, model: 'answer' },
+    ],
+
+    index: [{ zuoyeid: '1' }],
+    fields: [
+      { label: '作业名称', required: true, model: 'name' },
+      { label: '状态', required: true, model: 'state', type: `select` },
+      { label: '作业代码', required: true, model: 'optionid' },
+      { label: '标题', required: true, model: 'title' },
+
+      { label: 'openid', required: true, model: 'openid' },
+      { label: '题型', required: true, model: 'type', type: 'wenjian', custom: true },
+    ],
+    rules: {
+      name: [{ required: true, message: '请输入作业姓名' }],
+      state: [{ required: true, message: '请选择状态' }],
+      optionid: [{ required: true, message: '请选择作业代码' }],
+      title: [{ required: true, message: '请选择标题' }],
+      openid: [{ required: true, message: '请输入openid' }],
+    },
+  }),
   created() {},
-  computed: {},
-  methods: {},
+  computed: {
+    isNew() {
+      return this.$route.query.id ? false : true;
+    },
+  },
+  methods: {
+    search({ skip = 0, limit = 15, ...info } = {}) {
+      console.log(`in search`);
+    },
+    toEdit(data) {
+      console.log(`in toEdit`);
+      console.log(data);
+    },
+    handleClick(tab, event) {
+      console.log(tab, event);
+    },
+
+    uploadSuccess() {},
+    async handleSave({ isNew, data }) {
+      console.log(isNew);
+      console.log(data);
+    },
+  },
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="less" scoped>
+/deep/.el-tabs__nav-wrap::after {
+  content: '';
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  height: 2px;
+  background-color: #ffffff;
+  z-index: 1;
+}
+
+/deep/.el-tabs__active-bar {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  height: 2px;
+  background-color: #ffffff;
+}
+</style>

src/views/work/index.vue

@@ -35,7 +35,6 @@ export default {
           return item === '0' ? '单选' : item === '1' ? '多选' : item === '2' ? '问答' : '其他';
         },
       },
-      { label: '题目', prop: 'timu' },
       {
         label: '状态',
         prop: 'state',
@@ -44,16 +43,12 @@ export default {
         },
       },
     ],
-    index: [
-      { id: '题编号', name: '礼仪题01', type: '1', state: '1', optionid: '1', optionname: 'a', answer: 'a' },
-      { id: '题编号', name: 'sss', type: '0', state: '1', optionid: '1', optionname: 'a', answer: 'a' },
-      { id: '题编号', name: 'test5', type: '2', state: '0', optionid: '1', optionname: 'a', answer: 'a' },
-    ],
+    index: [{ id: '题编号', name: '礼仪题01', title: '标题', timu: '0123', type: '1', state: '1' }],
     filFields: [
-      { label: '题名', model: 'name' },
+      { label: '科目名称', model: 'name' },
 
       {
-        label: '题类型',
+        label: '问题类型',
         model: 'type',
         type: 'select',
         list: [
@@ -63,7 +58,7 @@ export default {
         ],
       },
       {
-        label: '题状态',
+        label: '科目状态',
         model: 'state',
         type: 'select',
         list: [
@@ -75,7 +70,15 @@ export default {
   }),
   created() {},
   computed: {},
-  methods: {},
+  methods: {
+    search({ skip = 0, limit = 15, ...info } = {}) {
+      console.log(`in search`);
+    },
+    toEdit(data) {
+      console.log(`in toEdit`);
+      console.log(data);
+    },
+  },
 };
 </script>