This commit is contained in:
熊成强 2020-11-24 11:13:06 +08:00
parent 1fe4d0ccf1
commit c930c296a8
2 changed files with 26 additions and 15 deletions

View File

@ -16,9 +16,9 @@
cursor: pointer; cursor: pointer;
} }
.pre{ .pre{
line-height: 23px; line-height: 20px;
pre{ pre{
line-height: 23px; line-height: 20px;
// white-space:pre-line; // white-space:pre-line;
// word-wrap: break-word; // word-wrap: break-word;
white-space: pre-line; /* css-3 */ white-space: pre-line; /* css-3 */

View File

@ -1,6 +1,6 @@
<template> <template>
<div class='table'> <div class='table'>
<div v-if="obj.recortModelDtos.length !== 0" class="table-list commonFont"> <div v-if="obj.recortModelDtos.length !== 0" class="table-list">
<div class="table-header"> <div class="table-header">
<div class="table-left name">维度</div> <div class="table-left name">维度</div>
<div class="table-content-right-item" style="flex:1;"> <div class="table-content-right-item" style="flex:1;">
@ -8,9 +8,9 @@
<div class="table-header-flex pre kaohe">考核标准</div> <div class="table-header-flex pre kaohe">考核标准</div>
<div class="table-header-flex jieguo" v-if="tableInfo.result || tableAuth.showResult">结果值</div> <div class="table-header-flex jieguo" v-if="tableInfo.result || tableAuth.showResult">结果值</div>
<div class="table-header-flex quanzhomng" style="flex:none;">权重({{Math.round((obj.weight * 100)*1000)/1000}}%)</div> <div class="table-header-flex quanzhomng" style="flex:none;">权重({{Math.round((obj.weight * 100)*1000)/1000}}%)</div>
<div class="table-header-flex" style="flex:none;width:130px;" v-if="tableInfo.score || tableAuth.showScore">上级评分</div> <div class="table-header-flex pingfen" v-if="tableInfo.score || tableAuth.showScore">上级评分</div>
<div class="table-header-flex quanzhomng" style="flex:none;" v-if="tableInfo.score || tableAuth.showScore">得分</div> <div class="table-header-flex defen" style="flex:none;" v-if="tableInfo.score || tableAuth.showScore">得分</div>
<div class="table-header-flex" style="width: 200px;" v-if="tableInfo.score || tableAuth.showScore">评分说明</div> <div class="table-header-flex pingfen" v-if="tableInfo.score || tableAuth.showScore">评分说明</div>
</div> </div>
</div> </div>
@ -37,7 +37,7 @@
<div class="quanzhomng" style="flex:none;"> <div class="quanzhomng" style="flex:none;">
{{( Math.round((child.checkWeight * 100) * 1000) / 1000 )}}% {{( Math.round((child.checkWeight * 100) * 1000) / 1000 )}}%
</div> </div>
<div v-if="tableInfo.score || tableAuth.showScore" class="pingfen" style="flex:none;width:130px;"> <div v-if="tableInfo.score || tableAuth.showScore" class="pingfen" >
<!-- gradeGroupId=== 1 下拉 --> <!-- gradeGroupId=== 1 下拉 -->
<el-select v-if="tableInfo.score && obj.gradeGroupId===1" style="width:115px;" size="mini" v-model="child.scoreDtos[child.scoreDtos.length-1].acquireScore"> <el-select v-if="tableInfo.score && obj.gradeGroupId===1" style="width:115px;" size="mini" v-model="child.scoreDtos[child.scoreDtos.length-1].acquireScore">
<el-option <el-option
@ -50,10 +50,10 @@
<el-input v-if="tableInfo.score && obj.gradeGroupId===2" style="width:115px;" size="mini" placeholder="请输入评分值" v-model="child.scoreDtos[child.scoreDtos.length-1].acquireScore" clearable></el-input> <el-input v-if="tableInfo.score && obj.gradeGroupId===2" style="width:115px;" size="mini" placeholder="请输入评分值" v-model="child.scoreDtos[child.scoreDtos.length-1].acquireScore" clearable></el-input>
<span v-if="!tableInfo.score">{{handleScore(child.scoreDtos[child.scoreDtos.length-1].acquireScore)}}</span> <span v-if="!tableInfo.score">{{handleScore(child.scoreDtos[child.scoreDtos.length-1].acquireScore)}}</span>
</div> </div>
<div class="quanzhomng pingfen" style="flex:none;" v-if="tableInfo.score || tableAuth.showScore"> <div class="defen" style="flex:none;" v-if="tableInfo.score || tableAuth.showScore">
<span>{{child.scoreDtos[child.scoreDtos.length-1].acquireScore || '--'}}</span> <span>{{child.scoreDtos[child.scoreDtos.length-1].acquireScore || '--'}}</span>
</div> </div>
<div class='pre pingfen' style="padding:10px;width: 200px;" v-if="tableInfo.score || tableAuth.showScore"> <div class='pre pingfen' v-if="tableInfo.score || tableAuth.showScore">
<el-input v-if="tableInfo.score" style="width:200px;" :rows="12" size="mini" type="textarea" placeholder="请输入内容" v-model="child.scoreComment" clearable></el-input> <el-input v-if="tableInfo.score" style="width:200px;" :rows="12" size="mini" type="textarea" placeholder="请输入内容" v-model="child.scoreComment" clearable></el-input>
<span v-else>{{child.scoreComment || '--'}}</span> <span v-else>{{child.scoreComment || '--'}}</span>
</div> </div>
@ -74,7 +74,7 @@
<div class="quanzhomng" style="flex:none;" v-if="tableInfo.score || tableAuth.showScore"> <div class="quanzhomng" style="flex:none;" v-if="tableInfo.score || tableAuth.showScore">
</div> </div>
<div style="padding:10px;width: 200px;" v-if="tableInfo.score || tableAuth.showScore"> <div class='pingfen' v-if="tableInfo.score || tableAuth.showScore">
</div> </div>
</div> </div>
<div v-if="item.name==='总分'" class="table-content-right-item"> <div v-if="item.name==='总分'" class="table-content-right-item">
@ -86,13 +86,13 @@
</div> </div>
<div class="quanzhomng pingfen" style="flex:none;"> <div class="quanzhomng pingfen" style="flex:none;">
</div> </div>
<div class="pingfen" style="padding:10px;flex:none;width:130px;" v-if="tableInfo.score || tableAuth.showScore"> <div class="pingfen" v-if="tableInfo.score || tableAuth.showScore">
{{score.scoreLevel}} {{score.scoreLevel}}
</div> </div>
<div class="quanzhomng pingfen" style="flex:none;" v-if="tableInfo.score || tableAuth.showScore"> <div class="defen" style="flex:none;" v-if="tableInfo.score || tableAuth.showScore">
{{score.lastScore}} {{score.lastScore}}
</div> </div>
<div class="pingfen" style="padding:10px;width: 200px;" v-if="tableInfo.score || tableAuth.showScore"> <div class="pingfen"v-if="tableInfo.score || tableAuth.showScore">
</div> </div>
</div> </div>
</div> </div>
@ -244,6 +244,7 @@ export default {
</script> </script>
<style lang='less' scoped> <style lang='less' scoped>
.pingfen{ .pingfen{
width: 120px ;
.center(); .center();
} }
.names{ .names{
@ -265,6 +266,8 @@ export default {
width: 260px !important; width: 260px !important;
display: block; display: block;
flex: 1 1 auto; flex: 1 1 auto;
display: flex;
align-items: center;
// flex: none; // flex: none;
} }
.nojixiao{ .nojixiao{
@ -278,6 +281,8 @@ export default {
} }
.table-list{ .table-list{
overflow: auto; overflow: auto;
color: #52575b;
font-size: 12px;
border: 1px solid @borderColor; border: 1px solid @borderColor;
border-bottom: none; border-bottom: none;
@ -289,6 +294,7 @@ export default {
// border: 1px solid @borderColor; // border: 1px solid @borderColor;
>div{ >div{
background: #f5f5f5; background: #f5f5f5;
// padding: 10px; // padding: 10px;
border-bottom: 1px solid @borderColor;; border-bottom: 1px solid @borderColor;;
@ -299,7 +305,7 @@ export default {
} }
&-flex{ &-flex{
// flex: 1; // flex: 1;
// .center(); .center();
} }
} }
.table-content{ .table-content{
@ -363,8 +369,13 @@ export default {
width: 60px; width: 60px;
text-align: center; text-align: center;
} }
.defen{
width: 50px !important;
.center();
text-align: center;
}
.quanzhomng{ .quanzhomng{
width: 100px !important; width: 86px !important;
.center(); .center();
text-align: center; text-align: center;
} }