From 76958d96c76813b37e9eddf178ff1d58e81fd04e Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 12 Dec 2024 13:50:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=97=A5=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bns/html/supplement/daily_duty_report.html | 31 +- bns/js/supplement/daily_duty_report.js | 329 +-------------------- 2 files changed, 10 insertions(+), 350 deletions(-) diff --git a/bns/html/supplement/daily_duty_report.html b/bns/html/supplement/daily_duty_report.html index 30ae5fe..d6395b8 100644 --- a/bns/html/supplement/daily_duty_report.html +++ b/bns/html/supplement/daily_duty_report.html @@ -3,7 +3,7 @@ 值班日报 - + @@ -11,7 +11,7 @@ - + @@ -97,24 +97,7 @@

1.今日共督查0处（视频0处），其中三级及以上现场0处、重要四级现场0处、其他现场0处，发现一般违章0处。

（二）常规工程

远程督查情况

-

1.今日视频督查情况：督查作业现场0处，发现一般违章0处。

-
- -
-

2.问题整改回复情况：

- -
- -
-

3.今日现场督查情况：无。

-

4.地市公司自查违章情况：

-

今日各地市自查违章共0条，其中严重违章0条，一般违章0条，情况如下：

-
-
-
-

5.关键措施照片上传和日报质量评价情况：

+

1.关键措施照片上传和日报质量评价情况：

@@ -129,9 +112,9 @@
-

6.值班抽查情况

+

2.值班抽查情况

今日各地市公司均参与点到。

-

7.远程抽查情况

+

3.远程抽查情况

远程抽查关键人员0人，具体如下：

@@ -155,7 +138,7 @@
-

8.二级风险明细

+

4.二级风险明细

@@ -174,7 +157,7 @@
-

9.二级风险到岗到位抽查情况

+

5.二级风险到岗到位抽查情况

