ソースを参照

Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

zengyicheng 1 年間 前
コミット
93482668d8

+ 1 - 1
dist/index.html

@@ -25,7 +25,7 @@
       height: 100%;
       width: 100%;
       background: #e6eaf0;
-    }</style><link href=./static/css/app.ff613c33678a9064ea271461013bbffc.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.f4313154be2b51e16fef.js></script><script type=text/javascript src=./static/js/app.7bb1b36e7ed74562efc7.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.7e6b281de8821d3c5f6f6c3408a70b37.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.f4313154be2b51e16fef.js></script><script type=text/javascript src=./static/js/app.83464a77a1a38bc9b8c8.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

ファイルの差分が大きいため隠しています
+ 0 - 0
dist/static/css/app.7e6b281de8821d3c5f6f6c3408a70b37.css


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/static/css/app.7e6b281de8821d3c5f6f6c3408a70b37.css.map


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/static/js/app.83464a77a1a38bc9b8c8.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/static/js/app.83464a77a1a38bc9b8c8.js.map


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


+ 11 - 11
src/components/pages/EnglishVoice/component/check.vue

@@ -63,17 +63,17 @@ export default {
                         }
                     ]
                 },
-                // {
-                //     name:'对话',
-                //     open: true,
-                //     children:[
-                //         {
-                //             icon:icon_check_addUser,
-                //             name:'创建角色',
-                //             type:'createRole'
-                //         }
-                //     ]
-                // },
+                {
+                    name:'对话',
+                    open: true,
+                    children:[
+                        {
+                            icon:icon_check_addUser,
+                            name:'创建角色',
+                            type:'createRole'
+                        }
+                    ]
+                },
                 {
                     name:'主题陈述',
                     open: true,

+ 2 - 2
src/components/pages/EnglishVoice/component/component/testRole.vue

@@ -184,7 +184,7 @@ export default {
             let iiframe = this.$refs['iiframe']
             // iiframe.contentWindow.doPronunciationAssessmentOnceAsync('', { files: [audioFile] })
             let _this = this
-            window.onRecognizing = function (e) {
+            window.onRecognizedResult = function (e) {
                 console.log('onRecognizedResult', e);
                 let privText = e.privText
                 // e.privText 
@@ -210,7 +210,7 @@ export default {
             let iiframe = this.$refs['iiframe']
             // iiframe.contentWindow.doPronunciationAssessmentOnceAsync('', { files: [audioFile] })
             let _this = this
-            window.onRecognizing = function (e) {
+            window.onRecognizedResult = function (e) {
                 console.log('onRecognizedResult', e);
                 let privText = e.privText
                 // e.privText 

+ 45 - 25
src/components/pages/EnglishVoice/component/order.vue

@@ -13,7 +13,8 @@
             :class="{ icon_word: item.type == 'word', icon_sentence: item.type == 'sentence', icon_QA: item.type == 'QA', icon_theme: item.type == 'theme', icon_createRole: item.type == 'createRole' }"></span>
           <span class="title">{{ getTitle(item) }}</span>
           <div class="edit_btn">
-            <button class="c_pub_button_add" @click.stop="openTest(item)" style="margin-right: 15px;" v-if="editType == 2 && item.type == 'createRole' && checkType != index">角色测试</button>
+            <button class="c_pub_button_add" @click.stop="openTest(item)" style="margin-right: 15px;"
+              v-if="editType == 2 && item.type == 'createRole' && checkType != index">角色测试</button>
             <div class="pic" v-if="editType == 2 && item.img && checkType != index">
               <div class="pic_mask">
                 <span class="delete" @click.stop="deleteImg(index)"></span>
@@ -90,19 +91,19 @@ export default {
     //     }
     //   };
     // },
-    getTitle(){
-      return function(item){
-        if(item.type == 'word'  && !item.content){
+    getTitle() {
+      return function (item) {
+        if (item.type == 'word' && !item.content) {
           return '单词/词组'
-        }else if(item.type == 'sentence' && !item.content){
+        } else if (item.type == 'sentence' && !item.content) {
           return '句子/短文'
-        } else if(item.type == 'QA' && !item.content){
+        } else if (item.type == 'QA' && !item.content) {
           return '问题'
-        } else if(item.type == 'theme' && !item.content){
+        } else if (item.type == 'theme' && !item.content) {
           return '主题陈述'
-        } else if(item.type == 'createRole' && !item.content){
+        } else if (item.type == 'createRole' && !item.content) {
           return '角色对话'
-        } else{
+        } else {
           return item.content
         }
       }
@@ -143,7 +144,7 @@ export default {
         })
         .catch(() => { });
     },
-    deleteImg(index){
+    deleteImg(index) {
       this.$confirm('确定删除该题目的图片吗?', "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -155,7 +156,22 @@ export default {
           this.$emit('setJson', this.checkArray)
         })
     },
-    openTest(json){
+    openTest(json) {
+      if (json.content == '') {
+        this.$message.error(`请输入角色名字`);
+        type = 2
+        return;
+      }
+      if (json.content2 == '') {
+        this.$message.error(`请输入角色定义`);
+        type = 2
+        return;
+      }
+      if (json.content3 == '') {
+        this.$message.error(`请输入角色问候`);
+        type = 2
+        return;
+      }
       this.dataDialog = true
       this.Json = json
     }
@@ -229,13 +245,15 @@ export default {
 .o_child_title.active>.drag {
   background-image: url('../../../../assets/icon/test/drag_icon_active.png');
 }
-.o_child_title > .title{
+
+.o_child_title>.title {
   width: 100%;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
   max-width: 200px;
 }
+
 .o_child_title>.order {
   line-height: 38px;
 }
@@ -297,22 +315,24 @@ export default {
 .o_child_title>.edit_btn>.delete2 {
   background-image: url('../../../../assets/icon/test/delete_test_icon2.png');
 }
-.o_child_title>.edit_btn>.pic{
+
+.o_child_title>.edit_btn>.pic {
   width: 50px;
-    overflow: hidden;
-    height: 32px;
-    margin-right: 15px;
-    border-radius: 5px;
-    cursor: pointer;
-    position: relative;
+  overflow: hidden;
+  height: 32px;
+  margin-right: 15px;
+  border-radius: 5px;
+  cursor: pointer;
+  position: relative;
 }
 
-.o_child_title>.edit_btn>.pic > img{
+.o_child_title>.edit_btn>.pic>img {
   width: 100%;
   height: 100%;
   object-fit: cover;
 }
-.o_child_title>.edit_btn>.pic > .pic_mask {
+
+.o_child_title>.edit_btn>.pic>.pic_mask {
   position: absolute;
   width: 100%;
   height: 100%;
@@ -325,16 +345,16 @@ export default {
   display: none;
   border-radius: 5px;
 }
-.o_child_title>.edit_btn>.pic:hover > .pic_mask {
+
+.o_child_title>.edit_btn>.pic:hover>.pic_mask {
   display: flex;
 }
 
-.o_child_title>.edit_btn>.pic > .pic_mask > .delete{
+.o_child_title>.edit_btn>.pic>.pic_mask>.delete {
   width: 15px;
   height: 15px;
   background-image: url('../../../../assets/icon/englishVoice/icon_delete2.png');
   background-size: 100% 100%;
   display: block;
   cursor: pointer;
-}
-</style>
+}</style>

+ 36 - 0
src/components/pages/EnglishVoice/index.vue

@@ -109,6 +109,42 @@ export default {
                 this.$message.error("请至少添加一道口语题目");
                 return
             }
+            let type = 1
+            for(let i=0;i<this.checkJson.length;i++){
+                if(this.checkJson[i].content == '' && this.checkJson[i].type != 'createRole' && this.checkJson[i].type != 'theme'){
+                    this.$message.error(`第${i + 1}题请输入内容`);
+                    type = 2
+                    break;
+                }
+
+                if(this.checkJson[i].content == '' && this.checkJson[i].type == 'theme'){
+                    this.$message.error(`第${i + 1}题请输入题目`);
+                    type = 2
+                    break;
+                }
+                if(this.checkJson[i].content2 == '' && this.checkJson[i].type == 'theme'){
+                    this.$message.error(`第${i + 1}题请输入要点`);
+                    type = 2
+                    break;
+                }
+
+                if(this.checkJson[i].content == '' && this.checkJson[i].type == 'createRole'){
+                    this.$message.error(`第${i + 1}题请输入角色名字`);
+                    type = 2
+                    break;
+                }
+                if(this.checkJson[i].content2 == '' && this.checkJson[i].type == 'createRole'){
+                    this.$message.error(`第${i + 1}题请输入角色定义`);
+                    type = 2
+                    break;
+                }
+                if(this.checkJson[i].content3 == '' && this.checkJson[i].type == 'createRole'){
+                    this.$message.error(`第${i + 1}题请输入角色问候`);
+                    type = 2
+                    break;
+                }
+            }
+            if(type == 2) return
             let a = {
                 title: this.title,
                 detail: this.detail,

+ 9 - 9
src/components/pages/addCourse.vue

@@ -2490,9 +2490,9 @@
                             <div class="pjCss" :style="{width:itemTask.isEvaFold?'calc(100% - 55%)':'calc(100% - 120px)'}">
                               <div v-if="itemTask.eList && itemTask.eList.length" class="elist_input">
                                 <div v-for="(eItem, eIndex) in itemTask.eList" :key="eIndex" class="elist_input_box">
-                                  <span>评价名称:</span>
-                                  <!-- <el-tooltip effect="dark" :content="itemTask.eList[eIndex].value || '填写评价名称'" placement="top" popper-class="text_tooltip2"> -->
-                                    <input type="input" v-model="itemTask.eList[eIndex].value" placeholder="填写评价名称" />
+                                  <span>评价维度:</span>
+                                  <!-- <el-tooltip effect="dark" :content="itemTask.eList[eIndex].value || '填写评价维度'" placement="top" popper-class="text_tooltip2"> -->
+                                    <input type="input" v-model="itemTask.eList[eIndex].value" placeholder="填写评价维度" />
                                   <!-- </el-tooltip> -->
                                   <!-- <span>评星等级:</span>
                                   <el-rate v-model="itemTask.eList[eIndex].score" @change="setEListStar()"
@@ -2501,14 +2501,14 @@
                                     deletEList(unitIndex, itemTaskIndex, eIndex)
                                     "></div>
                                   <div class="elist_inptu_text">
-                                    <span>评价描述:</span>
-                                    <!-- <el-tooltip effect="dark" :content="itemTask.eList[eIndex].detail || '填写评价描述'" placement="top" popper-class="text_tooltip2"> -->
-                                      <input type="input" v-model="itemTask.eList[eIndex].detail" placeholder="填写评价描述" />
+                                    <span>维度描述:</span>
+                                    <!-- <el-tooltip effect="dark" :content="itemTask.eList[eIndex].detail || '填写维度描述'" placement="top" popper-class="text_tooltip2"> -->
+                                      <input type="input" v-model="itemTask.eList[eIndex].detail" placeholder="填写维度描述" />
                                     <!-- </el-tooltip> -->
                                   </div>
                                   <div class="elist_inptu_text" v-if="evalua">
                                     <span>目标:</span>
-                                    <!-- <input type="input" v-model="itemTask.eList[eIndex].target" placeholder="填写评价描述" /> -->
+                                    <!-- <input type="input" v-model="itemTask.eList[eIndex].target" placeholder="填写维度描述" /> -->
                                     <!-- <el-select v-model="itemTask.eList[eIndex].target" placeholder="请选择目标"
                                 @change="forceUpdate()">
                                 <el-option v-for="(e, eIndex) in targetArray" :key="eIndex" :label="e.name"
@@ -3516,7 +3516,7 @@
           <div v-if="rateJson.length" class="elist_input" style="height: 360px; overflow: auto">
             <div v-for="(eItem, eIndex) in rateJson" :key="eIndex" class="elist_input_box">
               <span style="min-width: 100px; text-align: right">个人评价指标:</span>
-              <input type="input" v-model="eItem.value" placeholder="填写评价名称" />
+              <input type="input" v-model="eItem.value" placeholder="填写评价维度" />
               <div class="remove" @click="deletRateList(eIndex)"></div>
               <div style="width: 100%; display: flex">
                 <span style="min-width: 100px; text-align: right">评星等级:</span>
@@ -3524,7 +3524,7 @@
               </div>
               <div class="elist_inptu_text" style="align-items: flex-start">
                 <span style="min-width: 100px; text-align: right">描述:</span>
-                <textarea class="rate_textarea" :rows="3" v-model="eItem.detail" placeholder="填写评价描述"></textarea>
+                <textarea class="rate_textarea" :rows="3" v-model="eItem.detail" placeholder="填写维度描述"></textarea>
               </div>
             </div>
           </div>

+ 2 - 2
src/components/pages/evaBox/index.vue

@@ -13,11 +13,11 @@
                 <div v-if="gradeId" class="elist_input">
                     <div v-for="(eItem, eIndex) in array" :key="eIndex" class="elist_input_box">
                         <div class="elist_inptu_text">
-                            <span>评价名称:</span>
+                            <span>评价维度:</span>
                             <span>{{ eItem.value }}</span>
                         </div>
                         <div class="elist_inptu_text">
-                            <span>评价描述:</span>
+                            <span>维度描述:</span>
                             <span>{{ eItem.detail }}</span>
                         </div>
                     </div>

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません