|
@@ -110,11 +110,11 @@
|
|
|
</p>
|
|
|
<p v-if="item2.taskId != null">任务:{{item2.taskName}}
|
|
|
</p>
|
|
|
- <p>时长:
|
|
|
+ <p style="display: inline-block;">时长:
|
|
|
<span v-if="item2.reportTimeType == 0" style="margin-right:10px;">{{typeList[item2.timeType]}}</span>
|
|
|
<span v-if="item2.reportTimeType == 2" style="margin-right:10px;">{{item2.startTime+'-'+item2.endTime}}</span>
|
|
|
{{item2.time.toFixed(1)}}h
|
|
|
- <el-tag type="danger" class="tages" v-if="item2.isOvertime === 1">加班</el-tag>
|
|
|
+ <el-tag type="danger" size="mini" style="margin-left: 65px" v-if="item2.isOvertime === 1">加班</el-tag>
|
|
|
</p>
|
|
|
|
|
|
<p>事项:<span v-html="item2.content"></span></p>
|
|
@@ -1354,9 +1354,9 @@
|
|
|
.plus {
|
|
|
display: inline-block;
|
|
|
}
|
|
|
- .tages {
|
|
|
- float: right;
|
|
|
- }
|
|
|
+ // .tages {
|
|
|
+ // float: right;
|
|
|
+ // }
|
|
|
.overtime {
|
|
|
display: inline-block;
|
|
|
margin-left: 30px;
|