11wqe1 4 月之前
父节点
当前提交
c0f0900b0f

+ 296 - 31
src/components/components/choseWorksDetailDialog.vue

@@ -171,34 +171,22 @@
 
                 <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></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>题目{{ index + 1 }}:请选择正确顺序</span>
-                    <!-- <span>{{ item.sentenceTitle?item.sentenceTitle:"无标题" }}</span> -->
+										<div class="s_b_m_b_i_m_c_title2">
+                      <span></span>
+                      <span>题目{{ index + 1 }}:请选择正确顺序</span>
+                    </div>
 
-                  </div>
+                    <div class="si_box2">
+                      <div class="si_b_top">
+                        <div class="si_b_t_item" v-for="(item2,index2) in item.addSentence" :key="index2"></div>
+                      </div>
 
-									<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"></span>
-										</div>
-										<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 style="height: 1px;background-color: #ccc;width: 100%;margin: 10px 0"></div>
+
+                      <div class="si_b_bottom">
+                        <div class="si_b_b_item" v-for="(item2,index2) in item.rightAnswer" :key="index2">{{ item2 }}</div>
+                      </div>
+                    </div>
 									</div>
 								</div>
 
@@ -272,7 +260,109 @@
                     <div  class="cont" v-if="testData && testData.tableJson && testData.tableJson.text" v-html="testData.tableJson.text"></div>                
                   </el-form>
                 </div>
-
+                <div v-if="[7,1].includes(toolType)" class="s_b_m_b_i_m_evaluation">
+                  <!-- {{ testData }} -->
+                  <!-- <img src="" alt=""> -->
+                    <!-- <div class="cont" v-if="testData && testData.tableJson && testData.tableJson.text" v-html="testData.tableJson.text"></div>                 -->
+                </div>
+                <div v-if="[49].includes(toolType)" class="s_b_m_b_i_m_evaluation">
+                  <!-- {{ testData.groupJson }} -->
+                  <div>
+                    <div
+                      class="g_d_box"
+                      v-if="testData.groupJson.group"
+                    >
+                      <div
+                        class="g_d_group"
+                        v-for="(g, gindex) in testData.groupJson.group"
+                        :key="gindex"
+                      >
+ 
+                      <div class="g_d_group_chair">
+                        <div v-if="testData.groupJson.number > 1">
+                          <span class="isChair">
+                              <span class="updateChairBtn">修改</span>
+                          </span>
+                          <span>空位置</span>
+                        </div>
+                        <div v-if="testData.groupJson.number > 4">
+                          <span class="isChair">
+                              <span class="updateChairBtn">修改</span>
+                          </span>
+                          <span>空位置</span>
+                        </div>
+                        <div v-if="testData.groupJson.number > 8">
+                          <span class="isChair">
+                              <span class="updateChairBtn">修改</span>
+                          </span>
+                          <span>空位置</span>
+                        </div>
+                      </div>
+                      <div class="g_d_group_tableBox">
+                        <div class="g_d_group_chair2">
+                          <div v-if="testData.groupJson.number > 2">
+                            <span class="isChair">
+                              <span class="updateChairBtn">修改</span>
+                            </span>
+                            <span>空位置</span>
+                          </div>
+                          <div v-if="testData.groupJson.number > 6">
+                            <span class="isChair">
+                              <span class="updateChairBtn">修改</span>
+                            </span>
+                            <span>空位置</span>
+                          </div>
+                        </div>
+                        <div class="g_d_group_table">
+                          <div>
+                            {{ g.name }}
+                          </div>
+                          <div>
+                            <div>
+                              加入分组
+                            </div>
+                          </div>
+                        </div>
+                        <div class="g_d_group_chair2">
+                          <div v-if="testData.groupJson.number > 3">
+                            <span class="isChair">
+                              <span class="updateChairBtn">修改</span>
+                            </span>
+                            <span>空位置</span>
+                          </div>
+                          <div v-if="testData.groupJson.number > 7">
+                            <span class="isChair">
+                              <span class="updateChairBtn">修改</span>
+                            </span>
+                            <span>空位置</span>
+                          </div>
+                        </div>
+                      </div>
+                      <div class="g_d_group_chair">
+                        <div v-if="testData.groupJson.number > 1">
+                          <span class="isChair">
+                              <span class="updateChairBtn">修改</span>
+                          </span>
+                          <span>空位置</span>
+                        </div>
+                        <div v-if="testData.groupJson.number > 5">
+                          <span class="isChair">
+                              <span class="updateChairBtn">修改</span>
+                          </span>
+                          <span>空位置</span>
+                        </div>
+                        <div v-if="testData.groupJson.number > 9">
+                          <span class="isChair">
+                              <span class="updateChairBtn">修改</span>
+                          </span>
+                          <span>空位置</span>
+                        </div>
+                      </div>
+                      </div>
+                    </div>
+                  </div>
+               
+                </div>
               </div>
             </div>
             <div class="s_b_m_b_item" v-if="showType === 1 && dialogTypeList[1].showType.includes(toolType)">
