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

src/api/combatduty/ReteOfTen.js

@@ -57,3 +57,19 @@ export function getzbky(){
   })
 }
 
+// 获取编辑装备五率接口
+export function addzbwl(data) {
+  return request({
+    url: '/peoplefiverates/outfitinfo/list',
+    method: 'get',
+    data: data
+  })
+}
+
+// 获取编辑六量接口
+export function getliulian(){
+  return request({
+    url:"/peoplefiverates/measureinfo/list",
+    method:"get",
+  })
+}

src/api/doormanManage/bdglVisit.js

@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 查询人员来访登记列表
+export function listBdglVisit(query) {
+  return request({
+    url: '/doormanManage/bdglVisit/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询人员来访登记详细
+export function getBdglVisit(id) {
+  return request({
+    url: '/doormanManage/bdglVisit/' + id,
+    method: 'get'
+  })
+}
+
+// 新增人员来访登记
+export function addBdglVisit(data) {
+  return request({
+    url: '/doormanManage/bdglVisit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改人员来访登记
+export function updateBdglVisit(data) {
+  return request({
+    url: '/doormanManage/bdglVisit',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除人员来访登记
+export function delBdglVisit(id) {
+  return request({
+    url: '/doormanManage/bdglVisit/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出人员来访登记
+export function exportBdglVisit(query) {
+  return request({
+    url: '/doormanManage/bdglVisit/export',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 获取当前部门接待人
+export function deptUser (deptId) {
+  return request({
+    url: `/grassrootsregistration/common/getZhuChiRen?deptId=${deptId}`,
+    method: 'get'
+  })
+}

src/assets/styles/global.css

@@ -14,6 +14,22 @@
   font-style: normal;
 }
 
+/* 仿宋字体 */
+@font-face {
+  font-family: 'fangsong';
+  src: url('../css/仿宋.ttf');
+  font-weight: normal;
+  font-style: normal;
+}
+
+/* 楷体字体 */
+@font-face {
+  font-family: 'kaiti';
+  src: url('../css/楷体.ttf');
+  font-weight: normal;
+  font-style: normal;
+}
+
 /* 新增表单字体颜色 */
 .el-dialog__body .el-form-item__label {
   color: black;
@@ -765,6 +781,17 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
 }
 
 /* 工作任务表格 */
+<<<<<<< HEAD
+/* .workTask .el-table__empty-block{
+=======
 .workTask .el-table__empty-block {
+>>>>>>> 14aebc6a2f95bfe7a1a581d07b85167c1def7ef9
   border-bottom: 2px solid white !important;
 }
+.el-time-panel__content .el-scrollbar__wrap .el-scrollbar__view{
+  background-color: white !important;
+}
+.el-date-picker__editor-wrap .el-input__inner{
+  color: black;
+} */
+

src/components/look_word/bdglarmament.vue

@@ -5,24 +5,26 @@
     <div class="word" id="contents">
       <p
         style="
-          font-size: 20pt;
+          font-size: 16pt;
           font-weight: 900;
           margin: 0px 0px 20px -30px;
           color: black;
           text-align: center;
+          font-family: 'kaiti'
         "
       >
         军械装备登记表（总表）
       </p>
       <p
         style="
-          font-size: 12pt;
-          font-weight: 100;
+          font-size: 16px;
+          font-weight: 600;
           margin: 0px 0px 3px 0px;
           color: black;
+          font-family: 'kaiti'
         "
       >
-        装备名称：<span style="text-decoration: underline"
+        装备名称：<span style="text-decoration: underline;font-family: 'fangsong'"
           >{{ message.name }}
         </span>
       </p>
@@ -43,8 +45,8 @@
         width="940"
         bordercolor="black"
       >
-        <tbody>
-          <tr class="JR_tr">
+        <tbody style="font-size: 16px;font-weight: 600;">
+          <tr class="JR_tr" style="font-size: 16px;font-weight: 600;font-family: 'kaiti'">
             <td
               width="37"
               valign="center"
@@ -119,7 +121,7 @@
               <p align="center">核对人</p>
             </td>
           </tr>
-          <tr class="JR_tr">
+          <tr class="JR_tr" style="font-size: 16px;font-weight: 600;font-family: 'kaiti'">
             <td width="37" valign="center" nowrap="" class="JR_left">
               <p align="center">年</p>
             </td>
@@ -151,7 +153,7 @@
               <p align="center">缺陷种类及数量</p>
             </td>
           </tr>
-          <tr class="JR_tr">
+          <tr class="JR_tr" style="font-size: 16px;font-weight: 600;font-family: 'fangsong'">
             <td width="37" valign="center" nowrap="" class="JR_right">
               <p align="center">01</p>
             </td>
@@ -353,7 +355,7 @@
             </td>
           </tr>
           <tr class="JR_tr">
-            <td width="37" valign="center" nowrap="" class="JR_left">
+            <td width="37" valign="center" nowrap="" class="JR_left" style="font-family: 'kaiti'">
               <p align="center">备注</p>
             </td>
             <td width="869" valign="top" colspan="15" class="JR_right">

src/components/look_word/bdglcookbook.vue

@@ -5,14 +5,24 @@
       <p
         style="
           text-align: center;
-          font-size: 22px;
           color: black;
-          font-weight: 550;
+          font-size: 16pt;
+          font-weight: 900;
+          font-family: 'kaiti';
         "
       >
         食堂食谱表
       </p>
-      <p style="margin-left: 10px; color: black; font-size: 18px">
+      <p
+        style="
+          font-size: 16px;
+          font-weight: 600;
+          margin-left: 10px;
+          color: black;
+          font-size: 18px;
+          font-family: 'fangsong';
+        "
+      >
         使用时间:{{ message.startTime }}——{{ message.endTime }}
       </p>
       <table
@@ -41,8 +51,8 @@
           <col width="130" />
           <col width="121" span="3" />
         </colgroup>
-        <tbody>
-          <tr height="45" class="JR_tr">
+        <tbody style="font-size: 16px;font-weight: 600;">
+          <tr height="45" class="JR_tr" style="font-family: 'kaiti'">
             <td colspan="2" align="center" class="JR_left">时间</td>
             <td width="111" align="center" class="JR_left">星期一</td>
             <td width="111" align="center" class="JR_left">星期二</td>
@@ -53,7 +63,7 @@
             <td width="111" align="center" class="JR_left">星期天</td>
           </tr>
 
-          <tr height="45" class="JR_tr">
+          <tr height="45" class="JR_tr" style="font-family: 'kaiti'">
             <td width="99" rowspan="4" align="center" class="JR_left">早餐</td>
             <td width="70" rowspan="2" align="center" class="JR_left">主食</td>
             <td
@@ -82,7 +92,7 @@
               炊事员：{{ message.cookbookRegistrations[36].peopleNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr">
+          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
             <td align="center" style="white-space: normal">
               {{ message.cookbookRegistrations[0].cookcategoryNames }}
             </td>
@@ -105,7 +115,7 @@
               {{ message.cookbookRegistrations[36].cookcategoryNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr">
+          <tr height="45" class="JR_tr" style="font-family: 'kaiti'">
             <td width="70" rowspan="2" align="center" class="JR_left">副食</td>
             <td align="center" style="white-space: normal" class="JR_right">
               炊事员：{{ message.cookbookRegistrations[1].peopleNames }}
@@ -129,7 +139,7 @@
               炊事员：{{ message.cookbookRegistrations[37].peopleNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr">
+          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
             <td align="center" style="white-space: normal" class="JR_right">
               {{ message.cookbookRegistrations[1].cookcategoryNames }}
             </td>
@@ -153,7 +163,7 @@
             </td>
           </tr>
 
-          <tr height="45" class="JR_tr">
+          <tr height="45" class="JR_tr" style="font-family: 'kaiti'">
             <td width="99" rowspan="4" align="center" class="JR_left">午餐</td>
             <td width="70" rowspan="2" align="center" class="JR_left">主食</td>
             <td align="center" style="white-space: normal" class="JR_right">
@@ -178,7 +188,7 @@
               炊事员：{{ message.cookbookRegistrations[38].peopleNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr">
+          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
             <td align="center" style="white-space: normal" class="JR_right">
               {{ message.cookbookRegistrations[2].cookcategoryNames }}
             </td>
@@ -201,7 +211,7 @@
               {{ message.cookbookRegistrations[38].cookcategoryNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr">
+          <tr height="45" class="JR_tr" style="font-family: 'kaiti'">
             <td width="70" rowspan="2" align="center" class="JR_left">副食</td>
             <td align="center" style="white-space: normal" class="JR_right">
               炊事员：{{ message.cookbookRegistrations[3].peopleNames }}
@@ -225,7 +235,7 @@
               炊事员：{{ message.cookbookRegistrations[39].peopleNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr">
+          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
             <td align="center" style="white-space: normal">
               {{ message.cookbookRegistrations[3].cookcategoryNames }}
             </td>
@@ -249,7 +259,7 @@
             </td>
           </tr>
 
-          <tr height="45" class="JR_tr">
+          <tr height="45" class="JR_tr" style="font-family: 'kaiti'">
             <td width="99" rowspan="4" align="center" class="JR_left">晚餐</td>
             <td width="70" rowspan="2" align="center" class="JR_left">主食</td>
             <td align="center" style="white-space: normal" class="JR_right">
@@ -274,7 +284,7 @@
               炊事员：{{ message.cookbookRegistrations[40].peopleNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr">
+          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
             <td align="center" style="white-space: normal" class="JR_right">
               {{ message.cookbookRegistrations[4].cookcategoryNames }}
             </td>
@@ -297,7 +307,7 @@
               {{ message.cookbookRegistrations[40].cookcategoryNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr">
+          <tr height="45" class="JR_tr" style="font-family: 'kaiti'">
             <td width="70" rowspan="2" align="center" class="JR_left">副食</td>
             <td align="center" style="white-space: normal" class="JR_right">
               炊事员：{{ message.cookbookRegistrations[5].peopleNames }}
@@ -321,7 +331,7 @@
               炊事员：{{ message.cookbookRegistrations[41].peopleNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr">
+          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
             <td align="center" style="white-space: normal" class="JR_right">
               {{ message.cookbookRegistrations[5].cookcategoryNames }}
             </td>
@@ -354,6 +364,7 @@
             font-weight: 700;
             line-height: 30px;
             width: 960px;
+            font-family: 'kaiti'
           "
         >
           <td

src/components/look_word/bdgldiary.vue

@@ -4,11 +4,12 @@
     <div class="word" id="contents">
       <p
         style="
-          font-size: 14pt;
+          font-size: 16pt;
           font-weight: 600;
-          text-align: left;
+          text-align: center;
           margin-botttom: 30px;
           color: black;
+          font-family: 'kaiti'
         "
       >
         《连队要事日记》
@@ -38,16 +39,17 @@
           margin-left: -20px;
           border-color: black;
           color: black;
+          font-size: 16px;font-weight: 600;
         "
       >
-        <tr height="30" align="center" style="border:none">
+        <tr height="30" align="center" style="border:none;font-family: 'kaiti'">
           <td colspan="3" height="40" style="border:none">{{ message.blogDate }}</td>
           <td colspan="2" style="border:none">{{ week }}</td>
           <td colspan="6" style="border:none">天气：{{ message.weather }}</td>
           <td colspan="3" style="border:none">值班员:{{ message.peopleName }}</td>
         </tr>
         <!-- 实力 -->
-        <tr class="JR_tr" height="30" align="center">
+        <tr class="JR_tr" height="30" align="center" style="font-family: 'kaiti'">
           <td colspan="2" rowspan="2" class="JR_left">实力</td>
           <td colspan="6" style="letter-spacing: 20px" class="JR_left">
             编制人数
@@ -57,23 +59,23 @@
           </td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
-          <td width="68" class="JR_left">干部</td>
-          <td width="68" class="JR_left">{{ message.orgcadre }}</td>
-          <td width="68" class="JR_left">战士</td>
-          <td width="68" class="JR_left">{{ message.orgsoldier }}</td>
-          <td width="68" class="JR_left">合计</td>
-          <td width="68" class="JR_left"></td>
-          <td width="68" class="JR_left">干部</td>
-          <td width="68" class="JR_left">{{ message.nowcadre }}</td>
-          <td width="68" class="JR_left">战士</td>
-          <td width="68" class="JR_left">{{ message.nowsoldier }}</td>
-          <td width="68" class="JR_left">合计</td>
-          <td width="68" class="JR_left"></td>
+          <td width="68" class="JR_left" style="font-family: 'kaiti'" >干部</td>
+          <td width="68" class="JR_left" style="font-family: 'fangsong'">{{ message.orgcadre }}</td>
+          <td width="68" class="JR_left" style="font-family: 'kaiti'">战士</td>
+          <td width="68" class="JR_left" style="font-family: 'fangsong'">{{ message.orgsoldier }}</td>
+          <td width="68" class="JR_left" style="font-family: 'kaiti'">合计</td>
+          <td width="68" class="JR_left" style="font-family: 'fangsong'"></td>
+          <td width="68" class="JR_left" style="font-family: 'kaiti'">干部</td>
+          <td width="68" class="JR_left" style="font-family: 'fangsong'">{{ message.nowcadre }}</td>
+          <td width="68" class="JR_left" style="font-family: 'kaiti'">战士</td>
+          <td width="68" class="JR_left" style="font-family: 'fangsong'">{{ message.nowsoldier }}</td>
+          <td width="68" class="JR_left" style="font-family: 'kaiti'">合计</td>
+          <td width="68" class="JR_left" style="font-family: 'fangsong'"></td>
         </tr>
         <!-- 训练、教育或者执行其他任务情况 -->
         <tr class="JR_tr" height="20" align="center">
           <td rowspan="6" class="JR_left">
-            <p align="center" style="margin: 0 15px">
+            <p align="center" style="margin: 0 15px;font-family: 'kaiti'">
               训 <br />
               练 <br />
               、 <br />
@@ -91,23 +93,24 @@
               况
             </p>
           </td>
-          <td rowspan="2" width="68" class="JR_left">区分</td>
+          <td rowspan="2" width="68" class="JR_left" style="font-family: 'kaiti'">区分</td>
           <td
             colspan="9"
             rowspan="2"
-            style="letter-spacing: 60px"
+            style="letter-spacing: 60px;font-family: 'fangsong'"
             class="JR_left"
           >
             内容
           </td>
-          <td colspan="3" class="JR_left">人数</td>
+          <td colspan="3" class="JR_left" style="font-family: 'kaiti'">人数</td>
         </tr>
-        <tr class="JR_tr" height="30" align="center">
+        <tr class="JR_tr" height="30" align="center" style="font-family: 'kaiti'">
           <td class="JR_left">应到</td>
           <td class="JR_left">实到</td>
           <td class="JR_left">到课率</td>
         </tr>
         <tr
+        style="font-family: 'fangsong'"
           class="JR_tr"
           height="70"
           align="center"
@@ -143,27 +146,27 @@
         </tr> -->
         <!-- 公差勤务 -->
         <tr class="JR_tr">
-          <td colspan="2"><p align="center" class="JR_left">公差勤务</p></td>
-          <td colspan="12" class="JR_right" v-html="message.tolerance">
-            <p></p>
+          <td colspan="2"><p align="center" class="JR_left" style="font-family: 'kaiti'">公差勤务</p></td>
+          <td style="font-family: 'fangsong'" colspan="12" class="JR_right" v-html="message.tolerance">
+            
           </td>
         </tr>
         <tr class="JR_tr">
           <!-- 人员装备变动 -->
           <td colspan="2" class="JR_left">
-            <p align="center">
+            <p align="center" style="font-family: 'kaiti'">
               人员或 <br />
               装备变动
             </p>
           </td>
-          <td colspan="12" class="JR_right" v-html="message.transfer">
+          <td style="font-family: 'fangsong'" colspan="12" class="JR_right" v-html="message.transfer">
             <p></p>
           </td>
         </tr>
         <!-- 武器装备检查情况 -->
         <tr class="JR_tr">
           <td height="150" rowspan=":count($xlian)" colspan="2" class="JR_left">
-            <p align="center">
+            <p align="center" style="font-family: 'kaiti'">
               武 内 <br />
               器 务 <br />
               装 卫 <br />
@@ -175,12 +178,12 @@
               记 <br />
             </p>
           </td>
-          <td colspan="12" class="JR_right" v-html="message.internal">
+          <td style="font-family: 'fangsong'" colspan="12" class="JR_right" v-html="message.internal">
             <p></p>
           </td>
         </tr>
         <!-- 查铺查哨 -->
-        <tr class="JR_tr">
+        <tr class="JR_tr" style="font-family: 'kaiti'">
           <td :rowspan="chapu" class="JR_left">
             <p align="center">
               查 <br />
@@ -202,6 +205,7 @@
           :key="i"
           class="JR_tr"
           height="30"
+          style="font-family: 'fangsong'"
         >
           <td class="JR_right">
             <p align="center">{{ item.peopleName }}</p>
@@ -234,7 +238,7 @@
           <td class="JR_right" colspan="8"><p align="center"></p></td>
         </tr> -->
         <!-- 派班情况 -->
-        <tr class="JR_tr">
+        <tr class="JR_tr" style="font-family: 'kaiti'">
           <td class="JR_left" rowspan="4">
             <p align="center">
               派 <br />
@@ -252,44 +256,44 @@
           </td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
-          <td class="JR_left">值班员</td>
+          <td class="JR_left" style="font-family: 'kaiti'">值班员</td>
           <td class="JR_right">
-            <p align="center">{{ message.dutya }}</p>
+            <p align="center" style="font-family: 'fangsong'">{{ message.dutya }}</p>
           </td>
           <td class="JR_right">
-            <p align="center">{{ message.dutya }}</p>
+            <p align="center" style="font-family: 'fangsong'">{{ message.dutya }}</p>
           </td>
           <td class="JR_right" colspan="2">
-            <p align="center">{{ message.dutylead }}</p>
+            <p align="center" style="font-family: 'fangsong'">{{ message.dutylead }}</p>
           </td>
           <td class="JR_right" colspan="8"><p align="center"></p></td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
-          <td class="JR_left">值日员</td>
+          <td class="JR_left" style="font-family: 'kaiti'">值日员</td>
           <td class="JR_right">
-            <p align="center">{{ message.dutyc }}</p>
+            <p align="center" style="font-family: 'fangsong'">{{ message.dutyc }}</p>
           </td>
           <td class="JR_right">
-            <p align="center">{{ message.dutyd }}</p>
+            <p align="center" style="font-family: 'fangsong'">{{ message.dutyd }}</p>
           </td>
-          <td class="JR_left" colspan="2" rowspan="2">
+          <td class="JR_left" colspan="2" rowspan="2" style="font-family: 'fangsong'">
             {{ message.dutyDate }}<br />
           </td>
           <td class="JR_right" colspan="8"></td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
-          <td class="JR_left">厨房值班</td>
+          <td class="JR_left"  style="font-family: 'kaiti'">厨房值班</td>
           <td class="JR_right">
-            <p align="center">{{ message.dutye }}</p>
+            <p align="center" style="font-family: 'fangsong'">{{ message.dutye }}</p>
           </td>
           <td class="JR_right">
-            <p align="center">{{ message.dutyf }}</p>
+            <p align="center" style="font-family: 'fangsong'">{{ message.dutyf }}</p>
           </td>
-          <td class="JR_right" colspan="8"></td>
+          <td class="JR_right" colspan="8" style="font-family: 'fangsong'"></td>
         </tr>
 
         <!-- 临时来队亲属 -->
-        <tr class="JR_tr" height="30">
+        <tr class="JR_tr" height="30"  style="font-family: 'kaiti'">
           <td :rowspan="qinshu" class="JR_left">
             <p align="center" style="margin: 0 15px">
               临 <br />
@@ -319,19 +323,20 @@
           </td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
-          <td class="JR_left" height="30">来队</td>
-          <td class="JR_left" height="30">离队</td>
+          <td class="JR_left" height="30"  style="font-family: 'kaiti'">来队</td>
+          <td class="JR_left" height="30"  style="font-family: 'kaiti'">离队</td>
           <td
+          style="font-family: 'fangsong'"
             class="JR_right"
             height="30"
             colspan="10"
             rowspan="3"
             v-html="message.invalid"
           >
-            <p align="left"></p>
+            <p align="left" style="font-family: 'fangsong'"></p>
           </td>
         </tr>
-        <tr class="JR_tr" v-for="(item1, i) in message.kinsfolk" :key="i">
+        <tr style="font-family: 'fangsong'" class="JR_tr" v-for="(item1, i) in message.kinsfolk" :key="i">
           <td class="JR_right" height="30">
             <p align="center">{{ item1.peopleName }}</p>
           </td>
@@ -359,7 +364,7 @@
           <td class="JR_right" height="30"><p align="center"></p></td>
         </tr> -->
         <!-- 请假外出休假 -->
-        <tr class="JR_tr" align="center" height="30">
+        <tr class="JR_tr" align="center" height="30" style="font-family: 'kaiti'">
           <td rowspan="6" class="JR_left">
             <p align="center" style="margin: 0 15px">
               请 <br />
@@ -397,7 +402,7 @@
             时(天)数
           </td>
         </tr>
-        <tr class="JR_tr" height="30">
+        <tr class="JR_tr" height="30" style="font-family: 'fangsong'">
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right" colspan="2"><p align="center"></p></td>
@@ -407,7 +412,7 @@
           <td class="JR_right" colspan="2"><p align="center"></p></td>
           <td class="JR_right" colspan="3"><p align="center"></p></td>
         </tr>
-        <tr class="JR_tr" height="30">
+        <tr class="JR_tr" height="30" style="font-family: 'fangsong'">
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right" colspan="2"><p align="center"></p></td>
@@ -417,7 +422,7 @@
           <td class="JR_right" colspan="2"><p align="center"></p></td>
           <td class="JR_right" colspan="3"><p align="center"></p></td>
         </tr>
-        <tr class="JR_tr" height="30">
+        <tr class="JR_tr" height="30" style="font-family: 'fangsong'">
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right" colspan="2"><p align="center"></p></td>
@@ -427,7 +432,7 @@
           <td class="JR_right" colspan="2"><p align="center"></p></td>
           <td class="JR_right" colspan="3"><p align="center"></p></td>
         </tr>
-        <tr class="JR_tr" height="30">
+        <tr class="JR_tr" height="30" style="font-family: 'fangsong'">
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right" colspan="2"><p align="center"></p></td>
@@ -437,7 +442,7 @@
           <td class="JR_right" colspan="2"><p align="center"></p></td>
           <td class="JR_right" colspan="3"><p align="center"></p></td>
         </tr>
-        <tr class="JR_tr" height="30">
+        <tr class="JR_tr" height="30" style="font-family: 'fangsong'">
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right" colspan="2"><p align="center"></p></td>
@@ -449,7 +454,7 @@
         </tr>
         <!-- 上级通知 -->
         <tr class="JR_tr">
-          <td class="JR_left" width="101">
+          <td class="JR_left" width="101" style="font-family: 'kaiti'">
             <p align="center" style="margin: 0 15px">
               上 <br />
               级 <br />
@@ -470,14 +475,14 @@
           <td
             class="JR_right"
             colspan="15"
-            style="white-space: normal"
+            style="white-space: normal;font-family: 'fangsong'"
             v-html="message.notice"
           ></td>
         </tr>
       </table>
 
-      <span style="margin-left: 48px; color: black">连队首长签字:</span>
-      <span style="margin-left: 615px; color: black; letter-spacing: 15px"
+      <span style="margin-left: 48px; color: black;font-family: 'fangsong';font-size: 16px;font-weight: 600;">连队首长签字:</span>
+      <span style="margin-left: 615px; color: black; letter-spacing: 15px;font-family: 'fangsong';font-size: 16px;font-weight: 600;"
         >&nbsp;&nbsp;时&nbsp;&nbsp;&nbsp;&nbsp;分</span
       >
     </div>

src/components/look_word/bdgldrill.vue

@@ -20,6 +20,7 @@
           color: black;
           text-align: center;
           margin-bottom: 5px;
+          font-family: 'kaiti'
         "
       >
         <span class="a1">月</span> 日军事训练登记表
@@ -44,82 +45,82 @@
         width="960"
         bordercolor="black"
       >
-        <tbody>
+        <tbody style="font-size: 16px;font-weight: 600;">
           <tr class="JR_tr">
             <th width="101" nowrap="" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0">训练类别</p>
+              <p align="center" style="margin: 20px 0;font-family: 'kaiti'">训练类别</p>
             </th>
             <th width="113" nowrap="" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0">训练内容</p>
+              <p align="center" style="margin: 20px 0;font-family: 'kaiti'">训练内容</p>
             </th>
             <th width="120" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0">训练时间</p>
+              <p align="center" style="margin: 20px 0;font-family: 'kaiti'">训练时间</p>
             </th>
             <th width="85" nowrap="" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0">训练地点</p>
+              <p align="center" style="margin: 20px 0;font-family: 'kaiti'">训练地点</p>
             </th>
             <th width="114" nowrap="" colspan="2" class="JR_left">
-              <p align="center" style="margin: 5px 0">参训兵力</p>
+              <p align="center" style="margin: 5px 0;font-family: 'kaiti'">参训兵力</p>
             </th>
             <th width="68" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0">参训率</p>
+              <p align="center" style="margin: 20px 0;font-family: 'kaiti'">参训率</p>
             </th>
             <th width="115" nowrap="" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0">效果（成绩）</p>
+              <p align="center" style="margin: 20px 0;font-family: 'kaiti'">效果（成绩）</p>
             </th>
             <th width="104" nowrap="" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0">消耗</p>
+              <p align="center" style="margin: 20px 0;font-family: 'kaiti'">消耗</p>
             </th>
             <th width="70" nowrap="" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0">备注</p>
+              <p align="center" style="margin: 20px 0;font-family: 'kaiti'">备注</p>
             </th>
           </tr>
           <tr class="JR_tr">
             <th width="57" nowrap="" class="JR_left">
-              <p align="center">应训</p>
+              <p align="center" style="font-family: 'kaiti'">应训</p>
             </th>
-            <th width="57" class="JR_left"><p align="center">实训</p></th>
+            <th width="57" class="JR_left"><p align="center" style="font-family: 'kaiti'">实训</p></th>
           </tr>
 
           <tr class="JR_tr">
             <td width="101" class="JR_right">
-              <p align="center" style="margin: 10px 0">
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">
                 {{ message.project }}
                 <!-- <span style="display: none">111</span> -->
               </p>
             </td>
             <td width="113" class="JR_right">
-              <p align="center">{{ message.contents }}</p>
+              <p align="center" style="font-family: 'fangsong'">{{ message.contents }}</p>
             </td>
             <!--<td width="85"><p align="center">2021-12-15</p></td>-->
             <td width="85" class="JR_right">
-              <p align="center" style="margin: 10px 0">
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">
                 {{ message.drillTime }}
                 <!-- <span style="display: none"></span> -->
               </p>
             </td>
             <td width="85" class="JR_right">
-              <p align="center" style="margin: 10px 0">{{ message.address }}</p>
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.address }}</p>
             </td>
             <td width="57" class="JR_right">
-              <p align="center" style="margin: 10px 0">{{ message.oughtTo }}</p>
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.oughtTo }}</p>
             </td>
             <td width="57" class="JR_right">
-              <p align="center" style="margin: 10px 0">{{ message.actual }}</p>
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.actual }}</p>
             </td>
             <td width="68" nowrap="" class="JR_right">
-              <p align="center" style="margin: 10px 0">
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">
                 {{ message.probability }}
               </p>
             </td>
             <td width="104" nowrap="" class="JR_right">
-              <p align="center" style="margin: 10px 0">{{ message.result }}</p>
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.result }}</p>
             </td>
             <td width="104" nowrap="" class="JR_right">
-              <p align="center" style="margin: 10px 0">{{ message.expend }}</p>
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.expend }}</p>
             </td>
             <td width="83" nowrap="" class="JR_right">
-              <p align="center" style="margin: 10px 0">{{ message.remark }}</p>
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.remark }}</p>
             </td>
           </tr>
 
@@ -236,6 +237,7 @@
           font-weight: 900;
           margin: 10px 50px 20px 700px;
           color: black;
+          font-family: 'kaiti'
         "
       >
         军事主管：{{message.peopleName}}
@@ -273,7 +275,7 @@ tr:last-child {
   border-bottom: 1px solid;
 }
 .a1 {
-  margin-right: 50px;
+  margin-right: 30px;
 }
 .box1 {
   position: absolute;

src/components/look_word/bdglequip.vue

@@ -9,6 +9,7 @@
           font-weight: 900;
           margin: 0px 0px 20px -30px;
           color: black;
+
         "
       >
         《训练器材、教材登记簿》
@@ -22,6 +23,7 @@
           color: black;
           margin-left: -20px;
           margin-bottom: 5px;
+          font-family: 'kaiti'
         "
       >
         审核：
@@ -45,84 +47,84 @@
       >
         <!--<p align="center" style="font-size: 14pt;font-weight: bold;">顶级分类-训练器材、教材登记簿</p>-->
 
-        <tbody>
+        <tbody  style="font-size: 16px;font-weight: 600;">
           <tr class="JR_tr">
             <td width="37" valign="center" rowspan="2" class="JR_left">
-              <p align="center" style="">序<br />号</p>
+              <p align="center" style="font-family: 'kaiti'">序<br />号</p>
             </td>
             <td width="66" valign="center" rowspan="2" class="JR_left">
-              <p align="center" style="">类别</p>
+              <p align="center" style="font-family: 'kaiti'">类别</p>
             </td>
             <td width="85" valign="center" rowspan="2" class="JR_left">
-              <p align="center" style="">名称</p>
+              <p align="center" style="font-family: 'kaiti'">名称</p>
             </td>
             <td width="274" valign="center" colspan="5" class="JR_left">
-              <p align="center">库存情况</p>
+              <p align="center" style="font-family: 'kaiti'">库存情况</p>
             </td>
             <td width="179" valign="center" colspan="3" class="JR_left">
-              <p align="center">入库情况</p>
+              <p align="center" style="font-family: 'kaiti'">入库情况</p>
             </td>
             <td width="179" valign="center" colspan="3" class="JR_left">
-              <p align="center">出库情况</p>
+              <p align="center" style="font-family: 'kaiti'">出库情况</p>
             </td>
             <td width="56" valign="center" rowspan="2" class="JR_left">
-              <p align="center">质量<br />状况</p>
+              <p align="center" style="font-family: 'kaiti'">质量<br />状况</p>
             </td>
             <td width="56" valign="center" rowspan="2" class="JR_left">
-              <p align="center">备注</p>
+              <p align="center" style="font-family: 'kaiti'">备注</p>
             </td>
           </tr>
           <tr class="JR_tr">
             <td width="66" valign="center" class="JR_left">
-              <p align="center">
+              <p align="center" style="font-family: 'kaiti'">
                 配发 <br />
                 单位
               </p>
             </td>
             <td width="56" valign="center" class="JR_left">
-              <p align="center">
+              <p align="center" style="font-family: 'kaiti'">
                 配发 <br />
                 时间
               </p>
             </td>
             <td width="47" valign="center">
-              <p align="center" style="t" class="JR_left">
+              <p align="center" style="font-family: 'kaiti'" class="JR_left">
                 配发<br />
                 数量
               </p>
             </td>
             <td width="47" valign="center">
-              <p align="center" style="" class="JR_left">
+              <p align="center" style="font-family: 'kaiti'" class="JR_left">
                 自筹<br />
                 数量
               </p>
             </td>
             <td width="47" valign="center">
-              <p align="center" style="" class="JR_left">
+              <p align="center" style="font-family: 'kaiti'" class="JR_left">
                 库存<br />
                 数量
               </p>
             </td>
             <td width="56" valign="center">
-              <p align="center" class="JR_left">时间</p>
+              <p align="center" class="JR_left" style="font-family: 'kaiti'">时间</p>
             </td>
             <td width="47" valign="center">
-              <p align="center" class="JR_left">数量</p>
+              <p align="center" class="JR_left" style="font-family: 'kaiti'">数量</p>
             </td>
             <td width="75" valign="center">
-              <p align="center" class="JR_left">经手人</p>
+              <p align="center" class="JR_left" style="font-family: 'kaiti'">经手人</p>
             </td>
             <td width="56" valign="center">
-              <p align="center" class="JR_left">时间</p>
+              <p align="center" class="JR_left" style="font-family: 'kaiti'">时间</p>
             </td>
             <td width="47" valign="center">
-              <p align="center" class="JR_left">数量</p>
+              <p align="center" class="JR_left" style="font-family: 'kaiti'">数量</p>
             </td>
             <td width="75" valign="center">
-              <p align="center" class="JR_left">经手人</p>
+              <p align="center" class="JR_left" style="font-family: 'kaiti'">经手人</p>
             </td>
           </tr>
-          <tr class="JR_tr">
+          <tr class="JR_tr" style="font-family: 'fangsong'">
             <td width="37" valign="center">
               <p align="center">{{ message.id }}</p>
             </td>
@@ -173,7 +175,7 @@
             </td>
           </tr>
           <tr class="JR_tr">
-            <td width="37" valign="center" style="">
+            <td width="37" valign="center" style="font-family: 'kaiti'">
               <p align="center">
                 填<br />
                 写<br />
@@ -181,7 +183,7 @@
                 明 <br />
               </p>
             </td>
-            <td width="897" valign="center" colspan="15" v-html="message.info">
+            <td width="897" valign="center" colspan="15" v-html="message.info" style="font-family: 'fangsong'">
               <p></p>
             </td>
           </tr>
@@ -200,7 +202,7 @@
             class="JR_right"
             colspan="6"
             align="left"
-            style="border: none; line-height: 45px"
+            style="border: none; line-height: 45px;font-family: 'fangsong'"
           >
             军事主官：
           </td>
@@ -208,7 +210,7 @@
             class="JR_right"
             colspan="7"
             align="left"
-            style="border: none; line-height: 45px"
+            style="border: none; line-height: 45px;font-family: 'fangsong'"
           >
             政治主官：
           </td>
@@ -216,7 +218,7 @@
             class="JR_right"
             colspan="3"
             align="left"
-            style="border: none; line-height: 45px"
+            style="border: none; line-height: 45px;font-family: 'fangsong'"
           >
             时间：
           </td>

src/components/look_word/bdgleven.vue

@@ -2,11 +2,11 @@
   <div>
     <el-button class="box1" @click="daochu">导出</el-button>
 
-    <div class="word" id="contents" style="font-family: 'fangsong'">
+    <div class="word" id="contents" style="font-family: 'kaiti'">
       <!-- <div class="fTitle">大队连务会记录本</div> -->
       <p
         style="
-          font-size: 14pt;
+          font-size: 16pt;
           font-weight: 900;
           margin-botttom: 30px;
           color: black;
@@ -32,57 +32,58 @@
         width="600"
         align="center"
         bordercolor="black"
+        
       >
-        <tbody>
+        <tbody style="font-size: 16px;font-weight: 600;">
           <tr class="JR_tr">
             <td
               width="80"
               class="JR_left"
-              style="border-right: 1px dashed #999"
+              style="border-right: 1px dashed #999;font-family: 'kaiti'"
             >
               <p align="center">&nbsp;&nbsp;时 &nbsp;&nbsp;&nbsp;&nbsp;间</p>
             </td>
-            <td class="JR_right">
+            <td class="JR_right" style="font-family: 'fangsong'">
               <p align="left" style="padding-left: 20px">
                 {{ message.convokeTime }}
               </p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left">
+            <td class="JR_left" style="font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;地 &nbsp;&nbsp;&nbsp;&nbsp;点</p>
             </td>
-            <td class="JR_right">
+            <td class="JR_right" style="font-family: 'fangsong'">
               <p align="left" style="padding-left: 20px">
                 {{ message.address }}
               </p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left">
+            <td class="JR_left" style="font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;出席人</p>
             </td>
-            <td class="JR_right">
+            <td class="JR_right" style="font-family: 'fangsong'">
               <p align="left" style="padding-left: 20px">
                 {{ message.joinId }}
               </p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left">
+            <td class="JR_left" style="font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;主持人</p>
             </td>
-            <td class="JR_right">
+            <td class="JR_right" style="font-family: 'fangsong'">
               <p align="left" style="padding-left: 20px">
                 {{ message.compereRen }}
               </p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left">
+            <td class="JR_left" style="font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;记录人</p>
             </td>
-            <td class="JR_right">
+            <td class="JR_right" style="font-family: 'fangsong'">
               <p align="left" style="padding-left: 20px">
                 {{ message.peopleJiLu }}
               </p>
@@ -90,7 +91,7 @@
           </tr>
 
           <tr class="JR_tr">
-            <td class="JR_left">
+            <td class="JR_left" style="font-family: 'kaiti'">
               <p align="right" style="text-align: center; line-height: 20px">
                 议<br />题
               </p>
@@ -98,14 +99,14 @@
             <td
               class="JR_right"
               align="left"
-              style="line-height: 20px; text-indent: 30px"
+              style="line-height: 20px; text-indent: 30px;font-family: 'fangsong'"
               v-html="message.title"
             >
               <!-- {{ message.title }} -->
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left">
+            <td class="JR_left" style="font-family: 'kaiti'">
               <p align="right" style="text-align: center; line-height: 20px">
                 会<br />议<br />内<br />容
               </p>
@@ -113,7 +114,7 @@
             <td
               align="left"
               class="JR_right"
-              style="line-height: 20px; text-indent: 30px"
+              style="line-height: 20px; text-indent: 30px;font-family: 'fangsong'"
               v-html="message.contents"
             ></td>
           </tr>
@@ -122,7 +123,7 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black"
+              style="border-left: 1px solid black;font-family: 'kaiti'"
             >
               <p style="text-align: right; padding-right: 80px">主持人：</p>
             </td>
@@ -131,7 +132,7 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black"
+              style="border-left: 1px solid black;font-family: 'kaiti'"
             >
               <p style="text-align: right; padding-right: 80px">记录人：</p>
             </td>
@@ -140,7 +141,7 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black"
+              style="border-left: 1px solid black;font-family: 'kaiti'"
             >
               <!--<p style=" text-align:right;padding-right: 10px;">　　　　年　　月　　日</p>-->
               <p style="text-align: right; padding-right: 80px">时间：</p>

src/components/look_word/bdglfilemanagement.vue

@@ -9,6 +9,7 @@
           font-weight: 900;
           margin-botttom: 30px;
           color: black;
+          font-family: 'kaiti'
         "
       >
         《文件管理登记本》
@@ -35,12 +36,12 @@
       >
         <!--<p align="center" style="font-size: 14pt;font-weight: bold;">文件管理登记本</p>-->
 
-        <tbody>
-          <tr class="JR_tr">
+        <tbody  style="font-size: 16px;font-weight: 600;">
+          <tr class="JR_tr" >
             <th width="174" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit">文件名称</font></font
+                  ><font style="vertical-align: inherit;font-family: 'kaiti'">文件名称</font></font
                 >
               </p>
             </th>
@@ -48,7 +49,7 @@
             <th width="125" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit">文件编号</font></font
+                  ><font style="vertical-align: inherit;font-family: 'kaiti'">文件编号</font></font
                 >
               </p>
             </th>
@@ -56,7 +57,7 @@
             <th width="95" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit">收文日期</font></font
+                  ><font style="vertical-align: inherit;font-family: 'kaiti'">收文日期</font></font
                 >
               </p>
             </th>
@@ -64,7 +65,7 @@
             <th width="57" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit">密级</font></font
+                  ><font style="vertical-align: inherit;font-family: 'kaiti'">密级</font></font
                 >
               </p>
             </th>
@@ -72,7 +73,7 @@
             <th width="57" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit">份数</font></font
+                  ><font style="vertical-align: inherit;font-family: 'kaiti'">份数</font></font
                 >
               </p>
             </th>
@@ -80,7 +81,7 @@
             <th width="85" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit">签收人</font></font
+                  ><font style="vertical-align: inherit;font-family: 'kaiti'">签收人</font></font
                 >
               </p>
             </th>
@@ -88,7 +89,7 @@
             <th width="85" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit">借阅人</font></font
+                  ><font style="vertical-align: inherit;font-family: 'kaiti'">借阅人</font></font
                 >
               </p>
             </th>
@@ -96,7 +97,7 @@
             <th width="85" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit"> 借阅时间 </font></font
+                  ><font style="vertical-align: inherit;font-family: 'kaiti'"> 借阅时间 </font></font
                 >
               </p>
             </th>
@@ -104,7 +105,7 @@
             <th width="85" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit"> 归还时间 </font></font
+                  ><font style="vertical-align: inherit;font-family: 'kaiti'"> 归还时间 </font></font
                 >
               </p>
             </th>
@@ -112,7 +113,7 @@
             <th width="59" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit">注销</font></font
+                  ><font style="vertical-align: inherit;font-family: 'kaiti'">注销</font></font
                 >
               </p>
             </th>
@@ -120,43 +121,43 @@
 
           <tr class="JR_tr">
             <td width="174" valign="center" class="JR_right">
-              <p align="center" style="margin: 20px 0">{{ message.name }}</p>
+              <p align="center" style="margin: 20px 0;font-family: 'fangsong'">{{ message.name }}</p>
             </td>
 
             <td width="125" valign="center" class="JR_right">
-              <p align="center">{{ message.number }}</p>
+              <p align="center" style="font-family: 'fangsong'">{{ message.number }}</p>
             </td>
 
             <td width="95" valign="center" class="JR_right">
-              <p align="center">{{ message.incomingDispatchesTime }}</p>
+              <p align="center" style="font-family: 'fangsong'">{{ message.incomingDispatchesTime }}</p>
             </td>
 
             <td width="57" valign="center" class="JR_right">
-              <p align="center">{{ message.confidential }}</p>
+              <p align="center" style="font-family: 'fangsong'">{{ message.confidential }}</p>
             </td>
 
             <td width="57" valign="center" class="JR_right">
-              <p align="center">{{ message.copies }}</p>
+              <p align="center" style="font-family: 'fangsong'">{{ message.copies }}</p>
             </td>
 
             <td width="85" valign="center" class="JR_right">
-              <p align="center">{{ message.peopleName }}</p>
+              <p align="center" style="font-family: 'fangsong'">{{ message.peopleName }}</p>
             </td>
 
             <td width="85" valign="center" class="JR_right">
-              <p align="center">{{ message.borrowName }}</p>
+              <p align="center" style="font-family: 'fangsong'">{{ message.borrowName }}</p>
             </td>
 
             <td width="85" valign="center" class="JR_right">
-              <p align="center">{{ message.loanTime }}</p>
+              <p align="center" style="font-family: 'fangsong'">{{ message.loanTime }}</p>
             </td>
 
             <td width="85" valign="center" class="JR_right">
-              <p align="center">{{ message.returnTime }}</p>
+              <p align="center" style="font-family: 'fangsong'">{{ message.returnTime }}</p>
             </td>
 
             <td width="59" valign="center" class="JR_right">
-              <p align="center">{{ message.logoutName }}</p>
+              <p align="center" style="font-family: 'fangsong'">{{ message.logoutName }}</p>
             </td>
           </tr>
 

src/components/look_word/bdglfood.vue

@@ -4,10 +4,11 @@
     <div class="word" id="contents" style="margin-top: 10px">
       <p
         style="
-          font-size: 14pt;
+          font-size: 16pt;
           font-weight: 900;
           margin-botttom: 30px;
           color: black;
+          font-family: 'kaiti'
         "
       >
         《伙食管理登记簿》
@@ -42,6 +43,7 @@
           mso-border-insidev: 0.5pt solid windowtext;
           mso-padding-alt: 0pt 0pt 0pt 0pt;
           margin-left: -20px;
+          font-size: 16px;font-weight: 600;
         "
         width="960"
         align="center"
@@ -49,7 +51,7 @@
       >
         <tr
           class="aaa"
-          style="border: none; color: black; font-size: 12pt; line-height: 30px"
+          style="border: none; color: black; font-size: 12pt; line-height: 30px;font-family: 'kaiti'"
         >
           <td
             class="JR_right"
@@ -76,9 +78,9 @@
             单位：千克、元
           </td>
         </tr>
-        <tbody>
+        <tbody >
           <!-- 区分早中晚一日三餐 -->
-          <tr style="text-align: center" class="JR_tr">
+          <tr style="text-align: center;font-family: 'kaiti'" class="JR_tr" >
             <td colspan="2" class="JR_left" style="widt: 60px">区 分</td>
             <td colspan="3" class="JR_left">
               <p align="center">主食</p>
@@ -88,36 +90,36 @@
             </td>
           </tr>
 
-          <tr class="JR_tr">
-            <td colspan="2" class="JR_left"><p align="center">早</p></td>
-            <td colspan="3" style="color: black" class="JR_right">
+          <tr class="JR_tr" >
+            <td colspan="2" class="JR_left"><p align="center" style="font-family: 'kaiti'">早</p></td>
+            <td colspan="3" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].stapleFood }}</p>
             </td>
-            <td colspan="11" style="color: black" class="JR_right">
+            <td colspan="11" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].menu }}</p>
             </td>
           </tr>
 
           <tr class="JR_tr">
-            <td colspan="2" class="JR_left"><p align="center">中</p></td>
-            <td colspan="3" style="color: black" class="JR_right">
+            <td colspan="2" class="JR_left"><p align="center" style="font-family: 'kaiti'">中</p></td>
+            <td colspan="3" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].stapleFood }}</p>
             </td>
-            <td colspan="11" style="color: v" class="JR_right">
+            <td colspan="11" style="font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].menu }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td colspan="2" class="JR_left"><p align="center">晚</p></td>
-            <td colspan="3" style="color: v" class="JR_right">
+            <td colspan="2" class="JR_left"><p align="center" style="font-family: 'kaiti'">晚</p></td>
+            <td colspan="3" style="font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].stapleFood }}</p>
             </td>
-            <td colspan="11" style="color: v" class="JR_right">
+            <td colspan="11" style="font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].menu }}</p>
             </td>
           </tr>
 
-          <tr style="text-align: center" class="JR_tr">
+          <tr style="text-align: center;font-family: 'kaiti'" class="JR_tr">
             <td rowspan="2" colspan="2" class="JR_left">
               <p align="center" style="">区<br />分</p>
             </td>
@@ -129,7 +131,7 @@
             </td>
           </tr>
 
-          <tr class="JR_tr">
+          <tr class="JR_tr" style="font-family: 'kaiti'">
             <td width="" class="JR_left"><p align="center">总数</p></td>
             <td width="" class="JR_left"><p align="center">连队</p></td>
             <td width="" class="JR_left"><p align="center">外来</p></td>
@@ -170,155 +172,155 @@
 
           <tr class="JR_tr">
             <td width="" colspan="2" class="JR_left">
-              <p align="center">早</p>
+              <p align="center" style="font-family: 'kaiti'">早</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].jiucanCount }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].lianduiCount }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].wailaiCount }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].mianfen }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].dami }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].rolei }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].yulei }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].youlei }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].huangdo }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].suchai }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].shuiguo }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].tang }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].tiaoliao }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].ranliao }}</p>
             </td>
           </tr>
 
           <tr class="JR_tr">
             <td colspan="2" width="" class="JR_left">
