EmmaBaBa hai 9 meses
pai
achega
685f97c643

+ 2 - 2
index.html

@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <link rel="icon" href="./static/image/title.png" type="image/x-icon"/>
+  <link rel="icon" href="./static/image/s5-m-act.png" type="image/x-icon"/>
   <link rel="stylesheet" href="./assets/css/font.css">
   <link rel="stylesheet" href="./assets/css/animate.min.css">
   <!--<script src="./assets/js/wow.min.js"></script>
@@ -23,7 +23,7 @@
   <script type="text/javascript">
     Vue.use(window.VueVideoPlayer)
   </script>-->
-  <title>智慧云智能教育平台</title>
+  <title>阳光AI教育平台</title>
   <style>
     #app{width: 100%;}
     .el-submenu__title .haha i.el-submenu__icon-arrow{color: #fff!important;}

+ 63 - 4
src/components/question-info.vue

@@ -69,7 +69,7 @@
         type="danger"
         @click="openWritingBoard"
         v-show="currentQuestion.questionType !== 1 && currentQuestion.questionType !== 2
-           && currentQuestion.questionType !== 6" round>开始答题
+           && currentQuestion.questionType !== 6" round>GPS-REN学习法
       </el-button>
 
       <el-button
@@ -138,6 +138,57 @@
             <div slot="tip" class="el-upload__tip">答案附件上传(只能上传jpg/png文件,且不超过1M)</div>
           </el-upload>
         </template>
+
+        <template>
+          <el-dialog title="GPS-REN学习法"  :visible.sync="dialogVisible" width="80%"
+            :before-close="handleClose">
+
+            <el-form :model="form" ref="form" label-width="100px" class="demo-ruleForm" label-position="top">
+
+              <el-col :span="24">
+                <el-form-item label="G(目标导向):">
+                 <div v-html="currentQuestion.content"></div>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="24">
+                <el-form-item label="P(描述问题):">
+                  <el-input type="textarea" v-model="form.p"></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="24">
+                <el-form-item label="S(拆解问题):">
+                  <el-input type="textarea" v-model="form.s"></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="24">
+                <el-form-item label="R(结果):">
+                  <el-input type="textarea" v-model="form.r"></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="24">
+                <el-form-item label="E(评估方案):">
+                  <el-input type="textarea" v-model="form.e"></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="24">
+                <el-form-item label="N(这个整个学习过程对我补充了什么新知识):">
+                  <el-input type="textarea" v-model="form.n"></el-input>
+                </el-form-item>
+              </el-col>
+
+            </el-form>
+
+            <span slot="footer" class="dialog-footer">
+              <el-button @click="dialogVisible = false">取 消</el-button>
+              <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+            </span>
+          </el-dialog>
+        </template>
       </div>
     </div>
   </div>
@@ -205,7 +256,12 @@
           currentQuestion: {}, // 当前试题
           currentQuestionPage: 0,
           questionAnswerDataList: [], // 试题答案列表
-          questionTotal: 0
+          questionTotal: 0,
+          dialogVisible:false,
+          form:{},
+          config:{
+            zIndex:0
+          }
         }
       },
 
@@ -259,8 +315,11 @@
 
         openWritingBoard () {
          // location.href = this.$store.state.host + '/static/writingBoard/writingBoard.html'
-          this.$emit('openWritingBoard')
-          window.open(this.$store.state.common.host + '/static/writingBoard/writingBoard.html')
+          // this.$emit('openWritingBoard')
+          // window.open(this.$store.state.common.host + '/static/writingBoard/writingBoard.html')
+           
+
+            this.dialogVisible = true 
         },
 
         lookAnswerImg (url) {

+ 2 - 1
src/views/common/header-common.vue

@@ -316,12 +316,13 @@
   .header{
     width: 1200px;
     height: 100px;
+    background-color: #7898F4;
     margin: 0 auto;
     position: relative;
     .el-dropdown{position: absolute;right: 0;top: 35px;height: 36px;line-height:36px;cursor: pointer;
       .cp{font-size: 36px;color: #009CDE;padding-right: 5px;vertical-align:middle;}
     }
-    .systemtitle{width: 400px;height: 100%;;overflow: hidden;padding-top:20px;padding-bottom:10px;
+    .systemtitle{width: 250px;height: 100%;;overflow: hidden;padding-left:20px;padding-top:20px;padding-bottom:10px;
       img{width: 100%;height: 100%;}
     }
     .head-nav{position: absolute;right: 300px;top: 30px; display: flex;border: 1px solid #52565a;border-radius: 16px;overflow: visible;

+ 1 - 1
src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="loginpage">
     <el-card class="box-card">
-      <div class="title">智慧云智能教育平台</div>
+      <div class="title">阳光AI教育平台</div>
 
       <div class="login-form">
         <el-form ref="form" :model="form" :rules="rules" @keyup.enter.native="doLogin()" label-width="80px">

BIN=BIN
static/image/logo.jpg


BIN=BIN
static/image/logo.png