Jelajahi Sumber

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

lsc 6 hari lalu
induk
melakukan
d8282686c6

+ 7 - 2
dist/index.html

@@ -1,4 +1,9 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>PBL教师端</title><link rel="shortcut icon" type=image/x-icon href=static/logo.ico><style>@charset "utf-8";
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta http-equiv=Content-Security-Policy content="default-src * data: blob: 'unsafe-inline' 'unsafe-eval';
+               media-src * data: blob:;
+               script-src * 'unsafe-inline' 'unsafe-eval';
+               style-src * 'unsafe-inline' 'unsafe-hashes';
+               img-src * data: blob:;
+               font-src * data:;"><title>PBL教师端</title><link rel="shortcut icon" type=image/x-icon href=static/logo.ico><style>@charset "utf-8";
     /* @font-face {
         font-family: 'Source Han Sans SC';
         src: url('./static/SourceHanSans-Regular.otf') format('truetype');
@@ -32,7 +37,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-    }</style><link href=./static/css/app.c10c171b082e3f72128f7f30a3c8180c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.dfc8a8e3392292c7b8e5.js></script><script type=text/javascript src=./static/js/app.3fe1ea5ccd6fbc1a1e4f.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.16dcb4ddf8dce8d81d451d86eae15256.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.dfc8a8e3392292c7b8e5.js></script><script type=text/javascript src=./static/js/app.6fb3b19f4d5dec61b9c0.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/css/app.16dcb4ddf8dce8d81d451d86eae15256.css


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/css/app.16dcb4ddf8dce8d81d451d86eae15256.css.map


TEMPAT SAMPAH
dist/static/img/cocoloading.5a4818f.gif


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.6fb3b19f4d5dec61b9c0.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.6fb3b19f4d5dec61b9c0.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map


+ 7 - 0
index.html

@@ -4,6 +4,13 @@
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <meta http-equiv="Content-Security-Policy" 
+      content="default-src * data: blob: 'unsafe-inline' 'unsafe-eval';
+               media-src * data: blob:;
+               script-src * 'unsafe-inline' 'unsafe-eval';
+               style-src * 'unsafe-inline' 'unsafe-hashes';
+               img-src * data: blob:;
+               font-src * data:;">
   <title>PBL教师端</title>
   <link rel="shortcut icon" type="image/x-icon" href="static/logo.ico">
   <style>

+ 2 - 2
src/common/tools.js

@@ -12,7 +12,7 @@ if (typeof window !== 'undefined') {
     } else if (window.location.href.includes("cocorobo.com")) {
         lang = en;
     } else {
-        lang = en;
+        lang = cn;
     }
 }
 
@@ -29,7 +29,7 @@ export const tools = {
     48: { name: lang.ssTable },
     49: { name: lang.ssStuGroup },
     4: { name: lang.ssQuest },
-    45: { name: lang.ssMultipleChoice },
+    45: { name: lang.ssChoice },
     15: { name: lang.ssQA },
     16: { name: lang.ssHomework },
     50: { name: lang.ssBatchUp },

+ 4 - 4
src/components/pages/aiAddCourse/addCourse.vue

@@ -246,7 +246,7 @@
                       <div class="ai_content" @click="openAI"><img src="../../../assets/icon/new/ai.png"/><span>AI共创</span></div>
                     </div> -->
                       <div class="c_info_title" style="padding: 0 0 15px; margin: 0 auto 0 0">
-                        {{ lang.UploadCover }}
+                        {{ lang.ssUploadCover }}
                       </div>
                       <div style="width: 100%">
                         <div class="uploadFm" @click="choosePicVisible = true" :class="{ uploadFm2: cover.length }">
@@ -7098,7 +7098,7 @@
               {{ lang.ssSelectLocal }}
               <input type="file" accept="image/*" style="display: none" @change="beforeUpload1" />
             </button>
-            <div class="spanName">{{ lang.ssSelectLocal }}</div>
+            <!-- <div class="spanName">{{ lang.ssSelectLocal }}</div> -->
           </div>
           <!-- <div>
             <el-button @click="getAllBanner" v-if="isSysPic == false">选择系统文件</el-button>
@@ -7119,7 +7119,7 @@
                 <img src="../../../assets/icon/delete.png" alt="" />
               </div>
             </div>
-            <div class="spanName">{{ lang.ssSelectNet }}</div>
+            <!-- <div class="spanName">{{ lang.ssSelectNet }}</div> -->
           </div>
         </div>
         <!-- <div class="fileCss">
@@ -7152,7 +7152,7 @@
         </div>
       </div>
     </el-dialog>
-    <el-dialog :title="lang.ssSelectNet" :visible.sync="sysPicVisible2" :append-to-body="true" width="710px"
+    <el-dialog :title="lang.SelectWebImage" :visible.sync="sysPicVisible2" :append-to-body="true" width="710px"
       :before-close="handleClose" class="dialog_diy">
       <div>
         <div class="people_top_right" style="display: flex; align-items: center">

+ 16 - 16
src/components/pages/aiEasy/addCourse.vue

@@ -222,7 +222,7 @@
                     </div>
                     <div class="right_first" v-loading="imageloading2">
                       <div class="c_info_title" style="padding: 0 0 15px; margin: 0 auto 0 0">
-                        {{ lang.UploadCover }}
+                        {{ lang.ssUploadCover }}
                       </div>
                       <div style="width: 100%">
                         <div class="uploadFm" @click="choosePicVisible = true" :class="{ uploadFm2: cover.length }">
@@ -267,7 +267,7 @@
                             {{ getListClassC(checkboxList2) }}
                           </div>
                         </el-tooltip>
-                        <div v-else class="wb_j_box_span">{{ lang.SelectTeachingClasses }}</div>
+                        <div v-else class="wb_j_box_span">{{ lang.ssSelectTeac }}</div>
                         <div class="wb_j_box_arrow"></div>
                       </div>
                     </div>
@@ -1753,7 +1753,7 @@
                     <div class="panel_title">{{ lang.ssConfigWF }}</div>
                     <div class="panel_tips">{{ lang.ssWorkflowTip }}</div>
                     <div class="panel_input">
-                      <input type="text" :placeholder="this.aiJson.agentid ? this.aiJson.agentid : lang.ssEnterAid" class="binfo_input" v-model="agentid"/>
+                      <input type="text" :placeholder="aiJson.agentid ? aiJson.agentid : lang.ssEnterAid" class="binfo_input" v-model="agentid"/>
                     </div>
                     <div class="panel_button">
                       <button class="c_pub_button_confirm" @click="setAgentid">{{ lang.Confirm }}</button>
@@ -5022,7 +5022,7 @@
                               </div>
                               <!-- v-show="!itemTool.isFold3" -->
                               <div class="op_tool_box"
-                                v-loading="taskDetailLoading3.indexOf('task-' + itemTaskIndex + toolIndex) !== -1" :element-loading-text="this.lang.ssGenWaitPls">
+                                v-loading="taskDetailLoading3.indexOf('task-' + itemTaskIndex + toolIndex) !== -1" :element-loading-text="lang.ssGenWaitPls">
                                 <textarea rows="2" v-autoHeight="70" type="text" :placeholder="lang.AddToolDescription"
                                   class="binfo_input" style="
                                     margin: 0 0 20px 0;
@@ -5031,13 +5031,13 @@
                                 <div class="op_box" :class="{op_box_isquote: isQuote['aiDetail3-'+itemTaskIndex+'-'+toolIndex]}">
                                   <div class="op_remark">{{ lang.ssToolDescTip }}</div>
                                   <div class="op_box_right">
-                                    <el-tooltip effect="light" :content="this.lang.ssRightClick" placement="bottom">
+                                    <el-tooltip effect="light" :content="lang.ssRightClick" placement="bottom">
                                       <div class="r_pub_button_op"
                                         @contextmenu.prevent="openAiDialog(1, 'aiDetail3', itemTool, itemTaskIndex, toolIndex), addCourseBehavior('courseBehavior2', `右键学历案-任务${itemTaskIndex + 1}-工具${toolIndex + 1}-工具描述-智能优化按钮`)"
                                         @click="openAiDialog(2, 'aiDetail3', itemTool.toolDetail, itemTaskIndex, toolIndex), addCourseBehavior('courseBehavior2', `点击学历案-任务${itemTaskIndex + 1}-工具${toolIndex + 1}-工具描述-智能优化按钮`)">
-                                        {{ this.lang.ssIntOpt }}</div>
+                                        {{ lang.ssIntOpt }}</div>
                                     </el-tooltip>
-                                    <el-switch style="margin-left: 10px" v-model="isQuote['aiDetail3-'+itemTaskIndex+'-'+toolIndex]" :active-text="this.lang.ssQuote" active-color="#0061FF"  class="custom-switch" v-if="isDialog == 1"  @change="handleSwitchChange('aiDetail3-'+itemTaskIndex+'-'+toolIndex)"></el-switch>
+                                    <el-switch style="margin-left: 10px" v-model="isQuote['aiDetail3-'+itemTaskIndex+'-'+toolIndex]" :active-text="lang.ssQuote" active-color="#0061FF"  class="custom-switch" v-if="isDialog == 1"  @change="handleSwitchChange('aiDetail3-'+itemTaskIndex+'-'+toolIndex)"></el-switch>
                                   </div>
                                 </div>
                               </div>
@@ -5085,17 +5085,17 @@
                               ">
                               <div class="lineTitle clineTitle">{{ lang.ssEvalSetting }}</div>
                               <div style="margin-left:auto;display: flex;">
-                                <el-tooltip effect="light" :content="this.lang.ssRightClick" placement="bottom" v-if="itemTask.eList && itemTask.eList.length">
+                                <el-tooltip effect="light" :content="lang.ssRightClick" placement="bottom" v-if="itemTask.eList && itemTask.eList.length">
                                   <div class="r_pub_button_op"
                                     @contextmenu.prevent="openAiDialog(1, 'aiRateRuleA', itemTaskIndex)"
                                     @click="openAiDialog(2, 'aiRateRuleA', itemTaskIndex)">{{ lang.ssGenEvalRules }}</div>
                                 </el-tooltip>
-                                <el-tooltip effect="light" :content="this.lang.ssRightClick" placement="bottom" v-if="itemTask.eList && itemTask.eList.length">
+                                <el-tooltip effect="light" :content="lang.ssRightClick" placement="bottom" v-if="itemTask.eList && itemTask.eList.length">
                                   <div class="r_pub_button_op" style="margin-left:10px;"
                                     @contextmenu.prevent="openAiDialog(1, 'aiDetail4', itemTask.eList, itemTaskIndex)"
                                     @click="openAiDialog(2, 'aiDetail4', itemTask.eList, itemTaskIndex)">{{ lang.ssIntOpt }}</div>
                                 </el-tooltip>
-                                <el-tooltip effect="light" :content="this.lang.ssRightClick" placement="bottom">
+                                <el-tooltip effect="light" :content="lang.ssRightClick" placement="bottom">
                                   <div class="r_pub_button_op" style="margin-left:10px;"
                                     @contextmenu.prevent="openAiDialog(1, 'aiTaskG3', itemTaskIndex)"
                                     @click="openAiDialog(2, 'aiTaskG3', itemTaskIndex)">{{ (itemTask.eList && itemTask.eList.length) ? lang.ssRegenEval : lang.ssGenEval }}</div>
@@ -5318,7 +5318,7 @@
                                     <span>{{ lang.ssEvalRuleColon }}</span>
                                     <div style="width: calc(100%);">
                                       <div @click="openRule(itemTaskIndex, eIndex)" class="ruleBtn" v-if="itemTask.eList[eIndex].rule">{{itemTask.eList[eIndex].isrule ? lang.ssCollapseRule : lang.ssExpandRule}}</div>
-                                      <el-tooltip effect="light" :content="this.lang.ssRightClick" placement="bottom" v-else>
+                                      <el-tooltip effect="light" :content="lang.ssRightClick" placement="bottom" v-else>
                                         <div class="ruleBtn"
                                           @contextmenu.prevent="openAiDialog(1, 'aiRateRule', itemTaskIndex, eIndex)"
                                           @click="openAiDialog(2, 'aiRateRule', itemTaskIndex, eIndex)">{{ lang.ssGenRule }}</div>
@@ -5328,7 +5328,7 @@
                                           <div class="op_box">
                                             <div class="op_remark"></div>
                                             <div class="op_box_right">
-                                              <el-tooltip effect="light" :content="this.lang.ssRightClick" placement="bottom">
+                                              <el-tooltip effect="light" :content="lang.ssRightClick" placement="bottom">
                                                 <div class="r_pub_button_op"
                                                   @contextmenu.prevent="openAiDialog(1, 'aiRateRule', itemTaskIndex, eIndex)"
                                                   @click="openAiDialog(2, 'aiRateRule', itemTaskIndex, eIndex)">{{itemTask.eList[eIndex].rule ? lang.ssRegenerate : lang.ssGenRule}}</div>
@@ -7071,7 +7071,7 @@
         </div>
         <div class="addTypeChoose" v-if="setTypeJson.one != ''">
           <div style="min-width: 100px">{{ lang.ssSelectSecCategory }}:</div>
-          <el-select v-model="setTypeJson.two" :placeholder="this.lang.ssSelect" style="width: 200px">
+          <el-select v-model="setTypeJson.two" :placeholder="lang.ssSelect" style="width: 200px">
             <el-option v-for="(item1, index1) in twoJson" :key="index1" :label="item1.name" :value="item1.id">
             </el-option>
           </el-select>
@@ -18416,6 +18416,8 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
     },
     async aiConfirm(msg,msg2,msg3) {
       let sub = []
+      let _this = this
+
       if (this.courseTypeId.length) {
         for (var i = 0; i < this.courseTypeId.length; i++) {
           let _sid = this.courseTypeId[i]
@@ -18636,7 +18638,6 @@ ${(this.templateid == "4480d65a-1e48-11ef-bee5-005056b86db5" || this.templateid
           }
 
           let ij = 0;
-          let _this = this
           function processNext() {
             if (ij < _this.unitJson[0].chapterInfo[0].taskJson.length) {
               let _task = _this.unitJson[0].chapterInfo[0].taskJson[ij]
@@ -18757,7 +18758,6 @@ ${msg3}
           }
           this.$forceUpdate();
           let ij = 0;
-          let _this = this
           function processNext() {
             if (ij < _this.unitJson[0].chapterInfo[0].taskJson.length) {
               let _task = _this.unitJson[0].chapterInfo[0].taskJson[ij]
@@ -18924,7 +18924,6 @@ ${(this.templateid != "4480d65a-1e48-11ef-bee5-005056b86db5") ? '## 参考上下
         })
       } else if (this.aitype == "aiTeacher2"){
         this.isOutline2 = true
-        let _this = this
         setTimeout(()=>{
           for (var i = 0; i < _this.unitJson[0].chapterInfo[0].taskJson.length; i++) {
             const _tindex = 'task-' + i;
@@ -30010,6 +30009,7 @@ ol {
   line-height: 40px;
   width: 105px;
   text-align: center;
+  flex-direction: 0;
   color: #060e17;
   border-right: 1.5px solid #cad1dc;
   box-sizing: border-box;

+ 14 - 13
src/components/pages/easy/addCourse.vue

@@ -35,7 +35,7 @@
             :style="{
               height: !isBtnDisplay ? 'calc(100% - 50px)' : 'calc(100% - 120px)'
             }"
-            v-if="this.steps == 1"
+            v-if="steps == 1"
             @mousewheel="scrollChange"
           >
             <div
@@ -154,7 +154,7 @@
                         class="c_info_title"
                         style="padding: 0 0 15px;margin: 0 auto 0 0;"
                       >
-                          {{ lang.UploadCover }}
+                          {{ lang.ssUploadCover }}
                       </div>
                       <div style="width: 100%;">
                         <div
@@ -227,7 +227,7 @@
                           {{ getListClassC(checkboxList2) }}
                         </div>
                       </el-tooltip>
-                      <div v-else class="wb_j_box_span">{{ lang.SelectTeachingClasses }}</div>
+                      <div v-else class="wb_j_box_span">{{ lang.ssSelectTeac }}</div>
                       <div class="wb_j_box_arrow"></div>
                     </div>
                   </div>
@@ -334,7 +334,7 @@
                           ></div>
                           <div class="nt_taskBox">
                             <div class="nt_taskTitle">
-                              {{ lang.ssTaskNum.replace(/\*/g, tIndex + 1) }}
+                              {{ lang.ssTaskNum.replace(/\*/g, tIndex + 1) }}:
                             </div>
                             <div class="nt_taskName">
                               <el-tooltip
