From fc6f97c03e35c489d2babf64fded5beba16a5751 Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Fri, 10 Nov 2023 17:02:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AD=99=E9=83=A8=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/safetyenvironmental/archive/components/info.vue | 2 -- src/views/safetyenvironmental/chief/components/info.vue | 2 -- src/views/safetyenvironmental/inspection/components/info.vue | 2 -- 3 files changed, 6 deletions(-) diff --git a/src/views/safetyenvironmental/archive/components/info.vue b/src/views/safetyenvironmental/archive/components/info.vue index ecde019..f1ada88 100644 --- a/src/views/safetyenvironmental/archive/components/info.vue +++ b/src/views/safetyenvironmental/archive/components/info.vue @@ -180,8 +180,6 @@ :preview-src-list="new Array(config.fileUrl + pd.INSPECTED_SITEUSER_SIGN_IMG)" style="width: 100px; height: 100px"/> - 确认时间： - {{ pd.INSPECTED_SITEUSER_SIGN_TIME }} diff --git a/src/views/safetyenvironmental/chief/components/info.vue b/src/views/safetyenvironmental/chief/components/info.vue index dc6c703..01e8727 100644 --- a/src/views/safetyenvironmental/chief/components/info.vue +++ b/src/views/safetyenvironmental/chief/components/info.vue @@ -184,8 +184,6 @@ :preview-src-list="new Array(config.fileUrl + pd.INSPECTED_SITEUSER_SIGN_IMG)" style="width: 100px; height: 100px"/> - 确认时间： - {{ pd.INSPECTED_SITEUSER_SIGN_TIME }} diff --git a/src/views/safetyenvironmental/inspection/components/info.vue b/src/views/safetyenvironmental/inspection/components/info.vue index 72fa403..2532081 100644 --- a/src/views/safetyenvironmental/inspection/components/info.vue +++ b/src/views/safetyenvironmental/inspection/components/info.vue @@ -185,8 +185,6 @@ :preview-src-list="new Array(config.fileUrl + pd.INSPECTED_SITEUSER_SIGN_IMG)" style="width: 100px; height: 100px"/> - 确认时间： - {{ pd.INSPECTED_SITEUSER_SIGN_TIME }} From 21c0655b0b53ba47798b81bc33658c3db95d002c Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Wed, 15 Nov 2023 17:27:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?BI=E6=A0=B9=E6=8D=AE=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=8F=90=E5=87=BA=E7=9A=84=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?,=E4=B8=AD=E9=97=B4=E7=9A=84=E8=A6=81=E5=AF=B9=E4=B8=8A=20?= =?UTF-8?q?=E5=8F=B3=E4=B8=8A=E6=96=B9=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AF=B9?= =?UTF-8?q?=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/BI/index.vue | 51 +++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/src/views/BI/index.vue b/src/views/BI/index.vue index 06c0c50..9902e72 100644 --- a/src/views/BI/index.vue +++ b/src/views/BI/index.vue @@ -540,16 +540,25 @@ export default { ).then((data) => { var yinhuanCount = [] 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 - } else if (item.HIDDENLEVEL == 'hiddenLevel1002') { // 一般隐患 + }else if (item.HIDDENLEVEL == 'hiddenLevel1002') { // 一般隐患 yinhuanCount[1] = item.count - } else if (item.HIDDENLEVEL == 'pecial') { // 特殊处置 + } else if (item.HIDDENLEVEL == 'jdyh001') { // 较大隐患 yinhuanCount[2] = item.count - } else if (item.HIDDENLEVEL == 'jdyh001') { // 较大隐患 - yinhuanCount[3] = item.count } else if (item.HIDDENLEVEL == 'hiddenLevel2002') { // 重大隐患 - yinhuanCount[4] = item.count + yinhuanCount[3] = item.count } }) this.initEcharts5(yinhuanCount) @@ -868,7 +877,7 @@ export default { left: 'center', top: '30%', style: { - text: '\n\n项', + text: '\n\n次', fill: '#ffffff', textAlign: 'center', fontSize: '12px', @@ -1056,8 +1065,8 @@ export default { labelLine: { normal: { show: true, - length: 15, - length2: 15 + length: 1, + length2: 1 } }, label: { @@ -1085,11 +1094,15 @@ export default { right: '0%', bottom: '15%', data: [ - '忽略', - '一般', - '特殊处置', - '较大隐患', - '重大隐患' + // '忽略' + // '一般', + // '特殊处置', + // '较大隐患', + // '重大隐患' + '轻微隐患', + '一般隐患', + '较大隐患', + '重大隐患' ], width: '20', height: '10', @@ -1125,22 +1138,18 @@ export default { data: [ { value: yinhuanCount[0], - name: '忽略' + name: '轻微隐患' }, { value: yinhuanCount[1], - name: '一般' + name: '一般隐患' }, { value: yinhuanCount[2], - name: '特殊处置' - }, - { - value: yinhuanCount[3], name: '较大隐患' }, { - value: yinhuanCount[4], + value: yinhuanCount[3], name: '重大隐患' }, { From d0f38ccda9737285d6dddbb5dc847b460db9e2ad Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Wed, 15 Nov 2023 17:39:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?BI=E6=A0=B9=E6=8D=AE=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=8F=90=E5=87=BA=E7=9A=84=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?,=E4=B8=AD=E9=97=B4=E7=9A=84=E8=A6=81=E5=AF=B9=E4=B8=8A=20?= =?UTF-8?q?=E5=8F=B3=E4=B8=8A=E6=96=B9=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AF=B9?= =?UTF-8?q?=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/BI/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/BI/index.vue b/src/views/BI/index.vue index 9099413..4ffa02b 100644 --- a/src/views/BI/index.vue +++ b/src/views/BI/index.vue @@ -877,7 +877,7 @@ export default { left: 'center', top: '30%', style: { - text: '\n\n项', + text: '\n\n次', fill: '#ffffff', textAlign: 'center', fontSize: '12px', From ba989d3cf103337e310a5d3ceb3cfefc093aae1b Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Thu, 16 Nov 2023 09:03:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?BI=E6=A0=B9=E6=8D=AE=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=8F=90=E5=87=BA=E7=9A=84=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?,=E4=B8=AD=E9=97=B4=E7=9A=84=E8=A6=81=E5=AF=B9=E4=B8=8A=20?= =?UTF-8?q?=E5=8F=B3=E4=B8=8A=E6=96=B9=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AF=B9?= =?UTF-8?q?=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/BI/index.vue | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/views/BI/index.vue b/src/views/BI/index.vue index 4ffa02b..3588b5c 100644 --- a/src/views/BI/index.vue +++ b/src/views/BI/index.vue @@ -212,11 +212,11 @@
{{ - 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 + }} {{ - 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 + }}
@@ -1065,8 +1065,8 @@ export default { labelLine: { normal: { show: true, - length: 15, - length2: 15 + length: 1, + length2: 1 } }, label: { @@ -1094,9 +1094,13 @@ export default { right: '0%', bottom: '15%', data: [ - '忽略', - '一般', - '特殊处置', + // '忽略' + // '一般', + // '特殊处置', + // '较大隐患', + // '重大隐患' + '轻微隐患', + '一般隐患', '较大隐患', '重大隐患' ], @@ -1134,22 +1138,18 @@ export default { data: [ { value: yinhuanCount[0], - name: '忽略' + name: '轻微隐患' }, { value: yinhuanCount[1], - name: '一般' + name: '一般隐患' }, { value: yinhuanCount[2], - name: '特殊处置' - }, - { - value: yinhuanCount[3], name: '较大隐患' }, { - value: yinhuanCount[4], + value: yinhuanCount[3], name: '重大隐患' }, {