diff --git a/.gitignore b/.gitignore index fc004645..874e8730 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,8 @@ pnpm-debug.log* *.ntvs* *.njsproj *.sln -*.sw? \ No newline at end of file +*.sw? +node_modules +node_modules +node_modules +node_modules diff --git a/package-lock.json b/package-lock.json index 4a2c8e5e..0183e793 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2044,49 +2044,6 @@ "webpack-merge": "^5.7.3", "webpack-virtual-modules": "^0.4.2", "whatwg-fetch": "^3.6.2" - }, - "dependencies": { - "@vue/vue-loader-v15": { - "version": "npm:vue-loader@15.11.1", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.11.1.tgz", - "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==", - "dev": true, - "requires": { - "@vue/component-compiler-utils": "^3.1.0", - "hash-sum": "^1.0.2", - "loader-utils": "^1.1.0", - "vue-hot-reload-api": "^2.3.0", - "vue-style-loader": "^4.1.0" - }, - "dependencies": { - "hash-sum": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", - "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==", - "dev": true - } - } - }, - "json5": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", - "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", - "dev": true, - "requires": { - "minimist": "^1.2.0" - } - }, - "loader-utils": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", - "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" - } - } } }, "@vue/cli-shared-utils": { @@ -2251,6 +2208,47 @@ } } }, + "@vue/vue-loader-v15": { + "version": "npm:vue-loader@15.11.1", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.11.1.tgz", + "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==", + "dev": true, + "requires": { + "@vue/component-compiler-utils": "^3.1.0", + "hash-sum": "^1.0.2", + "loader-utils": "^1.1.0", + "vue-hot-reload-api": "^2.3.0", + "vue-style-loader": "^4.1.0" + }, + "dependencies": { + "hash-sum": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", + "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==", + "dev": true + }, + "json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + }, + "loader-utils": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" + } + } + } + }, "@vue/web-component-wrapper": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz", diff --git a/src/api/room.js b/src/api/room.js index ce3717bd..4fb4a2f5 100644 --- a/src/api/room.js +++ b/src/api/room.js @@ -1,6 +1,6 @@ import axios from "@/utils/request"; let baseUrlZC = 'https://api.xayunmei.com/zhongcaiapi'; -let baseUrl = 'https://api.xayunmei.com/tiaojieapitest'; +let baseUrl = 'https://api.xayunmei.com/tiaojieapi'; // let baseUrl = 'http://121.40.189.20:6001'; // 开始云端录制 export function startVideo(data) { diff --git a/src/router/index.js b/src/router/index.js index 1ec92aa5..3fcc9a59 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -6,7 +6,7 @@ const routes = [ { path: "/", component: () => import("../views/home.vue"), - redirect:'home' + redirect: 'home' }, { path: "/home", @@ -16,17 +16,29 @@ const routes = [ }, { - path:"/room", - name:"Room", - component:()=>import("../views/room.vue"), - meta:{title:"房间"} + path: "/room", + name: "Room", + component: () => import("../views/room.vue"), + meta: { title: "房间" } }, { - path:"/onlyOffice", - name:"onlyOffice", - component:()=>import("../views/onlyOffice.vue"), - meta:{title:"在线文档"} - } + path: "/onlyOffice", + name: "onlyOffice", + component: () => import("../views/onlyOffice.vue"), + meta: { title: "在线文档" } + }, + { + path: "/test", + name: "test", + component: () => import("../views/test.vue"), + meta: { title: "test" } + }, + { + path: "/testRoom", + name: "testRoom", + component: () => import("../views/testRoom.vue"), + meta: { title: "testRoom" } + } ] const router = new VueRouter({ diff --git a/src/views/components/roomFooter.vue b/src/views/components/roomFooter.vue index 8618ad2d..70a09402 100644 --- a/src/views/components/roomFooter.vue +++ b/src/views/components/roomFooter.vue @@ -1,176 +1,204 @@ + + + async startVideoFn() { + await startVideo({ + caseId: this.caseId, + roomId: this.roomId, + }).then((res) => { + this.taskId = res.data.taskId; + console.log(res.data.taskId, "pppppp"); + }); + }, + stopVideoFn() { + stopVideo(this.taskId).then((res) => { + console.log(res, "KKKKKK"); + }); + }, + }, + async mounted() { + this.roomId = this.$route.query.roomId; + this.caseId = this.$route.query.caseId; + let roleFlag = this.$route.query.flag; + this.roleFlag = roleFlag; + if (roleFlag) { + await this.startVideoFn(); + } + // setTimeout(() => { + // console.log(this.roomId, "房间号房间哈房间号房间哈房间号"); + // }); + }, +}; + \ No newline at end of file +.roomFooter { + width: 100%; + height: 100%; + display: flex; + flex-direction: row-reverse; +} + +.mic, +.video, +.sharing, +.outRoom { + cursor: pointer; + width: 10%; + height: 100%; + display: flex; + align-items: center; + justify-content: center; +} + +.operation { + width: 90%; + height: 100%; + display: flex; + align-items: center; +} + +.iconImg { + width: 30%; + height: 60%; +} + +.title { + color: aliceblue; +} + +.empty { + width: 60%; + height: 100%; +} + +.mic, +.video, +.sharing { + width: 60px; + height: 60px; + margin-left: 20px; +} + +.micImg, +.videoImg, +.sharImg { + width: 40px; + height: 40px; +} + \ No newline at end of file diff --git a/src/views/room.vue b/src/views/room.vue index ca85dd2e..87da1efe 100644 --- a/src/views/room.vue +++ b/src/views/room.vue @@ -1,39 +1,43 @@ + \ No newline at end of file diff --git a/src/views/testRoom.vue b/src/views/testRoom.vue new file mode 100644 index 00000000..5ada3469 --- /dev/null +++ b/src/views/testRoom.vue @@ -0,0 +1,854 @@ + + + + + + + + \ No newline at end of file