@@ -903,7 +903,7 @@
                       v-for="(itemTask, itemTaskIndex) in item.taskJson"
                       :key="itemTaskIndex"
                     >
-                      <div class="taskTitle">{{ lang.ssTask.replace(/\*/g, itemTaskIndex + 1) }}</div>
+                      <div class="taskTitle">{{ lang.ssTask }}{{ itemTaskIndex + 1 }}</div>
                       <div v-if="unitJson[unitIndex].easy != 1">
                         <div
                           :style="{
@@ -3274,7 +3274,7 @@
               </button>
             </div>
           </div>
-          <div class="rightBox" v-if="this.steps == 2">
+          <div class="rightBox" v-if="steps == 2">
             <div
               class="basic_box"
               style="padding: 20px 30px 0px !important; box-sizing: border-box"
@@ -3398,7 +3398,7 @@
               </div>
             </div>
           </div>
-          <div class="rightBox" v-if="this.steps == 3" ref="rightboxR">
+          <div class="rightBox" v-if="steps == 3" ref="rightboxR">
             <div class="basic_box">
               <div
                 style="
@@ -6239,7 +6239,7 @@
               </div>
             </div>
           </div>
-          <div class="rightBox" v-if="this.steps == 4">
+          <div class="rightBox" v-if="steps == 4">
             <div class="basic_box_success">
               <div class="right_img">
                 <img src="../../../assets/icon/right.png" alt />
