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

src/api/combatduty/teamdutyinfo.js

@@ -76,4 +76,12 @@ export function getDept(query) {
     method: 'get',
     params: query
   })
+}
+
+// 删除新增按钮当前数据
+export function delTeamdutyinfos(id) {
+  return request({
+    url: '/combatduty/teamdutyFu/' + id,
+    method: 'delete'
+  })
 }

src/assets/styles/global.css

@@ -1054,7 +1054,7 @@ input:-moz-placeholder {
 #app .sidebar-container {
   -webkit-transition: width 0.28s;
   transition: width 0.28s;
-  width: 265px !important;
+  width: 240px !important;
   background-color: #304156;
   height: 100%;
   position: fixed;
@@ -1072,7 +1072,7 @@ input:-moz-placeholder {
   min-height: 100%;
   -webkit-transition: margin-left 0.28s;
   transition: margin-left 0.28s;
-  margin-left: 265px;
+  margin-left: 240px;
   position: relative;
 }
 

src/components/FileUpload/index.vue

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

src/layout/components/TagsView/index.vue

@@ -226,7 +226,7 @@ export default {
       }
 
       this.top = e.clientY
-      this.visible = true
+      // this.visible = true
       this.selectedTag = tag
     },
     closeMenu() {

src/views/PrintsLog/printlog/index.vue

@@ -245,12 +245,12 @@
             >查看</el-button
           >
           <!-- <el-button size="mini" type="text" v-if="scope.row.statusG==1||scope.row.statusG==2">已归还</el-button> -->
-          <!-- <el-button
+          <el-button
             size="btd"
             type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['PrintsLog:printlog:remove']"
-          >删除</el-button>-->
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/barracksManagement/checkin/index.vue

@@ -126,12 +126,6 @@
       <el-table-column label="单位名称" align="center" prop="unitName" />
       <el-table-column label="位置" align="center" prop="common" />
       <el-table-column label="入住人姓名" align="center" prop="occupant" />
-      <el-table-column
-        label="备注"
-        align="center"
-        prop="remark"
-        show-overflow-tooltip
-      />
       <el-table-column label="入住时间" align="center" prop="entryTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.entryTime, "{y}-{m}-{d}") }}</span>
@@ -142,6 +136,12 @@
           <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
+      <el-table-column
+        label="备注"
+        align="center"
+        prop="remark"
+        show-overflow-tooltip
+      />
       <el-table-column
         label="操作"
         align="center"
@@ -255,13 +255,13 @@ export default {
   name: "Checkin",
   data() {
     var validatePass = (rule, value, callback) => {
-      console.log(value)
+      console.log(value);
       var MobileRegex = /^(\d+)*#+(\d+)$/;
       if (!MobileRegex.test(value)) {
         callback(new Error("位置格式不正确！"));
-      }else{
-        console.log("11")
-        callback()
+      } else {
+        console.log("11");
+        callback();
       }
     };
     return {

src/views/barracksManagement/flats/index.vue

@@ -39,7 +39,7 @@
           v-model="queryParams.peopleName"
           ref="peoplenames"
           placeholder="请选择人员"
-            @change="handleQuery"
+          @change="handleQuery"
         >
           <el-option
             v-for="item in executors"
@@ -590,24 +590,21 @@
           </el-date-picker>
         </el-form-item>
         <div class="jiben">信息确认</div>
-        <el-form-item
+        <!-- <el-form-item
           label="是否符合申请条件"
           prop="whether"
           style="margin-left: -20px"
           label-width="127px"
         >
           <el-input v-model="form.whether" />
-        </el-form-item>
-        <el-form-item
+        </el-form-item> -->
+        <!-- <el-form-item
           label="申请住房户型"
           prop="houseType"
           style="margin-left: 5px"
         >
-          <!-- <el-select v-model="form.houseType" placeholder="请选择申请住房户型" class="zhufnag">
-            <el-option label="请选择字典生成" value="" class="zhufnag" /> -->
           <el-input v-model="form.houseType" class="zhufnag" />
-          <!-- </el-select> -->
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item
           label="申请住房类别"
           prop="type"
@@ -1165,5 +1162,4 @@ export default {
 ::v-deep .dialog-footer {
   margin-right: 34px;
 }
-
 </style>

src/views/bdglSecret/secret/index.vue

@@ -24,15 +24,15 @@
           />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item prop="confidential">
+      <el-form-item prop="peopleName">
         <el-input
-          v-model="queryParams.confidential"
-          placeholder="请输入密级"
+          v-model="queryParams.peopleName"
+          placeholder="请输入责任人"
           clearable
           size="small"
           @input="handleQuery"
         />
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item>
         <el-button icon="el-icon-refresh" size="btr" @click="resetQuery"
           >重置</el-button
@@ -114,7 +114,7 @@
       <el-table-column label="型号" align="center" prop="version" width="200" />
       <el-table-column label="编号" align="center" prop="number" width="200" />
       <!-- <el-table-column label="密级" align="center" prop="confidential" /> -->
-      <el-table-column label="使用人" align="center" prop="people1Name" />
+      <!-- <el-table-column label="使用人" align="center" prop="people1Name" /> -->
       <el-table-column
         label="使用单位"
         align="center"
@@ -122,9 +122,16 @@
         :formatter="deptIdformatter"
         width="200"
       />
-      <el-table-column label="用途" align="center" show-overflow-tooltip prop="people2Name" width="200" />
+      <el-table-column label="责任人" align="center" prop="peopleName" />
       <el-table-column
-        label="起用时间"
+        label="用途"
+        align="center"
+        show-overflow-tooltip
+        prop="people2Name"
+        width="200"
+      />
+      <el-table-column
+        label="启用时间"
         align="center"
         prop="startTime"
         width="160"
@@ -153,8 +160,13 @@
           <span>{{ parseTime(scope.row.hindOverTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="责任人" align="center" prop="peopleName" />
-      <el-table-column label="备注" align="center" show-overflow-tooltip prop="remarks" width="200" />
+      <el-table-column
+        label="备注"
+        align="center"
+        show-overflow-tooltip
+        prop="remarks"
+        width="200"
+      />
       <el-table-column
         label="操作"
         align="center"
@@ -222,11 +234,7 @@
           />
         </el-form-item>
         <el-form-item label="类型" prop="kind">
-          <el-select
-            v-model="form.kind"
-            placeholder="请选择类型"
-            @change="zhongLei"
-          >
+          <el-select v-model="form.kind" placeholder="请选择类型">
             <el-option
               v-for="item in ziDian"
               :key="item.dictValue"
@@ -238,9 +246,9 @@
           </el-select>
         </el-form-item>
         <el-form-item label="编号" prop="number">
-          <el-input v-model="form.number" placeholder="请输入编号" disabled />
+          <el-input v-model="form.number" placeholder="请输入编号" />
         </el-form-item>
-        <el-form-item label="使用人" prop="peopleId1">
+        <!-- <el-form-item label="使用人" prop="peopleId1">
           <el-select
             ref="aa"
             v-model="form.peopleId1"
@@ -256,7 +264,7 @@
             >
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="型号" prop="version">
           <el-input v-model="form.version" placeholder="请输入型号" />
         </el-form-item>
@@ -289,7 +297,7 @@
             </el-option>
           </el-select>
         </el-form-item> -->
-        <el-form-item label="起用时间" prop="startTime">
+        <el-form-item label="启用时间" prop="startTime">
           <el-date-picker
             clearable
             size="small"
@@ -297,7 +305,7 @@
             type="date"
             :editable="false"
             value-format="yyyy-MM-dd"
-            placeholder="请选择起用时间"
+            placeholder="请选择启用时间"
           >
           </el-date-picker>
         </el-form-item>
@@ -375,14 +383,14 @@ import {
   addSecret,
   updateSecret,
   exportSecret,
-  getDepts
+  getDepts,
 } from "@/api/bdglSecret/secret";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getDicts } from "@/api/system/dict/data";
 import {
   getZhuChiRen,
-  getDept
+  getDept,
 } from "@/api/grassrootsregistration/bdglmeeting";
 export default {
   name: "Bdglsecrecy",
@@ -428,36 +436,36 @@ export default {
         peopleId: null,
         peopleId1: null,
         peopleId2: null,
-        people2Name:null,
+        people2Name: null,
         startTime: null,
         endTime: null,
         hindOverTime: null,
         unitId: null,
-        remarks:null,
+        remarks: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         unitId: [
-          { required: true, message: "单位名称不能为空", trigger: "blur" }
+          { required: true, message: "单位名称不能为空", trigger: "blur" },
         ],
         kind: [{ required: true, message: "种类不能为空", trigger: "blur" }],
         confidential: [
-          { required: true, message: "密级不能为空", trigger: "blur" }
+          { required: true, message: "密级不能为空", trigger: "blur" },
         ],
         peopleId: [
-          { required: true, message: "责任人不能为空", trigger: "blur" }
+          { required: true, message: "责任人不能为空", trigger: "blur" },
         ],
         peopleId1: [
-          { required: true, message: "使用人不能为空", trigger: "blur" }
+          { required: true, message: "使用人不能为空", trigger: "blur" },
         ],
         // peopleId2: [
         //   { required: true, message: "批准人不能为空", trigger: "blur" },
         // ],
         startTime: [
-          { required: true, message: "起用时间不能为空", trigger: "blur" }
-        ]
+          { required: true, message: "起用时间不能为空", trigger: "blur" },
+        ],
       },
       //下拉
       options: [],
@@ -465,7 +473,7 @@ export default {
       deptOptions: [],
       // 查询字典
       dictType: {
-        dictType: "electronic"
+        dictType: "electronic",
       },
       // 字典列表
       ziDian: [],
@@ -474,16 +482,16 @@ export default {
       // 树形配置对象
       defaultProps: {
         children: "children",
-        label: "label"
+        label: "label",
       },
-      unitId: []
+      unitId: [],
     };
   },
   created() {
     this.getList();
     this.getdict();
     //部门数据
-    getDepts().then(res => {
+    getDepts().then((res) => {
       if (res.code == 200) {
         this.unitId = res.data;
       }
@@ -493,7 +501,7 @@ export default {
     //单位翻译
     deptIdformatter(row, column) {
       var deptName = "";
-      this.unitId.map(item => {
+      this.unitId.map((item) => {
         if (item.deptId == row.unitId) {
           deptName = item.deptName;
         }
@@ -501,7 +509,7 @@ export default {
       return deptName;
     },
     // 种类选择触发
-    zhongLei() {
+    zhongLeis() {
       this.planName();
     },
     // 计划编号
@@ -529,7 +537,7 @@ export default {
     },
     // 获取主持人
     getZhuChi(id) {
-      getZhuChiRen(id).then(res => {
+      getZhuChiRen(id).then((res) => {
         this.renYuan = res.data;
       });
     },
@@ -543,7 +551,7 @@ export default {
     /** 查询网络/手机/涉密载体登记本列表 */
     getList() {
       this.loading = true;
-      listSecret(this.queryParams).then(response => {
+      listSecret(this.queryParams).then((response) => {
         this.bdglsecrecyList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -551,21 +559,21 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-      getDept().then(response => {
+      getDept().then((response) => {
         // console.log(response);
         this.deptOptions = response.data;
       });
     },
     // 查询电子产品
     getdict() {
-      getDicts(this.dictType.dictType).then(res => {
+      getDicts(this.dictType.dictType).then((res) => {
         this.ziDian = res.data;
       });
     },
     // 选中添加部门单位触发
     department() {
       console.log(this.form);
-      getZhuChiRen(this.form.unitId).then(res => {
+      getZhuChiRen(this.form.unitId).then((res) => {
         console.log(res);
         this.renYuan = res.data;
       });
@@ -608,12 +616,12 @@ export default {
         peopleId: null,
         peopleId1: null,
         peopleId2: null,
-        people2Name:null,
+        people2Name: null,
         startTime: null,
         endTime: null,
         hindOverTime: null,
         unitId: null,
-        remarks:null,
+        remarks: null,
       };
       this.resetForm("form");
     },
@@ -639,7 +647,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;
     },
@@ -665,7 +673,7 @@ export default {
       this.reset();
       this.getTreeselect();
       const id = row.id || this.ids;
-      getSecret(id).then(response => {
+      getSecret(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改网络/手机/涉密载体登记本";
@@ -676,7 +684,7 @@ export default {
       // 是否隐藏按钮
       this.opens = false;
       const id = row.id || this.ids;
-      getSecret(id).then(response => {
+      getSecret(id).then((response) => {
         console.log(response);
         this.wordInfo = response.data;
         this.title = "查看网络/手机/涉密载体登记本";
@@ -687,16 +695,16 @@ export default {
     /** 提交按钮 */
     submitForm(style) {
       this.style = style;
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateSecret(this.form).then(response => {
+            updateSecret(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addSecret(this.form).then(response => {
+            addSecret(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -713,7 +721,7 @@ export default {
         //   '是否确认删除网络/手机/涉密载体登记本编号为"' + ids + '"的数据项？'
         // )
         .confirm("是否确认删除该数据？")
-        .then(function() {
+        .then(function () {
           return delSecret(ids);
         })
         .then(() => {
@@ -731,13 +739,13 @@ export default {
           this.exportLoading = true;
           return exportSecret(queryParams);
         })
-        .then(response => {
+        .then((response) => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
         .catch(() => {});
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped>

src/views/bdglregular/regularcountinfo/index.vue

@@ -91,7 +91,7 @@
       </div>
       <div class="foot-right">
         <div class="head-left-title">
-          <span>各营级</span>
+          <span>各单位</span>
         </div>
         <div class="foot-right-main" id="foot-right-main" ref="foot">
           <div class="block"></div>
@@ -146,14 +146,14 @@ export default {
         if (res.code == 200) {
           this.peopleList = res.data;
           // console.log(this.peopleList)
-          this.peopleList.forEach((item)=>{
+          this.peopleList.forEach((item) => {
             // console.log(item.zongfen)
-            return item.zongfen = item.zongfen.split(".")[0]
-          })
-           this.peopleList.forEach((item)=>{
+            return (item.zongfen = item.zongfen.split(".")[0]);
+          });
+          this.peopleList.forEach((item) => {
             // console.log(item.zongfen)
-            return item.subscore = item.subscore.split(".")[0]
-          })
+            return (item.subscore = item.subscore.split(".")[0]);
+          });
           // console.log(this.peopleList)
         }
       });

src/views/bdglregular/regularinfo/index.vue

@@ -178,7 +178,7 @@
         <el-button
           type="success"
           v-if="queryParams.caoZuoType == 0"
-          style="background: #1D96FF"
+          style="background: #1d96ff"
           @click="handleAdd"
           >减分录入</el-button
         >
@@ -187,7 +187,7 @@
         <el-button
           type="success"
           v-if="queryParams.caoZuoType == 1"
-          style="background: #1D96FF"
+          style="background: #1d96ff"
           @click="handleAdd"
           >加分录入</el-button
         >
@@ -252,7 +252,12 @@
       </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="inspectionTime" width="150px" />
+      <el-table-column
+        label="检查时间"
+        align="center"
+        prop="inspectionTime"
+        width="150px"
+      />
       <el-table-column label="检查地点" align="center" prop="inspectionSite" />
       <el-table-column
         label="分值"
@@ -350,10 +355,7 @@
             "
             >审批</el-button
           >
-          <el-button
-            size="btu"
-            type="text"
-            @click="handleAdds(scope.row)"
+          <el-button size="btu" type="text" @click="handleAdds(scope.row)"
             >修改</el-button
           >
           <el-button size="btd" type="text" @click="handleDelete(scope.row)"
@@ -392,8 +394,8 @@
             v-model="form.unitCheck"
             @change="unitCheckIdfun"
             clearable
-            placeholder="请选择受检单位"
-            :disabled="disabled || this.isdisabled==true"
+            placeholder="请选择检查单位"
+            :disabled="disabled || this.isdisabled == true"
           >
             <el-option
               v-for="dict in unitId"
@@ -409,7 +411,7 @@
             @change="inspectedUnitfun"
             clearable
             placeholder="请选择受检单位"
-            :disabled="disabled || this.isdisabled==true"
+            :disabled="disabled || this.isdisabled == true"
           >
             <el-option
               v-for="dict in unitId"
@@ -466,7 +468,7 @@
             default-time="00:00:00"
             value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="选择检查时间"
-            :disabled="disabled || this.isdisabled==true"
+            :disabled="disabled || this.isdisabled == true"
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="检查地点" prop="inspectionSite">
@@ -719,33 +721,33 @@ export default {
       disabled: false,
       currentState: null,
       curr: null,
-      isdisabled:false,
+      isdisabled: false,
     };
   },
   created() {
-    this.queryParams={
-        pageNum: 1,
-        pageSize: 10,
-        inspectedUnitId: null,
-        inspectedUnit: null,
-        inspectionType: null,
-        unitCheckId: null,
-        unitCheck: null,
-        inspectionTime: null,
-        inspectionSite: null,
-        score: null,
-        rectificationTime: null,
-        currentState: null,
-        question: null,
-        createUserId: null,
-        createUser: null,
-        chargePeopleId: null,
-        chargePeople: null,
-        correctiveAction: null,
-        pictureProof: null,
-        documentProof: null,
-        caoZuoType: 0,
-      };
+    this.queryParams = {
+      pageNum: 1,
+      pageSize: 10,
+      inspectedUnitId: null,
+      inspectedUnit: null,
+      inspectionType: null,
+      unitCheckId: null,
+      unitCheck: null,
+      inspectionTime: null,
+      inspectionSite: null,
+      score: null,
+      rectificationTime: null,
+      currentState: null,
+      question: null,
+      createUserId: null,
+      createUser: null,
+      chargePeopleId: null,
+      chargePeople: null,
+      correctiveAction: null,
+      pictureProof: null,
+      documentProof: null,
+      caoZuoType: 0,
+    };
     //部门数据
     getDept().then((res) => {
       if (res.code == 200) {
@@ -776,7 +778,7 @@ export default {
   },
   watch: {
     $route(to, from) {
-      this.queryParams={
+      this.queryParams = {
         pageNum: 1,
         pageSize: 10,
         inspectedUnitId: null,
@@ -893,7 +895,7 @@ export default {
       this.title = "经常性检查";
       this.jiannum = 0;
       this.btnnum = null;
-           var today = new Date();
+      var today = new Date();
       var y = today.getFullYear();
       var M = today.getMonth() + 1;
       var d = today.getDate();
@@ -916,7 +918,8 @@ export default {
       if (s < 10) {
         s = "0" + s;
       }
-      this.form.inspectionTime = y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
+      this.form.inspectionTime =
+        y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
     },
     // // 修改按钮操作
     // handleAdds(row){
@@ -930,7 +933,7 @@ export default {
     // },
     /** 整改按钮操作 */
     handleUpdate(row) {
-      console.log(row)
+      console.log(row);
       this.reset();
       const id = row.id || this.ids;
       getRegularinfo(id).then((response) => {
@@ -946,9 +949,9 @@ export default {
       });
     },
     // 修改按钮
-    handleAdds(row){
-      this.isdisabled=true
-       this.reset();
+    handleAdds(row) {
+      this.isdisabled = true;
+      this.reset();
       const id = row.id || this.ids;
       getRegularinfo(id).then((response) => {
         this.form = response.data;

src/views/combatduty/Quantitative/index.vue

@@ -37,7 +37,7 @@
             <div class="wrap-top-left-top-item">
               <div class="wrap-top-left-top-item-left">一分队指挥员</div>
               <div class="wrap-top-left-top-item-right">
-                {{ this.BaseOnDuty.detachmentonePeopleName}}
+                {{ this.BaseOnDuty.detachmentonePeopleName }}
               </div>
             </div>
             <div class="wrap-top-left-top-item">
@@ -45,12 +45,13 @@
                 一 分 队 人 数
               </div>
               <div class="wrap-top-left-top-item-right2">
-                <span> {{ this.BaseOnDuty.detachmentoneNumber }}</span>人
+                <span> {{ this.BaseOnDuty.detachmentoneNumber }}</span
+                >人
               </div>
             </div>
           </div>
           <div style="width: 100%; display: flex">
-             <div class="wrap-top-left-top-item">
+            <div class="wrap-top-left-top-item">
               <div class="wrap-top-left-top-item-left">值 班 分 队 二</div>
               <div class="wrap-top-left-top-item-right">
                 {{ this.BaseOnDuty.detachmentwoName }}
@@ -62,90 +63,99 @@
                 {{ this.BaseOnDuty.detachmentwoPeopleName }}
               </div>
             </div>
-           
+
             <div class="wrap-top-left-top-item">
               <div class="wrap-top-left-top-item-left zuozhan">
                 二 分 队 人 数
               </div>
               <div class="wrap-top-left-top-item-right2">
-                  <span>{{ this.BaseOnDuty.detachmentwoNumber }}</span>人
+                <span>{{ this.BaseOnDuty.detachmentwoNumber }}</span
+                >人
               </div>
             </div>
           </div>
         </div>
       </div>
-      <div class="wrap-top-left-top" style="margin-left:10px;">
+      <div class="wrap-top-left-top" style="margin-left: 10px">
         <div class="wrap-top-left-top-head"><b>大队值班</b></div>
         <div style="width: 100%; display: flex">
-            <div class="wrap-top-left-top-item">
-              <div class="wrap-top-left-top-item-left">值 班 首 长</div>
-              <div class="wrap-top-left-top-item-right">
-                {{ this.GreatDuty1.chiefDutyName }}
-              </div>
+          <div class="wrap-top-left-top-item">
+            <div class="wrap-top-left-top-item-left">值 班 首 长</div>
+            <div class="wrap-top-left-top-item-right">
+              {{ this.GreatDuty1.chiefDutyName }}
             </div>
-            <div class="wrap-top-left-top-item">
-              <div class="wrap-top-left-top-item-left">机要值班员</div>
-              <div class="wrap-top-left-top-item-right" style="margin-left:22px">
-                {{ this.GreatDuty1.confidentialName }}
-              </div>
+          </div>
+          <div class="wrap-top-left-top-item">
+            <div class="wrap-top-left-top-item-left">机要值班员</div>
+            <div class="wrap-top-left-top-item-right" style="margin-left: 22px">
+              {{ this.GreatDuty1.confidentialName }}
             </div>
-            <div class="wrap-top-left-top-item">
-              <div class="wrap-top-left-top-item-left zuozhan">
-                作 战 值 班 员
-              </div>
-              <div class="wrap-top-left-top-item-right">
-                {{ this.GreatDuty1.combatDutyName }}
-              </div>
+          </div>
+          <div class="wrap-top-left-top-item">
+            <div class="wrap-top-left-top-item-left zuozhan">
+              作 战 值 班 员
+            </div>
+            <div class="wrap-top-left-top-item-right">
+              {{ this.GreatDuty1.combatDutyName }}
             </div>
           </div>
-          <div style="width: 100%; display: flex">
-            <div class="wrap-top-left-top-item">
-              <div class="wrap-top-left-top-item-left">通 信 值 班 员</div>
-              <div class="wrap-top-left-top-item-right">
-                {{ this.GreatDuty1.dutyOffierName}}
-              </div>
+        </div>
+        <div style="width: 100%; display: flex">
+          <div class="wrap-top-left-top-item">
+            <div class="wrap-top-left-top-item-left">通 信 值 班 员</div>
+            <div class="wrap-top-left-top-item-right">
+              {{ this.GreatDuty1.dutyOffierName }}
             </div>
-            <div class="wrap-top-left-top-item">
-              <div class="wrap-top-left-top-item-left" style="width:120px">政治工作部值班员</div>
-              <div class="wrap-top-left-top-item-right">
-                {{ this.GreatDuty1.politicalName }}
-              </div>
+          </div>
+          <div class="wrap-top-left-top-item">
+            <div class="wrap-top-left-top-item-left" style="width: 120px">
+              政治工作部值班员
             </div>
-            <div class="wrap-top-left-top-item">
-              <div class="wrap-top-left-top-item-left zuozhan">
-                <!-- 值&nbsp;&nbsp;&nbsp;&nbsp; 班&nbsp;&nbsp;&nbsp;&nbsp; 分&nbsp;&nbsp;&nbsp;&nbsp; 队 -->
-                <span style="margin-right:10px">值</span><span style="margin-right:10px">班</span><span style="margin-right:10px">分</span><span>队</span>
-              </div>
-              <div class="wrap-top-left-top-item-right3">
-                {{ this.GreatDuty1.detachmentName }}
-                <!-- 发射一营 -->
-              </div>
+            <div class="wrap-top-left-top-item-right">
+              {{ this.GreatDuty1.politicalName }}
             </div>
           </div>
-          <div style="width: 100%; display: flex">
-            <div class="wrap-top-left-top-item">
-              <div class="wrap-top-left-top-item-left">通 信 值 班 员</div>
-              <div class="wrap-top-left-top-item-right">
-                {{ this.GreatDuty1.dutyOffierName }}
-              </div>
+          <div class="wrap-top-left-top-item">
+            <div class="wrap-top-left-top-item-left zuozhan">
+              <!-- 值&nbsp;&nbsp;&nbsp;&nbsp; 班&nbsp;&nbsp;&nbsp;&nbsp; 分&nbsp;&nbsp;&nbsp;&nbsp; 队 -->
+              <span style="margin-right: 10px">分</span
+              ><span style="margin-right: 10px">队</span
+              ><span style="margin-right: 10px">数</span><span>量</span>
             </div>
-            <div class="wrap-top-left-top-item">
-              <div class="wrap-top-left-top-item-left" style="width:110px">保 障 部 值 班 员</div>
-              <div class="wrap-top-left-top-item-right">
-                {{ this.GreatDuty1.guaranteeName }}
-              </div>
+            <div class="wrap-top-left-top-item-right3">
+              {{ this.GreatDuty1.detachmentName }}
+              <!-- 发射一营 -->
             </div>
-            <div class="wrap-top-left-top-item">
-              <div class="wrap-top-left-top-item-left1">
-               <span>指</span>
-               <span>挥</span>
-               <span>员</span>
-              </div>
-              <div class="wrap-top-left-top-item-right" style="margin-left:15px">
-                {{ this.GreatDuty1.detachmentPeopleName }}
-              </div>
+          </div>
+        </div>
+        <div style="width: 100%; display: flex">
+          <div class="wrap-top-left-top-item">
+            <div class="wrap-top-left-top-item-left">通 信 值 班 员</div>
+            <div class="wrap-top-left-top-item-right">
+              {{ this.GreatDuty1.dutyOffierName }}
+            </div>
+          </div>
+          <div class="wrap-top-left-top-item">
+            <div class="wrap-top-left-top-item-left" style="width: 110px">
+              保 障 部 值 班 员
+            </div>
+            <div class="wrap-top-left-top-item-right">
+              {{ this.GreatDuty1.guaranteeName }}
             </div>
           </div>
+          <div class="wrap-top-left-top-item">
+            <div class="wrap-top-left-top-item-left1">
+              <span>分</span>
+              <span>队</span>
+              <span>总</span>
+              <span>人</span>
+              <span>数</span>
+            </div>
+            <div class="wrap-top-left-top-item-right" style="margin-left: 15px">
+              {{ this.GreatDuty1.detachmentPeopleName }}
+            </div>
+          </div>
+        </div>
         <!-- <div class="wrap-top-left-top-item">
           <div class="wrap-top-left-top-item-left">值 班 首 长</div>
           <div class="wrap-top-left-top-item-right" style="padding-left: 25px">
@@ -212,21 +222,23 @@
         <div class="wrap-top-left-top-head"><b>执行任务人员情况</b></div>
         <table width="95%" style="table-layout: fixed">
           <tr>
-            <th style="width:100px;font-weight:500" height="40">单位</th>
-            <th style="width:100px;font-weight:500">指挥员</th>
-            <th style="width:120px;font-weight:500">事由</th>
-            <th style="width:100px;font-weight:500">所在位置</th>
-            <th style="width:100px;font-weight:500">开始时间</th>
-            <th style="width:110px;font-weight:500">结束时间</th>
+            <!-- <th style="width:100px;font-weight:500" height="40">单位</th> -->
+            <th style="width: 100px; font-weight: 500">指挥员</th>
+            <th style="width: 120px; font-weight: 500">事由</th>
+            <th style="width: 100px; font-weight: 500">所在位置</th>
+            <th style="width: 100px; font-weight: 500">开始时间</th>
+            <th style="width: 110px; font-weight: 500">结束时间</th>
           </tr>
 
           <tr v-for="item in performanceTask" :key="item.id">
-            <td style="color:#ccc"  height="28">{{item.unitName}}</td>
-            <td style="color:#ccc" >{{ item.commanderName }}</td>
-            <td style="color:#ccc" class="shiyou" :title="item.question"  >{{item.question }}</td>
-            <td style="color:#ccc" >{{ item.adress }}</td>
-            <td style="color:#ccc" >{{ item.startTime }}</td>
-            <td style="color:#ccc" >{{ item.endTime }}</td>
+            <!-- <td style="color:#ccc"  height="28">{{item.unitName}}</td> -->
+            <td style="color: #ccc">{{ item.commanderName }}</td>
+            <td style="color: #ccc" class="shiyou" :title="item.question">
+              {{ item.question }}
+            </td>
+            <td style="color: #ccc">{{ item.adress }}</td>
+            <td style="color: #ccc">{{ item.startTime }}</td>
+            <td style="color: #ccc">{{ item.endTime }}</td>
           </tr>
         </table>
       </div>
@@ -239,7 +251,9 @@
             </div>
             <div class="wrap-top-center-item-right">
               <div class="wrap-top-center-item-right-top">编纳总人数</div>
-              <div class="wrap-top-center-item-right-bottom">{{this.peopleQK.zaibianzongshu}}</div>
+              <div class="wrap-top-center-item-right-bottom">
+                {{ this.peopleQK.zaibianzongshu }}
+              </div>
             </div>
           </div>
           <div class="wrap-top-center-item">
@@ -248,7 +262,9 @@
             </div>
             <div class="wrap-top-center-item-right">
               <div class="wrap-top-center-item-right-top">编纳在位</div>
-              <div class="wrap-top-center-item-right-bottom">{{this.peopleQK.zaibianzaiwei}}</div>
+              <div class="wrap-top-center-item-right-bottom">
+                {{ this.peopleQK.zaibianzaiwei }}
+              </div>
             </div>
           </div>
           <div class="wrap-top-center-item">
@@ -259,9 +275,19 @@
                 alt=""
               />
             </div>
-           <div class="wrap-top-center-item-right">
-              <div class="wrap-top-center-item-right-top" style="margin-top:-40px;margin-left:10px">编纳休假</div>
-              <div class="wrap-top-center-item-right-bottom" style="margin-left:30px">{{this.peopleQK.zaibianxiujia}}</div>
+            <div class="wrap-top-center-item-right">
+              <div
+                class="wrap-top-center-item-right-top"
+                style="margin-top: -40px; margin-left: 10px"
+              >
+                编纳休假
+              </div>
+              <div
+                class="wrap-top-center-item-right-bottom"
+                style="margin-left: 30px"
+              >
+                {{ this.peopleQK.zaibianxiujia }}
+              </div>
             </div>
           </div>
           <div class="wrap-top-center-item">
@@ -270,7 +296,9 @@
             </div>
             <div class="wrap-top-center-item-right">
               <div class="wrap-top-center-item-right-top">编纳出差</div>
-              <div class="wrap-top-center-item-right-bottom">{{this.peopleQK.zaibianchuchai}}</div>
+              <div class="wrap-top-center-item-right-bottom">
+                {{ this.peopleQK.zaibianchuchai }}
+              </div>
             </div>
           </div>
           <div class="wrap-top-center-item">
@@ -279,7 +307,9 @@
             </div>
             <div class="wrap-top-center-item-right">
               <div class="wrap-top-center-item-right-top">编纳学习</div>
-              <div class="wrap-top-center-item-right-bottom">{{this.peopleQK.zaibianxuexi}}</div>
+              <div class="wrap-top-center-item-right-bottom">
+                {{ this.peopleQK.zaibianxuexi }}
+              </div>
             </div>
           </div>
           <div class="wrap-top-center-item">
@@ -288,7 +318,9 @@
             </div>
             <div class="wrap-top-center-item-right">
               <div class="wrap-top-center-item-right-top">编纳外诊</div>
-              <div class="wrap-top-center-item-right-bottom">{{this.peopleQK.zaibianwaizhen}}</div>
+              <div class="wrap-top-center-item-right-bottom">
+                {{ this.peopleQK.zaibianwaizhen }}
+              </div>
             </div>
           </div>
           <div class="wrap-top-center-item">
@@ -297,7 +329,9 @@
             </div>
             <div class="wrap-top-center-item-right">
               <div class="wrap-top-center-item-right-top">未编纳总人数</div>
-              <div class="wrap-top-center-item-right-bottom">{{this.peopleQK.weizaibianzongrenshu }}</div>
+              <div class="wrap-top-center-item-right-bottom">
+                {{ this.peopleQK.weizaibianzongrenshu }}
+              </div>
             </div>
           </div>
           <div class="wrap-top-center-item">
@@ -306,20 +340,32 @@
             </div>
             <div class="wrap-top-center-item-right">
               <div class="wrap-top-center-item-right-top">未编纳在位</div>
-              <div class="wrap-top-center-item-right-bottom">{{this.peopleQK.weizaibianzaiwei }}</div>
+              <div class="wrap-top-center-item-right-bottom">
+                {{ this.peopleQK.weizaibianzaiwei }}
+              </div>
             </div>
           </div>
           <div class="wrap-top-center-item">
-             <div class="wrap-top-center-item-left1">
+            <div class="wrap-top-center-item-left1">
               <img
                 style="width: 44px; height: 22px"
                 src="../../../images/Quantitative/休假.png"
                 alt=""
               />
             </div>
-           <div class="wrap-top-center-item-right">
-              <div class="wrap-top-center-item-right-top" style="margin-top:-40px;margin-left:15px">未编纳休假</div>
-              <div class="wrap-top-center-item-right-bottom" style="margin-left:30px">{{this.peopleQK.weizaibianxiujia}}</div>
+            <div class="wrap-top-center-item-right">
+              <div
+                class="wrap-top-center-item-right-top"
+                style="margin-top: -40px; margin-left: 15px"
+              >
+                未编纳休假
+              </div>
+              <div
+                class="wrap-top-center-item-right-bottom"
+                style="margin-left: 30px"
+              >
+                {{ this.peopleQK.weizaibianxiujia }}
+              </div>
             </div>
           </div>
           <div class="wrap-top-center-item">
@@ -328,7 +374,9 @@
             </div>
             <div class="wrap-top-center-item-right">
               <div class="wrap-top-center-item-right-top">未编纳出差</div>
-              <div class="wrap-top-center-item-right-bottom">{{this.peopleQK.weizaibianchuchai}}</div>
+              <div class="wrap-top-center-item-right-bottom">
+                {{ this.peopleQK.weizaibianchuchai }}
+              </div>
             </div>
           </div>
           <div class="wrap-top-center-item">
@@ -337,7 +385,9 @@
             </div>
             <div class="wrap-top-center-item-right">
               <div class="wrap-top-center-item-right-top">未编纳学习</div>
-              <div class="wrap-top-center-item-right-bottom">{{this.peopleQK.weizaibianxuexi  }}</div>
+              <div class="wrap-top-center-item-right-bottom">
+                {{ this.peopleQK.weizaibianxuexi }}
+              </div>
             </div>
           </div>
           <div class="wrap-top-center-item">
@@ -346,7 +396,9 @@
             </div>
             <div class="wrap-top-center-item-right">
               <div class="wrap-top-center-item-right-top">未编纳外诊</div>
-              <div class="wrap-top-center-item-right-bottom">{{this.peopleQK.weizaibianwaizhen}}</div>
+              <div class="wrap-top-center-item-right-bottom">
+                {{ this.peopleQK.weizaibianwaizhen }}
+              </div>
             </div>
           </div>
         </div>
@@ -356,26 +408,30 @@
             <div class="wrap-top-left-top-head"><b>军车值班</b></div>
             <table width="95%" style="table-layout: fixed">
               <tr>
-                <th  style="font-weight:500" height="40">序号</th>
-                <th style="font-weight:500">车牌号码</th>
-                <th style="font-weight:500">厂牌型号</th>
-                <th style="font-weight:500">车属单位</th>
-                <th style="font-weight:500">司机</th>
-                <th style="font-weight:500">司机位置</th>
+                <th style="font-weight: 500" height="40">序号</th>
+                <th style="font-weight: 500">车牌号码</th>
+                <th style="font-weight: 500">厂牌型号</th>
+                <!-- <th style="font-weight: 500">车属单位</th> -->
+                <th style="font-weight: 500">司机</th>
+                <th style="font-weight: 500">司机位置</th>
               </tr>
 
-              <tr style="color:#ccc" v-for="(item,index) in MilitaryDuty" :key="item.id">
-                <td style="color:#ccc" height="28">{{index+1}}</td>
-                <td style="color:#ccc">{{ item.numberPlateName }}</td>
-                <td style="color:#ccc">{{ item.modelInfo }}</td>
+              <tr
+                style="color: #ccc"
+                v-for="(item, index) in MilitaryDuty"
+                :key="item.id"
+              >
+                <td style="color: #ccc" height="28">{{ index + 1 }}</td>
+                <td style="color: #ccc">{{ item.numberPlateName }}</td>
+                <td style="color: #ccc">{{ item.modelInfo }}</td>
                 <!-- <el-table-column label="车辆型号" align="center" prop="vehiclemodel"> 
                   <template slot-scope="scope">
                      <dict-tag :options="dict.type.brand " :value="scope.row.vehiclemodel"/>
                       </template> 
                 </el-table-column> -->
-                <td style="color:#ccc">{{ item.carUnitName }}</td>
-                <td style="color:#ccc">{{ item.driverName }}</td>
-                <td style="color:#ccc" class="shiyou">{{ item.adress }}</td>
+                <!-- <td style="color: #ccc">{{ item.carUnitName }}</td> -->
+                <td style="color: #ccc">{{ item.driverName }}</td>
+                <td style="color: #ccc" class="shiyou">{{ item.adress }}</td>
               </tr>
             </table>
           </div>
@@ -384,20 +440,22 @@
             <div class="wrap-top-left-top-head"><b>装备值班</b></div>
             <table width="95%" style="table-layout: fixed">
               <tr>
-                <th style="width:80px;font-weight:500" height="40">序号</th>
-                <th style="width:80px;font-weight:500">装备名称</th>
-                <th style="width:80px;font-weight:500">所属单位</th>
-                <th style="width:80px;font-weight:500">装备类型</th>
-                <th style="width:80px;font-weight:500">数量</th>
-                <th style="width:100px;font-weight:500">位置</th>
+                <th style="width: 80px; font-weight: 500" height="40">序号</th>
+                <th style="width: 80px; font-weight: 500">装备名称</th>
+                <!-- <th style="width: 80px; font-weight: 500">所属单位</th> -->
+                <th style="width: 80px; font-weight: 500">装备类型</th>
+                <th style="width: 80px; font-weight: 500">数量</th>
+                <th style="width: 100px; font-weight: 500">位置</th>
               </tr>
-              <tr v-for="(item,index) in Equipment" :key="item.id">
-                <td style="color:#ccc" height="28">{{index+1}}</td>
-                <td style="color:#ccc" >{{ item.equipmentName }}</td>
-                <td style="color:#ccc" >{{ item.unitName }}</td>
-                <td style="color:#ccc" >{{ item.type }}</td>
-                <td style="color:#ccc" >{{ item.equipmentNumber }}</td>
-                <td style="color:#ccc" class="shiyou">{{ item.standbyPosition }}</td>
+              <tr v-for="(item, index) in Equipment" :key="item.id">
+                <td style="color: #ccc" height="28">{{ index + 1 }}</td>
+                <td style="color: #ccc">{{ item.equipmentName }}</td>
+                <!-- <td style="color: #ccc">{{ item.unitName }}</td> -->
+                <td style="color: #ccc">{{ item.type }}</td>
+                <td style="color: #ccc">{{ item.equipmentNumber }}</td>
+                <td style="color: #ccc" class="shiyou">
+                  {{ item.standbyPosition }}
+                </td>
               </tr>
             </table>
           </div>
@@ -420,7 +478,7 @@ import {
   // 执行任务人员情况
   zhixingrenwu,
   // 人员情况
-  listshow
+  listshow,
 } from "@/api/combatduty/Quantitative";
 import { getDicts } from "@/api/system/dict/data";
 export default {
@@ -437,75 +495,70 @@ export default {
       // 执行任务
       performanceTask: [],
       // 人员情况
-      peopleQK:[],
+      peopleQK: [],
       // 查询字典
       dictType: {
         dictType: "brand",
       },
-      ziDian:[]
+      ziDian: [],
     };
   },
   created() {
     // 人员情况
-    listshow().then(res=>{
+    listshow().then((res) => {
       // console.log(res)
-      this.peopleQK=res.data
-    })
+      this.peopleQK = res.data;
+    });
     // 基地值班
     getTodayzhiban().then((res) => {
-      if (res.rows[0] != undefined){
+      if (res.rows[0] != undefined) {
         this.BaseOnDuty = res.rows[0];
       }
-     
     });
     // 大队值班接口
     greatDuty().then((res) => {
-      if (res.rows[0] != undefined){
-        this.GreatDuty1=res.rows[0]
+      if (res.rows[0] != undefined) {
+        this.GreatDuty1 = res.rows[0];
       }
       // console.log(res);
     });
     // 查询字典
-    this.getdict()
-    
-    
+    this.getdict();
+
     // // 装备值班接口
-    equipment().then(res=>{
+    equipment().then((res) => {
       // console.log(res)
-      if (res.rows != undefined){
-        this.Equipment=res.rows
+      if (res.rows != undefined) {
+        this.Equipment = res.rows;
       }
       // console.log(this.Equipment)
-    })
+    });
     // 执行任务人员情况
     zhixingrenwu().then((res) => {
       // console.log(res);
-      if (res.rows != undefined){
-        this.performanceTask=res.rows
+      if (res.rows != undefined) {
+        this.performanceTask = res.rows;
       }
     });
-    
-    
   },
   mounted() {
     // // 军车值班接口
-    militaryDuty().then(res=>{
+    militaryDuty().then((res) => {
       // console.log(res.rows)
-      this.MilitaryDuty=res.rows
+      this.MilitaryDuty = res.rows;
       // console.log(res.rows)
-      this.MilitaryDuty.map((item)=>{
-        this.ziDian.map((items)=>{
+      this.MilitaryDuty.map((item) => {
+        this.ziDian.map((items) => {
           // console.log(items)
-            if(item.modelInfo==items.dictValue){
-              // console.log(items.dictLabel)
-             return item.modelInfo=items.dictLabel
-
-            }
-            this.MilitaryDuty=this.MilitaryDuty
-        })
-      })
+          if (item.modelInfo == items.dictValue) {
+            // console.log(items.dictLabel)
+            return (item.modelInfo = items.dictLabel);
+          }
+          this.MilitaryDuty = this.MilitaryDuty;
+        });
+      });
       // console.log(this.MilitaryDuty)
-    })
+    });
   },
   methods: {
     // 查询字典
@@ -519,10 +572,10 @@ export default {
 };
 </script>
 <style scoped>
-.wrap-top-left-top-item-right3{
+.wrap-top-left-top-item-right3 {
   width: 100%;
   text-align: center;
-  color: #30FDFF;
+  color: #30fdff;
   line-height: 35px;
 }
 #app {
@@ -537,14 +590,14 @@ body {
 .content {
   background-color: #103360;
 }
-.bottomsss{
+.bottomsss {
   position: absolute;
   bottom: 0;
   width: 100%;
   height: 10px;
   /* background-color: pink; */
 }
-#wrap{
+#wrap {
   position: relative;
 }
 /* .wrap {
@@ -654,7 +707,7 @@ body {
 .wrap-top-left-top-item {
   width: 30%;
   height: 40px;
- max-width:30%;
+  max-width: 30%;
   max-height: 40px;
   display: inline-block;
   border: #0f4d75 1px solid;
@@ -666,7 +719,7 @@ body {
 .wrap-top-left-top-item-left {
   width: 86px;
   margin-left: 8px;
-  
+
   height: 100%;
   font-size: 14px;
   text-align: start;
@@ -729,8 +782,8 @@ body {
   letter-spacing: 0.2rem; /*如果需要y个字两端对齐，则为(x-y)/(y-1),这里是（4-2）/(2-1)=2em*/
   /* margin-right: -3.5em; 同上 */
 }
-.wrap-top-left-top-item-right2 span{
-  margin-right:10px;
+.wrap-top-left-top-item-right2 span {
+  margin-right: 10px;
 }
 .wrap-top-left-top-head {
   width: 100%;
@@ -746,8 +799,8 @@ body {
   margin-top: 17px;
   margin-left: 21px;
 }
-.junche .wrap-top-left-top-head{
-   background-image: url("../../../images/组 21.png");
+.junche .wrap-top-left-top-head {
+  background-image: url("../../../images/组 21.png");
   background-repeat: no-repeat;
   /* background-size: 79% 100%; */
 }
@@ -756,8 +809,8 @@ body {
   background-repeat: no-repeat;
   /* background-size: 95% 100%; */
 }
-.renyuan{
-   width: 100%;
+.renyuan {
+  width: 100%;
   height: 30px;
   font-size: 18px;
   font-family: Source Han Sans CN;
@@ -782,11 +835,11 @@ body {
   font-size: 18px;
   font-family: Source Han Sans CN;
   /* font-weight: 400; */
-  color: #EFF7FF;
+  color: #eff7ff;
   margin-left: 40px;
   line-height: 30px;
 }
-.renyuan b{
+.renyuan b {
   line-height: 30px;
   font-weight: 400;
   font-size: 18px;
@@ -817,9 +870,9 @@ body {
   align-items: center;
   justify-content: center;
 }
-.wrap-top-center-item-left1 img{
+.wrap-top-center-item-left1 img {
   margin-left: 5px;
-   margin-top: 18px;
+  margin-top: 18px;
 }
 .wrap-top-center-item-left img {
   margin-top: 7px;
@@ -905,7 +958,7 @@ table tr td {
   width: 99%;
 
   /* flex: 2; */
-  
+
   height: 100%;
   display: flex;
   flex-wrap: wrap;
@@ -942,35 +995,35 @@ table tr td {
 .zuozhan {
   width: 100px;
 }
-.shiyou{
+.shiyou {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-#a1 img{
+#a1 img {
   height: 30px;
 }
-#a2 img{
+#a2 img {
   height: 30px;
 }
-#a3 img{
+#a3 img {
   width: 30px;
 }
-#a4 img{
+#a4 img {
   width: 30px;
 }
-#a5 img{
+#a5 img {
   width: 30px;
 }
-#a6 img{
-  width: 30px ;
+#a6 img {
+  width: 30px;
 }
-#a7 img{
-  width: 30px ;
+#a7 img {
+  width: 30px;
   height: 30px;
 }
-#a8 img{
-  width: 30px ;
+#a8 img {
+  width: 30px;
   height: 30px;
 }
 </style>

src/views/combatduty/grassdutyinfo/index.vue

@@ -3,21 +3,201 @@
     <el-row>
       <el-col :span="1.5" class="isSubmit">
         <el-radio-group v-model="queryParams.type" @change="caoZuoTypefun">
-          <el-radio-button label="null">所有值班</el-radio-button>
           <el-radio-button label="1">今日值班</el-radio-button>
           <el-radio-button label="2">次日值班</el-radio-button>
         </el-radio-group>
       </el-col>
     </el-row>
     <hr />
-    <el-form
+    <el-row :gutter="20">
+      <el-col :span="4" :xs="24">
+        <div class="dadui">
+          <img src="../../../images/星星.png" alt />
+          大队
+        </div>
+        <div class="tree">
+          <el-tree
+            class="userAgrees"
+            style="height: calc(100vh - 170px); overflow: auto"
+            :data="deptOptionss"
+            :props="defaultProps"
+            @node-click="handleNodeClick"
+            default-expand-all
+            highlight-current
+            :expand-on-click-node="false"
+          ></el-tree>
+        </div>
+      </el-col>
+      <el-col :span="1.5" class="mb8">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['combatduty:grassdutyinfo:add']"
+          >新增</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="['combatduty:grassdutyinfo:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <el-col :span="1.5"> </el-col>
+      <el-col :span="1.5"> </el-col>
+      <el-col :span="20" :xs="24">
+        <el-table
+          v-loading="loading"
+          :data="grassdutyinfoList"
+          @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">
+            <template slot-scope="scope">
+              <span>{{
+                (queryParams.pageNum - 1) * queryParams.pageSize +
+                scope.$index +
+                1
+              }}</span>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="值班岗位" align="center" prop="id" /> -->
+          <el-table-column
+            label="单位名称"
+            align="center"
+            prop="unitName"
+            width="150"
+          />
+          <!-- <el-table-column label="单位" align="center" prop="unitId" :formatter="unitIdFormat" /> -->
+          <!-- <el-table-column label="值班首长" align="center" prop="chiefDutyName" /> -->
+          <el-table-column
+            label="值班首长"
+            align="center"
+            prop="chiefDutyId"
+            :formatter="chiefDutyIdFormat"
+          />
+          <el-table-column
+            label="值班首长职务"
+            align="center"
+            prop="chiefDutyZhiwu"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <dict-tag
+                :options="dict.type.sys_duty_hief"
+                :value="scope.row.chiefDutyZhiwu"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="办公电话"
+            align="center"
+            prop="telephoneBg"
+            width="120"
+          />
+          <el-table-column
+            label="宿舍电话"
+            align="center"
+            prop="telephoneSs"
+            width="120"
+          />
+          <el-table-column
+            label="值班首长手机"
+            align="center"
+            prop="chiefDutyPhone"
+            width="120"
+          />
+          <!-- <el-table-column label="值班员" align="center" prop="dutyOffierName" /> -->
+          <el-table-column
+            label="值班员"
+            align="center"
+            prop="dutyOffierId"
+            :formatter="dutyOffierIdFormat"
+          />
+          <el-table-column
+            label="值班员职务"
+            align="center"
+            prop="dutyOffierZw"
+          >
+            <template slot-scope="scope">
+              <dict-tag
+                :options="dict.type.sys_duty_hief"
+                :value="scope.row.dutyOffierZw"
+              />
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="值班员手机" align="center" prop="dutyOffierPhone" />
+      <el-table-column label="值班电话" align="center" prop="dutyPhone" />-->
+          <el-table-column
+            label="值班岗位"
+            align="center"
+            prop="dutyGangwei"
+            :formatter="dutyGangweiFormat"
+          />
+          <el-table-column
+            label="值班时间"
+            align="center"
+            prop="attendedTime"
+            width="180"
+          >
+            <template slot-scope="scope">
+              <span>{{
+                parseTime(scope.row.attendedTime, "{y}-{m}-{d}")
+              }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            align="center"
+            width="200"
+            class-name="small-padding fixed-width"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="btu"
+                type="text"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['combatduty:grassdutyinfo:edit']"
+                >修改</el-button
+              >
+              <el-button
+                size="btd"
+                type="text"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['combatduty:grassdutyinfo: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-col>
+    </el-row>
+    <!-- <el-form
       :model="queryParams"
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
       label-width="auto"
-    >
-      <!-- <el-form-item label="值班时间" prop="attendedTime">
+    > -->
+    <!-- <el-form-item label="值班时间" prop="attendedTime">
         <el-date-picker
           clearable
           size="small"
@@ -28,7 +208,7 @@
         >
         </el-date-picker>
       </el-form-item>-->
-      <el-form-item prop="attendedTime">
+    <!-- <el-form-item prop="attendedTime">
         <el-date-picker
           clearable
           size="small"
@@ -54,8 +234,8 @@
             :value="item.id"
           ></el-option>
         </el-select>
-      </el-form-item>
-      <!-- <el-form-item label="单位名称" prop="unitName">
+      </el-form-item> -->
+    <!-- <el-form-item label="单位名称" prop="unitName">
         <el-select
           v-model="queryParams.unitName"
           placeholder="请选择单位名称"
@@ -65,7 +245,7 @@
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>-->
-      <!-- <el-form-item label="单位ID" prop="unitId">
+    <!-- <el-form-item label="单位ID" prop="unitId">
         <el-input
           v-model="queryParams.unitId"
           placeholder="请输入单位ID"
@@ -74,7 +254,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <!-- <el-form-item label="值班首长" prop="chiefDutyName">
+    <!-- <el-form-item label="值班首长" prop="chiefDutyName">
         <el-input
           v-model="queryParams.chiefDutyName"
           placeholder="请输入值班首长"
@@ -83,7 +263,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <!-- <el-form-item label="值班首长ID" prop="chiefDutyId">
+    <!-- <el-form-item label="值班首长ID" prop="chiefDutyId">
         <el-select
           v-model="queryParams.chiefDutyId"
           placeholder="请选择值班首长ID"
@@ -135,7 +315,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <el-form-item prop="dutyOffierId">
+    <!-- <el-form-item prop="dutyOffierId">
         <el-select
           v-model="queryParams.dutyOffierId"
           placeholder="请选择值班员"
@@ -150,8 +330,8 @@
             :value="item.id"
           ></el-option>
         </el-select>
-      </el-form-item>
-      <!-- <el-form-item label="值班员ID" prop="dutyOffierId">
+      </el-form-item> -->
+    <!-- <el-form-item label="值班员ID" prop="dutyOffierId">
         <el-input
           v-model="queryParams.dutyOffierId"
           placeholder="请输入值班员ID"
@@ -203,15 +383,15 @@
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>-->
-      <el-form-item>
-        <!-- <el-button type="primary" size="btn" @click="handleQuery"
+    <!-- <el-form-item>
+        <el-button type="primary" size="btn" @click="handleQuery"
           >搜索</el-button
-        > -->
+        >
         <el-button size="btr" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+      </el-form-item> -->
+    <!-- </el-form> -->
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -223,7 +403,7 @@
           >新增</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -234,7 +414,7 @@
           v-hasPermi="['combatduty:grassdutyinfo:edit']"
           >修改</el-button
         >
-      </el-col>-->
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -247,7 +427,7 @@
           >删除</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -258,113 +438,10 @@
           v-hasPermi="['combatduty:grassdutyinfo:export']"
           >导出</el-button
         >
-      </el-col>-->
-
-      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
-    </el-row>
-
-    <el-table
-      v-loading="loading"
-      :data="grassdutyinfoList"
-      @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" type="index" />
-      <!-- <el-table-column label="值班岗位" align="center" prop="id" /> -->
-      <el-table-column label="单位名称" align="center" prop="unitName" />
-      <!-- <el-table-column label="单位" align="center" prop="unitId" :formatter="unitIdFormat" /> -->
-      <!-- <el-table-column label="值班首长" align="center" prop="chiefDutyName" /> -->
-      <el-table-column
-        label="值班首长"
-        align="center"
-        prop="chiefDutyId"
-        :formatter="chiefDutyIdFormat"
-      />
-      <el-table-column
-        label="值班首长职务"
-        align="center"
-        prop="chiefDutyZhiwu"
-      >
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_duty_hief"
-            :value="scope.row.chiefDutyZhiwu"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="办公电话" align="center" prop="telephoneBg" />
-      <el-table-column label="宿舍电话" align="center" prop="telephoneSs" />
-      <el-table-column
-        label="值班首长手机"
-        align="center"
-        prop="chiefDutyPhone"
-      />
-      <!-- <el-table-column label="值班员" align="center" prop="dutyOffierName" /> -->
-      <el-table-column
-        label="值班员"
-        align="center"
-        prop="dutyOffierId"
-        :formatter="dutyOffierIdFormat"
-      />
-      <el-table-column label="值班员职务" align="center" prop="dutyOffierZw">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_duty_hief"
-            :value="scope.row.dutyOffierZw"
-          />
-        </template>
-      </el-table-column>
-      <!-- <el-table-column label="值班员手机" align="center" prop="dutyOffierPhone" />
-      <el-table-column label="值班电话" align="center" prop="dutyPhone" />-->
-      <el-table-column
-        label="值班岗位"
-        align="center"
-        prop="dutyGangwei"
-        :formatter="dutyGangweiFormat"
-      />
-      <el-table-column
-        label="值班时间"
-        align="center"
-        prop="attendedTime"
-        width="180"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.attendedTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="操作"
-        align="center"
-        width="200"
-        class-name="small-padding fixed-width"
-      >
-        <template slot-scope="scope">
-          <el-button
-            size="btu"
-            type="text"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['combatduty:grassdutyinfo:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="btd"
-            type="text"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['combatduty:grassdutyinfo:remove']"
-            >删除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+      </el-col>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row> -->
 
     <!-- 添加或修改基层值班对话框 -->
     <el-dialog
@@ -414,7 +491,8 @@
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="单位名称" prop="unitName">
-          <el-select
+          <el-input v-model="form.unitName" placeholder="" disabled />
+          <!-- <el-select
             v-model="form.unitName"
             @change="unitNamechange"
             clearable
@@ -426,7 +504,7 @@
               :label="dict.deptName"
               :value="dict"
             ></el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <!-- <el-form-item label="单位" prop="unitId">
           <el-select v-model="form.unitId" ref="deptId" clearable placeholder="请选择单位名称">
@@ -548,6 +626,8 @@ import {
   listPeople,
   getDept,
 } from "@/api/combatduty/grassdutyinfo";
+import { getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
+import { getUserProfile } from "@/api/system/user";
 
 export default {
   name: "Grassdutyinfo",
@@ -604,14 +684,45 @@ export default {
       //单位数据
       deptOptions: [],
       qdflg: null,
+      // 左侧树形
+      deptOptionss: [],
+      // 树形配置
+      defaultProps: {
+        children: "children",
+        label: "label",
+      },
+      danWie: "",
+      deptId: null,
     };
   },
   created() {
+    this.getUser();
     this.getList();
     this.gettreeselect();
     this.getrylist();
+    this.treeselect();
   },
   methods: {
+    // 获取登录信息
+    getUser() {
+      getUserProfile().then((response) => {
+        this.deptId = response.data.dept.deptId;
+        this.danWie = response.data.dept.deptName;
+      });
+    },
+    //外面树形选择搜索
+    handleNodeClick(data) {
+      this.queryParams.type = null;
+      this.queryParams.unitId = data.id;
+      this.getList();
+    },
+    // 获取外面部门树形
+    treeselect() {
+      getWeiShu().then((res) => {
+        console.log(res);
+        this.deptOptionss = res.data;
+      });
+    },
     //获取人员
     getrylist() {
       listPeople().then((res) => {
@@ -725,6 +836,8 @@ export default {
       this.open = true;
       this.title = "添加基层值班";
       this.qdflg = 1;
+      this.form.unitName = this.danWie;
+      this.form.unitId = this.deptId;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -791,6 +904,7 @@ export default {
     },
     //值班分类
     caoZuoTypefun() {
+      this.queryParams.unitId = null;
       this.getList();
     },
     //首长电话
@@ -940,7 +1054,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;
@@ -951,7 +1065,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 {
@@ -960,4 +1074,99 @@ hr {
   background-color: rgba(204, 204, 204, 0.5);
   margin-bottom: 15px;
 }
+/* 头部样式 */
+.dadui {
+  height: 40px;
+  background: #003156;
+  /* border-bottom: 1px solid #718A9D ; */
+  background-image: url(../../../images/矩形底部边框.png);
+  background-repeat: no-repeat;
+  background-position: 0px 39px;
+  font-size: 16px;
+  color: #1d96ff;
+}
+.dadui img {
+  margin: 10px 10px 0px 10px;
+}
+
+.data p {
+  position: absolute;
+  top: -5px;
+  left: 15px;
+}
+.data .a1 {
+  width: 128px;
+  height: 26px;
+  background: rgba(23, 74, 112, 0.4);
+  border-radius: 13px;
+  position: absolute;
+  top: 7px;
+  left: 60px;
+}
+/* 划过效果 */
+::v-deep .el-tree-node__content:hover {
+  /* color: #fff; */
+  background-color: #003156;
+  background-image: url("../../../assets/images/选中.png");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+}
+/* .app-container {
+  display: flex;
+} */
+/* 左侧树状盒子 */
+.app-container .box-lfet {
+  width: 15%;
+  min-height: 740px;
+  /* background: #003156; */
+  /* padding: 10px; */
+  margin-right: 10px;
+  /* border: 1px solid white; */
+}
+/* 右侧内容盒子 */
+.app-container .box-right {
+  flex: 1;
+}
+.app-container .box-lfet .data {
+  height: 40px;
+  background: #003156;
+  margin-bottom: 12px;
+  color: #fff;
+  display: flex;
+  font-size: 13px;
+  line-height: 25px;
+  position: relative;
+}
+.el-tree {
+  background: #003156;
+  color: #fff;
+  margin-right: 2px;
+  padding-top: 7px;
+}
+::v-deep .el-dialog {
+  background-color: #004d86 !important;
+}
+::v-deep .el-input__suffix {
+  right: 60px;
+}
+::v-deep .el-tree-node__content {
+  height: 32px;
+}
+::v-deep
+  .el-tree--highlight-current
+  .el-tree-node.is-current
+  > .el-tree-node__content {
+  height: 32px;
+  color: #fff !important;
+  background-color: #003156;
+  background-image: url("../../../assets/images/选中.png");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+}
+::v-deep .canjiaren .el-input__inner {
+  width: 560px;
+}
+::v-deep .el-input__suffix-inner {
+  margin-right: -80px;
+}
 </style>

src/views/combatduty/taskdutyinfo/index.vue

@@ -175,7 +175,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" type="index" />
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
-      <el-table-column label="单位" align="center" prop="unitName" />
+      <!-- <el-table-column label="单位" align="center" prop="unitName" /> -->
       <!-- <el-table-column label="部门ID" align="center" prop="unitId" /> -->
       <el-table-column label="指挥员" align="center" prop="commanderName" />
       <!-- <el-table-column label="指挥员ID" align="center" prop="commanderId" /> -->
@@ -187,10 +187,9 @@
       <!-- <el-table-column label="参加人员" align="center" prop="participantsName" /> -->
       <!-- <el-table-column label="参加人员ID" align="center" prop="participantsId" /> -->
       <el-table-column
-        label="参加人员"
+        label="参加人数"
         align="center"
-        prop="participantsIds"
-        :formatter="unit2Format"
+        prop="participantsName"
       />
       <el-table-column
         label="开始时间"
@@ -232,6 +231,13 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
+          <el-button
+            size="btk"
+            type="text"
+            @click="handlelook(scope.row)"
+            v-hasPermi="['combatduty:taskdutyinfo:edit']"
+            >查看</el-button
+          >
           <el-button
             size="btu"
             type="text"
@@ -274,7 +280,7 @@
         :inline="true"
       >
         <div class="jiben">基本信息</div>
-        <el-form-item label="单位" prop="unitName">
+        <!-- <el-form-item label="单位" prop="unitName">
           <el-select
             v-model="form.unitName"
             @change="unitNamechange"
@@ -288,7 +294,7 @@
               :value="dict"
             ></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <!-- <el-form-item label="部门ID" prop="unitId">
           <el-input v-model="form.unitId" placeholder="请输入部门ID" />
         </el-form-item>-->
@@ -316,6 +322,9 @@
         <el-form-item label="指挥员电话" prop="commanderPhone">
           <el-input v-model="form.commanderPhone" placeholder="" />
         </el-form-item>
+        <el-form-item label="参加人数" prop="participantsName">
+          <el-input v-model="form.participantsName" placeholder="" />
+        </el-form-item>
         <!-- <el-form-item label="参加人员">
           <el-select
             v-model="form.participantsId"
@@ -327,7 +336,34 @@
             <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>
         </el-form-item>-->
-        <el-form-item label="参加人员" prop="participantsIds">
+        <el-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="adress">
+          <el-input v-model="form.adress" placeholder="" />
+        </el-form-item>
+        <div class="jiben">人员名册</div>
+        <el-form-item>
+          <FileUpload v-model="form.taskdutyFus" />
+        </el-form-item>
+        <!-- <el-form-item label="" prop="participantsIds">
           <el-select
             v-model="form.participantsIds"
             multiple
@@ -342,10 +378,64 @@
               :value="item.id"
             ></el-option>
           </el-select>
+        </el-form-item> -->
+        <div class="jiben">事由</div>
+        <el-form-item label prop="question">
+          <el-input v-model="form.question" type="textarea" placeholder="" />
+        </el-form-item>
+        <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="title1"
+      :visible.sync="open1"
+      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-form-item label="指挥员" prop="commanderName">
+          <el-select
+            v-model="form.commanderName"
+            @change="driverNamefun"
+            filterable
+            clearable
+            disabled
+            placeholder=""
+          >
+            <el-option
+              v-for="item in rylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="指挥员电话" prop="commanderPhone">
+          <el-input disabled v-model="form.commanderPhone" placeholder="" />
+        </el-form-item>
+        <el-form-item label="参加人数" prop="participantsName">
+          <el-input disabled v-model="form.participantsName" placeholder="" />
         </el-form-item>
         <el-form-item label="开始时间" prop="startTime">
           <el-date-picker
             clearable
+            disabled
             size="small"
             v-model="form.startTime"
             type="date"
@@ -355,6 +445,7 @@
         </el-form-item>
         <el-form-item label="结束时间" prop="endTime">
           <el-date-picker
+            disabled
             clearable
             size="small"
             v-model="form.endTime"
@@ -364,20 +455,40 @@
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="所在位置" prop="adress">
-          <el-input v-model="form.adress" placeholder="" />
+          <el-input disabled v-model="form.adress" placeholder="" />
         </el-form-item>
+        <div class="jiben">人员名册</div>
+        <!-- <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> -->
+            <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>
         <el-form-item label prop="question">
-          <el-input v-model="form.question" type="textarea" placeholder="" />
+          <el-input
+            disabled
+            v-model="form.question"
+            type="textarea"
+            placeholder=""
+          />
         </el-form-item>
         <div class="jiben">备注</div>
         <el-form-item label prop="remarks">
-          <el-input v-model="form.remarks" type="textarea" placeholder="" />
+          <el-input
+            disabled
+            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>
+        <!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
+        <el-button @click="open1 = false" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -418,8 +529,10 @@ export default {
       taskdutyinfoList: [],
       // 弹出层标题
       title: "",
+      title1: "",
       // 是否显示弹出层
       open: false,
+      open1: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -440,7 +553,11 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        // participantsName:[
+        //     { type: 'Number', required: true, message: '请选择日期', trigger: 'change' }
+        //   ],
+      },
       //人员数据
       rylist: [],
       //单位数据
@@ -454,6 +571,37 @@ export default {
     this.getrylist();
   },
   methods: {
+     downloadss(URL,name) {
+      // console.log(URL)
+      let xhr = new XMLHttpRequest();
+      xhr.open("get", URL, true);
+      xhr.setRequestHeader("Content-Type", `application/pdf`);
+      xhr.responseType = "blob";
+      let that = this;
+      xhr.onload = function () {
+        if (this.status == 200) {
+          //接受二进制文件流
+          var blob = this.response; // that.downloadExportFile(blob, fileName);
+          let downloadElement = document.createElement("a");
+          let href = blob;
+          if (typeof blob == "string") {
+            downloadElement.target = "_blank";
+          } else {
+            href = window.URL.createObjectURL(blob); //创建下载的链接
+          }
+          downloadElement.href = href;
+          // console.log(that.dyform.printName);
+          downloadElement.download = name; // tagFileName + //下载后文件名
+          document.body.appendChild(downloadElement);
+          downloadElement.click(); //点击下载
+          document.body.removeChild(downloadElement); //下载完成移除元素
+          if (typeof blob != "string") {
+            window.URL.revokeObjectURL(href); //释放掉blob对象
+          }
+        }
+      };
+      xhr.send();
+    },
     //获取人员
     getrylist() {
       listPeople().then((res) => {
@@ -553,12 +701,72 @@ export default {
       const id = row.id || this.ids;
       getTaskdutyinfo(id).then((response) => {
         this.form = response.data;
+
+        this.form.taskdutyFus.forEach((item) => {
+          // 文件路径
+          item.url = item.filepath;
+          // 文件名称
+          item.name = item.filename;
+        });
+        console.log(this.form);
+        //  var fileNameS=[];
+        //  var filename= this.form.filename.split(',')
+        //  var filepath= this.form.filepath.split(',')
+        //   filename.map((item,i)=>{
+        //       fileNameS.push({name:filename[i],url: filepath[i]})
+        //   })
+        //    this.form.fileNameS=fileNameS
+
         this.open = true;
         this.title = "修改执行任务";
       });
     },
+    // 查看按钮操作
+    handlelook(row) {
+      this.reset();
+      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.open1 = true;
+        this.title1 = "查看执行任务";
+      });
+    },
     /** 提交按钮 */
     submitForm() {
+      // console.log(this.form.fileName)
+      // this.form.filename = "";
+      // this.form.filepath = "";
+      // console.log(this.form.fileNameS)
+      // for (var i of this.form.fileNameS) {
+      //   // console.log(i)
+      //   this.form.filename += i.name + ",";
+      //   this.form.filepath += i.url + ",";
+      // }
+      // this.form.filename = this.form.filename.substring(
+      //   0,
+      //   this.form.filename.length - 1
+      // );
+      // this.form.filepath = this.form.filepath.substring(
+      //   0,
+      //   this.form.filepath.length - 1
+      // );
+      console.log(this.form);
+      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
+      });
+      }
+      
+      console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
@@ -741,4 +949,42 @@ export default {
   border: none !important;
   color: #cccccc;
 }
+/* 计划附件 */
+::v-deep .el-upload__tip {
+  color: white;
+  position: absolute;
+  top: -5px;
+  width: 500px;
+  left: 90px;
+  color: white;
+}
+::v-deep .el-link.el-link--default {
+  color: white;
+  text-indent: 0.5em;
+}
+/* 选取文件 */
+::v-deep .el-upload-list__item {
+  width: 300px;
+}
+::v-deep .el-upload-list__item a {
+  color: white;
+  text-indent: 0.5em;
+}
+::v-deep .el-upload-list__item a .el-link--inner {
+  padding: 8px;
+  line-height: 10px;
+}
+::v-deep .el-select-dropdown__item {
+  color: white;
+}
+.wordfile{
+  width: 840px;
+  display: inline-block;
+  height: 30px;
+  line-height: 30px;
+  border: 1px solid white;
+  text-indent: 20px;
+  /* text-align: center; */
+  margin-bottom: 10px;
+}
 </style>

src/views/combatduty/teamdutyinfo/index.vue

@@ -328,63 +328,83 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" type="index" />
       <!-- <el-table-column label="值班分队指挥员电话" align="center" prop="id" /> -->
-      <!-- <el-table-column label="值班首长" align="center" prop="chiefDutyName" /> -->
-      <el-table-column
+      <el-table-column label="值班首长" align="center" prop="chiefDutyName" />
+      <!-- <el-table-column
         label="值班首长"
         align="center"
         prop="chiefDutyId"
         :formatter="chiefDutyIdFormat"
-      />
+      /> -->
       <!-- <el-table-column label="值班首长电话" align="center" prop="chiefDutyPhone" /> -->
-      <!-- <el-table-column label="作战值班员" align="center" prop="combatDutyName" /> -->
       <el-table-column
+        label="作战值班员"
+        align="center"
+        prop="combatDutyName"
+      />
+      <!-- <el-table-column
         label="作战值班员"
         align="center"
         prop="combatDutyId"
         :formatter="combatDutyIdFormat"
-      />
-      <!-- <el-table-column label="作战值班员电话" align="center" prop="combatDutyPhone" />
-      <el-table-column label="通信值班员" align="center" prop="dutyOffierName" />-->
+      /> -->
+      <!-- <el-table-column label="作战值班员电话" align="center" prop="combatDutyPhone" /> -->
       <el-table-column
+        label="通信值班员"
+        align="center"
+        prop="dutyOffierName"
+      />
+      <!-- <el-table-column
         label="通信值班员"
         align="center"
         prop="dutyOffierId"
         :formatter="dutyOffierIdFormat"
-      />
-      <!-- <el-table-column label="通信值班员电话" align="center" prop="dutyOffierPhone" />
-      <el-table-column label="机要值班员" align="center" prop="confidentialName" />-->
+      /> -->
+      <!-- <el-table-column label="通信值班员电话" align="center" prop="dutyOffierPhone" /> -->
       <el-table-column
+        label="机要值班员"
+        align="center"
+        prop="confidentialName"
+      />
+      <!-- <el-table-column
         label="机要值班员"
         align="center"
         prop="confidentialId"
         :formatter="confidentialIdFormat"
-      />
+      /> -->
       <!-- <el-table-column label="机要值班员电话" align="center" prop="confidentialPhone" />-->
-      <!-- <el-table-column label="政治工作部值班员" align="center" prop="politicalName" />-->
       <el-table-column
+        label="政治工作部值班员"
+        align="center"
+        prop="politicalName"
+      />
+      <!-- <el-table-column
         label="政治工作部值班员"
         align="center"
         prop="politicalId"
         :formatter="politicalIdFormat"
-      />
-      <!-- <el-table-column label="政治工作部值班员电话" align="center" prop="politicalPhone" />
-      <el-table-column label="保障部值班员" align="center" prop="guaranteeName" />-->
+      /> -->
+      <!-- <el-table-column label="政治工作部值班员电话" align="center" prop="politicalPhone" /> -->
       <el-table-column
+        label="保障部值班员"
+        align="center"
+        prop="guaranteeName"
+      />
+      <!-- <el-table-column
         label="保障部值班员"
         align="center"
         prop="guaranteeId"
         :formatter="guaranteeIdFormat"
-      />
-      <!-- <el-table-column label="保障部值班员电话" align="center" prop="guaranteePhone" />
-      <el-table-column label="值班通信员" align="center" prop="messengerName" />-->
-      <el-table-column
+      /> -->
+      <!-- <el-table-column label="保障部值班员电话" align="center" prop="guaranteePhone" /> -->
+      <el-table-column label="值班通信员" align="center" prop="messengerName" />
+      <!-- <el-table-column
         label="值班通信员"
         align="center"
         prop="messengerId"
         :formatter="messengerIdFormat"
-      />
+      /> -->
       <!-- <el-table-column label="值班通信员电话" align="center" prop="messengerPhone" /> -->
-      <el-table-column label="值班分队" align="center" prop="detachmentName" />
+      <!-- <el-table-column label="值班分队" align="center" prop="detachmentName" /> -->
       <!-- <el-table-column
         label="值班分队"
         align="center"
@@ -441,37 +461,38 @@
       append-to-body
       :close-on-click-modal="false"
     >
-    <div class="userAgree" style="overflow: -Scroll; overflow-x: hidden">
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="155px"
-        :inline="true"
-      >
-        <div class="jiben">基本信息</div>
-        <el-form-item label="值班时间" prop="attendedTime">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.attendedTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder=""
-            v-if="qdflg == 2"
-          ></el-date-picker>
-          <el-date-picker
-            v-model="form.attendedTime"
-            type="daterange"
-            range-separator="至"
-            start-placeholder
-            end-placeholder
-            value-format="yyyy-MM-dd"
-            v-if="qdflg == 1"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="值班首长" prop="chiefDutyName">
-          <el-select
+      <div class="userAgree" style="overflow: -Scroll; overflow-x: hidden">
+        <el-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          label-width="155px"
+          :inline="true"
+        >
+          <div class="jiben">基本信息</div>
+          <el-form-item label="值班时间" prop="attendedTime">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.attendedTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder=""
+              v-if="qdflg == 2"
+            ></el-date-picker>
+            <el-date-picker
+              v-model="form.attendedTime"
+              type="daterange"
+              range-separator="至"
+              start-placeholder
+              end-placeholder
+              value-format="yyyy-MM-dd"
+              v-if="qdflg == 1"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="值班首长" prop="chiefDutyName">
+            <el-input v-model="form.chiefDutyName" placeholder="" />
+            <!-- <el-select
             v-model="form.chiefDutyName"
             @change="chiefDutyNamefun"
             filterable
@@ -484,186 +505,195 @@
               :label="item.name"
               :value="item"
             ></el-option>
-          </el-select>
-        </el-form-item>
-        <!-- <el-form-item label="值班首长" prop="chiefDutyId">
+          </el-select> -->
+          </el-form-item>
+          <!-- <el-form-item label="值班首长" prop="chiefDutyId">
           <el-select v-model="form.chiefDutyId" filterable clearable placeholder="请选择值班首长">
             <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>
         </el-form-item>-->
-        <!-- <el-form-item label="值班首长ID" prop="chiefDutyId">
+          <!-- <el-form-item label="值班首长ID" prop="chiefDutyId">
           <el-input v-model="form.chiefDutyId" placeholder="请输入值班首长ID" />
         </el-form-item>-->
-        <el-form-item label="值班首长电话" prop="chiefDutyPhone">
-          <el-input v-model="form.chiefDutyPhone" placeholder="" />
-        </el-form-item>
-        <el-form-item label="作战值班员" prop="combatDutyName">
-          <el-select
-            v-model="form.combatDutyName"
-            @change="combatDutyNamefun"
-            filterable
-            clearable
-            placeholder=""
-          >
-            <el-option
-              v-for="item in rylist"
-              :key="item.id"
-              :label="item.name"
-              :value="item"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <!-- <el-form-item label="作战值班员" prop="combatDutyId">
+          <el-form-item label="值班首长电话" prop="chiefDutyPhone">
+            <el-input v-model="form.chiefDutyPhone" placeholder="" />
+          </el-form-item>
+          <el-form-item label="作战值班员" prop="combatDutyName">
+            <el-input v-model="form.combatDutyName" placeholder="" />
+            <!-- <el-select
+              v-model="form.combatDutyName"
+              @change="combatDutyNamefun"
+              filterable
+              clearable
+              placeholder=""
+            >
+              <el-option
+                v-for="item in rylist"
+                :key="item.id"
+                :label="item.name"
+                :value="item"
+              ></el-option>
+            </el-select> -->
+          </el-form-item>
+          <!-- <el-form-item label="作战值班员" prop="combatDutyId">
           <el-select v-model="form.combatDutyId" filterable clearable placeholder="请选择作战值班员">
             <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>
         </el-form-item>-->
-        <!-- <el-form-item label="作战值班员ID" prop="combatDutyId">
+          <!-- <el-form-item label="作战值班员ID" prop="combatDutyId">
           <el-input
             v-model="form.combatDutyId"
             placeholder="请输入作战值班员ID"
           />
         </el-form-item>-->
-        <el-form-item label="作战值班员电话" prop="combatDutyPhone">
-          <el-input v-model="form.combatDutyPhone" placeholder="" />
-        </el-form-item>
-        <el-form-item label="通信值班员" prop="dutyOffierName">
-          <el-select
-            v-model="form.dutyOffierName"
-            @change="dutyOffierNamefun"
-            filterable
-            clearable
-            placeholder=""
-          >
-            <el-option
-              v-for="item in rylist"
-              :key="item.id"
-              :label="item.name"
-              :value="item"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <!-- <el-form-item label="通信值班员" prop="dutyOffierId">
+          <el-form-item label="作战值班员电话" prop="combatDutyPhone">
+            <el-input v-model="form.combatDutyPhone" placeholder="" />
+          </el-form-item>
+          <el-form-item label="通信值班员" prop="dutyOffierName">
+            <el-input v-model="form.dutyOffierName" placeholder="" />
+            <!-- <el-select
+              v-model="form.dutyOffierName"
+              @change="dutyOffierNamefun"
+              filterable
+              clearable
+              placeholder=""
+            >
+              <el-option
+                v-for="item in rylist"
+                :key="item.id"
+                :label="item.name"
+                :value="item"
+              ></el-option>
+            </el-select> -->
+          </el-form-item>
+          <!-- <el-form-item label="通信值班员" prop="dutyOffierId">
           <el-select v-model="form.dutyOffierId" filterable clearable placeholder="请选择通信值班员">
             <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>
         </el-form-item>-->
-        <el-form-item label="通信值班员电话" prop="dutyOffierPhone">
-          <el-input v-model="form.dutyOffierPhone" placeholder="" />
-        </el-form-item>
-        <el-form-item label="机要值班员" prop="confidentialName">
-          <el-select
-            v-model="form.confidentialName"
-            @change="confidentialNamechange"
-            filterable
-            clearable
-            placeholder=""
-          >
-            <el-option
-              v-for="item in rylist"
-              :key="item.id"
-              :label="item.name"
-              :value="item"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <!-- <el-form-item label="机要值班员" prop="confidentialId">
+          <el-form-item label="通信值班员电话" prop="dutyOffierPhone">
+            <el-input v-model="form.dutyOffierPhone" placeholder="" />
+          </el-form-item>
+          <el-form-item label="机要值班员" prop="confidentialName">
+            <el-input v-model="form.confidentialName" placeholder="" />
+            <!-- <el-select
+              v-model="form.confidentialName"
+              @change="confidentialNamechange"
+              filterable
+              clearable
+              placeholder=""
+            >
+              <el-option
+                v-for="item in rylist"
+                :key="item.id"
+                :label="item.name"
+                :value="item"
+              ></el-option>
+            </el-select> -->
+          </el-form-item>
+          <!-- <el-form-item label="机要值班员" prop="confidentialId">
           <el-select v-model="form.confidentialId" filterable clearable placeholder="请选择机要值班员">
             <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>
         </el-form-item>-->
-        <el-form-item label="机要值班员电话" prop="confidentialPhone">
-          <el-input v-model="form.confidentialPhone" placeholder="" />
-        </el-form-item>
-        <el-form-item label="政治工作部值班员" prop="politicalName">
-          <el-select
-            v-model="form.politicalName"
-            @change="politicalNamechange"
-            filterable
-            clearable
-            placeholder=""
-          >
-            <el-option
-              v-for="item in rylist"
-              :key="item.id"
-              :label="item.name"
-              :value="item"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <!-- <el-form-item label="政治工作部值班员" prop="politicalId">
+          <el-form-item label="机要值班员电话" prop="confidentialPhone">
+            <el-input v-model="form.confidentialPhone" placeholder="" />
+          </el-form-item>
+          <el-form-item label="政治工作部值班员" prop="politicalName">
+            <el-input v-model="form.politicalName" placeholder="" />
+            <!-- <el-select
+              v-model="form.politicalName"
+              @change="politicalNamechange"
+              filterable
+              clearable
+              placeholder=""
+            >
+              <el-option
+                v-for="item in rylist"
+                :key="item.id"
+                :label="item.name"
+                :value="item"
+              ></el-option>
+            </el-select> -->
+          </el-form-item>
+          <!-- <el-form-item label="政治工作部值班员" prop="politicalId">
           <el-select v-model="form.politicalId" filterable clearable placeholder="请选择机政治工作部值班员">
             <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>
         </el-form-item>-->
-        <el-form-item label="政治工作部值班员电话" prop="politicalPhone">
-          <el-input v-model="form.politicalPhone" placeholder="" />
-        </el-form-item>
-        <el-form-item label="保障部值班员" prop="guaranteeName">
-          <el-select
-            v-model="form.guaranteeName"
-            @change="guaranteeNamechange"
-            filterable
-            clearable
-            placeholder=""
-          >
-            <el-option
-              v-for="item in rylist"
-              :key="item.id"
-              :label="item.name"
-              :value="item"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <!-- <el-form-item label="保障部值班员" prop="guaranteeId">
+          <el-form-item label="政治工作部值班员电话" prop="politicalPhone">
+            <el-input v-model="form.politicalPhone" placeholder="" />
+          </el-form-item>
+          <el-form-item label="保障部值班员" prop="guaranteeName">
+            <el-input v-model="form.guaranteeName" placeholder="" />
+            <!-- <el-select
+              v-model="form.guaranteeName"
+              @change="guaranteeNamechange"
+              filterable
+              clearable
+              placeholder=""
+            >
+              <el-option
+                v-for="item in rylist"
+                :key="item.id"
+                :label="item.name"
+                :value="item"
+              ></el-option>
+            </el-select> -->
+          </el-form-item>
+          <!-- <el-form-item label="保障部值班员" prop="guaranteeId">
           <el-select v-model="form.guaranteeId" filterable clearable placeholder="请选择保障部值班员">
             <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>
         </el-form-item>-->
-        <el-form-item label="保障部值班员电话" prop="guaranteePhone">
-          <el-input v-model="form.guaranteePhone" placeholder="" />
-        </el-form-item>
-        <el-form-item label="值班通信员" prop="messengerName">
-          <el-select
-            v-model="form.messengerName"
-            @change="messengerNamechange"
-            filterable
-            clearable
-            placeholder=""
-          >
-            <el-option
-              v-for="item in rylist"
-              :key="item.id"
-              :label="item.name"
-              :value="item"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <!-- <el-form-item label="值班通信员" prop="messengerId">
+          <el-form-item label="保障部值班员电话" prop="guaranteePhone">
+            <el-input v-model="form.guaranteePhone" placeholder="" />
+          </el-form-item>
+          <el-form-item label="值班通信员" prop="messengerName">
+            <el-input v-model="form.messengerName" placeholder="" />
+            <!-- <el-select
+              v-model="form.messengerName"
+              @change="messengerNamechange"
+              filterable
+              clearable
+              placeholder=""
+            >
+              <el-option
+                v-for="item in rylist"
+                :key="item.id"
+                :label="item.name"
+                :value="item"
+              ></el-option>
+            </el-select> -->
+          </el-form-item>
+          <!-- <el-form-item label="值班通信员" prop="messengerId">
           <el-select v-model="form.messengerId" filterable clearable placeholder="请选择值班通信员">
             <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>
         </el-form-item>-->
-        <el-form-item label="值班通信员电话" prop="messengerPhone">
-          <el-input v-model="form.messengerPhone" placeholder="" />
-        </el-form-item>
-        <el-form-item label="值班分队" prop="detachmentName">
-          <el-select
-            v-model="form.detachmentName"
-            @change="detachmentNamechange"
-            clearable
-            placeholder=""
+          <el-form-item label="值班通信员电话" prop="messengerPhone">
+            <el-input v-model="form.messengerPhone" placeholder="" />
+          </el-form-item>
+          <div class="jiben">值班分队</div>
+          <el-row
+            v-for="(item, i) in relatives"
+            :key="i"
+            style="margin-bottom: 20px"
           >
-            <el-option
-              v-for="dict in deptOptions"
-              :key="dict.deptId"
-              :label="dict.deptName"
-              :value="dict"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <!-- <el-form-item label="值班分队" prop="detachmentId">
+            <!-- <el-form v-for="(item, i) in relatives" :key="i"> -->
+            <el-form-item label="值班分队" prop="detachmentId">
+              <el-select v-model="item.detachmentId" clearable placeholder="">
+                <el-option
+                  v-for="dict in deptOptions"
+                  :key="dict.deptId"
+                  :label="dict.deptName"
+                  :value="dict.deptId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <!-- <el-form-item label="值班分队" prop="detachmentId">
           <el-select v-model="form.detachmentId" ref="deptId" clearable placeholder="请选择值班分队">
+              @change="detachmentNamechange"
             <el-option
               v-for="dict in deptOptions"
               :key="dict.deptId"
@@ -672,31 +702,32 @@
             ></el-option>
           </el-select>
         </el-form-item> -->
-        <el-form-item label="值班分队人数" prop="detachmentNumber">
-          <el-input
-            v-model="form.detachmentNumber"
-            type="number"
-            :min="0"
-            placeholder=""
-          />
-        </el-form-item>
-        <el-form-item label="值班分队指挥员" prop="detachmentPeopleName">
-          <el-select
-            v-model="form.detachmentPeopleName"
-            filterable
-            clearable
-            placeholder=""
-            @change="detachmentPeopleNamechange"
-          >
-            <el-option
-              v-for="item in rylist"
-              :key="item.id"
-              :label="item.name"
-              :value="item"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <!-- <el-form-item label="值班分队指挥员" prop="detachmentPeopleId">
+            <el-form-item label="值班分队人数" prop="detachmentNumber">
+              <el-input
+                v-model="item.detachmentNumber"
+                type="number"
+                :min="0"
+                placeholder=""
+              />
+            </el-form-item>
+            <el-form-item label="值班分队指挥员" prop="detachmentPeopleName">
+              <el-input v-model="item.detachmentPeopleName" placeholder="" />
+              <!-- <el-select
+              v-model="form.detachmentPeopleName"
+              filterable
+              clearable
+              placeholder=""
+              @change="detachmentPeopleNamechange"
+            >
+              <el-option
+                v-for="item in rylist"
+                :key="item.id"
+                :label="item.name"
+                :value="item"
+              ></el-option>
+            </el-select> -->
+            </el-form-item>
+            <!-- <el-form-item label="值班分队指挥员" prop="detachmentPeopleId">
           <el-select
             v-model="form.detachmentPeopleId"
             filterable
@@ -706,27 +737,48 @@
             <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>
         </el-form-item>-->
-        <el-form-item label="值班分队指挥员电话" prop="detachmentPeoplePhone">
-          <el-input v-model="form.detachmentPeoplePhone" placeholder="" />
-        </el-form-item>
-        <div class="jiben">值班情况</div>
-        <el-form-item label prop="zhibanqingkaung">
-          <el-input
-            v-model="form.zhibanqingkaung"
-            type="textarea"
-            placeholder=""
-          />
-        </el-form-item>
-        <div class="jiben">兵力情况</div>
-        <el-form-item label prop="bingliqingkuang">
-          <el-input
-            v-model="form.bingliqingkuang"
-            type="textarea"
-            placeholder=""
-          />
-        </el-form-item>
-      </el-form>
-    </div>
+            <el-form-item
+              label="值班分队指挥员电话"
+              prop="detachmentPeoplePhone"
+            >
+              <el-input v-model="item.detachmentPeoplePhone" placeholder="" />
+            </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-form> -->
+          </el-row>
+          <div class="jiben">值班情况</div>
+          <el-form-item label prop="zhibanqingkaung">
+            <el-input
+              v-model="form.zhibanqingkaung"
+              type="textarea"
+              placeholder=""
+            />
+          </el-form-item>
+          <div class="jiben">兵力情况</div>
+          <el-form-item label prop="bingliqingkuang">
+            <el-input
+              v-model="form.bingliqingkuang"
+              type="textarea"
+              placeholder=""
+            />
+          </el-form-item>
+        </el-form>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel" size="btn">取 消</el-button>
@@ -746,6 +798,7 @@ import {
   rllist,
   listPeople,
   getDept,
+  delTeamdutyinfos,
 } from "@/api/combatduty/teamdutyinfo";
 
 export default {
@@ -824,6 +877,15 @@ export default {
       rylist: [],
       //单位数据
       deptOptions: [],
+      // 添加多个分队值班
+      relatives: [
+        {
+          detachmentId: null,
+          detachmentNumber: null,
+          detachmentPeopleName: null,
+          detachmentPeoplePhone: null,
+        },
+      ],
     };
   },
   created() {
@@ -832,6 +894,22 @@ export default {
     this.getrylist();
   },
   methods: {
+    //增加多个分队值班
+    addFormss() {
+      this.relatives.push({
+        detachmentId: null,
+        detachmentNumber: null,
+        detachmentPeopleName: null,
+        detachmentPeoplePhone: null,
+      });
+    },
+    //删除多个分队值班
+    delFormss(e, id) {
+      this.relatives.splice(e, 1);
+      if (id) {
+        delTeamdutyinfos(id).then(() => {});
+      }
+    },
     //获取人员
     getrylist() {
       listPeople().then((res) => {
@@ -927,6 +1005,7 @@ export default {
       this.loading = true;
       listTeamdutyinfo(this.queryParams).then((response) => {
         this.teamdutyinfoList = response.rows;
+        console.log(response.rows);
         this.total = response.total;
         this.loading = false;
       });
@@ -971,6 +1050,14 @@ export default {
         zhibanqingkaung: null,
         bingliqingkuang: null,
       };
+      this.relatives = [
+        {
+          detachmentId: null,
+          detachmentNumber: null,
+          detachmentPeopleName: null,
+          detachmentPeoplePhone: null,
+        },
+      ];
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -1002,6 +1089,9 @@ export default {
       const id = row.id || this.ids;
       getTeamdutyinfo(id).then((response) => {
         this.form = response.data;
+        if (this.form.teamduties.length != 0) {
+          this.relatives = this.form.teamduties;
+        }
         this.open = true;
         this.title = "修改大队值班";
         this.qdflg = 2;
@@ -1012,6 +1102,7 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
+            this.form.teamduties = this.relatives;
             updateTeamdutyinfo(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -1020,6 +1111,14 @@ export default {
           } else {
             this.form.timequjian = this.form.attendedTime;
             this.form.attendedTime = this.form.attendedTime.join(",");
+            if (
+              this.relatives[0].detachmentId ||
+              this.relatives[0].detachmentNumber ||
+              this.relatives[0].detachmentPeopleName ||
+              this.relatives[0].detachmentPeoplePhone
+            ) {
+              this.form.teamduties = this.relatives;
+            }
             addTeamdutyinfo(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

src/views/login.vue

@@ -193,7 +193,7 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background: url("../assets/images/背景-denglu.png") center no-repeat;
+  background: url("../images/背景图片这是.png") center no-repeat;
   // background-size: cover;
 }
 .title {

src/views/militaryvehicleManagement/thebus/index.vue

@@ -269,7 +269,12 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="车牌号" align="center" prop="vehiclenumber" />
+      <el-table-column
+        label="车牌号"
+        align="center"
+        prop="vehiclenumber"
+        width="100"
+      />
       <el-table-column
         label="车辆型号"
         align="center"
@@ -483,7 +488,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="号牌号码" prop="vehiclenumber">
+        <el-form-item label="车牌号" prop="vehiclenumber">
           <el-input v-model="form.vehiclenumber" placeholder="请输入号码" />
         </el-form-item>
         <el-form-item label="固定座位数" prop="seatCount">

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -108,7 +108,7 @@
         label="单位"
         align="center"
         prop="unitName"
-        width="100"
+        width="150"
       />
       <el-table-column label="人员名称" align="center" prop="peopleName" />
       <el-table-column
@@ -268,15 +268,16 @@
         align="center"
         class-name="small-padding fixed-width"
         width="220"
+        class="shenpis"
       >
         <template slot-scope="scope">
           <div
             v-if="
               scope.row.isTeShu == '1' &&
-              scope.row.peopleoneState != '1' &&
-              scope.row.shenpijiedian != '3' &&
+              scope.row.shenpijiedian != '2' &&
               scope.row.yingjicaozuoren != 'oneji'
             "
+            style="display: inline-block"
           >
             <!-- 1 -->
             <el-button
@@ -316,7 +317,10 @@
               >特殊审批</el-button
             >
           </div>
-          <div v-if="scope.row.status == '1' && scope.row.isCaoZuo == '0'">
+          <div
+            v-if="scope.row.status == '1' && scope.row.isCaoZuo == '0'"
+            style="display: inline-block"
+          >
             <!-- 1 -->
             <el-button
               size="btc"
@@ -1599,8 +1603,8 @@ export default {
   color: #bdbdbd4f !important;
 }
 /* 审批按钮样式 */
-::v-deep .cell {
-  display: flex !important;
+::v-deep .el-table_1_column_18 .cell {
+  /* display: flex !important; */
   margin-top: 10px;
 }
 .box {

src/views/peopleChuRu/bdglLeave/index.vue

@@ -69,7 +69,12 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="单位" align="center" prop="unitName" />
+      <el-table-column
+        label="单位"
+        align="center"
+        prop="unitName"
+        width="150px"
+      />
       <el-table-column label="请假人员" align="center" prop="peopleName" />
 
       <el-table-column
@@ -137,7 +142,14 @@
         width="100"
       >
         <template slot-scope="scope">
-          <el-col v-if="scope.row.status1 == 0" style="color: #ffba00"
+          <el-col v-if="scope.row.peopleId1 == (null || '' || undefined)">
+          </el-col>
+          <el-col
+            v-if="
+              scope.row.status1 == 0 &&
+              scope.row.peopleId1 != (null || '' || undefined)
+            "
+            style="color: #ffba00"
             >未审批</el-col
           >
           <el-col v-if="scope.row.status1 == 1" style="color: #13ce66"
@@ -174,7 +186,14 @@
         width="100"
       >
         <template slot-scope="scope">
-          <el-col v-if="scope.row.status2 == 0" style="color: #ffba00"
+          <el-col v-if="scope.row.peopleId2 == (null || '' || undefined)">
+          </el-col>
+          <el-col
+            v-if="
+              scope.row.status2 == 0 &&
+              scope.row.peopleId2 != (null || '' || undefined)
+            "
+            style="color: #ffba00"
             >未审批</el-col
           >
           <el-col v-if="scope.row.status2 == 1" style="color: #13ce66"
@@ -209,7 +228,14 @@
         width="100"
       >
         <template slot-scope="scope">
-          <el-col v-if="scope.row.status3 == 0" style="color: #ffba00"
+          <el-col v-if="scope.row.peopleId3 == (null || '' || undefined)">
+          </el-col>
+          <el-col
+            v-if="
+              scope.row.status3 == 0 &&
+              scope.row.peopleId3 != (null || '' || undefined)
+            "
+            style="color: #ffba00"
             >未审批</el-col
           >
           <el-col v-if="scope.row.status3 == 1" style="color: #13ce66"
@@ -240,7 +266,14 @@
         width="100"
       >
         <template slot-scope="scope">
-          <el-col v-if="scope.row.status4 == 0" style="color: #ffba00"
+          <el-col v-if="scope.row.peopleId4 == (null || '' || undefined)">
+          </el-col>
+          <el-col
+            v-if="
+              scope.row.status4 == 0 &&
+              scope.row.peopleId4 != (null || '' || undefined)
+            "
+            style="color: #ffba00"
             >未审批</el-col
           >
           <el-col v-if="scope.row.status4 == 1" style="color: #13ce66"
@@ -834,18 +867,18 @@ export default {
         leaveType: [
           { required: true, message: "请假类型不能为空", trigger: "blur" },
         ],
-        peopleId1: [
-          { required: true, message: "审批人不能为空", trigger: "blur" },
-        ],
-        peopleId2: [
-          { required: true, message: "审批人不能为空", trigger: "blur" },
-        ],
-        peopleId3: [
-          { required: true, message: "审批人不能为空", trigger: "blur" },
-        ],
-        peopleId4: [
-          { required: true, message: "审批人不能为空", trigger: "blur" },
-        ],
+        // peopleId1: [
+        //   { required: true, message: "审批人不能为空", trigger: "blur" },
+        // ],
+        // peopleId2: [
+        //   { required: true, message: "审批人不能为空", trigger: "blur" },
+        // ],
+        // peopleId3: [
+        //   { required: true, message: "审批人不能为空", trigger: "blur" },
+        // ],
+        // peopleId4: [
+        //   { required: true, message: "审批人不能为空", trigger: "blur" },
+        // ],
       },
       // 特殊审批表单验证
       rulesform: {
@@ -1228,11 +1261,20 @@ export default {
             });
           } else if (this.form.common != null) {
           } else {
-            addBdglLeave(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+            if (
+              this.form.peopleId2 ||
+              this.form.peopleId1 ||
+              this.form.peopleId3 ||
+              this.form.peopleId4
+            ) {
+              addBdglLeave(this.form).then((response) => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              this.$modal.msgWarning("审批人必须有一个");
+            }
           }
         }
       });

src/views/peopleManage/transfer/index.vue

@@ -8,7 +8,14 @@
       label-width="68px"
     >
       <el-form-item label="" prop="peopleId">
-        <el-select
+        <el-input
+          v-model="queryParams.cName"
+          placeholder="请输入调动人员"
+          clearable
+          size="small"
+          @input="handleQuery"
+        />
+        <!-- <el-select
           v-model="queryParams.peopleId"
           clearable
           ref="peopleId"
@@ -22,7 +29,7 @@
             :value="dict.id"
             style="width: 200px; height: 36px"
           ></el-option>
-        </el-select>
+        </el-select> -->
       </el-form-item>
       <el-form-item label="" prop="transferId">
         <el-select
@@ -746,6 +753,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.cName = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },

src/views/phone/cabinet/index.vue

@@ -3,55 +3,67 @@
     <div class="box" v-if="phone">
       <ul>
         <li class="oneUl" v-for="(item, i) in cabinetList" :key="i">
-          <div class="title">{{ item.name }}</div>
-          <table class="table" @click="opens(item.number)">
-            <tr>
-              <td style="text-align: left; width: 86px">柜子编号</td>
-              <td style="text-align: right; width: 145px">{{ item.number }}</td>
-            </tr>
-            <tr>
-              <td style="text-align: left; width: 86px">柜子IP</td>
-              <td style="text-align: right; width: 145px">
-                {{ item.ip }}
-              </td>
-            </tr>
-            <tr>
-              <td style="text-align: left; width: 86px">格子数量</td>
-              <td style="text-align: right; width: 145px; color: #00f6ff">
-                {{ item.gridCount }}
-              </td>
-            </tr>
-            <tr>
-              <td style="text-align: left; width: 86px">连接信息</td>
-              <td
-                style="text-align: right; width: 145px; color: #13ce66"
-                v-if="item.connected != '断开连接'"
-              >
-                {{ item.connected }}
-              </td>
-              <td
-                style="text-align: right; width: 145px; color: #ff4949"
-                v-else
-              >
-                {{ item.connected }}
-              </td>
-            </tr>
-            <tr>
-              <td style="text-align: left; width: 86px">开门状态</td>
-              <td
-                style="text-align: right; width: 145px; color: #13ce66"
-                v-if="item.connected != '允许开启'"
-              >
-                {{ item.allowOpen }}
-              </td>
-              <td
-                style="text-align: right; width: 145px; color: #ff4949"
-                v-else
-              >
-                {{ item.allowOpen }}
-              </td>
-            </tr>
-          </table>
+          <div
+            @click="opens(item.number)"
+            style="
+              width: 265px;
+              height: 230px;
+              cursor: pointer;
+              text-align: center;
+            "
+          >
+            <div class="title">{{ item.departmentInfo.name }}</div>
+            <table class="table">
+              <tr>
+                <td style="text-align: left; width: 86px">柜子编号</td>
+                <td style="text-align: right; width: 145px">
+                  {{ item.number }}
+                </td>
+              </tr>
+              <tr>
+                <td style="text-align: left; width: 86px">柜子IP</td>
+                <td style="text-align: right; width: 145px">
+                  {{ item.ip }}
+                </td>
+              </tr>
+              <tr>
+                <td style="text-align: left; width: 86px">格子数量</td>
+                <td style="text-align: right; width: 145px; color: #00f6ff">
+                  {{ item.gridCount }}
+                </td>
+              </tr>
+              <tr>
+                <td style="text-align: left; width: 86px">连接信息</td>
+                <td
+                  style="text-align: right; width: 145px; color: #13ce66"
+                  v-if="item.connected != '断开连接'"
+                >
+                  {{ item.connected }}
+                </td>
+                <td
+                  style="text-align: right; width: 145px; color: #ff4949"
+                  v-else
+                >
+                  {{ item.connected }}
+                </td>
+              </tr>
+              <tr>
+                <td style="text-align: left; width: 86px">开门状态</td>
+                <td
+                  style="text-align: right; width: 145px; color: #13ce66"
+                  v-if="item.connected != '允许开启'"
+                >
+                  {{ item.allowOpen }}
+                </td>
+                <td
+                  style="text-align: right; width: 145px; color: #ff4949"
+                  v-else
+                >
+                  {{ item.allowOpen }}
+                </td>
+              </tr>
+            </table>
+          </div>
         </li>
       </ul>
     </div>
@@ -73,14 +85,11 @@
               border-radius: 4px;
               margin-left: 31px;
               background-color: #196299;
+              cursor: pointer;
             "
+            @click="dianJi"
           >
-            <i
-              class="el-icon-arrow-left"
-              style="color: #fff; cursor: pointer"
-              @click="dianJi"
-              >返回</i
-            >
+            <i class="el-icon-arrow-left" style="color: #fff">返回</i>
           </div>
         </el-form-item>
         <!-- <el-form-item prop="gridNumber">
@@ -107,11 +116,12 @@
           v-for="(item, i) in gridList"
           :key="i"
           :class="{
-            greed: item.gridState == '手机已存放',
+            greed: item.gridState == '手机放入',
             red: item.gridState == '手机未放入',
             yellow: item.gridState == '人员请假',
             grey: item.gridState == '未绑定人员',
           }"
+          class="orging"
         >
           <div class="two_div">
             <span>{{ item.deviceId }}</span>
@@ -353,7 +363,7 @@ export default {
       this.cabinetNumber = cabinetNum;
       xianPhoneGeZi(this.cabinetNumber).then((res) => {
         this.gridList = res.data.infos;
-        console.log(res);
+        console.log(res.data.infos);
         this.gridList.forEach((item) => {
           if (item.gridState == "手机未放入") {
             this.red += 1;
@@ -390,6 +400,7 @@ export default {
     /** 查询手机柜列表 */
     getList() {
       xianPhone().then((res) => {
+        console.log(res);
         this.cabinetList = res.data.infos;
       });
       // axios
@@ -534,7 +545,6 @@ ul {
   color: #fff;
   height: 16px;
   display: inline-table;
-  margin-left: 100px;
 }
 .table {
   margin-top: 18px;
@@ -553,15 +563,18 @@ ul {
   height: 36px;
 }
 .red {
-  background: url("../../../assets/images/抽屉-红色1.png") no-repeat;
+  background: url("../../../assets/images/抽屉-红色1.png") no-repeat !important;
 }
 .greed {
-  background: url("../../../assets/images/抽屉-绿色1.png") no-repeat;
+  background: url("../../../assets/images/抽屉-绿色1.png") no-repeat !important;
 }
 .yellow {
-  background: url("../../../assets/images/抽屉-黄色1.png") no-repeat;
+  background: url("../../../assets/images/抽屉-黄色1.png") no-repeat !important;
 }
 .grey {
+  background: url("../../../assets/images/柜子-灰.png") no-repeat !important;
+}
+.orging {
   background: url("../../../assets/images/柜子-灰.png") no-repeat;
 }
 

src/views/pt.vue

@@ -9,12 +9,18 @@
           <span class="span" style="padding-left: 4px">{{ danWie }}</span>
           <span style="color: #00f6ff">用户名 :</span>
           <span style="padding-left: 4px; color: #00f6ff">{{ yongHu }}</span>
-          <span
-            class="iconfont icon-logout"
-            @click="logout"
-            style="font-size: 19px; margin-left: 23px; cursor: pointer"
-          ></span>
         </div>
+        <span
+          class="iconfont icon-logout"
+          @click="logout"
+          style="
+            font-size: 24px;
+            cursor: pointer;
+            position: absolute;
+            right: 16px;
+            top: 8px;
+          "
+        ></span>
         <span style="color: #00f6ff; font-size: 1vw" class="tiem">{{
           times
         }}</span>
@@ -110,7 +116,7 @@
             </li>
             <img src="../assets/images/椭圆 513 (2).png" class="li-img" alt />
           </ul>
-          <hr />
+          <!-- <hr /> -->
           <ul class="ul">
             <li>
               <div class="demo-box">
@@ -212,7 +218,7 @@
             </li>
             <img src="../assets/images/椭圆 513 (2).png" class="li-img" alt />
           </ul>
-          <hr />
+          <!-- <hr /> -->
           <ul class="ul">
             <li>
               <div class="demo-box">
@@ -273,7 +279,7 @@
             </li>
             <img src="../assets/images/椭圆 513 (2).png" class="li-img" alt />
           </ul>
-          <hr />
+          <!-- <hr /> -->
           <ul class="ul">
             <li>
               <div class="demo-box">
@@ -1118,6 +1124,7 @@ li {
   background: url("../images/tx.png") no-repeat;
   text-align: center;
   margin-top: 10%;
+  /* margin-bottom: 10px; */
   /* margin: 0 80px; */
 }
 .demo img {
@@ -1143,7 +1150,7 @@ li {
   align-items: center;
 }
 .ul {
-  /* margin-bottom: 7vh; */
+  margin-bottom: 20px;
   height: 23%;
   display: flex;
   flex-flow: wrap;
@@ -1157,6 +1164,10 @@ li {
 }
 .li-img {
   width: 100%;
+  /* height: 2px;
+  background-color: #06668a;
+  border: none;
+  margin-bottom: 20px; */
 }
 .boxx {
   padding: 0 0 0 80px;
@@ -1376,9 +1387,9 @@ hr {
   text-align: center;
   font-size: 16px;
   cursor: pointer;
-  /* margin-left: 851px; */
+  /* margin-left: 3.5px; */
   position: absolute;
-  right: 4%;
+  right: 3.5%;
   top: 9%;
 }
 ::v-deep .el-dialog {

src/views/system/notice/index.vue

@@ -132,7 +132,7 @@
           <span v-if="scope.row.status == '0'" style="color: #13ce66"
             >正常</span
           >
-          <span v-if="scope.row.status == '1'" style="color=#FF4949">停用</span>
+          <span v-if="scope.row.status == '1'" style="color:#FF4949">停用</span>
           <!-- <dict-tag
             :options="dict.type.sys_notice_status"
             :value="scope.row.status"

src/views/workingArrangements/planTask/index.vue

@@ -160,7 +160,7 @@
             size="btlook"
             type="text"
             @click="ViewProgress(scope.row)"
-            v-if="scope.row.common == 1&&scope.row.taskProgress!='100'"
+            v-if="scope.row.common == 1 && scope.row.taskProgress != '100'"
           >
             <span>进度录入</span>
           </el-button>
@@ -228,7 +228,7 @@
         <div class="jiben">基本信息</div>
         <el-form-item label="计划名称" prop="name">
           <el-input
-            placeholder="请输入计划名册"
+            placeholder="请输入计划名称"
             label="计划名称"
             v-model="form.name"
             @click.native="planName"
@@ -486,13 +486,13 @@
           color="rgba(41, 231, 205, 1)"
         ></el-progress>
         <div class="jiben">任务信息</div>
-              <el-form-item label="发布人" prop="username" label-width="auto" >
+        <el-form-item label="发布人" prop="username" label-width="auto">
           <el-input
             placeholder="请输入发布人"
             v-model="singleTable.username"
             :disabled="true"
             class="ipt"
-            style="color:#fff;width:350px;"
+            style="color: #fff; width: 350px"
           >
           </el-input>
         </el-form-item>
@@ -511,13 +511,13 @@
               line-height: 35px;
               text-indent: 1em;
               margin-bottom: 20px;
-              color:#fff;
+              color: #fff;
             "
           >
             {{ singleTable.startTime }} 至 {{ singleTable.endTime }}
           </div>
         </el-form-item>
-        
+
         <!-- <div class="thistext"></div> -->
         <div class="jiben">附件文档</div>
         <el-form-item prop="file">
@@ -555,7 +555,6 @@
           />
         </el-form-item> -->
         <div class="thistext">{{ singleTable.remark }}</div>
-        
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm2">确 定</el-button>
@@ -587,13 +586,13 @@
           color="rgba(41, 231, 205, 1)"
         ></el-progress>
         <div class="jiben">任务信息</div>
-         <el-form-item label="发布人" prop="username" label-width="auto" >
+        <el-form-item label="发布人" prop="username" label-width="auto">
           <el-input
             placeholder="请输入发布人"
             v-model="moreTable.username"
             :disabled="true"
             class="ipt"
-            style="color:#fff;width:350px;"
+            style="color: #fff; width: 350px"
           >
           </el-input>
         </el-form-item>
@@ -602,7 +601,8 @@
             v-model="singleTable."
             class="big"
           /> -->
-          <div  style="
+          <div
+            style="
               width: 350px;
               border: 1px solid #fff;
               border-radius: 4px;
@@ -611,12 +611,13 @@
               line-height: 35px;
               text-indent: 1em;
               margin-bottom: 20px;
-              color:#fff;
-            ">
+              color: #fff;
+            "
+          >
             {{ moreTable.startTime }} 至 {{ moreTable.endTime }}
           </div>
         </el-form-item>
-        
+
         <!-- <div class="thistext"></div> -->
         <div class="jiben">附件文档</div>
         <el-form-item prop="file">
@@ -1081,8 +1082,11 @@ export default {
         this.singleTable.planProgresses =
           this.singleTable.planProgress.schedule;
         console.log(this.singleTable);
-        this.singleTable.peopleName=res.data.peopleName.split(",").map(Number);
-        this.singleTable.file=process.env.VUE_APP_BASE_API+this.singleTable.file;
+        this.singleTable.peopleName = res.data.peopleName
+          .split(",")
+          .map(Number);
+        this.singleTable.file =
+          process.env.VUE_APP_BASE_API + this.singleTable.file;
         this.getZhuChi(res.data.unitId);
         // this.singleTable.jindu=singleTable.planProgress.schedule
         // console.log(this.singleTable)
@@ -1100,10 +1104,11 @@ export default {
         console.log(res);
         this.comstatus = 0;
         this.moreTable = res.data;
-        this.moreTable.planProgresses.map(item=>{
-            item.file=process.env.VUE_APP_BASE_API+item.file;
-        })
-        this.moreTable.file=process.env.VUE_APP_BASE_API+this.moreTable.file;
+        this.moreTable.planProgresses.map((item) => {
+          item.file = process.env.VUE_APP_BASE_API + item.file;
+        });
+        this.moreTable.file =
+          process.env.VUE_APP_BASE_API + this.moreTable.file;
         this.moreTable.planProgresses.forEach((item) => {
           this.comstatus +=
             item.schedule / this.moreTable.planProgresses.length;
@@ -1613,7 +1618,7 @@ export default {
 .vue-treeselect__menu {
   color: #606266;
 }
-.el-scrollbar li:hover{
+.el-scrollbar li:hover {
   color: black;
 }
 </style>