Merge remote-tracking branch 'origin/master'

付延余

2022-04-11 e765d3974558793043740a7ca46d6b1bc5e260d7

Merge remote-tracking branch 'origin/master'

 .postcssrc.js

@@ -8,7 +8,7 @@
    "autoprefixer": {},
    "postcss-px2rem-exclude": {  // 添加的代码
      remUnit: 256,
      exclude: /node_modules|element/i // 忽略node_modules目录下的文件
      // exclude: /node_modules|element/i // 忽略node_modules目录下的文件
    }

  }

 src/pages/components/jiuyeQingkuang/chengzhenXinzengJiuye.vue

@@ -3,6 +3,7 @@
      <el-table
        border
        :data="tableData"
        :header-cell-style="handleheader"
        style="width: 100%">
        <el-table-column
          prop="shiqu"
@@ -101,6 +102,13 @@
                    address: '624'
                }]
            }
        },
        methods: {
            handleheader(data) {
                return {
                    lineHeight: '0',
                }
            }
        }
    }
</script>
@@ -109,12 +117,12 @@
  @import "../../../assets/css/base";
  .chengzhenXinzengJiuye-wrap{
    width: 100%;
    margin-top: 2rem;
    margin-top: 0.078125rem  /* 20/256 */;
    .el-table th.el-table__cell{
      background-color:$color-blue;
    }
    .el-table tr{
      height: 6.4rem;
    .el-table .el-table__body-wrapper tr{
      height: 0.25rem  /* 64/256 */;
    }
    .el-table tr:nth-child(odd){
      background-color: #CEF2FF;
@@ -138,10 +146,10 @@
      line-height: 1;
    }
    .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
      border-bottom:1px solid $color-grey; /*no*/
      border-bottom:1Px solid $color-grey; /*no*/
    }
    .el-table--border .el-table__cell, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{
      border-right:1px solid $color-grey; /*no*/
      border-right:1Px solid $color-grey; /*no*/
    }
  }
</style>

 src/pages/show/index/index.vue

