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

src/common/tools.js

@@ -1,37 +1,38 @@
 export const tools = {
-  58: { name: "模拟驾驶" },
-  59: { name: "路径搜索" },
-  60: { name: "深度学习" },
-  10: { name: "倒计时" },
-  65: { name: "挑人" },
-  7: { name: "思维网格" },
-  1: { name: "电子白板" },
-  52: { name: "文档" },
-  3: { name: "思维导图" },
-  48: { name: "表格" },
-  49: { name: "学生分组" },
-  4: { name: "问卷调查" },
-  45: { name: "选择题" },
-  15: { name: "问答" },
-  16: { name: "作业提交" },
-  50: { name: "批量上传" },
-  41: { name: "选择匹配" },
-  47: { name: "排序" },
-  40: { name: "个人评价" },
-  18: { name: "训练平台" },
-  21: { name: "AIoT Blockly" },
-  23: { name: "AI Python" },
-  24: { name: "AI Blockly" },
-  32: { name: "源码编辑" },
-  57: { name: "CocoPi" },
-  63: { name: "海龟编程" },
-  28: { name: "翻译" },
-  31: { name: "数字画板" },
-  39: { name: "GeoGebra" },
-  66: { name: "公式编辑" },
-  67: { name: "分子结构" },
-  68: { name: "时间轴" },
-  25: { name: "目标管理" },
-  26: { name: "课程设计" },
-  62: { name: "交互视频" }
-};
+    58: { name: "模拟驾驶" },
+    59: { name: "路径搜索" },
+    60: { name: "深度学习" },
+    10: { name: "倒计时" },
+    65: { name: "挑人" },
+    7: { name: "思维网格" },
+    1: { name: "电子白板" },
+    52: { name: "文档" },
+    3: { name: "思维导图" },
+    48: { name: "表格" },
+    49: { name: "学生分组" },
+    4: { name: "问卷调查" },
+    45: { name: "选择题" },
+    15: { name: "问答" },
+    16: { name: "作业提交" },
+    50: { name: "批量上传" },
+    41: { name: "选择匹配" },
+    47: { name: "排序" },
+    40: { name: "个人评价" },
+    18: { name: "训练平台" },
+    21: { name: "AIoT Blockly" },
+    23: { name: "AI Python" },
+    24: { name: "AI Blockly" },
+    32: { name: "源码编辑" },
+    57: { name: "CocoPi" },
+    63: { name: "海龟编程" },
+    28: { name: "翻译" },
+    31: { name: "数字画板" },
+    39: { name: "GeoGebra" },
+    66: { name: "公式编辑" },
+    67: { name: "分子结构" },
+    68: { name: "时间轴" },
+    69: { name: "英语写作" },
+    25: { name: "目标管理" },
+    26: { name: "课程设计" },
+    62: { name: "交互视频" }
+};

src/components/courseDetail.vue

@@ -690,6 +690,13 @@
                                 />
                                 <div>时间轴</div>
                               </div>
+                              <div v-if="item3.tool == 69">
+                                <img
+                                  src="../assets/icon/secondToolList/timeAxis.png"
+                                  alt
+                                />
+                                <div>英语写作</div>
+                              </div>
                               <div v-if="item3.tool == undefined">
                                 <img
                                   src="../assets/icon/empytool.png"

src/components/easy3/studyStudent.vue

@@ -1,4 +1,5 @@
 <template>
+<!-- 极简模式 -->
   <div class="pb_content" style="overflow: unset">
     <div
       class="pb_content_body"
@@ -206,6 +207,7 @@
                       <div v-if="t.tool == 66">公式编辑</div>
                       <div v-if="t.tool == 67">分子结构</div>
                       <div v-if="t.tool == 68">时间轴</div>
+                      <div v-if="t.tool == 69">英语写作</div>
                       <div v-if="t.tool == 25">目标管理</div>
                       <div v-if="t.tool == 26">课程设计</div>
                       <div v-if="t.tool == 62">交互视频</div>
@@ -1281,6 +1283,14 @@
                             />
                             <div style="margin: 5px 0">时间轴</div>
                           </div>
+                          <div v-if="tooC == 69">
+                            <img
+                              @click="addTools(tooC, toolIndex, taskCount)"
+                              src="../../assets/icon/secondToolList/timeAxis.png"
+                              alt
+                            />
+                            <div style="margin: 5px 0">英语写作</div>
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -8104,6 +8114,23 @@
                 <div v-else class="isChoose"></div>
               </div>
             </div>
+            <div
+              class="tool"
+              :class="{ isToolChoose: checktoolArray.indexOf(69) != -1 }"
+              @click="addTools2(69)"
+            >
+              <div class="whiteBIcon">
+                <img src="../../assets/icon/secondToolList/timeAxis.png" alt />
+                <div style="margin: 5px 0">英语写作</div>
+              </div>
+              <div class="check">
+                <div
+                  v-if="checktoolArray.indexOf(69) == -1"
+                  class="noChoose"
+                ></div>
+                <div v-else class="isChoose"></div>
+              </div>
+            </div>
           </div>
           <div class="toolSort" v-if="toolType == 4">
             <div
@@ -11054,6 +11081,22 @@
         <el-button type="primary" @click="updateName">确 定</el-button>
       </span>
     </el-dialog>
+    <el-dialog
+      title="英语写作"
+      :visible.sync="engDialogVisible"
+      :append-to-body="true"
+      width="800px"
+      :before-close="handleClose"
+      class="dialog_diy"
+    >
+      <div>
+        111
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="engDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="addEngLish">确 定</el-button>
+      </span>
+    </el-dialog>
     <interVideo
       :dialogVisibleVideo.sync="dialogVisibleVideo"
       :videoJson="videoJson"
@@ -11375,6 +11418,7 @@ export default {
       timeDialogVisible: false,
       replyDialogVisible: false,
       toolDialogVisible: false,
+      engDialogVisible: false,
       replyIndex: 0,
       replyPid: "",
       radio: [],
@@ -11385,6 +11429,7 @@ export default {
         askJson: [{ askstitle: "", askItem: 1, checkList: [] }],
       },
       testJson: {},
+      englishList: {},
       checkJson: [],
       askList: [],
       answerList: [],
@@ -16847,6 +16892,13 @@ export default {
         window.parent.postMessage({ tools: "61" }, "*");
       } else if (t == 63) {
         window.parent.postMessage({ tools: "63" }, "*");
+      } else if (t == 69) {
+        this.englishList = this.chapInfoList[this.courseType].chapterInfo[0]
+          .taskJson[index].toolChoose[i].englishList
+          ? this.chapInfoList[this.courseType].chapterInfo[0].taskJson[index]
+              .toolChoose[i].englishList
+          : {};
+        this.engDialogVisible = true;
       } else if (t == 65) {
         if (this.tType == 2) {
           this.$message.error("不支持学生使用");