重置按钮改取消按钮，营房管理搜索，个别页面的输入框边框颜色

src/views/barracksManagement/barracks/index.vue

@@ -524,6 +524,9 @@ export default {
 ::v-deep .el-table__cell .cell {
   text-align: center;
 }
+::v-deep .el-input__inner{
+  border: 1px solid white !important;
+}
 /* 备注样式 */
 .jibens {
   width: 650px;

src/views/barracksManagement/checkin/index.vue

@@ -433,6 +433,9 @@ export default {
   color: white;
   /* border-bottom: 1px solid white; */
 }
+::v-deep .el-input__inner{
+  border: 1px solid white !important;
+}
 /* 标题下划线 */
 ::v-deep .el-dialog__header {
   border-bottom: 1px solid white;

src/views/barracksManagement/flat/index.vue

@@ -545,6 +545,9 @@ export default {
   color: white;
   /* border-bottom: 1px solid white; */
 }
+::v-deep .el-input__inner{
+  border: 1px solid white !important;
+}
 /* 标题下划线 */
 ::v-deep .el-dialog__header {
   border-bottom: 1px solid white;

src/views/barracksManagement/flats/index.vue

@@ -7,12 +7,7 @@
       v-show="showSearch"
       label-width="100px"
     >
-      <el-form-item
-        
-        prop="unitId"
-        style="margin-left: -40px"
-        label-width="50px"
-      >
+      <el-form-item prop="unitId" style="margin-left: -40px" label-width="50px">
         <!-- <el-input
           v-model="queryParams.unitId"
           placeholder="请输入单位"
@@ -29,7 +24,6 @@
         />
       </el-form-item>
       <el-form-item
-        
         prop="peopleId"
         label-width="50px"
         style="margin-left: -23px"
@@ -42,16 +36,16 @@
           @keyup.enter.native="handleQuery"
         /> -->
         <el-select
-          v-model="queryParams.name"
+          v-model="queryParams.peopleName"
           ref="peoplenames"
           placeholder="请选择人员"
+            @change="handleQuery"
         >
           <el-option
-            v-for="item in executor"
+            v-for="item in executors"
             :key="item.id"
             :label="item.name"
             :value="item.name"
-            @click.native="peopleIds1(item.id, item.name)"
           />
         </el-select>
       </el-form-item>
@@ -77,7 +71,11 @@
         <!-- <el-select v-model="queryParams.type" placeholder="请选择申请住房类别" clearable size="small">
           <el-option label="请选择字典生成" value="" />
         </el-select> -->
-        <el-select v-model="queryParams.type" placeholder="请选择申请住房类别">
+        <el-select
+          v-model="queryParams.type"
+          placeholder="请选择申请住房类别"
+          @change="leibie"
+        >
           <!-- <el-option label="请选择字典生成" value="" /> -->
           <el-option
             v-for="(item, i) in ziDian"
@@ -655,7 +653,7 @@ import {
 import { getDicts } from "@/api/system/dict/data";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { getDept2 } from "@/api/grassrootsregistration/bdglmeeting";
+import { getDept2, getAll } from "@/api/grassrootsregistration/bdglmeeting";
 import { deptUser } from "@/api/doormanManage/bdglVisit";
 import { allUser, getDeptList } from "@/api/workingArrangements/workTask";
 export default {
@@ -729,6 +727,8 @@ export default {
       form: {},
       rylist: [],
       executor: [],
+      // 获取外面人员
+      executors: [],
       // 表单校验
       rules: {
         enlistDate: [
@@ -742,24 +742,27 @@ export default {
     };
   },
   created() {
+    this.getSuoYou();
     this.getList();
     this.getdict();
     this.getdict1();
     allUser().then((res) => {
       this.rylist = res.rows;
-      // console.log(this.rylist);
     });
 
     getDeptList().then((res) => {
-      // console.log(res.data)
       this.getdeptList = res.data;
-      // console.log(this.getdeptList);
     });
-    // this.selectPeo1)()
     this.selectPeo1();
-    // this.selectPeo()
   },
   methods: {
+    // 获取所有人员
+    getSuoYou() {
+      getAll().then((response) => {
+        console.log(response);
+        this.executors = response.rows;
+      });
+    },
     unit4Format(row, column) {
       // console.log(row)
       var deptName = "";
@@ -837,6 +840,10 @@ export default {
       this.queryParams.id = id;
       this.queryParams.peopleName = name;
       // console.log(id);
+      this.getList();
+    },
+    leibie() {
+      this.getList();
     },
     // 到访单位选中触发
     selectPeo1(val) {
@@ -847,16 +854,18 @@ export default {
         // console.log(this.users);
       });
       this.queryParams.unitId = val.id;
-      this.queryParams.peopleName = "";
-      this.queryParams.unitName = val.label;
-      // console.log(this.queryParams);
+      // this.queryParams.peopleName = "";
+      // this.queryParams.unitName = val.label;
+      // // console.log(this.queryParams);
       this.getZhuChi(this.queryParams.unitId);
+      this.getList();
     },
     // 获取执行人
     getZhuChi(id) {
       // console.log(id)
       deptUser(id).then((res) => {
         this.executor = res.data;
+        this.executors = res.data;
         // console.log(this.executor)
         // this.form.unitName=this.executor
       });
@@ -942,6 +951,7 @@ export default {
     resetQuery() {
       this.queryParams = {};
       this.getList();
+      this.getSuoYou();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -1044,6 +1054,10 @@ export default {
   width: 216px;
   color: white;
   margin-right: 20px;
+  border: 1px solid white !important;
+}
+::v-deep .el-input__inner {
+  border: 1px solid white !important;
 }
 /* 标题弹框 */
 ::v-deep .el-dialog__title {

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-right2">
-                {{ this.BaseOnDuty.detachmentoneNumber }}人
+              <div class="wrap-top-left-top-item-right">
+                {{ 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,89 +62,95 @@
                 {{ 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-right2">
-                {{ this.BaseOnDuty.detachmentwoNumber }}人
+              <div class="wrap-top-left-top-item-right">
+                {{ 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 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 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">机 要 值 班 员</div>
+            <div class="wrap-top-left-top-item-right" style="margin-left: 22px">
+              {{ this.GreatDuty1.confidentialName }}
             </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 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 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 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 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 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">
-              <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 class="wrap-top-left-top-item-right">
+              {{ this.GreatDuty1.politicalName }}
             </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>
+          <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">
-              <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 class="wrap-top-left-top-item-right">
+              {{ this.GreatDuty1.detachmentName }}
             </div>
-            <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 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">
+            <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">
+            <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 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">
@@ -211,21 +217,23 @@
         <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>
@@ -238,7 +246,9 @@
             </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">
@@ -247,7 +257,9 @@
             </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">
@@ -258,9 +270,19 @@
                 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">
@@ -269,7 +291,9 @@
             </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">
@@ -278,7 +302,9 @@
             </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">
@@ -287,7 +313,9 @@
             </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">
@@ -296,7 +324,9 @@
             </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">
@@ -305,20 +335,32 @@
             </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">
@@ -327,7 +369,9 @@
             </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">
@@ -336,7 +380,9 @@
             </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">
@@ -345,7 +391,9 @@
             </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>
@@ -355,26 +403,30 @@
             <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>
@@ -383,20 +435,22 @@
             <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>
@@ -419,7 +473,7 @@ import {
   // 执行任务人员情况
   zhixingrenwu,
   // 人员情况
-  listshow
+  listshow,
 } from "@/api/combatduty/Quantitative";
 import { getDicts } from "@/api/system/dict/data";
 export default {
@@ -436,12 +490,12 @@ export default {
       // 执行任务
       performanceTask: [],
       // 人员情况
-      peopleQK:[],
+      peopleQK: [],
       // 查询字典
       dictType: {
         dictType: "brand",
       },
-      ziDian:[]
+      ziDian: [],
     };
   },
   created() {
@@ -452,50 +506,47 @@ export default {
     });
     // 大队值班接口
     greatDuty().then((res) => {
-      this.GreatDuty1=res.rows[0]
+      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
+      this.Equipment = res.rows;
       // console.log(this.Equipment)
-    })
+    });
     // 执行任务人员情况
     zhixingrenwu().then((res) => {
       // console.log(res);
-      this.performanceTask=res.rows
+      this.performanceTask = res.rows;
     });
     // 人员情况
-    listshow().then(res=>{
+    listshow().then((res) => {
       // console.log(res)
-      this.peopleQK=res.data
-    })
-    
+      this.peopleQK = res.data;
+    });
   },
   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: {
     // 查询字典
@@ -521,14 +572,14 @@ body {
 .content {
   background-color: #103360;
 }
-.bottomsss{
+.bottomsss {
   position: absolute;
   bottom: 0;
   width: 100%;
   height: 10px;
   /* background-color: pink; */
 }
-#wrap{
+#wrap {
   position: relative;
 }
 /* .wrap {
@@ -638,7 +689,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;
@@ -650,7 +701,7 @@ body {
 .wrap-top-left-top-item-left {
   width: 86px;
   margin-left: 8px;
-  
+
   height: 100%;
   font-size: 14px;
   text-align: start;
@@ -726,8 +777,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%; */
 }
@@ -736,8 +787,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;
@@ -762,11 +813,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;
@@ -797,9 +848,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;
@@ -885,7 +936,7 @@ table tr td {
   width: 99%;
 
   /* flex: 2; */
-  
+
   height: 100%;
   display: flex;
   flex-wrap: wrap;
@@ -922,35 +973,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/combatduty/RateOfTen/index.vue

@@ -1670,6 +1670,7 @@ export default {
 }
 ::v-deep .el-input__inner {
   /* width: 250px; */
+  border: 1px solid white !important;
   text-align: center !important;
   /* text-indent: 4.3em !important; */
 }

src/views/grassrootsregistration/bdglarmament/index.vue

@@ -302,8 +302,9 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="resertwo">重置</el-button>
         <el-button type="primary" @click="submitForm(1)">确 定 </el-button>
+        <el-button @click="cancel">取消</el-button>
+        
       </div>
     </el-dialog>
 

src/views/grassrootsregistration/bdglcookbook/index.vue

@@ -1759,8 +1759,8 @@
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="resertwo">重置</el-button>
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
+        <el-button @click="cancel">取消</el-button>
       </div>
     </el-dialog>
     <el-dialog

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -747,9 +747,10 @@
           </el-form>
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="resertwo">重置</el-button>
-
           <el-button type="primary" @click="submitForm(1)">确 定</el-button>
+          <el-button @click="cancel">取消</el-button>
+
+          
         </div>
       </el-dialog>
       <!-- 查看 -->

src/views/grassrootsregistration/bdgldrill/index.vue

@@ -239,8 +239,9 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="resertwo">重置</el-button>
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
+        <el-button @click="cancel">取消</el-button>
+        
       </div>
     </el-dialog>
     <div class="fff">

src/views/grassrootsregistration/bdglequip/index.vue

@@ -329,8 +329,9 @@
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="resertwo">重置</el-button>
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
+        <el-button @click="cancel">取消</el-button>
+        
       </div>
     </el-dialog>
     <el-dialog

src/views/grassrootsregistration/bdgleven/index.vue

@@ -294,8 +294,8 @@
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer" v-if="opens">
-        <el-button @click="resertwo">重置</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+         <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
     <div class="fff">

src/views/grassrootsregistration/bdglfilemanagement/index.vue

@@ -301,8 +301,9 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="resertwo">重置</el-button>
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
+        <el-button @click="cancel">取消</el-button>
+        
       </div>
     </el-dialog>
 

src/views/grassrootsregistration/bdglfood/index.vue

@@ -1081,8 +1081,9 @@
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="resertwo">重置</el-button>
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
+        <el-button @click="cancel">取消</el-button>
+        
       </div>
     </el-dialog>
     <el-dialog

src/views/grassrootsregistration/bdglmeeting/index.vue

@@ -343,8 +343,9 @@
       </el-form>
 </div>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="resertwo">重置</el-button>
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
+        <el-button @click="cancel">取消</el-button>
+        
       </div>
     </el-dialog>
     <el-dialog

src/views/grassrootsregistration/bdglparty/index.vue

@@ -323,8 +323,9 @@
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="resertwo">重置</el-button>
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
+        <el-button @click="cancel">取消</el-button>
+        
       </div>
     </el-dialog>
     <el-dialog

src/views/grassrootsregistration/bdglpublicproperty/index.vue

@@ -267,8 +267,9 @@
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="resertwo">重置</el-button>
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
+        <el-button @click="cancel">取消</el-button>
+        
       </div>
     </el-dialog>
 

src/views/grassrootsregistration/bdglsecrecy/index.vue

@@ -313,8 +313,9 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="resertwo">重置</el-button>
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
+        <el-button @click="cancel">取消</el-button>
+        
       </div>
     </el-dialog>
     <div class="fff">

src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -317,9 +317,10 @@
       </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="resertwo">重置</el-button>
-
         <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取消</el-button>
+
+        
         <!-- <el-button @click="cancel">取 消</el-button> -->
       </div>
     </el-dialog>

src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -439,8 +439,9 @@
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="resertwo">重置</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+         <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取消</el-button>
+       
       </div>
     </el-dialog>
     <!-- 查看 -->

src/views/grassrootsregistration/personnelRoster/index.vue

@@ -1518,4 +1518,7 @@ export default {
 ::v-deep .el-input__suffix .el-input__suffix-inner .el-input__icon {
   margin-right: -45px !important;
 }
+::v-deep .el-pagination .el-input__suffix{
+  right: 34px !important;
+}
 </style>

src/views/grassrootsregistration/statistics/index.vue

@@ -411,7 +411,7 @@ export default {
   color: #fff;
   width: 100px !important;
 }
-::v-deep .el-input__inner {
+::v-deep .el-dialog  .el-input__inner {
   width: 260px !important;
   height: 36px;
   background: transparent;

src/views/materialManagement/archives/index.vue

@@ -254,15 +254,15 @@
       >
         <template slot-scope="scope">
           <el-button
-            size="mini"
-            type="btu"
+            size="btu"
+            type="text"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['materialManagement:archives:edit']"
             >修改</el-button
           >
           <el-button
-            size="mini"
-            type="btd"
+            size="btd"
+            type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['materialManagement:archives:remove']"
             >删除</el-button
@@ -638,7 +638,7 @@ export default {
   color: #fff;
   width: 100px !important;
 }
-::v-deep .el-input__inner {
+::v-deep .el-dialog .el-input__inner {
   width: 200px !important;
   height: 36px;
   background: transparent;

src/views/materialManagement/distribution/index.vue

@@ -370,7 +370,7 @@
       >
         <template slot-scope="scope">
           <el-button
-            size="mini"
+            size="btu"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
@@ -378,7 +378,7 @@
             >修改</el-button
           >
           <el-button
-            size="mini"
+            size="btd"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"

src/views/militaryvehicleManagement/driver/index.vue

@@ -77,6 +77,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
+        class="box"
           type="warning"
           plain
           icon="el-icon-download"
@@ -821,4 +822,7 @@ export default {
 ::v-deep .el-input__inner {
     border: 1px solid white !important;
 }
+.box{
+  background-color: #ffba00 !important;
+}
 </style>

src/views/militaryvehicleManagement/privateAccessLog/index.vue

@@ -174,6 +174,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
+        class="box"
           type="warning"
           plain
           icon="el-icon-download"
@@ -740,4 +741,7 @@ export default {
 ::v-deep .el-input__inner {
     border: 1px solid white !important;
 }
+.box{
+  background-color: #ffba00 !important;
+}
 </style>

src/views/militaryvehicleManagement/privateCar/index.vue

@@ -84,6 +84,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
+        class="box"
           type="warning"
           plain
           icon="el-icon-download"
@@ -684,4 +685,7 @@ export default {
 ::v-deep ::-webkit-input-placeholder {
   color: #bdbdbd4f !important;
 }
+.box{
+  background-color: #ffba00 !important;
+}
 </style>

src/views/militaryvehicleManagement/thebus/index.vue

@@ -241,13 +241,14 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
+        class="box"
           type="warning"
           plain
           icon="el-icon-download"
           size="mini"
           :loading="exportLoading"
           @click="handleExport"
-          v-hasPermi="['militaryvehicleManagement:thebus:export']"
+          v-hasPermi="['medicalhealth:bdgldurgarchives:export']"
           >导出</el-button
         >
       </el-col>
@@ -981,4 +982,7 @@ export default {
 ::v-deep .el-input__inner {
   border: 1px solid white !important;
 }
+.box{
+  background-color: #ffba00 !important;
+}
 </style>

src/views/militaryvehicleManagement/thebusAccessLog/index.vue

@@ -67,6 +67,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
+        class="box"
           type="warning"
           plain
           icon="el-icon-download"
@@ -652,4 +653,7 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+.box{
+  background-color: #ffba00 !important;
+}
 </style>

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -77,6 +77,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
+        class="box"
           type="warning"
           plain
           icon="el-icon-download"
@@ -1570,5 +1571,8 @@ export default {
 ::v-deep .cell {
   display: flex !important;
 }
+.box{
+  background-color: #ffba00 !important;
+}
 </style>
 

src/views/militaryvehicleManagement/thebusConfig/index.vue

@@ -75,6 +75,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
+        class="box"
           type="warning"
           plain
           icon="el-icon-download"
@@ -719,4 +720,7 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+.box{
+  background-color: #ffba00 !important;
+}
 </style>

src/views/militaryvehicleManagement/thebusThemplate/index.vue

@@ -113,6 +113,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
+        class="box"
           type="warning"
           plain
           icon="el-icon-download"
@@ -366,3 +367,8 @@ export default {
   },
 };
 </script>
+<style scoped>
+.box{
+  background-color: #ffba00 !important;
+}
+</style>

src/views/peopleChuRu/bdglLeave/index.vue

@@ -38,6 +38,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
+        class="box"
           type="warning"
           plain
           icon="el-icon-download"
@@ -1273,6 +1274,7 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
+  border: 1px solid white !important;
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
@@ -1395,4 +1397,7 @@ export default {
 ::v-deep .el-table__fixed-right {
   height: 100% !important;
 }
+::v-deep .box{
+  background-color: #ffba00 !important;
+}
 </style>

src/views/peopleChuRu/leaveOne/index.vue

@@ -16,7 +16,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <el-form-item label="单位" prop="unitId">
+      <el-form-item label="" prop="unitId">
         <treeselect
           v-model="queryParams.unitId"
           :options="deptOptions"
@@ -25,7 +25,7 @@
           @open="blurSelect"
         />
       </el-form-item>
-      <el-form-item label="请假人员" prop="peopleId">
+      <el-form-item label="" prop="peopleId">
         <el-select
           v-model="queryParams.peopleId"
           placeholder="请选择请假人员"
@@ -316,10 +316,10 @@
         </el-date-picker>
       </el-form-item>  -->
       <el-form-item>
-        <el-button type="primary" size="btn" @click="handleQuery"
+        <!-- <el-button type="primary" size="btn" @click="handleQuery"
           >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="btr" @click="resetQuery"
+        > -->
+        <el-button  size="btr" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>
@@ -372,10 +372,10 @@
           v-hasPermi="['peopleChuRu:leaveOne:export']"
         >导出</el-button>
       </el-col> -->
-      <right-toolbar
+      <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
-      ></right-toolbar>
+      ></right-toolbar> -->
     </el-row>
 
     <el-table
@@ -1052,6 +1052,7 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
+  border: 1px solid white !important;
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
@@ -1180,4 +1181,7 @@ export default {
 ::v-deep .el-table__fixed-right {
   height: 100% !important;
 }
+::v-deep .vue-treeselect__control{
+  background-color: transparent !important;
+}
 </style>

src/views/peopleChuRu/peopleBorrow/index.vue

@@ -551,6 +551,7 @@ export default {
   background: transparent;
   color: #fff;
   border-color: #fff;
+  border: 1px solid white !important;
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {