调试集中文印，工作安排，战备值班表单

src/assets/styles/global.css

@@ -972,3 +972,33 @@ margin-right: 34px;
 ::v-deep .el-table .el-table__body .el-table__row.hover-row td {
   background-color: #004d86;
 }
+/* 调整输入框提示文字颜色 */
+.vue-treeselect__placeholder {
+  color: #bdbdbd4f !important;
+}
+ input::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+ input:-moz-placeholder {
+  color: #bdbdbd4f !important;
+}
+.jinduchakan .el-table__body-wrapper .el-table__empty-block{
+  border-bottom: 2px solid white !important;
+  border-left: 2px solid white !important;
+  border-right: 2px solid white !important;
+}
+/* 文本域提示文字颜色 */
+ ::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+/* 右侧上浮框 */
+.el-table .el-table__body .el-table__row.hover-row td {
+   background-color: #004d86;
+  }
+  /* .el-table__fixed-right {
+    height: 100% !important;
+  } */
+  /* 浮层底线 */
+  .el-table__fixed::before, .el-table__fixed-right::before {
+   background-color: transparent !important;
+  }

src/views/PrintsLog/printlog/index.vue

@@ -221,7 +221,7 @@
     />
 
     <!-- 添加或修改集中文印记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1030px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1030px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :inline="true" :rules="rules" label-width="120px">
         <!-- <el-form-item label="打印id" prop="printId">
           <el-input v-model="form.printId" placeholder="请输入打印id" />
