Merge branch 'develop' of SEEC-II-FrontEnd-Team/SEEC-II-FrontEnd into master

src/layouts/courseLayouts/StudentMenu.vue

@@ -1,12 +1,12 @@
 <template>
   <aside class="menu dark-menu">
-    <p class="menu-label">总览</p>
+    <!--<p class="menu-label">总览</p>-->
     <ul class="menu-list">
-      <li>
-        <router-link active-class="is-active" :to="`${prefix}/dashboard`">
-          <img alt="" src="../../assets/icon/work.png" />工作台
-        </router-link>
-      </li>
+      <!--<li>-->
+      <!--<router-link active-class="is-active" :to="`${prefix}/dashboard`">-->
+      <!--<img alt="" src="../../assets/icon/work.png" />工作台-->
+      <!--</router-link>-->
+      <!--</li>-->
     </ul>
     <p class="menu-label">作业</p>
     <ul class="menu-list">

src/layouts/courseLayouts/TeacherMenu.vue

@@ -2,11 +2,11 @@
   <aside class="menu dark-menu">
     <p class="menu-label">总览</p>
     <ul class="menu-list">
-      <li>
-        <router-link active-class="is-active" :to="`${prefix}/dashboard`">
-          <img alt="" src="../../assets/icon/work.png" />工作台
-        </router-link>
-      </li>
+      <!--<li>-->
+      <!--<router-link active-class="is-active" :to="`${prefix}/dashboard`">-->
+      <!--<img alt="" src="../../assets/icon/work.png" />工作台-->
+      <!--</router-link>-->
+      <!--</li>-->
       <li>
         <router-link active-class="is-active" :to="`/teacher/`">
           <img alt="" src="../../assets/icon/home.png" />课程选择

src/views/student/Home/index.vue

@@ -24,7 +24,7 @@
           v-for="item in courses"
           class="column is-4-desktop"
         >
-          <router-link :to="`/course-student/${item.id}/dashboard`">
+          <router-link :to="`/course-student/${item.id}/group`">
             <card hoverable>{{ item.name }}</card>
           </router-link>
         </div>

src/views/teacher/Code/index.vue

@@ -82,6 +82,10 @@
             </article>
           </template>
         </b-table>
+        <no-data-svg
+          style="margin-top: 20px;"
+          v-if="!loadingCodeList && !(codeData && codeData.length > 0)"
+        ></no-data-svg>
       </div>
     </page-body>
   </div>
@@ -97,6 +101,7 @@ import DeleteAssignment from "@/components/AssignmentCRUD/DeleteAssignment";
 import UpdateAssignment from "@/components/AssignmentCRUD/UpdateAssignment";
 import CreateAssignment from "@/components/AssignmentCRUD/CreateAssignment";
 import PageSectionLoading from "@/components/PageBody/PageSectionLoading/index";
+import NoDataSvg from "@/components/NoDataSvg";
 
 export default {
   components: {
@@ -105,7 +110,8 @@ export default {
     DeleteAssignment,
     UpdateAssignment,
     CreateAssignment,
-    PageSectionLoading
+    PageSectionLoading,
+    NoDataSvg
   },
   mixins: [timeMixins],
   mounted() {

src/views/teacher/Document/index.vue

@@ -78,6 +78,10 @@
               </article>
             </template>
           </b-table>
+          <no-data-svg
+            style="margin-top: 20px;"
+            v-if="!loadingDocList && !(docData && docData.length > 0)"
+          ></no-data-svg>
         </div>
       </div>
     </page-body>
@@ -94,6 +98,7 @@ import DeleteAssignment from "@/components/AssignmentCRUD/DeleteAssignment";
 import UpdateAssignment from "@/components/AssignmentCRUD/UpdateAssignment";
 import CreateAssignment from "@/components/AssignmentCRUD/CreateAssignment";
 import PageSectionLoading from "@/components/PageBody/PageSectionLoading/index";
+import NoDataSvg from "@/components/NoDataSvg";
 
 export default {
   computed: {
@@ -107,7 +112,8 @@ export default {
     DeleteAssignment,
     UpdateAssignment,
     CreateAssignment,
-    PageSectionLoading
+    PageSectionLoading,
+    NoDataSvg
   },
   mixins: [timeMixins],
   mounted() {

src/views/teacher/Home/index.vue

@@ -19,7 +19,7 @@
           <card loading /> <card loading /> <card loading /> <card loading />
         </div>
         <div v-else :key="item.id" v-for="item in courses" class="column is-4">
-          <router-link :to="`/course-teacher/${item.id}/dashboard`">
+          <router-link :to="`/course-teacher/${item.id}/question`">
             <card hoverable>{{ item.name }}</card>
           </router-link>
         </div>

src/views/teacher/Review/index.vue

@@ -35,6 +35,10 @@
           </router-link>
         </div>
       </div>
+      <no-data-svg
+        style="margin-top: 20px;"
+        v-if="!reviewListLoading && !(review && review.length > 0)"
+      ></no-data-svg>
     </page-body>
     <b-modal :active.sync="showModal">
       <div class="card">
@@ -138,12 +142,14 @@ import ReviewStateTag from "@/components/ReviewStateTag/index";
 import { getDocAssignmentListTeacherByCrs } from "@/api/assignment";
 import timeMixins from "@/mixins/time";
 import { required } from "vuelidate/lib/validators";
+import NoDataSvg from "@/components/NoDataSvg";
 export default {
   components: {
     ReviewStateTag,
     PageBody,
     PageHeader,
-    Card
+    Card,
+    NoDataSvg
   },
   computed: {
     ...mapState({

vue.config.js

@@ -2,8 +2,8 @@ module.exports = {
   devServer: {
     proxy: {
       "^/api": {
-        target: "http://localhost:4000/",
-        // target: "http://10.1.1.198:8080/",
+        //target: "http://localhost:4000/",
+        target: "http://10.1.1.198:8080/",
         // target: "http://192.168.0.101:8080",
         // target: "http://10.1.2.3:8080/",
 

yarn.lock

@@ -1093,6 +1093,13 @@ address@^1.0.3:
   version "1.0.3"
   resolved "https://registry.npmjs.org/address/-/address-1.0.3.tgz#b5f50631f8d6cec8bd20c963963afb55e06cbce9"
 
+adler-32@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/adler-32/-/adler-32-1.2.0.tgz#6a3e6bf0a63900ba15652808cb15c6813d1a5f25"
+  dependencies:
+    exit-on-epipe "~1.0.1"
+    printj "~1.1.0"
+
 agent-base@2:
   version "2.1.1"
   resolved "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz#d6de10d5af6132d5bd692427d46fc538539094c7"
@@ -1997,6 +2004,15 @@ caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
 
+cfb@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/cfb/-/cfb-1.1.0.tgz#44fb1b30eee014fa5633a0ed5f26c87fd765799a"
+  dependencies:
+    adler-32 "~1.2.0"
+    commander "^2.16.0"
+    crc-32 "~1.2.0"
+    printj "~1.1.2"
+
 chai-nightwatch@~0.1.x:
   version "0.1.1"
   resolved "http://registry.npmjs.org/chai-nightwatch/-/chai-nightwatch-0.1.1.tgz#1ca56de768d3c0868fe7fc2f4d32c2fe894e6be9"
@@ -2204,6 +2220,13 @@ code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
+codepage@~1.14.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/codepage/-/codepage-1.14.0.tgz#8cbe25481323559d7d307571b0fff91e7a1d2f99"
+  dependencies:
+    commander "~2.14.1"
+    exit-on-epipe "~1.0.1"
+
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -2285,9 +2308,13 @@ commander@2.9.0:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
-commander@^2.14.1, commander@^2.18.0, commander@^2.19.0, commander@^2.9.0:
+commander@^2.14.1, commander@^2.16.0, commander@^2.18.0, commander@^2.19.0, commander@^2.9.0:
   version "2.19.0"
-  resolved "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+
+commander@~2.14.1:
+  version "2.14.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa"
 
 common-tags@^1.4.0:
   version "1.8.0"
@@ -2454,6 +2481,13 @@ cosmiconfig@^5.0.0, cosmiconfig@^5.0.2:
     js-yaml "^3.9.0"
     parse-json "^4.0.0"
 
+crc-32@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208"
+  dependencies:
+    exit-on-epipe "~1.0.1"
+    printj "~1.1.0"
+
 create-ecdh@^4.0.0:
   version "4.0.3"
   resolved "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
@@ -3497,6 +3531,10 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+exit-on-epipe@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692"
+
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
@@ -3751,6 +3789,10 @@ file-loader@^2.0.0:
     loader-utils "^1.0.2"
     schema-utils "^1.0.0"
 
+file-saver@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.1.tgz#7fe2242af1cbc559a29d8176078a8b56d781fa79"
+
 file-uri-to-path@1:
   version "1.0.0"
   resolved "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
@@ -3867,7 +3909,6 @@ flat-cache@^1.2.1:
 flatpickr@^4.5.1:
   version "4.5.2"
   resolved "http://registry.npm.taobao.org/flatpickr/download/flatpickr-4.5.2.tgz#47c8ad472a096e5fb7e74b809b0703535383f20d"
-  integrity sha1-R8itRyoJbl+350uAmwcDU1OD8g0=
 
 flush-write-stream@^1.0.0:
   version "1.0.3"
@@ -3918,6 +3959,10 @@ forwarded@~0.1.2:
   version "0.1.2"
   resolved "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
 
+frac@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/frac/-/frac-1.1.2.tgz#3d74f7f6478c88a1b5020306d747dc6313c74d0b"
+
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
@@ -7537,6 +7582,10 @@ pretty@2.0.0:
     extend-shallow "^2.0.1"
     js-beautify "^1.6.12"
 
+printj@~1.1.0, printj@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"
+
 private@^0.1.6, private@^0.1.8:
   version "0.1.8"
   resolved "https://registry.npmjs.org/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
@@ -8504,6 +8553,12 @@ sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
 
+ssf@~0.10.2:
+  version "0.10.2"
+  resolved "https://registry.yarnpkg.com/ssf/-/ssf-0.10.2.tgz#65b2b4fcdfd967bc8e8383a41349009893115976"
+  dependencies:
+    frac "~1.1.2"
+
 sshpk@^1.7.0:
   version "1.15.2"
   resolved "https://registry.npmjs.org/sshpk/-/sshpk-1.15.2.tgz#c946d6bd9b1a39d0e8635763f5242d6ed6dcb629"
@@ -9301,7 +9356,6 @@ vue-eslint-parser@^4.0.2:
 vue-flatpickr-component@^8.1.1:
   version "8.1.1"
   resolved "http://registry.npm.taobao.org/vue-flatpickr-component/download/vue-flatpickr-component-8.1.1.tgz#f0876e62cc8a6fdbe0e0cc5068f3a314b972a96f"
-  integrity sha1-8IduYsyKb9vg4MxQaPOjFLlyqW8=
   dependencies:
     flatpickr "^4.5.1"
 
@@ -9337,7 +9391,6 @@ vue-loader@^15.4.2:
 vue-markdown@^2.2.4:
   version "2.2.4"
   resolved "http://registry.npm.taobao.org/vue-markdown/download/vue-markdown-2.2.4.tgz#db0f774178f3bc91ee18c626d86a3a0d2de22746"
-  integrity sha1-2w93QXjzvJHuGMYm2Go6DS3iJ0Y=
   dependencies:
     highlight.js "^9.12.0"
     markdown-it "^6.0.1"
@@ -9797,6 +9850,18 @@ ws@^6.0.0:
   dependencies:
     async-limiter "~1.0.0"
 
+xlsx@^0.14.1:
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/xlsx/-/xlsx-0.14.1.tgz#ecedf536bd1e94055486ff484f5888dcaa89bd3d"
+  dependencies:
+    adler-32 "~1.2.0"
+    cfb "^1.1.0"
+    codepage "~1.14.0"
+    commander "~2.17.1"
+    crc-32 "~1.2.0"
+    exit-on-epipe "~1.0.1"
+    ssf "~0.10.2"
+
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"