Merge branch 'master' of http://101.43.194.146:10101/root/supervision-ui

src/api/combatduty/Quantitative.js

@@ -7,9 +7,37 @@ export function getTodayzhiban() {
     })
 }
 
-export function getListshow() {
-    return request({
-      url: '/combatduty/quantistatis/listshow',
-      method: 'get',
-    })
-}
+// 获取大队值班接口
+export function greatDuty(){
+  return request({
+    url:"/combatduty/quantistatis/daduizhiban",
+    method:"get"
+  })
+}
+
+// 获取军车值班接口
+export function militaryDuty() { 
+  return request({
+    url:"/combatduty/quantistatis/junchezhiban",
+    method:"get"
+  })
+}
+
+// 获取装备值班接口
+export function equipment(){
+  return request({
+    url:"/combatduty/quantistatis/zhuangbeizhiban",
+    method:"get"
+  })
+}
+
+// 获取执行任务人员情况接口
+export function zhixingrenwu(){
+  return request({
+    url:"/combatduty/taskdutyinfo/list",
+    method:"get"
+  })
+}
+
+
+

src/api/combatduty/ReteOfTen.js

@@ -47,4 +47,13 @@ export function getzbwl(data){
     method:"get",
     data:data
   })
-}
+}
+
+// 获取装备可用数接口
+export function getzbky(){
+  return request({
+    url:"/combatduty/quantistatis/zhuanbeikeyongshu",
+    method:"get",
+  })
+}
+

src/views/combatduty/Quantitative/index.vue

@@ -75,27 +75,27 @@
           <div class="wrap-top-left-top-head"><b>大队值班</b></div>
           <div class="wrap-top-left-top-item">
             <div class="wrap-top-left-top-item-left">值 班 首 长</div>
-            <div class="wrap-top-left-top-item-right">
-              
+            <div class="wrap-top-left-top-item-right" style="padding-left:25px">
+              {{this.GreatDuty1.chiefDutyName}}
             </div>
           </div>
           <div class="wrap-top-left-top-item">
             <div class="wrap-top-left-top-item-left zuozhan" >作 战 值 班 员</div>
-            <div class="wrap-top-left-top-item-right">
-              
+            <div class="wrap-top-left-top-item-right" style="padding-left:20px">
+              {{this.GreatDuty1.combatDutyName}}
             </div>
           </div>
 
           <div class="wrap-top-left-top-item">
             <div class="wrap-top-left-top-item-left zuozhan">通 信 值 班 员</div>
             <div class="wrap-top-left-top-item-right">
-              
+              {{this.GreatDuty1.dutyOffierName}}
             </div>
           </div>
           <div class="wrap-top-left-top-item">
             <div class="wrap-top-left-top-item-left zuozhan">机 要 值 班 员</div>
             <div class="wrap-top-left-top-item-right">
-              
+            {{this.GreatDuty1.confidentialName}}
             </div>
           </div>
           <div class="wrap-top-left-top-item">
@@ -104,26 +104,26 @@
                 <span style="display:inline-block;width:30px">员</span>
                 </div>
             <div class="wrap-top-left-top-item-right">
-             
+             {{this.GreatDuty1.politicalName}}
             </div>
           </div>
           <div class="wrap-top-left-top-item">
             <div style="color:white;font-size:14px;margin-left:7px">
             <span style="display:inline-block;width:35px">保</span>
             <span style="display:inline-block;width:35px">障</span>
-            <span style="display:inline-block;width:35px">部</span>
+            <span style="display:inline-block;">部</span>
             <span style="display:inline-block;width:35px">值</span>
             <span style="display:inline-block;width:35px">班</span>
-            <span style="display:inline-block;width:30px">员</span>
+            <span style="display:inline-block;">员</span>
             </div>
             <div class="wrap-top-left-top-item-right">
-              
+              {{this.GreatDuty1.guaranteeName}}
             </div>
           </div>
           <div class="wrap-top-left-top-item">
-            <div class="wrap-top-left-top-item-left zuozhan">勤 劳 保 障 员</div>
+            <div class="wrap-top-left-top-item-left zuozhan">值 班 通 信 员</div>
             <div class="wrap-top-left-top-item-right">
