晓荣通知公告，要事日记时间

src/components/look_word/bdgldiary.vue

@@ -130,7 +130,9 @@
             {{ 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: 'fangsong'">
+             {{ message.orgcadre + message.orgsoldier}}
+          </td>
           <td width="68" class="JR_left" style="font-family: 'songti'">干部</td>
           <td width="68" class="JR_left" style="font-family: 'fangsong'">
             {{ message.nowcadre }}
@@ -140,7 +142,9 @@
             {{ 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" style="font-family: 'fangsong'">
+            {{ message.nowcadre + message.nowsoldier}}
+          </td>
         </tr>
         <!-- 训练、教育或者执行其他任务情况 -->
         <tr class="JR_tr" height="20" align="center">

src/views/combatduty/Quantitative/index.vue

@@ -37,20 +37,20 @@
             <div class="wrap-top-left-top-item">
               <div class="wrap-top-left-top-item-left">一分队指挥员</div>
               <div class="wrap-top-left-top-item-right">
-                {{ this.BaseOnDuty.detachmentonePeopleName }}
+                {{ this.BaseOnDuty.detachmentonePeopleName}}
               </div>
             </div>
             <div class="wrap-top-left-top-item">
               <div class="wrap-top-left-top-item-left zuozhan">
                 一 分 队 人 数
               </div>
-              <div class="wrap-top-left-top-item-right">
-                {{ this.BaseOnDuty.detachmentoneNumber }}
+              <div class="wrap-top-left-top-item-right2">
+                {{ this.BaseOnDuty.detachmentoneNumber }}人
               </div>
             </div>
           </div>
           <div style="width: 100%; display: flex">
-            <div class="wrap-top-left-top-item">
+             <div class="wrap-top-left-top-item">
               <div class="wrap-top-left-top-item-left">值 班 分 队 二</div>
               <div class="wrap-top-left-top-item-right">
                 {{ this.BaseOnDuty.detachmentwoName }}
@@ -62,95 +62,89 @@
                 {{ this.BaseOnDuty.detachmentwoPeopleName }}
               </div>
             </div>
-
+           
             <div class="wrap-top-left-top-item">
               <div class="wrap-top-left-top-item-left zuozhan">
                 二 分 队 人 数
               </div>
-              <div class="wrap-top-left-top-item-right">
-                {{ this.BaseOnDuty.detachmentwoNumber }}
+              <div class="wrap-top-left-top-item-right2">
+                {{ this.BaseOnDuty.detachmentwoNumber }}人
               </div>
             </div>
           </div>
         </div>
       </div>
-      <div class="wrap-top-left-top" style="margin-left: 10px">
+      <div class="wrap-top-left-top" style="margin-left:10px;">
         <div class="wrap-top-left-top-head"><b>大队值班</b></div>
         <div style="width: 100%; display: flex">
-          <div class="wrap-top-left-top-item">
-            <div class="wrap-top-left-top-item-left">值 班 首 长</div>
-            <div class="wrap-top-left-top-item-right">
-              {{ this.GreatDuty1.chiefDutyName }}
-            </div>
-          </div>
-          <div class="wrap-top-left-top-item">
-            <div class="wrap-top-left-top-item-left">机 要 值 班 员</div>
-            <div class="wrap-top-left-top-item-right" style="margin-left: 22px">
-              {{ this.GreatDuty1.confidentialName }}
-            </div>
-          </div>
-          <div class="wrap-top-left-top-item">
-            <div class="wrap-top-left-top-item-left zuozhan">
-              作 战 值 班 员
-            </div>
-            <div class="wrap-top-left-top-item-right">
-              {{ this.GreatDuty1.combatDutyName }}
-            </div>
-          </div>
-        </div>
-        <div style="width: 100%; display: flex">
-          <div class="wrap-top-left-top-item">
-            <div class="wrap-top-left-top-item-left">通 信 值 班 员</div>
-            <div class="wrap-top-left-top-item-right">
-              {{ this.GreatDuty1.dutyOffierName }}
+            <div class="wrap-top-left-top-item">
+              <div class="wrap-top-left-top-item-left">值 班 首 长</div>
+              <div class="wrap-top-left-top-item-right">
+                {{ this.GreatDuty1.chiefDutyName }}
+              </div>
             </div>
-          </div>
-          <div class="wrap-top-left-top-item">
-            <div class="wrap-top-left-top-item-left" style="width: 120px">
-              政治工作部值班员
+            <div class="wrap-top-left-top-item">
+              <div class="wrap-top-left-top-item-left">机 要 值 班 员</div>
+              <div class="wrap-top-left-top-item-right" style="margin-left:22px">
+                {{ this.GreatDuty1.confidentialName }}
+              </div>
             </div>
-            <div class="wrap-top-left-top-item-right">
-              {{ this.GreatDuty1.politicalName }}
+            <div class="wrap-top-left-top-item">
+              <div class="wrap-top-left-top-item-left zuozhan">
+                作 战 值 班 员
+              </div>
+              <div class="wrap-top-left-top-item-right">
+                {{ this.GreatDuty1.combatDutyName }}
+              </div>
             </div>
           </div>
-          <div class="wrap-top-left-top-item">
-            <div class="wrap-top-left-top-item-left zuozhan">
-              <!-- 值&nbsp;&nbsp;&nbsp;&nbsp; 班&nbsp;&nbsp;&nbsp;&nbsp; 分&nbsp;&nbsp;&nbsp;&nbsp; 队 -->
-              <span style="margin-right: 10px">值</span
-              ><span style="margin-right: 10px">班</span
-              ><span style="margin-right: 10px">分</span><span>队</span>
+          <div style="width: 100%; display: flex">
+            <div class="wrap-top-left-top-item">
+              <div class="wrap-top-left-top-item-left">通 信 值 班 员</div>
+              <div class="wrap-top-left-top-item-right">
+                {{ this.GreatDuty1.dutyOffierName}}
+              </div>
             </div>
-            <div class="wrap-top-left-top-item-right">
-              {{ this.GreatDuty1.detachmentName }}
+            <div class="wrap-top-left-top-item">
+              <div class="wrap-top-left-top-item-left" style="width:120px">政治工作部值班员</div>
+              <div class="wrap-top-left-top-item-right">
+                {{ this.GreatDuty1.politicalName }}
+              </div>
             </div>
-          </div>
-        </div>
-        <div style="width: 100%; display: flex">
-          <div class="wrap-top-left-top-item">
-            <div class="wrap-top-left-top-item-left">通 信 值 班 员</div>
-            <div class="wrap-top-left-top-item-right">
-              {{ this.GreatDuty1.dutyOffierName }}
+            <div class="wrap-top-left-top-item">
+              <div class="wrap-top-left-top-item-left zuozhan">
+                <!-- 值&nbsp;&nbsp;&nbsp;&nbsp; 班&nbsp;&nbsp;&nbsp;&nbsp; 分&nbsp;&nbsp;&nbsp;&nbsp; 队 -->
+                <span style="margin-right:10px">值</span><span style="margin-right:10px">班</span><span style="margin-right:10px">分</span><span>队</span>
+              </div>
+              <div class="wrap-top-left-top-item-right">
+                {{ this.GreatDuty1.detachmentName }}
+              </div>
             </div>
           </div>
-          <div class="wrap-top-left-top-item">
-            <div class="wrap-top-left-top-item-left" style="width: 110px">
-              保 障 部 值 班 员
-            </div>
-            <div class="wrap-top-left-top-item-right">
-              {{ this.GreatDuty1.guaranteeName }}
+          <div style="width: 100%; display: flex">
+            <div class="wrap-top-left-top-item">
+              <div class="wrap-top-left-top-item-left">通 信 值 班 员</div>
+              <div class="wrap-top-left-top-item-right">
+                {{ this.GreatDuty1.dutyOffierName }}
+              </div>
             </div>
-          </div>
-          <div class="wrap-top-left-top-item">
-            <div class="wrap-top-left-top-item-left1">
-              <span>指</span>
-              <span>挥</span>
-              <span>员</span>
+            <div class="wrap-top-left-top-item">
+              <div class="wrap-top-left-top-item-left" style="width:110px">保 障 部 值 班 员</div>
+              <div class="wrap-top-left-top-item-right">
+                {{ this.GreatDuty1.guaranteeName }}
+              </div>
             </div>
-            <div class="wrap-top-left-top-item-right" style="margin-left: 15px">
-              {{ this.GreatDuty1.detachmentPeopleName }}
+            <div class="wrap-top-left-top-item">
+              <div class="wrap-top-left-top-item-left1">
+               <span>指</span>
+               <span>挥</span>
+               <span>员</span>
+              </div>
+              <div class="wrap-top-left-top-item-right" style="margin-left:15px">
+                {{ this.GreatDuty1.detachmentPeopleName }}
+              </div>
             </div>
           </div>
-        </div>
         <!-- <div class="wrap-top-left-top-item">
           <div class="wrap-top-left-top-item-left">值 班 首 长</div>
           <div class="wrap-top-left-top-item-right" style="padding-left: 25px">
@@ -217,23 +211,21 @@
         <div class="wrap-top-left-top-head"><b>执行任务人员情况</b></div>
         <table width="95%" style="table-layout: fixed">
           <tr>
-            <th style="width: 100px; font-weight: 500" height="40">单位</th>
-            <th style="width: 100px; font-weight: 500">指挥员</th>
-            <th style="width: 120px; font-weight: 500">事由</th>
-            <th style="width: 100px; font-weight: 500">所在位置</th>
-            <th style="width: 100px; font-weight: 500">开始时间</th>
-            <th style="width: 110px; font-weight: 500">结束时间</th>
+            <th style="width:100px;font-weight:500" height="40">单位</th>
+            <th style="width:100px;font-weight:500">指挥员</th>
+            <th style="width:120px;font-weight:500">事由</th>
+            <th style="width:100px;font-weight:500">所在位置</th>
+            <th style="width:100px;font-weight:500">开始时间</th>
+            <th style="width:110px;font-weight:500">结束时间</th>
           </tr>
 
           <tr v-for="item in performanceTask" :key="item.id">
-            <td style="color: #ccc" height="28">{{ item.unitName }}</td>
-            <td style="color: #ccc">{{ item.commanderName }}</td>
-            <td style="color: #ccc" class="shiyou" :title="item.question">
-              {{ item.question }}
-            </td>
-            <td style="color: #ccc">{{ item.adress }}</td>
-            <td style="color: #ccc">{{ item.startTime }}</td>
-            <td style="color: #ccc">{{ item.endTime }}</td>
+            <td style="color:#ccc"  height="28">{{item.unitName}}</td>
+            <td style="color:#ccc" >{{ item.commanderName }}</td>
+            <td style="color:#ccc" class="shiyou" :title="item.question"  >{{item.question }}</td>
+            <td style="color:#ccc" >{{ item.adress }}</td>
+            <td style="color:#ccc" >{{ item.startTime }}</td>
+            <td style="color:#ccc" >{{ item.endTime }}</td>
           </tr>
         </table>
       </div>
@@ -246,9 +238,7 @@
             </div>
             <div class="wrap-top-center-item-right">
               <div class="wrap-top-center-item-right-top">编纳总人数</div>
-              <div class="wrap-top-center-item-right-bottom">
-                {{ this.peopleQK.zaibianzongshu }}
-              </div>
+              <div class="wrap-top-center-item-right-bottom">{{this.peopleQK.zaibianzongshu}}</div>
             </div>
           </div>
           <div class="wrap-top-center-item">
@@ -257,9 +247,7 @@
             </div>
             <div class="wrap-top-center-item-right">
               <div class="wrap-top-center-item-right-top">编纳在位</div>
-              <div class="wrap-top-center-item-right-bottom">
-                {{ this.peopleQK.zaibianzaiwei }}
-              </div>
+              <div class="wrap-top-center-item-right-bottom">{{this.peopleQK.zaibianzaiwei}}</div>
             </div>
           </div>
           <div class="wrap-top-center-item">
@@ -270,19 +258,9 @@
                 alt=""
               />
             </div>
-            <div class="wrap-top-center-item-right">
-              <div
-                class="wrap-top-center-item-right-top"
-                style="margin-top: -40px; margin-left: 10px"
-              >
-                编纳休假
-              </div>
-              <div
-                class="wrap-top-center-item-right-bottom"
-                style="margin-left: 30px"
-              >
-                {{ this.peopleQK.zaibianxiujia }}
-              </div>
+           <div class="wrap-top-center-item-right">
+              <div class="wrap-top-center-item-right-top" style="margin-top:-40px;margin-left:10px">编纳休假</div>
+              <div class="wrap-top-center-item-right-bottom" style="margin-left:30px">{{this.peopleQK.zaibianxiujia}}</div>
             </div>
           </div>
           <div class="wrap-top-center-item">
@@ -291,9 +269,7 @@
             </div>
             <div class="wrap-top-center-item-right">
               <div class="wrap-top-center-item-right-top">编纳出差</div>
-              <div class="wrap-top-center-item-right-bottom">
-                {{ this.peopleQK.zaibianchuchai }}
-              </div>
+              <div class="wrap-top-center-item-right-bottom">{{this.peopleQK.zaibianchuchai}}</div>
             </div>
           </div>
           <div class="wrap-top-center-item">
@@ -302,9 +278,7 @@
             </div>
             <div class="wrap-top-center-item-right">
               <div class="wrap-top-center-item-right-top">编纳学习</div>
-              <div class="wrap-top-center-item-right-bottom">
-                {{ this.peopleQK.zaibianxuexi }}
-              </div>
+              <div class="wrap-top-center-item-right-bottom">{{this.peopleQK.zaibianxuexi}}</div>
             </div>
           </div>
           <div class="wrap-top-center-item">
@@ -313,9 +287,7 @@
             </div>
             <div class="wrap-top-center-item-right">
               <div class="wrap-top-center-item-right-top">编纳外诊</div>
-              <div class="wrap-top-center-item-right-bottom">
-                {{ this.peopleQK.zaibianwaizhen }}
-              </div>
+              <div class="wrap-top-center-item-right-bottom">{{this.peopleQK.zaibianwaizhen}}</div>
             </div>
           </div>
           <div class="wrap-top-center-item">
@@ -324,9 +296,7 @@
             </div>
             <div class="wrap-top-center-item-right">
               <div class="wrap-top-center-item-right-top">未编纳总人数</div>
-              <div class="wrap-top-center-item-right-bottom">
-                {{ this.peopleQK.weizaibianzongrenshu }}
-              </div>
+              <div class="wrap-top-center-item-right-bottom">{{this.peopleQK.weizaibianzongrenshu }}</div>
             </div>
           </div>
           <div class="wrap-top-center-item">
@@ -335,32 +305,20 @@
             </div>
             <div class="wrap-top-center-item-right">
               <div class="wrap-top-center-item-right-top">未编纳在位</div>
-              <div class="wrap-top-center-item-right-bottom">
-                {{ this.peopleQK.weizaibianzaiwei }}
-              </div>
+              <div class="wrap-top-center-item-right-bottom">{{this.peopleQK.weizaibianzaiwei }}</div>
             </div>
           </div>
           <div class="wrap-top-center-item">
-            <div class="wrap-top-center-item-left1">
+             <div class="wrap-top-center-item-left1">
               <img
                 style="width: 44px; height: 22px"
                 src="../../../images/Quantitative/休假.png"
                 alt=""
               />
             </div>
-            <div class="wrap-top-center-item-right">
-              <div
-                class="wrap-top-center-item-right-top"
-                style="margin-top: -40px; margin-left: 15px"
-              >
-                未编纳休假
-              </div>
-              <div
-                class="wrap-top-center-item-right-bottom"
-                style="margin-left: 30px"
-              >
-                {{ this.peopleQK.weizaibianxiujia }}
-              </div>
+           <div class="wrap-top-center-item-right">
+              <div class="wrap-top-center-item-right-top" style="margin-top:-40px;margin-left:15px">未编纳休假</div>
+              <div class="wrap-top-center-item-right-bottom" style="margin-left:30px">{{this.peopleQK.weizaibianxiujia}}</div>
             </div>
           </div>
           <div class="wrap-top-center-item">
@@ -369,9 +327,7 @@
             </div>
             <div class="wrap-top-center-item-right">
               <div class="wrap-top-center-item-right-top">未编纳出差</div>
-              <div class="wrap-top-center-item-right-bottom">
-                {{ this.peopleQK.weizaibianchuchai }}
-              </div>
+              <div class="wrap-top-center-item-right-bottom">{{this.peopleQK.weizaibianchuchai}}</div>
             </div>
           </div>
           <div class="wrap-top-center-item">
@@ -380,9 +336,7 @@
             </div>
             <div class="wrap-top-center-item-right">
               <div class="wrap-top-center-item-right-top">未编纳学习</div>
-              <div class="wrap-top-center-item-right-bottom">
-                {{ this.peopleQK.weizaibianxuexi }}
-              </div>
+              <div class="wrap-top-center-item-right-bottom">{{this.peopleQK.weizaibianxuexi  }}</div>
             </div>
           </div>
           <div class="wrap-top-center-item">
@@ -391,9 +345,7 @@
             </div>
             <div class="wrap-top-center-item-right">
               <div class="wrap-top-center-item-right-top">未编纳外诊</div>
-              <div class="wrap-top-center-item-right-bottom">
-                {{ this.peopleQK.weizaibianwaizhen }}
-              </div>
+              <div class="wrap-top-center-item-right-bottom">{{this.peopleQK.weizaibianwaizhen}}</div>
             </div>
           </div>
         </div>
@@ -403,30 +355,26 @@
             <div class="wrap-top-left-top-head"><b>军车值班</b></div>
             <table width="95%" style="table-layout: fixed">
               <tr>
-                <th style="font-weight: 500" height="40">序号</th>
-                <th style="font-weight: 500">车牌号码</th>
-                <th style="font-weight: 500">厂牌型号</th>
-                <th style="font-weight: 500">车属单位</th>
-                <th style="font-weight: 500">司机</th>
-                <th style="font-weight: 500">司机位置</th>
+                <th  style="font-weight:500" height="40">序号</th>
+                <th style="font-weight:500">车牌号码</th>
+                <th style="font-weight:500">厂牌型号</th>
+                <th style="font-weight:500">车属单位</th>
+                <th style="font-weight:500">司机</th>
+                <th style="font-weight:500">司机位置</th>
               </tr>
 
-              <tr
-                style="color: #ccc"
-                v-for="(item, index) in MilitaryDuty"
-                :key="item.id"
-              >
-                <td style="color: #ccc" height="28">{{ index + 1 }}</td>
-                <td style="color: #ccc">{{ item.numberPlateName }}</td>
-                <td style="color: #ccc">{{ item.modelInfo }}</td>
+              <tr style="color:#ccc" v-for="(item,index) in MilitaryDuty" :key="item.id">
+                <td style="color:#ccc" height="28">{{index+1}}</td>
+                <td style="color:#ccc">{{ item.numberPlateName }}</td>
+                <td style="color:#ccc">{{ item.modelInfo }}</td>
                 <!-- <el-table-column label="车辆型号" align="center" prop="vehiclemodel"> 
                   <template slot-scope="scope">
                      <dict-tag :options="dict.type.brand " :value="scope.row.vehiclemodel"/>
                       </template> 
                 </el-table-column> -->
-                <td style="color: #ccc">{{ item.carUnitName }}</td>
-                <td style="color: #ccc">{{ item.driverName }}</td>
-                <td style="color: #ccc" class="shiyou">{{ item.adress }}</td>
+                <td style="color:#ccc">{{ item.carUnitName }}</td>
+                <td style="color:#ccc">{{ item.driverName }}</td>
+                <td style="color:#ccc" class="shiyou">{{ item.adress }}</td>
               </tr>
             </table>
           </div>
@@ -435,22 +383,20 @@
             <div class="wrap-top-left-top-head"><b>装备值班</b></div>
             <table width="95%" style="table-layout: fixed">
               <tr>
-                <th style="width: 80px; font-weight: 500" height="40">序号</th>
-                <th style="width: 80px; font-weight: 500">装备名称</th>
-                <th style="width: 80px; font-weight: 500">所属单位</th>
-                <th style="width: 80px; font-weight: 500">装备类型</th>
-                <th style="width: 80px; font-weight: 500">数量</th>
-                <th style="width: 100px; font-weight: 500">位置</th>
+                <th style="width:80px;font-weight:500" height="40">序号</th>
+                <th style="width:80px;font-weight:500">装备名称</th>
+                <th style="width:80px;font-weight:500">所属单位</th>
+                <th style="width:80px;font-weight:500">装备类型</th>
+                <th style="width:80px;font-weight:500">数量</th>
+                <th style="width:100px;font-weight:500">位置</th>
               </tr>
-              <tr v-for="(item, index) in Equipment" :key="item.id">
-                <td style="color: #ccc" height="28">{{ index + 1 }}</td>
-                <td style="color: #ccc">{{ item.equipmentName }}</td>
-                <td style="color: #ccc">{{ item.unitName }}</td>
-                <td style="color: #ccc">{{ item.type }}</td>
-                <td style="color: #ccc">{{ item.equipmentNumber }}</td>
-                <td style="color: #ccc" class="shiyou">
-                  {{ item.standbyPosition }}
-                </td>
+              <tr v-for="(item,index) in Equipment" :key="item.id">
+                <td style="color:#ccc" height="28">{{index+1}}</td>
+                <td style="color:#ccc" >{{ item.equipmentName }}</td>
+                <td style="color:#ccc" >{{ item.unitName }}</td>
+                <td style="color:#ccc" >{{ item.type }}</td>
+                <td style="color:#ccc" >{{ item.equipmentNumber }}</td>
+                <td style="color:#ccc" class="shiyou">{{ item.standbyPosition }}</td>
               </tr>
             </table>
           </div>
@@ -473,7 +419,7 @@ import {
   // 执行任务人员情况
   zhixingrenwu,
   // 人员情况
-  listshow,
+  listshow
 } from "@/api/combatduty/Quantitative";
 import { getDicts } from "@/api/system/dict/data";
 export default {
@@ -490,63 +436,75 @@ export default {
       // 执行任务
       performanceTask: [],
       // 人员情况
-      peopleQK: [],
+      peopleQK:[],
       // 查询字典
       dictType: {
         dictType: "brand",
       },
-      ziDian: [],
+      ziDian:[]
     };
   },
   created() {
+    // 人员情况
+    listshow().then(res=>{
+      // console.log(res)
+      this.peopleQK=res.data
+    })
     // 基地值班
     getTodayzhiban().then((res) => {
-      this.BaseOnDuty = res.rows[0];
-      // console.log(this.BaseOnDuty)
+      if (res.rows[0] != undefined){
+        this.BaseOnDuty = res.rows[0];
+      }
+     
     });
     // 大队值班接口
     greatDuty().then((res) => {
-      this.GreatDuty1 = res.rows[0];
+      if (res.rows[0] != undefined){
+        this.GreatDuty1=res.rows[0]
+      }
       // console.log(res);
     });
     // 查询字典
-    this.getdict();
-
+    this.getdict()
+    
+    
     // // 装备值班接口
-    equipment().then((res) => {
+    equipment().then(res=>{
       // console.log(res)
-      this.Equipment = res.rows;
+      if (res.rows != undefined){
+        this.Equipment=res.rows
+      }
       // console.log(this.Equipment)
-    });
+    })
     // 执行任务人员情况
     zhixingrenwu().then((res) => {
       // console.log(res);
-      this.performanceTask = res.rows;
-    });
-    // 人员情况
-    listshow().then((res) => {
-      // console.log(res)
-      this.peopleQK = res.data;
+      if (res.rows != undefined){
+        this.performanceTask=res.rows
+      }
     });
+    
+    
   },
   mounted() {
     // // 军车值班接口
-    militaryDuty().then((res) => {
+    militaryDuty().then(res=>{
       // console.log(res.rows)
-      this.MilitaryDuty = res.rows;
+      this.MilitaryDuty=res.rows
       // console.log(res.rows)
-      this.MilitaryDuty.map((item) => {
-        this.ziDian.map((items) => {
+      this.MilitaryDuty.map((item)=>{
+        this.ziDian.map((items)=>{
           // console.log(items)
-          if (item.modelInfo == items.dictValue) {
-            // console.log(items.dictLabel)
-            return (item.modelInfo = items.dictLabel);
-          }
-          this.MilitaryDuty = this.MilitaryDuty;
-        });
-      });
+            if(item.modelInfo==items.dictValue){
+              // console.log(items.dictLabel)
+             return item.modelInfo=items.dictLabel
+
+            }
+            this.MilitaryDuty=this.MilitaryDuty
+        })
+      })
       // console.log(this.MilitaryDuty)
-    });
+    })
   },
   methods: {
     // 查询字典
@@ -572,14 +530,14 @@ body {
 .content {
   background-color: #103360;
 }
-.bottomsss {
+.bottomsss{
   position: absolute;
   bottom: 0;
   width: 100%;
   height: 10px;
   /* background-color: pink; */
 }
-#wrap {
+#wrap{
   position: relative;
 }
 /* .wrap {
@@ -689,7 +647,7 @@ body {
 .wrap-top-left-top-item {
   width: 30%;
   height: 40px;
-  max-width: 30%;
+ max-width:30%;
   max-height: 40px;
   display: inline-block;
   border: #0f4d75 1px solid;
@@ -701,7 +659,7 @@ body {
 .wrap-top-left-top-item-left {
   width: 86px;
   margin-left: 8px;
-
+  
   height: 100%;
   font-size: 14px;
   text-align: start;
@@ -777,8 +735,8 @@ body {
   margin-top: 17px;
   margin-left: 21px;
 }
-.junche .wrap-top-left-top-head {
-  background-image: url("../../../images/组 21.png");
+.junche .wrap-top-left-top-head{
+   background-image: url("../../../images/组 21.png");
   background-repeat: no-repeat;
   /* background-size: 79% 100%; */
 }
@@ -787,8 +745,8 @@ body {
   background-repeat: no-repeat;
   /* background-size: 95% 100%; */
 }
-.renyuan {
-  width: 100%;
+.renyuan{
+   width: 100%;
   height: 30px;
   font-size: 18px;
   font-family: Source Han Sans CN;
@@ -813,11 +771,11 @@ body {
   font-size: 18px;
   font-family: Source Han Sans CN;
   /* font-weight: 400; */
-  color: #eff7ff;
+  color: #EFF7FF;
   margin-left: 40px;
   line-height: 30px;
 }
-.renyuan b {
+.renyuan b{
   line-height: 30px;
   font-weight: 400;
   font-size: 18px;
@@ -848,9 +806,9 @@ body {
   align-items: center;
   justify-content: center;
 }
-.wrap-top-center-item-left1 img {
+.wrap-top-center-item-left1 img{
   margin-left: 5px;
-  margin-top: 18px;
+   margin-top: 18px;
 }
 .wrap-top-center-item-left img {
   margin-top: 7px;
@@ -936,7 +894,7 @@ table tr td {
   width: 99%;
 
   /* flex: 2; */
-
+  
   height: 100%;
   display: flex;
   flex-wrap: wrap;
@@ -973,35 +931,35 @@ table tr td {
 .zuozhan {
   width: 100px;
 }
-.shiyou {
+.shiyou{
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-#a1 img {
+#a1 img{
   height: 30px;
 }
-#a2 img {
+#a2 img{
   height: 30px;
 }
-#a3 img {
+#a3 img{
   width: 30px;
 }
-#a4 img {
+#a4 img{
   width: 30px;
 }
-#a5 img {
+#a5 img{
   width: 30px;
 }
-#a6 img {
-  width: 30px;
+#a6 img{
+  width: 30px ;
 }
-#a7 img {
-  width: 30px;
+#a7 img{
+  width: 30px ;
   height: 30px;
 }
-#a8 img {
-  width: 30px;
+#a8 img{
+  width: 30px ;
   height: 30px;
 }
 </style>

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -249,7 +249,7 @@
             <el-form-item label="天气" prop="weather">
               <el-input v-model="form.weather" placeholder="请输入天气" />
             </el-form-item>
-            <el-form-item label="值班首长" prop="peopleId">
+            <el-form-item label="值班首长" prop="lead">
               <el-select v-model="form.lead" placeholder="请选择首长" clearable>
                 <el-option
                   :label="item.nickName"
@@ -642,13 +642,22 @@
                     :picker-options="pickerOptions"
                   >
                   </el-date-picker> -->
-                    <el-date-picker
+                    <!-- <el-date-picker
                       v-model="item1.examineDate"
                       type="datetime"
                       placeholder="选择日期时间"
                       class="sun"
                     >
-                    </el-date-picker>
+                    </el-date-picker> -->
+                    <el-time-picker
+                      v-model="item1.examineDate"
+                      :picker-options="{
+                        selectableRange: '00:00:00 - 23:59:59',
+                      }"
+                      placeholder="选择日期时间"
+                      value-format="hh:mm:ss"
+                    >
+                    </el-time-picker>
                   </el-form-item>
                   <el-form-item label="" prop="">
                     <el-input
@@ -704,7 +713,7 @@
                     ></el-input>
                   </el-form-item>
                   <el-form-item label="" prop="">
-                    <el-date-picker
+                    <!-- <el-date-picker
                       v-model="item1.comeDate"
                       type="date"
                       :editable="false"
@@ -712,10 +721,19 @@
                       placeholder="来队时间"
                       value-format="yyyy-MM-dd"
                     >
-                    </el-date-picker>
+                    </el-date-picker> -->
+                    <el-time-picker
+                      v-model="item1.comeDate"
+                      :picker-options="{
+                        selectableRange: '00:00:00 - 23:59:59',
+                      }"
+                      placeholder="来队时间"
+                      value-format="hh:mm:ss"
+                    >
+                    </el-time-picker>
                   </el-form-item>
                   <el-form-item label="" prop="">
-                    <el-date-picker
+                    <!-- <el-date-picker
                       v-model="item1.leaveDate"
                       type="date"
                       :editable="false"
@@ -723,7 +741,16 @@
                       placeholder="离队时间"
                       value-format="yyyy-MM-dd"
                     >
-                    </el-date-picker>
+                    </el-date-picker> -->
+                    <el-time-picker
+                      v-model="item1.leaveDate"
+                      :picker-options="{
+                        selectableRange: '00:00:00 - 23:59:59',
+                      }"
+                      placeholder="离队时间"
+                      value-format="hh:mm:ss"
+                    >
+                    </el-time-picker>
                   </el-form-item>
                   <el-form-item>
                     <el-button
@@ -747,10 +774,9 @@
           </el-form>
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitForm(1)">确 定</el-button>
-          <el-button @click="cancel">取消</el-button>
+          <el-button @click="resertwo">重置</el-button>
 
-          
+          <el-button type="primary" @click="submitForm(1)">确 定</el-button>
         </div>
       </el-dialog>
       <!-- 查看 -->
@@ -915,8 +941,8 @@ export default {
           { required: true, message: "值班日期不能为空", trigger: "blur" },
         ],
         weather: [{ required: true, message: "天气不能为空", trigger: "blur" }],
-        peopleId: [
-          // { required: true, message: "值班首长不能为空", trigger: "blur" },
+        lead: [
+          { required: true, message: "值班首长不能为空", trigger: "change" },
         ],
         orgcadre: [
           { required: true, message: "编制干部不能为空", trigger: "blur" },
@@ -1122,7 +1148,16 @@ export default {
       s = s < 10 ? "0" + s : s;
       let dateTime = y + "-" + m + "-" + d + " " + h + ":" + M + ":" + s;
       getXunLian(id, dateTime).then((res) => {
+        console.log(res.data);
         this.xunlian = res.data;
+        for (var i = 0; i < res.data.length; i++) {
+          this.xunlian[i].contents =
+            res.data[i].startTime +
+            "-" +
+            res.data[i].endTime +
+            "  " +
+            this.xunlian[i].contents;
+        }
       });
     },
     // 选中军人触发

src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -138,8 +138,8 @@
       </el-table-column>
       <el-table-column label="连值班领导" align="center" prop="peopleName" />
       <el-table-column label="电话" align="center" prop="phone" />
-      <el-table-column label="军事长官" align="center" prop="people1Name" />
-      <el-table-column label="政治长官" align="center" prop="people2Name" />
+      <el-table-column label="军事主官" align="center" prop="people1Name" />
+      <el-table-column label="政治主官" align="center" prop="people2Name" />
       <!-- <el-table-column label="时间" align="center" prop="time" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.time, "{y}-{m}-{d}") }}</span>
@@ -233,11 +233,11 @@
           <el-form-item label="电话" prop="phone">
             <el-input v-model="form.phone" placeholder="请输入电话" />
           </el-form-item>
-          <el-form-item label="军事长官" prop="peopleId1">
+          <el-form-item label="军事主官" prop="peopleId1">
             <el-select
               ref="aa"
               v-model="form.peopleId1"
-              placeholder="请选择军事长官"
+              placeholder="请选择军事主官"
             >
               <el-option
                 v-for="item in renYuan"
@@ -250,9 +250,9 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="政治长官" prop="peopleId2">
+          <el-form-item label="政治主官" prop="peopleId2">
             <!-- <el-input v-model="form.peopleId2" placeholder="请输入政治长官" /> -->
-            <el-select v-model="form.peopleId2" placeholder="请选择政治长官">
+            <el-select v-model="form.peopleId2" placeholder="请选择政治主官">
               <el-option
                 v-for="item in renYuan"
                 :key="item.id"
@@ -331,7 +331,11 @@
                 <el-input v-model="item.week" disabled />
               </el-form-item>
               <el-form-item label="" prop="day">
-                <el-select v-model="item.dateline" placeholder="早晨">
+                <el-select
+                  v-model="item.dateline"
+                  @change="datelinefun"
+                  placeholder="早晨"
+                >
                   <el-option
                     v-for="item in day"
                     :key="item.value"
@@ -347,23 +351,14 @@
                 class="b1"
                 placeholder="起始时间"
                 v-model="item.startTime"
-                :picker-options="{
-                  start: '00:00',
-                  step: '00:15',
-                  end: '24:45',
-                }"
+                :picker-options="option"
               >
               </el-time-select>
               <el-time-select
                 class="b1"
                 placeholder="结束时间"
                 v-model="item.endTime"
-                :picker-options="{
-                  start: '00:00',
-                  step: '00:15',
-                  end: '24:45',
-                  minTime: startTime,
-                }"
+                :picker-options="option"
               >
               </el-time-select>
               <el-form-item label="" prop="unitId5">
@@ -439,9 +434,8 @@
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取消</el-button>
-       
+        <el-button @click="resertwo">重置</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 查看 -->
@@ -616,6 +610,15 @@ export default {
       code: 0,
       // 单位的保存
       names: "",
+      // start: "06:00",
+      // end: "08:00",
+      
+      option: {
+        start: "06:00",
+        step: "00:30",
+        end: "08:00",
+        
+      },
     };
   },
   created() {
@@ -931,6 +934,22 @@ export default {
         })
         .catch(() => {});
     },
