From 4ead559ae250aaee2bc4f749225081904f61a190 Mon Sep 17 00:00:00 2001
From: Joyce-wei <237762151@qq.com>
Date: Fri, 25 Dec 2020 13:50:56 +0800
Subject: [PATCH] edit wording & change copyright

---
 source/vue/xzs-admin/package-lock.json        | 160 +++++++++---------
 source/vue/xzs-admin/src/layout/index.vue     |   2 +-
 source/vue/xzs-admin/src/router.js            |   4 +-
 .../src/views/education/subject/edit.vue      |   2 +-
 .../src/views/education/subject/list.vue      |   5 +-
 .../views/exam/question/edit/short-answer.vue |  16 +-
 .../src/views/exam/question/list.vue          |  18 +-
 .../vue/xzs-admin/src/views/login/index.vue   |   2 +-
 source/vue/xzs-student/src/layout/index.vue   |   2 +-
 9 files changed, 105 insertions(+), 106 deletions(-)

diff --git a/source/vue/xzs-admin/package-lock.json b/source/vue/xzs-admin/package-lock.json
index ad2e865..41ba33c 100644
--- a/source/vue/xzs-admin/package-lock.json
+++ b/source/vue/xzs-admin/package-lock.json
@@ -2119,6 +2119,16 @@
                     "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
                     "dev": true
                 },
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "http://registry.npm.livenono.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
                 "cacache": {
                     "version": "13.0.1",
                     "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-13.0.1.tgz",
@@ -2145,6 +2155,34 @@
                         "unique-filename": "^1.1.1"
                     }
                 },
+                "chalk": {
+                    "version": "4.1.0",
+                    "resolved": "http://registry.npm.livenono.com/chalk/-/chalk-4.1.0.tgz",
+                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "http://registry.npm.livenono.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "http://registry.npm.livenono.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "optional": true
+                },
                 "debug": {
                     "version": "4.3.1",
                     "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.3.1.tgz?cache=0&sync_timestamp=1605791507452&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.3.1.tgz",
@@ -2175,6 +2213,25 @@
                         "path-exists": "^4.0.0"
                     }
                 },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "http://registry.npm.livenono.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "optional": true
+                },
+                "loader-utils": {
+                    "version": "2.0.0",
+                    "resolved": "http://registry.npm.livenono.com/loader-utils/-/loader-utils-2.0.0.tgz",
+                    "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "big.js": "^5.2.2",
+                        "emojis-list": "^3.0.0",
+                        "json5": "^2.1.2"
+                    }
+                },
                 "locate-path": {
                     "version": "5.0.0",
                     "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-5.0.0.tgz?cache=0&sync_timestamp=1597081764621&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flocate-path%2Fdownload%2Flocate-path-5.0.0.tgz",
@@ -2245,6 +2302,16 @@
                         "minipass": "^3.1.1"
                     }
                 },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "http://registry.npm.livenono.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                },
                 "terser-webpack-plugin": {
                     "version": "2.3.8",
                     "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz?cache=0&sync_timestamp=1603881694762&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-2.3.8.tgz",
@@ -2261,6 +2328,18 @@
                         "terser": "^4.6.12",
                         "webpack-sources": "^1.4.3"
                     }
+                },
+                "vue-loader-v16": {
+                    "version": "npm:vue-loader@16.1.2",
+                    "resolved": "http://registry.npm.livenono.com/vue-loader/-/vue-loader-16.1.2.tgz",
+                    "integrity": "sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "chalk": "^4.1.0",
+                        "hash-sum": "^2.0.0",
+                        "loader-utils": "^2.0.0"
+                    }
                 }
             }
         },
@@ -12935,87 +13014,6 @@
                 }
             }
         },
-        "vue-loader-v16": {
-            "version": "npm:vue-loader@16.0.0-rc.2",
-            "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.0.0-rc.2.tgz",
-            "integrity": "sha1-tqfn8w0o81ZZqD3kH0oYMaQjKgQ=",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "chalk": "^4.1.0",
-                "hash-sum": "^2.0.0",
-                "loader-utils": "^2.0.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz",
-                    "integrity": "sha1-ThSHCmGNni7dl92DRf2dncMVZGo=",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
-                    "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
-                    "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-                    "dev": true,
-                    "optional": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
-                    "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-                    "dev": true,
-                    "optional": true
-                },
-                "loader-utils": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
-                    "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "big.js": "^5.2.2",
-                        "emojis-list": "^3.0.0",
-                        "json5": "^2.1.2"
-                    }
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1606205060845&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
-                    "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
         "vue-router": {
             "version": "3.4.9",
             "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.9.tgz?cache=0&sync_timestamp=1604612037000&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.9.tgz",
diff --git a/source/vue/xzs-admin/src/layout/index.vue b/source/vue/xzs-admin/src/layout/index.vue
index bd18437..0ce308b 100644
--- 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>
diff --git a/source/vue/xzs-admin/src/router.js b/source/vue/xzs-admin/src/router.js
index 12e2010..7eda807 100644
--- 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
       }
     ]
diff --git a/source/vue/xzs-admin/src/views/education/subject/edit.vue b/source/vue/xzs-admin/src/views/education/subject/edit.vue
index b098145..d4f7a13 100644
--- 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>
diff --git a/source/vue/xzs-admin/src/views/education/subject/list.vue b/source/vue/xzs-admin/src/views/education/subject/list.vue
index 20a66e0..b1ee81a 100644
--- 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">
diff --git 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
index 4112956..69e272d 100644
--- 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: '',
diff --git a/source/vue/xzs-admin/src/views/exam/question/list.vue b/source/vue/xzs-admin/src/views/exam/question/list.vue
index 4e43095..9999854 100644
--- 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: {
diff --git a/source/vue/xzs-admin/src/views/login/index.vue b/source/vue/xzs-admin/src/views/login/index.vue
index edabb3a..76329e8 100644
--- 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>
diff --git a/source/vue/xzs-student/src/layout/index.vue b/source/vue/xzs-student/src/layout/index.vue
index fefeb14..75103f5 100644
--- a/source/vue/xzs-student/src/layout/index.vue
+++ b/source/vue/xzs-student/src/layout/index.vue
@@ -66,7 +66,7 @@
       </div>
     </el-footer>
     <div class="foot-copyright">
-      <span>Copyright © 2020 武汉思维跳跃科技有限公司 版权所有</span>
+      <span>Copyright © 2020 TekSystem 版权所有</span>
     </div>
   </el-container>
 </template>