Skip to content

Z
zhongtong-avi-web
Commit fa80bd00 authored by 李志鸣's avatar 李志鸣
Browse files
Options

fea(涂装生产计划): 功能联调

parent 13bae4c4
Show whitespace changes
Inline Side-by-side
Showing with 244 additions and 21 deletions
config/index.js
View file @ fa80bd00
...@@ -13,9 +13,9 @@ module.exports = { ...@@ -13,9 +13,9 @@ module.exports = {
// 代理后端服务器 // 代理后端服务器
proxyTable: { proxyTable: {
'/host': { '/host': {
target: 'http://10.100.172.150:9108', //设置你调用的接口域名和端口号 别忘了加http // target: 'http://10.100.172.150:9108', // 设置你调用的接口域名和端口号 别忘了加http
// target: 'http://192.168.43.244:8888', // 东伟服务器地址 // target: 'http://192.168.43.244:8888', // 东伟服务器地址
// target: 'http://192.168.0.126:8080', // 训浩服务器 target: 'http://192.168.43.153:8080', // 训浩服务器
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/host': ''//这里理解成用‘/host’代替target里面的地址，后面组件中我们掉接口时直接用api代替 比如我要调用'http://40.00.100.100:3002/user/add'，直接写‘/api/user/add’即可 '^/host': ''//这里理解成用‘/host’代替target里面的地址，后面组件中我们掉接口时直接用api代替 比如我要调用'http://40.00.100.100:3002/user/add'，直接写‘/api/user/add’即可
......
src/interface/apis.js
View file @ fa80bd00
/* eslint-disable */ /* eslint-disable */
export default { export default {
"pda-controller": { "pda-controller": {
"skid-post": {
"url": "/PDA/change/skid",
"method": "post"
},
"bound-post": { "bound-post": {
"url": "/PDA/bound", "url": "/PDA/hanzhuang/bound",
"method": "post"
},
"repair-post": {
"url": "/PDA/repair",
"method": "post" "method": "post"
} }
}, },
...@@ -31,6 +39,10 @@ ...@@ -31,6 +39,10 @@
"url": "/api/basicinfo/lane/{areaId}", "url": "/api/basicinfo/lane/{areaId}",
"method": "get" "method": "get"
}, },
"workOrder-post": {
"url": "/api/basicinfo/mes/workOrder",
"method": "post"
},
"stationCreate-post": { "stationCreate-post": {
"url": "/api/basicinfo/stationCreate", "url": "/api/basicinfo/stationCreate",
"method": "post" "method": "post"
...@@ -46,6 +58,10 @@ ...@@ -46,6 +58,10 @@
"stationUpdate-put": { "stationUpdate-put": {
"url": "/api/basicinfo/stationUpdate", "url": "/api/basicinfo/stationUpdate",
"method": "put" "method": "put"
},
"upload-post": {
"url": "/api/basicinfo/upload",
"method": "post"
} }
}, },
"equip-date-channel-controller": { "equip-date-channel-controller": {
...@@ -75,9 +91,9 @@ ...@@ -75,9 +91,9 @@
"url": "/api/check/deleteCheckItemModelById/{id}", "url": "/api/check/deleteCheckItemModelById/{id}",
"method": "delete" "method": "delete"
}, },
"recordId-post": { "expert-get": {
"url": "/api/check/expert/{recordId}", "url": "/api/check/expert",
"method": "post" "method": "get"
}, },
"getCheckByType-get": { "getCheckByType-get": {
"url": "/api/check/getCheckByType", "url": "/api/check/getCheckByType",
......
src/views/Led/Station/paintingWorkShop.vue
View file @ fa80bd00
...@@ -249,8 +249,7 @@ ...@@ -249,8 +249,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.container { .container {
background-color: #111; background-color: #111;
width: 100%;
height: 100%;
.page-pack { .page-pack {
width: 1556px; width: 1556px;
height: 1037px; height: 1037px;
......
src/views/ProductionPlan/components/ImportPlan.vue 0 → 100644
View file @ fa80bd00
<template>
<el-dialog
title="导入生产计划"
:visible.sync="dialogToggle"
:show-close="false"
:close-on-press-escape="false"
:close-on-click-modal="false"
width="400px">
<el-upload
ref="upload"
class="upload-demo"
:action="apiAdress"
:limit="1"
:headers="uploadToken"
:file-list="fileList"
:auto-upload="false"
:on-exceed="handleExceed"
:on-success="uploadSuccess"
:on-change="uploadChange"
:on-remove="uploadRemove">
<el-button size="small" type="primary">选取文件</el-button>
<div slot="tip" class="el-upload__tip">请上传Excel格式文件</div>
</el-upload>
<span slot="footer" class="dialog-footer">
<el-button :loading="loadingToggle" size="small" type="primary" icon="el-icon-upload2" @click="doUploadClick">上传</el-button>
<el-button size="small" icon="el-icon-close" @click="doCancelClick">取消</el-button>
</span>
</el-dialog>
</template>
<script>
export default {
data () {
return {
// 对话框开关标识
dialogToggle: false,
// 数据提交状态开关标识
loadingToggle: false,
// 接口请求头
uploadToken: {
Authorization: ''
},
// 接口请求地址
apiAdress: `${process.env.API_HOST}/api/basicinfo/upload`,
// 文件上传列表
fileList: [],
// 是否可以提交
uploadFileToggle: false
}
},
methods: {
// 点击上传按钮
doUploadClick () {
if (this.uploadFileToggle) {
this.loadingToggle = true
this.$refs.upload.submit()
} else {
this.$message.warning('请选择要上传的文件！')
}
},
// 点击取消按钮
doCancelClick () {
this.loadingToggle = false
this.dialogToggle = false
this.fileList = []
},
// 超出文件上传个数
handleExceed (files, fileList) {
this.$message.warning(`当前限制选择1个文件！`)
},
// 文件上传成功
uploadSuccess (res, file) {
if (res.code === 600) {
this.dialogToggle = false
this.loadingToggle = false
this.$message.success('文件导入成功！')
this.fileList = []
this.$emit('onUploadSuccess')
} else {
this.loadingToggle = false
this.$message.error(res.message)
}
},
// 文件上传状态改变
uploadChange (file, fileList) {
this.uploadFileToggle = true
},
// 文件删除
uploadRemove (file, fileList) {
this.uploadFileToggle = false
}
},
mounted () {
setTimeout(() => {
this.uploadToken.Authorization = window.sessionStorage.getItem('Admin-Token')
}, 0)
}
}
</script>
<style lang="scss" scoped>
/deep/ .el-dialog {
.el-dialog__body {
height: 200px;
border: 1px solid rgb(192,204,218);
border-radius: 5px;
padding: 10px 10px;
margin: 10px 20px;
}
}
</style>
\ No newline at end of file
src/views/ProductionPlan/index.vue
View file @ fa80bd00
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</div> </div>
<div class="tool-pack clear-float pl-15 pr-15"> <div class="tool-pack clear-float pl-15 pr-15">
<Search <Search
searchCode="SCADA_EQUIP_INFO" searchCode="MES_WORKORDER_INFO"
@search="doSearchClick" @search="doSearchClick"
@reset="doResetClick"> @reset="doResetClick">
</Search> </Search>
...@@ -26,34 +26,130 @@ ...@@ -26,34 +26,130 @@
</el-button> </el-button>
</div> </div>
</div> </div>
<div class="general-list-main-pack pl-15 pr-15 pb-15">
<div>
<PreviewTable
:tableConfig="tableConfig"
@onPageSizeChange="onPageSizeChange"
@onCurrentPageChange="onCurrentPageChange">
</PreviewTable>
</div>
</div>
<!-- 导入生产计划对话框 -->
<ImportPlan
ref="ImportPlan"
@onUploadSuccess="importPlanUploadSuccess">
</ImportPlan>
</div> </div>
</template> </template>
<script> <script>
import Table from '@/components/Table/index.vue' import PreviewTable from '@/components/PreviewTable'
import Search from '@/components/Search' import Search from '@/components/Search'
import ImportPlan from './components/ImportPlan'
export default { export default {
name: 'ProductionPlanIndex', name: 'ProductionPlanIndex',
components: { components: {
Table, PreviewTable,
Search Search,
ImportPlan
}, },
data () { data () {
return { return {
// 精准搜索关键字列表 // 精准搜索关键字列表
searchList: {} searchList: {},
// 表格配置项
tableConfig: {
height: 0,
data: [],
fieldList: [],
paginationToggle: true,
paginationConfig: {
total: 0,
currentPage: 1,
pageSize: 20
}
}
} }
}, },
methods: { methods: {
// 点击刷新按钮 // 点击刷新按钮
doRefreshClick () {}, doRefreshClick () {
this.getTableData().then(response => {
this.$message.success('刷新成功！')
})
},
// 点击搜索按钮 // 点击搜索按钮
doSearchClick () {}, doSearchClick (searchValue) {
this.searchList = _.cloneDeep(searchValue)
this.tableConfig.paginationConfig.currentPage = 1
// 获取列表数据
this.getTableData()
},
// 点击重置按钮 // 点击重置按钮
doResetClick () {}, doResetClick (searchValue) {
this.searchList = { ...searchValue, filters: [] }
this.tableConfig.paginationConfig.currentPage = 1
this.tableConfig.paginationConfig.pageSize = 20
// 获取表格数据
this.getTableData()
},
// 点击导入按钮 // 点击导入按钮
doImportClick () {} doImportClick () {
this.$refs.ImportPlan.dialogToggle = true
},
// 表格组件分页数量改变事件
onPageSizeChange (pageSize) {
this.tableConfig.paginationConfig.currentPage = 1
this.tableConfig.paginationConfig.pageSize = pageSize
// 获取列表数据
this.getTableData()
},
// 表格组件分页页数改变事件
onCurrentPageChange (currentPage) {
this.tableConfig.paginationConfig.currentPage = currentPage
// 获取列表数据
this.getTableData()
},
// 获取列表数据
getTableData () {
let queryParams = {
searchCode: this.searchList.searchCode || 'MES_WORKORDER_INFO',
filters: this.searchList.filters || [],
pageSize: this.tableConfig.paginationConfig.pageSize,
pageNum: this.tableConfig.paginationConfig.currentPage
}
return new Promise((resolve, reject) => {
this.$fetch('basic-info-controller/workOrder-post', queryParams).then(response => {
this.tableConfig.data = _.cloneDeep(response.list)
this.tableConfig.paginationConfig.total = _.cloneDeep(response.total)
resolve()
})
})
},
// 获取列表表头
getTableLabel () {
let queryParams = { searchCode: 'MES_WORKORDER_INFO' }
this.$fetch('show-field-controller/showField-get', queryParams).then(response => {
this.tableConfig.fieldList = _.cloneDeep(response)
})
},
// 计划导入成功
importPlanUploadSuccess () {
// 获取列表数据
this.getTableData()
}
},
mounted () {
setTimeout(() => {
this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 210
// 获取列表数据
this.getTableData()
// 获取列表表头
this.getTableLabel()
}, 0)
} }
} }
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment