feat: 代码提交

刘有才luck
1 parent c412d95d
Showing 5 changed files with 95 additions and 47 deletions
src/assets/images/aside/wrong-question-default.png
src/assets/images/aside/wrong-question.png
src/router/index.js
src/views/basic/askTestQuestion/components/wrongQuestionDialog.vue
src/views/basic/askTestQuestion/wrongQuestion.vue
@@ -346,8 +346,8 @@ let addrouters = [
       },
       {
         path: "/wrongQuestion",
-        iconImage: require("@/assets/images/aside/suitangwen-baobiao-default.png"),
-        selectedIconImage: require("@/assets/images/aside/suitangwen-baobiao-selected.png"),
+        iconImage: require("@/assets/images/aside/wrong-question-default.png"),
+        selectedIconImage: require("@/assets/images/aside/wrong-question.png"),
         name: "错题组卷",
         demoRoles: ["ROLE_JIAOSHI"],
         component: wrongQuestion,
@@ -59,7 +59,7 @@
             <div
               class="test-group-title"
               :class="{
-                border: selectedIndex == group.questionType,
+                borderTitle: selectedIndex == group.questionType,
               }"
               @mouseenter="handleGroupMouseEnter(group.questionType, 'all')"
             >
@@ -95,7 +95,7 @@
                     left: tooltipPosition.x + 'px',
                   }"
                 >
-                  单击设置试卷标题
+                  单击修改大题名称
                 </div>
                 <span
@@ -177,10 +177,10 @@
           </div>
         </div>
         <div class="edit-info">
-          <div class="title size color" style="padding: 15px 0 0 10px">
+          <div class="title size color" style="padding: 10px 0 5px 10px">
             题目排序
-            <span class="title size" style="color: #999999"
-              >(拖拽题号可拖拽排序)</span
+            <span class="title size font-weight" style="color: #999999"
+              >(拖拽题号可排序)</span
             >
           </div>
           <!-- 外层容器，允许拖拽整个组 -->
@@ -806,7 +806,7 @@ export default {
     height: fit-content;
     max-height: 742px;
     overflow-y: auto;
-    box-shadow: 0 0 10px 0 #999999;
+    box-shadow: 0 0 10px 0 #cfcfcf;
     margin-right: 20px;
     box-sizing: border-box;
     padding: 0 20px;
@@ -833,8 +833,8 @@ export default {
       .test-group-title {
         position: relative;
         height: 40px;
-        line-height: 30px;
-        padding: 10px 0 0 0;
+        line-height: 40px;
+        padding: 0;
       }
     }
   }
