Skip to content

L
Laisi_AutoMES2
Commit 76c4f5d7 by lyy
Options

add

parent bc381f49
Showing with 238 additions and 74 deletions
Html/src/view/fml/operation_manage/feedingBlanking.vue
......@@ -24,15 +24,16 @@
<span class="red">*</span>
</p>
<div class="row">
<p
<div
:key="index"
class="options"
v-for="(item, index) in productionLine"
class="options2"
v-for="(item, index) in stationList"
@click="change(index)"
:class="{ active: a == index }"
>
{{ item.title }}
</p>
<p>{{ item.title }}</p>
<p>{{ item.status == 1 ? "待上料" : "运行中" }}</p>
</div>
</div>
</div>
<div class="choose">
......@@ -46,11 +47,8 @@
<label style="font-size: 16px"
>上料信息：</label
>
<Input
type="text"
class="searchInput"
style="width: 300px"
></Input>
<Input type="text" class="searchInput"
style="width: 300px"/>
</div>
<div class="row">
<p class="flex">
......@@ -277,20 +275,25 @@ export default {
method: "get",
})
.then((res) => {
this.productionLine = res.data.data;
// this.change(0);
if (this.productionLine.length == 0) {
this.$Message.error(this.$t(950057));
if (res.data.ret == 1) {
this.productionLine = res.data.data;
// this.change(0);
if (this.productionLine.length == 0) {
this.$Message.error(this.$t(950057));
}
}
});
},
getStations(id) {
let data = {
line: id,
type: 0,
};
this.request(
"/qms/RepairPostionSetting/GetSettingByChanel?Id=" + id,
"",
"/acc/AutomationOperate/GetloadStation",
data,
"get"
).then((res) => {
// console.log(res.data.data);
if (res.data.ret == 1) {
this.stationList = res.data.data;
}
......@@ -374,6 +377,18 @@ export default {
margin-right: 50px;
cursor: pointer;
}
.options2 {
font-size: 12px;
padding: 0 12px;
height: 50px;
line-height: 25px;
text-align: center;
border-radius: 5px;
background-color: #f2f2f2;
margin: 10px 0;
margin-right: 50px;
cursor: pointer;
}
.active {
background-color: #2d8cf0;
color: #fff;
......
Html/src/view/fml/statistical_analysis/lineMonitor.vue
......@@ -4,15 +4,23 @@
<h2>基本信息</h2>
<div class="newSearchDiv">
<div class="filter">
<label>{{ $t("1950574") }}：</label>
<Cascader trigger="click" class="searchSelect"></Cascader>
<label>{{ $t("1132") }}：</label>
<Cascader
trigger="click"
class="searchSelect"
:data="datalevel"
:value="leveldata"
></Cascader>
</div>
<div class="searchBtn">
<Button type="primary" class="twoWord" icon="ios-search">{{
$t("1001")
}}</Button>
<Button type="primary" class="twoWord" icon="ios-search"
<Button
type="primary"
class="twoWord"
icon="ios-search"
@click="search()"
>{{ $t("1001") }}</Button
>
<Button type="primary" class="twoWord" icon="ios-search" @click="exportExcel()"
>导出</Button
>
</div>
......@@ -26,28 +34,30 @@
<p><span>4</span>不可用</p>
</div>
<div class="stateWrap">
<div class="stateItem">
<p class="flex">
<span class="infoLabel">工位：</span>
<span class="info"></span>
</p>
<p class="flex">
<span class="infoLabel">产品：</span>
<span class="info"></span>
</p>
<p class="flex">
<span class="infoLabel">工装：</span>
<span class="info"></span>
</p>
<p class="flex">
<span class="infoLabel">储位：</span>
<span class="info"></span>
</p>
<p class="flex">
<span class="infoLabel">工件：</span>
<span class="info"></span>
</p>
</div>
<template v-for="(item,index) in stateList">
<div class="stateItem" :key="index">
<p class="flex">
<span class="infoLabel">工位：</span>
<span class="info">{{item}}</span>
</p>
<p class="flex">
<span class="infoLabel">产品：</span>
<span class="info"></span>
</p>
<p class="flex">
<span class="infoLabel">工装：</span>
<span class="info"></span>
</p>
<p class="flex">
<span class="infoLabel">储位：</span>
<span class="info"></span>
</p>
<p class="flex">
<span class="infoLabel">工件：</span>
<span class="info"></span>
</p>
</div>
</template>
</div>
<Table
class="tableClass"
......@@ -55,29 +65,36 @@
:columns="columns1"
:max-height="200"
></Table>
<Table
class="tableClass"
:data="data2"
:columns="columns2"
:max-height="200"
></Table>
<Table
class="tableClass"
:data="data3"
:columns="columns3"
:max-height="200"
></Table>
<div v-show="show1">
<Table
class="tableClass"
:data="data2"
:columns="columns2"
:max-height="200"
></Table>
</div>
<div v-show="show2">
<Table
class="tableClass"
:data="data3"
:columns="columns3"
:max-height="200"
></Table>
</div>
</div>
</div>
</template>
<script>
import axios from "@/libs/api.request";
export default {
data() {
return {
productionLine: [],
a: 0,
modal: false,
leveldata: [], // 产线层级插件所需数据
datalevel: [], // 产线层级选中数据
stateList:[0],
columns1: [
{
title: this.$t("1008"),
......@@ -101,6 +118,19 @@ export default {
{
title: "工装编号",
key: "install_sn",
render: (h, params) => {
return h(
"a",
{
on: {
click: () => {
this.show1 = true;
},
},
},
"look"
);
},
},
{
title: "产品编号",
......@@ -109,6 +139,19 @@ export default {
{
title: "工件编号",
key: "storage_sn",
render: (h, params) => {
return h(
"a",
{
on: {
click: () => {
this.show2 = true;
},
},
},
"look"
);
},
},
{
title: "状态",
......@@ -157,11 +200,43 @@ export default {
key: "install_sn",
},
{
title: "最后更新时间",
title: "子工装编号",
key: "install_sn",
},
{
title: "子工装名称",
key: "install_sn",
},
{
title: "子工装规格",
key: "install_sn",
},
{
title: "子工装编号",
key: "install_sn",
},
{
title: "状态",
key: "install_sn",
},
{
title: "备注",
key: "install_sn",
},
{
title: "附件",
key: "install_sn",
},
{
title: "维护人",
key: "install_sn",
},
{
title: "维护时间",
key: "workpiece_sn",
},
],
data1: [],
data2: [],
columns3: [
{
title: this.$t("1008"),
......@@ -175,38 +250,94 @@ export default {
width: 70,
},
{
title: "产线层级",
title: "产品编号",
key: "warehouse",
},
{
title: "设备",
title: "产品名称",
key: "storage_sn",
},
{
title: "工装编号",
title: "产品编号",
key: "install_sn",
},
{
title: "产品编号",
title: "工序顺序",
key: "workpiece_sn",
},
{
title: "工件编号",
title: "工序信息",
key: "storage_sn",
},
{
title: "状态",
title: "产线层级",
key: "install_sn",
},
{
title: "最后更新时间",
title: "设备信息",
key: "workpiece_sn",
},
{
title: "工装信息",
key: "workpiece_sn",
},
{
title: "结果",
key: "workpiece_sn",
},
{
title: "维护人",
key: "workpiece_sn",
},
{
title: "维护时间",
key: "workpiece_sn",
},
],
data1: [],
data3: [],
show2: false,
show1: false,
};
},
created() {},
created() {
this.initlevel();
},
methods: {
search() {},
initlevel() {
// 初始化产线层级
this.axios
.request({
url: "config/ProjectLevelSection/GetSectionTree",
method: "get",
})
.then((res) => {
const arr = [];
if (res.data.data.length > 0) {
this.datalevel = res.data.data;
arr.push(res.data.data[0].value);
this.leveldata = arr;
}
});
},
exportExcel(){
let data = {};
this.axios
.request({
url: "",
data,
method: "",
})
.then((res) => {
if (res.data.ret === 1) {
window.location.href =
axios.publicPath + "" + res.data.data;
} else {
this.$Message.error(this.$t(res.data.msg));
}
});
}
},
};
</script>
......
Html/src/view/fml/statistical_analysis/taskList.vue
......@@ -44,11 +44,11 @@
</div>
<div class="filter">
<label>任务编号：</label>
<Input type="text" class="searchInput"></Input>
<Input type="text" class="searchInput" />
</div>
<div class="filter">
<label>工件编号：</label>
<Input type="text" class="searchInput"></Input>
<Input type="text" class="searchInput"/>
</div>
<div class="filter">
<label>状态：</label>
......@@ -138,6 +138,8 @@
</template>
<script>
import axios from "@/libs/api.request";
export default {
data() {
return {
......@@ -259,6 +261,23 @@ export default {
}
});
},
exportExcel(){
let data = {};
this.axios
.request({
url: "",
data,
method: "",
})
.then((res) => {
if (res.data.ret === 1) {
window.location.href =
axios.publicPath + "" + res.data.data;
} else {
this.$Message.error(this.$t(res.data.msg));
}
});
}
},
};
</script>
......
Html/src/view/tlm/config/tool_boom.vue
......@@ -722,7 +722,6 @@ export default {
alert(err.msg);
});
},
request(url, data, type) {
if (type == "get") {
return 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