Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-app

src/App.vue

@@ -76,4 +76,8 @@ export default {
 .show {
   display: block !important;
 }
+
+.el-scrollbar .el-scrollbar__bar {
+  opacity: 1 !important;
+}
 </style>

src/views/pocAiClassroom/chatArea2.vue

@@ -16,14 +16,14 @@ 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?muti_agent_id=90bec943-65cf-11ef-9db4-12e77c4cb76b&isPbl=false`
+			src:`https://beta.cloud.cocorobo.cn/aigpt/#/poc?muti_agent_id=90bec943-65cf-11ef-9db4-12e77c4cb76b&isPbl=false`
     };
   },
   methods: {
 
   },
   mounted() {
-		this.src = `https://beta.cloud.cocorobo.cn/aigpt/#/js?muti_agent_id=90bec943-65cf-11ef-9db4-12e77c4cb76b&isPbl=false&session_id=${this.userId}-chat`
+		this.src = `https://beta.cloud.cocorobo.cn/aigpt/#/poc?muti_agent_id=90bec943-65cf-11ef-9db4-12e77c4cb76b&isPbl=false&session_id=${this.userId}-chat`
     console.log("聊聊天")
   }
 };

src/views/pocAiClassroom/index.vue

@@ -697,21 +697,56 @@ export default {
 		},
 		getFirstEnterStatus(){
 			let data = window.localStorage.getItem('showDialog');
+			let first = window.sessionStorage.getItem('firstEnter');
 			if(data){
 				data = JSON.parse(data)
 				if(data.type==1){
-					if((new Date().getTime()-data.time)<=(1000*60)){
-						return window.localStorage.removeItem('showDialog')
-					};
-					this.dialogMessage = `同學仔，歡迎返嚟！請問你想要繼續學習，定係想同我傾吓偈呢？`
+					// if((new Date().getTime()-data.time)<=(1000*60)){
+					// 	return window.localStorage.removeItem('showDialog')
+					// };
+					let msg = `同學仔，歡迎返嚟！請問你想要繼續學習，定係想同我傾吓偈呢？`
+					if(!first || first!=this.userId){
+						window.sessionStorage.setItem('firstEnter',this.userId)
+						let index = 0;
+						let timer = setInterval(()=>{
+							if(index<msg.length){
+								this.dialogMessage+= msg[index];
+								index+=1;
+							}else{
+								clearInterval(timer);
+								this.dialogMessage = msg
+								timer = null;
+								
+							}
+						},200)
+					}else{
+						this.dialogMessage = msg
+					}
 					this.showDialog = true;
+					return window.localStorage.removeItem('showDialog')
 				}else if(data.type==2){
-					if((new Date().getTime()-data.time)<=(1000*60)){
-						return window.localStorage.removeItem('showDialog')
-					};
-					this.dialogMessage = `同學仔，歡迎返嚟！請問你想要繼續學習，定係想同我傾吓偈呢？`
-					this.showDialog = true;
+
+					let msg = `同學仔，歡迎返嚟！請問你想要繼續學習，定係想同我傾吓偈呢？`
+					if(!first || first!=this.userId){
+						window.sessionStorage.setItem('firstEnter',this.userId)
+						let index = 0;
+						let timer = setInterval(()=>{
+							if(index<msg.length){
+								this.dialogMessage+= msg[index];
+								index+=1;
+							}else{
+								clearInterval(timer);
+								this.dialogMessage = msg
+								timer = null;
+								
+							}
+						},200)
+					}else{
+						this.dialogMessage = `同學仔，歡迎返嚟！請問你想要繼續學習，定係想同我傾吓偈呢？`
+					}
 					
+					this.showDialog = true;
+					return window.localStorage.removeItem('showDialog')
 				}
 				
 			}else{

src/views/pocAiClassroom/pocClass.vue

@@ -17,24 +17,24 @@ export default {
       org: this.$store.state.user.userinfo.org,
       oid: this.$store.state.user.userinfo.organizeid,
 			type:this.$route.query.type,
-			src:"https://beta.cloud.cocorobo.cn/aigpt/#/js?muti_agent_id=798c3511-6b32-11ef-8ce0-12e77c4cb76b&isPbl=false&session_id=merenduihua444"
+			src:"https://cloud.cocorobo.hk/aigpt/#/poc?muti_agent_id=798c3511-6b32-11ef-8ce0-12e77c4cb76b&isPbl=false&session_id=merenduihua444"
     };
   },
   methods: {
 		back(){
-			this.$router.go(-1)
+			this.$router.push('/pocAiClassroom')
 		}
   },
   mounted() {
     if (this.type == 1) {
 			// 2.1
 			console.log("2.1课程")
-      this.src = `https://beta.cloud.cocorobo.cn/aigpt/#/js?muti_agent_id=798c3511-6b32-11ef-8ce0-12e77c4cb76b&isPbl=false&session_id=${this.userId}-21`;
+      this.src = `https://cloud.cocorobo.hk/aigpt/#/poc?muti_agent_id=798c3511-6b32-11ef-8ce0-12e77c4cb76b&isPbl=false&session_id=${this.userId}-21`;
 			console.log("5")
     } else if (this.type == 2) {
 			//2.2
 			console.log("2.2课程")
-      this.src = `https://beta.cloud.cocorobo.cn/aigpt/#/js?muti_agent_id=a9883cc4-6c3d-11ef-8ce0-12e77c4cb76b&isPbl=false&session_id=${this.userId}-22`;
+      this.src = `https://cloud.cocorobo.hk/aigpt/#/poc?muti_agent_id=a9883cc4-6c3d-11ef-8ce0-12e77c4cb76b&isPbl=false&session_id=${this.userId}-22`;
 			console.log(3)
     }
 		window.localStorage.setItem("showDialog",JSON.stringify({type:1,time:new Date().getTime()}))

src/views/pocAiClassroom/startIndex.vue

@@ -266,13 +266,16 @@
       </div>
       <div class="pa_or_bottom">
         <span>
-          <span v-for="(item, index) in openingRemarksMessage[0]" :key="0 + '-' + index" v-text="item"></span>
+          <span v-if="typeof openingRemarksMessage[0]=='object'" v-for="(item, index) in openingRemarksMessage[0]" :key="0 + '-' + index" v-text="item"></span>
+					<span v-if="typeof openingRemarksMessage[0]!='object'" v-text="openingRemarksMessage[0]"></span>
         </span>
         <span>
-          <span v-for="(item, index) in openingRemarksMessage[1]" :key="1 + '-' + index" v-text="item"></span>
+          <span v-if="typeof openingRemarksMessage[1]=='object'" v-for="(item, index) in openingRemarksMessage[1]" :key="1 + '-' + index" v-text="item"></span>
+					<span v-if="typeof openingRemarksMessage[1]!='object'" v-text="openingRemarksMessage[1]"></span>
         </span>
         <span>
-          <span v-for="(item, index) in openingRemarksMessage[2]" :key="2 + '-' + index" v-text="item"></span>
+          <span v-if="typeof openingRemarksMessage[2]=='object'" v-for="(item, index) in openingRemarksMessage[2]" :key="2 + '-' + index" v-text="item"></span>
+					<span v-if="typeof openingRemarksMessage[2]!='object'" v-text="openingRemarksMessage[2]"></span>
         </span>
       </div>
     </div>
@@ -729,18 +732,19 @@ export default {
     },
     setOpeningRemarksMessage() {
       this.openingRemarksMessage = [[], [], []]
+			
       let timer1 = null
       let timer2 = null
       let timer3 = null
-      let openingRemarksMessage = [
+      let openingRemarksMessage1 = [
         '👋📚 親愛嘅同學，哈囉！👋',
         '我係你嘅專屬學習夥伴，希望能夠陪住你喺學習旅程中一齊進步。🚀🌟',
         '我對好多知識都有認識📚，仲有唔會厭煩嘅耐心👀，無論你係想學嘢，定係需要啲情感支持💖或者生活建議🛠，我都好樂意做你嘅聆聽者同指導者，成為你嘅最佳拍檔🧚‍♂️。'
       ]
-
-      openingRemarksMessage[0] = Array.from(openingRemarksMessage[0])
-      openingRemarksMessage[1] = Array.from(openingRemarksMessage[1])
-      openingRemarksMessage[2] = Array.from(openingRemarksMessage[2])
+			let openingRemarksMessage = [[],[],[]]
+      openingRemarksMessage[0] = Array.from(openingRemarksMessage1[0])
+      openingRemarksMessage[1] = Array.from(openingRemarksMessage1[1])
+      openingRemarksMessage[2] = Array.from(openingRemarksMessage1[2])
 
       let timer1Index = openingRemarksMessage[0].length
       let timer2Index = openingRemarksMessage[1].length
@@ -789,6 +793,7 @@ export default {
                 } else {
                   clearInterval(timer3)
                   timer3 = null
+									this.openingRemarksMessage[2] = openingRemarksMessage[2];
                   this.isAllOpeningRemarks = true
                   setTimeout(() => {
                     this.openingRemarksAllFn()
@@ -808,11 +813,11 @@ export default {
           '我係你嘅專屬學習夥伴，希望能夠陪住你喺學習旅程中一齊進步。🚀🌟',
           '我對好多知識都有認識📚，仲有唔會厭煩嘅耐心👀，無論你係想學嘢，定係需要啲情感支持💖或者生活建議🛠，我都好樂意做你嘅聆聽者同指導者，成為你嘅最佳拍檔🧚‍♂️。'
         ]
-				
       } else {
 				if(this.userInfo.userId && this.userInfo.userId==this.userId){
 					window.localStorage.setItem('showDialog',JSON.stringify({type:2,time:new Date().getTime()}))
-					return this.$router.push('/pocAiClassroom')
+					if(this.$route.name=='pocStartIndex')this.$router.push('/pocAiClassroom')
+					return 
 				}
         if (!this.showOpeningRemarks) return;
         this.showOpeningRemarks = false;