SanHQin 3 months ago
parent
commit
b1f702ebf0

+ 132 - 19
src/components/components/choseWorksDetailDialog.vue

@@ -194,6 +194,34 @@
 									</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 class="s_b_m_b_i_m_c_title">
+                    <span>{{ index + 1 }}</span>
+                    <svg
+                      width="16"
+                      height="16"
+                      viewBox="0 0 16 16"
+                      fill="none"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        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>
+
+                    <span>{{ item.value?item.value:"无标题" }}</span>
+                  </div>
+									<div class="e_item_content">
+										<span class="e_i_c_detail">{{ item.detail?item.detail:"无内容" }}</span>
+										<el-rate :value="item.score" disabled :max="item.score"></el-rate>
+									</div>
+									
+									</div>
+									<span>请输入评价内容...</span>
+								</div>
               </div>
 
             </div>
@@ -270,7 +298,7 @@
               </div>
             </div>
             <div class="s_b_m_b_item s_b_m_b_worksSubmit" v-if="showType === 2 && dialogTypeList[2].showType.includes(toolType)">
-              <div class="s_b_b_i_noSubmit"  v-if="[45,15,41,47].includes(toolType)">
+              <div class="s_b_b_i_noSubmit">
                 <div class="s_b_b_i_ws_top">
                   <div class="s_b_b_i_ws_t_left">
                     <div @click="foldList.noSubmit = !foldList.noSubmit">
@@ -309,7 +337,7 @@
                   >
                 </div>
               </div>
-              <div class="s_b_b_i_worksPreview"  v-if="[45,15,41,47].includes(toolType)">
+              <div class="s_b_b_i_worksPreview">
                 <div class="s_b_b_i_ws_top">
                   <div class="s_b_b_i_ws_t_left">
                     <div
@@ -343,7 +371,7 @@
                     v-for="item in worksStudent"
                     :key="item.userid"
                   >
-                    <div class="s_b_b_i_ws_b_i_s_i_t_top" :style="`cursor: ${[45].includes(toolType)?'pointer':'default'}`" @click="openTools(item)">
+                    <div class="s_b_b_i_ws_b_i_s_i_t_top" :style="`cursor: ${[45,7,52,48].includes(toolType)?'pointer':'default'};padding: ${[7,52,48].includes(toolType)?'0px':'10px'};`" @click="openTools(item)">
                       <div
                         class="s_b_b_i_ws_b_i_s_i_t_t_delIcon"
                         @click.stop="deleteWorks(item.wid)"
@@ -370,6 +398,26 @@
 													<span v-for="(item2,index2) in item.works.split(',')" :key="index2" :class="`${testData.selectJson.answer[index2]===parseInt(item2)?'answerRight':'answerWrong'}`">{{ optionTypeList[item2] }}</span>
 												</div>
 
+												<div class="answerSort" v-if="[47].includes(toolType)">
+													<span v-for="(item2,index2) in JSON.parse(item.works)">
+														<span :class="`${JSON.stringify(item2.chooseSenList)===JSON.stringify(item2.rightAnswer)?'answerRight':'answerWrong'}`">{{ JSON.stringify(item2.chooseSenList)===JSON.stringify(item2.rightAnswer)?'✓':'✕' }}</span>
+													</span>
+												</div>
+
+												<div class="answerEvaluation" v-if="[40].includes(toolType)">
+													<el-rate v-for="(item2,index2) in JSON.parse(item.works).eStar" :key="2" :value="item2" disabled :max="testData.rateJson[index2].score"></el-rate>
+													<span>{{ JSON.parse(item.works).eBzText }}</span>
+												</div>
+
+												<div class="imageWorks" v-if="[7].includes(toolType)">
+														<img :src="item.works" alt="" @click.stop="$hevueImgPreview(item.works)">
+												</div>
+
+												<div class="imageWorks" v-if="[52,48].includes(toolType)">
+													<img :src="require('../../assets/icon/isWord.png')" alt="">
+													<!-- <img v-if="[48].includes(toolType)" :src="require('../../assets/icon/isTxt.png')" alt=""> -->
+												</div>
+
 												<!-- <span>{{ worksCheckAnswer(item) }}</span> -->
 											</div>
                     </div>
@@ -443,26 +491,17 @@ export default {
         worksPreview: false
       },
       dialogTypeList: [
-        { label: "作业详细", value: 0,showType:[45,15,41,47], loading: false },
+        { label: "作业详细", value: 0,showType:[45,15,41,47,40], loading: false },
         { label: "题目统计", value: 1,showType:[45], loading: false },
-        { label: "学生统计", value: 2,showType:[45,15,41,47], loading: false }
+        { label: "学生统计", value: 2,showType:[45,15,41,47,40,7,52,48], loading: false }
       ],
-			// toolTypeList:{
-			// 	41:"选择匹配",
-			// 	45:"选择题",
-			// 	15:"问答题",
-			// 	47:"排序",
-			// },
-			// toolImageList:{
-			// 	15:require("../../assets/icon/thirdToolList/answer.png")
-			// 	41:require("../../assets/icon/thirdToolList/select.png"),
-			// 	47:require("../../assets/icon/fourthToolList/conSentences.png")
-			// },
 			toolList:[
 				{label:"选择题",value:45,img:require("../../assets/icon/thirdToolList/choose.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")}
+				{label:"排序",value:47,img:require("../../assets/icon/fourthToolList/conSentences.png")},
+				{label:"个人评价",value:40,img:require("../../assets/icon/secondToolList/eval.png")},
+				{label:"思维网格",value:7,img:require("../../assets/icon/secondToolList/mindNetwork.png")}
 			],
 			statisticsTypeList:[
 				{label:"准确率",value:0},
@@ -700,7 +739,6 @@ export default {
       deep: true
     }
   },
-
   methods: {
     open(data) {
       if (this.show) return;
@@ -708,6 +746,9 @@ export default {
       this.data = data;
       this.toolIndex = data.toolIndex;
 			this.toolType = data.toolType;
+			if(this.dialogTypeList.findIndex(i=>i.showType.includes(this.toolType))!==-1){
+				this.changeShowType(this.dialogTypeList.findIndex(i=>i.showType.includes(this.toolType)))
+			}
       this.setData();
     },
     setData() {
@@ -764,6 +805,8 @@ export default {
 		openTools(data){
 			if([45].includes(this.toolType)){
 				this.$emit("openTools",this.toolType,this.toolIndex,this.taskCount,data.works,data.sName)
+			}else if([52,48].includes(this.toolType)){
+				this.$emit("openWord",data)
 			}
 		},
 		changeShowStatisticsType(type){
@@ -1137,7 +1180,6 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  padding: 10px;
   flex-wrap: wrap;
   background-image: linear-gradient(
     45deg,
@@ -1232,6 +1274,11 @@ export default {
 	color: #000;
 }
 
+.s_b_b_i_ws_b_i_s_i_t_t_answer{
+	width: 100%;
+	height: 100%;
+}
+
 .s_b_b_i_ws_b_i_s_i_t_t_answer>span{
 	font-size: 18px;
 	font-weight: bold;
@@ -1353,6 +1400,17 @@ export default {
 	border: solid 1px #d7d9e0;
 }
 
+.s_b_m_b_i_m_evaluation>span{
+	width: 100%;
+	height: 150px;
+	display: block;
+	margin-top: 15px;
+	border-radius: 10px;
+	box-sizing: border-box;
+	padding: 2px;
+	border: solid 1px #d7d9e0;
+}
+
 .s_b_m_b_i_m_selectiveMatching{
 	width: 100%;
 	height: auto;
@@ -1455,6 +1513,61 @@ export default {
 	box-sizing: border-box;
 }
 
+.answerSort>span{
+	font-size: 20px;
+	margin-right: 10px;
+	font-weight: bold;
+}
+
+.s_b_m_b_i_m_evaluation{
+	box-sizing: border-box;
+	padding-left: 15px;
+}
+
+.e_item{
+	margin-bottom: 50px;
+}
+
+.e_item_content{
+	display: flex;
+	justify-content: center;
+	flex-direction: column;
+}
+
+.e_item_content>span{
+	padding: 10px 20px;
+	background-color: #F3F7FD;
+	border-radius: 5px;
+	margin: 10px 0;
+	font-size: 18px;
+}
+
+.e_item_content>>>.el-rate .el-rate__item{
+	width: 30px;
+	height: 30px;
+}
+
+.e_item_content>>>.el-rate .el-rate__item>.el-rate__icon{
+	width: 100%;
+	height: 100%;
+	font-size: 26px;
+}
+
+.imageWorks{
+	width: 100%;
+	height: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.imageWorks>img{
+	width: 100%;
+	height: 100%;
+	object-fit: fill;
+}
+
+
 /* F9FAFB */
 
 /* .s_b_b_i_noSubmit {

+ 20 - 2
src/components/easy2/studyStudent.vue

@@ -1043,6 +1043,10 @@
                               @click="addTools(tooC, toolIndex, taskCount)"
                             />
                             <div style="margin: 5px 0">思维网格</div>
+														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,7)"
+                              style="position: absolute;right: 33px;top: -30px;">
+                              作业详细
+                            </div>
                           </div>
                           <div v-if="tooC == 8">
                             <img
@@ -1277,6 +1281,10 @@
                               alt
                             />
                             <div style="margin: 5px 0">个人评价</div>
+														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,40)"
+                              style="position: absolute;right: 33px;top: -30px;">
+                              作业详细
+                            </div>
                           </div>
                           <div v-if="tooC == 41">
                             <img
@@ -1305,10 +1313,10 @@
                               alt
                             />
                             <div style="margin: 5px 0">排序</div>
-														<!-- <div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,47)"
+														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,47)"
                               style="position: absolute;right: 33px;top: -30px;">
                               作业详细
-                            </div> -->
+                            </div>
                           </div>
                           <div v-if="tooC == 48">
                             <img
@@ -1317,6 +1325,10 @@
                               alt
                             />
                             <div style="margin: 5px 0">表格</div>
+														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,48)"
+                              style="position: absolute;right: 33px;top: -30px;">
+                              作业详细
+                            </div>
                           </div>
                           <div v-if="tooC == 52">
                             <img
@@ -1325,6 +1337,10 @@
                               alt
                             />
                             <div style="margin: 5px 0">文档</div>
+														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,52)"
+                              style="position: absolute;right: 33px;top: -30px;">
+                              作业详细
+                            </div>
                           </div>
                           <div v-if="tooC == 49">
                             <img
@@ -15429,6 +15445,8 @@
       :taskCount="taskCount"
       @deleteWorks="deleteWorks"
       @openTools="openTools"
+			@openWord="openWord"
+			@openScore="openScore"
       @changeSplitScreenBehavior="changeSplitScreenBehavior"
     />
   </div>

+ 20 - 2
src/components/easy3/studyStudent.vue

@@ -996,6 +996,10 @@
                               @click="addTools(tooC, toolIndex, taskCount)"
                             />
                             <div style="margin: 5px 0">思维网格</div>
+														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,7)"
+                              style="position: absolute;right: 33px;top: -30px;">
+                              作业详细
+                            </div>
                           </div>
                           <div v-if="tooC == 8">
                             <img
@@ -1208,6 +1212,10 @@
                               alt
                             />
                             <div style="margin: 5px 0">个人评价</div>
+														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,40)"
+                              style="position: absolute;right: 33px;top: -30px;">
+                              作业详细
+                            </div>
                           </div>
                           <div v-if="tooC == 41">
                             <img
@@ -1236,10 +1244,10 @@
                               alt
                             />
                             <div style="margin: 5px 0">排序</div>
-														<!-- <div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,47)"
+														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,47)"
                               style="position: absolute;right: 33px;top: -30px;">
                               作业详细
-                            </div> -->
+                            </div>
                           </div>
                           <div v-if="tooC == 48">
                             <img
@@ -1248,6 +1256,10 @@
                               alt
                             />
                             <div style="margin: 5px 0">表格</div>
+														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,48)"
+                              style="position: absolute;right: 33px;top: -30px;">
+                              作业详细
+                            </div>
                           </div>
                           <div v-if="tooC == 52">
                             <img
@@ -1256,6 +1268,10 @@
                               alt
                             />
                             <div style="margin: 5px 0">文档</div>
+														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,52)"
+                              style="position: absolute;right: 33px;top: -30px;">
+                              作业详细
+                            </div>
                           </div>
                           <div v-if="tooC == 49">
                             <img
@@ -11976,6 +11992,8 @@
       :taskCount="taskCount"
       @deleteWorks="deleteWorks"
       @openTools="openTools"
+			@openWord="openWord"
+			@openScore="openScore"
       @changeSplitScreenBehavior="changeSplitScreenBehavior"
     />
   </div>

+ 22 - 0
src/components/studyStudent.vue

@@ -965,6 +965,10 @@
                               @click="addTools(tooC, toolIndex, taskCount)"
                             />
                             <div style="margin: 5px 0">思维网格</div>
+														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,7)"
+                              style="position: absolute;right: 33px;top: -30px;">
+                              作业详细
+                            </div>
                           </div>
                           <div v-if="tooC == 8">
                             <img
@@ -1177,6 +1181,10 @@
                               alt
                             />
                             <div style="margin: 5px 0">个人评价</div>
+														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,40)"
+                              style="position: absolute;right: 33px;top: -30px;">
+                              作业详细
+                            </div>
                           </div>
                           <div v-if="tooC == 41">
                             <img
@@ -1205,6 +1213,10 @@
                               alt
                             />
                             <div style="margin: 5px 0">排序</div>
+														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,47)"
+                              style="position: absolute;right: 33px;top: -30px;">
+                              作业详细
+                            </div>
                           </div>
                           <div v-if="tooC == 48">
                             <img
@@ -1213,6 +1225,10 @@
                               alt
                             />
                             <div style="margin: 5px 0">表格</div>
+														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,48)"
+                              style="position: absolute;right: 33px;top: -30px;">
+                              作业详细
+                            </div>
                           </div>
                           <div v-if="tooC == 52">
                             <img
@@ -1221,6 +1237,10 @@
                               alt
                             />
                             <div style="margin: 5px 0">文档</div>
+														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,52)"
+                              style="position: absolute;right: 33px;top: -30px;">
+                              作业详细
+                            </div>
                           </div>
                           <div v-if="tooC == 49">
                             <img
@@ -11913,6 +11933,8 @@
       :taskCount="taskCount"
       @deleteWorks="deleteWorks"
       @openTools="openTools"
+			@openWord="openWord"
+			@openScore="openScore"
       @changeSplitScreenBehavior="changeSplitScreenBehavior"
     />
   </div>