+    datelinefun(val) {
+      console.log(val);
+      if (val == "早晨") {
+        this.option.start = "06:00";
+        this.option.end = "08:00";
+      } else if (val == "上午") {
+        this.option.start = "08:00";
+        this.option.end = "012:00";
+      } else if (val == "下午") {
+        this.option.start = "12:00";
+        this.option.end = "18:00";
+      } else if (val == "晚上") {
+        this.option.start = "18:00";
+        this.option.end = "23:00";
+      }
+    },
   },
 };
 </script>

src/views/pt.vue

@@ -83,7 +83,7 @@
             <li>
               <div class="demo-box">
                 <div
-                id="q1"
+                  id="q1"
                   class="demo active"
                   v-on:click="tongzhifun"
                   data-url="/diary?ref=addtabs"
@@ -298,7 +298,7 @@
                 </div>
               </div>
               <div class="demo-a">
-                <a href="#" class="a">保密协议</a>
+                <a href="#" class="a">涉密载体</a>
               </div>
             </li>
           </ul>
@@ -316,10 +316,15 @@
                 <div class="num2-ul-title-c">分类</div>
                 <div class="num2-ul-title-r">执行人</div>
               </div>
-              <li class="num2-ul-li" v-for="item in worklist" :key="item.id" @click="dbsxfun">
-                <div class="num2-ul-li-l">{{item.taskName}}</div>
+              <li
+                class="num2-ul-li"
+                v-for="item in worklist"
+                :key="item.id"
+                @click="dbsxfun"
+              >
+                <div class="num2-ul-li-l">{{ item.taskName }}</div>
                 <div class="num2-ul-li-c">工作</div>
-                <div class="num2-ul-li-r">{{item.peopleName}}</div>
+                <div class="num2-ul-li-r">{{ item.peopleName }}</div>
               </li>
             </ul>
           </div>
@@ -452,29 +457,36 @@
       </div>
     </el-dialog>-->
     <el-dialog
-      title="添加通知公告"
+      title="查看通知公告"
       :visible.sync="open5"
       width="800px"
       append-to-body
     >
       <div class="jiben">基本信息</div>
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-        :inline="true"
-      >
+      <el-form ref="form" :model="form" :rules="rules" :inline="true">
         <el-row>
           <el-col :span="12">
-            <p style="width:100%;height:30px;line-height:30px;color:#fff;fontSize:16px;" v-if="!ggflg" >公告标题:<span style="margin-left:10px;fontSize:14px;">{{form.noticeTitle}}</span></p>
-            <el-form-item label="公告标题" v-if="ggflg"  prop="noticeTitle">
+            <p
+              style="
+                width: 100%;
+                height: 30px;
+                line-height: 30px;
+                color: #fff;
+                fontsize: 16px;
+              "
+              v-if="!ggflg"
+            >
+              公告标题:<span style="margin-left: 10px; fontsize: 14px">{{
+                form.noticeTitle
+              }}</span>
+            </p>
+            <el-form-item label="公告标题" v-if="ggflg" prop="noticeTitle">
               <el-input
                 v-model="form.noticeTitle"
                 placeholder="请输入公告标题"
               />
             </el-form-item>
