Skip to content

L
Laisi_AutoMES2
Commit 78d8a151 by yiyu.li
Options

change

parent 2525380d
Showing with 365 additions and 110 deletions
Html/src/view/fml/operation_manage/feedingBlanking.vue
......@@ -5,7 +5,7 @@
<div class="choose">
<p class="selectTitle">
1.请选择生产线
<span class="red">*</span>
<!-- <span class="red">*</span> -->
</p>
<div class="row">
<p
......@@ -19,17 +19,14 @@
</p>
</div>
<div class="choose">
<p class="selectTitle">
2.上下料工位
<span class="red">*</span>
</p>
<p class="selectTitle">2.上下料工位</p>
<div class="row">
<div
:key="index"
class="options2"
v-for="(item, index) in stationList"
@click="change(index)"
:class="{ active: a == index }"
@click="change2(index)"
:class="{ active: b == index }"
>
<p>{{ item.title }}</p>
<p>{{ item.status == 1 ? "待上料" : "运行中" }}</p>
......@@ -37,18 +34,19 @@
</div>
</div>
<div class="choose">
<p class="selectTitle">
3.操作
<span class="red">*</span>
</p>
<p class="selectTitle">3.操作</p>
<Tabs type="card">
<TabPane label="上料" :disabled="attr1">
<div class="filter">
<label style="font-size: 16px"
>上料信息：</label
>
<Input type="text" class="searchInput"
style="width: 300px"/>
<Input
type="text"
class="searchInput"
style="width: 300px"
@keyup.enter="getWorkOrderInfo()"
/>
</div>
<div class="row">
<p class="flex">
......@@ -149,8 +147,16 @@
</p>
</div>
<div>
<Button type="primary">准备上料</Button>
<Button type="primary">安装完成</Button>
<Button
type="primary"
@click="feedReady()"
>准备下料</Button
>
<Button
type="primary"
@click="installOver()"
>拆卸完成</Button
>
</div>
</div>
</div></TabPane
......@@ -199,6 +205,7 @@ export default {
productionLine: [],
stationList: [],
a: -1,
b: -1,
attr1: false, //上料、下料、上下料
attr2: false, //上料、下料、上下料
modal: false,
......@@ -209,26 +216,26 @@ export default {
render: (h, params) => {
return h(
"span",
params.index + (this.page - 1) * this.pagesize + 1
params.index + 1
);
},
width: 70,
},
{
title: "仓库",
key: "warehouse",
key: "wavehouse",
},
{
title: "储位编号",
key: "storage_sn",
key: "locationcode",
},
{
title: "工装编号",
key: "install_sn",
key: "code",
},
{
title: "工件编号",
key: "workpiece_sn",
key: "materialsn",
},
],
data1: [],
......@@ -239,22 +246,22 @@ export default {
render: (h, params) => {
return h(
"span",
params.index + (this.page - 1) * this.pagesize + 1
params.index+ 1
);
},
width: 70,
},
{
title: "储位编号",
key: "storage_sn",
key: "locationcode",
},
{
title: "工装编号",
key: "install_sn",
key: "code",
},
{
title: "工件编号",
key: "workpiece_sn",
key: "materialsn",
},
],
data2: [],
......@@ -262,6 +269,7 @@ export default {
},
created() {
this.getProLine();
this.getStorages();
},
mounted() {
// this.getStations()
......@@ -303,11 +311,22 @@ export default {
this.a = i;
this.getStations(this.productionLine[i].id);
},
change2(index) {
this.b = index;
let status = this.stationList[index].status;
if (status == 1) {
this.attr2 = true;
}
},
//获取储位
getStorages() {
this.request("", "", "")
this.request("/acc/AutomationLocation/GetLocationList", "", "get")
.then((res) => {
console.log(res.data.data);
if (res.data.ret == 1) {
this.data1 = res.data.data;
this.data2 = res.data.data;
}
})
.catch((err) => {
......@@ -325,6 +344,33 @@ export default {
console.log(err);
});
},
feedReady() {
// 准备上料
let data = {
section: 13,
code: "234324",
};
this.request("/acc/AutomationOperate/Loading", data, "post").thne((res) => {
if (res.data.ret == 1) {
}
});
},
installOver() {
// 安装完成
let data = {
section: 13
};
this.request("", data, "post").thne(
(res) => {
if (res.data.ret == 1) {
}
}
);
},
request(url, data, type) {
if (type == "get") {
return this.axios
......
Html/src/view/fms/associate/assemblyInfo.vue
......@@ -15,7 +15,17 @@
</Select>
</div>
<div class="filter">
<label>夹具类型：</label>
<label>工装编号：</label>
<Select
label-in-value
clearable
filterable
class="searchSelect"
>
</Select>
</div>
<div class="filter">
<label>状态：</label>
<Select
label-in-value
clearable
......@@ -112,8 +122,9 @@
export default {
data() {
return {
columns1: [
columns1:[
{
type: "index2",
title: this.$t("1008"),
key: "xuhao",
render: (h, params) => {
......@@ -122,13 +133,90 @@ export default {
params.index + (this.page - 1) * this.pagesize + 1
);
},
width: 70,
},
{
title: this.$t("100089"),
key: "productcode",
minWidth: 150,
title:'工装类型',
key:'category'
},
{
title:'管理类型',
key:'managetype',
render:(h,params)=>{
let str = '';
if(params.row.managetype===1){
str = '单件';
}else if(params.row.managetype===2){
str = '批次';
}
return h('span',str);
}
},
{
title:'工装料号',
key:'partnumber'
},
{
title:'工装名称',
key:'name'
},
{
title:'工装编号',
key:'code'
},
{
title:'规格型号',
key:'specification'
},
{
title:'数量',
key:'number'
},
{
title:'状态',
key:'status',
render:(h,params)=>{
let str = '';
if(params.row.status===1){
str = '可用';
}else{
str = '停用';
}
return h('span',str);
}
},
{
title:'备注',
key:'remark'
},
{
title:'附件',
key:'filename',
render:(h,params)=>{
return h('span',{
style:{
color:'#2b85e4',
cursor:'pointer'
},
on:{
click:()=>{
let name = params.row.filename;
let url = params.row.fileurl;
if(url){
this.downFile(url,name);
}
}
}
},params.row.filename);
}
},
{
title:'维护人',
key:'updator'
},
{
title:'维护时间',
key:'updatetime'
}
],
data1: [],
total: 0,
......
Html/src/view/qms/manual/collection.vue
......@@ -5,7 +5,7 @@
</div>
<div class="entryItem">
<div class="choose">
<p class="selectTitle">1.{{ $t("90000016") }}</p>
<p class="selectTitle">1.{{ $t("800082") }}</p>
<div class="row">
<p
class="options"
......@@ -13,7 +13,7 @@
@click="linechange(index)"
:class="{ active: a == index }"
>
{{ item.name }}
{{ item.title }}
</p>
</div>
</div>
......@@ -26,7 +26,7 @@
@click="stationchange(index)"
:class="{ active: b == index }"
>
{{ item.name }}
{{ item.title }}
</p>
</div>
</div>
......@@ -46,7 +46,7 @@
</div>
</div>
<div class="choose">
<p class="selectTitle">4.{{ $t("1950603") }}</p>
<p class="selectTitle">4.{{ $t("8063") }}</p>
<div class="row">
<p
class="options"
......@@ -61,7 +61,20 @@
</div>
<div class="entryItem">
<div class="choose">
<p class="selectTitle">5.{{ $t("90000017") }}</p>
<p class="selectTitle">5.工件编号</p>
<div class="row">
<input
class="erweima"
type="text"
v-model="qrcode"
@keyup.enter="savedata"
/>
</div>
</div>
</div>
<div class="entryItem">
<div class="choose">
<p class="selectTitle">6.{{ $t("90000017") }}</p>
<div class="row">
<p
class="options"
......@@ -82,10 +95,15 @@
</div>
<div class="entryItem">
<div class="choose">
<p class="selectTitle">6.{{ $t("90000020") }}</p>
<p class="selectTitle">7.{{ $t("90000020") }}</p>
<div
:class="table_scrollx ? 'collection_table' : ''"
style="width: 100%; float: left; height: 100%; padding-left: 5px"
style="
width: 100%;
float: left;
height: 100%;
padding-left: 5px;
"
>
<template style="overflow-x: scroll; overflow-y: hidden">
<Table
......@@ -102,13 +120,22 @@
<template slot-scope="{ row, index }" slot="item">
<span>{{ row.item }}</span>
</template>
<template slot-scope="{ row, index }" slot="standard">
<template
slot-scope="{ row, index }"
slot="standard"
>
<span>{{ row.standard }}</span>
</template>
<template slot-scope="{ row, index }" slot="min_value">
<template
slot-scope="{ row, index }"
slot="min_value"
>
<span>{{ row.min_value }}</span>
</template>
<template slot-scope="{ row, index }" slot="max_value">
<template
slot-scope="{ row, index }"
slot="max_value"
>
<span>{{ row.max_value }}</span>
</template>
<template slot-scope="{ row, index }" slot="range">
......@@ -129,17 +156,27 @@
<inputNumber
class="publicinput"
:class="{
active_class: tableData[index]['min_value' + (i + 1)]
? tableData[index]['min_value' + (i + 1)] <
row.min_value ||
tableData[index]['min_value' + (i + 1)] >
row.max_value
active_class: tableData[index][
'min_value' + (i + 1)
]
? tableData[index][
'min_value' + (i + 1)
] < row.min_value ||
tableData[index][
'min_value' + (i + 1)
] > row.max_value
: false,
}"
type="text"
v-model="tableData[index]['min_value' + (i + 1)]"
v-model="
tableData[index][
'min_value' + (i + 1)
]
"
style="width: 100px"
@blur.native.capture="getrange(index, i + 1)"
@blur.native.capture="
getrange(index, i + 1)
"
/>
</span>
</template>
......@@ -157,17 +194,27 @@
<inputNumber
class="publicinput"
type="text"
v-model="tableData[index]['max_value' + (i + 1)]"
v-model="
tableData[index][
'max_value' + (i + 1)
]
"
:class="{
active_class: tableData[index]['max_value' + (i + 1)]
? tableData[index]['max_value' + (i + 1)] <
row.min_value ||
tableData[index]['max_value' + (i + 1)] >
row.max_value
active_class: tableData[index][
'max_value' + (i + 1)
]
? tableData[index][
'max_value' + (i + 1)
] < row.min_value ||
tableData[index][
'max_value' + (i + 1)
] > row.max_value
: false,
}"
style="width: 100px"
@blur.native.capture="getrange(index, i + 1)"
@blur.native.capture="
getrange(index, i + 1)
"
/>
</span>
</template>
......@@ -177,34 +224,56 @@
:slot="'value' + (i + 1)"
>
<span v-if="tableData[index].checktype === 1">
<RadioGroup v-model="tableData[index]['value' + (i + 1)]">
<Radio label="OK" style="width: 30px">OK</Radio>
<Radio label="NG" style="width: 30px">NG</Radio>
<RadioGroup
v-model="
tableData[index]['value' + (i + 1)]
"
>
<Radio label="OK" style="width: 30px"
>OK</Radio
>
<Radio label="NG" style="width: 30px"
>NG</Radio
>
</RadioGroup>
</span>
<span v-else-if="tableData[index].checktype === 2">
<span
v-else-if="tableData[index].checktype === 2"
>
<inputNumber
:disabled="
tableData[index].checktype === 2 &&
tableData[index].valuecategory === 2
"
:class="{
active_class: tableData[index]['value' + (i + 1)]
? tableData[index]['value' + (i + 1)] < row.min_value ||
tableData[index]['value' + (i + 1)] > row.max_value
active_class: tableData[index][
'value' + (i + 1)
]
? tableData[index][
'value' + (i + 1)
] < row.min_value ||
tableData[index][
'value' + (i + 1)
] > row.max_value
: false,
}"
class="publicinput"
type="text"
v-model="tableData[index]['value' + (i + 1)]"
v-model="
tableData[index]['value' + (i + 1)]
"
style="width: 100px"
/>
</span>
<span v-else-if="tableData[index].checktype === 0">
<span
v-else-if="tableData[index].checktype === 0"
>
<input
class="publicinput"
type="text"
v-model="tableData[index]['value' + (i + 1)]"
v-model="
tableData[index]['value' + (i + 1)]
"
style="width: 100px"
/>
</span>
......@@ -224,11 +293,16 @@
:disabled="true"
class="publicinput"
type="text"
v-model="tableData[index]['range' + (i + 1)]"
v-model="
tableData[index]['range' + (i + 1)]
"
:class="{
active_class: tableData[index]['range' + (i + 1)]
? tableData[index]['range' + (i + 1)] >
tableData[index]['range']
active_class: tableData[index][
'range' + (i + 1)
]
? tableData[index][
'range' + (i + 1)
] > tableData[index]['range']
: false,
}"
style="width: 100px; font-color: black"
......@@ -240,23 +314,16 @@
</div>
</div>
</div>
<div class="entryItem">
<div class="choose">
<p class="selectTitle">7.{{ $t("90000021") }}</p>
<div class="row">
<input
class="erweima"
type="text"
v-model="qrcode"
@keyup.enter="savedata"
/>
</div>
</div>
</div>
<div class="entryItem pr">
<span class="tip" v-text="message"></span>
<!--<button class="save" @click="savedata">保存</button>-->
<Button type="primary" :loading="loading" @click="savedata" class="save">
<Button
type="primary"
:loading="loading"
@click="savedata"
class="save"
>
<span v-if="!loading">{{ $t("900306") }}</span>
<span v-else></span>
</Button>
......@@ -292,7 +359,10 @@
overflow-y: scroll;
"
>
<Table :columns="ngcolumns" :data="ngtableData"></Table>
<Table
:columns="ngcolumns"
:data="ngtableData"
></Table>
</div>
</div>
</div>
......@@ -300,7 +370,9 @@
<template>
<Poptip placement="left" width="300px">
<Button type="primary" :loading="loading2">
<span v-if="!loading2">{{ $t("1950549") }}</span>
<span v-if="!loading2">{{
$t("1950549")
}}</span>
<span v-else>{{ $t("1950549") }}</span>
</Button>
<div class="api" slot="content">
......@@ -322,14 +394,24 @@
style="width: 100px"
/>
</div>
<Button type="primary" :loading="loading2" @click="saveresult1">
<span v-if="!loading2">{{ $t("900306") }}</span>
<Button
type="primary"
:loading="loading2"
@click="saveresult1"
>
<span v-if="!loading2">{{
$t("900306")
}}</span>
<span v-else>{{ $t("900306") }}</span>
</Button>
</div>
</Poptip>
</template>
<Button type="primary" :loading="loading3" @click="saveresult2">
<Button
type="primary"
:loading="loading3"
@click="saveresult2"
>
<span v-if="!loading3">{{ "NG" }}</span>
<span v-else>{{ "NG" }}</span>
</Button>
......@@ -391,7 +473,7 @@ export default {
align: "center",
},
{
title: this.$t("950245"),
title: '量具信息',
slot: "standard",
align: "center",
},
......@@ -406,7 +488,12 @@ export default {
align: "center",
},
{
title: this.$t("920168"),
title: '极差',
slot: "max_value",
align: "center",
},
{
title: this.$t("950408"),
slot: "result_value",
align: "center",
},
......@@ -557,14 +644,17 @@ export default {
axios
.request({
url:
"/qms/InspectStandard/GetItemLevelSection?reverselevel=2&parentid=0",
"/qms/RepairPostionSetting/GetChanel",
method: "get",
})
.then((res) => {
if (res.data.ret == 1) {
this.lineList = res.data.data;
}
});
},
linechange(i) {
console.log(1111111111);
this.a = i;
this.line = this.lineList[i];
this.initstations(this.line.id);
......@@ -575,11 +665,16 @@ export default {
this.station = {};
this.b = 0;
if (lineid > 0) {
let params = {
line: lineid,
type: 1,
};
axios
.request({
url:
"/qms/InspectStandard/GetItemLevelSection?reverselevel=1&parentid=" +
lineid,
"/acc/AutomationOperate/GetloadStation"
,
params,
method: "get",
})
.then((res) => {
......@@ -660,24 +755,37 @@ export default {
}
},
initchecktype() {
axios.request({
url: '/qms/TypeCount/GetTypeCounts?page=1&pagesize=10000',
method: 'get'
}).then(res => {
axios
.request({
url: "/qms/TypeCount/GetTypeCounts?page=1&pagesize=10000",
method: "get",
})
.then((res) => {
let data = res.data.data;
if(res.data.ret ===1 && Array.isArray(data)&&data.length){
res.data.data.forEach(ele => {
this.checktypeList.push({id:ele.type_code, name:ele.type_name});
if (
res.data.ret === 1 &&
Array.isArray(data) &&
data.length
) {
res.data.data.forEach((ele) => {
this.checktypeList.push({
id: ele.type_code,
name: ele.type_name,
});
});
this.checktype = this.checktypeList[0];
this.e = 0;
}
})
});
},
checktypechange(i) {
this.checktype = this.checktypeList[i];
this.e = i;
if (this.product.id > 0 && this.station.id > 0 && this.checktype.id > 0) {
if (
this.product.id > 0 &&
this.station.id > 0 &&
this.checktype.id > 0
) {
this.inititems();
}
},
......@@ -729,7 +837,11 @@ export default {
sectionid: this.station.id,
checktype: this.checktype.id,
};
if (data.productid > 0 && data.sectionid > 0 && data.checktype > 0) {
if (
data.productid > 0 &&
data.sectionid > 0 &&
data.checktype > 0
) {
axios
.request({
url:
......@@ -746,7 +858,10 @@ export default {
var isMaxMin = false;
tablelist.forEach((element) => {
if (element.checktype === 2 && element.valuecategory === 2) {
if (
element.checktype === 2 &&
element.valuecategory === 2
) {
isMaxMin = true;
}
});
......@@ -824,7 +939,8 @@ export default {
value: item.value,
valuecategory: item.valuecategory,
range:
item.checktype === 2 && item.valuecategory === 2
item.checktype === 2 &&
item.valuecategory === 2
? item.range
: "",
};
......@@ -899,8 +1015,10 @@ export default {
spcCheck = true;
}
if (
(detail.value > ele.max_value && ele.max_value !== "") ||
(detail.value < ele.min_value && ele.min_value !== "")
(detail.value > ele.max_value &&
ele.max_value !== "") ||
(detail.value < ele.min_value &&
ele.min_value !== "")
) {
if (
detail.value !== null &&
......@@ -942,11 +1060,14 @@ export default {
if (
(detail.upperlimit > ele.max_value ||
detail.lowerlimit < ele.min_value ||
detail.upperlimit - detail.lowerlimit > ele.range ||
detail.upperlimit - detail.lowerlimit >
ele.range ||
detail.upperlimit < ele.min_value ||
detail.lowerlimit > ele.max_value ||
(detail.value > ele.max_value && ele.max_value !== "") ||
(detail.value < ele.min_value && ele.min_value !== "")) &&
(detail.value > ele.max_value &&
ele.max_value !== "") ||
(detail.value < ele.min_value &&
ele.min_value !== "")) &&
detail.upperlimit !== null &&
detail.upperlimit !== undefined &&
detail.upperlimit !== "" &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment