diff --git a/public/photon_tree.glb b/public/photon_tree.glb new file mode 100644 index 00000000..a6822ca9 Binary files /dev/null and b/public/photon_tree.glb differ diff --git a/src/config/route.js b/src/config/route.js index cd9c7139..e3bc8f1e 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -207,26 +207,6 @@ const routes = [ }, "component": "enm_limestone/report" }, - { - "name": "limestone_power", - "path": "/enm_limestone/power", - "meta": { - "title": "单位产品电耗", - "icon": "el-icon-odometer", - "perms": ["enm_limestone"] - }, - "component": "enm_limestone/power" - }, - { - "name": "limestone_teamAnalysis", - "path": "/enm_limestone/teamAnalysis", - "meta": { - "title": "班组月度对比", - "icon": "el-icon-operation", - "perms": ["enm_limestone"] - }, - "component": "enm_limestone/teamAnalysis" - }, { "name": "limestone_workshopAnalysis", "path": "/enm_limestone/workshopAnalysis", @@ -334,6 +314,80 @@ const routes = [ }, ] }, + //原料磨——基础 + { + "name": "enm_rmbase", + "path": "/enm_rmbase", + "meta": { + "title": "原料磨1", + "icon": "el-icon-list", + "type": "menu", + "perms": ["enm_rmbase"] + }, + "children": [ + { + "name": "report", + "path": "/enm_rmbase/report", + "meta": { + "title": "生产报告", + "icon": "el-icon-document", + "perms": ["enm_rmbase"] + }, + "component": "enm_rmbase/report" + }, + { + "name": "power", + "path": "/enm_rmbase/power", + "meta": { + "title": "单位产品电耗", + "icon": "el-icon-odometer", + "perms": ["enm_rmbase"] + }, + "component": "enm_rmbase/power" + }, + { + "name": "teamAnalysis", + "path": "/enm_rmbase/teamAnalysis", + "meta": { + "title": "班组月度对比", + "icon": "el-icon-operation", + "perms": ["enm_rmbase"] + }, + "component": "enm_rmbase/teamAnalysis" + }, + { + "name": "workshopAnalysis", + "path": "/enm_rmbase/workshopAnalysis", + "meta": { + "title": "车间单耗分析", + "icon": "el-icon-data-line", + "perms": ["enm_rmbase"] + }, + "component": "enm_rmbase/workshopAnalysis" + }, + { + "name": "handoverLog", + "path": "/enm_rmbase/handoverLog", + "meta": { + "title": "交接班日志", + "icon": "el-icon-document-copy", + "perms": ["enm_rmbase"] + }, + "component": "enm_rmbase/handoverLog" + }, + { + "name": "logDetail", + "path": "/enm_rmbase/logDetail", + "meta": { + "title": "日志详情", + "icon": "el-icon-document-copy", + "perms": ["enm_rmbase"], + "hidden": true + }, + "component": "enm_rmbase/logDetail" + }, + ] + }, //回转窑 { "name": "enm_kiln", @@ -418,16 +472,6 @@ const routes = [ }, "component": "enm_cogeneration/report" }, - { - "name": "cogeneration_power", - "path": "/enm_cogeneration/power", - "meta": { - "title": "单位产品电耗", - "icon": "el-icon-odometer", - "perms": ["enm_cogeneration"] - }, - "component": "enm_cogeneration/power" - }, { "name": "cogeneration_teamAnalysis", "path": "/enm_cogeneration/teamAnalysis", diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue index 78cbb47c..f89a901a 100644 --- a/src/layout/components/userbar.vue +++ b/src/layout/components/userbar.vue @@ -1,16 +1,16 @@ diff --git a/src/views/bigScreen/cesiumtest.vue b/src/views/bigScreen/cesiumtest.vue index 2fa682b1..4803d8e6 100644 --- a/src/views/bigScreen/cesiumtest.vue +++ b/src/views/bigScreen/cesiumtest.vue @@ -157,62 +157,26 @@ > 实时监测

-

+

实时状态

-
-
- - 运行 -
-
- - 待机 -
-
- - 离线 -
-
-
+
颗粒物
SO₂
NOx
-
13.00mg/m³
-
13.00mg/m³
-
13.00mg/m³
+
+ {{ objItem.颗粒物折算值 }}mg/m³ +
+
+ {{ objItem.so2折算值 }}mg/m³ +
+
+ {{ objItem.nox折算值 }}mg/m³ +
流量
@@ -220,25 +184,76 @@
湿度
-
22320.000m³/h
-
70.54℃
-
0.80%
+
+ {{ objItem.流量 }}m³/h +
+
+ {{ objItem.温度 }}℃ +
+
+ {{ objItem.湿度 }}% +
-
+
TSP
温度
湿度
-
0.18mg/m³
-
18.6℃
-
53.4%
+
+ {{ objItem.tsp }}mg/m³ +
+
+ {{ objItem.温度 }}℃ +
+
+ {{ objItem.湿度 }}% +
+
+
+
+
+
+ + 运行 +
+
+ + 停机 +
+
+ + 离线 +
@@ -285,15 +300,15 @@ export default { formatter: function (params) { var result = ""; let text = - params[0].data[1] == 1 + params[0].data[1] == 10 ? "运行" - : params[0].data[1] == 0 - ? "待机" - : "故障"; + : params[0].data[1] == 50 + ? "离线" + : "停机"; let colors = text == "运行" ? "#21a51f" - : text == "待机" + : text == "停机" ? "#ff8608" : "#c7c7c7"; var lineHtml = @@ -345,26 +360,45 @@ export default { }, pieces: [ { - gt: 0.5, - lte: 1, + gt: 1, + lte: 11, label: "运行", color: "#21a51f", }, { - gt: -0.5, - lte: 0.5, - label: "待机", + gt: 15, + lte: 45, + label: "停机", color: "#ff8608", }, { - gt: -1, - lte: -0.5, + gt: 46, + lte: 55, label: "离线", color: "#c7c7c7", }, ], }, - series: [{ type: "line" }], + series: [ + { + type: "line", + encode: { y: "运行状态", seriesName: ["运行状态"] }, + itemStyle: { + normal: { + color: function (params) { + var value = params.value; + if (value < 15) { + return "#21a51f"; + } else if (value >= 15 && value < 45) { + return "#ff8608"; + } else { + return "c7c7c7"; + } + }, + }, + }, + }, + ], }, modelPosition: [ { lng: 88.64154268696439, lat: 42.721977308996635 }, @@ -551,7 +585,7 @@ export default { myChart.showLoading(); // 使用刚指定的配置项和数据显示图表。 // myChart.setOption(option) - this.$API.bi.dataset.exec.req("eq_status", params).then((res) => { + this.$API.bi.dataset.exec.req("enp_edata2", params).then((res) => { console.log(res); let newOption = Object.assign({}, this.basicOption); newOption.dataset.source = res.data.ds0; @@ -633,18 +667,21 @@ export default { item.coordinates.longitude && item.coordinates.latitude ) { + console.log(item); let imgUrl = that.getItemIcon(item.cate_code); let lon = parseFloat(item.coordinates.longitude); let lat = parseFloat(item.coordinates.latitude); let height = parseInt(item.coordinates.height); - let type = item.cate_code; let arrs = { name: item.name, lon: lon, lat: lat, height: height, id: item.id, - type: type, + type: item.cate_code, + cate_code: item.cate_code, + state: item.running_state, + is_online: item.is_online, }; let config = { show: true, @@ -671,8 +708,11 @@ export default { lon, lat, id = "11111", - type = "display", + type, height, + is_online, + cate_code, + state, } = attrs; const { show = true, @@ -691,6 +731,9 @@ export default { attrs: attrs, id: id, type: type, + is_online: is_online, + cate_code: cate_code, + state: state, position: Cesium.Cartesian3.fromDegrees( lon || 117.08387268794274, lat || 31.6557737395655433, @@ -742,14 +785,60 @@ export default { }, //调用此方法获取相关信息显示在页面 getInfo(equpmentId) { + console.log("this.objItem------clickItem", this.objItem); let that = this; that.infoShow = true; console.log(equpmentId); - //根据id获取相关信息 - this.$API.em.equipment.item.req(equpmentId).then((res) => { - that.objItem = res; - console.log(res); - }); + // //根据id获取相关信息 + // this.$API.em.equipment.item.req(equpmentId).then((res) => { + // that.objItem = res; + // console.log(res); + // }); + if (that.objItem.type == "tsp" || that.objItem.type == "cems") { + let nowDate = new Date(); + let startDate = new Date(); + let year = nowDate.getFullYear(); + let month = nowDate.getMonth() + 1; + let day = nowDate.getDate(); + let hour = nowDate.getHours(); + month = month < 10 ? "0" + month : month; + day = day < 10 ? "0" + day : day; + hour = hour < 10 ? "0" + hour : hour; + let start_time = + year + "-" + month + "-" + day + " " + hour + ":00:00"; + let end_time = + year + "-" + month + "-" + day + " " + hour + ":59:00"; + let params = { + query: { + end_time: end_time, + start_time: start_time, + time_bucket: "1 hour", + equipment_id: this.objItem.id, + }, + }; + this.$API.bi.dataset.exec + .req("enp_edata2", params) + .then((res) => { + console.log(res); + if (res.data2.ds0 && res.data2.ds0.length > 0) { + if (that.objItem.type == "tsp") { + that.objItem.tsp = res.data2.ds0[0].tsp; + that.objItem.温度 = res.data2.ds0[0].温度; + that.objItem.湿度 = res.data2.ds0[0].湿度; + } else if (that.objItem.type == "cems") { + that.objItem.流量 = res.data2.ds0[0].流量; + that.objItem.湿度 = res.data2.ds0[0].湿度; + that.objItem.温度 = res.data2.ds0[0].温度; + that.objItem.so2折算值 = + res.data2.ds0[0].so2折算值; + that.objItem.nox折算值 = + res.data2.ds0[0].nox折算值; + that.objItem.颗粒物折算值 = + res.data2.ds0[0].颗粒物折算值; + } + } + }); + } this.getChartTime(); }, initChart() { diff --git a/src/views/enm_cogeneration/handoverLog.vue b/src/views/enm_cogeneration/handoverLog.vue index c05840ce..d896c6f2 100644 --- a/src/views/enm_cogeneration/handoverLog.vue +++ b/src/views/enm_cogeneration/handoverLog.vue @@ -1,282 +1,376 @@ - + - \ No newline at end of file diff --git a/src/views/enm_cogeneration/power.vue b/src/views/enm_cogeneration/power.vue deleted file mode 100644 index 4df2fd7c..00000000 --- a/src/views/enm_cogeneration/power.vue +++ /dev/null @@ -1,766 +0,0 @@ - - - diff --git a/src/views/enm_cogeneration/report.vue b/src/views/enm_cogeneration/report.vue index 2c37f212..fbc6ec90 100644 --- a/src/views/enm_cogeneration/report.vue +++ b/src/views/enm_cogeneration/report.vue @@ -271,19 +271,12 @@ let toolbox = { }; let legend = { top: "2%", - data: [ - "总产量", - "台时产量", - "运转率", - "分布电耗", - "单位产品标煤耗", - "成本", - ], + data: ["总发电量", "单位发电量", "运转时间", "运转率", "用电量"], }; let yAxis = [ { type: "value", - name: "产量 (t)", + name: "电量 (KW·h)", position: "left", alignTicks: true, axisLine: { @@ -298,39 +291,23 @@ let yAxis = [ }, { type: "value", - name: "运转率 ", + name: "运转率", position: "right", alignTicks: true, - offset: 120, + offset: 80, axisLine: { show: true, lineStyle: { color: colors[2], }, }, - axisLabel: { - formatter: "{value}%", - }, - }, - { - type: "value", - name: "分布电耗", - position: "right", - alignTicks: true, - offset: 60, - axisLine: { - show: true, - lineStyle: { - color: colors[3], - }, - }, axisLabel: { formatter: "{value}", }, }, { type: "value", - name: "标煤耗", + name: "运转时间(h)", position: "right", alignTicks: true, axisLine: { @@ -343,22 +320,6 @@ let yAxis = [ formatter: "{value}", }, }, - { - type: "value", - name: "成本(元)", - position: "left", - alignTicks: true, - offset: 70, - axisLine: { - show: true, - lineStyle: { - color: colors[5], - }, - }, - axisLabel: { - formatter: "{value}/元", - }, - }, ]; import scEcharts from "@/components/scEcharts"; import { defineAsyncComponent } from "vue"; @@ -384,15 +345,11 @@ export default { mgroup: "3347217246321065984", }, tableDatas: [ - ["产量", "总产量(t)", 0, 0, 0, 0, 0, 0, 0, 0], - ["产量", "台时产量(t/h)", "/", 0, 0, 0, 0, 0, 0, 0], + ["产量", "总发电量(KW·h/t)", 0, 0, 0, 0, 0, 0, 0, 0], + ["产量", "单位发电量(KW·h/t)", "/", 0, 0, 0, 0, 0, 0, 0], ["运转时间", "运转时间(h)", "/", 0, 0, 0, 0, 0, 0, 0], ["运转时间", "运转率(%)", "/", 0, 0, 0, 0, 0, 0, 0], - ["能耗", "单位产品分布电耗(KW·h/t)", 0, 0, 0, 0, 0, 0, 0, 0], - ["能耗", "单位产品综合电耗(KW·h/t)", 0, 0, 0, 0, 0, 0, 0, 0], - ["能耗", "单位产品标煤耗(kgce/t)", 0, 0, 0, 0, 0, 0, 0, 0], - ["能耗", "单位产品综合能耗(kgce/t)", 0, 0, 0, 0, 0, 0, 0, 0], - ["成本", "单位产品成本(元/吨)", 0, 0, 0, 0, 0, 0, 0, 0], + ["自用电量", "用电量(KW·h)", 0, 0, 0, 0, 0, 0, 0, 0], ], tableName: "生产报告", modelValue: true, @@ -420,13 +377,13 @@ export default { yAxis: yAxis, series: [ { - name: "总产量", + name: "总发电量", type: "bar", yAxisIndex: 0, data: [], }, { - name: "台时产量", + name: "单位发电量", type: "bar", yAxisIndex: 0, data: [], @@ -438,21 +395,15 @@ export default { data: [], }, { - name: "分布电耗", + name: "运转时间", type: "bar", yAxisIndex: 2, data: [], }, { - name: "单位产品标煤耗", + name: "用电量", type: "bar", - yAxisIndex: 3, - data: [], - }, - { - name: "成本", - type: "bar", - yAxisIndex: 4, + yAxisIndex: 0, data: [], }, ], @@ -488,13 +439,13 @@ export default { yAxis: yAxis, series: [ { - name: "总产量", + name: "总发电量", type: "bar", yAxisIndex: 0, data: [], }, { - name: "台时产量", + name: "单位发电量", type: "bar", yAxisIndex: 0, data: [], @@ -506,21 +457,15 @@ export default { data: [], }, { - name: "分布电耗", + name: "运转时间", type: "bar", yAxisIndex: 2, data: [], }, { - name: "单位产品标煤耗", + name: "用电量", type: "bar", - yAxisIndex: 3, - data: [], - }, - { - name: "成本", - type: "bar", - yAxisIndex: 4, + yAxisIndex: 0, data: [], }, ], @@ -542,13 +487,13 @@ export default { yAxis: yAxis, series: [ { - name: "总产量", + name: "总发电量", type: "bar", yAxisIndex: 0, data: [], }, { - name: "台时产量", + name: "单位发电量", type: "bar", yAxisIndex: 0, data: [], @@ -560,21 +505,15 @@ export default { data: [], }, { - name: "分布电耗", + name: "运转时间", type: "bar", yAxisIndex: 2, data: [], }, { - name: "单位产品标煤耗", + name: "用电量", type: "bar", - yAxisIndex: 3, - data: [], - }, - { - name: "成本", - type: "bar", - yAxisIndex: 4, + yAxisIndex: 0, data: [], }, ], @@ -846,8 +785,7 @@ export default { seriesData1 = [], seriesData2 = [], seriesData3 = [], - seriesData4 = [], - seriesData5 = []; + seriesData4 = []; let data = response; data.forEach((item) => { let ind = item.hour; @@ -856,7 +794,6 @@ export default { seriesData2[ind] = item.run_rate; seriesData3[ind] = item.elec_consume_unit; seriesData4[ind] = item.coal_consume_unit; - seriesData5[ind] = item.production_cost_unit; }); let options = { ...that.option1 }; options.series[0].data = seriesData0; @@ -864,7 +801,6 @@ export default { options.series[2].data = seriesData2; options.series[3].data = seriesData3; options.series[4].data = seriesData4; - options.series[5].data = seriesData5; let hourXAxis = []; for (let i = 1; i <= that.hours; i++) { let item = i + "时"; @@ -888,8 +824,7 @@ export default { seriesData1 = [], seriesData2 = [], seriesData3 = [], - seriesData4 = [], - seriesData5 = []; + seriesData4 = []; // debugger; console.log(response); let data = response; @@ -901,7 +836,6 @@ export default { seriesData2[ind] = item.run_rate; seriesData3[ind] = item.elec_consume_unit; seriesData4[ind] = item.coal_consume_unit; - seriesData5[ind] = item.production_cost_unit; }); let options = { ...that.option2 }; options.series[0].data = seriesData0; @@ -909,7 +843,6 @@ export default { options.series[2].data = seriesData2; options.series[3].data = seriesData3; options.series[4].data = seriesData4; - options.series[5].data = seriesData5; let dayXAxis = []; for (let i = 1; i <= that.days; i++) { let item = i + "日"; @@ -932,8 +865,7 @@ export default { seriesData1 = [], seriesData2 = [], seriesData3 = [], - seriesData4 = [], - seriesData5 = []; + seriesData4 = []; let data = response; data.forEach((item) => { let ind = item.month_s; @@ -942,7 +874,6 @@ export default { seriesData2[ind] = item.run_rate; seriesData3[ind] = item.elec_consume_unit; seriesData4[ind] = item.coal_consume_unit; - seriesData5[ind] = item.production_cost_unit; }); let options = { ...that.option3 }; options.series[0].data = seriesData0; @@ -950,7 +881,6 @@ export default { options.series[2].data = seriesData2; options.series[3].data = seriesData3; options.series[4].data = seriesData4; - options.series[5].data = seriesData5; let monthXAxis = []; for (let i = 1; i <= that.month; i++) { let item = i + "月"; diff --git a/src/views/enm_cogeneration/teamAnalysis.vue b/src/views/enm_cogeneration/teamAnalysis.vue index ec094e72..3137ce11 100644 --- a/src/views/enm_cogeneration/teamAnalysis.vue +++ b/src/views/enm_cogeneration/teamAnalysis.vue @@ -29,7 +29,7 @@
- @@ -46,28 +46,12 @@ - - - + - - - - - - - - - - - - - - diff --git a/src/views/enm_limestone/handoverLog.vue b/src/views/enm_limestone/handoverLog.vue index aeb808e3..8cdbfb5e 100644 --- a/src/views/enm_limestone/handoverLog.vue +++ b/src/views/enm_limestone/handoverLog.vue @@ -1,155 +1,212 @@ + + + + + +
+ 导出xlsx + + 打印 +
+ +
+
+ {{ + sflogItem.end_time.slice(0, 10) + }} + {{ sflogItem.shift_name }} + {{ + sflogItem.team_name + }} +
+
+ 余热发电工段班组月度对比分析
班组 产量 运转率单位产品标煤耗产品单位电耗得分发电量
总产量(t) 台时产量(t/h) 运转率(%)当期值(kgce/t))目标值(kgce/t)当期与目标差值(kgce/t)环期值(kgce/t)当期与环期差值(kgce/t)环比增长率(%)同比增长率(%)高温风机(kW·h/t)篦冷机一室风机(kW·h/t)篦冷机三室风机(kW·h/t)篦冷机二室风机(kW·h/t)窑头排风机(kW·h/t) 当期值(kW·h/t) 目标值(kW·h/t) 当期与目标差值(kW·h/t)
+ + + + + + + + + + + + + + + + + + + + + + + +
产量(t) + {{ reportItem.total_production }} + 单位产品电耗(kW·h/t) + {{ reportItem.production_hour }} +
+ 生产情况记录 + 时间类别原因处置措施处置人
{{ item.happen_time }}{{ item.cate }}{{ item.reason }}{{ item.measure }}{{ item.handler }}
+
+ + + + + + + 报表 + + + + + + +
+ 导出xlsx + + 打印 +
+ +
+
+ {{ + sflogItem.end_time.slice(0, 10) + }} + {{ sflogItem.shift_name }} + {{ + sflogItem.team_name + }} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
日期 + {{ sflogItem.end_time.slice(0, 10) }} + 班次 + {{ sflogItem.shift_name }} + 班组 + {{ + sflogItem.team_name + }} +
产量(t) + {{ reportItem.total_production }} + 台时(t/h) + {{ reportItem.production_hour }} + 运转时间(h) + {{ reportItem.run_hour }} +
运转率(%) + {{ reportItem.run_rate * 100 }} + 停机时长(h) + {{ reportItem.shut_hour }} + + 当期单位产品电耗(kW·h/t) + + {{ reportItem.elec_consume_unit }} +
+ 生产情况记录 + 时间类别原因处置措施处置人
{{ item.happen_time }}{{ item.cate }}{{ item.reason }}{{ item.measure }}{{ item.handler }}
+
+
+
+ + + + + + diff --git a/src/views/enm_rmbase/handover_form.vue b/src/views/enm_rmbase/handover_form.vue new file mode 100644 index 00000000..0efc5054 --- /dev/null +++ b/src/views/enm_rmbase/handover_form.vue @@ -0,0 +1,184 @@ + + + + \ No newline at end of file diff --git a/src/views/enm_rmbase/logDetail.vue b/src/views/enm_rmbase/logDetail.vue new file mode 100644 index 00000000..c3422d6d --- /dev/null +++ b/src/views/enm_rmbase/logDetail.vue @@ -0,0 +1,669 @@ + + + + + \ No newline at end of file diff --git a/src/views/enm_rmbase/other_form.vue b/src/views/enm_rmbase/other_form.vue new file mode 100644 index 00000000..0388fce6 --- /dev/null +++ b/src/views/enm_rmbase/other_form.vue @@ -0,0 +1,174 @@ + + + + \ No newline at end of file diff --git a/src/views/enm_limestone/power.vue b/src/views/enm_rmbase/power.vue similarity index 88% rename from src/views/enm_limestone/power.vue rename to src/views/enm_rmbase/power.vue index b64ea213..442a26e4 100644 --- a/src/views/enm_limestone/power.vue +++ b/src/views/enm_rmbase/power.vue @@ -25,7 +25,7 @@ - 石灰石破碎工段主要设备(100KW以上)单位产品电耗数据表 + 原料磨工段主要设备(100KW以上)单位产品电耗数据表 @@ -116,14 +116,7 @@
+ + + \ No newline at end of file diff --git a/src/views/enm_rmbase/report.vue b/src/views/enm_rmbase/report.vue new file mode 100644 index 00000000..9f64d2bc --- /dev/null +++ b/src/views/enm_rmbase/report.vue @@ -0,0 +1,1110 @@ + + + diff --git a/src/views/enm_limestone/teamAnalysis.vue b/src/views/enm_rmbase/teamAnalysis.vue similarity index 80% rename from src/views/enm_limestone/teamAnalysis.vue rename to src/views/enm_rmbase/teamAnalysis.vue index 4ea8788e..37fde6f2 100644 --- a/src/views/enm_limestone/teamAnalysis.vue +++ b/src/views/enm_rmbase/teamAnalysis.vue @@ -29,7 +29,7 @@
- + - - + - - - - @@ -125,6 +118,7 @@ export default { wrapArrs = []; this.$API.enm.enstat.req(query0).then((res0) => { let data0 = res0; + debugger; if (data0.length > 0) { data0.forEach((item0) => { //先按月份排序,再按班组排序 @@ -139,6 +133,8 @@ export default { } wrapArr0[ind0] = item0; }); + debugger; + console.log(wrapArr0); } else { } this.$API.enm.enstat.req(that.query).then((res) => { @@ -164,24 +160,12 @@ export default { arr.push(item.total_production); arr.push(item.production_hour); arr.push(item.run_rate); - //设备 - arr[5] = - item.循环风机_consume_unit != null - ? item.循环风机_consume_unit - : "/"; - arr[6] = - item.尾排风机_consume_unit != null - ? item.尾排风机_consume_unit - : "/"; - arr[7] = - item.废气风机_consume_unit != null - ? item.废气风机_consume_unit - : "/"; + // - arr[8] = item.elec_consume_unit; //当期值(KW·h/t) + arr[5] = item.elec_consume_unit; //当期值(KW·h/t) let keyVale = "goal_val_" + n; - arr[9] = goalData[keyVale]; //目标值(KW·h/t)//需要接口获取 - arr[10] = item.celec_consume_unit - arr[16]; //当期与目标差值(KW·h/t) + arr[6] = goalData[keyVale]; //目标值(KW·h/t)//需要接口获取 + arr[7] = item.celec_consume_unit - arr[16]; //当期与目标差值(KW·h/t) let ind_pre = 0, huanbi = 0; if (item.month_s == 1) { @@ -197,11 +181,11 @@ export default { : "/" : "/"; } - arr[11] = huanbi; //环期值(KW·h/t)上个月的值 - arr[12] = item.celec_consume_unit; //当期与环期差值(KW·h/t) - arr[13] = item.celec_consume_unit; //环比增长率(%) - arr[14] = item.celec_consume_unit; //同比增长率(%) - arr[15] = item.celec_consume_unit; //同比增长率(%) + arr[8] = huanbi; //环期值(KW·h/t)上个月的值 + arr[9] = item.celec_consume_unit; //当期与环期差值(KW·h/t) + arr[10] = item.celec_consume_unit; //环比增长率(%) + arr[11] = item.celec_consume_unit; //同比增长率(%) + arr[12] = item.celec_consume_unit; //同比增长率(%) wrapArr[ind] = arr; }); console.log(wrapArr); diff --git a/src/views/enm_rmbase/workshopAnalysis.vue b/src/views/enm_rmbase/workshopAnalysis.vue new file mode 100644 index 00000000..8a51c814 --- /dev/null +++ b/src/views/enm_rmbase/workshopAnalysis.vue @@ -0,0 +1,274 @@ + + + \ No newline at end of file diff --git a/src/views/home/widgets/index_photon.vue b/src/views/home/widgets/index_photon.vue index c4913857..77c2eef4 100644 --- a/src/views/home/widgets/index_photon.vue +++ b/src/views/home/widgets/index_photon.vue @@ -376,15 +376,27 @@ style="width: 100%; height: 285px" > + + + - { - // this.halfProductList = res; - // }); + let that = this; + let obj = { + query: { + material_types: "20", + }, + }; + that.$API.bi.dataset.exec.req("materialCount", obj).then((res) => { + if (res.data2.ds0) { + this.halfProductList = res.data2.ds0; + } + }); }, materialTypeChange() { this.getMaterialList(); diff --git a/src/views/inm/helpso_mio.vue b/src/views/inm/helpso_mio.vue index 19279160..da50865e 100644 --- a/src/views/inm/helpso_mio.vue +++ b/src/views/inm/helpso_mio.vue @@ -1,156 +1,227 @@ \ No newline at end of file + diff --git a/src/views/inm/mioitem_check.vue b/src/views/inm/mioitem_check.vue index 6683acf5..88eebbad 100644 --- a/src/views/inm/mioitem_check.vue +++ b/src/views/inm/mioitem_check.vue @@ -204,6 +204,18 @@ + + + + + + { that.userList = res; }); @@ -872,6 +887,7 @@ export default { }, countChange() {}, countNotOkSun() { + let that = this; if ( (that.type == "do_in" && that.cate == "halfgood") || that.type == "other_in" @@ -886,8 +902,10 @@ export default { this.form.count_n_dxt + this.form.count_n_js + this.form.count_n_qx + + this.form.count_n_hs + this.form.count_n_ysq + this.form.count_n_zz + + this.form.count_n_b + this.form.count_n_qt; } if (that.type == "do_in" && that.cate == "good") { @@ -917,6 +935,49 @@ export default { //提交 submit() { let that = this; + if ( + (that.type == "do_in" && that.cate == "halfgood") || + that.type == "other_in" + ) { + this.form.count_notok = + this.form.count_n_zw + + this.form.count_n_tw + + this.form.count_n_qp + + this.form.count_n_wq + + this.form.count_n_dl + + this.form.count_n_pb + + this.form.count_n_dxt + + this.form.count_n_js + + this.form.count_n_qx + + this.form.count_n_hs + + this.form.count_n_ysq + + this.form.count_n_zz + + this.form.count_n_b + + this.form.count_n_qt; + } + if (that.type == "do_in" && that.cate == "good") { + this.form.count_notok = + this.form.count_n_hs + + this.form.count_n_zs + + this.form.count_n_zz + + this.form.count_n_tw + + this.form.count_n_d + + this.form.count_n_zdd + + //棒 + this.form.count_n_qp + + this.form.count_n_bl + + this.form.count_n_hw + + this.form.count_n_yp + + this.form.count_n_bp + + this.form.count_n_sc + + //管 + this.form.count_n_qx + + this.form.count_n_js + + this.form.count_n_tydu + + this.form.count_n_sw + + this.form.count_n_bhpcd + + this.form.count_n_w; + } that.$refs.dialogForm.validate(async (valid) => { if (valid) { that.isSaveing = true; diff --git a/src/views/statistics/stock_statistics.vue b/src/views/statistics/stock_statistics.vue index a2fc72ed..7dea40b6 100644 --- a/src/views/statistics/stock_statistics.vue +++ b/src/views/statistics/stock_statistics.vue @@ -32,6 +32,32 @@ + + + + + + + + @@ -257,6 +283,7 @@ export default { currentMonth: "", currentLastDay: "", tableData: [], + tableData1: [], typeOptions: ["月", "年"], materialTypeOptions: [ { id: 10, name: "成品" }, @@ -282,13 +309,31 @@ export default { that.currentYear + "-" + that.currentMonth + "-" + lastDay; that.getTableData(); console.log(that.mio_type_name); + this.materialTypeChange(); }, methods: { queryTypeChnge() { this.query.queryDate = ""; }, materialTypeChange() { - this.$refs.tables1.refresh(); + let that = this; + that.tableData1 = []; + if (that.params.type == 10 || that.params.type == 20) { + let obj = { + query: { + material_types: that.params.type, + }, + }; + that.$API.bi.dataset.exec + .req("materialCount", obj) + .then((res) => { + if (res.data2.ds0) { + that.tableData1 = res.data2.ds0; + } + }); + } else { + that.$refs.tables1.refresh(); + } }, //更改周预估用量 weekcountChange(row) {
- 石灰石破碎工段班组月度对比分析 - 原料磨工段班组月度对比分析
月份 班组 产量 运转率单位产品电耗得分工段能耗
总产量(t) 台时产量(t/h) 运转率(%)循环风机(KW·h/t)尾排风机(KW·h/t)废气风机(KW·h/t)当期值(KW·h/t) 目标值(KW·h/t) 当期与目标差值(KW·h/t)