Merge remote-tracking branch 'origin/master'

value

2024-05-06 3717987432324c42e22922a17917e7b984798d4c

Merge remote-tracking branch 'origin/master'

 src/components/view/b3-classes copy.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,274 @@
<template>
<div class="class-page">
  <p style="font-size: 16px;padding:19.5px 0px">班次</p>
  <!-- <div class="search">
    <div class="search_thing">
      <div class="search_label">委托编号：</div>
      <div class="search_input"><el-input size="small" placeholder="请输入" clearable
      ></el-input></div>
    </div>
    <div class="search_thing" style="padding-left: 30px;">
      <el-button size="small" @click="refresh()">重 ç½®</el-button>
      <el-button size="small" type="primary" @click="refreshTable()">查 è¯¢</el-button>
    </div>
  </div> -->
  <div class="center">
    <table border="1" class="tables table-right" cellpadding="16">
      <tr v-for="(item,index) in titleList" :key="'a'+index">
        <td :rowspan="3" v-if="index==0">序号</td>
        <td :rowspan="3" v-if="index==0">姓名</td>
        <td :rowspan="3" v-if="index==0">实验室</td>
        <td :rowspan="2" :colspan="2" v-if="index==0">
          <el-dropdown trigger="click" placement="bottom">
            <span style="cursor: pointer;">
              {{ currentYear }}
            </span>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item v-for="(n,j) in yearList" :key="'b'+j">{{ n }}</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
        </td>
        <td :rowspan="2" v-if="index==0">å¹´</td>
        <td :rowspan="2" v-if="index==0">
          <el-dropdown trigger="click" placement="bottom">
            <span style="cursor: pointer;">
              {{ currentMonth }}
            </span>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item v-for="(n,j) in mouthList" :key="'c'+j">{{ n }}</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
        </td>
        <td :rowspan="2" v-if="index==0">月</td>
        <td :rowspan="2" v-if="index==0"></td>
        <td :rowspan="2" v-if="index==0"></td>
        <td v-if="index==2">出勤</td>
        <td v-if="index==2">休</td>
        <td v-if="index==2">请假</td>
        <td v-if="index==2">早</td>
        <td v-if="index==2">中</td>
        <td v-if="index==2">夜</td>
        <td v-if="index==2">夜12</td>
        <td v-for="(m,i) in item" :key="'d'+i">{{ m }}</td>
      </tr>
      <tr v-for="(item,index) in 22" :key="'e'+index">
        <td v-for="(m,i) in personList" :key="'f'+i">{{ m }}</td>
        <td v-for="(m,i) in classList" :key="'g'+i">
          <el-dropdown trigger="click" placement="bottom">
            <span style="cursor: pointer;">
              {{ m }}
            </span>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item v-for="(n,j) in classType" :key="'h'+j">{{ n }}</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
        </td>
      </tr>
    </table>
  </div>
</div>
</template>

<script>
export default {
  data () {
    return{
      titleList:[
        [
          '周次',
          "14",
          "14",
          "14",
          "14",
          "14",
          "14",
          "15",
          "15",
          "15",
          "15",
          "15",
          "15",
          "15",
          "16",
          "16",
          "16",
          "16",
          "16",
          "16",
          "16",
          "17",
          "17",
          "17",
          "17",
          "17",
          "17",
          "17",
          "18",
          "18",
          "18",
        ],
        [
          '星期',
          "周一",
          "周二",
          "周三",
          "周四",
          "周五",
          "周六",
          "周日",
          "周一",
          "周二",
          "周三",
          "周四",
          "周五",
          "周六",
          "周日",
          "周一",
          "周二",
          "周三",
          "周四",
          "周五",
          "周六",
          "周日",
          "周一",
          "周二",
          "周三",
          "周四",
          "周五",
          "周六",
          "周日",
          "周二",
          "周三",
        ],
        [
          '出差',
          "1",
          "2",
          "3",
          "4",
          "5",
          "6",
          "7",
          "8",
          "9",
          "10",
          "11",
          "12",
          "13",
          "14",
          "15",
          "15",
          "17",
          "18",
          "19",
          "20",
          "21",
          "22",
          "23",
          "24",
          "25",
          "26",
          "27",
          "28",
          "29",
          "30",
        ],
      ],
      classList:['0','早','早','早','早','早','早','早','早','早','早','早','早','早','早','早','早','早','早','早','早','早','早','早','早','早','早','早','早','早','早'],
      classType:[
        '早班',
        '中班',
        '晚班',
      ],
      personList:[
        1,
        '李媛媛',
        '材料',
        "26.5",
        3,
        0.5,
        26.5,
        0,
        0,
        0,
      ],
      yearList:[
        '2019',
        '2020',
        '2021',
        '2022',
        '2023',
        '2024',
        '2025',
      ],
      mouthList:[
        1,
        2,
        3,
        4,
        5,
        6,
        7,
        8,
        9,
        10,
        11,

      ],
      currentYear:new Date().getFullYear(),
      currentMonth:new Date().getMonth()+1,
    }
  },
  methods: {

  }
}
</script>