@@ -7583,7 +7583,7 @@
                 @change="beforeUpload1"
               />
             </button>
-            <div class="spanName">{{ lang.ssSelectLocal }}</div>
+            <!-- <div class="spanName">{{ lang.ssSelectLocal }}</div> -->
           </div>
           <!-- <div>
             <el-button @click="getAllBanner" v-if="isSysPic == false">选择系统文件</el-button>
@@ -7607,7 +7607,7 @@
                 <img src="../../../assets/icon/delete.png" alt="" />
               </div>
             </div>
-            <div class="spanName">{{ lang.ssSelectNet }}</div>
+            <!-- <div class="spanName">{{ lang.ssSelectNet }}</div> -->
           </div>
         </div>
         <!-- <div class="fileCss">
@@ -7667,7 +7667,7 @@
       </div>
     </el-dialog>
     <el-dialog
-      :title="lang.ssSelectNet"
+      :title="lang.SelectWebImage"
       :visible.sync="sysPicVisible2"
       :append-to-body="true"
       width="710px"
@@ -12417,7 +12417,7 @@ export default {
                 let checkC2 = aj[i].checkList[z2] ? aj[i].checkList[z2] : "";
                 if (checkC == checkC2) {
                   this.$message.error(
-                    lang.ssOptDup.replace(/\*/g, i + 1).replace(/&/g, this.optionTypeList[z]).replace(/\$/g, this.optionTypeList[z2])
+                    this.lang.ssOptDup.replace(/\*/g, i + 1).replace(/&/g, this.optionTypeList[z]).replace(/\$/g, this.optionTypeList[z2])
                   );
                   return;
                 }
@@ -12495,7 +12495,7 @@ export default {
                 let checkC2 = aj[i].checkList[z2] ? aj[i].checkList[z2] : "";
                 if (checkC == checkC2) {
                   this.$message.error(
-                    lang.ssOptDup.replace(/\*/g, i + 1).replace(/&/g, this.optionTypeList[z]).replace(/\$/g, this.optionTypeList[z2])
+                    this.lang.ssOptDup.replace(/\*/g, i + 1).replace(/&/g, this.optionTypeList[z]).replace(/\$/g, this.optionTypeList[z2])
                   );
                   return;
                 }
@@ -18320,6 +18320,7 @@ ol {
   height: 100%;
   line-height: 40px;
   width: 105px;
+  flex-shrink: 0;
   text-align: center;
   color: #060e17;
   border-right: 1.5px solid #cad1dc;

+ 17 - 17
src/components/pages/newCourse/addCourse.vue

@@ -261,7 +261,7 @@
                         class="c_info_title"
                         style="padding: 0 0 15px; margin: 0 auto 0 0"
                       >
-                        {{ lang.UploadCover }}
+                        {{ lang.ssUploadCover }}
                       </div>
                       <div style="width: 100%">
                         <div
@@ -658,7 +658,7 @@
                         ></div>
                         <div class="nt_taskBox">
                           <div class="nt_taskTitle">
-                            {{ lang.ssStage.replace(/\*/g, stageIndex + 1) }}
+                            {{ lang.ssStage.replace(/\*/g, stageIndex + 1) }}:
                           </div>
                           <div class="nt_taskName">
                             <el-tooltip
@@ -834,7 +834,7 @@
                           >{{
                             item.dyName
                               ? item.dyName
-                              : this.lang.ssStage.replace(/\*/g, (index + 1))
+                              : lang.ssStage.replace(/\*/g, (index + 1))
                           }}</span
                         >
                         <span v-else>{{ lang.ssStage.replace(/\*/g, (index + 1)) }}</span>
@@ -1289,7 +1289,7 @@
                                     />
                                     <input
                                       :placeholder="
-                                        item1.title ? item1.title : this.lang.ssLink
+                                        item1.title ? item1.title : lang.ssLink
                                       "
                                       v-if="item1.type == 8"
                                       style="
@@ -1306,7 +1306,7 @@
 
                                     <input
                                     :placeholder="
-                                      item1.title ? item1.title : this.lang.ssCodeUpload
+                                      item1.title ? item1.title : lang.ssCodeUpload
                                     "
                                     v-if="item1.type == 17"
                                     style="
@@ -1323,7 +1323,7 @@
 
                                     <input
                                       :placeholder="
-                                        item1.title ? item1.title : this.lang.ssLink
+                                        item1.title ? item1.title : lang.ssLink
                                       "
                                       v-if="item1.type == 14"
                                       style="
@@ -1342,7 +1342,7 @@
 
                                     <input
                                     :placeholder="
-                                      item1.title ? item1.title : this.lang.ssAiApp
+                                      item1.title ? item1.title : lang.ssAiApp
                                     "
                                     v-if="item1.type == 15"
                                     style="
@@ -1792,7 +1792,7 @@
                                     />
                                     <input
                                       :placeholder="
-                                        item1.title ? item1.title : this.lang.ssLink
+                                        item1.title ? item1.title : lang.ssLink
                                       "
                                       v-if="item1.type == 8 || item1.type == 14"
                                       style="
@@ -1809,7 +1809,7 @@
 
                                     <input
                                     :placeholder="
-                                      item1.title ? item1.title : this.lang.ssCodeUpload
+                                      item1.title ? item1.title : lang.ssCodeUpload
                                     "
                                     v-if="item1.type == 17"
                                     style="
@@ -1826,7 +1826,7 @@
 
                                     <input
                                     :placeholder="
-                                      item1.title ? item1.title : this.lang.ssAiApp
+                                      item1.title ? item1.title : lang.ssAiApp
                                     "
                                     v-if="item1.type == 15"
                                     style="
@@ -2000,7 +2000,7 @@
                                     unitIndex,
                                     2,
                                     itemTaskIndex,
-                                    this.lang.ssTeachingVideo
+                                    lang.ssTeachingVideo
                                   )
                                 "
                               />
@@ -2021,7 +2021,7 @@
                                     unitIndex,
                                     2,
                                     itemTaskIndex,
-                                    this.lang.ssTeachingAudio
+                                    lang.ssTeachingAudio
                                   )
                                 "
                               />
@@ -2042,7 +2042,7 @@
                                     unitIndex,
                                     3,
                                     itemTaskIndex,
-                                    this.lang.ssLearningSheet
+                                    lang.ssLearningSheet
                                   )
                                 "
                               />
