dusenyao vor 3 Jahren
Ursprung
Commit
66c8aa9650
4 geänderte Dateien mit 14 neuen und 395 gelöschten Zeilen
  1. 6 393
      package-lock.json
  2. 1 1
      package.json
  3. 1 1
      src/views/live/teacher/group.js
  4. 6 0
      src/views/live/teacher/group.vue

+ 6 - 393
package-lock.json

@@ -8,10 +8,9 @@
       "name": "gcls_sys_learn_web",
       "version": "0.1.0",
       "dependencies": {
-        "ailp-book-question-ui": "file:../ailp-book-question-ui-0.1.1.tgz",
+        "ailp-book-question-ui": "file:../ailp-book-question-ui-0.1.0.tgz",
         "awe-dnd": "^0.3.4",
         "axios": "^0.21.1",
-        "book-ui": "file:../book-ui-0.1.9.tgz",
         "core-js": "^3.10.1",
         "element-ui": "^2.15.1",
         "gcls-book-question-ui": "file:../gcls-book-question-ui-0.1.0.tgz",
@@ -4118,9 +4117,9 @@
       }
     },
     "node_modules/ailp-book-question-ui": {
-      "version": "0.1.1",
-      "resolved": "file:../ailp-book-question-ui-0.1.1.tgz",
-      "integrity": "sha512-8snSAD7U2YqlRUWw0NS7smimxC/hL3n1MTgUENFH/Rf0qVV0VTwO+hvqR6q/bGDCDbZZtWztAHnxnwIKruo28w==",
+      "version": "0.1.0",
+      "resolved": "file:../ailp-book-question-ui-0.1.0.tgz",
+      "integrity": "sha512-IsEBARnDEV+51ErizOEp8110yW46L96q+BtjC3CFl8Mxp0DuQRzMU9WVwK9JqaKT0khpBsafdPxXBjfg6anPWg==",
       "dependencies": {
         "awe-dnd": "^0.3.4",
         "axios": "^0.21.1",
@@ -5834,221 +5833,6 @@
       "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
       "dev": true
     },
-    "node_modules/book-ui": {
-      "version": "0.1.9",
-      "resolved": "file:../book-ui-0.1.9.tgz",
-      "integrity": "sha512-OFebDbxRJWBZ3u/X63W0sj4BntzLfajLBsPOCMEk269/0uVFprXfpQJenYXx3i8sse79qzpMSsUNmMOgmLeNRg==",
-      "dependencies": {
-        "awe-dnd": "^0.3.4",
-        "axios": "^0.21.1",
-        "core-js": "^3.6.5",
-        "element-ui": "^2.15.1",
-        "hanzi-writer": "^3.1.0",
-        "js-audio-recorder": "^1.0.7",
-        "js-cookie": "^3.0.1",
-        "less-loader": "^5.0.0",
-        "node-sass": "^4.14.1",
-        "sass-loader": "^7.1.0",
-        "seededshuffle": "^0.2.0",
-        "vue": "^2.6.11",
-        "vue-esign": "^1.0.5",
-        "vue-pdf": "^4.3.0",
-        "vuedraggable": "^2.24.3"
-      }
-    },
-    "node_modules/book-ui/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/book-ui/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/book-ui/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/book-ui/node_modules/cross-spawn": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
-      "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
-      "dependencies": {
-        "lru-cache": "^4.0.1",
-        "which": "^1.2.9"
-      }
-    },
-    "node_modules/book-ui/node_modules/get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/book-ui/node_modules/js-cookie": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.1.tgz",
-      "integrity": "sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/book-ui/node_modules/lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-      "dependencies": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
-      }
-    },
-    "node_modules/book-ui/node_modules/node-gyp": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
-      "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
-      "dependencies": {
-        "fstream": "^1.0.0",
-        "glob": "^7.0.3",
-        "graceful-fs": "^4.1.2",
-        "mkdirp": "^0.5.0",
-        "nopt": "2 || 3",
-        "npmlog": "0 || 1 || 2 || 3 || 4",
-        "osenv": "0",
-        "request": "^2.87.0",
-        "rimraf": "2",
-        "semver": "~5.3.0",
-        "tar": "^2.0.0",
-        "which": "1"
-      },
-      "bin": {
-        "node-gyp": "bin/node-gyp.js"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/book-ui/node_modules/node-gyp/node_modules/semver": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-      "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/book-ui/node_modules/node-sass": {
-      "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
-      "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
-      "hasInstallScript": true,
-      "dependencies": {
-        "async-foreach": "^0.1.3",
-        "chalk": "^1.1.1",
-        "cross-spawn": "^3.0.0",
-        "gaze": "^1.0.0",
-        "get-stdin": "^4.0.1",
-        "glob": "^7.0.3",
-        "in-publish": "^2.0.0",
-        "lodash": "^4.17.15",
-        "meow": "^3.7.0",
-        "mkdirp": "^0.5.1",
-        "nan": "^2.13.2",
-        "node-gyp": "^3.8.0",
-        "npmlog": "^4.0.0",
-        "request": "^2.88.0",
-        "sass-graph": "2.2.5",
-        "stdout-stream": "^1.4.0",
-        "true-case-path": "^1.0.2"
-      },
-      "bin": {
-        "node-sass": "bin/node-sass"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/book-ui/node_modules/nopt": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-      "dependencies": {
-        "abbrev": "1"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      }
-    },
-    "node_modules/book-ui/node_modules/sass-loader": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.3.1.tgz",
-      "integrity": "sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==",
-      "dependencies": {
-        "clone-deep": "^4.0.1",
-        "loader-utils": "^1.0.1",
-        "neo-async": "^2.5.0",
-        "pify": "^4.0.1",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">= 6.9.0"
-      },
-      "peerDependencies": {
-        "webpack": "^3.0.0 || ^4.0.0"
-      }
-    },
-    "node_modules/book-ui/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/book-ui/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/book-ui/node_modules/tar": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
-      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
-      "deprecated": "This version of tar is no longer supported, and will not receive security updates. Please upgrade asap.",
-      "dependencies": {
-        "block-stream": "*",
-        "fstream": "^1.0.12",
-        "inherits": "2"
-      }
-    },
-    "node_modules/book-ui/node_modules/yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
-    },
     "node_modules/boolbase": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/boolbase/download/boolbase-1.0.0.tgz",
@@ -26695,8 +26479,8 @@
       }
     },
     "ailp-book-question-ui": {
-      "version": "file:..\\ailp-book-question-ui-0.1.1.tgz",
-      "integrity": "sha512-8snSAD7U2YqlRUWw0NS7smimxC/hL3n1MTgUENFH/Rf0qVV0VTwO+hvqR6q/bGDCDbZZtWztAHnxnwIKruo28w==",
+      "version": "file:..\\ailp-book-question-ui-0.1.0.tgz",
+      "integrity": "sha512-IsEBARnDEV+51ErizOEp8110yW46L96q+BtjC3CFl8Mxp0DuQRzMU9WVwK9JqaKT0khpBsafdPxXBjfg6anPWg==",
       "requires": {
         "awe-dnd": "^0.3.4",
         "axios": "^0.21.1",
@@ -28063,177 +27847,6 @@
         }
       }
     },
-    "book-ui": {
-      "version": "file:..\\book-ui-0.1.9.tgz",
-      "integrity": "sha512-OFebDbxRJWBZ3u/X63W0sj4BntzLfajLBsPOCMEk269/0uVFprXfpQJenYXx3i8sse79qzpMSsUNmMOgmLeNRg==",
-      "requires": {
-        "awe-dnd": "^0.3.4",
-        "axios": "^0.21.1",
-        "core-js": "^3.6.5",
-        "element-ui": "^2.15.1",
-        "hanzi-writer": "^3.1.0",
-        "js-audio-recorder": "^1.0.7",
-        "js-cookie": "^3.0.1",
-        "less-loader": "^5.0.0",
-        "node-sass": "^4.14.1",
-        "sass-loader": "^7.1.0",
-        "seededshuffle": "^0.2.0",
-        "vue": "^2.6.11",
-        "vue-esign": "^1.0.5",
-        "vue-pdf": "^4.3.0",
-        "vuedraggable": "^2.24.3"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "cross-spawn": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
-          "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "which": "^1.2.9"
-          }
-        },
-        "get-stdin": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-          "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
-        },
-        "js-cookie": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.1.tgz",
-          "integrity": "sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw=="
-        },
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
-        "node-gyp": {
-          "version": "3.8.0",
-          "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
-          "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
-          "requires": {
-            "fstream": "^1.0.0",
-            "glob": "^7.0.3",
-            "graceful-fs": "^4.1.2",
-            "mkdirp": "^0.5.0",
-            "nopt": "2 || 3",
-            "npmlog": "0 || 1 || 2 || 3 || 4",
-            "osenv": "0",
-            "request": "^2.87.0",
-            "rimraf": "2",
-            "semver": "~5.3.0",
-            "tar": "^2.0.0",
-            "which": "1"
-          },
-          "dependencies": {
-            "semver": {
-              "version": "5.3.0",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-              "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
-            }
-          }
-        },
-        "node-sass": {
-          "version": "4.14.1",
-          "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
-          "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
-          "requires": {
-            "async-foreach": "^0.1.3",
-            "chalk": "^1.1.1",
-            "cross-spawn": "^3.0.0",
-            "gaze": "^1.0.0",
-            "get-stdin": "^4.0.1",
-            "glob": "^7.0.3",
-            "in-publish": "^2.0.0",
-            "lodash": "^4.17.15",
-            "meow": "^3.7.0",
-            "mkdirp": "^0.5.1",
-            "nan": "^2.13.2",
-            "node-gyp": "^3.8.0",
-            "npmlog": "^4.0.0",
-            "request": "^2.88.0",
-            "sass-graph": "2.2.5",
-            "stdout-stream": "^1.4.0",
-            "true-case-path": "^1.0.2"
-          }
-        },
-        "nopt": {
-          "version": "3.0.6",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-          "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-          "requires": {
-            "abbrev": "1"
-          }
-        },
-        "sass-loader": {
-          "version": "7.3.1",
-          "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.3.1.tgz",
-          "integrity": "sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==",
-          "requires": {
-            "clone-deep": "^4.0.1",
-            "loader-utils": "^1.0.1",
-            "neo-async": "^2.5.0",
-            "pify": "^4.0.1",
-            "semver": "^6.3.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
-        },
-        "tar": {
-          "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
-          "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
-          "requires": {
-            "block-stream": "*",
-            "fstream": "^1.0.12",
-            "inherits": "2"
-          }
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
-        }
-      }
-    },
     "boolbase": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/boolbase/download/boolbase-1.0.0.tgz",

+ 1 - 1
package.json

@@ -19,7 +19,7 @@
     "core-js": "^3.10.1",
     "element-ui": "^2.15.1",
     "gcls-book-question-ui": "file:../gcls-book-question-ui-0.1.0.tgz",
-    "book-ui": "file:../book-ui-0.1.9.tgz",
+    "book-ui": "file:../book-ui-0.1.11.tgz",
     "jquery": "^3.6.0",
     "js-cookie": "^2.2.1",
     "normalize.css": "^8.0.1",

+ 1 - 1
src/views/live/teacher/group.js

@@ -1,6 +1,6 @@
 import { Message } from 'element-ui';
 import { rtc, updateMcResult, createScript, createData } from '@/views/live/common';
-export { initSDK, sendMsg, closeVideo, roomUpdate, chatRoll } from '@/views/live/common';
+export { initSDK, sendMsg, closeVideo, roomUpdate, chatRoll, reconnection } from '@/views/live/common';
 
 /**
  * 推送本地流

+ 6 - 0
src/views/live/teacher/group.vue

@@ -6,6 +6,7 @@
         <div class="live-title-name">{{ roomInfo.cs_item_name }} {{ roomInfo.task_name }}</div>
         <div>
           <el-button @click="stopGroup">结束群组讨论</el-button>
+          <el-button v-show="isGroup" @click="reconnection">重连</el-button>
           <el-button v-show="isGroup && !isAudit" @click="setCurGroupToExample_Teacher">设为示范讨论组</el-button>
           <el-button v-show="isGroup && !isAudit" @click="exitCurGroup_Teacher">退出小组讨论</el-button>
         </div>
@@ -256,6 +257,7 @@ export default {
         }).then(({ room_id, is_example, group_id, teacher: { session_id }, student_list, audience_list }) => {
           this.room_id = room_id;
           this.session_id = session_id;
+          this.noStreamList = student_list;
           this.student_list = student_list;
           common.downloadWebSDK(this);
           this.isGroup = true;
@@ -300,6 +302,10 @@ export default {
       this.msg = '';
     },
 
+    reconnection() {
+      common.reconnection();
+    },
+
     // 给所有小组发送消息
     sendAllMsg() {
       this.$prompt(' ', '给所有小组发送群消息', {