Merge remote-tracking branch 'origin/master'

src/views/xjc-integratedmachine/components/head_component.vue

@@ -39,11 +39,22 @@
         router.go(-1);
       }
       // emit('backTo');
-      // clearData()
+      clearData()
     }
     function clearData(){
-      sessionStorage.removeItem('contrastList');
-      sessionStorage.removeItem('majorList');
+      let contrastList = [];
+      if(props.headinfo.contrastType === 'major'){
+        contrastList = JSON.parse(sessionStorage.getItem('majorList'));
+        if(contrastList && contrastList.length >= 2 ){
+          sessionStorage.removeItem('majorList');
+        }
+      }else if(props.headinfo.contrastType === 'university'){
+        contrastList = JSON.parse(sessionStorage.getItem('contrastList'));
+        if(contrastList && contrastList.length >= 2 ){
+          sessionStorage.removeItem('contrastList');
+        }
+      }
+
     }
     function homeUrlTo() {
         router.push({

src/views/xjc-integratedmachine/environment/contrast_university.vue

@@ -84,19 +84,36 @@
             <tr v-show="false"></tr>
             <tr class="two-tr">
               <td style="border-bottom: 8px solid #E0EEF4;">录取分数线
-                <select v-model="dbForm.area">
-                  <option v-for="dict in gk_province" :key="dict.value" :value="dict.value">{{ dict.label }}
-                  </option>
-                </select>
-                <select v-model="dbForm.category">
-                  <option v-for="dict in candidate_category" :key="dict.value" :value="dict.value">
-                    {{ dict.label }}
-                  </option>
-                </select>
+                <el-select v-model="dbForm.area" placeholder="选择高考省份" style="width: 240px">
+                  <el-option
+                      v-for="dict in gk_province"
+                      :key="dict.value" :value="dict.value"
+                      :label="dict.label"
+                  />
+                </el-select>
+                <el-select v-model="dbForm.category" placeholder="选择分科" style="width: 240px">
+                  <el-option
+                      v-for="dict in candidate_category"
+                      :key="dict.value" :value="dict.value"
+                      :label="dict.label"
+                  />
+                </el-select>
                 <button @click="dbResult">对比结果</button>
               </td>
-              <td style="background: #0ACB63;width: 616px;height: 760px;border-bottom: 8px solid #E0EEF4;">
-                <div style="width: 616px;height: 760px; display: flex;flex-direction: column;">
+              <td style="width: 616px;height: 760px;border-bottom: 8px solid #E0EEF4;">
+                <div style="width: 616px;height: 760px; display: flex;flex-direction: column;overflow: auto">
+                  <div class="score-box" v-for="(item,index) in dbData.university0" :key="index">
+                    <p>年份：<span>{{ item.years }}</span></p>
+                    <p>录取批次：<span>{{ item.batchname }}</span></p>
+                    <p>最低分：<span>{{ item.lowscore }}</span></p>
+                    <p class="text-td-p">最低分位次：<span>  {{ item.totalorder }}</span></p>
+                  </div>
+                  <div class="score-box" v-for="(item,index) in dbData.university0" :key="index">
+                    <p>年份：<span>{{ item.years }}</span></p>
+                    <p>录取批次：<span>{{ item.batchname }}</span></p>
+                    <p>最低分：<span>{{ item.lowscore }}</span></p>
+                    <p class="text-td-p">最低分位次：<span>  {{ item.totalorder }}</span></p>
+                  </div>
                   <div class="score-box" v-for="(item,index) in dbData.university0" :key="index">
                     <p>年份：<span>{{ item.years }}</span></p>
                     <p>录取批次：<span>{{ item.batchname }}</span></p>
@@ -111,16 +128,33 @@
                   </div>
                 </div>
               </td>
-              <td style="background: #0ACB63;width: 616px;height: 760px;display: flex;flex-direction: column;">
-                <div style="width: 616px;height: 760px;">
+              <td style="width: 616px;height: 760px;border-bottom: 8px solid #E0EEF4;">
+                <div style="width: 616px;height: 760px; display: flex;flex-direction: column;overflow: auto">
                   <div class="score-box" v-for="(item,index) in dbData.university1" :key="index">
                     <p>年份：<span>{{ item.years }}</span></p>
                     <p>录取批次：<span>{{ item.batchname }}</span></p>
                     <p>最低分：<span>{{ item.lowscore }}</span></p>
                     <p class="text-td-p">最低分位次：<span>  {{ item.totalorder }}</span></p>
                   </div>
+                  <div class="score-box" v-for="(item,index) in dbData.university0" :key="index">
+                    <p>年份：<span>{{ item.years }}</span></p>
+                    <p>录取批次：<span>{{ item.batchname }}</span></p>
+                    <p>最低分：<span>{{ item.lowscore }}</span></p>
+                    <p class="text-td-p">最低分位次：<span>  {{ item.totalorder }}</span></p>
+                  </div>
+                  <div class="score-box" v-for="(item,index) in dbData.university0" :key="index">
+                    <p>年份：<span>{{ item.years }}</span></p>
+                    <p>录取批次：<span>{{ item.batchname }}</span></p>
+                    <p>最低分：<span>{{ item.lowscore }}</span></p>
+                    <p class="text-td-p">最低分位次：<span>  {{ item.totalorder }}</span></p>
+                  </div>
+                  <div class="score-box" v-for="(item,index) in dbData.university0" :key="index">
+                    <p>年份：<span>{{ item.years }}</span></p>
+                    <p>录取批次：<span>{{ item.batchname }}</span></p>
+                    <p>最低分：<span>{{ item.lowscore }}</span></p>
+                    <p class="text-td-p">最低分位次：<span>  {{ item.totalorder }}</span></p>
+                  </div>
                 </div>
-
               </td>
             </tr>
             </tbody>
@@ -779,15 +813,28 @@ p, div {
               line-height: 52px;
 
               .score-box{
-                width: 620px;
+                width: 610px;
+                height: 287px;
+                background: #FFFFFF;
+                border-radius: 4px 4px 4px 4px;
+                border-bottom: 8px solid #E0EEF4;
+                //border-right: 8px solid #E0EEF4;
+                padding-left: 20px;
+                padding-top: 10px;
+                padding-bottom: 10px;
+              }
+              .score-box:last-child{
+                border-bottom: none;
+                width: 610px;
                 height: 287px;
                 background: #FFFFFF;
                 border-radius: 4px 4px 4px 4px;
                 border-bottom: 8px solid #E0EEF4;
-                border-right: 8px solid #E0EEF4;
+                //border-right: 8px solid #E0EEF4;
                 padding-left: 20px;
                 padding-top: 10px;
                 padding-bottom: 10px;
+
               }
             }
 
@@ -805,12 +852,12 @@ p, div {
               display: flex;
               flex-direction: column;
               .score-box{
-                width: 614px;
+                width: 610px;
                 height: 287px;
                 background: #FFFFFF;
                 border-radius: 4px 4px 4px 4px;
                 border-bottom: 8px solid #E0EEF4;
-                border-right: 8px solid #E0EEF4;
+                //border-right: 8px solid #E0EEF4;
                 padding-left: 20px;
                 padding-top: 10px;
                 padding-bottom: 10px;