修改

src/views/combatduty/Quantitative/index.vue

@@ -29,7 +29,7 @@
           <div style="width: 100%; display: flex">
             <div class="wrap-top-left-top-item">
               <div class="wrap-top-left-top-item-left">值 班 分 队 一</div>
-              <div class="wrap-top-left-top-item-right1">
+              <div class="wrap-top-left-top-item-right">
                 {{ this.BaseOnDuty.detachmentoneName }}
               </div>
             </div>
@@ -49,18 +49,19 @@
             </div>
           </div>
           <div style="width: 100%; display: flex">
-            <div class="wrap-top-left-top-item">
-              <div class="wrap-top-left-top-item-left">二分队指挥员</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">
-                {{ this.BaseOnDuty.detachmentwoPeopleName }}
+                {{ this.BaseOnDuty.detachmentwoName }}
               </div>
             </div>
             <div class="wrap-top-left-top-item">
-              <div class="wrap-top-left-top-item-left">值 班 分 队 二</div>
+              <div class="wrap-top-left-top-item-left">二分队指挥员</div>
               <div class="wrap-top-left-top-item-right">
-                {{ this.BaseOnDuty.detachmentwoName }}
+                {{ this.BaseOnDuty.detachmentwoPeopleName }}
               </div>
             </div>
+           
             <div class="wrap-top-left-top-item">
               <div class="wrap-top-left-top-item-left zuozhan">
                 二 分 队 人 数
@@ -139,7 +140,7 @@
                <span>员</span>
               </div>
               <div class="wrap-top-left-top-item-right" style="margin-left:15px">
-                {{ this.GreatDuty1.detachementPeopleName }}
+                {{ this.GreatDuty1.detachmentPeopleName }}
               </div>
             </div>
           </div>
@@ -220,7 +221,7 @@
           <tr v-for="item in performanceTask" :key="item.id">
             <td style="color:#ccc"  height="28">{{item.unitName}}</td>
             <td style="color:#ccc" >{{ item.commanderName }}</td>
-            <td style="color:#ccc" >{{item.question }}</td>
+            <td style="color:#ccc" class="shiyou" :title="item.question" >{{item.question }}</td>
             <td style="color:#ccc" >{{ item.adress }}</td>
             <td style="color:#ccc" >{{ item.startTime }}</td>
             <td style="color:#ccc" >{{ item.endTime }}</td>
@@ -365,9 +366,14 @@
                 <td style="color:#ccc" height="28">{{index+1}}</td>
                 <td style="color:#ccc">{{ item.numberPlateName }}</td>
                 <td style="color:#ccc">{{ item.modelInfo }}</td>
-                <td style="color:#ccc">{{ item.catUnitName }}</td>
+                <!-- <el-table-column label="车辆型号" align="center" prop="vehiclemodel"> 
+                  <template slot-scope="scope">
+                     <dict-tag :options="dict.type.brand " :value="scope.row.vehiclemodel"/>
+                      </template> 
+                </el-table-column> -->
+                <td style="color:#ccc">{{ item.carUnitName }}</td>
                 <td style="color:#ccc">{{ item.driverName }}</td>
-                <td style="color:#ccc">{{ item.adress }}</td>
+                <td style="color:#ccc" class="shiyou">{{ item.adress }}</td>
               </tr>
             </table>
           </div>
@@ -389,7 +395,7 @@
                 <td style="color:#ccc" >{{ item.unitName }}</td>
                 <td style="color:#ccc" >{{ item.type }}</td>
                 <td style="color:#ccc" >{{ item.equipmentNumber }}</td>
-                <td style="color:#ccc" >{{ item.standbyPosition }}</td>
+                <td style="color:#ccc" class="shiyou">{{ item.standbyPosition }}</td>
               </tr>
             </table>
           </div>
@@ -413,6 +419,7 @@ import {
   // 人员情况
   listshow
 } from "@/api/combatduty/Quantitative";
