guoyuepeng
/
qa-regulatory-gwj-vue
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into yhkp

main
dearlin 2023-11-16 09:08:00 +08:00
parent 2720ff7f9a afc00331cd
commit 14a3556e27
4 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/views/BI/index.vue
View File

@ -212,11 +212,11 @@
</div> </div>
<div v-for="(item,index) in safetyEnvironmentalInspectionList" :key="index"> <div v-for="(item,index) in safetyEnvironmentalInspectionList" :key="index">
<span>{{ <span>{{
item.INSPECTION_PLACE.length > 6 ? item.INSPECTION_PLACE.substr(0, 6) + '...' : item.INSPECTION_PLACE item.INSPECTION_PLACE.length > 6 ? item.INSPECTION_PLACE.substr(0, 6) + '...' : item.INSPECTION_PLACE
}}</span> }}</span>
<span>{{ <span>{{
item.INSPECTION_TIME_START.length > 10 ? item.INSPECTION_TIME_START.substr(0, 10) + '...' : item.INSPECTION_TIME_START item.INSPECTION_TIME_START.length > 10 ? item.INSPECTION_TIME_START.substr(0, 10) + '...' : item.INSPECTION_TIME_START
}}</span> }}</span>
</div> </div>
</div> </div>
</div> </div>
@ -540,16 +540,25 @@ export default {
).then((data) => { ).then((data) => {
var yinhuanCount = [] var yinhuanCount = []
data.valList.forEach((item, index) => { data.valList.forEach((item, index) => {
if (item.HIDDENLEVEL == 'hiddenLevel1001') { // 忽略 // if (item.HIDDENLEVEL == 'hiddenLevel1001') { // 忽略
// yinhuanCount[0] = item.count
// } else if (item.HIDDENLEVEL == 'hiddenLevel1002') { // 一般隐患
// yinhuanCount[1] = item.count
// } else if (item.HIDDENLEVEL == 'pecial') { // 特殊处置
// yinhuanCount[2] = item.count
// } else if (item.HIDDENLEVEL == 'jdyh001') { // 较大隐患
// yinhuanCount[3] = item.count
// } else if (item.HIDDENLEVEL == 'hiddenLevel2002') { // 重大隐患
// yinhuanCount[4] = item.count
// }
if (item.HIDDENLEVEL == 'hiddenLevel1004') { // 轻微隐患
yinhuanCount[0] = item.count yinhuanCount[0] = item.count
} else if (item.HIDDENLEVEL == 'hiddenLevel1002') { // 一般隐患 }else if (item.HIDDENLEVEL == 'hiddenLevel1002') { // 一般隐患
yinhuanCount[1] = item.count yinhuanCount[1] = item.count
} else if (item.HIDDENLEVEL == 'pecial') { // 特殊处置 } else if (item.HIDDENLEVEL == 'jdyh001') { // 较大隐患
yinhuanCount[2] = item.count yinhuanCount[2] = item.count
} else if (item.HIDDENLEVEL == 'jdyh001') { // 较大隐患
yinhuanCount[3] = item.count
} else if (item.HIDDENLEVEL == 'hiddenLevel2002') { // 重大隐患 } else if (item.HIDDENLEVEL == 'hiddenLevel2002') { // 重大隐患
yinhuanCount[4] = item.count yinhuanCount[3] = item.count
} }
}) })
this.initEcharts5(yinhuanCount) this.initEcharts5(yinhuanCount)
@ -868,7 +877,7 @@ export default {
left: 'center', left: 'center',
top: '30%', top: '30%',
style: { style: {
text: '\n\n项', text: '\n\n次',
fill: '#ffffff', fill: '#ffffff',
textAlign: 'center', textAlign: 'center',
fontSize: '12px', fontSize: '12px',
@ -1056,8 +1065,8 @@ export default {
labelLine: { labelLine: {
normal: { normal: {
show: true, show: true,
length: 10, length: 1,
length2: 10 length2: 1
} }
}, },
label: { label: {
@ -1085,9 +1094,13 @@ export default {
right: '0%', right: '0%',
bottom: '15%', bottom: '15%',
data: [ data: [
'忽略', // '忽略'
'一般', // '一般',
'特殊处置', // '特殊处置',
// '较大隐患',
// '重大隐患'
'轻微隐患',
'一般隐患',
'较大隐患', '较大隐患',
'重大隐患' '重大隐患'
], ],
@ -1125,22 +1138,18 @@ export default {
data: [ data: [
{ {
value: yinhuanCount[0], value: yinhuanCount[0],
name: '忽略' name: '轻微隐患'
}, },
{ {
value: yinhuanCount[1], value: yinhuanCount[1],
name: '一般' name: '一般隐患'
}, },
{ {
value: yinhuanCount[2], value: yinhuanCount[2],
name: '特殊处置'
},
{
value: yinhuanCount[3],
name: '较大隐患' name: '较大隐患'
}, },
{ {
value: yinhuanCount[4], value: yinhuanCount[3],
name: '重大隐患' name: '重大隐患'
}, },
{ {

2
src/views/safetyenvironmental/archive/components/info.vue
View File

@ -180,8 +180,6 @@
:preview-src-list="new Array(config.fileUrl + pd.INSPECTED_SITEUSER_SIGN_IMG)" :preview-src-list="new Array(config.fileUrl + pd.INSPECTED_SITEUSER_SIGN_IMG)"
style="width: 100px; height: 100px"/> style="width: 100px; height: 100px"/>
</td> </td>
<td class="tbg">确认时间：</td>
<td>{{ pd.INSPECTED_SITEUSER_SIGN_TIME }}</td>
</tr> </tr>
</table> </table>
</div> </div>

2
src/views/safetyenvironmental/chief/components/info.vue
View File

@ -184,8 +184,6 @@
:preview-src-list="new Array(config.fileUrl + pd.INSPECTED_SITEUSER_SIGN_IMG)" :preview-src-list="new Array(config.fileUrl + pd.INSPECTED_SITEUSER_SIGN_IMG)"
style="width: 100px; height: 100px"/> style="width: 100px; height: 100px"/>
</td> </td>
<td class="tbg">确认时间：</td>
<td>{{ pd.INSPECTED_SITEUSER_SIGN_TIME }}</td>
</tr> </tr>
</table> </table>
</div> </div>

2
src/views/safetyenvironmental/inspection/components/info.vue
View File

@ -185,8 +185,6 @@
:preview-src-list="new Array(config.fileUrl + pd.INSPECTED_SITEUSER_SIGN_IMG)" :preview-src-list="new Array(config.fileUrl + pd.INSPECTED_SITEUSER_SIGN_IMG)"
style="width: 100px; height: 100px"/> style="width: 100px; height: 100px"/>
</td> </td>
<td class="tbg">确认时间：</td>
<td>{{ pd.INSPECTED_SITEUSER_SIGN_TIME }}</td>
</tr> </tr>
</table> </table>
</div> </div>