|
@@ -284,7 +284,7 @@
|
|
|
v-for="item in ordinateList"
|
|
v-for="item in ordinateList"
|
|
|
:key="item.value"
|
|
:key="item.value"
|
|
|
class="ordinate-item"
|
|
class="ordinate-item"
|
|
|
- :style="{ color: viewType === 'users' ? '#606266' : `${item.color}`, height:viewType === 'users' ? '60px' : '130px' }"
|
|
|
|
|
|
|
+ :style="{ color: viewType === 'users' ? '#606266' : `${item.color}`}"
|
|
|
>
|
|
>
|
|
|
{{ item.label }}
|
|
{{ item.label }}
|
|
|
</div>
|
|
</div>
|
|
@@ -298,7 +298,7 @@
|
|
|
:key="cIndex"
|
|
:key="cIndex"
|
|
|
ref="shiftItem"
|
|
ref="shiftItem"
|
|
|
class="shift-item"
|
|
class="shift-item"
|
|
|
- :style="{ display: viewType === 'users' ? 'grid' : 'flex', height:viewType === 'users' ? '59px' : '129px'}"
|
|
|
|
|
|
|
+ :style="{ display: viewType === 'users' ? 'grid' : 'flex'}"
|
|
|
@mouseenter=" hoveredIndex = !readonly && `${row.value}-${cIndex}`"
|
|
@mouseenter=" hoveredIndex = !readonly && `${row.value}-${cIndex}`"
|
|
|
@mouseleave=" hoveredIndex = !readonly && null"
|
|
@mouseleave=" hoveredIndex = !readonly && null"
|
|
|
@click.prevent="!readonly && handleShiftClick($event, {row, rIndex, column, cIndex})"
|
|
@click.prevent="!readonly && handleShiftClick($event, {row, rIndex, column, cIndex})"
|
|
@@ -1387,13 +1387,15 @@ export default {
|
|
|
margin: 10px 0 20px 10px;
|
|
margin: 10px 0 20px 10px;
|
|
|
position: relative;
|
|
position: relative;
|
|
|
display: flex;
|
|
display: flex;
|
|
|
|
|
+ flex-direction: row;
|
|
|
|
|
+ align-items: stretch;
|
|
|
float: left;
|
|
float: left;
|
|
|
overflow-y: auto;
|
|
overflow-y: auto;
|
|
|
white-space: nowrap;
|
|
white-space: nowrap;
|
|
|
.ordinate {
|
|
.ordinate {
|
|
|
width: 80px;
|
|
width: 80px;
|
|
|
padding: 0 10px;
|
|
padding: 0 10px;
|
|
|
- height: 100%;
|
|
|
|
|
|
|
+ // height: 100%;
|
|
|
// background-color: #f0f0f0;
|
|
// background-color: #f0f0f0;
|
|
|
display: flex;
|
|
display: flex;
|
|
|
flex-shrink: 0;
|
|
flex-shrink: 0;
|
|
@@ -1403,8 +1405,9 @@ export default {
|
|
|
align-items: center;
|
|
align-items: center;
|
|
|
justify-content: center;
|
|
justify-content: center;
|
|
|
text-align: center;
|
|
text-align: center;
|
|
|
- height: 60px;
|
|
|
|
|
|
|
+ min-height: 60px;
|
|
|
flex-shrink: 0;
|
|
flex-shrink: 0;
|
|
|
|
|
+ flex-grow: 1;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
.shift-content {
|
|
.shift-content {
|
|
@@ -1415,7 +1418,7 @@ export default {
|
|
|
.shift-item {
|
|
.shift-item {
|
|
|
position: relative;
|
|
position: relative;
|
|
|
width: 59px;
|
|
width: 59px;
|
|
|
- height: 59px;
|
|
|
|
|
|
|
+ min-height: 59px;
|
|
|
font-size: 14px;
|
|
font-size: 14px;
|
|
|
border: 1px solid #ccc;
|
|
border: 1px solid #ccc;
|
|
|
border-bottom: none;
|
|
border-bottom: none;
|
zhonghuizhen