Commit 63810a96 authored by 袁家斌's avatar 袁家斌

change

parent 4e7ec3ac
......@@ -136,7 +136,7 @@ body {
/* 滚动条样式 */
*::-webkit-scrollbar {
width: 8px; /* 设置纵轴(y轴)轴滚动条 */
height: 4px; /* 设置横轴(x轴)轴滚动条 */
height: 8px; /* 设置横轴(x轴)轴滚动条 */
}
/* 滚动条滑块(里面小方块) */
*::-webkit-scrollbar-thumb {
......
......@@ -26,9 +26,10 @@
}
.el-table .cell {
padding: 8px 6px;
line-height: 18px;
padding: 0 6px;
// line-height: 18px;
height: 35px;
line-height: 35px;
}
.el-table thead.is-group th.el-table__cell {
......
......@@ -14,7 +14,7 @@
label="序号"
type="index"
align="center"
width="80"
width="70"
></el-table-column>
<template v-for="(column, cIndex) in columns">
<!-- 无插槽 -->
......@@ -25,6 +25,7 @@
:prop="column.prop"
:align="column.align ? column.align : 'center'"
:min-width="column.minWidth ? column.minWidth : ''"
:show-overflow-tooltip="column.showOverflowTooltip ? column.showOverflowTooltip : false"
:sortable="column.sortable"
></el-table-column>
<!-- 自定义插槽 -->
......@@ -33,6 +34,7 @@
:key="cIndex"
:label="column.label"
:prop="column.prop"
:show-overflow-tooltip="column.showOverflowTooltip ? column.showOverflowTooltip : false"
:align="column.align ? column.align : 'center'"
:min-width="column.minWidth ? column.minWidth : ''"
:sortable="column.sortable"
......
......@@ -90,6 +90,7 @@
class="dialog-data-table"
:data="question_info"
@row-click="showQuestion"
style="margin-top: 0;"
>
<el-table-column
label="问题总数"
......@@ -176,6 +177,7 @@
:data="check_info"
:span-method="handleSpanJC"
style="margin-bottom: 10px; margin-top: 0"
:cell-style="tableCellStyle"
>
<el-table-column
label="指标"
......@@ -195,11 +197,7 @@
:label="column.label"
align="center"
:prop="column.key"
>
<template slot-scope="scope">
<span :class="{'red' : isRed(scope.row[column.key])}">{{scope.row[column.key]}}</span>
</template>
</el-table-column>
></el-table-column>
</el-table>
<div class="inner-title">
......@@ -215,8 +213,9 @@
>
<el-table-column
label="单位工程名称"
align="center"
align="left"
prop="parent_name"
:show-overflow-tooltip=true
></el-table-column>
<el-table-column
label="是否为主要单位"
......@@ -230,8 +229,9 @@
></el-table-column>
<el-table-column
label="分部工程名称"
align="center"
align="left"
prop="part_name"
:show-overflow-tooltip=true
></el-table-column>
<el-table-column
label="是否为主要分部"
......@@ -287,7 +287,7 @@
</div>
</div>
<div class="score-detail">
<el-table border class="dialog-data-table" :data="excellence_info">
<el-table border class="dialog-data-table" :data="excellence_info" style="margin-top: 0;">
<el-table-column
label="创新工法"
align="center"
......@@ -376,6 +376,13 @@ export default {
},
},
methods: {
tableCellStyle({ row, column, rowIndex, columnIndex }){
for (let i = 0; i < this.columns.length; i++) {
if(column.property == this.columns[i].key && this.isRed(row[this.columns[i].key])) {
return 'background: #46234c; color: #ff3737;'
}
}
},
isRed(str){
if (str) {
let num = str.indexOf('%')
......@@ -525,6 +532,8 @@ export default {
});
this.columns = [...this.columns];
console.log('this.columns', this.columns);
},
showQuestion() {
......@@ -584,7 +593,7 @@ export default {
background: #0c3163;
border: 1px solid #1f4c89;
border-top: 0;
padding: 12px 20px;
padding: 10px;
}
.w-50 {
width: 50%;
......@@ -600,11 +609,13 @@ export default {
.top-score {
width: calc(25% - 6px);
font-size: 16px;
line-height: 40px;
/* line-height: 40px; */
padding: 15px 30px;
background: #12407f;
color: #d9d9d9;
white-space: nowrap;
display: flex;
align-items: center;
div {
line-height: 40px;
......@@ -647,7 +658,4 @@ export default {
line-height: 0.4rem;
vertical-align: top;
}
.red{
color: rgb(248, 98, 98);
}
</style>
\ No newline at end of file
......@@ -19,42 +19,42 @@
<div class="scores">
<div class="score-title">
<div class="title">创新工法</div>
<div class="got-score">得分:{{ formData.cxgf_score }}/24</div>
<div class="got-score">得分:{{ formData.cxgf_score || 0}}/24</div>
</div>
<div class="score-detail">
<div class="w-50">省级以上工法:{{ formData.province_num }}</div>
<div class="w-50">国家级工法:{{ formData.country_num }}</div>
<div class="w-50">省级以上工法:{{ formData.province_num || 0}}</div>
<div class="w-50">国家级工法:{{ formData.country_num || 0}}</div>
</div>
</div>
<div class="scores">
<div class="score-title">
<div class="title">工程专利</div>
<div class="got-score">得分:{{ formData.patent_score }}/30</div>
<div class="got-score">得分:{{ formData.patent_score || 0}}/30</div>
</div>
<div class="score-detail">
<div class="w-50">发明专利数:{{ formData.invention_patent_num }}</div>
<div class="w-50">发明专利数:{{ formData.invention_patent_num || 0}}</div>
<div class="w-50">
实用新型专利:{{ formData.practical_patent_num }}
实用新型专利:{{ formData.practical_patent_num || 0}}
</div>
</div>
</div>
<div class="scores">
<div class="score-title">
<div class="title">优秀质量管理成果</div>
<div class="got-score">得分:{{ formData.result_score }}/28</div>
<div class="got-score">得分:{{ formData.result_score || 0}}/28</div>
</div>
<div class="score-detail">
<div class="w-50">国家级:{{ formData.country_result_num }}</div>
<div class="w-50">省部级:{{ formData.province_result_num }}</div>
<div class="w-50">国家级:{{ formData.country_result_num || 0}}</div>
<div class="w-50">省部级:{{ formData.province_result_num || 0}}</div>
</div>
</div>
<div class="scores">
<div class="score-title">
<div class="title">工程质量获奖</div>
<div class="got-score">得分:{{ formData.city_project_score }}/18</div>
<div class="got-score">得分:{{ formData.city_project_score || 0}}/18</div>
</div>
<div class="score-detail">
<div class="w-50">工程质量获奖:{{ formData.city_project_num }}</div>
<div class="w-50">工程质量获奖:{{ formData.city_project_num || 0}}</div>
</div>
</div>
</Dialog>
......
......@@ -17,6 +17,7 @@
:element-loading-background="loadingBG"
height="calc(100% - .7rem)"
:span-method="handleSpan"
:cell-style="tableCellStyle"
>
<el-table-column
label="指标"
......@@ -36,11 +37,7 @@
:label="column.label"
align="center"
:prop="column.key"
>
<template slot-scope="scope">
<span :class="{'red' : isRed(scope.row[column.key])}">{{scope.row[column.key]}}</span>
</template>
</el-table-column>
></el-table-column>
</el-table>
</div>
</template>
......@@ -74,6 +71,13 @@ export default {
},
methods: {
tableCellStyle({ row, column, rowIndex, columnIndex }){
for (let i = 0; i < this.columns.length; i++) {
if(column.property == this.columns[i].key && this.isRed(row[this.columns[i].key])) {
return 'background: #46234c; color: #ff3737;'
}
}
},
changeVisible(val) {
this.dialogVisible = val;
},
......
......@@ -35,8 +35,9 @@
></el-table-column>
<el-table-column
label="分部工程名称"
align="center"
align="left"
prop="part_name"
:show-overflow-tooltip=true
></el-table-column>
<el-table-column
label="是否为主要分部"
......
......@@ -17,21 +17,21 @@
</div>
</div>
<div class="score-detail">
<div class="w-100">工程名称:{{ data.project_name }}</div>
<div class="w-100">所在地址:{{ data.address }}</div>
<div class="w-100"><span>工程名称:</span><div>{{ data.project_name }}</div></div>
<div class="w-100"><span>所在地址:</span><div>{{ data.address }}</div></div>
<div class="w-100">
负责人:{{ data.person_name }} / {{ data.person_mobile }}
<span>负责人:</span><div>{{ data.person_name }} / {{ data.person_mobile }}</div>
</div>
<div class="w-100">标段名称:{{ data.lot_project_name }}</div>
<div class="w-100">所属机构:{{ data.c_company_name }}</div>
<div class="w-100">所属单位:{{ data.units_company_name }}</div>
<div class="w-100">问题分类:{{ data.category_name }}</div>
<div class="w-100">问题等级:{{ data.question_level_str }}</div>
<div class="w-100">问题种类:{{ data.question_type_str }}</div>
<div class="w-100">处理状态:{{ data.question_status_str }}</div>
<div class="w-100">法规依据:{{ data.legal_basis }}</div>
<div class="w-100">系统问题描述:{{ data.system_question }}</div>
<div class="w-100">用户问题描述:{{ data.user_question }}</div>
<div class="w-100"><span>标段名称:</span><div>{{ data.lot_project_name }}</div></div>
<div class="w-100"><span>所属机构:</span><div>{{ data.c_company_name }}</div></div>
<div class="w-100"><span>所属单位:</span><div>{{ data.units_company_name }}</div></div>
<div class="w-100"><span>问题分类:</span><div>{{ data.category_name }}</div></div>
<div class="w-100"><span>问题等级:</span><div>{{ data.question_level_str }}</div></div>
<div class="w-100"><span>问题种类:</span><div>{{ data.question_type_str }}</div></div>
<div class="w-100"><span>处理状态:</span><div>{{ data.question_status_str }}</div></div>
<div class="w-100"><span>法规依据:</span><div>{{ data.legal_basis }}</div></div>
<div class="w-100"><span>系统问题描述:</span><div>{{ data.system_question }}</div></div>
<div class="w-100"><span>用户问题描述:</span><div>{{ data.user_question }}</div></div>
</div>
</div>
</Dialog>
......@@ -151,6 +151,11 @@ export default {
color: #d9d9d9;
font-size: 14px;
line-height: 28px;
display: flex;
span{
color: #b2bfcf;
white-space: nowrap;
}
}
::v-deep .el-dialog .el-dialog__body {
min-height: 400px !important;
......
......@@ -17,18 +17,20 @@
</div>
<el-form inline :model="searchForm" class="search-form">
<el-form-item label="记录时间:">
<div class="select-time-div">
<el-date-picker
v-model="dateRange"
type="datetimerange"
type="daterange"
start-placeholder="开始时间"
end-placeholder="结束时间"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd"
@change="changeTime"
class="select-time"
/>
</div>
</el-form-item>
<el-form-item label="问题类型:">
<el-input size="small" v-model="searchForm.category_name"></el-input>
<el-input size="small" v-model="searchForm.category_name" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="问题种类:">
<el-select
......@@ -148,16 +150,22 @@ export default {
label: "标段",
prop: "lot_project_name",
minWidth: "300px",
align: "left",
showOverflowTooltip: true
},
{
label: "机构名称",
prop: "c_company_name",
minWidth: "200px",
align: "left",
showOverflowTooltip: true
},
{
label: "单位名称",
prop: "units_company_name",
minWidth: "200px",
align: "left",
showOverflowTooltip: true
},
{
label: "单位类型",
......@@ -178,6 +186,8 @@ export default {
label: "用户问题描述",
prop: "user_question",
minWidth: "300px",
align: "left",
showOverflowTooltip: true
},
{
label: "记录时间",
......@@ -219,8 +229,8 @@ export default {
this.dialogVisible = val;
},
changeTime(tr) {
this.searchForm.start_time = tr[0] ? tr[0] : "";
this.searchForm.end_time = tr[1] ? tr[1] : "";
this.searchForm.start_time = tr[0] ? tr[0] + " 00:00:00" : "";
this.searchForm.end_time = tr[1] ? tr[1] + " 00:00:00" : "";
},
handleSearch() {
this.$refs.table.getData();
......@@ -292,4 +302,19 @@ export default {
height: 800px !important;
min-height: 800px !important;
}
.search-form .el-date-editor.el-input__inner{
background: #072350 !important;
height: 32px;
}
.select-time-div{
height: 40px;
display: flex;
align-items: center;
::v-deep .el-date-editor .el-range__icon{
line-height: 28px;
}
::v-deep .el-date-editor .el-range-separator{
line-height: 28px;
}
}
</style>
\ No newline at end of file
......@@ -166,6 +166,10 @@ export default {
.dialog-body-container {
display: flex;
flex-direction: column;
height: 100%;
// height: 100%;
height: calc(100% - 20px);
}
::v-deep .data-table-out{
height: calc(100% - 60px);
}
</style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment