Kaynağa Gözat

Merge branch 'beta'

SanHQin 8 saat önce
ebeveyn
işleme
89735a2f09

+ 1 - 1
dist/index.html

@@ -27,7 +27,7 @@
     html,
     body{
       font-family: '黑体';
-    }</style><link href=./static/css/app.be576daaa07f241daf815959e225b25a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.b2299056e030e9dd4cb8.js></script><script type=text/javascript src=./static/js/app.637a0846b122b5d64b1d.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.777fab13896dd19d89926096f8ad4d16.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.becc9317549795ada446.js></script><script type=text/javascript src=./static/js/app.1da8493129a6d0404cbf.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/css/app.777fab13896dd19d89926096f8ad4d16.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/css/app.777fab13896dd19d89926096f8ad4d16.css.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/app.1da8493129a6d0404cbf.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/app.1da8493129a6d0404cbf.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/vendor.becc9317549795ada446.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/vendor.becc9317549795ada446.js.map


+ 7 - 1
src/components/components/cocoFlowDia.vue

@@ -17,7 +17,13 @@
             <div class="markDialog">
                 <template v-if="listData.length && showListData(listData)">
                     <div v-for="(item,index) in listData" :key="index">
-                        <div class="BodyCon" v-if="item.messages.length"  >
+                        <div class="BodyCon" v-if="item.imageUrls && item.imageUrls.length">
+                            <div class="BodyConTit">节点{{ index + 1}}</div>
+                            <div style="display: flex;flex-wrap: wrap;gap: 10px;" v-for="(image,index) in item.imageUrls" :key="index+'-image'">
+                                <img style="max-width: 390px;object-fit: cover;" :src="image" alt="" />
+                            </div>
+                        </div>
+                        <div class="BodyCon" v-if="item.messages && item.messages.length" >
                             <div class="BodyConTit">节点{{ index + 1}}</div>
                             <div class="BodyConChat" v-for="(po, index2) in item.messages" :key="index+'-'+index2">
                                 <div class="left" v-if="po.role == 'assistant'">

+ 7 - 1
src/components/components/studentWorkPreviewDialog.vue

@@ -273,7 +273,13 @@
             <div class="s_b_m_tool40" v-if="[72].includes(tool)">
               <template v-if="JSON.parse(studentWork.works).length && JSON.parse(studentWork.works)[0].messages.length">
                 <div v-for="(item,index) in JSON.parse(studentWork.works)" :key="index">
-                    <div class="BodyCon" v-if="item.messages.length" >
+                  <div class="BodyCon" v-if="item.imageUrls && item.imageUrls.length">
+                      <div class="BodyConTit">节点{{ index + 1}}</div>
+                      <div style="display: flex;flex-wrap: wrap;gap: 10px;" v-for="(image,index) in item.imageUrls" :key="index+'-image'">
+                          <img style="max-width: 390px;object-fit: cover;" :src="image" alt="" />
+                      </div>
+                  </div>  
+                  <div class="BodyCon" v-if="item.messages.length" >
                         <div class="BodyConTit">节点{{ index + 1}}</div>
                         <div class="BodyConChat" v-for="(po, index2) in item.messages" :key="index+'-'+index2">
                             <div class="left" v-if="po.role == 'assistant'">

+ 8 - 6
src/components/pptEasyClass/index.vue

@@ -37,12 +37,10 @@
         </div>
         <div class="pec_h_right">
           <div class="pec_h_r_btnArea">
-            <!-- <el-tooltip effect="light" content="刷新" placement="top">
-              <div class="pec_h_r_btn_refresh" @click="refreshCourse">
-                <img src="../../assets/icon/newIcons/refresh.png" alt="" />
-                <span>刷新</span>
-              </div>
-            </el-tooltip> -->
+            <div class="pec_h_r_btn_refresh" @click="refreshCourse">
+              <img src="../../assets/icon/newIcons/refresh.png" alt="" />
+              <span>刷新</span>
+            </div>
             <div class="pec_h_r_btn_afterClass" @click="afterClass" v-if="courseDetail.userid == userid">
               <img src="../../assets/icon/newIcon/afterClass.svg" alt="" />
               <span>下课</span>
@@ -376,6 +374,10 @@ export default {
   border: 1px solid #cad1dc;
 }
 
