Skip to content

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

ok

parent 7d5ece4c
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 125 deletions
pages/aps/aps/add.vue
View file @ a6432029
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
<Form ref="form" :model="entity" :rules="rules" :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="left-up"> <div class="filedset">
<p class="title-c">参数设置</p> <p class="title">参数设置</p>
<FormItem :label="l('plan_method')" prop="plan_method"> <FormItem :label="l('plan_method')" prop="planMethod">
<i-switch v-model="entity.plan_method" size="large"> <i-switch v-model="entity.planMethod" size="large">
<span slot="open">On</span> <span slot="open">平行</span>
<span slot="close">Off</span> <span slot="close">重叠</span>
</i-switch> </i-switch>
</FormItem> </FormItem>
<FormItem :label="l('calId')" prop="calId"> <FormItem :label="l('calId')" prop="calId">
...@@ -21,22 +21,21 @@ ...@@ -21,22 +21,21 @@
></Option> ></Option>
</Select> </Select>
</FormItem> </FormItem>
<Divider />
<FormItem :label="l('overTime')" prop="overTime"> <FormItem :label="l('overTime')" prop="overTime">
<i-switch v-model="entity.overTime" size="large"> <i-switch v-model="entity.overTime" size="large">
<span slot="open">On</span> <span slot="open">加班</span>
<span slot="close">Off</span> <span slot="close">不加班</span>
</i-switch> </i-switch>
</FormItem> </FormItem>
<FormItem :label="l('efficiencyValue')" prop="efficiencyValue"> <FormItem :label="l('efficiencyValue')" prop="efficiencyValue">
<Input v-model="entity.efficiencyValue" style="width:150px"></Input> <InputNumber v-model="entity.efficiencyValue" :step="0.1"></InputNumber >
</FormItem> </FormItem>
<FormItem :label="l('run_time')" prop="run_time"> <Divider />
<InputNumber v-model="entity.run_time"></InputNumber>
</FormItem>
<FormItem :label="l('isDiscrete')" prop="isDiscrete"> <FormItem :label="l('isDiscrete')" prop="isDiscrete">
<i-switch v-model="entity.isDiscrete" size="large"> <i-switch v-model="entity.isDiscrete" size="large">
<span slot="open">On</span> <span slot="open">是</span>
<span slot="close">Off</span> <span slot="close">否</span>
</i-switch> </i-switch>
</FormItem> </FormItem>
<FormItem :label="l('discrete')" prop="discrete"> <FormItem :label="l('discrete')" prop="discrete">
...@@ -46,10 +45,10 @@ ...@@ -46,10 +45,10 @@
<InputNumber v-model="entity.discrete_percent"></InputNumber> <InputNumber v-model="entity.discrete_percent"></InputNumber>
</FormItem> </FormItem>
</div> </div>
<div class="left-donw"> <div class="filedset">
<p class="title-c">参数级别</p> <p class="title">参数级别</p>
<div class="icon"> <div class="icon">
<Dropdown trigger="custom" :visible="visible" style="width:150px"> <Dropdown trigger="click" >
<a href="javascript:void(0)" @click="handleOpen"> <a href="javascript:void(0)" @click="handleOpen">
<Icon type="md-git-compare" /> <Icon type="md-git-compare" />
</a> </a>
...@@ -86,44 +85,33 @@ ...@@ -86,44 +85,33 @@
</Dropdown> </Dropdown>
</div> </div>
<div class="slider"> <div class="slider">
<Slider v-model="entity.level" :step="20" show-stops></Slider> <Slider v-model="entity.level" :step="1" :min="1" :max="5" :marks="{1:'慢',5:'块'}" show-stops></Slider>
<div class="slow">慢</div>
<div class="fast">快</div>
</div> </div>
</div> </div>
</Col> </Col>
<Col span="12"> <Col span="12">
<div class="right-up"> <div class="filedset">
<p class="title-d">多台分配设置</p> <p class="title">多台分配设置</p>
<div class="duo"> <div class="duo">
<Row> <Row>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('multi_machine')" prop="multi_machine"> <FormItem :label="l('multi_machine')" prop="multipleEquip">
<i-switch v-model="entity.switch4" size="large"> <i-switch v-model="entity.multipleEquip" size="large">
<span slot="open">On</span> <span slot="open">是</span>
<span slot="close">Off</span> <span slot="close">否</span>
</i-switch> </i-switch>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem label="多台数量" prop="abbre"> <FormItem label="多台数量" prop="multipleCount">
<InputNumber v-model="entity.abbre"></InputNumber> <InputNumber v-model="entity.multipleCount"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
<FormItem label="班组结构"> <FormItem label="生产设备">
<Select v-model="entity.shopId" placeholder="请选择" style="width:150px" prop="shopId"> <EquipSelect v-model="entity.multipleEquipIds"> </EquipSelect>
<Option
v-for="(item,index) in list"
:key="index"
:value="item.value"
:label="item.title"
style="display:none"
></Option>
<Tree key="mytree" :data="data1" ref="mytree" :render="renderContent"></Tree>
</Select>
</FormItem> </FormItem>
<div class="check-box"> <!-- <div class="check-box">
<CheckboxGroup v-model="entity.fruit"> <CheckboxGroup v-model="entity.fruit">
<Checkbox label="10985553333（数控车床 车工班）"></Checkbox> <Checkbox label="10985553333（数控车床 车工班）"></Checkbox>
<br /> <br />
...@@ -134,17 +122,13 @@ ...@@ -134,17 +122,13 @@
<Checkbox label="10985553333（数控车床 车工班）"></Checkbox> <Checkbox label="10985553333（数控车床 车工班）"></Checkbox>
<br /> <br />
</CheckboxGroup> </CheckboxGroup>
</div> </div> -->
</div> </div>
</div> </div>
<div class="left-donw right-down"> <div class="filedset">
<p class="title-c">参数应用</p> <p class="title">参数应用</p>
<div class="slider"> <div class="slider">
<Slider v-model="entity.value2" :step="33.3" show-stops></Slider> <Slider v-model="entity.flog" :step="1" :min="1" :max="5" :marks="marks" size="large"></Slider>
<div class="slow">工序</div>
<div class="ding">订单</div>
<div class="ling">零件</div>
<div class="fast">所有</div>
</div> </div>
</div> </div>
</Col> </Col>
...@@ -165,13 +149,19 @@ export default { ...@@ -165,13 +149,19 @@ export default {
flog: 0, //参数应用 flog: 0, //参数应用
planMethod: "转序规则", // 平行 重叠 planMethod: "转序规则", // 平行 重叠
shopId: null, shopId: null,
level: 100, level: 1,
value2: 100, value2: 100,
fruit: [] fruit: []
}, },
list: [], list: [],
data1: [], data1: [],
marks:{
1:'工序',
2:'计划',
3:'零件',
4:'批次',
5:'所有',
},
listCal: [], listCal: [],
visible: false, visible: false,
rules: { rules: {
...@@ -256,9 +246,6 @@ export default { ...@@ -256,9 +246,6 @@ export default {
handleClose() { handleClose() {
this.$emit("on-close"); this.$emit("on-close");
}, },
handleOpen() {
this.visible = true;
},
handle() { handle() {
this.visible = false; this.visible = false;
}, },
...@@ -274,28 +261,13 @@ export default { ...@@ -274,28 +261,13 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.parameter { .parameter {
margin: 10px; margin: 10px;
.left-up { .filedset {
position: relative;
border: 1px solid #e0e0e0;
padding: 25px 0;
.title-c {
width: 68px;
padding-left: 5px;
background: #fff;
position: absolute;
top: -9px;
left: 25px;
color: #2680eb;
}
}
.left-donw {
margin-top: 15px;
position: relative; position: relative;
border: 1px solid #e0e0e0; border: 1px solid #e0e0e0;
padding: 25px 0; padding: 25px 0;
margin-bottom: 20px;
.title-c { .title {
width: 68px; display: inline-block;
padding-left: 5px; padding-left: 5px;
background: #fff; background: #fff;
position: absolute; position: absolute;
...@@ -303,62 +275,15 @@ export default { ...@@ -303,62 +275,15 @@ export default {
left: 25px; left: 25px;
color: #2680eb; color: #2680eb;
} }
.slider { .icon{
margin: 0 50px 0 50px;
position: relative;
.slow {
position: absolute;
top: 7px;
left: -5px;
}
.fast {
position: absolute;
top: 7px;
right: -10px;
}
.ding {
position: absolute;
top: 7px;
left: 30%;
}
.ling {
position: absolute;
top: 7px;
right: 30%;
}
}
.icon {
text-align: right;
padding-right: 15px;
margin-top: -15px;
}
}
.right-up {
position: relative;
border: 1px solid #e0e0e0;
padding: 25px 0;
.title-d {
width: 95px;
padding-left: 5px;
margin-left: 10px;
background: #fff;
position: absolute; position: absolute;
top: -9px; right: -10px;
left: 25px; top:10px;
color: #2680eb;
} }
.check-box { .slider{
height: 348px; padding: 0 20px;
border-top: 1px solid #e0e0e0;
padding: 15px;
padding-left: 0;
margin-left: 25px;
overflow: auto;
} }
} }
.right-down {
height: 92px;
}
.click-btn { .click-btn {
text-align: right; text-align: right;
margin-top: 15px; margin-top: 15px;
......
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