修改

src/views/barracksManagement/barracks/index.vue

@@ -10,7 +10,7 @@
       <el-form-item label="坐落号" prop="number">
         <el-input
           v-model="queryParams.number"
-          placeholder="请输入坐落号"
+          
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -19,7 +19,7 @@
       <el-form-item label="分栋号" prop="number1">
         <el-input
           v-model="queryParams.number1"
-          placeholder="请输入分栋号"
+          
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -215,27 +215,27 @@
         :inline="true"
       >
         <el-form-item label="坐落号" prop="number">
-          <el-input v-model="form.number" placeholder="请输入坐落号" />
+          <el-input v-model="form.number"  />
         </el-form-item>
         <el-form-item label="分栋号" prop="number1">
-          <el-input v-model="form.number1" placeholder="请输入分栋号" />
+          <el-input v-model="form.number1"  />
         </el-form-item>
         <el-form-item label="分栋名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入分栋名称" />
+          <el-input v-model="form.name"  />
         </el-form-item>
         <el-form-item label="营房用途" prop="behoof">
-          <el-input v-model="form.behoof" placeholder="请输入营房用途" />
+          <el-input v-model="form.behoof" />
         </el-form-item>
         <el-form-item label="利用现状" prop="statusQuo">
-          <el-input v-model="form.statusQuo" placeholder="请输入利用现状" />
+          <el-input v-model="form.statusQuo" />
         </el-form-item>
         <el-form-item label="建筑年代" prop="period">
-          <el-input v-model="form.period" placeholder="请输入建筑年代" />
+          <el-input v-model="form.period" />
         </el-form-item>
         <el-form-item label="建筑面积" prop="area">
-          <el-input v-model="form.area" placeholder="请输入建筑面积" />
+          <el-input v-model="form.area" />
         </el-form-item>
-        <div class="jiben">备注</div>
+        <div class="jibens">备注</div>
         <el-form-item prop="remark">
           <!-- <el-input v-model="form.remark" placeholder="请输入备注" /> -->
           <el-input
@@ -420,7 +420,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除营房档案编号为"' + ids + '"的数据项？')
+        .confirm('是否确认删除？')
         .then(function () {
           return delBarracks(ids);
         })
@@ -520,4 +520,17 @@ export default {
 ::v-deep .el-table__cell .cell{
   text-align: center;
 }
+/* 备注样式 */
+.jibens{
+  width: 650px;
+  height: 32px;
+  background-image:url("/static/img/小标题底.b7c6f45a.png");
+  margin-bottom: 25px;
+    color: #fff;
+    padding-left: 16px;
+    line-height: 32px;
+}
+::v-deep .el-form-item__content .el-input__inner{
+  color: white;
+}
 </style>

src/views/barracksManagement/checkin/index.vue

@@ -28,7 +28,7 @@
       <el-form-item label="入住人姓名" prop="occupant">
         <el-input
           v-model="queryParams.occupant"
-          placeholder="请输入入住人姓名"
+          
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -131,15 +131,15 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column  label="序号" type="index" width="50"> </el-table-column>
-      <el-table-column label="单位名称" align="center" prop="unitName"  width="200"/>
-      <el-table-column label="位置" align="center" prop="position"  width="200"/>
-      <el-table-column label="入住人姓名" align="center" prop="occupant"  width="200" />
-      <el-table-column label="备注" align="center" prop="remark"  width="200" />
+      <el-table-column label="单位名称" align="center" prop="unitName"  />
+      <el-table-column label="位置" align="center" prop="position" />
+      <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"
-         width="200"
+        
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.entryTime, "{y}-{m}-{d}") }}</span>
@@ -149,7 +149,7 @@
         label="退房时间"
         align="center"
         prop="endTime"
-        width="200"
+        
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
@@ -159,6 +159,7 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        
       >
         <template slot-scope="scope">
           <el-button
@@ -197,10 +198,10 @@
         :inline="true"
       >
         <el-form-item label="位置" prop="position">
-          <el-input v-model="form.position" placeholder="请输入位置" />
+          <el-input v-model="form.position" />
         </el-form-item>
         <el-form-item label="入驻单位" prop="unitName">
