路由刷新和跳转问题 值班、检查样式修改

src/layout/components/Sidebar/index.vue

@@ -66,9 +66,9 @@ export default {
   created() {
     //   this.routs=this.sidebarRouters
     console.log(this.$route)
-    if(this.$route.path){
-       this.p=this.$route.path
-    }
+    // if(this.$route.path){
+      
+    // }
     if (this.$route.query.name) {
       this.sidebarRoutersfun();
       this.p = this.routs[0].path + "/" + this.routs[0].children[0].path;
@@ -76,8 +76,6 @@ export default {
     } else {
       this.$route.query.name = "/" + this.$route.path.split("/")[1];
       this.sidebarRoutersfun();
-      this.p = this.routs[0].path + "/" + this.routs[0].children[0].path;
-      this.$router.push({ path: this.p });
     }
   },
   methods: {

src/views/PrintsManage/manage/index.vue

@@ -958,7 +958,7 @@ export default {
   color: #1c86e1;
 }
 .el-select-dropdown__item {
-  color: #fff;
+  color: #000;
 }
 .el-tree {
   background-color: #00365f;

src/views/bdglregular/regularinfo/index.vue

@@ -171,10 +171,10 @@
     </el-row>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="success" v-if="queryParams.caoZuoType==0" @click="handleAdd">减分录入</el-button>
+        <el-button type="success" v-if="queryParams.caoZuoType==0" style="background:rgb(255 106 0)" @click="handleAdd">减分录入</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="success" v-if="queryParams.caoZuoType==1" @click="handleAdd">加分录入</el-button>
+        <el-button type="success" v-if="queryParams.caoZuoType==1" style="background: rgb(2 255 2)" @click="handleAdd">加分录入</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -234,8 +234,8 @@
       <el-table-column label="检查地点" align="center" prop="inspectionSite" />
       <el-table-column label="分值" align="center" :key="Math.random()" prop="score">
         <template slot-scope="scope">
-          <div style="color:#f00;" v-if="queryParams.caoZuoType==0">{{scope.row.score}}</div>
-          <div style="color:#1cff00;" v-if="queryParams.caoZuoType==1">{{scope.row.score}}</div>
+          <div style="color:rgb(255 106 0);" v-if="queryParams.caoZuoType==0">{{scope.row.score}}</div>
+          <div style="color:rgb(2 255 2);" v-if="queryParams.caoZuoType==1">{{scope.row.score}}</div>
         </template>
       </el-table-column>
       <el-table-column
@@ -286,23 +286,20 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-            size="mini"
+            size="btk"
             type="text"
-            icon="el-icon-edit"
             v-if="scope.row.caoZuoType=='0'&&scope.row.isCaoZuoDept==0&&(scope.row.currentState=='未通过'||scope.row.currentState=='待处理')"
             @click="handleUpdate(scope.row)"
           >整改</el-button>
           <el-button
-            size="mini"
+            size="btu"
             type="text"
-            icon="el-icon-edit"
             @click="shenpifun(scope.row)"
             v-if="queryParams.caoZuoType==0&&scope.row.isShenPi==0&&scope.row.currentState=='待验收'"
           >审批</el-button>
           <el-button
-            size="mini"
+            size="btd"
             type="text"
-            icon="el-icon-delete"
             @click="handleDelete(scope.row)"
           >删除</el-button>
         </template>

src/views/bdglregular/specialinfo/index.vue

@@ -134,14 +134,16 @@
           type="success"
           v-if="queryParams.caoZuoType==0"
           @click="handleAdd"
-        >减分</el-button>
+          style="background:rgb(255 106 0)"
+        >减分录入</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
           type="success"
           v-if="queryParams.caoZuoType==1"
           @click="handleAdd"
-        >加分</el-button>
+          style="background: rgb(2 255 2)"
+        >加分录入</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -209,8 +211,8 @@
       />
       <el-table-column label="分值" align="center" :key="Math.random()" prop="score">
         <template slot-scope="scope">
-          <div style="color:#f00;" v-if="queryParams.caoZuoType==0">{{scope.row.score}}</div>
-          <div style="color:#1cff00;" v-if="queryParams.caoZuoType==1">{{scope.row.score}}</div>
+          <div style="color:rgb(255 106 0);" v-if="queryParams.caoZuoType==0">{{scope.row.score}}</div>
+          <div style="color:rgb(2 255 2);" v-if="queryParams.caoZuoType==1">{{scope.row.score}}</div>
         </template>
       </el-table-column>
       <el-table-column label="检查时间" align="center" prop="inspectionTime" />
@@ -288,22 +290,19 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-            size="mini"
+            size="btk"
             type="text"
-            icon="el-icon-edit"
             v-if="(queryParams.caoZuoType==0&&scope.row.isCaoZuoDept==0)&&(scope.row.currentState=='未通过'||scope.row.currentState=='待处理')"
             @click="handleUpdate(scope.row)"
           >整改</el-button>
           <el-button
-            size="mini"
+            size="btu"
             type="text"
-            icon="el-icon-edit"
             @click="shenpifun(scope.row)"
             v-if="(queryParams.caoZuoType==0&&scope.row.isShenPi==0)&&(scope.row.currentState=='待验收')"
           >审批</el-button>
           <el-button
-            size="mini"
-            type="text"
+            size="btd"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
           >删除</el-button>

src/views/combatduty/basedutyinfo/index.vue

@@ -290,24 +290,24 @@
       <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="值班分队1" align="center" prop="detachmentoneName" /> -->
-      <el-table-column
+      <el-table-column label="值班分队1" align="center" prop="detachmentoneName" />
+      <!-- <el-table-column
         label="值班分队1"
         align="center"
         prop="detachmentoneId"
         :formatter="detachmentoneIdFormat"
-      />
+      /> -->
       <!-- <el-table-column label="值班分队1人数" align="center" prop="detachmentoneNumber" /> -->
       <el-table-column label="值班分队1指挥员" align="center" prop="detachmentonePeopleName" />
       <!-- <el-table-column label="值班分队1指挥员" align="center" prop="detachmentonePeopleId" :formatter="detachmentonePeopleIdFormat" /> -->
       <!-- <el-table-column label="值班分队1指挥员电话" align="center" prop="detachmentonePeoplePhone" />  -->
-      <!-- <el-table-column label="值班分队2" align="center" prop="detachmentwoName" /> -->
-      <el-table-column
+      <el-table-column label="值班分队2" align="center" prop="detachmentwoName" />
+      <!-- <el-table-column
         label="值班分队2"
         align="center"
         prop="detachmentwoId"
         :formatter="detachmentwoIdFormat"
-      />
+      /> -->
       <!-- <el-table-column label="值班分队2人数" align="center" prop="detachmentwoNumber" /> -->
       <el-table-column label="值班分队2指挥员" align="center" prop="detachmentwoPeopleName" />
       <!-- <el-table-column label="值班分队2指挥员" align="center" prop="detachmentwoPeopleId" :formatter="detachmentwoPeopleIdFormat" /> -->
@@ -414,13 +414,13 @@
         <el-form-item label="总值班员电话" prop="dutyOffierPhone">
           <el-input v-model="form.dutyOffierPhone" placeholder="请输入总值班员电话" />
         </el-form-item>
-        <el-form-item label="值班分队1" prop="detachmentoneId">
-          <el-select v-model="form.detachmentoneId" ref="deptId" clearable placeholder="请选择值班分队1">
+        <el-form-item label="值班分队1" prop="detachmentoneName">
+          <el-select v-model="form.detachmentoneName" @change="detachmentoneNamechange" clearable placeholder="请选择值班分队1">
             <el-option
               v-for="dict in deptOptions"
               :key="dict.deptId"
               :label="dict.deptName"
-              :value="dict.deptId"
+              :value="dict"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -452,13 +452,13 @@
         <el-form-item label="值班分队1指挥员电话" prop="detachmentonePeoplePhone">
           <el-input v-model="form.detachmentonePeoplePhone" placeholder="请输入值班分队1指挥员电话" />
         </el-form-item>
-        <el-form-item label="值班分队2" prop="detachmentwoId">
-          <el-select v-model="form.detachmentwoId" ref="deptId" clearable placeholder="请选择值班分队2">
+        <el-form-item label="值班分队2" prop="detachmentwoName">
+          <el-select v-model="form.detachmentwoName" @change="detachmentwoNamechange" clearable placeholder="请选择值班分队2">
             <el-option
               v-for="dict in deptOptions"
               :key="dict.deptId"
               :label="dict.deptName"
-              :value="dict.deptId"
+              :value="dict"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -603,25 +603,25 @@ export default {
       });
     },
     //值班一队
-    detachmentoneIdFormat(row, column) {
-      var deptName = "";
-      this.deptOptions.map(item => {
-        if (item.deptId == row.detachmentoneId) {
-          deptName = item.deptName;
-        }
-      });
-      return deptName;
-    },
+    // detachmentoneIdFormat(row, column) {
+    //   var deptName = "";
+    //   this.deptOptions.map(item => {
+    //     if (item.deptId == row.detachmentoneId) {
+    //       deptName = item.deptName;
+    //     }
+    //   });
+    //   return deptName;
+    // },
     //值班二队
-    detachmentwoIdFormat(row, column) {
-      var deptName = "";
-      this.deptOptions.map(item => {
-        if (item.deptId == row.detachmentwoId) {
-          deptName = item.deptName;
-        }
-      });
-      return deptName;
-    },
+    // detachmentwoIdFormat(row, column) {
+    //   var deptName = "";
+    //   this.deptOptions.map(item => {
+    //     if (item.deptId == row.detachmentwoId) {
+    //       deptName = item.deptName;
+    //     }
+    //   });
+    //   return deptName;
+    // },
     //首长
     chiefDutyIdFormat(row, column) {
       var deptName = "";
@@ -832,6 +832,14 @@ export default {
       this.form.detachmentwoPeopleId = val.id;
       this.form.detachmentwoPeopleName = val.name;
       this.form.detachmentwoPeoplePhone = val.phone;
+    },
+    detachmentoneNamechange(val) {
+      this.form.detachmentoneId = val.deptId;
+      this.form.detachmentoneName = val.deptName;
+    },
+    detachmentwoNamechange(val) {
+      this.form.detachmentwoId = val.deptId;
+      this.form.detachmentwoName = val.deptName;
     }
   }
 };
@@ -862,7 +870,7 @@ export default {
 
 .el-select-dropdown__item {
   /* background-color: white; */
-  color: #fff !important;
+  color: #000 !important;
 }
 ::v-deep .el-date-editor.el-input {
   width: 200px;

src/views/combatduty/grassdutyinfo/index.vue

@@ -241,8 +241,8 @@
       <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="unitName" />
+      <!-- <el-table-column label="单位" align="center" prop="unitId" :formatter="unitIdFormat" /> -->
       <!-- <el-table-column label="值班首长" align="center" prop="chiefDutyName" /> -->
       <el-table-column
         label="值班首长"
@@ -344,12 +344,17 @@
             v-if="qdflg==1"
           ></el-date-picker>
         </el-form-item>
-        <!-- <el-form-item label="单位名称" prop="unitName">
-          <el-select v-model="form.unitName" placeholder="请选择单位名称">
-            <el-option label="请选择字典生成" value="" />
+        <el-form-item label="单位名称" prop="unitName">
+          <el-select v-model="form.unitName" @change="unitNamechange" clearable placeholder="请选择单位名称">
+            <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="unitId">
+        </el-form-item>
+        <!-- <el-form-item label="单位" prop="unitId">
           <el-select v-model="form.unitId" ref="deptId" clearable placeholder="请选择单位名称">
             <el-option
               v-for="dict in deptOptions"
@@ -358,7 +363,7 @@
               :value="dict.deptId"
             ></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="值班首长" prop="chiefDutyName">
           <!-- <el-input v-model="form.chiefDutyName" placeholder="请输入值班首长" /> -->
           <el-select
@@ -558,15 +563,15 @@ export default {
       return deptName;
     },
     //单位
-    unitIdFormat(row, column) {
-      var deptName = "";
-      this.deptOptions.map(item => {
-        if (item.deptId == row.unitId) {
-          deptName = item.deptName;
-        }
-      });
-      return deptName;
-    },
+    // unitIdFormat(row, column) {
+    //   var deptName = "";
+    //   this.deptOptions.map(item => {
+    //     if (item.deptId == row.unitId) {
+    //       deptName = item.deptName;
+    //     }
+    //   });
+    //   return deptName;
+    // },
     //岗位
     dutyGangweiFormat(row, column) {
       var deptName = "";
@@ -714,7 +719,15 @@ export default {
       this.form.dutyOffierId = val.id;
       this.form.dutyOffierName = val.name;
       this.form.dutyOffierPhone = val.phone;
-    }
+    },
+    unitNamechange(val) {
+      this.form.unitId = val.deptId;
+      this.form.unitName = val.deptName;
+    },
+    // detachmentwoNamechange(val) {
+    //   this.form.detachmentwoId = val.deptId;
+    //   this.form.detachmentwoName = val.deptName;
+    // }
   }
 };
 </script>
@@ -804,6 +817,6 @@ export default {
 }
 .el-select-dropdown__item {
   /* background-color: white; */
-  color: #fff !important;
+  color: #000 !important;
 }
 </style>

src/views/combatduty/militarydutyinfo/index.vue

@@ -166,8 +166,8 @@
       </el-table-column>
       <!-- <el-table-column label="号码号牌ID" align="center" prop="numberPlateId" /> -->
       <el-table-column label="号码号牌" align="center" prop="numberPlateName" />
-      <el-table-column label="车属单位" align="center" prop="carUnitId" :formatter="carUnitIdFormat" />
-      <!-- <el-table-column label="车属单位名称" align="center" prop="carUnitName" /> -->
+      <!-- <el-table-column label="车属单位" align="center" prop="carUnitId" :formatter="carUnitIdFormat" /> -->
+      <el-table-column label="车属单位名称" align="center" prop="carUnitName" />
       <el-table-column label="车辆类别" align="center" prop="carType" />
       <el-table-column label="车辆状态" align="center" prop="carStates">
         <template slot-scope="scope">
@@ -246,16 +246,16 @@
           />
         </el-form-item>-->
         <el-form-item label="号码号牌" prop="numberPlateName">
-          <el-select v-model="form.numberPlateName" placeholder="请选择号码号牌">
+          <el-select v-model="form.numberPlateName" @change="numberPlateNamechange" placeholder="请选择号码号牌">
             <el-option
               v-for="dict in buslist"
               :key="dict.id"
               :label="dict.vehiclenumber"
-              :value="dict.vehiclenumber"
+              :value="dict"
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="车属单位" prop="carUnitId">
+        <!-- <el-form-item label="车属单位" prop="carUnitId">
           <el-select v-model="form.carUnitId" ref="deptId" clearable placeholder="请选择车属单位">
             <el-option
               v-for="dict in deptOptions"
@@ -264,12 +264,17 @@
               :value="dict.deptId"
             ></el-option>
           </el-select>
-        </el-form-item>
-        <!-- <el-form-item label="车属单位名称" prop="carUnitName">
-          <el-select v-model="form.carUnitName" placeholder="请选择车属单位名称">
-            <el-option label="请选择字典生成" value />
+        </el-form-item> -->
+        <el-form-item label="车属单位名称" prop="carUnitName">
+           <el-select v-model="form.carUnitName" @change="carUnitNamechange" clearable placeholder="请选择车属单位">
+            <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>
         <el-form-item label="车辆类别" prop="carType">
           <el-input v-model="form.carType" placeholder="请输入车辆类别" />
         </el-form-item>
@@ -388,15 +393,15 @@ export default {
   },
   methods: {
     //岗位
-    carUnitIdFormat(row, column) {
-      var deptName = "";
-      this.deptOptions.map(item => {
-        if (item.deptId == row.carUnitId) {
-          deptName = item.deptName;
-        }
-      });
-       return deptName;
-    },
+    // carUnitIdFormat(row, column) {
+    //   var deptName = "";
+    //   this.deptOptions.map(item => {
+    //     if (item.deptId == row.carUnitId) {
+    //       deptName = item.deptName;
+    //     }
+    //   });
+    //    return deptName;
+    // },
     //获取人员
     getrylist() {
       listPeople().then(res => {
@@ -447,7 +452,8 @@ export default {
         adress: null,
         driverId: null,
         driverName: null,
-        telephone: null
+        telephone: null,
+        modelInfo:null
       };
       this.resetForm("form");
     },
@@ -542,6 +548,14 @@ export default {
       this.form.driverName = val.name;
       this.form.telephone = val.phone;
       this.form.driverId = val.id;
+    },
+    carUnitNamechange(val) {
+      this.form.carUnitId = val.deptId;
+      this.form.carUnitName = val.deptName;
+    },
+    numberPlateNamechange(val){
+      this.form.numberPlateName=val.vehiclenumber;
+      this.form.modelInfo=val.vehiclemodel;
     }
   }
 };
@@ -658,6 +672,6 @@ export default {
 }
 .el-select-dropdown__item {
   /* background-color: white; */
-  color: #fff !important;
+  color: #000 !important;
 }
 </style>

src/views/combatduty/regisdutyinfo/index.vue

@@ -253,12 +253,12 @@
       >
       <div class="jiben">基本信息</div>
         <el-form-item label="单位名称" prop="unitName">
-          <el-select v-model="form.unitName" ref="deptId" clearable placeholder="请选择单位名称">
+          <el-select v-model="form.unitName" @change="unitNamechange" clearable placeholder="请选择单位名称">
             <el-option
               v-for="dict in deptOptions"
               :key="dict.deptId"
               :label="dict.deptName"
-              :value="dict.deptId"
+              :value="dict"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -518,6 +518,10 @@ export default {
         })
         .catch(() => {});
     },
