解决

src/api/PrintsManage/manage.js

@@ -86,4 +86,13 @@ export function printCode(data) {
     method: "POST",
     data: data
   });
-}
+}
+
+//获取用户id
+export function printPeople(data) {
+  return request({
+    url: "/PrintsManage/manage/printPeople",
+    method: "POST",
+    data: data
+  });
+}

src/api/combatduty/ReteOfTen.js

@@ -57,19 +57,3 @@ 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/combatduty/regisdutyinfo.js

@@ -50,4 +50,13 @@ export function exportRegisdutyinfo(query) {
     method: 'get',
     params: query
   })
+}
+
+// 查询部门 
+export function getDept(query) {
+  return request({
+    url: '/system/dept/list',
+    method: 'get',
+    params: query
+  })
 }

src/api/doormanManage/bdglVisit.js

@@ -1,62 +0,0 @@
-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/api/grassrootsregistration/bdgldiary.js

@@ -28,6 +28,7 @@ export function addBdgldiary(data) {
 
 // 修改要事日记
 export function updateBdgldiary(data) {
+  console.log(data);
   return request({
     url: '/grassrootsregistration/bdgldiary',
     method: 'put',
@@ -35,15 +36,6 @@ export function updateBdgldiary(data) {
   })
 }
 
-// 审批
-export function updateBdglShenPi(data) {
-  return request({
-    url: '/grassrootsregistration/bdgldiary/update',
-    method: 'put',
-    data: data
-  })
-}
-
 // 删除要事日记
 export function delBdgldiary(id) {
   return request({
@@ -59,13 +51,4 @@ export function exportBdgldiary(query) {
     method: 'get',
     params: query
   })
-}
-
-// 选择页面时间查询当前数据
-export function exportBdgShuju(query) {
-  return request({
-    url: '/grassrootsregistration/bdgldiary/getNumber',
-    method: 'get',
-    params: { date: query }
-  })
-}
+}

src/api/grassrootsregistration/bdglmeeting.js

@@ -156,27 +156,4 @@ export function getBuMen() {
     params: { deptId: data, reign }
   })
 }
-// 获取搜索部门列表
-export function getShouBu() {
-  return request({
-    url: '/system/dept/list',
-    method: 'get'
-  })
-}
-
-// 获取所有搜索人员
-export function getAll() {
-  return request({
-    url: '/peopleManage/people/list',
-    method: 'get',
-  })
-}
 
-// 获取人员名册
-export function getXiangQi(query) {
-  return request({
-    url: '/grassrootsregistration/personnelRoster/getDeptXiangQi',
-    method: 'get',
-    params: { deptId: query }
-  })
-}

src/api/grassrootsregistration/bdglweekwork.js

@@ -50,13 +50,4 @@ export function exportBdglweekwork(query) {
     method: 'get',
     params: query
   })
-}
-
-// 判断当前部门该时段是否有工资安排
-export function exportBdglgetWeekWork(query) {
-  return request({
-    url: '/grassrootsregistration/bdglweekwork/getWeekWork',
-    method: 'get',
-    params: query
-  })
 }

src/api/medicalhealth/antiepidemicputin.js

@@ -50,13 +50,4 @@ export function exportAntiepidemicputin(query) {
     method: 'get',
     params: query
   })
-}
-
-//  获取防疫用品列表
-export function exportAntiepidemiFangYi(query) {
-  return request({
-    url: '/medicalhealth/antiepidemicputin/getlist',
-    method: 'get',
-    params: query
-  })
 }

