Эх сурвалжийг харах

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

sunyanqiang 2 жил өмнө
parent
commit
d6a83b5960

+ 2 - 2
src/components/look_word/bdgldrill.vue

@@ -14,7 +14,7 @@
         "
       >
         {{ message[0].unitname
-        }}{{ message[0].createtime | dataFormaty }}军事训练登记表
+        }}军事训练登记表
       </p>
       <table
         class="b1"
@@ -421,4 +421,4 @@ tr:last-child {
   border: 1px solid rgb(129, 130, 131);
   border-radius: 5px;
 }
-</style>
+</style>

+ 1 - 2
src/views/grassrootsregistration/bdglevens/index.vue

@@ -75,7 +75,6 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="单位" align="center" prop="unitName" />
         <el-table-column label="会议议题" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ onEditor(scope.row.title) }}</span>
@@ -427,4 +426,4 @@ li {
 img {
   object-fit: cover;
 }
-</style>
+</style>

+ 1 - 2
src/views/grassrootsregistration/bdglmeetings/index.vue

@@ -67,7 +67,6 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="单位" align="center" prop="deptName" />
         <el-table-column
           label="召开时间"
           align="center"
@@ -445,4 +444,4 @@ li {
   height: 500px;
   border-radius: 10px;
 }
-</style>
+</style>

+ 1 - 2
src/views/grassrootsregistration/bdglpartys/index.vue

@@ -72,7 +72,6 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="单位" align="center" prop="unitName" />
         <el-table-column label="会议议题" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ onEditor(scope.row.title) }}</span>
@@ -427,4 +426,4 @@ li {
   height: 500px;
   border-radius: 10px;
 }
-</style>
+</style>

+ 1 - 2
src/views/grassrootsregistration/bdglsoldiers/index.vue

@@ -69,7 +69,6 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="单位" align="center" prop="deptName" />
         <el-table-column label="会议议题" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ onEditor(scope.row.title) }}</span>
@@ -444,4 +443,4 @@ li {
   height: 500px;
   border-radius: 10px;
 }
-</style>
+</style>

+ 30 - 46
src/views/regulations/fileinfo/index.vue

@@ -172,7 +172,8 @@
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
-        @pagination="handleCurrentChange()"
+        :page-sizes="[8]"
+        @pagination="handleCurrentChange"
       />
       <pagination
         v-if="nunms == 1"
@@ -180,8 +181,18 @@
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
+        :page-sizes="[8]"
         @pagination="handleCurrentChanges"
       />
+      <pagination
+        v-if="nunms == 2"
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        :page-sizes="[8]"
+        @pagination="handleCurrentChangess"
+      />
     </div>
 
     <!-- 右边 -->
@@ -745,6 +756,7 @@ export default {
       nunms: 0,
       // 点击右侧一级分类进去
       Ids: null,
+      last: null,
     };
   },
 
@@ -829,28 +841,6 @@ export default {
         this.fileinfoList = res.rows;
         this.total = res.total;
       });
-      // if(this.nunms==0){
-      //   this.queryParams.pageNum = val;
-      // listFileinfo({
-      //   pageNum: this.queryParams.pageNum,
-      //   pageSize: this.queryParams.pageSize,
-      // }).then((res) => {
-      //   this.fileinfoList = res.rows;
-      //   this.total = res.total;
-      // });
-      // if(this.nunms==1){
-      //   listParents({
-      //     parentid: row.id,
-      //     pageNum: this.queryParams.pageNum,
-      //     pageSize: this.queryParams.pageSize,
-      //   }).then(res=>{
-      //     console.log(res,1);
-      //     this.fileinfoList = res.rows;
-      //     this.total = res.total;
-      //   })
-      // }
-      // }
-      console.log(val);
     },
     handleCurrentChanges() {
       this.queryParams.parentid=this.Ids;
@@ -859,6 +849,18 @@ export default {
         this.total = res.total;
       });
     },
+    handleCurrentChangess() {
+      // 文件
+      listFileinfo({
+        directoryId: this.last,
+        pageNum: this.queryParams.pageNum,
+        pageSize: this.queryParams.pageSize,
+      }).then((res) => {
+        this.nunms = 2;
+        this.fileinfoList = res.rows;
+        this.total = res.total;
+      });
+    },
     handleCurrentChange1(val) {
       this.queryParams1.pageNum = val;
       // this.queryParams.common = "1";
@@ -919,7 +921,6 @@ export default {
     },
     // 点击目录根据子目录的数量控制他是否可以点进去进行渲染
     mulus(row) {
-      console.log(row, 1);
       this.nunms = 1;
       if (row.parentId == 0) {
         this.parentId = row.id;
@@ -928,38 +929,20 @@ export default {
         this.parentId = row.parentId;
       }
       if (row.parentId == 0) {
+        this.queryParams.pageNum = 1;
         listParents({
           parentid: row.id,
           pageNum: this.queryParams.pageNum,
           pageSize: this.queryParams.pageSize,
         }).then((res) => {
-          console.log(res, 1);
           this.fileinfoList = res.rows;
           this.total = res.total;
         });
       } else {
-        // if(this.parentId)
-        this.form.directoryId = row.id;
-        // 文件
-        listFileinfo({
-          directoryId: this.form.directoryId,
-          pageNum: this.queryParams.pageNum,
-          pageSize: this.queryParams.pageSize,
-        }).then((res) => {
-          console.log(res, 2);
-          this.fileinfoList = res.rows;
-          // this.fileinfoList.map(item=>{
-          //   item.parentDirName='http://localhost:8089'+item.parentDirName;
-
-          // })
-          this.total = res.total;
-        });
+        this.last = row.id
+        this.queryParams.pageNum = 1;
+        this.handleCurrentChangess()
       }
-      // if (row.subclassification == 0) {
-      //   this.parentId = "";
-      //   return;
-      // }
-      // this.queryParams1.pageNum=1;
       // 目录
       listDirectoryinfo({
         parentId: this.parentId,
@@ -985,6 +968,7 @@ export default {
       this.parentId = "";
       this.addbtn = true;
       this.queryParams1.pageNum = 1;
+      this.queryParams.pageNum = 1;
       this.getList();
       this.ListDirectoryinfo();
     },