Skip to content

L
Laisi_AutoMES2
Commit 3b7a947e by xin.yang
Options

Merge branch 'master' of http://test.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

parents a478b1b4 5b3c335c
Showing with 498 additions and 10 deletions
Html/src/view/fml/operation_manage/feedingBlanking.vue
<template> <template>
<div> <div>
员工上下料管理 员工上下料管理
</div> <div class="divborder">
<div class="choose">
<p class="selectTitle">
1.请选择生产线
<span class="red">*</span>
</p>
<div class="row">
<p
:key="index"
class="options"
v-for="(item, index) in productionLine"
@click="change(index)"
:class="{ active: a == index }"
>
{{ item.title }}
</p>
</div>
<div class="choose">
<p class="selectTitle">
2.上下料工位
<span class="red">*</span>
</p>
<div class="row">
<p
:key="index"
class="options"
v-for="(item, index) in productionLine"
@click="change(index)"
:class="{ active: a == index }"
>
{{ item.title }}
</p>
</div>
</div>
<div class="choose">
<p class="selectTitle">
3.操作
<span class="red">*</span>
</p>
<Tabs type="card">
<TabPane label="上料">
<div class="filter">
<label>上料信息：</label>
<Input
type="text"
class="searchInput"
style="width: 300px"
></Input>
</div>
<div class="row">
<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>
<div class="row">
<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>
<Button type="primary">储位选择</Button>
</div>
<div>
<Button type="primary">准备上料</Button>
<Button type="primary">安装完成</Button>
</div>
</TabPane>
<TabPane label="下料">下料</TabPane>
</Tabs>
<Modal
class="newModalClass"
:title="$t(900249)"
v-model="modal"
:styles="{ width: '940px' }"
>
<div class="modal_body" style="padding-right: 40px">
<Table
class="tableClass"
:data="data1"
:columns="columns1"
:max-height="200"
></Table>
</div>
<div slot="footer">
<Button
type="text"
size="large"
@click="modal = false"
v-text="$t('1033')"
>取消</Button
>
<Button
type="primary"
size="large"
v-text="$t('1011')"
>提交</Button
>
</div>
</Modal>
</div>
</div>
</div>
</div>
</template> </template>
<script> <script>
export default { export default {
data() {
} return {
productionLine: [],
a: 0,
modal:false,
columns1:[],
data1:[]
};
},
created() {},
methods: {
change(i) {
this.a = i;
// 1. 选中产线后自动带出来工位属性中为上下料属性的工位
},
},
};
</script> </script>
<style> <style scoped>
.selectTitle {
font-size: 18px;
}
.row {
display: flex;
flex-direction: row;
flex-wrap: wrap;
flex-shrink: 1;
}
.options {
font-size: 12px;
padding: 0 12px;
/* width: 100px; */
height: 50px;
line-height: 50px;
text-align: center;
border-radius: 5px;
background-color: #f2f2f2;
margin: 10px 0;
margin-right: 50px;
cursor: pointer;
}
.active {
background-color: #2d8cf0;
color: #fff;
}
.actionTitle {
height: 50px;
width: 100px;
line-height: 50px;
font-size: 25px;
text-align: center;
/* border: 1px solid #b2b2b2; */
/* color: #c0c0c0; */
}
.flex {
display: flex;
}
.infoLabel {
display: inline-block;
margin-right: 10px;
width: 100px;
text-align: right;
font-size: 16px;
}
.info {
display: inline-block;
width: 200px;
font-size: 20px;
}
</style> </style>
\ No newline at end of file
Html/src/view/fml/statistical_analysis/taskList.vue
<template> <template>
<div> <div class="testdiv">
任务清单管理 \任务清单管理
<div class="divborder">
<h2>基本信息</h2>
<div class="newSearchDiv">
<div class="filter">
<label>{{ $t("1950574") }}：</label>
<Cascader trigger="click" class="searchSelect"></Cascader>
</div>
<div class="filter">
<label>任务类型：</label>
<Select
label-in-value
clearable
filterable
class="searchSelect"
>
</Select>
</div>
<div class="filter">
<label>发起地：</label>
<Select
label-in-value
clearable
filterable
class="searchSelect"
>
</Select>
</div>
<div class="filter">
<label>产品编号：</label>
<Select
label-in-value
clearable
filterable
class="searchSelect"
>
</Select>
</div>
<div class="filter">
<label>任务编号：</label>
<Input type="text" class="searchInput"></Input>
</div>
<div class="filter">
<label>工件编号：</label>
<Input type="text" class="searchInput"></Input>
</div>
<div class="filter">
<label>状态：</label>
<Select
label-in-value
clearable
filterable
class="searchSelect"
>
</Select>
</div>
<div class="filter">
<label>执行类型：</label>
<Select
label-in-value
clearable
filterable
class="searchSelect"
>
</Select>
</div>
<div class="filter">
<label>触发时间：</label>
<DatePicker
type="datetimerange"
placeholder="Select date"
style="width: 200px"
></DatePicker>
</div>
<div class="filter">
<label>完成时间：</label>
<DatePicker
type="datetimerange"
placeholder="Select date"
style="width: 200px"
></DatePicker>
</div>
<div class="searchBtn">
<Button type="primary" class="twoWord" icon="ios-search">{{
$t("1001")
}}</Button>
<!-- -->
<Button type="primary" class="twoWord" icon="ios-search"
>取消</Button
><!--只有状态是待执行的可以改成取消-->
<Button type="primary" class="twoWord" icon="ios-search"
>手动</Button
><!--当生产线的模式是手动是才可以进行手动任务执行-->
<Button type="primary" class="twoWord" icon="ios-search"
>导出</Button
>
</div>
</div>
</div>
<div class="divborder newTableDiv">
<Table class="tableClass" :columns="columns1" :data="data1"></Table>
<div class="pageDiv">
<div class="pageDirection">
<Page
:total="total"
:current="page"
show-elevator
show-sizer
show-total
:page-size-opts="[10, 20, 30, 40, 100]"
></Page>
</div>
</div>
</div>
</div> </div>
</template> </template>
<script> <script>
export default {}; export default {
data() {
return {
columns1: [
{
title: this.$t('1008'),
key: 'xuhao',
render: (h, params) => {
return h(
'span',
params.index + (this.page - 1) * this.pagesize + 1
);
},
width: 70
},
{
title: this.$t('100089'),
key: 'productcode',
minWidth: 150
},
],
data1: [],
total: 0,
page: 1,
pagesize: 10,
};
},
created() {
this.columns1 = this.$time.initTableTitle(this.columns1);
},
methods: {},
};
</script> </script>
<style> <style>
......
Html/src/view/fms/associate/assemblyInfo.vue
<template>
<div class="testdiv">
工装装配信息
<div class="divborder">
<h2>基本信息</h2>
<div class="newSearchDiv">
<div class="filter">
<label>工装类别：</label>
<Select
label-in-value
clearable
filterable
class="searchSelect"
>
</Select>
</div>
<div class="filter">
<label>夹具类型：</label>
<Select
label-in-value
clearable
filterable
class="searchSelect"
>
</Select>
</div>
<div class="searchBtn">
<Button
type="primary"
class="twoWord"
icon="ios-search"
@click="search(1, 10)"
>{{ $t("1001") }}</Button
>
<Button
type="success"
class="twoWord"
icon="md-add-circle"
@click="add()"
>{{ $t("1002") }}</Button
>
<Button
type="warning"
class="twoWord"
icon="ios-create-outline"
@click="edit()"
>{{ $t("1003") }}</Button
>
<Button
type="error"
class="twoWord intervalRight"
icon="md-close-circle"
@click="dele()"
>{{ $t("1004") }}</Button
>
<Button
type="primary"
class="fourWord"
icon="md-download"
@click="loadExcel()"
>{{ $t("1005") }}</Button
>
<!-- <Upload
style="display: inline-block"
ref="upload"
:action="action"
name="excel-file"
:headers="headers"
:show-upload-list="false"
:on-format-error="handleFormatError"
:on-success="handleSuccess"
:on-error="handleError"
:format="['xlsx']"
> -->
<Button
type="primary"
class="fourWord"
icon="md-cloud-upload"
>{{ $t("1006") }}</Button
>
<!-- </Upload> -->
<Button
type="primary"
class="fourWord"
icon="ios-cloud-download"
@click="exportEecel()"
>{{ $t("1007") }}</Button
>
</div>
</div>
</div>
<div class="divborder newTableDiv">
<Table class="tableClass" :columns="columns1" :data="data1"></Table>
<div class="pageDiv">
<div class="pageDirection">
<Page
:total="total"
:current="page"
show-elevator
show-sizer
show-total
:page-size-opts="[10, 20, 30, 40, 100]"
></Page>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
columns1: [
{
title: this.$t("1008"),
key: "xuhao",
render: (h, params) => {
return h(
"span",
params.index + (this.page - 1) * this.pagesize + 1
);
},
width: 70,
},
{
title: this.$t("100089"),
key: "productcode",
minWidth: 150,
},
],
data1: [],
total: 0,
page: 1,
pagesize: 10,
};
},
created() {
this.columns1 = this.$time.initTableTitle(this.columns1);
},
methods: {
search(page,pagesize){},
add(){},
edit(){},
dele(){},
loadExcel(){},
exportEecel(){},
},
};
</script>
<style>
</style>
\ No newline at end of file
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