Merge branch 'master' into HK

src/router/router.config.js

@@ -220,7 +220,7 @@ export const constantRouterMap = [
   {
     path: '/pocAiChat',
     name: 'pocAiChat',
-    component: () => import('@/views/pocAiClassroom/chatArea.vue'),
+    component: () => import('@/views/pocAiClassroom/chatArea2.vue'),
     meta: {
       title: '聊聊天',
       keepAlive: false

src/views/pocAiClassroom/chatArea2.vue

@@ -0,0 +1,44 @@
+<template>
+  <div class="chatArea">
+		<bar :backPage="1" tit="聊聊天"/>
+		<iframe ref="iframeRef" class="ca_iframe" allow="camera *; microphone *;display-capture;midi;encrypted-media;" :src="src"></iframe>
+  </div>
+</template>
+
+<script>
+import bar from './component/bar.vue';
+export default {
+	components:{
+		bar
+	},
+  data() {
+    return {
+			userId: this.$store.state.user.userinfo.userid,
+      org: this.$store.state.user.userinfo.org,
+      oid: this.$store.state.user.userinfo.organizeid,
+			src:"https://beta.cloud.cocorobo.cn/aigpt/#/js?active_role=0"
+    };
+  },
+  methods: {
+
+  },
+  mounted() {
+    
+  }
+};
+</script>
+
+<style scoped>
+.chatArea{
+	width: 100vw;
+	height: 100vh;
+	box-sizing: border-box;
+	padding-top: 40px;
+	overflow: hidden;
+}
+
+.ca_iframe{
+	width: 100%;
+	height: 100%;
+}
+</style>

src/views/pocAiClassroom/pocClass.vue

@@ -16,7 +16,7 @@ export default {
 			userId: this.$store.state.user.userinfo.userid,
       org: this.$store.state.user.userinfo.org,
       oid: this.$store.state.user.userinfo.organizeid,
-			src:"https://beta.cloud.cocorobo.cn/aigpt/#/js?active_role=0"
+			src:"https://beta.cloud.cocorobo.cn/aigpt/#/js?active_role=3"
     };
   },
   methods: {