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

更新

Browse Source
This commit is contained in:
liushuai
2019-09-24 17:25:50 +08:00
parent a59d1358c1
commit 2482179bbd
13 changed files with 237 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/ManufacturingCenter/CreatePreparationBill/index.vue
View File

@@ -5,8 +5,8 @@
<span>零件图号:</span>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
<el-checkbox v-model="all" size="small">查询全部</el-checkbox>
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:0px" @click="exportTable('BL')">导出备料单</el-button>
<!--<el-checkbox v-model="all" size="small">查询全部</el-checkbox>-->
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportTable('BL')">导出备料单</el-button>
<el-button type="info" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">自家备料</el-button>
<el-button type="warning" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit2()">外购备料</el-button>
</el-row>

102
src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue
View File

@@ -82,10 +82,10 @@
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-card style="width: 49.8%; float: left;margin-right: 5px">
<el-card style="width: 49.7%; float: left;margin-right: 5px">
<div id="myChart1" style="width: 1000px; height: 570px; margin: auto"/>
</el-card>
<el-card style="width: 49.8%">
<el-card style="width: 49.7%;margin-left: 5px">
<div id="myChart2" style="width: 1000px; height: 570px; margin: auto"/>
</el-card>
<el-card>
@@ -123,6 +123,38 @@
<el-card>
<div id="myChart" style="width: 1000px; height: 570px; margin: auto"/>
</el-card>
<el-card>
<span>工位号:</span>
<el-select v-model="MachineValue2" filterable size="small" style="width:160px;margin-bottom:10px" placeholder="工位号">
<el-option
v-for="item in Machine"
:key="item.value"
:label="item.label"
:value="item.value">
<div style="float: left">{{ item.label }}</div>
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<span style="margin-left: 10px">时间段:</span>
<el-date-picker
v-model="date3"
style="width:160px;margin:10px;"
size="small"
type="date"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期"/>
<span>~</span>
<el-date-picker
v-model="date4"
style="width:160px;margin:10px;"
size="small"
type="date"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchData2()">查询</el-button>
</el-card>
<el-card>
<div id="myChart3" style="width: 100%; height: 520px; margin: auto"/>
</el-card>
@@ -137,6 +169,7 @@ export default {
tableDataA: [],
MachineValue: '',
MachineValue1: '',
MachineValue2: '',
Machine: [],
yAxisValue: [],
colors: [],
@@ -144,6 +177,8 @@ export default {
Time: '',
date1: '',
date2: '',
date3: '',
date4: '',
time1: '',
time2: '',
time3: '',
@@ -199,47 +234,32 @@ export default {
})
},
searchData1() {
getData2(this.MachineValue1, this.date1, this.date2).then(response => {
this.table = response.data
console.log(this.table, 222)
}).then(() => {
this.drawLine()
})
if (this.date1 === null || this.date2 === null) {
this.$message.warning('请选择开始时间或结束时间')
} else {
const endYear = parseInt(this.date2.split('-')[0])
const startYear = parseInt(this.date1.split('-')[0])
const endMonth = parseInt(this.date2.split('-')[1])
const startMonth = parseInt(this.date1.split('-')[1])
const endDate = parseInt(this.date2.split('-')[2])
const startDate = parseInt(this.date1.split('-')[2])
let diff
if ((endMonth - startMonth) === 0) {
diff = endDate - startDate
}
if ((endMonth - startMonth) === 1) {
diff = endDate - startDate + 10
}
if ((endMonth - startMonth) > 1 || (endYear - startYear) !== 0) {
diff = 999
}
if (diff > 6) {
this.$message.warning('选择时间区间不得超过6天！')
} else {
searchState().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.colors.push(response.data[i].颜色)
this.state.push(response.data[i].状态)
}
})
getData3(this.MachineValue1, this.date1, this.date2).then(response => {
this.table1 = response.data
console.log(this.table1)
}).then(() => {
this.drawLine3()
})
}
getData2(this.MachineValue1, this.date1, this.date2).then(response => {
this.table = response.data
}).then(() => {
this.drawLine()
})
}
},
searchData2() {
if (this.date3 === null || this.date4 === null) {
this.$message.warning('请选择开始时间或结束时间')
} else {
searchState().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.colors.push(response.data[i].颜色)
this.state.push(response.data[i].状态)
}
})
getData3(this.MachineValue2, this.date3, this.date4).then(response => {
this.table1 = response.data
console.log(this.table1)
}).then(() => {
this.drawLine3()
})
}
},
// 绘制图形
@@ -484,7 +504,7 @@ export default {
var categoryIndex = api.value(0) // 这里使用 api.value(0) 取出当前 dataItem 中第一个维度的数值。
var start = api.coord([api.value(1), categoryIndex]) // 这里使用 api.coord(...) 将数值在当前坐标系中转换成为屏幕上的点的像素值。
var end = api.coord([api.value(2), categoryIndex])
var height = 24 // 柱体宽度
var height = 10 // 柱体宽度
return {
type: 'rect', // 表示这个图形元素是矩形。还可以是 'circle', 'sector', 'polygon' 等等。

4
src/views/ManufacturingCenter/ParseQuery/index.vue
View File

@@ -2671,7 +2671,7 @@ export default {
left join (select 组件流水号,count(*) as 已传递条数
from 车间生产管理工艺_零件工序_投产信息_查询视图 where 是否传递 = 2 group by 组件流水号) as b
on 综合查询_零件分配模块信息视图.组件流水号 = b.组件流水号
where 机床流水号 = ${this.machineValue1} order by 组号`
where 机床流水号 = ${this.machineValue1} and 组号 <> '00组' order by 组号`
}
}).then(res => {
this.tableDataDiv4 = res.data
@@ -4470,7 +4470,7 @@ export default {
width: 1858px;
height: 400px;
/*border: 1px solid red;*/
background: url('../../../assets/img/img12.png') repeat;
background: url('../../../assets/img/img13.png') repeat;
background-repeat:no-repeat;
background-size:100% 100%;-moz-background-size:100% 100%;
}

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

@@ -172,9 +172,9 @@
</el-row>
<el-divider content-position="right">跳转链接</el-divider>
<el-row style="margin-left: 20px">
<router-link to="/StatusQuery/index" style="color:dodgerblue">零件状态查询</router-link>
<el-button size="medium" type="text" @click="toStatusQuery">零件状态查询</el-button>
<el-divider direction="vertical"/>
<router-link to="/StatusQuery/index" style="color:dodgerblue">加工进度查询</router-link>
<el-button size="medium" type="text" @click="toProcessingStatus">加工进度查询</el-button>
</el-row>
</div>
</div>
@@ -307,6 +307,12 @@ export default {
})
}
},
toStatusQuery() {
this.$router.push('/ManufacturingCenter/StatusQuery')
},
toProcessingStatus() {
this.$router.push('/ManufacturingCenter/ProcessingStatus')
},
createFilterPick(queryString) {
return (restaurant) => {
return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) !== -1)

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

@@ -32,7 +32,7 @@
highlight-current-row
height="380"
size="mini"
stripe="true"
stripe
style="width: 100%;"
border
element-loading-text="拼命加载中"
@@ -65,7 +65,7 @@
</div>
</el-col>
<el-col :span="17" style="margin-left: 30px;">
<el-table v-loading="loading2" :data="tableData2" height="380" size="mini" stripe="true" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
<el-table v-loading="loading2" :data="tableData2" height="380" size="mini" stripe highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
<el-table-column label="零件图号" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
@@ -131,7 +131,7 @@
</el-card>
<el-card>
<el-col :span="6">
<el-table v-loading="loading3" :data="tableData3" stripe="true" size="mini" highlight-current-row height="380" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable5">
<el-table v-loading="loading3" :data="tableData3" stripe size="mini" highlight-current-row height="380" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable5">
<el-table-column label="机床编号" align="center" width="110px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
@@ -160,7 +160,7 @@
</div>
</el-col>
<el-col :span="17" style="margin-left: 30px;">
<el-table v-loading="loading4" :data="tableData4" size="mini" height="380" stripe="true" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
<el-table v-loading="loading4" :data="tableData4" size="mini" height="380" stripe highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
<el-table-column label="机床编号" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}