@@ -817,7 +817,7 @@
        .yanglao-block-inside2{
          width: 100%;
          display: flex;
          margin-top: 1rem;
          margin-top: 0.0390625rem  /* 10/256 */;
          .inside-left2{
            flex: 1;
            display: flex;
@@ -827,7 +827,7 @@
              display: flex;
              justify-content: center;
              .rightMargin{
                margin-right: 1rem;
                margin-right: 0.0390625rem  /* 10/256 */;
                color: #fff;
                font-size: $fontSize-20;
                line-height: 1.3;
@@ -841,15 +841,15 @@
        }
      }
      .yanglao-block2{
        width: 59rem  /* 590/10 */;
        height: 23rem  /* 230/10 */;
        width: 2.3046875rem  /* 590/256 */;
        height: 0.8984375rem  /* 230/256 */;
        background:url("../../../assets/images/yanglao-block-bj.png") no-repeat center;
        background-size: 100% 100%;
        display: flex;
        align-items: center;
        justify-content: center;
        position: relative;
        margin: 0 2rem;
        margin: 0 0.078125rem  /* 20/256 */;
        .yaolao-box{
          flex: 1;
          display: flex;
@@ -857,12 +857,12 @@
          justify-content: center;
          align-items: center;
          &:first-child{
            margin-left: 2rem;
            margin-left: 0.078125rem  /* 20/256 */;
          }
        }
        img{
          width: 8rem;
          height: 8rem;
          width: 0.3125rem  /* 80/256 */;
          height: 0.3125rem  /* 80/256 */;
        }
        h1{
          color: #fff;
@@ -882,12 +882,12 @@
      }
      .fu-biaoti{
        position: absolute;
        left:0.2rem;
        top:3rem;
        left:0.0078125rem  /* 2/256 */;
        top:0.1171875rem  /* 30/256 */;
        background:url("../../../assets/images/fubiaoti-bj.png") no-repeat center;
        background-size: 100% 100%;
        width: 3.2rem  /* 32/10 */;
        height: 16.7rem  /* 167/10 */;
        width: 0.125rem  /* 32/256 */;
        height:0.65234375rem  /* 167/256 */;
        display: flex;
        align-items: center;
        justify-content: center;
@@ -900,18 +900,18 @@
    }
    .index-line-box2{
      display: flex;
      margin-top: 3.2rem;
      margin-top: 0.125rem  /* 32/256 */;
      .shu-ju-box{
        width: 122rem  /* 1220/10 */;
        height: 41rem;
        width: 4.765625rem  /* 1220/256 */;
        height: 1.6015625rem  /* 410/256 */;
        background: url("../../../assets/images/yanglao-block-big-bj.png") no-repeat center;
        background-size: 100% 100%;
        position: relative;
        margin: 0 2rem;
        margin: 0 0.078125rem  /* 20/256 */;
        display: flex;
        .shuju-title-box{
          position: absolute;
          left: 10rem;
          left: 0.390625rem  /* 100/256 */;
          top: 0;
          h1{
            font-size: $fontSize-32;
@@ -921,22 +921,22 @@
              content: '';
              background: url("../../../assets/images/zhuangshi.png") no-repeat center;
              background-size: 100% 100%;
              width: 13.5rem;
              height: 1.6rem;
              width: 0.52734375rem  /* 135/256 */;
              height: 0.0625rem  /* 16/256 */;
              position: absolute;
              left: 20rem;
              top: 1.2rem  /* 12/10 */;
              left: 0.78125rem  /* 200/256 */;
              top: 0.046875rem  /* 12/256 */;
            }
          }
        }
        .shuju-main-box{
          width: 100%;
          padding: 6rem 3rem;
          padding: 0.234375rem  /* 60/256 */ 0.1171875rem  /* 30/256 */;
          box-sizing: border-box;
          display: flex;
          .shuju-table{
            width: 80.2rem;
            height: 31rem;
            width: 3.1328125rem  /* 802/256 */;
            height: 1.2109375rem  /* 310/256 */;
          }
        }
        .shuju-table{
@@ -947,7 +947,7 @@
            width: 100%;
            display: flex;
            .biao-title{
              width: 34rem;
              width: 1.328125rem  /* 340/256 */;
            }
            .title-flex{
              width: 100%;
@@ -964,12 +964,12 @@

          }
          .shuju-scroll{
            @include overflow-y(28rem)
            @include overflow-y(280)
          }
          .shuju-table-line2{
            width: 100%;
            display: flex;
            padding: 1rem 0;
            padding: 0.0390625rem  /* 10/256 */ 0;
            &:nth-child(odd) {
              background: rgba(81,210,255,0.10);
            }
@@ -990,7 +990,7 @@
              display: flex;
            }
            .biao-title{
              width: 34rem;
              width: 1.328125rem  /* 340/256 */;
              h1{
                font-size: $fontSize-26;
                color: $color-white;
@@ -1007,8 +1007,8 @@
          }
        }
        .shuju-echarts{
          width: 35rem  /* 168/10 */;
          height: 31rem;
          width: 1.3671875rem  /* 350/256 */;
          height: 1.2109375rem  /* 310/256 */;
        }
      }
    }

 src/pages/show/jiuyeAndChuangye/jiuyeAndChuangye.vue

@@ -48,20 +48,23 @@
      border-right:none;
    }
    .el-menu-item, .el-submenu__title{
      height: 8rem;
      margin: 3rem 0;
      height: 0.3125rem  /* 80/256 */;
      margin: 0.1171875rem  /* 30/256 */ 0;
    }
    .el-menu-item{
      background:url("../../../assets/images/jiuye-menu-normal.png") no-repeat center;
      background-size: 100% 100%;
      width: 19.2rem;
      height: 8rem;
      width: 0.75rem  /* 192/256 */;
      height: 0.3125rem  /* 80/256 */;
      display: flex;
      justify-content: center;
      padding-left: 0;
    }
    .el-menu-item.is-active{
      background:url("../../../assets/images/jiuye-menu-active.png") no-repeat center;
      background-size: 100% 100%;
      width: 19.2rem;
      height: 8rem;
      width: 0.75rem  /* 192/256 */;
      height: 0.3125rem  /* 80/256 */;
    }
  }

@@ -71,32 +74,36 @@
  @import "../../../assets/css/mixin";
  .jiuyeAndChuangye-wrap{
    width: 100%;
    padding: 2rem;
    padding: 0.078125rem  /* 20/256 */;
    box-sizing: border-box;
    display: flex;
    .menu-left{
      width: 0.9375rem  /* 240/256 */;
      height: 135rem  /* 1249/10 */;
      height: 5.2734375rem  /* 1350/256 */;
      background:url("../../../assets/images/jiuye-menu-bj.png") no-repeat center;
      background-size: 100% 100%;
      padding: 4rem 0;
      padding: 0.15625rem  /* 40/256 */ 0;
      box-sizing: border-box;
      display: flex;
      justify-content: center;
      .menu-left-block{
        width: 100%;
        display: flex;
        justify-content: center;
        h1{
          font-size: $fontSize-24;
          color: $color-blue;
          text-align: center;
          line-height: 8rem;
          line-height: 0.3125rem  /* 80/256 */;
        }
      }
    }
    .menu-right{
      flex: 1;
      padding: 0 2rem  /* 20/10 */;
      padding: 0 0.078125rem  /* 20/256 */;
      box-sizing: border-box;
      @include overflow-y(150rem)
      @include overflow-y(150px);
      height: 100%;
    }
  }


 src/pages/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue

@@ -269,32 +269,31 @@
  overflow-y: auto;
  .biyeshengStatistics-table{
    width: 100%;
    border: 1px solid $color-grey; /*no*/
    border: 1Px solid $color-grey; /*no*/
    border-collapse: collapse;
    table-layout: fixed;
    thead{
      background-color: $color-blue;
      tr{
        height: 5.2rem;
        height: 0.203125rem  /* 52/256 */;
      }
      th,td{
        color: $color-darkGrey;
        border:1px solid $color-grey; /*no*/
        border:1Px solid $color-grey; /*no*/
        font-weight: 300;
        font-size: $fontSize-24;
      }
    }
    tbody{
      background-color: #CEF2FF;
      height: 100rem;
      overflow-y: auto;
      height: 3.90625rem  /* 1000/256 */;
      tr{
        height: 5.2rem;
        height: 0.203125rem  /* 52/256 */;
      }
      th,td{
        color: $color-darkGrey;
        text-align: center;
        border:1px solid $color-grey; /*no*/
        border:1Px solid $color-grey; /*no*/
        font-weight: 300;
        font-size: $fontSize-24;
      }

 src/pages/show/jiuyeAndChuangye/jiuyeChildren/chuangyeDanbaoDaikuan.vue

@@ -110,7 +110,7 @@
    width: 100%;
    height: 100%;
    .danbaotongjibiao-box{
      margin-top: 2rem;
      margin-top: 0.078125rem  /* 20/256 */;
      h1{
        font-size: $fontSize-30;
        color: $color-white;
@@ -120,17 +120,17 @@
    }
    .chuangye-table-box{
      width: 100%;
      border: 1px solid $color-grey; /*no*/
      border: 1Px solid $color-grey; /*no*/
      border-collapse:collapse;
      table-layout: fixed;
      thead{
        background-color: $color-blue;
        tr{
          height: 11.2rem  /* 112/10 */;
          height: 0.4375rem  /* 112/256 */;
        }
        th,td{
          color: $color-darkGrey;
          border:1px solid $color-grey; /*no*/
          border:1Px solid $color-grey; /*no*/
          font-weight: 300;
          font-size: $fontSize-28;
        }
@@ -140,24 +140,24 @@
        &::after{
          content: '';
          width: calc(100%);
          height: 1px; /*no*/
          height: 1Px; /*no*/
          background-color: $color-grey;
          position: absolute;
          left: -0.1rem  /* -1/10 */;
          top: 0rem  /* 22/10 */;
          left: -1Px;
          top: 0;
          transform: rotate(10deg);
        }
        .time{
          position: absolute;
          left: 10rem;
          left: 0.390625rem  /* 100/256 */;
          top: 0rem;
          font-size: $fontSize-28;
          font-weight: 300;
        }
        .xiaomu{
          position: absolute;
          right: 10rem;
          top: -3rem;
          right: 0.390625rem  /* 100/256 */;
          top: -0.1171875rem  /* -30/256 */;
          font-size: $fontSize-28;
          font-weight: 300;
        }
@@ -166,10 +166,10 @@
        background-color: #CEF2FF;
        th,td{
          color: $color-darkGrey;
          height: 11.2rem  /* 112/10 */;
          line-height: 11.2rem;
          height: 0.4375rem  /* 112/256 */;
          line-height: 0.4375rem  /* 112/256 */;
          text-align: center;
          border:1px solid $color-grey; /*no*/
          border:1Px solid $color-grey; /*no*/
          font-weight: 300;
          font-size: $fontSize-28;
        }

 src/pages/show/jiuyeAndChuangye/jiuyeChildren/jiuyeQingkuang.vue

@@ -45,23 +45,23 @@
      justify-content: center;
    }
    .el-tabs__item{
      width: 24rem;
      height: 6.4rem;
      width: 0.9375rem  /* 240/256 */;
      height: 0.25rem  /* 64/256 */;
      background: rgba(81,210,255,0.08);
      border: 1px solid #0097cc; /*no*/
      border: 1Px solid #0097cc; /*no*/
      color: #9CE6FF;
      font-size: $fontSize-24;
      margin: 0 2rem  /* 10/10 */;
      margin: 0 0.078125rem  /* 20/256 */  /* 10/10 */;
      display: flex;
      justify-content: center;
      align-items: center;
    }
    .el-tabs__item.is-active{
      width: 24rem;
      height: 6.4rem;
      width: 0.9375rem  /* 240/256 */;
      height: 0.25rem  /* 64/256 */;
      background: #00a6e1;
      border: 1px solid #51d2ff;
      box-shadow: 0px 3px 10px 0px rgba(255,255,255,0.80) inset;
      border: 1Px solid #51d2ff;
      box-shadow: 0Px 3Px 10Px 0Px rgba(255,255,255,0.80) inset;
      color: $color-white;
      font-size: $fontSize-24;
      display: flex;
@@ -88,7 +88,7 @@
      color: $color-white;
      text-align: center;
      line-height: 2;
      margin-bottom: 2rem;
      margin-bottom: 0.078125rem  /* 20/256 */;
    }
  }
</style>

 src/pages/show/jiuyeAndChuangye/jiuyeChildren/workStatistics.vue

@@ -6,6 +6,7 @@
        <el-table
          max-height="640"
          :data="tableData"
          :header-cell-style="handleheader"
          stripe
          border
          style="width: 100%">
@@ -129,6 +130,13 @@
                    address: '2222'
                }]
            }
        },
        methods: {
            handleheader(data) {
                return {
                    lineHeight: '0',
                }
            }
        }
    }
</script>
@@ -152,13 +160,13 @@
      color: #111111;
    }
    .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
      border-bottom: 1px solid #8E8E8E;
      border-bottom: 1Px solid #8E8E8E;
    }
    .el-table--border .el-table__cell, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{
      border-right: 1px solid #8E8E8E;
      border-right: 1Px solid #8E8E8E;
    }
    .el-table .el-table__cell{
      padding: 2.2rem 0;
      padding: 0.0859375rem  /* 22/256 */ 0;
    }
    .el-table__body tr.hover-row.current-row>td.el-table__cell, .el-table__body tr.hover-row.el-table__row--striped.current-row>td.el-table__cell, .el-table__body tr.hover-row.el-table__row--striped>td.el-table__cell, .el-table__body tr.hover-row>td.el-table__cell{
      background: transparent;

 src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue

@@ -2,7 +2,7 @@
  <div class="zhiyePeixun-wrap">
    <el-table
      :data="tableData"
      max-height="650"
      :header-cell-style="handleheader"
      style="width: 100%">
      <el-table-column
        prop="year"
@@ -117,6 +117,14 @@
                    peixunrenci:'34223'
                }]
            }
        },
        methods: {
            handleheader(data) {
                return {
                    lineHeight: '0',

                }
            }
        }
    }
