全局样式

src/api/combatduty/Quantitative.js

@@ -40,4 +40,14 @@ export function zhixingrenwu(){
 }
 
 
+// 获取执行任务人员情况接口
+export function listshow(){
+  return request({
+    url:"/combatduty/quantistatis/listshow",
+    method:"get"
+  })
+}
+
+
+
 

src/assets/styles/global.css

@@ -855,6 +855,7 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
 .el-tooltip__popper{
   width: 300px !important;
   height: auto !important;
+  letter-spacing:.2em;
   /* text-align: center; */
   text-indent: 2em;
 }

src/views/combatduty/Quantitative/index.vue

@@ -460,6 +460,7 @@ export default {
     });
     // 人员情况
     listshow().then(res=>{
+      console.log(res)
       this.peopleQK=res.data
     })
   },

src/views/doormanManage/bdglVisit/index.vue

@@ -146,7 +146,7 @@
           <el-select
                 v-model="form.peopleName"
                 placeholder="请选择接待人"
-                id="execute"
+                
                 ref="peoplenames"
               >
                 <el-option
@@ -635,4 +635,7 @@ v-deep .el-table thead tr{
 ::v-deep .el-date-editor .el-input__inner{
   height: 36px;
 }
+::v-deep .el-date-picker__editor-wrap .el-input__inner{
+  width: 30px;
+}
 </style>

src/views/regulations/fileinfo/index.vue

@@ -28,30 +28,33 @@
                   alt=""
                 />
                 <img
-                  v-else-if="scope.row.parentDirId == '.doc'|| scope.row.parentDirId == '.docx'"
+                  v-else-if="
+                    scope.row.parentDirId == '.doc' ||
+                    scope.row.parentDirId == '.docx'
+                  "
                   src="../../../images/doc.png"
                   alt=""
                 />
               </div>
               <!-- 文件名称 fileName -->
               <div>
-                <div style="text-align: start; width: 100%;margin-left:30px">
+                <div style="text-align: start; width: 100%; margin-left: 30px">
                   {{ scope.row.fileName }}
                 </div>
                 <!-- 上传人 createUser -->
                 <!-- 页数 theNumberPages-->
                 <!-- 时间 createTime -->
                 <!-- 阅读量 readVolume -->
-                <div style="display:flex">
+                <div style="display: flex">
                   <span
                     style="
                       font-size: 14px;
                       color: rgba(204, 204, 204, 1);
                       margin-right: 30px;
-                      width:100px;
-                      margin-left:30px;
-                      display:block;
-                      text-align:start
+                      width: 100px;
+                      margin-left: 30px;
+                      display: block;
+                      text-align: start;
                     "
                     >上传人：{{ scope.row.createUser }}</span
                   >
@@ -60,9 +63,9 @@
                       font-size: 14px;
                       color: rgba(204, 204, 204, 1);
                       margin-right: 30px;
-                      width:50px;
-                      display:block;
-                      text-align:start
+                      width: 50px;
+                      display: block;
+                      text-align: start;
                     "
                     >页数：{{ scope.row.theNumberPages }}</span
                   >
@@ -71,9 +74,9 @@
                       font-size: 14px;
                       color: rgba(204, 204, 204, 1);
                       margin-right: 30px;
-                      width:200px;
-                      display:block;
-                      text-align:start
+                      width: 200px;
+                      display: block;
+                      text-align: start;
                     "
                     >时间：{{ scope.row.createTime }}</span
                   >
@@ -81,8 +84,8 @@
                     style="
                       font-size: 14px;
                       color: rgba(204, 204, 204, 1);
-                      width:100px;
-                      display:block;
+                      width: 100px;
+                      display: block;
                     "
                     >阅读量：{{ scope.row.readVolume }}</span
                   >
@@ -91,7 +94,7 @@
             </div>
           </template>
         </el-table-column>
-         <!-- <el-table-column
+        <!-- <el-table-column
           label="文件"
           align="center"
           class-name="small-padding fixed-width"
@@ -137,25 +140,23 @@
           </template>
         </el-table-column>
       </el-table>
-      <!-- <el-pagination
-      :background="background"
-      :current-page.sync="currentPage"
-      :page-size.sync="queryParams.pageSize"
-      :layout="layout"
-      :page-sizes="queryParams.pageNum"
-      :pager-count="pagerCount"
-      :total="total"
-      v-bind="$attrs"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-    /> -->
-      <pagination
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="queryParams.pageNum"
+        :page-sizes="[2, 5, 8, 10]"
+        :page-size="queryParams.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+      <!-- <pagination
         v-show="total > 0"
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
         @pagination="getList"
-      />
+      /> -->
     </div>
     <!-- 右边 -->
     <div class="rights">
@@ -163,9 +164,18 @@
       <div class="catalog">
         <div class="jichu">
           目录
-          <el-button class="turnback" @click="turnback" v-if="addbtn==0">返回上级</el-button>
-          <el-button class="uploadfilesbtn" :class="addbtn?'margins':''" @click="upload" v-if="addbtn!=0">上传文件</el-button
-          ><el-button class="manage" @click="mange" v-if="addbtn!=0">目录管理</el-button>
+          <el-button class="turnback" @click="turnback" v-if="addbtn == 0"
+            >返回上级</el-button
+          >
+          <el-button
+            class="uploadfilesbtn"
+            :class="addbtn ? 'margins' : ''"
+            @click="upload"
+            v-if="addbtn != 0"
+            >上传文件</el-button
+          ><el-button class="manage" @click="mange" v-if="addbtn != 0"
+            >目录管理</el-button
+          >
         </div>
         <el-table
           v-loading="loading"
@@ -180,12 +190,34 @@
               <div
                 @click="mulus(scope.row)"
                 :class="scope.row.subclassification == 0 ? '' : 'undeline'"
-                style="position:relative;cursor:pointer"
+                style="position: relative; cursor: pointer"
               >
-              <img v-if="addbtn!=0" src="../../../images/文件夹.png" alt="" style="margin-right:5px;position:absolute;left:5px;top:2px">
-              <!-- 分类图片 -->
-              <img v-if="addbtn==0" src="../../../images/分类icon.png" alt="" style="margin-right:5px;position:absolute;left:5px;top:2px">
-              <span style="margin-left:25px"> {{ scope.row.directory }}</span>
+                <img
+                  v-if="addbtn != 0"
+                  src="../../../images/文件夹.png"
+                  alt=""
+                  style="
+                    margin-right: 5px;
+                    position: absolute;
+                    left: 5px;
+                    top: 2px;
+                  "
+                />
+                <!-- 分类图片 -->
+                <img
+                  v-if="addbtn == 0"
+                  src="../../../images/分类icon.png"
+                  alt=""
+                  style="
+                    margin-right: 5px;
+                    position: absolute;
+                    left: 5px;
+                    top: 2px;
+                  "
+                />
+                <span style="margin-left: 25px">
+                  {{ scope.row.directory }}</span
+                >
               </div>
             </template>
           </el-table-column>
@@ -195,7 +227,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"
@@ -228,7 +260,7 @@
                 size="add"
                 type="text"
                 @click="ViewProgress(scope.row)"
-                v-if="addbtn==true"
+                v-if="addbtn == true"
               >
                 <span>添加</span>
               </el-button>
@@ -242,36 +274,55 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination
+        <!-- <pagination
           class="pagination"
           v-show="total1 > 0"
           :total="total1"
           :page.sync="queryParams1.pageNum"
           :limit.sync="queryParams1.pageSize"
           @pagination="ListDirectoryinfo"
-        />
+        /> -->
+        <el-pagination
+          class="pagination"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange1"
+          :current-page="queryParams1.pageNum"
+          :page-sizes="[2, 5, 8, 10]"
+          :page-size="queryParams1.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total1"
+        >
+        </el-pagination>
       </div>
       <!-- 排行 -->
       <div class="Ranking">
         <div class="jichu">排行</div>
         <table style="color: white">
-          <tr class="borderBottom" v-for="(item,index) in Ranking" :key="item.directory_id">
+          <tr
+            class="borderBottom"
+            v-for="(item, index) in Ranking"
+            :key="item.directory_id"
+          >
             <!-- 作战类 documentCategory -->
             <!-- 上月阅读量 readnumber1 -->
             <!-- 本月阅读量 readnumber2 -->
             <!-- 排序 -->
-            <td class="numbers">{{index+1}}</td>
+            <td class="numbers">{{ index + 1 }}</td>
             <!-- 作战类类别 -->
-            <td class="find">{{item.documentCategory}}</td>
+            <td class="find">{{ item.documentCategory }}</td>
             <!-- 上周阅读量 -->
             <td class="readnumber">
-              上月阅读量 <span style="margin-left: 5px">{{item.readnumber2}}</span>
+              上月阅读量
+              <span style="margin-left: 5px">{{ item.readnumber2 }}</span>
             </td>
-            <!-- 本周阅读量 -->  
-            <td class="thisweek" style="position:relative">
+            <!-- 本周阅读量 -->
+            <td class="thisweek" style="position: relative">
               <!-- <img src="../../../images/upRow.png" alt="" style="position:absolute;top:18px;right:158px" > -->
               <!-- <img src="../../../images/downRow.png" alt=""  style="position:absolute;top:17px;right:158px"> -->
-              本月阅读量 <span style="color: red; margin-left: 5px">{{item. readnumber1}}</span>
+              本月阅读量
+              <span style="color: red; margin-left: 5px">{{
+                item.readnumber1
+              }}</span>
             </td>
           </tr>
         </table>
@@ -306,11 +357,11 @@
           >
           <template slot-scope="scope">
             <div style="position:relative"> -->
-              <!-- 阅读量增长箭头 -->
-            <!-- <img src="../../../images/upRow.png" alt="" style="position:absolute;top:5px;right:130px" > 
+        <!-- 阅读量增长箭头 -->
+        <!-- <img src="../../../images/upRow.png" alt="" style="position:absolute;top:5px;right:130px" > 
             阅读量下降箭头
             <img src="../../../images/downRow.png" alt=""  style="position:absolute;top:5px;right:130px"> -->
-            <!-- 本周阅读量
+        <!-- 本周阅读量
             {{scope.row.read}}
             </div>
           </template>
@@ -406,7 +457,6 @@
             <el-input
               v-model="form1.directory"
               placeholder="请输入目录名称"
-              @click.native="planName"
               class="filename"
             />
           </el-form-item>
@@ -436,7 +486,6 @@
             <el-input
               v-model="form2.directory"
               placeholder="请输入子分类名称"
-              @click.native="planName"
               class="filename"
             />
           </el-form-item>
@@ -465,7 +514,7 @@ import {
   // 导出文件列表接口
   exportFileinfo,
   // 获取排行接口
-  rankList
+  rankList,
 } from "@/api/regulations/fileinfo";
 import {
   // 查询目录列表接口
@@ -568,9 +617,9 @@ export default {
       // 添加上传文件名称
       title: "",
       // 排行数据
-      Ranking:[],
+      Ranking: [],
       // 添加按钮
-      addbtn:true
+      addbtn: true,
     };
   },
 
@@ -579,25 +628,70 @@ export default {
     // 获取目录接口
     this.ListDirectoryinfo();
     // 获取排行目录接口
-    rankList().then(res=>{
-      this.Ranking=res.data
-    })
-    $(".app-wrapper").removeClass("openSidebar")
-    console.log($(".app-wrapper"))
-    $(".app-wrapper").addClass("hideSidebar")
-    $(".sidebar-logo-container").removeClass("collapse")
+    // rankList().then((res) => {
+    //   this.Ranking = res.data;
+    // });
+    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;
+    });
+    },
+    handleSizeChange(val) {},
+    handleCurrentChange(val) {
+      // console.log(val)
+      this.queryParams.pageNum = val;
+      listFileinfo({
+        pageNum: this.queryParams.pageNum,
+        pageSize: this.queryParams.pageSize,
+      }).then((res) => {
+        this.fileinfoList = res.rows;
+        this.total = res.total;
+      });
+    },
+    handleCurrentChange1(val) {
+      // console.log(val)
+      this.queryParams1.pageNum = val;
+      console.log(this.queryParams1.pageNum);
+      console.log(this.queryParams1.pageSize);
+      // this.queryParams.common = "1";
+
+      if (this.parentId) {
+        this.queryParams1.common = null;
+      } else {
+        this.queryParams1.common = "1";
+      }
+      listDirectoryinfo({
+        parentId: this.parentId,
+        pageNum: this.queryParams1.pageNum,
+        pageSize: this.queryParams1.pageSize,
+        common: this.queryParams1.common,
+      }).then((res) => {
+        this.directory = res.rows;
+        this.total1 = res.total;
+        this.loading = false;
+      });
+    },
     // 文件删除按钮操作
     handledels(row) {
-      console.log(row)
-        this.$modal
-        .confirm('是否确认删除该文件')
+      console.log(row);
+      this.$modal
+        .confirm("是否确认删除该文件")
         .then(function () {
           return delFileinfo(row.id);
         })
         .then(() => {
+          
+          this.ListDirectoryinfo();
+          this.RankList()
           this.getList();
+          
           this.$modal.msgSuccess("删除成功");
         })
         .catch(() => {});
@@ -610,9 +704,11 @@ export default {
     ListDirectoryinfo() {
       this.loading = true;
       this.queryParams.common = "1";
-      listDirectoryinfo(this.queryParams).then((res) => {
+      this.queryParams1.common = "1";
+      listDirectoryinfo(this.queryParams1).then((res) => {
         this.directory = res.rows;
-        this.total1 = res.rows.length;
+        console.log(this.directory);
+        this.total1 = res.total;
         this.loading = false;
         // console.log(this.directory);
       });
@@ -620,16 +716,33 @@ export default {
     // 点击目录根据子目录的数量控制他是否可以点进去进行渲染
     mulus(row) {
       this.parentId = row.id;
-      this.form.directoryId=row.id
-      listFileinfo({directoryId:this.form.directoryId}).then(res=>{
+      this.form.directoryId = row.id;
+       // 文件
+      listFileinfo({
+        directoryId: this.form.directoryId,
+        pageNum: this.queryParams.pageNum,
+        pageSize: this.queryParams.pageSize,
+      }).then((res) => {
         this.fileinfoList = res.rows;
         this.total = res.total;
-      })
-      listDirectoryinfo({ parentId: this.parentId }).then((res) => {
+      });
+      // console.log(row)
+      if (row.subclassification == 0) {
+        this.parentId = "";
+        return;
+      }
+     
+      // 目录
+      listDirectoryinfo({
+        parentId: this.parentId,
+        pageNum: this.queryParams1.pageNum,
+        pageSize: this.queryParams1.pageSize,
+      }).then((res) => {
         res.rows.forEach((item) => {
           if (item.subclassification == 0) {
             this.directory = res.rows;
-            this.addbtn=false
+            this.total1 = res.total;
+            this.addbtn = false;
           } else {
             return;
           }
@@ -639,8 +752,8 @@ export default {
     },
     // 返回目录
     turnback() {
-      this.addbtn=true
-      this.getList()
+      this.addbtn = true;
+      this.getList();
       this.ListDirectoryinfo();
     },
     // 选中父目录之后
@@ -658,7 +771,7 @@ export default {
       listFileinfo(this.queryParams).then((response) => {
         this.fileinfoList = response.rows;
         this.total = response.total;
-        this.loading=false
+        this.loading = false;
       });
     },
     // 取消按钮
@@ -718,7 +831,7 @@ export default {
     },
     /** 上传文件提交按钮 */
     submitForm() {
-      console.log(this.form)
+      console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           console.log(this.form.file[0]);
@@ -786,12 +899,13 @@ export default {
           return delDirectoryinfo(ids);
         })
         .then(() => {
-            this.getList();
+          this.getList();
+          
           this.ListDirectoryinfo();
-          this.loading=false
-          this.loading1=false
+          this.RankList()
+          this.loading = false;
+          this.loading1 = false;
           this.$modal.msgSuccess("删除成功");
-
         })
         .catch(() => {});
     },
@@ -846,6 +960,9 @@ export default {
       row.common = "1";
       updateFileinfo(row).then((res) => {
         this.getList();
+        rankList().then((res) => {
+          this.Ranking = res.data;
+        });
       });
       // console.log(this.fileinfoList);
       // window.open("www.baidu.com","_self");
@@ -864,7 +981,6 @@ export default {
   line-height: 40px;
   border-left: 4px solid rgba(29, 150, 255, 1);
   text-indent: 1em;
- 
 }
 /* 文件表格 */
 .tablesfile {
@@ -972,7 +1088,7 @@ export default {
 }
 /* 阅读按钮样式 */
 .el-button--reads .chakan1 {
-  padding-top:2px;
+  padding-top: 2px;
   margin-left: 7px;
 }
 /* 表格 */
@@ -1046,9 +1162,9 @@ table {
   color: white;
   border-radius: 4px;
   font-size: 14px;
-  text-align: center; 
+  text-align: center;
 }
-.margins{
+.margins {
   margin-left: 370px;
 }
 /* 返回目录按钮 */
@@ -1176,7 +1292,8 @@ table {
   cursor: pointer;
 }
 /* 序号居中 */
-::v-deep .el-table_1_column_1,.el-table_3_column_9 {
+::v-deep .el-table_1_column_1,
+.el-table_3_column_9 {
   text-align: center;
 }
 ::v-deep .el-table_2_column_4 {
@@ -1213,14 +1330,52 @@ body,
   margin: auto;
 } */
 /* 下拉框样式 */
-::v-deep .guizhangzhidu .el-select-dropdown .el-select-dropdown__wrap .el-scrollbar__view{
-  background-color: white !important;
+::v-deep
+  .guizhangzhidu
+  .el-select-dropdown
+  .el-select-dropdown__wrap
+  .el-scrollbar__view {
+  background-color: transparent !important;
   text-indent: 1em !important;
 }
-::v-deep .guizhangzhidu .el-select-dropdown__list{
+::v-deep .guizhangzhidu .el-select-dropdown__list {
   background: white !important;
 }
-::v-deep .el-table_2_column_13 .cell{
+::v-deep .el-table_2_column_13 .cell {
   text-align: center !important;
 }
+.el-select-dropdown__item {
+  color: black !important;
+}
+::v-deep .el-form-item__content .el-input__inner {
+  color: white !important;
+}
+::v-deep .el-pagination {
+  margin-top: 10px;
+  position: absolute;
+  right: 0;
+}
+::v-deep .el-pager li.active {
+  background-color: transparent;
+  color: white;
+}
+/* ::v-deep .el-pager .number{
+  background-color: transparent;
+  color: white;
+} */
+::v-deep .btn-prev{
+  background-color: transparent;
+  color: white;
+}
+::v-deep .btn-next{
+  background-color: transparent;
+  color: white;
+}
+.pagination-container {
+  background: #fff;
+  padding: 32px 16px;
+}
+.pagination-container.hidden {
+  display: none;
+}
 </style>