+import { getDicts } from "@/api/system/dict/data";
 export default {
   data() {
     return {
@@ -427,26 +434,45 @@ export default {
       // 执行任务
       performanceTask: [],
       // 人员情况
-      peopleQK:[]
+      peopleQK:[],
+      // 查询字典
+      dictType: {
+        dictType: "brand",
+      },
+      ziDian:[]
     };
   },
   created() {
     // 基地值班
     getTodayzhiban().then((res) => {
       this.BaseOnDuty = res.rows[0];
-      console.log(this.BaseOnDuty)
+      // console.log(this.BaseOnDuty)
     });
     // 大队值班接口
     greatDuty().then((res) => {
       this.GreatDuty1=res.rows[0]
-      console.log(res);
+      // console.log(res);
     });
+    // 查询字典
+    this.getdict()
     // // 军车值班接口
     militaryDuty().then(res=>{
       // console.log(res.rows)
       this.MilitaryDuty=res.rows
       // console.log(res.rows)
+      this.MilitaryDuty.map((item)=>{
+        this.ziDian.map((items)=>{
+          console.log(items)
+            if(item.modelInfo==items.dictValue){
+              // console.log(items.dictLabel)
+             return item.modelInfo=items.dictLabel
+
+            }
+        })
+      })
+      console.log(this.MilitaryDuty)
     })
+    
     // // 装备值班接口
     equipment().then(res=>{
       // console.log(res)
@@ -460,11 +486,20 @@ export default {
     });
     // 人员情况
     listshow().then(res=>{
-      console.log(res)
+      // console.log(res)
       this.peopleQK=res.data
     })
+    
+  },
+  methods: {
+    // 查询字典
+    getdict() {
+      getDicts(this.dictType.dictType).then((res) => {
+        // console.log(res);
+        this.ziDian = res.data;
+      });
+    },
   },
-  methods: {},
 };
 </script>
 <style scoped>
@@ -829,4 +864,9 @@ table tr td {
 .zuozhan {
   width: 100px;
 }
+.shiyou{
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 </style>

src/views/combatduty/RateOfTen/index.vue

@@ -546,6 +546,7 @@ export default {
         this.loading2 = true;
         this.form1={}
         this.zhuangbei = res.rows[0];
+        console.log(this.zhuangbei)
         this.myEcharts();
         this.loading2 = false;
       });
@@ -566,12 +567,15 @@ 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]
       })
     },
     editor3() {
       this.open2 = true;
+      this.form2=this.sixnum
       getliulian().then(res=>{
         this.form2=res.rows[0]
       })
@@ -685,14 +689,15 @@ export default {
           position: ["10%", "50%"],
           formatter: function (params) {
             return (
-              data[0].name +
+              "编制人数" +
               "(" +
-             data11 +
+            data[0].value  +
               ")" +
               ":" +
-              "编制人数" +
+              data[0].name +
               "(" +
-             data[0].value+
+              data11
+             +
               ")"
             );
           },
@@ -769,7 +774,7 @@ export default {
           name: "未在位人数",
         },
       ];
-      data2[1].value =this.form.zwrs-this.form.bzrs;
+      data2[1].value =this.form.bzrs-this.form.zwrs;
       let data22=this.form.zwrs
 
       var data3 = [
@@ -786,7 +791,7 @@ export default {
       // console.log(data3[1].value)
       var data4 = [
         {
-          value: this.form.bzrs,
+          value: this.form.cdrs,
           name: "出动人数",
         },
         {
@@ -794,7 +799,7 @@ export default {
           name: "未出动率",
         },
       ];
-      data4[1].value = this.form.cdrs-this.form.bzrs;
+      data4[1].value = this.form.bzrs-this.form.cdrs;
       let data44=this.form.cdrs
       var data5 = [
         {
@@ -911,7 +916,7 @@ export default {
                   var s=`异常`
                     return s
                 }else{
-                var n = _this.form.bzrs / _this.form.zwrs;
+                var n = _this.form.zwrs / _this.form.bzrs;
                 var s =
                   `{value|${(n * 100).toFixed()}%}` +
                   "\n" +
@@ -1047,7 +1052,7 @@ export default {
                   var s=`异常`
                     return s
                 }else{
-                  var n = _this.form.bzrs / _this.form.cdrs;
+                  var n = _this.form.cdrs / _this.form.bzrs;
                   var s =
                   `{value|${(n * 100).toFixed()}%}` +
                   "\n" +
@@ -1072,14 +1077,17 @@ export default {
           position: ["10%", "50%"],
           formatter: function (params) {
             return (
-              data2[0].name +
+              data5[0].name+
               "(" +
-              data55 +
+              data5[0].value
+              +
               ")" +
               ":" +
-              data5[0].name +
+              data2[0].name
+               +
               "(" +
-            data5[0].value +
+              data55 
+             +
               ")"
             );
           },

src/views/regulations/fileinfo/index.vue

@@ -50,7 +50,7 @@
                     style="
                       font-size: 14px;
                       color: rgba(204, 204, 204, 1);
-                      margin-right: 30px;
+
                       width: 100px;
                       margin-left: 30px;
                       display: block;
@@ -62,8 +62,8 @@
                     style="
                       font-size: 14px;
                       color: rgba(204, 204, 204, 1);
-                      margin-right: 30px;
-                      width: 50px;
+
+                      width: 80px;
                       display: block;
                       text-align: start;
                     "
@@ -73,8 +73,7 @@
                     style="
                       font-size: 14px;
                       color: rgba(204, 204, 204, 1);
-                      margin-right: 30px;
-                      width: 200px;
+                      width: 180px;
                       display: block;
                       text-align: start;
                     "
@@ -84,11 +83,20 @@
                     style="
                       font-size: 14px;
                       color: rgba(204, 204, 204, 1);
-                      width: 100px;
+                      width: 80px;
                       display: block;
                     "
                     >阅读量：{{ scope.row.readVolume }}</span
                   >
+                  <span
+                    style="
+                      font-size: 14px;
+                      color: rgba(204, 204, 204, 1);
+                      width: 100px;
+                      display: block;
+                    "
+                    >分类：{{ scope.row.directoryName }}</span
+                  >
                 </div>
               </div>
             </div>
@@ -227,29 +235,6 @@
             prop="subclassification"
           />
           <el-table-column label="文件" align="center" prop="documentsNumber" />
-          <!-- <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-column
             label="操作"
             align="center"
@@ -620,6 +605,8 @@ export default {
       Ranking: [],
       // 添加按钮
       addbtn: true,
+      // 虚拟字段
+      fid: "",
     };
   },
 
@@ -631,17 +618,17 @@ export default {
     // rankList().then((res) => {
     //   this.Ranking = res.data;
     // });
-    this.RankList()
+    this.RankList();
     $(".app-wrapper").removeClass("openSidebar");
     console.log($(".app-wrapper"));
     $(".app-wrapper").addClass("hideSidebar");
     $(".sidebar-logo-container").removeClass("collapse");
   },
   methods: {
-    RankList(){
- rankList().then((res) => {
-      this.Ranking = res.data;
-    });
+    RankList() {
+      rankList().then((res) => {
+        this.Ranking = res.data;
+      });
     },
     handleSizeChange(val) {},
     handleCurrentChange(val) {
@@ -661,7 +648,7 @@ export default {
       console.log(this.queryParams1.pageNum);
       console.log(this.queryParams1.pageSize);
       // this.queryParams.common = "1";
-
+      console.log(this.parentId);
       if (this.parentId) {
         this.queryParams1.common = null;
       } else {
@@ -674,8 +661,17 @@ export default {
         common: this.queryParams1.common,
       }).then((res) => {
         this.directory = res.rows;
+        // console.log(this.directory)
+        this.directory.map((item) => {
+          if (item.subclassification != 0) {
+            // this.queryParams1.pageNum=1
+            this.addbtn = true;
+          }
+        });
+        // this.addbtn=true
         this.total1 = res.total;
         this.loading = false;
+        // console.log(this.directory)
       });
     },
     // 文件删除按钮操作
@@ -687,11 +683,10 @@ export default {
           return delFileinfo(row.id);
         })
         .then(() => {
-          
           this.ListDirectoryinfo();
-          this.RankList()
+          this.RankList();
           this.getList();
-          
+
           this.$modal.msgSuccess("删除成功");
         })
         .catch(() => {});
@@ -715,9 +710,18 @@ export default {
     },
     // 点击目录根据子目录的数量控制他是否可以点进去进行渲染
     mulus(row) {
-      this.parentId = row.id;
+      console.log(row);
+      if (row.parentId == 0) {
+        this.parentId = row.id;
+      } else {
+        this.parentId = row.parentId;
+      }
+
+      console.log(this.parentId);
+
+      // if(this.parentId)
       this.form.directoryId = row.id;
-       // 文件
+      // 文件
       listFileinfo({
         directoryId: this.form.directoryId,
         pageNum: this.queryParams.pageNum,
@@ -727,11 +731,11 @@ export default {
         this.total = res.total;
       });
       // console.log(row)
-      if (row.subclassification == 0) {
-        this.parentId = "";
-        return;
-      }
-     
+      // if (row.subclassification == 0) {
+      //   this.parentId = "";
+      //   return;
+      // }
+      this.queryParams1.pageNum=1;
       // 目录
       listDirectoryinfo({
         parentId: this.parentId,
@@ -744,6 +748,7 @@ export default {
             this.total1 = res.total;
             this.addbtn = false;
           } else {
+            // this.addbtn = true;
             return;
           }
         });
@@ -752,8 +757,9 @@ export default {
     },
     // 返回目录
     turnback() {
-      this.parentId=""
+      this.parentId = "";
       this.addbtn = true;
+      this.queryParams1.pageNum = 1;
       this.getList();
       this.ListDirectoryinfo();
     },
@@ -771,6 +777,7 @@ export default {
       this.loading = true;
       listFileinfo(this.queryParams).then((response) => {
         this.fileinfoList = response.rows;
+        console.log(this.fileinfoList);
         this.total = response.total;
         this.loading = false;
       });
@@ -893,6 +900,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id;
+      this.parentId = row.parentId;
+      console.log(row.parentId);
       // console.log(ids);
       this.$modal
         .confirm("是否确认删除？")
@@ -900,15 +909,36 @@ export default {
           return delDirectoryinfo(ids);
         })
         .then(() => {
-          this.parentId=""
+          // this.parentId=""
           this.getList();
-          this.ListDirectoryinfo();
-          this.RankList()
-          
-          this.addbtn=true
-          this.loading = false;
-          this.loading1 = false;
-          this.$modal.msgSuccess("删除成功");
+          // this.ListDirectoryinfo();
+          listDirectoryinfo({
+            parentId: this.parentId,
+            pageNum: this.queryParams1.pageNum,
+            pageSize: this.queryParams1.pageSize,
+            //  common: this.queryParams1.common,
+          }).then((res) => {
+            console.log(res)
+            this.directory = res.rows;
+            this.total1=res.total;
+           
+            if (this.parentId==0) {
+              this.addbtn = true;
+              this.RankList();
+
+              this.loading = false;
+              this.loading1 = false;
+              this.$modal.msgSuccess("删除成功");
+            } else {
+             
+              this.addbtn = false;
+              this.RankList();
+
+              this.loading = false;
+              this.loading1 = false;
+              this.$modal.msgSuccess("删除成功");
+            }
+          });
         })
         .catch(() => {});
     },
@@ -1359,18 +1389,18 @@ body,
   right: 0;
 }
 ::v-deep .el-pager li.active {
-  background-color: transparent;
-  color: white;
+  background-color: white;
+  color: black;
 }
-/* ::v-deep .el-pager .number{
+::v-deep .el-pager .number {
   background-color: transparent;
   color: white;
-} */
-::v-deep .btn-prev{
+}
+::v-deep .btn-prev {
   background-color: transparent;
   color: white;
 }
-::v-deep .btn-next{
+::v-deep .btn-next {
   background-color: transparent;
   color: white;
 }

src/views/workingArrangements/planTask/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="120px"
     >
-      <el-form-item prop="type" label="计划类型" class="plantypes">
+      <el-form-item prop="type" label="计划类型" class="plantypes" label-width="80px">
         <el-select v-model="queryParams.types" placeholder="请选择计划类型">
           <el-option
             v-for="(item, i) in ziDian"
@@ -19,7 +19,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="adminId" label="发布单位" class="plantypes">
+      <el-form-item prop="adminId" label="发布单位" class="plantypes" label-width="80px">
           <treeselect
             v-model="queryParams.adminId"
             :options="users"
@@ -1476,4 +1476,10 @@ export default {
 .plantypes .el-form-item__label{
   text-align: center;
 }
+.vue-treeselect__placeholder{
+  color: #ccc;
+}
+.el-form-item__content{
+  border-bottom: none !important;
+}
 </style>

src/views/workingArrangements/workTask/index.vue

@@ -51,7 +51,7 @@
           <el-option label="保障部" value="safeguard"></el-option>
         </el-select>
       </el-form-item> -->
- <el-form-item prop="type" label="任务类型" class="plantypes">
+ <el-form-item prop="type" label="任务类型" class="plantypes"  label-width="80px">
         <el-select v-model="queryParams.types" placeholder="请选择任务类型">
           <el-option
             v-for="(item, i) in ziDian"
@@ -63,7 +63,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="adminId" label="发布单位" class="plantypes">
+      <el-form-item prop="adminId" label="发布单位" class="plantypes" label-width="80px">
           <treeselect
             v-model="queryParams.adminId"
             :options="users"
@@ -1415,4 +1415,10 @@ export default {
 .el-table__body-wrapper .el-table__empty-block{
   border: none !important;
 } 
+.vue-treeselect__placeholder{
+  color: #ccc;
+}
+.el-form-item__content{
+  border-bottom: none !important;
+}
 </style>