@@ -6579,7 +6579,7 @@
                 @change="beforeUpload1"
               />
             </button>
-            <div class="spanName">{{ lang.ssSelectLocal }}</div>
+            <!-- <div class="spanName">{{ lang.ssSelectLocal }}</div> -->
           </div>
           <!-- <div>
             <el-button @click="getAllBanner" v-if="isSysPic == false">选择系统文件</el-button>
@@ -6603,7 +6603,7 @@
                 <img src="../../../assets/icon/delete.png" alt="" />
               </div>
             </div>
-            <div class="spanName">{{ lang.ssSelectNet }}</div>
+            <!-- <div class="spanName">{{ lang.ssSelectNet }}</div> -->
           </div>
         </div>
         <!-- <div class="fileCss">
@@ -6661,7 +6661,7 @@
       </div>
     </el-dialog>
     <el-dialog
-      :title="lang.ssSelectNet"
+      :title="lang.SelectWebImage"
       :visible.sync="sysPicVisible2"
       :append-to-body="true"
       width="710px"
@@ -7033,7 +7033,7 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <!-- <el-button @click="dialogVisibleTable = false">取 消</el-button>
-        <el-button type="primary" @click="addTableJson">this.lang.ssConfirm</el-button> -->
+        <el-button type="primary" @click="addTableJson">lang.ssConfirm</el-button> -->
         <el-button type="primary" @click="addTableJson">{{ lang.ssUploadTemp }}</el-button>
       </span>
     </el-dialog>

