Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/views/lines/data.js

@@ -1,10 +1,12 @@
-const liens = [
+const lines = [
   {
     name: '镀锌线',
     url: '140.143.206.120:18081'
   },
   {
-    name: '酸连轧',
-    url: ''
+    name: 'g30',
+    url: '49.232.87.108:12081'
   }
-]
+]
+
+export default lines

klp-ui/src/views/lines/pdo/index.vue

@@ -1,11 +1,15 @@
 <template>
-  <div>
+  <div class="app-container">
+    <el-tabs v-model="baseURL" @tab-click="handleTabClick">
+      <el-tab-pane v-for="line in lines" :label="line.name" :name="line.url" />
+    </el-tabs>
     <PdoPage :baseURL="baseURL" />
   </div>
 </template>
 
 <script>
 import PdoPage from '../panels/pdo/index.vue'
+import lines from '../data.js'
 
 export default {
   components: {
@@ -13,8 +17,14 @@ export default {
   },
   data() {
     return {
-      baseURL: '140.143.206.120:18081'
+      lines,
+      baseURL: '140.143.206.120:18081',
     }
   },
+  methods: {
+    handleTabClick(tab) {
+      this.baseURL = tab.name
+    }
+  }
 }
 </script>

klp-ui/src/views/lines/roller/index.vue

@@ -1,11 +1,15 @@
 <template>
-  <div>
+  <div class="app-container">
+    <el-tabs v-model="baseURL" @tab-click="handleTabClick">
+      <el-tab-pane v-for="line in lines" :label="line.name" :name="line.url" />
+    </el-tabs>
     <RollerPage :baseURL="baseURL" />
   </div>
 </template>
 
 <script>
 import RollerPage from '../panels/roller/index.vue'
+import lines from '../data.js'
 
 export default {
   components: {
@@ -13,8 +17,14 @@ export default {
   },
   data() {
     return {
-      baseURL: '140.143.206.120:18081'
+      lines,
+      baseURL: '140.143.206.120:18081',
     }
   },
+  methods: {
+    handleTabClick(tab) {
+      this.baseURL = tab.name
+    }
+  }
 }
 </script>

klp-ui/src/views/lines/stop/index.vue

@@ -1,11 +1,15 @@
 <template>
   <div class="app-container">
+    <el-tabs v-model="baseURL" @tab-click="handleTabClick">
+      <el-tab-pane v-for="line in lines" :label="line.name" :name="line.url" />
+    </el-tabs>
     <StopPage :baseURL="baseURL" />
   </div>
 </template>
 
 <script>
 import StopPage from '../panels/stop/index.vue'
+import lines from '../data.js'
 
 export default {
   components: {
@@ -13,8 +17,14 @@ export default {
   },
   data() {
     return {
-      baseURL: '140.143.206.120:18081'
+      lines,
+      baseURL: '140.143.206.120:18081',
     }
   },
+  methods: {
+    handleTabClick(tab) {
+      this.baseURL = tab.name
+    }
+  }
 }
-</script>
+</script>

klp-ui/src/views/wms/coil/do/search.vue

@@ -44,6 +44,11 @@
                   <el-input v-model="form.team" placeholder="请输入班组" />
                 </el-form-item>
               </el-col>
+               <el-col :span="12">
+                <el-form-item label="长度" prop="length">
+                  <el-input v-model="form.length" placeholder="请输入长度" />
+                </el-form-item>
+              </el-col>
             </el-row>
 
             <el-row>