@@ -594,7 +594,7 @@ export default {
 .el-form-item ::v-deep .el-input__inner {
   width: 200px;
   height: 36px;
-  background: #004d86;
+  background: transparent;
   color: #fff;
   border: 1px solid #fff !important;
 }
@@ -735,4 +735,18 @@ export default {
   color: #00365f !important;
   /* background-color: #003156 !important; */
 }
+/* 调整输入框提示文字颜色 */
+::v-deep .vue-treeselect__placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input:-moz-placeholder {
+  color: #bdbdbd4f !important;
+}
+/* 文本域提示文字颜色 */
+::v-deep ::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>

src/views/PrintsManage/manage/index.vue

@@ -270,7 +270,7 @@
     />
 
     <!-- 添加或修改集中文印主对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1030px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1030px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :inline="true" :rules="rules" label-width="120px">
         <div class="jiben">发送人信息</div>
         <el-form-item label="发送人" prop="sendName">
@@ -398,6 +398,7 @@
       append-to-body
       width="700px"
       style="padding-top:100px;"
+      :close-on-click-modal="false"
     >
       <el-form ref="dyform" :model="dyform" :inline="true" :rules="rules" label-width="120px">
         <div class="jiben jiben2">打印信息</div>
@@ -870,7 +871,7 @@ export default {
 .el-form-item ::v-deep .el-input__inner {
   width: 200px;
   height: 36px;
-  background: #004d86;
+  background: transparent;
   color: #fff;
   border: 1px solid #fff !important;
 }
@@ -1026,4 +1027,21 @@ export default {
 /* ::v-deep .el-radio:last-child {
   margin-left: 35px;
 } */
+/* 调整输入框提示文字颜色 */
+::v-deep .vue-treeselect__placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input:-moz-placeholder {
+  color: #bdbdbd4f !important;
+}
+/* 文本域提示文字颜色 */
+::v-deep ::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep .el-dialog__footer {
+    padding-right: 30px !important;
+}
 </style>

src/views/combatduty/RateOfTen/index.vue

@@ -81,7 +81,10 @@
     <div class="wrap-box-botom" v-loading="loading3">
       <div class="wrap-box-top-box1-header" id="wrap-box-top-box1-header">
         <span style="margin-left: 55px">六量</span>
-        <a class="btn btn-xs btn-info btn-view btn-dialog" style="margin-right:-48px" @click="editor3"
+        <a
+          class="btn btn-xs btn-info btn-view btn-dialog"
+          style="margin-right: -48px"
+          @click="editor3"
           ><img src="/static/icon-img/编辑.png" alt="" />编辑</a
         >
       </div>
@@ -102,21 +105,38 @@
 
           <ul class="wrap-box-botom-list-item-ul" id="ul-id">
             <li>
-              <img src="../../../images/renoften/油料.png" style="margin-left:21px"  alt="" />
-              <div class="wrap-box-botom-list-item-ul-left" style="margin-left:16px">油料战术储备</div>
+              <img
+                src="../../../images/renoften/油料.png"
+                style="margin-left: 21px"
+                alt=""
+              />
+              <div
+                class="wrap-box-botom-list-item-ul-left"
+                style="margin-left: 16px"
+              >
+                油料战术储备
+              </div>
               <div class="wrap-box-botom-list-item-ul-right">
                 {{ this.sixnum.ylZscb }}
               </div>
             </li>
             <li>
-              <img src="../../../images/renoften/阈值.png" style="margin-left:19px" alt="" />
+              <img
+                src="../../../images/renoften/阈值.png"
+                style="margin-left: 19px"
+                alt=""
+              />
               <div class="wrap-box-botom-list-item-ul-left">储备阈值</div>
               <div class="wrap-box-botom-list-item-ul-right">
                 {{ this.sixnum.ylCxyz }}
               </div>
             </li>
             <li>
-              <img src="../../../images/renoften/自持能力.png" style="margin-left:21px" alt="" />
+              <img
+                src="../../../images/renoften/自持能力.png"
+                style="margin-left: 21px"
+                alt=""
+              />
               <div class="wrap-box-botom-list-item-ul-left">自持能力</div>
               <div class="wrap-box-botom-list-item-ul-right">
                 {{ this.sixnum.ylZcnl }}
@@ -140,21 +160,33 @@
 
           <ul class="wrap-box-botom-list-item-ul" id="ul-id">
             <li>
-              <img src="../../../images/renoften/军需物资.png" style="margin-left:21px" alt="" />
+              <img
+                src="../../../images/renoften/军需物资.png"
+                style="margin-left: 21px"
+                alt=""
+              />
               <div class="wrap-box-botom-list-item-ul-left">军需战术储备</div>
               <div class="wrap-box-botom-list-item-ul-right">
                 {{ this.sixnum.jxZscb }}
               </div>
             </li>
             <li>
-              <img src="../../../images/renoften/阈值.png" alt="" style="margin-left:19px" />
+              <img
+                src="../../../images/renoften/阈值.png"
+                alt=""
+                style="margin-left: 19px"
+              />
               <div class="wrap-box-botom-list-item-ul-left">储备阈值</div>
               <div class="wrap-box-botom-list-item-ul-right">
                 {{ this.sixnum.jxCxyz }}
               </div>
             </li>
             <li>
-              <img src="../../../images/renoften/自持能力.png" alt="" style="margin-left:21px" />
+              <img
+                src="../../../images/renoften/自持能力.png"
+                alt=""
+                style="margin-left: 21px"
+              />
               <div class="wrap-box-botom-list-item-ul-left">自持能力</div>
               <div class="wrap-box-botom-list-item-ul-right">
                 {{ this.sixnum.jxZcnl }}
@@ -177,7 +209,11 @@
           </div>
           <ul class="wrap-box-botom-list-item-ul" id="ul-id">
             <li>
-              <img src="../../../images/renoften/战备金.png" alt=""  style="margin-left:21px"  />
+              <img
+                src="../../../images/renoften/战备金.png"
+                alt=""
+                style="margin-left: 21px"
+              />
               <div class="wrap-box-botom-list-item-ul-left">战备金战术存储</div>
               <div class="wrap-box-botom-list-item-ul-right">
                 {{ this.sixnum.zbjZscb }}
@@ -200,7 +236,11 @@
           </div>
           <ul class="wrap-box-botom-list-item-ul" id="ul-id">
             <li>
-              <img src="../../../images/renoften/卫生物资.png" alt="" style="margin-left:21px" />
+              <img
+                src="../../../images/renoften/卫生物资.png"
+                alt=""
+                style="margin-left: 21px"
+              />
               <div class="wrap-box-botom-list-item-ul-left">
                 卫生物资战术储备
               </div>
@@ -209,7 +249,11 @@
               </div>
             </li>
             <li>
-              <img src="../../../images/renoften/阈值.png" alt="" style="margin-left:21px" />
+              <img
+                src="../../../images/renoften/阈值.png"
+                alt=""
+                style="margin-left: 21px"
+              />
               <div class="wrap-box-botom-list-item-ul-left">储备阈值</div>
               <div class="wrap-box-botom-list-item-ul-right">
                 {{ this.sixnum.wswzCxyz }}
@@ -233,7 +277,11 @@
 
           <ul class="wrap-box-botom-list-item-ul" id="ul-id">
             <li>
-              <img src="../../../images/renoften/弹药.png" alt="" style="margin-left:21px"/>
+              <img
+                src="../../../images/renoften/弹药.png"
+                alt=""
+                style="margin-left: 21px"
+              />
               <div class="wrap-box-botom-list-item-ul-left">弹药储存量</div>
               <div class="wrap-box-botom-list-item-ul-right">
                 {{ this.sixnum.dyCcl }}
@@ -257,7 +305,11 @@
 
           <ul class="wrap-box-botom-list-item-ul" id="ul-id">
             <li>
-              <img src="../../../images/renoften/维修.png" alt="" style="margin-left:21px" />
+              <img
+                src="../../../images/renoften/维修.png"
+                alt=""
+                style="margin-left: 21px"
+              />
               <div class="wrap-box-botom-list-item-ul-left">维修器材储存量</div>
               <div class="wrap-box-botom-list-item-ul-right">
                 {{ this.sixnum.wxCcl }}
@@ -269,13 +321,15 @@
     </div>
     <div class="bottomsss"></div>
     <!-- 编辑人员五率弹框 -->
-    <el-dialog
+    <div class="box1">
+      <el-dialog
       style="color: white"
       title="编辑人员五率"
       :visible.sync="open"
       width="450px"
       append-to-body
       class="el-dialog__header bianzhi"
+      :close-on-click-modal="false"
     >
       <el-form
         ref="form"
@@ -285,22 +339,38 @@
         :inline="true"
       >
         <el-form-item label="编制人数" prop="bzrs">
-           <el-input  v-model="form.bzrs" class="BIANJI"></el-input>
+          <el-input v-model="form.bzrs" class="BIANJI"></el-input>
         </el-form-item>
         <el-form-item label="实际人数" prop="sjrs">
-          <el-input  v-model="form.sjrs" class="BIANJI" :disabled="true"></el-input>
+          <el-input
+            v-model="form.sjrs"
+            class="BIANJI"
+            :disabled="true"
+          ></el-input>
           <!-- <div class="thistexts">{{ this.form.sjrs }}</div> -->
         </el-form-item>
         <el-form-item label="在位人数" prop="zwrs">
-           <el-input  v-model="form.zwrs" class="BIANJI" :disabled="true"></el-input>
+          <el-input
+            v-model="form.zwrs"
+            class="BIANJI"
+            :disabled="true"
+          ></el-input>
           <!-- <div class="thistexts">{{ this.form.zwrs }}</div> -->
         </el-form-item>
         <el-form-item label="对口人数" prop="dkrs">
-          <el-input  v-model="form.dkrs" class="BIANJI" :disabled="true"></el-input>
+          <el-input
+            v-model="form.dkrs"
+            class="BIANJI"
+            :disabled="true"
+          ></el-input>
           <!-- <div class="thistexts">{{ this.form.dkrs }}</div> -->
         </el-form-item>
         <el-form-item label="出动人数" prop="cdrs">
-          <el-input  v-model="form.cdrs" class="BIANJI" :disabled="true"></el-input>
+          <el-input
+            v-model="form.cdrs"
+            class="BIANJI"
+            :disabled="true"
+          ></el-input>
           <!-- <div class="thistexts">{{ this.form.cdrs }}</div> -->
         </el-form-item>
       </el-form>
@@ -309,14 +379,18 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    </div>
+    
     <!--编辑 装备五率的弹框 -->
-    <el-dialog
+    <div class="box2">
+      <el-dialog
       style="color: white"
       title="编辑装备五率"
       :visible.sync="open1"
       width="930px"
       append-to-body
       class="el-dialog__header"
+      :close-on-click-modal="false"
     >
       <el-form
         ref="form1"
@@ -332,7 +406,7 @@
             :min="0"
             :max="100"
           ></el-input-number> -->
-           <el-input  v-model="form1.zbbz" class="BIANJI"></el-input>
+          <el-input v-model="form1.zbbz" class="BIANJI"></el-input>
         </el-form-item>
         <el-form-item prop="zbsy" label="装备实有数">
           <!-- <el-input-number
@@ -341,10 +415,14 @@
             :min="0"
             :max="100"
           ></el-input-number> -->
-           <el-input  v-model="form1.zbsy" class="BIANJI"></el-input>
+          <el-input v-model="form1.zbsy" class="BIANJI"></el-input>
         </el-form-item>
         <el-form-item prop="zbky" label="装备可用数">
-          <el-input  v-model="form1.zbky" class="BIANJI" :disabled="true"></el-input>
+          <el-input
+            v-model="form1.zbky"
+            class="BIANJI"
+            :disabled="true"
+          ></el-input>
           <!-- <div class="thistexts">{{ this.form1.zbky }}</div> -->
         </el-form-item>
         <el-form-item prop="name" label="实际配套数">
@@ -354,7 +432,7 @@
             :min="0"
             :max="100"
           ></el-input-number> -->
-          <el-input  v-model="form1.sjpt" class="BIANJI"></el-input>
+          <el-input v-model="form1.sjpt" class="BIANJI"></el-input>
         </el-form-item>
         <el-form-item prop="name" label="编制配套数">
           <!-- <el-input-number
@@ -363,7 +441,7 @@
             :min="0"
             :max="100"
           ></el-input-number> -->
-          <el-input  v-model="form1.bzpt" class="BIANJI"></el-input>
+          <el-input v-model="form1.bzpt" class="BIANJI"></el-input>
         </el-form-item>
         <el-form-item prop="name" label="装备出动数">
           <!-- <el-input-number
@@ -372,18 +450,23 @@
             :min="0"
             :max="100"
           ></el-input-number> -->
-          <el-input  v-model="form1.zbcd" class="BIANJI"></el-input>
+          <el-input v-model="form1.zbcd" class="BIANJI"></el-input>
         </el-form-item>
-        <el-form-item prop="name" class="dadao" label="达到装备储存标准配套数" label-width="170px">
+        <el-form-item
+          prop="name"
+          class="dadao"
+          label="达到装备储存标准配套数"
+          label-width="170px"
+        >
           <!-- <el-input-number
             v-model="form1.cczb"
             controls-position="right"
             :min="0"
             :max="100"
           ></el-input-number> -->
-           <el-input  v-model="form1.cczb" class="BIANJIs"></el-input>
+          <el-input v-model="form1.cczb" class="BIANJIs"></el-input>
         </el-form-item>
-        
+
         <div></div>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -391,14 +474,18 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    </div>
+    
     <!-- 编辑六量弹框 -->
-    <el-dialog
+    <div class="box3">
+      <el-dialog
       style="color: white"
       title="编辑六量"
       :visible.sync="open2"
       width="830px"
       append-to-body
       class="el-dialog__header bianjiliuliang"
+      :close-on-click-modal="false"
     >
       <el-form
         ref="form2"
@@ -438,27 +525,47 @@
           </el-form-item>
         </el-form-item>
         <el-form-item prop="jxZscb">
-          <el-form-item label="军需物资战术储备" label-width="130px" style="margin-left:-30px">
+          <el-form-item
+            label="军需物资战术储备"
+            label-width="130px"
+            style="margin-left: -30px"
+          >
             <el-input v-model="form2.jxZscb" class="BIANJIss"></el-input>
           </el-form-item>
-        </el-form-item> 
+        </el-form-item>
         <el-form-item prop="zbjZscb">
-          <el-form-item label="战备金战术存储" label-width="130px" style="margin-left:-30px">
+          <el-form-item
+            label="战备金战术存储"
+            label-width="130px"
+            style="margin-left: -30px"
+          >
             <el-input v-model="form2.zbjZscb" class="BIANJIss"></el-input>
           </el-form-item>
         </el-form-item>
         <el-form-item prop="wswzZscb">
-          <el-form-item label="卫生物资战术储备" label-width="130px" style="margin-left:-30px">
+          <el-form-item
+            label="卫生物资战术储备"
+            label-width="130px"
+            style="margin-left: -30px"
+          >
             <el-input v-model="form2.wswzZscb" class="BIANJIss"></el-input>
           </el-form-item>
         </el-form-item>
         <el-form-item prop="wswzCxyz">
-          <el-form-item label="卫生物资储备阈值" label-width="130px" style="margin-left:-30px">
+          <el-form-item
+            label="卫生物资储备阈值"
+            label-width="130px"
+            style="margin-left: -30px"
+          >
             <el-input v-model="form2.wswzCxyz" class="BIANJIss"></el-input>
           </el-form-item>
         </el-form-item>
         <el-form-item prop="wxCcl">
-          <el-form-item label="维修器材储存量" label-width="130px" style="margin-left:-30px">
+          <el-form-item
+            label="维修器材储存量"
+            label-width="130px"
+            style="margin-left: -30px"
+          >
             <el-input v-model="form2.wxCcl" class="BIANJIss"></el-input>
           </el-form-item>
         </el-form-item>
@@ -468,6 +575,8 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    </div>
+    
   </div>
 </template>
 <script>
@@ -483,7 +592,7 @@ import {
   getzbky,
   // 获取装备五率接口
   addzbwl,
-  getliulian
+  getliulian,
 } from "@/api/combatduty/ReteOfTen";
 export default {
   data() {
@@ -500,13 +609,27 @@ export default {
       form2: {},
       // 表单校验
       rules: {
-        bzrs:[ { required: true,message:"编制人数不能为空", trigger: 'blur' }],
-        zbbz:[ { required: true,message:"装备编制不能为空",  trigger: 'blur' }],
-        zbsy:[ { required: true,message:"装备实有不能为空",  trigger: 'blur' }],
-        sjpt:[ { required: true,message:"实际配套不能为空",  trigger: 'blur' }],
-        bzpt:[{ required: true,message:"编制配套不能为空", trigger: 'blur' }],
-        zbcd:[{ required: true,message:"战术储备不能为空", trigger: 'blur' }],
-        cczb:[{ required: true,message:"存储标准不能为空", trigger: 'blur' }]
+        bzrs: [
+          { required: true, message: "编制人数不能为空", trigger: "blur" },
+        ],
+        zbbz: [
+          { required: true, message: "装备编制不能为空", trigger: "blur" },
+        ],
+        zbsy: [
+          { required: true, message: "装备实有不能为空", trigger: "blur" },
+        ],
+        sjpt: [
+          { required: true, message: "实际配套不能为空", trigger: "blur" },
+        ],
+        bzpt: [
+          { required: true, message: "编制配套不能为空", trigger: "blur" },
+        ],
+        zbcd: [
+          { required: true, message: "战术储备不能为空", trigger: "blur" },
+        ],
+        cczb: [
+          { required: true, message: "存储标准不能为空", trigger: "blur" },
+        ],
       },
       zaiweirenshu: 0,
       chudongrenshu: 0,
@@ -520,8 +643,8 @@ export default {
       loading2: false,
       // 六量加载
       loading3: false,
-      zhuangbei:[],
-      zbky:""
+      zhuangbei: [],
+      zbky: "",
     };
   },
   mounted() {
@@ -535,30 +658,30 @@ export default {
     this.getZbwl();
   },
   created() {
-    this.getLiuliang()
-    getzbky().then(res=>{
-      this.zbky=res.msg
-      console.log(this.zbky)
-    })
+    this.getLiuliang();
+    getzbky().then((res) => {
+      this.zbky = res.msg;
+      console.log(this.zbky);
+    });
   },
   methods: {
     getZbwl() {
       getzbwl().then((res) => {
         this.loading2 = true;
-        this.form1={}
+        this.form1 = {};
         this.zhuangbei = res.rows[0];
-        console.log(this.zhuangbei)
+        console.log(this.zhuangbei);
         this.myEcharts();
         this.loading2 = false;
       });
     },
-    getLiuliang(){
+    getLiuliang() {
       this.loading3 = true;
       getliuliang().then((res) => {
-      this.form2={}
-      this.sixnum = res.rows[0];
-      this.loading3 = false;
-    });
+        this.form2 = {};
+        this.sixnum = res.rows[0];
+        this.loading3 = false;
+      });
     },
     // 编辑人员五率
     editor1() {
@@ -567,19 +690,19 @@ export default {
     // 编辑装备五率
     editor2() {
       this.open1 = true;
-      this.form1.zbky=this.zbky
-      this.form1=this.zhuangbei
-      console.log(this.form1)
-      addzbwl().then(res=>{
-        this.form1=res.rows[0]
-      })
+      this.form1.zbky = this.zbky;
+      this.form1 = this.zhuangbei;
+      console.log(this.form1);
+      addzbwl().then((res) => {
+        this.form1 = res.rows[0];
+      });
     },
     editor3() {
       this.open2 = true;
-      this.form2=this.sixnum
-      getliulian().then(res=>{
-        this.form2=res.rows[0]
-      })
+      this.form2 = this.sixnum;
+      getliulian().then((res) => {
+        this.form2 = res.rows[0];
+      });
     },
     // 编辑人员五率确定
     submitForm() {
@@ -679,11 +802,11 @@ export default {
           name: "实际人数",
         },
         {
-          value:this.form.sjrs,
+          value: this.form.sjrs,
         },
       ];
-      data[1].value = this.form.sjrs-data[0].value;
-      let data11=this.form.sjrs
+      data[1].value = this.form.sjrs - data[0].value;
+      let data11 = this.form.sjrs;
       var option = {
         tooltip: {
           trigger: "item",
@@ -692,13 +815,12 @@ export default {
             return (
               "编制人数" +
               "(" +
-            data[0].value  +
+              data[0].value +
               ")" +
               ":" +
               data[0].name +
               "(" +
-              data11
-             +
+              data11 +
               ")"
             );
           },
@@ -767,7 +889,7 @@ export default {
       // 在位率
       var data2 = [
         {
-          value:  _this.form.bzrs,
+          value: _this.form.bzrs,
           name: "在位人数",
         },
         {
@@ -775,8 +897,8 @@ export default {
           name: "未在位人数",
         },
       ];
-      data2[1].value =this.form.bzrs-this.form.zwrs;
-      let data22=this.form.zwrs
+      data2[1].value = this.form.bzrs - this.form.zwrs;
+      let data22 = this.form.zwrs;
 
       var data3 = [
         {
@@ -800,8 +922,8 @@ export default {
           name: "未出动率",
         },
       ];
-      data4[1].value = this.form.bzrs-this.form.cdrs;
-      let data44=this.form.cdrs
+      data4[1].value = this.form.bzrs - this.form.cdrs;
+      let data44 = this.form.cdrs;
       var data5 = [
         {
           value: 5,
@@ -813,7 +935,7 @@ export default {
         },
       ];
       data5[1].value = this.form.zwrs - data5[0].value;
-      let data55=this.form.zwrs
+      let data55 = this.form.zwrs;
       var data6 = [
         {
           value: this.zhuangbei.zbsy,
@@ -913,17 +1035,17 @@ export default {
                 name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
-                 if( _this.form.zwrs==0){
-                  var s=`异常`
-                    return s
-                }else{
-                var n = _this.form.zwrs / _this.form.bzrs;
-                var s =
-                  `{value|${(n * 100).toFixed()}%}` +
-                  "\n" +
-                  "\n" +
-                  `{name|在位率}`;
-                return s;
+                if (_this.form.zwrs == 0) {
+                  var s = `异常`;
+                  return s;
+                } else {
+                  var n = _this.form.zwrs / _this.form.bzrs;
+                  var s =
+                    `{value|${(n * 100).toFixed()}%}` +
+                    "\n" +
+                    "\n" +
+                    `{name|在位率}`;
+                  return s;
                 }
               },
             },
@@ -990,17 +1112,17 @@ export default {
                 name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
-                if( _this.form.sjrs==0){
-                  var s=`异常`
-                    return s
-                }else{
-                var n = _this.form.dkrs / _this.form.sjrs;
-                var s =
-                  `{value|${(n * 100).toFixed()}%}` +
-                  "\n" +
-                  "\n" +
-                  `{name|对口率}`;
-                return s;
+                if (_this.form.sjrs == 0) {
+                  var s = `异常`;
+                  return s;
+                } else {
+                  var n = _this.form.dkrs / _this.form.sjrs;
+                  var s =
+                    `{value|${(n * 100).toFixed()}%}` +
+                    "\n" +
+                    "\n" +
+                    `{name|对口率}`;
+                  return s;
                 }
               },
             },
@@ -1020,7 +1142,7 @@ export default {
             return (
               data4[0].name +
               "(" +
-             data44 +
+              data44 +
               ")" +
               ":" +
               "编制人数" +
@@ -1049,19 +1171,18 @@ export default {
                 name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
-                if(_this.form.cdrs==0){
-                  var s=`异常`
-                    return s
-                }else{
+                if (_this.form.cdrs == 0) {
+                  var s = `异常`;
+                  return s;
+                } else {
                   var n = _this.form.cdrs / _this.form.bzrs;
                   var s =
-                  `{value|${(n * 100).toFixed()}%}` +
-                  "\n" +
-                  "\n" +
-                  `{name|出动率}`;
-                return s;
+                    `{value|${(n * 100).toFixed()}%}` +
+                    "\n" +
+                    "\n" +
+                    `{name|出动率}`;
+                  return s;
                 }
-                
               },
             },
             // itemStyle: {
@@ -1078,17 +1199,14 @@ export default {
           position: ["10%", "50%"],
           formatter: function (params) {
             return (
-              data5[0].name+
+              data5[0].name +
               "(" +
-              data5[0].value
-              +
+              data5[0].value +
               ")" +
               ":" +
-              data2[0].name
-               +
+              data2[0].name +
               "(" +
-              data55 
-             +
+              data55 +
               ")"
             );
           },
@@ -1272,7 +1390,7 @@ export default {
               ":" +
               "编制配套数" +
               "(" +
-              (data8[1].value+data8[0].value) +
+              (data8[1].value + data8[0].value) +
               ")"
             );
           },
@@ -1297,7 +1415,7 @@ export default {
               },
               formatter: function (params) {
                 // var n = data8[0].value / (data8[1].value + data8[0].value);
-                var n=_this.zhuangbei.sjpt/_this.zhuangbei.bzpt
+                var n = _this.zhuangbei.sjpt / _this.zhuangbei.bzpt;
                 var s =
                   `{value|${(n * 100).toFixed()}%}` +
                   "\n" +
@@ -1534,43 +1652,43 @@ export default {
 };
 </script>
 <style scoped>
-.bottomsss{
+.bottomsss {
   position: absolute;
   bottom: 0;
   width: 100%;
   height: 10px;
   background-color: pink;
 }
-::v-deep .el-form--inline .el-form-item{
+::v-deep .el-form--inline .el-form-item {
   margin-right: 19px !important;
 }
-::v-deep .BIANJI .el-input__inner{
+::v-deep .BIANJI .el-input__inner {
   width: 250px;
   text-align: center !important;
   /* text-indent: 4.3em !important; */
 }
-::v-deep .el-input__inner{
+::v-deep .el-input__inner {
   /* width: 250px; */
   text-align: center !important;
   /* text-indent: 4.3em !important; */
 }
-::v-deep .BIANJIs .el-input__inner{
+::v-deep .BIANJIs .el-input__inner {
   width: 670px;
   text-align: center !important;
   /* text-indent: 4.3em !important; */
 }
-::v-deep .BIANJIss .el-input__inner{
+::v-deep .BIANJIss .el-input__inner {
   width: 590px;
   text-align: center !important;
   /* text-indent: 4.3em !important; */
 }
-::v-deep .el-form-item__label{
+::v-deep .el-form-item__label {
   margin-left: 50px !important;
 }
-::v-deep .el-dialog__header{
+::v-deep .el-dialog__header {
   border-bottom: 1px solid white !important;
 }
-::v-deep .bianjiliuliang .el-form-item__label{
+::v-deep .bianjiliuliang .el-form-item__label {
   margin-left: 10px !important;
 }
 html,
@@ -1593,7 +1711,7 @@ body {
   display: flex;
   flex-wrap: wrap;
 } */
-#wrap{
+#wrap {
   position: relative;
 }
 .content {
@@ -1877,7 +1995,16 @@ body {
 ::v-deep .el-form-item__label {
   text-align: end !important;
 }
-::v-deep .dadao .el-form-item__label{
+::v-deep .dadao .el-form-item__label {
   margin-left: -20px !important;
 }
+::v-deep .el-dialog__footer {
+  margin-right: 49px !important;
+}
+ .el-dialog__footer {
+  margin-right: 50px !important;
+}
+::v-deep  .el-dialog__body {
+  padding: 30px 0px 30px 0px !important;
+}
 </style>

src/views/combatduty/basedutyinfo/index.vue

@@ -866,7 +866,7 @@ export default {
 .el-form-item ::v-deep .el-input__inner {
   width: 200px;
   height: 36px;
-  background: #004d86;
+  background: transparent;
   color: #fff !important;
   border: 1px solid #fff !important;
 }
@@ -1058,5 +1058,11 @@ export default {
   border: none !important;
   color: #cccccc;
 }
+::v-deep .el-dialog__body{
+  padding: 30px 0px 0px 40px !important;
+}
+::v-deep .el-dialog__footer{
+  margin-right: 20px !important;
+}
 </style>
 

src/views/combatduty/grassdutyinfo/index.vue

@@ -764,9 +764,14 @@ export default {
 ::v-deep .el-input__inner {
   /* width: 200px !important;
   height: 36px; */
-  background: transparent;
+  background: transparent !important;
   color: #fff;
 }
+::v-deep .el-dialog__body {
+    padding: 30px 0px 30px 46px;}
+  ::v-deep .el-dialog__footer{
+  margin-right: 30px !important;
+}
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
   background: #004d86 !important;

src/views/combatduty/militarydutyinfo/index.vue

@@ -599,8 +599,11 @@ export default {
 ::v-deep .el-input__inner {
   /* width: 200px !important;
   height: 36px; */
-  background: transparent;
+  background: transparent !important;
   color: #fff;
+}
+ ::v-deep .el-dialog__footer{
+  margin-right: 40px !important;
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {

src/views/combatduty/regisdutyinfo/index.vue

@@ -203,7 +203,12 @@
           <span>{{ parseTime(scope.row.attendedTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="装备情况" show-overflow-tooltip align="center" prop="remarks" />
+      <el-table-column
+        label="装备情况"
+        show-overflow-tooltip
+        align="center"
+        prop="remarks"
+      />
       <el-table-column
         label="操作"
         align="center"
@@ -251,9 +256,14 @@
         label-width="80px"
         :inline="true"
       >
-      <div class="jiben">基本信息</div>
+        <div class="jiben">基本信息</div>
         <el-form-item label="单位名称" prop="unitName">
-          <el-select v-model="form.unitName" @change="unitNamechange" clearable placeholder="">
+          <el-select
+            v-model="form.unitName"
+            @change="unitNamechange"
+            clearable
+            placeholder=""
+          >
             <el-option
               v-for="dict in deptOptions"
               :key="dict.deptId"
@@ -289,10 +299,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="装备状态" prop="equipmentStates">
-          <el-select
-            v-model="form.equipmentStates"
-            placeholder=""
-          >
+          <el-select v-model="form.equipmentStates" placeholder="">
             <el-option
               v-for="dict in dict.type.equipment_status"
               :key="dict.value"
@@ -302,10 +309,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="待命位置" prop="standbyPosition">
-          <el-input
-            v-model="form.standbyPosition"
-            placeholder=""
-          />
+          <el-input v-model="form.standbyPosition" placeholder="" />
         </el-form-item>
         <el-form-item label="值班日期" prop="attendedTime">
           <el-date-picker
@@ -320,11 +324,7 @@
         </el-form-item>
         <div class="jiben">装备情况</div>
         <el-form-item label="" prop="remarks">
-          <el-input
-            v-model="form.remarks"
-            type="textarea"
-            placeholder=""
-          />
+          <el-input v-model="form.remarks" type="textarea" placeholder="" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -343,7 +343,7 @@ import {
   addRegisdutyinfo,
   updateRegisdutyinfo,
   exportRegisdutyinfo,
-  getDept
+  getDept,
 } from "@/api/combatduty/regisdutyinfo";
 
 export default {
@@ -400,7 +400,7 @@ export default {
   },
   methods: {
     gettreeselect() {
-      getDept().then(res => {
+      getDept().then((res) => {
         console.log(res);
         if (res.code == 200) {
           this.deptOptions = res.data;
@@ -494,7 +494,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除该数据项？')
+        .confirm("是否确认删除该数据项？")
         .then(function () {
           return delRegisdutyinfo(ids);
         })
@@ -532,9 +532,15 @@ export default {
   background: #004d86 !important;
 }
 ::v-deep .el-textarea__inner {
-  width: 890px;
+  width: 920px;
   height: 124px;
-  margin-left: 29px;
+  /* margin-left: 0px; */
+}
+::v-deep .el-dialog__body {
+  padding: 30px 0px 30px 48px;
+}
+::v-deep .el-dialog__footer {
+  margin-right: 29px !important;
 }
 ::v-deep .el-dialog__header {
   border-bottom: 1px solid #718a9d;
@@ -565,9 +571,10 @@ export default {
 ::v-deep .el-input__inner {
   /* width: 200px !important;
   height: 36px; */
-  background: transparent;
+  background: transparent !important;
   color: #fff;
 }
+
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
   background: #004d86 !important;
@@ -613,10 +620,10 @@ export default {
   border: none !important;
   color: #cccccc;
 }
-.el-radio-group{
+.el-radio-group {
   width: 216px;
 }
-.el-select-dropdown__item{
+.el-select-dropdown__item {
   /* background-color: white; */
   color: #000 !important;
 }

src/views/combatduty/taskdutyinfo/index.vue

@@ -548,10 +548,13 @@ export default {
   background: #004d86 !important;
 }
 ::v-deep .el-textarea__inner {
-  width: 890px;
+  width: 920px;
   height: 124px;
-  margin-left: 29px;
 }
+::v-deep .el-dialog__body {
+    padding: 30px 0px 30px 48px;}
+   ::v-deep  .el-dialog__footer {
+    margin-right: 28px !important;}
 ::v-deep .el-dialog__header {
   border-bottom: 1px solid #718a9d;
 }
@@ -581,7 +584,7 @@ export default {
 ::v-deep .el-input__inner {
   /* width: 200px !important;
   height: 36px; */
-  background: transparent;
+  background: transparent !important;
   color: #fff;
 }
 /* 单位框背景颜色 */

src/views/combatduty/teamdutyinfo/index.vue

@@ -1048,7 +1048,7 @@ export default {
 .el-form-item ::v-deep .el-input__inner {
   width: 200px;
   height: 36px;
-  background: #004d86;
+  background: transparent;
   color: #fff !important;
   border: 1px solid #fff !important;
 }
@@ -1087,9 +1087,14 @@ export default {
   display: none;
 }
 ::v-deep .el-textarea__inner {
-  width: 1070px;
+  width: 1086px;
   height: 104px;
 }
+::v-deep .el-dialog__footer{
+  margin-right: 14px !important;
+}
+::v-deep .el-dialog__body {
+    padding: 30px 0px 30px 31px;}
 .addspan {
   width: 30px;
   height: 30px;

src/views/regulations/fileinfo/index.vue

@@ -362,6 +362,7 @@
           width="520px"
           append-to-body
           class="el-dialog__header"
+          :close-on-click-modal="false"
         >
           <el-form
             ref="form"
@@ -430,6 +431,7 @@
         width="316px"
         append-to-body
         class="el-dialog__header"
+        :close-on-click-modal="false"
       >
         <el-form
           ref="form1"
@@ -459,6 +461,7 @@
         width="316px"
         append-to-body
         class="el-dialog__header"
+        :close-on-click-modal="false"
       >
         <el-form
           ref="form2"

src/views/workingArrangements/planTask/index.vue

@@ -215,6 +215,7 @@
       width="990px"
       append-to-body
       class="el-dialog__header"
+      :close-on-click-modal="false"
     >
       <el-form
         ref="form"
@@ -226,6 +227,7 @@
         <div class="jiben">基本信息</div>
         <el-form-item label="计划名称" prop="name">
           <el-input
+          placeholder="请输入计划名册"
             label="计划名称"
             v-model="form.name"
             @click.native="planName"
@@ -233,6 +235,7 @@
         </el-form-item>
         <el-form-item label="任务编号" prop="number">
           <el-input
+          placeholder="请选择任务编号"
             label="任务编号"
             v-model="form.number"
             :disabled="true"
@@ -353,6 +356,7 @@
       width="980px"
       append-to-body
       class="el-dialog__header"
+      :close-on-click-modal="false"
     >
       <el-form
         ref="Progress"
@@ -446,6 +450,7 @@
       width="980px"
       append-to-body
       class="el-dialog__header"
+      :close-on-click-modal="false"
     >
       <el-form
         ref="singleTable"
@@ -529,6 +534,7 @@
       width="980px"
       append-to-body
       class="el-dialog__header jinduchakan"
+      :close-on-click-modal="false"
     >
       <el-form
         ref="moreTable"
@@ -1476,16 +1482,6 @@ export default {
 .el-form-item__content{
   border-bottom: none !important;
 }
-/* 调整输入框提示文字颜色 */
- .vue-treeselect__placeholder {
-  color: #bdbdbd4f !important;
-}
- input::-webkit-input-placeholder {
-  color: #bdbdbd4f !important;
-}
- input:-moz-placeholder {
-  color: #bdbdbd4f !important;
-}
 .jinduchakan .el-table__body-wrapper .el-table__empty-block{
   border-bottom: 2px solid white !important;
   border-left: 2px solid white !important;

src/views/workingArrangements/workTask/index.vue

@@ -244,23 +244,26 @@
       @pagination="getList"
     />
     <!-- 添加或修改工作任务对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="980px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="980px" append-to-body :close-on-click-modal="false">
       <el-form
         ref="form"
         :model="form"
         :rules="rules"
         label-width="100px"
         :inline="true"
+        
       >
         <div class="jiben">基本信息</div>
         <el-form-item label="任务名称" prop="name">
           <el-input
+          placeholder="请选择任务名称"
             v-model="form.name"
             @click.native="planName"
           />
         </el-form-item>
         <el-form-item label="任务编号" prop="number">
           <el-input
+          placeholder="请选择任务编号"
             label="任务编号"
             v-model="form.number"
             :disabled="true"
@@ -327,6 +330,7 @@
         </div>
         <el-form-item label="开始时间" prop="startTime">
           <el-date-picker
+          placeholder="请选择开始时间"
             clearable
             size="small"
             v-model="form.startTime"
@@ -338,6 +342,7 @@
         </el-form-item>
         <el-form-item label="结束时间" label-width="100px" prop="endTime">
           <el-date-picker
+          placeholder="请选择结束时间"
             clearable
             size="small"
             v-model="form.endTime"
@@ -381,6 +386,7 @@
       width="980px"
       append-to-body
       class="el-dialog__header"
+      :close-on-click-modal="false"
     >
       <el-form
         ref="Progress"
@@ -445,6 +451,7 @@
       width="980px"
       append-to-body
       class="el-dialog__header"
+      :close-on-click-modal="false"
     >
       <el-form
         ref="singleTable"
@@ -513,6 +520,7 @@
       width="980px"
       append-to-body
       class="el-dialog__header jinduchakan"
+      :close-on-click-modal="false"
     >
       <el-form
         ref="moreTable"
@@ -1404,19 +1412,4 @@ export default {
 .el-form-item__content{
   border-bottom: none !important;
 }
-/* 调整输入框提示文字颜色 */
- .vue-treeselect__placeholder {
-  color: #bdbdbd4f !important;
-}
- input::-webkit-input-placeholder {
-  color: #bdbdbd4f !important;
-}
- input:-moz-placeholder {
-  color: #bdbdbd4f !important;
-}
-.jinduchakan .el-table__body-wrapper .el-table__empty-block{
-  border-bottom: 2px solid white !important;
-  border-left: 2px solid white !important;
-  border-right: 2px solid white !important;
-}
 </style>