-             <!-- <el-form-item label="公告标题" prop="noticeTitle">
+            <!-- <el-form-item label="公告标题" prop="noticeTitle">
               <el-input
 
                 v-model="form.noticeTitle"
@@ -506,13 +518,30 @@
                   v-for="dict in dict.type.sys_notice_status"
                   :key="dict.value"
                   :label="dict.value"
-                  style="margin-right:20px;"
+                  style="margin-right: 20px"
                   >{{ dict.label }}</el-radio
                 >
               </el-radio-group>
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row style="margin-top: 10px">
+          <el-col :span="12" v-if="!ggflg">
+            <el-form-item label="发布人" prop="createBy" label-width="0">
+              <el-input
+                v-model="form.createBy"
+                disabled
+                placeholder="请输入发布人"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="!ggflg">
+            <el-form-item label="附件" label-width="0px" prop="filename">
+                <a :href="'http://192.168.2.250:8089'+form.filename" target="_blank" download style="display:inline-block;width:90px;height:30px;background-color:#409EFF;border:none;border-radus:3px;color:#fff;line-height:30px;text-align: center;">下载附件</a>
+              <!-- <fileUpload v-model="form.filename" class="m-l-20" /> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
         <div class="jiben">内容</div>
         <el-col :span="24">
           <el-form-item
