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

# Conflicts:
#	src/views/corpus/Result.vue

src/views/corpus/Result.vue

@@ -355,7 +355,7 @@ export default {
   components: {
     Header,
     Strockplayredline,
-    StrockplayredlineCorpus,
+    StrockplayredlineCorpus
   },
   props: {},
   data() {

src/views/wordcard/writeTable.vue

@@ -27,10 +27,10 @@
                         :BoxbgType="dataConfig.BoxbgType"
                         :targetDiv="
                             'write-item-miaohong-' +
-                            pageNumber + '-' + indexR + '-' + indexI + type + Math.random().toString(36).substr(2)
+                            pageNumber + '-' + indexR + '-' + indexI + type + itemI.con
                         "
                         :targetDivGray="'write-item-miaohong-gray-'+
-                            pageNumber + '-' + indexR + '-' + indexI + type + Math.random().toString(36).substr(2)"
+                            pageNumber + '-' + indexR + '-' + indexI + type + itemI.con"
                     />
                 </template>
                 <template v-else-if="itemI&&itemI.miaoRed">
@@ -43,7 +43,7 @@
                         :hanzicolor="dataConfig.miaoRedBgcolor"
                         :drawingColor="dataConfig.writeColor"
                         :BoxbgType="dataConfig.BoxbgType"
-                        :targetDiv="'write-item-' + pageNumber + '-' + indexR + '-' + indexI + type + Math.random().toString(36).substr(2)"
+                        :targetDiv="'write-item-' + pageNumber + '-' + indexR + '-' + indexI + type + itemI.con"
                      />
                 </template>
                 <div v-else-if="itemI" class="tian-div" @click="freeWrite(itemI,indexR,indexI)">