@@ -478,11 +568,15 @@
 														<img :src="item.works" alt="" @click.stop="$hevueImgPreview(item.works)">
 												</div>
 
+                        <div class="imageWorks" v-if="[1].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>
@@ -534,7 +628,7 @@ export default {
       default: () => []
     },
     courseType: {
-      type: Number,
+      type: [String , Number],
       default: 0
     },
     taskCount: {
@@ -563,13 +657,15 @@ export default {
         worksPreview: false
       },
       dialogTypeList: [
-        { label: "作业详细", value: 0,showType:[45,15,41,47,40,48], loading: false },
+        { label: "作业详细", value: 0,showType:[45,15,41,47,40,48,1,49,7], loading: false },
         { label: "题目统计", value: 1,showType:[45,15], loading: false },
-        { label: "学生统计", value: 2,showType:[45,15,41,47,40,7,52,48], loading: false }
+        { label: "学生统计", value: 2,showType:[45,15,41,47,40,7,52,48,1], 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:49,img:require("../../assets/icon/fourthToolList/group.png")},
+				{label:"电子白板",value:1,img:require("../../assets/icon/secondToolList/whiteBoard.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")},
@@ -1180,6 +1276,17 @@ export default {
   margin-bottom: 30px;
 }
 
+.s_b_m_b_i_m_c_title2 {
+  display: flex;
+  align-items: center;
+}
+
+.s_b_m_b_i_m_c_title2 > span:nth-of-type(1) {
+  font-size: 14px;
+  /* font-weight: bold; */
+  color: #3681fc;
+}
+
 .s_b_m_b_i_m_c_title {
   display: flex;
   align-items: center;
@@ -1662,6 +1769,52 @@ export default {
 	margin-bottom: 20px;
 }
 
+.si_box2{
+	width: auto;
+	min-height: 100px;
+	box-sizing: border-box;
+	padding: 10px;
+}
+.si_box2 > .si_b_top{
+	width: 100%;
+	margin-top: 20px;
+  display: flex;
+  flex-wrap: wrap;
+}
+.si_box2 > .si_b_top > .si_b_t_item{
+	font-size: 24px;
+	margin-right: 20px;
+	padding: 10px 40px;
+  height: 47px;
+	border: dashed 2px #d7d9e0;
+	border-radius: 5px;
+	color: #ebedf3;
+	font-weight: bold;
+	box-sizing: border-box;
+}
+
+.si_box2 > .si_b_bottom{
+	width: 100%;
+  margin: 0;
+  display: flex;
+  flex-wrap: wrap;
+
+}
+.si_box2 > .si_b_bottom > div{
+  flex-shrink: 0;
+  font-size: 18px;
+	margin-right: 20px;
+	padding: 10px 40px;
+  height: 47px;
+	border: solid 2px #A3C7F9;
+	border-radius: 5px;
+	font-weight: bold;
+	color: black;
+  line-height: 24px;
+	box-sizing: border-box;
+  margin-bottom: 10px;
+}
+
 .si_box{
 	width: 100%;
 	height: auto;
@@ -1880,4 +2033,116 @@ export default {
 ol {
   margin: 10px 0 10px 20px;
 }
+.g_d_box {
+  display: flex;
+  flex-flow: wrap;
+  justify-content: space-around;
+}
+
+.g_d_box .isChair {
+  background-image: url(../../assets/avatar.png) !important;
+}
+.updateChairBtn {
+  position: absolute;
+  width: 50px;
+  height: 50px;
+  overflow: hidden;
+  /* display: flex; */
+  align-items: center;
+  justify-content: center;
+  background: #00000087;
+  color: #fff;
+  border-radius: 50px;
+  display: none;
+  cursor: pointer;
+}
+.g_d_group_table {
+  background-image: url(../../assets/icon/groupBg.png);
+  width: 354px;
+  height: 196px;
+  background-size: 100% 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  color: #fff;
+}
+
+.g_d_group_table > div:nth-child(1) {
+  font-size: 24px;
+  margin-bottom: 5px;
+}
+
+.g_d_group_table > div:nth-child(2) div {
+  cursor: pointer;
+  background: #2e77bf;
+  padding: 4px 10px;
+  border-radius: 5px;
+}
+.g_d_group_chair {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.g_d_group_chair > div + div {
+  margin-left: 30px;
+}
+
+.g_d_group_chair > div,
+.g_d_group_chair2 > div {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.g_d_group_chair > div > span:nth-child(1),
+.g_d_group_chair2 > div > span:nth-child(1) {
+  background-image: url(../../assets/icon/chair.png);
+  width: 50px;
+  height: 50px;
+  display: block;
+  background-size: 100% 100%;
+}
+
+.g_d_group_tableBox {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.g_d_group_chair2 {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+.g_d_group_chair2 > div + div {
+  margin-top: 10px;
+}
+
+.g_d_group_table {
+  background-image: url(../../assets/icon/groupBg.png);
+  width: 354px;
+  height: 196px;
+  background-size: 100% 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  color: #fff;
+}
+
+.g_d_group_table > div:nth-child(1) {
+  font-size: 24px;
+  margin-bottom: 5px;
+}
+
+.g_d_group_table > div:nth-child(2) div {
+  cursor: pointer;
+  background: #2e77bf;
+  padding: 4px 10px;
+  border-radius: 5px;
+}
 </style>

+ 27 - 19
src/components/easy2/studyStudent.vue

@@ -1,10 +1,10 @@
 <template>
-  <div class="pb_content" style="overflow: unset">
+  <div class="pb_content" style="height: 100%;overflow: unset;">
     <div
       class="pb_content_body"
       style="
         display: flex;
-        height: 900px;
+        height: 100%;
         position: relative;
         padding: 20px 0 20px 20px;
         box-sizing: border-box;
@@ -1019,6 +1019,10 @@
                               @click="addTools(tooC, toolIndex, taskCount)"
                             />
                             <div style="margin: 5px 0">电子白板</div>
+                            <div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,1)"
+                            style="position: absolute;right: 33px;top: -30px;">
+                              投影
+                            </div>
                           </div>
                           <div v-if="tooC == 3">
                             <img
@@ -1043,9 +1047,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)"
+                            <!-- && worksStudent[toolIndex].length>0 -->
+														<div class="upload_toolBtn" v-if="tType==='1' " @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,7)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 8">
@@ -1105,8 +1110,7 @@
                             <div
                               class="upload_toolBtn"
                               v-if="
-                                tType === '1' &&
-                                  worksStudent[toolIndex].length > 0
+                                tType === '1'
                               "
                               @click="
                                 openChoseWorksDetailDialog(
@@ -1118,7 +1122,7 @@
                               "
                               style="position: absolute;right: 33px;top: -30px;"
                             >
-                              作业详细
+                            投影
                             </div>
                           </div>
                           <!-- <div v-if="tooC == 5">
@@ -1144,9 +1148,9 @@
                               alt
                             />
                             <div style="margin: 5px 0">问答</div>
-														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,15)"
+														<div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,15)"
                               style="position: absolute;right: 135px;top: -45px;height: 40px;display: flex;align-items: center;justify-content: center;background: #409EFF;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 26">
@@ -1282,9 +1286,9 @@
                               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)"
+														<div class="upload_toolBtn" v-if="tType==='1' " @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,40)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 41">
@@ -1294,9 +1298,9 @@
                               alt
                             />
                             <div style="margin: 5px 0">选择匹配</div>
-														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,41)"
+														<div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,41)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 44">
@@ -1314,9 +1318,9 @@
                               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'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,47)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 48">
@@ -1326,9 +1330,9 @@
                               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)"