-              <p align="center">中</p>
+              <p align="center" style="font-family: 'kaiti'">中</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].jiucanCount }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].lianduiCount }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].wailaiCount }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].mianfen }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].dami }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].rolei }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].yulei }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].youlei }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].huangdo }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].suchai }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].shuiguo }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].tang }}</p>
             </td>
 
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].tiaoliao }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].ranliao }}</p>
             </td>
           </tr>
 
           <tr class="JR_tr">
             <td colspan="2" width="" class="JR_left">
-              <p align="center">晚</p>
+              <p align="center" style="font-family: 'kaiti'">晚</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].jiucanCount }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].lianduiCount }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].wailaiCount }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].mianfen }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].dami }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].rolei }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].yulei }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].youlei }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].huangdo }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].suchai }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].shuiguo }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].tang }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].tiaoliao }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].ranliao }}</p>
             </td>
           </tr>
           <!-- 此处实物检验查收 -->
           <tr class="JR_tr">
             <td width="" colspan="16" class="JR_left">
-              <p align="center">实物检查验收</p>
+              <p align="center" style="font-family: 'kaiti'">实物检查验收</p>
             </td>
           </tr>
-          <tr class="JR_tr">
+          <tr class="JR_tr" style="font-family: 'kaiti'">
             <td width="" class="JR_left"><p align="center">区分</p></td>
             <td width="" colspan="3" class="JR_left">
               <p align="center">品名</p>
