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:
zhangdingyu
2019-09-24 20:46:17 +08:00
parent 9804b623bd 6cd2c4e1c3
commit c11add4b18
21 changed files with 340 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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%;
}