Merge branch 'master' of http://60.205.254.193:3000/GCLS/GCLS_Page_TC

src/components/Header.vue

@@ -58,14 +58,14 @@
             <el-input
               v-model="corpus.sentenceStart"
               style="width: 55px; margin-right: 8px;"
-              type="number"
+              onkeyup="value=value.replace(/^0+(\d)|[^\d]+/g,'')"
               class="numbre-input"
             ></el-input>
             ——
             <el-input
               v-model="corpus.sentenceEnd"
               style="width: 55px; margin-left: 8px"
-              type="number"
+              onkeyup="value=value.replace(/^0+(\d)|[^\d]+/g,'')"
               class="numbre-input"
             ></el-input>
           </div>
@@ -109,14 +109,14 @@
             <el-input
               v-model="corpus.sentenceStart"
               style="width: 55px; margin-right: 8px;"
-              type="number"
+              onkeyup="value=value.replace(/^0+(\d)|[^\d]+/g,'')"
               class="numbre-input"
             ></el-input>
             ——
             <el-input
               v-model="corpus.sentenceEnd"
               style="width: 55px; margin-left: 8px"
-              type="number"
+              onkeyup="value=value.replace(/^0+(\d)|[^\d]+/g,'')"
               class="numbre-input"
             ></el-input>
           </div>
@@ -766,4 +766,7 @@ export default {
     background: #ff9900;
   }
 }
+.el-popper{
+    z-index: 100000 !important;
+}
 </style>

src/components/corpus/FreeWriteQP.vue