src/api/medicalhealth/antiepidemicputout.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 // 查询防疫用品发放登记列表
-export function listAntiepidemicputout(query) {
+export function listPutout(query) {
   return request({
     url: '/medicalhealth/antiepidemicputout/list',
     method: 'get',
@@ -10,7 +10,7 @@ export function listAntiepidemicputout(query) {
 }
 
 // 查询防疫用品发放登记详细
-export function getAntiepidemicputout(id) {
+export function getPutout(id) {
   return request({
     url: '/medicalhealth/antiepidemicputout/' + id,
     method: 'get'
@@ -18,16 +18,16 @@ export function getAntiepidemicputout(id) {
 }
 
 // 新增防疫用品发放登记
-export function addAntiepidemicputout(data) {
+export function addPutout(data) {
   return request({
-    url: '/medicalhealth/antiepidemicputout',
+    url: '/antiepidemicputout/putout',
     method: 'post',
     data: data
   })
 }
 
 // 修改防疫用品发放登记
-export function updateAntiepidemicputout(data) {
+export function updatePutout(data) {
   return request({
     url: '/medicalhealth/antiepidemicputout',
     method: 'put',
@@ -36,7 +36,7 @@ export function updateAntiepidemicputout(data) {
 }
 
 // 删除防疫用品发放登记
-export function delAntiepidemicputout(id) {
+export function delPutout(id) {
   return request({
     url: '/medicalhealth/antiepidemicputout/' + id,
     method: 'delete'
@@ -44,7 +44,7 @@ export function delAntiepidemicputout(id) {
 }
 
 // 导出防疫用品发放登记
-export function exportAntiepidemicputout(query) {
+export function exportPutout(query) {
   return request({
     url: '/medicalhealth/antiepidemicputout/export',
     method: 'get',

src/api/medicalhealth/consumeputin.js

@@ -50,30 +50,4 @@ export function exportPutin(query) {
     method: 'get',
     params: query
   })
-}
-
-// 过期药品情况列表
-export function exportYaoPing(query) {
-  return request({
-    url: '/medicalhealth/yaopinguoqi/getGuoQi',
-    method: 'get',
-    params: query
-  })
-}
-// 过期药品销毁
-export function exportYaoPingXiaoHui(query) {
-  return request({
-    url: '/medicalhealth/yaopinguoqi',
-    method: 'get',
-    params: { 'id': query }
-  })
-}
-
-// 获取耗材所有名称
-export function exportHaoCai(query) {
-  return request({
-    url: '/medicalhealth/consumeputin/getlist',
-    method: 'get',
-    params: query
-  })
 }

src/assets/icons/svg/专项量统.svg

@@ -1 +0,0 @@
-<svg t="1648027899807" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8710" width="200" height="200"><path d="M329.728 967.68H101.888c-25.088 0-45.568-20.48-45.568-45.568V398.336c0-25.088 20.48-45.568 45.568-45.568h227.84v-250.88c0-25.088 20.48-45.568 45.568-45.568h273.408c25.088 0 45.568 20.48 45.568 45.568v433.152h227.84c24.064 0 43.52 18.432 45.568 41.984v345.088c0 24.064-18.432 43.52-41.984 45.568H329.728z m0-546.816h-204.8v478.208h204.8V420.864z m569.344 182.272h-205.312v296.448h205.312v-296.448z m-272.896-478.208H398.336v774.656h227.84V124.928z" fill="#FFFFFF" p-id="8711"></path></svg>

src/assets/icons/svg/临时来队.svg

@@ -1 +0,0 @@
-<svg t="1648026936535" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7258" width="200" height="200"><path d="M507.392 552.448c-135.168 0-244.224-109.568-244.224-244.224s109.568-244.224 244.224-244.224 244.224 109.568 244.224 244.224-109.568 244.224-244.224 244.224z m0-424.96c-99.84 0-180.736 80.896-180.736 180.736s80.896 180.736 180.736 180.736 180.736-80.896 180.736-180.736-80.896-180.736-180.736-180.736z" fill="#FFFFFF" p-id="7259"></path><path d="M514.56 973.824H88.064c-17.92 0-31.744-14.336-31.744-31.744 0-248.832 202.24-450.56 451.072-450.56 80.896 0 159.744 21.504 228.864 61.952 14.848 9.216 19.968 28.16 11.264 43.52-9.216 14.848-28.16 19.968-43.52 11.264-59.392-35.328-126.976-53.248-196.608-53.248-202.752 0-369.664 156.672-386.048 355.328h392.704c17.92 0 31.744 14.336 31.744 31.744 0.512 17.92-13.312 31.744-31.232 31.744z" fill="#FFFFFF" p-id="7260"></path><path d="M793.088 820.736c-73.728 0-134.144-77.312-134.144-173.056 0-12.8 10.24-23.04 23.04-23.04s23.04 10.24 23.04 23.04c0 70.656 39.424 127.488 88.576 127.488 48.64 0 88.576-57.344 88.576-127.488 0-12.8 10.24-23.04 23.04-23.04s23.04 10.24 23.04 23.04c-1.024 95.744-61.44 173.056-135.168 173.056z" fill="#FFFFFF" p-id="7261"></path><path d="M939.52 668.672h-292.864c-12.8 0-23.04-10.24-23.04-23.04s10.24-23.04 23.04-23.04h292.864c12.8 0 23.04 10.24 23.04 23.04s-10.24 23.04-23.04 23.04z m-35.328 303.616c-12.8 0-23.04-10.24-23.04-23.04 0-70.656-39.424-127.488-88.576-127.488s-88.576 57.344-88.576 127.488c0 12.8-10.24 23.04-23.04 23.04s-23.04-10.24-23.04-23.04c0-95.744 60.416-173.056 134.144-173.056s134.144 77.312 134.144 173.056c1.024 12.8-9.216 23.04-22.016 23.04z" fill="#FFFFFF" p-id="7262"></path><path d="M939.52 973.824h-292.864c-12.8 0-23.04-10.24-23.04-23.04s10.24-23.04 23.04-23.04h292.864c12.8 0 23.04 10.24 23.04 23.04 0 13.312-10.24 23.04-23.04 23.04z" fill="#FFFFFF" p-id="7263"></path></svg>

src/assets/icons/svg/人员借调.svg

@@ -1 +0,0 @@
-<svg t="1648026574007" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6604" width="200" height="200"><path d="M514.048 70.656c146.944 0 266.24 119.296 266.24 266.24 0 86.016-41.472 166.4-111.104 216.576 13.824 4.608 27.136 10.24 40.448 16.384 18.944 9.216 27.136 31.744 17.92 50.688-8.704 18.432-30.72 26.624-49.664 18.432-51.2-23.552-107.008-35.84-163.328-35.328h11.264c-185.344 6.656-340.992 141.824-373.248 325.12-3.584 20.48-23.04 34.304-44.032 30.72-20.48-3.584-34.304-23.04-30.72-44.032 28.16-161.28 138.24-295.936 290.816-355.84-122.88-80.896-157.184-245.76-76.288-368.64 48.64-75.264 132.096-120.32 221.696-120.32z m303.104 566.784l4.096 3.584 124.928 124.928c13.312 13.312 14.848 34.304 3.584 49.664l-3.584 4.096-124.928 124.928c-14.848 14.848-38.912 14.848-53.76 0-13.312-13.312-14.848-34.304-3.584-49.664l3.584-4.096 59.904-59.904H665.6c-20.992 0-37.888-16.896-37.888-37.888 0-18.944 13.824-34.816 32.768-37.888l5.12-0.512h161.792l-59.904-59.904c-13.312-13.312-14.848-34.304-3.584-49.664l3.584-4.096c13.312-12.8 34.304-14.848 49.664-3.584z m-303.104-490.496c-104.96 0-189.952 84.992-189.952 189.952s84.992 189.952 189.952 189.952 189.952-84.992 189.952-189.952-84.992-189.952-189.952-189.952z" fill="#FFFFFF" p-id="6605"></path></svg>

src/assets/icons/svg/人员政审.svg

@@ -1 +0,0 @@
-<svg t="1648026128261" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6343" width="200" height="200"><path d="M97.28 880.64h812.544v68.096H97.28V880.64z m677.376-327.168h-180.224c0-35.328 16.384-69.12 45.056-90.112 100.352-74.24 120.832-216.064 46.592-315.904-32.256-43.52-79.36-74.24-132.608-86.016-16.384-3.072-32.768-4.608-49.664-4.608-124.928 0-225.792 100.864-225.792 225.792 0 71.168 33.28 137.728 90.112 180.736 27.136 18.944 44.032 49.664 45.056 82.944v7.168H232.448C157.696 553.472 97.28 614.4 97.28 689.152v98.816c0 19.968 16.384 36.352 36.864 36.864h739.328c19.968 0 36.352-16.384 36.864-36.864v-98.816c-0.512-74.752-60.928-135.68-135.68-135.68z m67.584 203.264H165.376v-68.096c0-37.376 30.208-68.096 67.584-68.096h180.224c37.376 0 68.096-30.208 68.096-67.584v-7.168c-1.024-53.76-27.648-103.936-71.68-135.168-70.656-50.688-87.04-148.992-36.352-220.16 30.208-41.984 78.848-66.56 130.56-65.536 11.776 0 23.552 1.024 34.816 3.584 13.312 3.072 26.112 7.68 38.4 14.336 64 32.768 97.28 104.96 80.896 174.592-8.704 36.864-29.696 69.632-60.416 92.16-45.056 34.304-71.68 87.552-71.68 144.384 0 37.376 30.208 68.096 67.584 68.096h180.224c37.376 0 68.096 30.208 68.096 67.584v67.072h0.512z" fill="#FFFFFF" p-id="6344"></path></svg>

src/assets/icons/svg/人员来访.svg

@@ -1 +0,0 @@
-<svg t="1648029032127" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9884" width="200" height="200"><path d="M772.096 676.864l65.536-65.536c-49.664-49.664-110.592-87.552-177.152-110.08 102.912-94.72 109.568-254.976 14.848-357.888S420.352 33.792 317.44 128.512 207.36 383.488 302.08 486.4c9.216 9.728 18.944 18.944 29.184 27.136C161.28 585.728 51.2 752.64 51.2 936.96c0 25.6 20.992 46.08 46.08 46.08s45.568-20.48 46.08-46.08c0.512-203.776 165.888-368.128 369.152-368.128 97.28 0.512 190.464 39.424 259.584 108.032zM488.96 154.112c89.088 0 161.28 72.192 161.28 161.28s-72.192 161.28-161.28 161.28S327.68 404.48 327.68 315.392s72.192-161.28 161.28-161.28z" fill="#FFFFFF" p-id="9885"></path><path d="M926.72 660.992c-25.6 0-46.08 20.48-46.08 46.08v92.16h-306.176l16.896-16.384c16.384-17.92 16.384-45.056 0-62.464-17.92-16.896-45.568-16.896-62.976 0l-94.72 92.16c-16.384 17.92-16.384 45.056 0 62.464l94.72 92.16c17.92 16.896 45.568 16.896 62.976 0 16.384-17.92 16.384-45.056 0-62.464l-16.896-12.8H926.72c25.6 0 46.08-20.48 46.08-46.08v-138.24c0-26.112-20.992-46.592-46.08-46.592z" fill="#FFFFFF" p-id="9886"></path></svg>

src/assets/icons/svg/人员请假.svg

@@ -1 +0,0 @@
-<svg t="1648026614916" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6734" width="200" height="200"><path d="M344.064 731.136c-154.112-28.672-259.584-173.056-240.64-331.776 19.456-124.928 115.2-230.912 240.64-254.976 91.136-14.336 178.176 9.728 245.248 67.072 9.728 9.728 24.064 9.728 38.4 4.608 9.728-4.608 14.336-14.336 19.456-24.064 0-9.728-4.608-19.456-9.728-28.672-76.8-62.464-163.328-91.136-254.976-86.528C199.68 86.528 50.688 230.912 36.352 413.696s115.2 351.232 297.984 384.512h4.608c14.336 0 28.672-9.728 28.672-24.064 4.608-9.728 0-19.456-4.608-28.672-4.608-4.608-9.216-9.728-18.944-14.336z" fill="#FFFFFF" p-id="6735"></path><path d="M805.888 586.752c48.128-33.792 76.8-86.528 76.8-148.992 0-100.864-81.92-182.784-182.784-182.784S517.12 336.896 517.12 437.76c0 57.856 28.672 110.592 72.192 144.384-124.928 52.736-187.392 192.512-187.392 312.832 0 14.336 4.608 28.672 14.336 38.4s24.064 14.336 38.4 14.336h480.768c14.336 0 28.672-4.608 38.4-14.336 9.728-9.728 14.336-24.064 14.336-38.4 0.512-135.168-76.8-260.096-182.272-308.224z m-105.984-24.064c-72.192 0-124.928-52.736-124.928-124.928s52.736-124.928 124.928-124.928 124.928 52.736 124.928 124.928-52.736 124.928-124.928 124.928z m240.64 331.776H459.776c4.608-134.656 86.528-273.92 240.64-273.92 110.08 0 235.008 105.472 240.128 273.92zM372.736 288.768v144.384l-100.864 100.864c-4.608 4.608-9.728 14.336-9.728 19.456 0 9.728 4.608 14.336 9.728 19.456 4.608 4.608 9.728 4.608 19.456 4.608s14.336-4.608 24.064-9.728l105.984-105.984c4.608-4.608 4.608-14.336 4.608-19.456v-153.6c0-14.336-9.728-28.672-28.672-28.672-14.848-0.512-24.576 14.336-24.576 28.672z" fill="#FFFFFF" p-id="6736"></path></svg>

src/assets/icons/svg/公寓住房.svg

@@ -1 +0,0 @@
-<svg t="1648026813543" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6865" width="200" height="200"><path d="M951.296 435.2l-345.088-358.4c-25.6-26.624-59.904-41.472-96.768-41.472-36.864 0.512-71.168 14.848-96.768 41.472l-36.352 37.376c-5.632-5.12-12.8-8.704-20.992-8.704H168.96c-16.896 0-30.72 13.824-30.72 30.72v225.28L67.584 435.2c-38.912 40.448-33.792 72.192-27.136 88.064 6.656 15.36 26.112 41.472 82.432 41.472h18.944V962.56c0 16.896 13.824 30.72 30.72 30.72h674.304c16.896 0 30.72-13.824 30.72-30.72v-398.336h18.944c56.32 0 75.776-26.112 82.432-41.472 6.144-15.36 11.264-47.104-27.648-87.552zM199.68 166.912h125.44v1.024L199.68 298.496V166.912z m416.768 765.44h-91.136v-216.064h91.136v216.064z m199.68 0h-138.752v-246.784c0-16.896-13.824-30.72-30.72-30.72H494.592c-16.896 0-30.72 13.824-30.72 30.72v246.784h-261.12v-367.616h613.376v367.616z m80.384-429.056H122.368c-14.336 0-22.528-2.56-25.6-4.608 1.024-3.072 4.096-10.752 14.336-21.504l345.088-357.888c28.16-29.184 77.312-29.184 105.472 0l345.088 357.888c10.24 10.24 13.824 17.92 14.336 21.504-2.56 2.048-10.24 4.608-24.576 4.608z" fill="#FFFFFF" p-id="6866"></path></svg>

src/assets/icons/svg/公寓档案.svg

@@ -1 +0,0 @@
-<svg t="1648026857269" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6995" width="200" height="200"><path d="M841.216 986.624H176.64c-33.28 0-59.904-26.624-59.904-59.904v-356.352c-0.512-33.28 25.6-60.416 58.88-60.928 9.728 0 19.456 2.048 28.16 6.656l311.296 148.48 300.032-147.968c29.696-14.848 65.536-2.56 80.384 26.624 4.608 8.704 6.656 18.432 6.144 28.16v353.792c0.512 33.28-26.112 60.416-59.392 60.928 0 0.512-0.512 0.512-1.024 0.512zM177.152 569.856v356.352h665.088v-353.792L515.072 732.16l-337.92-162.304z" fill="#FFFFFF" p-id="6996"></path><path d="M750.08 611.84c-16.384 0-30.208-13.312-30.208-30.208V265.728c0-16.384 13.312-30.208 30.208-30.208 16.384 0 30.208 13.312 30.208 30.208v316.416c0 16.384-13.312 29.696-30.208 29.696z m-482.304-2.048c-16.384 0-30.208-13.312-30.208-30.208v-317.44c0-16.384 13.312-30.208 30.208-30.208 16.384 0 30.208 13.312 30.208 30.208v317.44c-0.512 16.896-13.824 30.208-30.208 30.208z" fill="#FFFFFF" p-id="6997"></path><path d="M172.032 372.224c-8.704 0-17.408-4.096-23.04-10.752-10.752-12.8-9.216-31.744 3.072-42.496l324.608-266.24c23.04-19.456 56.832-19.456 79.872 0l309.248 267.264c12.288 11.264 13.824 30.208 2.56 42.496s-30.208 13.824-42.496 2.56l-308.224-267.264c-0.512-0.512-2.048-0.512-2.56 0L190.464 365.056c-5.12 4.608-11.776 6.656-18.432 7.168z m483.328 50.176H362.496c-11.264 0-19.968-9.216-19.968-19.968 0-11.264 8.704-19.968 19.968-19.968H655.36c11.264 0 19.968 9.216 19.968 19.968 0 11.264-9.216 19.968-19.968 19.968z m0 101.376H362.496c-11.264 0-19.968-9.216-19.968-19.968 0-11.264 8.704-19.968 19.968-19.968H655.36c11.264 0 19.968 9.216 19.968 19.968 0 11.264-9.216 19.968-19.968 19.968z" fill="#FFFFFF" p-id="6998"></path></svg>

src/assets/icons/svg/军车司机.svg

@@ -1 +0,0 @@
-<svg t="1648027093199" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7392" width="200" height="200"><path d="M514.56 444.416c110.08 0 199.168-89.088 199.168-199.168S624.64 46.08 514.56 46.08 315.392 135.168 315.392 245.248 404.48 444.416 514.56 444.416z m0-345.088c79.36 0 143.872 64.512 143.872 143.872S593.92 387.072 514.56 387.072 370.688 323.072 370.688 243.2V240.64c1.536-78.336 65.536-141.312 143.872-141.312z m431.616 667.136c-5.12-12.8-138.24-304.64-314.368-304.64H399.872c-176.128 0-308.736 292.352-316.928 304.64-1.024 3.584-1.024 7.68 0 11.264v172.544c0 15.872 12.8 28.672 28.672 29.184h174.592c8.192 0 15.872-3.072 21.504-8.704 5.12-6.144 8.192-13.824 7.168-22.016v-8.704c-0.512-2.048-0.512-4.608 0-6.656 2.048-111.104 93.696-199.68 204.8-197.632 108.544 2.048 196.096 89.088 197.632 197.632 0.512 2.048 0.512 4.608 0 6.656v8.704c-0.512 8.192 2.048 15.872 7.168 22.016 5.632 6.144 13.312 9.216 20.992 9.216h174.592c15.872-0.512 28.672-13.312 28.672-29.184V778.24c0.512-3.584-0.512-8.192-2.56-11.776zM255.488 922.112H140.8v-137.216c36.352-78.848 145.92-265.728 259.072-265.728H629.76c30.72 1.536 59.904 12.288 83.456 31.232l-132.608 132.608c-21.504-6.144-44.032-9.216-66.56-9.216-138.752 0.512-252.416 109.568-258.56 248.32z m633.344 0h-114.688c-4.096-89.6-54.272-171.008-132.608-215.04l118.784-118.784c54.272 58.88 99.328 125.952 132.608 199.168l-4.096 134.656z" fill="#FFFFFF" p-id="7393"></path><path d="M514.56 775.168c-95.232 0.512-172.544 77.312-172.544 172.544-0.512 2.56-0.512 5.12 0 7.168-0.512 2.56-0.512 5.12 0 7.168 0 15.872 12.8 28.672 28.672 28.672h288.256c15.872 0 28.672-12.8 28.672-28.672 0.512-2.56 0.512-5.12 0-7.168 0.512-2.56 0.512-5.12 0-7.168-0.512-95.232-77.824-172.032-173.056-172.544z m-113.664 158.208c6.656-62.464 62.976-108.032 125.952-101.376 53.248 5.632 95.744 48.128 101.376 101.376H400.896z" fill="#FFFFFF" p-id="7394"></path></svg>

src/assets/icons/svg/军车查询.svg

@@ -1 +0,0 @@
-<svg t="1648027305561" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8051" width="200" height="200"><path d="M731.648 206.848h-82.944v-15.36c0-61.952-42.496-105.984-103.936-105.984H127.488c-61.44 0-99.84 43.008-99.84 105.984V803.84c0 29.696 17.92 51.2 46.592 51.2h72.192c17.92 58.368 72.192 102.4 137.216 102.4s119.296-43.52 137.216-102.4h154.624c17.92 58.368 72.192 102.4 137.216 102.4s122.368-43.52 140.8-102.4h23.552c65.024 0 119.296-54.784 119.296-120.32V398.336l-264.704-191.488zM284.16 883.712c-39.936 0-72.192-33.28-75.776-76.8 0-41.984 33.792-76.288 75.776-76.8 43.008 0 75.776 36.352 75.776 76.8 0 41.984-33.792 76.288-75.776 76.8z m429.056 0c-39.936 0-72.192-33.28-75.776-76.8 0-41.984 33.792-76.288 75.776-76.8 43.008 0 75.776 36.352 75.776 76.8 0 41.984-33.792 76.288-75.776 76.8z m211.456-149.504c0 25.6-21.504 47.616-46.592 47.616h-16.384c-14.336-69.632-72.192-120.32-144.896-120.32s-130.048 51.2-144.896 120.32h-143.36c-11.264-69.632-68.608-120.32-140.8-120.32s-133.632 51.2-144.896 120.32h-46.592V191.488c0-18.432 6.144-32.768 27.648-32.768h416.768c21.504 0 32.256 14.336 32.256 32.768V583.68h352.768l-1.024 150.528z m0-230.4h-276.992V276.48h72.192l204.288 133.12 0.512 94.208z" fill="#FFFFFF" p-id="8052"></path><path d="M407.04 459.264H183.296V517.12h223.744v52.736l93.184-78.848-93.184-79.36v47.616zM183.296 332.8l105.472 78.848V358.912h211.456V306.688H288.768V253.952L183.296 332.8z" fill="#FFFFFF" p-id="8053"></path></svg>

src/assets/icons/svg/十率六量.svg

@@ -1 +0,0 @@
-<svg t="1648025789266" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6213" width="200" height="200"><path d="M648.192 427.008h1.024c35.328-0.512 73.728-0.512 111.104-1.024 52.736-0.512 102.4-0.512 141.312-1.536 30.208-0.512 54.272-26.112 53.76-56.32 0-5.632-1.024-11.264-3.072-16.896-47.616-133.12-152.576-237.568-285.696-285.184-28.672-9.728-59.904 5.12-70.144 33.792-2.048 5.632-3.072 11.776-3.072 17.92v253.44c0 31.232 24.576 55.808 54.784 55.808z m15.36-286.208c96.768 40.448 173.568 117.248 214.528 214.016-34.304 0.512-75.264 1.024-118.272 1.024-32.256 0-65.024 0.512-96.256 0.512V140.8zM962.56 488.448c-10.24-10.752-25.088-16.896-39.936-16.896h-371.2c-2.56 0-4.608-2.048-4.608-4.608-0.512-56.832 0-134.656 0-217.6 0-50.176 0-101.888 0.512-153.088 0-30.208-24.576-54.784-54.784-55.296h-3.072C232.96 53.76 34.816 271.872 46.592 528.384c10.752 238.08 205.824 432.64 443.904 443.904 7.168 0.512 14.336 0.512 21.504 0.512 248.832-0.512 453.632-195.072 465.92-443.392 0.512-15.36-4.608-29.696-15.36-40.96z m-845.824 36.864c-9.728-211.968 148.992-393.728 360.448-413.184 0 45.568 0 92.16-0.512 136.704 0 82.944-0.512 161.28 0 218.112 0 5.632 0.512 11.264 2.048 16.896l-263.168 283.648c-59.392-67.072-94.208-152.576-98.816-242.176z m376.832 376.832c-82.944-4.096-162.304-34.304-226.816-86.016l259.072-279.04c8.192 3.072 17.408 4.608 26.112 4.608h354.816c-19.456 211.456-201.216 370.176-413.184 360.448z" fill="#FFFFFF" p-id="6214"></path></svg>

src/assets/icons/svg/基层值班.svg

@@ -1 +0,0 @@
-<svg t="1648023920852" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5687" width="200" height="200"><path d="M461.312 512c111.616 0 202.24-90.624 202.24-202.24S572.928 107.52 461.312 107.52 259.072 198.144 259.072 309.76 349.696 512 461.312 512z m0 50.688c-139.776 0-252.928-113.152-252.928-252.928s113.152-252.928 252.928-252.928 252.928 113.152 252.928 252.928-113.152 252.928-252.928 252.928z" fill="#FFFFFF" p-id="5688"></path><path d="M589.312 532.48c-40.96-13.824-84.48-20.48-127.488-20.48-223.232 0-404.48 181.248-404.48 404.48 0 13.824 11.264 25.088 25.088 25.088s25.088-11.264 25.088-25.088c0-195.584 158.72-353.792 353.792-353.792 37.888 0 75.776 6.144 111.616 17.92 13.312 4.096 27.648-3.584 31.232-16.896 4.096-12.8-2.56-26.624-14.848-31.232z m175.616 434.688c111.616 0 202.24-90.624 202.24-202.24s-90.624-202.24-202.24-202.24-202.24 90.624-202.24 202.24 90.624 202.24 202.24 202.24z m0-50.688c-83.968 0-151.552-68.096-151.552-151.552s68.096-151.552 151.552-151.552S916.48 680.96 916.48 764.928 848.384 916.48 764.928 916.48z" fill="#FFFFFF" p-id="5689"></path><path d="M739.328 663.552c16.896 0 25.088 8.192 25.088 25.088v101.376c0 16.896-8.192 25.088-25.088 25.088-16.896 0-25.088-8.192-25.088-25.088v-101.376c0-16.384 8.704-25.088 25.088-25.088z" fill="#FFFFFF" p-id="5690"></path><path d="M714.24 790.016c0-16.896 8.192-25.088 25.088-25.088h101.376c16.896 0 25.088 8.192 25.088 25.088 0 16.896-8.192 25.088-25.088 25.088h-101.376c-16.384 0.512-25.088-8.192-25.088-25.088z" fill="#FFFFFF" p-id="5691"></path></svg>

src/assets/icons/svg/工作计划.svg

@@ -1 +0,0 @@
-<svg t="1648028412585" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9101" width="200" height="200"><path d="M901.632 122.368h-111.616v-28.16c0-15.36-12.288-28.16-28.16-28.16s-28.16 12.288-28.16 28.16v28.16h-195.584v-28.16c0-15.36-12.288-28.16-28.16-28.16s-28.16 12.288-28.16 28.16v28.16h-194.56v-28.16c0-15.36-12.288-28.16-28.16-28.16s-28.16 12.288-28.16 28.16v28.16H119.808c-30.72 0-55.808 25.088-55.808 55.808v726.016c0 30.72 25.088 55.808 55.808 55.808h781.824c30.72 0 55.808-25.088 55.808-55.808V178.176c0-30.72-25.088-55.808-55.808-55.808z m0 781.824H119.808V345.6h781.824v558.592zM119.808 289.792V178.176h111.616v28.16c0 15.36 12.288 28.16 28.16 28.16s28.16-12.288 28.16-28.16v-28.16h195.584v28.16c0 15.36 12.288 28.16 28.16 28.16 15.36 0 28.16-12.288 28.16-28.16v-28.16h195.584v28.16c0 15.36 12.288 28.16 28.16 28.16s28.16-12.288 28.16-28.16v-28.16h111.616v111.616h-783.36z" fill="#FFFFFF" p-id="9102"></path><path d="M451.584 743.424c10.752 10.752 28.672 10.752 39.424 0l197.632-197.12c10.752-10.752 10.752-28.672 0-39.424s-28.672-10.752-39.424 0L471.04 684.032l-98.816-98.816c-10.752-10.752-28.672-10.752-39.424 0-10.752 10.752-10.752 28.672 0 39.424l118.784 118.784z" fill="#FFFFFF" p-id="9103"></path></svg>

src/assets/icons/svg/执行任务.svg

@@ -1 +0,0 @@
-<svg t="1648023867471" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5556" width="200" height="200"><path d="M152.576 987.648c-8.704 0-16.896-2.56-24.064-6.656-14.848-8.704-24.064-24.576-23.552-41.984V125.952c-0.512-47.104 37.376-86.016 84.48-87.04h647.168c47.104 0.512 84.992 39.424 84.48 87.04v812.544c0 17.408-9.216 33.28-24.064 41.984-13.824 8.192-31.232 8.704-45.568 1.024L520.704 834.56 174.08 982.528c-6.656 3.584-13.824 5.12-21.504 5.12zM189.44 98.304c-14.848 0.512-26.624 12.8-26.112 27.648v797.184l336.384-143.36c13.824-6.656 29.696-6.656 43.008 0.512l320 142.336V125.952c0.512-14.848-11.264-27.136-26.112-27.648H189.44z" fill="#FFFFFF" p-id="5557"></path><path d="M519.68 501.76c-72.192 0-131.072-58.368-131.072-130.56S446.464 240.64 518.656 240.128s131.072 57.856 131.072 130.048v0.512c0 72.192-58.368 130.56-130.048 131.072z m0-199.168c-37.888 0-68.608 30.208-68.608 68.096s30.208 68.608 68.096 68.608 68.608-30.208 68.608-68.096v-0.512c0-37.376-30.72-68.096-68.096-68.096z m157.696 397.824H361.984c-17.408-1.024-30.72-15.36-29.696-32.768 0.512-15.872 13.824-29.184 29.696-29.696h314.88c17.408-1.024 31.744 12.288 32.768 29.696 1.024 17.408-12.288 31.744-29.696 32.768h-2.56z" fill="#FFFFFF" p-id="5558"></path></svg>

src/assets/icons/svg/物资变更.svg

@@ -1 +0,0 @@
-<svg t="1648028822557" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9753" width="200" height="200"><path d="M887.808 38.4H141.312c-35.84 0-64.512 28.672-64.512 64.512v816.64c0 35.328 28.672 64.512 64.512 64.512h746.496c35.328 0 64.512-28.672 64.512-64.512V102.912c0-35.84-29.184-64.512-64.512-64.512z m-3.072 877.568H144.384V105.984h740.352v809.984z" fill="#FFFFFF" p-id="9754"></path><path d="M587.776 226.816c0 18.432 14.848 33.792 33.792 33.792 18.432 0 33.792-14.848 33.792-33.792 0-18.432-14.848-33.792-33.792-33.792-18.944 0-33.792 15.36-33.792 33.792zM715.776 226.816c0 18.432 14.848 33.792 33.792 33.792s33.792-14.848 33.792-33.792c0-18.432-14.848-33.792-33.792-33.792s-33.792 15.36-33.792 33.792zM309.76 495.104H732.16c18.432 0 33.792-14.848 33.792-33.792 0-18.432-14.848-33.792-33.792-33.792H339.968l25.088-70.144c6.144-17.408-3.072-36.864-20.48-43.008s-36.864 3.072-43.008 20.48L266.24 433.664c-5.12 13.824-3.072 29.696 5.632 41.984 8.704 12.288 23.04 19.456 37.888 19.456zM297.472 680.96h391.68l-25.088 70.144c-6.144 17.408 3.072 36.864 20.48 43.008 3.584 1.536 7.68 2.048 11.264 2.048 13.824 0 26.624-8.704 31.744-22.528l35.328-98.816c5.12-13.824 3.072-29.696-5.632-41.984-8.704-12.288-22.528-19.456-37.376-19.456H297.472c-18.432 0-33.792 14.848-33.792 33.792 0 18.944 14.848 33.792 33.792 33.792z" fill="#FFFFFF" p-id="9755"></path></svg>

src/assets/icons/svg/物资档案.svg

@@ -1 +0,0 @@
-<svg t="1648028695549" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9362" width="200" height="200"><path d="M886.272 46.08H136.704C84.992 46.08 43.008 88.064 43.008 139.776v749.568c0 51.712 41.984 93.696 93.696 93.696h749.568c51.712 0 93.696-41.984 93.696-93.696V139.776c0-51.712-41.984-93.696-93.696-93.696zM136.704 257.024c-13.824 0-23.552-9.216-23.552-23.552V139.776c0-13.824 9.216-23.552 23.552-23.552h749.568c13.824 0 23.552 9.216 23.552 23.552v93.696c0 13.824-9.216 23.552-23.552 23.552H136.704z m0 70.144h749.568c7.168 0 16.384-2.56 23.552-2.56v564.736c0 13.824-9.216 23.552-23.552 23.552H136.704c-13.824 0-23.552-9.216-23.552-23.552V324.608c7.168 0 16.384 2.56 23.552 2.56z" fill="#FFFFFF" p-id="9363"></path><path d="M511.488 151.552c-18.944 0-35.328 16.384-35.328 35.328s16.384 35.328 35.328 35.328 35.328-16.384 35.328-35.328-16.384-35.328-35.328-35.328z m0 233.984L307.712 502.784V737.28l203.776 117.248 203.776-117.248V502.784L511.488 385.536z m0 202.24l-109.056-63.488L511.488 460.8l109.056 63.488-109.056 63.488z m29.696 175.104v-125.44l109.568-62.464v125.44L541.184 762.88z m-59.392 0l-109.568-62.464v-125.44l109.568 62.464V762.88z" fill="#FFFFFF" p-id="9364"></path></svg>

src/assets/icons/svg/私车管理.svg

@@ -1 +0,0 @@
-<svg t="1648027200832" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7788" width="200" height="200"><path d="M726.016 876.544H303.104V936.96c0 16.896-13.312 30.208-30.208 30.208-16.896 0-30.208-13.312-30.208-30.208v-60.416H151.552c-66.56 0-120.832-54.272-120.832-120.832v-242.176c0-60.928 45.056-112.128 105.472-119.808l54.784-219.136C207.872 107.008 268.288 59.904 337.92 59.904h353.28c69.12 0 130.048 47.104 146.432 114.688l54.784 219.136c60.416 7.68 105.472 58.88 105.472 119.808v242.176c0 66.56-54.272 120.832-120.832 120.832h-90.624V936.96c0 16.896-13.312 30.208-30.208 30.208s-30.208-13.312-30.208-30.208v-60.416zM151.552 453.12c-33.28 0-60.416 27.136-60.416 60.416v242.176c0 33.28 27.136 60.416 60.416 60.416h726.016c33.28 0 60.416-27.136 60.416-60.416v-242.176c0-33.28-27.136-60.416-60.416-60.416H151.552z m60.416 241.664c-33.28 0-60.416-27.136-60.416-60.416s27.136-60.416 60.416-60.416c33.28 0 60.416 27.136 60.416 60.416s-26.624 60.416-60.416 60.416z m605.184 0c-33.28 0-60.416-27.136-60.416-60.416s27.136-60.416 60.416-60.416c33.28 0 60.416 27.136 60.416 60.416 0 33.28-27.136 60.416-60.416 60.416z m12.8-302.08L779.264 189.44c-10.24-40.448-46.592-68.608-88.064-68.608H337.92c-41.472 0-77.824 28.16-88.064 68.608l-50.688 203.264h630.784z" fill="#FFFFFF" p-id="7789"></path></svg>

src/assets/icons/svg/经常检查.svg

@@ -1 +0,0 @@
-<svg t="1648027940920" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8840" width="200" height="200"><path d="M915.456 526.848c-5.632 34.304-17.408 74.24-34.304 108.544-11.264 17.408-23.04 23.04-39.936 17.408-17.408-11.264-23.04-23.04-17.408-39.936 17.408-34.304 28.672-68.608 34.304-102.912 23.04-91.648 17.408-177.664 11.264-228.864l-355.328-165.888-354.816 165.376c-5.632 51.712-11.264 131.584 11.264 228.864 39.936 188.928 160.256 320.512 343.552 400.896 57.344-23.04 102.912-51.712 148.992-86.016 11.264-11.264 28.672-5.632 39.936 5.632s5.632 28.672-5.632 39.936c-51.712 39.936-109.056 68.608-172.032 97.28h-23.04C290.304 881.152 158.72 732.672 112.64 520.704c-17.408-86.528-20.992-175.616-11.264-263.168 5.632-11.264 11.264-17.408 17.408-23.04l384-183.296h23.04l384 183.296c11.264 5.632 17.408 11.264 17.408 23.04 5.12 51.712 10.752 148.992-11.776 269.312z m-389.632 171.52c-45.568 0-97.28-23.04-131.584-57.344-74.24-74.24-74.24-188.928 0-263.168s188.928-74.24 263.68 0c62.976 62.976 68.608 165.888 17.408 240.64l120.32 120.32c11.264 11.264 11.264 28.672 0 39.936-5.632 5.632-11.264 5.632-23.04 5.632-11.264 0-17.408 0-23.04-5.632L634.88 664.064c-34.816 23.04-69.12 34.304-109.056 34.304z m91.648-280.064c-23.04-28.672-57.344-39.936-91.648-39.936-34.304 0-68.608 17.408-91.648 39.936-51.712 51.712-51.712 131.584 0 183.296 51.712 45.568 131.584 45.568 183.296 0 51.712-51.712 51.712-132.096 0-183.296z" fill="#FFFFFF" p-id="8841"></path></svg>

src/assets/icons/svg/经常量统.svg

@@ -1 +0,0 @@
-<svg t="1648027975273" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8970" width="200" height="200"><path d="M972.8 875.008V410.624c0-16.384-8.192-30.208-22.528-36.352-14.336-6.144-30.208-3.584-42.496 3.584l-327.68 237.056-187.904-132.096c-14.336-9.728-34.304-9.728-48.64 2.048l-273.408 229.888c-8.192 6.144-14.336 17.92-14.336 30.208v128.512c0 22.528 17.92 40.448 40.448 40.448h838.656c21.504-1.024 39.936-18.944 37.888-38.912z m-78.336-42.496H136.192v-70.144l235.52-199.168 189.44 130.56c14.336 9.728 32.256 9.728 46.592 0L894.976 486.4v346.624h-0.512z" fill="#FFFFFF" p-id="8971"></path><path d="M95.232 520.192c9.216 1.024 19.456 0 25.088-3.072l261.12-219.136 184.32 137.216c9.728 8.192 26.112 8.192 36.352 0l265.728-205.824-6.656 32.768c-2.048 16.384 8.192 32.256 24.064 36.352h6.144c14.336 0 28.16-9.728 30.208-24.064l26.112-120.32c2.048-9.728-2.048-17.92-8.192-26.112-6.144-8.192-16.384-11.776-26.112-9.728l-120.32 17.92c-16.384 2.048-28.16 17.92-26.112 34.304 2.048 16.384 17.92 28.16 34.304 26.112l13.824-2.048-227.84 172.544-186.368-137.216c-11.776-8.192-28.16-6.144-38.4 2.048l-278.528 225.28c-11.776 9.728-20.48 36.864-10.752 49.152 11.776 12.8 22.016 13.824 22.016 13.824z" fill="#FFFFFF" p-id="8972"></path></svg>

src/assets/icons/svg/营房档案.svg

@@ -1 +0,0 @@
-<svg t="1648026892228" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7127" width="200" height="200"><path d="M879.104 56.32H154.112c-49.664 0-90.624 40.96-90.624 90.624v724.992c0 49.664 40.96 90.624 90.624 90.624h724.992c49.664 0 90.624-40.96 90.624-90.624V146.944c0-49.664-40.96-90.624-90.624-90.624zM154.112 260.096c-13.824 0-22.528-9.216-22.528-22.528V146.944c0-13.824 9.216-22.528 22.528-22.528h724.992c13.824 0 22.528 9.216 22.528 22.528v90.624c0 13.824-9.216 22.528-22.528 22.528H154.112z m0 68.096h724.992c6.656 0 15.872-2.048 22.528-2.048v545.792c0 13.824-9.216 22.528-22.528 22.528H154.112c-13.824 0-22.528-9.216-22.528-22.528V326.144c6.656 0 15.872 2.048 22.528 2.048z" fill="#FFFFFF" p-id="7128"></path><path d="M516.608 158.208c-17.92 0-33.792 15.872-33.792 33.792s15.872 33.792 33.792 33.792 33.792-15.872 33.792-33.792-15.872-33.792-33.792-33.792z m0 301.568l158.72 120.32v192.512h-317.44v-195.072l158.72-117.76m0-74.752c-9.216 0-20.48 2.048-27.136 9.216l-181.248 135.68c-11.264 9.216-17.92 22.528-17.92 36.352v226.304c0 25.088 20.48 45.568 45.056 45.568h362.496c25.088 0 45.568-20.48 45.568-45.568v-226.304c0-13.824-6.656-27.136-17.92-36.352l-181.248-136.192c-7.168-6.656-18.432-8.704-27.648-8.704z" fill="#FFFFFF" p-id="7129"></path></svg>

src/assets/icons/svg/装备登记.svg

@@ -1 +0,0 @@
-<svg t="1648023721491" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5163" width="200" height="200"><path d="M732.16 316.416H284.16c-17.92 0-32.256-14.336-32.256-32.256s14.336-32.256 32.256-32.256H732.16c17.92 0 32.256 14.336 32.256 32.256-0.512 17.92-14.848 32.256-32.256 32.256z m-190.464 193.536h-256c-17.92 0-32.256-14.336-32.256-32.256s14.336-32.256 32.256-32.256h256c17.92 0 32.256 14.336 32.256 32.256s-14.848 32.256-32.256 32.256z m-130.56 190.464h-128c-17.92 0-32.256-14.336-32.256-32.256s14.336-32.256 32.256-32.256h128c17.92 0 32.256 14.336 32.256 32.256s-14.336 32.256-32.256 32.256z" fill="#FFFFFF" p-id="5164"></path><path d="M860.672 61.952H156.672c-35.328 0-64 28.672-64 64v768c0 35.328 28.672 64 64 64h189.44c17.92 0 32.256-14.336 32.256-32.256s-14.336-32.256-32.256-32.256h-189.44v-768h704v223.744c0 17.92 14.336 32.256 32.256 32.256 8.704 0 16.896-3.584 22.528-9.216 5.632-5.632 9.216-13.824 9.216-22.528V125.952c0-35.328-28.672-64-64-64zM442.368 916.48v19.456c1.024-3.072 1.536-6.144 1.536-9.728s-0.512-6.656-1.536-9.728z" fill="#FFFFFF" p-id="5165"></path><path d="M736.768 479.744L438.272 778.24l-10.24 154.112c-1.024 13.312 10.24 24.576 23.552 23.552l154.112-10.24 298.496-298.496c25.088-25.088 25.088-65.536 0-90.624l-76.288-76.288c-25.6-25.6-66.56-25.6-91.136-0.512z m-160.256 402.944l-81.92 5.632 5.632-81.92 281.6-281.6 76.288 76.288-281.6 281.6z" fill="#FFFFFF" p-id="5166"></path></svg>

src/assets/icons/svg/调动管理.svg

@@ -1 +0,0 @@
-<svg t="1648026186151" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6473" width="200" height="200"><path d="M71.68 962.56c-15.872 0-28.672-12.8-29.184-28.672 3.584-181.76 122.88-340.992 296.448-395.264C259.072 494.08 209.408 409.6 208.896 317.952 211.456 175.616 328.192 61.44 471.04 62.976c142.848-2.56 260.608 110.592 263.168 253.44v1.536c-0.512 91.136-50.176 175.104-129.536 219.648 68.096 20.992 129.536 58.88 178.688 110.08 5.632 5.632 8.704 12.8 8.192 20.992-0.512 7.68-4.096 14.336-9.216 19.968-5.632 5.12-12.8 7.68-20.48 7.68-8.192 0-15.36-3.072-21.504-8.704-70.144-73.216-167.936-114.688-269.312-113.664-201.728-2.56-367.104 158.72-369.664 360.448 0 15.872-13.312 29.184-29.696 28.672 0.512-0.512 0.512-0.512 0-0.512zM471.04 122.368c-110.592-1.536-201.728 87.04-203.264 197.632 1.536 110.592 92.672 199.168 203.264 197.632 110.592 1.536 201.728-87.04 203.264-197.632-1.024-111.104-91.648-200.704-202.752-199.68H471.04v2.048z" fill="#FFFFFF" p-id="6474"></path><path d="M576.512 799.744c-14.336 2.048-27.648-8.192-29.696-22.528-2.048-14.336 8.192-27.648 22.528-29.696 2.56-0.512 4.608-0.512 7.168 0h306.688l-24.064-35.328 43.008-30.72 82.944 117.76-408.576 0.512z m-21.504 43.008h400.896c14.336 0 26.112 11.776 26.112 26.112s-11.776 26.112-26.112 26.112H640l19.456 37.888-49.664 23.552-54.784-113.664z" fill="#FFFFFF" p-id="6475"></path></svg>

src/assets/icons/svg/量化统计.svg

@@ -1 +0,0 @@
-<svg t="1648023971401" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5952" width="200" height="200"><path d="M835.584 69.632h-640c-61.44 0-111.616 49.664-111.616 110.592v496.64c0 60.416 50.176 110.08 111.616 110.08h217.6v110.08h-50.688c-14.848 0-27.648 12.8-27.648 27.648 0 15.36 12.288 27.648 27.648 27.648H696.32c14.848 0 27.648-12.8 27.648-27.648 0-15.36-12.288-27.648-27.648-27.648h-50.688v-110.08h189.952c61.44 0 111.616-49.664 111.616-110.592v-496.64c0-60.416-50.176-110.08-111.616-110.08z m-254.976 827.392H478.72v-110.08h101.888v110.08z m301.056-220.672c0 30.72-15.36 45.568-46.08 45.568h-640c-31.232 0-46.08-14.848-46.08-45.568v-45.568l732.16-9.728v55.296z m0-119.808h-732.16V189.952c0-30.72 25.088-55.296 55.808-55.296h621.056c31.232 0 55.808 24.576 55.808 55.296l-0.512 366.592z" fill="#FFFFFF" p-id="5953"></path><path d="M795.648 317.44l-168.96-102.912c-10.752-6.656-24.064-5.12-33.28 3.584l-180.224 168.96c-9.728 8.704-24.576 10.24-35.328 2.56l-109.568-76.8c-13.312-9.216-30.72-1.024-39.424 11.776-9.216 12.8-5.632 34.816 6.656 43.52L382.976 471.04c10.752 7.68 25.088 6.144 34.816-2.56l182.272-170.496c8.704-8.704 23.04-9.728 33.28-3.584l133.12 80.384c13.312 8.192 30.208-1.024 38.4-13.824 8.704-13.312 4.096-35.328-9.216-43.52z" fill="#FFFFFF" p-id="5954"></path></svg>

src/assets/styles/global.css

@@ -14,38 +14,6 @@
   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;
-}
-
-/* 宋体字体 */
-@font-face {
-  font-family: 'songti';
-  src: url('../css/宋体.ttf');
-  font-weight: normal;
-  font-style: normal;
-}
-
-/* 黑体字体 */
-@font-face {
-  font-family: 'heiti';
-  src: url('../css/黑体.ttf');
-  font-weight: normal;
-  font-style: normal;
-}
-
 /* 新增表单字体颜色 */
 .el-dialog__body .el-form-item__label {
   color: black;
@@ -111,6 +79,10 @@
   background-color: #004D86 !important;
 }
 
+.el-table__body .el-table__row.hover-row td{
+  background-color: #004D86 !important;
+}
+
 /* 表格文字居中 */
 ::v-deep .cell {
   text-align: center;
@@ -164,7 +136,7 @@ table td {
   /* background: #004D86; */
   background-color: transparent;
   border: 1px solid #D2D6DE;
-  /* color: #fff ; */
+  color: #fff !important;
 }
 
 /* 时间日历设置 */
@@ -708,7 +680,6 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
 /* 输入框显示手指 */
 ::v-deep .el-input__inner {
   cursor: pointer !important;
-  border: none;
 }
 
 /* 页面左栏图标大小 */
@@ -798,16 +769,6 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
 }
 
 /* 工作任务表格 */
-/* .workTask .el-table__empty-block{
+.workTask .el-table__empty-block {
   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;
-} */
-::v-deep .el-form-item__content{
-  border-bottom: none;
-}
-

src/components/look_word/bdglarmament.vue

@@ -5,26 +5,24 @@
     <div class="word" id="contents">
       <p
         style="
-          font-size: 16pt;
-          font-weight: 600;
+          font-size: 20pt;
+          font-weight: 900;
           margin: 0px 0px 20px -30px;
           color: black;
           text-align: center;
-          font-family: 'heiti'
         "
       >
         军械装备登记表（总表）
       </p>
       <p
         style="
-          font-size: 16px;
-          font-weight: 600;
+          font-size: 12pt;
+          font-weight: 100;
           margin: 0px 0px 3px 0px;
           color: black;
-          font-family: 'songti'
         "
       >
-        装备名称：<span style="text-decoration: underline;font-family: 'fangsong'"
+        装备名称：<span style="text-decoration: underline"
           >{{ message.name }}
         </span>
       </p>
@@ -45,8 +43,8 @@
         width="940"
         bordercolor="black"
       >
-        <tbody style="font-size: 16px;font-weight: 500;">
-          <tr class="JR_tr" style="font-size: 16px;font-weight: 500;font-family: 'songti'">
+        <tbody>
+          <tr class="JR_tr">
             <td
               width="37"
               valign="center"
@@ -54,7 +52,6 @@
               nowrap=""
               rowspan="2"
               class="JR_left"
-              style="font-family: 'songti'"
             >
               序<br />号
             </td>
@@ -65,13 +62,13 @@
               nowrap=""
               colspan="3"
             >
-              <p align="center" style="font-family: 'songti'">登记日期</p>
+              <p align="center">登记日期</p>
             </td>
             <td width="47" valign="center" rowspan="2" class="JR_left">
-              <p align="center" style="font-family: 'songti'">单位</p>
+              <p align="center">单位</p>
             </td>
             <td width="47" valign="center" rowspan="2" class="JR_left">
-              <p align="center" style="font-family: 'songti'">编制数</p>
+              <p align="center">编制数</p>
             </td>
             <td
               width="94"
@@ -80,7 +77,7 @@
               rowspan="2"
               class="JR_left"
             >
-              <p align="center" style="font-family: 'songti'">
+              <p align="center">
                 交接依据<br />
                 来 &nbsp;&nbsp;&nbsp;源
               </p>
@@ -92,7 +89,7 @@
               colspan="4"
               class="JR_left"
             >
-              <p align="center" style="font-family: 'songti'">现有数</p>
+              <p align="center">现有数</p>
             </td>
             <td
               width="217"
@@ -101,7 +98,7 @@
               colspan="3"
               class="JR_left"
             >
-              <p align="center" style="font-family: 'songti'">附品、工具、装护具配套情况</p>
+              <p align="center">附品、工具、装护具配套情况</p>
             </td>
             <td
               width="75"
@@ -110,7 +107,7 @@
               rowspan="2"
               class="JR_left"
             >
-              <p align="center" style="font-family: 'songti'">登记人</p>
+              <p align="center">登记人</p>
             </td>
             <td
               width="75"
@@ -119,53 +116,53 @@
               rowspan="2"
               class="JR_left"
             >
-              <p align="center" style="font-family: 'songti'">核对人</p>
+              <p align="center">核对人</p>
             </td>
           </tr>
-          <tr class="JR_tr" style="font-size: 16px;font-weight: 500;font-family: 'songti'">
+          <tr class="JR_tr">
             <td width="37" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="font-family: 'songti'">年</p>
+              <p align="center">年</p>
             </td>
             <td width="37" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="font-family: 'songti'">月</p>
+              <p align="center">月</p>
             </td>
             <td width="37" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="font-family: 'songti'">日</p>
+              <p align="center">日</p>
             </td>
             <td width="47" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="font-family: 'songti'">合计</p>
+              <p align="center">合计</p>
             </td>
             <td width="47" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="font-family: 'songti'">完好数</p>
+              <p align="center">完好数</p>
             </td>
             <td width="56" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="font-family: 'songti'">待修数</p>
+              <p align="center">待修数</p>
             </td>
             <td width="47" valign="center" nowrap="" class="JR_left">
               <p align="center">送修数</p>
             </td>
             <td width="66" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="font-family: 'songti'">标准（套）</p>
+              <p align="center">标准（套）</p>
             </td>
             <td width="56" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="font-family: 'songti'">现有（套）</p>
+              <p align="center">现有（套）</p>
             </td>
             <td width="94" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="font-family: 'songti'">缺陷种类及数量</p>
+              <p align="center">缺陷种类及数量</p>
             </td>
           </tr>
-          <tr class="JR_tr" style="font-size: 16px;font-weight: 500;font-family: 'fangsong'">
+          <tr class="JR_tr">
             <td width="37" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{message.id}}</p>
+              <p align="center">01</p>
             </td>
             <td width="37" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{message.recordDate.split('-')[0]}}</p>
+              <p align="center">22</p>
             </td>
             <td width="37" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{message.recordDate.split('-')[1]}}</p>
+              <p align="center">03</p>
             </td>
             <td width="37" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{message.recordDate.split('-')[2]}}</p>
+              <p align="center">08</p>
             </td>
             <td width="47" valign="center" nowrap="" class="JR_right">
               <p align="center">{{ message.metering }}</p>
@@ -356,7 +353,7 @@
             </td>
           </tr>
           <tr class="JR_tr">
-            <td width="37" valign="center" nowrap="" class="JR_left" style="font-family: 'songti'">
+            <td width="37" valign="center" nowrap="" class="JR_left">
               <p align="center">备注</p>
             </td>
             <td width="869" valign="top" colspan="15" class="JR_right">
@@ -382,7 +379,6 @@ export default {
         ".JR_tr {height: 40px;};.JR_left{font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
     };
   },
-
   methods: {
     daochu() {
       lookWord(this.title, "#contents", this.style, true);

src/components/look_word/bdglcookbook.vue

@@ -5,23 +5,14 @@
       <p
         style="
           text-align: center;
+          font-size: 22px;
           color: black;
-          font-size: 18pt;
-          font-weight: 600;
-          font-family: 'heiti';
+          font-weight: 550;
         "
       >
         食堂食谱表
       </p>
-      <p
-        style="
-          font-size: 16px;
-          font-weight: 500;
-          margin-left: 10px;
-          color: black;
-          font-family: 'fangsong';
-        "
-      >
+      <p style="margin-left: 10px; color: black; font-size: 18px">
         使用时间:{{ message.startTime }}——{{ message.endTime }}
       </p>
       <table
@@ -50,21 +41,21 @@
           <col width="130" />
           <col width="121" span="3" />
         </colgroup>
-        <tbody style="font-size: 15px;font-weight: 500;">
-          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
-            <td colspan="2" align="center" class="JR_left" style="font-family: 'fangsong'">时间</td>
-            <td width="111" align="center" class="JR_left" style="font-family: 'fangsong'">星期一</td>
-            <td width="111" align="center" class="JR_left" style="font-family: 'fangsong'">星期二</td>
-            <td width="111" align="center" class="JR_left" style="font-family: 'fangsong'">星期三</td>
-            <td width="111" align="center" class="JR_left" style="font-family: 'fangsong'">星期四</td>
-            <td width="111" align="center" class="JR_left" style="font-family: 'fangsong'">星期五</td>
-            <td width="111" align="center" class="JR_left" style="font-family: 'fangsong'">星期六</td>
-            <td width="111" align="center" class="JR_left" style="font-family: 'fangsong'">星期天</td>
+        <tbody>
+          <tr height="45" class="JR_tr">
+            <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>
+            <td width="111" align="center" class="JR_left">星期三</td>
+            <td width="111" align="center" class="JR_left">星期四</td>
+            <td width="111" align="center" class="JR_left">星期五</td>
+            <td width="111" align="center" class="JR_left">星期六</td>
+            <td width="111" align="center" class="JR_left">星期天</td>
           </tr>
 
-          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
-            <td width="99" rowspan="4" align="center" class="JR_left" style="font-family: 'fangsong'">早餐</td>
-            <td width="70" rowspan="2" align="center" class="JR_left" style="font-family: 'fangsong'">主食</td>
+          <tr height="45" class="JR_tr">
+            <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; height: 45"
@@ -91,7 +82,7 @@
               炊事员：{{ message.cookbookRegistrations[36].peopleNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
+          <tr height="45" class="JR_tr">
             <td align="center" style="white-space: normal">
               {{ message.cookbookRegistrations[0].cookcategoryNames }}
             </td>
@@ -114,8 +105,8 @@
               {{ message.cookbookRegistrations[36].cookcategoryNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
-            <td width="70" rowspan="2" align="center" class="JR_left" style="font-family: 'fangsong'">副食</td>
+          <tr height="45" class="JR_tr">
+            <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 }}
             </td>
@@ -138,7 +129,7 @@
               炊事员：{{ message.cookbookRegistrations[37].peopleNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
+          <tr height="45" class="JR_tr">
             <td align="center" style="white-space: normal" class="JR_right">
               {{ message.cookbookRegistrations[1].cookcategoryNames }}
             </td>
@@ -162,9 +153,9 @@
             </td>
           </tr>
 
-          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
-            <td width="99" rowspan="4" align="center" class="JR_left" style="font-family: 'fangsong'">午餐</td>
-            <td width="70" rowspan="2" align="center" class="JR_left" style="font-family: 'fangsong'">主食</td>
+          <tr height="45" class="JR_tr">
+            <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">
               炊事员：{{ message.cookbookRegistrations[2].peopleNames }}
             </td>
@@ -187,7 +178,7 @@
               炊事员：{{ message.cookbookRegistrations[38].peopleNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
+          <tr height="45" class="JR_tr">
             <td align="center" style="white-space: normal" class="JR_right">
               {{ message.cookbookRegistrations[2].cookcategoryNames }}
             </td>
@@ -210,8 +201,8 @@
               {{ message.cookbookRegistrations[38].cookcategoryNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
-            <td width="70" rowspan="2" align="center" class="JR_left" style="font-family: 'fangsong'">副食</td>
+          <tr height="45" class="JR_tr">
+            <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 }}
             </td>
@@ -234,7 +225,7 @@
               炊事员：{{ message.cookbookRegistrations[39].peopleNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
+          <tr height="45" class="JR_tr">
             <td align="center" style="white-space: normal">
               {{ message.cookbookRegistrations[3].cookcategoryNames }}
             </td>
@@ -258,9 +249,9 @@
             </td>
           </tr>
 
-          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
-            <td width="99" rowspan="4" align="center" class="JR_left" style="font-family: 'fangsong'">晚餐</td>
-            <td width="70" rowspan="2" align="center" class="JR_left" style="font-family: 'fangsong'">主食</td>
+          <tr height="45" class="JR_tr">
+            <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">
               炊事员：{{ message.cookbookRegistrations[4].peopleNames }}
             </td>
@@ -283,7 +274,7 @@
               炊事员：{{ message.cookbookRegistrations[40].peopleNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
+          <tr height="45" class="JR_tr">
             <td align="center" style="white-space: normal" class="JR_right">
               {{ message.cookbookRegistrations[4].cookcategoryNames }}
             </td>
@@ -306,8 +297,8 @@
               {{ message.cookbookRegistrations[40].cookcategoryNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
-            <td width="70" rowspan="2" align="center" class="JR_left" style="font-family: 'fangsong'">副食</td>
+          <tr height="45" class="JR_tr">
+            <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 }}
             </td>
@@ -330,7 +321,7 @@
               炊事员：{{ message.cookbookRegistrations[41].peopleNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
+          <tr height="45" class="JR_tr">
             <td align="center" style="white-space: normal" class="JR_right">
               {{ message.cookbookRegistrations[5].cookcategoryNames }}
             </td>
@@ -359,11 +350,10 @@
           style="
             border: none;
             color: black;
-            font-size: 16px;
-            font-weight: 500;
+            font-size: 12pt;
+            font-weight: 700;
             line-height: 30px;
             width: 960px;
-            font-family: 'fangsong'
           "
         >
           <td

src/components/look_word/bdgldiary.vue

@@ -4,12 +4,11 @@
     <div class="word" id="contents">
       <p
         style="
-          font-size: 16pt;
+          font-size: 14pt;
           font-weight: 600;
-          text-align: center;
+          text-align: left;
           margin-botttom: 30px;
           color: black;
-          font-family: 'songti';
         "
       >
         《连队要事日记》
@@ -23,40 +22,6 @@
         <span style="margin-left: 380px">值班员:{{ message.peopleName }}</span>
       </div> -->
 
-      <table
-        border="none"
-        style="
-          border-collapse: collapse;
-          mso-border-left-alt: 0.5pt solid windowtext;
-          mso-border-top-alt: 0.5pt solid windowtext;
-          mso-border-right-alt: 0.5pt solid windowtext;
-          mso-border-bottom-alt: 0.5pt solid windowtext;
-          mso-border-insideh: 0.5pt solid windowtext;
-          mso-border-insidev: 0.5pt solid windowtext;
-          mso-padding-alt: 0pt 0pt 0pt 0pt;
-          width: 960px;
-          margin-left: -20px;
-          color: black;
-          font-size: 16px;
-          font-weight: 500;
-          border: none;
-        "
-      >
-        <tr
-          height="30"
-          align="center"
-          style="border: none; font-family: 'songti'"
-        >
-          <td colspan="3" height="40" style="border: none;font-family: 'fangsong'">
-            {{ message.blogDate | dataFormat }}
-          </td>
-          <td colspan="2" style="border: none;font-family: 'songti'"><span style="font-family: 'fangsong'">{{ week }}</span> </td>
-          <td colspan="6" style="border: none;font-family: 'songti'">天气：<span style="font-family: 'fangsong'">{{ message.weather }}</span></td>
-          <td colspan="3" style="border: none;font-family: 'songti'">
-            值班员: <span style="font-family: 'fangsong'">{{ message.peopleName }}</span> 
-          </td>
-        </tr>
-      </table>
       <table
         border="1"
         style="
@@ -73,51 +38,42 @@
           margin-left: -20px;
           border-color: black;
           color: black;
-          font-size: 16px;
-          font-weight: 500;
         "
       >
+        <tr height="30" align="center">
+          <td colspan="3" height="40">{{ message.blogDate }}</td>
+          <td colspan="2">星期</td>
+          <td colspan="6">天气：{{ message.weather }}</td>
+          <td colspan="3">值班员:{{ message.peopleName }}</td>
+        </tr>
         <!-- 实力 -->
-        <tr
-          class="JR_tr"
-          height="30"
-          align="center"
-          style="font-family: 'songti'"
-        >
-          <td colspan="2" rowspan="2" class="JR_left" style="font-family: 'songti'">实力</td>
-          <td colspan="6" style="letter-spacing: 20px;font-family: 'songti'" class="JR_left">
+        <tr class="JR_tr" height="30" align="center">
+          <td colspan="2" rowspan="2" class="JR_left">实力</td>
+          <td colspan="6" style="letter-spacing: 20px" class="JR_left">
             编制人数
           </td>
-          <td colspan="6" style="letter-spacing: 20px;font-family: 'songti'" class="JR_left">
+          <td colspan="6" style="letter-spacing: 20px" class="JR_left">
             现有人数
           </td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
-          <td width="68" class="JR_left" style="font-family: 'songti'">干部</td>
-          <td width="68" class="JR_left" style="font-family: 'fangsong'">
-            {{ message.orgcadre }}
-          </td>
-          <td width="68" class="JR_left" style="font-family: 'songti'">战士</td>
-          <td width="68" class="JR_left" style="font-family: 'fangsong'">
-            {{ message.orgsoldier }}
-          </td>
-          <td width="68" class="JR_left" style="font-family: 'songti'">合计</td>
-          <td width="68" class="JR_left" style="font-family: 'fangsong'"></td>
-          <td width="68" class="JR_left" style="font-family: 'songti'">干部</td>
-          <td width="68" class="JR_left" style="font-family: 'fangsong'">
-            {{ message.nowcadre }}
-          </td>
-          <td width="68" class="JR_left" style="font-family: 'songti'">战士</td>
-          <td width="68" class="JR_left" style="font-family: 'fangsong'">
-            {{ message.nowsoldier }}
-          </td>
-          <td width="68" class="JR_left" style="font-family: 'songti'">合计</td>
-          <td width="68" class="JR_left" style="font-family: 'fangsong'"></td>
+          <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>
         </tr>
         <!-- 训练、教育或者执行其他任务情况 -->
         <tr class="JR_tr" height="20" align="center">
           <td rowspan="6" class="JR_left">
-            <p align="center" style="margin: 0 15px; font-family: 'songti'">
+            <p align="center" style="margin: 0 15px">
               训 <br />
               练 <br />
               、 <br />
@@ -135,133 +91,79 @@
               况
             </p>
           </td>
-          <td
-            rowspan="2"
-            width="68"
-            class="JR_left"
-            style="font-family: 'songti'"
-          >
-            区分
-          </td>
+          <td rowspan="2" width="68" class="JR_left">区分</td>
           <td
             colspan="9"
             rowspan="2"
-            style="letter-spacing: 60px; font-family: 'fangsong'"
+            style="letter-spacing: 60px"
             class="JR_left"
-            align="center"
           >
             内容
           </td>
-          <td colspan="3" class="JR_left" style="font-family: 'songti'">人数</td>
+          <td colspan="3" class="JR_left">人数</td>
         </tr>
-        <tr
-          class="JR_tr"
-          height="30"
-          align="center"
-          
-        >
-          <td class="JR_left" style="font-family: 'songti'">应到</td>
-          <td class="JR_left" style="font-family: 'songti'">实到</td>
-          <td class="JR_left" style="font-family: 'songti'">到课率</td>
+        <tr class="JR_tr" height="30" align="center">
+          <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"
           v-for="(items, index) in message.weekworkRegisters"
           :key="index"
-          v-show="message.weekworkRegisters.length > 0"
         >
-          <td class="JR_right" height="70">{{ items.dateline }}</td>
+          <td class="JR_left">{{ items.dateline }}</td>
           <td colspan="9" v-html="items.contents"></td>
-          <td class="JR_right" height="70">{{ items.shouldArrive }}</td>
-          <td class="JR_right" height="70">{{ items.realTo }}</td>
-          <td class="JR_right" height="70">{{ items.percentage }}</td>
+          <td class="JR_right">{{ items.shouldArrive }}</td>
+          <td class="JR_right">{{ items.realTo }}</td>
+          <td class="JR_right">{{ items.percentage }}</td>
         </tr>
-        <tr
-          class="JR_tr"
-          height="70"
-          align="center"
-          v-if="message.weekworkRegisters == null"
-        >
-          <td class="JR_left" height="70" style="font-family: 'songti'">早晨</td>
+        <!-- <tr class="JR_tr" height="70" align="center">
+          <td class="JR_left">上午</td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
         </tr>
-        <tr
-          class="JR_tr"
-          height="70"
-          align="center"
-          v-if="message.weekworkRegisters == null"
-        >
-          <td class="JR_left" height="70" style="font-family: 'songti'">上午</td>
+        <tr class="JR_tr" height="70" align="center">
+          <td class="JR_left">下午</td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
         </tr>
-        <tr
-          class="JR_tr"
-          height="70"
-          align="center"
-          v-if="message.weekworkRegisters == null"
-        >
-          <td class="JR_left" height="70" style="font-family: 'songti'">下午</td>
-          <td class="JR_right" colspan="9"></td>
-          <td class="JR_right"></td>
-          <td class="JR_right"></td>
-          <td class="JR_right"></td>
-        </tr>
-        <tr
-          class="JR_tr"
-          height="70"
-          align="center"
-          v-if="message.weekworkRegisters == null"
-        >
-          <td class="JR_left" height="70" style="font-family: 'songti'">晚上</td>
+        <tr class="JR_tr" height="70" align="center">
+          <td class="JR_left">晚上</td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
-        </tr>
+        </tr> -->
         <!-- 公差勤务 -->
         <tr class="JR_tr">
-          <td colspan="2">
-            <p align="center" class="JR_left" style="font-family: 'songti'">
-              公差勤务
-            </p>
+          <td colspan="2"><p align="center" class="JR_left">公差勤务</p></td>
+          <td colspan="12" class="JR_right" v-html="message.tolerance">
+            <p></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" style="font-family: 'songti'">
+            <p align="center">
               人员或 <br />
               装备变动
             </p>
           </td>
-          <td
-            style="font-family: 'fangsong'"
-            colspan="12"
-            class="JR_right"
-            v-html="message.transfer"
-          >
+          <td 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" style="font-family: 'songti'">
+            <p align="center">
               武 内 <br />
               器 务 <br />
               装 卫 <br />
@@ -273,44 +175,39 @@
               记 <br />
             </p>
           </td>
-          <td
-            style="font-family: 'fangsong'"
-            colspan="12"
-            class="JR_right"
-            v-html="message.internal"
-          >
+          <td colspan="12" class="JR_right" v-html="message.internal">
             <p></p>
           </td>
         </tr>
         <!-- 查铺查哨 -->
-        <tr class="JR_tr" style="font-family: 'songti'" >
+        <tr class="JR_tr">
           <td :rowspan="chapu" class="JR_left">
-            <p align="center" style="font-family: 'songti'">
+            <p align="center">
               查 <br />
               铺 <br />
               查 <br />
               哨
             </p>
           </td>
-          <td class="JR_left" ><p align="center" style="font-family: 'songti'">检查人</p></td>
-          <td class="JR_left"><p align="center" style="font-family: 'songti'">时　间</p></td>
-          <td class="JR_left"><p align="center" style="font-family: 'songti'">领班员</p></td>
-          <td class="JR_left" colspan="2"><p align="center" style="font-family: 'songti'">卫兵姓名</p></td>
+          <td class="JR_left"><p align="center">检查人</p></td>
+          <td class="JR_left"><p align="center">时　间</p></td>
+          <td class="JR_left"><p align="center">领班员</p></td>
+          <td class="JR_left" colspan="2"><p align="center">卫兵姓名</p></td>
           <td class="JR_left" colspan="8">
-            <p align="center" style="letter-spacing: 20px;font-family: 'songti'" >检　查　情　况</p>
+            <p align="center" style="letter-spacing: 20px">检　查　情　况</p>
           </td>
         </tr>
         <tr
           v-for="(item, i) in message.inspect"
           :key="i"
           class="JR_tr"
-          style="font-family: 'fangsong'"
+          height="30"
         >
           <td class="JR_right">
             <p align="center">{{ item.peopleName }}</p>
           </td>
           <td class="JR_right">
-            <p align="center">{{ item.examineDate | dataFormat }}</p>
+            <p align="center">{{ item.examineDate }}</p>
           </td>
           <td class="JR_right">
             <p align="center">{{ item.foremanName }}</p>
@@ -337,83 +234,64 @@
           <td class="JR_right" colspan="8"><p align="center"></p></td>
         </tr> -->
         <!-- 派班情况 -->
-        <tr class="JR_tr" style="font-family: 'songti'">
+        <tr class="JR_tr">
           <td class="JR_left" rowspan="4">
-            <p align="center" style="font-family: 'songti'">
+            <p align="center">
               派 <br />
               班 <br />
               情 <br />
               况
             </p>
           </td>
-          <td class="JR_left"><p align="center" style="font-family: 'songti'">职务</p></td>
-          <td class="JR_left"><p align="center" style="font-family: 'songti'">交班者</p></td>
-          <td class="JR_left"><p align="center" style="font-family: 'songti'">接班者</p></td>
-          <td class="JR_left" colspan="2"><p align="center" style="font-family: 'songti'">组织者</p></td>
+          <td class="JR_left"><p align="center">职务</p></td>
+          <td class="JR_left"><p align="center">交班者</p></td>
+          <td class="JR_left"><p align="center">接班者</p></td>
+          <td class="JR_left" colspan="2"><p align="center">组织者</p></td>
           <td class="JR_left" colspan="8">
-            <p align="center" style="letter-spacing: 20px;font-family: 'songti'" >交 接　情　况</p>
+            <p align="center" style="letter-spacing: 20px">交 接　情　况</p>
           </td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
-          <td class="JR_left" style="font-family: 'songti'">值班员</td>
+          <td class="JR_left">值班员</td>
           <td class="JR_right">
-            <p align="center" style="font-family: 'fangsong'">
-              {{ message.dutya }}
-            </p>
+            <p align="center">{{ message.dutya }}</p>
           </td>
           <td class="JR_right">
-            <p align="center" style="font-family: 'fangsong'">
-              {{ message.dutya }}
-            </p>
+            <p align="center">{{ message.dutya }}</p>
           </td>
           <td class="JR_right" colspan="2">
-            <p align="center" style="font-family: 'fangsong'">
-              {{ message.dutylead }}
-            </p>
+            <p align="center">{{ 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" style="font-family: 'songti'">值日员</td>
+          <td class="JR_left">值日员</td>
           <td class="JR_right">
-            <p align="center" style="font-family: 'fangsong'">
-              {{ message.dutyc }}
-            </p>
+            <p align="center">{{ message.dutyc }}</p>
           </td>
           <td class="JR_right">
-            <p align="center" style="font-family: 'fangsong'">
-              {{ message.dutyd }}
-            </p>
+            <p align="center">{{ message.dutyd }}</p>
           </td>
-          <td
-            class="JR_left"
-            colspan="2"
-            rowspan="2"
-            style="font-family: 'fangsong'"
-          >
-            {{ message.dutyDate | dataFormat }}<br />
+          <td class="JR_left" colspan="2" rowspan="2">
+            {{ message.dutyDate }}<br />
           </td>
           <td class="JR_right" colspan="8"></td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
-          <td class="JR_left" style="font-family: 'songti'">厨房值班</td>
+          <td class="JR_left">厨房值班</td>
           <td class="JR_right">
-            <p align="center" style="font-family: 'fangsong'">
-              {{ message.dutye }}
-            </p>
+            <p align="center">{{ message.dutye }}</p>
           </td>
           <td class="JR_right">
-            <p align="center" style="font-family: 'fangsong'">
-              {{ message.dutyf }}
-            </p>
+            <p align="center">{{ message.dutyf }}</p>
           </td>
-          <td class="JR_right" colspan="8" style="font-family: 'fangsong'"></td>
+          <td class="JR_right" colspan="8"></td>
         </tr>
 
         <!-- 临时来队亲属 -->
-        <tr class="JR_tr" height="30" style="font-family: 'songti'">
-          <td :rowspan="qinshu" class="JR_left">
-            <p align="center" style="margin: 0 15px;font-family: 'songti'">
+        <tr class="JR_tr" height="30">
+          <td rowspan="4" class="JR_left">
+            <p align="center" style="margin: 0 15px">
               临 <br />
               时 <br />
               来 <br />
@@ -423,85 +301,55 @@
             </p>
           </td>
           <td class="JR_left" height="30" rowspan="2">
-            <p align="center" style="font-family: 'songti'">军人姓名</p>
+            <p align="center">军人姓名</p>
           </td>
           <td class="JR_left" height="30" rowspan="2">
-            <p align="center" style="font-family: 'songti'">亲属姓名</p>
+            <p align="center">亲属姓名</p>
           </td>
           <td class="JR_left" height="30" rowspan="2">
-            <p align="center" style="font-family: 'songti'">关&nbsp; 系</p>
+            <p align="center">关&nbsp; 系</p>
           </td>
           <td class="JR_left" height="30" colspan="2">
-            <p align="center" style="font-family: 'songti'">时　间</p>
+            <p align="center">时　间</p>
           </td>
-          <td class="JR_left" height="30" colspan="8">
-            <p align="center" style="letter-spacing: 10px;font-family: 'songti'">
+          <td class="JR_left" height="30" colspan="10" >
+            <p align="center" style="letter-spacing: 16px">
               病 号 及 处 理 情 况
             </p>
           </td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
-          <td class="JR_left" height="30" style="font-family: 'songti'">来队</td>
-          <td class="JR_left" height="30" style="font-family: 'songti'">离队</td>
+          <td class="JR_left" height="30">来队</td>
+          <td class="JR_left" height="30">离队</td>
           <td
-            style="font-family: 'fangsong'"
             class="JR_right"
             height="30"
-            colspan="8"
-            :rowspan="qinshu2"
+            colspan="10"
+            rowspan="3"
             v-html="message.invalid"
           >
-            <p align="left" style="font-family: 'fangsong'"></p>
+            <p align="left"></p>
           </td>
+          
         </tr>
-        <tr
-          style="font-family: 'fangsong'"
-          class="JR_tr"
-          v-for="(item1, i) in message.kinsfolk"
-          :key="i"
-          v-show="message.kinsfolk.length > 0"
-        >
+        <tr 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>
           <td class="JR_right" height="30">
             <p align="center">{{ item1.name }}</p>
           </td>
-
           <td class="JR_right" height="30">
             <p align="center">{{ item1.relation }}</p>
           </td>
           <td class="JR_right" height="30">
-            <p align="center">{{ item1.comeDate | dataFormat }}</p>
-          </td>
-          <td class="JR_right" height="30">
-            <p align="center">{{ item1.leaveDate | dataFormat }}</p>
-          </td>
-        </tr>
-
-        <tr
-          style="font-family: 'fangsong'"
-          class="JR_tr"
-          v-if="message.kinsfolk == null || message.kinsfolk.length == 0"
-        >
-          <td class="JR_right" height="30">
-            <p align="center"></p>
+            <p align="center">{{ item1.comeDate }}</p>
           </td>
           <td class="JR_right" height="30">
-            <p align="center"></p>
-          </td>
-
-          <td class="JR_right" height="30">
-            <p align="center"></p>
-          </td>
-          <td class="JR_right" height="30">
-            <p align="center"></p>
-          </td>
-          <td class="JR_right" height="30">
-            <p align="center"></p>
-          </td>
+            <p align="center">{{ item1.leaveDate }}</p>
+          </td>    
         </tr>
-
+       
         <tr></tr>
         <!-- <tr class="JR_tr" height="30">
           <td class="JR_right" height="30"><p align="center"></p></td>
@@ -511,14 +359,9 @@
           <td class="JR_right" height="30"><p align="center"></p></td>
         </tr> -->
         <!-- 请假外出休假 -->
-        <tr
-          class="JR_tr"
-          align="center"
-          height="30"
-          style="font-family: 'songti'"
-        >
+        <tr class="JR_tr" align="center" height="30">
           <td rowspan="6" class="JR_left">
-            <p align="center" style="margin: 0 15px;font-family: 'songti'">
+            <p align="center" style="margin: 0 15px">
               请 <br />
               假 <br />
               外 <br />
@@ -530,31 +373,31 @@
               假
             </p>
           </td>
-          <td class="JR_left" style="font-family: 'songti'">姓&nbsp; 名</td>
-          <td class="JR_left" style="font-family: 'songti'">职&nbsp; 务</td>
-          <td class="JR_left" colspan="2" style="font-family: 'songti'">事&nbsp;&nbsp;&nbsp; 由</td>
-          <td class="JR_left" colspan="2" style="font-family: 'songti'">
+          <td class="JR_left">姓&nbsp; 名</td>
+          <td class="JR_left">职&nbsp; 务</td>
+          <td class="JR_left" colspan="2">事&nbsp;&nbsp;&nbsp; 由</td>
+          <td class="JR_left" colspan="2">
             时数或 <br />
             天&nbsp; 数
           </td>
-          <td class="JR_left" colspan="2" style="font-family: 'songti'">
+          <td class="JR_left" colspan="2">
             准假部 <br />
             门(人)
           </td>
-          <td class="JR_left" colspan="2" style="font-family: 'songti'">
+          <td class="JR_left" colspan="2">
             离 队 <br />
             时 间
           </td>
-          <td class="JR_left" colspan="2" style="font-family: 'songti'">
+          <td class="JR_left" colspan="2">
             归 队 <br />
             时 间
           </td>
-          <td class="JR_left" colspan="3" style="font-family: 'songti'">
+          <td class="JR_left" colspan="3">
             超(误)假 <br />
             时(天)数
           </td>
         </tr>
-        <tr class="JR_tr" height="30" style="font-family: 'fangsong'">
+        <tr class="JR_tr" height="30">
           <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>
@@ -564,7 +407,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" style="font-family: 'fangsong'">
+        <tr class="JR_tr" height="30">
           <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>
@@ -574,7 +417,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" style="font-family: 'fangsong'">
+        <tr class="JR_tr" height="30">
           <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>
@@ -584,7 +427,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" style="font-family: 'fangsong'">
+        <tr class="JR_tr" height="30">
           <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>
@@ -594,7 +437,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" style="font-family: 'fangsong'">
+        <tr class="JR_tr" height="30">
           <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>
@@ -606,8 +449,8 @@
         </tr>
         <!-- 上级通知 -->
         <tr class="JR_tr">
-          <td class="JR_left" width="101" style="font-family: 'songti'">
-            <p align="center" style="margin: 0 15px;font-family: 'songti'">
+          <td class="JR_left" width="101">
+            <p align="center" style="margin: 0 15px">
               上 <br />
               级 <br />
               通 <br />
@@ -627,67 +470,16 @@
           <td
             class="JR_right"
             colspan="15"
-            style="white-space: normal; font-family: 'fangsong'"
+            style="white-space: normal"
             v-html="message.notice"
           ></td>
         </tr>
       </table>
 
-      <table
-        border="none"
-        style="
-          border-collapse: collapse;
-          mso-border-left-alt: 0.5pt solid windowtext;
-          mso-border-top-alt: 0.5pt solid windowtext;
-          mso-border-right-alt: 0.5pt solid windowtext;
-          mso-border-bottom-alt: 0.5pt solid windowtext;
-          mso-border-insideh: 0.5pt solid windowtext;
-          mso-border-insidev: 0.5pt solid windowtext;
-          mso-padding-alt: 0pt 0pt 0pt 0pt;
-          width: 960px;
-          margin-left: -20px;
-          color: black;
-          font-size: 16px;
-          font-weight: 500;
-          border: none;
-        "
-      >
-        <tr
-          height="30"
-          style="border: none; font-family: 'songti'"
-        ><td colspan="3" style="border: none"></td>
-          <td colspan="6" style="border: none"></td>
-          <td colspan="2" height="40" style="border:none">
-           <p style="border: none;font-family: 'songti'">连队首长签字:</p> 
-          </td>
-          
-          <td colspan="3" style="border: none;font-family: 'songti'" >
-            <p style="border: none;font-family: 'songti'">&nbsp;&nbsp;时&nbsp;&nbsp;&nbsp;&nbsp;分</p>
-            
-          </td>
-        </tr>
-      </table>
-      <!-- <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;
-        "
+      <span style="margin-left: 48px; color: black">连队首长签字:</span>
+      <span style="margin-left: 615px; color: black; letter-spacing: 15px"
         >&nbsp;&nbsp;时&nbsp;&nbsp;&nbsp;&nbsp;分</span
-      > -->
+      >
     </div>
   </div>
 </template>
@@ -703,16 +495,13 @@ export default {
       style:
         ".JR_tr {height: 40px;};.JR_left{text-align:center;font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
       chapu: 4,
-      qinshu: 4,
-      week: "",
-      qinshu2: 2,
     };
   },
   created() {
+    // this.chapu();
+    // this.chapus();
     this.chapu = this.chapus();
-    this.qinshu = this.qinshus();
-    this.week = this.getWeek(this.message.blogDate);
-    this.qinshu2 = this.qinshus2();
+    // console.log(this.chapus());
   },
   methods: {
     daochu() {
@@ -720,43 +509,9 @@ export default {
     },
     chapus() {
       return this.message.inspect.length + 1;
-    },
-    qinshus() {
-      return this.message.kinsfolk.length + 2;
-    },
-
-    qinshus2() {
-      return this.message.kinsfolk.length + 2;
-    },
-
-    /*
-      获取当前星期几
-     */
-    getWeek(dateString) {
-      var dateArray = dateString.split("-");
-      var date = new Date(
-        dateArray[0],
-        parseInt(dateArray[1] - 1),
-        dateArray[2]
-      );
-      return "星期" + "日一二三四五六".charAt(date.getDay());
-    },
-
-    /*
-      标准时间转换格式
-     */
-    getDate(timesDate) {
-      var date = new Date(timesDate);
-      var y = date.getFullYear();
-      var m = date.getMonth() + 1;
-      m = m < 10 ? "0" + m : m;
-      var d = date.getDate();
-      d = d < 10 ? "0" + d : d;
-      var h = date.getHours();
-      var minute = date.getMinutes();
-      minute = minute < 10 ? "0" + minute : minute;
-      let time = y + "-" + m + "-" + d; //这里如果不需要小时 分  后边的可以不需要拼接
-      return time;
+      // if (this.message.inspect.lenght > 3) {
+      //   this.chapu += this.message.inspect.lenght - 3;
+      // }
     },
   },
 };

src/components/look_word/bdgldrill.vue

@@ -5,23 +5,21 @@
       <!-- <div class="fTitle">大队连务会记录本</div> -->
       <p
         style="
-          font-size: 16pt;
-          font-weight: 600;
+          font-size: 14pt;
+          font-weight: 900;
           margin-botttom: 30px;
           color: black;
-          font-family: 'heiti'
         "
       >
         《军事训练登记簿》
       </p>
       <p
         style="
-          font-size: 16pt;
-          font-weight: 600;
+          font-size: 14pt;
+          font-weight: 900;
           color: black;
           text-align: center;
           margin-bottom: 5px;
-          font-family: 'heiti'
         "
       >
         <span class="a1">月</span> 日军事训练登记表
@@ -46,82 +44,82 @@
         width="960"
         bordercolor="black"
       >
-        <tbody style="font-size: 16px;font-weight: 500;">
+        <tbody>
           <tr class="JR_tr">
             <th width="101" nowrap="" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0;font-family: 'heiti'">训练类别</p>
+              <p align="center" style="margin: 20px 0">训练类别</p>
             </th>
             <th width="113" nowrap="" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0;font-family: 'heiti'">训练内容</p>
+              <p align="center" style="margin: 20px 0">训练内容</p>
             </th>
             <th width="120" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0;font-family: 'heiti'">训练时间</p>
+              <p align="center" style="margin: 20px 0">训练时间</p>
             </th>
             <th width="85" nowrap="" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0;font-family: 'heiti'">训练地点</p>
+              <p align="center" style="margin: 20px 0">训练地点</p>
             </th>
             <th width="114" nowrap="" colspan="2" class="JR_left">
-              <p align="center" style="margin: 5px 0;font-family: 'heiti'">参训兵力</p>
+              <p align="center" style="margin: 5px 0">参训兵力</p>
             </th>
             <th width="68" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0;font-family: 'heiti'">参训率</p>
+              <p align="center" style="margin: 20px 0">参训率</p>
             </th>
             <th width="115" nowrap="" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0;font-family: 'heiti'">效果（成绩）</p>
+              <p align="center" style="margin: 20px 0">效果（成绩）</p>
             </th>
             <th width="104" nowrap="" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0;font-family: 'heiti'">消耗</p>
+              <p align="center" style="margin: 20px 0">消耗</p>
             </th>
             <th width="70" nowrap="" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0;font-family: 'heiti'">备注</p>
+              <p align="center" style="margin: 20px 0">备注</p>
             </th>
           </tr>
           <tr class="JR_tr">
             <th width="57" nowrap="" class="JR_left">
-              <p align="center" style="font-family: 'heiti'">应训</p>
+              <p align="center">应训</p>
             </th>
-            <th width="57" class="JR_left"><p align="center" style="font-family: 'heiti'">实训</p></th>
+            <th width="57" class="JR_left"><p align="center">实训</p></th>
           </tr>
 
           <tr class="JR_tr">
             <td width="101" class="JR_right">
-              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">
+              <p align="center" style="margin: 10px 0">
                 {{ message.project }}
                 <!-- <span style="display: none">111</span> -->
               </p>
             </td>
             <td width="113" class="JR_right">
-              <p align="center" style="font-family: 'fangsong'">{{ message.contents }}</p>
+              <p align="center">{{ 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;font-family: 'fangsong'">
+              <p align="center" style="margin: 10px 0">
                 {{ message.drillTime }}
                 <!-- <span style="display: none"></span> -->
               </p>
             </td>
             <td width="85" class="JR_right">
-              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.address }}</p>
+              <p align="center" style="margin: 10px 0">{{ message.address }}</p>
             </td>
             <td width="57" class="JR_right">
-              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.oughtTo }}</p>
+              <p align="center" style="margin: 10px 0">{{ message.oughtTo }}</p>
             </td>
             <td width="57" class="JR_right">
-              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.actual }}</p>
+              <p align="center" style="margin: 10px 0">{{ message.actual }}</p>
             </td>
             <td width="68" nowrap="" class="JR_right">
-              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">
+              <p align="center" style="margin: 10px 0">
                 {{ message.probability }}
               </p>
             </td>
             <td width="104" nowrap="" class="JR_right">
-              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.result }}</p>
+              <p align="center" style="margin: 10px 0">{{ message.result }}</p>
             </td>
             <td width="104" nowrap="" class="JR_right">
-              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.expend }}</p>
+              <p align="center" style="margin: 10px 0">{{ message.expend }}</p>
             </td>
             <td width="83" nowrap="" class="JR_right">
-              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.remark }}</p>
+              <p align="center" style="margin: 10px 0">{{ message.remark }}</p>
             </td>
           </tr>
 
@@ -238,10 +236,9 @@
           font-weight: 900;
           margin: 10px 50px 20px 700px;
           color: black;
-          font-family: 'heiti'
         "
       >
-        军事主管：{{message.peopleName}}
+        军事主管：
       </div>
     </div>
   </div>
@@ -276,7 +273,7 @@ tr:last-child {
   border-bottom: 1px solid;
 }
 .a1 {
-  margin-right: 30px;
+  margin-right: 50px;
 }
 .box1 {
   position: absolute;

src/components/look_word/bdglequip.vue

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

src/components/look_word/bdgleven.vue

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

src/components/look_word/bdglfilemanagement.vue

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

src/components/look_word/bdglfood.vue

@@ -4,11 +4,10 @@
     <div class="word" id="contents" style="margin-top: 10px">
       <p
         style="
-          font-size: 16pt;
-          font-weight: 600;
+          font-size: 14pt;
+          font-weight: 900;
           margin-botttom: 30px;
           color: black;
-          font-family: 'heiti'
         "
       >
         《伙食管理登记簿》
@@ -43,7 +42,6 @@
           mso-border-insidev: 0.5pt solid windowtext;
           mso-padding-alt: 0pt 0pt 0pt 0pt;
           margin-left: -20px;
-          font-size: 16px;font-weight: 500;
         "
         width="960"
         align="center"
@@ -51,359 +49,359 @@
       >
         <tr
           class="aaa"
-          style="border: none; color: black; font-size: 12pt; line-height: 30px;font-family: 'songti'"
+          style="border: none; color: black; font-size: 12pt; line-height: 30px"
         >
           <td
             class="JR_right"
             colspan="5"
             align="left"
-            style="border: none; line-height: 45px;font-family: 'songti'"
+            style="border: none; line-height: 45px"
           >
-            日期：<span style="font-family: 'fangsong'"> {{ message.recordDate }}</span>
+            日期：{{ message.recordDate }}
           </td>
           <td
             class="JR_right"
             colspan="8"
             align="left"
-            style="border: none; line-height: 45px;font-family: 'songti'"
+            style="border: none; line-height: 45px"
           >
-            {{ week }}
+            星期：
           </td>
           <td
             class="JR_right"
             colspan="3"
             align="left"
-            style="border: none; line-height: 45px;font-family: 'songti'"
+            style="border: none; line-height: 45px"
           >
             单位：千克、元
           </td>
         </tr>
-        <tbody style="font-size: 16px;font-weight: 500;">
+        <tbody>
           <!-- 区分早中晚一日三餐 -->
-          <tr style="text-align: center;font-family: 'songti'" class="JR_tr" >
-            <td colspan="2" class="JR_left" style="widt: 60px;font-family: 'songti'" >区 分</td>
+          <tr style="text-align: center" class="JR_tr">
+            <td colspan="2" class="JR_left" style="widt: 60px">区 分</td>
             <td colspan="3" class="JR_left">
-              <p align="center" style="font-family: 'songti'">主食</p>
+              <p align="center">主食</p>
             </td>
             <td colspan="11" class="JR_left">
-              <p align="center" style="font-family: 'songti'">菜谱</p>
+              <p align="center">菜谱</p>
             </td>
           </tr>
 
-          <tr class="JR_tr" >
-            <td colspan="2" class="JR_left"><p align="center" style="font-family: 'songti'">早</p></td>
-            <td colspan="3" style="color: black;font-family: 'fangsong'" class="JR_right">
+          <tr class="JR_tr">
+            <td colspan="2" class="JR_left"><p align="center">早</p></td>
+            <td colspan="3" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].stapleFood }}</p>
             </td>
-            <td colspan="11" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td colspan="11" style="color: black" 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" style="font-family: 'songti'">中</p></td>
-            <td colspan="3" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td colspan="2" class="JR_left"><p align="center">中</p></td>
+            <td colspan="3" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].stapleFood }}</p>
             </td>
-            <td colspan="11" style="font-family: 'fangsong'" class="JR_right">
+            <td colspan="11" style="color: v" 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" style="font-family: 'songti'">晚</p></td>
-            <td colspan="3" style="font-family: 'fangsong'" class="JR_right">
+            <td colspan="2" class="JR_left"><p align="center">晚</p></td>
+            <td colspan="3" style="color: v" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].stapleFood }}</p>
             </td>
-            <td colspan="11" style="font-family: 'fangsong'" class="JR_right">
+            <td colspan="11" style="color: v" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].menu }}</p>
             </td>
           </tr>
 
-          <tr style="text-align: center;font-family: 'songti'" class="JR_tr">
+          <tr style="text-align: center" class="JR_tr">
             <td rowspan="2" colspan="2" class="JR_left">
-              <p align="center" style="font-family: 'songti'">区<br />分</p>
+              <p align="center" style="">区<br />分</p>
             </td>
             <td width="" colspan="3" class="JR_left">
-              <p align="center" style="font-family: 'songti'">就餐人数</p>
+              <p align="center">就餐人数</p>
             </td>
             <td width="" colspan="11" class="JR_left">
-              <p align="center" style="font-family: 'songti'">当日消耗</p>
+              <p align="center">当日消耗</p>
             </td>
           </tr>
 
-          <tr class="JR_tr" style="font-family: 'songti'">
-            <td width="" class="JR_left"><p align="center" style="font-family: 'songti'">总数</p></td>
-            <td width="" class="JR_left"><p align="center" style="font-family: 'songti'">连队</p></td>
-            <td width="" class="JR_left"><p align="center" style="font-family: 'songti'">外来</p></td>
+          <tr class="JR_tr">
+            <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>
             <td width="60px" class="JR_left">
-              <p align="center" style="font-family: 'songti'">面<br />粉</p>
+              <p align="center">面<br />粉</p>
             </td>
             <td width="60px" class="JR_left">
-              <p align="center" style="font-family: 'songti'">大<br />米</p>
+              <p align="center">大<br />米</p>
             </td>
             <td width="60px" class="JR_left">
-              <p align="center" style="font-family: 'songti'">肉<br />类</p>
+              <p align="center">肉<br />类</p>
             </td>
             <td width="60px" colspan="" class="JR_left">
-              <p align="center" style="font-family: 'songti'">鱼禽<br />类</p>
+              <p align="center">鱼禽<br />类</p>
             </td>
             <td width="60px" class="JR_left">
-              <p align="center" style="font-family: 'songti'">食<br />油</p>
+              <p align="center">食<br />油</p>
             </td>
             <td width="60px" colspan="" class="JR_left">
-              <p align="center" style="font-family: 'songti'">黄<br />豆</p>
+              <p align="center">黄<br />豆</p>
             </td>
             <td width="60px" colspan="" class="JR_left">
-              <p align="center" style="font-family: 'songti'">蔬<br />菜</p>
+              <p align="center">蔬<br />菜</p>
             </td>
             <td width="60px" class="JR_left">
-              <p align="center" style="font-family: 'songti'">水果<br />（奶）</p>
+              <p align="center">水果<br />（奶）</p>
             </td>
             <td width="60px" colspan="" class="JR_left">
-              <p align="center" style="font-family: 'songti'">糖</p>
+              <p align="center">糖</p>
             </td>
             <td width="60px">
-              <p align="center" class="JR_left" style="font-family: 'songti'">调<br />料</p>
+              <p align="center" class="JR_left">调<br />料</p>
             </td>
             <td width="60px" colspan="">
-              <p align="center" class="JR_left" style="font-family: 'songti'">燃<br />料</p>
+              <p align="center" class="JR_left">燃<br />料</p>
             </td>
           </tr>
 
           <tr class="JR_tr">
             <td width="" colspan="2" class="JR_left">
-              <p align="center" style="font-family: 'songti'">早</p>
+              <p align="center">早</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].jiucanCount }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].lianduiCount }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
+            <td width="" style="color: black" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].wailaiCount }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].mianfen }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].dami }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].rolei }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
+            <td width="" style="color: black" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].yulei }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].youlei }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
+            <td width="" style="color: black" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].huangdo }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
+            <td width="" style="color: black" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].suchai }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].shuiguo }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
+            <td width="" style="color: black" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].tang }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].tiaoliao }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
+            <td width="" style="color: black" 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" style="font-family: 'songti'">中</p>
+              <p align="center">中</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].jiucanCount }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].lianduiCount }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
+            <td width="" style="color: black" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].wailaiCount }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].mianfen }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].dami }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].rolei }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
+            <td width="" style="color: black" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].yulei }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
+            <td width="" style="color: black" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].youlei }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].huangdo }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
+            <td width="" style="color: black" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].suchai }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
+            <td width="" style="color: black" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].shuiguo }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].tang }}</p>
             </td>
 
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].tiaoliao }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
+            <td width="" style="color: black" 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" style="font-family: 'songti'">晚</p>
+              <p align="center">晚</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].jiucanCount }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].lianduiCount }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
+            <td width="" style="color: black" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].wailaiCount }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].mianfen }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].dami }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].rolei }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
+            <td width="" style="color: black" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].yulei }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].youlei }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
+            <td width="" style="color: black" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].huangdo }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
+            <td width="" style="color: black" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].suchai }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].shuiguo }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
+            <td width="" style="color: black" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].tang }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
+            <td width="" style="color: black" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].tiaoliao }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
+            <td width="" style="color: black" 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" style="font-family: 'songti'">实物检查验收</p>
+              <p align="center">实物检查验收</p>
             </td>
           </tr>