@@ -847,7 +847,8 @@ export default {
     .edit-title {
       width: 100%;
       height: 200px;
-      border: 1px solid #999999;
+      border: 1px solid #cfcfcf;
+      border-radius: 5px;
       .edit-title-info {
         height: 60px;
@@ -879,11 +880,12 @@ export default {
     .edit-info {
       flex: 1;
-      border: 1px solid #999999;
+      border: 1px solid #cfcfcf;
       margin-top: 20px;
       max-height: 500px;
       padding: 10px;
       overflow: auto;
+      border-radius: 5px;
       .group-item {
         margin: 10px;
@@ -903,14 +905,14 @@ export default {
       .questions {
         display: flex;
         flex-wrap: wrap;
-
+        padding: 10px 0;
         .question-item {
           width: 35px;
           height: 35px;
           border: 1px solid rgb(172, 188, 249);
           border-radius: 4px;
           cursor: grab;
-          margin: 5px 8px;
+          margin: 0 10px 10px 10px;
           line-height: 35px;
           text-align: center;
           font-size: 16px !important;
@@ -947,6 +949,7 @@ export default {
 .border {
   border: 1px solid rgb(173, 190, 250);
   position: relative;
+  border-radius: 3px;
   .border-del {
     position: absolute;
@@ -959,7 +962,7 @@ export default {
     color: rgb(67, 141, 255);
     font-size: 14px !important;
     line-height: 28px;
-    font-weight: 600;
+
     cursor: pointer;
   }
 }
@@ -984,9 +987,16 @@ export default {
   background: rgb(233, 237, 253);
   width: fit-content;
 }
+.borderTitle {
+  background: rgba(102, 127, 253, 0.1);
+  padding: 0;
+}
 .title-bg {
   background: rgb(115, 142, 246);
   border-bottom: 1px solid rgb(115, 142, 246);
 }
+.font-weight {
+  font-weight: 400;
+}
 </style>
@@ -71,7 +71,7 @@
           </el-col>
           <el-col class="col-margin" :span="8">
             <span style="font-weight: 600">得分率：</span>
-            <div>
+            <div style="font-size: 16px !important">
               <el-input
                 v-model="formData.startScoreRate"
                 type="number"
@@ -94,7 +94,7 @@
               %
             </div>
           </el-col>
-          <el-col class="col-margin" :span="7"
+          <el-col class="col-margin" :span="6"
             ><span
               style="font-weight: 600; width: fit-content; white-space: nowrap"
               >题型：</span
@@ -109,7 +109,7 @@
               {{ item.label }}
             </div></el-col
           >
-          <el-col class="col-margin" :span="2"
+          <el-col class="col-margin" style="margin-left: 10px" :span="2"
             ><el-button
               @click="handleSearch"
               style="background: #6b73f5"
@@ -130,13 +130,21 @@
             >道题)</span
           >
         </div>
+        <div
+          style="text-align: center; line-height: 400px"
+          v-if="topicList.length < 1"
+        >
+          筛选条件下，暂无题目
+        </div>
         <div class="topic" v-for="(item, index) in topicList" :key="index">
           <div class="topic-title">
             <div style="display: flex">
               <div style="display: flex; align-items: center">
-                <span class="size"> 第 {{ item.questionIndex }} 题 </span>
+                <span class="size font-weight">
+                  第 {{ item.questionIndex }} 题
+                </span>
                 <div
-                  class="select-box Selected size"
+                  class="select-box Selected size font-weight"
                   style="padding: 3px 5px; margin-right: 20px"
                 >
                   {{
@@ -149,15 +157,17 @@
               <div>
                 <span class="color size"> 得分率： </span>
                 <span class="score-color size">{{ item.scoreRate }}%</span>
-                <span class="size">({{ item.joinClassNames }})</span>
+                <span class="size font-weight"
+                  >({{ item.joinClassNames }})</span
+                >
               </div>
             </div>
             <div>
-              <span class="color size">来自试卷：</span
-              ><span class="size">{{ item.paperName }}</span>
-              <span class="color size" style="margin-left: 20px"
+              <span class="color size font-weight">来自试卷：</span
+              ><span class="size font-weight">{{ item.paperName }}</span>
+              <span class="color size font-weight" style="margin-left: 20px"
                 >测试时间：</span
-              ><span class="size">{{ item.testTime }}</span>
+              ><span class="size font-weight">{{ item.testTime }}</span>
             </div>
           </div>
@@ -165,22 +175,26 @@
             class="topic-info"
             :src="item.screenshot"
             :ref="'iframe' + index"
-            style="width: 100%"
+            style="width: 100%; border: none"
             @load="onIFrameLoad(index)"
           />
           <!-- <div class="topic-info" v-html="item.modifiedHtml"></div> -->
           <div class="topic-bottom">
-            <div>
+            <div style="padding-left: 20px">
               <span
                 v-if="item.answerScreenshot"
-                class="knowledge size"
+                class="knowledge size font-weight"
                 @click="handleAnalysis(item.answerScreenshot)"
                 ><i class="el-icon-key"></i>查看解析</span
               >
-              <span class="color size">知识点：</span>
-              <span class="size">{{ item.knowledge }}</span>
+              <span class="color size font-weight">知识点：</span>
+              <span v-if="item.knowledge" class="size">{{
+                item.knowledge
+              }}</span>
+              <span v-else class="size color font-weight">未标注</span>
             </div>
             <el-button
+              style="margin-right: 20px"
               v-if="!questions.some((obj) => item.id === obj.id)"
               class="button"
               type="primary"
@@ -190,7 +204,7 @@
             <el-button
               v-else
               plain
-              style="padding: 5px 10px"
+              style="padding: 5px 10px; margin-right: 20px"
               @click="handleDel(item)"
               >移除试卷</el-button
             >
@@ -219,6 +233,7 @@
             questions.map((item) => item.id)
           )
         "
+        style="margin-right: 20px"
         @click="handleAllTest()"
         >全选本页</el-button
       >
@@ -227,7 +242,7 @@
         class="button-size"
         v-else
         plain
-        style="padding: 5px 10px"
+        style="padding: 5px 10px; margin-right: 20px"
         >移除本页</el-button
       >
     </div>
@@ -290,8 +305,8 @@ export default {
       classList: [],
       // 时间选择
       dateList: [
-        { type: "onDay", name: "今天" },
         { type: "onWeek", name: "本周" },
+        { type: "onMonth", name: "本月" },
         { type: "term", name: "本学期" },
       ],
       // 题型选择
@@ -308,7 +323,7 @@ export default {
       formData: {
         classId: 1, // 班级选中
         // type: "onDay", // 时间类型
-        type: "onDay", // 时间类型
+        type: "onWeek", // 时间类型
         dateRange: ["2022-03-01", "2023-05-01"], // 开始结束时间
         startScoreRate: 0, // 开始区间
         endScoreRate: 60, // 结束区间
@@ -625,11 +640,23 @@ export default {
     // 获取ref
     onIFrameLoad(index) {
       const iframeRef = this.$refs["iframe" + index][0]; // 获取对应的 iframe
+      // const doc = iframeRef.contentDocument || iframeRef.contentWindow.document;
+      // const body = iframeRef.contentWindow.document.body;
+      // body.style.overflowX = "hidden"; // 不允许出现横向滚动条
+      // const height = body.scrollHeight; // 获取内容的高度
+      // iframeRef.style.height = `${height}px`; // 设置 iframe 的高度
+      // // 获取第一个P标签
+      // const firstP = doc.getElementsByTagName("p")[0];
+      // // 或者修改第一个 < p > 标签的内容;
+      // if (firstP) {
+      //   let a = this.processString(firstP.innerHTML);
+      //   firstP.innerHTML = a;
+      // }
       const doc = iframeRef.contentDocument || iframeRef.contentWindow.document;
       const body = iframeRef.contentWindow.document.body;
       body.style.overflowX = "hidden"; // 不允许出现横向滚动条
       const height = body.scrollHeight; // 获取内容的高度
-      iframeRef.style.height = `${height}px`; // 设置 iframe 的高度
+      iframeRef.style.height = `${height + 20}px`; // 设置 iframe 的高度
       // 获取第一个P标签
       const firstP = doc.getElementsByTagName("p")[0];
       // 或者修改第一个 < p > 标签的内容;
@@ -699,7 +726,7 @@ export default {
         margin-top: 15px;
         display: flex;
         flex-direction: column;
-        box-shadow: 0px 0px 9px 0px #999999;
+        box-shadow: 0px 0px 9px 0px #cfcfcf;
         border-radius: 5px;
         .topic-title {
           height: 45px;
@@ -720,10 +747,9 @@ export default {
           display: flex;
           align-items: center;
           justify-content: space-between;
-          margin: 0 20px;
           font-weight: 600;
           box-sizing: border-box;
-          border-top: 1px solid #d2cdcd;
+          border-top: 1px solid #e0dbdb;
           .knowledge {
             color: rgb(105, 134, 205);
             margin-right: 30px;
@@ -737,15 +763,14 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    border-top: 1px solid #666666;
+    border-top: 1px solid #cfcfcf;
     background: #ffffff;
-    box-shadow: 0 0 3px 0 #666666;
     padding: 5px 20px 0 20px;
   }
   .shopping {
-    width: 40px;
-    height: 120px;
+    width: 50px;
+    height: 135px;
     position: fixed;
     top: 30%;
     right: 0;
@@ -763,13 +788,13 @@ export default {
     text-align: center;
     cursor: pointer;
     .shopping-select {
-      width: 20px;
-      height: 20px;
+      width: 25px;
+      height: 25px;
       border-radius: 50%;
-      background: yellow;
-      color: red;
-      line-height: 20px;
+      background: #eb5151;
+      color: #ffffff;
       font-size: 12px !important;
+      line-height: 25px;
     }
     .size {
       font-size: 14px !important;
@@ -785,6 +810,7 @@ export default {
   margin: 10px 0;
   display: flex;
   align-items: center;
+  font-size: 16px !important;
 }
 .button {
   background: #6b73f5;
@@ -794,6 +820,7 @@ export default {
   padding: 5px 10px;
   border-radius: 5px;
   margin: 0 8px;
+  font-size: 16px !important;
   cursor: pointer;
   white-space: nowrap;
   width: fit-content;
@@ -814,4 +841,15 @@ export default {
 .size {
   font-size: 14px !important;
 }
+.font-weight {
+  font-weight: 400;
+}
+.filter-datePicker {
+  font-size: 16px !important;
+}
+::v-deep .el-button {
+  span {
+    font-size: 16px !important;
+  }
+}
 </style>