+														<div class="upload_toolBtn" v-if="tType==='1' " @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,48)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 52">
@@ -1338,9 +1342,9 @@
                               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)"
+														<div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,52)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 49">
@@ -1350,6 +1354,10 @@
                               alt
                             />
                             <div style="margin: 5px 0">学生分组</div>
+                            <div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,49)"
+                              style="position: absolute;right: 33px;top: -30px;">
+                              投影
+                            </div>
                           </div>
                           <div v-if="tooC == 57">
                             <img

+ 28 - 18
src/components/easy3/studyStudent.vue

@@ -1,10 +1,11 @@
 <template>
-  <div class="pb_content" style="overflow: unset">
+  <div class="pb_content" style="height: 100%;overflow: unset;">
     <div
       class="pb_content_body"
       style="
         display: flex;
-        height: 900px;
+        /* height: 900px; */
+        height: 100%;
         position: relative;
         padding: 20px 0 20px 20px;
         box-sizing: border-box;
@@ -972,6 +973,10 @@
                               @click="addTools(tooC, toolIndex, taskCount)"
                             />
                             <div style="margin: 5px 0">电子白板</div>
+                            <div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,1)"
+                            style="position: absolute;right: 33px;top: -30px;">
+                              投影
+                            </div>
                           </div>
                           <div v-if="tooC == 3">
                             <img
@@ -996,9 +1001,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)"
+                            <!-- && worksStudent[toolIndex].length>0 -->
+														<div class="upload_toolBtn" v-if="tType==='1' " @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,7)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 8">
@@ -1045,9 +1051,9 @@
                             />
                             <div style="margin: 5px 0">选择题</div>
 
-														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,45)"
+														<div class="upload_toolBtn" v-if="tType==='1' " @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,45)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <!-- <div v-if="tooC == 5">
@@ -1074,9 +1080,9 @@
                             />
                             <div style="margin: 5px 0">问答</div>
 
-														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,15)"
+														<div class="upload_toolBtn" v-if="tType==='1' " @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,15)"
                               style="position: absolute;right: 135px;top: -45px;height: 40px;display: flex;align-items: center;justify-content: center;background: #409EFF;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 26">
@@ -1212,9 +1218,9 @@
                               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)"
+														<div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,40)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 41">
@@ -1224,9 +1230,9 @@
                               alt
                             />
                             <div style="margin: 5px 0">选择匹配</div>
-														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,41)"
+														<div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,41)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 44">
@@ -1244,9 +1250,9 @@
                               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'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,47)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 48">
@@ -1256,9 +1262,9 @@
                               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)"
+														<div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,48)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 52">
@@ -1268,9 +1274,9 @@
                               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)"
+														<div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,52)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 49">
@@ -1280,6 +1286,10 @@
                               alt
                             />
                             <div style="margin: 5px 0">学生分组</div>
+                            <div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,49)"
+                              style="position: absolute;right: 33px;top: -30px;">
+                              投影
+                            </div>
                           </div>
                           <div v-if="tooC == 57">
                             <img

+ 27 - 17
src/components/studyStudent.vue

@@ -1,10 +1,11 @@
 <template>
-  <div class="pb_content" style="overflow: unset">
+  <div class="pb_content" style="height: 100%;overflow: unset;">
     <div
       class="pb_content_body"
       style="
         display: flex;
-        height: 900px;
+        /* height: 900px; */
+        height: 100%;
         position: relative;
         padding: 20px 0 20px 20px;
         box-sizing: border-box;
@@ -941,6 +942,10 @@
                               @click="addTools(tooC, toolIndex, taskCount)"
                             />
                             <div style="margin: 5px 0">电子白板</div>
+                            <div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,1)"
+                            style="position: absolute;right: 33px;top: -30px;">
+                              投影
+                            </div>
                           </div>
                           <div v-if="tooC == 3">
                             <img
@@ -965,9 +970,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)"
+                            <!-- && worksStudent[toolIndex].length>0 -->
+														<div class="upload_toolBtn" v-if="tType==='1' " @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,7)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 8">
@@ -1017,7 +1023,7 @@
 
 														<div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,45)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <!-- <div v-if="tooC == 5">
@@ -1043,9 +1049,9 @@
                               alt
                             />
                             <div style="margin: 5px 0">问答</div>
-														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,15)"
+														<div class="upload_toolBtn" v-if="tType==='1' " @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,15)"
                               style="position: absolute;right: 135px;top: -45px;height: 40px;display: flex;align-items: center;justify-content: center;background: #409EFF;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 26">
@@ -1181,9 +1187,9 @@
                               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)"
+														<div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,40)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 41">
@@ -1193,9 +1199,9 @@
                               alt
                             />
                             <div style="margin: 5px 0">选择匹配</div>
-														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,41)"
+														<div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,41)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 44">
@@ -1213,9 +1219,9 @@
                               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' " @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,47)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 48">
@@ -1225,9 +1231,9 @@
                               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)"
+														<div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,48)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 52">
@@ -1237,9 +1243,9 @@
                               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)"
+														<div class="upload_toolBtn" v-if="tType==='1' " @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,52)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 49">
@@ -1249,6 +1255,10 @@
                               alt
                             />
                             <div style="margin: 5px 0">学生分组</div>
+                            <div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,49)"
+                              style="position: absolute;right: 33px;top: -30px;">
+                              投影
+                            </div>
                           </div>
                           <div v-if="tooC == 57">
                             <img

+ 28 - 19
src/components/studySutdentClass/studyStudent.vue

@@ -1,10 +1,10 @@
 <template>
-  <div class="pb_content" style="overflow: unset">
+  <div class="pb_content" style="height: 100%;overflow: unset;">
     <div
       class="pb_content_body"
       style="
         display: flex;
-        height: 900px;
+        height: 100%;
         position: relative;
         padding: 20px 0 20px 20px;
         box-sizing: border-box;
@@ -972,6 +972,10 @@
                               @click="addTools(tooC, toolIndex, taskCount)"
                             />
                             <div style="margin: 5px 0">电子白板</div>
+                            <div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,1)"
+                              style="position: absolute;right: 33px;top: -30px;">
+                              投影
+                            </div>
                           </div>
                           <div v-if="tooC == 3">
                             <img
@@ -996,9 +1000,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)"
+                            <!-- && worksStudent[toolIndex].length>0 -->
+                            <div class="upload_toolBtn" v-if="tType==='1' " @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,7)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 8">
@@ -1055,11 +1060,11 @@
                               alt
                             />
                             <div style="margin: 5px 0">选择题</div>
+                            <!-- &&worksStudent[toolIndex].length > 0 -->
                             <div
                               class="upload_toolBtn"
                               v-if="
-                                tType === '1' &&
-                                  worksStudent[toolIndex].length > 0
+                                tType === '1' 
                               "
                               @click="
                                 openChoseWorksDetailDialog(
@@ -1070,7 +1075,7 @@
                               "
                               style="position: absolute;right: 33px;top: -30px;"
                             >
-                              作业详细
+                            投影
                             </div>
                           </div>
                           <!-- <div v-if="tooC == 5">
@@ -1096,9 +1101,9 @@
                               alt
                             />
                             <div style="margin: 5px 0">问答</div>
-														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,15)"
+														<div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,15)"
                               style="position: absolute;right: 135px;top: -45px;height: 40px;display: flex;align-items: center;justify-content: center;background: #409EFF;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 26">
@@ -1234,9 +1239,9 @@
                               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)"
+                            <div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,40)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 41">
@@ -1246,9 +1251,9 @@
                               alt
                             />
                             <div style="margin: 5px 0">选择匹配</div>
-														<div class="upload_toolBtn" v-if="tType==='1' && worksStudent[toolIndex].length>0" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,41)"
+														<div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,41)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 44">
@@ -1266,9 +1271,9 @@
                               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'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,47)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 48">
@@ -1278,9 +1283,9 @@
                               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)"
+                            <div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,48)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 52">
@@ -1290,9 +1295,9 @@
                               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)"
+                            <div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,52)"
                               style="position: absolute;right: 33px;top: -30px;">
-                              作业详细
+                              投影
                             </div>
                           </div>
                           <div v-if="tooC == 49">
@@ -1302,6 +1307,10 @@
                               alt
                             />
                             <div style="margin: 5px 0">学生分组</div>
+                            <div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,49)"
+                              style="position: absolute;right: 33px;top: -30px;">
+                              投影
+                            </div>
                           </div>
                           <div v-if="tooC == 57">
                             <img