合并冲突

src/components/classRoomHelper/component/searchArea.vue

@@ -113,24 +113,11 @@
     <div class="s_bottom">
       <!-- <div class="s_b_ba-item" @click.stop="choiceRole()">选择角色</div> -->
 
-      <!-- <div class="s_b_btnArea">
+      <div class="s_b_btnArea">
         <div class="s_b_ba-item">
-          <el-checkbox
-            :disabled="loading"
-            style="display: flex;"
-            v-model="imageCheck"
-            >图片</el-checkbox
-          >
+          清空聊天记录
         </div>
-        <div class="s_b_ba-item">
-          <el-checkbox
-            :disabled="loading"
-            style="display: flex;"
-            v-model="videoCheck"
-            >视频</el-checkbox
-          >
-        </div>
-      </div> -->
+      </div>
       <div class="s_b_inputArea">
         <!-- <div class="s_b_tape" @click="goTape()"></div> -->
         <div class="s_b_input">
@@ -589,7 +576,7 @@ export default {
 
 .s_top {
   width: 100%;
-  height: calc(100% - 55px);
+  height: calc(100% - 90px);
   overflow-x: hidden;
   box-sizing: border-box;
   padding: 20px 0;
@@ -789,7 +776,7 @@ export default {
 
 .s_bottom {
   width: 100%;
-  height: 55px;
+  height: 90px;
   display: flex;
   flex-direction: column;
   justify-content: space-between;

src/components/classRoomHelper/component/taskArea.vue

@@ -11,6 +11,7 @@
         </div>
       </div>
 
+<<<<<<< HEAD
       <div class="tt_item">
         <div class="tt_i_title">
           <span>任务状态</span>
@@ -96,6 +97,85 @@
             v-model="text"
           ></el-input>
           <!-- <div class="t_b_i_right" @click="sendFile()">
+=======
+			<div class="tt_item">
+				<div class="tt_i_title">
+					<span>任务状态</span>
+					<span>学生活动中...</span>
+				</div>
+				<div class="tt_i_box">
+					<div class="tt_i_b_item">
+						<div class="tt_i_b_title">作业提交</div>
+						<div class="tt_i_b_box">
+							<div class="tt_i_b_b_item">
+								<div>提交人数</div>
+								<span>34<span>人</span></span>
+							</div>
+							<div class="tt_i_b_b_item">
+								<div>正确率</div>
+								<span>88<span>%</span></span>
+							</div>
+						</div>
+					</div>
+					<div class="tt_i_b_item">
+						<div class="tt_i_b_title">交流互动</div>
+						<div class="tt_i_b_box">
+							<div class="tt_i_b_b_item">
+								<div>参与人数</div>
+								<span>56<span>人</span></span>
+							</div>
+							<div class="tt_i_b_b_item">
+								<div>点赞数</div>
+								<span>36<span>个</span></span>
+							</div>
+							<div class="tt_i_b_b_item">
+								<div>评论数</div>
+								<span>128<span>条</span></span>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="t_top" ref="chatRef">
+			<div class="t_t_chat" v-for="(item,index) in chatList" :key="index">
+				<div class="t_t_c_user" v-if="item.role =='user'">
+					<div class="t_t_c_u_left">
+						<div class="t_t_c_u_l_content">{{item.content}}</div>
+						<div class="t_t_c_u_l_time">{{item.time}}</div>
+					</div>
+					<div class="t_t_c_u_right">
+						<span>我</span>
+					</div>
+				</div>
+				<div class="t_t_c_ai" v-if="item.role =='ai'">
+					<div class="t_t_c_a_left">
+						<span>Ai</span>
+					</div>
+					<div class="t_t_c_a_right">
+						<div class="t_t_c_a_r_content" v-loading="loading && index == chatList.length - 1" v-html="item.content"></div>
+						<div class="t_t_c_a_r_time">{{item.time}}</div>
+					</div>
+					
+				</div>
+			</div>
+			
+		</div>
+		<div class="t_bottom">
+			<div class="t_b_btnArea">
+				<!-- <div class="s_b_ba-item" @click.stop="choiceRole()">选择角色</div> -->
+				<div class="t_b_ba_item" @click="sendType('智能总结')">智能总结</div>
+				<div class="t_b_ba_item" @click="sendType('智能出题')">智能出题</div>
+				<!-- <div class="t_b_ba_item" @click="sendType('优秀标兵')">优秀标兵</div> -->
+				<div class="t_b_ba_item" @click="sendType('扩展知识')">扩展知识</div>
+				<div class="t_b_ba_item">清空聊天记录</div>
+			</div>
+			<div class="t_b_inputArea">
+				<!-- <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()">
+>>>>>>> dc05a6c7a97362978a7f97539a5f6ae3b0198930
 						<span></span>
 					</div> -->
         </div>