Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/exam/question-form.vue

@@ -30,7 +30,7 @@
         </div>
         <div class="page-content">
           <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
-            class="sticky-column-table sticky-header-column-table" style="max-height: 550px" separator="none"
+            class="sticky-column-table sticky-header-column-table" style="max-height: 440px" separator="none"
             :data="dataList" :columns="columns" row-key="QuestionId" selection="multiple"
             :selected.sync="selectedQuestion">
             <template v-slot:top="props">

src/pages/exam/paperEdit.vue

@@ -146,7 +146,7 @@
   }
 
   .List-ul li:hover .exam_ListSHow {
-    display: block;
+    display: inline-block;
   }
 
   .left-btn-list {
@@ -225,7 +225,7 @@
   }
 
   .exam_DetailList {
-    width: 80%;
+    width: 45%;
     display: inline-block;
     overflow: hidden;
     white-space: nowrap;
@@ -313,16 +313,19 @@
                 </div>
               </div>
               <ul class="List-ul" v-if="gItem.DetailsList&&gItem.DetailsList.length>0">
-                <li class="" style="cursor:pointer;" :class="{'checkUl':dIndex==ComCheckIndex&&gIndex==ComOneIndex}"
+                <li class="" style="cursor:pointer;position:relative;" :class="{'checkUl':dIndex==ComCheckIndex&&gIndex==ComOneIndex}"
                   v-for="(dItem,dIndex) in gItem.DetailsList" :key="dIndex" @click="ClickItem(dItem,gIndex,dIndex)">
                   ({{dIndex+1}}) <span class="exam_DetailList" v-html="dItem.ShowTitle"></span>
-                  <span class="exam_ListSHow">
-                    <i class="iconfont icon-shangyi2" @click.stop="MoveChildItem(gIndex,dIndex,0)"
-                      style="margin-right:5px;" v-if="dIndex!=0"></i>
-                    <i class="iconfont icon-xiayi" @click.stop="MoveChildItem(gIndex,dIndex,1)"
-                      v-if="dIndex!=gItem.DetailsList.length-1"></i>
-                    <i class="iconfont icon-shanchu2" @click.stop="delExam(gItem.DetailsList,dItem,dIndex)"
-                      style="margin-left:5px;font-size:17px;"></i>
+                  <span style="position:absolute;right:5px;">
+                    <el-tag type="warning" size="mini" style="margin-right:5px;" v-if="getRepeat(dItem.QuestionId,gItem.DetailsList)">与{{gIndex+1}}.1重复出现</el-tag>
+                    <span class="exam_ListSHow">
+                      <i class="iconfont icon-shangyi2" @click.stop="MoveChildItem(gIndex,dIndex,0)"
+                        style="margin-right:5px;" v-if="dIndex!=0"></i>
+                      <i class="iconfont icon-xiayi" style="margin-right:5px;" @click.stop="MoveChildItem(gIndex,dIndex,1)"
+                        v-if="dIndex!=gItem.DetailsList.length-1"></i>
+                      <i class="iconfont icon-shanchu2" @click.stop="delExam(gItem.DetailsList,dItem,dIndex)"
+                        style="font-size:17px;"></i>
+                    </span>
                   </span>
                 </li>
               </ul>
@@ -1334,7 +1337,21 @@
         this.AddQuestion(tempArray);
         this.isShowQuestion = false;
       },
-
+      //获取相同
+      getRepeat(QuestionId,Arr){
+        console.log(QuestionId,'进入');
+        console.log(this.DataObj,'this.DataObj');
+        console.log(Arr,'Arrrrrrrrr');
+        let Num=0;
+        Arr.forEach(x=>{
+          if (x.QuestionId == QuestionId) {
+            Num++;
+          }
+        })
+        if(Num>1){
+          return true
+        }
+      }
     }
   }