From f885f47a5ebb8f4a1fd732635f19ede6ed1b43f0 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 09 五月 2024 11:30:52 +0800
Subject: [PATCH] 修改样品详情bug
---
src/components/do/b1-sample/detail.vue | 12 +++++++++++-
src/components/view/b3-classes.vue | 48 ++++++++++++++++++++++++++++++++++++------------
2 files changed, 47 insertions(+), 13 deletions(-)
diff --git a/src/components/do/b1-sample/detail.vue b/src/components/do/b1-sample/detail.vue
index 5a07876..cd913d4 100644
--- a/src/components/do/b1-sample/detail.vue
+++ b/src/components/do/b1-sample/detail.vue
@@ -69,7 +69,11 @@
<el-table-column prop="inspectionItemSubclass" label="妫�楠岄」鍒嗙被" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="laboratory" label="瀹為獙瀹�" min-min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="unit" label="鍗曚綅" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="equipValue" label="璁惧" min-width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="equipName" label="璁惧" min-width="100" show-overflow-tooltip>
+ <template slot-scope="scope">
+ {{handleData(scope.row.equipName)}}
+ </template>
+ </el-table-column>
<el-table-column prop="entrustCode" label="濮旀墭缂栧彿" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="updateUserName" label="妫�楠屼汉" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="updateTime" label="妫�楠屾椂闂�" min-width="100" show-overflow-tooltip></el-table-column>
@@ -129,6 +133,12 @@
this.histories = histories;
this.products = products;
})
+ },
+ handleData(e){
+ let info = JSON.parse(e).map(item => {
+ return item.v;
+ }).join(',')
+ return info
}
}
}
diff --git a/src/components/view/b3-classes.vue b/src/components/view/b3-classes.vue
index 3a2d9af..c931dfe 100644
--- a/src/components/view/b3-classes.vue
+++ b/src/components/view/b3-classes.vue
@@ -47,7 +47,7 @@
</div>
<div class="center" v-loading="pageLoading">
<scroll-pagination @load="init" :finishLoding="finishLoding">
- <div>
+ <div class="clearfix">
<div class="fixed-left">
<div class="content-title" style="padding-left: 16px;box-sizing: border-box;">
浜哄憳鍚嶇О
@@ -57,7 +57,7 @@
<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>
</div>
@@ -73,9 +73,9 @@
</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">
<span>{{ getShiftByDic(m.shift) }}</span>
@@ -568,19 +568,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 +598,6 @@
.content {
min-height: calc(100% - 10px); /* 瑙嗗彛楂樺害 */
- /* min-width: 2000px; */
}
.content-title{
height: 52px;
@@ -598,7 +605,6 @@
border-bottom: 1px solid #EEEEEE;
}
.content-title-right{
- /* min-width: 2000px; */
display: flex;
align-items: center;
}
@@ -676,6 +682,24 @@
background: #FDE2E2;
color: #F56C6C;
}
+.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;
--
Gitblit v1.9.3