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

src/components/pages/test/check/index.vue

@@ -120,9 +120,9 @@
           </div>
           <div class="search_nav" style="display:flex;justify-content:space-evenly;border: none;" v-if="!isDesktop">
             <div class="right">
-              <span :class="{ active: stype == 1 }" @click="checkDataType(1)">按题目查看</span>
-              <span :class="{ active: stype == 2 }" @click="checkDataType(2)">按人员查看</span>
-              <span :class="{ active: stype == 3 }" @click="checkDataType(3)" v-show="false">按数量查看</span>
+              <span :class="{ active2: stype == 1 }" @click="checkDataType(1)">按题目查看</span>
+              <span :class="{ active2: stype == 2 }" @click="checkDataType(2)">按人员查看</span>
+              <span :class="{ active2: stype == 3 }" @click="checkDataType(3)" v-show="false">按数量查看</span>
             </div>
           </div>
 
@@ -296,8 +296,12 @@
                     :class="{ test_icon_check: item.type == 1 && item.atype == 2, test_icon_checkO: item.type == 1 && item.atype == 1, test_icon_gap: item.type == 3, test_icon_file: item.type == 5, test_course_file: item.type == 6, test_eva_file: item.type == 7,test_icon_time: item.type == 8 }"></span>
                 </el-tooltip> -->
                 <div style="display: flex;">
-                  <div style="margin-right: 5px;color: rgba(0, 0, 0, 0.9);">第{{ index+1 }}题:</div>
-                  <div style="width: 100px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{ item.title }}</div>
+                  <div class="topicTitCss">第{{ index+1 }}题:</div>
+                  <el-tooltip :content="item.title" placement="top" effect="dark">
+                    <div style="width: 100px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{ item.title }}</div>
+                  </el-tooltip>
+
+                  
                 </div>
                 <div style="display: flex;">
                   <!-- <div v-if="item.type==7" style="right:0;position: absolute;">平均分：{{ getAverageScore(index) }}</div> -->
@@ -436,8 +440,8 @@
                 </div>
 
               </div>
-              <div class="content2" v-if="item.type == 8">
-                <div class="left">
+              <div class="content2"  style="width:100%;display: block;" v-if="item.type == 8">
+                <div class="left" style="width:100%" v-if="!item.cut">
                   <div class="title">
                     <span>序号</span>
                     <span>词频</span>
@@ -452,11 +456,14 @@
                     </el-tooltip>
                   </div>
                 </div>
-                <div class="right">
+                <div class="right isDesktopRight" v-if="item.cut">
                   <wordcloud :data="item.array" nameKey="name" valueKey="count" :showTooltip="false"
                     :wordClick="wordClickHandler">
                   </wordcloud>
                 </div>
+                <div class="cutBtnBlockCss">
+                  <div class="cutBtnCss" @click="item.cut=!item.cut">{{ item.cut?'查看详情':'查看视图' }}</div>
+                </div>
               </div>
             </div>
           </div>
@@ -528,7 +535,7 @@
           <div class="table_content" v-if="stype == 2 && !isDesktop">
 
             <div v-for="(i,index) in worksArray"  :key="i.id" class="isDesktopTable_content">
-              <div class="isDTitle" :class="i.cut?'':'CutCss'">
+              <div class="isDTitle CutCss">
                 <div style="font-size: 16px;font-weight: 600;">{{ i.name }}</div>
                 <div :style="'font-size: 14px',i.cut?'color:rgba(54, 129, 252, 1)':'color: rgba(0, 0, 0, 0.6);'">{{ i.time }}</div>
                 <div @click="i.cut=!i.cut">
@@ -568,7 +575,7 @@
                       <div class="isDTitle2">
                         <div style="display: flex;justify-content: space-between;">
                           <div style="display: flex;">
-                            <span>第{{kin+1}}题:</span>
+                            <span class="topicTitCss">第{{kin+1}}题:</span>
                             <div class="isDTitle2JsonTit">
                               {{ k.json.title }}
                             </div>
@@ -584,7 +591,7 @@
                       <div class="isDTitle2">
                         <div style="display: flex;justify-content: space-between;">
                           <div style="display: flex;">
-                            <span>第{{kin+1}}题:</span>
+                            <span class="topicTitCss">第{{kin+1}}题:</span>
                             <div class="isDTitle2JsonTit">
                               {{ k.json.title }}
                             </div>
@@ -614,7 +621,7 @@
                       <div class="isDTitle2">
                         <div style="display: flex;justify-content: space-between;">
                           <div style="display: flex;">
-                            <span>第{{kin+1}}题:</span>
+                            <span class="topicTitCss">第{{kin+1}}题:</span>
                             <div class="isDTitle2JsonTit">
                               {{ k.json.title }}
                             </div>
@@ -630,7 +637,7 @@
                       <div class="isDTitle2">
                         <div style="display: flex;justify-content: space-between;">
                           <div style="display: flex;">
-                            <span>第{{kin+1}}题:</span>
+                            <span class="topicTitCss">第{{kin+1}}题:</span>
                             <div class="isDTitle2JsonTit">
                               {{ k.json.title }}
                             </div>
@@ -2071,6 +2078,8 @@ export default {
 }
 .topicTitCss{
   color:  rgba(0, 0, 0, 0.9);
+  font-weight: 600;
+  margin-right: 5px;
 }
 .IsDFile{
   width: 150px;
@@ -2080,6 +2089,7 @@ export default {
   display: flex;
   flex-direction: column;
   overflow: hidden;
+  margin-bottom: 5px;
 }
 .IsDownload{
   position: absolute;
@@ -2298,6 +2308,21 @@ export default {
   margin-left: auto;
 }
 
+.search_nav>.right>span.active2 {
+  color: #3681FC;
+  font-weight: 600;
+}
+.search_nav>.right>span.active2::before {
+  content: "";
+  position: absolute;
+  bottom: -10px;
+  width: 100%;
+  height: 3px;
+  background: #3681fc;
+  left: 50%;
+  transform: translateX(-50%);
+}
+
 
 .student_input>>>.el-input__inner {
   height: 40px;

src/components/pages/testStudent/view/component/file.vue

@@ -32,19 +32,19 @@
             <div class="choices">
                 <div class="uploadBtn" v-if="checktype == 1">
                     <div class="btn" @click.stop="addImg($event)">
-                        <span>添加本地文件</span>
+                        <span :style="isN==1? 'font-size: 12px;' : ''">添加本地文件</span>
                         <input type="file" accept="*" style="display: none" multiple="multiple"
                             @change="beforeUpload($event)" />
                     </div>
                     <div class="btn" @click="openFileBox()">
-                        <span>从资源库添加</span>
+                        <span :style="isN==1? 'font-size: 12px;' : ''">从资源库添加</span>
                     </div>
                     <div class="switch">
                         <el-switch
                             active-color="#3681fc"
                             v-model="isTong">
                         </el-switch>
-                        <span @click="isTong = !isTong">同步至资源库</span>
+                        <span :style="isN==1? 'font-size: 12px;' : ''" @click="isTong = !isTong">同步至资源库</span>
                     </div>
                 </div>
                 <div class="binfo_input">
@@ -197,6 +197,8 @@ export default {
                 1: { name: '附件' },
             },
             userid: this.$route.query.userid,
+            isN: this.$route.query.isN,
+
             checkJson: undefined,
             progress: 0,
             isFinishSize: 0,