فهرست منبع

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

lsc 3 روز پیش
والد
کامیت
b30bd9bd5a

+ 1 - 1
dist/index.html

@@ -37,7 +37,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-    }</style><link href=./static/css/app.02f02b53c10197a630223edaac384fdc.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.6b2a44c7de00ff27bd1f.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.701d46fb0d60562af68e716db2c373bb.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.086a2dedc1105aa594b0.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/css/app.701d46fb0d60562af68e716db2c373bb.css


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/css/app.701d46fb0d60562af68e716db2c373bb.css.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/app.086a2dedc1105aa594b0.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/app.086a2dedc1105aa594b0.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map


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

@@ -2418,14 +2418,14 @@
                     pub_btn_next_img: steps != 3,
                     pub_btn_finish_img: steps == 3,
                   }">
-                  {{ steps == 3 ? lang.ConfirmUpload : !isOutline ? lang.ssGenOut : !isOutline2 ? lang.ssGenLessonPlan : lang.Next }}
+                  {{ steps == 3 ? lang.ssConfirmUpload : !isOutline ? lang.ssGenOut : !isOutline2 ? lang.ssGenLessonPlan : lang.Next }}
                 </button>
                 <button class="c_pub_button_confirm" v-else @click="nextSteps(2)" @contextmenu.prevent="nextSteps(1)"
                   :class="{
                     pub_btn_next_img: steps != 3,
                     pub_btn_finish_img: steps == 3,
                   }">
-                  {{ steps == 3 ? lang.ConfirmUpload : ((templateid == "4480d65a-1e48-11ef-bee5-005056b86db5" || templateid ==
+                  {{ steps == 3 ? lang.ssConfirmUpload : ((templateid == "4480d65a-1e48-11ef-bee5-005056b86db5" || templateid ==
                   "cf5722a4-401b-11ef-b873-005056b86dc3") && cpoteType < 4) ? cpoteType < 3 ? cpoteType < 2 ? cpoteType
                     < 1 ? lang.ssGenCpote : lang.ssGenQChain : lang.ssGenTargetLay : lang.ssGenTaskClus : !isOutline2 ? lang.ssGenLessonPlan : lang.Next }} </button>
               </el-tooltip>
@@ -2586,7 +2586,7 @@
                 pub_btn_next_img: steps != 3,
                 pub_btn_finish_img: steps == 3,
               }">
-                {{ steps == 3 ? lang.ConfirmUpload : !isOutline ? lang.ssGenOut : lang.Next }}
+                {{ steps == 3 ? lang.ssConfirmUpload : !isOutline ? lang.ssGenOut : lang.Next }}
               </button>
             </div>
           </div>
@@ -2838,7 +2838,7 @@
                   <!-- <button class="c_pub_button_confirm3" style="margin: 0 0 0 10px;" @click="exportTaskEA(), addCourseBehavior('courseBehavior', `点击学历案-导出评价和学历案按钮`)">导出评价和学历案</button> -->
                   <button class="c_pub_button_confirm" style="margin: 0 0 0 10px;" v-if="steps < 4 && istemplate != 1"
                     @click="nextSteps">
-                    {{ steps == 3 ? lang.ConfirmUpload : lang.Next }}
+                    {{ steps == 3 ? lang.ssConfirmUpload : lang.Next }}
                   </button>
                 </div>
                 <div class="basic_box" ref="unitBox" @scroll="taskScroll">
@@ -6044,7 +6044,7 @@
                       pub_btn_next_img: steps != 3,
                       pub_btn_finish_img: steps == 3,
                     }">
-                      {{ steps == 3 ? lang.ssConfirmUp : lang.ssNextStep }}
+                      {{ steps == 3 ? lang.ssConfirmUpload : lang.ssNextStep }}
                     </button>
                     <button class="c_pub_button_confirm" v-if="istemplate == 1" @click="openSaveTips">{{ templateid ?
                       lang.ssModifyTemp : lang.ssSaveTemp }}</button>
@@ -6097,7 +6097,7 @@
               pub_btn_next_img: steps != 3,
               pub_btn_finish_img: steps == 3,
             }">
-              {{ steps == 3 ? lang.ssConfirmUp : lang.ssNextStep }}
+              {{ steps == 3 ? lang.ssConfirmUpload : lang.ssNextStep }}
             </button>
           </div>
         </div>

+ 30 - 2
src/components/pages/components/exportDataDialog.vue

@@ -41,9 +41,9 @@
             />
           </div>
           <div class="termC">
-            <div><span>2023-2024</span>{{lang.ssSchoolYear}}</div>
+            <div><span>{{schoolYear}}</span>{{lang.ssSchoolYear}}</div>
             <div style="width: 20px;"></div>
-            <div>{{lang.ssSemester.replace(/\*/g, 2)}}</div>
+            <div>{{lang.ssSemester.replace(/\*/g, semester)}}</div>
           </div>
 
           <div class="fromCss">
@@ -1416,6 +1416,34 @@ export default {
         let md = new MarkdownIt();
         return c ? md.render(c) : "";
       };
+    },
+    // 计算中国学年
+    schoolYear() {
+      const now = new Date();
+      const year = now.getFullYear();
+      const month = now.getMonth() + 1; // getMonth() 返回 0-11
+      
+      // 中国学年:9月1日到次年8月31日
+      // 如果当前月份是9-12月,学年是 当前年-次年
+      // 如果当前月份是1-8月,学年是 去年-当前年
+      if (month >= 9) {
+        return `${year}-${year + 1}`;
+      } else {
+        return `${year - 1}-${year}`;
+      }
+    },
+    // 计算学期:1学期或2学期
+    semester() {
+      const now = new Date();
+      const month = now.getMonth() + 1; // getMonth() 返回 0-11
+      
+      // 第一学期:9月-次年1月
+      // 第二学期:2月-8月
+      if (month >= 9 || month <= 1) {
+        return 1;
+      } else {
+        return 2;
+      }
     }
   },
 

+ 30 - 2
src/components/pages/components/exportWorksDialog.vue

@@ -28,9 +28,9 @@
             {{ lang.ssWorkSet }}
           </div>
           <div class="termC">
-            <div><span>2023-2024</span>{{ lang.ssSchoolYear }}</div>
+            <div><span>{{schoolYear}}</span>{{ lang.ssSchoolYear }}</div>
             <div style="width: 20px;"></div>
-            <div>{{ lang.ssSemester.replace(/\*/g, 2) }}</div>
+            <div>{{ lang.ssSemester.replace(/\*/g, semester) }}</div>
           </div>
           <div class="fromCss">
             <div>
@@ -989,6 +989,34 @@ export default {
 
         return this.convertToTimestamp(TimeList[0]);
       };
+    },
+    // 计算中国学年
+    schoolYear() {
+      const now = new Date();
+      const year = now.getFullYear();
+      const month = now.getMonth() + 1; // getMonth() 返回 0-11
+      
+      // 中国学年:9月1日到次年8月31日
+      // 如果当前月份是9-12月,学年是 当前年-次年
+      // 如果当前月份是1-8月,学年是 去年-当前年
+      if (month >= 9) {
+        return `${year}-${year + 1}`;
+      } else {
+        return `${year - 1}-${year}`;
+      }
+    },
+    // 计算学期:1学期或2学期
+    semester() {
+      const now = new Date();
+      const month = now.getMonth() + 1; // getMonth() 返回 0-11
+      
+      // 第一学期:9月-次年1月
+      // 第二学期:2月-8月
+      if (month >= 9 || month <= 1) {
+        return 1;
+      } else {
+        return 2;
+      }
     }
   },
 

+ 2 - 2
src/components/pages/easy/addCourse.vue

@@ -3270,7 +3270,7 @@
                 class="c_pub_button_confirm pub_btn_finish_img"
                 @click="nextSteps"
               >
-{{ lang.ConfirmUpload }}
+{{ lang.ssConfirmUpload }}
               </button>
             </div>
           </div>
@@ -6273,7 +6273,7 @@
               @click="nextSteps"
               v-if="isBtnDisplay"
             >
-{{ lang.ConfirmUpload }}
+{{ lang.ssConfirmUpload }}
             </button>
           </div>
         </div>

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

@@ -5006,7 +5006,7 @@
                   pub_btn_finish_img: steps == 3,
                 }"
               >
-                {{ lang.ssConfirmUp }}
+                {{ lang.ssConfirmUpload }}
               </button>
             </div>
           </div>
@@ -5203,7 +5203,7 @@
                   pub_btn_finish_img: steps == 3,
                 }"
               >
-                {{ steps == 3 ? lang.ssConfirmUp : lang.ssNextStep }}
+                {{ steps == 3 ? lang.ssConfirmUpload : lang.ssNextStep }}
               </button>
             </div>
           </div>
@@ -5270,7 +5270,7 @@
                 pub_btn_finish_img: steps == 3,
               }"
             >
-                {{ lang.ssConfirmUp }}
+                {{ lang.ssConfirmUpload }}
             </button>
           </div>
         </div>
