This commit is contained in:
caoqianming 2023-08-18 16:33:50 +08:00
commit e1c29c282a
46 changed files with 2083 additions and 1899 deletions

View File

@ -43,7 +43,19 @@
<style lang="scss"> <style lang="scss">
@import '@/style/style.scss'; @import '@/style/style.scss';
.headerSearch{
width: 120px!important;
margin-right: 5px;
}
.printWrap{
width: 100%;
overflow-x: scroll;
}
.printContainer{
width: 1075px;
}
.myTable{ .myTable{
table-layout: fixed;
border: 1px solid #cccccc; border: 1px solid #cccccc;
} }
.myTableHead{ .myTableHead{
@ -51,7 +63,6 @@
color:#ffffff; color:#ffffff;
} }
.myTable th{ .myTable th{
width: 80px;
height: 40px; height: 40px;
font-weight: 500; font-weight: 500;
} }
@ -61,8 +72,29 @@
border: 1px solid #cccccc; border: 1px solid #cccccc;
} }
.numCell{ .numCell{
width: 80px;
height: 35px; height: 35px;
text-align: center; text-align: center;
} }
.numCell,.myTable th{
width: 100px!important;
}
.chartWrap{
width: 1035px;
margin-top: 20px;
border: 1px solid #eeeeee;
}
.chartTitle{
text-align: center;
font-size: 20px;
font-weight: bold;
margin-top: 20px;
}
.redColor{
font-weight: bold;
color: #ff0000;
}
.greenColor{
font-weight: bold;
color: #008000;
}
</style> </style>

View File

@ -1130,7 +1130,7 @@ const routes = [
"title": "班组管理", "title": "班组管理",
"icon": "el-icon-postcard", "icon": "el-icon-postcard",
"type": "menu", "type": "menu",
"perms": ["dataset"] "perms": ["enm"]
}, },
"component": "ungrouped/team" "component": "ungrouped/team"
}, },
@ -1140,7 +1140,7 @@ const routes = [
"meta": { "meta": {
"title": "测点集", "title": "测点集",
"icon": "el-icon-grid", "icon": "el-icon-grid",
"perms": ["dataset"] "perms": ["enm"]
}, },
"component": "ungrouped/mgroup" "component": "ungrouped/mgroup"
}, },
@ -1150,7 +1150,7 @@ const routes = [
"meta": { "meta": {
"title": "测点", "title": "测点",
"icon": "el-icon-grid", "icon": "el-icon-grid",
"perms": ["dataset"] "perms": ["enm"]
}, },
"component": "em/mpoint" "component": "em/mpoint"
}, },
@ -1160,7 +1160,7 @@ const routes = [
"meta": { "meta": {
"title": "物料", "title": "物料",
"icon": "el-icon-grid", "icon": "el-icon-grid",
"perms": ["dataset"] "perms": ["enm"]
}, },
"component": "ungrouped/material" "component": "ungrouped/material"
} }
@ -1182,7 +1182,7 @@ const routes = [
"meta": { "meta": {
"title": "物料价格配置", "title": "物料价格配置",
"icon": "el-icon-grid", "icon": "el-icon-grid",
"perms": ["dataset"] "perms": ["enm"]
}, },
"component": "ungrouped/priceset" "component": "ungrouped/priceset"
}, },
@ -1192,7 +1192,7 @@ const routes = [
"meta": { "meta": {
"title": "工段成本配置", "title": "工段成本配置",
"icon": "el-icon-grid", "icon": "el-icon-grid",
"perms": ["dataset"] "perms": ["enm"]
}, },
"component": "ungrouped/feeset" "component": "ungrouped/feeset"
}, },
@ -1202,7 +1202,7 @@ const routes = [
"meta": { "meta": {
"title": "月度年度目标值", "title": "月度年度目标值",
"icon": "el-icon-grid", "icon": "el-icon-grid",
"perms": ["dataset"] "perms": ["enm"]
}, },
"component": "ungrouped/goalSetting" "component": "ungrouped/goalSetting"
}, },
@ -1225,7 +1225,7 @@ const routes = [
"meta": { "meta": {
"title": "能源统计", "title": "能源统计",
"icon": "el-icon-grid", "icon": "el-icon-grid",
"perms": ["dataset"] "perms": ["enm"]
}, },
"component": "ungrouped/energy" "component": "ungrouped/energy"
}, },
@ -1235,7 +1235,7 @@ const routes = [
"meta": { "meta": {
"title": "工业产值", "title": "工业产值",
"icon": "el-icon-grid", "icon": "el-icon-grid",
"perms": ["dataset"] "perms": ["enm"]
}, },
"component": "ungrouped/value" "component": "ungrouped/value"
}, },
@ -1245,7 +1245,7 @@ const routes = [
"meta": { "meta": {
"title": "全厂电量统计", "title": "全厂电量统计",
"icon": "el-icon-grid", "icon": "el-icon-grid",
"perms": ["dataset"] "perms": ["enm"]
}, },
"component": "ungrouped/electric" "component": "ungrouped/electric"
} }
@ -1267,7 +1267,7 @@ const routes = [
"meta": { "meta": {
"title": "成本计算", "title": "成本计算",
"icon": "el-icon-grid", "icon": "el-icon-grid",
"perms": ["dataset"] "perms": ["enm"]
}, },
"component": "ungrouped/costing" "component": "ungrouped/costing"
}, },
@ -1277,7 +1277,7 @@ const routes = [
"meta": { "meta": {
"title": "质量报表", "title": "质量报表",
"icon": "el-icon-grid", "icon": "el-icon-grid",
"perms": ["dataset"] "perms": ["enm"]
}, },
"component": "ungrouped/quality" "component": "ungrouped/quality"
} }
@ -1287,7 +1287,7 @@ const routes = [
"meta": { "meta": {
"title": "生产报表", "title": "生产报表",
"icon": "el-icon-grid", "icon": "el-icon-grid",
"perms": ["dataset"] "perms": ["enm"]
}, },
"component": "ungrouped/report" "component": "ungrouped/report"
} }
@ -1297,7 +1297,7 @@ const routes = [
// "meta": { // "meta": {
// "title": "图表", // "title": "图表",
// "icon": "el-icon-grid", // "icon": "el-icon-grid",
// "perms": ["dataset"] // "perms": ["enm"]
// }, // },
// "component": "ungrouped/echart" // "component": "ungrouped/echart"
// } // }

View File

@ -2,15 +2,11 @@
<el-container> <el-container>
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<el-button type="primary" icon="el-icon-plus" @click="add"></el-button>
</div>
<div class="right-panel">
<div class="right-panel-search">
<el-input <el-input
v-model="query.search" v-model="query.search"
placeholder="名称" placeholder="名称"
clearable clearable
@keyup.enter="handleQuery" style="margin-right: 5px;"
></el-input> ></el-input>
<el-button <el-button
type="primary" type="primary"
@ -18,6 +14,8 @@
@click="handleQuery" @click="handleQuery"
></el-button> ></el-button>
</div> </div>
<div class="right-panel">
<el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'equipment.create'"></el-button>
</div> </div>
</el-header> </el-header>
<el-main class="nopadding"> <el-main class="nopadding">
@ -75,12 +73,15 @@
<el-link <el-link
type="primary" type="primary"
@click="table_edit(scope.row)" @click="table_edit(scope.row)"
v-auth="'equipment.update'"
> >
编辑 编辑
</el-link> </el-link>
<el-divider direction="vertical"></el-divider>
<el-link <el-link
type="danger" type="danger"
@click="table_del(scope.row)" @click="table_del(scope.row)"
v-auth="'equipment.delete'"
> >
删除 删除
</el-link> </el-link>

View File

@ -6,15 +6,16 @@
v-model="query.search" v-model="query.search"
placeholder="名称" placeholder="名称"
clearable clearable
@keyup.enter="handleQuery" style="margin-right: 5px;"
></el-input> ></el-input>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@click="handleQuery" @click="handleQuery"
></el-button> ></el-button>
<el-button type="primary" icon="el-icon-plus" @click="table_add"></el-button> </div>
<div class="right-panel">
<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'mpoint.create'"></el-button>
</div> </div>
</el-header> </el-header>
<el-main class="nopadding"> <el-main class="nopadding">
@ -27,11 +28,11 @@
<el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column> <el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="140"> <el-table-column label="操作" fixed="right" align="center" width="140">
<template #default="scope"> <template #default="scope">
<el-button link size="small" @click="table_edit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button> <el-button link size="small" @click="table_edit(scope.row)" v-auth="'mpoint.update'" type="primary">编辑</el-button>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-popconfirm title="确定删除吗?" @confirm="table_del(scope.row, scope.$index)"> <el-popconfirm title="确定删除吗?" @confirm="table_del(scope.row, scope.$index)">
<template #reference> <template #reference>
<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button> <el-button link size="small" v-auth="'mpoint.delete'" type="danger">删除</el-button>
</template> </template>
</el-popconfirm> </el-popconfirm>
</template> </template>

View File

@ -4,11 +4,20 @@
<div class="left-panel"> <div class="left-panel">
<div style="margin-right: 20px">交接班日志</div> <div style="margin-right: 20px">交接班日志</div>
<el-date-picker <el-date-picker
v-model="query.time" v-model="query.start_time__gte"
type="date" type="date"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD" format="YYYY-MM-DD"
placeholder="日志时间" placeholder="开始时间"
style=" width: 120px"
/>
<el-date-picker
v-model="query.end_time__lt"
type="date"
value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD"
placeholder="结束时间"
style="margin-left: 2px; width: 120px"
/> />
<el-select <el-select
v-model="query.shift" v-model="query.shift"
@ -18,9 +27,9 @@
> >
<el-option <el-option
v-for="item in optionsShift" v-for="item in optionsShift"
:key="item.value" :key="item.id"
:label="item.label" :label="item.name"
:value="item.value" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
<el-select <el-select
@ -31,9 +40,9 @@
> >
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.id"
:label="item.label" :label="item.name"
:value="item.value" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
<el-button <el-button
@ -65,9 +74,9 @@
<span>{{ scope.row.end_time.slice(0,16)}}</span> <span>{{ scope.row.end_time.slice(0,16)}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="班组名称" prop="team_name" width="80"></el-table-column> <el-table-column label="班组名称" prop="team_name"></el-table-column>
<el-table-column label="当前班次" prop="shift_name" width="80"></el-table-column> <el-table-column label="当前班次" prop="shift_name"></el-table-column>
<el-table-column label="班长" prop="leader_name" width="80"></el-table-column> <el-table-column label="班长" prop="leader_name"></el-table-column>
<el-table-column label="检验时间"> <el-table-column label="检验时间">
<template #default="scope"> <template #default="scope">
@ -157,8 +166,8 @@
@success="handleCheckSuccess" @success="handleCheckSuccess"
@closed="dialog.save = false" @closed="dialog.save = false"
></quastat-dialog> ></quastat-dialog>
</template> </template>
<script> <script>
import saveDialog from "./../enm_rm/handover_form.vue"; import saveDialog from "./../enm_rm/handover_form.vue";
import quastatDialog from "./../enm_rm/quastat_form.vue"; import quastatDialog from "./../enm_rm/quastat_form.vue";
import otherDialog from "./../enm_rm/other_form.vue"; import otherDialog from "./../enm_rm/other_form.vue";
@ -174,6 +183,10 @@
apiObj: this.$API.wpm.sflog.list, apiObj: this.$API.wpm.sflog.list,
apiObj2: null, apiObj2: null,
query: { query: {
shift:'',
team:'',
end_time__lt:'',
start_time__gte:'',
mgroup:'3347217512021835776', mgroup:'3347217512021835776',
}, },
deptId :'3347207082608115712', deptId :'3347207082608115712',
@ -197,8 +210,27 @@
limitedExport:false, limitedExport:false,
}; };
}, },
mounted(){
this.getTeam();
this.getShfit();
},
methods: { methods: {
getTeam(){
let form ={};
form.page = 0;
form.belong_dept = this.deptId;
this.$API.mtm.team.list.req(form).then(res=>{
this.options = res;
})
},
getShfit(){
this.$API.mtm.shift.req({page:0}).then(res=>{
this.optionsShift = res;
})
},
handleQuery(){
this.$refs.table.queryData(this.query);
},
sflog_export(){ sflog_export(){
this.limitedExport = true; this.limitedExport = true;
}, },
@ -291,9 +323,6 @@
</script> </script>
<style scoped> <style scoped>
.printContainer{
width: 1075px;
}
#numTable{ #numTable{
margin-left: 37px; margin-left: 37px;
} }

View File

@ -16,11 +16,12 @@
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <el-card style="margin-top:5px">
<div class="printWrap">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" width="1000" cellspacing="0" :key="timeStamp" class="myTable" id="myTable"> <table border="1" width="1035" cellspacing="0" :key="timeStamp" class="myTable" id="myTable">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="7">煤磨工段主要设备100KW以上单位产品电耗数据表</th> <th colspan="6">煤磨工段主要设备100KW以上单位产品电耗数据表</th>
</tr> </tr>
<tr> <tr>
<th>设备名称</th> <th>设备名称</th>
@ -42,10 +43,21 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<scEcharts height="400px" width="1074px" :option="optionHour"></scEcharts> <div class="chartWrap">
<scEcharts height="400px" width="1074px" :option="optionDay"></scEcharts> <div class="chartTitle">小时生产参数统计图</div>
<scEcharts height="400px" width="1074px" :option="optionMonth"></scEcharts> <scEcharts height="400px" width="1033px" :option="optionHour"></scEcharts>
</div> </div>
<div class="chartWrap">
<div class="chartTitle">本月生产参数统计图</div>
<scEcharts height="400px" width="1033px" :option="optionDay"></scEcharts>
</div>
<div class="chartWrap">
<div class="chartTitle">本年生产参数统计图</div>
<scEcharts height="400px" width="1033px" :option="optionMonth"></scEcharts>
</div>
</div>
</div>
<sc-dialog v-model="chartShow" draggable title="创建/编辑人员证书"> <sc-dialog v-model="chartShow" draggable title="创建/编辑人员证书">
<div class="searchHead" v-if="type=='hours'"> <div class="searchHead" v-if="type=='hours'">
<el-date-picker <el-date-picker
@ -133,8 +145,8 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
// alwaysShowContent:true, // alwaysShowContent:true,
}; };
let grid={ let grid={
right: '10%', right: '3%',
left:'10%', left:'7%',
top:'15%' top:'15%'
}; };
let toolbox={ let toolbox={
@ -146,12 +158,12 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
} }
}; };
let legend= { let legend= {
top:'5%', top:'2%',
data:['煤磨排风机主电机', '煤磨主电机'] data:['煤磨排风机主电机', '煤磨主电机']
}; };
let yAxis= { let yAxis= {
type: 'value', type: 'value',
name: '单位产品分布电耗(KW.h/t)', name: '分布电耗(KW.h/t)',
alignTicks: true, alignTicks: true,
axisLine: { axisLine: {
show: true, show: true,
@ -527,8 +539,8 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
} }
}; };
</script> </script>
<style> <style scoped>
.printContainer{ .printContainer{
width: 1075px; padding-left: 20px;
} }
</style> </style>

View File

@ -16,8 +16,9 @@
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <el-card style="margin-top:5px">
<div class="printWrap">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable"> <table border="1" width="1035" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="10">煤磨工段生产报告</th> <th colspan="10">煤磨工段生产报告</th>
@ -50,10 +51,21 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<scEcharts height="400px" width="1074px" :option="optionHour"></scEcharts> <div class="chartWrap">
<scEcharts height="400px" width="1074px" :option="optionDay"></scEcharts> <div class="chartTitle">小时生产参数统计图</div>
<scEcharts height="400px" width="1074px" :option="optionMonth"></scEcharts> <scEcharts height="400px" width="1033px" :option="optionHour"></scEcharts>
</div> </div>
<div class="chartWrap">
<div class="chartTitle">本月生产参数统计图</div>
<scEcharts height="400px" width="1033px" :option="optionDay"></scEcharts>
</div>
<div class="chartWrap">
<div class="chartTitle">本年生产参数统计图</div>
<scEcharts height="400px" width="1033px" :option="optionMonth"></scEcharts>
</div>
</div>
</div>
<sc-dialog v-model="chartShow" draggable title="煤磨工段"> <sc-dialog v-model="chartShow" draggable title="煤磨工段">
<div class="searchHead" v-if="type=='hours'"> <div class="searchHead" v-if="type=='hours'">
<el-date-picker <el-date-picker
@ -159,12 +171,12 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#91CC75','#EE6666'];
triggerOn:"mousemove", triggerOn:"mousemove",
}; };
let grid={ let grid={
right: '10%', right: '8%',
left:'10%', left:'4%',
top:'15%' top:'15%'
}; };
let toolbox={ let toolbox={
right:'5%', right:'2%',
feature: { feature: {
dataView: { show: true, readOnly: false }, dataView: { show: true, readOnly: false },
// restore: { show: true }, // restore: { show: true },
@ -172,7 +184,7 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#91CC75','#EE6666'];
} }
}; };
let legend= { let legend= {
top:'5%', top:'2%',
data:['总产量', '台时产量', '运转率', '分布电耗'] data:['总产量', '台时产量', '运转率', '分布电耗']
}; };
let yAxis= [{ let yAxis= [{
@ -195,7 +207,7 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#91CC75','#EE6666'];
name: '运转率 (%)', name: '运转率 (%)',
position: 'right', position: 'right',
alignTicks: true, alignTicks: true,
offset: 0, offset: 80,
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
@ -211,7 +223,6 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#91CC75','#EE6666'];
name: '分布电耗(KW.h)', name: '分布电耗(KW.h)',
position: 'right', position: 'right',
alignTicks: true, alignTicks: true,
offset: 80,
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
@ -665,8 +676,8 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#91CC75','#EE6666'];
} }
}; };
</script> </script>
<style> <style scoped>
.printContainer{ .printContainer{
width: 1075px; padding-left: 20px;
} }
</style> </style>

View File

@ -8,7 +8,7 @@
value-format="YYYY" value-format="YYYY"
format="YYYY" format="YYYY"
placeholder="查询年份" placeholder="查询年份"
style="margin-right: 6px;" class="headerSearch"
/> />
<el-button <el-button
type="primary" type="primary"
@ -29,11 +29,12 @@
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <el-card style="margin-top:5px">
<div class="printWrap">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" cellspacing="0" :key="timeStamp" id="myTable" class="myTable"> <table border="1" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="20">煤磨工段班组月度对比分析</th> <th colspan="16">煤磨工段班组月度对比分析</th>
</tr> </tr>
<tr> <tr>
<th rowspan="2">月份</th> <th rowspan="2">月份</th>
@ -63,6 +64,7 @@
</tr> </tr>
</table> </table>
</div> </div>
</div>
</el-card> </el-card>
</div> </div>
</template> </template>
@ -203,7 +205,8 @@
}; };
</script> </script>
<style scoped> <style scoped>
.printContainer{ .printWrap{
width: 100%; width: 100%;
overflow-x: scroll;
} }
</style> </style>

View File

@ -8,7 +8,7 @@
value-format="YYYY" value-format="YYYY"
format="YYYY" format="YYYY"
placeholder="查询年份" placeholder="查询年份"
style="margin-right: 6px;" class="headerSearch"
/> />
<el-button <el-button
type="primary" type="primary"
@ -29,8 +29,9 @@
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <el-card style="margin-top:5px">
<div class="printWrap">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable"> <table border="1" width="1075" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="8">煤磨工段车间单位产品电耗月度分析表</th> <th colspan="8">煤磨工段车间单位产品电耗月度分析表</th>
@ -61,6 +62,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
</el-card> </el-card>
</div> </div>
</template> </template>
@ -265,16 +267,9 @@
} }
}; };
</script> </script>
<style> <style scoped>
.printContainer{ .printWrap{
width: 1075px; width: 100%;
} overflow-x: scroll;
.redColor{
font-weight: bold;
color: #ff0000;
}
.greenColor{
font-weight: bold;
color: #008000;
} }
</style> </style>

View File

@ -4,11 +4,20 @@
<div class="left-panel"> <div class="left-panel">
<div style="margin-right: 20px">交接班日志</div> <div style="margin-right: 20px">交接班日志</div>
<el-date-picker <el-date-picker
v-model="query.time" v-model="query.start_time__gte"
type="date" type="date"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD" format="YYYY-MM-DD"
placeholder="日志时间" placeholder="开始时间"
style=" width: 120px"
/>
<el-date-picker
v-model="query.end_time__lt"
type="date"
value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD"
placeholder="结束时间"
style="margin-left: 2px; width: 120px"
/> />
<el-select <el-select
v-model="query.shift" v-model="query.shift"
@ -18,9 +27,9 @@
> >
<el-option <el-option
v-for="item in optionsShift" v-for="item in optionsShift"
:key="item.value" :key="item.id"
:label="item.label" :label="item.name"
:value="item.value" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
<el-select <el-select
@ -31,9 +40,9 @@
> >
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.id"
:label="item.label" :label="item.name"
:value="item.value" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
<el-button <el-button
@ -193,6 +202,10 @@ import otherDialog from "./../enm_rm/other_form.vue";
apiObj: this.$API.wpm.sflog.list, apiObj: this.$API.wpm.sflog.list,
apiObj2: null, apiObj2: null,
query: { query: {
shift:'',
team:'',
end_time__lt:'',
start_time__gte:'',
mgroup:'3347217246321065984', mgroup:'3347217246321065984',
}, },
@ -217,8 +230,27 @@ import otherDialog from "./../enm_rm/other_form.vue";
limitedExport:false, limitedExport:false,
}; };
}, },
mounted(){
this.getTeam();
this.getShfit();
},
methods: { methods: {
getTeam(){
let form ={};
form.page = 0;
form.belong_dept = this.deptId;
this.$API.mtm.team.list.req(form).then(res=>{
this.options = res;
})
},
getShfit(){
this.$API.mtm.shift.req({page:0}).then(res=>{
this.optionsShift = res;
})
},
handleQuery(){
this.$refs.table.queryData(this.query);
},
sflog_export(){ sflog_export(){
this.limitedExport = true; this.limitedExport = true;
}, },
@ -311,9 +343,6 @@ import otherDialog from "./../enm_rm/other_form.vue";
</script> </script>
<style scoped> <style scoped>
.printContainer{
width: 1075px;
}
#numTable{ #numTable{
margin-left: 37px; margin-left: 37px;
} }

View File

@ -16,11 +16,12 @@
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <el-card style="margin-top:5px">
<div class="printWrap">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" width="1000" cellspacing="0" :key="timeStamp" class="myTable" id="myTable"> <table border="1" width="1035" cellspacing="0" :key="timeStamp" class="myTable" id="myTable">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="7">回转窑工段主要设备100KW以上单位产品电耗数据表</th> <th colspan="6">回转窑工段主要设备100KW以上单位产品电耗数据表</th>
</tr> </tr>
<tr> <tr>
<th>设备名称</th> <th>设备名称</th>
@ -42,10 +43,21 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<scEcharts height="400px" width="1074px" :option="optionHour"></scEcharts> <div class="chartWrap">
<scEcharts height="400px" width="1074px" :option="optionDay"></scEcharts> <div class="chartTitle">小时生产参数统计图</div>
<scEcharts height="400px" width="1074px" :option="optionMonth"></scEcharts> <scEcharts height="400px" width="1033px" :option="optionHour"></scEcharts>
</div> </div>
<div class="chartWrap">
<div class="chartTitle">本月生产参数统计图</div>
<scEcharts height="400px" width="1033px" :option="optionDay"></scEcharts>
</div>
<div class="chartWrap">
<div class="chartTitle">本年生产参数统计图</div>
<scEcharts height="400px" width="1033px" :option="optionMonth"></scEcharts>
</div>
</div>
</div>
<sc-dialog v-model="chartShow" draggable title="创建/编辑人员证书"> <sc-dialog v-model="chartShow" draggable title="创建/编辑人员证书">
<div class="searchHead" v-if="type=='hours'"> <div class="searchHead" v-if="type=='hours'">
<el-date-picker <el-date-picker
@ -132,26 +144,26 @@
triggerOn:"mousemove", triggerOn:"mousemove",
}; };
let grid={ let grid={
right: '15%', right: '3%',
left:'10%', left:'7%',
top:'15%' top:'15%'
}; };
let toolbox={ let toolbox={
right:'5%', right:'2%',
feature: { feature: {
dataView: { show: true, readOnly: false }, dataView: { show: true, readOnly: false },
saveAsImage: { show: true } saveAsImage: { show: true }
} }
}; };
let legend= { let legend= {
top:'15%', top:'2%',
right:'0', left:'30',
orient:'vertical', // orient:'vertical',
data:['高温风机', '窑主电机', '篦冷机一室风机电机', '篦冷机二室风机电机', '篦冷机三室风机电机','窑头排风机主电机','充气梁风机(左)电机','充气梁风机(右)电机'] data:['高温风机', '窑主电机', '篦冷机一室风机', '篦冷机二室风机', '篦冷机三室风机','窑头排风机','充气梁风机(左)','充气梁风机(右)']
}; };
let yAxis= { let yAxis= {
type: 'value', type: 'value',
name: '单位产品分布电耗(KW.h/t)', name: '分布电耗(KW.h/t)',
alignTicks: true, alignTicks: true,
axisLine: { axisLine: {
show: true, show: true,
@ -188,20 +200,6 @@
tableDatas:[ tableDatas:[
['高温风机','','KW·h/t','','',''], ['高温风机','','KW·h/t','','',''],
['窑主电机','','KW·h/t','','',''], ['窑主电机','','KW·h/t','','',''],
// {name:'',number:'NM001',unit:'KW·h/t',hours:'1',days:'24',month:'720'},
// {name:'',number:'NM002',unit:'KW·h/t',hours:'1',days:'24',month:'720'},
// {name:'',number:'NM003',unit:'KW·h/t',hours:'1',days:'24',month:'720'},
// {name:'',number:'NM004',unit:'KW·h/t',hours:'1',days:'24',month:'720'},
// {name:'',number:'NM005',unit:'KW·h/t',hours:'1',days:'24',month:'720'},
// {name:'',number:'NM006',unit:'KW·h/t',hours:'1',days:'24',month:'720'},
// {name:'',number:'NM006',unit:'KW·h/t',hours:'1',days:'24',month:'720'},
// {name:'',number:'NM006',unit:'KW·h/t',hours:'1',days:'24',month:'720'},
// {name:'',number:'NM006',unit:'KW·h/t',hours:'1',days:'24',month:'720'},
// {name:'西',number:'NM006',unit:'KW·h/t',hours:'1',days:'24',month:'720'},
// {name:'3301',number:'NM006',unit:'KW·h/t',hours:'1',days:'24',month:'720'},
// {name:'3303',number:'NM006',unit:'KW·h/t',hours:'1',days:'24',month:'720'},
// {name:'3308',number:'NM006',unit:'KW·h/t',hours:'1',days:'24',month:'720'},
// {name:'3318',number:'NM006',unit:'KW·h/t',hours:'1',days:'24',month:'720'},
], ],
modelValue:true, modelValue:true,
type:'hours', type:'hours',
@ -240,32 +238,32 @@
data: [] data: []
}, },
{ {
name: '篦冷机一室风机电机', name: '篦冷机一室风机',
type: 'bar', type: 'bar',
data: [] data: []
}, },
{ {
name: '篦冷机二室风机电机', name: '篦冷机二室风机',
type: 'bar', type: 'bar',
data: [] data: []
}, },
{ {
name: '篦冷机三室风机电机', name: '篦冷机三室风机',
type: 'bar', type: 'bar',
data: [] data: []
}, },
{ {
name: '窑头排风机主电机', name: '窑头排风机',
type: 'bar', type: 'bar',
data: [] data: []
}, },
{ {
name: '充气梁风机(左)电机', name: '充气梁风机(左)',
type: 'bar', type: 'bar',
data: [] data: []
}, },
{ {
name: '充气梁风机(右)电机', name: '充气梁风机(右)',
type: 'bar', type: 'bar',
data: [] data: []
}, },
@ -693,8 +691,8 @@
} }
}; };
</script> </script>
<style> <style scoped>
.printContainer{ .printContainer{
width: 1075px; padding-left: 20px;
} }
</style> </style>

View File

@ -16,8 +16,9 @@
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <el-card style="margin-top:5px">
<div class="printWrap">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable"> <table border="1" width="1035" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="10">回转窑工段生产报告</th> <th colspan="10">回转窑工段生产报告</th>
@ -51,10 +52,21 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<scEcharts height="400px" width="1074px" :option="optionHour"></scEcharts> <div class="chartWrap">
<scEcharts height="400px" width="1074px" :option="optionDay"></scEcharts> <div class="chartTitle">小时生产参数统计图</div>
<scEcharts height="400px" width="1074px" :option="optionMonth"></scEcharts> <scEcharts height="400px" width="1033px" :option="optionHour"></scEcharts>
</div> </div>
<div class="chartWrap">
<div class="chartTitle">本月生产参数统计图</div>
<scEcharts height="400px" width="1033px" :option="optionDay"></scEcharts>
</div>
<div class="chartWrap">
<div class="chartTitle">本年生产参数统计图</div>
<scEcharts height="400px" width="1033px" :option="optionMonth"></scEcharts>
</div>
</div>
</div>
<sc-dialog v-model="chartShow" draggable title="回转窑工段"> <sc-dialog v-model="chartShow" draggable title="回转窑工段">
<div class="searchHead" v-if="type=='hours'"> <div class="searchHead" v-if="type=='hours'">
<el-date-picker <el-date-picker
@ -160,19 +172,19 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
triggerOn:"mousemove", triggerOn:"mousemove",
}; };
let grid={ let grid={
right: '10%', right: '9%',
left:'10%', left:'7%',
top:'15%' top:'15%'
}; };
let toolbox={ let toolbox={
right:'5%', right:'2%',
feature: { feature: {
dataView: { show: true, readOnly: false }, dataView: { show: true, readOnly: false },
saveAsImage: { show: true } saveAsImage: { show: true }
} }
}; };
let legend= { let legend= {
top:'5%', top:'2%',
data:['总产量', '台时产量', '运转率', '分布电耗','单位产品标煤耗', '成本'] data:['总产量', '台时产量', '运转率', '分布电耗','单位产品标煤耗', '成本']
}; };
let yAxis= [ let yAxis= [
@ -196,7 +208,7 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
name: '运转率 ', name: '运转率 ',
position: 'right', position: 'right',
alignTicks: true, alignTicks: true,
offset: 0, offset: 120,
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
@ -228,7 +240,6 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
name: '标煤耗', name: '标煤耗',
position: 'right', position: 'right',
alignTicks: true, alignTicks: true,
offset: 120,
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
@ -244,7 +255,7 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
name: '成本(元)', name: '成本(元)',
position: 'left', position: 'left',
alignTicks: true, alignTicks: true,
offset: 80, offset: 70,
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
@ -785,8 +796,8 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
} }
}; };
</script> </script>
<style> <style scoped>
.printContainer{ .printContainer{
width: 1075px; padding-left: 20px;
} }
</style> </style>

View File

@ -8,7 +8,7 @@
value-format="YYYY" value-format="YYYY"
format="YYYY" format="YYYY"
placeholder="查询年份" placeholder="查询年份"
style="margin-right: 6px;" class="headerSearch"
/> />
<el-button <el-button
type="primary" type="primary"
@ -29,11 +29,12 @@
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <el-card style="margin-top:5px">
<div class="printWrap">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" cellspacing="0" :key="timeStamp" id="myTable" class="myTable"> <table border="1" width="3200" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="45">回转窑工段班组月度对比分析</th> <th colspan="32">回转窑工段班组月度对比分析</th>
</tr> </tr>
<tr> <tr>
<th rowspan="2">月份</th> <th rowspan="2">月份</th>
@ -84,6 +85,7 @@
</tr> </tr>
</table> </table>
</div> </div>
</div>
</el-card> </el-card>
</div> </div>
</template> </template>
@ -250,7 +252,11 @@
}; };
</script> </script>
<style scoped> <style scoped>
.printContainer{ .printWrap{
width: 100%; width: 100%;
overflow-x: scroll;
}
.numCell{
width: 100px!important;
} }
</style> </style>

View File

@ -8,7 +8,7 @@
value-format="YYYY" value-format="YYYY"
format="YYYY" format="YYYY"
placeholder="查询年份" placeholder="查询年份"
style="margin-right: 6px;" class="headerSearch"
/> />
<el-button <el-button
type="primary" type="primary"
@ -42,8 +42,9 @@
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <el-card style="margin-top:5px">
<div class="printWrap">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" width="1000" cellspacing="0" :key="1" id="myTable" class="myTable" v-if="query.type==1"> <table border="1" width="1075" cellspacing="0" :key="1" id="myTable" class="myTable" v-if="query.type==1">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="8">车间单位产品电耗月度分析表</th> <th colspan="8">车间单位产品电耗月度分析表</th>
@ -73,7 +74,7 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table border="1" width="1000" cellspacing="0" :key="2" id="myTable1" class="myTable" v-else-if="query.type==2"> <table border="1" width="1075" cellspacing="0" :key="2" id="myTable1" class="myTable" v-else-if="query.type==2">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="9">车间单位产品综合电耗月度分析表</th> <th colspan="9">车间单位产品综合电耗月度分析表</th>
@ -105,7 +106,7 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table border="1" width="1000" cellspacing="0" :key="3" id="myTable1" class="myTable" v-else-if="query.type==3"> <table border="1" width="1075" cellspacing="0" :key="3" id="myTable1" class="myTable" v-else-if="query.type==3">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="9">车间单位产品标煤耗月度分析表</th> <th colspan="9">车间单位产品标煤耗月度分析表</th>
@ -137,7 +138,7 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table border="1" width="1000" cellspacing="0" :key="4" id="myTable1" class="myTable" v-else-if="query.type==4"> <table border="1" width="1075" cellspacing="0" :key="4" id="myTable1" class="myTable" v-else-if="query.type==4">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="9">车间单位产品综合能耗月度分析表</th> <th colspan="9">车间单位产品综合能耗月度分析表</th>
@ -170,6 +171,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
</el-card> </el-card>
</div> </div>
</template> </template>
@ -734,16 +736,10 @@
} }
}; };
</script> </script>
<style> <style scoped>
.printContainer{ .printWrap{
width: 1075px; width: 100%;
} overflow-x: scroll;
.redColor{
font-weight: bold;
color: #ff0000;
}
.greenColor{
font-weight: bold;
color: #008000;
} }
</style> </style>

View File

@ -4,11 +4,20 @@
<div class="left-panel"> <div class="left-panel">
<div style="margin-right: 20px">交接班日志</div> <div style="margin-right: 20px">交接班日志</div>
<el-date-picker <el-date-picker
v-model="query.time" v-model="query.start_time__gte"
type="date" type="date"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD" format="YYYY-MM-DD"
placeholder="日志时间" placeholder="开始时间"
style=" width: 120px"
/>
<el-date-picker
v-model="query.end_time__lt"
type="date"
value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD"
placeholder="结束时间"
style="margin-left: 2px; width: 120px"
/> />
<el-select <el-select
v-model="query.shift" v-model="query.shift"
@ -18,9 +27,9 @@
> >
<el-option <el-option
v-for="item in optionsShift" v-for="item in optionsShift"
:key="item.value" :key="item.id"
:label="item.label" :label="item.name"
:value="item.value" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
<el-select <el-select
@ -31,9 +40,9 @@
> >
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.id"
:label="item.label" :label="item.name"
:value="item.value" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
<el-button <el-button
@ -174,6 +183,10 @@
apiObj: this.$API.wpm.sflog.list, apiObj: this.$API.wpm.sflog.list,
apiObj2: null, apiObj2: null,
query: { query: {
shift:'',
team:'',
end_time__lt:'',
start_time__gte:'',
mgroup:'3347217651339837440', mgroup:'3347217651339837440',
}, },
deptId:'3347207316583170048', deptId:'3347207316583170048',
@ -197,8 +210,27 @@
limitedExport:false, limitedExport:false,
}; };
}, },
mounted(){
this.getTeam();
this.getShfit();
},
methods: { methods: {
getTeam(){
let form ={};
form.page = 0;
form.belong_dept = this.deptId;
this.$API.mtm.team.list.req(form).then(res=>{
this.options = res;
})
},
getShfit(){
this.$API.mtm.shift.req({page:0}).then(res=>{
this.optionsShift = res;
})
},
handleQuery(){
this.$refs.table.queryData(this.query);
},
sflog_export(){ sflog_export(){
this.limitedExport = true; this.limitedExport = true;
}, },
@ -291,9 +323,6 @@
</script> </script>
<style scoped> <style scoped>
.printContainer{
width: 1075px;
}
#numTable{ #numTable{
margin-left: 37px; margin-left: 37px;
} }

View File

@ -16,11 +16,12 @@
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <el-card style="margin-top:5px">
<div class="printWrap">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable"> <table border="1" width="1035" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="7">水泥磨工段主要设备100KW以上单位产品电耗数据表</th> <th colspan="6">水泥磨工段主要设备100KW以上单位产品电耗数据表</th>
</tr> </tr>
<tr> <tr>
<th>设备名称</th> <th>设备名称</th>
@ -42,10 +43,21 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<scEcharts height="400px" width="1074px" :option="optionHour"></scEcharts> <div class="chartWrap">
<scEcharts height="400px" width="1074px" :option="optionDay"></scEcharts> <div class="chartTitle">小时生产参数统计图</div>
<scEcharts height="400px" width="1074px" :option="optionMonth"></scEcharts> <scEcharts height="400px" width="1033px" :option="optionHour"></scEcharts>
</div> </div>
<div class="chartWrap">
<div class="chartTitle">本月生产参数统计图</div>
<scEcharts height="400px" width="1033px" :option="optionDay"></scEcharts>
</div>
<div class="chartWrap">
<div class="chartTitle">本年生产参数统计图</div>
<scEcharts height="400px" width="1033px" :option="optionMonth"></scEcharts>
</div>
</div>
</div>
<sc-dialog v-model="chartShow" draggable title="创建/编辑人员证书"> <sc-dialog v-model="chartShow" draggable title="创建/编辑人员证书">
<div class="searchHead" v-if="type=='hours'"> <div class="searchHead" v-if="type=='hours'">
<el-date-picker <el-date-picker
@ -132,26 +144,25 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
triggerOn:"mousemove", triggerOn:"mousemove",
}; };
let grid={ let grid={
right: '15%', right: '3%',
left:'10%', left:'7%',
top:'15%' top:'15%'
}; };
let toolbox={ let toolbox={
right:'5%', right:'2%',
feature: { feature: {
dataView: { show: true, readOnly: false }, dataView: { show: true, readOnly: false },
saveAsImage: { show: true } saveAsImage: { show: true }
} }
}; };
let legend= { let legend= {
top:'15%', top:'2%',
right:'0', x:'center',
orient:'vertical',
data:['循环风机1906', '系统风机', '水平涡流选粉机', '水泥磨主电机', '辊压机动辊电机','辊压机定辊电机','新增磨尾风机'] data:['循环风机1906', '系统风机', '水平涡流选粉机', '水泥磨主电机', '辊压机动辊电机','辊压机定辊电机','新增磨尾风机']
}; };
let yAxis= { let yAxis= {
type: 'value', type: 'value',
name: '单位产品分布电耗(KW.h/t)', name: '分布电耗(KW.h/t)',
alignTicks: true, alignTicks: true,
axisLine: { axisLine: {
show: true, show: true,
@ -662,8 +673,8 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
} }
}; };
</script> </script>
<style> <style scoped>
.printContainer{ .printContainer{
width: 1075px; padding-left: 20px;
} }
</style> </style>