@@ -342,34 +344,34 @@
 
           <tr class="JR_tr" v-for="(item, i) in message.bdglFoodKinds" :key="i">
             <td width="" rowspan="" class="JR_left">
-              <p align="center">
+              <p align="center" style="font-family: 'kaiti'">
                 {{ i == 0 ? "主食" : i == 1 ? "副食" : "其他" }}
               </p>
             </td>
-            <td width="" style="color: black" colspan="3" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="3" class="JR_right">
               <p align="center">{{ item.name }}</p>
             </td>
-            <td width="" style="color: black" colspan="2" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="2" class="JR_right">
               <p align="center">
                 {{ item.distinctions }}
               </p>
             </td>
-            <td width="" style="color: black" colspan="2" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="2" class="JR_right">
               <p align="center">{{ item.weight }}</p>
             </td>
-            <td width="" style="color: black" colspan="2" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="2" class="JR_right">
               <p align="center">{{ item.money }}</p>
             </td>
-            <td width="" style="color: black" colspan="3" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="3" class="JR_right">
               <p align="center">{{ item.types }}</p>
             </td>
-            <td width="" style="color: black" colspan="3" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="3" class="JR_right">
               <p align="center">{{ item.money }}</p>
             </td>
           </tr>
 
           <!-- 退交伙食费- -->
-          <tr class="JR_tr" style="text-align: center">
+          <tr class="JR_tr" style="text-align: center;font-family: 'kaiti'">
             <td width="" colspan="1" rowspan="2" class="JR_left">
               <p align="center" style="">姓名</p>
             </td>
@@ -384,7 +386,7 @@
             </td>
           </tr>
 
-          <tr class="JR_tr">
+          <tr class="JR_tr" style="font-family: 'kaiti'">
             <td width="" colspan="3" class="JR_left">
               <p align="center">天数</p>
             </td>
@@ -409,7 +411,7 @@
             v-for="(item, i) in by_reset"
             :key="i"
             class="JR_tr"
-            style="text-align: center; line-height: 47px"
+            style="text-align: center; line-height: 47px;font-family: 'fangsong'"
           >
             <td colspan="1" class="JR_right">
               {{ item.peopleName }}
@@ -448,10 +450,10 @@
           <!-- 在食堂购物 -->
           <tr class="JR_tr">
             <td width="" colspan="16" class="JR_left">
-              <p align="center">在食堂购物</p>
+              <p align="center" style="font-family: 'kaiti'">在食堂购物</p>
             </td>
           </tr>
-          <tr class="JR_tr" style="text-align: center; line-height: 47px">
+          <tr class="JR_tr" style="text-align: center; line-height: 47px;font-family: 'kaiti'">
             <td width="" rowspan="2" colspan="2" class="JR_left">
               <p align="center">姓名</p>
             </td>
@@ -468,7 +470,7 @@
               <p align="center">合计</p>
             </td>
           </tr>
-          <tr class="JR_tr">
+          <tr class="JR_tr" style="font-family: 'kaiti'">
             <td width="" colspan="2" class="JR_left">
               <p align="center">品名</p>
             </td>
@@ -503,6 +505,7 @@
             v-for="(item) in message.bdglFoodShoppings"
             :key="item.id"
             height="50"
+            style="font-family: 'fangsong'"
           >
             <td width="" colspan="2" class="JR_right">
               <p align="center">
@@ -544,7 +547,7 @@
           </tr>
 
           <tr class="JR_tr">
-            <td width="" colspan="2" class="JR_left">
+            <td width="" colspan="2" class="JR_left" style="font-family: 'kaiti'">
               <p align="center">
                 炊<br />
                 事<br />
@@ -558,30 +561,29 @@
               </p>
             </td>
             <td
-              width=""
+              style="font-family: 'fangsong'"
               colspan="6"
-              style=""
               v-html="message.contents"
               class="JR_right"
             >
               <p></p>
             </td>
             <td width="" style="padding: 48px 5px" class="JR_left">
-              <p align="center">
+              <p align="center" style="font-family: 'kaiti'">
                 帮<br />
                 厨<br />
                 人<br />
                 员
               </p>
             </td>
-            <td width="" colspan="7" style="" class="JR_right">
+            <td width="" colspan="7" style="font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.peopleNames }}</p>
             </td>
           </tr>
 
           <tr class="JR_tr">
             <td width="" colspan="2" class="JR_left">
-              <p align="center">
+              <p align="center" style="font-family: 'kaiti'">
                 就<br />
                 餐<br />
                 人<br />
@@ -594,7 +596,7 @@
               class="JR_right"
               width=""
               colspan="14"
-              style="text-align: center"
+              style="text-align: center;font-family: 'fangsong'"
               v-html="message.repastContent"
             >
               <p align="center"></p>
@@ -603,7 +605,7 @@
         </tbody>
         <tr
           class="aaa"
-          style="border: none; color: black; font-size: 12pt; line-height: 30px"
+          style="border: none; color: black; font-size: 12pt; line-height: 30px;font-family: 'kaiti'"
         >
           <td
             class="JR_right"

src/components/look_word/bdglmeeting.vue

@@ -9,6 +9,7 @@
           margin-botttom: 30px;
           color: black;
           text-align: center;
+          font-family: 'kaiti'
         "
       >
         《团支部工作记录本》
@@ -30,10 +31,10 @@
         align="center"
         bordercolor="black"
       >
-        <tbody>
+        <tbody  style="font-size: 16px;font-weight: 600;">
           <tr class="JR_tr">
-            <th class="" colspan="2">
-              <h4 align="center" style="text-align: center">
+            <th class="" colspan="2" >
+              <h4 align="center"  style="font-size: 16px;font-weight: 600;font-family: 'kaiti'">
                 团支部委员会会议
               </h4>
             </th>
@@ -42,110 +43,110 @@
             <td
               width="120"
               class="JR_left"
-              style="border-right: 1px dashed #fff"
+              style="border-right: 1px dashed #fff;font-family: 'kaiti'"
             >
               <p align="center">&nbsp;&nbsp;时 &nbsp;间：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.convokeTime }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #fff">
+            <td class="JR_left" style="border-right: 1px dashed #fff;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;地 &nbsp;点：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.address }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #fff">
+            <td class="JR_left" style="border-right: 1px dashed #fff;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;主持人：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.compereRen }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #fff">
+            <td class="JR_left" style="border-right: 1px dashed #fff;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;参加人：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.joinId }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #fff">
+            <td class="JR_left" style="border-right: 1px dashed #fff;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;列席人：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.peopleIds }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #fff">
+            <td class="JR_left" style="border-right: 1px dashed #fff;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;缺席人：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.absentIds }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #fff">
+            <td class="JR_left" style="border-right: 1px dashed #fff;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;记录人：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.peopleJiLu }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #fff">
+            <td class="JR_left" style="border-right: 1px dashed #fff;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;议 &nbsp;题：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
               v-html="message.title"
             >
               <!-- <p>{{ message.title }}</p> -->
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: none">
+            <td class="JR_left" style="border-right: none;font-family: 'kaiti'">
               <p align="center">&nbsp; 内 &nbsp;容：</p>
             </td>
             <td
               align="left"
-              style="border-left: none; padding-left: 20px"
+              style="border-left: none; padding-left: 20px;font-family: 'fangsong'"
               class="JR_right"
               v-html="message.contents"
             ></td>
@@ -155,7 +156,7 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black"
+              style="border-left: 1px solid black;font-family: 'kaiti'"
             >
               <p style="text-align: right; padding-right: 80px">主持人：</p>
             </td>
@@ -164,16 +165,16 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black"
+              style="border-left: 1px solid black;font-family: 'kaiti'"
             >
-              <p style="text-align: right; padding-right: 80px">主持人：</p>
+              <p style="text-align: right; padding-right: 80px">记录人：</p>
             </td>
           </tr>
           <tr class="JR_tr">
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black"
+              style="border-left: 1px solid black;font-family: 'kaiti'"
             >
               <!--<p style=" text-align:right;padding-right: 10px;">　　　　年　　月　　日</p>-->
               <p style="text-align: right; padding-right: 80px">时间：</p>

src/components/look_word/bdglparty.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button class="box1" @click="daochu">导出</el-button>
 
-    <div class="word" id="contents">
+    <div class="word" id="contents" style="font-family: 'kaiti'">
       <p
         style="
           font-size: 14pt;
@@ -31,10 +31,10 @@
         align="center"
         bordercolor="black"
       >
-        <tbody>
+        <tbody style="font-size: 16px;font-weight: 600;">
           <tr class="JR_tr">
-            <th class="" colspan="2">
-              <h4 align="center" style="text-align: center">
+            <th class="" colspan="2" style="font-family: 'kaiti'">
+              <h4 align="center" style="font-size: 16px;font-weight: 600;">
                 党支部委员会议(简称支委会)
               </h4>
             </th>
@@ -43,14 +43,14 @@
             <td
               width="120"
               class="JR_left"
-              style="border-right: 1px dashed #999"
+              style="border-right: 1px dashed #999;font-family: 'kaiti'"
             >
               <p align="center">&nbsp;&nbsp;时 &nbsp;间：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.convokeTime }}</p>
             </td>
@@ -59,74 +59,74 @@
             <td
               align="left"
               class="JR_left"
-              style="border-right: 1px dashed #999"
+              style="border-right: 1px dashed #999;font-family: 'kaiti'"
             >
               <p align="center">&nbsp;&nbsp;地 &nbsp;点：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.address }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #999">
+            <td class="JR_left" style="border-right: 1px dashed #999;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;主持人：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.compereRen }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #999">
+            <td class="JR_left" style="border-right: 1px dashed #999;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;参加人：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.joinId }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #999">
+            <td class="JR_left" style="border-right: 1px dashed #999;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;列席人：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.peopleIds }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #999">
+            <td class="JR_left" style="border-right: 1px dashed #999;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;缺席人：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.absentIds }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #999">
+            <td class="JR_left" style="border-right: 1px dashed #999;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;记录人：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.peopleJiLu }}</p>
             </td>
@@ -136,13 +136,13 @@
             <td
               rowspan="2"
               class="JR_left"
-              style="border-right: 1px dashed #999"
+              style="border-right: 1px dashed #999;font-family: 'kaiti'"
             >
               <p align="center">&nbsp;&nbsp;议 &nbsp;题：</p>
             </td>
             <td
               rowspan="2"
-              style="border-left: 1px dashed #999; padding: 0px 20px"
+              style="border-left: 1px dashed #999; padding: 0px 20px;font-family: 'fangsong'"
               align="left"
               v-html="message.title"
             >
@@ -151,7 +151,7 @@
           </tr>
           <tr class="JR_tr"></tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 0">
+            <td class="JR_left" style="border-right: 0;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp; 内 &nbsp;容：</p>
             </td>
             <td class="TableData" style="border-left: 0"></td>
@@ -165,6 +165,7 @@
                 text-indent: 30px;
                 padding: 0px 10px;
                 border: 1px solid black;
+                font-family: 'fangsong'
               "
             ></td>
           </tr>
@@ -173,7 +174,7 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black"
+              style="border-left: 1px solid black;font-family: 'kaiti'"
             >
               <p style="text-align: right; padding-right: 80px">主持人：</p>
             </td>
@@ -182,16 +183,16 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black"
+              style="border-left: 1px solid black;font-family: 'kaiti'"
             >
-              <p style="text-align: right; padding-right: 80px">主持人：</p>
+              <p style="text-align: right; padding-right: 80px">记录人：</p>
             </td>
           </tr>
           <tr class="JR_tr">
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black"
+              style="border-left: 1px solid black;font-family: 'kaiti'"
             >
               <!--<p style=" text-align:right;padding-right: 10px;">　　　　年　　月　　日</p>-->
               <p style="text-align: right; padding-right: 80px">时间：</p>

src/components/look_word/bdglpublicproperty.vue

@@ -33,8 +33,8 @@
         bordercolor="black"
       >
         <!--<p align="center" style="font-size: 14pt;font-weight: bold;">营产，公物管理登记簿</p>-->
-        <tbody>
-          <tr class="JR_tr">
+        <tbody style="font-size: 16px;font-weight: 600;">
+          <tr class="JR_tr" style="font-size: 16px;font-weight: 600;font-family: 'kaiti'">
             <th width="47" valign="center" nowrap="" class="JR_left">
               <p align="center" style="margin: 10px 0">序号</p>
             </th>
@@ -76,7 +76,7 @@
             </th>
           </tr>
 
-          <tr class="JR_tr">
+          <tr class="JR_tr" style="font-family: 'fangsong'">
             <td width="47" valign="center" nowrap="" class="JR_right">
               <p align="center">{{ message.id }}</p>
             </td>

src/components/look_word/bdglsecrecy.vue

@@ -32,77 +32,77 @@
         bordercolor="black"
       >
         <!--<p align="center" style="font-size: 14pt;font-weight: bold;">网络/移动电话/涉密载体登记本</p>-->
-        <tbody>
+        <tbody style="font-size: 16px;font-weight: 600;">
           <tr class="JR_tr">
-            <td valign="center" style="width: 106px" class="JR_left">
+            <td valign="center" style="width: 106px;font-family: 'kaiti'" class="JR_left">
               <p align="center" style="margin: 5px 0">种类（名称）</p>
             </td>
-            <td valign="center" style="width: 106px" class="JR_left">
+            <td valign="center" style="width: 106px;font-family: 'kaiti'" class="JR_left">
               <p align="center" style="margin: 5px 0">型号</p>
             </td>
-            <td valign="center" style="width: 106px" class="JR_left">
+            <td valign="center" style="width: 106px;font-family: 'kaiti'" class="JR_left">
               <p align="center" style="margin: 5px 0">编号</p>
             </td>
-            <td valign="center" style="width: 106px" class="JR_left">
+            <td valign="center" style="width: 106px;font-family: 'kaiti'" class="JR_left">
               <p align="center" style="margin: 5px 0">密级</p>
             </td>
-            <td valign="center" style="width: 106px" class="JR_left">
+            <td valign="center" style="width: 106px;font-family: 'kaiti'" class="JR_left">
               <p align="center" style="margin: 5px 0">责任人</p>
             </td>
-            <td valign="center" style="width: 106px" class="JR_left">
+            <td valign="center" style="width: 106px;font-family: 'kaiti'" class="JR_left">
               <p align="center" style="margin: 5px 0">使用人</p>
             </td>
-            <td valign="center" style="width: 106px" class="JR_left">
+            <td valign="center" style="width: 106px;font-family: 'kaiti'" class="JR_left">
               <p align="center" style="margin: 5px 0">批准人</p>
             </td>
-            <td valign="center" style="width: 106px" class="JR_left">
+            <td valign="center" style="width: 106px;font-family: 'kaiti'" class="JR_left">
               <p align="center" style="margin: 5px 0">
                 使用起止 <br />
                 时间
               </p>
             </td>
-            <td valign="center" style="width: 106px" class="JR_left">
+            <td valign="center" style="width: 106px;font-family: 'kaiti'" class="JR_left">
               <p align="center" style="margin: 5px 0">移交（出借）时间</p>
             </td>
           </tr>
           <tr class="JR_tr">
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0">{{ message.kind }}</p>
+              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">{{ message.kind }}</p>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0">{{ message.number }}</p>
+              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">{{ message.number }}</p>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0">{{ message.version }}</p>
+              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">{{ message.version }}</p>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0">
+              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">
                 {{ message.confidential }}
               </p>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0">
+              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">
                 {{ message.peopleName }}
               </p>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0">
+              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">
                 {{ message.people1Name }}
               </p>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0">
+              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">
                 {{ message.people2Name }}
               </p>
             </td>
             <td valign="center" class="JR_right">
               <!--<p align="center">2022-01-18<br>2022-01-18</p>-->
-              <p align="center" style="margin: 5px 0">
+              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">
                 {{ message.startTime }}
               </p>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0">
+              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">
                 {{ message.hindOverTime }}<br />
                 (移交/出售)
               </p>

src/components/look_word/bdglsoldier.vue

@@ -9,6 +9,7 @@
           margin-botttom: 30px;
           color: black;
           text-align: center;
+          font-family: 'kaiti'
         "
       >
         《军人委员会工作记录本》
@@ -30,10 +31,10 @@
         align="center"
         bordercolor="black"
       >
-        <tbody>
+        <tbody style="font-size: 16px;font-weight: 600;">
           <tr class="JR_tr">
-            <th class="" colspan="2">
-              <h4 align="center" style="text-align: center">军人委员会会议</h4>
+            <th class="" colspan="2" style="font-family: 'kaiti'">
+              <h4 align="center" style="font-size: 16px;font-weight: 600;">军人委员会会议</h4>
             </th>
           </tr>
           <tr class="JR_tr">
@@ -41,70 +42,71 @@
               align="center"
               width="120"
               class="JR_left"
-              style="border-right: 0"
+              style="border-right: 0;font-family: 'kaiti'"
+              
             >
               <p align="center">&nbsp;&nbsp;&nbsp;&nbsp;时 &nbsp;间：</p>
             </td>