-              
+              {{this.GreatDuty1.dutyOffierName}}
             </div>
           </div>
           <div class="wrap-top-left-top-item">
@@ -134,7 +134,7 @@
                  <span style="display:inline-block;width:30px">队</span>
             </div>
             <div class="wrap-top-left-top-item-right">
-              
+              {{this.GreatDuty1.detachmentName}}
             </div>
           </div>
           <div class="wrap-top-left-top-item">
@@ -143,8 +143,7 @@
                 <span style="display:inline-block;width:35px">挥</span>
                 <span style="display:inline-block;width:30px">员</span>
             </div>
-            <div class="wrap-top-left-top-item-right">111
-            </div>
+            <div class="wrap-top-left-top-item-right">{{this.GreatDuty1.detachmentPeopleName}}</div>
           </div>
         </div>
       </div>
@@ -170,7 +169,7 @@
         </div>
         <div class="wrap-top-center-item">
           <div class="wrap-top-center-item-left">
-            <img src="../../../images/Quantitative/休假.png" alt="" />
+            <img style="width:44px;height:22px" src="../../../images/Quantitative/休假.png" alt="" />
           </div>
           <div class="wrap-top-center-item-right">
             <div class="wrap-top-center-item-right-top">编纳休假</div>
@@ -206,7 +205,7 @@
         </div>
         <div class="wrap-top-center-item">
           <div class="wrap-top-center-item-left">
-            <img src="../../../images/Quantitative/未编纳总人数.png" alt="" />
+            <img  src="../../../images/Quantitative/未编纳总人数.png" alt="" />
           </div>
           <div class="wrap-top-center-item-right">
             <div class="wrap-top-center-item-right-top">未编纳总人数</div>
@@ -224,7 +223,7 @@
         </div>
         <div class="wrap-top-center-item">
           <div class="wrap-top-center-item-left">
-            <img src="../../../images/Quantitative/休假.png" alt="" />
+            <img style="width:44px;height:22px" src="../../../images/Quantitative/休假.png" alt="" />
           </div>
           <div class="wrap-top-center-item-right">
             <div class="wrap-top-center-item-right-top">未编纳休假</div>
@@ -273,11 +272,12 @@
           
           <tr>
             <td height="28"></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
+            <td>{{this.MilitaryDuty.numberPlateName}}</td>
+            <!-- 厂牌型号字段没有 -->
+            <td>{{this.MilitaryDuty.modelInfo}}</td>
+            <td>{{this.MilitaryDuty.catUnitName}}</td>
+            <td>{{this.MilitaryDuty.driverName}}</td>
+            <td>{{this.MilitaryDuty.adress}}</td>
           </tr>
     
         </table>
@@ -298,11 +298,11 @@
        
           <tr>
             <td height="28"></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
+            <td>{{this.performanceTask.commanderName}}</td>
+            <td>{{this.performanceTask.question}}</td>
+            <td>{{this.performanceTask.adress}}</td>
+            <td>{{this.performanceTask.startTime}}</td>
+            <td>{{this.performanceTask.endTime}}</td>
           </tr>
         </table>
       </div>
@@ -319,11 +319,11 @@
           </tr>
           <tr>
             <td height="28"></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
+            <td>{{this.Equipment.equipmentName}}</td>
+            <td>{{this.Equipment.unitName}}</td>
+            <td>{{this.Equipment.type}}</td>
+            <td>{{this.Equipment.equipmentNumber}}</td>
+            <td>{{this.Equipment.standbyPosition}}</td>
           </tr>
         </table>
       </div>
@@ -331,39 +331,76 @@
   </div>
 </template>
 <script>
