Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-student-table into beta

src/components/classRoomHelper/component/dialogArea.vue

@@ -29,17 +29,17 @@
 			<div class="d_bottom">
 				<div class="d_b_btnArea">
 					<div class="d_b_ba-item" @click.stop="choiceRole()">
-					<img style="width: 20px;" src="../../../assets/icon/course/role.png" alt="">
-					选择角色
-				</div>
+						<img style="width: 20px;" src="../../../assets/icon/course/role.png" alt="">
+						选择角色
+					</div>
 				</div>
 				<div class="d_b_inputArea">
-					<div class="d_b_tape" @click="goTape()"></div>
+					<!-- <div class="d_b_tape" @click="goTape()"></div> -->
 					<div class="d_b_input">
 						<el-input :disabled="loading" @keyup.enter.native="send()" class="d_b_i_left" v-model="text"></el-input>
-						<div class="d_b_i_right" @click="sendFile()">
+						<!-- <div class="d_b_i_right" @click="sendFile()">
 							<span></span>
-						</div>
+						</div> -->
 					</div>
 					<div class="d_b_btn" @click="send()">
 						<span></span>
@@ -53,8 +53,23 @@
 					<div>切换角色：</div>
 					<span>您希望以下哪个角色回答您的问题，请选择：</span>
 				</div>
-
-				<div class="characterBlock" v-for="(item,index) in roleList" :key="item.id" @click.stop="roleType=index">
+				<div class="choiceSelect">
+					<el-button class="option" :style="{background:sortOption == 0?'#36A9FC':'',color:sortOption==0?'#fff':''}" @click="optBtn(0)" plain>我的</el-button>
+					<el-button class="option" :style="{background:sortOption == 1?'#36A9FC':'',color:sortOption==1?'#fff':''}" @click="optBtn(1)" plain>社区</el-button>
+				</div>
+				<div class="characterBlock" v-if="sortOption==0" v-for="(item,index) in roleList" :key="item.id" @click.stop="roleType=index">
+					<div class="imgLeft">
+						<div class="img">
+							<img style="width: 100%;height: 100%;" :src="item.avatar">
+						</div>
+					</div>
+					<div class="txtRight">
+						<div class="bir">{{ item.bir }}</div>
+						<div :style="{color: '#fff',display: roleType ==index?'block':'none'  }">已选择</div>
+						<!-- <span></span> -->
+					</div>
+				</div>
+				<div class="characterBlock" v-if="sortOption==1" v-for="(item,index) in roleList2" :key="item.id" @click.stop="roleType=index">
 					<div class="imgLeft">
 						<div class="img">
 							<img style="width: 100%;height: 100%;" :src="item.avatar">
@@ -66,7 +81,7 @@
 						<!-- <span></span> -->
 					</div>
 				</div>
-				<div class="characterBlock" @click="addCharacter">
+				<!-- <div class="characterBlock" @click="addCharacter">
 					<div class="imgLeft">
 						<div class="img2">
 							<img style="width: 100%;height: 100%;" src="https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/basil_add-outline1715564539170.png">
@@ -75,7 +90,7 @@
 					<div class="txtRight">
 						<div style="color: #fff;margin-left: 5px;">添加新角色</div>
 					</div>
-				</div>
+				</div> -->
 
 				<!-- <div class="filterSubjects">
 					<div class="fs_title">筛选科目</div>
@@ -108,12 +123,21 @@
 			return{
 				cardType:0,//0-对话 1-选角色
 				text:"",
+				sortOption: 0, //切换角色 0我的 1 社区
 				subjectsList:['语文',"数学","英语","科学","信息","历史","地理","政治","生物","化学","物理","其他"],
 				subjectsType:-1,
 				rightSubjects:-1,
 				roleType:-1,
 				rightRole:-1,
 				loading:false,
+				roleList2:[
+					{id:3,avatar:require("../../../assets/icon/course/aiAvatar.png"),name:"莱昂纳多·达芬奇",bir:'我是莱昂纳多·达芬奇'},
+					{id:4,avatar:require("../../../assets/icon/course/aiAvatar.png"),name:"列文虎克",bir:'我是列文虎克'},
+					{id:5,avatar:require("../../../assets/icon/course/aiAvatar.png"),name:"詹姆斯·瓦特",bir:'我是詹姆斯·瓦特'},
+					{id:6,avatar:require("../../../assets/icon/course/aiAvatar.png"),name:"瑞秋·卡森",bir:'我是瑞秋·卡森'},
+					{id:7,avatar:require("../../../assets/icon/course/aiAvatar.png"),name:"尼古拉·特斯拉",bir:'我是尼古拉·特斯拉'},
+					{id:8,avatar:require("../../../assets/icon/course/aiAvatar.png"),name:"约翰·穆尔",bir:'我是约翰·穆尔'}
+				],
 				roleList:[
 					{id:0,avatar:require("../../../assets/icon/course/aiAvatar.png"),name:"爱因斯坦",bir:'我是爱因斯坦'},
 					{id:1,avatar:require("../../../assets/icon/course/aiAvatar.png"),name:"居里夫人",bir:'我是居里夫人'},
@@ -151,8 +175,11 @@
 			}
 		},
 		methods: {
-			addCharacter(){
-				this.$message.info("点击了添加新角色")
+			// addCharacter(){
+			// 	this.$message.info("点击了添加新角色")
+			// },
+			optBtn(val){
+				this.sortOption=val
 			},
 			choiceRole(){
 				if(this.loading)return this.$message.info("请稍等")
@@ -363,7 +390,7 @@
 .characterBlock{
 	display: flex;
 	background: rgba(54, 169, 252, 1);
-	width: 80%;
+	width: 100%;
 	height: 80px;
 	margin: 0 auto;
 	border-radius: 10px;
@@ -395,7 +422,7 @@
 	align-items: center;
 }
 .characterBlock > .txtRight > .bir{
-	width: 150px;
+	width: 180px;
 	height: 35px;
 	display: flex;
 	align-items: center;
@@ -568,7 +595,8 @@
 	box-sizing: border-box;
 	border-top: solid 1px #EDEDED;
 	display: flex;
-	justify-content: center;
+	justify-content: space-between;
+	padding-right: 10px;
 	align-items: center;
 }
 
@@ -582,17 +610,20 @@
 }
 
 .d_b_input{
-	width: 65%;
+	/* width: 75%; */
+	flex: 1;
 	height: 45px;
 	background-color: #F3F3F3;
 	border-radius: 50px;
 	margin: 0 10px;
 	display: flex;
+	overflow: hidden;
 	align-items: center;
 }
 
 .d_b_i_left{
-	width: calc(100% - 45px);
+	width: 100%;
+	line-height: 45px;
 	height: 100%;
 }
 
@@ -645,6 +676,8 @@
 	width: 100%;
 	height: 95%;
 	overflow-x: hidden;
+	box-sizing: border-box;
+	padding: 10px;
 }
 
 .choiceBottom{
@@ -661,7 +694,7 @@
 
 .choiceRoleHeader{
 	width: 100%;
-	margin: 10px;
+	/* margin: 10px; */
 	margin-bottom: 20px;
 }
 
@@ -673,7 +706,24 @@
 .choiceRoleHeader>span{
 	font-size: 14px;
 }
-
+.choiceSelect{
+	width: 100%;
+	display: flex;
+	height: 35px;
+	justify-content: flex-start;
+	align-items: center;
+	margin: 15px 0;
+}
+.choiceSelect > .option{
+	width: 80px;
+	height: 100%;
+	border-radius: 5px;
+	margin-right: 10px;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	cursor: pointer;
+}
 .filterSubjects{
 	margin: 10px;
 	width: 100%;

src/components/classRoomHelper/component/searchArea.vue

@@ -111,7 +111,7 @@
         </div>
       </div> -->
       <div class="s_b_inputArea">
-        <div class="s_b_tape" @click="goTape()"></div>
+        <!-- <div class="s_b_tape" @click="goTape()"></div> -->
         <div class="s_b_input">
           <el-input
             :disabled="loading"
@@ -119,9 +119,9 @@
             class="s_b_i_left"
             v-model="text"
           ></el-input>
-          <div class="s_b_i_right" @click="sendFile()">
+          <!-- <div class="s_b_i_right" @click="sendFile()">
             <span></span>
-          </div>
+          </div> -->
         </div>
         <div class="s_b_btn" @click="send()">
           <span></span>
@@ -386,7 +386,7 @@ https://www.bilibili.com/video/BV1ZD4y1U7H7/ `;
 
 .s_top {
   width: 100%;
-  height: calc(100% - 90px);
+  height: calc(100% - 55px);
   overflow-x: hidden;
   box-sizing: border-box;
   padding: 20px 0;
@@ -584,7 +584,7 @@ https://www.bilibili.com/video/BV1ZD4y1U7H7/ `;
 
 .s_bottom {
   width: 100%;
-  height: 90px;
+  height: 55px;
   display: flex;
   flex-direction: column;
   justify-content: space-between;
@@ -622,8 +622,9 @@ https://www.bilibili.com/video/BV1ZD4y1U7H7/ `;
   box-sizing: border-box;
   border-top: solid 1px #ededed;
   display: flex;
-  justify-content: center;
+  justify-content: space-between;
   align-items: center;
+	padding-right: 10px;
 }
 
 .s_b_tape {
@@ -636,18 +637,21 @@ https://www.bilibili.com/video/BV1ZD4y1U7H7/ `;
 }
 
 .s_b_input {
-  width: 65%;
+  /* width: 65%; */
+  flex: 1;
   height: 45px;
   background-color: #f3f3f3;
   border-radius: 50px;
   margin: 0 10px;
   display: flex;
   align-items: center;
+  overflow: hidden;
 }
 
 .s_b_i_left {
-  width: calc(100% - 45px);
-  height: 100%;
+  width: 100%;
+	line-height: 45px;
+	height: 100%;
 }
 
 .s_b_i_left >>> .el-input__inner {

src/components/classRoomHelper/component/taskArea.vue

@@ -83,12 +83,12 @@
 				<div class="t_b_ba_item" @click="sendType('扩展知识')">扩展知识</div>
 			</div>
 			<div class="t_b_inputArea">
-				<div class="t_b_tape" @click="goTape()"></div>
+				<!-- <div class="t_b_tape" @click="goTape()"></div> -->
 				<div class="t_b_input">
 					<el-input :disabled="loading" @keyup.enter.native="send()" class="t_b_i_left" v-model="text"></el-input>
-					<div class="t_b_i_right" @click="sendFile()">
+					<!-- <div class="t_b_i_right" @click="sendFile()">
 						<span></span>
-					</div>
+					</div> -->
 				</div>
 				<div class="t_b_btn" @click="send()">
 					<span></span>
@@ -580,8 +580,9 @@ b.学生可以创建一个“绿色挑战”活动，鼓励家庭成员减少垃
 	box-sizing: border-box;
 	border-top: solid 1px #EDEDED;
 	display: flex;
-	justify-content: center;
+	justify-content: space-between;
 	align-items: center;
+	padding-right: 10px;
 }
 
 .t_b_tape{
@@ -594,17 +595,21 @@ b.学生可以创建一个“绿色挑战”活动，鼓励家庭成员减少垃
 }
 
 .t_b_input{
-	width: 65%;
+	/* width: 75%; */
+	flex: 1;
 	height: 45px;
 	background-color: #F3F3F3;
 	border-radius: 50px;
 	margin: 0 10px;
 	display: flex;
+	overflow: hidden;
 	align-items: center;
 }
 
 .t_b_i_left{
-	width: calc(100% - 45px);
+	/* width: calc(100% - 45px); */
+	width: 100%;
+	line-height: 45px;
 	height: 100%;
 }