diff --git a/bns/js/supplement/daily_duty_report.js b/bns/js/supplement/daily_duty_report.js index 9f568be..d5e6256 100644 --- a/bns/js/supplement/daily_duty_report.js +++ b/bns/js/supplement/daily_duty_report.js @@ -1,5 +1,4 @@ let form, layer, laydate, checkedDate; -let myChart4 = echarts.init(document.getElementById("voi-echarts")); layui.use(["form", "laydate", "layer"], function () { layer = layui.layer; form = layui.form; @@ -95,7 +94,7 @@ function downloadDaily() { }); let url = dataUrl + - "proteam/pot/newDailyDutyReport/downloadDaily?currentDay=" + + "proteam/pot/safetyReport/downloadDaily?currentDay=" + checkedDate + "&chineseDate=" + setDate(checkedDate) + @@ -150,7 +149,7 @@ function getDaily(currentDay) { ), }, type: "POST", - url: dataUrl + "proteam/pot/newDailyDutyReport/getDailyData?token=" + token, + url: dataUrl + "proteam/pot/safetyReport/getDailyData?token=" + token, data: { currentDay: currentDay, }, @@ -194,7 +193,7 @@ function reloadDaily(currentDay, loadingMsg) { ), }, type: "POST", - url: dataUrl + "proteam/pot/newDailyDutyReport/getDailyData?token=" + token, + url: dataUrl + "proteam/pot/safetyReport/getDailyData?token=" + token, data: { currentDay: currentDay, }, @@ -317,23 +316,6 @@ function setDailyData(data, dataMap) { $("#six_num6").html(data.six_num6); $("#seven_num").html(data.seven_num); $("#seven_num2").html(data.seven_num2); - // 远程督查情况 - setModuleElevenData(data); - // 整改情况 - let html = ""; - if (data.zgList && data.zgList.length > 0) { - $.each(data.zgList, function (index, item) { - const str = item.zg; - html += "

" + str + "

"; - }); - $("#zgListDiv").empty().append(html); - } - // 地市公司自查违章情况 - $("#eight_num").html(data.eight_num); - $("#eight_num2").html(data.eight_num3); - $("#eight_num3").html(data.eight_num4); - initEchartsTwo(data.exceList); - // 关键措施照片上传和日报质量评价情况 if (data.tableList && data.tableList.length > 0) { let cent = ""; @@ -417,309 +399,4 @@ function setDailyData(data, dataMap) { $(".seven-table tbody").empty().append(cent); } } - - function setModuleElevenData(data) { - let html = ""; - if (data.vioList && data.vioList.length > 0) { - $.each(data.vioList, function (index, item) { - html += - '
' + - '' + - '" + - '" + - '" + - '" + - '" + - '" + - '" + - "
' + - item.wzlx + - "
违章现场' + - item.name + - "
违章照片' + - setVoiPhotos(item) + - "
违章内容' + - item.content + - "
违章依据' + - item.yj + - "
违章处理情况' + - item.dealwith + - "
整改照片' + - setVoizgPhotos(item) + - "
"; - }); - } else { - html += - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - "
一般违章
违章现场
违章照片
违章内容
违章依据
违章处理情况
整改照片
"; - } - $(".general-voi-box").empty().append(html); - if (data.moduleEleven && data.moduleEleven.length > 0) { - $.each(data.moduleEleven, function (index, item) { - let viewer = new Viewer( - document.getElementById("general-voi" + index + ""), - { - url: "data-original", - show: function () { - viewer.update(); - }, - } - ); - }); - } - } - - /* 违章照片 */ - function setVoiPhotos(obj) { - let cent = ''; - let voiImgList = obj.voiImgList; - $.each(voiImgList, function (index, item) { - let path = photoUrl + item.img2 + "?token=" + token; - cent += - ''; - }); - return cent; - } - - /* 整改图片 */ - function setVoizgPhotos(obj) { - let cent = ''; - if (obj.hasWord == 1) { - let voizgFileList = obj.voizgFileList; - $.each(voizgFileList, function (index, item) { - let path = '../../img/word.png'; - cent += - ''; - }); - } else { - let voizgImgList = obj.voizgImgList; - $.each(voizgImgList, function (index, item) { - let path = photoUrl + item.img2 + "?token=" + token; - cent += - ''; - }); - } - - return cent; - } - - /*周风险echarts*/ - function initEchartsTwo(dataList) { - let xAxisList = []; - let data = []; - let data2 = []; - let data3 = []; - $.each(dataList, function (index, item) { - xAxisList.push(item.cityName); - data.push(item.zbhNum); - data2.push(item.yzwzNum); - data3.push(item.ybwzNum); - }); - let fontSize = "14"; - // 基于准备好的dom，初始化echarts图表 - let option = { - backgroundColor: "transparent", - tooltip: { - show: false, - }, - legend: { - // right: '3%', - top: "92%", - itemWidth: 10, - itemHeight: 10, - itemGap: 15, - // 环图之间间隔，图例防抖动 - inactiveBorderWidth: 0, - itemStyle: { - borderWidth: 0, - }, - selectedMode: false, - }, - grid: { - left: "3%", - right: "3%", - bottom: "10%", - top: "15%", - containLabel: true, - }, - calculable: true, - xAxis: [ - { - type: "category", - axisLabel: { - interval: 0, // 解决x轴名称过长问题 - rotate: 45, - textStyle: { - color: "#262626", - fontSize: 14, - fontFamily: "Alibaba PuHuiTi R", - }, - }, - axisLine: { - show: false, - lineStyle: { - //y轴网格线设置 - color: "#262626", - width: 1, - }, - }, - data: xAxisList, - }, - ], - yAxis: [ - { - type: "value", - // name: "单位/个", - nameGap: 8, - nameTextStyle: { - color: "#262626", - }, - - axisTick: { - show: false, - }, - axisLine: { - show: false, - lineStyle: { - //y轴网格线设置 - color: "#2c2c2c", - width: 1, - }, - }, - splitLine: { - //保留网格线 - show: true, - lineStyle: { - //y轴网格线设置 - color: "#101C4A", - width: 1, - }, - }, - axisLabel: { - show: true, - textStyle: { - fontSize: 16, - color: "#262626", //字体颜色 - fontFamily: "Alibaba PuHuiTi R", - }, - }, - }, - ], - series: [ - { - name: "作业现场", - type: "bar", - z: 1, - barWidth: 6, - barGap: "100%", - label: { - show: true, - position: "top", - textStyle: { - color: "#262626", - }, - }, - itemStyle: { - normal: { - color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [ - { - offset: 0, - color: "#4472c4", - }, - { - offset: 1, - color: "#4c87ef", - }, - ]), - }, - }, - data: data, - }, - { - name: "严重违章", - type: "bar", - barGap: "100%", - z: 1, - barWidth: 6, - label: { - show: true, - position: "top", - textStyle: { - color: "#262626", - }, - }, - itemStyle: { - normal: { - color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [ - { - offset: 0, - color: "#618b35", - }, - { - offset: 1, - color: "#97ec3e", - }, - ]), - }, - }, - data: data2, - }, - { - name: "一般违章", - type: "bar", - barGap: "100%", - z: 1, - barWidth: 6, - label: { - show: true, - position: "top", - textStyle: { - color: "#262626", - }, - }, - itemStyle: { - normal: { - color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [ - { - offset: 0, - color: "#a83232", - }, - { - offset: 1, - color: "#d02020", - }, - ]), - }, - }, - data: data3, - }, - ], - }; - myChart4.setOption(option, true); - window.addEventListener("resize", function () { - myChart4.resize(); - }); - } } From b35e8f58a317632a7c90a8905e36699629f61642 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 12 Dec 2024 13:57:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A3=8E=E9=99=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bns/js/supplement/risk_time_list.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bns/js/supplement/risk_time_list.js b/bns/js/supplement/risk_time_list.js index a2b084f..3055e89 100644 --- a/bns/js/supplement/risk_time_list.js +++ b/bns/js/supplement/risk_time_list.js @@ -9,10 +9,10 @@ layui.use(['form', 'layer', 'table', 'laydate'], function () { elem: '#ID-laydate-rangeLinked', range: ['#startDay', '#endDay'], rangeLinked: true, - btns: ['confirm'] + // btns: ['confirm'] }); - $('#startDay').val(getNowTime()); - $('#endDay').val(getNowTime()); + // $('#startDay').val(getNowTime()); + // $('#endDay').val(getNowTime()); pages(1, 10, 1); }) @@ -194,8 +194,8 @@ function getReqParams(page, limit, type) { limit: '10', proName: '', riskLevel:'', - startDay:getNowTime(), - endDay:getNowTime(), + startDay:'', + endDay:'', currentUserId: user.userId + '', isSup: user.isSup, currentUserOrgId: user.orgId @@ -209,8 +209,8 @@ function queryTable(type) { if (type === 2) { $('#proName').val(''); $('#riskLevel').val(''); - $('#startDay').val(getNowTime()); - $('#endDay').val(getNowTime()); + $('#startDay').val(''); + $('#endDay').val(''); layui.form.render(); } let pattern = new RegExp("[%_<>]");