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

pages/aps/aps/add.vue

@@ -20,7 +20,7 @@
               </FormItem>
             </div>
           </div>
-          <div class="filedset">
+          <div class="filedset h50">
             <p class="title">快速设置</p>
             <div class="icon">
               <Dropdown trigger="hover">
@@ -59,23 +59,30 @@
               </Dropdown>
             </div>
             <div class="slider">
-                <h3 v-text="entity.level"></h3>
               <Slider
-                v-model="entity.level"
+                v-model="level"
                 :step="1"
                 :min="0"
-                :max="levelRules.length-1"
+                :max="5"
                 :marks="levelMarks"
                 show-stops
                 @on-change="setParameter"
               ></Slider>
-          
             </div>
           </div>
-          <div class="filedset">
+          <div class="filedset h50">
             <p class="title">应用范围</p>
             <div class="slider">
-              <Slider v-model="entity.flog" :step="1" :min="0" :max="5" :marks="marks" size="large"></Slider>
+              <Slider
+                v-model="entity.flog"
+                :step="1"
+                :min="0"
+                :max="5"
+                :marks="marks"
+                :disabled="partTaskPk==0"
+                size="large"
+              ></Slider>
+              <!--  :disabled="partTaskPk==0" -->
             </div>
           </div>
         </Col>
@@ -105,9 +112,19 @@
                 <span slot="close">不加班</span>
               </i-switch>
             </FormItem>
-            <FormItem :label="l('efficiencyValue')" prop="efficiencyValue">
-              <InputNumber v-model="entity.efficiencyValue" :step="0.1"></InputNumber>
+            <Row>
+              <Col :span="12">
+                <FormItem :label="l('efficiencyValue')" prop="efficiencyValue">
+                  <InputNumber v-model="entity.efficiencyValue" :step="0.01"></InputNumber>
+                </FormItem>
+              </Col>
+              <Col :span="12">
+              <FormItem :label="l('run_time')" prop="run_time">
+             <span v-text="run_time"></span>
             </FormItem>
+              </Col>
+            </Row>
+
             <Divider />
             <FormItem :label="l('isDiscrete')" prop="lisan">
               <i-switch v-model="entity.lisan" size="large">
@@ -116,10 +133,16 @@
               </i-switch>
             </FormItem>
             <FormItem :label="l('discrete')" prop="discrete">
-              <InputNumber v-model="entity.discrete"></InputNumber>
+              <InputNumber
+                v-model="entity.discrete"
+                :disabled="count==0"
+                :min="1"
+                :max="count==0?1:count"
+              ></InputNumber>
+              <!-- <span>{{count}}</span> -->
             </FormItem>
             <FormItem :label="l('discrete_percent')" prop="discrete_percent">
-              <InputNumber v-model="entity.discrete_percent"></InputNumber>
+              <span v-text="k"></span>
             </FormItem>
           </div>
         </Col>
@@ -140,8 +163,7 @@ export default {
         partTaskPk: 0,
         opTaskPk: 0,
         taskSeq: "",
-        flog: 0, //参数应用范围
-        level: 0, //参数规则ID
+        flog: 5, //参数应用范围
         calId: null,
         planState: true,
         planMethod: "重叠", // 平行 重叠
@@ -158,7 +180,9 @@ export default {
         multipleEquipPks: [],
         multipleEquipIds: "" //"设备id", 用英文逗号分隔
       },
-      levelRules:[],
+      // discrete_percent:1,//"离散度"
+      level: 0, //参数规则ID
+      levelRules: [],
       levelMarks: {
         0: "慢",
         5: "快"
@@ -206,6 +230,10 @@ export default {
       //生产计划数量
       type: Number,
       default: 0
+    },
+    run_time:{
+      type: Number,
+      default:0
     }
   },
   created() {
@@ -224,14 +252,12 @@ export default {
     apsGet() {
       Api.apsGetall().then(res => {
         if (res.success) {
-          console.log(res.result)
           this.levelRules = res.result;
-          let max=this.levelRules.length-1;
-        
+          // 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;
+          this.level = 0;
         }
       });
     },
@@ -249,12 +275,16 @@ export default {
           this.entity.lisan = u.parameterValue == "是";
           this.entity.isDiscrete = u.parameterValue;
         }
-        console.log(u);
       });
     },
     handleSubmit() {
       this.$refs.form.validate(valid => {
         if (valid) {
+          if(this.opTaskPk==0&&this.partTaskPk>0&&this.entity.flog<1){
+            this.$Message.error("计划参数调整参数应用范围不能是工序级的")
+            this.entity.flog=1;
+            return;
+          }
           this.entity.multipleEquipIds = this.entity.multipleEquipPks.join();
           this.entity.planMethod = this.entity.planState ? "重叠" : "平行";
           this.entity.overTime = this.entity.over ? "不加班" : "加班";
@@ -283,12 +313,34 @@ export default {
       return this.$t(vkey) || key;
     }
   },
-  watch:{
-    "entity.partTaskPk"(v,n){
-      if(v){
-        
+  computed: {
+    k() {
+      if (this.count == 0) return 0;
+      else {
+        return (
+          (100 * this.count - 100 * this.entity.discrete) / (this.count - 1)
+        );
       }
     }
+  },
+  watch: {
+    partTaskPk(v, n) {
+      if (v == 0) {
+        this.entity.flog = 5;
+      } else if (v > 0 && this.opTaskPk == 0) {
+        this.entity.flog = 1;
+      } else {
+        this.entity.flog = 0;
+      }
+      this.entity.partTaskPk = v;
+    },
+    opTaskPk(v, n) {
+      this.entity.opTaskPk = v;
+      this.entity.taskSeq = this.taskSeq;
+    },
+    count(v, n) {
+      this.entity.discrete = 1;
+    }
   }
 };
 </script>
@@ -323,6 +375,9 @@ export default {
       }
     }
   }
+  .h50{
+    height: 115px;
+  }
   .click-btn {
     text-align: right;
     margin-top: 15px;