Merge branch 'master' of http://git.bozedu.net:3000/bzkf3/liankao

src/pages/ksfx/cjfx_cjd/[ykj_id].vue

@@ -17,15 +17,15 @@
 
         <div class="h-218px mt-5px  bg-gray-500 py-4 pl-150px pr-100px perfectShow">
           <div class="h-full  flex justify-between" v-if="rangeData.length!=0">
-            <div class="h-full bg-opacity-20 rounded singlepart" v-for="(item, index) in rangeData" :key="index">
+            <div class="w-1/5 h-full bg-opacity-20 rounded flex-grow flex-shrink mr-2 singlepart" v-for="(item, index) in rangeData" :key="index">
               <div class="h-1/3 text-center py-4  RankLabel">
                 <img :src="'/images/one'+(index+1)+'.png'" alt="">
               </div>
-              <div class="text-sm p-5px RankBaseInfo">
-                <p class="h-1/4">考号：{{ item.kh }}</p>
-                <p class="h-1/4">成绩：{{item.cj}}分</p>
-                <p class="h-1/4">名次：{{ item.mc }}</p>
-                <p class="h-1/4">学校：{{ item.xx }}</p>
+              <div class="text-sm mt-2 p-5px  RankBaseInfo">
+                <p class="h-1/4 mt-3px overflow-ellipsis whitespace-nowrap" style="overflow: hidden;" :title="item.kh">考号：{{ item.kh }}</p>
+                <p class="h-1/4 mt-3px overflow-ellipsis whitespace-nowrap" style="overflow: hidden;" :title="item.cj">成绩：{{item.cj}}分</p>
+                <p class="h-1/4 mt-3px overflow-ellipsis whitespace-nowrap" style="overflow: hidden;" :title="item.mc">名次：{{ item.mc }}</p>
+                <p class="h-1/4 mt-3px overflow-ellipsis whitespace-nowrap" style="overflow: hidden;" :title="item.xx">学校：{{ item.xx }}</p>
               </div>
             </div>
           </div>
@@ -99,7 +99,11 @@ const initData =() => {
       if (res.code == "1") {
         rangeData.value = res.data.data.rangeData;
         tableHeader.value = res.data.data.tableHeader;
-        tableData.value = res.data.data.tableData;
+        if (res.data.data.tableData[0].length == '0') {
+          tableData.value = [];
+        } else {
+          tableData.value = res.data.data.tableData;
+        }
       }
     })
   .catch(error=>{console.log(error)})