parent: ab81cb6b | 补丁 | 提交 | ignore whitespace
付延余
2022-04-11 f06841d8d1569f35128d428598a4b2e14402e73a 
Merge branch 'master' of http://39.96.92.240:10000/r/jiashicang-front
14个文件已修改
2个文件已添加
316 ■■■■■ 已修改文件
.postcssrc.js 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
config/index.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
index.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
package.json 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/css/base.scss 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/css/main.css 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/css/mixin.scss 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/components/showIndexTitle.vue 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/show/index/index.vue 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/show/jiuyeAndChuangye/jiuyeAndChuangye.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/show/jiuyeAndChuangye/jiuyeChildren/chuangyeDanbaoDaikuan.vue 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue 180 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/show/main/showHome.vue 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shehuiBaoxian.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/router/router.js 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 .postcssrc.js


@@ -5,6 +5,11 @@


    "postcss-import": {},


    "postcss-url": {},


    // to edit target browsers: use "browserslist" field in package.json


    "autoprefixer": {}


    "autoprefixer": {},


    "postcss-px2rem-exclude": {  // 添加的代码


      remUnit: 256,


      exclude: /node_modules|element/i // 忽略node_modules目录下的文件


    }




  }


}




 config/index.js


@@ -21,7 +21,7 @@


        },




        // Various Dev Server settings


        host: 'localhost', // can be overwritten by process.env.HOST


        host: '192.168.0.110', // can be overwritten by process.env.HOST


        port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined


        autoOpenBrowser: false,


        errorOverlay: true,




 index.html


@@ -3,14 +3,16 @@




<head>


    <meta charset="utf-8">


    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0"/>


    <meta name="referrer" content="no-referrer">


    <meta name="viewport" content="width=device-width,initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">


    <title>视频管理</title>


    <link rel="icon" type="image/x-icon" href="./src/assets/img/logo.ico" />


</head>




<body>


    <div id="app"></div>


    <script>


        // 适配pad padPro


        /(pad|pod|iPad|iPod|iOS)/i.test(navigator.userAgent)&&(head=document.getElementsByTagName('head'),viewport=document.createElement('meta'),viewport.name='viewport',viewport.content='target-densitydpi=device-dpi, width=480px, user-scalable=no',head.length>0&&head[head.length-1].appendChild(viewport));


    </script>


</body>




</html>




 package.json


@@ -77,8 +77,8 @@


    "plugins": {


      "autoprefixer": {},


      "postcss-px2rem-exclude": {


        "remUnit": 10,


        "exclude": "/node_modules/i"


        "remUnit": 256,


        "exclude": "/node_modules|element/i"


      }


    }


  }




 src/assets/css/base.scss


@@ -1,14 +1,16 @@


$fontSize-20: 2rem;


$fontSize-24: 2.4rem;


$fontSize-26: 2.6rem;


$fontSize-28: 2.8rem;


$fontSize-30: 3rem;


$fontSize-32: 3.2rem;


$fontSize-38: 3.8rem;


$fontSize-48: 4.8rem;


$fontSize-20: 0.078125rem  /* 20/256 */;


$fontSize-24: 0.09375rem  /* 24/256 */;


$fontSize-26: 0.1015625rem  /* 26/256 */;


$fontSize-28: 0.109375rem  /* 28/256 */;


$fontSize-30: 0.1171875rem  /* 30/256 */;


$fontSize-32: 0.125rem  /* 32/256 */;


$fontSize-38: 0.1484375rem  /* 38/256 */;


$fontSize-48: 0.1875rem  /* 48/256 */;




$color-blue: #51D2FF;


$color-white: #fff;


$color-dark: #05336A;


$color-grey:#8E8E8E;


$color-darkGrey:#111111;








 src/assets/css/main.css


@@ -526,6 +526,6 @@




@media screen and (min-width: 2560px) {


  html {


    font-size: 10px!important;


    font-size: 256px!important;


  }


}




 src/assets/css/mixin.scss


New file


@@ -0,0 +1,6 @@


@mixin overflow-y($h) {


   max-height: $h;


   overflow-y: auto;


   touch-action: pan-y;


   -webkit-overflow-scrolling: touch;


}




 src/pages/components/showIndexTitle.vue


