From 3a4041f3eef38f38fa03d6305bea9faead06c133 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 10 五月 2024 16:36:43 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b3-classes.vue | 466 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 268 insertions(+), 198 deletions(-)
diff --git a/src/components/view/b3-classes.vue b/src/components/view/b3-classes.vue
index 3a2d9af..0c851bd 100644
--- a/src/components/view/b3-classes.vue
+++ b/src/components/view/b3-classes.vue
@@ -8,6 +8,7 @@
v-model="query.year"
type="year"
size="small"
+ format="yyyy"
placeholder="閫夋嫨骞�"
style="width: 140px;"
:clearable="false">
@@ -41,13 +42,13 @@
<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="schedulingVisible = true">鎺� 鐝�</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" v-loading="pageLoading">
- <scroll-pagination @load="init" :finishLoding="finishLoding">
- <div>
+ <scroll-pagination @load="init" :finishLoding="finishLoding" v-show="query.month&&list.length>0">
+ <div class="clearfix">
<div class="fixed-left">
<div class="content-title" style="padding-left: 16px;box-sizing: border-box;">
浜哄憳鍚嶇О
@@ -57,9 +58,11 @@
<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="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.totalAttendance }}澶�</span></p>
+ color: #FF4902;">{{ query.month?item.monthlyAttendance
+.totalAttendance:item.sidebarAnnualAttendance
+.totalAttendance }}澶�</span></p>
</div>
</div>
</div>
@@ -67,21 +70,24 @@
<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">{{ item.weekNum }}鍛�</span>
- <span class="day">{{ item.day }}</span>
- <span class="week">{{ item.week }}</span>
+ <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>
</div>
<div class="content-body" v-for="(item,index) in list" :key="'c'+index"
- :class="{hoverType:currentUserIndex==index}"v-on:mouseenter="onMouseEnter(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">
+ <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">
+ <!-- <div class="work-box-left">
<span>{{ getShiftByDic(m.shift) }}</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>
+ </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>
@@ -93,6 +99,56 @@
</div>
</div>
</scroll-pagination>
+ <scroll-pagination @load="initYear" :finishLoding="finishLoding" v-show="!query.month&&list.length>0" style="width: 100%;">
+ <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 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="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 list"
+ :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 monthList.length" :key="'d'+i" :class="{hoverType:currentUserIndex==index}">
+ <p style="color:rgb(153, 153, 153);font-size: 12px;">鍚堣鍑哄嫟锛�<span style="font-size: 14px;color:#000">12</span></p>
+ <p style="color:rgb(153, 153, 153);font-size: 12px;">
+ 鏃�: 12, 涓�: 12, 澶�: 12, 浼�: 12, 鍋�: 12
+ </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="list.length==0">鏆傛棤鏁版嵁</span>
</div>
<el-dialog title="鎺掔彮" :visible.sync="schedulingVisible" width="400px">
<div class="search_thing">
@@ -151,188 +207,68 @@
},
data () {
return{
- currentYear:new Date().getFullYear(),
- currentMonth:new Date().getMonth()+1,
+ addPower:true,
+ upPower:true,
+ downPower:true,
query:{
userName:'',
laboratory:'',
- year:'',
- month:''
+ 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鏈�'
},
],
laboratory:[],
weeks:[],
- 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:[],
currentUserIndex:null,
schedulingVisible:false,
@@ -347,8 +283,24 @@
currentPage: 1, // 褰撳墠椤�
pageSize: 10, // 涓�椤�10鏉�
total: '',
- pageLoading: true, // 缁勪欢loading鐨勫睍绀�,榛樿涓簍rue
- finishLoding: false // 鍔犺浇瀹屾垚锛屾樉绀哄凡缁忔病鏈夋洿澶氫簡
+ pageLoading: false, // 缁勪欢loading鐨勫睍绀�,榛樿涓簍rue
+ finishLoding: false, // 鍔犺浇瀹屾垚锛屾樉绀哄凡缁忔病鏈夋洿澶氫簡
+ monthList:[]
+ }
+ },
+ 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()
}
},
mounted(){
@@ -356,6 +308,12 @@
this.obtainItemParameterList()
this.getUsers()
this.init()
+ this.monthList = []
+ for(let i=new Date().getMonth()+1;i>0;i--){
+ this.monthList.push(i)
+ }
+ this.monthList.reverse()
+ // this.getPower()
},
methods: {
refresh(){
@@ -364,8 +322,8 @@
this.query = {
userName:'',
laboratory:'',
- year:'',
- month:''
+ year:new Date(),
+ month:new Date().getMonth()+1
}
this.init()
},
@@ -378,39 +336,52 @@
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:this.query.month?this.query.year+'-'+this.query.month:this.query.year,
+ 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.records.map(item=>{
- for (let key in item) {
+ 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[key]
+ item[`day${type}`] = item.monthlyAttendance[key]
}
}
return item
});
// 鍙充晶鏃ユ湡鑾峰彇
- if(this.currentPage==1){
- if(list&&list.length>0){
- this.weeks = [];
- list[0].list&&list[0].list.forEach(item=>{
- let obj = {
- weekNum:item.weekly,
- week:item.headerTime.split(' ')[1],
- day:item.headerTime.split(' ')[0]
- }
- this.weeks.push(obj)
- })
+ // if(this.currentPage==1){
+ // if(list&&list.length>0){
+ // this.weeks = [];
+ // list[0].list&&list[0].list.forEach(item=>{
+ // let obj = {
+ // weekNum:item.weekly,
+ // week:item.headerTime.split(' ')[1],
+ // day:item.headerTime.split(' ')[0]
+ // }
+ // this.weeks.push(obj)
+ // })
+ // }
+ // }
+ 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{
@@ -423,7 +394,29 @@
}
this.currentPage++;
}
+ console.log(this.list)
})
+ },
+ initYear(){},
+ 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
@@ -487,10 +480,14 @@
},
handleCommand(e,m){
if(e!=m.shift){
- this.$axios.put(this.$api.performanceShift.update+m.id, {
+ this.$axios.put(this.$api.performanceShift.update, {
id:m.id,
shift:e
- }).then(res => {
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
if (res.code == 201) return
this.$message.success('鎿嶄綔鎴愬姛')
m.shift = e
@@ -568,19 +565,27 @@
width: 100%;
height: calc(100% - 40px );
background-color: #fff;
- position: relative;
overflow-y: auto;
+ display: flex;
+}
+>>>.scroll-pagination{
+ overflow-y: scroll;
+ scrollbar-width: none; /* 瀵逛簬 Firefox 鍜� IE 鐨勫吋瀹瑰啓娉� */
+}
+>>>.scroll-pagination::-webkit-scrollbar {
+ display: none; /* 瀵逛簬 Chrome, Safari 鍜� Opera 鐨勫啓娉� */
}
.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); /* 瑙嗗彛楂樺害 */
@@ -590,7 +595,6 @@
.content {
min-height: calc(100% - 10px); /* 瑙嗗彛楂樺害 */
- /* min-width: 2000px; */
}
.content-title{
height: 52px;
@@ -598,38 +602,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{
@@ -637,8 +641,8 @@
align-items: center;
}
.content-body-item{
- height: 80px;
- width: 100px;
+ height: 70px;
+ width: 60px;
flex-shrink: 0;
box-sizing: border-box;
padding: 4px;
@@ -658,24 +662,57 @@
}
.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;
+ color: #67C23A !important;
+}
+.work-box.type3 span{
+ color: #67C23A !important;
}
.work-box.type4{
background: #FDE2E2;
- color: #F56C6C;
+ 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;
@@ -684,7 +721,7 @@
}
.content-user{
width: 100%;
- height: 80px;
+ height: 70px;
box-sizing: border-box;
border-bottom: 1px solid #EEEEEE;
display: flex;
@@ -708,4 +745,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