工作安排1.0

src/views/barracksManagement/flats/index.vue

@@ -379,7 +379,6 @@
            <el-select
                 v-model="form.peopleId"
                 placeholder="请选择人员"
-                id="execute"
                 ref="peoplenames"
               >
                 <el-option
@@ -388,7 +387,6 @@
                   :label="item.name"
                   :value="item.id"
                   @click.native="peopleIds(item.name,item)"
-                  id="execute"
                 />
               </el-select>
         </el-form-item>

src/views/combatduty/Quantitative/index.vue

@@ -528,6 +528,9 @@ body {
   height: 10px;
   /* background-color: pink; */
 }
+#wrap{
+  position: relative;
+}
 /* .wrap {
   min-height: calc(100vh - 85px);
   width: 100%;
@@ -563,10 +566,12 @@ body {
   margin-right: 10px; */
 }
 .wrap-top {
-  width: 99%;
+  position: absolute;
+  width: 98.9%;
   height: 23vh;
   /* background-color: pink; */
   display: flex;
+  /* flex: 1 */
   flex-direction: row;
   margin: 10px;
   /* padding-top: 5px;
@@ -838,23 +843,20 @@ table tr td {
 }
 
 .wrap-footer {
-  width: 100%;
+  position: absolute;
+  bottom: 0;
+  top: 24vh;
+  width: 99.8%;
   /* height: calc(100vh-159.84px); */
   /* height: 90%; */
-  height: 65vh;
+  /* height: 66vh; */
   /* height:calc(100% - 100px); */
   /* height: calc(77vh-94px); */
   /* overflow:scroll; */
-  /* background-color:#F0E6A2; */
-  /* background-color: pink; */
-  /* height: 100vh; */
-  /* background-color: palegoldenrod; */
-  /* background-color: pink; */
   display: flex;
+  /* flex: 1; */
   margin: 10px;
   flex-direction: row;
-  /* padding-top: 20px;
-  padding-bottom: 10px; */
 }
 
 .wrap-footer-left {

src/views/combatduty/RateOfTen/index.vue

@@ -80,8 +80,8 @@
     </div>
     <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: 58px">六量</span>
-        <a class="btn btn-xs btn-info btn-view btn-dialog" @click="editor3"
+        <span style="margin-left: 55px">六量</span>
+        <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 +102,21 @@
 
           <ul class="wrap-box-botom-list-item-ul" id="ul-id">
             <li>
-              <img src="/static/icon-img/油料.png" 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.ylZscb }}
               </div>
             </li>
             <li>
-              <img src="/static/icon-img/阈值.png" 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="/static/icon-img/自持能力.png" 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 +140,21 @@
 
           <ul class="wrap-box-botom-list-item-ul" id="ul-id">
             <li>
-              <img src="/static/icon-img/军需物资.png" 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="/static/icon-img/阈值.png" alt="" />
+              <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="/static/icon-img/自持能力.png" alt="" />
+              <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 +177,7 @@
           </div>
           <ul class="wrap-box-botom-list-item-ul" id="ul-id">
             <li>
-              <img src="/static/icon-img/战备金.png" alt="" />
+              <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 +200,7 @@
           </div>
           <ul class="wrap-box-botom-list-item-ul" id="ul-id">
             <li>
-              <img src="/static/icon-img/卫生物资.png" alt="" />
+              <img src="../../../images/renoften/卫生物资.png" alt="" style="margin-left:21px" />
               <div class="wrap-box-botom-list-item-ul-left">
                 卫生物资战术储备
               </div>
@@ -209,7 +209,7 @@
               </div>
             </li>
             <li>
-              <img src="/static/icon-img/阈值.png" alt="" />
+              <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 +233,7 @@
 
           <ul class="wrap-box-botom-list-item-ul" id="ul-id">
             <li>
-              <img src="/static/icon-img/弹药.png" alt="" />
+              <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 +257,7 @@
 
           <ul class="wrap-box-botom-list-item-ul" id="ul-id">
             <li>
-              <img src="/static/icon-img/维修.png" alt="" />
+              <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 }}
@@ -267,6 +267,7 @@
         </div>
       </div>
     </div>
+    <div class="bottomsss"></div>
     <!-- 编辑人员五率弹框 -->
     <el-dialog
       style="color: white"
@@ -1533,6 +1534,13 @@ export default {
 };
 </script>
 <style scoped>
+.bottomsss{
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: 10px;
+  background-color: pink;
+}
 ::v-deep .el-form--inline .el-form-item{
   margin-right: 19px !important;
 }
@@ -1585,6 +1593,9 @@ body {
   display: flex;
   flex-wrap: wrap;
 } */
+#wrap{
+  position: relative;
+}
 .content {
   background-color: #103360;
 }
@@ -1639,20 +1650,20 @@ body {
 
 .wrap-box-top-box1-header {
   width: 95%;
-  height: 30px;
-  background-image: url("../../../images/标题底.png");
+  height: 35px;
+  background-image: url("../../../images/renoften/标题底.png");
   background-repeat: no-repeat;
-  background-size: 77% 100%;
+  /* background-size: 77% 100%; */
   margin-top: 10px;
-  margin-left: 2%;
+  margin-left: 10px;
   display: inline-block;
 }
 
 .wrap-box-top-box1-header span {
   font-size: 18px;
   color: #fff;
-  margin-left: 60px;
-  line-height: 30px;
+  margin-left: 55px;
+  line-height: 35px;
 }
 
 .wrap-box-top-box1-header a {
@@ -1691,6 +1702,7 @@ body {
   left: 30px;
 } */
 .wrap-box-top {
+  position: absolute;
   display: flex;
   flex-flow: flex-flow;
   /* margin-left: 20px; */
@@ -1700,6 +1712,8 @@ body {
   height: 45vh;
 }
 .wrap-box-botom {
+  position: absolute;
+  top: 46vh;
   width: 99%;
   height: 44vh;
   background-image: url("../../../images/六量底.png");
@@ -1835,8 +1849,8 @@ body {
   color: #05d5e9;
 }
 #wrap-box-top-box1-header {
-  background-size: 89% 100%;
-  background-position: 0px 2px;
+  /* background-size: 89% 100%; */
+  background-position: 0px 0px;
   background-image: url("../../../assets/images/六量标题底.png");
 }
 /* 弹框背景 */

src/views/regulations/fileinfo/index.vue

@@ -207,7 +207,7 @@
                   style="
                     margin-right: 5px;
                     position: absolute;
-                    left: 5px;
+                    left: 20px;
                     top: 2px;
                   "
                 />
@@ -219,7 +219,7 @@
                   style="
                     margin-right: 5px;
                     position: absolute;
-                    left: 5px;
+                    left: 25px;
                     top: 2px;
                   "
                 />

src/views/workingArrangements/planTask/index.vue

@@ -1085,12 +1085,11 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      console.log(this.form)
-      if(this.form.file[0]){
+      console.log(this.form.file)
+      if(this.form.file){
         this.form.fileName=this.form.file[0].name
-      this.form.file=this.form.file[0].url
+        this.form.file=this.form.file[0].url
       }
-      
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.adminId === this.form.unitId) {

src/views/workingArrangements/workTask/index.vue

@@ -997,7 +997,7 @@ export default {
     /** 提交按钮 */
     submitForm() {
       console.log(this.form);
-      if(this.form.file[0]){
+      if(this.form.file){
          this.form.fileName=this.form.file[0].name
         this.form.file=this.form.file[0].url
       }