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

src/assets/css/button.css

@@ -297,6 +297,7 @@
 .pub_test_btn_group::before,
 .pub_test_btn_course::before,
 .pub_test_btn_eva::before,
+.pub_test_btn_time::before,
 .pub_test_btn_file::before {
   content: "";
   width: 18px;
@@ -330,6 +331,9 @@
 .pub_test_btn_eva::before {
   background-image: url(../icon/test/type_eva_icon.png);
 }
+.pub_test_btn_time::before {
+  background-image: url(../icon/test/type_time_icon.png);
+}
 
 .test_icon{
   display: inline-block;
@@ -360,7 +364,9 @@
 .test_eva_file{
   background-image: url('../icon/test/type_eva_icon.png');
 }
-
+.test_icon_time{
+  background-image: url('../icon/test/type_time_icon.png');
+}
 
 .dataBoard_check_box {
   display: flex;

src/components/pages/pblCourse/guide.vue

@@ -581,7 +581,7 @@ export default {
   width: 928px;
   height: 216px;
   margin: auto;
-  margin-top: 120px;
+  margin-top: 80px;
 }
 .guideList > .guideListTop {
   width: 100%;

src/components/pages/test/add/edit/edit/index.vue

@@ -23,9 +23,10 @@
                   pub_test_btn_file: item.value == 5,
                   pub_test_btn_course: item.value == 6,
                   pub_test_btn_eva: item.value == 7,
+                  pub_test_btn_time: item.value == 8,
                 }"
               >
-                {{ item.label }}
+                {{ item.label }} 
               </button>
             </div>
           </div>

src/components/pages/test/add/minxins/minxin.js

@@ -30,10 +30,10 @@ const minxin = {
           value: 7,
           label: "评分"
         },
-        // {
-        //   value: 8,
-        //   label: "时间"
-        // },
+        {
+          value: 8,
+          label: "日期"
+        },
       ],
       optionsPin:[
        {
@@ -49,7 +49,7 @@ const minxin = {
         5: "附件",
         6: "课程",
         7: "评分",
-        8: "时间",
+        8: "日期",
       },
       buttonOptions: [
         { name: "分组", type: 1 },

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

@@ -92,7 +92,7 @@
               <div class="title">
                 <el-tooltip :content="selectType(item)" placement="top" effect="dark">
                   <span class="test_icon"
-                    :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 }"></span>
+                    :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>
                 <span>{{ item.title }}</span>
 								<el-button v-if="item.type == 5 && item.array.length>0" class="title_downBtn" type="primary" size="small" @click.stop="downloadFileType5(item.array,item.title)">批量下载附件</el-button>
@@ -216,6 +216,28 @@
                   <checkPie :dataJ="item.array"></checkPie>
                 </div>
               </div>
+              <div class="content2" v-if="item.type == 8">
+                <div class="left">
+                  <div class="title">
+                    <span>序号</span>
+                    <span>词频</span>
+                    <span>日期</span>
+                  </div>
+                  <div class="data" v-for="(data, index2) in item.array" :key="index + '-' + index2">
+                    <span>{{ index2 + 1 }}</span>
+                    <span>{{ data.count }}次</span>
+                    <el-tooltip :content="data.name" placement="top" effect="dark">
+                      <!-- content to trigger tooltip here -->
+                      <span>{{ data.name }}</span>
+                    </el-tooltip>
+                  </div>
+                </div>
+                <div class="right">
+                  <wordcloud :data="item.array" nameKey="name" valueKey="count" :showTooltip="false"
+                    :wordClick="wordClickHandler">
+                  </wordcloud>
+                </div>
+              </div>
             </div>
           </div>
           <div class="table_content" v-if="stype == 2">
@@ -244,7 +266,7 @@
                     <span class="answer_type" v-for="(answer2, index2) in scope.row.array[index].json.answer2"
                       :key="index + '-' + index2">{{ scope.row.array[index].json.array[answer2].option }}</span>
                   </div>
-                  <div v-if="scope.row.array[index].type == 3" style="display: flex; flex-wrap: wrap;">
+                  <div v-if="scope.row.array[index].type == 3 || scope.row.array[index].type == 8" style="display: flex; flex-wrap: wrap;">
                     {{ scope.row.array[index].json.answer2 }}
                   </div>
                   <div v-if="scope.row.array[index].type == 5" style="display: flex; flex-wrap: wrap;"
@@ -481,6 +503,8 @@ export default {
           return '课程'
         } else if (item.type == 7) {
           return '评分'
+        } else if (item.type == 8) {
+          return '日期'
         }
       };
     }
@@ -700,7 +724,7 @@ export default {
                   topic.array[_answer[k]].count++
                   topic.count++
                 }
-              } else if (topic.type == 3) {
+              } else if (topic.type == 3 || topic.type == 8) {
                 let type3 = 1
                 let _answer = el2.array[i].json.answer2
                 if (_answer) {
@@ -1056,6 +1080,9 @@ export default {
             let _score = this.getScore2(item.json)
             let _option = `<div style='margin:10px 0 0 40px;'>打分：${_score}分</div>`
             _test += _option
+        } else if (item.type == 8 && item.json.answer2) {
+          let _option = `<div style='margin:10px 0 0 40px;'>${item.json.answer2}</div>`
+          _test += _option
         }
       }
       _test += `</div>`
@@ -1099,7 +1126,10 @@ export default {
             let _score = this.getScore2(item.json)
             let _option = `<div style='margin:10px 0 0 40px;'>打分：${_score}分</div>`
             _test += _option
-        }
+        } else if (item.type == 8 && item.json.answer2) {
+          let _option = `<div style='margin:10px 0 0 40px;'>${item.json.answer2}</div>`
+          _test += _option
+        } 
       }
       _test += `</div>`
       let _html = _title + _content + _detail + _test;
@@ -1175,6 +1205,9 @@ export default {
             let _score = this.getScore2(item.json)
             let _option = `<div style='margin:10px 0 0 40px;'>打分：${_score}分</div>`
             _test += _option
+        } else if (item.type == 8 && item.json.answer2) {
+          let _option = `<div style='margin:10px 0 0 40px;'>${item.json.answer2}</div>`
+          _test += _option
         }
       }
       _test += `</div>`
@@ -1219,6 +1252,9 @@ export default {
             let _score = this.getScore2(item.json)
             let _option = `<div style='margin:10px 0 0 40px;'>打分：${_score}分</div>`
             _test += _option
+        } else if (item.type == 8 && item.json.answer2) {
+          let _option = `<div style='margin:10px 0 0 40px;'>${item.json.answer2}</div>`
+          _test += _option
         }
       }
       _test += `</div>`
@@ -1354,6 +1390,8 @@ export default {
           } else if (res[i].array[j].type == 7 && res[i].array[j].json.answer2) {
             let _score = this.getScore2(res[i].array[j].json)
             _json[j + 1 + "." + chapters[j].json.title] = _score
+          } else if (res[i].array[j].type == 8 && res[i].array[j].json.answer2) {
+            _json[j + 1 + "." + chapters[j].json.title] = res[i].array[j].json.answer2
           }
         }
         array.push(_json);

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

@@ -10,6 +10,7 @@
             </div>
             <div style="margin-top: 10px;">
                 <el-date-picker
+                    :readonly="checktype == 2"
                     v-model="checkJson.answer2"
                     type="date"
                     format="yyyy 年 MM 月 dd 日"
@@ -80,6 +81,7 @@ export default {
 .c_box {
     width: 100%;
     position: relative;
+    overflow: unset;
 }
 
 /* .mask {