admin update

2020-12-29 10:05:18 +08:00
parent 27fe05a636
commit 5b1e48e301
12 changed files with 227 additions and 189 deletions
--- a/source/vue/xzs-admin/src/store/modules/enumItem.js
+++ b/source/vue/xzs-admin/src/store/modules/enumItem.js
@@ -18,7 +18,7 @@ const state = {
      typeEnum: [{ key: 1, value: '单选题' }, { key: 2, value: '多选题' }, { key: 3, value: '判断题' }, { key: 4, value: '填空题' }, { key: 5, value: '简答题' }],
      editUrlEnum: [{ key: 1, value: '/exam/question/edit/singleChoice', name: '单选题' },
        { key: 2, value: '/exam/question/edit/multipleChoice', name: '多选题' },
-        { key: 3, value: '/exam/question/edit/trueFalse', name: '判断题' },
+        { key: 3, value: '/exam/question/edit/trueFaltagsViewse', name: '判断题' },
        { key: 4, value: '/exam/question/edit/gapFilling', name: '填空题' },
        { key: 5, value: '/exam/question/edit/shortAnswer', name: '简答题' }]
    }
@@ -33,7 +33,9 @@ const getters = {
 }

 // actions
-const actions = {}
+const actions = {
+
+}

 // mutations
 const mutations = {}
--- a/source/vue/xzs-admin/src/views/education/industry/edit.vue
+++ b/source/vue/xzs-admin/src/views/education/industry/edit.vue
@@ -1,6 +1,6 @@
 <template>
    <div class="app-container">
-  
+
      <el-form :model="form" ref="form" label-width="100px" v-loading="formLoading">
        <el-form-item label="industry：" required>
          <el-input v-model="form.name"></el-input>
@@ -17,11 +17,11 @@
      </el-form>
    </div>
  </template>
-  
+
  <script>
  import { mapGetters, mapState, mapActions } from 'vuex'
-  import subjectApi from '@/api/subject'
-  
+  import industryApi from '@/api/industry'
+
  export default {
    data () {
      return {
@@ -39,7 +39,7 @@
      let _this = this
      if (id && parseInt(id) !== 0) {
        _this.formLoading = true
-        subjectApi.select(id).then(re => {
+        industryApi.select(id).then(re => {
          _this.form = re.response
          _this.formLoading = false
        })
@@ -50,7 +50,7 @@
        let _this = this
        this.formLoading = true
        this.form.levelName = this.enumFormat(this.levelEnum, this.form.level)
-        subjectApi.edit(this.form).then(data => {
+        industryApi.edit(this.form).then(data => {
          if (data.code === 1) {
            _this.$message.success(data.message)
            _this.delCurrentView(_this).then(() => {
@@ -85,4 +85,3 @@
    }
  }
  </script>
-  
--- a/source/vue/xzs-admin/src/views/education/industry/list.vue
+++ b/source/vue/xzs-admin/src/views/education/industry/list.vue
@@ -1,11 +1,11 @@
 <template>
    <div class="app-container">
      <el-form :model="queryParam" ref="queryForm" :inline="true">
-        <el-form-item label="年级：">
+        <!--<el-form-item label="年级：">
          <el-select v-model="queryParam.level" placeholder="年级" clearable="">
            <el-option v-for="item in levelEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>
          </el-select>
-        </el-form-item>
+        </el-form-item>-->
        <el-form-item>
          <el-button type="primary" @click="submitForm">查询</el-button>
          <router-link :to="{path:'/education/industry/edit'}" class="link-left">
@@ -13,7 +13,7 @@
          </router-link>
        </el-form-item>
      </el-form>
-  
+
      <el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
        <el-table-column prop="id" label="Id" />
        <el-table-column prop="name" label="industry"/>
@@ -30,12 +30,12 @@
                  @pagination="search"/>
    </div>
  </template>
-  
+
  <script>
  import { mapGetters, mapState } from 'vuex'
  import Pagination from '@/components/Pagination'
  import industryApi from '@/api/industry'
-  
+
  export default {
    components: { Pagination },
    data () {
@@ -90,4 +90,3 @@
    }
  }
  </script>
-  
--- a/source/vue/xzs-admin/src/views/education/subject/list.vue
+++ b/source/vue/xzs-admin/src/views/education/subject/list.vue
@@ -1,11 +1,11 @@
 <template>
  <div class="app-container">
    <el-form :model="queryParam" ref="queryForm" :inline="true">
-      <el-form-item label="年级：">
+      <!--<el-form-item label="年级：">
        <el-select v-model="queryParam.level" placeholder="年级" clearable="">
          <el-option v-for="item in levelEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>
        </el-select>
-      </el-form-item>
+      </el-form-item>-->
      <el-form-item>
        <el-button type="primary" @click="submitForm">查询</el-button>
        <router-link :to="{path:'/education/subject/edit'}" class="link-left">
--- a/source/vue/xzs-admin/src/views/exam/question/edit/short-answer.vue
+++ b/source/vue/xzs-admin/src/views/exam/question/edit/short-answer.vue
@@ -1,14 +1,14 @@
 <template>
  <div class="app-container">
    <el-form :model="form" ref="form" label-width="100px" v-loading="formLoading" :rules="rules">
-      <el-form-item label="industry：" prop="industry" required>
-        <el-select v-model="form.industry"   placeholder="industry"  @change="levelChange">
-          <el-option v-for="item in levelEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>
+      <el-form-item label="industry：" prop="industryId" required>
+        <el-select v-model="form.industryId"   placeholder="industry"  @change="levelChange">
+          <el-option v-for="item in industryFilter" :key="item.id" :value="item.id" :label="item.name"></el-option>
        </el-select>
      </el-form-item>
-      <el-form-item label="skill：" prop="skill" required>
-        <el-select v-model="form.skill" placeholder="skill" >
-          <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id" :label="item.name+' ( '+item.levelName+' )'"></el-option>
+      <el-form-item label="skill：" prop="skillId" required>
+        <el-select v-model="form.skillId" placeholder="skill" >
+          <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id" :label="item.name"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="题干：" prop="title" required>
@@ -50,6 +50,7 @@ import QuestionShow from '../components/Show'
 import Ueditor from '@/components/Ueditor'
 import { mapGetters, mapState, mapActions } from 'vuex'
 import questionApi from '@/api/question'
+import industryApi from '@/api/industry'

 export default {
  components: {
@@ -60,16 +61,17 @@ export default {
      form: {
        id: null,
        questionType: 5,
-        industry: null,
-        skill: null,
+        industryId: null,
+        skillId: null,
        title: '',
        items: [],
        analyze: '',
        correct: '',
-        score: '',
+        score: '0',
        difficult: 0
      },
      subjectFilter: null,
+      industryFilter: null,
      formLoading: false,
      rules: {
        gradeLevel: [
@@ -118,6 +120,10 @@ export default {
        _this.formLoading = false
      })
    }
+    industryApi.list().then(re => {
+                this.industryFilter=re.response;
+              })
+
  },
  methods: {
    editorReady (instance) {
@@ -178,6 +184,8 @@ export default {
    levelChange () {
      this.form.subjectId = null
      this.subjectFilter = this.subjects.filter(data => data.level === this.form.gradeLevel)
+      console.log(this.subjectFilter);
+
    },
    showQuestion () {
      this.questionShow.dialog = true
--- a/source/vue/xzs-admin/src/views/exam/question/list.vue
+++ b/source/vue/xzs-admin/src/views/exam/question/list.vue
@@ -6,7 +6,7 @@
      </el-form-item>
      <el-form-item label="industry：">
        <el-select v-model="queryParam.industry" placeholder="industry"  @change="levelChange" clearable>
-          <el-option v-for="item in levelEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>
+          <el-option v-for="item in industryFilter" :key="item.id" :value="item.id" :label="item.name"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="skill：">
@@ -59,6 +59,7 @@ import { mapGetters, mapState, mapActions } from 'vuex'
 import Pagination from '@/components/Pagination'
 import QuestionShow from './components/Show'
 import questionApi from '@/api/question'
+import industryApi from '@/api/industry'

 export default {
  components: { Pagination, QuestionShow },
@@ -73,6 +74,7 @@ export default {
        pageSize: 10
      },
      subjectFilter: null,
+      industryFilter: null,
      listLoading: false,
      tableData: [],
      total: 0,
@@ -87,6 +89,13 @@ export default {
  created () {
    this.initSubject()
    this.search()
+    let _this = this
+        this.initSubject(function () {
+          _this.subjectFilter = _this.subjects
+        })
+    industryApi.list().then(re => {
+                    this.industryFilter=re.response;
+                  })
  },
  methods: {
    submitForm () {