Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-operate-ui/src/views/monitoring/EnterpriseMonitoring.vue

@@ -58,8 +58,6 @@
                 label="操作"
                 align="left"
                 width="160"
-                class-name="small-padding fixed-width"
-                fixed="right"
               >
                 <template slot-scope="scope">
                   <span style="color:#0081FF;" @click="handleCancel(scope.row.companyId)">取消监控</span>
@@ -423,6 +421,7 @@
         position: relative;
         ::v-deep .el-radio{
           margin-right:16px;
+          color: rgba(35,35,35,0.8);
         }
         ::v-deep .el-date-editor{
           position: absolute;

dsk-operate-ui/src/views/monitoring/MonitoringDynamics.vue

@@ -96,8 +96,6 @@
                 label="操作"
                 align="center"
                 width="150"
-                class-name="small-padding fixed-width"
-                fixed="right"
               >
                 <template slot-scope="scope">
                   <span style="cursor: pointer;color:#0081FF;" @click="handleDetail(scope.row)">查看详情</span>
@@ -718,10 +716,11 @@
           top: -6px;
           opacity: 0;
           line-height: 22px;
-          .el-input {
+          ::v-deep .el-input {
             width: 100%;
             line-height: 22px;
             .el-input__inner {
+              color: rgba(35,35,35,0.8);
               width: 100%;
               height: 22px !important;
             }
@@ -744,6 +743,12 @@
             margin-right: 24px;
           }
         }
+        ::v-deep .el-radio{
+          color: rgba(35,35,35,0.8);
+        }
+        ::v-deep .el-checkbox__label{
+          color: rgba(35,35,35,0.8);
+        }
         ::v-deep .el-checkbox{
           margin-right: 10px;
         }

dsk-operate-ui/src/views/monitoring/MonitoringReport.vue

@@ -51,6 +51,9 @@
           <div class="p1">抱歉，没找到相关数据</div>
           <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
         </div>
+        <div class="pagination-box" v-if="tableDataTotal>queryParams.pageSize" style="background: #ffffff;margin-top: 16px;padding-right: 16px;">
+          <el-pagination background :current-page="queryParams.pageNum" :page-size="queryParams.pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
+        </div>
       </div>
     </div>
 </template>
@@ -89,7 +92,6 @@
     methods: {
       async querySubmit() {
         reportPage(this.queryParams).then(res => {
-          console.log(res)
           this.isSkeleton = false;
           this.dataList=res.rows;
           this.tableDataTotal=res.total
@@ -100,7 +102,19 @@
         this.queryParams.pageNum=1
         this.queryParams.pageSize=10
         this.querySubmit()
-      }
+      },
+      // 重置页数
+      handleSizeChange(val) {
+        this.queryParams.pageNum = 1
+        this.queryParams.pageSize = val
+        this.querySubmit()
+      },
+      // 跳转指定页数
+      handleCurrentChange(val) {
+        this.queryParams.pageNum = val
+        this.querySubmit()
+        window.scrollTo(0, 0);
+      },
     }
   }
 </script>

dsk-operate-ui/src/views/system/supplierBad/index.vue

@@ -18,8 +18,6 @@
             <el-table-column
               label="操作"
               align="left"
-              class-name="small-padding fixed-width"
-              fixed="right"
             >
               <template slot-scope="scope">
                 <span v-if="scope.row.status===0" style="cursor: pointer;margin-right: 16px;color: #0081FF;" @click="handleClick(scope.row,1)">停用</span>