PY-2022.1 <Faith@DESKTOP-FQ04LTL Merge branch 'master'

src/api/combatduty/Quantitative.js

@@ -1,50 +1,57 @@
 import request from '@/utils/request'
 // 获取基地值班的信息
 export function getTodayzhiban() {
-    return request({
-      url: '/combatduty/quantistatis/todayzhiban',
-      method: 'get',
-    })
+  return request({
+    url: '/combatduty/quantistatis/todayzhiban',
+    method: 'get',
+  })
 }
 
 // 获取大队值班接口
-export function greatDuty(){
+export function greatDuty() {
+  return request({
+    url: "/combatduty/quantistatis/daduizhiban",
+    method: "get"
+  })
+}
+// 获取大队值班分队数量
+export function greatDutys() {
   return request({
-    url:"/combatduty/quantistatis/daduizhiban",
-    method:"get"
+    url: "/combatduty/quantistatis/getdaDuiZhiBanNumber",
+    method: "get"
   })
 }
 
 // 获取军车值班接口
-export function militaryDuty() { 
+export function militaryDuty() {
   return request({
-    url:"/combatduty/quantistatis/junchezhiban",
-    method:"get"
+    url: "/combatduty/quantistatis/junchezhiban",
+    method: "get"
   })
 }
 
 // 获取装备值班接口
-export function equipment(){
+export function equipment() {
   return request({
-    url:"/combatduty/quantistatis/zhuangbeizhiban",
-    method:"get"
+    url: "/combatduty/quantistatis/zhuangbeizhiban",
+    method: "get"
   })
 }
 
 // 获取执行任务人员情况接口
-export function zhixingrenwu(){
+export function zhixingrenwu() {
   return request({
-    url:"/combatduty/taskdutyinfo/list",
-    method:"get"
+    url: "/combatduty/taskdutyinfo/list",
+    method: "get"
   })
 }
 
 
 // 获取执行任务人员情况接口
-export function listshow(){
+export function listshow() {
   return request({
-    url:"/combatduty/quantistatis/listshow",
-    method:"get"
+    url: "/combatduty/quantistatis/listshow",
+    method: "get"
   })
 }
 

src/api/combatduty/militarydutyinfo.js

@@ -80,10 +80,10 @@ export function getDept(query) {
 
 
 //车牌号 
-export function getthebus(query) {
+export function getthebus(status) {
   return request({
     url: '/militaryvehicleManagement/thebus/list',
     method: 'get',
-    params: query
+    params: { status: status }
   })
 }

src/api/grassrootsregistration/bdglmeeting.js

@@ -76,7 +76,7 @@ export function getZhuChiRen(data) {
     params: { deptId: data }
   })
 }
-// 查询所在单位首长
+// 查询所在单位首长(用户，不包含自己)
 export function getUser(data) {
   return request({
     url: '/grassrootsregistration/common/getUsers',
@@ -84,7 +84,7 @@ export function getUser(data) {
     params: { deptId: data }
   })
 }
-// 查询所有人员首长
+// 查询所有人员首长(用户)
 export function getUsers(data) {
   return request({
     url: '/grassrootsregistration/common/getUser',
@@ -92,7 +92,14 @@ export function getUsers(data) {
     params: { deptId: data }
   })
 }
-
+// 查询所在单位首长(用户，包含自己)
+export function getUserzs(data) {
+  return request({
+    url: 'system/user/list',
+    method: 'get',
+    params: { deptId: data }
+  })
+}
 // 获取实力情况
 export function getShiLi(query) {
   return request({

src/api/monitoringcp/cameracp.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询安防监控列表
+export function listCameracp(query) {
+  return request({
+    url: '/monitoringcp/cameracp/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询安防监控详细
+export function getCameracp(id) {
+  return request({
+    url: '/monitoringcp/cameracp/' + id,
+    method: 'get'
+  })
+}
+
+// 新增安防监控
+export function addCameracp(data) {
+  return request({
+    url: '/monitoringcp/cameracp',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改安防监控
+export function updateCameracp(data) {
+  return request({
+    url: '/monitoringcp/cameracp',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除安防监控
+export function delCameracp(id) {
+  return request({
+    url: '/monitoringcp/cameracp/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出安防监控
+export function exportCameracp(query) {
+  return request({
+    url: '/monitoringcp/cameracp/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/phone/cabinet.js

@@ -1,73 +1,5 @@
-import request from '@/utils/request'
-import requests from '@/utils/requests'
-
-// 查询手机柜列表
-export function listCabinet(query) {
-  return request({
-    url: '/phone/cabinet/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询手机柜详细
-export function getCabinet(id) {
-  return request({
-    url: '/phone/cabinet/' + id,
-    method: 'get'
-  })
-}
-
-// 新增手机柜
-export function addCabinet(data) {
-  return request({
-    url: '/phone/cabinet',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改手机柜
-export function updateCabinet(data) {
-  return request({
-    url: '/phone/cabinet',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除手机柜
-export function delCabinet(id) {
-  return request({
-    url: '/phone/cabinet/' + id,
-    method: 'delete'
-  })
-}
 
-// 导出手机柜
-export function exportCabinet(query) {
-  return request({
-    url: '/phone/cabinet/export',
-    method: 'get',
-    params: query
-  })
-}
-// 查询详情手机柜列表
-export function shouJiGrid(query) {
-  return request({
-    url: '/phone/grid/getNumber',
-    method: 'get',
-    params: query
-  })
-}
-// 查询手机柜格子列表
-export function listGrid(query) {
-  return request({
-    url: '/phone/grid/list',
-    method: 'get',
-    params: query
-  })
-}
+import requests from '@/utils/requests'
 
 // 线上查询手机柜列表
 export function xianPhone(query) {
@@ -93,4 +25,12 @@ export function xianPhoneOppe(query) {
     method: 'get',
     params: query
   })
+}
+// 获取accessToken
+export function getToken(data) {
+  return requests({
+    url: '/wl/api/getAccessToken',
+    method: 'post',
+    data
+  })
 }

src/api/taishi/taishi.js

@@ -31,7 +31,13 @@ export function jinrizhiban() {
     method: "get"
   });
 }
-
+// 今日值班总人数
+export function zongjinrizhiban() {
+  return request({
+    url: "/combatduty/quantistatis/getdaDuiZhiBanNumber",
+    method: "get"
+  });
+}
 // 登记落实
 export function tongjiluoshi() {
   return request({

src/assets/styles/global.css

@@ -1,4 +1,4 @@
-/* 加粗字体 */
+/* 思源字体 */
 @font-face {
   font-family: 'siyuan';
   src: url('../css/siyuan.OTF');
@@ -6,6 +6,14 @@
   font-style: normal;
 }
 
+/* 思源加粗字体 */
+@font-face {
+  font-family: 'siyuanbold';
+  src: url('../css/siyuan_bold.OTF');
+  font-weight: normal;
+  font-style: normal;
+}
+
 /* 正常字体 */
 @font-face {
   font-family: 'fangyuan';
@@ -46,6 +54,7 @@
   font-style: normal;
 }
 
+
 /* 新增表单字体颜色 */
 .el-dialog__body .el-form-item__label {
   color: black;

src/components/FileUpload/index.vue

@@ -157,6 +157,7 @@ export default {
     handleDelete(index) {
       this.fileList.splice(index, 1);
       this.$emit("input", this.fileList);
+      
     },
     // 获取文件名称
     getFileName(name) {

src/layout/components/AppMain.vue

@@ -2,7 +2,7 @@
   <section class="app-main">
     <transition name="fade-transform" mode="out-in">
       <keep-alive :include="cachedViews">
-        <router-view :key="key" />
+        <router-view :key="new Date().getTime()" />
       </keep-alive>
     </transition>
     <div class="tkbox" v-if="open">
@@ -108,7 +108,8 @@ export default {
       open3: false,
       open4: false,
       title3: "",
-      title4: ""
+      title4: "",
+      n:0
     };
   },
   created() {
@@ -120,6 +121,7 @@ export default {
       return this.$store.state.tagsView.cachedViews;
     },
     key() {
+     
       return this.$route.path;
     }
   },

src/utils/requests.js

@@ -7,13 +7,13 @@ import Cookies from "js-cookie";
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 配置公共的根路径
-const service = axios.create({
+const services = axios.create({
   baseURL: 'http://114.115.153.156:12090',
   // 超时
   timeout: 10000
 })
 // 请求拦截器
-service.interceptors.request.use(config => {
+services.interceptors.request.use(config => {
   // 是否需要设置 token
   const isToken = (config.headers || {}).isToken === false
   if (getToken() && !isToken) {
@@ -50,4 +50,5 @@ service.interceptors.request.use(config => {
 })
 
 
-export default service
+
+export default services

src/views/barracksManagement/flat/index.vue

@@ -252,10 +252,10 @@
         :inline="true"
       >
         <el-form-item label="坐落号" prop="number">
-          <el-input v-model="form.number" />
+          <el-input v-model="form.number"  oninput="value=value.replace(/[^\d]/g,'')"/>
         </el-form-item>
         <el-form-item label="分栋号" prop="number1">
-          <el-input v-model="form.number1" />
+          <el-input v-model="form.number1"  oninput="value=value.replace(/[^\d]/g,'')"/>
         </el-form-item>
         <el-form-item label="分栋名称" prop="name">
           <el-input v-model="form.name" />
@@ -283,9 +283,11 @@
         </el-form-item>
         <div class="jibens">备注</div>
         <el-form-item prop="remark">
+          
           <el-input
             v-model="form.remark"
             type="textarea"
+            autosize
             placeholder="请输入内容"
           />
         </el-form-item>
@@ -312,6 +314,7 @@ export default {
   name: "Flat",
   data() {
     return {
+      
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -354,7 +357,7 @@ export default {
       // 表单校验
       rules: {
         number: [
-          { required: true, message: "坐落号不能为空", trigger: "blur" },
+          { required: true,  message: "坐落号不能为空", trigger: "blur" },
         ],
         number1: [
           { required: true, message: "分栋号不能为空", trigger: "blur" },
@@ -600,4 +603,8 @@ export default {
   width: 200px;
   height: 36px;
 }
+::v-deep .el-textarea__inner {
+  min-height: 120px !important;
+}
+
 </style>

src/views/barracksManagement/flats/index.vue

@@ -182,7 +182,7 @@
       <el-table-column
         label="申请住房户型"
         align="center"
-        prop="houseType"
+        prop="type"
         width="150"
       />
       <el-table-column
@@ -976,9 +976,9 @@ export default {
       const id = row.id || this.ids;
       getFlats(id).then((response) => {
         this.form = response.data;
+        this.getZhuChi(this.form.unitId);
         // this.form.name=this.form.peopleName
-        // console.log(this.form)
-        this.form.peopleId = this.form.peopleName;
+        // this.form.peopleId = this.form.peopleName;
         // this.executor.forEach
         this.ziDian1.forEach((item) => {
           if (item.dictSort == this.form.rankId) {

src/views/bdglregular/regularinfo/index.vue

@@ -180,6 +180,7 @@
           v-if="queryParams.caoZuoType == 0"
           style="background: #1d96ff"
           @click="handleAdd"
+          v-hasPermi="['bdglregular:regularinfo:jian']"
           >减分录入</el-button
         >
       </el-col>
@@ -188,6 +189,7 @@
           type="success"
           v-if="queryParams.caoZuoType == 1"
           style="background: #1d96ff"
+          v-hasPermi="['bdglregular:regularinfo:jia']"
           @click="handleAdd"
           >加分录入</el-button
         >
@@ -251,20 +253,26 @@
         </template>
       </el-table-column>
       <!-- <el-table-column label="单位检查_id" align="center" prop="unitCheckId" /> -->
-      <el-table-column label="检查单位" align="center" prop="unitCheck" />
+      <el-table-column
+        label="检查单位"
+        align="center"
+        prop="unitCheck"
+        width="150"
+      />
       <el-table-column
         label="检查时间"
         align="center"
         prop="inspectionTime"
         width="150px"
       />
-      <el-table-column label="检查地点" align="center" prop="inspectionSite" />
       <el-table-column
-        label="分值"
+        width="250"
+        show-overflow-tooltip
+        label="检查地点"
         align="center"
-        :key="Math.random()"
-        prop="score"
-      >
+        prop="inspectionSite"
+      />
+      <el-table-column label="分值" align="center" prop="score">
         <template slot-scope="scope">
           <div style="color: rgb(255 106 0)" v-if="queryParams.caoZuoType == 0">
             {{ scope.row.score }}
@@ -278,7 +286,6 @@
         label="当前状态"
         align="center"
         prop="currentState"
-        :key="Math.random()"
         v-if="queryParams.caoZuoType == 0"
       >
         <template slot-scope="scope">
@@ -315,7 +322,6 @@
         label="整改时间"
         align="center"
         prop="rectificationTime"
-        :key="Math.random()"
         v-if="queryParams.caoZuoType == 0"
         width="150px"
       />
@@ -330,6 +336,8 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        width="250"
+        fixed="right"
       >
         <template slot-scope="scope">
           <el-button
@@ -337,9 +345,9 @@
             type="text"
             v-if="
               scope.row.caoZuoType == '0' &&
-              scope.row.isCaoZuoDept == 0 &&
-              (scope.row.currentState == '未通过' ||
-                scope.row.currentState == '待处理')
+                scope.row.isCaoZuoDept == 0 &&
+                (scope.row.currentState == '未通过' ||
+                  scope.row.currentState == '待处理')
             "
             @click="handleUpdate(scope.row)"
             >整改</el-button
@@ -350,15 +358,25 @@
             @click="shenpifun(scope.row)"
             v-if="
               queryParams.caoZuoType == 0 &&
-              scope.row.isShenPi == 0 &&
-              scope.row.currentState == '待验收'
+                scope.row.isShenPi == 0 &&
+                scope.row.currentState == '待验收'
             "
             >审批</el-button
           >
-          <el-button size="btu" type="text" @click="handleAdds(scope.row)"
+          <!-- v-if="scope.row.unitCheckId==this.danWies" -->
+          <!-- bdglregular:regularinfo:query -->
+          <el-button
+            v-if="scope.row.currentState == '待处理' && scope.row.isShenPi == 0"
+            size="btu"
+            type="text"
+            @click="handleAdds(scope.row)"
             >修改</el-button
           >
-          <el-button size="btd" type="text" @click="handleDelete(scope.row)"
+          <el-button
+            size="btd"
+            type="text"
+            @click="handleDelete(scope.row)"
+            v-if="scope.row.isShenPi == 0"
             >删除</el-button
           >
         </template>
@@ -598,7 +616,13 @@
         <el-button
           type="primary"
           @click="submitForm"
-          v-if="btnnum != 0 && btnnum != 1"
+          v-if="btnnum != 0 && btnnum != 1 && zg != 3"
+          >确 定</el-button
+        >
+        <el-button
+          type="primary"
+          @click="submitForm2"
+          v-if="btnnum != 0 && btnnum != 1 && zg == 3"
           >确 定</el-button
         >
         <el-button type="primary" @click="tongguofun" v-if="btnnum == 0"
@@ -613,6 +637,127 @@
         <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog
+      :title="title"
+      :visible.sync="open1"
+      width="500px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        :inline="true"
+        label-width="120px"
+      >
+        <div class="jiben">基本信息</div>
+        <el-form-item label="检查单位" prop="unitCheck">
+          <el-select
+            v-model="form.unitCheck"
+            @change="unitCheckIdfun"
+            clearable
+            placeholder="请选择检查单位"
+            :disabled="disabled || this.isdisabled == true"
+          >
+            <el-option
+              v-for="dict in unitId"
+              :key="dict.deptId"
+              :label="dict.deptName"
+              :value="dict"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="受检单位" prop="inspectedUnit">
+          <el-select
+            v-model="form.inspectedUnit"
+            @change="inspectedUnitfun"
+            clearable
+            placeholder="请选择受检单位"
+            :disabled="disabled || this.isdisabled == true"
+          >
+            <el-option
+              v-for="dict in unitId"
+              :key="dict.deptId"
+              :label="dict.deptName"
+              :value="dict"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="类型" prop="inspectionType">
+          <el-select
+            v-model="form.inspectionType"
+            :disabled="disabled"
+            clearable
+            placeholder="请选择类型"
+          >
+            <el-option
+              v-for="dict in inspectionType"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="检查时间" prop="inspectionTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.inspectionTime"
+            type="datetime"
+            default-time="00:00:00"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择检查时间"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="检查地点" prop="inspectionSite">
+          <el-input
+            v-model="form.inspectionSite"
+            :disabled="disabled"
+            placeholder="请输入检查地点"
+          />
+        </el-form-item>
+        <el-form-item label="分值" prop="score">
+          <!-- <el-input v-model="form.score" type="number" @blur="scoreblur" :disabled="disabled" placeholder="请输入分值" /> -->
+          <el-input-number
+            v-model="form.score"
+            controls-position="right"
+            :min="0"
+          ></el-input-number>
+        </el-form-item>
+        <el-form-item
+          label="整改时间"
+          prop="rectificationTime"
+          v-if="queryParams.caoZuoType == 0"
+        >
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.rectificationTime"
+            type="datetime"
+            default-time="00:00:00"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择整改时间"
+            :disabled="disabled"
+          ></el-date-picker>
+        </el-form-item>
+
+        <div class="jiben" v-if="queryParams.caoZuoType == 0">存在问题</div>
+        <div class="jiben" v-if="queryParams.caoZuoType == 1">加分事由</div>
+        <el-form-item label prop="question">
+          <el-input
+            v-model="form.question"
+            :disabled="disabled"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="open1 = false" size="btn">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -630,9 +775,9 @@ import {
   editissuccess,
   editisfalse,
   bumenlist,
-  listRegularinfos,
+  listRegularinfos
 } from "@/api/bdglregular/regularinfo";
-
+import { getUserProfile } from "@/api/system/user";
 export default {
   name: "Regularinfo",
   dicts: ["inspectionType"],
@@ -680,34 +825,38 @@ export default {
         correctiveAction: null,
         pictureProof: null,
         documentProof: null,
-        caoZuoType: 0,
+        caoZuoType: 0
       },
+      // 用户
+      user: {},
+      // danWies:0,
+      yongHu: "",
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         unitCheck: [
-          { required: true, message: "检查单位不能为空", trigger: "change" },
+          { required: true, message: "检查单位不能为空", trigger: "change" }
         ],
         inspectedUnit: [
-          { required: true, message: "受检单位不能为空", trigger: "change" },
+          { required: true, message: "受检单位不能为空", trigger: "change" }
         ],
         inspectionType: [
-          { required: true, message: "类型不能为空", trigger: "change" },
+          { required: true, message: "类型不能为空", trigger: "change" }
         ],
         inspectionTime: [
-          { required: true, message: "检查时间不能为空", trigger: "change" },
+          { required: true, message: "检查时间不能为空", trigger: "change" }
         ],
         inspectionSite: [
-          { required: true, message: "检查地点不能为空", trigger: "blur" },
+          { required: true, message: "检查地点不能为空", trigger: "blur" }
         ],
         score: [{ required: true, message: "分值不能为空", trigger: "blur" }],
         rectificationTime: [
-          { required: true, message: "整改时间不能为空", trigger: "change" },
+          { required: true, message: "整改时间不能为空", trigger: "change" }
         ],
         chargePeople: [
-          { required: true, message: "负责人不能为空", trigger: "change" },
-        ],
+          { required: true, message: "负责人不能为空", trigger: "change" }
+        ]
       },
       //单位
       unitId: [],
@@ -722,9 +871,12 @@ export default {
       currentState: null,
       curr: null,
       isdisabled: false,
+      open1: false,
+      zg: null
     };
   },
   created() {
+    // this.danWiess()
     this.queryParams = {
       pageNum: 1,
       pageSize: 10,
@@ -746,27 +898,28 @@ export default {
       correctiveAction: null,
       pictureProof: null,
       documentProof: null,
-      caoZuoType: 0,
+      caoZuoType: 0
     };
+    // this.danWiess()
     //部门数据
-    getDept().then((res) => {
+    getDept().then(res => {
       if (res.code == 200) {
         this.unitId = res.data;
       }
     });
     //调动人员对象
-    listPeople().then((res) => {
+    listPeople().then(res => {
       if (res.code == 200) {
         this.peopleIds = res.rows;
       }
     });
     //检查类型
-    this.getDicts("inspectionType").then((response) => {
+    this.getDicts("inspectionType").then(response => {
       this.inspectionType = response.data;
     });
 
     if (this.$route.query.id) {
-      bumenlist(this.$route.query.id).then((res) => {
+      bumenlist(this.$route.query.id).then(res => {
         console.log(1);
         this.regularinfoList = res.rows;
         this.total = res.total;
@@ -799,10 +952,10 @@ export default {
         correctiveAction: null,
         pictureProof: null,
         documentProof: null,
-        caoZuoType: 0,
+        caoZuoType: 0
       };
       if (to.query.id) {
-        bumenlist(to.query.id).then((res) => {
+        bumenlist(to.query.id).then(res => {
           this.regularinfoList = res.rows;
           this.total = res.total;
           this.loading = false;
@@ -811,7 +964,7 @@ export default {
         this.queryParams.inspectedUnitId = to.query.obj.id + "";
         this.queryParams.currentState = to.query.obj.name + "";
 
-        listRegularinfos(this.queryParams).then((res) => {
+        listRegularinfos(this.queryParams).then(res => {
           console.log(res);
           this.regularinfoList = res.rows;
           this.total = res.total;
@@ -822,17 +975,28 @@ export default {
       }
 
       // listRegularinfos
-      console.log(to.query.obj);
-    },
+      // console.log(to.query.obj);
+    }
   },
   mounted() {
     console.log(0);
+    // this.danWiess()
   },
   methods: {
+    danWiess() {
+      // 获取当前用户接口
+      getUserProfile().then(response => {
+        this.user = response.data;
+        console.log(this.user);
+        // console.log(response.data.dept.deptId+"这是")
+        // if(response)
+        this.danWies = response.data.dept.deptId;
+      });
+    },
     /** 查询经常性检查列表 */
     getList() {
       this.loading = true;
-      listRegularinfo(this.queryParams).then((response) => {
+      listRegularinfo(this.queryParams).then(response => {
         this.regularinfoList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -868,7 +1032,7 @@ export default {
         correctiveAction: null,
         pictureProof: null,
         documentProof: null,
-        reasonReturn: null,
+        reasonReturn: null
       };
       this.resetForm("form");
     },
@@ -884,7 +1048,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -895,6 +1059,7 @@ export default {
       this.title = "经常性检查";
       this.jiannum = 0;
       this.btnnum = null;
+      this.isdisabled = false;
       var today = new Date();
       var y = today.getFullYear();
       var M = today.getMonth() + 1;
@@ -936,12 +1101,13 @@ export default {
       console.log(row);
       this.reset();
       const id = row.id || this.ids;
-      getRegularinfo(id).then((response) => {
+      getRegularinfo(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改经常性检查";
         this.jiannum = 1;
         this.btnnum = null;
+        this.zg = 3;
         if (this.form.currentState == "未通过") {
           this.currentState = 1;
           this.curr = true;
@@ -953,23 +1119,23 @@ export default {
       this.isdisabled = true;
       this.reset();
       const id = row.id || this.ids;
-      getRegularinfo(id).then((response) => {
+      getRegularinfo(id).then(response => {
         this.form = response.data;
-        this.open = true;
+        this.open1 = true;
         this.title = "修改经常性检查";
-        this.jiannum = 1;
-        this.btnnum = null;
-        if (this.form.currentState == "未通过") {
-          this.currentState = 1;
-          this.curr = true;
-        }
+        // this.jiannum = 1;
+        // this.btnnum = null;
+        // if (this.form.currentState == "未通过") {
+        //   this.currentState = 1;
+        //   this.curr = true;
+        // }
       });
     },
     /** 审批按钮操作 */
     shenpifun(row) {
       this.reset();
       const id = row.id || this.ids;
-      getRegularinfo(id).then((response) => {
+      getRegularinfo(id).then(response => {
         this.disabled = true;
         this.form = response.data;
         this.open = true;
@@ -980,7 +1146,7 @@ export default {
     },
     //通过
     tongguofun() {
-      editissuccess(this.form).then((res) => {
+      editissuccess(this.form).then(res => {
         if (res.code == 200) {
           this.$modal.msgSuccess("审批成功");
           this.open = false;
@@ -1004,15 +1170,24 @@ export default {
     },
     //未通过提交
     weitongguofun() {
-      editisfalse(this.form).then((res) => {
+      editisfalse(this.form).then(res => {
         this.$modal.msgSuccess("操作成功");
         this.open = false;
         this.getList();
       });
     },
+    submitForm2() {
+      editquestion(this.form).then(response => {
+        this.$modal.msgSuccess("整改成功");
+        this.open = false;
+        this.open1 = false;
+        this.getList();
+      });
+    },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      // console.log(this.form)
+      this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.documentProof) {
             this.form.documentProof = this.form.documentProof[0].url;
@@ -1020,16 +1195,18 @@ export default {
 
           if (this.form.id != null) {
             this.form.caoZuoType = this.queryParams.caoZuoType;
-            editquestion(this.form).then((response) => {
+            updateRegularinfo(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
+              this.open1 = false;
               this.getList();
             });
           } else {
             this.form.caoZuoType = this.queryParams.caoZuoType;
-            addRegularinfo(this.form).then((response) => {
+            addRegularinfo(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
+              this.open1 = false;
               this.getList();
             });
           }
@@ -1041,7 +1218,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除经常性检查的数据项？")
-        .then(function () {
+        .then(function() {
           return delRegularinfo(ids);
         })
         .then(() => {
@@ -1059,7 +1236,7 @@ export default {
           this.exportLoading = true;
           return exportRegularinfo(queryParams);
         })
-        .then((response) => {
+        .then(response => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
@@ -1088,8 +1265,8 @@ export default {
       if (this.form.score < 0) {
         this.form.score = null;
       }
-    },
-  },
+    }
+  }
 };
 </script>
 <style scoped>

src/views/bdglregular/specialinfo/index.vue

@@ -136,6 +136,7 @@
           v-if="queryParams.caoZuoType == 0"
           @click="handleAdd"
           style="background: #1d96ff"
+            v-hasPermi="['bdglregular:specialinfo:jjan']"
           >减分录入</el-button
         >
       </el-col>
@@ -145,6 +146,7 @@
           v-if="queryParams.caoZuoType == 1"
           @click="handleAdd"
           style="background: #1d96ff"
+            v-hasPermi="['bdglregular:specialinfo:jia']"
           >加分录入</el-button
         >
       </el-col>
@@ -338,9 +340,11 @@
             >审批</el-button
           >
           <el-button size="btu" type="text" @click="handleAdds(scope.row)"
+          v-if="scope.row.currentState=='待处理'&&scope.row.isShenPi==0"
             >修改</el-button
           >
           <el-button size="btd" @click="handleDelete(scope.row)"
+          v-if="scope.row.isShenPi==0"
             >删除</el-button
           >
         </template>

src/views/combatduty/Quantitative/index.vue

@@ -123,7 +123,8 @@
               ><span style="margin-right: 10px">数</span><span>量</span>
             </div>
             <div class="wrap-top-left-top-item-right3">
-              {{ this.GreatDuty1.detachmentName }}
+              {{ fenShu }}
+              队
               <!-- 发射一营 -->
             </div>
           </div>
@@ -152,7 +153,7 @@
               <span>数</span>
             </div>
             <div class="wrap-top-left-top-item-right" style="margin-left: 15px">
-              {{ this.GreatDuty1.detachmentPeopleName }}
+              {{ fenZong }}人
             </div>
           </div>
         </div>
@@ -451,7 +452,14 @@
                 <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">
+                  <template>
+                    <dict-tag
+                      :options="dict.type.type_type"
+                      :value="item.type"
+                    />
+                  </template>
+                </td>
                 <td style="color: #ccc">{{ item.equipmentNumber }}</td>
                 <td style="color: #ccc" class="shiyou">
                   {{ item.standbyPosition }}
@@ -471,6 +479,7 @@ import {
   getTodayzhiban,
   // 大队值班接口
   greatDuty,
+  greatDutys,
   // 军车值班接口
   militaryDuty,
   // 装备值班接口
@@ -482,6 +491,7 @@ import {
 } from "@/api/combatduty/Quantitative";
 import { getDicts } from "@/api/system/dict/data";
 export default {
+  dicts: ["type_type"],
   data() {
     return {
       // 基地值班
@@ -501,6 +511,10 @@ export default {
         dictType: "brand",
       },
       ziDian: [],
+      // 分队数量
+      fenShu: "",
+      // 分队总人数
+      fenZong: "",
     };
   },
   created() {
@@ -522,6 +536,10 @@ export default {
       }
       // console.log(res);
     });
+    greatDutys().then((res) => {
+      this.fenShu = res.data[0];
+      this.fenZong = res.data[1];
+    });
     // 查询字典
     this.getdict();
 
@@ -577,6 +595,7 @@ export default {
   text-align: center;
   color: #30fdff;
   line-height: 35px;
+  letter-spacing: 0.2rem;
 }
 #app {
   width: 100%;

src/views/combatduty/RateOfTen/index.vue

@@ -803,14 +803,14 @@ export default {
       //   满编率
       var data = [
         {
-          value: this.form.bzrs,
+          value: this.form.sjrs,
           name: "实际人数",
         },
         {
           value: this.form.sjrs,
         },
       ];
-      data[1].value = this.form.sjrs - data[0].value;
+      data[1].value = this.form.bzrs - data[0].value;
       let data11 = this.form.sjrs;
       var option = {
         tooltip: {
@@ -856,7 +856,7 @@ export default {
                     `{value|${(0).toFixed()}%}` + "\n" + "\n" + `{name|满编率}`;
                   return s;
                 } else {
-                  var n = _this.form.bzrs / _this.form.sjrs;
+                  var n = _this.form.sjrs / _this.form.bzrs;
                   var s =
                     `{value|${(n * 100).toFixed()}%}` +
                     "\n" +

src/views/combatduty/basedutyinfo/index.vue

@@ -28,9 +28,9 @@
           @change="handleQuery"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="" prop="chiefDutyName">
+      <el-form-item label="" prop="chiefDutyId">
         <el-select
-          v-model="queryParams.chiefDutyName"
+          v-model="queryParams.chiefDutyId"
           filterable
           clearable
           placeholder="请选择值班首长"
@@ -1195,7 +1195,7 @@ export default {
   background: #196299;
   border: none;
   color: #fff;
-      line-height: 12px !important;
+  line-height: 12px !important;
 }
 ::v-deep .el-radio-button:first-child .el-radio-button__inner {
   border-left: none !important;
@@ -1206,7 +1206,7 @@ export default {
   border-color: #006cff !important;
   -webkit-box-shadow: -1px 0 0 0 #006cff !important;
   box-shadow: -1px 0 0 0 #006cff !important;
-      line-height: 12px !important;
+  line-height: 12px !important;
 }
 /* 将水平线设为红色： */
 hr {

src/views/combatduty/grassdutyinfo/index.vue

@@ -127,6 +127,7 @@
             label="值班员职务"
             align="center"
             prop="dutyOffierZw"
+            width="120"
           >
             <template slot-scope="scope">
               <dict-tag

src/views/combatduty/militarydutyinfo/index.vue

@@ -193,7 +193,7 @@
       <el-table-column label="车辆状态" align="center" prop="carStates">
         <template slot-scope="scope">
           <dict-tag
-            :options="dict.type.vehicle_status"
+            :options="dict.type.military"
             :value="scope.row.carStates"
           />
         </template>
@@ -333,7 +333,7 @@
         <el-form-item label="车辆状态" prop="carStates">
           <el-select v-model="form.carStates" placeholder="">
             <el-option
-              v-for="dict in dict.type.vehicle_status"
+              v-for="dict in dict.type.military"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
@@ -367,6 +367,9 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm1" v-if="baoCun"
+          >保存并继续编辑</el-button
+        >
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
@@ -390,7 +393,7 @@ import {
 
 export default {
   name: "Militarydutyinfo",
-  dicts: ["vehicle_status"],
+  dicts: ["military"],
   data() {
     return {
       // 遮罩层
@@ -432,7 +435,15 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        attendedTime: [
+          {
+            required: true,
+            message: "值班时间不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
       //人员数据
       rylist: [],
       //单位数据
@@ -440,6 +451,8 @@ export default {
       qdflg: null,
       //车牌号
       buslist: [],
+      // 保存显示隐藏
+      baoCun: true,
     };
   },
   created() {
@@ -475,7 +488,7 @@ export default {
       });
     },
     getthebusfun() {
-      getthebus().then((res) => {
+      getthebus(1).then((res) => {
         if (res.code == 200) {
           this.buslist = res.rows;
         }
@@ -533,6 +546,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.baoCun = true;
       this.open = true;
       this.title = "添加军车值班";
       this.qdflg = 1;
@@ -542,12 +556,26 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getMilitarydutyinfo(id).then((response) => {
+        this.baoCun = false;
         this.form = response.data;
         this.open = true;
         this.title = "修改军车值班";
         this.qdflg = 2;
       });
     },
+    // 保存并继续编辑按钮
+    submitForm1() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          this.form.timequjian = this.form.attendedTime;
+          this.form.attendedTime = this.form.attendedTime.join(",");
+          addMilitarydutyinfo(this.form).then((response) => {
+            this.getList();
+          });
+          this.reset();
+        }
+      });
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate((valid) => {
@@ -611,6 +639,7 @@ export default {
       this.form.carUnitName = val.deptName;
     },
     numberPlateNamechange(val) {
+      this.form.numberPlateId = val.id;
       this.form.numberPlateName = val.vehiclenumber;
       this.form.modelInfo = val.vehiclemodel;
     },

src/views/combatduty/regisdutyinfo/index.vue

@@ -244,13 +244,123 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改装备登记对话框 -->
+    <!-- 添加装备登记对话框 -->
     <el-dialog
       :title="title"
       :visible.sync="open"
       width="1016px"
       append-to-body
       :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        :inline="true"
+      >
+        <div class="jiben">基本信息</div>
+        <el-row
+          v-for="(item, i) in relatives"
+          :key="i"
+          style="margin-bottom: 20px"
+        >
+          <el-form-item label="单位名称" prop="unitName">
+            <el-select v-model="item.unitName" clearable placeholder="">
+              <el-option
+                v-for="dict in deptOptions"
+                :key="dict.deptId"
+                :label="dict.deptName"
+                :value="dict"
+                @click.native="unitNameClick(dict, i)"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!-- @change="unitNamechange" -->
+          <!-- <el-form-item label="单位ID" prop="unitId">
+          <el-input v-model="form.unitId" placeholder="请输入单位ID" />
+        </el-form-item> -->
+          <el-form-item label="装备名称" prop="equipmentName">
+            <el-input v-model="item.equipmentName" placeholder="" />
+          </el-form-item>
+          <!-- <el-form-item label="装备ID" prop="equipmentId">
+          <el-input v-model="form.equipmentId" placeholder="请输入装备ID" />
+        </el-form-item> -->
+          <el-form-item label="装备数量" prop="equipmentNumber">
+            <el-input
+              v-model="item.equipmentNumber"
+              placeholder=""
+              type="Number"
+            />
+          </el-form-item>
+          <el-form-item label="类型" prop="type">
+            <el-select v-model="item.type" placeholder="">
+              <el-option
+                v-for="dict in dict.type.type_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="装备状态" prop="equipmentStates">
+            <el-select v-model="item.equipmentStates" placeholder="">
+              <el-option
+                v-for="dict in dict.type.equipment_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="待命位置" prop="standbyPosition">
+            <el-input v-model="item.standbyPosition" placeholder="" />
+          </el-form-item>
+          <el-form-item label="值班日期" prop="attendedTime">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="item.attendedTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder=""
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item style="margin-left: 156px">
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              size="mini"
+              @click="addFormss"
+              v-if="i == relatives.length - 1"
+            ></el-button>
+            <el-button
+              type="danger"
+              icon="el-icon-delete"
+              size="mini"
+              v-if="i > 0"
+              @click="delFormss(i, item.id)"
+            ></el-button>
+          </el-form-item>
+        </el-row>
+        <div class="jiben">装备情况</div>
+        <el-form-item label="" prop="remarks">
+          <el-input v-model="form.remarks" type="textarea" placeholder="" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 修改装备登记对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open1"
+      width="1016px"
+      append-to-body
+      :close-on-click-modal="false"
     >
       <el-form
         ref="form"
@@ -263,9 +373,9 @@
         <el-form-item label="单位名称" prop="unitName">
           <el-select
             v-model="form.unitName"
-            @change="unitNamechange"
             clearable
             placeholder=""
+            @change="unitNamechange"
           >
             <el-option
               v-for="dict in deptOptions"
@@ -275,6 +385,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <!-- @change="unitNamechange" -->
         <!-- <el-form-item label="单位ID" prop="unitId">
           <el-input v-model="form.unitId" placeholder="请输入单位ID" />
         </el-form-item> -->
@@ -395,6 +506,20 @@ export default {
       rules: {},
       //单位数据
       deptOptions: [],
+      // 添加多个基本信息
+      relatives: [
+        {
+          unitId: null,
+          equipmentName: null,
+          equipmentNumber: null,
+          type: null,
+          equipmentStates: null,
+          attendedTime: null,
+          standbyPosition: null,
+        },
+      ],
+      // 修改弹出层显示与隐藏
+      open1: false,
     };
   },
   created() {
@@ -402,9 +527,29 @@ export default {
     this.gettreeselect();
   },
   methods: {
+    // 单位提交
+    unitNameClick(date, i) {
+      this.relatives[i].unitName = date.deptName;
+      this.relatives[i].unitId = date.deptId;
+    },
+    //增加多个基本信息
+    addFormss() {
+      this.relatives.push({
+        unitId: null,
+        equipmentName: null,
+        equipmentNumber: null,
+        type: null,
+        equipmentStates: null,
+        attendedTime: null,
+        standbyPosition: null,
+      });
+    },
+    //删除多个基本信息
+    delFormss(e, id) {
+      this.relatives.splice(e, 1);
+    },
     gettreeselect() {
       getDept().then((res) => {
-        console.log(res);
         if (res.code == 200) {
           this.deptOptions = res.data;
         }
@@ -414,6 +559,7 @@ export default {
     getList() {
       this.loading = true;
       listRegisdutyinfo(this.queryParams).then((response) => {
+        console.log(response);
         this.regisdutyinfoList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -439,6 +585,17 @@ export default {
         attendedTime: null,
         remarks: null,
       };
+      this.relatives = [
+        {
+          unitId: null,
+          equipmentName: null,
+          equipmentNumber: null,
+          type: null,
+          equipmentStates: null,
+          attendedTime: null,
+          standbyPosition: null,
+        },
+      ];
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -469,7 +626,7 @@ export default {
       const id = row.id || this.ids;
       getRegisdutyinfo(id).then((response) => {
         this.form = response.data;
-        this.open = true;
+        this.open1 = true;
         this.title = "修改装备登记";
       });
     },
@@ -480,10 +637,12 @@ export default {
           if (this.form.id != null) {
             updateRegisdutyinfo(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
-              this.open = false;
+              this.open1 = false;
               this.getList();
             });
           } else {
+            this.form.regisDutyList = this.relatives;
+            // console.log(this.form);
             addRegisdutyinfo(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

src/views/combatduty/taskdutyinfo/index.vue

@@ -461,10 +461,21 @@
         <!-- <el-form-item>
           <FileUpload v-model="form.taskdutyFus" />
         </el-form-item> -->
-        <div v-for="item in this.form.taskdutyFus" :key="item" style="margin-bottom:10px">
-          <span class="wordfile" style="color: white; margin-left: 10px">{{item.filename}}</span>
+        <div
+          v-for="item in this.form.taskdutyFus"
+          :key="item"
+          style="margin-bottom: 10px"
+        >
+          <span class="wordfile" style="color: white; margin-left: 10px">{{
+            item.filename
+          }}</span>
           <!-- <div> -->
-            <span href="item.filepath" style="color: white; margin-left: 10px;cursor:pointer;" @click="downloadss(item.filepath,item.filename)">下载附件</span>
+          <span
+            href="item.filepath"
+            style="color: white; margin-left: 10px; cursor: pointer"
+            @click="downloadss(item.filepath, item.filename)"
+            >下载附件</span
+          >
           <!-- </div> -->
         </div>
         <div class="jiben">事由</div>
@@ -571,7 +582,7 @@ export default {
     this.getrylist();
   },
   methods: {
-     downloadss(URL,name) {
+    downloadss(URL, name) {
       // console.log(URL)
       let xhr = new XMLHttpRequest();
       xhr.open("get", URL, true);
@@ -727,10 +738,10 @@ export default {
       const id = row.id || this.ids;
       getTaskdutyinfo(id).then((response) => {
         this.form = response.data;
-        this.form.taskdutyFus.forEach(item=>{
-          item.filepath=process.env.VUE_APP_BASE_API+item.filepath
-        })
-        console.log(this.form)
+        this.form.taskdutyFus.forEach((item) => {
+          item.filepath = process.env.VUE_APP_BASE_API + item.filepath;
+        });
+        console.log(this.form);
         this.open1 = true;
         this.title1 = "查看执行任务";
       });
@@ -755,17 +766,17 @@ export default {
       //   this.form.filepath.length - 1
       // );
       console.log(this.form);
-      if(this.form.taskdutyFus){
+      if (this.form.taskdutyFus) {
         this.form.taskdutyFus.forEach((item) => {
-        // 文件路径
-        item.filepath = item.url;
-        item.url=item.filepath;
-        // 文件名称
-        item.filename = item.name;
-        item.name=item.filename
-      });
+          // 文件路径
+          item.filepath = item.url;
+          item.url = item.filepath;
+          // 文件名称
+          item.filename = item.name;
+          item.name = item.filename;
+        });
       }
-      
+
       console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
@@ -977,7 +988,7 @@ export default {
 ::v-deep .el-select-dropdown__item {
   color: white;
 }
-.wordfile{
+.wordfile {
   width: 840px;
   display: inline-block;
   height: 30px;
@@ -987,4 +998,8 @@ export default {
   /* text-align: center; */
   margin-bottom: 10px;
 }
+::v-deep .el-input.is-disabled .el-input__inner {
+  background-color: transparent;
+  color: #fff;
+}
 </style>

src/views/militaryvehicleManagement/privateCar/index.vue

@@ -132,7 +132,7 @@
         prop="certificatenumber"
         width="170"
       />
-      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="备注" align="center" prop="remarks"  show-overflow-tooltip />
       <!-- <el-table-column label="创建人" align="center" prop="adminId" />
       <el-table-column label="创建时间" align="center" prop="createtime" /> -->
 

src/views/monitoring/camera/index.vue

@@ -218,7 +218,7 @@
 
     <el-row>
       <el-col :span="1.5">
-        <el-button
+        <!-- <el-button
           type="primary"
           plain
           icon="el-icon-plus"
@@ -226,7 +226,7 @@
           @click="handleAdd"
           v-hasPermi="['monitoring:camera:add']"
           >新增</el-button
-        >
+        > -->
       </el-col>
       <el-col :span="1.5" class="isSubmit">
         <!-- <el-radio-group v-model="queryParams.type" @change="caoZuoTypefun"> -->
@@ -330,7 +330,6 @@
             <!-- :id="'videoElement' + i" -->
             <video
               autoplay
-             
               controls
               style="
                 width: 100%;
@@ -352,7 +351,6 @@
             class="fourscreen"
           >
             <video
-           
               autoplay
               controls
               style="
@@ -369,7 +367,6 @@
         <div class="video1" v-if="this.btn == 1 && this.dan == true">
           <div v-for="(i, index) in 1" :key="index" class="fullscreen">
             <video
-            
               autoplay
               controls
               style="width: 100%; height: 100%; position: relative"
@@ -709,6 +706,7 @@ export default {
       // debugger
       this.loading = true;
       listCamera({ belongLocal: a }).then((response) => {
+        console.log(response);
         this.cameraList = response.rows;
         this.url1 = this.cameraList[0].caddr;
         // console.log(this.url1);

src/views/monitoring/cameracp/index.vue

@@ -0,0 +1,643 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="摄像头名称" prop="cname">
+        <el-input
+          v-model="queryParams.cname"
+          placeholder="请输入摄像头名称"
+          clearable
+          size="small"
+          @input="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="访问地址" prop="caddr">
+        <el-input
+          v-model="queryParams.caddr"
+          placeholder="请输入访问地址"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="cstatus">
+        <el-select v-model="queryParams.cstatus" placeholder="请选择状态" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createtime">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.createtime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择创建时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="单位id" prop="unitid">
+        <el-input
+          v-model="queryParams.unitid"
+          placeholder="请输入单位id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单位名称" prop="unitname">
+        <el-input
+          v-model="queryParams.unitname"
+          placeholder="请输入单位名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="存入菜单ID" prop="powerArea">
+        <el-input
+          v-model="queryParams.powerArea"
+          placeholder="请输入存入菜单ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <!-- <el-form-item label="归属地" prop="belongLocal">
+        <el-input
+          v-model="queryParams.belongLocal"
+          placeholder="请输入归属地"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </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">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['monitoringcp:cameracp:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['monitoringcp:cameracp:edit']"
+          >修改</el-button
+        >
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['monitoringcp:cameracp:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['monitoringcp:cameracp:export']"
+          >导出</el-button
+        >
+      </el-col> -->
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="cameracpList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{ background: '#003C69', color: 'white' }"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" prop="id">
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="摄像头名称" align="center" prop="cname" />
+      <el-table-column
+        label="访问地址"
+        align="center"
+        prop="caddr"
+        width="300px"
+      />
+      <el-table-column
+        label="单位名称"
+        align="center"
+        prop="unitname"
+        width="150px"
+      />
+      <el-table-column label="属性ID" align="center" prop="unitid" />
+      <el-table-column label="状态" align="center" prop="cstatus">
+        <template slot-scope="scope">
+          <span v-if="scope.row.cstatus == '1'" style="color: #13ce66"
+            >显示</span
+          >
+          <span v-if="scope.row.cstatus == '0'" style="color: #ccc">隐藏</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createtime"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createtime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="单位id" align="center" prop="unitid" /> -->
+      <!-- <el-table-column label="存入菜单ID" align="center" prop="powerArea" /> -->
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="btu"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['monitoringcp:cameracp:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="btd"
+            type="text"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['monitoringcp:cameracp:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改安防监控对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        inline
+      >
+        <el-form-item label="单位名称" prop="unitname">
+          <treeselect
+            @select="selectPeo"
+            v-model="form.unitid"
+            :options="deptOptions"
+            placeholder="选择单位"
+          />
+          <!-- <el-input v-model="form.unitname" placeholder="请输入单位名称" /> -->
+        </el-form-item>
+        <el-form-item label="属性ID" prop="unitid">
+          <el-input v-model="form.unitid" placeholder="请输入归属地" disabled />
+        </el-form-item>
+        <el-form-item label="摄像头名称" prop="cname">
+          <el-input v-model="form.cname" placeholder="请输入摄像头名称" />
+        </el-form-item>
+        <el-form-item label="访问地址" prop="caddr">
+          <el-input v-model="form.caddr" placeholder="请输入访问地址" />
+        </el-form-item>
+
+        <el-form-item label="是否显示">
+          <el-switch
+            v-model="form.cstatus"
+            active-color="#13ce66"
+            inactive-color="#ccc"
+            active-value="1"
+            inactive-value="0"
+          >
+          </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 label="单位id" prop="unitid">
+          <el-input v-model="form.unitid" placeholder="请输入单位id" />
+        </el-form-item> -->
+
+        <!-- <el-form-item label="存入菜单ID" prop="powerArea">
+          <el-input v-model="form.powerArea" placeholder="请输入存入菜单ID" />
+        </el-form-item> -->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel" type="btn">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listCameracp,
+  getCameracp,
+  delCameracp,
+  addCameracp,
+  updateCameracp,
+  exportCameracp,
+} from "@/api/monitoringcp/cameracp";
+// 导入树形结构
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+import { getDept } from "@/api/grassrootsregistration/bdgleven";
+
+export default {
+  components: { Treeselect },
+  name: "Cameracp",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 安防监控表格数据
+      cameracpList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        cname: null,
+        caddr: null,
+        cstatus: null,
+        createtime: null,
+        unitid: null,
+        unitname: null,
+        powerArea: null,
+        belongLocal: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      // 单位
+      deptOptions: [],
+    };
+  },
+  created() {
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    // 选择单位触发
+    selectPeo(val) {
+      console.log(val);
+      this.form.unitname = val.label;
+      this.form.unitid = val.id;
+    },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      getDept().then((response) => {
+        this.deptOptions = response.data;
+      });
+    },
+    /** 查询安防监控列表 */
+    getList() {
+      this.loading = true;
+      listCameracp(this.queryParams).then((response) => {
+        this.cameracpList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        cname: null,
+        caddr: null,
+        cstatus: "0",
+        createtime: null,
+        unitid: null,
+        unitname: null,
+        powerArea: null,
+        belongLocal: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加安防监控";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getCameracp(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改安防监控";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateCameracp(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCameracp(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm("是否确认删除当前安防监控据项？")
+        .then(function () {
+          return delCameracp(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal
+        .confirm("是否确认导出所有安防监控数据项？")
+        .then(() => {
+          this.exportLoading = true;
+          return exportCameracp(queryParams);
+        })
+        .then((response) => {
+          this.$download.name(response.msg);
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
+};
+</script>
+<style scoped>
+/* 对话框背景颜色 */
+::v-deep .el-dialog {
+  background: #004d86 !important;
+}
+::v-deep .el-textarea__inner {
+  width: 920px;
+  height: 104px;
+}
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid #718a9d;
+}
+::v-deep .el-dialog__title {
+  color: #fff;
+  font: 18px;
+}
+::v-deep .el-dialog__headerbtn .el-dialog__close {
+  color: #fff;
+}
+::v-deep .el-form-item__label {
+  font: 16px;
+  color: #fff;
+  width: 100px !important;
+}
+::v-deep .el-input__inner {
+  /* width: 200px !important;
+  height: 36px; */
+  background: transparent;
+  color: #fff;
+  border-color: #fff !important;
+}
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+}
+/* 基本信息背景 */
+.jiben {
+  width: 920px;
+  height: 32px;
+  background-image: url(../../../images/小标题底.png);
+  margin-bottom: 25px;
+  color: #fff;
+  padding-left: 16px;
+  line-height: 32px;
+}
+/*调整表单间距 */
+::v-deep .el-form-item__content {
+  width: 200px;
+}
+::v-deep .el-input__inner {
+  cursor: pointer !important;
+}
+/* 底部确定取消按钮 */
+::v-deep .el-dialog__footer {
+  padding: 30px 50px;
+}
+::v-deep .el-dialog__body {
+  margin: 10px 30px 20px 62px;
+  padding-top: 20px !important;
+  box-sizing: border-box;
+  /* padding: 30px 12px 30px 28px; */
+}
+.contents {
+  padding: 0px 40px !important;
+}
+/* 下拉菜单 */
+.el-dropdown-link {
+  cursor: pointer;
+  color: #409eff;
+}
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+/* 刷新图标
+.el-icon-refresh {
+  width: 76px;
+  height: 36px;
+  color: #fff;
+  background-color: #1d96ff !important;
+  border-radius: 4px;
+  border: none;
+  margin-left: 20px;
+  font-size: 14px;
+} */
+/* 下拉菜单字体/背景颜色 */
+.el-select-dropdown__item.hover,
+.el-select-dropdown__item:hover {
+  background-color: #004d86;
+  color: #fff;
+}
+.el-select-dropdown__item {
+  color: #fff;
+}
+/* 时间选择 */
+::v-deep .el-input--small .el-input__inner {
+  width: 200px;
+  height: 36px;
+  line-height: 36px;
+}
+.el-date-editor.el-input {
+  width: 200px;
+  height: 36px;
+  line-height: 36px;
+}
+::v-deep .el-date-editor.el-input .el-input__inner {
+  height: 36px;
+  line-height: 36px;
+}
+
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+  color: #fff;
+}
+/* 单位下拉菜单选中字体颜色 */
+::v-deep .vue-treeselect__single-value {
+  color: #fff !important;
+}
+/* 分页按钮 */
+::v-deep .el-pagination.is-background .el-pager li {
+  background-color: #004d86;
+  color: #fff;
+}
+::v-deep .el-pagination.is-background .btn-next {
+  background-color: #004d86;
+  color: #fff;
+}
+::v-deep .el-pagination.is-background .btn-prev,
+.el-pagination.is-background .btn-next,
+.el-pagination.is-background .el-pager li {
+  background: #004d86 !important;
+  color: #fff !important;
+}
+/* 计数器按钮 */
+::v-deep .el-input-number__increase {
+  background-color: transparent !important;
+  border: none;
+  color: #cccccc;
+  border-bottom: none !important;
+}
+::v-deep .el-input-number__decrease {
+  background-color: transparent !important;
+  border: none !important;
+  color: #cccccc;
+}
+/* 底部确定取消按钮 */
+::v-deep .el-dialog__footer {
+  padding: 18px 42px 30px 0px;
+  margin-right: 66px;
+}
+/* 增加按钮弹框 */
+::v-deep .el-dialog {
+  width: 800px !important;
+}
+::v-deep .el-dialog__body {
+  padding: none !important;
+}
+
+/* 调整输入框提示文字颜色 */
+::v-deep .vue-treeselect__placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input:-moz-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep .el-input.is-disabled .el-input__inner {
+  background-color: transparent;
+  color: #fff;
+}
+.greed {
+  position: absolute;
+  top: 26px;
+  right: -10px;
+  color: #13ce66;
+}
+.CCC {
+  position: absolute;
+  top: 26px;
+  right: 118px;
+  color: #cccccc;
+}
+</style>

src/views/peopleChuRu/bdglLeave/index.vue

@@ -208,7 +208,9 @@
           <el-col
             v-if="scope.row.status2 == 3"
             :title="
-              scope.row.bdglLeaveFus.length > 0 ? [1].specialApproval : ''
+              scope.row.bdglLeaveFus.length > 1
+                ? scope.row.bdglLeaveFus[1].specialApproval
+                : ''
             "
             style="color: #1f73d7"
             >特殊审批</el-col
@@ -247,7 +249,14 @@
             style="color: #ff4949"
             >已驳回</el-col
           >
-          <el-col v-if="scope.row.status3 == 3" style="color: #1f73d7"
+          <el-col
+            v-if="scope.row.status3 == 3"
+            style="color: #1f73d7"
+            :title="
+              scope.row.bdglLeaveFus.length > 2
+                ? scope.row.bdglLeaveFus[2].specialApproval
+                : ''
+            "
             >特殊审批</el-col
           >
         </template>
@@ -285,7 +294,14 @@
             style="color: #ff4949"
             >已驳回</el-col
           >
-          <el-col v-if="scope.row.status4 == 3" style="color: #1f73d7"
+          <el-col
+            v-if="scope.row.status4 == 3"
+            style="color: #1f73d7"
+            :title="
+              scope.row.bdglLeaveFus.length > 3
+                ? scope.row.bdglLeaveFus[3].specialApproval
+                : ''
+            "
             >特殊审批</el-col
           >
           <!-- :title="scope.row.bdglLeaveFus[3].specialApproval" -->
@@ -354,7 +370,7 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-    <!-- 添加或修改人员请假对话框 -->
+    <!-- 添加人员请假对话框 -->
     <el-dialog
       :title="title"
       :visible.sync="open"
@@ -576,6 +592,470 @@
       </div>
     </el-dialog>
 
+    <!-- 修改人员请假对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open1"
+      width="500px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        inline
+      >
+        <div class="jiben">基本信息</div>
+
+        <el-form-item label="单位" prop="unitId">
+          <treeselect
+            v-model="form.unitId"
+            :options="deptOptions"
+            placeholder="请选择单位"
+            @select="selectPeo"
+            @open="blurSelect"
+            :disabled="xiugai"
+          />
+        </el-form-item>
+        <el-form-item label="请假人员" prop="peopleId">
+          <!-- <el-input v-model="form.peopleId" placeholder="请输入请假人员" /> -->
+          <el-select
+            v-model="form.peopleId"
+            placeholder="请输入请假人员"
+            ref="headerSearchSelect"
+            :disabled="xiugai"
+          >
+            <el-option
+              v-for="(item, i) in renYuan"
+              :key="i"
+              :label="item.name"
+              :value="item.id"
+              @click.native="qingRen(item.name)"
+              class="input_xiala"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="请假开始时间" prop="startTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.startTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择请假开始时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="请假结束时间" prop="endTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.endTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择请假结束时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="请假类型" prop="leaveType">
+          <el-select v-model="form.leaveType" placeholder="请选择请假类型">
+            <!-- <el-option label="请选择字典生成" value="" /> -->
+            <el-option
+              v-for="item in ziDian"
+              :key="item.dictCode"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+              class="input_xiala"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="离队时间" prop="departureTime">
+          <!-- <el-input v-model="form.departureTime" placeholder="请输入离队时间" /> -->
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.departureTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请输入离队时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="归队时间" prop="returnTime">
+          <!-- <el-input v-model="form.returnTime" placeholder="请输入归队时间" /> -->
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.returnTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请输入归队时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="一级审批人" prop="peopleId2">
+          <!-- <el-input v-model="form.peopleId2" placeholder="请输入二级审批人" /> -->
+          <el-select
+            v-model="form.peopleId1"
+            filterable
+            placeholder="请输入一级审批人"
+            ref="abcdef"
+            :disabled="xiugai"
+          >
+            <el-option
+              v-for="(item, i) in yongHu"
+              :key="i"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="oneRen(item.nickName)"
+              class="input_xiala"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="二级审批人" prop="peopleId2">
+          <!-- <el-input v-model="form.peopleId2" placeholder="请输入二级审批人" /> -->
+          <el-select
+            v-model="form.peopleId2"
+            filterable
+            placeholder="请输入二级审批人"
+            ref="abcde"
+            :disabled="xiugai"
+          >
+            <el-option
+              v-for="(item, i) in yongHu"
+              :key="i"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="twoRen(item.nickName)"
+              class="input_xiala"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="三级审批人" prop="peopleId3">
+          <!-- <el-input v-model="form.peopleId3" placeholder="请输入三级审批人" /> -->
+          <el-select
+            v-model="form.peopleId3"
+            filterable
+            placeholder="请输入三级审批人"
+            ref="abcd"
+            :disabled="xiugai"
+          >
+            <el-option
+              v-for="(item, i) in yongHu"
+              :key="i"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="thereRen(item.nickName)"
+              class="input_xiala"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="四级审批人" prop="peopleId4">
+          <!-- <el-input v-model="form.peopleId4" placeholder="请输入四级审批人" /> -->
+          <el-select
+            v-model="form.peopleId4"
+            filterable
+            placeholder="请输入四级审批人"
+            ref="abc"
+            :disabled="xiugai"
+          >
+            <el-option
+              v-for="(item, i) in yongHu"
+              :key="i"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="fourRen(item.nickName)"
+              class="input_xiala"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <div class="jiben">请假原因</div>
+        <el-form-item prop="leaveReason">
+          <el-input
+            v-model="form.leaveReason"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+        <div class="jiben" v-if="statussp == '1'">驳回原因</div>
+        <el-form-item v-if="statussp == '1'" prop="reasons">
+          <el-input
+            v-model="form.reasons"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+        <div class="jiben" v-if="statussp == '2'">驳回原因</div>
+        <el-form-item v-if="statussp == '2'" prop="reasons">
+          <el-input
+            v-model="form.reasons"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+        <div class="jiben" v-if="statussp == '2'">特殊审批原因</div>
+        <el-form-item v-if="statussp == '2'" prop="reasons">
+          <el-input
+            v-model="form.specialApproval"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer" v-if="statussp == '0'">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
+      </div>
+      <div v-if="statussp == '1'" class="dialog-footer" slot="footer">
+        <el-button type="primary" @click="submitForms">通过</el-button>
+        <el-button @click="boHui" size="btn">驳回</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 审批人员请假对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open2"
+      width="500px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        inline
+      >
+        <div class="jiben">基本信息</div>
+
+        <el-form-item label="单位" prop="unitId">
+          <treeselect
+            v-model="form.unitId"
+            :options="deptOptions"
+            placeholder="请选择单位"
+            @select="selectPeo"
+            @open="blurSelect"
+            disabled
+          />
+        </el-form-item>
+        <el-form-item label="请假人员" prop="peopleId">
+          <!-- <el-input v-model="form.peopleId" placeholder="请输入请假人员" /> -->
+          <el-select
+            v-model="form.peopleId"
+            placeholder="请输入请假人员"
+            ref="headerSearchSelect"
+            disabled
+          >
+            <el-option
+              v-for="(item, i) in renYuan"
+              :key="i"
+              :label="item.name"
+              :value="item.id"
+              @click.native="qingRen(item.name)"
+              class="input_xiala"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="请假开始时间" prop="startTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.startTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择请假开始时间"
+            disabled
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="请假结束时间" prop="endTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.endTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择请假结束时间"
+            disabled
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="请假类型" prop="leaveType">
+          <el-select
+            v-model="form.leaveType"
+            placeholder="请选择请假类型"
+            disabled
+          >
+            <!-- <el-option label="请选择字典生成" value="" /> -->
+            <el-option
+              v-for="item in ziDian"
+              :key="item.dictCode"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+              class="input_xiala"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="离队时间" prop="departureTime">
+          <!-- <el-input v-model="form.departureTime" placeholder="请输入离队时间" /> -->
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.departureTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请输入离队时间"
+            disabled
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="归队时间" prop="returnTime">
+          <!-- <el-input v-model="form.returnTime" placeholder="请输入归队时间" /> -->
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.returnTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请输入归队时间"
+            disabled
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="一级审批人" prop="peopleId2">
+          <!-- <el-input v-model="form.peopleId2" placeholder="请输入二级审批人" /> -->
+          <el-select
+            v-model="form.peopleId1"
+            filterable
+            placeholder="请输入一级审批人"
+            ref="abcdef"
+            disabled
+          >
+            <el-option
+              v-for="(item, i) in yongHu"
+              :key="i"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="oneRen(item.nickName)"
+              class="input_xiala"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="二级审批人" prop="peopleId2">
+          <!-- <el-input v-model="form.peopleId2" placeholder="请输入二级审批人" /> -->
+          <el-select
+            v-model="form.peopleId2"
+            filterable
+            placeholder="请输入二级审批人"
+            ref="abcde"
+            disabled
+          >
+            <el-option
+              v-for="(item, i) in yongHu"
+              :key="i"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="twoRen(item.nickName)"
+              class="input_xiala"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="三级审批人" prop="peopleId3">
+          <!-- <el-input v-model="form.peopleId3" placeholder="请输入三级审批人" /> -->
+          <el-select
+            v-model="form.peopleId3"
+            filterable
+            placeholder="请输入三级审批人"
+            ref="abcd"
+            disabled
+          >
+            <el-option
+              v-for="(item, i) in yongHu"
+              :key="i"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="thereRen(item.nickName)"
+              class="input_xiala"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="四级审批人" prop="peopleId4">
+          <!-- <el-input v-model="form.peopleId4" placeholder="请输入四级审批人" /> -->
+          <el-select
+            v-model="form.peopleId4"
+            filterable
+            placeholder="请输入四级审批人"
+            ref="abc"
+            disabled
+          >
+            <el-option
+              v-for="(item, i) in yongHu"
+              :key="i"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="fourRen(item.nickName)"
+              class="input_xiala"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <div class="jiben">请假原因</div>
+        <el-form-item prop="leaveReason">
+          <el-input
+            v-model="form.leaveReason"
+            type="textarea"
+            placeholder="请输入内容"
+            disabled
+          />
+        </el-form-item>
+        <div class="jiben" v-if="statussp == '1'">驳回原因</div>
+        <el-form-item v-if="statussp == '1'" prop="reasons">
+          <el-input
+            v-model="form.reasons"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+        <div class="jiben" v-if="statussp == '2'">驳回原因</div>
+        <el-form-item v-if="statussp == '2'" prop="reasons">
+          <el-input
+            v-model="form.reasons"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+        <div class="jiben" v-if="statussp == '2'">特殊审批原因</div>
+        <el-form-item v-if="statussp == '2'" prop="reasons">
+          <el-input
+            v-model="form.specialApproval"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer" v-if="statussp == '0'">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
+      </div>
+      <div v-if="statussp == '1'" class="dialog-footer" slot="footer">
+        <el-button type="primary" @click="submitForms">通过</el-button>
+        <el-button @click="boHui" size="btn">驳回</el-button>
+      </div>
+    </el-dialog>
     <!--特殊审批对话框 -->
     <el-dialog
       :title="title"
@@ -597,6 +1077,7 @@
             placeholder="选择单位"
             @select="selectPeo"
             @open="blurSelect"
+            disabled
           />
         </el-form-item>
         <el-form-item label="请假人员" prop="peopleId">
@@ -604,6 +1085,7 @@
             v-model="form.peopleId"
             placeholder="请选择请假人员"
             ref="headerSearchSelect"
+            disabled
           >
             <el-option
               v-for="(item, i) in renYuan"
@@ -624,6 +1106,7 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择请假开始时间"
+            disabled
           >
           </el-date-picker>
         </el-form-item>
@@ -635,11 +1118,16 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择请假结束时间"
+            disabled
           >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="请假类型" prop="leaveType">
-          <el-select v-model="form.leaveType" placeholder="请选择请假类型">
+          <el-select
+            v-model="form.leaveType"
+            placeholder="请选择请假类型"
+            disabled
+          >
             <el-option
               v-for="item in ziDian"
               :key="item.dictCode"
@@ -656,6 +1144,7 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="请输入离队时间"
+            disabled
           >
           </el-date-picker>
         </el-form-item>
@@ -667,6 +1156,7 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="请输入归队时间"
+            disabled
           >
           </el-date-picker>
         </el-form-item>
@@ -676,6 +1166,7 @@
             filterable
             placeholder="请输入一级审批人"
             ref="abcdef"
+            disabled
           >
             <el-option
               v-for="(item, i) in yongHu"
@@ -693,6 +1184,7 @@
             filterable
             placeholder="请输入二级审批人"
             ref="abcde"
+            disabled
           >
             <el-option
               v-for="(item, i) in yongHu"
@@ -710,6 +1202,7 @@
             filterable
             placeholder="请输入三级审批人"
             ref="abcd"
+            disabled
           >
             <el-option
               v-for="(item, i) in yongHu"
@@ -727,6 +1220,7 @@
             filterable
             placeholder="请输入四级审批人"
             ref="abc"
+            disabled
           >
             <el-option
               v-for="(item, i) in yongHu"
@@ -744,10 +1238,11 @@
             v-model="form.leaveReason"
             type="textarea"
             placeholder="请输入内容"
+            disabled
           />
         </el-form-item>
         <div class="jiben">驳回原因</div>
-        <el-form-item prop="reasons">
+        <el-form-item prop="">
           <el-input
             v-model="form.reasons"
             type="textarea"
@@ -782,7 +1277,7 @@ import {
 } from "@/api/peopleChuRu/bdglLeave";
 
 import {
-  getUser,
+  getUserzs,
   getDept,
   getQuanBu,
 } from "@/api/grassrootsregistration/bdglmeeting";
@@ -915,6 +1410,12 @@ export default {
       shenPis: {},
       // 特殊审批对象
       teShu: {},
+      // 修改弹出层
+      open1: false,
+      // 修改审批人禁止修改
+      xiugai: false,
+      // 审批弹出层显示与隐藏
+      open2: false,
     };
   },
   created() {
@@ -955,6 +1456,7 @@ export default {
       const id = row.id || this.ids;
       getBdglLeave(id).then((response) => {
         this.form = response.data;
+        this.form.specialApproval = null;
         this.getYong(this.form.unitId);
         this.getRen(this.form.unitId);
         this.opens = true;
@@ -973,10 +1475,9 @@ export default {
       const id = row.id || this.ids;
       getBdglLeave(id).then((response) => {
         this.form = response.data;
-        console.log(this.form);
         this.getYong(this.form.unitId);
         this.getRen(this.form.unitId);
-        this.open = true;
+        this.open2 = true;
         this.title = "审批人员请假";
       });
     },
@@ -1036,8 +1537,8 @@ export default {
     },
     // 获取用户列表
     getYong(id) {
-      getUser(id).then((res) => {
-        this.yongHu = res.data;
+      getUserzs(id).then((res) => {
+        this.yongHu = res.rows;
       });
     },
     // 获取人员
@@ -1058,6 +1559,8 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.open1 = false;
+      this.open2 = false;
       this.reset();
     },
     //审批通过按钮
@@ -1065,22 +1568,23 @@ export default {
       if (this.shenPis.shenPiJiBie == "一级") {
         this.form.status1 = 1;
         this.form.contents = "一级审批通过";
+        // console.log("一级");
       } else if (this.shenPis.shenPiJiBie == "二级") {
         this.form.status2 = 1;
         this.form.contents = "二级审批通过";
-        console.log("二级");
+        // console.log("二级");
       } else if (this.shenPis.shenPiJiBie == "三级") {
         this.form.status3 = 1;
         this.form.contents = "三级审批通过";
-        console.log("三级");
+        // console.log("三级");
       } else if (this.shenPis.shenPiJiBie == "四级") {
         this.form.status4 = 1;
         this.form.contents = "四级审批通过";
-        console.log("四级");
+        // console.log("四级");
       }
       updateBdglLeave(this.form).then((response) => {
         this.$modal.msgSuccess("审批成功");
-        this.open = false;
+        this.open2 = false;
         this.getList();
       });
     },
@@ -1103,7 +1607,7 @@ export default {
           }
           updateBdglLeave(this.form).then((response) => {
             this.$modal.msgSuccess("审批成功");
-            this.open = false;
+            this.open2 = false;
             this.getList();
           });
         }
@@ -1201,7 +1705,6 @@ export default {
         contents: null,
         statusd: null,
         rejoin: null,
-        specialApproval: null,
       };
       this.resetForm("form");
     },
@@ -1235,7 +1738,16 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      console.log(row);
       this.statussp = "0";
+      if (
+        row.status1 != 0 ||
+        row.status2 != 0 ||
+        row.status3 != 0 ||
+        row.status4 != 0
+      ) {
+        this.xiugai = true;
+      }
       this.getBuMeng();
       // 获取字典类型
       this.getdict();
@@ -1245,7 +1757,7 @@ export default {
         this.form = response.data;
         this.getYong(this.form.unitId);
         this.getRen(this.form.unitId);
-        this.open = true;
+        this.open1 = true;
         this.title = "修改人员请假";
       });
     },
@@ -1468,4 +1980,8 @@ export default {
 ::v-deep .box {
   background-color: #ffba00 !important;
 }
+::v-deep .el-input.is-disabled .el-input__inner {
+  background-color: transparent;
+  color: #fff;
+}
 </style>

src/views/peopleManage/people/index.vue

@@ -2155,4 +2155,7 @@ export default {
   padding: 0px 18px;
   margin-right: 230px;
 }
+::v-deep img {
+  object-fit: cover;
+}
 </style>

src/views/phone/cabinet/index.vue

@@ -229,6 +229,7 @@
 </template>
 
 <script>
+import axios from "axios";
 import {
   getCabinet,
   delCabinet,
@@ -238,7 +239,10 @@ import {
   xianPhone,
   xianPhoneGeZi,
   xianPhoneOppe,
+  getToken,
 } from "@/api/phone/cabinet";
+import { from } from "../../../../public/assets/libs/moment/src/lib/moment/from";
+import Cookies from "js-cookie";
 
 export default {
   name: "Cabinet",
@@ -335,7 +339,6 @@ export default {
       //     this.loading = false;
       //   });
     },
-
     // 点击名字触发
     buttOn(row, data) {
       this.jiBen = row;
@@ -400,16 +403,9 @@ export default {
     /** 查询手机柜列表 */
     getList() {
       xianPhone().then((res) => {
-        console.log(res);
+        // console.log(res);
         this.cabinetList = res.data.infos;
       });
-      // axios
-      //   .get("http://114.115.153.156:12090/wl/api/v1/cabinets", {
-      //     headers: { Authorization: Cookies.get("accessToken") },
-      //   })
-      //   .then((res) => {
-      //     this.cabinetList = res.data.infos;
-      //   });
     },
     // 取消按钮
     cancel() {

src/views/pt.vue

@@ -354,7 +354,9 @@
           <div class="num1">
             <div class="num2">
               <img src="../images/db.png" alt />
-              <span>待办事项</span>
+              <span style="font-family: siyuanbold; font-size: 15.5px"
+                >待办事项</span
+              >
             </div>
             <ul class="num1-ul">
               <div class="num2-ul-title">
@@ -377,9 +379,11 @@
           <div class="num1">
             <div class="num2">
               <img src="../assets/images/通知公告.png" alt />
-              <span>通知公告</span>
+              <span style="font-family: siyuanbold; font-size: 15.5px"
+                >通知公告</span
+              >
             </div>
-            <span class="addspan" @click="tiaddfun">更多</span>
+            <div class="addspan" @click="tiaddfun">查看更多</div>
             <div class="num1-box">
               <div
                 class="num1-box-div"
@@ -387,7 +391,18 @@
                 :key="item.noticeId"
                 @click="tzggfun(item)"
               >
-                <div class="num1-box-l">{{ item.noticeTitle }}</div>
+                <div class="num1-box-l">
+                  <span
+                    style="
+                      color: #bcbcbc;
+                      font-size: 14px;
+                      font-weight: 400;
+                      margin-right: 10px;
+                    "
+                    >[ {{ item.createTime }} ]</span
+                  >
+                  {{ item.noticeTitle }}
+                </div>
                 <div class="num1-box-r">
                   <img
                     src="../assets/images/通知.png"
@@ -717,6 +732,23 @@ export default {
     },
     // 手机柜线上地址
     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;
+      // console.log(csrftoken);
+      // document.cookie = "tiem" + "=" + new Date();
       axios
         .post("http://114.115.153.156:12090/wl/api/getAccessToken", {
           password: "super123fs456wl",
@@ -737,6 +769,12 @@ export default {
     getlist() {
       listNotice().then((res) => {
         this.noticeList = res.data;
+        console.log(this.noticeList);
+        this.noticeList.forEach((item) => {
+          // var newDate=/\d{4}-\d{1,2}-\d{1,2}/g.exec(item.createTime)
+          var a = item.createTime.substring(0, 10).split("-");
+          return (item.createTime = a[0] + "-" + a[1] + "-" + a[2]);
+        });
       });
     },
     getworklist() {
@@ -1120,7 +1158,7 @@ li {
 .demo {
   color: #fff;
   width: 107px;
-  height: 90%;
+  height: 95%;
   background: url("../images/tx.png") no-repeat;
   text-align: center;
   margin-top: 10%;
@@ -1192,10 +1230,10 @@ hr {
 .num1 {
   color: #fff;
   width: 529px;
-  height: 41.5vh;
-  background: url("../images/rd.png") no-repeat;
-  margin-bottom: 20px;
-  padding: 30px 20px 0px 20px;
+  height: 41vh;
+  background: url("../images/底3.png") no-repeat;
+  margin-bottom: 10px;
+  padding: 16px 20px 0px 20px;
   background-size: 100% 100%;
 }
 .num1 img {
@@ -1239,7 +1277,7 @@ hr {
 .num1-box {
   width: 100%;
   height: 86%;
-  margin-top: 10%;
+  margin-top: 5%;
 }
 .num1-box .num1-box-div {
   width: 100%;
@@ -1257,23 +1295,26 @@ hr {
   background: rgba(0, 246, 255, 0.3);
 }
 .num1-box-l {
-  flex: 7;
+  flex: 8;
   height: 100%;
   text-align: left;
   margin-left: 10px;
   text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
 }
 .num1-box-r {
-  flex: 3;
+  flex: 1;
   height: 100%;
   text-align: right;
   margin-right: 10px;
+  margin-top: -4px;
   line-height: 30px;
 }
 .num1-ul {
   width: 100%;
   height: 86%;
-  margin-top: 5%;
+  margin-top: 2%;
 }
 .num1-ul-li {
   width: 100%;
@@ -1378,19 +1419,27 @@ hr {
 .num1 {
   position: relative;
 }
+.num1 .addspan:hover {
+  color: #1d96ff;
+}
 .num1 .addspan {
-  width: 50px;
-  height: 25px;
+  width: 80px;
+  /* background-color: pink; */
+  height: 20px;
   display: inline-block;
-  background-color: #1c86e1;
+  /* background-color: #1c86e1; */
   line-height: 25px;
   text-align: center;
-  font-size: 16px;
+  font-size: 14px;
   cursor: pointer;
+  color: #dcdcdc;
+  background-repeat: no-repeat;
   /* margin-left: 3.5px; */
+  background-position: 70px 5px;
   position: absolute;
-  right: 3.5%;
-  top: 9%;
+  right: 1.6%;
+  top: 2%;
+  font-family: siyuan;
 }
 ::v-deep .el-dialog {
   background-color: #004d86;

src/views/regulations/fileinfo/index.vue

@@ -1145,6 +1145,7 @@ export default {
       this.reset();
       this.open = true;
       this.title = "上传文件";
+      this.moreFile=""
       this.ListDirectoryinfo();
     },
     // 目录管理

src/views/taishi/index.vue

@@ -245,11 +245,11 @@
             </div>
             <div class="center4_b">
               在位
-              <span style="color: #fde17b">{{ jclist.waichu }}</span>
+              <span style="color: #fde17b">{{ jclist.zaiwei }}</span>
             </div>
             <div class="center4_b">
               外出
-              <span style="color: #f0422a">{{ jclist.zaiwei }}</span>
+              <span style="color: #f0422a">{{ jclist.waichu }}</span>
             </div>
             <table class="center4_s">
               <tr>
@@ -263,7 +263,7 @@
                 </td>
               </tr>
               <tr>
-                <td style="font-size: 15px; color: white">车辆统计</td>
+                <td style="font-size: 13px; color: white">车辆统计</td>
               </tr>
             </table>
 
@@ -279,11 +279,11 @@
                 </td>
               </tr>
               <tr>
-                <td style="font-size: 15px; color: white">车辆在位</td>
+                <td style="font-size: 13px; color: white">车辆在位</td>
               </tr>
             </table>
 
-            <table class="center4_s" style="margin-top: 1.3%">
+            <table class="center4_s" style="margin-top: 1.28%">
               <tr>
                 <td rowspan="2">
                   <img src="../../assets/images/cheliangz.png" alt />
@@ -295,7 +295,7 @@
                 </td>
               </tr>
               <tr>
-                <td style="font-size: 15px; color: white">车辆出场</td>
+                <td style="font-size: 13px; color: white">车辆出场</td>
               </tr>
             </table>
 
@@ -307,11 +307,13 @@
                 <td
                   style="font-family: 'IMPACT'; font-size: 22px; color: #b4372a"
                 >
-                  1
+                  0
                 </td>
               </tr>
               <tr>
-                <td colspan="2" style="letter-spacing: 7px">夜间进入</td>
+                <td colspan="2" style="letter-spacing: 7px; font-size: 13px">
+                  夜间进入
+                </td>
               </tr>
             </table>
 
@@ -323,11 +325,13 @@
                 <td
                   style="font-family: 'IMPACT'; font-size: 22px; color: #b4372a"
                 >
-                  1
+                  0
                 </td>
               </tr>
               <tr>
-                <td colspan="2" style="letter-spacing: 7px">外来车辆</td>
+                <td colspan="2" style="letter-spacing: 7px; font-size: 13px">
+                  外来车辆
+                </td>
               </tr>
             </table>
           </div>
@@ -897,7 +901,7 @@
                 :key="index"
               >
                 <span style="color: #fff; font-size: 12px">
-                  {{ index }}
+                  {{ index + 1 }}
                 </span>
                 <span>{{ item.durgName }}</span>
                 <span>{{ item.amount }}</span>
@@ -1040,6 +1044,7 @@ import {
   getantiepidemic,
   antiepidemicArchivesList,
   getLeavlNumber,
+  zongjinrizhiban,
 } from "@/api/taishi/taishi";
 import * as echarts from "echarts";
 import vueSeamlessScroll from "vue-seamless-scroll";
@@ -1120,7 +1125,7 @@ export default {
         { name: "政治工作部值班员", value: "" },
         { name: "保障部值班员", value: "" },
         { name: "值班通信员", value: "" },
-        { name: "值班分队", value: "" },
+        { name: "值班总人数", value: "" },
       ],
       // 检查督导
       jianCanName: [],
@@ -1171,7 +1176,9 @@ export default {
               value: res.data[i],
             });
           } else if (i == "detachmentName") {
-            this.jrzblist.push({ name: "值班分队", value: res.data[i] });
+            zongjinrizhiban().then((res) => {
+              this.jrzblist.push({ name: "值班总人数", value: res.data[1] });
+            });
           }
         }
       }
@@ -2234,7 +2241,7 @@ export default {
   border: 0.1px solid #052c41;
   height: 6vh;
   width: 35%;
-  line-height: 50px;
+  line-height: 6vh;
   text-align: center;
 }
 
@@ -2245,9 +2252,16 @@ export default {
 }
 .center4_s {
   /* transform: scale(0.8); */
+  /* width: 20px; */
+  height: 6.3vh;
+  /* width: ; */
+  line-height: 2vh;
   position: relative;
   top: -80%;
   left: 40%;
+  margin-top: -0.5vh;
+  margin-left: 4px;
+  /* line-height: 50px; */
   margin-bottom: 5px;
   /* margin-top: 10px; */
 }
@@ -2261,14 +2275,19 @@ export default {
   color: white;
   font-size: 12px;
   position: absolute;
-  top: 15%;
+  top: 12%;
   left: 75%;
+  height: 8.2vh;
+  margin-top: -1vh;
+  line-height: 2.2vh;
   margin-bottom: 20px;
 }
 .center4_y2 {
   position: absolute;
-  top: 60%;
+  top: 57%;
   left: 75%;
+  height: 9vh;
+  line-height: 1.9vh;
   margin-bottom: 20px;
 }
 .center4_y img {
@@ -2653,11 +2672,13 @@ export default {
 }
 .right3-r-main-item {
   width: 100%;
-  height: 20%;
+  height: 5vh;
+  /* height: 20%; */
   display: flex;
-  margin-top: 4%;
+  margin-top: 1vh;
 }
 .right3-r-main-item-l {
+  margin-top: 1px;
   width: 30%;
   height: 100%;
   display: inline-block;