Merge branch 'master' of http://101.43.194.146:10101/root/supervision-ui

src/components/look_word/personnelRoster.vue

@@ -33,37 +33,37 @@
         bordercolor="black"
       >
         <tbody>
-          <tr height="40" align="center">
-            <td rowspan="2">日期</td>
-            <td colspan="3">编制人数</td>
-            <td colspan="3">在位人数</td>
-            <td colspan="3">超（缺）编人员情况</td>
+          <tr class="JR_tr" height="40" align="center">
+            <td class="JR_left" rowspan="2">日期</td>
+            <td class="JR_left" colspan="3">编制人数</td>
+            <td class="JR_left" colspan="3">在位人数</td>
+            <td class="JR_left" colspan="3">超（缺）编人员情况</td>
           </tr>
-          <tr height="40" align="center">
-            <td>干部</td>
-            <td>士官</td>
-            <td>义务兵</td>
-            <td>干部</td>
-            <td>士官</td>
-            <td>义务兵</td>
-            <td>干部</td>
-            <td>士官</td>
-            <td>义务兵</td>
+          <tr class="JR_tr" height="40" align="center">
+            <td class="JR_left">干部</td>
+            <td class="JR_left">士官</td>
+            <td class="JR_left">义务兵</td>
+            <td class="JR_left">干部</td>
+            <td class="JR_left">士官</td>
+            <td class="JR_left">义务兵</td>
+            <td class="JR_left">干部</td>
+            <td class="JR_left">士官</td>
+            <td class="JR_left">义务兵</td>
           </tr>
-          <tr height="40" align="center">
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
+          <tr class="JR_tr" height="40" align="center">
+            <td class="JR_right"></td>
+            <td class="JR_right"></td>
+            <td class="JR_right"></td>
+            <td class="JR_right"></td>
+            <td class="JR_right"></td>
+            <td class="JR_right"></td>
+            <td class="JR_right"></td>
+            <td class="JR_right"></td>
+            <td class="JR_right"></td>
+            <td class="JR_right"></td>
           </tr>
 
-          <tr height="40" align="center">
+          <tr class="JR_tr" height="40" align="center">
             <td></td>
             <td></td>
             <td></td>
@@ -102,38 +102,38 @@
         bordercolor="black"
       >
         <tbody>
-          <tr height="40" align="center">
-            <td>姓名</td>
-            <td>职务</td>
-            <td>军衔</td>
-            <td>名族</td>
-            <td>籍贯</td>
-            <td>出生<br />年月</td>
-            <td>入伍<br />年月</td>
-            <td>
+          <tr class="JR_tr" height="40" align="center">
+            <td class="JR_left">姓名</td>
+            <td class="JR_left">职务</td>
+            <td class="JR_left">军衔</td>
+            <td class="JR_left">名族</td>
+            <td class="JR_left">籍贯</td>
+            <td class="JR_left">出生<br />年月</td>
+            <td class="JR_left">入伍<br />年月</td>
+            <td class="JR_left">
               入党（团）<br />
               时间
             </td>
-            <td>文化<br />程度</td>
-            <td>婚姻<br />状况</td>
-            <td>家庭住址及联系方式</td>
-            <td>备注</td>
+            <td class="JR_left">文化<br />程度</td>
+            <td class="JR_left">婚姻<br />状况</td>
+            <td class="JR_left">家庭住址及联系方式</td>
+            <td class="JR_left">备注</td>
           </tr>
-          <tr height="40" align="center">
-            <td>{{ message.name }}</td>
-            <td>{{ message.postId }}</td>
-            <td>{{ message.rankId }}</td>
-            <td>{{ message.nationId }}</td>
-            <td>{{ message.origin }}</td>
-            <td>{{ message.birthDate }}</td>
-            <td>{{ message.enlistDate }}</td>
-            <td>{{ message.partyDate }}</td>
-            <td>{{}}</td>
-            <td>{{ message.marryList }}</td>
-            <td>{{ message.live }}{{ message.phone }}</td>
-            <td>{{}}</td>
+          <tr class="JR_tr" height="40" align="center">
+            <td class="JR_right">{{ message.name }}</td>
+            <td class="JR_right">{{ message.postId }}</td>
+            <td class="JR_right">{{ message.rankId }}</td>
+            <td class="JR_right">{{ message.nationId }}</td>
+            <td class="JR_right">{{ message.origin }}</td>
+            <td class="JR_right">{{ message.birthDate }}</td>
+            <td class="JR_right">{{ message.enlistDate }}</td>
+            <td class="JR_right">{{ message.partyDate }}</td>
+            <td class="JR_right">{{ message.educationId }}</td>
+            <td class="JR_right">{{ message.marryList }}</td>
+            <td class="JR_right">{{ message.live }}{{ message.phone }}</td>
+            <td class="JR_right"></td>
           </tr>
-          <tr height="40" align="center">
+          <tr class="JR_tr" height="40" align="center">
             <td></td>
             <td></td>
             <td></td>
@@ -163,7 +163,7 @@ export default {
     return {
       title: "人员名册",
       style:
-        ".JR_tr {height: 40px;};.JR_left{border-right:none;width: 120px;font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
+        ".JR_tr {height: 40px;};.JR_left{font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
     };
   },
   methods: {