+ 19 - 11
src/components/pages/synergyCourse/addCourse.vue

@@ -21,7 +21,7 @@
                     person,
                 }"> {{this.person ? '跨学科学习平台' : lang.CocoNote}}</el-breadcrumb-item>
                 <el-breadcrumb-item>
-                  <span style="color: rgb(15, 126, 255)">{{this.person ? '创建项目' : lang.EditCoconote}}</span>
+                  <span style="color: rgb(15, 126, 255)">{{this.person ? '创建项目' : lang.ssCreateCocoNote}}</span>
                 </el-breadcrumb-item>
               </el-breadcrumb>
             </div>
@@ -2280,10 +2280,10 @@
         <div class="fileCss" style="padding-top: 20px">
           <div>
             <button class="info_btn" @click="addImg($event)">
-              {{ lang.Selectlocalfile }}
+              {{ lang.ssSelectLocal }}
               <input type="file" accept="image/*" style="display: none" @change="beforeUpload1" />
             </button>
-            <div class="spanName"> {{ lang.Selectlocalfile }}</div>
+            <!-- <div class="spanName"> {{ lang.ssSelectLocal }}</div> -->
           </div>
           <!-- <div>
             <el-button @click="getAllBanner" v-if="isSysPic == false">选择系统文件</el-button>
@@ -2296,14 +2296,14 @@
             <div class="spanName">选择系统文件</div>
           </div> -->
           <div>
-            <el-button @click="searchImageValue = courseName, resetImage()" v-if="isSysPic2 == false"> {{ lang.Selectnetworkfiles }}</el-button>
+            <el-button @click="searchImageValue = courseName, resetImage()" v-if="isSysPic2 == false"> {{ lang.ssSelectNet }}</el-button>
             <div class="isSysPic" v-if="isSysPic2 == true && cover.length > 0">
               <img :src="cover[0].url" alt="" />
               <div class="deletePic" @click="deleteSysPic">
                 <img src="../../../assets/icon/delete.png" alt="" />
               </div>
             </div>