-          <tr class="JR_tr" style="font-family: 'songti'">
-            <td width="" class="JR_left"><p align="center" style="font-family: 'songti'">区分</p></td>
+          <tr class="JR_tr">
+            <td width="" class="JR_left"><p align="center">区分</p></td>
             <td width="" colspan="3" class="JR_left">
-              <p align="center" style="font-family: 'songti'">品名</p>
+              <p align="center">品名</p>
             </td>
             <td width="" colspan="2" class="JR_left">
-              <p align="center" style="font-family: 'songti'">重量</p>
+              <p align="center">重量</p>
             </td>
             <td width="" colspan="2" class="JR_left">
-              <p align="center" style="font-family: 'songti'">单价</p>
+              <p align="center">单价</p>
             </td>
             <td width="" colspan="2" class="JR_left">
-              <p align="center" style="font-family: 'songti'">金额</p>
+              <p align="center">金额</p>
             </td>
             <td width="" colspan="3" class="JR_left">
-              <p align="center" style="font-family: 'songti'">购买或自产</p>
+              <p align="center">购买或自产</p>
             </td>
             <td width="" colspan="3" class="JR_left">
-              <p align="center" style="font-family: 'songti'">备注</p>
+              <p align="center">备注</p>
             </td>
           </tr>
 
           <tr class="JR_tr" v-for="(item, i) in message.bdglFoodKinds" :key="i">
             <td width="" rowspan="" class="JR_left">
-              <p align="center" style="font-family: 'songti'">
+              <p align="center">
                 {{ i == 0 ? "主食" : i == 1 ? "副食" : "其他" }}
               </p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="3" class="JR_right">
+            <td width="" style="color: black" colspan="3" class="JR_right">
               <p align="center">{{ item.name }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="2" class="JR_right">
+            <td width="" style="color: black" colspan="2" class="JR_right">
               <p align="center">
                 {{ item.distinctions }}
               </p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="2" class="JR_right">
+            <td width="" style="color: black" colspan="2" class="JR_right">
               <p align="center">{{ item.weight }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="2" class="JR_right">
+            <td width="" style="color: black" colspan="2" class="JR_right">
               <p align="center">{{ item.money }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="3" class="JR_right">
+            <td width="" style="color: black" colspan="3" class="JR_right">
               <p align="center">{{ item.types }}</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" colspan="3" class="JR_right">
+            <td width="" style="color: black" colspan="3" class="JR_right">
               <p align="center">{{ item.money }}</p>
             </td>
           </tr>
 
           <!-- 退交伙食费- -->
-          <tr class="JR_tr" style="text-align: center;font-family: 'songti'">
+          <tr class="JR_tr" style="text-align: center">
             <td width="" colspan="1" rowspan="2" class="JR_left">
-              <p align="center" style="font-family: 'songti'">姓名</p>
+              <p align="center" style="">姓名</p>
             </td>
             <td width="" colspan="7" class="JR_left">
-              <p align="center" style="font-family: 'songti'">交伙食费</p>
+              <p align="center">交伙食费</p>
             </td>
             <td width="" colspan="2" rowspan="2" class="JR_left">
-              <p align="center" style="font-family: 'songti'">姓名</p>
+              <p align="center" style="">姓名</p>
             </td>
             <td width="" colspan="6" class="JR_left">
-              <p align="center" style="font-family: 'songti'">退伙食费</p>
+              <p align="center">退伙食费</p>
             </td>
           </tr>
 
-          <tr class="JR_tr" style="font-family: 'songti'">
+          <tr class="JR_tr">
             <td width="" colspan="3" class="JR_left">
-              <p align="center" style="font-family: 'songti'">天数</p>
+              <p align="center">天数</p>
             </td>
             <td width="" colspan="2" class="JR_left">
-              <p align="center" style="font-family: 'songti'">标准</p>
+              <p align="center" style="">标准</p>
             </td>
             <td width="" colspan="2" class="JR_left">
-              <p align="center" style="font-family: 'songti'">金额</p>
+              <p align="center" style="">金额</p>
             </td>
             <td width="" colspan="2" class="JR_left">
-              <p align="center" style="font-family: 'songti'">天数</p>
+              <p align="center">天数</p>
             </td>
             <td width="" colspan="2" class="JR_left">
-              <p align="center" style="font-family: 'songti'">标准</p>
+              <p align="center" style="">标准</p>
             </td>
             <td width="" colspan="2" class="JR_left">
-              <p align="center" style="font-family: 'songti'">金额</p>
+              <p align="center" style="">金额</p>
             </td>
           </tr>
 
@@ -411,7 +409,7 @@
             v-for="(item, i) in by_reset"
             :key="i"
             class="JR_tr"
-            style="text-align: center; line-height: 47px;font-family: 'fangsong'"
+            style="text-align: center; line-height: 47px"
           >
             <td colspan="1" class="JR_right">
               {{ item.peopleName }}
@@ -420,29 +418,29 @@
             <td colspan="2" class="JR_right">{{ item.standard }}</td>
             <td colspan="2" class="JR_right">{{ item.money }}</td>
 
-            <td colspan="2" v-if="isWho" class="JR_right">
+            <td colspan="2" v-show="isWho" class="JR_right">
               {{ reset[i].peopleName }}
             </td>
-            <td colspan="2" v-if="isWho" class="JR_right">
+            <td colspan="2" v-show="isWho" class="JR_right">
               {{ reset[i].sky }}
             </td>
-            <td colspan="2" v-if="isWho" class="JR_right">
+            <td colspan="2" v-show="isWho" class="JR_right">
               {{ reset[i].standard }}
             </td>
-            <td colspan="2" v-if="isWho" class="JR_right">
+            <td colspan="2" v-show="isWho" class="JR_right">
               {{ reset[i].money }}
             </td>
 
-            <td colspan="2" v-if="!isWho" class="JR_right">
+            <td colspan="2" v-show="!isWho" class="JR_right">
               {{ by[i].peopleName }}
             </td>
-            <td colspan="2" v-if="!isWho" class="JR_right">
+            <td colspan="2" v-show="!isWho" class="JR_right">
               {{ by[i].sky }}
             </td>
-            <td colspan="2" v-if="!isWho" class="JR_right">
+            <td colspan="2" v-show="!isWho" class="JR_right">
               {{ by[i].standard }}
             </td>
-            <td colspan="2" v-if="!isWho" class="JR_right">
+            <td colspan="2" v-show="!isWho" class="JR_right">
               {{ by[i].money }}
             </td>
           </tr>
@@ -450,62 +448,61 @@
           <!-- 在食堂购物 -->
           <tr class="JR_tr">
             <td width="" colspan="16" class="JR_left">
-              <p align="center" style="font-family: 'songti'">在食堂购物</p>
+              <p align="center">在食堂购物</p>
             </td>
           </tr>
-          <tr class="JR_tr" style="text-align: center; line-height: 47px;font-family: 'songti'">
+          <tr class="JR_tr" style="text-align: center; line-height: 47px">
             <td width="" rowspan="2" colspan="2" class="JR_left">
-              <p align="center" style="font-family: 'songti'">姓名</p>
+              <p align="center">姓名</p>
             </td>
             <td width="" colspan="4" class="JR_left">
-              <p align="center" style="font-family: 'songti'">主食</p>
+              <p align="center">主食</p>
             </td>
             <td width="" colspan="4" class="JR_left">
-              <p align="center" style="font-family: 'songti'">副食</p>
+              <p align="center">副食</p>
             </td>
             <td width="" colspan="4" class="JR_left">
-              <p align="center" style="font-family: 'songti'">其他</p>
+              <p align="center">其他</p>
             </td>
             <td width="" rowspan="2" colspan="2" class="JR_left">
-              <p align="center" style="font-family: 'songti'">合计</p>
+              <p align="center">合计</p>
             </td>
           </tr>
-          <tr class="JR_tr" style="font-family: 'songti'">
+          <tr class="JR_tr">
             <td width="" colspan="2" class="JR_left">
-              <p align="center" style="font-family: 'songti'">品名</p>
+              <p align="center">品名</p>
             </td>
             <td width="" colspan="1" class="JR_left">
-              <p align="center" style="font-family: 'songti'">重量</p>
+              <p align="center">重量</p>
             </td>
             <td width="" colspan="1" class="JR_left">
-              <p align="center" style="font-family: 'songti'">金额</p>
+              <p align="center">金额</p>
             </td>
             <td width="" colspan="2" class="JR_left">
-              <p align="center" style="font-family: 'songti'">品名</p>
+              <p align="center">品名</p>
             </td>
             <td width="" colspan="1" class="JR_left">
-              <p align="center" style="font-family: 'songti'">重量</p>
+              <p align="center">重量</p>
             </td>
             <td width="" colspan="1" class="JR_left">
-              <p align="center" style="font-family: 'songti'">金额</p>
+              <p align="center">金额</p>
             </td>
             <td width="" colspan="2" class="JR_left">
-              <p align="center" style="font-family: 'songti'">品名</p>
+              <p align="center">品名</p>
             </td>
             <td width="" colspan="1" class="JR_left">
-              <p align="center" style="font-family: 'songti'">重量</p>
+              <p align="center">重量</p>
             </td>
             <td width="" colspan="1" class="JR_left">
-              <p align="center" style="font-family: 'songti'">金额</p>
+              <p align="center">金额</p>
             </td>
           </tr>
 
           <tr
             class="JR_tr"
-            v-for="(item) in message.bdglFoodShoppings"
-            :key="item.id"
+            v-for="(item, i) in message.bdglFoodShoppings"
+            :key="i"
             height="50"
-            style="font-family: 'fangsong'"
           >
             <td width="" colspan="2" class="JR_right">
               <p align="center">
@@ -547,8 +544,8 @@
           </tr>
 
           <tr class="JR_tr">
-            <td width="" colspan="2" class="JR_left" style="font-family: 'songti'">
-              <p align="center" style="font-family: 'songti'">
+            <td width="" colspan="2" class="JR_left">
+              <p align="center">
                 炊<br />
                 事<br />
                 人<br />
@@ -561,29 +558,30 @@
               </p>
             </td>
             <td
-              style="font-family: 'fangsong'"
+              width=""
               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" style="font-family: 'songti'">
+              <p align="center">
                 帮<br />
                 厨<br />
                 人<br />
                 员
               </p>
             </td>
-            <td width="" colspan="7" style="font-family: 'fangsong'" class="JR_right">
+            <td width="" colspan="7" style="" 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" style="font-family: 'songti'">
+              <p align="center">
                 就<br />
                 餐<br />
                 人<br />
@@ -596,7 +594,7 @@
               class="JR_right"
               width=""
               colspan="14"
-              style="text-align: center;font-family: 'fangsong'"
+              style="text-align: center"
               v-html="message.repastContent"
             >
               <p align="center"></p>
@@ -605,31 +603,31 @@
         </tbody>
         <tr
           class="aaa"
-          style="border: none; color: black; font-size: 12pt; line-height: 30px;font-family: 'songti'"
+          style="border: none; color: black; font-size: 12pt; line-height: 30px"
         >
           <td
             class="JR_right"
             colspan="6"
             align="left"
-            style="border: none; line-height: 45px;font-family: 'songti'"
+            style="border: none; line-height: 45px"
           >
-            单位首长：<span style="font-family: 'fangsong'">{{ message.people1Name }}</span> 
+            单位首长：{{ message.people1Name }}
           </td>
           <td
             class="JR_right"
             colspan="6"
             align="left"
-            style="border: none; line-height: 45px;font-family: 'songti'"
+            style="border: none; line-height: 45px"
           >
-            经委会主任：<span style="font-family: 'fangsong'">{{ message.chairmanName }}</span> 
+            经委会主任：{{ message.chairmanName }}
           </td>
           <td
             class="JR_right"
             colspan="3"
             align="left"
-            style="border: none; line-height: 45px;font-family: 'songti'"
+            style="border: none; line-height: 45px"
           >
-            值班员：<span style="font-family: 'fangsong'"> {{ message.peopleName }}</span>
+            值班员：{{ message.peopleName }}
           </td>
         </tr>
       </table>
@@ -671,7 +669,6 @@ export default {
         peopleId: "",
         sky: "",
         standard: "",
-        weel:"",
       },
       by: [],
       reset: [],
@@ -680,7 +677,6 @@ export default {
   },
   created() {
     this.isWhy();
-    this.week = this.getWeek(this.message.recordDate);
   },
   methods: {
     daochu() {
@@ -696,9 +692,6 @@ export default {
           this.reset.push(this.message.bdglFoodBoardWagess[item]);
         }
       }
-      console.log(this.by,111);
-      console.log(this.reset,222);
-
       if (this.by.length > this.by_reset || this.reset.length > this.by_reset) {
         console.log(this.by.length);
         if (this.by.length >= this.reset.length) {
@@ -720,18 +713,6 @@ export default {
         }
       }
     },
-    /*
-      获取当前星期几
-     */
-    getWeek(dateString) {
-      var dateArray = dateString.split("-");
-      var date = new Date(
-        dateArray[0],
-        parseInt(dateArray[1] - 1),
-        dateArray[2]
-      );
-      return "星期" + "日一二三四五六".charAt(date.getDay());
-    },
   },
 };
 </script>

src/components/look_word/bdglmeeting.vue

@@ -4,12 +4,11 @@
     <div class="word" id="contents">
       <p
         style="
-          font-size: 16pt;
-          font-weight: 600;
+          font-size: 14pt;
+          font-weight: 900;
           margin-botttom: 30px;
           color: black;
           text-align: center;
-          font-family: 'heiti'
         "
       >
         《团支部工作记录本》
@@ -27,14 +26,14 @@
           mso-border-insidev: 0.5pt solid windowtext;
           mso-padding-alt: 0pt 0pt 0pt 0pt;
         "
-        width="500"
+        width="600"
         align="center"
         bordercolor="black"
       >
-        <tbody  style="font-size: 16px;font-weight: 500;">
+        <tbody>
           <tr class="JR_tr">
-            <th class="" colspan="2" >
-              <h4 align="center"  style="font-size: 18px;font-weight: 500;font-family: 'kaiti'">
+            <th class="" colspan="2">
+              <h4 align="center" style="text-align: center">
                 团支部委员会会议
               </h4>
             </th>
@@ -43,110 +42,110 @@
             <td
               width="120"
               class="JR_left"
-              style="border-right: 1px dashed #fff;font-family: 'kaiti'"
+              style="border-right: 1px dashed #fff"
             >
               <p align="center">&nbsp;&nbsp;时 &nbsp;间：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
+              style="border-left: 1px dashed #999; padding-left: 20px"
             >
               <p>{{ message.convokeTime }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #fff;font-family: 'kaiti'">
+            <td class="JR_left" style="border-right: 1px dashed #fff">
               <p align="center">&nbsp;&nbsp;地 &nbsp;点：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
+              style="border-left: 1px dashed #999; padding-left: 20px"
             >
               <p>{{ message.address }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #fff;font-family: 'kaiti'">
+            <td class="JR_left" style="border-right: 1px dashed #fff">
               <p align="center">&nbsp;&nbsp;主持人：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
+              style="border-left: 1px dashed #999; padding-left: 20px"
             >
               <p>{{ message.compereRen }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #fff;font-family: 'kaiti'">
+            <td class="JR_left" style="border-right: 1px dashed #fff">
               <p align="center">&nbsp;&nbsp;参加人：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
+              style="border-left: 1px dashed #999; padding-left: 20px"
             >
               <p>{{ message.joinId }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #fff;font-family: 'kaiti'">
+            <td class="JR_left" style="border-right: 1px dashed #fff">
               <p align="center">&nbsp;&nbsp;列席人：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
+              style="border-left: 1px dashed #999; padding-left: 20px"
             >
               <p>{{ message.peopleIds }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #fff;font-family: 'kaiti'">
+            <td class="JR_left" style="border-right: 1px dashed #fff">
               <p align="center">&nbsp;&nbsp;缺席人：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
+              style="border-left: 1px dashed #999; padding-left: 20px"
             >
               <p>{{ message.absentIds }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #fff;font-family: 'kaiti'">
+            <td class="JR_left" style="border-right: 1px dashed #fff">
               <p align="center">&nbsp;&nbsp;记录人：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
+              style="border-left: 1px dashed #999; padding-left: 20px"
             >
               <p>{{ message.peopleJiLu }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #fff;font-family: 'kaiti'">
+            <td class="JR_left" style="border-right: 1px dashed #fff">
               <p align="center">&nbsp;&nbsp;议 &nbsp;题：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
+              style="border-left: 1px dashed #999; padding-left: 20px"
               v-html="message.title"
             >
               <!-- <p>{{ message.title }}</p> -->
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: none;font-family: 'kaiti'">
+            <td class="JR_left" style="border-right: none">
               <p align="center">&nbsp; 内 &nbsp;容：</p>
             </td>
             <td
               align="left"
-              style="border-left: none; padding-left: 20px;font-family: 'fangsong'"
+              style="border-left: none; padding-left: 20px"
               class="JR_right"
               v-html="message.contents"
             ></td>
@@ -156,7 +155,7 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black;font-family: 'kaiti'"
+              style="border-left: 1px solid black"
             >
               <p style="text-align: right; padding-right: 80px">主持人：</p>
             </td>
@@ -165,16 +164,16 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black;font-family: 'kaiti'"
+              style="border-left: 1px solid black"
             >
-              <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;font-family: 'kaiti'"
+              style="border-left: 1px solid black"
             >
               <!--<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,11 +2,11 @@
   <div>
     <el-button class="box1" @click="daochu">导出</el-button>
 
-    <div class="word" id="contents" style="font-family: 'kaiti'">
+    <div class="word" id="contents">
       <p
         style="
-          font-size: 16pt;
-          font-weight: 600;
+          font-size: 14pt;
+          font-weight: 900;
           margin-botttom: 30px;
           color: black;
           text-align: center;
@@ -31,10 +31,10 @@
         align="center"
         bordercolor="black"
       >
-        <tbody style="font-size: 16px;font-weight: 500;">
+        <tbody>
           <tr class="JR_tr">
-            <th class="" colspan="2" style="font-family: 'kaiti'">
-              <h4 align="center" style="font-size: 18px;font-weight: 500;font-family: 'kaiti'">
+            <th class="" colspan="2">
+              <h4 align="center" style="text-align: center">
                 党支部委员会议(简称支委会)
               </h4>
             </th>
@@ -43,14 +43,14 @@
             <td
               width="120"
               class="JR_left"
-              style="border-right: 1px dashed #999;font-family: 'kaiti'"
+              style="border-right: 1px dashed #999"
             >
               <p align="center">&nbsp;&nbsp;时 &nbsp;间：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
+              style="border-left: 1px dashed #999; padding-left: 20px"
             >
               <p>{{ message.convokeTime }}</p>
             </td>
@@ -59,74 +59,74 @@
             <td
               align="left"
               class="JR_left"
-              style="border-right: 1px dashed #999;font-family: 'kaiti'"
+              style="border-right: 1px dashed #999"
             >
               <p align="center">&nbsp;&nbsp;地 &nbsp;点：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
+              style="border-left: 1px dashed #999; padding-left: 20px"
             >
               <p>{{ message.address }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #999;font-family: 'kaiti'">
+            <td class="JR_left" style="border-right: 1px dashed #999">
               <p align="center">&nbsp;&nbsp;主持人：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
+              style="border-left: 1px dashed #999; padding-left: 20px"
             >
               <p>{{ message.compereRen }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #999;font-family: 'kaiti'">
+            <td class="JR_left" style="border-right: 1px dashed #999">
               <p align="center">&nbsp;&nbsp;参加人：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
+              style="border-left: 1px dashed #999; padding-left: 20px"
             >
               <p>{{ message.joinId }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #999;font-family: 'kaiti'">
+            <td class="JR_left" style="border-right: 1px dashed #999">
               <p align="center">&nbsp;&nbsp;列席人：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
+              style="border-left: 1px dashed #999; padding-left: 20px"
             >
               <p>{{ message.peopleIds }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #999;font-family: 'kaiti'">
+            <td class="JR_left" style="border-right: 1px dashed #999">
               <p align="center">&nbsp;&nbsp;缺席人：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
+              style="border-left: 1px dashed #999; padding-left: 20px"
             >
               <p>{{ message.absentIds }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #999;font-family: 'kaiti'">
+            <td class="JR_left" style="border-right: 1px dashed #999">
               <p align="center">&nbsp;&nbsp;记录人：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
+              style="border-left: 1px dashed #999; padding-left: 20px"
             >
               <p>{{ message.peopleJiLu }}</p>
             </td>
@@ -136,13 +136,13 @@
             <td
               rowspan="2"
               class="JR_left"
-              style="border-right: 1px dashed #999;font-family: 'kaiti'"
+              style="border-right: 1px dashed #999"
             >
               <p align="center">&nbsp;&nbsp;议 &nbsp;题：</p>
             </td>
             <td
               rowspan="2"
-              style="border-left: 1px dashed #999; padding: 0px 20px;font-family: 'fangsong'"
+              style="border-left: 1px dashed #999; padding: 0px 20px"
               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;font-family: 'kaiti'">
+            <td class="JR_left" style="border-right: 0">
               <p align="center">&nbsp;&nbsp; 内 &nbsp;容：</p>
             </td>
             <td class="TableData" style="border-left: 0"></td>
@@ -165,7 +165,6 @@
                 text-indent: 30px;
                 padding: 0px 10px;
                 border: 1px solid black;
-                font-family: 'fangsong'
               "
             ></td>
           </tr>
@@ -174,7 +173,7 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black;font-family: 'kaiti'"
+              style="border-left: 1px solid black"
             >
               <p style="text-align: right; padding-right: 80px">主持人：</p>
             </td>
@@ -183,16 +182,16 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black;font-family: 'kaiti'"
+              style="border-left: 1px solid black"
             >
-              <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;font-family: 'kaiti'"
+              style="border-left: 1px solid black"
             >
               <!--<p style=" text-align:right;padding-right: 10px;">　　　　年　　月　　日</p>-->
               <p style="text-align: right; padding-right: 80px">时间：</p>

src/components/look_word/bdglpublicproperty.vue

@@ -4,11 +4,10 @@
     <div class="word" id="contents">
       <p
         style="
-          font-size: 16pt;
-          font-weight: 600;
+          font-size: 14pt;
+          font-weight: 900;
           margin: 0px 0px 20px -30px;
           color: black;
-          font-family: 'heiti'
         "
       >
         《营产、公物管理登记簿》
@@ -30,54 +29,54 @@
           mso-padding-alt: 0pt 0pt 0pt 0pt;
           margin-left: -10px;
         "
-        width="960"
+        width="940"
         bordercolor="black"
       >
         <!--<p align="center" style="font-size: 14pt;font-weight: bold;">营产，公物管理登记簿</p>-->
-        <tbody style="font-size: 15px;font-weight: 500;">
-          <tr class="JR_tr" style="font-size: 16px;font-weight: 600;font-family: 'heiti'">
+        <tbody>
+          <tr class="JR_tr">
             <th width="47" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">序号</p>
+              <p align="center" style="margin: 10px 0">序号</p>
             </th>
             <th width="66" valign="center" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">名称</p>
+              <p align="center" style="margin: 10px 0">名称</p>
             </th>
             <th width="94" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">规格型号</p>
+              <p align="center" style="margin: 10px 0">规格型号</p>
             </th>
             <th width="56" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">数量</p>
+              <p align="center" style="margin: 10px 0">数量</p>
             </th>
             <th width="66" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">单 价</p>
+              <p align="center" style="margin: 10px 0">单 价</p>
             </th>
             <th width="66" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">总价值</p>
+              <p align="center" style="margin: 10px 0">总价值</p>
             </th>
             <th width="122" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">装备时间</p>
+              <p align="center" style="margin: 10px 0">装备时间</p>
             </th>
             <th width="94" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">保管人</p>
+              <p align="center" style="margin: 10px 0">保管人</p>
             </th>
             <th width="75" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">取得方式</p>
+              <p align="center" style="margin: 10px 0">取得方式</p>
             </th>
             <th width="75" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">质量状况</p>
+              <p align="center" style="margin: 10px 0">质量状况</p>
             </th>
             <th width="75" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">固定资产负责人</p>
+              <p align="center" style="margin: 10px 0">固定资产负责人</p>
             </th>
             <th width="75" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">放置地点</p>
+              <p align="center" style="margin: 10px 0">放置地点</p>
             </th>
             <th width="56" valign="center" nowrap="" class="JR_left">
-              <p align="center" style=";font-family: 'heiti'">备注</p>
+              <p align="center">备注</p>
             </th>
           </tr>
 
-          <tr class="JR_tr" style="font-family: 'fangsong'">
+          <tr class="JR_tr">
             <td width="47" valign="center" nowrap="" class="JR_right">
               <p align="center">{{ message.id }}</p>
             </td>
@@ -123,7 +122,7 @@
           <tr class="JR_tr">
             <td width="47" height="45px" valign="center" nowrap="">
               <p align="center" style="margin: 5px">
-                <span style="display: none"></span>
+                <span style="display: none">111</span>
               </p>
             </td>
             <td width="66" height="45px" valign="center">
@@ -167,7 +166,7 @@
           <tr class="JR_tr">
             <td width="47" height="45px" valign="center" nowrap="">
               <p align="center" style="margin: 5px">
-                <span style="display: none"></span>
+                <span style="display: none">111</span>
               </p>
             </td>
             <td width="66" height="45px" valign="center">
@@ -210,7 +209,7 @@
           <tr class="JR_tr">
             <td width="47" height="45px" valign="center" nowrap="">
               <p align="center" style="margin: 5px">
-                <span style="display: none"></span>
+                <span style="display: none">111</span>
               </p>
             </td>
             <td width="66" height="45px" valign="center">
@@ -253,7 +252,7 @@
           <tr class="JR_tr">
             <td width="47" height="45px" valign="center" nowrap="">
               <p align="center" style="margin: 5px">
-                <span style="display: none"></span>
+                <span style="display: none">111</span>
               </p>
             </td>
             <td width="66" height="45px" valign="center">
@@ -296,7 +295,7 @@
           <tr class="JR_tr">
             <td width="47" height="45px" valign="center" nowrap="">
               <p align="center" style="margin: 5px">
-                <span style="display: none"></span>
+                <span style="display: none">111</span>
               </p>
             </td>
             <td width="66" height="45px" valign="center">
@@ -339,7 +338,7 @@
           <tr class="JR_tr">
             <td width="47" height="45px" valign="center" nowrap="">
               <p align="center" style="margin: 5px">
-                <span style="display: none"></span>
+                <span style="display: none">111</span>
               </p>
             </td>
             <td width="66" height="45px" valign="center">

src/components/look_word/bdglsecrecy.vue

@@ -5,11 +5,10 @@
     <div class="word" id="contents">
       <p
         style="
-          font-size: 16pt;
-          font-weight: 600;
+          font-size: 14pt;
+          font-weight: 900;
           margin-botttom: 30px;
           color: black;
-          font-family: 'heiti'
         "
       >
         《网络、移动电话、涉密载体使用管理登记本》
@@ -33,77 +32,77 @@
         bordercolor="black"
       >
         <!--<p align="center" style="font-size: 14pt;font-weight: bold;">网络/移动电话/涉密载体登记本</p>-->
-        <tbody style="font-size: 16px;font-weight: 500;">
+        <tbody>
           <tr class="JR_tr">
-            <td valign="center" style="width: 106px;font-family: 'heiti'" class="JR_left">
+            <td valign="center" style="width: 106px" class="JR_left">
               <p align="center" style="margin: 5px 0">种类（名称）</p>
             </td>
-            <td valign="center" style="width: 106px;font-family: 'heiti'" class="JR_left">
+            <td valign="center" style="width: 106px" class="JR_left">
               <p align="center" style="margin: 5px 0">型号</p>
             </td>
-            <td valign="center" style="width: 106px;font-family: 'heiti'" class="JR_left">
+            <td valign="center" style="width: 106px" class="JR_left">
               <p align="center" style="margin: 5px 0">编号</p>
             </td>
-            <td valign="center" style="width: 106px;font-family: 'heiti'" class="JR_left">
+            <td valign="center" style="width: 106px" class="JR_left">
               <p align="center" style="margin: 5px 0">密级</p>
             </td>
-            <td valign="center" style="width: 106px;font-family: 'heiti'" class="JR_left">
+            <td valign="center" style="width: 106px" class="JR_left">
               <p align="center" style="margin: 5px 0">责任人</p>
             </td>
-            <td valign="center" style="width: 106px;font-family: 'heiti'" class="JR_left">
+            <td valign="center" style="width: 106px" class="JR_left">
               <p align="center" style="margin: 5px 0">使用人</p>
             </td>
-            <td valign="center" style="width: 106px;font-family: 'heiti'" class="JR_left">
+            <td valign="center" style="width: 106px" class="JR_left">
               <p align="center" style="margin: 5px 0">批准人</p>
             </td>
-            <td valign="center" style="width: 106px;font-family: 'heiti'" class="JR_left">
+            <td valign="center" style="width: 106px" class="JR_left">
               <p align="center" style="margin: 5px 0">
                 使用起止 <br />
                 时间
               </p>
             </td>
-            <td valign="center" style="width: 106px;font-family: 'heiti'" class="JR_left">
+            <td valign="center" style="width: 106px" 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;font-family: 'fangsong'">{{ message.kind }}</p>
+              <p align="center" style="margin: 5px 0">{{ message.kind }}</p>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">{{ message.number }}</p>
+              <p align="center" style="margin: 5px 0">{{ message.number }}</p>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">{{ message.version }}</p>
+              <p align="center" style="margin: 5px 0">{{ message.version }}</p>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">
+              <p align="center" style="margin: 5px 0">
                 {{ message.confidential }}
               </p>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">
+              <p align="center" style="margin: 5px 0">
                 {{ message.peopleName }}
               </p>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">
+              <p align="center" style="margin: 5px 0">
                 {{ message.people1Name }}
               </p>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">
+              <p align="center" style="margin: 5px 0">
                 {{ 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;font-family: 'fangsong'">
+              <p align="center" style="margin: 5px 0">
                 {{ message.startTime }}
               </p>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">
+              <p align="center" style="margin: 5px 0">
                 {{ message.hindOverTime }}<br />
                 (移交/出售)
               </p>

src/components/look_word/bdglsoldier.vue

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

src/components/look_word/bdglweekwork.vue

@@ -6,10 +6,9 @@
         style="
           text-align: center;
           margin-top: 10px;
-          font-size: 16px;
+          font-size: 20px;
           font-weight: 600;
           color: black;
-          font-family: 'heiti'
         "
         id="qTitle"
       >
@@ -39,7 +38,7 @@
           mso-border-insidev: 0.5pt solid windowtext;
           mso-padding-alt: 0pt 0pt 0pt 0pt;
         "
-        width="960"
+        width="940"
         align="center"
         bordercolor="black"
       >
@@ -48,24 +47,22 @@
           style="
             border: none;
             color: black;
-            font-size: 16px;font-weight: 500;
+            font-size: 12pt;
             line-height: 30px;
-            width: 960px;
-            font-family: 'kaiti'
+            width: 940px;
           "
         >
           <td
             class="JR_left"
             colspan="3"
             align="left"
-            
-            style="border: none; line-height: 45px; width: 500px;"
+            style="border: none; line-height: 45px; width: 360px"
           >
             连值班领导：{{ message.peopleName }}
           </td>
           <td
             class="JR_left"
-            colspan="2"
+            colspan="3"
             align="left"
             style="border: none; line-height: 45px; width: 360px"
           >
@@ -73,32 +70,32 @@
           </td>
           <td
             class="JR_left"
-            colspan="3"
+            colspan="2"
             align="left"
             style="border: none; line-height: 45px"
           >
             {{ message.startTime }}—{{ message.endTime }}
           </td>
         </tr>
-        <tbody style="font-size: 16px;font-weight: 500;">
-          <tr class="JR_tr" style="font-size: 16px;font-weight: 500;font-family: 'heiti'">
+        <tbody>
+          <tr class="JR_tr">
             <td align="center" valign="center" colspan="3" class="JR_left">
-              <p align="center" style="font-family: 'heiti'">日期</p>
+              <p align="center">日期</p>
             </td>
             <td valign="center" class="JR_left">
-              <p align="center" style="font-family: 'heiti'">内容</p>
+              <p align="center">内容</p>
             </td>
             <td valign="center" class="JR_left">
-              <p align="center" style="font-family: 'heiti'">负责单位</p>
+              <p align="center">负责单位</p>
             </td>
             <td valign="center" class="JR_left">
-              <p align="center" style="font-family: 'heiti'">参加人员</p>
+              <p align="center">参加人员</p>
             </td>
             <td valign="center" class="JR_left">
-              <p align="center" style="font-family: 'heiti'">地点</p>
+              <p align="center">地点</p>
             </td>
             <td valign="center" class="JR_left">
-              <p align="center" style="font-family: 'heiti'">时间</p>
+              <p align="center">时间</p>
             </td>
           </tr>
 
@@ -106,7 +103,7 @@
             class="JR_tr"
             v-for="(item, i) in message.bdglWeekworkRegisterList"
             :key="i"
-            style="text-align: center; height: 45px;font-family: 'fangsong'"
+            style="text-align: center; height: 45px"
           >
             <td style="text-align: center" rowspan="1" class="JR_right">
               {{ item.week }}
@@ -135,10 +132,10 @@
           </tr>
 
           <tr class="JR_tr">
-            <td valign="center" class="JR_left" style="font-family: 'songti'">
+            <td valign="center" class="JR_left">
               <p align="center">备注</p>
             </td>
-            <td valign="center" colspan="7" class="JR_right" style="font-family: 'fangsong'">
+            <td valign="center" colspan="7" class="JR_right">
               {{ message.remark }}
             </td>
           </tr>
@@ -147,29 +144,28 @@
           style="
             border: none;
             color: black;
-            font-size: 16px;font-weight: 500;
+            font-size: 12pt;
             line-height: 30px;
-            width: 960px;
-            font-family: 'fangsong'
+            width: 940px;
           "
         >
           <td
             class="JR_left"
             colspan="3"
             align="left"
-            style="border: none; line-height: 45px; width: 360px;font-family: 'fangsong'"
+            style="border: none; line-height: 45px; width: 360px"
           >
             军事主官：{{ message.people1Name }}
           </td>
           <td
             colspan="1"
-            style="border: none; line-height: 45px; width: 360px;font-family: 'fangsong'"
+            style="border: none; line-height: 45px; width: 360px"
           ></td>
           <td
             class="JR_left"
             colspan="3"
             align="left"
-            style="border: none; line-height: 45px; width: 360px;font-family: 'fangsong'"
+            style="border: none; line-height: 45px; width: 360px"
           >
             政治主官：{{ message.people2Name }}
           </td>
@@ -177,7 +173,7 @@
             class="JR_left"
             colspan="3"
             align="left"
-            style="border: none; line-height: 45px;font-family: 'fangsong'"
+            style="border: none; line-height: 45px"
           >
             时间：
           </td>

src/components/look_word/personnelRoster.vue

@@ -5,12 +5,11 @@
     <div class="word" id="contents" style="font-family: 'fangsong'">
       <p
         style="
-          font-size: 16pt;
-          font-weight: 600;
+          font-size: 14pt;
+          font-weight: 900;
           margin-botttom: 30px;
           color: black;
           text-align: center;
-          font-family: 'geiti';
         "
       >
         《人员名册》
@@ -33,50 +32,35 @@
         align="center"
         bordercolor="black"
       >
-        <tbody style="font-size: 16px; font-weight: 500">
-          <tr
-            class="JR_tr"
-            height="40"
-            align="center"
-            style="font-family: 'heiti'"
-          >
-            <td class="JR_left" rowspan="2" style="font-family: 'heiti'">日期</td>
-            <td class="JR_left" colspan="3" style="font-family: 'heiti'">编制人数</td>
-            <td class="JR_left" colspan="3" style="font-family: 'heiti'">在位人数</td>
-            <td class="JR_left" colspan="3" style="font-family: 'heiti'">超（缺）编人员情况</td>
+        <tbody>
+          <tr class="JR_tr" height="40" align="center">
+            <td class="JR_left" rowspan="2">日期</td>
+            <td class="JR_left" colspan="3">编制人数</td>
+            <td class="JR_left" colspan="3">在位人数</td>
+            <td class="JR_left" colspan="3">超（缺）编人员情况</td>
           </tr>
-          <tr
-            class="JR_tr"
-            height="40"
-            align="center"
-            style="font-family: 'heiti'"
-          >
-            <td class="JR_left" style="font-family: 'heiti'">干部</td>
-            <td class="JR_left" style="font-family: 'heiti'">士官</td>
-            <td class="JR_left" style="font-family: 'heiti'">义务兵</td>
-            <td class="JR_left" style="font-family: 'heiti'">干部</td>
-            <td class="JR_left" style="font-family: 'heiti'">士官</td>
-            <td class="JR_left" style="font-family: 'heiti'">义务兵</td>
-            <td class="JR_left" style="font-family: 'heiti'">干部</td>
-            <td class="JR_left" style="font-family: 'heiti'">士官</td>
-            <td class="JR_left" style="font-family: 'heiti'">义务兵</td>
+          <tr class="JR_tr" height="40" align="center">
+            <td class="JR_left">干部</td>
+            <td class="JR_left">士官</td>
+            <td class="JR_left">义务兵</td>
+            <td class="JR_left">干部</td>
+            <td class="JR_left">士官</td>
+            <td class="JR_left">义务兵</td>
+            <td class="JR_left">干部</td>
+            <td class="JR_left">士官</td>
+            <td class="JR_left">义务兵</td>
           </tr>
-          <tr
-            class="JR_tr"
-            height="40"
-            align="center"
-            style="font-family: 'fangsong'"
-          >
+          <tr class="JR_tr" height="40" align="center">
+            <td class="JR_right"></td>
+            <td class="JR_right"></td>
+            <td class="JR_right"></td>
+            <td class="JR_right"></td>
+            <td class="JR_right"></td>
+            <td class="JR_right"></td>
+            <td class="JR_right"></td>
+            <td class="JR_right"></td>
+            <td class="JR_right"></td>
             <td class="JR_right"></td>
-            <td class="JR_right">{{ renshu.bzwgb }}</td>
-            <td class="JR_right">{{ renshu.bzwsb }}</td>
-            <td class="JR_right">{{ renshu.bzwyw }}</td>
-            <td class="JR_right">{{ renshu.zbgb }}</td>
-            <td class="JR_right">{{ renshu.zbsb }}</td>
-            <td class="JR_right">{{ renshu.zbyw }}</td>
-            <td class="JR_right">{{ renshu.zwgb }}</td>
-            <td class="JR_right">{{ renshu.zwsb }}</td>
-            <td class="JR_right">{{ renshu.zwyw }}</td>
           </tr>
 
           <tr class="JR_tr" height="40" align="center">
@@ -96,14 +80,7 @@
 
       <p
         align="right"
-        style="
-          margin: 20px 200px 5px 0px;
-          font-size: 16px;
-          color: black;
-          font-family: 'fangsong';
-          font-size: 18px;
-          font-weight: 500;
-        "
+        style="margin: 20px 200px 5px 0px; font-size: 16px; color: black"
       >
         日期
       </p>
@@ -124,69 +101,35 @@
         align="center"
         bordercolor="black"
       >
-        <tbody style="font-size: 16px; font-weight: 500">
-          <tr
-            class="JR_tr"
-            height="40"
-            align="center"
-            style="font-family: 'heiti'"
-          >
-            <td class="JR_left" style="font-family: 'heiti'">姓名</td>
-            <td class="JR_left" style="font-family: 'heiti'">职务</td>
-            <td class="JR_left" style="font-family: 'heiti'">军衔</td>
-            <td class="JR_left" style="font-family: 'heiti'">名族</td>
-            <td class="JR_left" style="font-family: 'heiti'">籍贯</td>
-            <td class="JR_left" style="font-family: 'heiti'">出生<br />年月</td>
-            <td class="JR_left" style="font-family: 'heiti'">入伍<br />年月</td>
-            <td class="JR_left" style="font-family: 'heiti'">
+        <tbody>
+          <tr class="JR_tr" height="40" align="center">
+            <td class="JR_left">姓名</td>
+            <td class="JR_left">职务</td>
+            <td class="JR_left">军衔</td>
+            <td class="JR_left">名族</td>
+            <td class="JR_left">籍贯</td>
+            <td class="JR_left">出生<br />年月</td>
+            <td class="JR_left">入伍<br />年月</td>
+            <td class="JR_left">
               入党（团）<br />
               时间
             </td>
-            <td class="JR_left" style="font-family: 'heiti'">文化<br />程度</td>
-            <td class="JR_left" style="font-family: 'heiti'">婚姻<br />状况</td>
-            <td class="JR_left" style="font-family: 'heiti'">家庭住址及联系方式</td>
-            <td class="JR_left" style="font-family: 'heiti'">备注</td>
+            <td class="JR_left">文化<br />程度</td>
+            <td class="JR_left">婚姻<br />状况</td>
+            <td class="JR_left">家庭住址及联系方式</td>
+            <td class="JR_left">备注</td>
           </tr>
-          <tr
-            class="JR_tr"
-            height="40"
-            align="center"
-            style="font-family: 'fangsong'"
-          >
+          <tr class="JR_tr" height="40" align="center">
             <td class="JR_right">{{ message.name }}</td>
-            <td class="JR_right">
-              <dict-tag
-                :options="dict.type.post_Level"
-                :value="message.postId"
-              />
-            </td>
-            <td class="JR_right">
-              <dict-tag
-                :options="dict.type.post_Level"
-                :value="message.rankId"
-              />
-            </td>
-            <td class="JR_right">
-              <dict-tag
-                :options="dict.type.sys_familyName"
-                :value="message.nationId"
-              />
-            </td>
+            <td class="JR_right">{{ message.postId }}</td>
+            <td class="JR_right">{{ message.rankId }}</td>
+            <td class="JR_right">{{ message.nationId }}</td>
             <td class="JR_right">{{ message.origin }}</td>
             <td class="JR_right">{{ message.birthDate }}</td>
             <td class="JR_right">{{ message.enlistDate }}</td>
             <td class="JR_right">{{ message.partyDate }}</td>
-            <td class="JR_right">
-              <dict-tag
-                :options="dict.type.Degree_level"
-                :value="message.educationId"
-              />
-            </td>
-            <td class="JR_right">
-              <dict-tag
-                :options="dict.type.marryList"
-                :value="message.marryList"
-              /></td>
+            <td class="JR_right">{{ message.educationId }}</td>
+            <td class="JR_right">{{ message.marryList }}</td>
             <td class="JR_right">{{ message.live }}{{ message.phone }}</td>
             <td class="JR_right"></td>
           </tr>
@@ -215,54 +158,14 @@ import { lookWord } from "@/utils/look_word.js";
 import "@/utils/lodJs.js";
 export default {
   name: "bdgleven",
-  props: ["message", "renshu"],
-  dicts: [
-    "post_Level",
-    "sys_user_rank",
-    "sys_familyName",
-    "Degree_level",
-    "marryList",
-  ],
+  props: ["message"],
   data() {
     return {
       title: "人员名册",
       style:
         ".JR_tr {height: 40px;};.JR_left{font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
-      //学历
-      educationId: [],
-      //军衔
-      rankIds: [],
-      //民族
-      nationIds: [],
-      //职务层级
-      postIds: [],
-      //婚姻情况
-      marryList: [],
-      xueLi: "",
     };
   },
-  created() {
-    //学历
-    this.getDicts("Degree_level").then((response) => {
-      this.educationId = response.data;
-    });
-    //婚姻情况
-    this.getDicts("marryList").then((response) => {
-      this.marryList = response.data;
-    });
-    //职务层级
-    this.getDicts("post_Level").then((response) => {
-      this.postIds = response.data;
-    });
-    //军衔
-    this.getDicts("sys_user_rank").then((response) => {
-      this.rankIds = response.data;
-    });
-    //民族
-    this.getDicts("sys_familyName").then((response) => {
-      this.nationIds = response.data;
-    });
-  },
   methods: {
     daochu() {
       lookWord(this.title, "#contents", this.style, true);

src/layout/components/AppMain.vue

@@ -18,7 +18,7 @@
       <div class="tkbox-main">
         <p>
           <img src="../../assets/images/警示.png" alt />
-          <span>您有一条打印文件需要处理，请尽快处理</span>
+          <span>{{title}}</span>
         </p>
       </div>
       <div class="tkbox-footer">
@@ -30,12 +30,14 @@
 
 <script>
 import { printTrigger, printTriggerClear } from "@/api/PrintsManage/manage";
+import Cookies from "js-cookie";
 export default {
   name: "AppMain",
   data() {
     return {
       open: false,
-      timer: null
+      timer: null,
+      title: ""
     };
   },
   created() {
@@ -59,27 +61,34 @@ export default {
     },
     quchulifun() {
       printTriggerClear().then(res => {
-         if(res.code==200){
-           window.open(`/print/manage`, "_self");
-         }
+        if (res.code == 200) {
+          window.open(`/print/manage`, "_self");
+        }
       });
-      
     },
     startTime() {
       this.timer = setInterval(() => {
         printTrigger().then(res => {
-             if(res.code==200){
-                 if(res.numb!=0){
-                     this.open = true;
-                 }else{
-                   this.open = false;
-                 }
-             }
+          if (res.code == 200) {
+            if (res.printInfo_u != 0) {
+              
+              var sendId = Cookies.get("userId");
+              if (res.printUserInfo == sendId) {
+                this.title = res.msg;
+                this.open = true;
+              }
+              if (res.printInfo == sendId) {
+                // this.title = res.msg;
+                this.title = "您有打印文件需要处理，请尽快处理";
+                this.open = true;
+              }
+            }
+          }
         });
       }, 10000); /* 每500毫秒执行一次，实现动态显示时间效果 */
     }
   },
-  destroyed() { 
+  destroyed() {
     clearInterval(this.timer); // 清除定时器
     this.timer = null;
   }
@@ -115,7 +124,7 @@ export default {
 }
 
 .tkbox-title-left {
-  flex: 1;
+  flex: 3;
   display: flex;
   align-items: center;
 }

src/layout/components/Navbar.vue

@@ -96,6 +96,12 @@ export default {
   },
   created() {
     this.getUser();
+    // console.log(this.sidebar)
+    // console.log(this.$route)
+    if(this.$route.query.name=='/regulations'){
+      this.sidebar.opened=false;
+    }
+    // /print
   },
   methods: {
     toggleSideBar() {

src/layout/components/Sidebar/Logo.vue

@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import logoImg from '@/assets/logo/logo.png'
+import logoImg from '@/assets/images/八一.png'
 import variables from '@/assets/styles/variables.scss'
 
 export default {

src/layout/components/Sidebar/index.vue

@@ -1,27 +1,14 @@
 <template>
   <div
-    :class="{ 'has-logo': showLogo }"
-    :style="{
-      backgroundColor:
-        settings.sideTheme === 'theme-dark'
-          ? variables.menuBackground
-          : variables.menuLightBackground,
-    }"
+    :class="{'has-logo':showLogo}"
+    :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }"
   >
     <logo v-if="showLogo" :collapse="isCollapse" />
     <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
       <el-menu
         :collapse="false"
-        :background-color="
-          settings.sideTheme === 'theme-dark'
-            ? variables.menuBackground
-            : variables.menuLightBackground
-        "
-        :text-color="
-          settings.sideTheme === 'theme-dark'
-            ? variables.menuColor
-            : variables.menuLightColor
-        "
+        :background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
+        :text-color="settings.sideTheme === 'theme-dark' ? variables.menuColor : variables.menuLightColor"
         :unique-opened="true"
         :active-text-color="settings.theme"
         :collapse-transition="false"
@@ -31,7 +18,7 @@
       >
         <sidebar-item
           v-for="(route, index) in routs"
-          :key="route.path + index"
+          :key="route.path  + index"
           :item="route"
           :base-path="route.path"
         />
@@ -50,7 +37,7 @@ export default {
   data() {
     return {
       routs: [],
-      p: null,
+      p: null
     };
   },
   components: { SidebarItem, Logo },
@@ -74,10 +61,9 @@ export default {
     },
     isCollapse() {
       return !this.sidebar.opened;
-    },
+    }
   },
   created() {
-    console.log(this.$route.query.name)
     //   this.routs=this.sidebarRouters
     if (this.$route.query.name) {
       this.sidebarRoutersfun();
@@ -92,9 +78,8 @@ export default {
   },
   methods: {
     sidebarRoutersfun() {
-      this.sidebarRouters.map((item) => {
+      this.sidebarRouters.map(item => {
         if (item.path == this.$route.query.name) {
-          console.log(11)
           this.routs.push(item);
         }
         // console.log(this.routs.length)
@@ -102,7 +87,7 @@ export default {
       if (this.routs.length <= 0) {
         window.open(`/pt`, "_self");
       }
-    },
-  },
+    }
+  }
 };
 </script>

src/store/modules/user.js

@@ -1,5 +1,6 @@
 import { login, logout, getInfo } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
+import Cookies from "js-cookie";
 
 const user = {
   state: {
@@ -50,7 +51,9 @@ const user = {
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
-          const user = res.user
+          const user = res.user;
+          Cookies.set("nickName", res.user.nickName);
+          Cookies.set("userId", res.user.userId);
           const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
           if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
             commit('SET_ROLES', res.roles)

src/utils/supervision.js

@@ -48,6 +48,11 @@ export function parseTime(time, pattern) {
  * 获取当前星期几
  */
  export function getNowWeek(now) {
+	//    var ssdate = new Date(now[0], parseInt(now[1] - 1), now[2]);
+    //    var  week1=String(ssdate.getDay()).replace("0","日").replace("1","一").replace("2","二").replace("3","三").replace("4","四").replace("5","五").replace("6","六")//就是你要的星期几
+    //    var week="星期"+week1
+	//    return week;
+
 	   var dateArray = now.split("-");
 	   var date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]);
 	   return "星期" + "日一二三四五六".charAt(date.getDay());

src/views/PrintsLog/printlog/index.vue

@@ -98,7 +98,7 @@
         />
       </el-form-item>-->
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="btr" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="btn" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -115,30 +115,19 @@
           >新增</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="['PrintsLog:printlog:edit']"
-          style="width:120px;"
-          >批量归还</el-button
-        >
-      </el-col>-->
       <el-col :span="1.5">
+        <el-button type="primary" @click="handleUpdate" style="width:76px;height:36px;">归还</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="['PrintsLog:printlog:remove']"
         >删除</el-button>
-      </el-col>
+      </el-col>-->
       <!-- <el-col :span="1.5">
         <el-button
           type="warning"
@@ -185,7 +174,15 @@
       </el-table-column>
       <el-table-column label="归还状态" align="center" prop="statusG">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_statusG" :value="scope.row.statusG" />
+          <!-- <dict-tag :options="dict.type.sys_statusG" :value="scope.row.statusG" /> -->
+          <div
+            style="color:#E6A23C;"
+            v-if="scope.row.statusG=='0'"
+          >未归还</div>
+          <div
+            style="color:#57b764;"
+            v-if="scope.row.statusG=='1'"
+          >已归还</div>
         </template>
       </el-table-column>
       <el-table-column label="归还份数" align="center" prop="returnNumber">
@@ -203,20 +200,14 @@
       <el-table-column label="现文件路径" align="center" prop="presentPath" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="btk"
-            type="text"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['PrintsLog:printlog:edit']"
-            v-if="scope.row.statusG==0"
-          >归还</el-button>
+          <el-button size="btk" type="text" @click="handlesee(scope.row)">查看</el-button>
           <!-- <el-button size="mini" type="text" v-if="scope.row.statusG==1||scope.row.statusG==2">已归还</el-button> -->
-          <el-button
+          <!-- <el-button
             size="btd"
             type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['PrintsLog:printlog:remove']"
-          >删除</el-button>
+          >删除</el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -237,7 +228,16 @@
         </el-form-item>-->
         <div class="jiben">打印编码</div>
         <el-form-item label="打印编码" prop="printCode">
-          <el-input v-model="form.printCode" placeholder="请输入打印编码" />
+          <el-input v-model="form.printCode" @blur="printCodeblur" placeholder="请输入打印编码" />
+          <!-- <el-select v-model="form.printCode" filterable @change="printCodechange" clearable placeholder="请选择打印编码">
+          <el-option
+            v-for="dict in printlogList"
+            :key="dict.printId"
+            :label="dict.printCode"
+            :value="dict"
+          ></el-option>
+          </el-select>-->
+          <!-- <el-input v-model="form.printCode" placeholder="请输入打印编码" /> -->
         </el-form-item>
         <div class="jiben">基本信息</div>
         <!-- <el-form-item label="单位名称" prop="unitName">
@@ -272,17 +272,13 @@
           <el-input v-model="form.isReturn" placeholder="请输入是否需要归还(0否1是)" />
         </el-form-item>-->
         <el-form-item label="归还份数" prop="returnNumber">
-          <el-input
-            v-model="form.returnNumber"
-            type="Number"
-            @blur="returnNumberblur"
-            placeholder="请输入打印份数"
-          />
+          <el-input v-model="form.returnNumber" @blur="returnNumberblur" placeholder="请输入打印份数" />
         </el-form-item>
         <el-form-item label="文件打印人" prop="printfileName">
-          <el-select v-model="form.printfileName" filterable clearable placeholder="请选择文件打印人">
+          <el-input v-model="form.printfileName" placeholder="请输入文件打印人" />
+          <!-- <el-select v-model="form.printfileName" filterable clearable placeholder="请选择文件打印人">
             <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
-          </el-select>
+          </el-select>-->
         </el-form-item>
         <!-- <el-form-item label="备注说明" prop="prize">
           <el-input v-model="form.prize" type="textarea" placeholder />
@@ -311,7 +307,7 @@
         </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-if="flg!=1">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -380,7 +376,8 @@ export default {
       },
       statusGlist: [],
       rylist: [],
-      returnNumber: null
+      returnNumber: null,
+      flg: null
     };
   },
   created() {
@@ -412,6 +409,7 @@ export default {
     cancel() {
       this.open = false;
       this.reset();
+      this.flg = null;
     },
     // 表单重置
     reset() {
@@ -455,29 +453,47 @@ export default {
       this.title = "添加集中文印记录";
       this.getrylist();
     },
+    /** 查看按钮操作 */
+    handlesee(row) {
+      getPrintlog(row.id).then(res => {
+        if (res.code == 200) {
+          this.form = res.data;
+          if (res.data.returnNumber) {
+            this.form.returnNumber = res.data.returnNumber;
+          } else {
+            this.form.returnNumber = 0;
+          }
+          this.title = "归还记录";
+          this.open = true;
+          this.flg = 1;
+        }
+      });
+    },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleUpdate() {
       this.reset();
-      const id = row.id || this.ids;
-      getPrintlog(id).then(response => {
-        if (!response.data.returnNumber) {
-          this.returnNumber = 0;
-        } else {
-          this.returnNumber = response.data.returnNumber;
-        }
+      this.title = "归还记录";
+      this.open = true;
+      // const id = row.id || this.ids;
+      // getPrintlog(id).then(response => {
+      //   if (!response.data.returnNumber) {
+      //     this.returnNumber = 0;
+      //   } else {
+      //     this.returnNumber = response.data.returnNumber;
+      //   }
 
-        this.form = response.data;
-        this.form.isReturn = this.form.isReturn + "";
-        this.open = true;
-        // if(this.form.returnNumber==this.form.printNumber){
-        //      this.form.statusG = 1;
-        // }else{
-        //   this.form.statusG=this.form.statusG;
-        // }
+      //   this.form = response.data;
+      //   this.form.isReturn = this.form.isReturn + "";
+      //   this.open = true;
+      //   // if(this.form.returnNumber==this.form.printNumber){
+      //   //      this.form.statusG = 1;
+      //   // }else{
+      //   //   this.form.statusG=this.form.statusG;
+      //   // }
 
-        this.form.returnNumber = response.data.printNumber;
-        this.title = "修改集中文印记录";
-      });
+      //   this.form.returnNumber = response.data.printNumber;
+      //   this.title = "修改集中文印记录";
+      // });
     },
     returnNumberblur() {
       if (
@@ -543,6 +559,19 @@ export default {
           this.exportLoading = false;
         })
         .catch(() => {});
+    },
+    //打印编号
+    printCodeblur() {
+      if (this.form.printCode) {
+        listPrintlog({ printCode: this.form.printCode }).then(response => {
+          this.form = response.rows[0];
+          if (this.form.returnNumber) {
+            this.form.returnNumber = this.form.returnNumber;
+          } else {
+            this.form.returnNumber = 0;
+          }
+        });
+      }
     }
   }
 };
@@ -567,6 +596,7 @@ export default {
   height: 36px;
   background: #004d86;
   color: #fff;
+  border: 1px solid #fff !important;
 }
 ::v-deep .el-date-editor.el-input {
   width: 200px;

src/views/PrintsManage/manage/index.vue

@@ -133,7 +133,7 @@
         />
       </el-form-item>-->
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="btr" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="btn" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -143,11 +143,10 @@
         <el-button
           type="primary"
           plain
-          icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
           v-hasPermi="['PrintsManage:manage:add']"
-        >新增</el-button>
+        >发送文件</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -197,7 +196,22 @@
       <el-table-column label="文件名称" align="center" prop="name" />
       <!-- <el-table-column label="路径" align="center" prop="file" /> -->
       <el-table-column label="类型" align="center" prop="type" />
-      <el-table-column label="大小" align="center" prop="size" />
+      <el-table-column label="是否彩打" align="center" prop="isPrintColor">
+        <template slot-scope="scope">
+          <span>{{scope.row.isPrintColor==0?'否':'是'}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否双面打" align="center" prop="isPrintTwo">
+        <template slot-scope="scope">
+          <span>{{scope.row.isPrintTwo==0?'否':'是'}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="打印状态" align="center" prop="printStatus">
+        <template slot-scope="scope">
+          <span>{{scope.row.printStatus==1?'打印中':'已打印'}}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="大小" align="center" prop="size" /> -->
       <!-- <el-table-column label="单位ID" align="center" prop="unitId" /> -->
       <!-- <el-table-column label="单位名称" align="center" prop="unitName" /> -->
       <el-table-column label="级别" align="center" prop="levelM">
@@ -207,18 +221,17 @@
       </el-table-column>
       <!-- <el-table-column label="发送人ID" align="center" prop="sendId" /> -->
       <el-table-column label="发送人" align="center" prop="sendName" />
-      <el-table-column label="创建时间" align="center" prop="creattime" width="180">
+      <!-- <el-table-column label="创建时间" align="center" prop="creattime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.creattime, "{y}-{m}-{d}") }}</span>
         </template>
-      </el-table-column>
+      </el-table-column>-->
       <!-- <el-table-column label="更新时间" align="center" prop="updatetime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updatetime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>-->
       <!-- <el-table-column label="打印说明" align="center" prop="explainInfo" />
-      <el-table-column label="打印状态(1 打印中  2 已打印)" align="center" prop="printStatus" />
       <el-table-column label="接收人ID" align="center" prop="receiveId" />
       <el-table-column label="接收人" align="center" prop="receiveName" />
       <el-table-column label="生成路径" align="center" prop="sFile" />
@@ -228,6 +241,7 @@
           <el-button
             size="btk"
             type="text"
+            v-if="scope.row.printStatus==1"
             @click="handlePrint(scope.row)"
           >打印</el-button>
           <el-button
@@ -259,7 +273,7 @@
       <el-form ref="form" :model="form" :inline="true" :rules="rules" label-width="120px">
         <div class="jiben">发送人信息</div>
         <el-form-item label="发送人" prop="sendName">
-          <el-input v-model="form.sendName" placeholder="请输入发送人" />
+          <el-input v-model="form.sendName" disabled placeholder="请输入发送人" />
         </el-form-item>
         <div class="jiben">文件信息</div>
         <el-form-item label="上传文件">
@@ -312,6 +326,27 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="打印份数" prop="printNumber">
+          <el-input v-model="form.printNumber" type="Number" placeholder="请输入打印份数" />
+        </el-form-item>
+        <!-- <el-form-item label="是否需要归还" prop="isReturn">
+          <el-radio-group v-model="form.isReturn" style="width:200px;" size="mini">
+            <el-radio label="1">归还</el-radio>
+            <el-radio label="0">无需归还</el-radio>
+          </el-radio-group>
+        </el-form-item>-->
+        <el-form-item label="是否为彩打" prop="isPrintColor">
+          <el-radio-group v-model="form.isPrintColor" style="width:200px;" size="mini">
+            <el-radio label="1">是</el-radio>
+            <el-radio label="0">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="是否为双面打" prop="isPrintTwo">
+          <el-radio-group v-model="form.isPrintTwo" style="width:200px;" size="mini">
+            <el-radio label="1">是</el-radio>
+            <el-radio label="0">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <!-- <el-form-item label="发送人ID" prop="sendId">
           <el-input v-model="form.sendId" placeholder="请输入发送人ID" />
         </el-form-item>-->
@@ -373,11 +408,23 @@
           <el-input v-model="dyform.printNumber" type="Number" placeholder="请输入打印份数" />
         </el-form-item>
         <el-form-item label="是否需要归还" prop="isReturn">
-          <el-radio-group v-model="dyform.isReturn" size="mini" style="width:200px;">
+          <el-radio-group v-model="dyform.isReturn" style="width:200px;" size="mini">
             <el-radio label="1">归还</el-radio>
             <el-radio label="0">无需归还</el-radio>
           </el-radio-group>
         </el-form-item>
+        <!-- <el-form-item label="是否为彩打" prop="isPrintColor">
+          <el-radio-group v-model="dyform.isPrintColor" style="width:200px;" size="mini">
+            <el-radio label="1">是</el-radio>
+            <el-radio label="0">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="是否为双面打" prop="isPrintTwo">
+          <el-radio-group v-model="dyform.isPrintTwo" style="width:200px;" size="mini">
+            <el-radio label="1">是</el-radio>
+            <el-radio label="0">否</el-radio>
+          </el-radio-group>
+        </el-form-item>-->
         <!-- <div class="jiben">打印人信息</div> -->
         <el-form-item label="打印人" prop="printfileName">
           <el-select v-model="dyform.printfileName" filterable clearable placeholder="请选择打印人">
@@ -385,6 +432,9 @@
           </el-select>
         </el-form-item>
         <div class="jiben jiben2">打印说明</div>
+        <div
+          style="width:98.5%;height:45px;font-size:14px;line-height:45px;color:#fff;border-bottom:1px solid #fff;margin-bottom:20px;padding-left:15px;"
+        >其他要求：{{yaoqiu}}</div>
         <el-form-item label prop="explainInfo">
           <el-input
             v-model="dyform.explainInfo"
@@ -399,6 +449,15 @@
         <el-button @click="dycancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog
+      :title="title"
+      :visible.sync="dyopen2"
+      append-to-body
+      width="1500px"
+      style="padding-top:100px;"
+    >
+      <div ref="file" v-html="tableau" style="width:100%;"></div>
+    </el-dialog>
   </div>
 </template>
 
@@ -416,6 +475,10 @@ import {
 } from "@/api/PrintsManage/manage";
 import { getToken } from "@/utils/auth";
 import Cookies from "js-cookie";
+import axios from "axios";
+const XLSX = require("xlsx");
+const docx = require("docx-preview");
+window.JSZip = require("jszip");
 
 export default {
   name: "Manage",
@@ -442,7 +505,7 @@ export default {
     isShowTip: {
       type: Boolean,
       default: true
-    },
+    }
   },
   data() {
     return {
@@ -505,6 +568,10 @@ export default {
       fileList: [],
       faith: null,
       rylist: [],
+      islist: [],
+      yaoqiu: "",
+      dyopen2: false,
+      tableau: null
     };
   },
   created() {
@@ -513,6 +580,10 @@ export default {
     this.getDicts("level").then(response => {
       this.levelMs = response.data;
     });
+    //是否
+    this.getDicts("sys_is").then(response => {
+      this.islist = response.data;
+    });
   },
   methods: {
     /** 查询集中文印主列表 */
@@ -553,7 +624,11 @@ export default {
         receiveId: null,
         receiveName: null,
         sFile: null,
-        printInfo: null
+        printInfo: null,
+        isReturn: null,
+        printNumber: null,
+        isPrintTwo: null,
+        isPrintColor: null
       };
       this.resetForm("form");
     },
@@ -568,7 +643,9 @@ export default {
         explainInfo: null,
         file: null,
         printId: null,
-        statusG: null
+        statusG: null,
+        isPrintTwo: null,
+        isPrintColor: null
       };
       this.resetForm("dyform");
     },
@@ -594,6 +671,7 @@ export default {
       this.open = true;
       this.title = "添加集中文印主";
       this.form.sendName = Cookies.get("nickName");
+      this.form.sendId = Cookies.get("userId");
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -601,6 +679,8 @@ export default {
       const id = row.id || this.ids;
       getManage(id).then(response => {
         this.form = response.data;
+        this.form.isPrintColor = response.data.isPrintColor + "";
+        this.form.isPrintTwo = response.data.isPrintTwo + "";
         this.open = true;
         this.title = "修改集中文印主";
       });
@@ -713,6 +793,7 @@ export default {
     },
     //打印
     handlePrint(row) {
+      console.log(row);
       this.dyreset();
       this.dyopen = true;
       this.title = "打印";
@@ -722,6 +803,19 @@ export default {
       this.dyform.file = row.file;
       this.dyform.statusG = 0;
       this.dyform.printfileName = row.sendName;
+      this.dyform.printNumber = row.printNumber;
+      this.dyform.type = row.type;
+      // this.dyform.isReturn = row.isReturn + "";
+      if (row.isPrintColor == 1) {
+        this.yaoqiu = "彩打";
+      }
+      if (row.isPrintTwo == 1) {
+        if (this.yaoqiu) {
+          this.yaoqiu += " 双面打";
+        } else {
+          this.yaoqiu = "双面打";
+        }
+      }
       this.getrylist();
     },
     //获取人员
@@ -741,10 +835,40 @@ export default {
       }
       printCode(this.dyform).then(res => {
         if (res.code == 200) {
-          this.dyopen=false;
+          console.log(res);
+          this.dyopen = false;
           // var open=window.open();
-          location.href =
+          // location.href =
+          //   "http://192.168.5.188:8080/profile/print/" + res.printFileName;
+          var url =
             "http://192.168.5.188:8080/profile/print/" + res.printFileName;
+          this.dyopen2 = true;
+          console.log(this.dyform.type);
+          if (this.dyform.type == "docx") {
+            console.log(1);
+            axios({
+              method: "get",
+              responseType: "blob", // 设置响应文件格式
+              url: url
+            }).then(({ data }) => {
+              console.log(this.$refs.file);
+
+              docx.renderAsync(data, this.$refs.file); // 渲染到页面预览
+            });
+          } else if (this.dyform.type == "xlsx") {
+            console.log(2);
+            axios
+              .get(url, {
+                responseType: "arraybuffer" // 设置响应体类型为arraybuffer
+              })
+              .then(({ data }) => {
+                let workbook = XLSX.read(new Uint8Array(data), {
+                  type: "array"
+                }); // 解析数据
+                var worksheet = workbook.Sheets[workbook.SheetNames[0]]; // workbook.SheetNames 下存的是该文件每个工作表名字,这里取出第一个工作表
+                this.tableau = XLSX.utils.sheet_to_html(worksheet); // 渲染
+              });
+          }
         }
       });
       // open.location.href="http://192.168.5.188:8080/priofile/print/202203211244.docx";
@@ -773,6 +897,7 @@ export default {
   height: 36px;
   background: #004d86;
   color: #fff;
+  border: 1px solid #fff !important;
 }
 ::v-deep .el-date-editor.el-input {
   width: 200px;
@@ -920,10 +1045,10 @@ export default {
   color: #00365f !important;
   /* background-color: #003156 !important; */
 }
-::v-deep .el-radio-group .el-radio{
+::v-deep .el-radio-group .el-radio {
   color: #fff;
 }
-::v-deep .el-radio:last-child{
+/* ::v-deep .el-radio:last-child {
   margin-left: 35px;
-}
+} */
 </style>

src/views/bdglregular/regularcountinfo/index.vue

@@ -9,7 +9,7 @@
           :data="peopleList"
           :header-cell-style="{ background: '#0c2c50', color: 'white' }"
           style="width:98%;background:#0c2c50;margin-left:1%;"
-          height="350"
+          height="88%"
         >
           <!-- <el-table-column type="selection" width="55" align="center" /> -->
           <el-table-column label="名次" align="center" type="index" />
@@ -36,7 +36,8 @@
           :data="peopleList2"
           :header-cell-style="{ background: '#0c2c50', color: 'white' }"
           style="width:98%;background:#0c2c50;margin-left:1%;"
-          height="350"
+          height="88%"
+          @row-click="rowclick"
         >
           <!-- <el-table-column type="selection" width="55" align="center" /> -->
           <el-table-column label="序号" align="center" type="index" />
@@ -174,19 +175,19 @@ export default {
                 },
                 data: [
                   {
-                    value: res.data[0].daiyanshou,
+                    value: res.data[0].daiyanshou==0?null:res.data[0].daiyanshou,
                     name: "待验收"
                   },
                   {
-                    value: res.data[0].yitongguo,
+                    value: res.data[0].yitongguo==0?null:res.data[0].yitongguo,
                     name: "已通过"
                   },
                   {
-                    value: res.data[0].daichuli,
+                    value: res.data[0].daichuli==0?null:res.data[0].daichuli,
                     name: "待处理"
                   },
                   {
-                    value: res.data[0].weitongguo,
+                    value: res.data[0].weitongguo==0?null:res.data[0].weitongguo,
                     name: "未通过"
                   }
                 ],
@@ -211,7 +212,6 @@ export default {
           this.peopleList3 = res.data;
           var roseCharts = document.getElementsByClassName("block");
           for (var i = 0; i < this.peopleList3.length; i++) {
-            console.log(this.peopleList3);
             var myChart = echarts.init(roseCharts[i]);
             var option = {
               title: {
@@ -263,19 +263,19 @@ export default {
                   },
                   data: [
                     {
-                      value: this.peopleList3[i].daichuli,
+                      value: this.peopleList3[i].daichuli==0?null:this.peopleList3[i].daichuli, 
                       name: "待处理"
                     },
                     {
-                      value: this.peopleList3[i].daiyanshou,
+                      value: this.peopleList3[i].daiyanshou==0?null:this.peopleList3[i].daiyanshou,
                       name: "待验收"
                     },
                     {
-                      value: this.peopleList3[i].weitongguo,
+                      value: this.peopleList3[i].weitongguo==0?null:this.peopleList3[i].weitongguo,
                       name: "未通过"
                     },
                     {
-                      value: this.peopleList3[i].yitongguo,
+                      value: this.peopleList3[i].yitongguo==0?null:this.peopleList3[i].yitongguo,
                       name: "已通过"
                     }
                   ],
@@ -293,6 +293,9 @@ export default {
           }
         }
       });
+    },
+    rowclick(row){
+       console.log(row.id)
     }
   }
 };

src/views/bdglregular/regularinfo/index.vue

@@ -289,7 +289,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="queryParams.caoZuoType==0&&scope.row.isCaoZuoDept==0&&(scope.row.currentState=='未通过'||scope.row.currentState=='待处理')"
+            v-if="scope.row.caoZuoType=='0'&&scope.row.isCaoZuoDept==0&&(scope.row.currentState=='未通过'||scope.row.currentState=='待处理')"
             @click="handleUpdate(scope.row)"
           >整改</el-button>
           <el-button
@@ -843,6 +843,7 @@ export default {
   height: 36px;
   background: #004d86;
   color: #fff;
+  border: 1px solid #fff !important;
 }
 ::v-deep .el-date-editor.el-input {
   width: 200px;

src/views/bdglregular/specialcountinfo/index.vue

@@ -9,7 +9,7 @@
           :data="peopleList"
           :header-cell-style="{ background: '#0c2c50', color: 'white' }"
           style="width:98%;background:#0c2c50;margin-left:1%;"
-          height="350"
+          height="88%"
         >
           <!-- <el-table-column type="selection" width="55" align="center" /> -->
           <el-table-column label="名次" align="center" type="index" />
@@ -36,6 +36,7 @@
           :data="peopleList2"
           :header-cell-style="{ background: '#0c2c50', color: 'white' }"
           style="width:98%;background:#0c2c50;margin-left:1%;"
+          height="88%"
         >
           <!-- <el-table-column type="selection" width="55" align="center" /> -->
           <el-table-column label="序号" align="center" type="index" />
@@ -188,19 +189,19 @@ export default {
                 },
                 data: [
                   {
-                    value: res.data[0].daiyanshou,
+                    value: res.data[0].daiyanshou==0?null:res.data[0].daiyanshou,
                     name: "待验收"
                   },
                   {
-                    value: res.data[0].yitongguo,
+                    value: res.data[0].yitongguo==0?null:res.data[0].yitongguo,
                     name: "已通过"
                   },
                   {
-                    value: res.data[0].daichuli,
+                    value: res.data[0].daichuli==0?null:res.data[0].daichuli,
                     name: "待处理"
                   },
                   {
-                    value: res.data[0].weitongguo,
+                    value: res.data[0].weitongguo==0?null:res.data[0].weitongguo,
                     name: "未通过"
                   }
                 ],
@@ -277,19 +278,19 @@ export default {
                   },
                   data: [
                     {
-                      value: this.peopleList3[i].daichuli,
+                      value: this.peopleList3[i].daichuli==0?null:this.peopleList3[i].daichuli,
                       name: "待处理"
                     },
                     {
-                      value: this.peopleList3[i].daiyanshou,
+                      value: this.peopleList3[i].daiyanshou==0?null:this.peopleList3[i].daiyanshou,
                       name: "待验收"
                     },
                     {
-                      value: this.peopleList3[i].weitonguo,
+                      value: this.peopleList3[i].weitonguo==0?null:this.peopleList3[i].weitonguo,
                       name: "未通过"
                     },
                     {
-                      value: this.peopleList3[i].yitongguo,
+                      value: this.peopleList3[i].yitongguo==0?null:this.peopleList3[i].yitongguo,
                       name: "已通过"
                     }
                   ],

src/views/bdglregular/specialinfo/index.vue

@@ -731,6 +731,7 @@ export default {
   height: 36px;
   background: #004d86;
   color: #fff;
+  border: 1px solid #fff !important;
 }
 ::v-deep .el-date-editor.el-input {
   width: 200px;

src/views/combatduty/RateOfTen/index.vue

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

src/views/combatduty/basedutyinfo/index.vue

@@ -5,23 +5,22 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      label-width="auto"
     >
       <el-form-item label="值班时间" prop="attendedTime">
         <el-date-picker
-            clearable
-            size="small"
-            v-model="queryParams.attendedTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择值班时间"
-            v-if="qdflg==2"
-          ></el-date-picker>
+          clearable
+          size="small"
+          v-model="queryParams.attendedTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择值班时间"
+        ></el-date-picker>
       </el-form-item>
       <el-form-item label="值班首长" prop="chiefDutyName">
-        <el-select v-model="queryParams.chiefDutyName"  filterable clearable placeholder="请选择值班首长">
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
-          </el-select>
+        <el-select v-model="queryParams.chiefDutyName" filterable clearable placeholder="请选择值班首长">
+          <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
+        </el-select>
       </el-form-item>
       <!-- <el-form-item label="值班首长ID" prop="chiefDutyId">
         <el-input
@@ -239,7 +238,7 @@
           @click="handleUpdate"
           v-hasPermi="['combatduty:basedutyinfo:edit']"
         >修改</el-button>
-      </el-col> -->
+      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -261,7 +260,7 @@
           @click="handleExport"
           v-hasPermi="['combatduty:basedutyinfo:export']"
         >导出</el-button>
-      </el-col> -->
+      </el-col>-->
       <el-col :span="1.5" class="isSubmit">
         <el-radio-group v-model="queryParams.type" @change="caoZuoTypefun">
           <el-radio-button label="null">所有值班</el-radio-button>
@@ -282,28 +281,38 @@
       <el-table-column label="序号" align="center" type="index" />
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
       <el-table-column label="值班时间" align="center" prop="attendedTime" />
-      <!-- <el-table-column label="值班首长" align="center" prop="chiefDutyName" /> -->
-      <el-table-column label="值班首长" align="center" prop="chiefDutyId" :formatter="chiefDutyIdFormat" />
+      <el-table-column label="值班首长" align="center" prop="chiefDutyName" />
+      <!-- <el-table-column label="值班首长" align="center" prop="chiefDutyId" :formatter="chiefDutyIdFormat" /> -->
       <!-- <el-table-column label="值班首长电话" align="center" prop="chiefDutyPhone" /> -->
-      <!-- <el-table-column label="作战值班员" align="center" prop="combatDutyName" /> -->
-      <el-table-column label="作战值班员" align="center" prop="combatDutyId" :formatter="combatDutyIdFormat" />
-      <!-- <el-table-column label="作战值班员手机号" align="center" prop="combatDutyPhone" />
-      <el-table-column label="总值班员" align="center" prop="dutyOffierName" /> -->
-      <el-table-column label="总值班员" align="center" prop="dutyOffierId" :formatter="dutyOffierIdFormat" />
+      <el-table-column label="作战值班员" align="center" prop="combatDutyName" />
+      <!-- <el-table-column label="作战值班员" align="center" prop="combatDutyId" :formatter="combatDutyIdFormat" /> -->
+      <!-- <el-table-column label="作战值班员手机号" align="center" prop="combatDutyPhone" /> -->
+      <el-table-column label="总值班员" align="center" prop="dutyOffierName" />
+      <!-- <el-table-column label="总值班员" align="center" prop="dutyOffierId" :formatter="dutyOffierIdFormat" /> -->
       <!-- <el-table-column label="总值班员电话" align="center" prop="dutyOffierPhone" /> -->
       <!-- <el-table-column label="值班分队1" align="center" prop="detachmentoneName" /> -->
-      <el-table-column label="值班分队1" align="center" prop="detachmentoneId" :formatter="detachmentoneIdFormat" />
+      <el-table-column
+        label="值班分队1"
+        align="center"
+        prop="detachmentoneId"
+        :formatter="detachmentoneIdFormat"
+      />
       <!-- <el-table-column label="值班分队1人数" align="center" prop="detachmentoneNumber" /> -->
       <el-table-column label="值班分队1指挥员" align="center" prop="detachmentonePeopleName" />
       <!-- <el-table-column label="值班分队1指挥员" align="center" prop="detachmentonePeopleId" :formatter="detachmentonePeopleIdFormat" /> -->
       <!-- <el-table-column label="值班分队1指挥员电话" align="center" prop="detachmentonePeoplePhone" />  -->
       <!-- <el-table-column label="值班分队2" align="center" prop="detachmentwoName" /> -->
-      <el-table-column label="值班分队2" align="center" prop="detachmentwoId" :formatter="detachmentwoIdFormat" />
+      <el-table-column
+        label="值班分队2"
+        align="center"
+        prop="detachmentwoId"
+        :formatter="detachmentwoIdFormat"
+      />
       <!-- <el-table-column label="值班分队2人数" align="center" prop="detachmentwoNumber" /> -->
-      <!-- <el-table-column label="值班分队2指挥员" align="center" prop="detachmentwoPeopleName" /> -->
-      <el-table-column label="值班分队2指挥员" align="center" prop="detachmentwoPeopleId" :formatter="detachmentwoPeopleIdFormat" />
+      <el-table-column label="值班分队2指挥员" align="center" prop="detachmentwoPeopleName" />
+      <!-- <el-table-column label="值班分队2指挥员" align="center" prop="detachmentwoPeopleId" :formatter="detachmentwoPeopleIdFormat" /> -->
       <!-- <el-table-column label="值班分队2指挥员电话" align="center" prop="detachmentwoPeoplePhone" />
-      <el-table-column label="备注" align="center" prop="remarks" /> -->
+      <el-table-column label="备注" align="center" prop="remarks" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
         <template slot-scope="scope">
           <el-button
@@ -351,11 +360,17 @@
             start-placeholder
             end-placeholder
             value-format="yyyy-MM-dd"
-             v-if="qdflg==1"
+            v-if="qdflg==1"
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="值班首长" prop="chiefDutyName">
-          <el-select v-model="form.chiefDutyName" @change="chiefDutyNamefun" filterable clearable placeholder="请选择值班首长">
+          <el-select
+            v-model="form.chiefDutyName"
+            @change="chiefDutyNamefun"
+            filterable
+            clearable
+            placeholder="请选择值班首长"
+          >
             <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
           </el-select>
         </el-form-item>
@@ -366,7 +381,13 @@
           <el-input v-model="form.chiefDutyPhone" placeholder="请输入值班首长电话" />
         </el-form-item>
         <el-form-item label="作战值班员" prop="combatDutyName">
-          <el-select v-model="form.combatDutyName" @change="combatDutyNamefun" filterable clearable placeholder="请选择作战值班员">
+          <el-select
+            v-model="form.combatDutyName"
+            @change="combatDutyNamefun"
+            filterable
+            clearable
+            placeholder="请选择作战值班员"
+          >
             <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
           </el-select>
         </el-form-item>
@@ -377,7 +398,13 @@
           <el-input v-model="form.combatDutyPhone" placeholder="请输入作战值班员手机号" />
         </el-form-item>
         <el-form-item label="总值班员" prop="dutyOffierName">
-          <el-select v-model="form.dutyOffierName" @change="dutyOffierNamefun" filterable clearable placeholder="请选择作战值班员">
+          <el-select
+            v-model="form.dutyOffierName"
+            @change="dutyOffierNamefun"
+            filterable
+            clearable
+            placeholder="请选择作战值班员"
+          >
             <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
           </el-select>
         </el-form-item>
@@ -540,7 +567,7 @@ export default {
         detachmentwoPeopleId: null,
         detachmentwoPeoplePhone: null,
         remarks: null,
-        type:null,
+        type: null
       },
       // 表单参数
       form: {},
@@ -550,8 +577,7 @@ export default {
       rylist: [],
       //单位数据
       deptOptions: [],
-      qdflg:null,
-
+      qdflg: null
     };
   },
   created() {
@@ -709,7 +735,7 @@ export default {
       this.title = "添加基地值班";
       this.getrylist();
       this.gettreeselect();
-      this.qdflg=1;
+      this.qdflg = 1;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -719,15 +745,13 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改基地值班";
-         this.qdflg=2;
+        this.qdflg = 2;
       });
     },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          this.form. timequjian=this.form.attendedTime;
-          this.form.attendedTime=this.form.attendedTime.join(',');
           if (this.form.id != null) {
             updateBasedutyinfo(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -735,6 +759,8 @@ export default {
               this.getList();
             });
           } else {
+            this.form.timequjian = this.form.attendedTime;
+            this.form.attendedTime = this.form.attendedTime.join(",");
             addBasedutyinfo(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -748,7 +774,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除基地值班编号为"' + ids + '"的数据项？')
+        .confirm("是否确认删除该数据项？")
         .then(function() {
           return delBasedutyinfo(ids);
         })
@@ -774,38 +800,38 @@ export default {
         .catch(() => {});
     },
     //值班分类
-    caoZuoTypefun(){
-       this.getList();
+    caoZuoTypefun() {
+      this.getList();
     },
     //首长电话
-    chiefDutyNamefun(val){
-        this.form.chiefDutyId=val.id;
-        this.form.chiefDutyName=val.name;
-        this.form.chiefDutyPhone=val.phone;
+    chiefDutyNamefun(val) {
+      this.form.chiefDutyId = val.id;
+      this.form.chiefDutyName = val.name;
+      this.form.chiefDutyPhone = val.phone;
     },
     //作战值班电话
-    combatDutyNamefun(val){
-        this.form.combatDutyId=val.id;
-        this.form.combatDutyName=val.name;
-        this.form.combatDutyPhone=val.phone;
+    combatDutyNamefun(val) {
+      this.form.combatDutyId = val.id;
+      this.form.combatDutyName = val.name;
+      this.form.combatDutyPhone = val.phone;
     },
     //总值班员
-    dutyOffierNamefun(val){
-        this.form.dutyOffierId=val.id;
-        this.form.dutyOffierName=val.name;
-        this.form.dutyOffierPhone=val.phone;
+    dutyOffierNamefun(val) {
+      this.form.dutyOffierId = val.id;
+      this.form.dutyOffierName = val.name;
+      this.form.dutyOffierPhone = val.phone;
     },
     //值班分队1指挥员
-    detachmentonePeopleNamefun(val){
-        this.form.detachmentonePeopleId=val.id;
-        this.form.detachmentonePeopleName=val.name;
-        this.form.detachmentonePeoplePhone=val.phone;
+    detachmentonePeopleNamefun(val) {
+      this.form.detachmentonePeopleId = val.id;
+      this.form.detachmentonePeopleName = val.name;
+      this.form.detachmentonePeoplePhone = val.phone;
     },
     //值班分队2指挥员
-    detachmentwoPeopleNamefun(val){
-        this.form.detachmentwoPeopleId=val.id;
-        this.form.detachmentwoPeopleName=val.name;
-        this.form.detachmentwoPeoplePhone=val.phone;
+    detachmentwoPeopleNamefun(val) {
+      this.form.detachmentwoPeopleId = val.id;
+      this.form.detachmentwoPeopleName = val.name;
+      this.form.detachmentwoPeoplePhone = val.phone;
     }
   }
 };
@@ -830,7 +856,13 @@ export default {
   width: 200px;
   height: 36px;
   background: #004d86;
-  color: #fff;
+  color: #fff !important;
+  border: 1px solid #fff !important;
+}
+
+.el-select-dropdown__item {
+  /* background-color: white; */
+  color: #fff !important;
 }
 ::v-deep .el-date-editor.el-input {
   width: 200px;
@@ -1002,6 +1034,7 @@ export default {
 }
 ::v-deep .el-range-separator {
   color: #fff;
+  font-size: 12px;
 }
 </style>
 

src/views/combatduty/grassdutyinfo/index.vue

@@ -5,7 +5,7 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      label-width="auto"
     >
       <!-- <el-form-item label="值班时间" prop="attendedTime">
         <el-date-picker
@@ -26,7 +26,6 @@
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="请选择值班时间"
-          v-if="qdflg==2"
         ></el-date-picker>
       </el-form-item>
       <el-form-item label="值班首长" prop="chiefDutyName">
@@ -240,6 +239,7 @@
       :header-cell-style="{ background: '#003c69', color: 'white' }"
     >
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" type="index" />
       <!-- <el-table-column label="值班岗位" align="center" prop="id" /> -->
       <!-- <el-table-column label="单位名称" align="center" prop="unitName" /> -->
       <el-table-column label="单位" align="center" prop="unitId" :formatter="unitIdFormat" />
@@ -275,7 +275,7 @@
       <el-table-column
         label="值班岗位"
         align="center"
-        prop="dutyGangwei"
+        prop="dutyGangwei" 
         :formatter="dutyGangweiFormat"
       />
       <el-table-column label="值班时间" align="center" prop="attendedTime" width="180">
@@ -359,13 +359,25 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="值班首长" prop="chiefDutyName">
-          <el-input v-model="form.chiefDutyName" placeholder="请输入值班首长" />
-        </el-form-item>-->
-        <el-form-item label="值班首长" prop="chiefDutyId">
+        <el-form-item label="值班首长" prop="chiefDutyName">
+          <!-- <el-input v-model="form.chiefDutyName" placeholder="请输入值班首长" /> -->
+          <el-select
+            v-model="form.chiefDutyName"
+            @change="chiefDutyNamefun"
+            filterable
+            clearable
+            placeholder="请选择值班首长"
+          >
+            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item label="值班首长" prop="chiefDutyId">
           <el-select v-model="form.chiefDutyId" filterable clearable placeholder="请选择值班首长">
             <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>
+        </el-form-item>-->
+        <el-form-item label="值班首长电话" prop="chiefDutyPhone">
+          <el-input v-model="form.chiefDutyPhone" placeholder="请输入值班首长电话" />
         </el-form-item>
         <el-form-item label="值班首长职务" prop="chiefDutyZhiwu">
           <el-select v-model="form.chiefDutyZhiwu" placeholder="请选择值班首长职务">
@@ -383,18 +395,25 @@
         <el-form-item label="宿舍电话" prop="telephoneSs">
           <el-input v-model="form.telephoneSs" placeholder="请输入宿舍电话" />
         </el-form-item>
-        <el-form-item label="值班首长手机" prop="chiefDutyPhone">
-          <el-input v-model="form.chiefDutyPhone" placeholder="请输入值班首长手机" />
-        </el-form-item>
-        <!-- <el-form-item label="值班员" prop="dutyOffierName">
-          <el-select v-model="form.dutyOffierName" placeholder="请选择值班员">
-            <el-option label="请选择字典生成" value="" />
+
+        <el-form-item label="值班员" prop="dutyOffierName">
+          <el-select
+            v-model="form.dutyOffierName"
+            @change="dutyOffierNamefun"
+            filterable
+            clearable
+            placeholder="请选择值班员"
+          >
+            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
           </el-select>
-        </el-form-item>-->
-        <el-form-item label="值班员" prop="dutyOffierId">
+        </el-form-item>
+        <!-- <el-form-item label="值班员" prop="dutyOffierId">
           <el-select v-model="form.dutyOffierId" filterable clearable placeholder="请选择值班员">
             <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>
+        </el-form-item>-->
+        <el-form-item label="值班员电话" prop="dutyOffierPhone">
+          <el-input v-model="form.dutyOffierPhone" placeholder="请输入值班员电话" />
         </el-form-item>
         <el-form-item label="值班员职务" prop="dutyOffierZw">
           <el-select v-model="form.dutyOffierZw" placeholder="请选择值班员职务">
@@ -406,14 +425,11 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="值班员手机" prop="dutyOffierPhone">
-          <el-input v-model="form.dutyOffierPhone" placeholder="请输入值班员手机" />
-        </el-form-item>
         <el-form-item label="值班电话" prop="dutyPhone">
           <el-input v-model="form.dutyPhone" placeholder="请输入值班电话" />
         </el-form-item>
         <el-form-item label="值班岗位" prop="dutyGangwei">
-          <el-select v-model="form.dutyGangwei" ref="deptId" clearable placeholder="请选择值班岗位">
+          <el-select v-model="form.dutyGangwei"  clearable placeholder="请选择值班岗位">
             <el-option
               v-for="dict in deptOptions"
               :key="dict.deptId"
@@ -517,7 +533,6 @@ export default {
     },
     gettreeselect() {
       getDept().then(res => {
-        console.log(res);
         if (res.code == 200) {
           this.deptOptions = res.data;
         }
@@ -556,10 +571,11 @@ export default {
     dutyGangweiFormat(row, column) {
       var deptName = "";
       this.deptOptions.map(item => {
-        if (item.deptId == row.dutyGangwei) {
+        if (item.deptId == Number(row.dutyGangwei)) {
           deptName = item.deptName;
         }
       });
+       return deptName;
     },
     /** 查询基层值班列表 */
     getList() {
@@ -626,6 +642,7 @@ export default {
       const id = row.id || this.ids;
       getGrassdutyinfo(id).then(response => {
         this.form = response.data;
+        this.form.dutyGangwei=Number(this.form.dutyGangwei)
         this.open = true;
         this.title = "修改基层值班";
         this.qdflg = 2;
@@ -635,8 +652,6 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          this.form.timequjian = this.form.attendedTime;
-          this.form.attendedTime = this.form.attendedTime.join(",");
           if (this.form.id != null) {
             updateGrassdutyinfo(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -644,6 +659,8 @@ export default {
               this.getList();
             });
           } else {
+            this.form.timequjian = this.form.attendedTime;
+            this.form.attendedTime = this.form.attendedTime.join(",");
             addGrassdutyinfo(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -657,7 +674,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除基层值班编号为"' + ids + '"的数据项？')
+        .confirm("是否确认删除该数据项？")
         .then(function() {
           return delGrassdutyinfo(ids);
         })
@@ -685,6 +702,18 @@ export default {
     //值班分类
     caoZuoTypefun() {
       this.getList();
+    },
+    //首长电话
+    chiefDutyNamefun(val) {
+      this.form.chiefDutyId = val.id;
+      this.form.chiefDutyName = val.name;
+      this.form.chiefDutyPhone = val.phone;
+    },
+    //总值班员
+    dutyOffierNamefun(val) {
+      this.form.dutyOffierId = val.id;
+      this.form.dutyOffierName = val.name;
+      this.form.dutyOffierPhone = val.phone;
     }
   }
 };
@@ -760,15 +789,21 @@ export default {
 }
 ::v-deep .el-range-separator {
   color: #fff;
+  font-size: 12px;
 }
 .el-form-item ::v-deep .el-input__inner {
   width: 200px;
   height: 36px;
   background: #004d86;
   color: #fff;
+  border: 1px solid #fff !important;
 }
 ::v-deep .el-date-editor.el-input {
   width: 200px;
   height: 36px;
 }
+.el-select-dropdown__item {
+  /* background-color: white; */
+  color: #fff !important;
+}
 </style>

src/views/combatduty/militarydutyinfo/index.vue

@@ -5,7 +5,7 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      label-width="auto"
     >
       <el-form-item label="值班时间" prop="attendedTime">
         <el-date-picker
@@ -136,7 +136,7 @@
           v-hasPermi="['combatduty:militarydutyinfo:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -146,7 +146,7 @@
           @click="handleExport"
           v-hasPermi="['combatduty:militarydutyinfo:export']"
         >导出</el-button>
-      </el-col>
+      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -157,16 +157,17 @@
       :header-cell-style="{ background: '#003C69', color: 'white' }"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" />
+      <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
+      <el-table-column label="序号" align="center" type="index" />
       <el-table-column label="值班时间" align="center" prop="attendedTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.attendedTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="号码号牌ID" align="center" prop="numberPlateId" />
+      <!-- <el-table-column label="号码号牌ID" align="center" prop="numberPlateId" /> -->
       <el-table-column label="号码号牌" align="center" prop="numberPlateName" />
-      <el-table-column label="车属单位ID" align="center" prop="carUnitId" />
-      <el-table-column label="车属单位名称" align="center" prop="carUnitName" />
+      <el-table-column label="车属单位" align="center" prop="carUnitId" :formatter="carUnitIdFormat" />
+      <!-- <el-table-column label="车属单位名称" align="center" prop="carUnitName" /> -->
       <el-table-column label="车辆类别" align="center" prop="carType" />
       <el-table-column label="车辆状态" align="center" prop="carStates">
         <template slot-scope="scope">
@@ -174,7 +175,7 @@
         </template>
       </el-table-column>
       <el-table-column label="所在位置" align="center" prop="adress" />
-      <el-table-column label="司机id" align="center" prop="driverId" />
+      <!-- <el-table-column label="司机id" align="center" prop="driverId" /> -->
       <el-table-column label="司机名字" align="center" prop="driverName" />
       <el-table-column label="联系方式" align="center" prop="telephone" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
@@ -248,9 +249,9 @@
           <el-select v-model="form.numberPlateName" placeholder="请选择号码号牌">
             <el-option
               v-for="dict in buslist"
-              :key="dict.deptId"
-              :label="dict.deptName"
-              :value="dict.deptId"
+              :key="dict.id"
+              :label="dict.vehiclenumber"
+              :value="dict.vehiclenumber"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -289,7 +290,13 @@
           <el-input v-model="form.driverId" placeholder="请输入司机id" />
         </el-form-item>-->
         <el-form-item label="司机名字" prop="driverName">
-          <el-select v-model="form.driverName" @change="driverNamefun" filterable clearable placeholder="请选择司机名字">
+          <el-select
+            v-model="form.driverName"
+            @change="driverNamefun"
+            filterable
+            clearable
+            placeholder="请选择司机名字"
+          >
             <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
           </el-select>
         </el-form-item>
@@ -370,7 +377,7 @@ export default {
       deptOptions: [],
       qdflg: null,
       //车牌号
-      buslist:[],
+      buslist: []
     };
   },
   created() {
@@ -380,6 +387,16 @@ export default {
     this.getthebusfun();
   },
   methods: {
+    //岗位
+    carUnitIdFormat(row, column) {
+      var deptName = "";
+      this.deptOptions.map(item => {
+        if (item.deptId == row.carUnitId) {
+          deptName = item.deptName;
+        }
+      });
+       return deptName;
+    },
     //获取人员
     getrylist() {
       listPeople().then(res => {
@@ -395,12 +412,12 @@ export default {
         }
       });
     },
-    getthebusfun(){
-       getthebus().then(res=>{
-          if(res.code==200){
-             this.buslist=res.data;
-          }
-       })
+    getthebusfun() {
+      getthebus().then(res => {
+        if (res.code == 200) {
+          this.buslist = res.rows;
+        }
+      });
     },
     /** 查询军车值班列表 */
     getList() {
@@ -472,8 +489,6 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          this.form.timequjian = this.form.attendedTime;
-          this.form.attendedTime = this.form.attendedTime.join(",");
           if (this.form.id != null) {
             updateMilitarydutyinfo(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -481,6 +496,8 @@ export default {
               this.getList();
             });
           } else {
+            this.form.timequjian = this.form.attendedTime;
+            this.form.attendedTime = this.form.attendedTime.join(",");
             addMilitarydutyinfo(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -494,7 +511,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除军车值班编号为"' + ids + '"的数据项？')
+        .confirm("是否确认删除该数据项？")
         .then(function() {
           return delMilitarydutyinfo(ids);
         })
@@ -520,10 +537,11 @@ export default {
         .catch(() => {});
     },
     //司机联系方式
-    driverNamefun(val){
+    driverNamefun(val) {
       //  console.log(val)
-       this.form.telephone=val.phone;
-       this.form.driverId=val.id;
+      this.form.driverName = val.name;
+      this.form.telephone = val.phone;
+      this.form.driverId = val.id;
     }
   }
 };
@@ -603,7 +621,18 @@ export default {
   height: 36px;
   line-height: 36px;
 }
-
+/* 计数器按钮 */
+::v-deep .el-input-number__increase {
+  background-color: transparent !important;
+  border: none;
+  color: #cccccc;
+  border-bottom: none !important;
+}
+::v-deep .el-input-number__decrease {
+  background-color: transparent !important;
+  border: none !important;
+  color: #cccccc;
+}
 .el-radio-group {
   width: 216px;
 }
@@ -614,15 +643,21 @@ export default {
 }
 ::v-deep .el-range-separator {
   color: #fff;
+  font-size: 12px;
 }
 .el-form-item ::v-deep .el-input__inner {
   width: 200px;
   height: 36px;
   background: #004d86;
   color: #fff important;
+  border: 1px solid #fff !important;
 }
 ::v-deep .el-date-editor.el-input {
   width: 200px;
   height: 36px;
 }
+.el-select-dropdown__item {
+  /* background-color: white; */
+  color: #fff !important;
+}
 </style>

src/views/combatduty/regisdutyinfo/index.vue

@@ -147,7 +147,7 @@
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -158,7 +158,7 @@
           v-hasPermi="['combatduty:regisdutyinfo:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -172,11 +172,12 @@
       :header-cell-style="{ background: '#003C69', color: 'white' }"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" />
+      <el-table-column label="序号" align="center" type="index" />
+      <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
       <el-table-column label="单位名称" align="center" prop="unitName" />
-      <el-table-column label="单位ID" align="center" prop="unitId" />
+      <!-- <el-table-column label="单位ID" align="center" prop="unitId" /> -->
       <el-table-column label="装备名称" align="center" prop="equipmentName" />
-      <el-table-column label="装备ID" align="center" prop="equipmentId" />
+      <!-- <el-table-column label="装备ID" align="center" prop="equipmentId" /> -->
       <el-table-column label="装备数量" align="center" prop="equipmentNumber" />
       <el-table-column label="类型" align="center" prop="type">
         <template slot-scope="scope">
@@ -202,7 +203,7 @@
           <span>{{ parseTime(scope.row.attendedTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="装备情况" align="center" prop="remarks" />
+      <el-table-column label="装备情况" show-overflow-tooltip align="center" prop="remarks" />
       <el-table-column
         label="操作"
         align="center"
@@ -252,8 +253,13 @@
       >
       <div class="jiben">基本信息</div>
         <el-form-item label="单位名称" prop="unitName">
-          <el-select v-model="form.unitName" placeholder="请选择单位名称">
-            <el-option label="请选择字典生成" value="" />
+          <el-select v-model="form.unitName" ref="deptId" clearable placeholder="请选择单位名称">
+            <el-option
+              v-for="dict in deptOptions"
+              :key="dict.deptId"
+              :label="dict.deptName"
+              :value="dict.deptId"
+            ></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="单位ID" prop="unitId">
@@ -336,6 +342,7 @@ import {
   addRegisdutyinfo,
   updateRegisdutyinfo,
   exportRegisdutyinfo,
+  getDept
 } from "@/api/combatduty/regisdutyinfo";
 
 export default {
@@ -382,12 +389,23 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+      //单位数据
+      deptOptions: [],
     };
   },
   created() {
     this.getList();
+    this.gettreeselect();
   },
   methods: {
+    gettreeselect() {
+      getDept().then(res => {
+        console.log(res);
+        if (res.code == 200) {
+          this.deptOptions = res.data;
+        }
+      });
+    },
     /** 查询装备登记列表 */
     getList() {
       this.loading = true;
@@ -475,7 +493,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除装备登记编号为"' + ids + '"的数据项？')
+        .confirm('是否确认删除该数据项？')
         .then(function () {
           return delRegisdutyinfo(ids);
         })
@@ -593,4 +611,15 @@ export default {
 .el-radio-group{
   width: 216px;
 }
+.el-select-dropdown__item{
+  /* background-color: white; */
+  color: #fff !important;
+}
+.el-form-item ::v-deep .el-input__inner {
+  width: 200px;
+  height: 36px;
+  background: #004d86;
+  color: #fff important;
+  border: 1px solid #fff !important;
+}
 </style>

src/views/combatduty/taskdutyinfo/index.vue

@@ -5,13 +5,23 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      label-width="auto"
     >
       <el-form-item label="单位" prop="unitName">
+        <el-select v-model="queryParams.unitName" clearable placeholder="请选择单位">
+          <el-option
+            v-for="dict in deptOptions"
+            :key="dict.deptId"
+            :label="dict.deptName"
+            :value="dict.deptId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item label="单位" prop="unitName">
         <el-select v-model="queryParams.unitName" placeholder="请选择单位" clearable size="small">
           <el-option label="请选择字典生成" value />
         </el-select>
-      </el-form-item>
+      </el-form-item>-->
       <!-- <el-form-item label="部门ID" prop="unitId">
         <el-input
           v-model="queryParams.unitId"
@@ -22,10 +32,21 @@
         />
       </el-form-item>-->
       <el-form-item label="指挥员" prop="commanderName">
+        <el-select
+          v-model="queryParams.commanderName"
+          @change="driverNamefun"
+          filterable
+          clearable
+          placeholder="请选择指挥员"
+        >
+          <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item label="指挥员" prop="commanderName">
         <el-select v-model="queryParams.commanderName" placeholder="请选择指挥员" clearable size="small">
           <el-option label="请选择字典生成" value />
         </el-select>
-      </el-form-item>
+      </el-form-item>-->
       <!--   <el-form-item label="指挥员ID" prop="commanderId">
         <el-input
           v-model="queryParams.commanderId"
@@ -117,7 +138,7 @@
           v-hasPermi="['combatduty:taskdutyinfo:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -127,7 +148,7 @@
           @click="handleExport"
           v-hasPermi="['combatduty:taskdutyinfo:export']"
         >导出</el-button>
-      </el-col>
+      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -138,14 +159,16 @@
       :header-cell-style="{ background: '#003C69', color: 'white' }"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" />
-      <el-table-column label="单位" align="center" prop="unitName" />
-      <el-table-column label="部门ID" align="center" prop="unitId" />
+      <el-table-column label="序号" align="center" type="index" />
+      <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
+      <el-table-column label="单位" align="center" prop="unitName" :formatter="unitNameFormat" />
+      <!-- <el-table-column label="部门ID" align="center" prop="unitId" /> -->
       <el-table-column label="指挥员" align="center" prop="commanderName" />
-      <el-table-column label="指挥员ID" align="center" prop="commanderId" />
+      <!-- <el-table-column label="指挥员ID" align="center" prop="commanderId" /> -->
       <el-table-column label="指挥员电话" align="center" prop="commanderPhone" />
-      <el-table-column label="参加人员" align="center" prop="participantsName" />
-      <el-table-column label="参加人员ID" align="center" prop="participantsId" />
+      <!-- <el-table-column label="参加人员" align="center" prop="participantsName" /> -->
+      <!-- <el-table-column label="参加人员ID" align="center" prop="participantsId" /> -->
+      <el-table-column label="参加人员" align="center" prop="participantsIds" :formatter="unit2Format" />
       <el-table-column label="开始时间" align="center" prop="startTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
@@ -190,7 +213,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
         <div class="jiben">基本信息</div>
         <el-form-item label="单位" prop="unitName">
-          <el-select v-model="form.unitName"  clearable placeholder="请选择单位">
+          <el-select v-model="form.unitName" clearable placeholder="请选择单位">
             <el-option
               v-for="dict in deptOptions"
               :key="dict.deptId"
@@ -203,7 +226,13 @@
           <el-input v-model="form.unitId" placeholder="请输入部门ID" />
         </el-form-item>-->
         <el-form-item label="指挥员" prop="commanderName">
-          <el-select v-model="form.commanderName" @change="driverNamefun" filterable clearable placeholder="请选择指挥员">
+          <el-select
+            v-model="form.commanderName"
+            @change="driverNamefun"
+            filterable
+            clearable
+            placeholder="请选择指挥员"
+          >
             <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
           </el-select>
         </el-form-item>
@@ -211,13 +240,29 @@
           <el-select v-model="form.commanderId" @change="driverNamefun" filterable clearable placeholder="请选择指挥员">
             <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
           </el-select>
-        </el-form-item> -->
+        </el-form-item>-->
         <el-form-item label="指挥员电话" prop="commanderPhone">
           <el-input v-model="form.commanderPhone" placeholder="请输入指挥员电话" />
         </el-form-item>
-
-        <el-form-item label="参加人员" prop="participantsId">
-          <el-select v-model="form.participantsId" @change="driverNamefun" multiple filterable clearable placeholder="请选择参加人员">
+        <!-- <el-form-item label="参加人员">
+          <el-select
+            v-model="form.participantsId"
+            multiple
+            filterable
+            clearable
+            placeholder="请选择参加人员"
+          >
+            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>-->
+        <el-form-item label="参加人员" prop="participantsIds">
+          <el-select
+            v-model="form.participantsIds"
+            multiple
+            filterable
+            clearable
+            placeholder="请选择参加人员"
+          >
             <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>
         </el-form-item>
@@ -244,11 +289,6 @@
         <el-form-item label="所在位置" prop="adress">
           <el-input v-model="form.adress" placeholder="请输入所在位置" />
         </el-form-item>
-        <!-- <el-form-item label="参加人员">
-          <el-checkbox-group v-model="form.participantsName">
-            <el-checkbox>请选择字典生成</el-checkbox>
-          </el-checkbox-group>
-        </el-form-item> -->
         <div class="jiben">事由</div>
         <el-form-item label prop="question">
           <el-input v-model="form.question" type="textarea" placeholder="请输入内容" />
@@ -314,6 +354,7 @@ export default {
         commanderPhone: null,
         participantsName: null,
         participantsId: null,
+        participantsIds: null,
         startTime: null,
         endTime: null,
         adress: null,
@@ -353,6 +394,28 @@ export default {
         }
       });
     },
+    //单位翻译
+    unitNameFormat(row, column) {
+      var deptName = "";
+      this.deptOptions.map(item => {
+        if (item.deptId == row.unitName) {
+          deptName = item.deptName;
+        }
+      });
+      return deptName;
+    },
+    unit2Format(row, column) {
+      var deptName = "";
+      this.rylist.map(item => {
+        row.participantsIds.forEach((items, index) => {
+          if (item.id == items) {
+            deptName += item.name + "  ";
+          }
+        });
+      });
+
+      return deptName;
+    },
     /** 查询执行任务列表 */
     getList() {
       this.loading = true;
@@ -378,6 +441,7 @@ export default {
         commanderPhone: null,
         participantsName: [],
         participantsId: null,
+        participantsIds: null,
         startTime: null,
         endTime: null,
         adress: null,
@@ -444,7 +508,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除执行任务编号为"' + ids + '"的数据项？')
+        .confirm("是否确认删除该数据项？")
         .then(function() {
           return delTaskdutyinfo(ids);
         })
@@ -470,10 +534,11 @@ export default {
         .catch(() => {});
     },
     //联系方式
-    driverNamefun(val){
+    driverNamefun(val) {
       //  console.log(val)
-       this.form.commanderPhone=val.phone;
-       this.form.commanderId=val.id;
+      this.form.commanderName = val.name;
+      this.form.commanderPhone = val.phone;
+      this.form.commanderId = val.id;
     }
   }
 };
@@ -572,4 +637,15 @@ export default {
 .el-checkbox__label {
   color: rgb(204, 198, 198);
 }
+.el-select-dropdown__item {
+  /* background-color: white; */
+  color: #fff !important;
+}
+.el-form-item ::v-deep .el-input__inner {
+  width: 200px;
+  height: 36px;
+  background: #004d86;
+  color: #fff important;
+  border: 1px solid #fff !important;
+}
 </style>