111

src/modules/marking/views/Marking.vue

@@ -39,8 +39,8 @@
               @click="taskChange"
               size="small"
             >
-              <span class="titlefont"
-                >切换任务 <i class="el-icon-caret-bottom el-icon--right"></i>
+              <span class="titlefont">
+                切换任务 <i class="el-icon-caret-bottom el-icon--right"></i>
               </span>
             </el-button>
           </small>
@@ -133,9 +133,9 @@
                 <el-table-column label="评阅时间">
                   <template slot-scope="scope">
                     <div>
-                      <span style="margin-left: 10px">{{
-                        dateFormatter(scope.row)
-                      }}</span>
+                      <span style="margin-left: 10px">
+                        {{ dateFormatter(scope.row) }}
+                      </span>
                     </div>
                   </template>
                 </el-table-column>
@@ -145,18 +145,18 @@
                 <el-table-column label="问题卷">
                   <template slot-scope="scope">
                     <div>
-                      <span style="margin-left: 10px">{{
-                        getTagName(scope.row.tag)
-                      }}</span>
+                      <span style="margin-left: 10px">
+                        {{ getTagName(scope.row.tag) }}
+                      </span>
                     </div>
                   </template>
                 </el-table-column>
                 <el-table-column label="评卷备注">
                   <template slot-scope="scope">
                     <div>
-                      <span style="margin-left: 10px">{{
-                        scope.row.markRemark
-                      }}</span>
+                      <span style="margin-left: 10px">
+                        {{ scope.row.markRemark }}
+                      </span>
                     </div>
                   </template>
                 </el-table-column>
@@ -673,7 +673,6 @@ small {
   margin-top: 20px;
 }
 .content-header {
-  margin-top: 10px;
   margin-left: 15px;
   overflow: hidden;
   background-color: rgb(77, 124, 196);
@@ -730,7 +729,7 @@ li {
 .box {
   position: relative;
   border-radius: 3px;
-  margin-bottom: 20px;
+  margin-bottom: 0px;
   width: 100%;
 }
 .pull-right {

src/modules/marking/views/TpMain.vue

@@ -382,7 +382,7 @@ export default {
 .markmain {
   width: 74%;
   overflow: auto;
-  height: 600px;
+  max-height: calc(100vh - 65px);
 }
 .markmain::-webkit-scrollbar {
   /*滚动条整体样式*/
@@ -452,4 +452,7 @@ img {
   font-weight: bold;
   color: black;
 }
+.paper >>> .max-number {
+  font-size: 20px;
+}
 </style>

src/modules/marking/views/TpScoreBoard.vue

@@ -119,12 +119,24 @@
 
       <div>
         <div class="step-board"></div>
-        <div class="title-board"><span class="title-font">备注</span></div>
-        <div class="remark-step">
+        <div class="title-board">
+          <span class="title-font">备注</span>
+          <div
+            v-if="!textareaflag"
+            class="el-icon-caret-right remark-board"
+            @click="showTextarea"
+          ></div>
+          <div
+            v-if="textareaflag"
+            class="el-icon-caret-top remark-board"
+            @click="showTextarea"
+          ></div>
+        </div>
+        <div class="remark-step" v-if="textareaflag">
           <textarea
             id="remark"
             type="text"
-            rows="5"
+            rows="3"
             cols="42"
             placeholder="请输入内容"
             v-model="markedResult.markRemark"
@@ -156,9 +168,9 @@
                 v-for="tag in tags"
                 :key="tag.code"
               >
-                <el-radio :label="tag.code" :key="tag.code">{{
-                  tag.name
-                }}</el-radio>
+                <el-radio :label="tag.code" :key="tag.code">
+                  {{ tag.name }}
+                </el-radio>
               </div>
             </el-radio-group>
           </span>
@@ -228,6 +240,7 @@ export default {
       steps: [],
       loading: false,
       btnflag: false,
+      textareaflag: false,
       tmpSignItem: this.signItem,
       tags: [],
       unusualType: "",
@@ -670,6 +683,13 @@ export default {
         }, 1);
         this.positionDiv(order);
       }
+    },
+    showTextarea() {
+      if (this.textareaflag) {
+        this.textareaflag = false;
+      } else {
+        this.textareaflag = true;
+      }
     }
   },
   watch: {
@@ -898,10 +918,10 @@ li {
   border-bottom: 1px solid #ccc;
 }
 .board-title {
-  height: 40px;
+  height: 50px;
   width: 80px;
-  background: red;
-  border: 2px solid red;
+  background: rgb(255, 109, 109);
+  border: 2px solid rgb(255, 109, 109);
   text-align: center;
   padding-top: 20px;
   font-weight: 600;
@@ -909,21 +929,21 @@ li {
   border-bottom-left-radius: 15px;
   float: left;
   font-size: 30px;
-  line-height: 1;
+  line-height: 0.5;
 }
 .board-score {
-  height: 40px;
+  height: 50px;
   width: 110px;
-  border: 2px solid red;
+  border: 2px solid rgb(255, 109, 109);
   margin-left: 80px;
   text-align: center;
   padding-top: 20px;
   font-weight: 600;
-  color: red;
+  color: rgb(255, 109, 109);
   border-top-right-radius: 15px;
   border-bottom-right-radius: 15px;
   font-size: 30px;
-  line-height: 1;
+  line-height: 0.5;
 }
 .title-board {
   margin-top: 20px;
@@ -963,8 +983,9 @@ li {
   line-height: 2.5;
 }
 textarea {
-  background: #ccc;
+  background: rgb(245, 245, 245);
   border-radius: 10px;
+  outline: none;
 }
 .step-board {
   margin-top: 20px;
@@ -973,6 +994,7 @@ textarea {
 .problem-button {
   border-bottom: 1px solid #ccc;
   margin-bottom: 15px;
+  margin-top: 20px;
 }
 .remark-step {
   height: 100px;
@@ -1022,7 +1044,7 @@ textarea {
   line-height: 1.5;
 }
 .btn {
-  margin-right: 10px;
+  margin-top: 20px;
   margin-bottom: 10px;
 }
 .score-btn {
@@ -1030,4 +1052,10 @@ textarea {
   color: white;
   border-color: rgb(85, 191, 255);
 }
+.remark-board {
+  cursor: pointer;
+}
+.el-button {
+  outline: none;
+}
 </style>