<style scoped>
.search {
  background-color: #fff;
  height: 80px;
  display: flex;
  align-items: center;
  margin-bottom: 16px;
}

.search_thing {
  display: flex;
  align-items: center;
  height: 50px;
}

.search_label {
  width: 120px;
  font-size: 14px;
  text-align: right;
}

.search_input {
  width: calc(100% - 120px);
}
.center {
  width: calc(100% - 40px);
  /* height: calc(100% - 60px - 80px - 40px); */
  height: calc(100% - 100px );
  background-color: #fff;
  border-radius: 3px;
  padding: 20px;
  overflow-y: auto;
  overflow-x: auto;
  display: flex;
}
.tables{
  table-layout: fixed;
}
td {
  vertical-align: middle;
  text-align: center;
  min-width: 50px;
  box-sizing: border-box;
  padding: 6px 4px;
  word-break: keep-all; /* é˜²æ­¢å•è¯å†…æ–­è¡Œ */
}
</style>

 src/components/view/b3-classes.vue

@@ -0,0 +1,730 @@
<template>
<div class="class-page">
  <div class="search">
    <div class="search_thing">
      <div class="search_label">选择时间：</div>
      <div class="search_input">
        <el-date-picker
          v-model="query.year"
          type="year"
          size="small"
          placeholder="选择年"
          style="width: 140px;"
          :clearable="false">
        </el-date-picker>
        <el-select
        v-model="query.month"
        clearable
        placeholder="选择月"
        style="width: 140px;margin-left: 16px;"
        size="small">
          <el-option
            v-for="item in monthOptions"
            :key="item.value"
            :label="item.label"
            :value="item.value">
          </el-option>
        </el-select>
        <el-input v-model="query.name" placeholder="请输入人员名称" size="small" style="width: 140px;margin: 0 16px;" clearable ></el-input>
        <el-select v-model="query.addr" placeholder="请选择实验室" style="width: 140px;" size="small" clearable >
          <el-option
            v-for="item in labOptions"
            :key="item.value"
            :label="item.label"
            :value="item.value">
          </el-option>
        </el-select>
      </div>
    </div>
    <div class="search_thing" style="padding-left: 30px;">
      <el-button size="small" @click="refresh()">重 ç½®</el-button>
      <el-button size="small" type="primary" @click="refreshTable()">查 è¯¢</el-button>
    </div>
    <div class="search_thing btns" style="padding-left: 30px;">
      <el-button size="small" type="primary">导 å‡º</el-button>
      <el-button size="small" type="primary" @click="handleScheduling">排 ç­</el-button>
    </div>
  </div>
  <div class="center">
    <div class="fixed-left">
      <div class="content-title" style="padding-left: 16px;box-sizing: border-box;">
        äººå‘˜åç§°
      </div>
      <div class="content-user" :class="{hoverType:currentUserIndex==index}" v-for="(item,index) in userList" :key="'e'+index" v-on:mouseenter="onMouseEnter(index)"
      v-on:mouseleave="currentUserIndex=null">
        <div class="user-pic">{{ item.name.charAt(0) }}</div>
        <div class="user-info">
          <p style="font-size: 14px;color: #3A7BFA;line-height: 24px;">{{ item.name }} ({{ item.part }})</p>
          <p style="color: #999999;font-size: 12px;transform: scale(0.8) translateX(-20px);white-space: nowrap;width: 150px;overflow-x: show;">早:{{ item.day0 }}, ä¸­:{{ item.day1 }}, å¤œ:{{ item.day2 }}, ä¼‘:{{ item.day3 }}, å‡:{{ item.day4 }}</p>
          <p style="margin-top: 4px;"><span style="color: #999999;font-size: 12px;display: inline-block;transform: scale(0.8) translateX(-10px);">合计出勤: </span><span style="font-size: 16px;
