From c3a656fc5dfd995c19fd570d4f9181aff7d06867 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 19 Jul 2023 16:13:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E9=99=86=E5=90=8E=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/route.js | 21 + src/views/ecm/algo.vue | 10 +- src/views/home/enm_home.vue | 41 ++ src/views/home/widgets/index_enm.vue | 378 +++++++++++++ src/views/login/components/passwordForm.vue | 43 +- src/views/rm_enm/report.vue | 1 + src/views/ungrouped/costing.vue | 553 +++++++++++++++++++- src/views/ungrouped/echart.vue | 414 +++++++++++++++ src/views/ungrouped/energy.vue | 133 ++++- src/views/ungrouped/material_form.vue | 2 +- src/views/ungrouped/mgroup_form.vue | 3 +- src/views/ungrouped/quality.vue | 209 ++++++++ 12 files changed, 1766 insertions(+), 42 deletions(-) create mode 100644 src/views/home/enm_home.vue create mode 100644 src/views/home/widgets/index_enm.vue create mode 100644 src/views/ungrouped/echart.vue diff --git a/src/config/route.js b/src/config/route.js index 2a845364..2b8ababa 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -47,6 +47,17 @@ const routes = [ "perms": ["dashboard"] }, "component": "home" + }, + { + "name": "dashboard_enm", + "path": "/dashboard_enm", + "meta": { + "title": "控制台", + "icon": "el-icon-monitor", + "affix": true, + "perms": ["bi"] + }, + "component": "home/enm_home" }, { "path": "/bigScreen", @@ -922,6 +933,16 @@ const routes = [ }, "component": "ungrouped/report" } + ,{ + "name": "echart", + "path": "/ungrouped/echart", + "meta": { + "title": "图表", + "icon": "el-icon-grid", + "perms": ["dataset"] + }, + "component": "ungrouped/echart" + } ] }, { diff --git a/src/views/ecm/algo.vue b/src/views/ecm/algo.vue index 7730de97..7421ce93 100644 --- a/src/views/ecm/algo.vue +++ b/src/views/ecm/algo.vue @@ -95,10 +95,18 @@ label="算法名称" prop="algo_.name" > - + + + +
+ + + + + + + + +
+ + + + + + diff --git a/src/views/home/widgets/index_enm.vue b/src/views/home/widgets/index_enm.vue new file mode 100644 index 00000000..c341dc68 --- /dev/null +++ b/src/views/home/widgets/index_enm.vue @@ -0,0 +1,378 @@ + + + + + diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue index d09d4d1c..473c1560 100644 --- a/src/views/login/components/passwordForm.vue +++ b/src/views/login/components/passwordForm.vue @@ -166,26 +166,33 @@ export default { var res1 = await that.$API.auth.info.get(); that.$TOOL.data.set("USER_INFO", res1); that.$TOOL.data.set("PERMISSIONS", Object.keys(res1.perms)); - that.$API.am.area.list.req({page_size:999}).then(res => { - if (res.err_msg) { - } else { - debugger; - let areaList = res.results; - that.$TOOL.data.set("qyjyAreaList", areaList); - if(res1.type==='employee'){ - this.$router.replace({ - path: "/", - }); - }else{ - this.$router.replace({ - path: "/rpm/rpj", + debugger; + console.log(this.$TOOL.data.get('BASE_INFO').base.base_name) + if(this.$TOOL.data.get('BASE_INFO').base.base_name=='托克逊能源管理平台'){//托克逊 + this.$router.replace({ + path: "/dashboard_enm", }); + }else{//曲阳金隅 + that.$API.am.area.list.req({page_size:999}).then(res => { + if (res.err_msg) { + } else { + debugger; + let areaList = res.results; + that.$TOOL.data.set("qyjyAreaList", areaList); + if(res1.type==='employee'){ + this.$router.replace({ + path: "/", + }); + }else{ + this.$router.replace({ + path: "/rpm/rpj", + }); + } + that.$message.success("Login Success 登录成功"); + that.islogin = false; + } + }) } - that.$message.success("Login Success 登录成功"); - that.islogin = false; - } - }) - } catch (err) { that.islogin = false; console.log(err);} diff --git a/src/views/rm_enm/report.vue b/src/views/rm_enm/report.vue index eb512852..6aa1356a 100644 --- a/src/views/rm_enm/report.vue +++ b/src/views/rm_enm/report.vue @@ -233,6 +233,7 @@ } .numCell{ width: 80px; + height: 35px; } .numCell.numCell_last{ width: 100px; diff --git a/src/views/ungrouped/costing.vue b/src/views/ungrouped/costing.vue index 83fab8bd..4e59024a 100644 --- a/src/views/ungrouped/costing.vue +++ b/src/views/ungrouped/costing.vue @@ -66,7 +66,7 @@ -
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
电石渣干粉核算
日期班次班组实际产量（t）总成本（元）单位成本（元/吨）直接材料直接人工制造费用
原材料电车间人员工资劳务工资倒运费用材料出库维修费用装卸费差旅费折旧摊销
湿电石渣（t）单价（元/吨）总成本（元）单位成本（元/吨）动力电（kw.h）单价（元/度）总成本（元）单位成本（元/度）单位成本（元/吨）单位成本（元/吨）单位成本（元/吨）单位成本（元/吨）检修单位成本（元/吨）外协施工费用单位成本（元/吨）单位成本（元/吨）单位成本（元/吨）单位成本（元/吨）无形资产摊销单位成本（元/吨）
{{item[0]}}{{item[1]}}{{item[2]}}{{item[3]}}{{item[4]}}{{item[5]}}{{item[6]}}{{item[7]}}{{item[8]}}{{item[9]}}{{item[10]}}{{item[11]}}{{item[12]}}{{item[13]}}{{item[14]}}{{item[15]}}{{item[16]}}{{item[17]}}{{item[18]}}{{item[19]}}{{item[20]}}{{item[21]}}{{item[22]}}{{item[23]}}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
生料核算
日期班次班组实际产量（t）总成本（元）单位成本（元/吨）直接材料
原材料
干粉（t）单价（元/吨）总成本（元）单位成本（元/吨）辅料（t）单价（元/吨）总成本（元）单位成本（元/吨）粉煤灰（t）单价（元/吨）总成本（元）单位成本（元/吨）电石厂除尘灰（t）单价（元/吨）总成本（元）单位成本（元/吨）
{{item[0]}}{{item[1]}}{{item[2]}}{{item[3]}}{{item[4]}}{{item[5]}}{{item[6]}}{{item[7]}}{{item[8]}}{{item[9]}}{{item[10]}}{{item[11]}}{{item[12]}}{{item[13]}}{{item[14]}}{{item[15]}}{{item[16]}}{{item[17]}}{{item[18]}}{{item[19]}}{{item[20]}}{{item[21]}}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
生料核算
日期班次班组直接材料直接人工制造费用
电和水车间人员工资劳务工资倒运费用材料出库维修费用装卸费差旅费折旧摊销
动力电（kw.h）单价（元/度）总成本（元）单位成本（元/度）工业水（t）单价（元/吨）总成本（元）单位成本（元/吨）单位成本（元/吨）单位成本（元/吨）单位成本（元/吨）单位成本（元/吨）检修单位成本（元/吨）外协施工费用单位成本（元/吨）单位成本（元/吨）单位成本（元/吨）单位成本（元/吨）无形资产摊销单位成本（元/吨）
{{item[0]}}{{item[1]}}{{item[2]}}{{item[3]}}{{item[4]}}{{item[5]}}{{item[6]}}{{item[7]}}{{item[8]}}{{item[9]}}{{item[10]}}{{item[11]}}{{item[12]}}{{item[13]}}{{item[14]}}{{item[15]}}{{item[16]}}{{item[17]}}{{item[18]}}{{item[19]}}{{item[20]}}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
熟料核算
日期班次班组实际产量（t）总成本（元）单位成本（元/吨）直接材料
原材料电和水
生料（t）单价（元/吨）总成本（元）单位成本（元/吨）原煤（t）单价（元/吨）总成本（元）单位成本（元/吨）动力电（kw.h）单价（元/度）总成本（元）单位成本（元/度）工业水（t）单价（元/吨）总成本（元）单位成本（元/吨）
{{item[0]}}{{item[1]}}{{item[2]}}{{item[3]}}{{item[4]}}{{item[5]}}{{item[6]}}{{item[7]}}{{item[8]}}{{item[9]}}{{item[10]}}{{item[11]}}{{item[12]}}{{item[13]}}{{item[14]}}{{item[15]}}{{item[16]}}{{item[17]}}{{item[18]}}{{item[19]}}{{item[20]}}{{item[21]}}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
生料核算
日期班次班组直接人工制造费用
车间人员工资劳务工资倒运费用材料出库维修费用装卸费差旅费折旧摊销
单位成本（元/吨）单位成本（元/吨）单位成本（元/吨）单位成本（元/吨）检修单位成本（元/吨）外协施工费用单位成本（元/吨）单位成本（元/吨）单位成本（元/吨）单位成本（元/吨）无形资产摊销单位成本（元/吨）
{{item[0]}}{{item[1]}}{{item[2]}}{{item[3]}}{{item[4]}}{{item[5]}}{{item[6]}}{{item[7]}}{{item[8]}}{{item[9]}}{{item[10]}}{{item[11]}}{{item[12]}}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
水泥核算
日期班次班组实际产量（t）总成本（元）单位成本（元/吨）直接材料
原材料
熟料（t）单价（元/吨）总成本（元）单位成本（元/吨）废石灰石粉（t）单价（元/吨）总成本（元）单位成本（元/吨）脱硫石膏（t）单价（元/吨）总成本（元）单位成本（元/吨）粉煤灰（t）单价（元/吨）总成本（元）单位成本（元/吨）矿粉（t）单价（元/吨）总成本（元）单位成本（元/吨）助磨剂（t）单价（元/吨）总成本（元）单位成本（元/吨）
{{item[0]}}{{item[1]}}{{item[2]}}{{item[3]}}{{item[4]}}{{item[5]}}{{item[6]}}{{item[7]}}{{item[8]}}{{item[9]}}{{item[10]}}{{item[11]}}{{item[12]}}{{item[13]}}{{item[14]}}{{item[15]}}{{item[16]}}{{item[17]}}{{item[18]}}{{item[19]}}{{item[20]}}{{item[21]}}{{item[21]}}{{item[21]}}{{item[21]}}{{item[21]}}{{item[21]}}{{item[21]}}{{item[21]}}{{item[21]}}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
水泥核算
日期班次班组直接材料直接人工制造费用
原材料电和水车间人员工资劳务工资倒运费用材料出库维修费用装卸费差旅费折旧摊销
缓凝剂（t）单价（元/吨）总成本（元）单位成本（元/吨）包装袋（t）单价（元/吨）总成本（元）单位成本（元/吨）动力电（kw.h）单价（元/度）总成本（元）单位成本（元/度）工业水（t）单价（元/吨）总成本（元）单位成本（元/吨）单位成本（元/吨）单位成本（元/吨）单位成本（元/吨）单位成本（元/吨）检修单位成本（元/吨）外协施工费用单位成本（元/吨）单位成本（元/吨）单位成本（元/吨）单位成本（元/吨）无形资产摊销单位成本（元/吨）
{{item[0]}}{{item[1]}}{{item[2]}}{{item[3]}}{{item[4]}}{{item[5]}}{{item[6]}}{{item[7]}}{{item[8]}}{{item[9]}}{{item[10]}}{{item[11]}}{{item[12]}}{{item[13]}}{{item[14]}}{{item[15]}}{{item[16]}}{{item[17]}}{{item[18]}}{{item[19]}}{{item[20]}}{{item[20]}}{{item[20]}}{{item[20]}}{{item[20]}}{{item[20]}}{{item[20]}}{{item[20]}}{{item[20]}}
+
@@ -315,6 +846,18 @@ ['制造费用','摊销','无形资产摊销','/','/','/','/',5], ['成本合计','',''], ], + tableData1:[ + ['2023.07.10','夜班','甲组',1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5], + ['2023.07.10','夜班','甲组',1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5], + ['2023.07.10','夜班','甲组',1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5], + ['2023.07.10','夜班','甲组',1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5], + ['2023.07.10','夜班','甲组',1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5], + ['2023.07.10','夜班','甲组',1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5], + ['2023.07.10','夜班','甲组',1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5], + ['2023.07.10','夜班','甲组',1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5], + ['2023.07.10','夜班','甲组',1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5], + ['2023.07.10','夜班','甲组',1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5], + ], optionsShift:[], sourceData:{} }; @@ -326,7 +869,6 @@ month = '0'+month; } this.query.month = myDate.getFullYear()+'-'+month; - // this.getData(); this.getShift(); }, @@ -378,12 +920,9 @@ } }; - + \ No newline at end of file diff --git a/src/views/ungrouped/energy.vue b/src/views/ungrouped/energy.vue index a49e3d2d..5f50c748 100644 --- a/src/views/ungrouped/energy.vue +++ b/src/views/ungrouped/energy.vue @@ -118,31 +118,136 @@ {{item[17]}} - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
日期烧成车间
回转窑煤磨烧成车间压缩空气
电量（KW.h）电量折标煤（tce）煤粉（t）煤粉折标煤（tce）水（t）柴油（t）柴油折标煤（tce）余热锅炉外送蒸汽（t）余热锅炉外送蒸汽折标煤（tce）产品产量（t）单位产品综合能耗（tce/t）电量（KW.h）电量折标煤（tce）产品产量（t）单位产品综合能耗（tce/t）压缩空气（m3）
{{item[0]}}{{item[1]}}{{item[2]}}{{item[3]}}{{item[4]}}{{item[5]}}{{item[6]}}{{item[7]}}{{item[8]}}{{item[9]}}{{item[10]}}{{item[11]}}{{item[12]}}{{item[13]}}{{item[14]}}{{item[15]}}{{item[16]}}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
日期水泥车间
水泥磨包装水泥车间压缩空气
电量（KW.h）电量折标煤（tce）水（t）产品产量（t）单位产品综合能耗（tce/t）电量（KW.h）电量折标煤（tce）产品产量（t）单位产品综合能耗（tce/t）压缩空气（m3）
{{item[0]}}{{item[1]}}{{item[2]}}{{item[3]}}{{item[4]}}{{item[5]}}{{item[6]}}{{item[7]}}{{item[8]}}{{item[9]}}{{item[10]}}
 diff --git a/src/views/ungrouped/material_form.vue b/src/views/ungrouped/material_form.vue index f8bd1fdb..0f056c2f 100644 --- a/src/views/ungrouped/material_form.vue +++ b/src/views/ungrouped/material_form.vue @@ -137,7 +137,7 @@ that.$refs.dialogForm.validate(async (valid) => { if (valid) { that.isSaveing = true; - if(that.type==='add'){ + if(that.mode==='add'){ that.$API.mtm.material.create.req(that.form).then(res=>{ that.isSaveing = false; that.$emit("success", that.form, that.mode); diff --git a/src/views/ungrouped/mgroup_form.vue b/src/views/ungrouped/mgroup_form.vue index 3c63b949..95ab8c9f 100644 --- a/src/views/ungrouped/mgroup_form.vue +++ b/src/views/ungrouped/mgroup_form.vue @@ -183,8 +183,9 @@ let that = this; that.$refs.dialogForm.validate(async (valid) => { if (valid) { + debugger; that.isSaveing = true; - if(that.type==='add'){ + if(that.mode==='add'){ that.$API.mtm.mgroup.create.req(that.form).then(res=>{ that.isSaveing = false; that.$emit("success", that.form, that.mode); diff --git a/src/views/ungrouped/quality.vue b/src/views/ungrouped/quality.vue index 24974d62..14256358 100644 --- a/src/views/ungrouped/quality.vue +++ b/src/views/ungrouped/quality.vue @@ -88,6 +88,195 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
原料车间烧成车间水泥车间
辅料干混生料入窑生料熟料煤粉出磨水泥
细度Fe2O3水分CaOFe2O3细度水分CaOFe2O3细度水分立升重f-CaO细度水分比表面积SO3掺量
平均值检次合次合格率平均值检次合次合格率平均值检次合次合格率平均值检次合次合格率平均值检次合次合格率平均值检次合次合格率平均值检次合次合格率平均值检次合次合格率平均值检次合次合格率平均值检次合次合格率平均值检次合次合格率平均值检次合次合格率平均值检次合次合格率平均值检次合次合格率平均值检次合次合格率平均值检次合次合格率平均值检次合次合格率平均值检次合次合格率
{{item[0]}}{{item[1]}}{{item[2]}}{{item[3]}}{{item[4]}}{{item[5]}}{{item[6]}}{{item[7]}}{{item[8]}}{{item[9]}}{{item[10]}}{{item[11]}}{{item[12]}}{{item[13]}}{{item[14]}}{{item[15]}}{{item[16]}}{{item[17]}}{{item[0]}}{{item[1]}}{{item[2]}}{{item[3]}}{{item[4]}}{{item[5]}}{{item[6]}}{{item[7]}}{{item[8]}}{{item[9]}}{{item[10]}}{{item[11]}}{{item[12]}}{{item[13]}}{{item[14]}}{{item[15]}}{{item[16]}}{{item[17]}}{{item[0]}}{{item[1]}}{{item[2]}}{{item[3]}}{{item[4]}}{{item[5]}}{{item[6]}}{{item[7]}}{{item[8]}}{{item[9]}}{{item[10]}}{{item[11]}}{{item[12]}}{{item[13]}}{{item[14]}}{{item[15]}}{{item[16]}}{{item[17]}}{{item[0]}}{{item[1]}}{{item[2]}}{{item[3]}}{{item[4]}}{{item[5]}}{{item[6]}}{{item[7]}}{{item[8]}}{{item[9]}}{{item[10]}}{{item[11]}}{{item[12]}}{{item[13]}}{{item[14]}}{{item[15]}}{{item[16]}}{{item[17]}}
+
+ @@ -133,6 +322,17 @@ ['水泥车间','出磨水泥','掺量'], ], exportLoading:false, + tableData1:[ + [1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5], + [1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5], + [1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5], + [1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5], + [1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5], + [1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5], + [1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5], + [1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5], + [1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5,1,2,3,4,5], + ], }; }, mounted() { @@ -216,6 +416,15 @@ height: 32px; padding-left: 5px; } + .tableContainer{ + overflow-x: scroll; + } + #myTable1{ + width: 100%; + } + #myTable1 .numCell,#myTable1 th{ + width: 80px; + } .numCell{ width: 80px; }