Merge remote-tracking branch 'origin/master'

luoyb

2021-02-01 1490fa57d2d29edae071a5fa8ce3321531b17ee5

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/user/Informationinput.vue

 src/views/dashboard/index.vue

@@ -1,13 +1,21 @@
<template>
  <div class="main">
    <el-row style="    height: 40px;">
      <el-col :span="9"><div>&nbsp;</div></el-col>
      <el-col :span="9"><p /></el-col>
      <el-col :span="15">
        <ul class="data-ul">
          <li :class="{selectedColor:selectIndex === 0}" @click="selectTab(0)">今日</li>
          <li :class="{selectedColor:selectIndex === 1}" @click="selectTab(1)">本周</li>
          <li :class="{selectedColor:selectIndex === 2}" @click="selectTab(2)">本月</li>
          <li :class="{selectedColor:selectIndex === 3}" @click="selectTab(3)">今年</li>
          <li :class="{ selectedColor: selectIndex === 0 }" @click="selectTab(0)">
            今日
          </li>
          <li :class="{ selectedColor: selectIndex === 1 }" @click="selectTab(1)">
            本周
          </li>
          <li :class="{ selectedColor: selectIndex === 2 }" @click="selectTab(2)">
            本月
          </li>
          <li :class="{ selectedColor: selectIndex === 3 }" @click="selectTab(3)">
            今年
          </li>
        </ul>
        <span style=" font-size: 16px; color: #333333;"> 时间段：</span>
        <el-date-picker
@@ -25,37 +33,37 @@
    </el-row>
    <el-row :gutter="20">
      <el-col :span="4">
        <el-card shadow="always">
        <el-card shadow="always" class="card-info">
          <p class="card-number">12</p>
          <p>在职员工总数</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always">
        <el-card shadow="always" class="card-info">
          <p class="card-number">12</p>
          <p>离职员工总数</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always">
        <el-card shadow="always" class="card-info">
          <p class="card-number">12</p>
          <p>新进人员</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always">
        <el-card shadow="always" class="card-info">
          <p class="card-number">12</p>
          <p>正常离职人员</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always">
        <el-card shadow="always" class="card-info">
          <p class="card-number">12</p>
          <p>自动离职人员</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always">
        <el-card shadow="always" class="card-info">
          <p class="card-number">12</p>
          <p>有效合同</p>
        </el-card>
@@ -63,37 +71,37 @@
    </el-row>
    <el-row :gutter="20">
      <el-col :span="4">
        <el-card shadow="always">
        <el-card shadow="always" class="card-info">
          <p class="card-number">12</p>
          <p>到期合同</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always">
        <el-card shadow="always" class="card-info">
          <p class="card-number">12</p>
          <p>新签合同</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always">
        <el-card shadow="always" class="card-info">
          <p class="card-number">12</p>
          <p>续签合同</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always">
        <el-card shadow="always" class="card-info">
          <p class="card-number">12</p>
          <p>历史合同</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always">
        <el-card shadow="always" class="card-info">
          <p class="card-number">12</p>
          <p>出勤天数</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always">
        <el-card shadow="always" class="card-info">
          <p class="card-number">12</p>
          <p>员工请假</p>
        </el-card>
@@ -101,37 +109,37 @@
    </el-row>
    <el-row :gutter="20">
      <el-col :span="4">
        <el-card shadow="always">
        <el-card shadow="always" class="card-info">
          <p class="card-number">12</p>
          <p>员工加班（天）</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always">
        <el-card shadow="always" class="card-info">
          <p class="card-number">12</p>
          <p>员工加班（小时）</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always">
        <el-card shadow="always" class="card-info">
          <p class="card-number">12</p>
          <p>员工旷工</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always">
        <el-card shadow="always" class="card-info">
          <p class="card-number">12</p>
          <p>证件到期</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always">
        <el-card shadow="always" class="card-info">
          <p class="card-number">12</p>
          <p>员工调岗</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always">
        <el-card shadow="always" class="card-info">
          <p class="card-number">12</p>
          <p>员工体检</p>
        </el-card>
