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

components/page/inputTime.vue

+<style lang="less">
+.timer {
+  .ivu-input-number {
+    width: 60px;
+  }
+  > span {
+    line-height: 30px;
+  }
+}
+</style>
+<template>
+  <div class="flex timer">
+    <div class="fg1">
+      <InputNumber v-model="hour" :formatter="value => `${value}`" :min="0" :max="100" />
+    </div>
+    <span>小时</span>
+    <div class="fg1">
+      <InputNumber v-model="minute" :formatter="value => `${value}`" :min="-1" :max="60" />
+    </div>
+    <span>分钟</span>
+    <div class="fg1">
+      <InputNumber v-model="second" :formatter="value => `${value}`" :min="0" :max="60" />
+    </div>
+    <span>秒</span>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      hour: 0,
+      minute: 0,
+      second: 0
+    };
+  },
+  model: {
+    prop: "value",
+    event: "on-change",
+  },
+    props: {
+    value: [Number],
+    
+  },
+  mounted(){
+      this.setTime(this.value)
+  },
+  methods: {
+    setTime(v) {
+      let h = parseInt(v / ( 60 * 60));
+      this.hour = h;
+      this.minute = parseInt((v - h *  60 * 60) / 60);
+      this.second = parseInt(v - h * 60 * 60 - this.minute * 60);
+    },
+    change(){
+        let result=0
+        result+=this.hour*60*60;
+        result+=this.minute*60;
+        result+=this.second;
+        this.$emit("on-change",result);
+    }
+  },
+  watch: {
+    value(v){
+        this.setTime(v);
+    },
+    second(v){
+        if(v>=60){
+            this.second=0
+            this.minute+=1;
+        }
+        this.change();
+    },
+    minute(v){
+        if(v>=60){
+            this.minute=0;
+            this.hour+=1;
+        }else if(v<0){
+            this.hour-=1;
+            this.minute=59;
+        }
+        this.change();
+    },
+    hour(v){
+        this.change();
+    }
+  }
+};
+</script>
\ No newline at end of file

package-lock.json

@@ -15362,8 +15362,7 @@
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -15523,7 +15522,6 @@
               "version": "2.9.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -15542,7 +15540,6 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -15645,7 +15642,6 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -15731,8 +15727,7 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -15768,7 +15763,6 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -15832,14 +15826,12 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "yallist": {
               "version": "3.1.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             }
           }
         },
@@ -18617,6 +18609,7 @@
             "minimatch": {
               "version": "3.0.4",
               "bundled": true,
+              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -19485,7 +19478,6 @@
               "version": "2.9.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -19504,7 +19496,6 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -19607,7 +19598,6 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -19693,8 +19683,7 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -19794,14 +19783,12 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "yallist": {
               "version": "3.1.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             }
           }
         },

pages/technology/details/routingStep/api.js

@@ -11,7 +11,7 @@ export default {
     return Api.post(`${technologyUrl}routingstep/create`,params);
     },
     update(params){
-    return Api.post(`${technologyUrl}routingstep/update`,params);
+    return Api.put(`${technologyUrl}routingstep/update`,params);
     },
     delete(id) {
     return Api.delete(`${technologyUrl}routingstep/delete`,{params:{id:id}});

pages/technology/index.vue

@@ -16,7 +16,7 @@
   right: 0;
   //   bottom:100%;
   //   right: 100%;
-  z-index: 990;
+  z-index: 898;
   background-color: white;
   // background: red;
   .top {

pages/test/time.vue

+<template>
+  <div>
+      <div v-width="400">
+          <InputTime v-model="time"></InputTime>
+      </div>
+      
+      {{time}}
+  </div>
+</template>
+<script>
+export default {
+  layout: 'empty',
+  async fetch({ store, params }) {
+    await store.dispatch('loadDictionary') // 加载数据字典
+  },
+  data() {
+    return {
+      time: 39470,
+      
+    }
+  },
+  created() {
+    //   this.setList();
+    // alert(1234321)
+    // var arrs = []
+    // for (let i = 0; i < 5; i++) {
+    //   arrs.push(i)
+    // }
+    // this.list = arrs
+  },
+  mounted() {
+  },
+  methods: {
+  
+  },
+
+}
+</script>
\ No newline at end of file

plugins/iview.js

@@ -44,6 +44,7 @@ import ProductNumberSelect from '@/components/page/productNumberSelect.vue'
 import ProductSelect from '@/components/page/productSelect.vue'
 import DTSpan from '@/components/page/dtSpan.vue'
 import DTSearch from '@/components/page/dtSearch.vue'
+import InputTime from '@/components/page/inputTime.vue'
 
 // import FormMaking from 'form-making'
 // import 'form-making/dist/FormMaking.css'
@@ -94,6 +95,7 @@ Vue.component("ProductNumberSelect", ProductNumberSelect)
 Vue.component("ProductSelect", ProductSelect)
 Vue.component("DTSpan", DTSpan)
 Vue.component("DTSearch", DTSearch)
+Vue.component("InputTime", InputTime)
 
 //注入mock
 // require("../mock")