-import {getTodayzhiban,getListshow} from "@/api/combatduty/Quantitative"
+import {
+  // 值班基地接口
+  getTodayzhiban,
+  // 大队值班接口
+  greatDuty,
+  // 军车值班接口
+  militaryDuty,
+  // 装备值班接口
+  equipment,
+  // 执行任务人员情况
+  zhixingrenwu
+} from "@/api/combatduty/Quantitative"
 export default {
   data() {
     return {
-      BaseOnDuty:[]
+      // 基地值班
+      BaseOnDuty:[],
+      // 大队值班
+      GreatDuty1:[],
+      // 军车值班
+      MilitaryDuty:[],
+      // 装备值班
+      Equipment :[],
+      // 执行任务
+      performanceTask:[]
     };
   },
   created() {
+    // 基地值班
     getTodayzhiban().then(res=>{
-      console.log(res.rows[0])
       this.BaseOnDuty=res.rows[0]
-      // console.log(res.rows)
     })
-    getListshow().then(res=>{
-      // console.log(res.data)
+    // 大队值班接口
+    greatDuty().then(res=>{
+      console.log(res)
     })
+    // // 军车值班接口
+    // militaryDuty().then(res=>{
+    //   console.log(res)
+    // })
+    // // 装备值班接口
+    // equipment().then(res=>{
+    //   console.log(res)
+    // })
+    // 执行任务人员情况
+    zhixingrenwu().then(res=>{
+      console.log(res)
+    })
+  },
+  methods: {
+
   },
-  methods: {},
 };
 </script>
 <style scoped>
-html,
-body {
+#app {
   width: 100%;
   height: 100%;
 }
-
+html,body{
+  height: 100%;
+  width: 100%;
+}
 .content {
   background-color: #103360;
 }
 
 .wrap {
   background-color: #103360;
+  /* position: absolute; */
   position: fixed;
   height: 100%;
 }
@@ -459,14 +496,14 @@ body {
   height: 30px;
   background-image: url("../../../images/组 21.png");
   background-repeat: no-repeat;
-  background-size: 100% 100%;
+  background-size: 78% 100%;
   margin-top: 5px;
   margin-left: 10px;
 }
 .wrap-footer-center .wrap-top-left-top-head {
   background-image: url("../../../images/组 21.png");
   background-repeat: no-repeat;
-  background-size: 50% 100%;
+  background-size: 40% 100%;
 }
 .wrap-top-left-top-head b {
   font-size: 18px;
@@ -542,7 +579,7 @@ table tr td {
 
 .wrap-footer {
   width: 100%;
-  height: 400px;
+  height: 90%;
   display: flex;
   flex-direction: row;
   padding-top: 20px;
@@ -557,7 +594,7 @@ table tr td {
 
 .wrap-footer-center {
   flex: 2;
-  height: 400px;
+  height: 51%;
   width: 1100px;
   background-image: url("../../../images/底-执行人员情况.png");
   background-size: 100% 100%;
@@ -565,17 +602,19 @@ table tr td {
   margin-top: 10px;
   margin-left: 20px;
   padding-right: 40px;
+  margin-bottom: 10px;
 }
 
 .wrap-footer-right {
   flex: 1;
-  height: 400px;
+  height: 51%;
   background-image: url("../../../images/底-装备值班.png");
   background-size: 100% 100%;
   background-repeat: no-repeat;
   margin-top: 10px;
   margin-left: 17px;
   margin-right: 10px;
+  margin-bottom: 10px;
 }
 .wrap-footer-left-top {
   width: 96%;

src/views/combatduty/RateOfTen/index.vue

@@ -185,7 +185,7 @@
             </li>
           </ul>
         </div>
-        <div class="wrap-box-botom-list-item">
+        <div class="wrap-box-botom-list-item1">
           <div class="wrap-box-botom-list-item-title">
             <img
               src="../../../images/小标题.png"
@@ -217,7 +217,7 @@
             </li>
           </ul>
         </div>
-        <div class="wrap-box-botom-list-item">
+        <div class="wrap-box-botom-list-item1">
           <div class="wrap-box-botom-list-item-title">
             <img
               src="../../../images/小标题.png"
@@ -241,7 +241,7 @@
             </li>
           </ul>
         </div>
-        <div class="wrap-box-botom-list-item">
+        <div class="wrap-box-botom-list-item1">
           <div class="wrap-box-botom-list-item-title">
             <img
               src="../../../images/小标题.png"
@@ -307,7 +307,7 @@
     <!--编辑 装备五率的弹框 -->
     <el-dialog
       style="color: white"
-      title="装备五率的弹框"
+      title="编辑装备五率"
       :visible.sync="open1"
       width="880px"
       append-to-body
@@ -473,6 +473,8 @@ import {
   updatewulv,
   updatezbwl,
   getzbwl,
+  // 获取装备可用接口
+  getzbky
 } from "@/api/combatduty/ReteOfTen";
 export default {
   data() {
@@ -489,7 +491,13 @@ export default {
       form2: {},
       // 表单校验
       rules: {
-        // bzrs:[ { type: 'number', required: true, 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,
@@ -503,15 +511,15 @@ export default {
       loading2: false,
       // 六量加载
       loading3: false,
-      zhuangbei:[]
+      zhuangbei:[],
+      zbky:""
     };
   },
   mounted() {
     getReteOfTen().then((res) => {
-      console.log(res)
+      // console.log(res)
       this.loading1 = true;
       this.form = res.rows[0];
-      console.log(this.form);
       this.myEcharts();
       this.loading1 = false;
     });
@@ -519,12 +527,15 @@ export default {
   },
   created() {
     this.getLiuliang()
+    getzbky().then(res=>{
+      this.zbky=res.msg
+      console.log(this.zbky)
+    })
   },
   methods: {
     getZbwl() {
       getzbwl().then((res) => {
         this.loading2 = true;
-        console.log(res.rows);
         this.form1={}
         this.zhuangbei = res.rows[0];
         this.myEcharts();
@@ -546,6 +557,7 @@ export default {
     // 编辑装备五率
     editor2() {
       this.open1 = true;
+      this.form1.zbky=this.zbky
     },
     editor3() {
       this.open2 = true;
@@ -568,7 +580,6 @@ export default {
     submitForm1() {
       this.$refs["form1"].validate((valid) => {
         this.form.zbky = 0;
-        console.log(this.form1);
         if (valid) {
           // 添加装备五率的接口
           updatezbwl(this.form1).then((response) => {
@@ -583,7 +594,6 @@ export default {
     // 编辑六量确定
     submitForm2() {
       this.$refs["form2"].validate((valid) => {
-        console.log(this.form2);
         if (valid) {
           updateliuliang(this.form2).then((response) => {
             this.$modal.msgSuccess("上传成功");
@@ -646,15 +656,15 @@ export default {
       //   满编率
       var data = [
         {
-          value: this.form.sjrs,
+          value: this.form.bzrs,
           name: "实际人数",
         },
         {
-          // 输入10的时候他也是10
-          value: this.form.sjrs,
+          value:this.form.sjrs,
         },
       ];
-      data[1].value = this.form.bzrs - this.form.sjrs;
+      data[1].value = this.form.sjrs-data[0].value;
+      let data11=this.form.sjrs
       var option = {
         tooltip: {
           trigger: "item",
@@ -663,12 +673,12 @@ export default {
             return (
               data[0].name +
               "(" +
-              data[0].value +
+             data11 +
               ")" +
               ":" +
               "编制人数" +
               "(" +
-              Number(data[1].value + data[0].value) +
+             data[0].value+
               ")"
             );
           },
@@ -696,9 +706,10 @@ export default {
                 name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
+                // console.log(data[1].value)
                 // 设置满编率
                 // var n = data[0].value / (data[1].value + data[0].value);
-                var n = _this.form.sjrs / _this.form.bzrs;
+                var n = _this.form.bzrs / _this.form.sjrs;
                 var s =
                   `{value|${(n * 100).toFixed()}%}` +
                   "\n" +
@@ -715,10 +726,10 @@ export default {
               labelLine: { show: true },
             },
             // 样式
-            itemStyle: {
-              borderRadius: 2,
-              borderWidth: 10,
-            },
+            // itemStyle: {
+            //   borderRadius: 2,
+            //   borderWidth: 10,
+            // },
             // emphasis: {
             //   label: {
             //     // show: false,
@@ -736,15 +747,16 @@ export default {
       // 在位率
       var data2 = [
         {
-          value: _this.form.zwrs,
+          value:  _this.form.bzrs,
           name: "在位人数",
         },
         {
-          value: 2,
+          value: _this.form.bzrs,
           name: "未在位人数",
         },
       ];
-      data2[1].value = this.form.bzrs - data2[0].value;
+      data2[1].value =this.form.zwrs-this.form.bzrs;
+      let data22=this.form.zwrs
 
       var data3 = [
         {
@@ -760,16 +772,16 @@ export default {
       // console.log(data3[1].value)
       var data4 = [
         {
-          value: this.form.cdrs,
+          value: this.form.bzrs,
           name: "出动人数",
         },
         {
-          value: 2,
+          value: this.form.bzrs,
           name: "未出动率",
         },
       ];
-      data4[1].value = this.form.bzrs - data4[0].value;
-
+      data4[1].value = this.form.cdrs-this.form.bzrs;
+      let data44=this.form.cdrs
       var data5 = [
         {
           value: 6,
@@ -850,7 +862,7 @@ export default {
             return (
               data2[0].name +
               "(" +
-              data2[0].value +
+              data22 +
               ")" +
               ":" +
               "编制人数" +
@@ -881,7 +893,7 @@ export default {
                 name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
-                var n = _this.form.zwrs / _this.form.bzrs;
+                var n = _this.form.bzrs / _this.form.zwrs;
                 var s =
                   `{value|${(n * 100).toFixed()}%}` +
                   "\n" +
@@ -890,10 +902,10 @@ export default {
                 return s;
               },
             },
-            itemStyle: {
-              borderRadius: 2,
-              borderWidth: 10,
-            },
+            // itemStyle: {
+            //   borderRadius: 2,
+            //   borderWidth: 10,
+            // },
             data: data2,
           },
         ],
@@ -954,7 +966,6 @@ export default {
               },
               formatter: function (params) {
                 var n = _this.form.dkrs / _this.form.sjrs;
-                console.log(n);
                 var s =
                   `{value|${(n * 100).toFixed()}%}` +
                   "\n" +
@@ -963,10 +974,10 @@ export default {
                 return s;
               },
             },
-            itemStyle: {
-              borderRadius: 2,
-              borderWidth: 10,
-            },
+            // itemStyle: {
+            //   borderRadius: 2,
+            //   borderWidth: 10,
+            // },
             data: data3,
           },
         ],
@@ -979,7 +990,7 @@ export default {
             return (
               data4[0].name +
               "(" +
-              data4[0].value +
+             data44 +
               ")" +
               ":" +
               "编制人数" +
@@ -1008,7 +1019,7 @@ export default {
                 name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
-                var n = _this.form.cdrs / _this.form.bzrs;
+                var n = _this.form.bzrs / _this.form.cdrs;
                 var s =
                   `{value|${(n * 100).toFixed()}%}` +
                   "\n" +
@@ -1017,10 +1028,10 @@ export default {
                 return s;
               },
             },
-            itemStyle: {
-              borderRadius: 2,
-              borderWidth: 10,
-            },
+            // itemStyle: {
+            //   borderRadius: 2,
+            //   borderWidth: 10,
+            // },
             data: data4,
           },
         ],
@@ -1073,10 +1084,10 @@ export default {
                 return s;
               },
             },
-            itemStyle: {
-              borderRadius: 2,
-              borderWidth: 10,
-            },
+            // itemStyle: {
+            //   borderRadius: 2,
+            //   borderWidth: 10,
+            // },
             data: data5,
           },
         ],
@@ -1222,7 +1233,7 @@ export default {
               ":" +
               "编制配套数" +
               "(" +
-              data8[0].value +
+              (data8[1].value+data8[0].value) +
               ")"
             );
           },
@@ -1246,7 +1257,8 @@ export default {
                 name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
-                var n = data8[0].value / (data8[1].value + data8[0].value);
+                // var n = data8[0].value / (data8[1].value + data8[0].value);
+                var n=_this.zhuangbei.sjpt/_this.zhuangbei.bzpt
                 var s =
                   `{value|${(n * 100).toFixed()}%}` +
                   "\n" +
@@ -1522,19 +1534,18 @@ body {
   background-color: #103360;
 }
 
-#wrap {
-  background-color: #103360;
+/* #wrap {
+  min-height: calc(100vh - 85px);
   width: 100%;
-  height: 100%;
-}
+  position: relative;
+  overflow: hidden;
+  background-color: #103360;
+  margin: 0;
+  padding:0;
+} */
 .content {
   background-color: #103360;
 }
-.wrap-box-top {
-  display: flex;
-  flex-flow: flex-flow;
-  margin-left: 20px;
-}
 /* 备注 */
 .thistext {
   color: white;
@@ -1561,21 +1572,28 @@ body {
   /* margin: auto; */
 }
 .wrap-box-top-box1 {
-  width: 46.5%;
-  height: 400px;
-  background: #002e4f;
-  background-image: url("/supervision-ui/src/images/五率底.png");
-  margin: 3px 1.5%;
+  width: 48%;
+  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 {
-  width: 46.5%;
-  height: 400px;
-  background: #002e4f;
-  background-image: url("/supervision-ui/src/images/五率底.png");
+  /* position: absolute; */
+  /* top: 10px; */
+  /* right: 10px; */
+  width: 48%;
+  height: 100%;
+  /* background: #002843; */
+  border-radius: 12px;
+  background-image: url("../../../images/五率底.png");
   margin: 3px 1.5%;
   background-size: 100% 100%;
   /*margin-top: 10px;*/
@@ -1587,7 +1605,7 @@ body {
   height: 30px;
   background-image: url("../../../images/标题底.png");
   background-repeat: no-repeat;
-  background-size: 100% 100%;
+  background-size: 77% 100%;
   margin-top: 10px;
   margin-left: 2%;
   display: inline-block;
@@ -1617,6 +1635,7 @@ body {
 .wrap-box-top-box1-center {
   width: 100%;
   height: 370px;
+  padding: 20px;
   /* background-color: #fff; */
 }
 
@@ -1630,15 +1649,23 @@ body {
   flex: 1;
   height: 180px;
 }
+.wrap-box-top {
+  display: flex;
+  flex-flow: flex-flow;
+  margin-left: 20px;
+  /* margin-bottom: 10px; */
+  width: 100%;
+  height: 45vh;
+}
 .wrap-box-botom {
-  width: 95%;
-  height: 420px;
+  width: 97%;
+  height: 43vh;
   background-image: url("../../../images/六量底.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
-  margin-left: 2.5%;
   margin-bottom: 10px;
-  position: relative;
+  margin-left: 25px;
+  bottom: 10px;
   margin-top: 15px;
 }
 
@@ -1669,13 +1696,20 @@ body {
 
 .wrap-box-botom-list {
   width: 100%;
-  height: 400px;
+  height: 45vh;
   margin-top: 10px;
 }
 
 .wrap-box-botom-list-item {
   width: 30%;
-  height: 168px;
+  height: 45%;
+  background-color: #002843;
+  margin: 5px 1.5%;
+  display: inline-block;
+}
+.wrap-box-botom-list-item1 {
+  width: 30%;
+  height: 32%;
   background-color: #002843;
   margin: 0 1.5%;
   display: inline-block;
@@ -1761,7 +1795,7 @@ body {
   color: #05d5e9;
 }
 #wrap-box-top-box1-header {
-  background-size: 100% 100%;
+  background-size: 89% 100%;
   background-position: 0px 2px;
   background-image: url("../../../assets/images/六量标题底.png");
 }

src/views/regulations/fileinfo/index.vue

@@ -91,6 +91,16 @@
             </div>
           </template>
         </el-table-column>
+         <!-- <el-table-column
+          label="文件"
+          align="center"
+          class-name="small-padding fixed-width"
+          label-width="30px"
+        >
+          <template slot-scope="scope">
+            {{scope.row.directoryName}}
+          </template>
+        </el-table-column> -->
         <el-table-column
           label="操作"
           align="center"
@@ -159,7 +169,8 @@
                 @click="mulus(scope.row)"
                 :class="scope.row.subclassification == 0 ? '' : 'undeline'"
               >
-                {{ scope.row.directory }}
+              <img src="../../../images/文件夹.png" alt="" style="margin-right:5px">
+              <span> {{ scope.row.directory }}</span>
               </div>
             </template>
           </el-table-column>
@@ -169,7 +180,7 @@
             prop="subclassification"
           />
           <el-table-column label="文件" align="center" prop="documentsNumber" />
-          <el-table-column
+           <!-- <el-table-column
             label="更新时间"
             align="center"
             class-name="small-padding fixed-width"
@@ -191,6 +202,29 @@
                 <span class="chakan">删除</span>
               </el-button>
             </template>
+          </el-table-column> -->
+          <el-table-column
+            label="操作"
+            align="center"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="add"
+                type="text"
+                @click="ViewProgress(scope.row)"
+                v-if="addbtn==true"
+              >
+                <span>添加</span>
+              </el-button>
+              <el-button
+                size="dels"
+                type="text"
+                @click="handleDelete(scope.row)"
+              >
+                <span class="chakan">删除</span>
+              </el-button>
+            </template>
           </el-table-column>
         </el-table>
         <pagination
@@ -524,6 +558,7 @@ export default {
       addbtn:true
     };
   },
+
   created() {
     this.getList();
     // 获取目录接口
@@ -532,13 +567,24 @@ export default {
     rankList().then(res=>{
       this.Ranking=res.data
     })
+    $(".app-wrapper").removeClass("openSidebar")
+    console.log($(".app-wrapper"))
+    $(".app-wrapper").addClass("hideSidebar")
+    $(".sidebar-logo-container").removeClass("collapse")
   },
   methods: {
     // 文件删除按钮操作
     handledels(row) {
-      delFileinfo(row.id).then((res) => {
-        this.getList();
-      });
+        this.$modal
+        .confirm('是否确认删除该文件')
+        .then(function () {
+          return delFileinfo(row.id);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     // 子分类id
     soncategory(id) {
@@ -549,6 +595,7 @@ export default {
       this.loading = true;
       this.queryParams.common = "1";
       listDirectoryinfo(this.queryParams).then((res) => {
+        console.log(res.rows)
         this.directory = res.rows;
         this.total1 = res.rows.length;
         this.loading = false;
@@ -558,21 +605,23 @@ export default {
     // 点击目录根据子目录的数量控制他是否可以点进去进行渲染
     mulus(row) {
       this.parentId = row.id;
+      // console.log(row.id)
+      this.form.directoryId=row.id
+      console.log(this.form.directoryId)
+      // this.listFileinfo({directoryId:this.form.directoryId})
+      listFileinfo({directoryId:this.form.directoryId}).then(res=>{
+        this.fileinfoList = res.rows;
+        this.total = res.total;
+      })
       listDirectoryinfo({ parentId: this.parentId }).then((res) => {
-        this.addbtn=false
         res.rows.forEach((item) => {
           if (item.subclassification == 0) {
             this.directory = res.rows;
-            // this.addbtn=false
+            this.addbtn=false
           } else {
             return;
           }
         });
-        // if (res.rows[0].subclassification == 0) {
-        //   this.directory = res.rows;
-        // } else {
-        //   return;
-        // }
       });
       // 绑定的数据 directory
     },
@@ -593,10 +642,10 @@ export default {
     /** 查询规章制度文件记录列表 */
     getList() {
       // this.loading = true;
-      listFileinfo(this.queryParams).then((response) => {
+      listFileinfo(this.form.directoryId).then((response) => {
+        console.log(response)
         this.fileinfoList = response.rows;
         this.total = response.total;
-        // this.loading = false;
       });
     },
     // 取消按钮
@@ -656,8 +705,8 @@ export default {
     },
     /** 上传文件提交按钮 */
     submitForm() {
+      console.log(this.form)
       this.$refs["form"].validate((valid) => {
-        // console.log(this.form);
         if (valid) {
           console.log(this.form.file[0]);
           // 文件名
@@ -671,7 +720,7 @@ export default {
           // 文件大小
           this.form.fileSize = this.form.file[0].fileLength;
           // 目录名称
-          this.form.directoryName = this.form.directory;
+          this.form.directoryName = this.form.subclassification;
           //输出结果
           console.log(this.form);
           // 上传文件接口
@@ -1097,6 +1146,7 @@ table {
 /* 下划线 */
 .undeline {
   /* text-decoration: underline; */
+  /* text-align: start; */
   color: #1d96ff;
   cursor: pointer;
 }

src/views/workingArrangements/planTask/index.vue

@@ -1367,6 +1367,7 @@ export default {
   height: auto;
   min-height: 35px;
   text-indent: 1em;
+  line-height: 35px;
   margin-bottom: 20px;
   /* margin: auto; */
 }

src/views/workingArrangements/workTask/index.vue

@@ -1268,7 +1268,7 @@ export default {
   border-radius: 4px;
   min-height: 35px;
   height: auto !important;
-  line-height: 36px;
+  line-height: 35px;
   text-indent: 1em;
   margin-bottom: 20px;
 }