Skip to content

L
Laisi_AutoMES2
Commit cd2bd4b3 by yiyu.li
Options

add

parent 8a665cad
Showing with 109 additions and 39 deletions
Html/src/view/fml/operation_manage/feedingBlanking.vue
...@@ -88,10 +88,12 @@ ...@@ -88,10 +88,12 @@
<span class="infoLabel">状态：</span> <span class="infoLabel">状态：</span>
<span class="info">{{ <span class="info">{{
orderDetail.status == 1 orderDetail.status == 1
? "待上料" ? "待上料"
: orderDetail.status == 2 : orderDetail.status == 2
? "运行中" ? "运行中"
: "待下料" : orderDetail.status == 3
? "待下料"
: ""
}}</span> }}</span>
</p> </p>
<p class="flex"> <p class="flex">
...@@ -176,7 +178,9 @@ ...@@ -176,7 +178,9 @@
? "待上料" ? "待上料"
: orderDetail.status == 2 : orderDetail.status == 2
? "运行中" ? "运行中"
: "待下料" : orderDetail.status == 3
? "待下料"
: ""
}}</span> }}</span>
</p> </p>
<p class="flex"> <p class="flex">
......
Html/src/view/fml/statistical_analysis/lineMonitor.vue
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
class="searchSelect" class="searchSelect"
:data="datalevel" :data="datalevel"
:value="leveldata" :value="leveldata"
@on-change="getSectionId"
></Cascader> ></Cascader>
</div> </div>
<div class="searchBtn"> <div class="searchBtn">
...@@ -20,7 +21,11 @@ ...@@ -20,7 +21,11 @@
@click="search()" @click="search()"
>{{ $t("1001") }}</Button >{{ $t("1001") }}</Button
> >
<Button type="primary" class="twoWord" icon="ios-search" @click="exportExcel()" <Button
type="primary"
class="twoWord"
icon="ios-search"
@click="exportExcel()"
>导出</Button >导出</Button
> >
</div> </div>
...@@ -28,33 +33,33 @@ ...@@ -28,33 +33,33 @@
</div> </div>
<div class="divborder"> <div class="divborder">
<div class="stateTitle flex"> <div class="stateTitle flex">
<p><span>4</span>生产中</p> <p><span>{{summary.produceTotal}}</span>生产中</p>
<p><span>4</span>待下料</p> <p><span>{{summary.complateTotal}}</span>待下料</p>
<p><span>4</span>待上料</p> <p><span>{{summary.waittingTotal}}</span>待上料</p>
<p><span>4</span>不可用</p> <p><span>{{summary.disableTotal}}</span>不可用</p>
</div> </div>
<div class="stateWrap"> <div class="stateWrap">
<template v-for="(item,index) in stateList"> <template v-for="(item, index) in stateList">
<div class="stateItem" :key="index"> <div class="stateItem" :key="index" :style="{background:item.bgc}">
<p class="flex"> <p class="flex">
<span class="infoLabel">工位：</span> <span class="infoLabel">工位：</span>
<span class="info">{{item}}</span> <span class="info">{{ item.section }}</span>
</p> </p>
<p class="flex"> <p class="flex">
<span class="infoLabel">产品：</span> <span class="infoLabel">产品：</span>
<span class="info"></span> <span class="info">{{item.product}}</span>
</p> </p>
<p class="flex"> <p class="flex">
<span class="infoLabel">工装：</span> <span class="infoLabel">工装：</span>
<span class="info"></span> <span class="info">{{item.fixtureName}}</span>
</p> </p>
<p class="flex"> <p class="flex">
<span class="infoLabel">储位：</span> <span class="infoLabel">储位：</span>
<span class="info"></span> <span class="info">{{item.location}}</span>
</p> </p>
<p class="flex"> <p class="flex">
<span class="infoLabel">工件：</span> <span class="infoLabel">工件：</span>
<span class="info"></span> <span class="info">{{item.sn}}</span>
</p> </p>
</div> </div>
</template> </template>
...@@ -63,14 +68,14 @@ ...@@ -63,14 +68,14 @@
class="tableClass" class="tableClass"
:data="data1" :data="data1"
:columns="columns1" :columns="columns1"
:max-height="200"
></Table> ></Table>
<div v-show="show1"> <div v-show="show1">
<Table <Table
class="tableClass" class="tableClass"
:data="data2" :data="data2"
:columns="columns2" :columns="columns2"
:max-height="200"
></Table> ></Table>
</div> </div>
<div v-show="show2"> <div v-show="show2">
...@@ -78,7 +83,7 @@ ...@@ -78,7 +83,7 @@
class="tableClass" class="tableClass"
:data="data3" :data="data3"
:columns="columns3" :columns="columns3"
:max-height="200"
></Table> ></Table>
</div> </div>
</div> </div>
...@@ -94,7 +99,7 @@ export default { ...@@ -94,7 +99,7 @@ export default {
productionLine: [], productionLine: [],
leveldata: [], // 产线层级插件所需数据 leveldata: [], // 产线层级插件所需数据
datalevel: [], // 产线层级选中数据 datalevel: [], // 产线层级选中数据
stateList:[0], stateList: [0],
columns1: [ columns1: [
{ {
title: this.$t("1008"), title: this.$t("1008"),
...@@ -102,22 +107,22 @@ export default { ...@@ -102,22 +107,22 @@ export default {
render: (h, params) => { render: (h, params) => {
return h( return h(
"span", "span",
params.index + (this.page - 1) * this.pagesize + 1 params.index+1
); );
}, },
width: 70, width: 70,
}, },
{ {
title: "产线层级", title: "产线层级",
key: "warehouse", key: "section",
},
{
title: "设备",
key: "storage_sn",
}, },
// {
// title: "设备",
// key: "storage_sn",
// },
{ {
title: "工装编号", title: "工装编号",
key: "install_sn", key: "fixtureName",
render: (h, params) => { render: (h, params) => {
return h( return h(
"a", "a",
...@@ -134,11 +139,11 @@ export default { ...@@ -134,11 +139,11 @@ export default {
}, },
{ {
title: "产品编号", title: "产品编号",
key: "workpiece_sn", key: "product",
}, },
{ {
title: "工件编号", title: "工件编号",
key: "storage_sn", key: "sn",
render: (h, params) => { render: (h, params) => {
return h( return h(
"a", "a",
...@@ -155,7 +160,7 @@ export default { ...@@ -155,7 +160,7 @@ export default {
}, },
{ {
title: "状态", title: "状态",
key: "install_sn", key: "status",
}, },
{ {
title: "最后更新时间", title: "最后更新时间",
...@@ -297,13 +302,52 @@ export default { ...@@ -297,13 +302,52 @@ export default {
data3: [], data3: [],
show2: false, show2: false,
show1: false, show1: false,
sectionid:0,
summary:{}
}; };
}, },
created() { created() {
this.initlevel(); this.initlevel();
this.search();
}, },
methods: { methods: {
search() {}, search() {
// 初始化产线层级
this.axios
.request({
url: "/acc/AutomationState/GetStationMonitor?section="+this.sectionid,
method: "get",
})
.then((res) => {
const arr = [];
if (res.data.ret == 1) {
console.log(res.data.data);
// this.stateList = res.data.data.dts;
let arr = [];
arr = res.data.data.dts;
arr.forEach(ele => {
let bgc = '';
if (ele.enable == 0) {
bgc = 'red'
}
if(ele.status ==1){
bgc = '#2db7f5'
}
if(ele.status ==2){
bgc = '#ff9900'
}
if(ele.status ==3){
bgc = '#19be6b'
}
ele.bgc = bgc
});
this.stateList = arr;
this.data1 = arr;
this.summary = res.data.data.sum;
console.log(this.summary);
}
});
},
initlevel() { initlevel() {
// 初始化产线层级 // 初始化产线层级
this.axios this.axios
...@@ -320,7 +364,11 @@ export default { ...@@ -320,7 +364,11 @@ export default {
} }
}); });
}, },
exportExcel(){ getSectionId(val){
this.leveldata = val;
this.sectionid = this.leveldata.length>0?this.leveldata[this.leveldata.length-1]:0;
},
exportExcel() {
let data = {}; let data = {};
this.axios this.axios
.request({ .request({
...@@ -336,7 +384,7 @@ export default { ...@@ -336,7 +384,7 @@ export default {
this.$Message.error(this.$t(res.data.msg)); this.$Message.error(this.$t(res.data.msg));
} }
}); });
} },
}, },
}; };
</script> </script>
...@@ -347,12 +395,15 @@ export default { ...@@ -347,12 +395,15 @@ export default {
} }
.stateWrap { .stateWrap {
margin: 20px 10px; margin: 20px 10px;
display: flex;
flex-wrap: wrap;
} }
.stateItem { .stateItem {
border: 1px solid #000; border: 1px solid #d3d3d3;
width: 200px; width: 300px;
height: 150px; // height: 150px;
padding-left: 10px; padding-left: 10px;
margin: 10px;
p { p {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
......
Html/src/view/fms/associate/assemblyInfo.vue
...@@ -587,8 +587,23 @@ export default { ...@@ -587,8 +587,23 @@ export default {
}); });
} }
}, },
loadExcel() {}, loadExcel() {
exportEecel() {}, // this.axios.request({
// url: "/config/Download/GetTemplate?name=StorageLocation",
// method: "get",
// })
// .then((res) => {
// if (res.data.ret === 1) {
// window.location.href =
// this.axios.publicPath + "" + res.data.data;
// } else {
// this.$Message.error(this.$t(res.data.msg));
// }
// });
},
exportEecel() {
},
//工装类型 //工装类型
initFrockType() { initFrockType() {
this.axios this.axios
......
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