+    unitNamechange(val) {
+      this.form.unitId = val.deptId;
+      this.form.unitName = val.deptName;
+    },
   },
 };
 </script>
@@ -613,7 +617,7 @@ export default {
 }
 .el-select-dropdown__item{
   /* background-color: white; */
-  color: #fff !important;
+  color: #000 !important;
 }
 .el-form-item ::v-deep .el-input__inner {
   width: 200px;

src/views/combatduty/taskdutyinfo/index.vue

@@ -161,7 +161,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" :formatter="unitNameFormat" />
+      <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" /> -->
@@ -213,12 +213,12 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
         <div class="jiben">基本信息</div>
         <el-form-item label="单位" prop="unitName">
-          <el-select v-model="form.unitName" clearable placeholder="请选择单位">
+          <el-select v-model="form.unitName" @change="unitNamechange" clearable placeholder="请选择单位">
             <el-option
               v-for="dict in deptOptions"
               :key="dict.deptId"
               :label="dict.deptName"
-              :value="dict.deptId"
+              :value="dict"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -395,15 +395,15 @@ export default {
       });
     },
     //单位翻译
-    unitNameFormat(row, column) {
-      var deptName = "";
-      this.deptOptions.map(item => {
-        if (item.deptId == row.unitName) {
-          deptName = item.deptName;
-        }
-      });
-      return deptName;
-    },
+    // unitNameFormat(row, column) {
+    //   var deptName = "";
+    //   this.deptOptions.map(item => {
+    //     if (item.deptId == row.unitName) {
+    //       deptName = item.deptName;
+    //     }
+    //   });
+    //   return deptName;
+    // },
     unit2Format(row, column) {
       var deptName = "";
       this.rylist.map(item => {
@@ -539,7 +539,11 @@ export default {
       this.form.commanderName = val.name;
       this.form.commanderPhone = val.phone;
       this.form.commanderId = val.id;
-    }
+    },
+    unitNamechange(val) {
+      this.form.unitId = val.deptId;
+      this.form.unitName = val.deptName;
+    },
   }
 };
 </script>
