From d40e875d8e025fd09566e919306f5b05755c25cb Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期六, 11 五月 2024 14:51:17 +0800
Subject: [PATCH] x优化班次
---
src/components/view/b3-classes.vue | 968 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 538 insertions(+), 430 deletions(-)
diff --git a/src/components/view/b3-classes.vue b/src/components/view/b3-classes.vue
index f7db61e..2d9ffd5 100644
--- a/src/components/view/b3-classes.vue
+++ b/src/components/view/b3-classes.vue
@@ -8,7 +8,9 @@
v-model="query.year"
type="year"
size="small"
+ format="yyyy"
placeholder="閫夋嫨骞�"
+ @change="refreshTable()"
style="width: 140px;"
:clearable="false">
</el-date-picker>
@@ -17,7 +19,8 @@
clearable
placeholder="閫夋嫨鏈�"
style="width: 140px;margin-left: 16px;"
- size="small">
+ size="small"
+ @change="refreshTable()">
<el-option
v-for="item in monthOptions"
:key="item.value"
@@ -25,10 +28,10 @@
: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-input v-model="query.userName" placeholder="璇疯緭鍏ヤ汉鍛樺悕绉�" size="small" style="width: 140px;margin: 0 16px;" clearable @keyup.enter.native="refreshTable()"></el-input>
+ <el-select v-model="query.laboratory" placeholder="璇烽�夋嫨瀹為獙瀹�" style="width: 140px;" size="small" clearable @change="refreshTable()">
<el-option
- v-for="item in labOptions"
+ v-for="item in laboratory"
:key="item.value"
:label="item.label"
:value="item.value">
@@ -41,84 +44,141 @@
<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>
+ <el-button size="small" type="primary" v-if="downPower">瀵� 鍑�</el-button>
+ <el-button size="small" type="primary" @click="schedulingVisible = true" v-if="addPower">鎺� 鐝�</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 class="center" v-loading="pageLoading">
+ <scroll-pagination @load="init" :finishLoding="finishLoding" v-show="query.month&&list.length>0" style="height: 100%;" :key="'123'">
+ <div class="clearfix">
+ <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 list" :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 }}</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;">{{ query.month?item.monthlyAttendance
+.totalAttendance:item.sidebarAnnualAttendance
+.totalAttendance }}澶�</span></p>
+ </div>
</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 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" style="position: absolute;top: 4px;" v-if="item.week=='鍛ㄦ棩'">{{ item.weekNum }}鍛�</span>
+ <p style="height: 26px;position: absolute;bottom: 12px;">
+ <span class="day">{{ item.day }}</span>
+ <span class="week">{{ item.week }}</span>
+ </p>
</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 class="content-body" v-for="(item,index) in list" :key="'c'+index"
+ v-on:mouseenter="onMouseEnter(index)"
+ v-on:mouseleave="currentUserIndex=null">
+ <div class="content-body-item" v-for="(m,i) in item.list" :key="'d'+i" :class="{hoverType:currentUserIndex==index}">
+ <div class="work-box" :class="{type0:m.shift==='0',type1:m.shift==='1',type2:m.shift==='2',type3:m.shift==='3',type4:m.shift==='4',}">
+ <!-- <div class="work-box-left">
+ <span>{{ getShiftByDic(m.shift) }}</span>
+ </div> -->
+ <el-dropdown trigger="click" placement="bottom" @command="e=>handleCommand(e,m)" :disabled="!downPower">
+ <!-- <i class="el-icon-arrow-down el-icon--right" style="font-size: 20px;color: #fff;cursor: pointer;"></i> -->
+ <span style="cursor: pointer;">{{ getShiftByDic(m.shift) }}</span>
+ <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>
+ </scroll-pagination>
+ <scroll-pagination @load="initYear" :finishLoding="finishLoding" v-show="!query.month&&yearList.length>0" style="width: 100%;" :key="'111'">
+ <div class="clearfix year-table">
+ <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 yearList" :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 }}</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.work_time }}澶�</span></p>
+ </div>
+ </div>
+ </div>
+ <div class="scroll-right">
+ <div class="content">
+ <div>
+ <div class="content-title content-title-right" style="border-bottom: 0;height: 52px;" :style="`display: grid;
+ grid-template-columns: repeat(${monthList.length}, 1fr);`">
+ <div class="content-title-item" v-for="(item,index) in monthList" :key="'b'+index" style="height: 52px;">
+ <span class="month">{{ item }}鏈�</span>
+ </div>
+ </div>
+ <div
+ class="content-body"
+ v-for="(item,index) in yearList"
+ :key="'c'+index"
+ v-on:mouseenter="onMouseEnter(index)"
+ v-on:mouseleave="currentUserIndex=null"
+ :style="`display: grid;
+ grid-template-columns: repeat(${monthList.length}, 1fr);`"
+ >
+ <div class="content-body-item" v-for="(m,i) in item.monthList" :key="'d'+i" :class="{hoverType:currentUserIndex==index}">
+ <p style="color:rgb(153, 153, 153);font-size: 12px;">鍚堣鍑哄嫟锛�<span style="font-size: 14px;color:#000">{{ m.totalMonthAttendance }}</span></p>
+ <p style="color:rgb(153, 153, 153);font-size: 12px;">
+ 鏃�: {{ m.day0 }}, 涓�: {{ m.day1 }}, 澶�: {{ m.day2 }}, 浼�: {{ m.day3 }}, 鍋�: {{ m.day4 }}
+ </p>
+ </div>
</div>
</div>
</div>
</div>
</div>
+ </scroll-pagination>
+ <span style="color:#909399;font-size:14px;position: absolute;left:50%;top: 50%;transform: translate(-59%,-50%);" v-if="(query.month&&list.length==0)||(!query.month&&yearList.length==0)">鏆傛棤鏁版嵁</span>
</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">
+ <div class="search_label" style="width:90px"><span style="color: red;margin-right: 4px;">*</span>鍛ㄦ锛�</div>
+ <div class="search_input" style="width: calc(100% - 90px);">
<el-date-picker
v-model="schedulingQuery.week"
type="week"
format="yyyy 绗� WW 鍛�"
- placeholder="閫夋嫨鍛ㄦ" style="width: 203px;">
+ placeholder="閫夋嫨鍛ㄦ" style="width: 100%">
</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 >
+ <div class="search_label" style="width:90px"><span style="color: red;margin-right: 4px;">*</span>浜哄憳鍚嶇О锛�</div>
+ <div class="search_input" style="width: calc(100% - 90px);">
+ <el-select v-model="schedulingQuery.userId" placeholder="璇烽�夋嫨" style="width: 100%;" multiple clearable collapse-tags >
<el-option
v-for="item in personList"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
</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%;">
+ <div class="search_label" style="width:90px"><span style="color: red;margin-right: 4px;">*</span>鐝锛�</div>
+ <div class="search_input" style="width: calc(100% - 90px);">
+ <el-select v-model="schedulingQuery.shift" placeholder="璇烽�夋嫨" style="width: 100%;">
<el-option
v-for="item in classType"
:key="item.value"
@@ -137,417 +197,325 @@
</template>
<script>
+import {
+ getYearAndMonthAndDays
+ } from '../../util/date'
+ import ScrollPagination from '../tool/scroll-paging.vue'
export default {
+ components: {
+ ScrollPagination
+ },
data () {
return{
- currentYear:new Date().getFullYear(),
- currentMonth:new Date().getMonth()+1,
+ addPower:true,
+ upPower:true,
+ downPower:true,
query:{
- name:'',
- addr:'',
- year:'',
- month:''
+ userName:'',
+ laboratory:'',
+ year:new Date(),
+ month:new Date().getMonth()+1
+ // month:''
},
monthOptions:[
{
- value:'1',
+ value:1,
label:'1鏈�'
},
{
- value:'2',
+ value:2,
label:'2鏈�'
},
{
- value:'3',
+ value:3,
label:'3鏈�'
},
{
- value:'4',
+ value:4,
label:'4鏈�'
},
{
- value:'5',
+ value:5,
label:'5鏈�'
},
{
- value:'6',
+ value:6,
label:'6鏈�'
},
{
- value:'7',
+ value:7,
label:'7鏈�'
},
{
- value:'8',
+ value:8,
label:'8鏈�'
},
{
- value:'9',
+ value:9,
label:'9鏈�'
},
{
- value:'10',
+ value:10,
label:'10鏈�'
},
{
- value:'11',
+ value:11,
label:'11鏈�'
},
{
- value:'12',
+ 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',
- },
- ],
+ laboratory:[],
+ weeks:[],
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:''
- }
+ userId:null,
+ shift:''
+ },
+ list:[],
+ currentPage: 1, // 褰撳墠椤�
+ pageSize: 10, // 涓�椤�10鏉�
+ total: '',
+ pageLoading: false, // 缁勪欢loading鐨勫睍绀�,榛樿涓簍rue
+ finishLoding: false, // 鍔犺浇瀹屾垚锛屾樉绀哄凡缁忔病鏈夋洿澶氫簡
+ monthList:[],
+ yearList:[]
}
+ },
+ watch: {
+ // 'query.year'(val){
+ // this.monthList = []
+ // if(val.getFullYear()==new Date().getFullYear()){
+ // for(let i=new Date().getMonth()+1;i>0;i--){
+ // this.monthList.push(i)
+ // }
+ // }else{
+ // for (let i=12;i>0;i--) {
+ // this.monthList.push(i)
+ // }
+ // }
+ // this.monthList.reverse()
+ // },
+ // 'query.month'(val){
+ // if(!val){
+ // this.currentPage = 1;
+ // this.yearList = []
+ // this.initYear()
+ // }
+ // }
},
mounted(){
this.selectEnumByCategory()
+ this.obtainItemParameterList()
+ this.getUsers()
+ if(this.query.month){
+ this.init()
+ }else{
+ this.initYear()
+ }
+ this.monthList = []
+ for(let i=12;i>0;i--){
+ this.monthList.push(i)
+ }
+ this.monthList.reverse()
+ // this.getPower()
},
methods: {
- refresh(){},
- refreshTable(){},
+ refresh(){
+ this.list = [];
+ this.yearList = []
+ this.currentPage = 1
+ this.query = {
+ userName:'',
+ laboratory:'',
+ year:new Date(),
+ month:new Date().getMonth()+1
+ }
+ if(this.query.month){
+ this.init()
+ }else{
+ this.initYear()
+ }
+ },
+ refreshTable(){
+ this.currentPage = 1
+ if(this.query.month){
+ this.list = [];
+ this.init()
+ }else{
+ this.yearList = []
+ this.initYear()
+ }
+ },
+ init(){
+ if(this.currentPage==1){
+ this.pageLoading = true
+ }
+ let year = this.query.year.getFullYear()
+ let month0 = this.query.month?this.query.month:new Date().getMonth()+1
+ let month = month0>9?month0:'0'+month0
+ this.$axios.post(this.$api.performanceShift.page, {
+ size:this.pageSize,
+ current:this.currentPage,
+ time:year+'-'+month+'-01 00:00:00',
+ userName:this.query.userName,
+ laboratory:this.query.laboratory,
+ }).then(res => {
+ this.pageLoading = false
+ if (res.code == 201) return
+ this.total = res.data.total
+ let list = res.data.page.records.map(item=>{
+ for (let key in item.monthlyAttendance) {
+ let type = this.getDayByDic(key)
+ if(type!=undefined||type!=null){
+ item[`day${type}`] = item.monthlyAttendance[key]
+ }
+ }
+ return item
+ });
+ let headerList = res.data.headerList;
+ this.weeks = [];
+ headerList.forEach(item=>{
+ let obj = {
+ weekNum:item.weekly,
+ week:item.headerTime.split(' ')[1],
+ day:item.headerTime.split(' ')[0]
+ }
+ this.weeks.push(obj)
+ })
+ if(list.length==0){
+ this.finishLoding = true;
+ }else{
+ if(list.length<this.pageSize){
+ this.finishLoding = true;
+ }
+ this.list = this.list.concat(list)
+ if(this.total==this.list.length){
+ this.finishLoding = true;
+ }
+ this.currentPage++;
+ }
+ })
+ },
+ initYear(){
+ // pageYear
+ if(this.currentPage==1){
+ this.pageLoading = true
+ }
+ let year = this.query.year.getFullYear()
+ this.$axios.post(this.$api.performanceShift.pageYear, {
+ size:this.pageSize,
+ current:this.currentPage,
+ time:year+'-01-01 00:00:00',
+ userName:this.query.userName,
+ laboratory:this.query.laboratory,
+ }).then(res => {
+ this.pageLoading = false
+ if (res.code == 201) return
+ this.total = res.data.total
+ let list = res.data.records.map(item=>{
+ for (let key in item.year) {
+ let type = this.getDayByDic(key)
+ if(type!=undefined||type!=null){
+ item[`day${type}`] = item.year[key]
+ }
+ }
+ item.monthList = []
+ for (let m in item.month) {
+ let obj = {}
+ for (let key in item.month[m]) {
+ let type = this.getDayByDic(key)
+ if(type!=undefined||type!=null){
+ obj[`day${type}`] = item.month[m][key]
+ }
+ }
+ obj.totalMonthAttendance = item.month[m].totalMonthAttendance
+ item.monthList.push(obj)
+ }
+ return item
+ });
+ if(list.length==0){
+ this.finishLoding = true;
+ }else{
+ if(list.length<this.pageSize){
+ this.finishLoding = true;
+ }
+ this.yearList = this.yearList.concat(list)
+ if(this.total==this.yearList.length){
+ this.finishLoding = true;
+ }
+ this.currentPage++;
+ }
+ })
+ },
+ getPower() {
+ let power = JSON.parse(sessionStorage.getItem('power'))
+ let add = false
+ let up = false
+ let down = false
+ for (var i = 0; i < power.length; i++) {
+ if (power[i].menuMethod == 'update') {
+ up = true
+ }
+ if (power[i].menuMethod == 'delDeviceParameter') {
+ down = true
+ }
+ if (power[i].menuMethod == 'add') {
+ add = true
+ }
+ }
+ this.addPower = add
+ this.upPower = up
+ this.downPower = down
+ },
onMouseEnter(index){
this.currentUserIndex = index
},
- handleScheduling(){
- this.schedulingVisible = true
+ confirmScheduling(){
+ if(!this.schedulingQuery.week){
+ this.$message.error('璇烽�夋嫨鍛ㄦ')
+ return
+ }
+ let time = this.schedulingQuery.week.getTime()
+ let startWeek =getYearAndMonthAndDays(new Date(time - 24 * 60 * 60 * 1000)) + ' 00:00:00'
+ let endWeek = getYearAndMonthAndDays(new Date(time + 24 * 60 * 60 * 1000 * 5))+ ' 00:00:00'
+ if(!this.schedulingQuery.userId||this.schedulingQuery.userId.length==0){
+ this.$message.error('璇烽�夋嫨浜哄憳')
+ return
+ }
+ if(!this.schedulingQuery.shift){
+ this.$message.error('璇烽�夋嫨鐝')
+ return
+ }
+ this.loading = true
+ this.$axios.post(this.$api.performanceShift.add, {
+ startWeek,
+ endWeek,
+ userId:this.schedulingQuery.userId.join(','),
+ shift:this.schedulingQuery.shift}, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ this.loading = false
+ if (res.code == 201) return
+ this.$message.success('鎿嶄綔鎴愬姛')
+ this.schedulingVisible = false
+ this.schedulingQuery = {
+ week:'',
+ userId:null,
+ shift:''
+ }
+ this.refresh()
+ })
},
- confirmScheduling(){},
selectEnumByCategory() {
this.$axios.post(this.$api.enums.selectEnumByCategory, {
category: "鐝绫诲瀷"
@@ -555,8 +523,67 @@
this.classType = res.data
})
},
+ obtainItemParameterList() {
+ this.$axios.get(this.$api.laboratoryScope.obtainItemParameterList).then(res => {
+ let data = []
+ res.data.forEach(a => {
+ data.push({
+ label: a.laboratoryName,
+ value: a.id
+ })
+ })
+ this.laboratory = data
+ })
+ },
handleCommand(e,m){
- console.log(e,m)
+ if(e!=m.shift){
+ this.$axios.put(this.$api.performanceShift.update, {
+ id:m.id,
+ shift:e
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ if (res.code == 201) return
+ this.$message.success('鎿嶄綔鎴愬姛')
+ m.shift = e
+ })
+ }
+ },
+ getUsers(){
+ this.$axios.post(this.$api.user.selectUserList, {
+ page: {
+ current: -1,
+ size: -1,
+ },
+ entity: {
+ name: null,
+ }
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ if (res.code === 201) {
+ return
+ }
+ let arr = res.data.body.records
+ this.personList = arr
+ })
+ },
+ getDayByDic(e){
+ let obj = this.classType.find(m=>m.label==e)
+ if(obj){
+ return obj.value
+ }
+ },
+ getShiftByDic(e){
+ let obj = this.classType.find(m=>m.value==e)
+ if(obj){
+ return obj.label
+ }
+ return '鏈帓鐝�'
}
}
}
@@ -593,21 +620,29 @@
}
.center {
width: 100%;
- height: calc(100% - 40px );
+ height: calc(100% - 50px );
background-color: #fff;
- position: relative;
overflow-y: auto;
+ display: flex;
+}
+>>>.scroll-pagination{
+ overflow-y: scroll;
+ scrollbar-width: none;
+}
+>>>.scroll-pagination::-webkit-scrollbar {
+ display: none;
}
.fixed-left {
- position: absolute;
- left: 0;
- top: 0;
+ float: left;
width: 220px; /* 宸﹁竟鍖哄煙瀹藉害 */
- min-height: calc(100% - 10px); /* 瑙嗗彛楂樺害 */
background-color: #fff;
box-shadow: 2px -2px 5px rgba(51,51,51,0.12); /* 宸﹁竟闃村奖 */
}
-
+.clearfix::after {
+ content: "";
+ display: table;
+ clear: both;
+}
.scroll-right {
width: calc(100% - 220px); /* 鍑忓幓宸﹁竟鍖哄煙瀹藉害 */
min-height: calc(100% - 10px); /* 瑙嗗彛楂樺害 */
@@ -617,7 +652,6 @@
.content {
min-height: calc(100% - 10px); /* 瑙嗗彛楂樺害 */
- min-width: 2000px;
}
.content-title{
height: 52px;
@@ -625,38 +659,38 @@
border-bottom: 1px solid #EEEEEE;
}
.content-title-right{
- min-width: 2000px;
display: flex;
align-items: center;
}
.content-title-item{
height: 100%;
- width: 100px;
+ width: 60px;
flex-shrink: 0;
border-bottom: 1px solid #EEEEEE;
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: center;
+ flex-direction: column;
+ position: relative;
}
.content-title-item .month{
font-size: 12px;
color: #3A7BFA;
box-sizing: border-box;
- padding: 0 4px;
+ padding: 0 1px;
border-radius: 50%;
background: #D6E4FF;
- line-height: 30px;
text-align: center;
- margin-right: 6px;
+ line-height: 22px;
}
.content-title-item .day{
- font-size: 16px;
+ font-size: 14px;
color: #333333;
- margin-right: 6px;
+ /* margin-right: 4px; */
}
.content-title-item .week{
- font-size: 14px;
+ font-size: 12px;
color: #999999;
}
.content-body{
@@ -664,8 +698,8 @@
align-items: center;
}
.content-body-item{
- height: 80px;
- width: 100px;
+ height: 70px;
+ width: 60px;
flex-shrink: 0;
box-sizing: border-box;
padding: 4px;
@@ -678,23 +712,64 @@
display: flex;
align-items: center;
justify-content: space-around;
- background: rgba(58,123,250,0.15);
+ background: #F5F7FB;
border-radius: 8px 8px 8px 8px;
- color: #3A7BFA;
+ color: #999;
font-size: 14px;
}
.work-box.type0{
background: rgba(58,123,250,0.15);
- color: #3A7BFA;
+ color: #3A7BFA !important;
+}
+.work-box.type0 span{
+ color: #3A7BFA !important;
}
.work-box.type1{
background: #E3DCFE;
- color: #635998;
+ color: #635998 !important;
+}
+.work-box.type1 span{
+ color: #635998 !important;
}
.work-box.type2{
background: #FAE2CA;
- color: #BC8D5E;
+ color: #BC8D5E !important;
}
+.work-box.type2 span{
+ color: #BC8D5E !important;
+}
+.work-box.type3{
+ background: #E1F3D8;
+ color: #67C23A !important;
+}
+.work-box.type3 span{
+ color: #67C23A !important;
+}
+.work-box.type4{
+ background: #FDE2E2;
+ color: #F56C6C !important;
+}
+.work-box.type4 span{
+ color: #F56C6C !important;
+}
+/* .el-icon-arrow-down::before{
+ color: #c6c4c4;
+} */
+/* .type0 .el-icon-arrow-down::before{
+ color: #fff;
+}
+.type1 .el-icon-arrow-down::before{
+ color: #fff;
+}
+.type2 .el-icon-arrow-down::before{
+ color: #fff;
+}
+.type3 .el-icon-arrow-down::before{
+ color: #fff;
+}
+.type4 .el-icon-arrow-down::before{
+ color: #fff;
+} */
.work-box-left{
display: flex;
justify-content: center;
@@ -703,7 +778,7 @@
}
.content-user{
width: 100%;
- height: 80px;
+ height: 70px;
box-sizing: border-box;
border-bottom: 1px solid #EEEEEE;
display: flex;
@@ -727,4 +802,37 @@
.hoverType{
background: rgba(58,123,250,0.05);
}
+.year-table{
+ width: 100%;
+}
+/* .year-table .scroll-right{
+ width: calc(100% -220px);
+} */
+.year-table .scroll-right{
+ flex: 1;
+}
+.year-table .month{
+ font-size: 14px;
+ color: #3A7BFA;
+ box-sizing: border-box;
+ padding: 0 4px;
+ border-radius: 50%;
+ background: #D6E4FF;
+ text-align: center;
+ line-height: 30px;
+}
+.year-table .content-title-item{
+ width: 100%;
+}
+.year-table .content-body{
+ /* width: calc(100% -220px) !important; */
+}
+.year-table .content-body-item{
+ width: 100%;
+ height: 70px;
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+ justify-content: center;
+}
</style>
--
Gitblit v1.9.3