@@ -124,7 +124,7 @@ export default {
         context.beginPath();
         context.moveTo(lastLoc.x, lastLoc.y);
         context.lineTo(curLoc.x, curLoc.y);
-        context.strokeStyle = "#000";
+        context.strokeStyle = this.lineColor;
         context.lineCap = "round";
         context.lineJoin = "round";
         context.stroke();
@@ -133,7 +133,7 @@ export default {
         this.redrawCxt.beginPath();
         this.redrawCxt.moveTo(lastLoc.x, lastLoc.y);
         this.redrawCxt.lineTo(curLoc.x, curLoc.y);
-        this.redrawCxt.strokeStyle = "#000";
+        this.redrawCxt.strokeStyle = this.lineColor;
         this.redrawCxt.lineCap = "round";
         this.redrawCxt.lineJoin = "round";
         this.redrawCxt.stroke();

src/components/corpus/FreewriteLettle.vue

@@ -71,7 +71,8 @@ export default {
     "closeifFreeShow",
     "rowIndex",
     "colIndex",
-    "BoxbgType"
+    "BoxbgType",
+    "lineColor"
   ],
   data() {
     return {
@@ -215,7 +216,7 @@ export default {
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {
     let _this = this;
-    let color = _this.colorsList[_this.colorIndex];
+    let color = _this.lineColor?_this.lineColor:_this.colorsList[_this.colorIndex];
     _this.hanzicolor = color;
     _this.hanziweight = 6;
     if (this.currenHzData && this.currenHzData.strokes_image_url) {

src/components/corpus/StrockplayredlineCorpus.vue

@@ -29,13 +29,13 @@
       icon-class="tian"
       className="tian-bg"
       v-if="BoxbgType == 0"
-      :style="{ color: '#DE4444' }"
+      :style="{ color: 'rgba(222, 68, 68, 0.25)' }"
     />
     <svg-icon
       icon-class="mi"
       className="tian-bg"
       v-if="BoxbgType == 1"
-      :style="{ color: '#DEDEDE' }"
+      :style="{ color: 'rgba(222, 68, 68, 0.25)' }"
     />
     <!-- <svg-icon
       icon-class="tian"
@@ -121,7 +121,6 @@ export default {
         for (let i = 0; i < Number(this.judgeAnswer); i++) {
           charData.radStrokes.push(i);
         }
-        console.log(charData);
         return charData;
       }
     },
@@ -176,8 +175,9 @@ export default {
   height: 100%;
   z-index: 99999;
   position: absolute;
-  border: 2px solid #de4444;
+  border: 1px solid #de4444;
   border-radius: 8px;
+  box-sizing: border-box;
 }
 .character-target-div-gray {
   top: 0;

src/views/corpus/Result.vue

@@ -60,8 +60,9 @@
                   :isHighlight="true"
                   :judgeAnswer="indexs + 1"
                   :BoxbgType="0"
-                  strokeColorgray="#aaaaaa"
+                  strokeColorgray="#ccc"
                   strokeColor="#000000"
+                  v-if="JFIndex == 0 ? item.con+'-'+indexs : item.fanti+'-'+indexs"
                 />
                 <div class="number">{{ indexs + 1 }}</div>
               </div>
@@ -271,7 +272,7 @@
                 :current-page.sync="page"
                 layout="prev, pager, next"
                 :total="1000"
-                :pager-count="6"
+                :pager-count="5"
               >
               </el-pagination>
             </div>
@@ -925,6 +926,7 @@ export default {
     },
     changehzdata() {
       this.hzData = [];
+      this.jfEvent(0)
       let arr = this.$route.query.keyword.split("");
       arr.forEach((item) => {
         if (!/^[\u4e00-\u9fa5]/.test(item)) {
@@ -949,6 +951,7 @@ export default {
       this.sizeIndex = 1;
       this.sort = "down";
       this.KWIC_sortIndex = 0;
+      this.cutSize(1)
     },
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -1081,10 +1084,11 @@ export default {
           margin-top: 9px;
           width: 64px;
           height: 20px;
-          background: #e9e9e9;
+          background: #f0f0f0;
           border-radius: 22px;
           text-align: center;
           line-height: 20px;
+          color: rgba(0, 0, 0, 0.5);
         }
       }
     }
@@ -1515,4 +1519,7 @@ export default {
     }
   }
 }
+.el-loading-mask{
+    z-index: 200000 !important;
+}
 </style>

src/views/wordcard/cread.vue

@@ -80,7 +80,7 @@
                 <el-input
                   style="width: 60px; text-align: center"
                   v-model="from.writeBoxNumber"
-                  type="number"
+                  onkeyup="value=value.replace(/^0+(\d)|[^\d]+/g,'')"
                   class="numbre-input"
                 ></el-input>
                 <span style="margin-left: 8px">{{
@@ -92,8 +92,8 @@
                 <el-input
                   style="width: 60px; text-align: center"
                   v-model="from.miaoRedBoxNumber"
-                  type="number"
                   class="numbre-input"
+                  onkeyup="value=value.replace(/^0+(\d)|[^\d]+/g,'')"
                 ></el-input>
                 <span style="margin-left: 8px">{{
                   typeIndex == 0 ? "格" : "句"
@@ -104,7 +104,7 @@
                 <el-input
                   style="width: 60px; text-align: center"
                   v-model="from.lastNullrow"
-                  type="number"
+                  onkeyup="value=value.replace(/^0+(\d)|[^\d]+/g,'')"
                   class="numbre-input"
                 ></el-input>
                 <span style="margin-left: 8px">行</span>
@@ -226,12 +226,12 @@ export default {
       from: {
         content: "",
         BoxbgType: 0,
-        fontSize: "big",
+        fontSize: "center",
         playStorkes: true,
         StorkesUnfold: true,
-        writeBoxNumber: "", //书写行
-        miaoRedBoxNumber: "", //描红格
-        lastNullrow: "", //文本末空行数
+        writeBoxNumber: "0", //书写行
+        miaoRedBoxNumber: "0", //描红格
+        lastNullrow: "0", //文本末空行数
         miaoRedBgcolor: "#E1E1E1", //描红底色
         writeColor: "#000000", //书写颜色
         borderColor: "#D65353", //边框颜色
@@ -387,6 +387,10 @@ export default {
         this.$message.warning("请先输入配置内容");
         return;
       }
+      if(this.from.writeBoxNumber<this.from.miaoRedBoxNumber){
+        this.$message.warning("书写格数不能小于描红数");
+        return;
+      }
       // 大 一行8个    中 一行10个  小 一行12个
       let data = {
         option: [],

src/views/wordcard/writeTable.vue

@@ -151,6 +151,7 @@
         :closeifFreeShow="closeifFreeShow"
         @ExerciseChangeCurQue="ExerciseChangeCurQue"
         :BoxbgType="dataConfig.BoxbgType"
+        :lineColor="dataConfig.writeColor"
       />
     </div>
   </div>