-          <el-input v-model="form.unitName" placeholder="请输入单位名称" />
+          <el-input v-model="form.unitName" />
         </el-form-item>
         <!-- <el-form-item label="单位id" prop="unitId">
           <el-input v-model="form.unitId" placeholder="请输入单位id" />
@@ -209,7 +210,7 @@
           <el-input v-model="form.creatId" placeholder="请输入创建人id" />
         </el-form-item> -->
         <el-form-item label="入住人员" prop="occupant">
-          <el-input v-model="form.occupant" placeholder="请输入入住人员" />
+          <el-input v-model="form.occupant"  />
         </el-form-item>
         <el-form-item label="入住时间" prop="entryTime">
           <el-date-picker
@@ -218,7 +219,7 @@
             v-model="form.entryTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="选择入住时间"
+           
           >
           </el-date-picker>
         </el-form-item>
@@ -229,11 +230,11 @@
             v-model="form.endTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="选择退房时间"
+            
           >
           </el-date-picker>
         </el-form-item>
-        <div class="jiben">备注</div>
+        <div class="jibens">备注</div>
         <el-form-item prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -394,7 +395,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除临时来队编号为"' + ids + '"的数据项？')
+        .confirm('是否确认删除？')
         .then(function () {
           return delCheckin(ids);
         })
