Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

pages/aps/aps/options.vue

@@ -28,11 +28,11 @@
                   <Icon type="md-git-compare" />
                 </a>
                 <DropdownMenu slot="list" style="text-align: center;">
-                  <DropdownItem v-for="li in items" :key="li" v-dragging="{ item: li, list: items}">
+                  <DropdownItem v-for="li in items" :key="li.value" v-dragging="{ item: li, list: items}">
                     <a href="#">
                       <Icon type="md-apps" />
                     </a>
-                    <span>{{li}}</span>
+                    <span>{{li.name}}</span>
                   </DropdownItem> 
                 </DropdownMenu>                
               </Dropdown>
@@ -42,7 +42,7 @@
                 v-model="level"
                 :step="1"
                 :min="0"
-                :max="5"
+                :max="4"
                 :marks="levelMarks"
                 show-stops
                 @on-change="setParameter"
@@ -110,6 +110,15 @@
                 <span slot="open">是</span>
                 <span slot="close">否</span>
               </i-switch>
+            </FormItem>
+             <FormItem :label="l('discrete_percent')" prop="discrete_percent">             
+              <Slider
+                v-model="entity.discrete_percent"
+                :step="1"
+                :min="0"
+                :max="100"
+                @on-change="setPercent"
+              ></Slider>
             </FormItem>
             <FormItem :label="l('discrete')" prop="discrete">
               <InputNumber
@@ -117,12 +126,10 @@
                 :disabled="count==0"
                 :min="1"
                 :max="count==0?1:count"
+                 @on-change="setDiscrete"
               ></InputNumber>
               <!-- <span>{{count}}</span> -->
             </FormItem>           
-            <FormItem :label="l('discrete_percent')" prop="discrete_percent">
-              <span v-text="k"></span>
-            </FormItem>
           </div>
         </Col>
       </Row>
@@ -138,7 +145,7 @@ import Api from "./api";
 export default {
   data() {
     return {
-      items:["是否多台","转序规则","加班策略","是否离散"],
+      items:[{name:"是否多台",value:"multiple"},{name:"转序规则",value:"planState"},{name:"加班策略",value:"over"},{name:"是否离散",value:"dis"}],
       entity: {
         partTaskPk: 0,
         opTaskPk: 0,
@@ -154,6 +161,7 @@ export default {
         dis:false,
         isDiscrete: "否",//是否离散 是否
         discrete: 1, //离散数值  必须大于 1
+        discrete_percent:0,
         multiple: false,
         multipleEquip: "否", //"是否多台安排设备", 否  是
         multipleCount: 1, //多台数量
@@ -165,7 +173,7 @@ export default {
       levelRules: [],
       levelMarks: {
         0: "慢",
-        5: "快"
+        4: "快"
       },
       rules: {
         // calId: [
@@ -228,10 +236,12 @@ export default {
   },
   mounted() {
     this.$dragging.$on('dragged', ({ value }) => {
-      console.log(value.item)
-      console.log(value.list)
-      console.log(value.otherData)
+      localStorage.setItem("apsitems",JSON.stringify(value.list));
     })
+    var items=localStorage.getItem("apsitems");
+    if(items){
+      this.items=JSON.parse(items);
+    }
   },
   methods: {
     getCal() {
@@ -254,20 +264,13 @@ export default {
       });
     },
     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.isDiscrete = u.parameterValue == "是";
-          this.entity.isDiscrete = u.parameterValue;
+       this.entity.multiple=false;
+        this.entity.planState=false;        
+        this.entity.over=false;
+        this.entity.dis=false;
+        for(var i=0;i<v;i++){
+          this.entity[this.items[i].value]=true;
         }     
-      });
     },
     handleSubmit() {
       this.$refs.form.validate(valid => {
@@ -310,6 +313,14 @@ export default {
     l(key) {
       let vkey = "mes_op_task_plan_simulate" + "." + key;
       return this.$t(vkey) || key;
+    },
+    setPercent(v){
+      this.entity.discrete=Math.round(((this.count-1)*v-this.count)/100);
+    },
+    setDiscrete(v){
+      this.entity.discrete_percent=(
+          (100 * this.count - 100 * this.entity.discrete) / (this.count - 1)
+        );        
     }
   },
   computed: {