Merge remote-tracking branch 'origin/master'

neim-ui/src/assets/styles/screenPage.scss

@@ -67,6 +67,51 @@
     line-height: 80px !important;
     font-size: 24px;
   }
+  /*后台*/
+  .textInfo{
+    line-height: 40px !important;
+    font-size: 25px !important;
+  }
+  .contentBox{
+    font-size: 24px !important;
+    height: 200px !important;
+    .numberBox {
+      font-size: 28px !important;
+      span{
+        font-size: 20px !important;
+      }
+    }
+  }
+  .tiltle {
+    font-size: 28px !important;
+  }
+  .windDataBg{
+    height: 180px !important;
+    .dataBox {
+      font-size: 24px !important;
+      .dataContent {
+        font-size: 38px !important;
+      }
+    }
+  }
+  .infoContent{
+    font-size: 24px !important;
+  }
+  .textBox{
+    .wdText{
+      width: 70px !important;
+      font-size: 20px !important;
+    }
+    .text{
+      font-size: 28px !important;
+    }
+    span{
+      line-height: 30px !important;
+    }
+  }
+  .pageLeft-left{
+    font-size: 24px;
+  }
 }
 @media screen and (max-width: 1920px) and (min-width: 1540px){
   .myMain-container {
@@ -147,4 +192,28 @@
     height: 95%;
     overflow-y: scroll;
   }
+  /*后台*/
+  .textInfo{
+    line-height: 20px !important;
+    font-size: 14px !important;
+  }
+  .contentBox{
+    font-size: 14px !important;
+    height: 100px !important;
+    .numberBox {
+      font-size: 16px !important;
+    }
+  }
+  .windDataBg{
+    height: 100px !important;
+  }
+  .textBox{
+    .wdText{
+      font-size: 10px !important;
+    }
+    .text{
+      font-size: 14px !important;
+    }
+  }
+
 }

neim-ui/src/views/largeScreenPage/Subpage/projectEvolve.vue

@@ -2,7 +2,7 @@
   <div class="page projectEvolvePage">
     <div class="timeBox">{{ time }}</div>
     <div class="topTiltle">
-<!--      <span class="title">项目进展情况</span>-->
+      <!--      <span class="title">项目进展情况</span>-->
       <img
         class="titleImg"
         referrerpolicy="no-referrer"
@@ -16,8 +16,14 @@
       <div class="topBtu topRightBtu" @click="push()">
         <span class="btuText">后台管理</span>
       </div>
-      <div class="topBtu topRightBtu" @click="initInfo()">
-        <span class="btuText">还原</span>
+      <div class="topBtu" @click="reduction()">
+<!--        <span class="btuText">还原</span>-->
+        <img
+          width="20"
+          style="margin-right: 10px;cursor: pointer"
+          referrerpolicy="no-referrer"
+          src="../../../../public/largeScreenImg/reduction.png"
+        />
       </div>
     </div>
     <div class="myMain-container">
@@ -29,16 +35,17 @@
         </div>
         <div class="tableContent">
           <el-table
-            :data="tableData"
+            :data="tableData" ref="projectEvolveTable"
             :cell-style="cellStyle"
             :header-cell-style="headClass"
             border
             :span-method="handleSpanMethod"
-            :row-style="{height:'0'}">
+            :row-style="{height:'0'}" height="calc(70vh)"
+            style="width: 100%;background: #16354c">
             <el-table-column
               prop="taskNo"
               label="序号"
-              width="50%" :formatter="formatTaskNo">
+              width="20" :formatter="formatTaskNo">
 
             </el-table-column>
 
@@ -92,7 +99,7 @@
                   @click="handleDelete(scope.$index, scope.row)">删除
                 </el-button>
 
-                <div style="float:right">
+                <div class="uploadBtu">
                   <el-upload
                     :http-request="dataUpload"
                     :before-upload="beforeUpload"
@@ -424,6 +431,21 @@ export default {
     pushPreProjectResource() {
       this.$router.push({path: "/homepage/preProjectResources"})
     },
+    /*还原*/
+    reduction() {
+      this.$confirm('此操作将还原表格, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.initInfo()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        });
+      });
+    },
     /*时间格式化*/
     formatTime() {
       this.time = ''
@@ -437,6 +459,9 @@ export default {
       if (day < 10) day = "0" + day;
       if (minutes < 10) minutes = "0" + minutes;
       this.time = year + "-" + month + "-" + day + " " + hour + ' : ' + minutes;
+      this.$nextTick(() => { //在数据加载完，重新渲染表格
+        this.$refs['projectEvolveTable'].doLayout();
+      })
     },
 
     /**
@@ -623,11 +648,13 @@ export default {
   display: flex;
   justify-content: center;
 }
+
 .titleImg {
   width: 11%;
   height: 60%;
   margin-top: .5%;
 }
+
 .title {
   width: 17%;
   height: 100%;
@@ -686,7 +713,7 @@ export default {
 
 .tableBox {
   width: 95%;
-  height: calc(90vh);
+  height: calc(85vh);
   background: url(../../../assets/largeScreenImg/index/leftTextBg.png) 100% no-repeat;
   background-size: 100% 100%;
   padding: 2%;
@@ -712,6 +739,12 @@ export default {
   margin-top: 2%;
 }
 
+/*解决出现滚动条，错位问题*/
+.tableContent /deep/ .el-table__header-wrapper {
+  background: #16354c;
+  padding-right: 8px !important; /*滚动条宽度*/
+}
+
 .tableContent /deep/ .el-table .el-table__header-wrapper th, .el-table .el-table__fixed-header-wrapper th {
   background: #16354c;
   text-align: center;
@@ -750,10 +783,6 @@ export default {
   background-color: #0a3b6e; /*滚动条的背景颜色*/
 }
 
-.tableContent /deep/ .el-table colgroup col[name='gutter'] {
-  width: 0px;
-}
-
 .tableContent /deep/ .el-table__body {
   width: 100% !important;
 }
@@ -762,7 +791,13 @@ export default {
   width: 100% !important;
 }
 
-
+.uploadBtu {
+  display: inline-block;
+  margin-left: 10px
+}
+.uploadBtu /deep/ .el-upload-list{
+  display: none;
+}
 .bottomPushBtu {
   background: url(../../../assets/largeScreenImg/index/topLeftBtuBg.png) 100% no-repeat;
   background-size: 100% 100%;