Skip to content

M
mes-ui
Commit 2f4b52fd authored by 周远喜's avatar 周远喜
Browse files
Options

okkk

parent d257f0e2
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 283 deletions
pages/aps/aps/add.vue
View file @ 2f4b52fd
<template> <template>
<div class="parameter"> <div class="parameter">
<Form ref="form" :model="entity" :label-width="100"> <Form ref="form" :model="entity" :rules="rules" :label-width="100">
<Row :gutter="20"> <Row :gutter="20">
<Col span="12"> <Col span="12">
<div class="filedset" style="height:238px">
<p class="title">多台分配设置</p>
<div class="duo">
<FormItem :label="l('multi_machine')" prop="multiple">
<i-switch v-model="entity.multiple" size="large">
<span slot="open">是</span>
<span slot="close">否</span>
</i-switch>
</FormItem>
<FormItem label="多台数量" prop="multipleCount">
<InputNumber v-model="entity.multipleCount"></InputNumber>
</FormItem>
<FormItem label="生产设备">
<EquipSelect v-model="entity.multipleEquipPks" multiple></EquipSelect>
</FormItem>
</div>
</div>
<div class="filedset"> <div class="filedset">
<p class="title">快速设置</p> <p class="title">快速设置</p>
<div class="icon"> <div class="icon">
...@@ -42,57 +59,31 @@ ...@@ -42,57 +59,31 @@
</Dropdown> </Dropdown>
</div> </div>
<div class="slider"> <div class="slider">
<h3 v-text="entity.level"></h3>
<Slider <Slider
v-model="entity.level" v-model="entity.level"
:step="1" :step="1"
:min="1" :min="0"
:max="5" :max="levelRules.length-1"
:marks="{1:'慢',5:'快'}" :marks="levelMarks"
show-stops show-stops
@on-change="setParameter"
></Slider> ></Slider>
</div>
</div>
<div class="filedset" style="height:238px">
<p class="title">多台分配设置</p>
<div class="duo">
<FormItem :label="l('multi_machine')" prop="multipleEquip">
<i-switch v-model="entity.multipleEquip" size="large">
<span slot="open">是</span>
<span slot="close">否</span>
</i-switch>
</FormItem>
<FormItem label="多台数量" prop="multipleCount">
<InputNumber v-model="entity.multipleCount"></InputNumber>
</FormItem>
<FormItem label="生产设备">
<EquipSelect v-model="entity.multipleEquipIds"></EquipSelect>
</FormItem>
<!-- <div class="check-box">
<CheckboxGroup v-model="entity.fruit">
<Checkbox label="10985553333（数控车床 车工班）"></Checkbox>
<br />
<Checkbox label="10985553333（数控车床 车工班）"></Checkbox>
<br />
<Checkbox label="10985553333（数控车床 车工班）"></Checkbox>
<br />
<Checkbox label="10985553333（数控车床 车工班）"></Checkbox>
<br />
</CheckboxGroup>
</div>-->
</div> </div>
</div> </div>
<div class="filedset"> <div class="filedset">
<p class="title">应用范围</p> <p class="title">应用范围</p>
<div class="slider"> <div class="slider">
<Slider v-model="entity.flog" :step="1" :min="1" :max="5" :marks="marks" size="large"></Slider> <Slider v-model="entity.flog" :step="1" :min="0" :max="5" :marks="marks" size="large"></Slider>
</div> </div>
</div> </div>
</Col> </Col>
<Col span="12"> <Col span="12">
<div class="filedset"> <div class="filedset">
<p class="title">参数设置</p> <p class="title">参数设置</p>
<FormItem :label="l('plan_method')" prop="planMethod"> <FormItem :label="l('plan_method')" prop="planState">
<i-switch v-model="entity.plan" size="large"> <i-switch v-model="entity.planState" size="large">
<span slot="open">平行</span> <span slot="open">平行</span>
<span slot="close">重叠</span> <span slot="close">重叠</span>
</i-switch> </i-switch>
...@@ -108,7 +99,7 @@ ...@@ -108,7 +99,7 @@
</Select> </Select>
</FormItem> </FormItem>
<Divider /> <Divider />
<FormItem :label="l('overTime')" prop="overTime"> <FormItem :label="l('overTime')" prop="over">
<i-switch v-model="entity.over" size="large"> <i-switch v-model="entity.over" size="large">
<span slot="open">加班</span> <span slot="open">加班</span>
<span slot="close">不加班</span> <span slot="close">不加班</span>
...@@ -118,7 +109,7 @@ ...@@ -118,7 +109,7 @@
<InputNumber v-model="entity.efficiencyValue" :step="0.1"></InputNumber> <InputNumber v-model="entity.efficiencyValue" :step="0.1"></InputNumber>
</FormItem> </FormItem>
<Divider /> <Divider />
<FormItem :label="l('isDiscrete')" prop="isDiscrete"> <FormItem :label="l('isDiscrete')" prop="lisan">
<i-switch v-model="entity.lisan" size="large"> <i-switch v-model="entity.lisan" size="large">
<span slot="open">是</span> <span slot="open">是</span>
<span slot="close">否</span> <span slot="close">否</span>
...@@ -151,8 +142,8 @@ export default { ...@@ -151,8 +142,8 @@ export default {
taskSeq: "", taskSeq: "",
flog: 0, //参数应用范围 flog: 0, //参数应用范围
level: 0, //参数规则ID level: 0, //参数规则ID
planState: true,
calId: null, calId: null,
planState: true,
planMethod: "重叠", // 平行 重叠 planMethod: "重叠", // 平行 重叠
over: false, over: false,
overTime: "不加班", //"六日加班", 不加班 加班 overTime: "不加班", //"六日加班", 不加班 加班
...@@ -161,250 +152,29 @@ export default { ...@@ -161,250 +152,29 @@ export default {
lisan: true, lisan: true,
isDiscrete: "否", isDiscrete: "否",
discrete: 1, //离散数值 必须大于 1 discrete: 1, //离散数值 必须大于 1
multiple: false, multiple: true,
multipleEquip: "是", //"是否多台安排设备", 否 是 multipleEquip: "是", //"是否多台安排设备", 否 是
multipleCount: 1, //多台数量 multipleCount: 1, //多台数量
multipleEquipPks: [], multipleEquipPks: [],
multipleEquipIds: "" //"设备id", 用英文逗号分隔 multipleEquipIds: "" //"设备id", 用英文逗号分隔
}, },
levelRules:[], levelRules:[],
levelRules2: [ levelMarks: {
{ 0: "慢",
level: 0, 5: "快"
prams: [ },
{ rules: {
parameterLevel: "0", // calId: [
parameterName: "转序规则", // { required: true, message: "必填", type: "number", trigger: "change" }
parametersCode: "PlanMethod", // ]
parameterValue: "重叠", },
parametersState: "1",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 1
},
{
parameterLevel: "0",
parameterName: "六日加班",
parametersCode: "OverTime",
parameterValue: "加班",
parametersState: "1",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 2
},
{
parameterLevel: "0",
parameterName: "是否离散",
parametersCode: "Discrete",
parameterValue: "0",
parametersState: "0",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 3
}
]
},
{
level: 1,
prams: [
{
parameterLevel: "1",
parameterName: "转序规则",
parametersCode: "PlanMethod",
parameterValue: "平行",
parametersState: "1",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 4
},
{
parameterLevel: "1",
parameterName: "六日加班",
parametersCode: "OverTime",
parameterValue: "加班",
parametersState: "0",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 5
},
{
parameterLevel: "1",
parameterName: "是否离散",
parametersCode: "Discrete",
parameterValue: "0",
parametersState: "0",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 6
}
]
},
{
level: 2,
prams: [
{
parameterLevel: "2",
parameterName: "转序规则",
parametersCode: "PlanMethod",
parameterValue: "重叠",
parametersState: "1",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 7
},
{
parameterLevel: "2",
parameterName: "六日加班",
parametersCode: "OverTime",
parameterValue: "加班",
parametersState: "1",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 8
},
{
parameterLevel: "2",
parameterName: "是否离散",
parametersCode: "Discrete",
parameterValue: "0",
parametersState: "1",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 9
}
]
},
{
level: 3,
prams: [
{
parameterLevel: "3",
parameterName: "转序规则",
parametersCode: "PlanMethod",
parameterValue: "平行",
parametersState: "1",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 10
},
{
parameterLevel: "3",
parameterName: "六日加班",
parametersCode: "OverTime",
parameterValue: "加班",
parametersState: "1",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 11
},
{
parameterLevel: "3",
parameterName: "是否离散",
parametersCode: "Discrete",
parameterValue: "0",
parametersState: "0",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 12
}
]
},
{
level: 4,
prams: [
{
parameterLevel: "4",
parameterName: "转序规则",
parametersCode: "PlanMethod",
parameterValue: "重叠",
parametersState: "0",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 13
},
{
parameterLevel: "4",
parameterName: "六日加班",
parametersCode: "OverTime",
parameterValue: "加班",
parametersState: "1",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 14
},
{
parameterLevel: "4",
parameterName: "是否离散",
parametersCode: "Discrete",
parameterValue: "0",
parametersState: "0",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 15
}
]
},
{
level: 5,
prams: [
{
parameterLevel: "5",
parameterName: "转序规则",
parametersCode: "PlanMethod",
parameterValue: "平行",
parametersState: "1",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 16
},
{
parameterLevel: "5",
parameterName: "六日加班",
parametersCode: "OverTime",
parameterValue: "加班",
parametersState: "1",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 17
},
{
parameterLevel: "5",
parameterName: "是否离散",
parametersCode: "Discrete",
parameterValue: "0",
parametersState: "0",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 18
}
]
}
],
list: [], list: [],
data1: [], data1: [],
marks: { marks: {
1: "工序", 0: "工序",
2: "计划", 1: "计划",
3: "零件", 2: "产品",
3: "项目",
4: "批次", 4: "批次",
5: "所有" 5: "所有"
}, },
...@@ -454,22 +224,54 @@ export default { ...@@ -454,22 +224,54 @@ export default {
apsGet() { apsGet() {
Api.apsGetall().then(res => { Api.apsGetall().then(res => {
if (res.success) { if (res.success) {
console.log(res.result)
this.levelRules = res.result; this.levelRules = res.result;
let max=this.levelRules.length-1;
// let marks = `{0:"慢", ${max}:"快"}`;
// marks = marks.replace(/(\d+):/g,"\"$1\":");
// this.levelMarks = JSON.parse(marks);
// this.entity.level=0;
}
});
},
setParameter(v) {
// alert(v)
let parameters = this.levelRules[v].prams;
parameters.map(u => {
if (u.parametersCode == "PlanMethod") {
this.entity.planState = u.parameterValue == "平行";
this.entity.planMethod = u.parameterValue;
} else if (u.parametersCode == "OverTime") {
this.entity.over = u.OverTime == "不加班";
this.entity.overTime = u.parameterValue;
} else if (u.parametersCode == "Discrete") {
this.entity.lisan = u.parameterValue == "是";
this.entity.isDiscrete = u.parameterValue;
} }
console.log(u);
}); });
}, },
handleSubmit() { handleSubmit() {
this.$refs.form.validate(valid => { this.$refs.form.validate(valid => {
if (valid) { if (valid) {
Api.apsschedulupdateparameter(this.entity).then(res => { this.entity.multipleEquipIds = this.entity.multipleEquipPks.join();
if (res.result.state) { this.entity.planMethod = this.entity.planState ? "重叠" : "平行";
this.$Message.success(res.result.msg); this.entity.overTime = this.entity.over ? "不加班" : "加班";
this.$emit("on-parameter-ok"); this.entity.isDiscrete = this.entity.lisan ? "是" : "否";
}else{ this.entity.multipleEquip = this.entity.multiple ? "是" : "否";
this.$Message.error(res.result.msg); Api.apsschedulupdateparameter(this.entity)
} .then(res => {
}); if (res.result.state) {
this.$Message.success(res.result.msg);
this.$emit("on-parameter-ok");
} else {
this.$Message.error(res.result.msg);
}
})
.catch(e => {
this.$Message.error("数据异常！");
});
} }
}); });
}, },
......
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