@@ -469,4 +470,19 @@ export default {
 ::v-deep .el-table__cell .cell{
   text-align: center;
 }
+/* 文字多余部分省略 */
+::v-deep .el-table__cell .cell {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.jibens{
+  width: 670px;
+  height: 32px;
+  background-image:url("/static/img/小标题底.b7c6f45a.png");
+  margin-bottom: 25px;
+    color: #fff;
+    padding-left: 16px;
+    line-height: 32px;
+}
 </style>

src/views/barracksManagement/flat/index.vue

@@ -4,7 +4,7 @@
       <el-form-item label="坐落号" prop="number">
         <el-input
           v-model="queryParams.number"
-          placeholder="请输入坐落号"
+         
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -13,7 +13,7 @@
       <el-form-item label="分栋号" prop="number1">
         <el-input
           v-model="queryParams.number1"
-          placeholder="请输入分栋号"
+          
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -117,7 +117,7 @@
           v-hasPermi="['barracksManagement:flat:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+       <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -139,6 +139,7 @@
           v-hasPermi="['barracksManagement:flat:remove']"
         >删除</el-button>
       </el-col>
+      <!--
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -149,7 +150,7 @@
           @click="handleExport"
           v-hasPermi="['barracksManagement:flat:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -204,36 +205,36 @@
     <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="90px" :inline="true">
         <el-form-item label="坐落号" prop="number">
-          <el-input v-model="form.number" placeholder="请输入坐落号" />
+          <el-input v-model="form.number"  />
         </el-form-item>
         <el-form-item label="分栋号" prop="number1">
-          <el-input v-model="form.number1" placeholder="请输入分栋号" />
+          <el-input v-model="form.number1"/>
         </el-form-item>
         <el-form-item label="分栋名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入分栋名称" />
+          <el-input v-model="form.name" />
         </el-form-item>
         <el-form-item label="营房用途" prop="behoof">
-          <el-input v-model="form.behoof" placeholder="请输入营房用途" />
+          <el-input v-model="form.behoof"  />
         </el-form-item>
         <el-form-item label="利用现状" prop="statusQuo">
-          <el-input v-model="form.statusQuo" placeholder="请输入利用现状" />
+          <el-input v-model="form.statusQuo"  />
         </el-form-item>
         <el-form-item label="建筑年代" prop="period">
-          <el-input v-model="form.period" placeholder="请输入建筑年代" />
+          <el-input v-model="form.period"  />
         </el-form-item>
         <el-form-item label="建筑面积" prop="area">
-          <el-input v-model="form.area" placeholder="请输入建筑面积" />
+          <el-input v-model="form.area"  />
         </el-form-item>
         <el-form-item label="楼房层数" prop="tier">
-          <el-input v-model="form.tier" placeholder="请输入楼房层数" />
+          <el-input v-model="form.tier" />
         </el-form-item>
         <el-form-item label="房间号" prop="roomNumber">
-          <el-input v-model="form.roomNumber" placeholder="请输入房间号" />
+          <el-input v-model="form.roomNumber"  />
         </el-form-item>
         <el-form-item label="单元号" prop="element">
-          <el-input v-model="form.element" placeholder="请输入单元号" />
+          <el-input v-model="form.element"  />
         </el-form-item>
-        <div class="jiben">备注</div>
+        <div class="jibens">备注</div>
         <el-form-item prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -423,7 +424,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除公寓房档案编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除？').then(function() {
         return delFlat(ids);
       }).then(() => {
         this.getList();
@@ -487,4 +488,20 @@ export default {
 ::v-deep .el-table__cell .cell{
   text-align: center;
 }
+/* 文字多余部分省略 */
+::v-deep .el-table__cell .cell {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.jibens{
+  width: 650px;
+  height: 32px;
+  background-image:url("/static/img/小标题底.b7c6f45a.png");
+  margin-bottom: 25px;
+    color: #fff;
+    padding-left: 16px;
+    line-height: 32px;
+}
+
 </style>

src/views/combatduty/Quantitative/index.vue

@@ -3,6 +3,7 @@
     <div class="wrap-top">
       <div class="wrap-top-left">
         <div class="wrap-top-left-top">
+          <!-- <img src="../../../images/Quantitative/" alt=""> -->
           <div class="wrap-top-left-top-head"><b>基地值班</b></div>
           <div style="width: 100%; display: flex">
             <div class="wrap-top-left-top-item">
@@ -73,7 +74,7 @@
           </div>
         </div>
       </div>
-      <div class="wrap-top-left-top">
+      <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">
@@ -402,6 +403,7 @@
         </div>
       </div>
     </div>
+    <div class="bottomsss"></div>
   </div>
 </template>
 <script>
@@ -519,6 +521,13 @@ body {
 .content {
   background-color: #103360;
 }
+.bottomsss{
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: 10px;
+  background-color: pink;
+}
 /* .wrap {
   min-height: calc(100vh - 85px);
   width: 100%;
@@ -531,8 +540,9 @@ body {
 /* 军车装备样式 */
 .junchezhuangbei {
   display: flex;
+  width: 98.5%;
   height: 65.5%;
-  margin-left: -5px;
+  /* margin-left: 10px; */
   margin-top: 10px;
   /* margin: 0 1%; */
   /* background-color: purple; */
@@ -540,55 +550,67 @@ body {
 }
 /* 装备值班样式 */
 .zhuangbeizhiban {
-  flex: 1;
-  height: 96%;
+  /* flex: 1; */
+  width: 98%;
+  height: 92%;
   background-image: url("../../../images/Quantitative/底 拷贝 8.png");
   background-size: 100% 100%;
   background-repeat: no-repeat;
-  margin-top: 10px;
-  margin: 10px 1%;
+  margin-left: 10px;
+  /* margin-top: 10px; */
+  /* margin: 10px 1%; */
   /* margin-left: 17px;
   margin-right: 10px; */
 }
 .wrap-top {
-  width: 100%;
+  width: 99%;
   height: 23vh;
   /* background-color: pink; */
   display: flex;
   flex-direction: row;
-  padding-top: 5px;
-  margin-bottom: 5px;
+  margin: 10px;
+  /* padding-top: 5px;
+  margin-bottom: 5px; */
 }
 
 .wrap-top-left {
   width: 100%;
   flex: 1;
   height: 100%;
-  margin-left: 9px;
+  /* margin-left: 9px; */
 }
 
 .wrap-top-center {
-  flex: 1;
-  height: 35%;
-  background-image: url("../../../images/Quantitative/底 拷贝 6 (1).png");
+  /* flex: 1; */
+  width: 98.5%;
+  height: 38%;
+  /* max-width: 98.5%;
+   max-height: 35%; */
+  /* background-image: url("../../../images/Quantitative/底 拷贝 6 (1).png"); */
+  background-image: url("../../../images/Quantitative/底 拷贝 6.png");
   background-size: 100% 100%;
   background-repeat: no-repeat;
+  /* margin-right: 10px; */
   /* margin-top: 10px; */
-  margin: 0 1%;
+  /* margin: 0 1%; */
   display: flex;
   flex-wrap: wrap;
   /* margin-right: 8px; */
 }
 
 .wrap-top-right {
-  flex: 1;
-  height: 96%;
+  /* flex: 1; */
+  width: 98%;
+  height: 92%;
+  /* max-width: 98%;
+  max-height: 96%; */
   background-image: url("../../../images/Quantitative/底 拷贝 8.png");
   background-size: 100% 100%;
   background-repeat: no-repeat;
-  margin-top: 10px;
+  /* margin-left: 10px; */
+  /* margin-top: 10px;
   margin-left: 17px;
-  margin-right: 10px;
+  margin-right: 10px; */
 }
 
 .wrap-top-left-top {
@@ -598,15 +620,21 @@ body {
   background-image: url("../../../images/Quantitative/底.png");
   background-size: 100% 100%;
   background-repeat: no-repeat;
-  margin: 0 1%;
+  max-height: 100%;
+  max-width: 100%;
+  /* margin: 0 1%; */
+  /* margin-left: 10px; */
+  /* margin-left: 10px; */
   display: flex;
   flex-wrap: wrap;
-  margin-top: 10px;
+  /* margin-top: 10px; */
 }
 
 .wrap-top-left-top-item {
   width: 30%;
   height: 40px;
+ max-width:30%;
+  max-height: 40px;
   display: inline-block;
   border: #0f4d75 1px solid;
   margin-left: 2.5%;
@@ -617,6 +645,7 @@ body {
 .wrap-top-left-top-item-left {
   width: 86px;
   margin-left: 8px;
+  
   height: 100%;
   font-size: 14px;
   text-align: start;
@@ -799,12 +828,19 @@ table tr td {
 
 .wrap-footer {
   width: 100%;
-  height: 67vh;
+  /* height: calc(100vh-159.84px); */
+  /* height: 90%; */
+  height: 65vh;
+  /* height: calc(77vh-94px); */
+  /* background-color: pink; */
+  /* height: 100vh; */
+  /* background-color: palegoldenrod; */
   /* background-color: pink; */
   display: flex;
+  margin: 10px;
   flex-direction: row;
-  padding-top: 20px;
-  padding-bottom: 10px;
+  /* padding-top: 20px;
+  padding-bottom: 10px; */
 }
 
 .wrap-footer-left {
@@ -815,30 +851,32 @@ table tr td {
 
 .wrap-footer-center {
   flex: 1;
-  height: 64vh;
+  height: 100%;
   width: 100%;
+  max-width: 100%;
+  max-height: 100%;
   /* width: 1100px; */
   background-image: url("../../../images/Quantitative/底 拷贝 7.png");
   background-size: 100% 100%;
   background-repeat: no-repeat;
-  margin-top: 10px;
-  margin-left: 20px;
+  /* margin-top: 10px; */
+  /* margin-left: 20px; */
   /* padding-right: 40px; */
-  margin-bottom: 10px;
+  /* margin-bottom: 10px; */
 }
 
 .wrap-footer-right {
-  flex: 2;
-  height: 63vh;
+  width: 99%;
+
+  /* flex: 2; */
+  
+  height: 100%;
   display: flex;
   flex-wrap: wrap;
   /* background-image: url("../../../images/底-装备值班.png"); */
   background-size: 100% 100%;
   background-repeat: no-repeat;
-  margin-top: 10px;
   margin-left: 10px;
-  margin-right: 10px;
-  margin-bottom: 10px;
 }
 .wrap-footer-left-top {
   width: 96%;

src/views/combatduty/RateOfTen/index.vue

@@ -16,7 +16,7 @@
           <div class="wrap-box-top-box1-center-top">
             <div
               id="wrap-box-top-box1-center-top-box1"
-              class="wrap-box-top-box1-center-top-box1"
+              class="wrap-box-top-box1-center-top-box1 manbian"
             ></div>
             <div
               id="wrap-box-top-box1-center-top-box2"
@@ -1610,29 +1610,24 @@ body {
   /* margin: auto; */
 }
 .wrap-box-top-box1 {
-  width: 48%;
+  width: 50%;
   height: 100%;
-  /* position: absolute; */
-  /* top: 10px;
-  left: 0px; */
   background-image: url("../../../images/五率底.png");
-  /* margin: 3px 1.5%; */
   border-radius: 12px;
   background-size: 100% 100%;
-
-  /*margin-top: 3px;*/
   background-repeat: no-repeat;
 }
 .wrap-box-top-box2 {
   /* position: absolute; */
   /* top: 10px; */
   /* right: 10px; */
-  width: 48%;
+  width: 48.5%;
   height: 100%;
   /* background: #002843; */
   border-radius: 12px;
   background-image: url("../../../images/五率底.png");
-  margin: 3px 1.5%;
+  /* margin: 3px 1.5%; */
+  margin-left: 10px;
   background-size: 100% 100%;
   /*margin-top: 10px;*/
   background-repeat: no-repeat;
@@ -1687,32 +1682,31 @@ body {
   flex: 1;
   height: 180px;
 }
+/* .manbian{
+  top: 20px;
+  left: 30px;
+} */
 .wrap-box-top {
   display: flex;
   flex-flow: flex-flow;
-  margin-left: 20px;
+  /* margin-left: 20px; */
   /* margin-bottom: 10px; */
+  margin: 10px;
   width: 100%;
   height: 45vh;
 }
 .wrap-box-botom {
-  width: 97%;
-  height: 43vh;
+  width: 99%;
+  height: 44vh;
   background-image: url("../../../images/六量底.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
-  margin-bottom: 10px;
-  margin-left: 25px;
-  bottom: 10px;
-  margin-top: 15px;
+  margin: 10px;
 }
 
 .wrap-box-botom-header {
   width: 100%;
   height: 35px;
-  /* background-image: url("./img/dtitle.png");
-            background-repeat: no-repeat;
-            background-size: 100% 100%; */
   position: relative;
   margin-bottom: 10px;
 }
@@ -1739,17 +1733,21 @@ body {
 }
 
 .wrap-box-botom-list-item {
-  width: 30%;
-  height: 45%;
+  width: 32.5%;
+  height: 46%;
   background-color: #002843;
-  margin: 5px 1.5%;
+  /* margin: 5px 1.5%; */
+  margin-left: 10px;
   display: inline-block;
 }
 .wrap-box-botom-list-item1 {
-  width: 30%;
-  height: 32%;
+  margin: 10px 0px;
+  width: 32.5%;
+  height: 34%;
   background-color: #002843;
-  margin: 0 1.5%;
+  /* margin: 0 1.5%; */
+  /* margin:10px; */
+  margin-left: 10px;
   display: inline-block;
 }
 

src/views/doormanManage/bdglVisit/index.vue

@@ -22,7 +22,6 @@
         <el-input
         class="daofang"
           v-model="queryParams.name"
-          placeholder="请输入到访人员姓名"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -145,7 +144,7 @@
           <!-- <el-input v-model="form.peopleId" placeholder="请输入接待人" /> -->
           <el-select
                 v-model="form.peopleName"
-                placeholder="请选择接待人"
+                
                 
                 ref="peoplenames"
               >
@@ -160,28 +159,28 @@
               </el-select>
         </el-form-item>
         <el-form-item label="到访人员姓名" prop="name">
-          <el-input v-model="form.name" placeholder="请输入到访人员姓名" />
+          <el-input v-model="form.name" />
         </el-form-item>
         <el-form-item label="到访时间" prop="arriveTime" style="margin-left:20px">
           <el-date-picker clearable size="small"
             v-model="form.arriveTime"
             type="datetime"
-            placeholder="选择到访时间">
+            >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="离队时间" prop="endTime">
           <el-date-picker clearable size="small"
             v-model="form.endTime"
             type="datetime"
-            placeholder="选择离队时间">
+            >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="到访车牌号" prop="numberPlate">
-          <el-input v-model="form.numberPlate" placeholder="请输入到访车牌号" />
+          <el-input v-model="form.numberPlate" />
         </el-form-item>
         <div class="jiben" style="margin-left:20px">来访原因</div>
         <el-form-item  prop="contents" class="daofang" style="margin-left:20px" >
-          <el-input v-model="form.contents" type="textarea" placeholder="请输入内容"  />
+          <el-input v-model="form.contents" type="textarea"  />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

src/views/regulations/fileinfo/index.vue

@@ -906,7 +906,7 @@ export default {
       console.log(row.parentId);
       // console.log(ids);
       this.$modal
-        .confirm("是否确认删除？")
+        .confirm("是否确认删除该文件？")
         .then(function () {
           return delDirectoryinfo(ids);
         })
@@ -1009,6 +1009,9 @@ export default {
 </script>
 
 <style scoped>
+::v-deep .el-table__row .el-table__cell{
+  text-align: center !important;
+}
 .jichu {
   color: white;
   width: 100%;
@@ -1023,9 +1026,9 @@ export default {
   background: #00365f;
   width: calc(100% - 695px);
   position: absolute;
-  left: 20px;
-  top: 20px;
-  bottom: 20px;
+  left: 10px;
+  top: 10px;
+  bottom: 10px;
 }
 /* 弹性布局 */
 .flexlayout {
@@ -1058,23 +1061,24 @@ export default {
 /* 排行 */
 .Ranking {
   width: 100%;
-  height: 48.6%;
+  height: 48.8%;
   right: 12%;
   top: 45%;
   background-color: #00365f;
   margin-top: 10px;
-  margin-bottom: 20px;
+  /* margin-bottom: 20px; */
 }
 /* 右边栏样式 */
 .rights {
   /* height: 100vh; */
   /* height: 85vh; */
-  width: 632px;
+  width: 665px;
   float: right;
   position: absolute;
-  top: 20px;
-  right: 20px;
-  bottom: 20px;
+  top: 10px;
+  right: 10px;
+  bottom: 10px;
+  margin-left: 10px;
 }
 
 /* 阅读 */
@@ -1388,16 +1392,22 @@ body,
 ::v-deep .el-pagination {
   margin-top: 10px;
   position: absolute;
-  right: 0;
+  right: 5px;
 }
 ::v-deep .el-pager li.active {
-  background-color: white;
-  color: black;
+  background-color: #1D96FF;
+  color: white;
 }
 ::v-deep .el-pager .number {
-  background-color: transparent;
+  background-color: #196299;
   color: white;
 }
+::v-deep .el-pagination .el-select .el-input .el-input__inner{
+  background-color: #196299 !important ;
+}
+::v-deep .el-pagination__editor.el-input .el-input__inner{
+  background-color: #196299 !important ;
+}
 ::v-deep .btn-prev {
   background-color: transparent;
   color: white;

src/views/workingArrangements/planTask/index.vue

@@ -228,7 +228,6 @@
           <el-input
             label="计划名称"
             v-model="form.name"
-            placeholder="请输入计划名称"
             @click.native="planName"
           />
         </el-form-item>
@@ -241,39 +240,14 @@
           >
           </el-input>
         </el-form-item>
-        <el-form-item label="发布单位" prop="adminId">
-          <treeselect
-            v-model="form.adminId"
-            :options="part"
-            placeholder="选择单位"
-            @select="selectPeo"
-            class="threeselects"
-          />
-        </el-form-item>
-        <el-form-item label="执行单位" prop="unitId">
-          <treeselect
-            v-model="form.unitId"
-            :options="users"
-            placeholder="请选择执行单位"
-            class="threeselects"
-            @select="selectPeo1"
-          />
-        </el-form-item>
         <el-form-item label="计划类型" prop="type" class="change_plan_type">
           <el-select
             v-model="form.type"
-            placeholder="请选择计划类型"
+            
             ref="dict"
             clearable
             size="small"
           >
-            <!-- <el-option
-              v-for="dict in dict.type.plan_type"
-              :key="dict"
-              :label="dict.dictLabel"
-              :value="dict.dictLabel"
-              @click.native="chooseplan"
-            /> -->
             <el-option
             v-for="(item, i) in ziDian"
             :key="i"
@@ -283,13 +257,30 @@
           </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="发布单位" prop="adminId">
+          <treeselect
+            v-model="form.adminId"
+            :options="part"
+            @select="selectPeo"
+            class="threeselects"
+          />
+        </el-form-item>
+        <el-form-item label="执行单位" prop="unitId">
+          <treeselect
+            v-model="form.unitId"
+            :options="users"
+            
+            class="threeselects"
+            @select="selectPeo1"
+          />
+        </el-form-item>
         <div>
           <el-form-item label="执行人" prop="peopleName" label-width="100px">
             <div>
               <el-select
                 multiple
                 v-model="form.peopleName"
-                placeholder="请选择执行人"
+                
                 id="execute"
                 ref="peoplenames"
               >
@@ -312,7 +303,7 @@
             v-model="form.startTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="选择计划开始时间"
+           
           >
           </el-date-picker>
         </el-form-item>
@@ -323,7 +314,7 @@
             v-model="form.endTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="选择计划结束时间"
+            
             style="width: 200px"
           >
           </el-date-picker>
@@ -847,7 +838,7 @@ export default {
     // 发布单位选中触发
     selectPeo(val) {
       this.form.adminId = val.id;
-      this.getZhuChi(this.form.adminId);
+      // this.getZhuChi(this.form.adminId);
     },
     // 发布单位选中触发
     selectPeo3(val) {
@@ -1148,7 +1139,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除工作计划编号为"' + ids + '"的数据项？')
+        .confirm('是否确认删除？')
         .then(function () {
           return delPlanTask(ids);
         })
@@ -1482,4 +1473,6 @@ export default {
 .el-form-item__content{
   border-bottom: none !important;
 }
+/* 去除默认字体 */
+/* .el-select .el-input__inner */
 </style>

src/views/workingArrangements/workTask/index.vue

@@ -256,7 +256,6 @@
         <el-form-item label="任务名称" prop="name">
           <el-input
             v-model="form.name"
-            placeholder="请输入任务名称"
             @click.native="planName"
           />
         </el-form-item>
@@ -268,12 +267,27 @@
             class="ipt"
           >
           </el-input>
+        </el-form-item>
+         <el-form-item label="任务类型" prop="type">
+          <el-select
+            v-model="form.type"
+            style="width: 200px"
+            clearable
+            size="small"
+          >
+            <el-option
+            v-for="(item, i) in ziDian"
+            :key="i"
+            :label="item.dictLabel"
+            :value="parseInt(item.dictSort)"
+          >
+          </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="发布单位" prop="adminId">
           <treeselect
             v-model="form.adminId"
             :options="part"
-            placeholder="选择单位"
             @select="selectPeo"
             class="threeselects"
           />
@@ -282,56 +296,16 @@
           <treeselect
             v-model="form.unitId"
             :options="users"
-            placeholder="请选择执行单位"
             class="threeselects"
             @select="selectPeo1"
           />
         </el-form-item>
-        <el-form-item label="任务类型" prop="type">
-          <el-select
-            v-model="form.type"
-            placeholder="请选择任务类型"
-            style="width: 200px"
-            clearable
-            size="small"
-          >
-            <!-- <el-option
-              v-for="dict in dict.type.work_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-              @click.native="chooseplan"
-            /> -->
-             <!-- <el-select
-            v-model="form.type"
-            placeholder="请选择计划类型"
-            ref="dict"
-            clearable
-            size="small"
-          > -->
-            <!-- <el-option
-              v-for="dict in dict.type.plan_type"
-              :key="dict"
-              :label="dict.dictLabel"
-              :value="dict.dictLabel"
-              @click.native="chooseplan"
-            /> -->
-            <el-option
-            v-for="(item, i) in ziDian"
-            :key="i"
-            :label="item.dictLabel"
-            :value="parseInt(item.dictSort)"
-          >
-          </el-option>
-          </el-select>
-        </el-form-item>
         <div>
           <el-form-item label="执行人" prop="peopleName" label-width="100px">
             <div>
               <el-select
                 multiple
                 v-model="form.peopleName"
-                placeholder="请选择执行人"
                 id="execute"
                 ref="peoplenames"
               >
@@ -354,7 +328,6 @@
             v-model="form.startTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="请选择任务开始时间"
             style="width: 200px"
           >
           </el-date-picker>
@@ -366,7 +339,6 @@
             v-model="form.endTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="请选择任务结束时间"
           >
           </el-date-picker>
         </el-form-item>
@@ -909,7 +881,7 @@ export default {
     // 发布单位选中触发
     selectPeo(val) {
       this.form.adminId = val.id;
-      this.getZhuChi(this.form.adminId);
+      // this.getZhuChi(this.form.adminId);
     },
     // 执行单位选中触发
     selectPeo1(val) {
@@ -1092,7 +1064,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除工作任务编号为"' + ids + '"的数据项？')
+        .confirm('是否确认删除？')
         .then(function () {
           return delWorkTask(ids);
         })