#

src/components/components/choseWorksDetailDialog.vue

@@ -42,10 +42,10 @@
 
                 <span>题目内容</span>
 
-                <div v-if="[45].includes(toolType) && testJsonCopy">
+                <div v-if="[45].includes(toolType) && testJson">
                   <div
                     class="s_b_m_b_i_m_choseList"
-                    v-for="(item, index) in testJsonCopy.testJson.testJson"
+                    v-for="(item, index) in testJson"
                   >
                     <div class="s_b_m_b_i_m_c_title">
                       <span>{{ index + 1 }}</span>
@@ -74,25 +74,27 @@
                   <div
                     class="s_b_m_b_i_m_c_options"
                     v-for="(item2, index2) in item.checkList"
-                    :class="{
+                  
+                  >
+                  <!-- :class="{
                       s_b_m_b_i_m_c_o_right:
                           item.type == 1
                           ? testJsonCopy.anwer[index] == index2
                           : testJsonCopy.anwer[index].includes(index2)
-                    }"
-                  >
-                  
+                    }" -->
                     <div class="s_b_m_b_i_m_c_o_btn">
                       <span
                         class="s_b_m_b_i_m_c_o_btn1"
                         v-if="item.type == 1"
                       >
-                          <span v-if="testJsonCopy.anwer[index] == index2"></span>
+                      <!-- {{testJson}} -->
+                          <!-- <span ></span> -->
+                          <!-- v-if="testJson.anwer[index] == index2" -->
                       </span>
                       <span class="s_b_m_b_i_m_c_o_btn2" v-else>
                       
-                          <span v-if="testJsonCopy.anwer[index].includes(index2)">
-                            <svg
+                          <!-- <span v-if="testJson.anwer[index].includes(index2)"> -->
+                            <!-- <svg
                               width="8"
                               height="6"
                               viewBox="0 0 8 6"
@@ -105,8 +107,8 @@
                                 d="M7.44194 0.558058C7.68602 0.802136 7.68602 1.19786 7.44194 1.44194L3.44194 5.44194C3.19786 5.68602 2.80214 5.68602 2.55806 5.44194L0.558058 3.44194C0.313981 3.19786 0.313981 2.80214 0.558058 2.55806C0.802136 2.31398 1.19786 2.31398 1.44194 2.55806L3 4.11612L6.55806 0.558058C6.80214 0.313981 7.19786 0.313981 7.44194 0.558058Z"
                                 fill="white"
                               />
-                            </svg>
-                          </span>
+                            </svg> -->
+                          <!-- </span> -->
                         
                       </span>
                     </div>
@@ -140,20 +142,21 @@
                       />
                     </svg>
 
-                    <span v-if="testJsonCopy && testJsonCopy.answerTitle">提问：{{ testJsonCopy.answerTitle }}</span>
+                    <span v-if="testJson && testJson.answerTitle">提问：</span>
                   </div>
-									<span v-if="testJsonCopy && testJsonCopy.answer" style="padding: 10px;">
-                    {{ testJsonCopy.answer }}
+                  <!-- v-if="testJsonCopy && testJsonCopy.answer"  -->
+									<span style="padding: 10px;">
+                    <!-- {{ testJsonCopy.answer }} -->
 									</span>
 								</div>
 
-								<div v-if="[41].includes(toolType)" class="s_b_m_b_i_m_selectiveMatching">
+                <div v-if="[41].includes(toolType)" class="s_b_m_b_i_m_selectiveMatching">
 									<div class="sm_left">
 										<img :src="testData.selectJson.url" alt="" @click="$hevueImgPreview(testData.selectJson.url)">
 									</div>
-									<div class="sm_right" v-if="testJsonCopy">
+									<div class="sm_right">
 										<div class="sm_right_item" v-for="(item,index) in testData.selectJson.answer">
-											<el-select v-model="testData.selectJson.answer[testJsonCopy[index]]" placeholder="请选择">
+											<el-select v-model="testData.selectJson.answer[index]" placeholder="请选择">
   			  							<el-option
   			  								v-for="(item2,index2) in testData.selectJson.select"
 													:disabled="item!==index2"
@@ -162,17 +165,15 @@
   			  								:value="index2">
 												</el-option>
 											</el-select>
-                      <!-- <span v-if="testData.selectJson.answer[index] == testJson[index]" style="color: blue;margin-left: 10px;">回答正确</span>
-                      <span v-else><span style="color: red;margin-left: 10px;">回答错误</span> 答案:{{ testData.selectJson.select[index]  }}</span> -->
 										</div>
 									</div>
 								</div>
 
-								<div v-if="[47].includes(toolType)" class="s_b_m_b_i_m_sorting">
+                <div v-if="[47].includes(toolType)" class="s_b_m_b_i_m_sorting">
 									<div class="sortingItem" v-for="(item,index) in testData.sentenceList" :key="index">
 										<div class="s_b_m_b_i_m_c_title">
-                    <span>{{ index + 1 }}</span>
-                    <svg
+                    <span></span>
+                    <!-- <svg
                       width="16"
                       height="16"
                       viewBox="0 0 16 16"
@@ -183,31 +184,63 @@
                         d="M15.3536 8.35355C15.5488 8.15829 15.5488 7.84171 15.3536 7.64645L12.1716 4.46447C11.9763 4.2692 11.6597 4.2692 11.4645 4.46447C11.2692 4.65973 11.2692 4.97631 11.4645 5.17157L14.2929 8L11.4645 10.8284C11.2692 11.0237 11.2692 11.3403 11.4645 11.5355C11.6597 11.7308 11.9763 11.7308 12.1716 11.5355L15.3536 8.35355ZM1 8.5H15V7.5H1V8.5Z"
                         fill="#3681FC"
                       />
-                    </svg>
+                    </svg> -->
+                    <span>题目{{ index + 1 }}:请选择正确顺序</span>
+                    <!-- <span>{{ item.sentenceTitle?item.sentenceTitle:"无标题" }}</span> -->
 
-                    <span>{{ item.sentenceTitle?item.sentenceTitle:"无标题" }}</span>
                   </div>
 
-									<div class="si_box" v-if="testJsonCopy && testJsonCopy.chooseSenList && testJsonCopy.chooseSenList.length">
+									<div class="si_box">
 										<!-- <span v-for="(item2,index2) in item.sentenceContent" :key="index2">{{ item2 }}</span> -->
-										<!-- <div class="si_b_top">
-											<span class="si_b_t_item" v-for="(item2,index2) in item.addSentence" :key="index2">{{ item.rightAnswer[index2] }}</span>
-										</div> -->
-                    <div class="si_b_bottom" >
-											<span class="si_b_t_item" v-for="(item2,index2) in testJsonCopy.chooseSenList" :key="index2">{{ item2 }}</span>
-                      <!-- <div v-if="JSON.stringify(item.rightAnswer) == JSON.stringify(testJson.chooseSenList)" style="color: blue;display: inline;">回答正确</div>
-                      <div v-else style="color: red;display: inline">回答错误</div>  -->
+										<div class="si_b_top">
+											<span class="si_b_t_item" v-for="(item2,index2) in item.addSentence" :key="index2"></span>
 										</div>
-                    
-										<!-- <div class="si_b_bottom" v-if="JSON.stringify(item.rightAnswer) != JSON.stringify(testJson.chooseSenList)">
+										<div class="si_b_bottom">
 											<span class="si_b_b_item" v-for="(item2,index2) in item.rightAnswer" :key="index2">{{ item2 }}</span>
-										</div> -->
+										</div>
 									</div>
 									</div>
 								</div>
 
-								<div v-if="[40].includes(toolType)" class="s_b_m_b_i_m_evaluation">
-									<div class="e_item" v-for="(item,index) in testData.rateJson" :key="index">
+                <div v-if="[40].includes(toolType)" class="s_b_m_b_i_m_evaluation">
+                  <div class="middleBox">
+                    <div class="pfBox" v-for="(e, eIndex) in testData.rateJson" :key="eIndex">
+                      <div class="nameAndrate">
+                        <div>{{ e.value }}</div>
+                        <el-rate
+                          disabled
+                        ></el-rate>
+                      </div>
+                      <div v-if="e.detail">{{ e.detail }}</div>
+                    </div>
+                    <div class="easy_comment" v-if="false">
+                      <div
+                        v-for="(p, pIndex) in PlTextList"
+                        :key="pIndex"
+                        @click="fastText(p, 2)"
+                      >
+                        {{ p }}
+                      </div>
+                    </div>
+                    <div class="bz">
+                      <textarea
+                        disabled
+                        rows="4"
+                        class="pj"
+                        style="
+                          padding: 10px 5px;
+                          width: 70%;
+                          background: #f7f6f9;
+                          font-size: 14px;
+                          text-indent: 10px;
+                          resize:none
+                        "
+                        cols
+                        placeholder="请输入评价内容..."
+                      ></textarea>
+                    </div>
+                  </div>
+									<!-- <div class="e_item" v-for="(item,index) in testData.rateJson" :key="index">
 										<div class="s_b_m_b_i_m_c_title">
                     <span>{{ index + 1 }}</span>
                     <svg
@@ -225,16 +258,22 @@
 
                     <span>{{ item.value?item.value:"无标题" }}</span>
                     </div>
-                    <div class="e_item_content" v-if="testJsonCopy">
+                    <div class="e_item_content" v-if="testJson">
                       <span class="e_i_c_detail">{{ item.detail?item.detail:"无内容" }}</span>
-                      <el-rate :value="testJsonCopy.eStar[index]" disabled :max="item.score"></el-rate>
+                      <el-rate :value="testJson.eStar[index]" disabled :max="item.score"></el-rate>
                     </div>
 									
 									</div>
-									<span v-if="testJsonCopy" style="padding: 10px;">{{ testJsonCopy.eBzText }}</span>
-								</div>
-              </div>
+									<span v-if="testJson" style="padding: 10px;">{{ testJson.eBzText }}</span>
+								</div> -->
+                </div>
+                <div v-if="[48].includes(toolType)" class="s_b_m_b_i_m_evaluation">
+                  <el-form>
+                    <div  class="cont" v-if="testData && testData.tableJson && testData.tableJson.text" v-html="testData.tableJson.text"></div>                
+                  </el-form>
+                </div>
 
+              </div>
             </div>
             <div class="s_b_m_b_item" v-if="showType === 1 && dialogTypeList[1].showType.includes(toolType)">
 
@@ -312,8 +351,7 @@
 							<div v-if="toolType == 15">
                 <choseWordCloud :data="cy" :dialogVisibleWordCloud="dialogVisibleWordCloud"></choseWordCloud>
               </div>
-
-
+              
 
             </div>
             <div class="s_b_m_b_item s_b_m_b_worksSubmit" v-if="showType === 2 && dialogTypeList[2].showType.includes(toolType)">
@@ -395,12 +433,15 @@
                       :style="`cursor: ${[45,7,52,48].includes(toolType)?'pointer':'default'};padding: ${[7,52,48].includes(toolType)?'0px':'10px'};`"  
                       @click="StudentWork(item)"
                       >
-                      <!-- @click="openTools(item)" -->
+
+                      <!-- @click="openTools(item)"  -->
                       <div
                         class="s_b_b_i_ws_b_i_s_i_t_t_delIcon"
-                        @click.stop="deleteWorks(item.wid)"
                       >
-                        <img src="../../assets/deleteworks.png" alt="" />
+                        <div>
+                          <span v-if="toolType == 45">{{ accuracy(item) }}</span>
+                        </div>
+                        <img @click.stop="deleteWorks(item.wid)" src="../../assets/deleteworks.png" alt="" />
                       </div>
 
 											<div class="s_b_b_i_ws_b_i_s_i_t_t_answer">
@@ -493,8 +534,8 @@ export default {
       default: () => []
     },
     courseType: {
-      type: String || Number,
-      default: ""
+      type: Number,
+      default: 0
     },
     taskCount: {
       type: Number,
@@ -504,7 +545,7 @@ export default {
   data() {
     return {
       show: false,
-      showType: 2,
+      showType: 0,
       wordCloudData:[], //词云数据
       dialogVisibleWordCloud:false,
 			showStatisticsType:0,
@@ -522,12 +563,13 @@ export default {
         worksPreview: false
       },
       dialogTypeList: [
-        { label: "作业详细", value: 0,showType:[45,15,41,47,40], loading: false },
+        { label: "作业详细", value: 0,showType:[45,15,41,47,40,48], loading: false },
         { label: "题目统计", value: 1,showType:[45,15], loading: false },
         { label: "学生统计", value: 2,showType:[45,15,41,47,40,7,52,48], loading: false }
       ],
 			toolList:[
 				{label:"选择题",value:45,img:require("../../assets/icon/thirdToolList/choose.png")},
+				{label:"表格",value:48,img:require("../../assets/icon/fourthToolList/table.png")},
 				{label:"问答题",value:15,img:require("../../assets/icon/thirdToolList/answer.png")},
 				{label:"选择匹配",value:41,img:require("../../assets/icon/thirdToolList/select.png")},
 				{label:"排序",value:47,img:require("../../assets/icon/fourthToolList/conSentences.png")},
@@ -746,6 +788,37 @@ export default {
       }
 
       return _result;
+    },
+    accuracy(){
+      return data=>{
+        console.log('data',JSON.parse(data.works));
+
+        let allData = JSON.parse(data.works)[0]
+        let answerData = []
+        let num = 0
+        allData.testJson.testJson.forEach(e=>{
+          answerData.push(e.answer)
+        })
+
+        answerData.forEach((e,i)=>{
+          if (JSON.stringify(e) == JSON.stringify(allData.anwer[i])) {
+            num++
+          }
+        })
+        
+
+        
+				// let _result = "";
+				// if([15].includes(this.toolType)){
+				// 	let _work = data.works?JSON.parse(data.works)[0]:null;
+				// 	if(_work){
+				// 		_result = _work.answer;
+				// 	}
+				// }
+
+        let et = ((num / answerData.length).toFixed(1)) * 100
+				return  et+'%';
+			}
     }
   },
   watch: {
@@ -819,13 +892,6 @@ export default {
       this.dialogVisibleWordCloud = true
     },
     StudentWork(val){
-      // console.log('splitScreenFn',val);
-
-      // console.log('val',JSON.parse(val));
-      // console.log('toolType',this.toolType);
-      // console.log('this.worksStudent',this.worksStudent);
-
-      
 
       if (this.toolType == 41) {
         this.testJsonCopy=val.works.split(',')
@@ -842,17 +908,17 @@ export default {
 
       // console.log('this.testJson',JSON.parse(JSON.stringify(this.testJsonCopy)));
       
-      this.showType = 0;
-			this.$emit("changeSplitScreenBehavior",{code: 1,
-        form: {
-          toolType:this.toolType,
-          toolIndex: this.toolIndex,
-          courseType: this.courseType,
-          taskCount: this.taskCount,
-          type: this.showType,
-					showStatisticsType:this.showStatisticsType,
-					lookWorks:val.wid
-        }})
+      // this.showType = 0;
+			// this.$emit("changeSplitScreenBehavior",{code: 1,
+      //   form: {
+      //     toolType:this.toolType,
+      //     toolIndex: this.toolIndex,
+      //     courseType: this.courseType,
+      //     taskCount: this.taskCount,
+      //     type: this.showType,
+			// 		showStatisticsType:this.showStatisticsType,
+			// 		lookWorks:val.wid
+      //   }})
     },
     setData() {      
       if (this.show && this.toolIndex !== null) {
@@ -862,7 +928,7 @@ export default {
         this.noWorksStudent = JSON.parse(
           JSON.stringify(this.noWorksSData[this.toolIndex])
         );
-        if(![52,48].includes(this.toolType)){
+        if(![52].includes(this.toolType)){
           let _tempData = this.chapInfoListData[this.courseType].chapterInfo[0]
             .taskJson[this.taskCount].toolChoose[this.toolIndex];
           this.testData = _tempData ? _tempData : null;
@@ -879,7 +945,7 @@ export default {
     },
     init() {
       this.data = null;
-      this.showType = 2;
+      this.showType = 0;
 			this.showStatisticsType = 0;
       this.testJson = null;
       this.testJsonCopy = null;
@@ -1311,16 +1377,19 @@ export default {
 }
 
 .s_b_b_i_ws_b_i_s_i_t_t_delIcon {
-  width: 25px;
+  width: 70px;
   height: 25px;
   position: absolute;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
   right: 10px;
   top: 10px;
   cursor: pointer;
 }
 
 .s_b_b_i_ws_b_i_s_i_t_t_delIcon > img {
-  width: 100%;
+  width: 25px;
   height: 100%;
 }
 
@@ -1706,4 +1775,109 @@ export default {
   padding: 20px;
   background-color: blue;
 } */
+.middleBox {
+  padding: 5px 0 15px 20px;
+}
+.pfBox {
+  padding-bottom: 30px;
+}
+
+.nameAndrate {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+  padding-bottom: 10px;
+  height: 30px;
+  line-height: 30px;
+}
+
+.nameAndrate > div {
+  margin-left: 10px;
+  color: #000;
+  height: 30px;
+}
+
+.nameAndrate >>> .el-rate__icon {
+  font-size: 28px !important;
+}
+
+.pfBox > div:nth-child(2) {
+  background: #f7f6f9;
+  width: 400px;
+  min-height: 45px;
+  border-radius: 10px;
+  font-size: 16px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  padding: 10px 20px;
+  box-sizing: border-box;
+  color: #000;
+}
+
+.bz {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: flex-start;
+}
+
+.bz > div {
+  padding: 0 10px;
+}
+/* table 样式 */
+.cont >>> table {
+  border-top: 1px solid #ccc;
+  border-left: 1px solid #ccc;
+}
+
+.cont >>> table td,
+.cont >>> table th {
+  border-bottom: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+  /* padding: 20px 5px; */
+  padding: 5px 10px;
+  max-width: 0px;
+  height: 30px;
+  vertical-align: baseline;
+  box-sizing: border-box;
+}
+
+.cont >>> table th {
+  border-bottom: 2px solid #ccc;
+  text-align: center;
+}
+
+/* blockquote 样式 */
+.cont >>> blockquote {
+  display: block;
+  border-left: 8px solid #d0e5f2;
+  padding: 5px 10px;
+  margin: 10px 0;
+  line-height: 1.4;
+  font-size: 100%;
+  background-color: #f1f1f1;
+}
+
+/* code 样式 */
+.cont >>> code {
+  display: inline-block;
+  /* *display: inline; */
+  zoom: 1;
+  background-color: #f1f1f1;
+  border-radius: 3px;
+  padding: 3px 5px;
+  margin: 0 3px;
+}
+
+.cont >>> pre code {
+  display: block;
+}
+
+/* ul ol 样式 */
+.cont >>> ul,
+ol {
+  margin: 10px 0 10px 20px;
+}
 </style>

src/components/easy2/studyStudent.vue

@@ -13185,7 +13185,7 @@
       width="100%"
       :before-close="handleClose"
       :show-close="false"
-      :class="['dialog_diy','full_diy', fulltype == 3 ? 'full_diy2' : '', (splitScreenData.isOpen && splitScreenData.uid != splitScreenData.myUid) ? 'dialog_diyCopy' : ''] "
+      :class="['dialog_diy','full_diy', fulltype == 3 ? 'full_diy2' : '', (splitScreenData.isOpen && (splitScreenData.uid != splitScreenData.myUid)) ? 'dialog_diyCopy' : ''] "
     >
       <div slot="title" class="header-title">
         <div style="color: #fff">查看文档</div>
@@ -13207,7 +13207,27 @@
           退出全屏
         </div>
       </div>
-      <div style="height: 100%">
+      <div style="height: 100%;position: relative;">
+        <el-button
+          v-if="(splitScreenData.isOpen && (splitScreenData.uid != splitScreenData.myUid))"
+          size="medium" 
+          type="primary"
+          @click="
+            () => {
+              (fullDialogVisible = false),
+                changeSplitScreenBehavior({ code: 99 });
+            }
+          "
+          style="
+            cursor: pointer;
+            position: absolute;
+            top: 10px;
+            right: 20px;
+            color: #fff;
+          "
+        >
+          退出全屏
+        </el-button>
         <div
           class="wheel"
           v-if="
@@ -24530,7 +24550,7 @@ export default {
           toolIndex: toolIndex,
           courseType: this.courseType,
           taskCount: this.taskCount,
-          type: 2
+          type: 0
         }
       });
     },

src/components/easy3/studyStudent.vue

@@ -10010,7 +10010,7 @@
       width="100%"
       :before-close="handleClose"
       :show-close="false"
-      :class="['dialog_diy','full_diy', fulltype == 3 ? 'full_diy2' : '', (splitScreenData.isOpen && splitScreenData.uid != splitScreenData.myUid) ? 'dialog_diyCopy' : ''] "
+      :class="['dialog_diy','full_diy', fulltype == 3 ? 'full_diy2' : '', (splitScreenData.isOpen && (splitScreenData.uid != splitScreenData.myUid)) ? 'dialog_diyCopy' : ''] "
 
     >
       <div slot="title" class="header-title">
@@ -10028,7 +10028,27 @@
           退出全屏
         </div>
       </div>
-      <div style="height: 100%">
+      <div style="height: 100%;position: relative;">
+        <el-button
+          v-if="(splitScreenData.isOpen && (splitScreenData.uid != splitScreenData.myUid))"
+          size="medium" 
+          type="primary"
+          @click="
+            () => {
+              (fullDialogVisible = false),
+                changeSplitScreenBehavior({ code: 99 });
+            }
+          "
+          style="
+            cursor: pointer;
+            position: absolute;
+            top: 10px;
+            right: 20px;
+            color: #fff;
+          "
+        >
+          退出全屏
+        </el-button>
         <div
           class="wheel"
           v-if="
@@ -20303,9 +20323,9 @@ export default {
             this.$nextTick(() => {
 							if (this.$refs.choseWorksDetailDialogRef.show) {
                 //已经打开了
-								this.$refs.choseWorksDetailDialogRef.splitScreenFn({toolType:behavior.form.toolType,type:behavior.form.type,showStatisticsType:behavior.form.showStatisticsType})
+								this.$refs.choseWorksDetailDialogRef.splitScreenFn({toolType:behavior.form.toolType,type:behavior.form.type,showStatisticsType:behavior.form.showStatisticsType,lookWorks:behavior.form.lookWorks})
               } else {
-								this.$refs.choseWorksDetailDialogRef.open({toolType:behavior.form.toolType,toolIndex:behavior.form.toolIndex,tType: this.tType,})
+								this.$refs.choseWorksDetailDialogRef.open({toolType:behavior.form.toolType,toolIndex:behavior.form.toolIndex,tType: this.tType,lookWorks:behavior.form.lookWorks})
               }
             });
           }else if(behavior.code === 2){

src/components/studyStudent.vue

@@ -9955,7 +9955,7 @@
       width="100%"
       :before-close="handleClose"
       :show-close="false"
-      :class="['dialog_diy','full_diy', fulltype == 3 ? 'full_diy2' : '', (splitScreenData.isOpen && splitScreenData.uid != splitScreenData.myUid) ? 'dialog_diyCopy' : ''] "
+      :class="['dialog_diy','full_diy', fulltype == 3 ? 'full_diy2' : '', (splitScreenData.isOpen && (splitScreenData.uid != splitScreenData.myUid)) ? 'dialog_diyCopy' : ''] "
 
     >
       <div slot="title" class="header-title">
@@ -9973,7 +9973,27 @@
           退出全屏
         </div>
       </div>
-      <div style="height: 100%">
+      <div style="height: 100%;position: relative;">
+        <el-button
+          v-if="(splitScreenData.isOpen && (splitScreenData.uid != splitScreenData.myUid))"
+          size="medium" 
+          type="primary"
+          @click="
+            () => {
+              (fullDialogVisible = false),
+                changeSplitScreenBehavior({ code: 99 });
+            }
+          "
+          style="
+            cursor: pointer;
+            position: absolute;
+            top: 10px;
+            right: 20px;
+            color: #fff;
+          "
+        >
+          退出全屏
+        </el-button>
         <div
           class="wheel"
           v-if="
@@ -20290,9 +20310,9 @@ export default {
             this.$nextTick(() => {
 							if (this.$refs.choseWorksDetailDialogRef.show) {
                 //已经打开了
-								this.$refs.choseWorksDetailDialogRef.splitScreenFn({toolType:behavior.form.toolType,type:behavior.form.type,showStatisticsType:behavior.form.showStatisticsType})
+								this.$refs.choseWorksDetailDialogRef.splitScreenFn({toolType:behavior.form.toolType,type:behavior.form.type,showStatisticsType:behavior.form.showStatisticsType,lookWorks:behavior.form.lookWorks})
               } else {
-								this.$refs.choseWorksDetailDialogRef.open({toolType:behavior.form.toolType,toolIndex:behavior.form.toolIndex,tType: this.tType,})
+								this.$refs.choseWorksDetailDialogRef.open({toolType:behavior.form.toolType,toolIndex:behavior.form.toolIndex,tType: this.tType,lookWorks:behavior.form.lookWorks})
               }
             });
           }else if(behavior.code === 2){

src/components/studySutdentClass/studyStudent.vue

@@ -12951,7 +12951,7 @@
       width="100%"
       :before-close="handleClose"
       :show-close="false"
-      :class="['dialog_diy','full_diy', fulltype == 3 ? 'full_diy2' : '', (splitScreenData.isOpen && splitScreenData.uid != splitScreenData.myUid) ? 'dialog_diyCopy' : ''] "
+      :class="['dialog_diy','full_diy', fulltype == 3 ? 'full_diy2' : '', (splitScreenData.isOpen && (splitScreenData.uid != splitScreenData.myUid)) ? 'dialog_diyCopy' : ''] "
 
     >
       <div slot="title" class="header-title">
@@ -12969,7 +12969,27 @@
           退出全屏
         </div>
       </div>
-      <div style="height: 100%">
+      <div style="height: 100%;position: relative;">
+        <el-button
+          v-if="(splitScreenData.isOpen && (splitScreenData.uid != splitScreenData.myUid))"
+          size="medium" 
+          type="primary"
+          @click="
+            () => {
+              (fullDialogVisible = false),
+                changeSplitScreenBehavior({ code: 99 });
+            }
+          "
+          style="
+            cursor: pointer;
+            position: absolute;
+            top: 10px;
+            right: 20px;
+            color: #fff;
+          "
+        >
+          退出全屏
+        </el-button>
         <div
           class="wheel"
           v-if="
@@ -22708,7 +22728,8 @@ export default {
         this.fullUrl =
           "https://view.officeapps.live.com/op/view.aspx?src=" + encodeURIComponent(_uuurl);
       }
-			this.changeSplitScreenBehavior({code:0,form:[t,f]})
+      this.changeSplitScreenBehavior({code:0,form:{t:t,f:f}})
+  
     },
     openSname(n, id, i, uid) {
       this.snameWid = id;
@@ -24025,7 +24046,7 @@ export default {
 						}
           } else if (behavior.code === 0) {
             //开启内容列表弹窗
-            this.checkFileFull1(behavior.form[0], behavior.form[1]);
+            this.checkFileFull1(behavior.form.t, behavior.form.f);
           } else if (behavior.code === 1) {
             //关于选择题的作业详细的操作
             // toolIndex:toolIndex,courseType:this.courseType,taskCount:this.taskCount,type:0
@@ -24036,9 +24057,9 @@ export default {
             this.$nextTick(() => {
 							if (this.$refs.choseWorksDetailDialogRef.show) {
                 //已经打开了
-								this.$refs.choseWorksDetailDialogRef.splitScreenFn({toolType:behavior.form.toolType,type:behavior.form.type,showStatisticsType:behavior.form.showStatisticsType})
+								this.$refs.choseWorksDetailDialogRef.splitScreenFn({toolType:behavior.form.toolType,type:behavior.form.type,showStatisticsType:behavior.form.showStatisticsType,lookWorks:behavior.form.lookWorks})
               } else {
-								this.$refs.choseWorksDetailDialogRef.open({toolType:behavior.form.toolType,toolIndex:behavior.form.toolIndex,tType: this.tType,})
+								this.$refs.choseWorksDetailDialogRef.open({toolType:behavior.form.toolType,toolIndex:behavior.form.toolIndex,tType: this.tType,lookWorks:behavior.form.lookWorks})
               }
             });
           }else if(behavior.code === 2){