更改基层登

src/api/taishi/taishi.js

@@ -124,4 +124,13 @@ export function selectCount(query) {
     method: 'get',
     params: query
   })
+}
+
+// 态势车辆在位情况
+export function selectCounts(query) {
+  return request({
+    url: '/militaryvehicleManagement/thebus/selectCount',
+    method: 'get',
+    params: query
+  })
 }

src/utils/requests.js

@@ -8,7 +8,9 @@ import Cookies from "js-cookie";
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 配置公共的根路径
 const services = axios.create({
-  baseURL: 'http://114.115.153.156:12090',
+  
+  // 线上地址
+   baseURL: 'http://172.4.5.232:12092',
   // 超时
   timeout: 10000
 })

src/views/PrintsManage/manage/index.vue

@@ -16,6 +16,15 @@
           @input="handleQuery"
         />
       </el-form-item>
+      <el-form-item prop="sendName">
+        <el-input
+          v-model="queryParams.sendName"
+          placeholder="请输入发送人"
+          clearable
+          size="small"
+          @input="handleQuery"
+        />
+      </el-form-item>
       <!-- <el-form-item label="类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择类型" clearable size="small">
           <el-option label="请选择字典生成" value />
@@ -337,6 +346,7 @@
           :inline="true"
           :rules="rules"
           label-width="120px"
+             style="margin-left: 34px"
         >
           <div class="jiben">发送人信息</div>
           <el-form-item label="发送人" prop="sendName">
@@ -522,7 +532,7 @@
         </el-form-item>-->
               <el-form-item
                 label="是否为彩打"
-                label-width="150px"
+                label-width="120px"
                 prop="isPrintColor"
               >
                 <!-- <el-radio-group
@@ -546,7 +556,7 @@
               </el-form-item>
               <el-form-item
                 label="是否为双面打"
-                label-width="150px"
+                label-width="120px"
                 prop="isPrintTwo"
               >
                 <!-- <el-radio-group
@@ -568,6 +578,22 @@
                 <span class="greed" v-if="item.isPrintTwo == '1'"></span>
                 <span class="CCC" v-if="item.isPrintTwo == '0'"></span>
               </el-form-item>
+              <el-form-item
+                label="是否需归还"
+                label-width="120px"
+                prop="isReturns"
+              >
+                <el-switch
+                  v-model="item.isReturn"
+                  active-color="#13ce66"
+                  inactive-color="#ccc"
+                  active-value="1"
+                  inactive-value="0"
+                >
+                </el-switch>
+                <span class="greed" v-if="item.isReturn == '1'"></span>
+                <span class="CCC" v-if="item.isReturn == '0'"></span>
+              </el-form-item>
             </el-form>
           </div>
           <el-form-item style="margin-left: 20px" prop="name">
@@ -626,16 +652,17 @@
         </el-form-item>-->
         </el-form>
       </div>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer" style="margin-right:30px;">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
+
     <!-- 修改集中文印 -->
     <el-dialog
       :title="title1"
       :visible.sync="open1"
-      width="900px"
+      width="940px"
       append-to-body
       :close-on-click-modal="false"
     >
@@ -645,7 +672,7 @@
         :inline="true"
         :rules="rules"
         label-width="120px"
-        style="margin-left: 15px"
+        style="margin-left: 37px"
       >
         <div class="jiben">发送人信息</div>
         <el-form-item label="发送人" prop="sendName">
@@ -732,7 +759,7 @@
         </el-form-item>
         <el-form-item
           label="是否为彩打"
-          label-width="150px"
+          label-width="120px"
           prop="isPrintColor"
         >
           <el-switch
@@ -748,7 +775,7 @@
         </el-form-item>
         <el-form-item
           label="是否为双面打"
-          label-width="150px"
+          label-width="120px"
           prop="isPrintTwo"
         >
           <!-- <el-radio-group
@@ -770,6 +797,18 @@
           <span class="greed" v-if="form1.isPrintTwo == '1'"></span>
           <span class="CCC" v-if="form1.isPrintTwo == '0'"></span>
         </el-form-item>
+        <el-form-item label="是否需归还" label-width="120px" prop="isReturns">
+          <el-switch
+            v-model="form1.isReturn"
+            active-color="#13ce66"
+            inactive-color="#ccc"
+            :active-value="1"
+            :inactive-value="0"
+          >
+          </el-switch>
+          <span class="greed" v-if="form1.isReturn == 1"></span>
+          <span class="CCC" v-if="form1.isReturn == 0"></span>
+        </el-form-item>
         <el-form-item prop="name">
           <!-- <fileUpload v-model="form.file" /> -->
           <el-upload
@@ -795,11 +834,12 @@
         </el-form-item>
       </el-form>
 
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer" style="margin-right:18px;">
         <el-button type="primary" @click="updatesubmit">确 定</el-button>
         <el-button @click="open1 = false" size="btn">取 消</el-button>
       </div>
     </el-dialog>
+
     <el-dialog
       :title="title"
       :visible.sync="dyopen"
@@ -914,6 +954,7 @@
     >
       <div ref="file" v-html="tableau" style="width:100%;"></div>
     </el-dialog> -->
+
     <!-- 添加预览doc文件弹框 -->
     <el-dialog
       style="color: pink"
@@ -933,6 +974,7 @@
         > -->
       </div>
     </el-dialog>
+
     <!-- 预览PDF文件弹框 -->
     <el-dialog
       :title="title3"
@@ -1005,6 +1047,7 @@
         <!-- </div> -->
       </template>
     </el-dialog>
+
     <el-dialog
       :title="title3"
       :visible.sync="open44"
@@ -1213,7 +1256,7 @@ export default {
       open1: false,
       title1: "",
       // 打印备注
-      ramrk:false
+      ramrk: false,
     };
   },
   created() {
@@ -1239,17 +1282,21 @@ export default {
     this.roles = Cookies.get("roles");
   },
   methods: {
+    // 点击上传文件触发
+    fileChange(data) {
+      console.log(1);
+    },
     // 打印点击叉号关闭事件
-    close(){
-      this.ramrk=false
+    close() {
+      this.ramrk = false;
     },
     // 点击是否需要归还触发
-    dianji(data){
-     if(data=='1') {
-       this.ramrk =false
-     }else if(data=='0'){
-       this.ramrk=true
-     }
+    dianji(data) {
+      if (data == "1") {
+        this.ramrk = false;
+      } else if (data == "0") {
+        this.ramrk = true;
+      }
     },
     // 增加工作登记
     addForms() {
@@ -1289,7 +1336,7 @@ export default {
     },
     dycancel() {
       this.dyopen = false;
-      this.ramrk=false
+      this.ramrk = false;
       this.dyreset();
     },
     // 表单重置
@@ -1397,6 +1444,7 @@ export default {
           isPrintColor: null,
           // 是否为双面打
           isPrintTwo: null,
+          isReturn:null
         },
       ]),
         (this.fileList = []);
@@ -1404,6 +1452,8 @@ export default {
       const id = row.id || this.ids;
       getManage(id).then((response) => {
         this.form1 = response.data;
+        console.log(response);
+        console.log(this.form1);
 
         this.form1.isPrintColor = response.data.isPrintColor + "";
         this.form1.isPrintTwo = response.data.isPrintTwo + "";
@@ -1447,10 +1497,10 @@ export default {
             var num = 0;
             var num1 = this.tomList.length;
             for (let index = 0; index < this.tomList.length; index++) {
-              if (this.tomList[index].levelM) {
+              if (this.tomList[index].levelM&&this.tomList[index].printNumber) {
                 num += 1;
               } else {
-                return this.$modal.msgWarning("请选择级别");
+                return this.$modal.msgWarning("请选择级别,份数");
               }
             }
             // this.tomList.forEach((item,i)=>{
@@ -1502,6 +1552,11 @@ export default {
     },
     // 上传前校检格式和大小
     handleBeforeUpload(file) {
+      // if (this.tomList.length > 1) {
+      //   console.log(this.tomList);
+      //    this.$message.error("上传失败, 请重试");
+      //  callback(new Error('请填写必填项'))
+      // } else {
       // 校检文件类型
       this.tomLists.name = file.name;
       this.form1.name = file.name;
@@ -1552,6 +1607,7 @@ export default {
         }
       }
       return true;
+      // }
     },
     // 文件个数超出
     handleExceed() {
@@ -1591,7 +1647,14 @@ export default {
       this.dyform.printNumber = row.printNumber;
       this.dyform.printRoom = row.printRoom;
       this.dyform.type = row.type;
-      // this.dyform.isReturn = row.isReturn + "";
+      this.dyform.isReturn=row.isReturn
+      this.dyform.isReturn = row.isReturn + "";
+      if(row.isReturn=="1"){
+        this.ramrk=false
+      }
+      if(row.isReturn=="0"){
+        this.ramrk=true
+      }
 
       if (row.isPrintColor == 1) {
         this.yaoqiu = "彩打";
@@ -1710,7 +1773,7 @@ export default {
                 };
                 xhr.send();
                 this.dyopen = false;
-                this.ramrk=false
+                this.ramrk = false;
                 this.getList();
               } else {
                 let downloadElement = document.createElement("a");
@@ -1723,7 +1786,7 @@ export default {
                 downloadElement.click(); //点击下载
                 document.body.removeChild(downloadElement);
                 this.dyopen = false;
-                this.ramrk=false
+                this.ramrk = false;
                 this.printshow = true;
                 this.getList();
               }

src/views/combatduty/Quantitative/index.vue

@@ -85,12 +85,7 @@
               {{ 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">
               作 战 值 班 员
@@ -99,22 +94,29 @@
               {{ 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-left">值 班 通 信 员</div>
             <div class="wrap-top-left-top-item-right">
-              {{ this.GreatDuty1.dutyOffierName }}
+              {{ this.GreatDuty1.messengerName }}
             </div>
           </div>
+        </div>
+        <div style="width: 100%; display: flex">
           <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-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">
-              {{ this.GreatDuty1.politicalName }}
+              {{ this.GreatDuty1.dutyOffierName }}
             </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; 队 -->
@@ -131,9 +133,11 @@
         </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-left" style="width: 120px">
+              政治工作部值班员
+            </div>
             <div class="wrap-top-left-top-item-right">
-              {{ this.GreatDuty1.dutyOffierName }}
+              {{ this.GreatDuty1.politicalName }}
             </div>
           </div>
           <div class="wrap-top-left-top-item">

src/views/combatduty/regisdutyinfo/index.vue

@@ -318,7 +318,7 @@
           </el-form-item>
           <el-form-item label="值班日期" prop="attendedTime">
             <el-date-picker
-              clearable
+              clearablerelatives
               size="small"
               v-model="item.attendedTime"
               type="date"
@@ -327,7 +327,17 @@
             >
             </el-date-picker>
           </el-form-item>
-          <el-form-item style="margin-left: 156px">
+           <el-form-item label="是否值班" prop="isnoduty">
+            <el-select v-model="item.isonduty" placeholder="">
+              <el-option
+                v-for="dict in zhiban"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item >
             <el-button
               type="primary"
               icon="el-icon-plus"
@@ -436,6 +446,16 @@
           >
           </el-date-picker>
         </el-form-item>
+           <el-form-item label="是否值班" prop="isnoduty">
+            <el-select v-model="form.isonduty" placeholder="">
+              <el-option
+                v-for="dict in zhiban"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
         <div class="jiben">装备情况</div>
         <el-form-item label="" prop="remarks">
           <el-input v-model="form.remarks" type="textarea" placeholder="" />
@@ -469,6 +489,17 @@ export default {
       loading: true,
       // 导出遮罩层
       exportLoading: false,
+      // 是否值班
+      zhiban:[
+        {
+          label:"是",
+          value:"0"
+        },
+         {
+          label:"否",
+          value:"1"
+        }
+      ],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -516,6 +547,8 @@ export default {
           equipmentStates: null,
           attendedTime: null,
           standbyPosition: null,
+          isonduty:null
+          
         },
       ],
       // 修改弹出层显示与隐藏
@@ -542,6 +575,7 @@ export default {
         equipmentStates: null,
         attendedTime: null,
         standbyPosition: null,
+        isonduty:null
       });
     },
     //删除多个基本信息
@@ -567,6 +601,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.open1=false
       this.reset();
     },
     // 表单重置
@@ -593,6 +628,7 @@ export default {
           equipmentStates: null,
           attendedTime: null,
           standbyPosition: null,
+          isonduty:null
         },
       ];
       this.resetForm("form");
@@ -641,7 +677,6 @@ export default {
             });
           } else {
             this.form.regisDutyList = this.relatives;
-
             addRegisdutyinfo(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

src/views/grassrootsregistration/bdglarmament/index.vue

@@ -7,22 +7,9 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <!-- <el-form-item label="" prop="unitId">
-        <el-select
-          v-model="queryParams.unitId"
-          placeholder="请选择单位"
-          @change="host"
-        >
-          <el-option
-            v-for="(item, i) in deptOptions"
-            :key="i"
-            :label="item.deptName"
-            :value="item.deptId"
-            class="input_xiala"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item> -->
+    <el-form-item prop="unitName">
+      <el-input placeholder="请输入单位" v-model="queryParams.unitName" @input="handleQuery"/>
+      </el-form-item>
       <el-form-item label="" prop="recordDate">
         <el-date-picker
           clearable

src/views/grassrootsregistration/bdglcookbook/index.vue

@@ -7,23 +7,9 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <!-- <el-form-item label="" prop="unitId">
-        <el-select
-          v-model="queryParams.unitId"
-          placeholder="请选择单位"
-          @change="host"
-          clearable
-        >
-          <el-option
-            v-for="(item, i) in deptOptionss"
-            :key="i"
-            :label="item.deptName"
-            :value="item.deptId"
-            class="input_xiala"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item> -->
+      <el-form-item prop="unitName">
+      <el-input placeholder="请输入单位" v-model="queryParams.unitName" @input="handleQuery"/>
+      </el-form-item>
       <el-form-item label="" prop="createtime">
         <el-date-picker
           clearable

src/views/grassrootsregistration/bdgldrill/index.vue

@@ -6,7 +6,15 @@
       :inline="true"
       v-show="showSearch"
       label-width="68px"
+      class="shouForm"
     >
+      <el-form-item prop="unitname">
+        <el-input
+          placeholder="请输入单位"
+          v-model="queryParams.unitname"
+          @input="handleQuery"
+        />
+      </el-form-item>
       <!-- <el-form-item label="训练项目" prop="project">
         <el-input
           v-model="queryParams.project"
@@ -139,19 +147,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <!-- <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
-      </el-form-item> -->
+      <el-form-item>
+        <el-button size="btr" @click="resetQuery">重置</el-button>
+      </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -243,7 +241,12 @@
           <span>{{ parseTime(scope.row.drillEndtime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="单位" align="center" prop="unitname" />
+      <el-table-column
+        label="单位"
+        align="center"
+        prop="unitname"
+        width="200"
+      />
       <!-- <el-table-column label="应训" align="center" prop="oughtTo" /> -->
       <el-table-column
         label="文件名称"
@@ -315,7 +318,19 @@
         label-width="120px"
       >
         <div class="jiben">基本信息</div>
-        <el-form-item label="训练类别" prop="trainingCategory">
+        <el-form-item label="单位" prop="unitId">
+          <treeselect
+            @select="selectPeo"
+            v-model="form.unitId"
+            :options="rese"
+            placeholder="请选择单位"
+          />
+        </el-form-item>
+        <el-form-item
+          label="训练类别"
+          prop="trainingCategory"
+          style="margin-left: 100px"
+        >
           <!-- <el-input
             v-model="form.trainingCategory"
             placeholder="请输入训练类别"
@@ -334,7 +349,7 @@
         <el-form-item
           label="证明材料"
           prop="project2"
-          style="display: inline-block; width: 550px"
+          style="display: inline-block; width: 900px"
         >
           <!-- <input
             type="text"
@@ -509,14 +524,6 @@
             >添加人员</el-button
           >
         </el-row>
-        <el-form-item label="单位" prop="unitId" style="margin-left: -60px">
-          <treeselect
-            @select="selectPeo"
-            v-model="form.unitId"
-            :options="rese"
-            placeholder="请选择单位"
-          />
-        </el-form-item>
         <el-table
           :data="drillFus"
           :header-cell-style="{ background: '#003C69', color: 'white' }"
@@ -590,7 +597,20 @@
         label-width="120px"
       >
         <div class="jiben">基本信息</div>
-        <el-form-item label="训练类别" prop="trainingCategory">
+        <el-form-item label="单位" prop="unitId">
+          <treeselect
+            @select="selectPeo"
+            v-model="form.unitId"
+            :options="rese"
+            placeholder="请选择单位"
+            disabled
+          />
+        </el-form-item>
+        <el-form-item
+          label="训练类别"
+          prop="trainingCategory"
+          style="margin-left: 100px"
+        >
           <!-- <el-input
             v-model="form.trainingCategory"
             placeholder="请输入训练类别"
@@ -609,7 +629,7 @@
         <el-form-item
           label="证明材料"
           prop="project2"
-          style="display: inline-block; width: 550px"
+          style="display: inline-block; width: 900px"
         >
           <!-- <input
             type="text"
@@ -785,15 +805,6 @@
             >添加人员</el-button
           >
         </el-row>
-        <el-form-item label="单位" prop="unitId" style="margin-left: -60px">
-          <treeselect
-            @select="selectPeo"
-            v-model="form.unitId"
-            :options="rese"
-            placeholder="请选择单位"
-            disabled
-          />
-        </el-form-item>
         <el-table
           :data="drillFus"
           :header-cell-style="{ background: '#003C69', color: 'white' }"
@@ -885,7 +896,7 @@ import {
   treeselect,
   getweekwork,
   drillFu,
-  treeselects
+  treeselects,
 } from "@/api/grassrootsregistration/bdgldrill";
 import bdgldrill from "@/components/look_word/bdgldrill.vue";
 // 导入树形结构
@@ -951,7 +962,9 @@ export default {
         assessment: false,
       },
       // 表单校验
-      rules: {},
+      rules: {
+        unitId: [{ required: true, message: "请选择单位", trigger: "blur" }],
+      },
       cities: ["安全训练"],
       cities2: ["主官组训施教"],
       cities3: ["针对性训练"],
@@ -1118,14 +1131,18 @@ export default {
       this.getQuanShu();
       const id = row.id || this.ids;
       getBdgldrill(id).then((response) => {
-        this.fiel = [
-          {
-            name: response.data.filename,
-            url: response.data.filepath,
-          },
-        ];
         this.form = response.data;
-        this.form.filepath = this.fiel;
+        if (response.data.filename != null || response.data.filepath != null) {
+          this.fiel = [
+            {
+              name: response.data.filename,
+              url: response.data.filepath,
+            },
+          ];
+
+          this.form.filepath = this.fiel;
+        }
+
         if (this.form.safety == 1) {
           this.form.safety = true;
         } else {
@@ -1270,7 +1287,7 @@ export default {
     },
     // 单位选择触发
     selectPeo(data) {
-      this.form.unitName = data.label;
+      this.form.unitname = data.label;
       this.getRen(data.id);
     },
     // 获取人员
@@ -1395,4 +1412,7 @@ export default {
 #chakan /deep/ .el-dialog__body {
   padding: 30px 64px;
 }
+.shouForm /deep/ .el-input__inner {
+  width: 220px;
+}
 </style>

src/views/grassrootsregistration/bdglequip/index.vue

@@ -7,22 +7,9 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <!-- <el-form-item label="" prop="unitId">
-        <el-select
-          v-model="queryParams.unitId"
-          placeholder="请输入单位"
-          @change="company"
-        >
-          <el-option
-            v-for="item in BuMeng"
-            :key="item.deptId"
-            :label="item.deptName"
-            :value="item.deptId"
-            class="input_xiala"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item> -->
+       <el-form-item prop="unitName">
+      <el-input placeholder="请输入配发单位" v-model="queryParams.unitName" @input="handleQuery"/>
+      </el-form-item>
       <el-form-item label="" prop="granttime">
         <el-date-picker
           clearable

src/views/grassrootsregistration/bdgleven/index.vue

@@ -7,23 +7,9 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <!-- <el-form-item prop="unitId">
-        <el-select
-          v-model="queryParams.unitId"
-          placeholder="请选择单位"
-          @change="host"
-          class="input_xiala"
-        >
-          <el-option
-            v-for="(item, i) in buMens"
-            :key="i"
-            :label="item.deptName"
-            :value="item.deptId"
-            class="input_xiala"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item> -->
+      <el-form-item prop="unitName">
+      <el-input placeholder="请输入单位" v-model="queryParams.unitName" @input="handleQuery"/>
+      </el-form-item>
 
       <el-form-item label="" prop="compereId">
         <el-select

src/views/grassrootsregistration/bdglfilemanagement/index.vue

@@ -7,22 +7,9 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <!-- <el-form-item prop="unitId">
-        <el-select
-          v-model="queryParams.unitId"
-          placeholder="请选择单位"
-          @change="host"
-        >
-          <el-option
-            v-for="(item, i) in deptOption"
-            :key="i"
-            :label="item.deptName"
-            :value="item.deptId"
-            class="input_xiala"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item> -->
+       <el-form-item prop="deptName">
+      <el-input placeholder="请输入单位" v-model="queryParams.deptName" @input="handleQuery"/>
+      </el-form-item>
       <el-form-item prop="confidential">
         <el-input
           v-model="queryParams.confidential"

src/views/grassrootsregistration/bdglfood/index.vue

@@ -7,22 +7,9 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <!-- <el-form-item label="" prop="unitId">
-        <el-select
-          v-model="queryParams.unitId"
-          placeholder="请选择单位"
-          @change="host"
-        >
-          <el-option
-            v-for="(item, i) in deptOptionss"
-            :key="i"
-            :label="item.deptName"
-            :value="item.deptId"
-            class="input_xiala"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item> -->
+       <el-form-item prop="unitName">
+      <el-input placeholder="请输入单位" v-model="queryParams.unitName" @input="handleQuery"/>
+      </el-form-item>
       <el-form-item label="" prop="peopleId">
         <el-select
           v-model="queryParams.peopleId"

src/views/grassrootsregistration/bdglmeeting/index.vue

@@ -7,34 +7,8 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <!-- <el-form-item label="" prop="unitId">
-        <el-select
-          v-model="queryParams.unitId"
-          placeholder="请输入单位"
-          @change="company"
-        >
-          <el-option
-            v-for="item in buMeng"
-            :key="item.deptId"
-            :label="item.deptName"
-            :value="item.deptId"
-            class="input_xiala"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item> -->
-      <el-form-item label="" prop="convokeTime">
-        <el-date-picker
-          clearable
-          size="small"
-          v-model="queryParams.convokeTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择召开时间"
-          @change="tiem"
-          :editable="false"
-        >
-        </el-date-picker>
+     <el-form-item prop="deptName">
+      <el-input placeholder="请输入单位" v-model="queryParams.deptName" @input="handleQuery"/>
       </el-form-item>
 
       <el-form-item label="" prop="compereId">

src/views/grassrootsregistration/bdglparty/index.vue

@@ -7,23 +7,9 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <!-- <el-form-item label="" prop="unitId">
-        <el-select
-          v-model="queryParams.unitId"
-          placeholder="请选择单位"
-          @change="Company"
-          class="input_xiala"
-        >
-          <el-option
-            v-for="item in buMeng"
-            :key="item.deptId"
-            :label="item.deptName"
-            :value="item.deptId"
-            class="input_xiala"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item> -->
+     <el-form-item prop="unitName">
+      <el-input placeholder="请输入单位" v-model="queryParams.unitName" @input="handleQuery"/>
+      </el-form-item>
       <el-form-item label="" prop="compereId">
         <el-select
           v-model="queryParams.compereId"

src/views/grassrootsregistration/bdglpublicproperty/index.vue

@@ -7,22 +7,9 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <!-- <el-form-item label="" prop="unitId">
-        <el-select
-          v-model="queryParams.unitId"
-          placeholder="请选择单位"
-          @change="host"
-        >
-          <el-option
-            v-for="(item, i) in deptOptionss"
-            :key="i"
-            :label="item.deptName"
-            :value="item.deptId"
-            class="input_xiala"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item> -->
+       <el-form-item prop="unitName">
+      <el-input placeholder="请输入单位" v-model="queryParams.unitName" @input="handleQuery"/>
+      </el-form-item>
       <el-form-item prop="name">
         <el-input
           v-model="queryParams.name"

src/views/grassrootsregistration/bdglsecrecy/index.vue

@@ -7,6 +7,9 @@
       v-show="showSearch"
       label-width="68px"
     >
+    <el-form-item prop="deptName">
+      <el-input placeholder="请输入单位" v-model="queryParams.deptName" @input="handleQuery"/>
+      </el-form-item>
       <el-form-item label="" prop="kind">
         <el-select
           v-model="queryParams.kind"

src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -7,22 +7,9 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <!-- <el-form-item label="" prop="unitId">
-        <el-select
-          v-model="queryParams.unitId"
-          placeholder="请选择单位"
-          @change="company"
-        >
-          <el-option
-            v-for="item in buMeng"
-            :key="item.deptId"
-            :label="item.deptName"
-            :value="item.deptId"
-            class="input_xiala"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item> -->
+      <el-form-item prop="deptName">
+      <el-input placeholder="请输入单位" v-model="queryParams.deptName" @input="handleQuery"/>
+      </el-form-item>
       <el-form-item label="" prop="compereId">
         <el-select
           v-model="queryParams.compereId"

src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -7,22 +7,9 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <!-- <el-form-item prop="unitId">
-        <el-select
-          v-model="queryParams.unitId"
-          placeholder="请选择单位"
-          @change="host"
-        >
-          <el-option
-            v-for="(item, i) in deptOptionss"
-            :key="i"
-            :label="item.deptName"
-            :value="item.deptId"
-            class="input_xiala"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item> -->
+      <el-form-item prop="unitName">
+      <el-input placeholder="请输入单位" v-model="queryParams.unitName" @input="handleQuery"/>
+      </el-form-item>
       <el-form-item label="" prop="time">
         <el-date-picker
           clearable

src/views/grassrootsregistration/statistics/index.vue

@@ -7,6 +7,9 @@
       v-show="showSearch"
       label-width="68px"
     >
+     <el-form-item prop="unitName">
+      <el-input placeholder="请输入单位" v-model="queryParams.unitName" @input="handleQuery" style=""/>
+      </el-form-item>
       <!-- <el-form-item label="" prop="unitId">
         <el-input
           v-model="queryParams.unitId"
@@ -43,7 +46,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <!-- <el-form-item> -->
+      <el-form-item>
       <!-- <el-button
           type="primary"
           icon="el-icon-search"
@@ -51,8 +54,8 @@
           @click="handleQuery"
           >搜索</el-button
         > -->
-      <!-- <el-button size="btr" @click="resetQuery">重置</el-button>
-      </el-form-item> -->
+      <el-button size="btr" @click="resetQuery">重置</el-button>
+      </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -598,4 +601,11 @@ export default {
 ::v-deep .docx-wrapper section{
   padding: 0pt 90pt !important;
 }
+::v-deep .el-input__inner {
+  /* width: 200px !important;
+  height: 36px; */
+  background: transparent;
+  color: #fff;
+  border-color: #fff !important;
+}
 </style>

src/views/monitoring/cameracp/index.vue

@@ -237,7 +237,7 @@
           <el-input v-model="form.caddr" placeholder="请输入访问地址" />
         </el-form-item>
 
-        <el-form-item label="单屏">
+        <!-- <el-form-item label="单屏">
           <el-switch
             v-model="form.cstatus"
             active-color="#13ce66"
@@ -248,7 +248,7 @@
           </el-switch>
           <span class="greed" v-if="form.cstatus == '1'"></span>
           <span class="CCC" v-if="form.cstatus == '0'"></span>
-        </el-form-item>
+        </el-form-item> -->
         <!-- <el-form-item label="单位id" prop="unitid">
           <el-input v-model="form.unitid" placeholder="请输入单位id" />
         </el-form-item> -->

src/views/peopleChuRu/bdglLeave/index.vue

@@ -81,22 +81,16 @@
         label="请假开始时间"
         align="center"
         prop="startTime"
-        width="100"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
+        width="200"
+      />
+      
       <el-table-column
         label="请假结束时间"
         align="center"
         prop="endTime"
-        width="100"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
+        width="200"
+     />
+
       <el-table-column label="请假类型" align="center" prop="leaveType">
         <template slot-scope="scope">
           <dict-tag
@@ -116,14 +110,16 @@
         label="离队时间"
         align="center"
         prop="departureTime"
-        width="100"
+        width="200"
       />
+  
       <el-table-column
         label="归队时间"
         align="center"
         prop="returnTime"
-        width="100"
+        width="200"
       />
+  
       <el-table-column label="是否归队" align="center" prop="isReturn">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_is" :value="scope.row.isReturn" />
@@ -401,9 +397,10 @@
             clearable
             size="small"
             v-model="form.startTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+            type="datetime"
+            default-time="00:00:00"
             placeholder="选择请假开始时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>
@@ -412,9 +409,10 @@
             clearable
             size="small"
             v-model="form.endTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+            type="datetime"
+            default-time="00:00:00"
             placeholder="选择请假结束时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>
@@ -436,9 +434,10 @@
             clearable
             size="small"
             v-model="form.departureTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请输入离队时间"
+            type="datetime"
+            default-time="00:00:00"
+            placeholder="选择离队时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>
@@ -448,9 +447,10 @@
             clearable
             size="small"
             v-model="form.returnTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请输入归队时间"
+            type="datetime"
+            default-time="00:00:00"
+            placeholder="选择归队时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>
@@ -461,6 +461,8 @@
             filterable
             placeholder="请输入一级审批人"
             ref="abcdef"
+            clearable
+            @clear="peopleIdOne"
           >
             <el-option
               v-for="(item, i) in lianJiRen"
@@ -480,6 +482,8 @@
             filterable
             placeholder="请输入二级审批人"
             ref="abcde"
+            clearable
+            @clear="peopleIdTwo"
           >
             <el-option
               v-for="(item, i) in yingJiRen"
@@ -499,6 +503,8 @@
             filterable
             placeholder="请输入三级审批人"
             ref="abcd"
+            clearable
+            @clear="peopleIdThere"
           >
             <el-option
               v-for="(item, i) in zhengZhiRen"
@@ -600,9 +606,10 @@
             clearable
             size="small"
             v-model="form.startTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+             type="datetime"
+            default-time="00:00:00"
             placeholder="选择请假开始时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>
@@ -611,9 +618,10 @@
             clearable
             size="small"
             v-model="form.endTime"
-            type="date"
-            value-format="yyyy-MM-dd"
             placeholder="选择请假结束时间"
+             type="datetime"
+            default-time="00:00:00"
+            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>
@@ -635,9 +643,10 @@
             clearable
             size="small"
             v-model="form.departureTime"
-            type="date"
-            value-format="yyyy-MM-dd"
             placeholder="请输入离队时间"
+             type="datetime"
+            default-time="00:00:00"
+            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>
@@ -647,9 +656,10 @@
             clearable
             size="small"
             v-model="form.returnTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请输入归队时间"
+             type="datetime"
+            default-time="00:00:00"
+            placeholder="选择归队时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>
@@ -661,6 +671,7 @@
             placeholder="请输入一级审批人"
             ref="abcdef"
             :disabled="xiugai"
+            clearable
           >
             <el-option
               v-for="(item, i) in lianJiRen"
@@ -681,6 +692,7 @@
             placeholder="请输入二级审批人"
             ref="abcde"
             :disabled="xiugai"
+            clearable
           >
             <el-option
               v-for="(item, i) in yingJiRen"
@@ -701,6 +713,7 @@
             placeholder="请输入三级审批人"
             ref="abcd"
             :disabled="xiugai"
+            clearable
           >
             <el-option
               v-for="(item, i) in zhengZhiRen"
@@ -803,9 +816,10 @@
             clearable
             size="small"
             v-model="form.startTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+            type="datetime"
+            default-time="00:00:00"
             placeholder="选择请假开始时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
             disabled
           >
           </el-date-picker>
@@ -815,9 +829,10 @@
             clearable
             size="small"
             v-model="form.endTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+            type="datetime"
+            default-time="00:00:00"
             placeholder="选择请假结束时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
             disabled
           >
           </el-date-picker>
@@ -844,9 +859,10 @@
             clearable
             size="small"
             v-model="form.departureTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请输入离队时间"
+             type="datetime"
+            default-time="00:00:00"
+            placeholder="选择离队时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
             disabled
           >
           </el-date-picker>
@@ -857,9 +873,10 @@
             clearable
             size="small"
             v-model="form.returnTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请输入归队时间"
+            type="datetime"
+            default-time="00:00:00"
+            placeholder="选择归队时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
             disabled
           >
           </el-date-picker>
@@ -872,6 +889,7 @@
             placeholder="请输入一级审批人"
             ref="abcdef"
             disabled
+            clearable
           >
             <el-option
               v-for="(item, i) in lianJiRen"
@@ -892,6 +910,7 @@
             placeholder="请输入二级审批人"
             ref="abcde"
             disabled
+            clearable
           >
             <el-option
               v-for="(item, i) in yingJiRen"
@@ -1020,9 +1039,10 @@
             clearable
             size="small"
             v-model="form.startTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+            type="datetime"
+            default-time="00:00:00"
             placeholder="选择请假开始时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
             disabled
           >
           </el-date-picker>
@@ -1032,9 +1052,10 @@
             clearable
             size="small"
             v-model="form.endTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+             type="datetime"
+            default-time="00:00:00"
             placeholder="选择请假结束时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
             disabled
           >
           </el-date-picker>
@@ -1058,9 +1079,10 @@
             clearable
             size="small"
             v-model="form.departureTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请输入离队时间"
+           type="datetime"
+            default-time="00:00:00"
+            placeholder="选择离队时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
             disabled
           >
           </el-date-picker>
@@ -1070,9 +1092,10 @@
             clearable
             size="small"
             v-model="form.returnTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请输入归队时间"
+             type="datetime"
+            default-time="00:00:00"
+            placeholder="选择归队时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
             disabled
           >
           </el-date-picker>
@@ -1288,6 +1311,9 @@ export default {
         contents: null,
         statusd: null,
         rejoin: null,
+        peopleName1: null,
+        peopleName2: null,
+        peopleName3: null,
       },
       // 表单参数
       form: {},
@@ -1378,22 +1404,34 @@ export default {
     this.getZheng();
   },
   methods: {
+    // 一级审批人清除按钮触发
+    peopleIdOne() {
+      this.form.peopleName1 = null;
+    },
+    // 二级审批人清除按钮触发
+    peopleIdTwo() {
+      this.form.peopleName2 = null;
+    },
+    // 三级审批人清除按钮触发
+    peopleIdThere() {
+      this.form.peopleName3 = null;
+    },
     // 营级人员
     getYing() {
       YingJIUSer().then((res) => {
-        this.yingJiRen=res.data
+        this.yingJiRen = res.data;
       });
     },
     // 连级人员
     getLiai() {
       LIanJIUSer().then((res) => {
-        this.lianJiRen=res.data
+        this.lianJiRen = res.data;
       });
     },
     // 政治人员
     getZheng() {
       ZhengZhiUSer().then((res) => {
-        this.zhengZhiRen=res.data
+        this.zhengZhiRen = res.data;
       });
     },
 
@@ -1473,7 +1511,7 @@ export default {
     // 查询请假类型
     getdict() {
       getDicts(this.dictType.dictType).then((res) => {
-        res.data.splice(0,1)
+        res.data.splice(0, 1);
         this.ziDian = res.data;
       });
     },

src/views/phone/cabinet/index.vue

@@ -324,18 +324,6 @@ export default {
         this.departmentName = res.data.infos[0].departmentName;
         this.loading = false;
       });
-      // axios
-      //   .get("http://114.115.153.156:12090/wl/api/v1/log/grid", {
-      //     params,
-      //     headers: { Authorization: Cookies.get("accessToken") },
-      //   })
-      //   .then((res) => {
-      //     this.tableData = res.data.infos;
-      //     this.total = res.data.totalCount;
-      //     this.happenTime = res.data.infos[0].happenTime;
-      //     this.departmentName = res.data.infos[0].departmentName;
-      //     this.loading = false;
-      //   });
     },
     // 点击名字触发
     buttOn(row, data) {
@@ -344,7 +332,7 @@ export default {
       this.stoneState = data.stoneState;
       this.queryParams.pageNo = 1;
       this.offMeng();
-      this.open = true;
+      // this.open = true;
       this.title = "柜子记录";
     },
     // 点击返回触发
@@ -377,26 +365,6 @@ export default {
           }
         });
       });
-      // axios
-      //   .get("http://114.115.153.156:12090/wl/api/v1/grids", {
-      //     params: { cabinetNum },
-      //     headers: { Authorization: Cookies.get("accessToken") },
-      //   })
-      //   .then((res) => {
-      //     console.log(res);
-      //     this.gridList = res.data.infos;
-      //     this.gridList.forEach((item) => {
-      //       if (item.gridState == "手机未放入") {
-      //         this.red += 1;
-      //       } else if (item.gridState == "手机已存放") {
-      //         this.green += 1;
-      //       } else if (item.gridState == "人员请假") {
-      //         this.yellow += 1;
-      //       } else {
-      //         this.grey += 1;
-      //       }
-      //     });
-      //   });
     },
     /** 查询手机柜列表 */
     getList() {

src/views/pt.vue

@@ -820,27 +820,12 @@ export default {
         })
         .catch(() => {});
     },
-    // 手机柜线上地址console
+    // 手机柜线S地址console
     xianShang() {
-      // var today = new Date();
-      // var h = today.getHours();
-      // var m = today.getMinutes();
-      // var s = today.getSeconds();
-      // h = h + 2;
-      // if (h < 10) {
-      //   h = "0" + h;
-      // }
-      // if (m < 10) {
-      //   m = "0" + m;
-      // }
-      // if (s < 10) {
-      //   s = "0" + s;
-      // }
-      // let csrftoken = h + ":" + m + ":" + s;
-
-      // document.cookie = "tiem" + "=" + new Date();
       axios
-        .post("http://114.115.153.156:12090/wl/api/getAccessToken", {
+          // 线上地址
+           .post("http://172.4.5.232:12092/wl/api/getAccessToken", {
+          
           password: "super123fs456wl",
           username: "admin",
         })

src/views/taishi/index.vue

@@ -186,7 +186,7 @@
                     font-size: 1.6rem;
                   "
                 >
-                  119
+                  {{junCat[4]}}
                 </td>
               </tr>
             </table>
@@ -205,7 +205,7 @@
                     font-size: 1.6rem;
                   "
                 >
-                  107
+                  {{junCat[6]}}
                 </td>
               </tr>
             </table>
@@ -225,32 +225,32 @@
                     font-size: 1.6rem;
                   "
                 >
-                  12
+                  {{junCat[5]}}
                 </td>
               </tr>
             </table>
             <div class="center4_b">
               总计
               <span style="color: #30fdff; float: right; margin-right: 20px"
-                >71</span
+                >{{junCat[0]}}</span
               >
             </div>
             <div class="center4_b">
               在位
               <span style="color: #fde17b; float: right; margin-right: 20px"
-                >52</span
+                >{{junCat[1]}}</span
               >
             </div>
             <div class="center4_b">
               外出
               <span style="color: #f0422a; float: right; margin-right: 20px"
-                >19</span
+                >{{junCat[2]}}</span
               >
             </div>
             <div class="center4_b">
               出车统计
               <span style="color: #f0422a; float: right; margin-right: 20px"
-                >3</span
+                >{{junCat[3]}}</span
               >
             </div>
           </div>
@@ -504,33 +504,7 @@
               <div id="center3_d"></div>
             </div>
           </div>
-          <div class="center4">
-            <div class="left1-head">
-              <span style="margin-left: 55px">人员请销假</span>
-            </div>
-            <div id="center4_d">
-              <div class="right2_d" style="margin-left: 3%">
-                今日迟到
-                <span>0</span>
-              </div>
-              <div class="right2_d">
-                本月迟到
-                <span>0</span>
-              </div>
-              <div class="right2_d">
-                今日应归队
-                <span>{{ qjlist.yingGuiDui }}</span>
-              </div>
-              <div class="right2_b">
-                超时归队
-                <span>{{ qjlist.chaoShi }}</span>
-              </div>
-              <div class="right2_b">
-                未归队
-                <span>{{ qjlist.weiGui }}</span>
-              </div>
-            </div>
-          </div>
+      
         </div>
         <div class="center-a">
           <img src="../../assets/images/右上角.png" alt class="left1-jrt" />
@@ -1076,6 +1050,7 @@ import {
   zaiweipeopleGet,
   listTraining,
   selectCount,
+  selectCounts
 } from "@/api/taishi/taishi";
 import * as echarts from "echarts";
 import vueSeamlessScroll from "vue-seamless-scroll";
@@ -1167,6 +1142,8 @@ export default {
       yueJiHua: {},
       // 装备统计
       zhuangBei: [],
+      // 军车统计
+      junCat:[]
     };
   },
   created() {
@@ -1263,22 +1240,13 @@ export default {
     antiepidemicArchivesList().then((res) => {
       this.fylist = res.data;
     });
-    //人员请销假
-    getLeavlNumber().then((res) => {
-      for (var i in res.data) {
-        if (res.data[i] >= 0) {
-          res.data[i];
-        } else {
-          res.data[i] = 0;
-        }
-      }
-      this.qjlist = res.data;
-    });
     this.startTime();
     // 军事训练月统计
     this.getJunShiTongJi();
     // 装备值班统计
     this.getZhuangBei();
+    // 军车统计
+    this.getCarList()
   },
   mounted() {
     this.$forceUpdate();
@@ -1297,17 +1265,22 @@ export default {
     this.center4();
   },
   methods: {
+    // 军车车辆统计
+    getCarList(){
+      selectCounts().then(res=>{
+        this.junCat=res.data
+        console.log(res);
+      })
+    },
     // 装备值班情况
     getZhuangBei() {
       selectCount().then((res) => {
-        console.log(res);
         this.zhuangBei = res.data;
       });
     },
     // 军事训练月统计情况
     getJunShiTongJi() {
       listTraining().then((res) => {
-        console.log(res);
         this.yueJiHua = res.data;
       });
     },
@@ -2523,12 +2496,12 @@ export default {
 
 #center2_d {
   width: 100%;
-  height: 87%;
+  height:130%;
 }
 
 #center3_d {
   width: 100%;
-  height: 87%;
+  height: 140%;
 }
 
 .center3 {