</script>
@@ -126,13 +134,13 @@
  .zhiyePeixun-wrap{
    width: 100%;
    height: 100%;
    margin-top: 2rem;
    margin-top: 0.078125rem  /* 20/256 */;
    .el-table th.el-table__cell{
      background-color:$color-blue;
      height: 8rem;
      height: 0.3125rem  /* 80/256 */;
    }
    .el-table tr{
      height: 8rem;
      height: 0.3125rem  /* 80/256 */;
    }
    .el-table tr:nth-child(odd){
      background-color: #CEF2FF;
@@ -157,16 +165,16 @@
      white-space:pre-line;
    }
    .el-table--border th.el-table__cell, .el-table__fixed-right-patch{
      border-bottom:1px solid $color-grey; /*no*/
      border-bottom:1Px solid $color-grey; /*no*/
    }
    .el-table thead.is-group th.el-table__cell{
      background-color: $color-blue;
    }
    .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
      border-bottom:1px solid $color-grey; /*no*/
      border-bottom:1Px solid $color-grey; /*no*/
    }
    .el-table--border .el-table__cell, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{
      border-right:1px solid $color-grey; /*no*/
      border-right:1Px solid $color-grey; /*no*/
    }
  }
</style>
@@ -174,7 +182,7 @@
<style lang="scss" scoped>
  .zhiyepeixun-echarts{
    width: 100%;
    height: calc(100% - 68rem);
    margin-top: 2rem;
    height: calc(100% - 2.65625rem  /* 680/256 */);
    margin-top: 0.078125rem  /* 20/256 */;
  }
</style>

 src/pages/show/shehuiBaozhang/shehuiBaozhang.vue

@@ -90,15 +90,15 @@
  @import "../../../assets/css/base";
  .shehuiBaozhang-wrap{
    width: 100%;
    padding: 2rem;
    padding: 0.078125rem  /* 20/256 */;
    box-sizing: border-box;
    display: flex;
    .shehuiBaozhang-menu-left{
      width: 24rem  /* 240/10 */;
      height: 124.9rem  /* 1249/10 */;
      width: 0.9375rem  /* 240/256 */;
      height: 4.87890625rem  /* 1249/256 */  /* 1249/10 */;
      background:url("../../../assets/images/jiuye-menu-bj.png") no-repeat center;
      background-size: 100% 100%;
      padding: 4rem 0;
      padding: 0.15625rem  /* 40/256 */ 0;
      box-sizing: border-box;
      display: flex;
      justify-content: center;
@@ -107,13 +107,13 @@
          font-size: $fontSize-24;
          color: $color-blue;
          text-align: center;
          line-height: 8rem;
          line-height: 0.3125rem  /* 80/256 */;
        }
      }
    }
    .shehuiBaozhang-menu-right{
      flex: 1;
      padding: 0 2rem  /* 20/10 */;
      padding: 0 0.078125rem  /* 20/256 */;
      box-sizing: border-box;
    }
  }

 src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shehuiBaoxian.vue

@@ -6,6 +6,7 @@
      <el-table
        max-height="640"
        :data="tableData"
        :header-cell-style="handleheader"
        stripe
        border
        style="width: 100%">
@@ -129,6 +130,13 @@
                    address: '2222'
                }]
            }
        },
        methods: {
            handleheader(data) {
                return {
                    lineHeight: '0',
                }
            }
        }
    }
</script>
@@ -152,13 +160,13 @@
      color: #111111;
    }
    .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
      border-bottom: 1px solid #8E8E8E;
      border-bottom: 1Px solid #8E8E8E;
    }
    .el-table--border .el-table__cell, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{
      border-right: 1px solid #8E8E8E;
      border-right: 1Px solid #8E8E8E;
    }
    .el-table .el-table__cell{
      padding: 2.2rem 0;
      padding: 0.0859375rem  /* 22/256 */ 0;
    }
    .el-table__body tr.hover-row.current-row>td.el-table__cell, .el-table__body tr.hover-row.el-table__row--striped.current-row>td.el-table__cell, .el-table__body tr.hover-row.el-table__row--striped>td.el-table__cell, .el-table__body tr.hover-row>td.el-table__cell{
      background: transparent;