@@ -639,7 +643,7 @@ export default {
 }
 .el-select-dropdown__item {
   /* background-color: white; */
-  color: #fff !important;
+  color: #000 !important;
 }
 .el-form-item ::v-deep .el-input__inner {
   width: 200px;

src/views/combatduty/teamdutyinfo/index.vue

@@ -379,13 +379,13 @@
         :formatter="messengerIdFormat"
       />
       <!-- <el-table-column label="值班通信员电话" align="center" prop="messengerPhone" /> -->
-      <!-- <el-table-column label="值班分队" align="center" prop="detachmentName"  /> -->
-      <el-table-column
+      <el-table-column label="值班分队" align="center" prop="detachmentName"  />
+      <!-- <el-table-column
         label="值班分队"
         align="center"
         prop="detachmentId"
         :formatter="detachmentIdFormat"
-      />
+      /> -->
       <!-- <el-table-column label="值班分队人数" align="center" prop="detachmentNumber" />
       <el-table-column label="值班分队指挥员" align="center" prop="detachmentPeopleName" />
       <el-table-column label="值班分队指挥员ID" align="center" prop="detachmentPeopleId" />
@@ -587,12 +587,17 @@
         <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" placeholder="请选择值班分队">
-            <el-option label="请选择字典生成" value />
+        <el-form-item label="值班分队" prop="detachmentName">
+          <el-select v-model="form.detachmentName" @change="detachmentNamechange" clearable placeholder="请选择值班分队">
+            <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-item>
+        <!-- <el-form-item label="值班分队" prop="detachmentId">
           <el-select v-model="form.detachmentId" ref="deptId" clearable placeholder="请选择值班分队">
             <el-option
               v-for="dict in deptOptions"
@@ -601,7 +606,7 @@
               :value="dict.deptId"
             ></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="值班分队人数" prop="detachmentNumber">
           <el-input v-model="form.detachmentNumber" type="number" placeholder="请输入值班分队人数" />
         </el-form-item>
@@ -760,15 +765,15 @@ export default {
       });
     },
     //值班一队