View File

@ -16,8 +16,9 @@
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <el-card style="margin-top:5px">
<div class="printWrap">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable"> <table border="1" width="1035" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="10">水泥磨工段生产报告</th> <th colspan="10">水泥磨工段生产报告</th>
@ -50,10 +51,21 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<scEcharts height="400px" width="1074px" :option="optionHour"></scEcharts> <div class="chartWrap">
<scEcharts height="400px" width="1074px" :option="optionDay"></scEcharts> <div class="chartTitle">小时生产参数统计图</div>
<scEcharts height="400px" width="1074px" :option="optionMonth"></scEcharts> <scEcharts height="400px" width="1033px" :option="optionHour"></scEcharts>
</div> </div>
<div class="chartWrap">
<div class="chartTitle">本月生产参数统计图</div>
<scEcharts height="400px" width="1033px" :option="optionDay"></scEcharts>
</div>
<div class="chartWrap">
<div class="chartTitle">本年生产参数统计图</div>
<scEcharts height="400px" width="1033px" :option="optionMonth"></scEcharts>
</div>
</div>
</div>
<sc-dialog v-model="chartShow" draggable title="水泥磨工段"> <sc-dialog v-model="chartShow" draggable title="水泥磨工段">
<div class="searchHead" v-if="type=='hours'"> <div class="searchHead" v-if="type=='hours'">
<el-date-picker <el-date-picker
@ -159,19 +171,19 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
triggerOn:"mousemove", triggerOn:"mousemove",
}; };
let grid={ let grid={
right: '10%', right: '8%',
left:'10%', left:'7%',
top:'15%' top:'15%'
}; };
let toolbox={ let toolbox={
right:'5%', right:'2%',
feature: { feature: {
dataView: { show: true, readOnly: false }, dataView: { show: true, readOnly: false },
saveAsImage: { show: true } saveAsImage: { show: true }
} }
}; };
let legend= { let legend= {
top:'5%', top:'2%',
data:['总产量', '台时产量', '运转率', '分布电耗', '成本'] data:['总产量', '台时产量', '运转率', '分布电耗', '成本']
}; };
let yAxis= [{ let yAxis= [{
@ -194,7 +206,7 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
name: '运转率 (%)', name: '运转率 (%)',
position: 'right', position: 'right',
alignTicks: true, alignTicks: true,
offset: 0, offset: 80,
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
@ -210,7 +222,6 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
name: '分布电耗(KW.h)', name: '分布电耗(KW.h)',
position: 'right', position: 'right',
alignTicks: true, alignTicks: true,
offset: 80,
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
@ -226,7 +237,7 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
name: '成本(元)', name: '成本(元)',
position: 'left', position: 'left',
alignTicks: true, alignTicks: true,
offset: 80, offset: 70,
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
@ -724,8 +735,8 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
} }
}; };
</script> </script>
<style> <style scoped>
.printContainer{ .printContainer{
width: 1075px; padding-left: 20px;
} }
</style> </style>

View File

@ -8,7 +8,7 @@
value-format="YYYY" value-format="YYYY"
format="YYYY" format="YYYY"
placeholder="查询年份" placeholder="查询年份"
style="margin-right: 6px;" class="headerSearch"
/> />
<el-button <el-button
type="primary" type="primary"
@ -29,11 +29,12 @@
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <el-card style="margin-top:5px">
<div class="printWrap">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" cellspacing="0" :key="timeStamp" id="myTable" class="myTable"> <table border="1" width="1900" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="20">水泥磨工段班组月度对比分析</th> <th colspan="19">水泥磨工段班组月度对比分析</th>
</tr> </tr>
<tr> <tr>
<th rowspan="2">月份</th> <th rowspan="2">月份</th>
@ -42,7 +43,7 @@
<th>运转率</th> <th>运转率</th>
<th>成本</th> <th>成本</th>
<th colspan="3">质量</th> <th colspan="3">质量</th>
<th colspan="10">单位产品电耗</th> <th colspan="9">单位产品电耗</th>
<th rowspan="2">得分</th> <th rowspan="2">得分</th>
</tr> </tr>
<tr> <tr>
@ -69,6 +70,7 @@
</tr> </tr>
</table> </table>
</div> </div>
</div>
</el-card> </el-card>
</div> </div>
</template> </template>
@ -211,8 +213,9 @@
} }
}; };
</script> </script>
<style> <style scoped>
.printContainer{ .printWrap{
width: 1075px; width: 100%;
overflow-x: scroll;
} }
</style> </style>

View File

@ -8,7 +8,7 @@
value-format="YYYY" value-format="YYYY"
format="YYYY" format="YYYY"
placeholder="查询年份" placeholder="查询年份"
style="margin-right: 6px;" class="headerSearch"
/> />
<el-select <el-select
v-model="query.type" v-model="query.type"
@ -42,8 +42,9 @@
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <el-card style="margin-top:5px">
<div class="printWrap">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" width="1000" cellspacing="0" :key="0" id="myTable" class="myTable" v-if="query.type==1"> <table border="1" width="1075" cellspacing="0" :key="0" id="myTable" class="myTable" v-if="query.type==1">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="9">水泥磨工段车间单位产品电耗月度分析表</th> <th colspan="9">水泥磨工段车间单位产品电耗月度分析表</th>
@ -75,7 +76,7 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table border="1" width="1000" cellspacing="0" :key="1" id="myTable1" class="myTable" v-else> <table border="1" width="1075" cellspacing="0" :key="1" id="myTable1" class="myTable" v-else>
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="9">水泥磨工段车间单位产品综合能耗月度分析表</th> <th colspan="9">水泥磨工段车间单位产品综合能耗月度分析表</th>
@ -108,6 +109,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
</el-card> </el-card>
</div> </div>
</template> </template>
@ -370,16 +372,5 @@
} }
}; };
</script> </script>
<style> <style scoped>
.printContainer{
width: 1075px;
}
.redColor{
font-weight: bold;
color: #ff0000;
}
.greenColor{
font-weight: bold;
color: #008000;
}
</style> </style>

View File

@ -4,11 +4,20 @@
<div class="left-panel"> <div class="left-panel">
<div style="margin-right: 20px">交接班日志</div> <div style="margin-right: 20px">交接班日志</div>
<el-date-picker <el-date-picker
v-model="query.time" v-model="query.start_time__gte"
type="date" type="date"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD" format="YYYY-MM-DD"
placeholder="日志时间" placeholder="开始时间"
style=" width: 120px"
/>
<el-date-picker
v-model="query.end_time__lt"
type="date"
value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD"
placeholder="结束时间"
style="margin-left: 2px; width: 120px"
/> />
<el-select <el-select
v-model="query.shift" v-model="query.shift"
@ -18,9 +27,9 @@
> >
<el-option <el-option
v-for="item in optionsShift" v-for="item in optionsShift"
:key="item.value" :key="item.id"
:label="item.label" :label="item.name"
:value="item.value" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
<el-select <el-select
@ -31,9 +40,9 @@
> >
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.id"
:label="item.label" :label="item.name"
:value="item.value" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
<el-button <el-button
@ -171,8 +180,27 @@ import saveDialog from "./../enm_rm/handover_form.vue";
limitedExport:false, limitedExport:false,
}; };
}, },
mounted(){
this.getTeam();
this.getShfit();
},
methods: { methods: {
getTeam(){
let form ={};
form.page = 0;
form.belong_dept = this.deptId;
this.$API.mtm.team.list.req(form).then(res=>{
this.options = res;
})
},
getShfit(){
this.$API.mtm.shift.req({page:0}).then(res=>{
this.optionsShift = res;
})
},
handleQuery(){
this.$refs.table.queryData(this.query);
},
sflog_export(){ sflog_export(){
this.limitedExport = true; this.limitedExport = true;
}, },
@ -248,9 +276,6 @@ import saveDialog from "./../enm_rm/handover_form.vue";
</script> </script>
<style scoped> <style scoped>
.printContainer{
width: 1075px;
}
#numTable{ #numTable{
margin-left: 37px; margin-left: 37px;
} }

View File

@ -16,15 +16,15 @@
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <el-card style="margin-top:5px">
<div class="printWrap">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable"> <table border="1" width="1035" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="10">水泥包装工段生产报告</th> <th colspan="9">水泥包装工段生产报告</th>
</tr> </tr>
<tr> <tr>
<th colspan="2">参数</th> <th colspan="2">参数</th>
<th>上个小时</th>
<th>昨日</th> <th>昨日</th>
<th>本月</th> <th>本月</th>
<th>本年</th> <th>本年</th>
@ -41,17 +41,24 @@
<td class="numCell hoursItem" @click="itemClick('hours',item)">{{item[2]}}</td> <td class="numCell hoursItem" @click="itemClick('hours',item)">{{item[2]}}</td>
<td class="numCell daysItem" @click="itemClick('days',item)">{{item[3]}}</td> <td class="numCell daysItem" @click="itemClick('days',item)">{{item[3]}}</td>
<td class="numCell monthItem" @click="itemClick('month',item)">{{item[4]}}</td> <td class="numCell monthItem" @click="itemClick('month',item)">{{item[4]}}</td>
<td class="numCell yearItem" @click="itemClick('year',item)">{{item[5]}}</td> <td class="numCell">{{item[5]}}</td>
<td class="numCell">{{item[6]}}</td> <td class="numCell">{{item[6]}}</td>
<td class="numCell">{{item[7]}}</td> <td class="numCell">{{item[7]}}</td>
<td class="numCell">{{item[8]}}</td> <td class="numCell">{{item[8]}}</td>
<td class="numCell">{{item[9]}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<scEcharts height="400px" width="1074px" :option="optionDay"></scEcharts> <div class="chartWrap">
<scEcharts height="400px" width="1074px" :option="optionMonth"></scEcharts> <div class="chartTitle">本月生产参数统计图</div>
<scEcharts height="400px" width="1033px" :option="optionDay"></scEcharts>
</div> </div>
<div class="chartWrap">
<div class="chartTitle">本年生产参数统计图</div>
<scEcharts height="400px" width="1033px" :option="optionMonth"></scEcharts>
</div>
</div>
</div>
<sc-dialog v-model="chartShow" draggable title="水泥磨工段"> <sc-dialog v-model="chartShow" draggable title="水泥磨工段">
<div class="searchHead" v-if="type=='hours'"> <div class="searchHead" v-if="type=='hours'">
<el-date-picker <el-date-picker
@ -157,19 +164,19 @@
triggerOn:"mousemove", triggerOn:"mousemove",
}; };
let grid={ let grid={
right: '10%', right: '4%',
left:'10%', left:'4%',
top:'15%' top:'15%'
}; };
let toolbox={ let toolbox={
right:'5%', right:'2%',
feature: { feature: {
dataView: { show: true, readOnly: false }, dataView: { show: true, readOnly: false },
saveAsImage: { show: true } saveAsImage: { show: true }
} }
}; };
let legend= { let legend= {
top:'5%', top:'2%',
data:['总产量','分布电耗'] data:['总产量','分布电耗']
}; };
let yAxis= [{ let yAxis= [{
@ -281,7 +288,7 @@
length: 5, length: 5,
inside: true, inside: true,
}, },
data: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'] data: []
}, },
yAxis: yAxis, yAxis: yAxis,
series:[ series:[
@ -327,13 +334,6 @@
month_d = lastDate.getMonth()+1; month_d = lastDate.getMonth()+1;
days_d = lastDate.getDate(); days_d = lastDate.getDate();
} }
//
let hourTime = timeDate - 3600000;
let hourDate = new Date(hourTime);
let year_h = hourDate.getFullYear();
let month_h = hourDate.getMonth()+1;
let days_h = hourDate.getDate();
let hours_h = hourDate.getHours();
// //
let params1 = {}; let params1 = {};
params1.page = 0; params1.page = 0;
@ -343,8 +343,8 @@
this.$API.enm.enstat.req(params1).then((res1) => { this.$API.enm.enstat.req(params1).then((res1) => {
if(res1.length>0){ if(res1.length>0){
let data1 = res1[0]; let data1 = res1[0];
that.tableDatas[0][5]=data1.total_production; that.tableDatas[0][4]=data1.total_production;
that.tableDatas[1][5]=data1.elec_consume_unit; that.tableDatas[1][4]=data1.elec_consume_unit;
} }
}) })
// //
@ -357,8 +357,8 @@
this.$API.enm.enstat.req(params2).then((res2) => { this.$API.enm.enstat.req(params2).then((res2) => {
if(res2.length>0){ if(res2.length>0){
let data2 = res2[0]; let data2 = res2[0];
that.tableDatas[0][4]=data2.total_production; that.tableDatas[0][3]=data2.total_production;
that.tableDatas[1][4]=data2.elec_consume_unit; that.tableDatas[1][3]=data2.elec_consume_unit;
} }
}) })
// //
@ -372,24 +372,8 @@
this.$API.enm.enstat.req(params3).then((res3) => { this.$API.enm.enstat.req(params3).then((res3) => {
if(res3.length>0){ if(res3.length>0){
let data3 = res3[0]; let data3 = res3[0];
that.tableDatas[0][3]=data3.total_production; that.tableDatas[0][2]=data3.total_production;
that.tableDatas[1][3]=data3.elec_consume_unit; that.tableDatas[1][2]=data3.elec_consume_unit;
}
})
//
let params4 = {};
params4.page = 0;
params4.year = year_h;
params4.month = month_h;
params4.day = days_h;
params4.hour = hours_h;
params4.type = 'hour_st';
params4.mgroup = this.query.mgroup;
this.$API.enm.enstat.req(params4).then((res4) => {
if(res4.length>0){
let data4 = res4[0];
that.tableDatas[0][2]=data4.total_production;
that.tableDatas[1][2]=data4.elec_consume_unit;
} }
}) })
// //
@ -398,19 +382,15 @@
params5.mgroup='3346520558031773696'; params5.mgroup='3346520558031773696';
this.$API.mtm.goal.list.req(params5).then((res5) => { this.$API.mtm.goal.list.req(params5).then((res5) => {
if(res5.length>0){ if(res5.length>0){
let data5 = res5; let data5 = res5;
data5.forEach(item5=>{ data5.forEach(item5=>{
let str = 'goal_val_'+that.month; let str = 'goal_val_'+that.month;
debugger;
console.log(str,item5[str])
if(item5.goal_cate_name=='总产量t'){ if(item5.goal_cate_name=='总产量t'){
that.tableDatas[0][6]=item5[str]; that.tableDatas[0][5]=item5[str];
that.tableDatas[0][8]=item5.goal_val; that.tableDatas[0][7]=item5.goal_val;
}else if(item5.goal_cate_name=='单位产品分布电耗KW·h/t'){ }else if(item5.goal_cate_name=='单位产品分布电耗KW·h/t'){
that.tableDatas[1][6]=item5[str]; that.tableDatas[1][5]=item5[str];
that.tableDatas[1][8]=item5.goal_val; that.tableDatas[1][7]=item5.goal_val;
} }
}) })
} }
@ -424,10 +404,10 @@
this.$API.enm.enstat.req(params1).then((res1) => { this.$API.enm.enstat.req(params1).then((res1) => {
if(res1.length>0){ if(res1.length>0){
let data1 = res1[0]; let data1 = res1[0];
that.tableDatas[0][5]=data1.total_production; that.tableDatas[0][4]=data1.total_production;
that.tableDatas[0][9]=precen(that.tableDatas[0][5],that.tableDatas[0][8]) that.tableDatas[0][8]=precen(that.tableDatas[0][4],that.tableDatas[0][7])
that.tableDatas[1][5]=data1.elec_consume_unit; that.tableDatas[1][4]=data1.elec_consume_unit;
that.tableDatas[1][9]=precen(that.tableDatas[1][5],that.tableDatas[1][8]) that.tableDatas[1][8]=precen(that.tableDatas[1][4],that.tableDatas[1][7])
} }
}) })
@ -441,10 +421,10 @@
this.$API.enm.enstat.req(params2).then((res2) => { this.$API.enm.enstat.req(params2).then((res2) => {
if(res2.length>0){ if(res2.length>0){
let data2 = res2[0]; let data2 = res2[0];
that.tableDatas[0][4]=data2.total_production; that.tableDatas[0][3]=data2.total_production;
that.tableDatas[0][7]=precen(that.tableDatas[0][4],that.tableDatas[0][6]) that.tableDatas[0][6]=precen(that.tableDatas[0][3],that.tableDatas[0][5])
that.tableDatas[1][4]=data2.elec_consume_unit; that.tableDatas[1][3]=data2.elec_consume_unit;
that.tableDatas[1][7]=precen(that.tableDatas[1][4],that.tableDatas[1][6]) that.tableDatas[1][6]=precen(that.tableDatas[1][3],that.tableDatas[1][5])
} }
}) })
}) })
@ -520,8 +500,6 @@
.req('3322567213885833216') .req('3322567213885833216')
.then((res) => { .then((res) => {
this.myOption = JSON.parse(res.echart_options); this.myOption = JSON.parse(res.echart_options);
debugger;
console.log(this.myOption)
this.chartShow = true; this.chartShow = true;
}); });
}, },
@ -536,9 +514,8 @@
} }
}; };
</script> </script>
<style> <style scoped>
.printContainer{ .printContainer{
width: 1075px; padding-left: 20px;
} }
</style> </style>

View File

@ -8,7 +8,7 @@
value-format="YYYY" value-format="YYYY"
format="YYYY" format="YYYY"
placeholder="查询年份" placeholder="查询年份"
style="margin-right: 6px;" class="headerSearch"
/> />
<el-button <el-button
type="primary" type="primary"
@ -28,7 +28,7 @@
</el-button> </el-button>
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <div class="printWrap"><el-card style="margin-top:5px">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" cellspacing="0" :key="timeStamp" id="myTable" class="myTable"> <table border="1" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
<thead class="myTableHead"> <thead class="myTableHead">
@ -59,6 +59,7 @@
</div> </div>
</el-card> </el-card>
</div> </div>
</div>
</template> </template>
<script> <script>
export default { export default {
@ -186,8 +187,9 @@
} }
}; };
</script> </script>
<style> <style scoped>
.printContainer{ .printWrap{
width: 1075px; width: 100%;
overflow-x: scroll;
} }
</style> </style>

View File

@ -8,7 +8,7 @@
value-format="YYYY" value-format="YYYY"
format="YYYY" format="YYYY"
placeholder="查询年份" placeholder="查询年份"
style="margin-right: 6px;" class="headerSearch"
/> />
<el-button <el-button
type="primary" type="primary"
@ -29,8 +29,9 @@
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <el-card style="margin-top:5px">
<div class="printWrap">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable"> <table border="1" width="1075" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="8">水泥包装工段车间单位产品电耗月度分析表</th> <th colspan="8">水泥包装工段车间单位产品电耗月度分析表</th>
@ -61,6 +62,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
</el-card> </el-card>
</div> </div>
</template> </template>
@ -264,16 +266,5 @@
} }
}; };
</script> </script>
<style> <style scoped>
.printContainer{
width: 1075px;
}
.redColor{
font-weight: bold;
color: #ff0000;
}
.greenColor{
font-weight: bold;
color: #008000;
}
</style> </style>

View File

@ -4,11 +4,20 @@
<div class="left-panel"> <div class="left-panel">
<div style="margin-right: 20px">交接班日志</div> <div style="margin-right: 20px">交接班日志</div>
<el-date-picker <el-date-picker
v-model="query.time" v-model="query.start_time__gte"
type="date" type="date"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD" format="YYYY-MM-DD"
placeholder="日志时间" placeholder="开始时间"
style=" width: 120px"
/>
<el-date-picker
v-model="query.end_time__lt"
type="date"
value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD"
placeholder="结束时间"
style="margin-left: 2px; width: 120px"
/> />
<el-select <el-select
v-model="query.shift" v-model="query.shift"
@ -18,9 +27,9 @@
> >
<el-option <el-option
v-for="item in optionsShift" v-for="item in optionsShift"
:key="item.value" :key="item.id"
:label="item.label" :label="item.name"
:value="item.value" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
<el-select <el-select
@ -31,9 +40,9 @@
> >
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.id"
:label="item.label" :label="item.name"
:value="item.value" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
<el-button <el-button
@ -218,8 +227,25 @@ import otherDialog from "./other_form.vue";
}, },
mounted(){ mounted(){
this.getTeam(); this.getTeam();
this.getShfit();
}, },
methods: { methods: {
getTeam(){
let form ={};
form.page = 0;
form.belong_dept = this.deptId;
this.$API.mtm.team.list.req(form).then(res=>{
this.options = res;
})
},
getShfit(){
this.$API.mtm.shift.req({page:0}).then(res=>{
this.optionsShift = res;
})
},
handleQuery(){
this.$refs.table.queryData(this.query);
},
sflog_export(){ sflog_export(){
this.limitedExport = true; this.limitedExport = true;
}, },
@ -244,14 +270,7 @@ import otherDialog from "./other_form.vue";
this.$refs.saveDialog.open("edit").setData(row); this.$refs.saveDialog.open("edit").setData(row);
}); });
}, },
getTeam(){
let form ={};
form.page = 0;
form.belong_dept = this.deptId;
this.$API.mtm.team.list.req(form).then(res=>{
this.teamOptions = res;
})
},
// //
sflog_check(row){ sflog_check(row){
this.dialog.check = true; this.dialog.check = true;
@ -329,9 +348,6 @@ import otherDialog from "./other_form.vue";
</script> </script>
<style scoped> <style scoped>
.printContainer{
width: 1075px;
}
#numTable{ #numTable{
margin-left: 37px; margin-left: 37px;
} }

View File

@ -217,9 +217,6 @@ import otherDialog from "./other_form.vue";
</script> </script>
<style scoped> <style scoped>
.printContainer{
width: 1075px;
}
#numTable{ #numTable{
margin-left: 37px; margin-left: 37px;
} }

View File

@ -16,11 +16,12 @@
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <el-card style="margin-top:5px">
<div class="printWrap">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable"> <table border="1" width="1035" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="7">原料磨工段主要设备100KW以上单位产品电耗数据表</th> <th colspan="6">原料磨工段主要设备100KW以上单位产品电耗数据表</th>
</tr> </tr>
<tr> <tr>
<th>设备名称</th> <th>设备名称</th>
@ -42,10 +43,21 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<scEcharts height="400px" width="1074px" :option="optionHour"></scEcharts> <div class="chartWrap">
<scEcharts height="400px" width="1074px" :option="optionDay"></scEcharts> <div class="chartTitle">小时生产参数统计图</div>
<scEcharts height="400px" width="1074px" :option="optionMonth"></scEcharts> <scEcharts height="400px" width="1033px" :option="optionHour"></scEcharts>
</div> </div>
<div class="chartWrap">
<div class="chartTitle">本月生产参数统计图</div>
<scEcharts height="400px" width="1033px" :option="optionDay"></scEcharts>
</div>
<div class="chartWrap">
<div class="chartTitle">本年生产参数统计图</div>
<scEcharts height="400px" width="1033px" :option="optionMonth"></scEcharts>
</div>
</div>
</div>
<sc-dialog v-model="chartShow" draggable> <sc-dialog v-model="chartShow" draggable>
<div class="searchHead" v-if="type=='hours'"> <div class="searchHead" v-if="type=='hours'">
<el-date-picker <el-date-picker
@ -132,9 +144,9 @@
triggerOn:"mousemove", triggerOn:"mousemove",
}; };
let grid={ let grid={
right: '10%', right: '3%',
left:'10%', left:'7%',
top:'20%' top:'15%'
}; };
let toolbox={ let toolbox={
right:'5%', right:'5%',
@ -144,12 +156,12 @@
} }
}; };
let legend= { let legend= {
top:'8%', top:'2%',
data:['立磨主电机', '循环风机', '烘干破主', '废气风机', '尾排风机'] data:['立磨主电机', '循环风机', '烘干破主', '废气风机', '尾排风机']
}; };
let yAxis= { let yAxis= {
type: 'value', type: 'value',
name: '单位产品分布电耗(KW.h/t)', name: '分布电耗(KW.h/t)',
alignTicks: true, alignTicks: true,
axisLine: { axisLine: {
show: true, show: true,
@ -202,10 +214,6 @@
allValDays:0, allValDays:0,
allValMonth:0, allValMonth:0,
option1:{ option1:{
title: {
text: '小时生产参数统计图',
x: 'center'
},
color: colors, color: colors,
tooltip:tooltip, tooltip:tooltip,
grid: grid, grid: grid,
@ -249,10 +257,6 @@
] ]
}, },
option2:{ option2:{
title: {
text: '本月生产参数统计图',
x: 'center'
},
color: colors, color: colors,
tooltip:tooltip, tooltip:tooltip,
grid: grid, grid: grid,
@ -296,10 +300,6 @@
] ]
}, },
option3:{ option3:{
title: {
text: '本年生产参数统计图',
x: 'center'
},
color: colors, color: colors,
tooltip:tooltip, tooltip:tooltip,
grid: grid, grid: grid,
@ -612,8 +612,8 @@
} }
}; };
</script> </script>
<style> <style scoped>
.printContainer{ .printContainer{
width: 1075px; padding-left: 20px;
} }
</style> </style>

View File

@ -16,8 +16,9 @@
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <el-card style="margin-top:5px">
<div class="printWrap">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable"> <table border="1" width="1035" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="10">原料磨工段生产报告</th> <th colspan="10">原料磨工段生产报告</th>
@ -50,10 +51,20 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div id="main" style="width:1200px;height:600px;"></div> <!-- <div id="main" style="width:1200px;height:600px;"></div> -->
<scEcharts height="400px" width="1074px" :option="optionHour"></scEcharts> <div class="chartWrap">
<scEcharts height="400px" width="1074px" :option="optionDay"></scEcharts> <div class="chartTitle">小时生产参数统计图</div>
<scEcharts height="400px" width="1074px" :option="optionMonth"></scEcharts> <scEcharts height="400px" width="1033px" :option="optionHour"></scEcharts>
</div>
<div class="chartWrap">
<div class="chartTitle">本月生产参数统计图</div>
<scEcharts height="400px" width="1033px" :option="optionDay"></scEcharts>
</div>
<div class="chartWrap">
<div class="chartTitle">本年生产参数统计图</div>
<scEcharts height="400px" width="1033px" :option="optionMonth"></scEcharts>
</div>
</div>
</div> </div>
<sc-dialog v-model="chartShow" draggable title="原料磨工段"> <sc-dialog v-model="chartShow" draggable title="原料磨工段">
@ -163,20 +174,19 @@
// alwaysShowContent:true, // alwaysShowContent:true,
}; };
let grid={ let grid={
right: '10%', right: '7%',
left:'10%', left:'7%',
top:'15%' top:'15%'
}; };
let toolbox={ let toolbox={
right:'5%', right:'2%',
feature: { feature: {
dataView: { show: true, readOnly: false }, dataView: { show: true, readOnly: false },
// restore: { show: true },
saveAsImage: { show: true } saveAsImage: { show: true }
} }
}; };
let legend= { let legend= {
top:'5%', top:'2%',
data:['总产量', '台时产量', '运转率', '分布电耗', '成本'] data:['总产量', '台时产量', '运转率', '分布电耗', '成本']
}; };
let yAxis= [{ let yAxis= [{
@ -199,7 +209,7 @@
name: '运转率 (%)', name: '运转率 (%)',
position: 'right', position: 'right',
alignTicks: true, alignTicks: true,
offset: 0, offset: 80,
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
@ -215,7 +225,6 @@
name: '分布电耗(KW.h)', name: '分布电耗(KW.h)',
position: 'right', position: 'right',
alignTicks: true, alignTicks: true,
offset: 80,
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
@ -231,7 +240,7 @@
name: '成本(元)', name: '成本(元)',
position: 'left', position: 'left',
alignTicks: true, alignTicks: true,
offset: 80, offset: 70,
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
@ -968,8 +977,8 @@
} }
}; };
</script> </script>
<style> <style scoped>
.printContainer{ .printContainer{
width: 1075px; padding-left: 20px;
} }
</style> </style>

View File

@ -8,7 +8,7 @@
value-format="YYYY" value-format="YYYY"
format="YYYY" format="YYYY"
placeholder="查询年份" placeholder="查询年份"
style="margin-right: 6px;" class="headerSearch"
/> />
<el-button <el-button
type="primary" type="primary"
@ -29,8 +29,9 @@
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <el-card style="margin-top:5px">
<div class="printWrap">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" cellspacing="0" :key="timeStamp" id="myTable" class="myTable"> <table border="1" width="2400" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="24">原料磨工段班组月度对比分析</th> <th colspan="24">原料磨工段班组月度对比分析</th>
@ -75,6 +76,7 @@
</tr> </tr>
</table> </table>
</div> </div>
</div>
</el-card> </el-card>
</div> </div>
</template> </template>
@ -224,7 +226,8 @@
}; };
</script> </script>
<style scoped> <style scoped>
.printContainer{ .printWrap{
width: 100%; width: 100%;
overflow-x: scroll;
} }
</style> </style>

View File

@ -8,7 +8,7 @@
value-format="YYYY" value-format="YYYY"
format="YYYY" format="YYYY"
placeholder="查询年份" placeholder="查询年份"
style="margin-right: 6px;" class="headerSearch"
/> />
<el-button <el-button
type="primary" type="primary"
@ -29,11 +29,12 @@
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <el-card style="margin-top:5px">
<div class="printWrap">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable"> <table border="1" width="1075" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="10">原料磨工段车间单位产品电耗月度分析表</th> <th colspan="8">原料磨工段车间单位产品电耗月度分析表</th>
</tr> </tr>
<tr> <tr>
<th>月份</th> <th>月份</th>
@ -61,6 +62,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
</el-card> </el-card>
</div> </div>
</template> </template>
@ -264,16 +266,9 @@
} }
}; };
</script> </script>
<style> <style scoped>
.printContainer{ .printWrap{
width: 1075px; width: 100%;
} overflow-x: scroll;
.redColor{
font-weight: bold;
color: #ff0000;
}
.greenColor{
font-weight: bold;
color: #008000;
} }
</style> </style>

View File

@ -4,11 +4,20 @@
<div class="left-panel"> <div class="left-panel">
<div style="margin-right: 20px">交接班日志</div> <div style="margin-right: 20px">交接班日志</div>
<el-date-picker <el-date-picker
v-model="query.time" v-model="query.start_time__gte"
type="date" type="date"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD" format="YYYY-MM-DD"
placeholder="日志时间" placeholder="开始时间"
style=" width: 120px"
/>
<el-date-picker
v-model="query.end_time__lt"
type="date"
value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD"
placeholder="结束时间"
style="margin-left: 2px; width: 120px"
/> />
<el-select <el-select
v-model="query.shift" v-model="query.shift"
@ -18,9 +27,9 @@
> >
<el-option <el-option
v-for="item in optionsShift" v-for="item in optionsShift"
:key="item.value" :key="item.id"
:label="item.label" :label="item.name"
:value="item.value" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
<el-select <el-select
@ -31,9 +40,9 @@
> >
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.id"
:label="item.label" :label="item.name"
:value="item.value" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
<el-button <el-button
@ -173,8 +182,27 @@
limitedExport:false, limitedExport:false,
}; };
}, },
mounted(){
this.getTeam();
this.getShfit();
},
methods: { methods: {
getTeam(){
let form ={};
form.page = 0;
form.belong_dept = this.deptId;
this.$API.mtm.team.list.req(form).then(res=>{
this.options = res;
})
},
getShfit(){
this.$API.mtm.shift.req({page:0}).then(res=>{
this.optionsShift = res;
})
},
handleQuery(){
this.$refs.table.queryData(this.query);
},
sflog_export(){ sflog_export(){
this.limitedExport = true; this.limitedExport = true;
}, },
@ -249,9 +277,6 @@
</script> </script>
<style scoped> <style scoped>
.printContainer{
width: 1075px;
}
#numTable{ #numTable{
margin-left: 37px; margin-left: 37px;
} }

View File

@ -16,11 +16,12 @@
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <el-card style="margin-top:5px">
<div class="printWrap">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" width="1000" cellspacing="0" :key="timeStamp" class="myTable" id="myTable"> <table border="1" width="1035" cellspacing="0" :key="timeStamp" class="myTable" id="myTable">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="7">电石渣工段主要设备100KW以上单位产品电耗数据表</th> <th colspan="6">电石渣工段主要设备100KW以上单位产品电耗数据表</th>
</tr> </tr>
<tr> <tr>
<th>设备名称</th> <th>设备名称</th>
@ -42,9 +43,17 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<scEcharts height="400px" width="1074px" :option="optionDay"></scEcharts> <div class="chartWrap">
<scEcharts height="400px" width="1074px" :option="optionMonth"></scEcharts> <div class="chartTitle">本月生产参数统计图</div>
<scEcharts height="400px" width="1033px" :option="optionDay"></scEcharts>
</div> </div>
<div class="chartWrap">
<div class="chartTitle">本年生产参数统计图</div>
<scEcharts height="400px" width="1033px" :option="optionMonth"></scEcharts>
</div>
</div>
</div>
<sc-dialog v-model="chartShow" draggable title="创建/编辑人员证书"> <sc-dialog v-model="chartShow" draggable title="创建/编辑人员证书">
<div class="searchHead" v-if="type=='hours'"> <div class="searchHead" v-if="type=='hours'">
<el-date-picker <el-date-picker
@ -131,8 +140,8 @@
triggerOn:"mousemove", triggerOn:"mousemove",
}; };
let grid={ let grid={
right: '10%', right: '3%',
left:'10%', left:'7%',
top:'15%' top:'15%'
}; };
let toolbox={ let toolbox={
@ -143,12 +152,12 @@
} }
}; };
let legend= { let legend= {
top:'5%', top:'2%',
data:['烘干破主电机'] data:['烘干破主电机']
}; };
let yAxis= { let yAxis= {
type: 'value', type: 'value',
name: '单位产品分布电耗(KW.h/t)', name: '分布电耗(KW.h/t)',
alignTicks: true, alignTicks: true,
axisLine: { axisLine: {
show: true, show: true,
@ -431,8 +440,8 @@
} }
}; };
</script> </script>
<style> <style scoped>
.printContainer{ .printContainer{
width: 1075px; padding-left: 20px;
} }
</style> </style>

View File

@ -16,15 +16,15 @@
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <el-card style="margin-top:5px">
<div class="printWrap">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable"> <table border="1" width="1035" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="10">电石渣工段生产报告</th> <th colspan="9">电石渣工段生产报告</th>
</tr> </tr>
<tr> <tr>
<th colspan="2">参数</th> <th colspan="2">参数</th>
<th>上个小时</th>
<th>昨日</th> <th>昨日</th>
<th>本月</th> <th>本月</th>
<th>本年</th> <th>本年</th>
@ -41,17 +41,24 @@
<td class="numCell hoursItem" @click="itemClick('hours',item)" >{{item[2]}}</td> <td class="numCell hoursItem" @click="itemClick('hours',item)" >{{item[2]}}</td>
<td class="numCell daysItem" @click="itemClick('days',item)">{{item[3]}}</td> <td class="numCell daysItem" @click="itemClick('days',item)">{{item[3]}}</td>
<td class="numCell monthItem" @click="itemClick('month',item)">{{item[4]}}</td> <td class="numCell monthItem" @click="itemClick('month',item)">{{item[4]}}</td>
<td class="numCell yearItem" @click="itemClick('year',item)">{{item[5]}}</td> <td class="numCell">{{item[6]}}</td>
<td class="numCell">{{item[6]}}</td> <td class="numCell">{{item[6]}}</td>
<td class="numCell">{{item[7]}}</td> <td class="numCell">{{item[7]}}</td>
<td class="numCell">{{item[8]}}</td> <td class="numCell">{{item[8]}}</td>
<td class="numCell">{{item[9]}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<scEcharts height="400px" width="1074px" :option="optionDay"></scEcharts> <div class="chartWrap">
<scEcharts height="400px" width="1074px" :option="optionMonth"></scEcharts> <div class="chartTitle">本月生产参数统计图</div>
<scEcharts height="400px" width="1033px" :option="optionDay"></scEcharts>
</div> </div>
<div class="chartWrap">
<div class="chartTitle">本年生产参数统计图</div>
<scEcharts height="400px" width="1033px" :option="optionMonth"></scEcharts>
</div>
</div>
</div>
<sc-dialog v-model="chartShow" draggable title="电石渣工段"> <sc-dialog v-model="chartShow" draggable title="电石渣工段">
<div class="searchHead" v-if="type=='hours'"> <div class="searchHead" v-if="type=='hours'">
<el-date-picker <el-date-picker
@ -160,20 +167,19 @@
// alwaysShowContent:true, // alwaysShowContent:true,
}; };
let grid={ let grid={
right: '10%', right: '7%',
left:'10%', left:'4%',
top:'15%' top:'15%'
}; };
let toolbox={ let toolbox={
right:'5%', right:'5%',
feature: { feature: {
dataView: { show: true, readOnly: false }, dataView: { show: true, readOnly: false },
// restore: { show: true },
saveAsImage: { show: true } saveAsImage: { show: true }
} }
}; };
let legend= { let legend= {
top:'5%', top:'2%',
data:['总产量', '分布电耗', '成本'] data:['总产量', '分布电耗', '成本']
}; };
let yAxis= [{ let yAxis= [{
@ -353,14 +359,6 @@
month_d = lastDate.getMonth()+1; month_d = lastDate.getMonth()+1;
days_d = lastDate.getDate(); days_d = lastDate.getDate();
} }
//
let hourTime = timeDate - 3600000;
let hourDate = new Date(hourTime);
let year_h = hourDate.getFullYear();
let month_h = hourDate.getMonth()+1;
let days_h = hourDate.getDate();
let hours_h = hourDate.getHours();
// //
let params3 = {}; let params3 = {};
params3.page = 0; params3.page = 0;
@ -372,26 +370,9 @@
this.$API.enm.enstat.req(params3).then((res3) => { this.$API.enm.enstat.req(params3).then((res3) => {
if(res3.length>0){ if(res3.length>0){
let data3 = res3[0]; let data3 = res3[0];
that.tableDatas[0][3]=data3.total_production; that.tableDatas[0][2]=data3.total_production;
that.tableDatas[1][3]=data3.elec_consume_unit; that.tableDatas[1][2]=data3.elec_consume_unit;
that.tableDatas[2][3]=data3.production_cost_unit; that.tableDatas[2][2]=data3.production_cost_unit;
}
})
//
let params4 = {};
params4.page = 0;
params4.year = year_h;
params4.month = month_h;
params4.day = days_h;
params4.hour = hours_h;
params4.type = 'hour_st';
params4.mgroup = this.query.mgroup;
this.$API.enm.enstat.req(params4).then((res4) => {
if(res4.length>0){
let data4 = res4[0];
that.tableDatas[0][2]=data4.total_production;
that.tableDatas[1][2]=data4.elec_consume_unit;
that.tableDatas[2][2]=data4.production_cost_unit;
} }
}) })
// //
@ -404,14 +385,14 @@
data5.forEach(item5=>{ data5.forEach(item5=>{
let str = 'goal_val_'+that.month; let str = 'goal_val_'+that.month;
if(item5.goal_cate_name=='总产量t'){ if(item5.goal_cate_name=='总产量t'){
that.tableDatas[0][6]=item5[str]; that.tableDatas[0][5]=item5[str];
that.tableDatas[0][8]=item5.goal_val; that.tableDatas[0][7]=item5.goal_val;
}else if(item5.goal_cate_name=='单位产品分布电耗KW·h/t'){ }else if(item5.goal_cate_name=='单位产品分布电耗KW·h/t'){
that.tableDatas[1][6]=item5[str]; that.tableDatas[1][5]=item5[str];
that.tableDatas[1][8]=item5.goal_val; that.tableDatas[1][7]=item5.goal_val;
}else if(item5.goal_cate_name=='单位产品成本(元/吨)'){ }else if(item5.goal_cate_name=='单位产品成本(元/吨)'){
that.tableDatas[2][6]=item5[str]; that.tableDatas[2][5]=item5[str];
that.tableDatas[2][8]=item5.goal_val; that.tableDatas[2][7]=item5.goal_val;
} }
}) })
} }
@ -425,12 +406,12 @@
this.$API.enm.enstat.req(params1).then((res1) => { this.$API.enm.enstat.req(params1).then((res1) => {
if(res1.length>0){ if(res1.length>0){
let data1 = res1[0]; let data1 = res1[0];
that.tableDatas[0][5]=data1.total_production; that.tableDatas[0][4]=data1.total_production;
that.tableDatas[0][9]=precen(that.tableDatas[0][5],that.tableDatas[0][8]) that.tableDatas[0][8]=precen(that.tableDatas[0][4],that.tableDatas[0][7])
that.tableDatas[1][5]=data1.elec_consume_unit; that.tableDatas[1][4]=data1.elec_consume_unit;
that.tableDatas[1][9]=precen(that.tableDatas[1][5],that.tableDatas[1][8]) that.tableDatas[1][8]=precen(that.tableDatas[1][4],that.tableDatas[1][7])
that.tableDatas[2][5]=data1.production_cost_unit; that.tableDatas[2][4]=data1.production_cost_unit;
that.tableDatas[2][9]=precen(that.tableDatas[2][5],that.tableDatas[2][8]) that.tableDatas[2][8]=precen(that.tableDatas[2][4],that.tableDatas[2][7])
}else{ }else{
} }
@ -446,12 +427,12 @@
this.$API.enm.enstat.req(params2).then((res2) => { this.$API.enm.enstat.req(params2).then((res2) => {
if(res2.length>0){ if(res2.length>0){
let data2 = res2[0]; let data2 = res2[0];
that.tableDatas[0][4]=data2.total_production; that.tableDatas[0][3]=data2.total_production;
that.tableDatas[0][7]=precen(that.tableDatas[0][4],that.tableDatas[0][6]) that.tableDatas[0][6]=precen(that.tableDatas[0][3],that.tableDatas[0][5])
that.tableDatas[1][4]=data2.elec_consume_unit; that.tableDatas[1][3]=data2.elec_consume_unit;
that.tableDatas[1][7]=precen(that.tableDatas[1][4],that.tableDatas[1][6]) that.tableDatas[1][6]=precen(that.tableDatas[1][3],that.tableDatas[1][5])
that.tableDatas[2][4]=data2.production_cost_unit; that.tableDatas[2][3]=data2.production_cost_unit;
that.tableDatas[2][7]=precen(that.tableDatas[2][4],that.tableDatas[2][6]) that.tableDatas[2][6]=precen(that.tableDatas[2][3],that.tableDatas[2][5])
} }
}) })
}) })
@ -546,8 +527,8 @@
} }
}; };
</script> </script>
<style> <style scoped>
.printContainer{ .printContainer{
width: 1075px; padding-left: 20px;
} }
</style> </style>

View File

@ -8,7 +8,7 @@
value-format="YYYY" value-format="YYYY"
format="YYYY" format="YYYY"
placeholder="查询年份" placeholder="查询年份"
style="margin-right: 6px;" class="headerSearch"
/> />
<el-button <el-button
type="primary" type="primary"
@ -29,8 +29,9 @@
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <el-card style="margin-top:5px">
<div class="printWrap">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" cellspacing="0" :key="timeStamp" id="myTable" class="myTable"> <table border="1" width="1075" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="12">电石渣工段班组月度对比分析</th> <th colspan="12">电石渣工段班组月度对比分析</th>
@ -58,6 +59,7 @@
</tr> </tr>
</table> </table>
</div> </div>
</div>
</el-card> </el-card>
</div> </div>
</template> </template>
@ -188,8 +190,9 @@
} }
}; };
</script> </script>
<style> <style scoped>
.printContainer{ .printWrap{
width: 1075px; width: 100%;
overflow-x: scroll;
} }
</style> </style>

View File

@ -8,7 +8,7 @@
value-format="YYYY" value-format="YYYY"
format="YYYY" format="YYYY"
placeholder="查询年份" placeholder="查询年份"
style="margin-right: 6px;" class="headerSearch"
/> />
<el-button <el-button
type="primary" type="primary"
@ -29,8 +29,9 @@
</div> </div>
</el-header> </el-header>
<el-card style="margin-top:5px"> <el-card style="margin-top:5px">
<div class="printWrap">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable"> <table border="1" width="1075" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="8">车间单位产品电耗月度分析表</th> <th colspan="8">车间单位产品电耗月度分析表</th>
@ -61,6 +62,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
</el-card> </el-card>
</div> </div>
</template> </template>
@ -264,16 +266,9 @@
} }
}; };
</script> </script>
<style> <style scoped>
.printContainer{ .printWrap{
width: 1075px; width: 100%;
} overflow-x: scroll;
.redColor{
font-weight: bold;
color: #ff0000;
}
.greenColor{
font-weight: bold;
color: #008000;
} }
</style> </style>

View File

@ -8,7 +8,7 @@
placeholder="工段" placeholder="工段"
clearable clearable
@change="mgroupChange" @change="mgroupChange"
style="margin-left: 2px; width: 200px" class="headerSearch"
> >
<el-option <el-option
v-for="item in mgroupOptions" v-for="item in mgroupOptions"
@ -21,6 +21,7 @@
v-model="query.type" v-model="query.type"
placeholder="查询类型" placeholder="查询类型"
clearable clearable
class="headerSearch"
@change="typeCange" @change="typeCange"
> >
<el-option <el-option
@ -36,6 +37,7 @@
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
format="YYYY-MM-DD" format="YYYY-MM-DD"
placeholder="日" placeholder="日"
class="headerSearch"
v-if="query.type==0" v-if="query.type==0"
/> />
<!-- 选择班次 --> <!-- 选择班次 -->
@ -44,7 +46,7 @@
v-model="query.shift" v-model="query.shift"
placeholder="班次" placeholder="班次"
clearable clearable
style="margin-left: 2px; width: 120px" class="headerSearch"
> >
<el-option <el-option
v-for="item in optionsShift" v-for="item in optionsShift"
@ -59,6 +61,7 @@
value-format="YYYY-MM" value-format="YYYY-MM"
format="YYYY-MM" format="YYYY-MM"
placeholder="月份" placeholder="月份"
class="headerSearch"
v-if="query.type==1" v-if="query.type==1"
/> />
<el-date-picker <el-date-picker
@ -67,6 +70,7 @@
value-format="YYYY" value-format="YYYY"
format="YYYY" format="YYYY"
placeholder="年份" placeholder="年份"
class="headerSearch"
v-if="query.type==2" v-if="query.type==2"
/> />
<el-button <el-button

View File

@ -154,9 +154,6 @@
}; };
</script> </script>
<style> <style>
.printContainer{
width: 1075px;
}
#numTable{ #numTable{
margin-left: 37px; margin-left: 37px;
} }

View File

@ -7,7 +7,7 @@
placeholder="车间" placeholder="车间"
clearable clearable
@change="deptChange" @change="deptChange"
style="margin-left: 2px; width: 200px" class="headerSearch"
> >
<el-option <el-option
v-for="item in deptOptions" v-for="item in deptOptions"
@ -20,6 +20,7 @@
v-model="query.type" v-model="query.type"
placeholder="查询类型" placeholder="查询类型"
clearable clearable
class="headerSearch"
@change="typeCange" @change="typeCange"
> >
<el-option <el-option
@ -36,6 +37,7 @@
format="YYYY-MM" format="YYYY-MM"
placeholder="查询月份" placeholder="查询月份"
v-if="query.type==0" v-if="query.type==0"
class="headerSearch"
/> />
<el-date-picker <el-date-picker
v-model="query.year" v-model="query.year"
@ -44,6 +46,7 @@
format="YYYY" format="YYYY"
placeholder="查询年份" placeholder="查询年份"
v-if="query.type==1" v-if="query.type==1"
class="headerSearch"
/> />
<el-date-picker <el-date-picker
v-model="query.yearStart" v-model="query.yearStart"
@ -52,8 +55,8 @@
format="YYYY" format="YYYY"
placeholder="起始年份" placeholder="起始年份"
v-if="query.type==2" v-if="query.type==2"
class="headerSearch"
/> />
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -296,9 +299,6 @@
}; };
</script> </script>
<style> <style>
.printContainer{
width: 1075px;
}
#numTable{ #numTable{
margin-left: 37px; margin-left: 37px;
} }

View File

@ -2,27 +2,27 @@
<el-container> <el-container>
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<el-date-picker <!-- <el-date-picker
v-model="query.year" v-model="query.year"
type="year" type="year"
value-format="YYYY" value-format="YYYY"
format="YYYY" format="YYYY"
placeholder="年" placeholder="年"
style="width: 120px;margin-right: 5px;" style="width: 120px;margin-right: 5px;"
/> /> -->
<el-date-picker <el-date-picker
v-model="query.month" v-model="query.date"
type="month" type="month"
value-format="YYYY-MM" value-format="YYYY-MM"
format="YYYY-MM" format="YYYY-MM"
placeholder="月" placeholder="月"
style="width: 120px;margin-right: 5px;" class="headerSearch"
/> />
<el-select <el-select
v-model="query.fee" v-model="query.fee"
placeholder="费用类型" placeholder="费用类型"
clearable clearable
style="width: 120px;margin-right: 5px;" class="headerSearch"
> >
<el-option <el-option
v-for="item in feeOptions" v-for="item in feeOptions"
@ -35,7 +35,7 @@
v-model="query.mgroup" v-model="query.mgroup"
placeholder="工段" placeholder="工段"
clearable clearable
style="width: 120px;margin-right: 5px;" class="headerSearch"
> >
<el-option <el-option
v-for="item in options" v-for="item in options"
@ -47,9 +47,8 @@
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
</div> </div>
<div class="right-panel"> <div class="right-panel">
<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'role.create'"></el-button> <el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'feeset.create'"></el-button>
</div> </div>
</el-header> </el-header>
<el-main class="nopadding"> <el-main class="nopadding">
<scTable ref="table" :apiObj="apiObj" row-key="id"> <scTable ref="table" :apiObj="apiObj" row-key="id">
@ -65,11 +64,11 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="140"> <el-table-column label="操作" fixed="right" align="center" width="140">
<template #default="scope"> <template #default="scope">
<el-button link size="small" @click="table_edit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button> <el-button link size="small" @click="table_edit(scope.row)" v-auth="'feeset.update'" type="primary">编辑</el-button>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-popconfirm title="确定删除吗?" @confirm="table_del(scope.row, scope.$index)"> <el-popconfirm title="确定删除吗?" @confirm="table_del(scope.row, scope.$index)">
<template #reference> <template #reference>
<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button> <el-button link size="small" v-auth="'feeset.delete'" type="danger">删除</el-button>
</template> </template>
</el-popconfirm> </el-popconfirm>
</template> </template>
@ -95,8 +94,7 @@
return { return {
apiObj: this.$API.fim.feeset.list, apiObj: this.$API.fim.feeset.list,
query: { query: {
year:'', date:'',
month:'',
fee:'', fee:'',
mgroup:'', mgroup:'',
}, },
@ -156,7 +154,14 @@
}, },
// //
handleQuery(){ handleQuery(){
this.$refs.table.queryData(this.query) let year = this.query.date.split('-')[0];
let month = this.query.date.split('-')[1];
let query = {};
query.year = Number(year);
query.month = Number(month);
query.fee =this.query.fee;
query.mgroup =this.query.mgroup;
this.$refs.table.queryData(query)
}, },
// //
// //

View File

@ -2,21 +2,19 @@
<el-container> <el-container>
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<el-button type="primary" icon="el-icon-plus" @click="roleAdd" v-auth="'role.create'"></el-button>
</div>
<div class="right-panel">
<div class="right-panel-search">
<el-date-picker <el-date-picker
v-model="query.year" v-model="query.year"
type="year" type="year"
format="YYYY" format="YYYY"
value-format="YYYY" value-format="YYYY"
placeholder="年份" placeholder="年份"
class="headerSearch"
/> />
<el-select <el-select
v-model="query.mgroup" v-model="query.mgroup"
placeholder="关联工段" placeholder="关联工段"
clearable clearable
class="headerSearch"
> >
<el-option <el-option
v-for="item in mgroupOptions" v-for="item in mgroupOptions"
@ -29,6 +27,7 @@
v-model="query.goal_cate" v-model="query.goal_cate"
placeholder="目标种类" placeholder="目标种类"
clearable clearable
class="headerSearch"
> >
<el-option <el-option
v-for="item in goalOptions" v-for="item in goalOptions"
@ -39,13 +38,15 @@
</el-select> </el-select>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
</div> </div>
<div class="right-panel">
<el-button type="primary" icon="el-icon-plus" @click="roleAdd" v-auth="'goal.create'"></el-button>
</div> </div>
</el-header> </el-header>
<el-main class="nopadding"> <el-main class="nopadding">
<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" hidePagination> <scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange">
<el-table-column label="#" type="index" width="50"></el-table-column> <el-table-column label="#" type="index" width="50"></el-table-column>
<el-table-column label="工段" prop="mgroup_name" min-width="100"></el-table-column> <el-table-column label="工段" prop="mgroup_name" width="80"></el-table-column>
<el-table-column label="目标(项目)" prop="goal_cate_name" min-width="100"></el-table-column> <el-table-column label="目标(项目)" prop="goal_cate_name" min-width="120"></el-table-column>
<el-table-column label="1月" prop="goal_val_1"></el-table-column> <el-table-column label="1月" prop="goal_val_1"></el-table-column>
<el-table-column label="2月" prop="goal_val_2"></el-table-column> <el-table-column label="2月" prop="goal_val_2"></el-table-column>
<el-table-column label="3月" prop="goal_val_3"></el-table-column> <el-table-column label="3月" prop="goal_val_3"></el-table-column>
@ -61,11 +62,11 @@
<el-table-column label="年目标值" prop="goal_val"></el-table-column> <el-table-column label="年目标值" prop="goal_val"></el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="100"> <el-table-column label="操作" fixed="right" align="center" width="100">
<template #default="scope"> <template #default="scope">
<el-button link size="small" @click="roleEdit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button> <el-button link size="small" @click="roleEdit(scope.row)" v-auth="'goal.update'" type="primary">编辑</el-button>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-popconfirm title="确定删除吗?" @confirm="handleDel(scope.row)"> <el-popconfirm title="确定删除吗?" @confirm="handleDel(scope.row)">
<template #reference> <template #reference>
<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button> <el-button link size="small" v-auth="'goal.delete'" type="danger">删除</el-button>
</template> </template>
</el-popconfirm> </el-popconfirm>
</template> </template>

View File

@ -2,17 +2,16 @@
<el-container> <el-container>
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'role.create'"></el-button> <el-input style="margin-right: 5px;" v-model="query.search" placeholder="产品名称" clearable></el-input>
</div>
<div class="right-panel">
<div class="right-panel-search">
<el-input v-model="query.search" placeholder="产品名称" clearable @keyup.enter="handleQuery"></el-input>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
</div> </div>
<div class="right-panel">
<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'material.create'"></el-button>
</div> </div>
</el-header> </el-header>
<el-main class="nopadding"> <el-main class="nopadding">
<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" hidePagination> <scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange">
<el-table-column label="#" type="index" width="50"></el-table-column> <el-table-column label="#" type="index" width="50"></el-table-column>
<el-table-column label="名称" prop="name" min-width="100"></el-table-column> <el-table-column label="名称" prop="name" min-width="100"></el-table-column>
<el-table-column label="标识" prop="code" min-width="100"></el-table-column> <el-table-column label="标识" prop="code" min-width="100"></el-table-column>
@ -29,11 +28,11 @@
</el-table-column> --> </el-table-column> -->
<el-table-column label="操作" fixed="right" align="center" width="140"> <el-table-column label="操作" fixed="right" align="center" width="140">
<template #default="scope"> <template #default="scope">
<el-button link size="small" @click="table_edit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button> <el-button link size="small" @click="table_edit(scope.row)" v-auth="'material.update'" type="primary">编辑</el-button>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-popconfirm title="确定删除吗?" @confirm="roleDel(scope.row, scope.$index)"> <el-popconfirm title="确定删除吗?" @confirm="roleDel(scope.row, scope.$index)">
<template #reference> <template #reference>
<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button> <el-button link size="small" v-auth="'material.delete'" type="danger">删除</el-button>
</template> </template>
</el-popconfirm> </el-popconfirm>
</template> </template>

View File

@ -2,13 +2,11 @@
<el-container> <el-container>
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'role.create'"></el-button> <el-input style="margin-right: 5px;" v-model="query.search" placeholder="名称" clearable></el-input>
</div>
<div class="right-panel">
<div class="right-panel-search">
<el-input v-model="query.search" placeholder="测点集名称" clearable @keyup.enter="handleQuery"></el-input>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
</div> </div>
<div class="right-panel">
<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'mgroup.create'"></el-button>
</div> </div>
</el-header> </el-header>
<el-main class="nopadding"> <el-main class="nopadding">
@ -20,16 +18,15 @@
<span>{{ cates_[scope.row.cate] }}</span> <span>{{ cates_[scope.row.cate] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="主要产品" prop="product" min-width="150"></el-table-column> -->
<el-table-column label="所属部门" prop="belong_dept_name" min-width="150"></el-table-column> <el-table-column label="所属部门" prop="belong_dept_name" min-width="150"></el-table-column>
<el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column> <el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="140"> <el-table-column label="操作" fixed="right" align="center" width="140">
<template #default="scope"> <template #default="scope">
<el-button link size="small" @click="table_edit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button> <el-button link size="small" @click="table_edit(scope.row)" v-auth="'mgroup.update'" type="primary">编辑</el-button>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-popconfirm title="确定删除吗?" @confirm="table_del(scope.row, scope.$index)"> <el-popconfirm title="确定删除吗?" @confirm="table_del(scope.row, scope.$index)">
<template #reference> <template #reference>
<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button> <el-button link size="small" v-auth="'mgroup.delete'" type="danger">删除</el-button>
</template> </template>
</el-popconfirm> </el-popconfirm>
</template> </template>

View File

@ -3,18 +3,18 @@
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<el-date-picker <el-date-picker
v-model="query.month" v-model="query.monthData"
type="month" type="month"
value-format="YYYY-MM" value-format="YYYY-MM"
format="YYYY-MM" format="YYYY-MM"
placeholder="月" placeholder="月"
style="width: 120px;margin-right: 5px;" class="headerSearch"
/> />
<el-select <el-select
v-model="query.fee" v-model="query.material"
placeholder="物料" placeholder="物料"
clearable clearable
style="width: 120px;margin-right: 5px;" class="headerSearch"
> >
<el-option <el-option
v-for="item in options" v-for="item in options"
@ -26,7 +26,7 @@
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
</div> </div>
<div class="right-panel"> <div class="right-panel">
<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'role.create'"></el-button> <el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'priceset.create'"></el-button>
</div> </div>
</el-header> </el-header>
@ -39,11 +39,11 @@
<el-table-column label="单价" prop="price_unit" min-width="150"></el-table-column> <el-table-column label="单价" prop="price_unit" min-width="150"></el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="140"> <el-table-column label="操作" fixed="right" align="center" width="140">
<template #default="scope"> <template #default="scope">
<el-button link size="small" @click="table_edit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button> <el-button link size="small" @click="table_edit(scope.row)" v-auth="'priceset.update'" type="primary">编辑</el-button>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-popconfirm title="确定删除吗?" @confirm="table_del(scope.row, scope.$index)"> <el-popconfirm title="确定删除吗?" @confirm="table_del(scope.row, scope.$index)">
<template #reference> <template #reference>
<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button> <el-button link size="small" v-auth="'priceset.delete'" type="danger">删除</el-button>
</template> </template>
</el-popconfirm> </el-popconfirm>
</template> </template>
@ -69,8 +69,7 @@
return { return {
apiObj: this.$API.fim.priceset.list, apiObj: this.$API.fim.priceset.list,
query: { query: {
year:'', monthData:'',
month:'',
material:'', material:'',
}, },
dialog: { dialog: {
@ -121,7 +120,13 @@
}, },
// //
handleQuery(){ handleQuery(){
this.$refs.table.queryData(this.query) let year = this.query.monthData.split('-')[0];
let month = this.query.monthData.split('-')[1];
let query = {};
query.year = Number(year);
query.month = Number(month);
query.material =this.query.material;
this.$refs.table.queryData(query)
}, },
// //
// //

View File

@ -7,7 +7,7 @@
placeholder="车间" placeholder="车间"
clearable clearable
@change="deptChange" @change="deptChange"
style="margin-left: 2px; width: 200px" class="headerSearch"
> >
<el-option <el-option
v-for="item in deptOptions" v-for="item in deptOptions"
@ -20,6 +20,7 @@
v-model="query.type" v-model="query.type"
placeholder="查询类型" placeholder="查询类型"
clearable clearable
class="headerSearch"
@change="typeCange" @change="typeCange"
> >
<el-option <el-option
@ -36,6 +37,7 @@
value-format="YYYY" value-format="YYYY"
format="YYYY" format="YYYY"
placeholder="年份" placeholder="年份"
class="headerSearch"
v-if="query.type==1" v-if="query.type==1"
/> />
<el-date-picker <el-date-picker
@ -44,17 +46,9 @@
value-format="YYYY-MM" value-format="YYYY-MM"
format="YYYY-MM" format="YYYY-MM"
placeholder="月份" placeholder="月份"
class="headerSearch"
v-if="query.type==0" v-if="query.type==0"
/> />
<!-- <el-date-picker
v-model="query.day"
type="date"
value-format="YYYY-MM-DD"
format="YYYY-MM-DD"
placeholder="日"
v-if="query.type==0"
/> -->
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -358,9 +352,6 @@
}; };
</script> </script>
<style> <style>
.printContainer{
width: 1075px;
}
.tableContainer{ .tableContainer{
overflow-x: scroll; overflow-x: scroll;
} }

View File

@ -7,6 +7,7 @@
v-model="type" v-model="type"
placeholder="查询类型" placeholder="查询类型"
clearable clearable
class="headerSearch"
@change="typeCange" @change="typeCange"
> >
<el-option <el-option
@ -157,7 +158,7 @@
}); });
}, },
getTableData(){},
handlePrint() { handlePrint() {
this.$PRINT('#myReport'); this.$PRINT('#myReport');
}, },
@ -165,9 +166,6 @@
}; };
</script> </script>
<style> <style>
.printContainer{
width: 1075px;
}
#numTable{ #numTable{
margin-left: 37px; margin-left: 37px;
} }

View File

@ -2,7 +2,7 @@
<el-container> <el-container>
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<el-button type="primary" icon="el-icon-plus" @click="roleAdd" v-auth="'role.create'"></el-button> <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-auth="'team.create'"></el-button>
</div> </div>
<div class="right-panel"> <div class="right-panel">
<div class="right-panel-search"> <div class="right-panel-search">
@ -20,11 +20,11 @@
<el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column> <el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="140"> <el-table-column label="操作" fixed="right" align="center" width="140">
<template #default="scope"> <template #default="scope">
<el-button link size="small" @click="roleEdit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button> <el-button link size="small" @click="handleEdit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-popconfirm title="确定删除吗?" @confirm="roleDel(scope.row, scope.$index)"> <el-popconfirm title="确定删除吗?" @confirm="handleDel(scope.row, scope.$index)">
<template #reference> <template #reference>
<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button> <el-button link size="small" v-auth="'team.delete'" type="danger">删除</el-button>
</template> </template>
</el-popconfirm> </el-popconfirm>
</template> </template>
@ -106,7 +106,6 @@
} }
}, },
mounted() { mounted() {
this.getList();
this.getGroup(); this.getGroup();
}, },
methods: { methods: {
@ -120,13 +119,8 @@
this.group = res.results; this.group = res.results;
}); });
}, },
//
getList(){
var res = this.$API.system.role.list.req();
this.tableData = res.results;
},
// //
roleAdd(){ handleAdd(){
this.limitedVisible = true; this.limitedVisible = true;
this.type = "add"; this.type = "add";
this.form = Object.assign({}, defaultForm); this.form = Object.assign({}, defaultForm);
@ -158,14 +152,13 @@
}, },
// //
roleEdit(row){ handleEdit(row){
this.type='edit'; this.type='edit';
this.form=row; this.form=row;
this.limitedVisible = true; this.limitedVisible = true;
}, },
// //
async roleDel(row){ async handleDel(row){
var id = row.id; var id = row.id;
var res = await this.$API.mtm.team.delete.req(id); var res = await this.$API.mtm.team.delete.req(id);
if(res.err_msg){ if(res.err_msg){

View File

@ -87,7 +87,4 @@
}; };
</script> </script>
<style> <style>
.printContainer{
width: 1075px;
}
</style> </style>