edit wording & change copyright

2020-12-25 13:50:56 +08:00
parent fc58997116
commit 4ead559ae2
9 changed files with 105 additions and 106 deletions
--- a/source/vue/xzs-admin/src/layout/index.vue
+++ b/source/vue/xzs-admin/src/layout/index.vue
@@ -9,7 +9,7 @@
      </div>
      <app-main />
      <div class="foot-copyright">
-        <span>Copyright © 2020 武汉思维跳跃科技有限公司 版权所有</span>
+        <span>Copyright © 2020 TekSystem 版权所有</span>
      </div>
      <back-to-top :visibility-height="100" :back-position="0" transition-name="fade" ref="backTop"/>
    </div>
--- a/source/vue/xzs-admin/src/router.js
+++ b/source/vue/xzs-admin/src/router.js
@@ -176,13 +176,13 @@ const constantRoutes = [
        path: 'subject/list',
        component: () => import('@/views/education/subject/list'),
        name: 'EducationSubjectPage',
-        meta: { title: '学科列表', noCache: true }
+        meta: { title: 'skill列表', noCache: true }
      },
      {
        path: 'subject/edit',
        component: () => import('@/views/education/subject/edit'),
        name: 'EducationSubjectEditPage',
-        meta: { title: '学科编辑', noCache: true, activeMenu: '/education/subject/list' },
+        meta: { title: 'skill编辑', noCache: true, activeMenu: '/education/subject/list' },
        hidden: true
      }
    ]
--- a/source/vue/xzs-admin/src/views/education/subject/edit.vue
+++ b/source/vue/xzs-admin/src/views/education/subject/edit.vue
@@ -2,7 +2,7 @@
  <div class="app-container">

    <el-form :model="form" ref="form" label-width="100px" v-loading="formLoading">
-      <el-form-item label="学科：" required>
+      <el-form-item label="skill：" required>
        <el-input v-model="form.name"></el-input>
      </el-form-item>
      <el-form-item label="年级：" required>
--- a/source/vue/xzs-admin/src/views/education/subject/list.vue
+++ b/source/vue/xzs-admin/src/views/education/subject/list.vue
@@ -16,8 +16,9 @@

    <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="学科"/>
-      <el-table-column prop="levelName" label="年级" />
+      <el-table-column prop="skill" label="skill"/>
+      <el-table-column prop="industry" label="industry"/>
+      <!-- <el-table-column prop="levelName" label="年级" /> -->
      <el-table-column width="220px" label="操作" align="center">
        <template slot-scope="{row}">
          <router-link :to="{path:'/education/subject/edit', query:{id:row.id}}" 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,13 +1,13 @@
 <template>
  <div class="app-container">
    <el-form :model="form" ref="form" label-width="100px" v-loading="formLoading" :rules="rules">
-      <el-form-item label="年级：" prop="gradeLevel" required>
-        <el-select v-model="form.gradeLevel"   placeholder="年级"  @change="levelChange">
+      <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-select>
      </el-form-item>
-      <el-form-item label="学科：" prop="subjectId" required>
-        <el-select v-model="form.subjectId" placeholder="学科" >
+      <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-select>
      </el-form-item>
@@ -20,9 +20,9 @@
      <el-form-item label="解析：" prop="analyze" required>
        <el-input v-model="form.analyze"  @focus="inputClick(form,'analyze')" />
      </el-form-item>
-      <el-form-item label="分数：" prop="score" required>
+      <!-- <el-form-item label="分数：" prop="score" required>
        <el-input-number v-model="form.score" :precision="1" :step="1" :max="100"></el-input-number>
-      </el-form-item>
+      </el-form-item> -->
      <el-form-item label="难度：" required>
        <el-rate v-model="form.difficult" class="question-item-rate"></el-rate>
      </el-form-item>
@@ -60,8 +60,8 @@ export default {
      form: {
        id: null,
        questionType: 5,
-        gradeLevel: null,
-        subjectId: null,
+        industry: null,
+        skill: null,
        title: '',
        items: [],
        analyze: '',
--- a/source/vue/xzs-admin/src/views/exam/question/list.vue
+++ b/source/vue/xzs-admin/src/views/exam/question/list.vue
@@ -4,13 +4,13 @@
      <el-form-item label="题目ID：">
        <el-input v-model="queryParam.id" clearable></el-input>
      </el-form-item>
-      <el-form-item label="年级：">
-        <el-select v-model="queryParam.level" placeholder="年级"  @change="levelChange" clearable>
+      <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-select>
      </el-form-item>
-      <el-form-item label="学科：">
-        <el-select v-model="queryParam.subjectId" clearable>
+      <el-form-item label="skill：">
+        <el-select v-model="queryParam.skill" clearable>
          <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id"
                     :label="item.name+' ( '+item.levelName+' )'"></el-option>
        </el-select>
@@ -32,10 +32,10 @@
    </el-form>
    <el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
      <el-table-column prop="id" label="Id" width="90px"/>
-      <el-table-column prop="subjectId" label="学科" :formatter="subjectFormatter" width="120px"/>
+      <el-table-column prop="skill" label="skill" :formatter="subjectFormatter" width="120px"/>
      <el-table-column prop="questionType" label="题型" :formatter="questionTypeFormatter" width="70px"/>
      <el-table-column prop="shortTitle" label="题干" show-overflow-tooltip/>
-      <el-table-column prop="score" label="分数" width="60px"/>
+      <!-- <el-table-column prop="score" label="分数" width="60px"/> -->
      <el-table-column prop="difficult" label="难度" width="60px"/>
      <el-table-column prop="createTime" label="创建时间" width="160px"/>
      <el-table-column label="操作" align="center" width="220px">
@@ -67,13 +67,13 @@ export default {
      queryParam: {
        id: null,
        questionType: null,
-        level: null,
-        subjectId: null,
+        skill: null,
+        industry: null,
        pageIndex: 1,
        pageSize: 10
      },
      subjectFilter: null,
-      listLoading: true,
+      listLoading: false,
      tableData: [],
      total: 0,
      questionShow: {
--- a/source/vue/xzs-admin/src/views/login/index.vue
+++ b/source/vue/xzs-admin/src/views/login/index.vue
@@ -52,7 +52,7 @@
    </el-form>

    <div class="account-foot-copyright">
-      <span>Copyright © 2020 武汉思维跳跃科技有限公司 版权所有</span>
+      <span>Copyright © 2020 TekSystem 版权所有</span>
    </div>
  </div>
 </template>