-            <td align="left" class="JR_right" style="border-left: 0">
+            <td align="left" class="JR_right" style="border-left: 0;font-family: 'fangsong'">
               <p>{{ message.convokeTime }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 0">
+            <td class="JR_left" style="border-right: 0;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;&nbsp;&nbsp;地 &nbsp;点：</p>
             </td>
-            <td align="left" class="JR_right" style="border-left: 0">
+            <td align="left" class="JR_right" style="border-left: 0;font-family: 'fangsong'">
               <p>{{ message.address }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 0">
+            <td class="JR_left" style="border-right: 0;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;&nbsp;&nbsp;主持人：</p>
             </td>
-            <td align="left" class="JR_right" style="border-left: 0">
+            <td align="left" class="JR_right" style="border-left: 0;font-family: 'fangsong'">
               <p>{{ message.compereRen }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 0">
+            <td class="JR_left" style="border-right: 0;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;&nbsp;&nbsp;参加人：</p>
             </td>
-            <td align="left" class="JR_right" style="border-left: 0">
+            <td align="left" class="JR_right" style="border-left: 0;font-family: 'fangsong'">
               <p>{{ message.joinId }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 0">
+            <td class="JR_left" style="border-right: 0;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;&nbsp;&nbsp;列席人：</p>
             </td>
-            <td align="left" class="JR_right" style="border-left: 0">
+            <td align="left" class="JR_right" style="border-left: 0;font-family: 'fangsong'">
               <p>{{ message.peopleIds }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 0">
+            <td class="JR_left" style="border-right: 0;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;&nbsp;&nbsp;缺席人：</p>
             </td>
-            <td align="left" class="JR_right" style="border-left: 0">
+            <td align="left" class="JR_right" style="border-left: 0;font-family: 'fangsong'">
               <p>{{ message.absentIds }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 0">
+            <td class="JR_left" style="border-right: 0;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;&nbsp;&nbsp;记录人：</p>
             </td>
-            <td align="left" class="JR_right" style="border-left: 0">
+            <td align="left" class="JR_right" style="border-left: 0;font-family: 'fangsong'">
               <p>{{ message.peopleJiLu }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 0">
+            <td class="JR_left" style="border-right: 0;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;&nbsp;议 &nbsp;题：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 0"
+              style="border-left: 0;font-family: 'fangsong'"
               v-html="message.title"
             >
               <!-- <p>{{ message.title }}</p> -->
@@ -112,7 +114,7 @@
           </tr>
 
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 0">
+            <td class="JR_left" style="border-right: 0;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp; 内 &nbsp;容：</p>
             </td>
             <td class="TableData" style="border-left: 0"></td>
@@ -126,6 +128,7 @@
                 text-indent: 30px;
                 padding: 0px 10px;
                 border: 1px solid black;
+                font-family: 'fangsong'
               "
             ></td>
           </tr>
@@ -134,7 +137,7 @@
             <td colspan="2" class="TableData" style="border: 1px solid black">
               <p
                 class="JR_bottom"
-                style="text-align: right; padding-right: 80px"
+                style="text-align: right; padding-right: 80px;font-family: 'kaiti'"
               >
                 主持人：
               </p>
@@ -144,7 +147,7 @@
             <td colspan="2" class="TableData" style="border: 1px solid black">
               <p
                 class="JR_bottom"
-                style="text-align: right; padding-right: 80px"
+                style="text-align: right; padding-right: 80px;font-family: 'kaiti'"
               >
                 记录人：
               </p>
@@ -152,7 +155,7 @@
           </tr>
           <tr class="JR_tr">
             <td colspan="2" class="" style="border: 1px solid black">
-              <p style="text-align: right; padding-right: 80px">时间：</p>
+              <p style="text-align: right; padding-right: 80px;font-family: 'kaiti'">时间：</p>
             </td>
           </tr>
         </tbody>

src/components/look_word/bdglweekwork.vue

@@ -9,6 +9,7 @@
           font-size: 20px;
           font-weight: 600;
           color: black;
+          font-family: 'kaiti'
         "
         id="qTitle"
       >
@@ -47,22 +48,23 @@
           style="
             border: none;
             color: black;
-            font-size: 12pt;
+            font-size: 16px;font-weight: 600;
             line-height: 30px;
             width: 940px;
+            font-family: 'kaiti'
           "
         >
           <td
             class="JR_left"
             colspan="3"
             align="left"
-            style="border: none; line-height: 45px; width: 360px"
+            style="border: none; line-height: 45px; width: 360px;"
           >
             连值班领导：{{ message.peopleName }}
           </td>
           <td
             class="JR_left"
-            colspan="3"
+            colspan="2"
             align="left"
             style="border: none; line-height: 45px; width: 360px"
           >
@@ -77,8 +79,8 @@
             {{ message.startTime }}—{{ message.endTime }}
           </td>
         </tr>
-        <tbody>
-          <tr class="JR_tr">
+        <tbody style="font-size: 16px;font-weight: 600;">
+          <tr class="JR_tr" style="font-size: 16px;font-weight: 600;font-family: 'kaiti'">
             <td align="center" valign="center" colspan="3" class="JR_left">
               <p align="center">日期</p>
             </td>
@@ -103,7 +105,7 @@
             class="JR_tr"
             v-for="(item, i) in message.bdglWeekworkRegisterList"
             :key="i"
-            style="text-align: center; height: 45px"
+            style="text-align: center; height: 45px;font-family: 'fangsong'"
           >
             <td style="text-align: center" rowspan="1" class="JR_right">
               {{ item.week }}
@@ -132,10 +134,10 @@
           </tr>
 
           <tr class="JR_tr">
-            <td valign="center" class="JR_left">
+            <td valign="center" class="JR_left" style="font-family: 'kaiti'">
               <p align="center">备注</p>
             </td>
-            <td valign="center" colspan="7" class="JR_right">
+            <td valign="center" colspan="7" class="JR_right" style="font-family: 'kaiti'">
               {{ message.remark }}
             </td>
           </tr>
@@ -144,9 +146,10 @@
           style="
             border: none;
             color: black;
-            font-size: 12pt;
+            font-size: 16px;font-weight: 600;
             line-height: 30px;
             width: 940px;
+            font-family: 'kaiti'
           "
         >
           <td

src/components/look_word/personnelRoster.vue

@@ -10,6 +10,7 @@
           margin-botttom: 30px;
           color: black;
           text-align: center;
+          font-family: 'kaiti';
         "
       >
         《人员名册》
@@ -32,14 +33,24 @@
         align="center"
         bordercolor="black"
       >
-        <tbody>
-          <tr class="JR_tr" height="40" align="center">
+        <tbody style="font-size: 16px; font-weight: 600">
+          <tr
+            class="JR_tr"
+            height="40"
+            align="center"
+            style="font-family: 'kaiti'"
+          >
             <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 class="JR_tr" height="40" align="center">
+          <tr
+            class="JR_tr"
+            height="40"
+            align="center"
+            style="font-family: 'kaiti'"
+          >
             <td class="JR_left">干部</td>
             <td class="JR_left">士官</td>
             <td class="JR_left">义务兵</td>
@@ -50,7 +61,12 @@
             <td class="JR_left">士官</td>
             <td class="JR_left">义务兵</td>
           </tr>
-          <tr class="JR_tr" height="40" align="center">
+          <tr
+            class="JR_tr"
+            height="40"
+            align="center"
+            style="font-family: 'fangsong'"
+          >
             <td class="JR_right"></td>
             <td class="JR_right"></td>
             <td class="JR_right"></td>
@@ -80,7 +96,13 @@
 
       <p
         align="right"
-        style="margin: 20px 200px 5px 0px; font-size: 16px; color: black"
+        style="
+          margin: 20px 200px 5px 0px;
+          font-size: 16px;
+          color: black;
+          font-family: 'kaiti';
+          font-size: 16px;font-weight: 600;
+        "
       >
         日期
       </p>
@@ -101,8 +123,8 @@
         align="center"
         bordercolor="black"
       >
-        <tbody>
-          <tr class="JR_tr" height="40" align="center">
+        <tbody style="font-size: 16px; font-weight: 600">
+          <tr class="JR_tr" height="40" align="center" style="font-family: 'kaiti'">
             <td class="JR_left">姓名</td>
             <td class="JR_left">职务</td>
             <td class="JR_left">军衔</td>
@@ -119,7 +141,7 @@
             <td class="JR_left">家庭住址及联系方式</td>
             <td class="JR_left">备注</td>
           </tr>
-          <tr class="JR_tr" height="40" align="center">
+          <tr class="JR_tr" height="40" align="center" style="font-family: 'fangsong'">
             <td class="JR_right">{{ message.name }}</td>
             <td class="JR_right">{{ message.postId }}</td>
             <td class="JR_right">{{ message.rankId }}</td>

src/layout/components/Sidebar/index.vue

@@ -77,6 +77,7 @@ export default {
     },
   },
   created() {
+    console.log(this.$route.query.name)
     //   this.routs=this.sidebarRouters
     if (this.$route.query.name) {
       this.sidebarRoutersfun();
@@ -93,6 +94,7 @@ export default {
     sidebarRoutersfun() {
       this.sidebarRouters.map((item) => {
         if (item.path == this.$route.query.name) {
+          console.log(11)
           this.routs.push(item);
         }
         // console.log(this.routs.length)

src/views/combatduty/RateOfTen/index.vue

@@ -287,16 +287,20 @@
            <el-input  v-model="form.bzrs" class="BIANJI"></el-input>
         </el-form-item>
         <el-form-item label="实际人数" prop="sjrs">
-          <div class="thistexts">{{ this.form.sjrs }}</div>
+          <el-input  v-model="form.sjrs" class="BIANJI" :disabled="true"></el-input>
+          <!-- <div class="thistexts">{{ this.form.sjrs }}</div> -->
         </el-form-item>
         <el-form-item label="在位人数" prop="zwrs">
-          <div class="thistexts">{{ this.form.zwrs }}</div>
+           <el-input  v-model="form.zwrs" class="BIANJI" :disabled="true"></el-input>
+          <!-- <div class="thistexts">{{ this.form.zwrs }}</div> -->
         </el-form-item>
         <el-form-item label="对口人数" prop="dkrs">
-          <div class="thistexts">{{ this.form.dkrs }}</div>
+          <el-input  v-model="form.dkrs" class="BIANJI" :disabled="true"></el-input>
+          <!-- <div class="thistexts">{{ this.form.dkrs }}</div> -->
         </el-form-item>
         <el-form-item label="出动人数" prop="cdrs">
-          <div class="thistexts">{{ this.form.cdrs }}</div>
+          <el-input  v-model="form.cdrs" class="BIANJI" :disabled="true"></el-input>
+          <!-- <div class="thistexts">{{ this.form.cdrs }}</div> -->
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -339,7 +343,8 @@
            <el-input  v-model="form1.zbsy" class="BIANJI"></el-input>
         </el-form-item>
         <el-form-item prop="zbky" label="装备可用数">
-          <div class="thistexts">{{ this.form1.zbky }}</div>
+          <el-input  v-model="form1.zbky" class="BIANJI" :disabled="true"></el-input>
+          <!-- <div class="thistexts">{{ this.form1.zbky }}</div> -->
         </el-form-item>
         <el-form-item prop="name" label="实际配套数">
           <!-- <el-input-number
@@ -474,7 +479,10 @@ import {
   updatezbwl,
   getzbwl,
   // 获取装备可用接口
-  getzbky
+  getzbky,
+  // 获取装备五率接口
+  addzbwl,
+  getliulian
 } from "@/api/combatduty/ReteOfTen";
 export default {
   data() {
@@ -558,9 +566,15 @@ export default {
     editor2() {
       this.open1 = true;
       this.form1.zbky=this.zbky
+      addzbwl().then(res=>{
+        this.form1=res.rows[0]
+      })
     },
     editor3() {
       this.open2 = true;
+      getliulian().then(res=>{
+        this.form2=res.rows[0]
+      })
     },
     // 编辑人员五率确定
     submitForm() {
@@ -784,7 +798,7 @@ export default {
       let data44=this.form.cdrs
       var data5 = [
         {
-          value: 6,
+          value: 5,
           name: "军事训练成绩达到合格人数",
         },
         {
@@ -793,7 +807,7 @@ export default {
         },
       ];
       data5[1].value = this.form.zwrs - data5[0].value;
-
+      let data55=this.form.zwrs
       var data6 = [
         {
           value: this.zhuangbei.zbsy,
@@ -1019,13 +1033,19 @@ export default {
                 name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
-                var n = _this.form.bzrs / _this.form.cdrs;
-                var s =
+                if(_this.form.cdrs==0){
+                  var s=`异常`
+                    return s
+                }else{
+                  var n = _this.form.bzrs / _this.form.cdrs;
+                  var s =
                   `{value|${(n * 100).toFixed()}%}` +
                   "\n" +
                   "\n" +
                   `{name|出动率}`;
                 return s;
+                }
+                
               },
             },
             // itemStyle: {
@@ -1042,14 +1062,14 @@ export default {
           position: ["10%", "50%"],
           formatter: function (params) {
             return (
-              data5[0].name +
+              data2[0].name +
               "(" +
-              data5[0].value +
+              data55 +
               ")" +
               ":" +
-              data2[0].name +
+              data5[0].name +
               "(" +
-              data2[0].value +
+            data5[0].value +
               ")"
             );
           },

src/views/doormanManage/bdglVisit/index.vue

@@ -0,0 +1,507 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="到访单位" prop="unitId">
+        <el-input
+          v-model="queryParams.unitId"
+          placeholder="请输入到访单位"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="接待人" prop="peopleId">
+        <el-input
+          v-model="queryParams.peopleId"
+          placeholder="请输入接待人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="到访人员姓名" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入到访人员姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+       <el-form-item label="到访时间" prop="arriveTime" style="margin-left:20px">
+          <el-date-picker clearable size="small"
+            v-model="form.arriveTime"
+            type="datetime"
+            placeholder="选择到访时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="离队时间" prop="endTime">
+          <el-date-picker clearable size="small"
+            v-model="form.endTime"
+            type="datetime"
+            placeholder="选择离队时间">
+          </el-date-picker>
+        </el-form-item>
+      <el-form-item class="search">
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['doormanManage:bdglVisit:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['doormanManage:bdglVisit:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['doormanManage:bdglVisit:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['doormanManage:bdglVisit:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="bdglVisitList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="接待人姓名" align="center" prop="id" /> -->
+      <el-table-column label="到访单位" align="center" prop="unitId" :formatter="unit2Format"/>
+      <el-table-column label="接待人" align="center" prop="peopleName"  />
+      <el-table-column label="到访人员姓名" align="center" prop="name" />
+      <el-table-column label="到访时间" align="center" prop="arriveTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.arriveTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="离队时间" align="center" prop="endTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="到访车牌号" align="center" prop="numberPlate" />
+      <el-table-column label="来访原因" align="center" prop="contents" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['doormanManage:bdglVisit:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['doormanManage:bdglVisit:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改人员来访登记对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px"  :inline="true">
+        <el-form-item label="到访单位" prop="unitId" style="margin-left:20px">
+          <treeselect
+            v-model="form.unitId"
+            :options="users"
+            placeholder="请选择到访单位"
+            class="threeselects"
+            @select="selectPeo"
+          />
+          <!-- <el-input v-model="form.unitId" placeholder="请输入到访单位" /> -->
+        </el-form-item>
+        <el-form-item label="接待人" prop="peopleId">
+          <!-- <el-input v-model="form.peopleId" placeholder="请输入接待人" /> -->
+          <el-select
+                v-model="form.peopleName"
+                placeholder="请选择接待人"
+                id="execute"
+                ref="peoplenames"
+              >
+                <el-option
+                  v-for="item in executor"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.name"
+                  @click.native="peopleIds(item.id)"
+                  id="execute"
+                />
+              </el-select>
+        </el-form-item>
+        <el-form-item label="到访人员姓名" prop="name">
+          <el-input v-model="form.name" placeholder="请输入到访人员姓名" />
+        </el-form-item>
+        <el-form-item label="到访时间" prop="arriveTime" style="margin-left:20px">
+          <el-date-picker clearable size="small"
+            v-model="form.arriveTime"
+            type="datetime"
+            placeholder="选择到访时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="离队时间" prop="endTime">
+          <el-date-picker clearable size="small"
+            v-model="form.endTime"
+            type="datetime"
+            placeholder="选择离队时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="到访车牌号" prop="numberPlate">
+          <el-input v-model="form.numberPlate" placeholder="请输入到访车牌号" />
+        </el-form-item>
+        <div class="jiben" style="margin-left:20px">来访原因</div>
+        <el-form-item  prop="contents" class="daofang" style="margin-left:20px">
+          <el-input v-model="form.contents" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listBdglVisit, getBdglVisit, delBdglVisit, addBdglVisit, updateBdglVisit, exportBdglVisit, deptUser } from "@/api/doormanManage/bdglVisit";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { getDept2 } from "@/api/grassrootsregistration/bdglmeeting";
+import {allUser} from "@/api/workingArrangements/workTask"
+
+export default {
+  name: "BdglVisit",
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 人员来访登记表格数据
+      bdglVisitList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        unitId: null,
+        peopleId: null,
+        name: null,
+        arriveTime: null,
+        endTime: null,
+        adminId: null,
+        contents: null,
+        createtime: null,
+        updatetime: null,
+        numberPlate: null,
+        unitName: null,
+        peopleName: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        unitId: [{ required: true, message: "到访单位不能为空", trigger: "blur" }],
+        // peopleId: [{ required: true, message: "接待人不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "到访人员姓名不能为空", trigger: "blur" }],
+        arriveTime: [{ required: true, message: "到访时间不能为空", trigger: "blur" }],
+        endTime: [{ required: true, message: "离队时间不能为空", trigger: "blur" }],
+        numberPlate: [{ required: true, message: "到访车牌号不能为空", trigger: "blur" }],
+      },
+      // 执行单位列表
+      users: [],
+      // 接待人
+      executor:[],
+      // 人员列表
+      rylist:[]
+    };
+  },
+  created() {
+    this.getList();
+    allUser().then((res) => {
+      this.rylist = res.rows;
+    });
+  },
+  methods: {
+    unit2Format(row, column) {
+      var deptName = "";
+      deptName=row.unitName
+      // if(this.bdglVisitList[0].unitId==row.unitId){
+      //   deptName=row.unitName
+      // }
+      return deptName;
+    },
+    peopleIds(id){
+      this.form.peopleId=id
+      console.log(id)
+    },
+    // 获取执行人
+    getZhuChi(id) {
+      deptUser(id).then((res) => {
+        this.executor = res.data;
+        console.log(this.executor)
+      });
+    },
+    // 到访单位选中触发
+    selectPeo(val) {
+      this.form.unitId = val.id;
+      // console.log(this.form.unitId)
+      this.getZhuChi(this.form.unitId);
+    },
+    /** 查询人员来访登记列表 */
+    getList() {
+      this.loading = true;
+      listBdglVisit(this.queryParams).then(response => {
+        // console.log(response)
+        this.bdglVisitList = response.rows;
+        console.log(this.bdglVisitList)
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        unitId: null,
+        peopleId: null,
+        name: null,
+        arriveTime: null,
+        endTime: null,
+        adminId: null,
+        contents: null,
+        createtime: null,
+        updatetime: null,
+        numberPlate: null,
+        unitName: null,
+        peopleName: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加人员来访登记";
+      // 获取执行单位列表
+      getDept2().then((res) => {
+        // console.log(res,2)
+        this.users = res.data;
+        console.log(this.users);
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      getDept2().then((res) => {
+        // console.log(res,2)
+        this.users = res.data;
+        console.log(this.users);
+      });
+      const id = row.id || this.ids
+      getBdglVisit(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改人员来访登记";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      console.log(this.form)
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateBdglVisit(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBdglVisit(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除人员来访登记编号为"' + ids + '"的数据项？').then(function() {
+        return delBdglVisit(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有人员来访登记数据项？').then(() => {
+        this.exportLoading = true;
+        return exportBdglVisit(queryParams);
+      }).then(response => {
+        this.$download.name(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>
+<style scoped>
+::v-deep .el-dialog{
+   background-color: #004d86 !important;
+}
+/* 输入框 */
+::v-deep .el-dialog .el-input__inner{
+  background-color: #004d86 !important;
+  width: 220px;
+  color: white;
+}
+/* 标题弹框 */
+::v-deep .el-dialog__title{
+  color: white;
+  /* border-bottom: 1px solid white; */
+}
+/* 标题下划线 */
+::v-deep .el-dialog__header{
+  border-bottom: 1px solid white;
+}
+::v-deep .el-form-item__content{
+  width: 250px;
+}
+::v-deep .el-form-item__label{
+  text-align: start;
+}
+/* ::v-deep .el-form-item{
+  width: 200px;
+} */
+/* ::v-deep .jiedainame .el-form-item__label{
+  width: 90px !important;
+}
+::v-deep .el-input--small .el-input__inner{
+  width: 230px;
+} */
+::v-deep .el-textarea .el-textarea__inner{
+  /* text-align: center; */
+  width: 1080px;
+  height: auto !important;
+  min-height: 130px !important;
+}
+/* 到访单位 */
+::v-deep .el-form-item__content .el-input--small .el-input__inner{
+  width: 220px;
+}
+/* 表格头部 */
+v-deep .el-table thead tr{
+  background-color: #004d86 !important;
+}
+/* 树形 */
+.threeselects {
+  width: 200px;
+}
+.threeselects .vue-treeselect__input {
+  background-color: #004d86;
+  /* color: white; */
+}
+::v-deep .search .el-form-item__content{
+  margin-top: 0px;
+}
+::v-deep .el-picker-panel__body{
+  background-color: #004d86 !important;
+}
+::v-deep .vue-treeselect__control{
+  background-color: #004d86;
+  color: white;
+}
+::v-deep .vue-treeselect__single-value{
+  color: white;
+}
+::v-deep .threeselects{
+  width: 220px;
+}
+#execute{
+  color: white !important;
+}
+
+</style>

src/views/pt.vue

@@ -80,7 +80,7 @@
               </div>
             </li>
             <li>
-              <div class="demo active" data-url="/diary?ref=addtabs">
+              <div class="demo active" data-url="/diary?ref=addtabs" v-on:click="mengangfun">
                 <img src="../images/ag.png" alt />
                 <br />
                 <a href="#" class="a">门岗管理</a>
@@ -378,9 +378,14 @@ export default {
         .push({ path: "/index", query: { name: "/system" } })
         .catch(() => {});
     },
+    mengangfun() {
+      this.$router
+        .push({ path: "/index", query: { name: "/doormanManage" } })
+        .catch(() => {});
+    },
     gongju() {
       this.$router
-        .push({ path: "/index", query: { name: "/tool" } })
+        .push({ path: "/index", query: { name: "/tool" } }) 
         .catch(() => {});
     },
     wenyinfun() {

src/views/regulations/fileinfo/index.vue

@@ -137,6 +137,18 @@
           </template>
         </el-table-column>
       </el-table>
+      <!-- <el-pagination
+      :background="background"
+      :current-page.sync="currentPage"
+      :page-size.sync="queryParams.pageSize"
+      :layout="layout"
+      :page-sizes="queryParams.pageNum"
+      :pager-count="pagerCount"
+      :total="total"
+      v-bind="$attrs"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    /> -->
       <pagination
         v-show="total > 0"
         :total="total"
@@ -152,8 +164,8 @@
         <div class="jichu">
           目录
           <el-button class="turnback" @click="turnback" v-if="addbtn==0">返回上级</el-button>
-          <el-button class="uploadfilesbtn" :class="addbtn?'margins':''" @click="upload">上传文件</el-button
-          ><el-button class="manage" @click="mange">目录管理</el-button>
+          <el-button class="uploadfilesbtn" :class="addbtn?'margins':''" @click="upload" v-if="addbtn!=0">上传文件</el-button
+          ><el-button class="manage" @click="mange" v-if="addbtn!=0">目录管理</el-button>
         </div>
         <el-table
           v-loading="loading"
@@ -168,9 +180,10 @@
               <div
                 @click="mulus(scope.row)"
                 :class="scope.row.subclassification == 0 ? '' : 'undeline'"
+                style="position:relative;cursor:pointer"
               >
-              <img src="../../../images/文件夹.png" alt="" style="margin-right:5px">
-              <span> {{ scope.row.directory }}</span>
+              <img src="../../../images/文件夹.png" alt="" style="margin-right:5px;position:absolute;left:5px;top:2px">
+              <span style="margin-left:25px"> {{ scope.row.directory }}</span>
               </div>
             </template>
           </el-table-column>
@@ -605,10 +618,7 @@ export default {
     // 点击目录根据子目录的数量控制他是否可以点进去进行渲染
     mulus(row) {
       this.parentId = row.id;
-      // console.log(row.id)
       this.form.directoryId=row.id
-      console.log(this.form.directoryId)
-      // this.listFileinfo({directoryId:this.form.directoryId})
       listFileinfo({directoryId:this.form.directoryId}).then(res=>{
         this.fileinfoList = res.rows;
         this.total = res.total;
@@ -628,6 +638,7 @@ export default {
     // 返回目录
     turnback() {
       this.addbtn=true
+      this.getList()
       this.ListDirectoryinfo();
     },
     // 选中父目录之后
@@ -641,11 +652,12 @@ export default {
     },
     /** 查询规章制度文件记录列表 */
     getList() {
-      // this.loading = true;
-      listFileinfo(this.form.directoryId).then((response) => {
-        console.log(response)
+      this.loading = true;
+      listFileinfo(this.queryParams).then((response) => {
+        console.log(response.total)
         this.fileinfoList = response.rows;
         this.total = response.total;
+        this.loading=false
       });
     },
     // 取消按钮
@@ -725,10 +737,10 @@ export default {
           console.log(this.form);
           // 上传文件接口
           addFileinfo(this.form).then((response) => {
+            this.ListDirectoryinfo();
             this.$modal.msgSuccess("上传成功");
             this.open = false;
             this.getList();
-            // this.listDirectoryinfo();
           });
         }
       });
@@ -770,11 +782,16 @@ export default {
       this.$modal
         .confirm("是否确认删除？")
         .then(function () {
+          this.ListDirectoryinfo();
+            this.getList();
           return delDirectoryinfo(ids);
         })
         .then(() => {
           this.ListDirectoryinfo();
+          this.loading=false
+          this.loading1=false
           this.$modal.msgSuccess("删除成功");
+
         })
         .catch(() => {});
     },
@@ -847,6 +864,7 @@ export default {
   line-height: 40px;
   border-left: 4px solid rgba(29, 150, 255, 1);
   text-indent: 1em;
+ 
 }
 /* 文件表格 */
 .tablesfile {
@@ -1043,7 +1061,7 @@ table {
   line-height: 33px;
   margin-left: 30px;
   text-align: center;
-  margin-left: 300px;
+  margin-left: 450px;
   color: #ccc;
   background: #00365f;
 }
@@ -1059,6 +1077,13 @@ table {
   border-radius: 4px;
   margin-left: 10px;
 }
+.pagination-container {
+  background: #fff;
+  padding: 32px 16px;
+}
+.pagination-container.hidden {
+  display: none;
+}
 /* 弹框样式修改 */
 ::v-deep .el-dialog {
   background-color: #004d86 !important;
@@ -1195,4 +1220,7 @@ body,
 ::v-deep .guizhangzhidu .el-select-dropdown__list{
   background: white !important;
 }
+::v-deep .el-table_2_column_13 .cell{
+  text-align: center !important;
+}
 </style>

src/views/workingArrangements/planTask/index.vue

@@ -1446,4 +1446,7 @@ export default {
 ::v-deep .el-table th.el-table__cell{
   background-color: pink !important;
 }
+.el-table__empty-block{
+  border-bottom: 1px solid white;
+}
 </style>

src/views/workingArrangements/workTask/index.vue

@@ -1343,5 +1343,7 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-
+.el-table__empty-block{
+  border-bottom: 1px solid white;
+}
 </style>

vue.config.js

@@ -1,119 +0,0 @@
-
-'use strict'
-const path = require('path')
-
-function resolve(dir) {
-  return path.join(__dirname, dir)
-}
-
-const name = process.env.VUE_APP_TITLE || '智能督察管理平台' // 网页标题
-
-const port = process.env.port || process.env.npm_config_port || 80 // 端口
-
-// vue.config.js 配置说明
-//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
-// 这里只列一部分，具体配置参考文档
-module.exports = {
-  // 部署生产环境和开发环境下的URL。
-  // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
-  // 例如 https://www.supervision.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.supervision.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
-  // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
-  outputDir: 'dist',
-  // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
-  assetsDir: 'static',
-  // 是否开启eslint保存检测，有效值：ture | false | 'error'
-  lintOnSave: process.env.NODE_ENV === 'development',
-  // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
-  productionSourceMap: false,
-  // webpack-dev-server 相关配置
-  devServer: {
-    host: '0.0.0.0',
-    port: port,
-    open: true,
-    proxy: {
-      // detail: https://cli.vuejs.org/config/#devserver-proxy
-      [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.5.177:8080`,
-        target: `http://192.168.5.66:8089`,
-        changeOrigin: true,
-        pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API]: ''
-        }
-      }
-    },
-    disableHostCheck: true
-  },
-  configureWebpack: {
-    name: name,
-    resolve: {
-      alias: {
-        '@': resolve('src')
-      }
-    }
-  },
-  chainWebpack(config) {
-    config.plugins.delete('preload') // TODO: need test
-    config.plugins.delete('prefetch') // TODO: need test
-
-    // set svg-sprite-loader
-    config.module
-      .rule('svg')
-      .exclude.add(resolve('src/assets/icons'))
-      .end()
-    config.module
-      .rule('icons')
-      .test(/\.svg$/)
-      .include.add(resolve('src/assets/icons'))
-      .end()
-      .use('svg-sprite-loader')
-      .loader('svg-sprite-loader')
-      .options({
-        symbolId: 'icon-[name]'
-      })
-      .end()
-
-    config
-      .when(process.env.NODE_ENV !== 'development',
-        config => {
-          config
-            .plugin('ScriptExtHtmlWebpackPlugin')
-            .after('html')
-            .use('script-ext-html-webpack-plugin', [{
-              // `runtime` must same as runtimeChunk name. default is `runtime`
-              inline: /runtime\..*\.js$/
-            }])
-            .end()
-          config
-            .optimization.splitChunks({
-              chunks: 'all',
-              cacheGroups: {
-                libs: {
-                  name: 'chunk-libs',
-                  test: /[\\/]node_modules[\\/]/,
-                  priority: 10,
-                  chunks: 'initial' // only package third parties that are initially dependent
-                },
-                elementUI: {
-                  name: 'chunk-elementUI', // split elementUI into a single package
-                  priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
-                  test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
-                },
-                commons: {
-                  name: 'chunk-commons',
-                  test: resolve('src/components'), // can customize your rules
-                  minChunks: 3, //  minimum common number
-                  priority: 5,
-                  reuseExistingChunk: true
-                }
-              }
-            })
-          config.optimization.runtimeChunk('single'),
-          {
-            from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
-            to: './' //到根目录下
-          }
-        }
-      )
-  }
-}