+.pec_h_r_btnArea> div + div {
+  margin-left: 10px;
+}
+
 .pec_h_r_btnArea>div>img {
   width: 15px;
   height: 15px;

+ 134 - 0
src/lang/cn.json

@@ -0,0 +1,134 @@
+{
+  "lang": "cn",
+  "ssExpand": "展开",
+  "ssReset": "一键重置",
+  "ssAiScore": "AI评分",
+  "ssCollapse": "收缩",
+  "ssInviteCode": "识别码",
+  "ssTask": "任务",
+  "ssTool": "工具",
+  "ssSimulateDrive": "模拟驾驶",
+  "ssPathSearch": "路径搜索",
+  "ssDeepLearning": "深度学习",
+  "ssCountdown": "倒计时",
+  "ssPickPerson": "挑人",
+  "ssMindGrid": "思维网格",
+  "ssWhiteboard": "电子白板",
+  "ssDocument": "文档",
+  "ssMindMap": "思维导图",
+  "ssTable": "表格",
+  "ssStudentGroup": "学生分组",
+  "ssSurvey": "问卷调查",
+  "ssChoice": "选择题",
+  "ssQa": "问答",
+  "ssHomework": "作业提交",
+  "ssBatchUpload": "批量上传",
+  "ssMatch": "选择匹配",
+  "ssSort": "排序",
+  "ssPersonalEval": "个人评价",
+  "ssTraining": "训练平台",
+  "ssCodeEdit": "源码编辑",
+  "ssTurtle": "海龟编程",
+  "ssTranslate": "翻译",
+  "ssDigitalBoard": "数字画板",
+  "ssFormula": "公式编辑",
+  "ssMolecule": "分子结构",
+  "ssTimeline": "时间轴",
+  "ssEnglishWrite": "英语写作",
+  "ssEnglishSpeak": "英语口语",
+  "ssGoalManage": "目标管理",
+  "ssCourseDesign": "课程设计",
+  "ssInteractiveVideo": "交互视频",
+  "ssAiAgent": "AI智能体",
+  "ssAppCenter": "应用中心",
+  "ssRefresh": "刷新",
+  "ssComment": "评论",
+  "ssRecord": "录制",
+  "ssDownload": "下载",
+  "ssPrevious": "上一步",
+  "ssNext": "下一步",
+  "ssPermission": "权限",
+  "ssReturn": "返回",
+  "ssNoDesc": "暂无描述",
+  "ssViewDoc": "查看文档",
+  "ssContentList": "内容列表",
+  "ssNoPreview": "以下文件不支持预览",
+  "ssOpenLink": "打开链接",
+  "ssTime": "时间",
+  "ssWorkArea": "工作区",
+  "ssAnalyze": "分析",
+  "ssCoDoc": "协同文档",
+  "ssMaterialLib": "素材库",
+  "ssLearningMaterial": "学习资料",
+  "ssNote": "便签",
+  "ssStatisticalAnalysis": "统计分析",
+  "ssTrainingServer": "训练服务器",
+  "ssMathBoard": "数学画板",
+  "ssMohe": "魔盒识字",
+  "ss24Game": "24点",
+  "ssHanziPalace": "汉字宫",
+  "ssAllHistory": "全历史",
+  "ssToolDesc": "工具描述",
+  "ssEnterTaskDesc": "请输入任务描述",
+  "ssUploadHomework": "上传作业",
+  "ssGenerateWordCloud": "生成词云",
+  "ssExportHomework": "导出作业",
+  "ssHomeworkPreview": "作业预览",
+  "ssScore": "分",
+  "ssMarkScore": "评分",
+  "ssFold": "折叠",
+  "ssNotSubmitted": "未提交",
+  "ssScoring": "正在评分",
+  "ssNoHomework": "暂无提交作业",
+  "ssScoringIn": "评分中",
+  "ssCorrectRate": "正确率",
+  "ssQuestionNum": "第*题",
+  "ssRightPerson": "答对人数",
+  "ssGroupSetting": "分组设置",
+  "ssCurrentCount": "目前人数",
+  "ssPerson": "人",
+  "ssEvaluate": "评一评",
+  "ssTarget": "目标",
+  "ssEvalDimension": "评价维度",
+  "ssEvalStandard": "评价标准",
+  "ssDimensionDesc": "维度描述",
+  "ssDetail": "细则",
+  "ssView": "查看",
+  "ssCollapseTarget": "收起目标",
+  "ssExpandTarget": "展开目标",
+  "ssTargetTree": "目标树",
+  "ssTargetCompass": "目标罗盘",
+  "ssUpFile": "上传文件",
+  "ssSubmit": "提交",
+  "ssTotalEval": "总评",
+  "ssTimeDesc": "时间降序",
+  "ssTimeAsc": "时间升序",
+  "ssMyComment": "我的评课",
+  "ssEval": "评",
+  "ssCommentOf": "的评论",
+  "ssDelete": "删除",
+  "ssReply": "回复",
+  "ssAddComment": "添加评论",
+  "ssNewTool": "新增工具",
+  "ssInteract": "互动类",
+  "ssThinking": "思维类",
+  "ssEvalType": "测评类",
+  "ssProgram": "编程类",
+  "ssSubject": "学科类",
+  "ssCancel": "取消",
+  "ssConfirm": "确定",
+  "ssAddReply": "添加回复",
+  "ssEnterReply": "请输入回复描述",
+  "ssTeacherComment": "教师评论",
+  "ssText": "文本",
+  "ssAudio": "音频",
+  "ssUploading": "上传中请稍后",
+  "ssViewSurvey": "查看问卷",
+  "ssTitle": "标题",
+  "ssQuestionContent": "题目内容",
+  "ssQuestion": "题目",
+  "ssStudentName": "学生姓名",
+  "ssViewChoice": "查看选择题",
+  "ssSingleChoice": "单选题",
+  "ssMultiChoice": "多选题"
+}

+ 5 - 0
src/lang/en.json

@@ -0,0 +1,5 @@
+{
+  "lang": "com"
+ 
+
+}

+ 5 - 0
src/lang/hk.json

@@ -0,0 +1,5 @@
+{
+  "lang": "hk"
+ 
+
+}

+ 29 - 11
src/main.js

@@ -4,6 +4,8 @@ import Vue from 'vue'
 import App from './App'
 import router from './router'
 import store from './config/config'
+import locale from 'element-ui/lib/locale/lang/en'
+
 import {  Loading } from 'element-ui';
 // Message,
 import { myMessage } from './components/tools/message';
@@ -20,6 +22,10 @@ import drag from './components/directive/el-drag-dialog';
 import VueAudio from 'vue-audio-better'
 import './assets/css/markdownCss.css'
 
+import cn from "./lang/cn.json";
+import hk from "./lang/hk.json";
+import en from "./lang/en.json";
+
 Vue.use(VideoPlayer).use(VueAudio).use(VueCookies).use(hevueImgPreview, {
     clickMaskCLose: true
 }).use(drag)
@@ -44,18 +50,25 @@ Vue.prototype.openLoading = function(target) {
     return loading;
 }
 Vue.prototype.$qs = qs
+//注册到vue原型上
+let lang = new Object();
+let domain_name = "";
+
+if (window.location.href.includes("cocorobo.cn")) {
+  domain_name="cn";
+  lang = cn;
+} else if (window.location.href.includes("cocorobo.hk")) {
+  domain_name="hk";
+  lang = hk;
+} else if (window.location.href.includes("cocorobo.com")) {
+  domain_name="com";
+  lang=en;
+}else{
+  domain_name="cn";
+  lang=cn;
+}
+Vue.prototype.lang =lang;
 
-let region = 'cn'
-if (window.location.href.includes('beta') || window.location.href.includes('localhost')) {
-  region = 'beta'
-} else if (window.location.href.includes('cn')) {
-  region = 'cn'
-} else if (window.location.href.includes('hk')) {
-  region = 'hk'
-} else if (window.location.href.includes('com')) {
-  region = 'com'
-} 
-Vue.prototype.$region = region
 
 /* eslint-disable no-new */
 new Vue({
@@ -64,6 +77,11 @@ new Vue({
     components: { App },
     template: '<App/>'
 })
+if(domain_name==='com'){//英文版
+	Vue.use(ElementUI,{locale})
+}else{
+	Vue.use(ElementUI)
+}
 
 VueCookies.config('30d')
 

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor