Browse Source

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

WuXinyu 7 years ago
parent
commit
4cf13d5833

BIN
dist.zip


+ 1 - 1
mock/serializers/user/UserSerializer.js

@@ -14,7 +14,7 @@ const makeId = require("../../util/makeId");
  * @param role
  * @returns {UserSerializerType}
  */
-module.exports = (role = "TEACHER") => {
+module.exports = (role = "STUDENT") => {
   return {
     id: makeId(),
     role: role,

+ 7 - 0
mock/util/makeLongMarkdown.js

@@ -8,6 +8,13 @@ module.exports = () => {
   
   @(项目1)
   
+  <p align='center'>
+<img src='https://s2.ax1x.com/2019/04/23/EAsL2q.md.png'>
+</p>
+  
+  <script>alert('xss')</script> 
+
+  
   ## 0. 目录
   
   内容目录

+ 5 - 1
src/components/CheckList/ResultCheckListItem.vue

@@ -7,7 +7,11 @@
             {{ checkResultItem.content }}
           </b-tooltip>
         </strong>
-        <div @click="selectReviewingTarget" class="image-container">
+        <div
+          v-if="canBeReviewed"
+          @click="selectReviewingTarget"
+          class="image-container"
+        >
           <img
             style="width: 20px;height: 20px"
             alt=""

+ 3 - 3
vue.config.js

@@ -2,10 +2,10 @@ module.exports = {
   devServer: {
     proxy: {
       "^/api": {
-        // target: "http://localhost:4000/",
+        target: "http://localhost:4000/",
         // target: "http://10.1.1.198:8080/",
-        target: "http://192.168.0.100:8080",
-        // target: "http://10.1.2.3:8080/",
+        // target: "http://192.168.0.100:8080",
+        // target: "http://seec.yangshan.tech",
 
         ws: true,
         changeOrigin: true