@@ -550,7 +579,7 @@ import {
   addNotice,
   listNotice,
   updateNotice,
-  getWorkTask
+  getWorkTask,
 } from "@/api/pt";
 import Cookies from "js-cookie";
 export default {
@@ -583,7 +612,7 @@ export default {
       // 表单参数
       form: {},
       noticeList: [],
-      worklist:[],
+      worklist: [],
     };
   },
   created() {
@@ -606,11 +635,11 @@ export default {
         this.noticeList = res.data;
       });
     },
-    getworklist(){
-        getWorkTask().then(res=>{
-            console.log(res)
-            this.worklist=res.data
-        })
+    getworklist() {
+      getWorkTask().then((res) => {
+        console.log(res);
+        this.worklist = res.data;
+      });
     },
     // 表单重置
     reset() {
@@ -730,38 +759,34 @@ export default {
       this.$router.push({ path: "/taishi" }).catch(() => {});
       // window.open(`/taishi`,'_self');
     },
-    baomifun(){
-       this.$router
+    baomifun() {
+      this.$router
         .push({ path: "/index", query: { name: "/bdglSecret" } })
         .catch(() => {});
     },
     showfun() {
-       this.open = false;
+      this.open = false;
       printTriggerClear().then((res) => {
         // console.log(res)
       });
-     
     },
     showfun2() {
       this.open2 = false;
       printTriggerClear().then((res) => {
         // console.log(res)
       });
-      
     },
     showfun3() {
-       this.open3 = false;
+      this.open3 = false;
       printTriggerClear().then((res) => {
         // console.log(res)
       });
-     
     },
     showfun4() {
-       this.open4 = false;
+      this.open4 = false;
       printTriggerClear().then((res) => {
         // console.log(res)
       });
-     
     },
     quchulifun() {
       printTriggerClear().then((res) => {
@@ -868,7 +893,7 @@ export default {
     tzggfun(item) {
       // console.log(item);
       // item.start = 1;
-       this.reset();
+      this.reset();
       this.form = item;
       updateNotice({
         noticeId: item.noticeId,
@@ -877,15 +902,16 @@ export default {
       }).then((res) => {
         if (res.code == 200) {
           this.getlist();
-         
         }
       });
       this.open5 = true;
       this.ggflg = false;
     },
-    dbsxfun(){
-       this.$router.push({ path: "/workingArrangements/workTask" }).catch(() => {});
-    }
+    dbsxfun() {
+      this.$router
+        .push({ path: "/workingArrangements/workTask" })
+        .catch(() => {});
+    },
   },
   destroyed() {
     clearInterval(this.timer); // 清除定时器
@@ -951,7 +977,7 @@ li {
 .demo img {
   margin-top: 35px;
 }
- #q1 img{
+#q1 img {
   margin-top: 42px;
 }
 .demo-box {
@@ -1078,7 +1104,7 @@ hr {
   height: 100%;
   text-align: left;
   margin-left: 10px;
-  text-overflow:ellipsis;
+  text-overflow: ellipsis;
 }
 .num1-box-r {
   flex: 3;
@@ -1136,7 +1162,7 @@ hr {
   flex: 6;
   height: 100%;
   text-align: left;
-  margin-left:10px;
+  margin-left: 10px;
 }
 .num2-ul-li-c {
   flex: 3;
@@ -1180,7 +1206,7 @@ hr {
   flex: 6;
   height: 100%;
   text-align: left;
-  margin-left:10px;
+  margin-left: 10px;
 }
 .num2-ul-title-c {
   flex: 3;
@@ -1269,7 +1295,7 @@ hr {
 ::v-deep .el-form-item__label {
   font: 16px;
   color: #fff;
-  width: 100px !important;
+  width: auto !important;
 }
 ::v-deep .el-input__inner {
   width: 250px !important;
@@ -1349,6 +1375,9 @@ hr {
 .el-select-dropdown__item {
   left: 10px !important;
 }
+::v-deep .el-upload__tip {
+  display: none;
+}
 </style>
 <style lang="scss" scoped>
 .tkbox {

src/views/regulations/fileinfo/index.vue

@@ -127,7 +127,7 @@
               <span>
                 <!-- <iframe :src="'http://192.168.5.177:8080'+scope.row.parentDirName" target="_blank">阅读</iframe> -->
                 <a
-                  :href="'http://192.168.5.177:8080' + scope.row.parentDirName"
+                  :href="'http://192.168.2.250:8089' + scope.row.parentDirName"
                   target="_blank"
                   >阅读</a
                 >
@@ -139,7 +139,7 @@
               @click="handleupLoad(scope.row)"
             >
               <span class="chakan1">
-                <a :href="scope.row.parentDirName" download>下载</a>
+                <a :href="'http://192.168.2.250:8089' + scope.row.parentDirName" download>下载</a>
               </span>
             </el-button>
             <el-button size="dels" type="text" @click="handledels(scope.row)">
@@ -642,10 +642,10 @@ export default {
         pageSize: this.queryParams.pageSize,
       }).then((res) => {
         this.fileinfoList = res.rows;
-        this.fileinfoList.map(item=>{
-          item.parentDirName='http://localhost:8089'+item.parentDirName;
+        // this.fileinfoList.map(item=>{
+        //   item.parentDirName='http://localhost:8089'+item.parentDirName;
 
-        })
+        // })
        console.log(1)
         this.total = res.total;
       });
@@ -736,10 +736,10 @@ export default {
         pageSize: this.queryParams.pageSize,
       }).then((res) => {
         this.fileinfoList = res.rows;
-        this.fileinfoList.map(item=>{
-          item.parentDirName='http://localhost:8089'+item.parentDirName;
+        // this.fileinfoList.map(item=>{
+        //   item.parentDirName='http://localhost:8089'+item.parentDirName;
 
-        })
+        // })
         this.total = res.total;
       });
       // console.log(row)
@@ -791,10 +791,10 @@ export default {
       this.loading = true;
       listFileinfo(this.queryParams).then((response) => {
         this.fileinfoList = response.rows;
-        this.fileinfoList.map(item=>{
-          item.parentDirName='http://localhost:8089'+item.parentDirName;
+        // this.fileinfoList.map(item=>{
+        //   item.parentDirName='http://localhost:8089'+item.parentDirName;
 
-        })
+        // })
        
         console.log(this.fileinfoList);
         this.total = response.total;

src/views/system/notice/index.vue

@@ -219,7 +219,22 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="12">
+            <el-form-item label="发布人" prop="createBy">
+              <el-input v-model="form.createBy" disabled placeholder="请输入发布人" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="附件上传" label-width="0px" prop="filename">
+              <fileUpload
+                v-model="form.filename"
+                class="m-l-20"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
                 <el-radio
@@ -264,6 +279,7 @@ import {
   addNotice,
   updateNotice,
 } from "@/api/system/notice";
+import Cookies from "js-cookie";
 
 export default {
   name: "Notice",
@@ -295,6 +311,8 @@ export default {
         noticeTitle: undefined,
         createBy: undefined,
         status: undefined,
+        createBy: null,
+        filename: null,
       },
       // 表单参数
       form: {},
@@ -306,6 +324,9 @@ export default {
         noticeType: [
           { required: true, message: "公告类型不能为空", trigger: "change" },
         ],
+        createBy: [
+          { required: true, message: "发布人不能为空", trigger: "blur" },
+        ],
       },
     };
   },
@@ -334,7 +355,9 @@ export default {
         noticeTitle: undefined,
         noticeType: undefined,
         noticeContent: undefined,
+        createBy: null,
         status: "0",
+        filename: null,
       };
       this.resetForm("form");
     },
@@ -359,6 +382,8 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加公告";
+      this.form.createBy = Cookies.get("nickName");
+      // this.form.sendId = Cookies.get("userId");
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -374,6 +399,9 @@ export default {
     submitForm: function () {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          if(this.form.filename){
+             this.form.filename=this.form.filename[0].url;
+          }
           if (this.form.noticeId != undefined) {
             updateNotice(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
@@ -450,7 +478,6 @@ export default {
   background: transparent;
   color: #fff;
   border: 1px solid white !important;
-
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
@@ -531,4 +558,7 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+::v-deep .el-upload__tip {
+  display: none;
+}
 </style>