-    detachmentIdFormat(row, column) {
-      var deptName = "";
-      this.deptOptions.map(item => {
-        if (item.deptId == row.detachmentId) {
-          deptName = item.deptName;
-        }
-      });
-      return deptName;
-    },
+    // detachmentIdFormat(row, column) {
+    //   var deptName = "";
+    //   this.deptOptions.map(item => {
+    //     if (item.deptId == row.detachmentId) {
+    //       deptName = item.deptName;
+    //     }
+    //   });
+    //   return deptName;
+    // },
     //首长
     chiefDutyIdFormat(row, column) {
       var deptName = "";
@@ -1016,7 +1021,11 @@ export default {
       this.form.detachmentPeopleId = val.id;
       this.form.detachmentPeopleName = val.name;
       this.form.detachmentPeoplePhone = val.phone;
-    }
+    },
+    detachmentNamechange(val) {
+      this.form.detachmentId = val.deptId;
+      this.form.detachmentName = val.deptName;
+    },
   }
 };
 </script>
@@ -1046,8 +1055,9 @@ export default {
 
 .el-select-dropdown__item {
   /* background-color: white; */
-  color: #fff !important;
+  color: #000 !important;
 }
+
 ::v-deep .el-date-editor.el-input {
   width: 200px;
   height: 36px;

src/views/peopleManage/examination/index.vue

@@ -681,7 +681,7 @@ export default {
   color: #1c86e1;
 }
 .el-select-dropdown__item {
-  color: #fff;
+  color: #000;
 }
 .el-tree {
   background-color: #00365f;

src/views/peopleManage/people/index.vue

@@ -1829,7 +1829,7 @@ export default {
   color: #1c86e1;
 }
 .el-select-dropdown__item {
-  color: #fff !important;
+  color: #000 !important;
 }
 .el-tree {
   background-color: #00365f;

src/views/peopleManage/transfer/index.vue

@@ -806,7 +806,7 @@ export default {
   color: #1c86e1;
 }
 .el-select-dropdown__item {
-  color: #fff;
+  color: #000;
 }
 .el-tree {
   background-color: #00365f;

src/views/taishi/index.vue

@@ -1063,6 +1063,9 @@ export default {
 
       const myColor = ["#0496FF", "#EF4E4E", "#00E4FF", "#36E2B3", "#E89831"];
       const option12 = {
+        tooltip: {
+          color: "#00CCFF"
+        },
         grid: {
           containLabel: true,
           left: "2%",
@@ -1119,6 +1122,14 @@ export default {
             data: data1,
             type: "bar",
             barWidth: 18,
+            label: {
+              normal: {
+                show: true,
+                position: "top",
+                formatter: "{c}",
+                color: "#fff"
+              }
+            },
             itemStyle: {
               normal: {
                 barBorderRadius: 0,