@@ -91,15 +91,15 @@


  .el-menu-item.is-active {


    background: url("../../assets/images/menu-active.png") no-repeat center;


    background-size: 100% 100%;


    width: 12.8rem /* 128/10 */;


    height: 5rem;


    width: 0.5rem  /* 128/256 */;


    height: 0.1953125rem  /* 50/256 */;


  }


  .el-menu-item {


    background: url("../../assets/images/menu-normal.png") no-repeat center;


    background-size: 100% 100%;


    width: 12.8rem /* 128/10 */;


    height: 5rem;


    margin-right: 1.2rem /* 12/10 */;


    width: 0.5rem  /* 128/256 */;


    height: 0.1953125rem  /* 50/256 */;


    margin-right: 0.046875rem  /* 12/256 */;


  }


  .el-menu.el-menu--horizontal {


    border-bottom: 0;


@@ -109,22 +109,23 @@


<style lang="scss" scoped>


.showIndexTitle-wrap {


  width: 100%;


  height: 9rem /* 90/10 */;


  height: 0.3515625rem  /* 90/256 */;


  background: url("../../assets/images/jiashicang-title-bj.png") no-repeat


    center;


  background-size: 100% 100%;


  .title {


    font-size: 3rem /* 30/10 */;


    font-size: 0.1171875rem  /* 30/256 */;


    //font-family: "Source Han Sans CN";


    color: #fff;


    text-align: center;


    line-height: 7rem /* 70/10 */;


    line-height: 0.2734375rem  /* 70/256 */;


  }


  .showIndex-left {


    position: absolute;


    left: 1rem /* 10/10 */;


    top: -5rem /* 10/10 */;


    left: 0.0390625rem  /* 10/256 */;


    top: -0.1953125rem  /* -50/256 */;


    display: flex;


    z-index: 9;


    .showIndex-block {


      /*background:url("../../assets/images/menu-normal.png") no-repeat center;*/


      /*background-size: 100% 100%;*/


@@ -132,17 +133,18 @@


      /*height: 5rem;*/


      h1 {


        color: #fff;


        font-size: 2.4rem;


        font-size: 0.09375rem  /* 24/256 */;


        text-align: center;


        line-height: 5rem;


        line-height: 0.1953125rem  /* 50/256 */;


      }


    }


  }


  .showIndex-right {


    position: absolute;


    right: 1rem /* 10/10 */;


    top: -5rem /* 10/10 */;


    right: 0.0390625rem  /* 10/256 */;


    top: -0.1953125rem  /* -50/256 */;


    display: flex;


    z-index: 9;


    .showIndex-block {


      /*background:url("../../assets/images/menu-normal.png") no-repeat center;*/


      /*background-size: 100% 100%;*/


@@ -151,9 +153,9 @@


      /*cursor: pointer;*/


      h1 {


        color: #fff;


        font-size: 2.4rem;


        font-size: 0.09375rem  /* 24/256 */;


        text-align: center;


        line-height: 5rem;


        line-height: 0.1953125rem  /* 50/256 */;


      }


    }


    .menu-active {




 src/pages/show/index/index.vue


@@ -4,7 +4,7 @@


      <div class="yanglao-block">


        <img src="../../../assets/images/yanglao-icon1.png" alt="">


        <h1>城镇职工养老保险参保人数</h1>


        <h2><font class="bigger">277.8</font>万人</h2>


        <h2><font class="bigger">277.7</font>万人</h2>


      </div>


      <div class="yanglao-block">


        <img src="../../../assets/images/yanglao-icon2.png" alt="">


@@ -738,29 +738,30 @@


</script>


<style lang="scss" scoped>


  @import "../../../assets/css/base";


  @import "../../../assets/css/mixin";


  .index-wrap{


    width: 100%;


    height: 100%;


    padding: 0 2rem  /* 10/10 */;


    padding: 0 0.078125rem  /* 20/256 */;


    box-sizing: border-box;


    .index-line-box{


      width: 100%;


      display: flex;


      margin-top: 3.2rem;


      margin-top: 0.125rem  /* 32/256 */;


      .yanglao-block{


        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;


        flex-direction: column;


        align-items: center;


        justify-content: center;


        margin: 0 2rem;


        margin: 0 0.078125rem  /* 20/256 */;


        position: relative;


        img{


          width: 8rem;


          height: 8rem;


          width: 0.3125rem  /* 80/256 */;


          height: 0.3125rem  /* 80/256 */;


        }


        h1{


          color: #fff;


@@ -963,8 +964,7 @@




          }


          .shuju-scroll{


            height: 28rem  /* 280/10 */;


            overflow-y: auto;


            @include overflow-y(28rem)


          }


          .shuju-table-line2{


            width: 100%;




 src/pages/show/jiuyeAndChuangye/jiuyeAndChuangye.vue


@@ -22,7 +22,7 @@


              <h1>毕业生统计</h1>


            </div>


          </el-menu-item>


          <el-menu-item>


          <el-menu-item index="/zhiyePeixun">


            <div class="menu-left-block">


              <h1>职业培训</h1>


            </div>


@@ -68,14 +68,15 @@


</style>


<style lang="scss" scoped>


  @import "../../../assets/css/base";


  @import "../../../assets/css/mixin";


  .jiuyeAndChuangye-wrap{


    width: 100%;


    padding: 2rem;


    box-sizing: border-box;


    display: flex;


    .menu-left{


      width: 24rem  /* 240/10 */;


      height: 124.9rem  /* 1249/10 */;


      width: 0.9375rem  /* 240/256 */;


      height: 135rem  /* 1249/10 */;


      background:url("../../../assets/images/jiuye-menu-bj.png") no-repeat center;


      background-size: 100% 100%;


      padding: 4rem 0;


@@ -95,6 +96,7 @@


      flex: 1;


      padding: 0 2rem  /* 20/10 */;


      box-sizing: border-box;


      @include overflow-y(150rem)


    }


  }






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


@@ -266,6 +266,7 @@


.biyeshengStatistics-wrap{


  width: 100%;


  height: 100%;


  overflow-y: auto;


  .biyeshengStatistics-table{


    width: 100%;


    border: 1px solid $color-grey; /*no*/


@@ -285,6 +286,8 @@


    }


    tbody{


      background-color: #CEF2FF;


      height: 100rem;


      overflow-y: auto;


      tr{


        height: 5.2rem;


      }




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


@@ -125,7 +125,9 @@


      table-layout: fixed;


      thead{


        background-color: $color-blue;


        height: 11.2rem  /* 112/10 */;


        tr{


          height: 11.2rem  /* 112/10 */;


        }


        th,td{


          color: $color-darkGrey;


          border:1px solid $color-grey; /*no*/




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


New file


@@ -0,0 +1,180 @@


<template>


  <div class="zhiyePeixun-wrap">


    <el-table


      :data="tableData"


      max-height="650"


      style="width: 100%">


      <el-table-column


        prop="year"


        label="年份"


        align="center"


        width="200">


      </el-table-column>


      <el-table-column label="补贴性培训" align="center">


        <el-table-column


          label="补贴性培训"


          align="center"


          width="800">


          <el-table-column


            prop="shengtingjihua"


            :label="'省厅计划 \n （人次）'"


            align="center"


            width="200">


          </el-table-column>


          <el-table-column


            prop="shijipeixunjihua"


            :label="'实际培训人数 \n （人次）'"


            align="center"


            width="200">


          </el-table-column>


          <el-table-column


            prop="wanchenglv"


            label="完成率"


            align="center"


            width="200">


          </el-table-column>


          <el-table-column


            prop="zhuanzhangzhichu"


            :label="'专账资金支出 \n （万元）'"


            align="center"


            width="200">


          </el-table-column>


        </el-table-column>


        <el-table-column


          prop="name"


          label="其中应届毕业学年高校毕业生"


          align="center"


          width="400">


          <el-table-column


            prop="peixunrenshu"


            :label="'培训人数 \n （人次）'"


            align="center"


            width="200">


          </el-table-column>


          <el-table-column


            prop="butiejine"


            :label="'补贴金额 \n （万元)'"


            align="center"


            width="200">


          </el-table-column>


        </el-table-column>


      </el-table-column>


      <el-table-column


        prop="year"


        label="社会性培训"


        align="center">


        <el-table-column


          prop="peixunrenci"


          label="实际培训人数 （人次）"


          align="center">


        </el-table-column>


      </el-table-column>


    </el-table>


    <div class="zhiyepeixun-echarts"></div>


  </div>


</template>




<script>


    export default {


        name: "zhiyePeixun",


        data() {


            return {


                tableData:[{


                    year: '2017年',


                    shengtingjihua: '34212',


                    shijipeixunjihua: '44333',


                    wanchenglv: '90%',


                    zhuanzhangzhichu: '233421',


                    peixunrenshu: '3222',


                    butiejine:'2322',


                    peixunrenci:'34223'


                },{


                    year: '2018年',


                    shengtingjihua: '34212',


                    shijipeixunjihua: '44333',


                    wanchenglv: '90%',


                    zhuanzhangzhichu: '233421',


                    peixunrenshu: '3222',


                    butiejine:'2322',


                    peixunrenci:'34223'


                },{


                    year: '2019年',


                    shengtingjihua: '34212',


                    shijipeixunjihua: '44333',


                    wanchenglv: '90%',


                    zhuanzhangzhichu: '233421',


                    peixunrenshu: '3222',


                    butiejine:'2322',


                    peixunrenci:'34223'


                },{


                    year: '2020年',


                    shengtingjihua: '34212',


                    shijipeixunjihua: '44333',


                    wanchenglv: '90%',


                    zhuanzhangzhichu: '233421',


                    peixunrenshu: '3222',


                    butiejine:'2322',


                    peixunrenci:'34223'


                }]


            }


        }


    }


</script>




<style lang="scss">


  @import "../../../../assets/css/base";


  .zhiyePeixun-wrap{


    width: 100%;


    height: 100%;


    margin-top: 2rem;


    .el-table th.el-table__cell{


      background-color:$color-blue;


      height: 8rem;


    }


    .el-table tr{


      height: 8rem;


    }


    .el-table tr:nth-child(odd){


      background-color: #CEF2FF;


    }


    .el-table tr:nth-child(even){


      background-color: #A8E9FF;


    }


    .el-table, .el-table__expanded-cell{


      background-color: transparent;


    }


    .el-table thead{


      color: $color-darkGrey;


    }


    .el-table{


      color: $color-darkGrey;


    }


    .el-table .cell{


      font-size: $fontSize-28;


      color: $color-darkGrey;


      font-weight: 300;


      line-height: 1;


      white-space:pre-line;


    }


    .el-table--border th.el-table__cell, .el-table__fixed-right-patch{


      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*/


    }


    .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*/


    }


  }


</style>




<style lang="scss" scoped>


  .zhiyepeixun-echarts{


    width: 100%;


    height: calc(100% - 68rem);


    margin-top: 2rem;


  }


</style>




 src/pages/show/main/showHome.vue


@@ -18,8 +18,8 @@


<style lang="scss" scoped>


  @import "../../../assets/css/base";


  .showHome-wrap{


    width: 256rem  /* 2560/10 */;


    height: 160rem  /* 1600/10 */;


    width: 10rem  /* 2560/256 */;


    height: 6.25rem  /* 1600/256 */;


    background: url("../../../assets/images/jiashicang-bj.jpg") no-repeat center;


    background-size: 100% 100%;


  }




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


@@ -134,6 +134,7 @@


</script>




<style lang="scss">


  @import "../../../../assets/css/base";


  .shehuiBaoxian-table{


    .el-table tr{


      background-color: #CEF2FF;


@@ -162,6 +163,12 @@


    .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;


    }


    .el-table .cell{


      font-size: $fontSize-28;


      color: $color-darkGrey;


      font-weight: 300;


      line-height: 1;


    }


  }


</style>


<style lang="scss" scoped>




 src/router/router.js


@@ -55,6 +55,15 @@


            import(


              "@/pages/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue"


            )


        },


        {


          path: "/zhiyePeixun",


          meta: { title: "职业培训"},


          name: "zhiyePeixun",


          component: () =>


            import(


              "@/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue"


              )


        }


      ]


    },