-            <div class="spanName"> {{ lang.Selectnetworkfiles }}</div>
+            <!-- <div class="spanName"> {{ lang.ssSelectNet }}</div> -->
           </div>
         </div>
         <!-- <div class="fileCss">
@@ -2338,12 +2338,12 @@
         </div>
       </div>
     </el-dialog>
-    <el-dialog :title="lang.Selectnetworkfiles" :visible.sync="sysPicVisible2" :append-to-body="true" width="710px"
+    <el-dialog :title="lang.SelectWebImage" :visible.sync="sysPicVisible2" :append-to-body="true" width="710px"
       :before-close="handleClose" class="dialog_diy">
       <div>
         <div class="people_top_right" style="display: flex;align-items: center;">
           <div style="position: relative; width: 100%;">
-            <el-input style="height: 100%" :placeholder="lang.Searchimagekeywords" v-model="searchImageValue"
+            <el-input style="height: 100%" :placeholder="lang.ssSearchImg" v-model="searchImageValue"
               @keyup.enter.native="resetImage()"></el-input>
             <div class="search_img" @click="resetImage" style="right: 10px;">
               <img src="../../../assets/icon/search.png" alt />
@@ -2730,7 +2730,7 @@ export default {
   },
   data() {
     return {
-      person: this.$route.query.person,
+      person: this.$route.query.person || "",
       checkAll: false,
       chooseType: 1,
       checkedCities: [],
@@ -4897,6 +4897,11 @@ export default {
       for (var i = 0; i < this.unitJson.length; i++) {
         delete this.unitJson[i].isUpdate;
       }
+
+      let imgUrl = 'https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/wu1676621845022.png'
+      if (this.lang.lang == 'com') {
+        imgUrl = 'https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/wu1676621845022.png'
+      }
       let params = [
         {
           uid: this.userid,
@@ -4908,7 +4913,7 @@ export default {
               : JSON.stringify([
                 {
                   name: "noBanner.jpg",
-                  url: "https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/wu1676621845022.png",
+                  url: imgUrl,
                   uid: 1656409780264,
                   status: "success",
                 },
@@ -9776,7 +9781,7 @@ ol {
 .all_choose>.el-checkbox-group>.el-checkbox>>>.el-checkbox__label {
   min-width: 80px;
   overflow: hidden;
-  width: 80px;
+  /* width: 80px; */
   text-overflow: ellipsis;
   white-space: nowrap;
 }
@@ -9832,6 +9837,7 @@ ol {
 
 .wb_j_box_content {
   width: calc(100% - 55% - 100px);
+  min-width: 340px;
   display: flex;
   align-items: center;
 }
@@ -11446,6 +11452,7 @@ ol {
 
 .wb_j_box_btn {
   width: calc(100% - 30px);
+  min-width: 340px;
   display: flex;
   height: 40px;
   border: 1.5px solid #CAD1DC;
@@ -11465,7 +11472,8 @@ ol {
   background: #F0F4FA;
   height: 100%;
   line-height: 40px;
-  width: 90px;
+  /* width: 90px; */
+  padding: 0 5px;
   text-align: center;
   color: #060E17;
   border-right: 1.5px solid #CAD1DC;

+ 10 - 8
src/components/pages/synergyCourse/course.vue

@@ -167,7 +167,7 @@
               ">
               {{ lang.Shared }}
             </div>
-            <div class="xtCourse" v-else>{{ lang.CocoNote }}</div>
+            <div class="xtCourse" v-else>{{ lang.Shared }}</div>
             <div class="tup" @click="open(item.courseId, item.userid)" style="cursor: pointer;">
               <img :src="item.cover != null && item.cover != ''
                 ? JSON.parse(item.cover).length > 0
@@ -322,7 +322,7 @@ export default {
   components: { EditorBar,backPage },
   data() {
     return {
-      person: this.$route.query.person,
+      person: this.$route.query.person || "",
       gotype:(window.topU && window.topU.gotype) ?  window.topU.gotype : '',
       itemCount: 1,
       courseTitle: "",
@@ -1029,7 +1029,7 @@ export default {
     // },
     deleteCourse(cid) {
       // if (this.time()) {
-      this.$confirm(this.lang.Aystdi, this.lang.tip, {
+      this.$confirm(this.lang.Aystdi, '', {
         confirmButtonText: this.lang.Confirm,
         cancelButtonText:  this.lang.Cancel,
         type: "warning",
@@ -1934,6 +1934,7 @@ export default {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
+  gap: 10px;
   justify-content: flex-start;
   align-items: center;
 }
@@ -2008,13 +2009,14 @@ export default {
 
 .cName {
   cursor: pointer;
-  margin: 0 10px 5px 0;
   color: #b9b6b9;
-  min-width: 80px;
-  width: 80px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
   white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.05);
+  padding: 1px 5px;
+  box-sizing: border-box;
 }
 
 .isCType {

+ 5 - 8
src/lang/cn.json

@@ -166,8 +166,6 @@
   "exist":"在",
   "SMARTPaste":"智能粘贴",
   "uploadpictures":"上传图片",
-  "Selectlocalfile":"选择本地文件",
-  "Selectnetworkfiles":"选择网络文件",
   "Addmembers":"添加协同成员",
   "Searchforaccount":"搜索完整的姓名/账号(不含邮箱后缀)",
   "identity":"身份",
@@ -182,7 +180,6 @@
   "wantsavecontent":"是否保存已编辑内容?",
   "Noncannotedit":"非管理员和创建者不可编辑",
   "type":"类型",
-  "Searchimagekeywords":"搜索图片关键字",
   "enterkeywordsimages":"请输入关键词搜索图片",
   "Teachername":"老师姓名",
   "enterteachername":"请输入老师姓名",
@@ -262,12 +259,10 @@
   "English": "English",
   "AddCourse": "添加课程",
   "Publish": "是否公开此课程",
-  "UploadCover": "上传封面",
   "SelectLocalImage": "选择本地文件",
   "RefreshResults": "换一组",
   "UpdateCover": "修改封面",
   "TeachingClasses": "授课班级",
-  "SelectTeachingClasses": "请选择授课班级",
   "TaskL": "任务*",
   "UntitledTask": "未命名任务",
   "LearningContent": "学习内容",
@@ -283,7 +278,6 @@
   "AddTask": "添加任务",
   "BacktoCourse": "返回课程",
   "ConfirmUpload": "确认上传",
-  "SelectTeacCla": "选择授课班级",
   "pleasewait": "上传中,请稍后",
   "Filename": "文件名称",
   "Deleteitem": "确定删除此项?",
@@ -1792,7 +1786,7 @@
   "ssMoveDown":"下移",
   "ssCountdown":"倒计时",
   "ssPickPeople":"挑人",
-  "ssMultipleChoice":"选择题",
+  "ssChoice":"选择题",
   "ssAddToolDesc":"添加工具描述",
   "ssToolDescTip":"*可以将需要优化的建议添加在工具描述后,点击\"智能优化\",自动进行修改",
   "ssTaskEvalSys":"任务评价体系",
@@ -1876,7 +1870,10 @@
   "ssGradeType": "年级",
   "ssSubjectCategory": "学科",
   "ssThemeType": "主题",
-  "ssSaveSuccess":"保存成功"
+  "ssSaveSuccess":"保存成功",
+  "SelectWebImage":"选择网络文件",
+  "ssCreateCocoNote":"创建协同建构"
+
 
 
 

+ 17 - 23
src/lang/en.json

@@ -57,7 +57,7 @@
   "SelectClass":"Select Class",
   "NoteTdpfnsai":"Note: The default password for new student accounts is 'Coco1234'",
   "EditStudent":"Edit Student",
-  "Editsuccessful":"Edit successful",
+  "Editsuccessful":"Update Successful",
   "Aystd":"Are you sure you want to delete?",
   "EnterClassName":"Enter Class Name",
   "Grade":"Grade",
@@ -93,7 +93,7 @@
   "Aystdtg":"Are you want to delete this grade?",
   "EnterGrade":"Enter Grade",
   "CocoNote":"CocoNote",
-  "EditCoconote":"Edit Coconote",
+  "EditCoconote":"Create",
   "ResetNote":"Reset",
   "SearchNote":"Search",
   "All":"All",
@@ -102,18 +102,18 @@
   "Open":"Open",
   "Modified":"Modified",
   "Copy":"Copy",
-  "Aystdi":"Are you want to delete it?",
+  "Aystdi":"Are you sure you want to delete it?",
   "Successfullycopy":"Successfully copy",
   "Standardcreation":"Standard creation",
   "QuicklyCreate":"Quickly Create",
   "Back":"Back",
   "NoteName":"Note Name(Required)",
   "Cover":"Cover",
-  "AddCoverimage":"Add Cover image",
+  "AddCoverimage":"Add Cover Image",
   "Collaborator":"Collaborators",
   "Psac":"Please select collaborators",
   "Pleaseaddgroups":"Please add the course name before setting up the group",
-  "Pleasesetupgroups":"No groups available at the moment.Click the'Create' button to set up groups",
+  "Pleasesetupgroups":"No groups available at the moment.Click the 'Create' button to set up groups",
   "Creategroups":"Create",
   "Deletegroups":"Delete",
   "GroupSettings":"Group Settings",
@@ -165,8 +165,6 @@
   "exist":"exist",
   "SMARTPaste":"SMART Paste",
   "uploadpictures":"Upload Image",
-  "Selectlocalfile":"Select local file",
-  "Selectnetworkfiles":"Select network files",
   "Addmembers":"Add collaborative members",
   "Searchforaccount":"Search for complete name/account (excluding email suffix)",
   "identity":"identity",
@@ -181,7 +179,6 @@
   "notsave":"Do not save",
   "Noncannotedit":"Non administrators and creators cannot edit",
   "type":"type",
-  "Searchimagekeywords":"Search for image keywords",
   "enterkeywordsimages":"Please enter keywords to search for images",
   "Teachername":"Teacher's name",
   "enterteachername":"Please enter the teacher's name",
@@ -223,7 +220,7 @@
   "Owner": "Owner",
   "PleaseEnterKeyword": "Please enter keywords",
   "Preview": "Preview",
-  "AiEdit": "Ai, give it a second",
+  "AiEdit": "AI Polish",
   "Share": "Share",
   "CreationDate": "Creation Date",
   "ModificationDate": "Modification Date",
@@ -235,10 +232,10 @@
   "Close": "Close",
   "ViewCollaborativeCourse": "View collaborative courses",
   "ViewContent": "View Content",
-  "reset": "reset",
+  "reset": "Reset",
   "Coursescreening": "Course screening",
   "Pleaseselect": "Please select",
-  "entercoursename": "Please enter the course name",
+  "entercoursename": "Enter Course Name",
   "CreateTeacher": "Create Teacher",
   "edit": "edit",
   "deletebeforeuploading": "The course poster only supports uploading one. Please delete it before uploading again",
@@ -261,12 +258,10 @@
   "English": "English",
   "AddCourse": "Add Course",
   "Publish": "Publish",
-  "UploadCover": "Upload Cover",
   "SelectLocalImage": "Select Local Image",
   "RefreshResults": "Refresh Results",
   "UpdateCover": "Update Cover",
   "TeachingClasses": "Teaching Classes",
-  "SelectTeachingClasses": "Select Teaching Classes",
   "TaskL": "Task *",
   "UntitledTask": "Untitled Task",
   "LearningContent": "Learning Content",
@@ -282,7 +277,6 @@
   "AddTask": "Add Task",
   "BacktoCourse": "Back to Course",
   "ConfirmUpload": "Confirm & Upload",
-  "SelectTeacCla": "Select Teaching Classes",
   "pleasewait": "Uploading,please wait",
   "Filename": "Filename",
   "Deleteitem": "Delete this item?",
@@ -937,7 +931,7 @@
   "ssSearchMem":"Search for member names",
   "ssNoStuAvail":"No students available at the moment",
   "ssSelectTeac":"Select Teaching Classes",
-  "ssSelectClass":"Select Classes",
+  "ssSelectClass":"Select Class",
   "ssNoData":"No data",
   "ssAddMember":"Add collaborative members",
   "ssOther":"other",
@@ -977,8 +971,8 @@
   "ssPainting":"painting",
   "ssScience":"science and technology",
   "ssHumanity":"humanity",
-  "ssSearchImg":"Search for image keywords",
-  "ssChangeGrp":"Change to another group",
+  "ssSearchImg":"Enter keywords to search images",
+  "ssChangeGrp":"Refresh Results",
   "ssEnterKeyImg":"Please enter keywords to search for images",
   "ssUploadQuesImg":"Upload Question Image",
   "ssTipUpload":"Tip: Upload all questions as a single image.",
@@ -1791,7 +1785,7 @@
   "ssMoveDown":"Move Down",
   "ssCountdown":"Timer",
   "ssPickPeople":"Pick someone",
-  "ssMultipleChoice":"Multiple Choice",
+  "ssChoice":"Multiple Choice",
   "ssAddToolDesc":"Add Tool Description",
   "ssToolDescTip":"*You can add optimization suggestions after the tool description, click \"Smart Optimization\" to automatically modify",
   "ssTaskEvalSys":"Task Evaluation System",
@@ -1846,8 +1840,8 @@
   "ssModifyCover":"Modify Cover",
   "ssTeachingClass":"Teaching Class",
   "ssSelectTeachingClass":"Please select teaching class",
-  "ssCollaborators":"Collaborators",
-  "ssSelectCollaborators":"Please select collaborators",
+  "ssCollaborators":"Collaborator",
+  "ssSelectCollaborators":"Please select collaborator",
   "ssSmartPasteMode":"Smart Paste Mode",
   "ssCourseDescription":"Course Brief Description",
   "ssLearningContent":"Learning Content",
@@ -1875,8 +1869,8 @@
   "ssGradeType": "Grade",
   "ssSubjectCategory": "Subject",
   "ssThemeType": "Theme",
-  "ssSaveSuccess":"Saved successfully"
-
-
+  "ssSaveSuccess":"Saved successfully",
+  "SelectWebImage":"Select Web Image",
+  "ssCreateCocoNote":"Edit CocoNote"
 
 }

+ 5 - 8
src/lang/hk.json

@@ -166,8 +166,6 @@
   "exist":"在",
   "SMARTPaste":"智能粘貼",
   "uploadpictures":"上傳圖片",
-  "Selectlocalfile":"選擇本地文件",
-  "Selectnetworkfiles":"選擇網絡文件",
   "Addmembers":"添加協同成員",
   "Searchforaccount":"搜索完整的姓名/賬號(不含郵箱後綴)",
   "identity":"身份",
@@ -182,7 +180,6 @@
   "notsave":"不保存",
   "Noncannotedit":"非管理員和創建者不可編輯",
   "type":"類型",
-  "Searchimagekeywords":"搜索圖片關鍵字",
   "enterkeywordsimages":"請輸入關鍵詞搜索圖片",
   "Teachername":"老師姓名",
   "enterteachername":"請輸入老師姓名",
@@ -262,12 +259,10 @@
   "English": "English",  
   "AddCourse": "添加課程",  
   "Publish": "是否公開此課程",  
-  "UploadCover": "上傳封面",  
   "SelectLocalImage": "選擇本地文件",  
   "RefreshResults": "換一組",  
   "UpdateCover": "修改封面",  
   "TeachingClasses": "授課班級",  
-  "SelectTeachingClasses": "請選擇授課班級",  
   "TaskL": "任務*",  
   "UntitledTask": "未命名任務",  
   "LearningContent": "學習內容",  
@@ -283,7 +278,6 @@
   "AddTask": "添加任務",
   "BacktoCourse": "返回課程",
   "ConfirmUpload": "確認上傳",
-  "SelectTeacCla": "選擇授課班級",
   "pleasewait": "上傳中,請稍後",
   "Filename": "文件名稱",
   "Deleteitem": "確定刪除此項?",
@@ -1792,7 +1786,7 @@
   "ssMoveDown":"下移",
   "ssCountdown":"倒計時",
   "ssPickPeople":"挑人",
-  "ssMultipleChoice":"選擇題",
+  "ssChoice":"選擇題",
   "ssAddToolDesc":"添加工具描述",
   "ssToolDescTip":"*可以將需要優化的建議添加在工具描述後,點擊\"智能優化\",自動進行修改",
   "ssTaskEvalSys":"任務評價體系",
@@ -1876,7 +1870,10 @@
   "ssGradeType": "年級",
   "ssSubjectCategory": "學科",
   "ssThemeType": "主題",
-  "ssSaveSuccess":"保存成功"
+  "ssSaveSuccess":"保存成功",
+  "SelectWebImage":"選擇網絡圖片",
+  "ssCreateCocoNote":"創建協同建構"
+
 
 
 

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini