meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

Browse Source
This commit is contained in:
liushuai
2019-09-25 13:49:06 +08:00
parent fb86775031 76b361ddbd
commit 0d820bec95
22 changed files with 82 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/ManufacturingCenter/OwnTimeStatistics/index.vue
View File

@@ -35,7 +35,7 @@
</el-row>
</el-card>
<el-card v-loading="loading">
<div id="myChart" :style="{width: '100%', height: '470px', margin: 'auto'}"/>
<div id="myChart" :style="{width: '100%', height: '570px', margin: 'auto'}"/>
</el-card>
</div>
</template>

10
src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
View File

@@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-card style="margin: 10px">
<el-card>
<el-radio-group v-model="radio" size="small" style="margin: 10px;" @change="checked = false;partNum=[];partNumValue = '';typeValue = '';Specifications = '';partName = '';material = '';materialName = '';prepareMateriel = '';spec = '';batchNum = '';searchPartsByMachineGroup();">
<el-radio v-model="radio" :label="1" border>未编制</el-radio>
<el-radio v-model="radio" :label="2" border style="margin-left: 0px">已编制</el-radio>
@@ -65,7 +65,7 @@
</el-select>
</el-col>
<el-col v-show="materielValue==='1'||materielValue==='6'||materielValue==='7'||materielValue==='8'" :span="12" >
<el-col v-show="materielValue==='1'||materielValue==='6'||materielValue==='7'||materielValue==='8'" :span="12" style="width: 60%">
<span >直&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;径:</span>
<el-input-number v-model="diameter" size="small" controls-position="right" style="width:100px;margin-top: 7px"/>
<span>长度:</span>
@@ -121,7 +121,7 @@
</el-input>
</el-col>
<el-col v-show="materielValue==='5'" :span="20">
<el-col v-show="materielValue==='5'" :span="30">
<span>壁厚:</span>
<el-input-number v-model="bihou" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<span>外径:</span>
@@ -140,7 +140,7 @@
</div>
</el-card>
<el-card style="margin: 10px">
<el-card>
<el-row style="margin-bottom: 10px">
<span style="margin-left: 10px">输入数值:</span>
<el-input v-model="numVal" size="small" style="width:100px;margin-top: 3px" placeholder="输入数值"/>
@@ -1674,7 +1674,7 @@ export default {
background: #f0f9eb;
}
.el-card {
/*margin-bottom: 15px;*/
margin-bottom: 0px;
}
.el-date-editor {
width: 150px

10
src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
View File

@@ -21,7 +21,7 @@
type="date"
placeholder="选择日期"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
<el-tooltip :open-delay="1000" content="一键删除交货期" placement="right">
<el-tooltip :open-delay="1000" content="导出人员工时统计表" placement="right">
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportUninquirySheet1()">导出</el-button>
</el-tooltip>
</el-row>
@@ -128,8 +128,12 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="exportUninquirySheet2()">机床导出</el-button>
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="exportUninquirySheet3()">组件导出</el-button>
<el-tooltip :open-delay="1000" content="导出机床工时统计明细表" placement="top">
<el-button type="warning" size="mini" icon="el-icon-download" plain style="margin-left:10px" @click="exportUninquirySheet2()">机床导出</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" content="导出组件工时统计明细表" placement="top">
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" plain @click="exportUninquirySheet3()">组件导出</el-button>
</el-tooltip>
</el-card>
<el-card>
<el-col :span="6">