@@ -10775,7 +10775,7 @@ export default {
           if (this.steps != 1 && this.steps != 2 && this.steps != 3) {
             if (this.cidType == 1) {
               this.$message({
-                message: this.lang.ssUpdateSuccessful,
+                message: this.lang.ssModifySuccess,
                 type: "success",
               });
             } else {

+ 22 - 1
src/lang/cn.json

@@ -1866,7 +1866,28 @@
   "ssSaveSuccess":"保存成功",
   "SelectWebImage":"选择网络文件",
   "ssCreateCocoNote":"创建协同建构",
-  "ssCocoNoteUpdateTips":"协同建构不支持修改基本信息,只支持加入分组。"
+  "ssCocoNoteUpdateTips":"协同建构不支持修改基本信息,只支持加入分组。",
+  "ssInterTool":"互动工具",
+  "ssH5Page":"H5页面",
+  "ssCreateSpace":"创作空间",
+  "ssCreatedCont":"已创建内容",
+  "ssTotal":"共",
+  "ssItemCont":"项内容",
+  "ssNoTool":"暂无工具...",
+  "ssPreview":"预览",
+  "ssCopy":"复制",
+  "ssEnterTextTitle":"请输入文本标题...",
+  "ssAddH5Page":"添加H5页面",
+  "ssSelectMember":"选择成员",
+  "ssSearchMemberName":"搜索成员名称",
+  "ssMultipleChoice":"多选题",
+  "ssWhiteBoard":"电子白板",
+  "ssCollabDoc":"协同文档",
+  "ssEnterAnswerQuestion":"请输入您想要回答的问题",
+  "ssInteractType":"互动类",
+  "ssThinkType":"思维类",
+  "ssEvalType":"评价类",
+  "ssAddQuestion":"添加问题"
 
 
 

+ 22 - 1
src/lang/en.json

@@ -1865,6 +1865,27 @@
   "ssSaveSuccess":"Saved successfully",
   "SelectWebImage":"Select Web Image",
   "ssCreateCocoNote":"Edit CocoNote",
-  "ssCocoNoteUpdateTips":"CocoNote does not support modifying basic information, only supports joining groups."
+  "ssCocoNoteUpdateTips":"CocoNote does not support modifying basic information, only supports joining groups.",
+  "ssInterTool":"Interactive Tool",
+  "ssH5Page":"H5 Page",
+  "ssCreateSpace":"Creative Space",
+  "ssCreatedCont":"Created Content",
+  "ssTotal":"Total",
+  "ssItemCont":"Items",
+  "ssNoTool":"No tools...",
+  "ssPreview":"Preview",
+  "ssCopy":"Copy",
+  "ssEnterTextTitle":"Please enter text title...",
+  "ssAddH5Page":"Add H5 Page",
+  "ssSelectMember":"Select Member",
+  "ssSearchMemberName":"Search Member Name",
+  "ssMultipleChoice":"Multiple Choice",
+  "ssWhiteBoard":"Whiteboard",
+  "ssCollabDoc":"Collaborative Document",
+  "ssEnterAnswerQuestion":"Please enter the question you want to answer",
+  "ssInteractType":"Interactive",
+  "ssThinkType":"Thinking",
+  "ssEvalType":"Evaluation",
+  "ssAddQuestion":"Add Question"
 
 }

+ 22 - 1
src/lang/hk.json

@@ -1865,7 +1865,28 @@
   "ssThemeType": "主題",
   "ssSaveSuccess":"保存成功",
   "SelectWebImage":"選擇網絡圖片",
-  "ssCreateCocoNote":"創建協同建構"
+  "ssCreateCocoNote":"創建協同建構",
+  "ssInterTool":"互動工具",
+  "ssH5Page":"H5頁面",
+  "ssCreateSpace":"創作空間",
+  "ssCreatedCont":"已創建內容",
+  "ssTotal":"共",
+  "ssItemCont":"項內容",
+  "ssNoTool":"暫無工具...",
+  "ssPreview":"預覽",
+  "ssCopy":"複製",
+  "ssEnterTextTitle":"請輸入文本標題...",
+  "ssAddH5Page":"添加H5頁面",
+  "ssSelectMember":"選擇成員",
+  "ssSearchMemberName":"搜索成員名稱",
+  "ssMultipleChoice":"多選題",
+  "ssWhiteBoard":"電子白板",
+  "ssCollabDoc":"協同文檔",
+  "ssEnterAnswerQuestion":"請輸入您想要回答的問題",
+  "ssInteractType":"互動類",
+  "ssThinkType":"思維類",
+  "ssEvalType":"評價類",
+  "ssAddQuestion":"添加問題"
 
 
 

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است