logo等

src/components/codemirror.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="display:flex;">
-    <div style="position:relative;width: 100%;" class="button">
+    <div class="left">
       <codemirror
         v-model="exampleData"
         :value="codeid"
@@ -150,7 +150,7 @@ export default {
         theme: "monokai", // 主题
         extraKeys: { Ctrl: "autocomplete" } // 可以用于为编辑器指定额外的键绑定，以及keyMap定义的键绑定
       },
-      inputTextReg: /^((?!#).*?(,|\(|\[|\{|\s)+)?input(?!\w)\(['|"]([\s\S]+?)['|"]\)/m,
+      inputTextReg: /^((?!#).*?(,|\(|\[|\{|\s)+)?input(?!\w)\(['|"]([\s\S]+?)['|"]\)/mg,
       inputReg: /^((?!#).*?(,|\(|\[|\{|\s)+)?(input(?!\w)\(['|"][\s\S]*?['|"]\))/m,
       exitTextReg: /exit(?!\w)\(['|"]([\s\S]+?)['|"]\)/m,
       exitNotValidReg: /exit(?!\w)\(['|"]([\s\S]+?)['|"]\)/m,
@@ -273,7 +273,7 @@ export default {
         this.$post(this.api.UpdateCode,{
           code: this.sourceCode,
           codeId: this.codeId,
-          submit: this.submit //是否点击运行(0未运行,1已运行)
+          submit: this.submit
         }).then(res => {
           let result = res.message.result
           if(result.includes('File ')){
@@ -291,17 +291,23 @@ export default {
           }else if(!res.message.isError){
             this.isError = 0
             this.modifys += result
+            newmain.$emit("updateJud",{
+              id: res.data.judgmentPointsId,
+              isError: res.data.isError
+            })
           }
-
-          // if(!res.message.isError){
-          //   this.modifys += res.message.result
-          // }else if(res.message.result.includes('validing:')){
-          //   this.confirmInput(res.message.result)
-          // }
         }).catch(err => {})
       }).catch(err => {})
     },
     AnswerTips() {
+      // let inputTextReg = this.inputTextReg
+      // let str = `server = int(input('您好！请问您需要什么帮助呢？1 存取款；2 货币兑换；3 咨询\n')`
+      // str = str.replace(inputTextReg,val => {
+      //   console.log(val.replace(/\n/g,''))
+      //   return val.replace(/\n/g,'')
+      // })
+      // console.log(str)
+      // return
       if (this.isSubmit == "") {
         this.submit = 1;
         if (this.codeid == "") {
@@ -314,9 +320,9 @@ export default {
           let inputFuncReg = /input\(['|"]/g
           if (inputTextReg.test(this.exampleData)) {
             let sourceCode = this.exampleData
-            sourceCode = sourceCode.replace(inputTextReg,val => {
-              return val.replace(/[\r\n]/g,'')
-            })
+            // sourceCode = sourceCode.replace(inputTextReg,val => {
+            //   return console.log(val.replace(/\n'/g,"'"))
+            // })
             // return console.log(11,sourceCode)
 
             sourceCode = sourceCode.replace(inputFuncReg,val => {
@@ -408,7 +414,8 @@ export default {
                   }
                 }
               })
-              .catch(err => {
+              .catch(res => {
+                res.status == 500 && this.$message.error('检测到代码里有非法代码，请检查是否有调用系统命令。')
                 this.loadIns.close()
               });
             clearTimeout(this.timer);
@@ -452,6 +459,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.left{
+  position: relative;
+  width: calc(100% - 400px);
+}
 .text-wrapper {
   white-space: pre-wrap;
 }

src/config/index.js

@@ -4,10 +4,14 @@ export default {
      * @description 域名切换，liuwan：职站测试环境，occupationlab.com：职站正式环境，10.196.131.73：河海版本
      */
     host: (process.env.NODE_ENV === 'development' || location.host.includes('liuwanr.cn')) ? 'http://www.liuwanr.cn/' : (location.host.includes('10.196.131.73') ? 'http://10.196.131.73/' : 'http://www.occupationlab.com/'),
+    /**
+      * @description 是否是河海版本
+      */
+    isHh,
     /**
      * @description 配置显示在浏览器标签的title
      */
-    title: isHh ? '智信云Python程序设计教学系统' : 'Python程序设计教学系统',
+    title: isHh ? 'Python程序设计教学系统' : 'Python程序设计教学系统',
     /**
      * @description 是否使用国际化，默认为false
      *              如果不使用，则需要在路由中给需要在菜单中展示的路由设置meta: {title: 'xxx'}

src/utils/api.js

@@ -1,6 +1,6 @@
 import config from '@/config'
 // let host = 'http://192.168.31.125:8081/python'//林
-// let host = 'http://192.168.31.152:8081/python'//榕
+// let host = 'http://192.168.31.151:8081/python'//榕
 let host = `${config.host}python`
 
 export default {

src/utils/http.js

@@ -185,9 +185,7 @@ export function post(url, params) {
                             );
                             break;
                         case 500:
-                            this.$message.error(
-                                res.data.errmessage
-                            );
+                            reject(res.data)
                             break;
                         case 404:
                             this.$message.error(

src/views/Home.vue

@@ -1,13 +1,15 @@
 <template>
   <div>
-    <div class="flex header">
-      <p>{{$config.title}}</p>
+    <div class="flex header" :class="{hh: $config.isHh}">
+      <img v-if="$config.isHh" src="../assets/img/logo-hh.png" alt="" class="logo">
+      <p v-else>{{$config.title}}</p>
       <div class="bt">
         <el-button type="primary" @click="back()">退出实验</el-button>
       </div>
     </div>
 
     <div class="flex center">
+      <p v-if="$config.isHh" style="font-size: 18px">{{$config.title}}</p>
       <p>编程语言</p>
       <el-input placeholder="请输入内容" v-model="value" :disabled="true"></el-input>
     </div>
@@ -352,6 +354,14 @@ export default {
   justify-content: space-between;
   height: 40px;
   line-height: 40px;
+  &.hh{
+    padding: 10px 0;
+    line-height: normal;
+  }
+  .logo{
+    width: 200px;
+    margin-left: 10px;
+  }
 }
 //公共类
 p {