@@ -177,7 +185,8 @@
      value2: '',
      selectIndex: 0 // 搜索结果,被选中的li index
    }
  }, methods: {
  },
  methods: {
    selectTab(index) {
      this.selectIndex = index
    }
@@ -185,46 +194,45 @@
}
</script>
<style lang="scss">
.main{
  padding: 20px;
  .data-ul {
    margin-right: 40px;
    margin-top: 0px;
  list-style: none;
   float: left;
    li {
    float: left;
        width: 60px;
        text-align: center;
    font-size: 16px;
    color: #333333;
    }
    li:hover {
    color:#931e1e;
    border-bottom:2px solid #931e1e;
.main {
    padding: 20px;
    .data-ul {
        margin-right: 40px;
        margin-top: 0px;
        list-style: none;
        float: left;
        li {
            float: left;
            width: 60px;
            text-align: center;
            font-size: 16px;
            color: #333333;
        }
        li:hover {
            color: #931e1e;
            border-bottom: 2px solid #931e1e;
        }
    }
}
.selectedColor {
    color: #931e1e;
    border-bottom: 2px solid #931e1e;
}
.selectedColor{
  color:#931e1e;
    border-bottom:2px solid #931e1e;
.el-card__body {
    text-align: center;
    .card-number {
        color: #931e1e;
        font-size: 20px;
    }
}
.el-card__body{
  text-align: center;
  .card-number{
color:#931e1e;
font-size:20px;
}
}
.el-card__body:hover{
  text-align: center;
  background-color: #931e1e;
  color:#fff;
  .card-number{
  color:#fff;
font-size:20px;

}
.card-info:hover {
    text-align: center;
    background-color: #931e1e;
    color: #fff;
    .card-number {
        color: #fff;
        font-size: 20px;
    }
}
.el-row {
    margin-bottom: 20px;
@@ -256,7 +264,7 @@
<style lang="scss" scoped>
.data-ul {
    li {
  line-height: 40px;
  }
        line-height: 40px;
    }
}
</style>

 src/views/login/index.vue

@@ -1,14 +1,14 @@
<template>
  <div class="login-container">
    <el-row>
      <el-col :span="4"><div>&nbsp;</div></el-col>
      <el-col :span="4"><p /></el-col>
      <el-col :span="20"><img src="../../assets/login/pic02.png" width="500px" height="75px"></el-col>
    </el-row>
    <el-row>
      <el-col :span="4"><div>&nbsp;</div></el-col>
      <el-col :span="10.5" style="background-color: #fff;height: 515px;">
        <img src="../../assets/login/pic03.png"></el-col>
      <el-col :span="0.5" style="background-color: #fff;height: 515px;"><img src="../../assets/login/pic04.png"></el-col>
      <el-col :span="4"><p /></el-col>
      <el-col :span="11" style="background-color: #fff;height: 515px;">
        <img src="../../assets/login/pic03.png" style="float: left;">
        <img src="../../assets/login/pic04.png"></el-col>
      <el-col :span="5" style="background-color: #fff;height: 515px;"> <el-form ref="loginForm" :model="loginForm" :rules="rules" class="login-form" autocomplete="off" label-position="left">
        <h2 id="form-biao-dan"><span style="position: relative;">登陆</span></h2>
        <span v-if="login.type === 'up'">
@@ -126,7 +126,7 @@
          </el-tabs>
        </span>
      </el-form></el-col>
      <el-col :span="4"><div>&nbsp;</div></el-col>
      <el-col :span="4"><p /></el-col>
    </el-row>
    <span class="login-footer">
      © 2021 <a target="_blank" href="">版权所有：深圳市太阳帆信息技术开发有限公司</a>客服电话： 0755-26491738