Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhbigscreen into dev
姜玉琦
commit
6807227049
|
|
@ -40,17 +40,19 @@
|
|||
<div :class="nav == 3 ? 'head-nav active' : 'head-nav'" @click="doNav(3)">复检驳回({{ count['3'] }})</div>
|
||||
<div :class="nav == 4 ? 'head-nav active' : 'head-nav'" @click="doNav(4)">复检通过({{ count['4'] }})</div>
|
||||
<div :class="nav == 5 ? 'head-nav active' : 'head-nav'" @click="doNav(5)">整改超时({{ count['5'] }})</div>
|
||||
|
||||
|
||||
</div>
|
||||
<div class="data-list scroll" style="max-height:712px;overflow-y: auto;margin:12px 0px;overflow-x: hidden;">
|
||||
<div v-for="(it, idx) in dataTable" :key="idx" class="data-item" :class="it.checkState!=4 && it.timeout?'time-out':''">
|
||||
<div v-for="(it, idx) in dataTable" :key="idx" class="data-item"
|
||||
:class="it.timeout ? 'time-out' : ''">
|
||||
<div class="item-left">
|
||||
<el-image ref="preview" style="width: 200px; height: 100px" :preview-src-list="[it.marksPicture]"
|
||||
:src="it.marksPicture+'.min.jpg'">
|
||||
:src="it.marksPicture + '.min.jpg'">
|
||||
</el-image>
|
||||
</div>
|
||||
<div class="item-right">
|
||||
<div v-if="it.checkState!=4 && it.timeout" class="text-timeout">超时</div>
|
||||
<div v-if="it.timeout" class="text-timeout">超时</div>
|
||||
<div class="text-state" :class="'state'+it.checkState">{{ getCheckState(it.checkState) }}</div>
|
||||
<el-col :span="12" class="item-data">
|
||||
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">隐患类型:</span>
|
||||
<div class="div-text">{{ getDangerType(it.dangerType) }}</div>
|
||||
|
|
@ -67,22 +69,38 @@
|
|||
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">抄送人:</span>
|
||||
<div class="div-text">{{ it.copySend }}</div>
|
||||
</el-col>
|
||||
<el-col :span="8" class="item-data" v-if="1==2">
|
||||
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">流程状态:</span>
|
||||
<div class="div-text">{{ getCheckState(it.checkState) }}</div>
|
||||
<template v-if="it.checkState==4">
|
||||
<el-col :span="12" class="item-data">
|
||||
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">提交用户:</span>
|
||||
<div class="div-text">{{ it.createBy }}</div>
|
||||
</el-col>
|
||||
<el-col :span="12" class="item-data">
|
||||
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">提交时间:</span>
|
||||
<div class="div-text">{{ it.createTime | formatDate('YYYY-MM-DD') }}</div>
|
||||
</el-col>
|
||||
<el-col :span="12" class="item-data">
|
||||
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">截止时间:</span>
|
||||
<div class="div-text">{{ it.nickedTime | formatDate('YYYY-MM-DD') }}</div>
|
||||
</el-col>
|
||||
<el-col :span="12" class="item-data">
|
||||
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">完成时间:</span>
|
||||
<div class="div-text">{{ it.updateTime | formatDate('YYYY-MM-DD') }}</div>
|
||||
</el-col>
|
||||
</template>
|
||||
<template v-else>
|
||||
<el-col :span="8" class="item-data">
|
||||
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">提交用户:</span>
|
||||
<div class="div-text">{{ it.createBy }}</div>
|
||||
</el-col>
|
||||
<el-col :span="8" class="item-data">
|
||||
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">提交时间:</span>
|
||||
<div class="div-text">{{ it.createTime|formatDate('YYYY-MM-DD') }}</div>
|
||||
<div class="div-text">{{ it.createTime | formatDate('YYYY-MM-DD') }}</div>
|
||||
</el-col>
|
||||
<el-col :span="8" class="item-data">
|
||||
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">截止时间:</span>
|
||||
<div class="div-text">{{ it.nickedTime|formatDate('YYYY-MM-DD') }}</div>
|
||||
<div class="div-text">{{ it.nickedTime | formatDate('YYYY-MM-DD') }}</div>
|
||||
</el-col>
|
||||
</template>
|
||||
<el-col :span="24" class="item-data">
|
||||
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">隐患描述:</span>
|
||||
<div class="div-text">{{ it.workParts }}
|
||||
|
|
@ -145,27 +163,35 @@ export default {
|
|||
return;
|
||||
}
|
||||
this.nav = n;
|
||||
let postData={
|
||||
let postData = {
|
||||
projectId: this.row.projectId,
|
||||
infoType: this.infoType,
|
||||
infoType: this.infoType,
|
||||
};
|
||||
if(n==5){
|
||||
postData.activeName='zgcs'
|
||||
}else{
|
||||
postData.checkState=n
|
||||
if (n == 5) {
|
||||
postData.activeName = 'zgcs'
|
||||
} else {
|
||||
postData.checkState = n
|
||||
}
|
||||
this.$api.problemmodify.listSspProblemmodify(postData).then(d => {
|
||||
this.dataTable = (d.data || []).map(it=>{
|
||||
if(it.nickedTime){
|
||||
let dt1=+this.$dt(this.$dt(it.nickedTime).format("YYYY-MM-DD"));
|
||||
let dt2=+this.$dt(this.$dt(new Date()).format("YYYY-MM-DD"));
|
||||
if(dt1<dt2){
|
||||
it.timeout=true;
|
||||
}else{
|
||||
it.timeout=false;
|
||||
this.dataTable = (d.data || []).map(it => {
|
||||
if(it.updateTime){
|
||||
let dt1 = +this.$dt(this.$dt(it.nickedTime).format("YYYY-MM-DD"));
|
||||
let dt2 = +this.$dt(this.$dt(it.updateTime).format("YYYY-MM-DD"));
|
||||
if (dt1 < dt2) {
|
||||
it.timeout = true;
|
||||
} else {
|
||||
it.timeout = false;
|
||||
}
|
||||
}else{
|
||||
it.timeout=false;
|
||||
}else if (it.nickedTime) {
|
||||
let dt1 = +this.$dt(this.$dt(it.nickedTime).format("YYYY-MM-DD"));
|
||||
let dt2 = +this.$dt(this.$dt(new Date()).format("YYYY-MM-DD"));
|
||||
if (dt1 < dt2) {
|
||||
it.timeout = true;
|
||||
} else {
|
||||
it.timeout = false;
|
||||
}
|
||||
} else {
|
||||
it.timeout = false;
|
||||
}
|
||||
return it;
|
||||
});
|
||||
|
|
@ -191,13 +217,16 @@ export default {
|
|||
this.doNav(0, true);
|
||||
this.$api.problemmodify.groupByInfotypeCheckState({
|
||||
projectId: this.row.projectId,
|
||||
infoType:this.infoType
|
||||
infoType: this.infoType
|
||||
}).then(d => {
|
||||
for (let i = 0; i <= 5; i++) {
|
||||
this.count["" + i] = 0;
|
||||
}
|
||||
let tmps = (d.data || []).filter(it => it.infoType == this.infoType);
|
||||
tmps.forEach(it => {
|
||||
this.count["" + it.checkState] = it.id;
|
||||
})
|
||||
console.log("--->",this.count)
|
||||
console.log("--->", this.count)
|
||||
})
|
||||
}
|
||||
},
|
||||
|
|
@ -226,14 +255,15 @@ export default {
|
|||
}
|
||||
|
||||
&.font-size-2 {
|
||||
.head-title-tab{
|
||||
.head-nav{
|
||||
.head-title-tab {
|
||||
.head-nav {
|
||||
font-size: 32px;
|
||||
height: 48px;
|
||||
line-height: 48px;
|
||||
padding: 0px 48px;
|
||||
}
|
||||
}
|
||||
|
||||
.item-data {
|
||||
line-height: 64px;
|
||||
font-size: 32px;
|
||||
|
|
@ -247,18 +277,20 @@ export default {
|
|||
}
|
||||
|
||||
&.font-size-1 {
|
||||
.head-title-tab{
|
||||
.head-nav{
|
||||
.head-title-tab {
|
||||
.head-nav {
|
||||
font-size: 24px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
padding: 0px 30px;
|
||||
}
|
||||
}
|
||||
|
||||
.item-data {
|
||||
line-height: 48px;
|
||||
font-size: 24px;
|
||||
line-height: 48px;
|
||||
|
||||
.div-text {
|
||||
line-height: 48px;
|
||||
}
|
||||
|
|
@ -284,15 +316,32 @@ export default {
|
|||
box-shadow: inset 7px 0px 11px 5px rgb(36 131 167 / 70%);
|
||||
display: flex;
|
||||
padding-left: 8px;
|
||||
&.time-out{
|
||||
|
||||
&.time-out {
|
||||
box-shadow: inset 7px 0px 11px 5px rgb(167, 36, 36);
|
||||
.text-state {
|
||||
color: rgba(167, 36, 36,0.6) !important;
|
||||
}
|
||||
}
|
||||
|
||||
.item-left {
|
||||
display: inline-flex;
|
||||
width: 200px;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.text-state {
|
||||
font-size: 32px;
|
||||
position: absolute;
|
||||
color: rgba(200, 200, 200, 0.2);
|
||||
transform: rotate(45deg);
|
||||
top: 60px;
|
||||
left: calc(50% - 100px);
|
||||
&.state4{
|
||||
color: rgba(5, 248, 5, 0.5);
|
||||
}
|
||||
}
|
||||
|
||||
.item-right {
|
||||
display: inline-block;
|
||||
margin-left: 10px;
|
||||
|
|
@ -304,7 +353,8 @@ export default {
|
|||
color: aquamarine;
|
||||
|
||||
}
|
||||
.text-timeout{
|
||||
|
||||
.text-timeout {
|
||||
position: absolute;
|
||||
right: 0px;
|
||||
font-size: 64px;
|
||||
|
|
|
|||
Loading…
Reference in New Issue