DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joshi
2026-01-04 11:44:24 +08:00
parent 54d3c88c25 d7b72f89c7
commit 89cfc8c61e
5 changed files with 47 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
klp-ui/src/views/lines/data.js
View File

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

14
klp-ui/src/views/lines/pdo/index.vue
View File

@@ -1,11 +1,15 @@
<template> <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" /> <PdoPage :baseURL="baseURL" />
</div> </div>
</template> </template>
<script> <script>
import PdoPage from '../panels/pdo/index.vue' import PdoPage from '../panels/pdo/index.vue'
import lines from '../data.js'
export default { export default {
components: { components: {
@@ -13,8 +17,14 @@ export default {
}, },
data() { data() {
return { return {
baseURL: '140.143.206.120:18081' lines,
baseURL: '140.143.206.120:18081',
} }
}, },
methods: {
handleTabClick(tab) {
this.baseURL = tab.name
}
}
} }
</script> </script>

14
klp-ui/src/views/lines/roller/index.vue
View File

@@ -1,11 +1,15 @@
<template> <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" /> <RollerPage :baseURL="baseURL" />
</div> </div>
</template> </template>
<script> <script>
import RollerPage from '../panels/roller/index.vue' import RollerPage from '../panels/roller/index.vue'
import lines from '../data.js'
export default { export default {
components: { components: {
@@ -13,8 +17,14 @@ export default {
}, },
data() { data() {
return { return {
baseURL: '140.143.206.120:18081' lines,
baseURL: '140.143.206.120:18081',
} }
}, },
methods: {
handleTabClick(tab) {
this.baseURL = tab.name
}
}
} }
</script> </script>

14
klp-ui/src/views/lines/stop/index.vue
View File

@@ -1,11 +1,15 @@
<template> <template>
<div class="app-container"> <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" /> <StopPage :baseURL="baseURL" />
</div> </div>
</template> </template>
<script> <script>
import StopPage from '../panels/stop/index.vue' import StopPage from '../panels/stop/index.vue'
import lines from '../data.js'
export default { export default {
components: { components: {
@@ -13,8 +17,14 @@ export default {
}, },
data() { data() {
return { return {
baseURL: '140.143.206.120:18081' lines,
baseURL: '140.143.206.120:18081',
} }
}, },
methods: {
handleTabClick(tab) {
this.baseURL = tab.name
}
}
} }
</script> </script>

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

@@ -44,6 +44,11 @@
<el-input v-model="form.team" placeholder="请输入班组" /> <el-input v-model="form.team" placeholder="请输入班组" />
</el-form-item> </el-form-item>
</el-col> </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>
<el-row> <el-row>