Explorar el Código

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

lrf402788946 hace 5 años
padre
commit
0d6dd54749

+ 11 - 0
src/router/index.js

@@ -60,6 +60,17 @@ const routes = [
         name: 'work_index',
         component: () => import('@/views/work/index.vue'),
       },
+      {
+        path: '/work/look',
+        name: 'index_index',
+        component: () => import('@/views/work/look.vue'),
+      },
+
+      {
+        path: '/work/lookdetail',
+        name: 'index_index',
+        component: () => import('@/views/work/lookdetail.vue'),
+      },
       {
         path: '/subject/index',
         name: 'subject_index',

+ 0 - 2
src/views/teacher/detail.vue

@@ -55,9 +55,7 @@ export default {
       { label: '手机号', required: true, model: 'tel' },
       { label: '身份证号', required: true, model: 'card' },
       { label: '教师资格证号', required: true, model: 'teacard' },
-      { label: '学校代码', required: true, model: 'schoolid' },
       { label: '学校名称', required: true, model: 'schoolname' },
-      { label: '所属学校', required: true, model: 'schooid' }, //需要在保存时将名称过滤出来填上,不是选的或者写的
       { label: '邮箱', required: true, model: 'email' },
       { label: '年龄', required: true, model: 'age' },
       { label: '出生日期', required: true, model: 'birthday' },

+ 7 - 7
src/views/work/detail.vue

@@ -2,7 +2,7 @@
   <div id="detail">
     <detail-frame title="作业详情页" returns="/work/index">
       <data-form :fields="fields" :rules="rules" @save="handleSave" :isNew="isNew">
-        <template #options="{item}">
+        <!-- <template #options="{item}">
           <template v-if="item.model === 'state'">
             <el-option label="注册" value="0"></el-option>
             <el-option label="确认身份" value="1"></el-option>
@@ -25,8 +25,8 @@
             <el-radio label="1">是</el-radio>
             <el-radio label="0">否</el-radio>
           </template>
-        </template>
-        <template #custom="{ item, form, fieldChange }">
+        </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">
@@ -51,7 +51,7 @@
               <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
             </div>
           </el-dialog>
-        </template>
+        </template> -->
       </data-form>
     </detail-frame>
   </div>
@@ -104,10 +104,10 @@ export default {
     index: [{ zuoyeid: '1' }],
     fields: [
       { label: '作业名称', required: true, model: 'name' },
-      { label: '状态', required: true, model: 'state', type: `select` },
+      // { label: '状态', required: true, model: 'state', type: `select` },
       { label: '作业代码', required: true, model: 'optionid' },
-      { label: '标题', required: true, model: 'title' },
-      { label: '题型', required: true, model: 'type', type: 'wenjian', custom: true },
+      //   { label: '标题', required: true, model: 'title' },
+      //   { label: '题型', required: true, model: 'type', type: 'wenjian', custom: true },
     ],
     rules: {
       name: [{ required: true, message: '请输入作业姓名' }],

+ 10 - 22
src/views/work/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="index">
     <list-frame title="作业列表页" @query="search" :filter="filFields" @add="$router.push({ path: '/work/detail' })">
-      <data-table :fields="fields" :data="index" :opera="opera" @edit="toEdit"></data-table>
+      <data-table :fields="fields" :data="index" :opera="opera" @edit="toEdit" @delete="toEdit" @select="$router.push({ path: '/work/detail' })"> </data-table>
     </list-frame>
   </div>
 </template>
@@ -21,9 +21,15 @@ export default {
       {
         label: '编辑',
         icon: 'el-icon-edit',
-        method: 'edit',
+        method: 'select',
+      },
+      {
+        label: '删除',
+        icon: 'el-icon-delete',
+        method: 'delete',
       },
     ],
+
     fields: [
       { label: '科目代码', prop: 'id' },
       { label: '科目名称', prop: 'name' },
@@ -38,27 +44,8 @@ export default {
     ],
     index: [{ id: '001', name: '语文', title: '语文作业', timu: '0123', type: '1', state: '1' }],
     filFields: [
+      { label: '科目代码', model: 'id' },
       { label: '科目名称', model: 'name' },
-
-      {
-        label: '问题类型',
-        model: 'type',
-        type: 'select',
-        list: [
-          { label: '单选', value: 0 },
-          { label: '多选', value: 1 },
-          { label: '问答', value: 2 },
-        ],
-      },
-      {
-        label: '科目状态',
-        model: 'state',
-        type: 'select',
-        list: [
-          { label: '弃用', value: 0 },
-          { label: '使用', value: 1 },
-        ],
-      },
     ],
   }),
   created() {},
@@ -67,6 +54,7 @@ export default {
     search({ skip = 0, limit = 15, ...info } = {}) {
       console.log(`in search`);
     },
+
     toEdit(data) {
       console.log(`in toEdit`);
       console.log(data);

+ 92 - 0
src/views/work/look.vue

@@ -0,0 +1,92 @@
+<template>
+  <div id="index">
+    <list-frame title="作业题列表页" @query="search" :filter="filFields" @add="$router.push({ path: '/work/lookdetail' })">
+      <data-table :fields="fields" :data="index" :opera="opera" @edit="toEdit" @delete="toEdit" @add="$router.push({ path: '/work/lookdetail' })"> </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 {
+  metaInfo: { title: '作业题列表页' },
+  name: 'index',
+  props: {},
+  components: {
+    listFrame,
+    dataTable,
+  },
+  data: () => ({
+    opera: [
+      {
+        label: '编辑',
+        icon: 'el-icon-edit',
+        method: 'add',
+      },
+
+      {
+        label: '删除',
+        icon: 'el-icon-delete',
+        method: 'delete',
+      },
+    ],
+
+    fields: [
+      { label: '题编号', prop: 'id' },
+      { label: '题名称', prop: 'name' },
+      {
+        label: '问题类型',
+        prop: 'type',
+        format: item => {
+          return item === '0' ? '单选' : item === '1' ? '多选' : item === '2' ? '问答' : '其他';
+        },
+      },
+      {
+        label: '状态',
+        prop: 'state',
+        format: item => {
+          return item === '0' ? '弃用' : item === '1' ? '使用' : '其他';
+        },
+      },
+    ],
+    index: [{ id: '01', name: '礼仪题01', type: '1', state: '0' }],
+    filFields: [
+      { label: '题名', model: 'name' },
+
+      {
+        label: '题类型',
+        model: 'type',
+        type: 'select',
+        list: [
+          { label: '单选', value: 0 },
+          { label: '多选', value: 1 },
+          { label: '问答', value: 2 },
+        ],
+      },
+      {
+        label: '题状态',
+        model: 'state',
+        type: 'select',
+        list: [
+          { label: '弃用', value: 0 },
+          { label: '使用', value: 1 },
+        ],
+      },
+    ],
+  }),
+  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>

+ 176 - 0
src/views/work/lookdetail.vue

@@ -0,0 +1,176 @@
+<template>
+  <div id="lookdetail">
+    <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>
+          </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">
+                    <el-button type="text" @click="dialogFormVisible1 = true">增加</el-button>
+
+                    <el-dialog title="增加页面" :visible.sync="dialogFormVisible1">
+                      <el-form :model="form" label-width="80px">
+                        <el-form-item label="序号" :label-width="formLabelWidth">
+                          <el-input v-model="form.zuoyeid" autocomplete="off" placeholder="请输入序号" prop="zuoyeid"></el-input>
+                        </el-form-item>
+                        <el-form-item label="名称" :label-width="formLabelWidth">
+                          <el-input v-model="form.zuoyename" autocomplete="off" placeholder="请输入名称" prop="zuoyename"></el-input>
+                        </el-form-item>
+                        <el-form-item label="答案" :label-width="formLabelWidth">
+                          <el-input v-model="form.answer" autocomplete="off" placeholder="请输入答案" prop="answer"></el-input>
+                        </el-form-item>
+                      </el-form>
+                      <div slot="footer" class="dialog-footer">
+                        <el-button @click="dialogFormVisible1 = false">取 消</el-button>
+                        <el-button type="primary" @click="dialogFormVisible1 = false">确 定</el-button>
+                      </div>
+                    </el-dialog>
+                    <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: 'lookdetail',
+  props: {},
+  components: {
+    detailFrame,
+    dataForm,
+    dataTable,
+  },
+  data: () => ({
+    opera: [
+      {
+        label: '编辑',
+        icon: 'el-icon-edit',
+        method: 'edit',
+      },
+    ],
+
+    activeName: '',
+    dialogTableVisible: false,
+    dialogTableVisible1: false,
+    dialogFormVisible: false,
+    dialogFormVisible1: false,
+    form: {
+      duoxuan: '',
+      name: '',
+      region: '',
+      date1: '',
+      date2: '',
+      delivery: false,
+      type: [],
+      zuoyeid: '',
+      zuoyename: '',
+      answer: '',
+    },
+    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: 'state', type: `select` },
+      { label: '标题', required: true, model: 'title' },
+      { label: '题型', required: true, model: 'type', type: 'tixing', custom: true },
+    ],
+    rules: {
+      zuoyeid: [{ required: true, message: '请输入序号', trigger: 'blur' }],
+      zuoyename: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+      answer: [{ required: true, message: '请输入答案', trigger: 'blur' }],
+      name: [{ required: true, message: '请输入作业姓名' }],
+      state: [{ required: true, message: '请选择状态' }],
+      tixing: [{ required: true, message: '请选择题类型' }],
+      title: [{ required: true, message: '请选择标题' }],
+    },
+  }),
+  created() {},
+  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="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;
+}
+/deep/.el-tabs__item.is-active {
+  color: #303133;
+}
+/deep/.el-input__inner {
+  margin: 0 0 20px 0;
+}
+</style>