Home Explore Help
Sign In
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'beta'

SanHQin 1 month ago
parent
b5f882f87e 865edb945f
commit
694ff808f4
21 changed files with 91 additions and 52 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.5443948047598b83968cb49aebc37a2d.css
  3. 0 0
      dist/static/css/app.c10721857f03800ac74e8abaf4e771a7.css
  4. 0 0
      dist/static/css/app.c10721857f03800ac74e8abaf4e771a7.css.map
  5. 0 0
      dist/static/js/app.6c6425a292330f2480b4.js
  6. 0 0
      dist/static/js/app.6c6425a292330f2480b4.js.map
  7. 0 0
      dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map
  8. 0 0
      dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map
  9. 0 0
      dist/static/js/workPage.d10de4235f3c3a82a254.js
  10. 0 0
      dist/static/js/workPage.d10de4235f3c3a82a254.js.map
  11. 0 0
      dist/static/js/workPage.f15f5024082b8eeb6d3c.js
  12. 0 0
      dist/static/js/workPage.f15f5024082b8eeb6d3c.js.map
  13. 1 1
      dist/workPage.html
  14. 4 0
      src/common/axios.config.js
  15. 22 20
      src/components/pages/aiAddCourse/templateDialog.vue
  16. 25 23
      src/components/pages/aiEasy/templateDialog.vue
  17. 10 3
      src/components/pages/course.vue
  18. 1 1
      src/components/pages/pptEasy/dialog/BilibiliSearchDialog.vue
  19. 9 1
      src/lang/cn.json
  20. 9 1
      src/lang/en.json
  21. 9 1
      src/lang/hk.json

+ 1 - 1
dist/index.html
View File 

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

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.5443948047598b83968cb49aebc37a2d.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.c10721857f03800ac74e8abaf4e771a7.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.c10721857f03800ac74e8abaf4e771a7.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.6c6425a292330f2480b4.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.6c6425a292330f2480b4.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/workPage.d10de4235f3c3a82a254.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/workPage.d10de4235f3c3a82a254.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/workPage.f15f5024082b8eeb6d3c.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/workPage.f15f5024082b8eeb6d3c.js.map


+ 1 - 1
dist/workPage.html
View File 

@@ -1,4 +1,4 @@
 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>工作页面 - CocoFlow</title><link rel=icon href=../static/logo.ico><link href=./static/css/workPage.44973c21a9b3c1c3890a7896df5c527c.css rel=stylesheet></head><body><noscript><strong>We're sorry but this app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script type=text/javascript src=./static/js/workPage-manifest.2ece51fa34be51c8610a.js></script><script type=text/javascript src=./static/js/workPage-vendor.0c46d4deebf81c844386.js></script><script type=text/javascript src=./static/js/workPage.d10de4235f3c3a82a254.js></script></body></html><script>function stopSafari() {
 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>工作页面 - CocoFlow</title><link rel=icon href=../static/logo.ico><link href=./static/css/workPage.44973c21a9b3c1c3890a7896df5c527c.css rel=stylesheet></head><body><noscript><strong>We're sorry but this app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script type=text/javascript src=./static/js/workPage-manifest.2ece51fa34be51c8610a.js></script><script type=text/javascript src=./static/js/workPage-vendor.0c46d4deebf81c844386.js></script><script type=text/javascript src=./static/js/workPage.f15f5024082b8eeb6d3c.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

+ 4 - 0
src/common/axios.config.js
View File 

@@ -4,6 +4,7 @@ import qs from "qs"
 
 axios.defaults.timeout = 600000   //响应时间
 
 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';        //配置请求头
 
 axios.defaults.baseURL = process.env.NODE_HOST;   //配置接口地址
 
+axios.defaults.withCredentials = true;   //允许携带cookie
 
 console.log(process.env)
 
 
 const CancelToken = axios.CancelToken;
 