color: #FF4902;">{{ item.day5 }}天</span></p>
        </div>
      </div>
    </div>
    <div class="scroll-right">
      <div class="content">
        <div class="content-title content-title-right" style="border-bottom: 0;">
          <div class="content-title-item" v-for="(item,index) in weeks" :key="'b'+index">
            <span class="month" v-if="item.day==1">{{ item.month }}</span>
            <span class="day">{{ item.day }}</span>
            <span class="week">{{ item.week }}</span>
          </div>
        </div>
        <div class="content-body" v-for="(item,index) in 5" :key="'c'+index"
        :class="{hoverType:currentUserIndex==index}"v-on:mouseenter="onMouseEnter(index)"
      v-on:mouseleave="currentUserIndex=null">
          <div class="content-body-item" v-for="(m,i) in workList" :key="'d'+i">
            <div class="work-box" :class="{type0:m.type=='早班',type1:m.type=='中班',type2:m.type=='夜班',}">
              <div class="work-box-left">
                <span>{{ m.type }}</span>
              </div>
              <el-dropdown trigger="click" placement="bottom" @command="e=>handleCommand(e,m)">
                <i class="el-icon-arrow-down el-icon--right" style="font-size: 20px;color: #fff;cursor: pointer;"></i>
                <el-dropdown-menu slot="dropdown">
                  <el-dropdown-item v-for="(n,j) in classType" :key="'h'+j" :command="n.value">{{ n.label }}</el-dropdown-item>
                </el-dropdown-menu>
              </el-dropdown>
            </div>
          </div>
        </div>
      </div>
    </div>
  </div>
  <el-dialog title="排班" :visible.sync="schedulingVisible" width="400px">
    <div class="search_thing">
      <div class="search_label" style="width:90px">周次：</div>
      <div class="search_input">
        <el-date-picker
          v-model="schedulingQuery.week"
          type="week"
          format="yyyy ç¬¬ WW å‘¨"
          placeholder="选择周次" style="width: 203px;">
        </el-date-picker>
      </div>
    </div>
    <div class="search_thing">
      <div class="search_label" style="width:90px">人员名称：</div>
      <div class="search_input">
        <el-select v-model="schedulingQuery.person" placeholder="请选择" style="width: 100%;" multiple clearable >
          <el-option
            v-for="item in personList"
            :key="item.value"
            :label="item.label"
            :value="item.value">
          </el-option>
        </el-select>
      </div>
    </div>
    <div class="search_thing">
      <div class="search_label" style="width:90px">班次：</div>
      <div class="search_input">
        <el-select v-model="schedulingQuery.person" placeholder="请选择" style="width: 100%;">
          <el-option
            v-for="item in classType"
            :key="item.value"
            :label="item.label"
            :value="item.value">
          </el-option>
        </el-select>
      </div>
    </div>
    <span slot="footer" class="dialog-footer">
      <el-button @click="schedulingVisible = false">取 æ¶ˆ</el-button>
      <el-button type="primary" @click="confirmScheduling" :loading="loading">ç¡® å®š</el-button>
    </span>
  </el-dialog>
</div>
</template>

<script>
export default {
  data () {
    return{
      currentYear:new Date().getFullYear(),
      currentMonth:new Date().getMonth()+1,
      query:{
        name:'',
        addr:'',
        year:'',
        month:''
      },
      monthOptions:[
        {
          value:'1',
          label:'1月'
        },
        {
          value:'2',
          label:'2月'
        },
        {
          value:'3',
          label:'3月'
        },
        {
          value:'4',
          label:'4月'
        },
        {
          value:'5',
          label:'5月'
        },
        {
          value:'6',
          label:'6月'
        },
        {
          value:'7',
          label:'7月'
        },
        {
          value:'8',
          label:'8月'
        },
        {
          value:'9',
          label:'9月'
        },
        {
          value:'10',
          label:'10月'
        },
        {
          value:'11',
          label:'11月'
        },
        {
          value:'12',
          label:'12月'
        },
      ],
      labOptions:[],
      weeks:[
        {
          month:'14周',
          week:'周一',
          day:1,
        },
        {
          month:'14周',
          week:'周二',
          day:2,
        },
        {
          month:'14周',
          week:'周三',
          day:3,
        },
        {
          month:'14周',
          week:'周四',
          day:4,
        },
        {
          month:'14周',
          week:'周五',
          day:5,
        },
        {
          month:'14周',
          week:'周六',
          day:6,
        },
        {
          month:'14周',
          week:'周日',
          day:7,
        },
        {
          month:'14周',
          week:'周一',
          day:8,
        },
        {
          month:'14周',
          week:'周二',
          day:9,
        },
        {
          month:'14周',
          week:'周三',
          day:10,
        },
        {
          month:'14周',
          week:'周四',
          day:11,
        },
        {
          month:'14周',
          week:'周五',
          day:12,
        },
        {
          month:'14周',
          week:'周六',
          day:13,
        },{
          month:'14周',
          week:'周日',
          day:14,
        },
        {
          month:'14周',
          week:'周一',
          day:15,
        },
        {
          month:'14周',
          week:'周一',
          day:16,
        },
        {
          month:'14周',
          week:'周一',
          day:17,
        },
        {
          month:'14周',
          week:'周一',
          day:18,
        },
        {
          month:'14周',
          week:'周一',
          day:19,
        },
        {
          month:'14周',
          week:'周一',
          day:20,
        },
        {
          month:'14周',
          week:'周一',
          day:21,
        },
        {
          month:'14周',
          week:'周一',
          day:22,
        },
        {
          month:'14周',
          week:'周一',
          day:23,
        },
        {
          month:'14周',
          week:'周一',
          day:24,
        },
        {
          month:'14周',
          week:'周一',
          day:25,
        },
        {
          month:'14周',
          week:'周一',
          day:26,
        },
        {
          month:'14周',
          week:'周一',
          day:27,
        },
        {
          month:'14周',
          week:'周一',
          day:28,
        },
        {
          month:'14周',
          week:'周一',
          day:29,
        },
        {
          month:'14周',
          week:'周一',
          day:30,
        },
      ],
      workList:[
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'中班',
          time:'8:00-16:00',
        },
        {
          type:'夜班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
        {
          type:'早班',
          time:'8:00-16:00',
        },
      ],
      classType:[],
      userList:[
        {
          name:'李媛媛',
          part:'材料',
          day0:12,//早
          day1:12,//中
          day2:12,//夜
          day3:12,//休
          day4:12,//请假
          day5:12,//总计
        },
        {
          name:'李媛媛',
          part:'材料',
          day0:12,//早
          day1:12,//中
          day2:12,//夜
          day3:12,//休
          day4:12,//请假
          day5:12,//总计
        },
        {
          name:'李媛媛',
          part:'材料',
          day0:12,//早
          day1:12,//中
          day2:12,//夜
          day3:12,//休
          day4:12,//请假
          day5:12,//总计
        },
        {
          name:'李媛媛',
          part:'材料',
          day0:12,//早
          day1:12,//中
          day2:12,//夜
          day3:12,//休
          day4:12,//请假
          day5:12,//总计
        },
        {
          name:'李媛媛',
          part:'材料',
          day0:12,//早
          day1:12,//中
          day2:12,//夜
          day3:12,//休
          day4:12,//请假
          day5:12,//总计
        },
      ],
      currentUserIndex:null,
      schedulingVisible:false,
      personList:[],
      loading:false,
      schedulingQuery:{
        week:'',
        person:''
      }
    }
  },
  mounted(){
    this.selectEnumByCategory()
  },
  methods: {
    refresh(){},
    refreshTable(){},
    onMouseEnter(index){
      this.currentUserIndex = index
    },
    handleScheduling(){
      this.schedulingVisible = true
    },
    confirmScheduling(){},
    selectEnumByCategory() {
      this.$axios.post(this.$api.enums.selectEnumByCategory, {
        category: "班次类型"
      }).then(res => {
        this.classType = res.data
      })
    },
    handleCommand(e,m){
      console.log(e,m)
    }
  }
}
</script>

<style scoped>
.search {
  height: 50px;
  display: flex;
  align-items: center;
  position: relative;
}

.search_thing {
  display: flex;
  align-items: center;
  height: 50px;
}

.search_label {
  width: 70px;
  font-size: 14px;
  text-align: right;
}
.search_input{
  display: flex;
  align-items: center;
}
.btns{
  position: absolute;
  right: 16px;
  top: 50%;
  transform: translate(0,-50%);
}
.center {
  width: 100%;
  height: calc(100% - 40px );
  background-color: #fff;
  position: relative;
  overflow-y: auto;
}
.fixed-left {
  position: absolute;
  left: 0;
  top: 0;
  width: 220px; /* å·¦è¾¹åŒºåŸŸå®½åº¦ */
  min-height: calc(100% - 10px); /* è§†å£é«˜åº¦ */
  background-color: #fff;
  box-shadow: 2px -2px 5px rgba(51,51,51,0.12); /* å·¦è¾¹é˜´å½± */
}

.scroll-right {
  width: calc(100% - 220px); /* å‡åŽ»å·¦è¾¹åŒºåŸŸå®½åº¦ */
  min-height: calc(100% - 10px); /* è§†å£é«˜åº¦ */
  margin-left: 220px;
  overflow-x: scroll;
}

.content {
  min-height: calc(100% - 10px); /* è§†å£é«˜åº¦ */
  min-width: 2000px;
}
.content-title{
  height: 52px;
  line-height: 52px;
  border-bottom: 1px solid #EEEEEE;
}
.content-title-right{
  min-width: 2000px;
  display: flex;
  align-items: center;
}
.content-title-item{
  height: 100%;
  width: 100px;
  flex-shrink: 0;
  border-bottom: 1px solid #EEEEEE;
  box-sizing: border-box;
  display: flex;
  align-items: center;
  justify-content: center;
}
.content-title-item .month{
  font-size: 12px;
  color: #3A7BFA;
  box-sizing: border-box;
  padding: 0 4px;
  border-radius: 50%;
  background: #D6E4FF;
  line-height: 30px;
  text-align: center;
  margin-right: 6px;
}
.content-title-item .day{
  font-size: 16px;
  color: #333333;
  margin-right: 6px;
}
.content-title-item .week{
  font-size: 14px;
  color: #999999;
}
.content-body{
  display: flex;
  align-items: center;
}
.content-body-item{
  height: 80px;
  width: 100px;
  flex-shrink: 0;
  box-sizing: border-box;
  padding: 4px;
  border-right: 1px solid #EEEEEE;
  border-bottom: 1px solid #EEEEEE;
}
.work-box{
  width: 100%;
  height: 100%;
  display: flex;
  align-items: center;
  justify-content: space-around;
  background: rgba(58,123,250,0.15);
  border-radius: 8px 8px 8px 8px;
  color: #3A7BFA;
  font-size: 14px;
}
.work-box.type0{
  background: rgba(58,123,250,0.15);
  color: #3A7BFA;
}
.work-box.type1{
  background: #E3DCFE;
  color: #635998;
}
.work-box.type2{
  background: #FAE2CA;
  color: #BC8D5E;
}
.work-box-left{
  display: flex;
  justify-content: center;
  flex-direction: column;
  line-height: 24px;
}
.content-user{
  width: 100%;
  height: 80px;
  box-sizing: border-box;
  border-bottom: 1px solid #EEEEEE;
  display: flex;
  align-items: center;
}
.user-pic{
  width: 50px;
  height: 50px;
  border-radius: 50%;
  background: #C0C4CC;
  color: #fff;
  font-size: 20px;
  text-align: center;
  line-height: 50px;
  margin-left: 10px;
}
.user-info{
  flex: 1;
  margin-left: 10px;
}
.hoverType{
  background: rgba(58,123,250,0.05);
}
</style>

 src/main.js

@@ -13,8 +13,11 @@

//本地
Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';//李
const javaApi = 'http://114.132.189.42:1234';//测试服
// const javaApi = 'http://192.168.11.200:8001';//李
// const javaApi = 'http://192.168.11.249:8001';//å¼ 
const javaApi = 'http://172.20.10.3:8001';//姜
// const javaApi = 'http://192.168.11.2:8001';//柴
// const javaApi = 'http://114.132.189.42:1234';//测试服
//胜云服务器
// Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";
// const javaApi = 'http://122.114.52.69:8001';

 static/js/menu.js

@@ -94,7 +94,7 @@
        }, {
            v: "班次",
            i: "font icon-erjidaohang",
            u: "",
            u: "b3-classes",
            p: ""
        }]
    },