Halaman utama Jelajahi Bantuan
Masuk
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Berkas Masalah 0 Permintaan Tarik 0 Wiki
Jelajahi Sumber

Merge branch 'beta'

SanHQin 1 bulan lalu
induk
6e993b4f89 cb8dca1b57
melakukan
d0eb01fc38
16 mengubah file dengan 34 tambahan dan 17 penghapusan
Unified View Tampilkan Statistik Diff
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.1d4464e33d72d25bc04f3c6cf7ca6350.css
  3. 0 0
      dist/static/css/app.1d4464e33d72d25bc04f3c6cf7ca6350.css.map
  4. 0 0
      dist/static/css/workPage.e8f5ed26834f63dd8ee0684619c99be4.css
  5. 0 0
      dist/static/css/workPage.e8f5ed26834f63dd8ee0684619c99be4.css.map
  6. 0 0
      dist/static/js/app.1f0dbe0072bd7348519a.js
  7. 0 0
      dist/static/js/app.1f0dbe0072bd7348519a.js.map
  8. 0 0
      dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map
  9. 0 0
      dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map
  10. 0 0
      dist/static/js/workPage.4133a6b7c8dc139d675a.js
  11. 0 0
      dist/static/js/workPage.4133a6b7c8dc139d675a.js.map
  12. 0 0
      dist/static/js/workPage.86f09b6ea5607414d78b.js
  13. 0 0
      dist/static/js/workPage.86f09b6ea5607414d78b.js.map
  14. 1 1
      dist/workPage.html
  15. 19 14
      src/components/pages/studentManageNew/component/table.vue
  16. 13 1
      src/components/pages/workPage/components/questionsAndAnswers.vue

+ 1 - 1
dist/index.html
Tampilan Berkas 

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

File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/css/app.1d4464e33d72d25bc04f3c6cf7ca6350.css


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


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/css/workPage.e8f5ed26834f63dd8ee0684619c99be4.css


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/css/workPage.e8f5ed26834f63dd8ee0684619c99be4.css.map


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.1f0dbe0072bd7348519a.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.1f0dbe0072bd7348519a.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


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/workPage.4133a6b7c8dc139d675a.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/workPage.4133a6b7c8dc139d675a.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/workPage.86f09b6ea5607414d78b.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/workPage.86f09b6ea5607414d78b.js.map


+ 1 - 1
dist/workPage.html
Tampilan Berkas 

@@ -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.63dae65d2c64f60967d9c4d585b9d712.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.7e4b52d86fde7f24e41c.js></script><script type=text/javascript src=./static/js/workPage.86f09b6ea5607414d78b.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.e8f5ed26834f63dd8ee0684619c99be4.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.7e4b52d86fde7f24e41c.js></script><script type=text/javascript src=./static/js/workPage.4133a6b7c8dc139d675a.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {
 
     document.documentElement.addEventListener("touchstart", function (event) {

+ 19 - 14
src/components/pages/studentManageNew/component/table.vue
Tampilan Berkas 

@@ -183,7 +183,7 @@
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
-    <div class="tabList" v-loading="isLoading">
 
+    <div class="tabList" v-loading="boxType == 0 ? tab0Loading : boxType == 1 ? tab1Loading : boxType == 2 ? tab2Loading : false">
 
       <el-table
 
       <el-table
 
         :data="tableDataList"
 
         :data="tableDataList"
 
         ref="tableData"
 
         ref="tableData"
 
@@ -687,6 +687,9 @@ export default {
 
       popBoxdia: false,
 
       popBoxdia: false,
 
       insort: 0,
 
       insort: 0,
 
       EditStubox: "",
 
       EditStubox: "",
 
+      tab0Loading: false,
 
+      tab1Loading: false,
 
+      tab2Loading: false,
 
 
 
       delClaid: "",
 
       delClaid: "",
 
       delClaidtype: "",
 
       delClaidtype: "",
 
@@ -790,7 +793,7 @@ export default {
 
     },
 
     },
 
     stuClalist() {
 
     stuClalist() {
 
       return function(data, val) {
 
       return function(data, val) {
 
-        // console.log(data, "data");
 
+        // console.log(data, "data"); 
         if (data.length == 0) {
 
         if (data.length == 0) {
 
           return [];
 
           return [];
 
         }
 
         }
 
@@ -1474,7 +1477,7 @@ export default {
 
           this.cascaderDataPath = [];
 
           this.cascaderDataPath = [];
 
         })
 
         })
 
         .catch(err => {
 
         .catch(err => {
 
-          this.isLoading = false;
 
+          // this.isLoading = false;
 
           this.$message({
 
           this.$message({
 
             message: this.lang.Modificationfailed,
 
             message: this.lang.Modificationfailed,
 
             type: "error"
 
             type: "error"
 
@@ -1593,7 +1596,7 @@ export default {
 
       }
 
       }
 
     },
 
     },
 
     getStudent() {
 
     getStudent() {
 
-      this.isLoading = true;
 
+      this.tab0Loading = true;
 
       this.tableColumns = [];
 
       this.tableColumns = [];
 
       this.tableColumns = this.studentColumns;
 
       this.tableColumns = this.studentColumns;
 
       let params = {
 
       let params = {
 
@@ -1604,7 +1607,7 @@ export default {
 
       this.ajax
 
       this.ajax
 
         .get(this.$store.state.api + "selectclaStu", params)
 
         .get(this.$store.state.api + "selectclaStu", params)
 
         .then(res => {
 
         .then(res => {
 
-          this.isLoading = false;
 
+          this.tab0Loading = false;
 
           let box1 = res.data[0];
 
           let box1 = res.data[0];
 
           box1.forEach(e => {
 
           box1.forEach(e => {
 
             let kk = [];
 
             let kk = [];
 
@@ -1625,13 +1628,13 @@ export default {
 
           );
 
           );
 
         })
 
         })
 
         .catch(err => {
 
         .catch(err => {
 
-          this.isLoading = false;
 
+          this.tab0Loading = false;
 
           console.error(err);
 
           console.error(err);
 
         });
 
         });
 
     },
 
     },
 
     // 获取兴趣班
 
     // 获取兴趣班
 
     getInterestClass() {
 
     getInterestClass() {
 
-      this.isLoading = true;
 
+      this.tab1Loading = true;
 
       this.tableColumns = this.tableInterestClaColumns;
 
       this.tableColumns = this.tableInterestClaColumns;
 
       let params = {
 
       let params = {
 
         oid: this.oid,
 
         oid: this.oid,
 
@@ -1645,18 +1648,18 @@ export default {
 
       this.ajax
 
       this.ajax
 
         .get(this.$store.state.api + "selectInterestcla", params)
 
         .get(this.$store.state.api + "selectInterestcla", params)
 
         .then(res => {
 
         .then(res => {
 
-          this.isLoading = false;
 
+          this.tab1Loading = false;
 
           this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
 
           this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
 
           this.interestTableData = res.data[0];
 
           this.interestTableData = res.data[0];
 
         })
 
         })
 
         .catch(err => {
 
         .catch(err => {
 
-          this.isLoading = false;
 
+          this.tab1Loading = false;
 
           console.error(err);
 
           console.error(err);
 
         });
 
         });
 
     },
 
     },
 
     // 学生管理全部学生
 
     // 学生管理全部学生
 
     getAllStudent() {
 
     getAllStudent() {
 
-      this.isLoading = true;
 
+      this.tab2Loading = true;
 
       this.cancelAllSelection();
 
       this.cancelAllSelection();
 
       this.tableColumns = this.studentColumns;
 
       this.tableColumns = this.studentColumns;
 
       let params = {
 
       let params = {
 
@@ -1670,7 +1673,7 @@ export default {
 
       this.ajax
 
       this.ajax
 
         .get(this.$store.state.api + "selectStudentManagesrt", params)
 
         .get(this.$store.state.api + "selectStudentManagesrt", params)
 
         .then(res => {
 
         .then(res => {
 
-          this.isLoading = false;
 
+          this.tab2Loading = false;
 
           this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
 
           this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
 
           let box1 = res.data[0];
 
           let box1 = res.data[0];
 
           box1.forEach(e => {
 
           box1.forEach(e => {
 
@@ -1688,7 +1691,7 @@ export default {
 
           this.allTableData = res.data[0];
 
           this.allTableData = res.data[0];
 
         })
 
         })
 
         .catch(err => {
 
         .catch(err => {
 
-          this.isLoading = false;
 
+          this.tab2Loading = false;
 
           console.error(err);
 
           console.error(err);
 
         });
 
         });
 
     },
 
     },
 
@@ -1940,13 +1943,15 @@ export default {
 
   flex-wrap: wrap;
 
   flex-wrap: wrap;
 
   align-items: center;
 
   align-items: center;
 
   gap: 10px;
 
   gap: 10px;
 
-  height: 30px;
 
-  line-height: 30px;
 
+  /* height: 30px; */
 
+  /* line-height: 30px; */
 
 }
 
 }
 
 .cla_span {
 
 .cla_span {
 
   background: #e8f3ff;
 
   background: #e8f3ff;
 
   color: #0052d9;
 
   color: #0052d9;
 
   padding: 0px 25px;
 
   padding: 0px 25px;
 
+  height: 30px;
 
+  line-height: 30px;
 
   border-radius: 5px;
 
   border-radius: 5px;
 
   box-sizing: border-box;
 
   box-sizing: border-box;
 
 }
 
 }

+ 13 - 1
src/components/pages/workPage/components/questionsAndAnswers.vue
Tampilan Berkas 

@@ -155,7 +155,19 @@ export default {
 
       iframe.contentWindow.ConversationTranscriber();
 
       iframe.contentWindow.ConversationTranscriber();
 
       this.recordObj.status = "1"
 
       this.recordObj.status = "1"
 
       this.recordObj.startTime = new Date().getTime();
 
       this.recordObj.startTime = new Date().getTime();
 
-
 
+      setTimeout(()=>{
 
+        navigator.permissions && navigator.permissions.query({ name: 'microphone' }).then(permissionStatus => {
 
+        if (permissionStatus.state !== "granted") {
 
+          // 没有开启录音权限，直接确定停止录音
 
+          this.recordObj.status = "0";
 
+          this.recordObj.loading = false;
 
+          iframe.contentWindow.onSessionStopped = null;
 
+          iframe.contentWindow.window.onRecognizedResult = null;
 
+          this.$message.success(this.lang.ssNoPermStop);
 
+          return;
 
+        }
 
+      })
 
+      },2000)
 
     },
 
     },
 
     stopRecord() {
 
     stopRecord() {
 
       console.log("测试测试")
 
       console.log("测试测试")

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