@@ -12,6 +13,9 @@ let cancel; // 用于存储取消请求的方法
 
 //POST传参序列化(添加请求拦截器)
 
 axios.interceptors.request.use((config) => {
 
   //在发送请求之前做某件事
 
+  // 确保每个请求都携带cookie
 
+  config.withCredentials = true;
 
+  
   let token = sessionStorage.getItem('access_token') || ""  //获取token
 
   if (token != "") {
 
     config.headers = {

+ 22 - 20
src/components/pages/aiAddCourse/templateDialog.vue
View File 

@@ -3,14 +3,14 @@
 
         <!-- <div v-if="showDialog == true" class="a-dialog" v-el-drag-dialog> -->
 
         <div class="a-d-top">
 
             <div class="a-d-topTit">
 
-                <div style="width: 136px">模板库</div>
 
+                <div style="width: 136px">{{ lang.TemplateLibrary }}</div>
 
             </div>
 
             <div>
 
-                <el-input placeholder="请输入内容" prefix-icon="el-icon-search" v-model="input2" clearable>
 
+                <el-input :placeholder="lang.PleaseEnterContent" prefix-icon="el-icon-search" v-model="input2" clearable>
 
                 </el-input>
 
             </div>
 
             <div class="a-d-t-right">
 
-                <el-button @click="open2()" type="primary" size="small" style="margin-right: 10px;">设置模板</el-button>
 
+                <el-button @click="open2()" type="primary" size="small" style="margin-right: 10px;">{{ lang.SetTemplate }}</el-button>
 
                 <span @click.stop="close">×</span>
 
             </div>
 
         </div>
 
@@ -47,8 +47,8 @@
 
                                 <div class="a-d-b-i-t-title">{{ item.name }}</div>
 
                             </el-tooltip>
 
                         </div>
 
-                        <!-- <div class="a-d-b-i-top" v-if="item.uname">创建人：{{ item.uname }}</div> -->
 
-                        <div class="a-d-b-i-top" v-show="false">创建人：{{ item.uname }}</div>
 
+                        <!-- <div class="a-d-b-i-top" v-if="item.uname">{{ lang.Creator }}：{{ item.uname }}</div> -->
 
+                        <div class="a-d-b-i-top" v-show="false">{{ lang.Creator }}：{{ item.uname }}</div>
 
                         <!-- <el-tooltip :content="item.detail" placement="top" effect="dark"> -->
 
                             <div class="a-d-b-i-bottom">{{ item.detail }}</div>
 
                         <!-- </el-tooltip> -->
 
@@ -59,16 +59,16 @@
 
 										justify-content: space-around;
 
 									">
 
                                 <div class="a-d-b-i-t-btn" v-if="item.userid == userid" style="margin-right: 10px;"
 
-                                    @click="deleteA(item.id)">删除</div>
 
+                                    @click="deleteA(item.id)">{{ lang.Delete }}</div>
 
                                 <div class="a-d-b-i-t-btn1" v-if="item.userid == userid" style="margin-right: 10px;"
 
-                                    @click="open2(item.id)">修改</div>
 
+                                    @click="open2(item.id)">{{ lang.Edit }}</div>
 
                                 <div class="a-d-b-i-t-btn1" @click="open(item.id)">
 
-                                    使用
 
+                                    {{ lang.Use }}
 
                                 </div>
 
                             </div>
 
                         </div>
 
                     </div>
 
-                    <div v-if="!searchDataList.length" style="text-align: center;">暂无内容</div>
 
+                    <div v-if="!searchDataList.length" style="text-align: center;">{{ lang.NoItemsFound }}</div>
 
                 </div>
 
             </div>
 
         </div>
 
@@ -96,10 +96,6 @@ export default {
 
     },
 
     data() {
 
         return {
 
-            dialogTagList: [
 
-                { id: '2', name: "社区模板" },
 
-                { id: '1', name: "我的模板" },
 
-            ],
 
             tagIndex: '2',
 
             searchDataList: [],
 
             input2: '',
 
@@ -107,6 +103,12 @@ export default {
 
         }
 
     },
 
     computed: {
 
+        dialogTagList() {
 
+            return [
 
+                { id: '2', name: this.lang.CommunityTemplate },
 
+                { id: '1', name: this.lang.MyTemplate },
 
+            ]
 
+        },
 
         tagname() {
 
             return this.dialogTagList.filter((item) => {
 
                 return item.id == this.tagIndex
 
@@ -147,11 +149,11 @@ export default {
 
         deleteA(id) {
 
             let _this = this
 
             _this.$confirm(
 
-                "确定删除此模板吗？",
 
-                "提示",
 
+                _this.lang.deletethistemplate,
 
+                _this.lang.tip,
 
                 {
 
-                    confirmButtonText: "确定",
 
-                    cancelButtonText: "取消",
 
+                    confirmButtonText: _this.lang.Confirm,
 
+                    cancelButtonText: _this.lang.Cancel,
 
                     type: "warning",
 
                 }
 
             )
 
@@ -162,11 +164,11 @@ export default {
 
                     _this.ajax
 
                         .post(_this.$store.state.api + "deleteTipsTemplate", params)
 
                         .then((res) => {
 
-                            _this.$message.success("删除成功");
 
+                            _this.$message.success(_this.lang.DeleteSuccessful);
 
                             _this.getList()
 
                         })
 
                         .catch((err) => {
 
-                            _this.$message.error("网络不佳");
 
+                            _this.$message.error(_this.lang.Poorinternetconnection);
 
                             console.error(err);
 
                         });
 
                 })
 
@@ -200,7 +202,7 @@ export default {
 
                     }
 
                 })
 
                 .catch((err) => {
 
-                    this.$message.error("网络不佳");
 
+                    this.$message.error(this.lang.Poorinternetconnection);
 
                     console.error(err);
 
                 });
 
         }

+ 25 - 23
src/components/pages/aiEasy/templateDialog.vue
View File 

@@ -3,14 +3,14 @@
 
         <!-- <div v-if="showDialog == true" class="a-dialog" v-el-drag-dialog> -->
 
         <div class="a-d-top">
 
             <div class="a-d-topTit">
 
-                <div style="width: 136px">模板库</div>
 
+                <div style="width: 136px">{{ lang.TemplateLibrary }}</div>
 
             </div>
 
             <div>
 
-                <el-input placeholder="请输入内容" prefix-icon="el-icon-search" v-model="input2" clearable>
 
+                <el-input :placeholder="lang.PleaseEnterContent" prefix-icon="el-icon-search" v-model="input2" clearable>
 
                 </el-input>
 
             </div>
 
             <div class="a-d-t-right">
 
-                <el-button @click="open2()" type="primary" size="small" style="margin-right: 10px;">设置模板</el-button>
 
+                <el-button @click="open2()" type="primary" size="small" style="margin-right: 10px;">{{ lang.SetTemplate }}</el-button>
 
                 <span @click.stop="close">×</span>
 
             </div>
 
         </div>
 
@@ -47,8 +47,8 @@
 
                                 <div class="a-d-b-i-t-title">{{ item.name }}</div>
 
                             </el-tooltip>
 
                         </div>
 
-                        <!-- <div class="a-d-b-i-top" v-if="item.uname">创建人：{{ item.uname }}</div> -->
 
-                        <div class="a-d-b-i-top" v-show="false">创建人：{{ item.uname }}</div>
 
+                        <!-- <div class="a-d-b-i-top" v-if="item.uname">{{ lang.Creator }}：{{ item.uname }}</div> -->
 
+                        <div class="a-d-b-i-top" v-show="false">{{ lang.Creator }}：{{ item.uname }}</div>
 
                         <!-- <el-tooltip :content="item.detail" placement="top" effect="dark"> -->
 
                             <div class="a-d-b-i-bottom">{{ item.detail }}</div>
 
                         <!-- </el-tooltip> -->
 
@@ -59,16 +59,16 @@
 
 										justify-content: space-around;
 
 									">
 
                                 <div class="a-d-b-i-t-btn" v-if="item.userid == userid" style="margin-right: 10px;"
 
-                                    @click="deleteA(item.id)">删除</div>
 
+                                    @click="deleteA(item.id)">{{ lang.Delete }}</div>
 
                                 <div class="a-d-b-i-t-btn1" v-if="item.userid == userid" style="margin-right: 10px;"
 
-                                    @click="open2(item.id)">修改</div>
 
+                                    @click="open2(item.id)">{{ lang.Edit }}</div>
 
                                 <div class="a-d-b-i-t-btn1" @click="open(item.id)">
 
-                                    使用
 
+                                    {{ lang.Use }}
 
                                 </div>
 
                             </div>
 
                         </div>
 
                     </div>
 
-                    <div v-if="!searchDataList.length" style="text-align: center;">暂无内容</div>
 
+                    <div v-if="!searchDataList.length" style="text-align: center;">{{ lang.NoItemsFound }}</div>
 
                 </div>
 
             </div>
 
         </div>
 
@@ -96,10 +96,6 @@ export default {
 
     },
 
     data() {
 
         return {
 
-            dialogTagList: [
 
-                { id: '2', name: "社区模板" },
 
-                { id: '1', name: "我的模板" },
 
-            ],
 
             tagIndex: '2',
 
             searchDataList: [],
 
             input2: '',
 
@@ -107,6 +103,12 @@ export default {
 
         }
 
     },
 
     computed: {
 
+        dialogTagList() {
 
+            return [
 
+                { id: '2', name: this.lang.CommunityTemplate },
 
+                { id: '1', name: this.lang.MyTemplate },
 
+            ]
 
+        },
 
         tagname() {
 
             return this.dialogTagList.filter((item) => {
 
                 return item.id == this.tagIndex
 
@@ -147,11 +149,11 @@ export default {
 
         deleteA(id) {
 
             let _this = this
 
             _this.$confirm(
 
-                "确定删除此模板吗？",
 
-                "提示",
 
+                _this.lang.deletethistemplate,
 
+                _this.lang.tip,
 
                 {
 
-                    confirmButtonText: "确定",
 
-                    cancelButtonText: "取消",
 
+                    confirmButtonText: _this.lang.Confirm,
 
+                    cancelButtonText: _this.lang.Cancel,
 
                     type: "warning",
 
                 }
 
             )
 
@@ -163,11 +165,11 @@ export default {
 
                     _this.ajax
 
                         .post(_this.$store.state.api + "deleteTipsTemplateE", params)
 
                         .then((res) => {
 
-                            _this.$message.success("删除成功");
 
+                            _this.$message.success(_this.lang.DeleteSuccessful);
 
                             _this.getList()
 
                         })
 
                         .catch((err) => {
 
-                            _this.$message.error("网络不佳");
 
+                            _this.$message.error(_this.lang.Poorinternetconnection);
 
                             console.error(err);
 
                         });
 
                 })
 
@@ -202,7 +204,7 @@ export default {
 
                     }
 
                 })
 
                 .catch((err) => {
 
-                    this.$message.error("网络不佳");
 
+                    this.$message.error(this.lang.Poorinternetconnection);
 
                     console.error(err);
 
                 });
 
         }
 
@@ -295,8 +297,8 @@ export default {
 
 	margin-right: 3px;
 
 	cursor: pointer; */
 
     cursor: pointer;
 
-    width: 136px;
 
-    height: 32px;
 
+    width: 160px;
 
+    /* height: 32px; */
 
     display: flex;
 
     align-items: center;
 
     border-radius: 5px;
 
@@ -305,7 +307,7 @@ export default {
 
     padding: 5px;
 
     font-size: 14px;
 
     font-weight: 600;
 
-    line-height: 22px;
 
+    /* line-height: 22px; */
 
     text-align: left;
 
     margin-bottom: 20px;
 
 }

+ 10 - 3
src/components/pages/course.vue
View File 

@@ -38,11 +38,11 @@
 
               <!-- <div type="primary" @click="goToCourse2()">任务式课程</div> -->
 
               <!-- <div type="primary" @click="goToCourse()">阶段式课程</div> -->
 
               <div type="primary" @click="goToCourse4()">{{ lang.MultistageCourse }}</div>
 
+              <div type="primary" @click="goToPptEasy()" v-show="pptArrayOrg.includes(org) || pptArrayOid.includes(oid)">{{ lang.PPTmode }}</div>
 
               
               <!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5' || org == '884c5665-a453-46f3-b7b6-01d575290aa9'" -->
 
               <div type="primary" @click="oepnTemplate()" v-show="orgArray.includes(org) || oidArray.includes(oid)">{{ lang.AIMode }}</div>
 
               <div type="primary" @click="oepnTemplate2()" v-show="orgArray.includes(org) || oidArray.includes(oid)">{{ lang.Classroommode }}</div>
 
-              <div type="primary" @click="goToPptEasy()" v-show="pptArrayOrg.includes(org) || pptArrayOid.includes(oid)">{{ lang.PPTmode }}</div>
 
               <!-- oepnTemplate2 -->
 
             </div>
 
           </button>
 
@@ -215,7 +215,7 @@
 
               <!-- v-if="item.isCourseType == 2 || groupA == 1" -->
 
               <div class="kc_t">
 
                 <span>{{ item.uname }}</span>
 
-                <span>{{ item.state == 1 ? lang.StageMode : item.state == 2 ? lang.TaskMode :  item.state == 3 ? lang.MinimalMode : item.state == 6 ? lang.ClassMode : lang.AIMode }}</span>
 
+                <span>{{ item.state == 1 ? lang.StageMode : item.state == 2 ? lang.TaskMode :  item.state == 3 ? lang.MinimalMode : item.state == 6 ? lang.Classroommode : item.state == 7 ? lang.PPTmode : lang.AIMode }}</span>
 
               </div>
 
               <div class="kc_time">
 
                 <span style="color: #717C8D">{{ lang.CreationDate }}:</span>{{ item.time }}
 
@@ -2051,13 +2051,15 @@ export default {
 
 .myCourse {
 
   position: absolute;
 
   background: #3c3c3c;
 
-  width: 70px;
 
+  /* width: 70px; */
 
   height: 30px;
 
   border-radius: 5px;
 
   color: #fff;
 
   font-size: 14px;
 
   text-align: center;
 
   line-height: 30px;
 
+  padding: 0 10px;
 
+  box-sizing: border-box;
 
   top: 5px;
 
   left: 5px;
 
 }
 
@@ -2244,6 +2246,8 @@ export default {
 
   justify-content: space-evenly;
 
   align-items: flex-start;
 
   /* padding: 10px 0; */
 
+  padding-bottom: 10px;
 
+  box-sizing: border-box;
 
 }
 
 
 .all_choose {
 
@@ -2311,6 +2315,9 @@ export default {
 
   justify-content: center;
 
   align-items: center;
 
   white-space: nowrap;
 
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.05);
 
+  padding: 1px 5px;
 
+  box-sizing: border-box;
 
 }
 
 
 .isCType {

+ 1 - 1
src/components/pages/pptEasy/dialog/BilibiliSearchDialog.vue
View File 

@@ -199,7 +199,7 @@ export default {
 
           engine: "bilibiliNew",
 
           keyword: keyword,
 
           page: 1,
 
-          page_size: 20,
 
+          page_size: 50,
 
           order: this.navActive,
 
           duration: 0,
 
         }).then(response => {

+ 9 - 1
src/lang/cn.json
View File 

@@ -749,7 +749,15 @@
 
   "Putleacontent":"收起学习内容",
 
   "Expandleacontent":"展开学习内容",
 
 
-  "Menuitems":"教研室"
 
+  "Menuitems":"教研室",
 
+  "TemplateLibrary":"模板库",
 
+  "PleaseEnterContent":"请输入内容",
 
+  "SetTemplate":"设置模板",
 
+  "Use":"使用",
 
+  "CommunityTemplate":"社区模板",
 
+  "MyTemplate":"我的模板",
 
+  "Creator":"创建人",
 
+  "deletethistemplate":"确定删除此模板吗？"

+ 9 - 1
src/lang/en.json
View File 

@@ -748,7 +748,15 @@
 
   "Expandleacontent": "Expand Learning Content",
 
 
   "Menuitems":"Department",
 
-  "Norecordsfound":"No records found"
 
+  "Norecordsfound":"No records found",
 
+  "TemplateLibrary":"Template Library",
 
+  "PleaseEnterContent":"Please enter content",
 
+  "SetTemplate":"Set Template",
 
+  "Use":"Use",
 
+  "CommunityTemplate":"Community Template",
 
+  "MyTemplate":"My Template",
 
+  "Creator":"Creator",
 
+  "deletethistemplate":"Are you sure to delete this template?"

+ 9 - 1
src/lang/hk.json
View File 

@@ -749,7 +749,15 @@
 
   "Expandleacontent": "展開學習內容",
 
 
 
-  "Menuitems":"教研室"
 
+  "Menuitems":"教研室",
 
+  "TemplateLibrary":"模板庫",
 
+  "PleaseEnterContent":"請輸入內容",
 
+  "SetTemplate":"設置模板",
 
+  "Use":"使用",
 
+  "CommunityTemplate":"社區模板",
 
+  "MyTemplate":"我的模板",
 
+  "Creator":"創建人",
 
+  "deletethistemplate":"確定刪除此模板嗎？"

Some files were not shown because too many files changed in this diff