Merge branch 'feature/GFRS-454【0326】建议书优化2.0' into dev

This commit is contained in:
阳华祥
2020-04-10 20:15:41 +08:00

View File

@@ -97,6 +97,9 @@
<div :class="pageShowType.riskCheckStatus ? '' : 'hideInfo'" class="text-left div_5"> <div :class="pageShowType.riskCheckStatus ? '' : 'hideInfo'" class="text-left div_5">
<div v-if="pageShowType.dutyShowType == '01'"> <div v-if="pageShowType.dutyShowType == '01'">
<div class="div_6 duty_by_duty" v-for="(item, index) in pageShowInfo.showInsuredDTO.riskDTOLst" :key="index"> <div class="div_6 duty_by_duty" v-for="(item, index) in pageShowInfo.showInsuredDTO.riskDTOLst" :key="index">
<div v-if="item.riskDutySortResult">
<div v-for="(subItem3, subIndex3) in getObjectKeys(item.riskDutySortResult)" :key="subIndex3"></div>
</div>
<div class="fw600 fs15 color_3A81F6 show_risk_name"> <div class="fw600 fs15 color_3A81F6 show_risk_name">
{{ item.riskName }} {{ item.riskName }}
</div> </div>
@@ -107,7 +110,9 @@
<div class="head_radis"></div> <div class="head_radis"></div>
<div class="title_2">{{ subItem4.dutyName }}</div> <div class="title_2">{{ subItem4.dutyName }}</div>
</div> </div>
<div class="fs13 color_333333 div_17">{{ subItem4.dutyStairExplain }}</div> <div class="fs13 color_333333 div_17">
<div v-html="initDutyColor(subItem4.dutyStairExplain)"></div>
</div>
<div class="fs13 color_666666 div_17" v-if="subItem4.dutyDetailExplain && subItem4.dutyDetailExplain != ''"> <div class="fs13 color_666666 div_17" v-if="subItem4.dutyDetailExplain && subItem4.dutyDetailExplain != ''">
{{ subItem4.dutyDetailExplain }} {{ subItem4.dutyDetailExplain }}
</div> </div>
@@ -127,7 +132,9 @@
<div class="head_radis"></div> <div class="head_radis"></div>
<div class="title_2">{{ subItem2.dutyName }}</div> <div class="title_2">{{ subItem2.dutyName }}</div>
</div> </div>
<div class="fs13 div_17 color_333333">{{ subItem2.dutyStairExplain }}</div> <div class="fs13 div_17 color_333333">
<div v-html="initDutyColor(subItem2.dutyStairExplain)"></div>
</div>
<div class="fs13 div_17 color_666666" v-if="subItem2.dutyDetailExplain && subItem2.dutyDetailExplain != ''"> <div class="fs13 div_17 color_666666" v-if="subItem2.dutyDetailExplain && subItem2.dutyDetailExplain != ''">
{{ subItem2.dutyDetailExplain }} {{ subItem2.dutyDetailExplain }}
</div> </div>
@@ -381,6 +388,13 @@ export default {
next() next()
}, },
methods: { methods: {
initDutyColor(code) {
if (code) {
return code.replace(new RegExp('<span>', 'g'), '<span style="color: #3a81f6;font-weight: blod;">')
} else {
return ''
}
},
/* 添加定时器 */ /* 添加定时器 */
timeOut() { timeOut() {
let timer = setInterval(() => { let timer = setInterval(() => {