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

Merge branch 'beta'

SanHQin 2 weeks ago
parent
97d054b99e 39fa1ead32
commit
b9490d410c
15 changed files with 41 additions and 14 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.9cc0c4da63ea6ccab8cc4265c4daaf51.css
  3. 0 0
      dist/static/css/app.9cc0c4da63ea6ccab8cc4265c4daaf51.css.map
  4. 0 0
      dist/static/css/app.befe4f1ca0b69962b53f4d6cd8d00070.css
  5. 0 0
      dist/static/css/app.befe4f1ca0b69962b53f4d6cd8d00070.css.map
  6. 0 0
      dist/static/js/app.0b42c23f332bd041df59.js
  7. 0 0
      dist/static/js/app.0b42c23f332bd041df59.js.map
  8. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  9. 3 0
      src/assets/icon/course/refresh-2.svg
  10. 4 0
      src/common/axios.config.js
  11. 5 8
      src/components/index.vue
  12. 25 2
      src/components/pptEasyClass/index.vue
  13. 1 1
      src/lang/cn.json
  14. 1 1
      src/lang/en.json
  15. 1 1
      src/lang/hk.json

+ 1 - 1
dist/index.html
View File 

@@ -27,7 +27,7 @@
 
     html,
 
     body{
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.9cc0c4da63ea6ccab8cc4265c4daaf51.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.146c234c6d453c666231.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.befe4f1ca0b69962b53f4d6cd8d00070.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.0b42c23f332bd041df59.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.9cc0c4da63ea6ccab8cc4265c4daaf51.css


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


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


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


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


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


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


+ 3 - 0
src/assets/icon/course/refresh-2.svg
View File 

@@ -0,0 +1,3 @@
 
+<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
 
+<path d="M8.33333 0C10.3425 0 12.23 0.716666 13.705 1.96167L15.5383 0.125C15.5966 0.066628 15.6708 0.0268416 15.7516 0.0106762C15.8325 -0.00548917 15.9163 0.00269318 15.9925 0.0341877C16.0687 0.0656823 16.1338 0.119073 16.1797 0.187603C16.2255 0.256133 16.25 0.33672 16.25 0.419167V5.83333C16.25 5.88805 16.2392 5.94223 16.2183 5.99278C16.1973 6.04334 16.1667 6.08927 16.128 6.12796C16.0893 6.16665 16.0433 6.19734 15.9928 6.21828C15.9422 6.23922 15.8881 6.25 15.8333 6.25H10.4292C10.3468 6.24998 10.2663 6.22557 10.1978 6.17983C10.1294 6.1341 10.076 6.0691 10.0444 5.99304C10.0129 5.91699 10.0045 5.83328 10.0205 5.7525C10.0365 5.67172 10.076 5.59748 10.1342 5.53917L12.5233 3.14667C11.3969 2.23708 10.0049 1.71894 8.55782 1.67058C7.11077 1.62222 5.6873 2.04626 4.50261 2.87861C3.31791 3.71096 2.43639 4.90636 1.9913 6.28411C1.54621 7.66187 1.56175 9.14707 2.03556 10.5152C2.50938 11.8833 3.41572 13.06 4.61757 13.8674C5.81942 14.6748 7.25144 15.069 8.69717 14.9904C10.1429 14.9117 11.5237 14.3646 12.6309 13.4316C13.7381 12.4987 14.5115 11.2306 14.8342 9.81917C14.8568 9.71082 14.9007 9.60807 14.9635 9.5169C15.0262 9.42574 15.1065 9.34798 15.1996 9.28818C15.2928 9.22837 15.3969 9.18772 15.5059 9.16859C15.6149 9.14946 15.7266 9.15223 15.8345 9.17675C15.9425 9.20127 16.0444 9.24704 16.1345 9.31139C16.2245 9.37574 16.3008 9.45739 16.359 9.55156C16.4171 9.64573 16.4559 9.75054 16.4731 9.85987C16.4903 9.9692 16.4856 10.0809 16.4592 10.1883C16.0385 12.0288 15.0055 13.6719 13.5293 14.8488C12.0532 16.0256 10.2212 16.6666 8.33333 16.6667C3.73083 16.6667 0 12.9358 0 8.33333C0 3.73083 3.73083 0 8.33333 0Z" fill="black" fill-opacity="0.6"/>
 
+</svg>

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

@@ -3,9 +3,13 @@ import qs from "qs"
 
 axios.defaults.timeout = 900000 //响应时间
 
 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)
 
     //POST传参序列化(添加请求拦截器)
 
 axios.interceptors.request.use((config) => {
 
+    // 确保每个请求都携带cookie
 
+    config.withCredentials = true;
 
+  
     //在发送请求之前做某件事
 
     let token = sessionStorage.getItem('access_token') || "" //获取token 
     console.log(token)

+ 5 - 8
src/components/index.vue
View File 

@@ -1241,17 +1241,14 @@ export default {
 
 
 .cName {
 
   cursor: pointer;
 
-  /* margin: 0 10px 10px 0; */
 
   color: #b9b6b9;
 
-  /* min-width: 80px; */
 
-  /* width: 80px; */
 
-  flex-shrink: 0;
 
   display: flex;
 
-  align-items: center;
 
   justify-content: center;
 
-  /* white-space: nowrap; */
 
-  /* overflow: hidden;
 
-  text-overflow: ellipsis; */
 
+  align-items: center;
 
+  white-space: nowrap;
 
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.05);
 
+  padding: 1px 5px;
 
+  box-sizing: border-box;
 
 }
 
 
 .reBox {

+ 25 - 2
src/components/pptEasyClass/index.vue
View File 

@@ -34,13 +34,18 @@
 
           <div class="free-browse-switch" v-if="tType == 2">
 
             <span class="switch-label" :class="{ active: freeBrowse }">{{ freeBrowse ? '自由浏览' : '跟随模式' }}</span>
 
           </div>
 
+          <el-tooltip effect="dark" content="刷新" placement="bottom">
 
+            <div class="refresh_icon" @click="refreshCourse">
 
+                <img src="../../assets/icon/course/refresh-2.svg" />
 
+            </div>
 
+          </el-tooltip>
 
         </div>
 
         <div class="pec_h_right">
 
           <div class="pec_h_r_btnArea">
 
-            <div class="pec_h_r_btn_refresh" @click="refreshCourse">
 
+            <!-- <div class="pec_h_r_btn_refresh" @click="refreshCourse">
 
               <img src="../../assets/icon/newIcons/refresh.png" alt="" />
 
               <span>刷新</span>
 
-            </div>
 
+            </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>
 
@@ -458,4 +463,22 @@ export default {
 
   -webkit-background-clip: text;
 
   color: transparent;
 
 }
 
+
 
+.refresh_icon {
 
+  width: 40px;
 
+  height: 40px;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: center;
 
+  background-color: #fff7f5;
 
+  border-radius: 45%;
 
+  cursor: pointer;
 
+  margin-left: 15px;
 
+  padding: 0 3px;
 
+}
 
+
 
+.refresh_icon img {
 
+  width: 20px;
 
+  height: 20px;
 
+}
 
 </style>

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

@@ -219,7 +219,7 @@
 
   "ssSaveOperationFailed": "保存操作失败",
 
   "ssSummarizeCourseBrief": "总结以下内容为150字左右的课程简介：",
 
   "ssBack": "返回",
 
-  "ssOwner": "创建者",
 
+  "ssOwner": "创建者:",
 
   "ssStage2": "阶段*",
 
   "ssStudentNum": "*名学生",
 
   "ssAddOrModifyClass": "添加/修改班级",

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

@@ -219,7 +219,7 @@
 
   "ssSaveOperationFailed": "Save operation failed",
 
   "ssSummarizeCourseBrief": "Summarize the following content as a course introduction of about 150 words:",
 
   "ssBack": "Back",
 
-  "ssOwner": "Owner",
 
+  "ssOwner": "Owner:",
 
   "ssStage2": "Stage *",
 
   "ssStudentNum": "* students",
 
   "ssAddOrModifyClass": "Add/Modify Class",

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

@@ -219,7 +219,7 @@
 
   "ssSaveOperationFailed": "保存操作失敗",
 
   "ssSummarizeCourseBrief": "總結以下內容為150字左右的課程簡介：",
 
   "ssBack": "返回",
 
-  "ssOwner": "創建者",
 
+  "ssOwner": "創建者:",
 
   "ssStage2": "階段*",
 
   "ssStudentNum": "*名學生",
 
   "ssAddOrModifyClass": "添加/修改班級",

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