diff --git a/.env.development b/.env.development
index a6cf54bb..62b93c50 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,8 @@
NODE_ENV = development
# 标题
-VUE_APP_TITLE = '曲阳金隅安全智能管控平台'
+# VUE_APP_TITLE = '曲阳金隅安全智能管控平台'
+VUE_APP_TITLE = '托克逊能源管理平台'
# 接口地址
#VUE_APP_API_BASEURL = http://1.203.161.103:2800/api
diff --git a/.env.production b/.env.production
index 759c51be..e0730e0d 100644
--- a/.env.production
+++ b/.env.production
@@ -2,7 +2,8 @@
NODE_ENV = production
# 标题
-VUE_APP_TITLE = '曲阳金隅安全智能管控平台'
+# VUE_APP_TITLE = '曲阳金隅安全智能管控平台'
+VUE_APP_TITLE = '托克逊能源管理平台'
# 接口地址
VUE_APP_API_BASEURL = http://10.99.5.79:20309/api
diff --git a/src/App.vue b/src/App.vue
index 920b5329..2b426512 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -44,7 +44,6 @@
\ No newline at end of file
diff --git a/src/views/enm_mill/power.vue b/src/views/enm_mill/power.vue
index 7cb299b9..a6059c60 100644
--- a/src/views/enm_mill/power.vue
+++ b/src/views/enm_mill/power.vue
@@ -20,28 +20,32 @@
- | 水泥磨工段主要设备(100KW以上)单位产品电耗数据表 |
+ 水泥磨工段主要设备(100KW以上)单位产品电耗数据表 |
| 设备名称 |
设备编号 |
单位 |
+ 总电耗 |
上个小时 |
昨日 |
本月 |
-
- | {{item.name}} |
- {{item.number}} |
- {{item.unit}} |
- {{item[0]}} |
- {{item[2]}} |
- {{item[3]}} |
+
+
+ | {{item1}} |
+ {{item1}} |
+ {{item1}} |
+ {{item1}} |
+
+
+
+
@@ -117,6 +121,49 @@
-
\ No newline at end of file
diff --git a/src/views/enm_pack/report.vue b/src/views/enm_pack/report.vue
index a815fde4..0c9e37e0 100644
--- a/src/views/enm_pack/report.vue
+++ b/src/views/enm_pack/report.vue
@@ -49,6 +49,8 @@
+
+
@@ -143,6 +145,64 @@
diff --git a/src/views/ungrouped/electric.vue b/src/views/ungrouped/electric.vue
index 32ae0417..123500a9 100644
--- a/src/views/ungrouped/electric.vue
+++ b/src/views/ungrouped/electric.vue
@@ -3,9 +3,11 @@
-
全厂电量统计
-
-
+
+
+
+ | 全厂电量统计 |
+
| 车间 |
工段 |
@@ -17,19 +19,23 @@
- | {{item[0]}} |
- {{item[0]}} |
- {{item[0]}} |
- {{item[0]}} |
- {{item[0]}} |
- {{item[1]}} |
+ {{item[0]}} |
+ {{item[0]}} |
+ {{item[0]}} |
+ {{item[0]}} |
+ {{item[0]}} |
+
+ {{item[1]}} |
+ {{item[1]}} |
+ {{item[1]}} |
{{item[1]}} |
+
{{item[2]}} |
-
{{item[3]}} |
{{item[4]}} |
- {{item[5]}} |
- |
+ {{item[5]}} |
+
+ |
{{item[6]}} |
@@ -48,13 +54,14 @@
},
tableDatas:[
['原料车间','电石渣','电石渣',1,2,3,4 ],
+ ['原料车间','电石渣合计',1,2,3,4 ],
['原料车间','原料磨','反击式破碎机',1,2,3,4],
- ['原料车间','原料磨','立磨主电机'],
- ['原料车间','原料磨','循环风机'],
- ['原料车间','原料磨','烘干破主电机'],
- ['原料车间','原料磨','废气风机' ],
- ['原料车间','原料磨','尾排风机'],
- ['原料车间','原料磨','原料磨合计' ],
+ ['原料车间','立磨主电机'],
+ ['原料车间','循环风机'],
+ ['原料车间','烘干破主电机'],
+ ['原料车间','废气风机' ],
+ ['原料车间','尾排风机'],
+ ['原料车间','原料磨合计' ],
['原料车间','原料车间合计'],
['烧成车间','回转窑','高温风机'],
@@ -115,11 +122,9 @@
}
},
getData(){
- this.$API.bi.dataset.exec.req('3349203178834325504',).then((res) => {
- let data0 = this.sourceData = res.data2.ds0;
- // debugger;
- console.log(this.sourceData)
- });
+ this.$API.enm.enstat.req(params).then((res) => {
+
+ })
},
diff --git a/src/views/ungrouped/energy.vue b/src/views/ungrouped/energy.vue
index 50925770..4208d687 100644
--- a/src/views/ungrouped/energy.vue
+++ b/src/views/ungrouped/energy.vue
@@ -75,138 +75,53 @@
{{ tableName }}
-
-
+
+
| 日期 |
- 原料车间 |
+ 原料车间 |
+ 烧成车间 |
+ 水泥车间 |
-
+
| 电石渣 |
原料磨 |
- 原料车间压缩空气 |
+ 压缩空气(m3) |
-
- | 电量(KW.h) |
- 电量折标煤(tce) |
- 产品产量(t) |
- 单位产品综合能耗(tce/t) |
-
- 电量(KW.h) |
- 电量折标煤(tce) |
- 水(t) |
- 窑尾余热利用(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]}} |
-
-
-
-
-
- | 日期 |
- 烧成车间 |
-
-
+
| 回转窑 |
煤磨 |
- 烧成车间压缩空气 |
+ 压缩空气(m3) |
-
- | 电量(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]}} |
-
-
-
-
-
- | 日期 |
- 水泥车间 |
-
-
+
| 水泥磨 |
包装 |
- 水泥车间压缩空气 |
+ 压缩空气(m3) |
| 电量(KW.h) |
电量折标煤(tce) |
- 水(t) |
+ 煤粉(t) |
+ 煤粉折标煤(tce) |
+ 水(t) |
+ 柴油(t) |
+ 柴油折标煤(tce) |
+ 余热锅炉外送蒸汽(t) |
+ 余热锅炉外送蒸汽折标煤(tce) |
产品产量(t) |
单位产品综合能耗(tce/t) |
电量(KW.h) |
电量折标煤(tce) |
+ 水(t) |
+ 窑尾余热利用(tce) |
产品产量(t) |
单位产品综合能耗(tce/t) |
- 压缩空气(m3) |
| {{ item1 }} |
-
-
@@ -230,36 +145,7 @@
{id:1,name:'月统计'},
{id:2,name:'年统计'},
],
- tableDatas:[
- {month:'2023.1',name:'甲组',number:'NM001',unit:'KW·h/t',hours:'1',days:'2',months:'3'},
- {month:'2023.1',name:'乙组',number:'NM002',unit:'KW·h/t',hours:'1',days:'2',months:'3'},
- {month:'2023.1',name:'丙组',number:'NM003',unit:'KW·h/t',hours:'1',days:'2',months:'3'},
- {month:'2023.2',name:'甲组',number:'NM004',unit:'KW·h/t',hours:'1',days:'2',months:'3'},
- {month:'2023.2',name:'乙组',number:'NM005',unit:'KW·h/t',hours:'1',days:'2',months:'3'},
- {month:'2023.2',name:'丙组',number:'NM006',unit:'KW·h/t',hours:'1',days:'2',months:'3'},
- ],
tableHead:['车间','工段','能源分类','1号','2号','3号','4号','5号','6号','7号','8号'],
- tableDatas2:[
- ['原料车间','电石渣','电量(KW.h)',1,2,3,4,5,6],
- ['原料车间','电石渣','水(t)',1,2,3,4,5,6],
- ['原料车间','原料磨','电量(KW.h)',1,2,3,4,5,6],
- ['原料车间','原料磨','水(t)',1,2,3,4,5,6],
- ['原料车间','压缩空气(m3)',1,2,3,4,5,6],
-
- ['烧成车间','回转窑','电量(KW.h)',1,2,3,4,5,6],
- ['烧成车间','回转窑','煤粉(t)',1,2,3,4,5,6],
- ['烧成车间','回转窑','水(t)',1,2,3,4,5,6],
- ['烧成车间','回转窑','蒸汽(t)',1,2,3,4,5,6],
- ['烧成车间','煤磨','电量(KW.h)',1,2,3,4,5,6],
- ['烧成车间','煤磨','水(t)',1,2,3,4,5,6],
- ['烧成车间','压缩空气(m3)',1,2,3,4,5,6],
-
- ['水泥车间','水泥磨','电量(KW.h)',1,2,3,4,5,6],
- ['水泥车间','水泥磨','水(t)',1,2,3,4,5,6],
- ['水泥车间','包装','电量(KW.h)',1,2,3,4,5,6],
- ['水泥车间','包装','水(t)',1,2,3,4,5,6],
- ['水泥车间','压缩空气(m3)',1,2,3,4,5,6],
- ],
deptOptions:[],
tableDatas3:[],
sourceData:{}
@@ -291,6 +177,7 @@
that.deptOptions.forEach(item=>{
if(item.id==e){
that.deptName = item.name;
+ that.tableDatas3 = [];
}
})
},
@@ -306,7 +193,6 @@
getData(){
let that = this;
let params = {};
- let id = '';
let arr = [];
if(that.query.type==0){//日
params.type='day_s';
@@ -318,6 +204,7 @@
params.year_s = Number(that.query.year);
}
params.mgroup__belong_dept = that.query.belong_dept;
+
this.$API.enm.enstat.req(params).then((res) => {
let data = res.results;
let wrapArr = [];
@@ -354,21 +241,39 @@
}
}
});
+ // debugger;
+ // console.log(wrapArr);
wrapArr.forEach((item1)=>{
+ //item1------一天的数据
if(item1!=undefined){
let itemArr = [];
let time =item1[0].day_s!=null? item1[0].year_s+'.'+item1[0].month_s+'.'+item1[0].day_s:item1[0].year_s+'.'+item1[0].month_s;
- itemArr[0] = time;
- itemArr[1] = item1[0].elec_consume;
- itemArr[2] = item1[0].coal_consume_unit;
- itemArr[3] = item1[0].total_production;
- itemArr[4] = item1[0].cen_consume_unit;
- itemArr[5] = item1[1].elec_consume;
- itemArr[6] = item1[1].coal_consume_unit;
- itemArr[7] = item1[1].cen_consume_unit;
- itemArr[8] = item1[1].cen_consume_unit;
- itemArr[9] = item1[1].total_production;
- itemArr[10] = item1[1].cen_consume_unit;
+ itemArr.push(time)
+ itemArr.push( item1[0].elec_consume)
+ itemArr.push( item1[0].elec_coal_consume)
+ if(that.deptName=='烧成车间'){
+ itemArr.push( item1[0].pcoal_consume)//煤粉(t)
+ itemArr.push( item1[0].pcoal_coal_consume)//煤粉折标煤(tce)
+ itemArr.push( item1[0].water_consume)//水(t)
+ itemArr.push( item1[0].pcoal_consume)//柴油(t)
+ itemArr.push( item1[0].pcoal_coal_consume)//柴油折标煤(tce)
+ itemArr.push( item1[0].out_steam)//余热锅炉外送蒸汽(t)
+ itemArr.push( item1[0].out_steam_coal)//余热锅炉外送蒸汽折标煤(tce)
+ }else if(that.deptName=='水泥车间'){
+ itemArr.push( item1[0].water_consume)//水
+ }
+ itemArr.push( item1[0].total_production)
+ itemArr.push( item1[0].cen_consume_unit)
+
+ itemArr.push( item1[1].elec_consume)
+ itemArr.push( item1[1].elec_consume*0.1229/1000)
+ if(that.deptName=='原料车间'){
+ itemArr.push( item1[1].water_consume)//水
+ itemArr.push( item1[1].kiln_end_heat)//窑尾余热
+ }
+ itemArr.push( item1[1].total_production)
+ itemArr.push( item1[1].cen_consume_unit)
+ itemArr.push( item1[1].cair_consume)//压缩空气
innerArr.push(itemArr)
}
})
diff --git a/src/views/ungrouped/mgroup_form.vue b/src/views/ungrouped/mgroup_form.vue
index 95ab8c9f..b6b1e674 100644
--- a/src/views/ungrouped/mgroup_form.vue
+++ b/src/views/ungrouped/mgroup_form.vue
@@ -81,7 +81,7 @@
>
-
+
{
- // let data = [];
- // res.forEach(element => {
- // if(element.type!==0){
- // data.push(element)
- // }
- // });
this.options = res;
})
},
@@ -143,8 +137,8 @@
if (valid) {
that.isSaveing = true;
let arr = that.form.date.split('-');
- that.form.year = arr[0];
- that.form.month = arr[1];
+ that.form.year = Number(arr[0]);
+ that.form.month = Number(arr[1]);
if(that.mode==='add'){
that.$API.fim.priceset.create.req(that.form).then(res=>{
that.isSaveing = false;
@@ -155,7 +149,12 @@
that.isSaveing = false;
})
}else{
- res = that.$API.fim.priceset.update.req(that.form.id,that.form).then(res=>{
+ let form = {};
+ form.year = that.form.year;
+ form.month = that.form.month;
+ form.material = that.form.material;
+ form.price_unit = that.form.price_unit;
+ res = that.$API.fim.priceset.update.req(that.form.id,form).then(res=>{
that.isSaveing = false;
that.$emit("success", that.form, that.mode);
that.visible = false;
diff --git a/src/views/ungrouped/quality.vue b/src/views/ungrouped/quality.vue
index 77628912..b90231bf 100644
--- a/src/views/ungrouped/quality.vue
+++ b/src/views/ungrouped/quality.vue
@@ -3,13 +3,13 @@
-
+ /> -->
-
+
{{date}} |
@@ -100,196 +99,32 @@
{{item[6]}} |
-
+ -->
-
-
+
+
- | 原料车间 |
- 烧成车间 |
- 水泥车间 |
+ {{ tableName }} |
- | 辅料 |
- 干混生料 |
- 入窑生料 |
- 熟料 |
- 煤粉 |
- 出磨水泥 |
+ 日期 |
+ {{deptName}} |
- | 细度 |
- Fe2O3 |
- 水分 |
- CaO |
- Fe2O3 |
- 细度 |
- 水分 |
- CaO |
- Fe2O3 |
- 细度 |
- 水分 |
- 立升重 |
- f-CaO |
- 细度 |
- 水分 |
- 比表面积 |
- SO3 |
- 掺量 |
+ {{ item.name }} |
- | 平均值 |
- 检次 |
- 合次 |
- 合格率 |
- 平均值 |
- 检次 |
- 合次 |
- 合格率 |
- 平均值 |
- 检次 |
- 合次 |
- 合格率 |
- 平均值 |
- 检次 |
- 合次 |
- 合格率 |
- 平均值 |
- 检次 |
- 合次 |
- 合格率 |
- 平均值 |
- 检次 |
- 合次 |
- 合格率 |
- 平均值 |
- 检次 |
- 合次 |
- 合格率 |
- 平均值 |
- 检次 |
- 合次 |
- 合格率 |
- 平均值 |
- 检次 |
- 合次 |
- 合格率 |
- 平均值 |
- 检次 |
- 合次 |
- 合格率 |
- 平均值 |
- 检次 |
- 合次 |
- 合格率 |
- 平均值 |
- 检次 |
- 合次 |
- 合格率 |
- 平均值 |
- 检次 |
- 合次 |
- 合格率 |
- 平均值 |
- 检次 |
- 合次 |
- 合格率 |
- 平均值 |
- 检次 |
- 合次 |
- 合格率 |
- 平均值 |
- 检次 |
- 合次 |
- 合格率 |
- 平均值 |
- 检次 |
- 合次 |
- 合格率 |
- 平均值 |
- 检次 |
- 合次 |
- 合格率 |
-
+ {{item}} |
+
+
+ | {{item}} |
-
- | {{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]}} |
+
+ | {{item1}} |
-
@@ -302,13 +137,13 @@
type:0,
year:'',
month:'',
- day:'',
+ search_type:'',
},
options:[
{id:0,name:'日报表'},
{id:1,name:'月报表'},
- {id:2,name:'年报表'},
],
+ titleLength:1,
mgroupOptions:[],
tableTime:'',
tableName:'质检日报表',
@@ -336,17 +171,13 @@
['水泥车间','出磨水泥','掺量'],
],
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],
- ],
+ header2:[],
+ header3:[],
+ header4:[],
+ tableData:[],
+ header2Obj:[],
+ deptOptions:[],
+ arrLength:[0,0,0],
};
},
mounted() {
@@ -360,18 +191,9 @@
days = '0'+days;
}
this.query.day = myDate.getFullYear()+'-'+month+'-'+days;
- this.getTableData();
- this.getMgroup();
-
+ this.getGroup();
},
methods: {
- //获取工段列表
- getMgroup(){
- this.$API.mtm.mgroup.list.req({page:0}).then(res=>{
- this.mgroupOptions = res;
- this.query.mgroup = res[8].id
- })
- },
typeCange(value){
if(value==1){
this.tableName = '质检日报表'
@@ -381,40 +203,239 @@
this.tableName = '质检年报表'
}
},
+ deptChange(e){
+ let that = this;
+ that.deptOptions.forEach(item=>{
+ if(item.id==e){
+ that.deptName = item.name;
+ }
+ })
+ },
+ getGroup() {
+ let that = this;
+ that.$API.system.dept.list.req({ page_size: 3 , type:'dept'}).then(res=>{
+ that.deptOptions = res.results;
+ that.deptName = res.results[0].name;
+ that.query.belong_dept = res.results[0].id;
+ this.getTableData();
+ });
+ },
getTableData(){
let that = this;
- let params = {query:{}};
- let id = '';
+ that.tableDatas3 = [];
+ that.header2Obj=[];
+ that.header2 = [];//物料
+ that.header3 = [];//检测项
+ that.header4 = [];//检测项
+ let params = {};
let arr = [];
if(that.query.type==0){//日
- arr = that.query.day.split('-');
- params.query.year_s = arr[0];
- params.query.month_s = arr[1];
- params.query.day_s = arr[2];
- id='zjrbb'
- }else if(that.query.type==1){//月
arr = that.query.month.split('-');
- params.query.year_s = arr[0];
- params.query.month_s = arr[1];
- id='zjybb'
- }else{//年
- params.query.year_s = that.query.year;
- id='zjnbb'
+ params.year_s = arr[0];
+ params.month_s = arr[1];
+ params.type = 'day_s'
+ }else if(that.query.type==1){//月
+ params.type = 'month_s'
+ params.year_s = that.query.year;
}
- that.$API.bi.dataset.exec.req(id,params).then(res=>{
- that.time =
- that.tableName = res.name;
- let data = res.data.ds0;
- that.tableHead = data[0];
- that.tableDatas = data.slice(1,data.length);
- for(let i=0;i{
+ // let data = res.results;
+ // let list = [];
+ // data.forEach(item => {
+ // let index = item.day_s;
+ // if(list[index]){}else{
+ // list[index] = [];
+ // }
+ // list[index].push(item);
+ // })
+ // let header2=[],header2Obj=[],header3=[],header4=[];
+ // list = list.filter(item=>{
+ // return item
+ // })
+ // console.log(list)
+ // console.log('000000000000000')
+ // //list按天分好的数组
+ // list.forEach((item0,index0)=>{
+ // //data1某一天的数据
+ // let data1 = item0;
+ // let dayData=[],wrapData = [[],[],[]];
+ // dayData[0]= data1[0].day_s!=null?data1[0].year_s+'.'+data1[0].month_s+'.'+data1[0].day_s:data1[0].year_s+'.'+data1[0].month_s;
+ // data1.forEach(item1 => {
+ // if(item1.belong_dept_name=='原料车间'){
+ // wrapData[0].push(item1)
+ // }else if(item1.belong_dept_name=='烧成车间'){
+ // wrapData[1].push(item1)
+ // }else if(item1.belong_dept_name=='水泥车间'){
+ // wrapData[2].push(item1)
+ // }
+ // });
+ // //wrapData按车间分的数组
+ // for(let i=0;i{
+ // if(index0==0){
+ // header3.push(item3.testitem_name)
+ // if(header2.indexOf(item3.material_name)>-1){
+ // let indexObj = header2.indexOf(item3.material_name);
+ // header2Obj[indexObj].length = header2Obj[indexObj].length+1;
+ // }else{
+ // header2.push(item3.material_name);
+ // header2Obj.push({name:item3.material_name,length:1})
+ // }
+ // console.log(header2)
+ // console.log(header2Obj)
+ // header4.push('平均值')
+ // header4.push('检次')
+ // header4.push('合次')
+ // header4.push('及格率')
+ // }
+ // dayData.push(item3.val_avg)
+ // dayData.push(item3.num_test)
+ // dayData.push(item3.num_ok)
+ // let pass = item3.rate_pass*100+'%'
+ // dayData.push(pass)
+ // })
+ // }
+ // }
+ // if(index0==0){
+ // that.header2Obj=header2Obj;
+ // that.header2 = header2;//物料
+ // that.header3 = header3;//检测项
+ // that.header4 = header4;//检测项
+ // console.log(header2)
+ // console.log(header3)
+ // console.log(header4)
+ // }
+ // that.tableData.push(dayData)
+ // })
+ // // debugger;
+ // // console.log(that.tableData)
+ // // that.time =
+ // // that.tableName = res.name;
+ // // let data = res.data.ds0;
+ // // that.tableHead = data[0];
+ // // that.tableDatas = data.slice(1,data.length);
+ // // for(let i=0;i {
+ let data = res.results;
+ let wrapArr = [];
+ let innerArr = [];
+ let ind = 0;
+ //1、将相同日期或月份/年份的数据放到一组
+ let header2=[],header2Obj=[],header3=[],header4=[];
+ data.forEach(item => {
+ if(that.query.type==0){//日统计
+ ind = item.day_s-1;
+ }else if(that.query.type==1){//月统计
+ ind = item.month_s-1;
+ }
+ if(wrapArr[ind]){
+ }else{
+ wrapArr[ind] = [];
+ }
+ if(that.deptName=='原料车间'){
+ wrapArr[ind].push(item)
+ }else if(that.deptName=='烧成车间'){
+ if(item.mgroup_name=='回转窑'){
+ wrapArr[ind][1]=item
+ }else{
+ wrapArr[ind][0]=item
+ }
+ }else{
+ wrapArr[ind].push(item)
+ }
+ });
+ wrapArr = wrapArr.filter(item=>{
+ return item
+ })
+ wrapArr.forEach((item1,index1)=>{
+ if(item1!=undefined){
+ console.log(item1)//一天的数据
+ let itemArr = [];
+ let header2tem=[],header2Objtem=[],header3tem=[],header4tem=[];
+ let time =item1[0].day_s!=null? item1[0].year_s+'.'+item1[0].month_s+'.'+item1[0].day_s:item1[0].year_s+'.'+item1[0].month_s;
+ itemArr.push(time)
+ //遍历每个工段
+ item1.forEach(item2=>{
+ let data2 =item2.qua_data;
+ //遍历一个工段的物料检验数据
+ data2.forEach((item3,index3)=>{
+ //item3一个检验数据
+ if(header2tem.indexOf(item3.material_name)>-1){
+ let indexObj = header2tem.indexOf(item3.material_name);
+ header2Objtem[indexObj].lengths = header2Objtem[indexObj].lengths+1;
+ }else{
+ header2tem.push(item3.material_name);
+ header2Objtem.push({name:item3.material_name,lengths:1})
+ }
+ header3tem.push(item3.testitem_name)
+ header4tem.push('平均值')
+ header4tem.push('检次')
+ header4tem.push('合次')
+ header4tem.push('及格率')
+ let indexObj = header2tem.indexOf(item3.material_name);
+ debugger;
+ if(indexObj>0&&index3==0){
+ let inde = indexObj-1;
+ let ind =header2Objtem[inde].lengths*4+1;
+ itemArr[ind] = item3.val_avg.toFixed(2);
+ itemArr.push(item3.num_test)
+ itemArr.push(item3.num_ok)
+ let pass = (item3.rate_pass*100).toFixed(2);
+ pass= pass+'%';
+ itemArr.push(pass)
+ }else{
+ itemArr.push(item3.val_avg.toFixed(2))
+ itemArr.push(item3.num_test)
+ itemArr.push(item3.num_ok)
+ let pass = (item3.rate_pass*100).toFixed(2);
+ pass= pass+'%';
+ itemArr.push(pass)
+ }
+ that.titleLength =itemArr.length;
+ })
+ })
+ innerArr.push(itemArr)
+ console.log('0000000000000');
+ console.log(itemArr);
+ console.log(header2tem);
+ console.log(header2Objtem);
+ console.log(header3tem);
+ console.log(header4tem);
+ console.log('1111111111111');
+ if(header2tem.length>header2.length){
+ header2 = header2tem;
+ }
+ if(header2Objtem.length>header2Obj.length){
+ header2Obj=header2Objtem;
+ }
+ if(header3tem.length>header3.length){
+ header3 = header3tem;
+ }
+ if(header4tem.length>header4.length){
+ header4 = header4tem;
+ }
+ }
+ })
+ that.tableDatas3 = innerArr;
+ that.header2Obj=header2Obj;
+ that.header2 = header2;//物料
+ that.header3 = header3;//检测项
+ that.header4 = header4;//检测项
+ });
},
handlePrint() {
this.$PRINT('#myReport');
@@ -431,38 +452,8 @@
.printContainer{
width: 1075px;
}
- #myTable{
- margin-left: 37px;
- }
- #myTable td{
- height: 32px;
- padding-left: 5px;
- }
.tableContainer{
overflow-x: scroll;
}
- #myTable1{
- width: 100%;
- }
- #myTable1 .numCell,#myTable1 th{
- width: 80px;
- }
- .numCell{
- width: 80px;
- }
- .numCell.numCell_last{
- width: 100px;
- }
- .searchHead{
- display:flex
- }
- .middleText{
- height: 32px;
- line-height: 32px;
- margin: 0 5px;
- display: inline-block;
- }
- .searchBtn{
- margin-left: 5px;
- }
+
\ No newline at end of file
diff --git a/src/views/ungrouped/report.vue b/src/views/ungrouped/report.vue
index 70788c7e..fa501f83 100644
--- a/src/views/ungrouped/report.vue
+++ b/src/views/ungrouped/report.vue
@@ -3,9 +3,11 @@
-
全厂报表
-
-
+
+
+
+ | 全厂报表 |
+
| 序号 |
项目 |
diff --git a/src/views/ungrouped/value.vue b/src/views/ungrouped/value.vue
new file mode 100644
index 00000000..7c69bcbe
--- /dev/null
+++ b/src/views/ungrouped/value.vue
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+ | 全厂能源统计 |
+
+
+ | 月份 |
+ 工业总产值(万元) |
+ 工业增加值(万元) |
+ 综合能源消费 |
+ 单位总产值能耗 |
+ 单位工业增加值能耗 |
+
+
+ | 当期值(tce) |
+ 环比增长率(%) |
+ 同比增长率(%) |
+ 当期值(tce/万元) |
+ 环比增长率(%) |
+ 同比增长率(%) |
+ 当期值(tce/万元) |
+ 环比增长率(%) |
+ 同比增长率(%) |
+
+
+
+ | {{item1}} |
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/userCenter/index.vue b/src/views/userCenter/index.vue
index 91b5b1d8..c62283b0 100644
--- a/src/views/userCenter/index.vue
+++ b/src/views/userCenter/index.vue
@@ -59,8 +59,7 @@ export default {
components: {
account: defineAsyncComponent(() => import("./user/account")),
seting: defineAsyncComponent(() => import("./user/seting")),
- pushSettings: defineAsyncComponent(() => import("./user/pushSettings")),
- clockRecord: defineAsyncComponent(() => import("./user/clock_record")),
+ pushSettings: defineAsyncComponent(() => import("./user/pushSettings"))
},
data() {
return {
@@ -83,11 +82,6 @@ export default {
title: "修改密码",
component: "pushSettings",
},
- {
- icon: "el-icon-platform",
- title: "打卡记录",
- component: "clockRecord",
- },
],
},
],