Commit 29a0ae9d authored by 李志鸣's avatar 李志鸣

fea(车道基础数据、登录页): 联调、开发完成

parent 9d003fc3
/* eslint-disable */ /* eslint-disable */
export default { export default {
"basic-info-controller": { "basic-info-controller": {
"area-get": {
"url": "/api/basicinfo/area",
"method": "get"
},
"equipCreate-post": { "equipCreate-post": {
"url": "/api/basicinfo/equipCreate", "url": "/api/basicinfo/equipCreate",
"method": "post" "method": "post"
...@@ -17,6 +21,10 @@ ...@@ -17,6 +21,10 @@
"url": "/api/basicinfo/equipUpdate", "url": "/api/basicinfo/equipUpdate",
"method": "put" "method": "put"
}, },
"areaId-get": {
"url": "/api/basicinfo/lane/{areaId}",
"method": "get"
},
"stationCreate-post": { "stationCreate-post": {
"url": "/api/basicinfo/stationCreate", "url": "/api/basicinfo/stationCreate",
"method": "post" "method": "post"
...@@ -104,6 +112,10 @@ ...@@ -104,6 +112,10 @@
"runtimePage-post": { "runtimePage-post": {
"url": "/api/equipment/runtimePage", "url": "/api/equipment/runtimePage",
"method": "post" "method": "post"
},
"test-get": {
"url": "/api/equipment/test",
"method": "get"
} }
}, },
"show-field-controller": { "show-field-controller": {
......
...@@ -8,12 +8,12 @@ export default { ...@@ -8,12 +8,12 @@ export default {
meta: {title: 'Basic', icon: 'codingConfig'}, meta: {title: 'Basic', icon: 'codingConfig'},
alwaysShow: true, alwaysShow: true,
children: [ children: [
{ // {
path: 'workshopBasic', // path: 'workshopBasic',
component: () => import('@/views/Basic/WorkshopBasic/list'), // component: () => import('@/views/Basic/WorkshopBasic/list'),
name: 'WorkshopBasic', // name: 'WorkshopBasic',
meta: {title: 'WorkshopBasic', icon: 'document', noCache: false} // meta: {title: 'WorkshopBasic', icon: 'document', noCache: false}
}, // },
{ {
path: 'deviceBasic', path: 'deviceBasic',
component: () => import('@/views/Basic/DeviceBasic/list'), component: () => import('@/views/Basic/DeviceBasic/list'),
......
...@@ -20,20 +20,20 @@ ...@@ -20,20 +20,20 @@
} }
} }
} }
.el-button { //.el-button {
width: 100%; // width: 100%;
border-radius: 0px; // border-radius: 0px;
height: 60px; // height: 60px;
line-height: 60px; // line-height: 60px;
font-size: 24px; // font-size: 24px;
} //}
.el-button--medium { //.el-button--medium {
padding: 0; // padding: 0;
} //}
.el-button--primary { //.el-button--primary {
background-color: #00a1d8; // background-color: #00a1d8;
border: 1px solid #00a1d8; // border: 1px solid #00a1d8;
} //}
} }
.missingListMaterial-list-page { .missingListMaterial-list-page {
.el-input { .el-input {
......
...@@ -234,4 +234,4 @@ ...@@ -234,4 +234,4 @@
<style lang="scss" scoped> <style lang="scss" scoped>
</style> </style>
\ No newline at end of file
...@@ -19,14 +19,14 @@ ...@@ -19,14 +19,14 @@
</Search> </Search>
<div class="float-left"> <div class="float-left">
<el-button <el-button
size="small" size="small"
type="primary" type="primary"
@click="doAddClick"> @click="doAddClick">
新增 新增
</el-button> </el-button>
</div> </div>
</div> </div>
<div class="general-list-main-pack pl-15 pr-15"> <div class="general-list-main-pack pl-15 pr-15 pb-15">
<div> <div>
<Table <Table
:tableConfig="tableConfig" :tableConfig="tableConfig"
...@@ -219,7 +219,7 @@ ...@@ -219,7 +219,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.page-pack { .page-pack {
position: relative; position: relative;
height: 100%; min-height: 100%;
width: 100%; width: 100%;
border: 1px solid #d2d3d5; border: 1px solid #d2d3d5;
background-color: #fff; background-color: #fff;
...@@ -298,4 +298,4 @@ ...@@ -298,4 +298,4 @@
} }
} }
} }
</style> </style>
\ No newline at end of file
This diff is collapsed.
...@@ -26,12 +26,20 @@ ...@@ -26,12 +26,20 @@
</el-button> </el-button>
</div> </div>
</div> </div>
<div class="general-list-main-pack pl-15 pr-15"> <div class="general-list-main-pack pl-15 pr-15 pb-15">
<div> <div>
<Table <Table
:tableConfig="tableConfig" :tableConfig="tableConfig"
@onPageSizeChange="onPageSizeChange" @onPageSizeChange="onPageSizeChange"
@onCurrentPageChange="onCurrentPageChange"> @onCurrentPageChange="onCurrentPageChange">
<template slot="workshopCode">
<el-table-column
label="车间">
<template slot-scope="scope">
<span>{{ scope.row.workshopCode !== null ? scope.row.workshopCode : '涂装车间' }}</span>
</template>
</el-table-column>
</template>
<template slot="keyStation"> <template slot="keyStation">
<el-table-column <el-table-column
label="是否为关键工位" label="是否为关键工位"
...@@ -56,12 +64,14 @@ ...@@ -56,12 +64,14 @@
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text"> type="text"
@click="doEditClick(scope.row)">
编辑 编辑
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
style="color: rgb(244, 116, 118)"> style="color: rgb(244, 116, 118)"
@click="doDeleteClick(scope.row)">
删除 删除
</el-button> </el-button>
</template> </template>
...@@ -73,8 +83,15 @@ ...@@ -73,8 +83,15 @@
<!--新增车道基础信息对话框--> <!--新增车道基础信息对话框-->
<AddLaneDialog <AddLaneDialog
ref="AddLaneDialog"> ref="AddLaneDialog"
@doConfirmClick="doAddLaneDialogConfirmClick">
</AddLaneDialog> </AddLaneDialog>
<!--编辑车道基础信息对话框-->
<EditLaneDialog
ref="EditLaneDialog"
:editLaneBasicValue="editLaneBasicValue">
</EditLaneDialog>
</div> </div>
</template> </template>
...@@ -82,16 +99,20 @@ ...@@ -82,16 +99,20 @@
import Table from '@/components/Table/index.vue' import Table from '@/components/Table/index.vue'
import Search from '@/components/Search' import Search from '@/components/Search'
import AddLaneDialog from './components/AddLaneDialog' import AddLaneDialog from './components/AddLaneDialog'
import EditLaneDialog from './components/EditLaneDialog'
export default { export default {
name: 'LaneBasic', name: 'LaneBasic',
components: { components: {
Search, Search,
Table, Table,
AddLaneDialog AddLaneDialog,
EditLaneDialog
}, },
data () { data () {
return { return {
// 编辑车道基础数据
editLaneBasicValue: {},
// 精准搜索关键字列表 // 精准搜索关键字列表
searchList: {}, searchList: {},
// 表格配置项 // 表格配置项
...@@ -99,7 +120,7 @@ ...@@ -99,7 +120,7 @@
height: 0, height: 0,
data: [], data: [],
fieldList: [ fieldList: [
{ label: '车间', value: 'workshopCode' }, { label: '车间', value: 'workshopCode', slot: 'workshopCode' },
{ label: '区域', value: 'areaName' }, { label: '区域', value: 'areaName' },
{ label: '车道编号', value: 'laneCode' }, { label: '车道编号', value: 'laneCode' },
{ label: '工位编号', value: 'code' }, { label: '工位编号', value: 'code' },
...@@ -176,6 +197,33 @@ ...@@ -176,6 +197,33 @@
// 点击新增按钮 // 点击新增按钮
doAddClick () { doAddClick () {
this.$refs.AddLaneDialog.dialogToggle = true this.$refs.AddLaneDialog.dialogToggle = true
},
// 点击新增车道对话框确认按钮
doAddLaneDialogConfirmClick () {
// 获取表格数据
this.getTableList()
},
// 点击编辑按钮
doEditClick (laneValue) {
this.editLaneBasicValue = _.cloneDeep(laneValue)
this.$refs.EditLaneDialog.dialogToggle = true
},
// 点击删除按钮
doDeleteClick (laneValue) {
console.log(laneValue)
this.$confirm(`确定要删除车道编号为 ${laneValue.laneCode} 的车道基础数据吗?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
center: true
}).then(() => {
let queryParams = { stationId: laneValue.id, hash: 'stationId' }
this.$fetch('basic-info-controller/stationId-delete', queryParams).then(response => {
this.$message.success('删除成功!')
// 获取表格数据
this.getTableList()
})
}).catch(() => {})
} }
}, },
mounted () { mounted () {
...@@ -191,7 +239,7 @@ ...@@ -191,7 +239,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.page-pack { .page-pack {
position: relative; position: relative;
height: 100%; min-height: 100%;
width: 100%; width: 100%;
border: 1px solid #d2d3d5; border: 1px solid #d2d3d5;
background-color: #fff; background-color: #fff;
......
...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
</Search> </Search>
<div class="float-left"> <div class="float-left">
<el-button <el-button
size="small" size="small"
type="primary"> type="primary">
新增 新增
</el-button> </el-button>
</div> </div>
</div> </div>
<div class="general-list-main-pack pl-15 pr-15"> <div class="general-list-main-pack pl-15 pr-15 pb-15">
<div> <div>
<Table <Table
:tableConfig="tableConfig"> :tableConfig="tableConfig">
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.page-pack { .page-pack {
position: relative; position: relative;
height: 100%; min-height: 100%;
width: 100%; width: 100%;
border: 1px solid #d2d3d5; border: 1px solid #d2d3d5;
background-color: #fff; background-color: #fff;
...@@ -158,4 +158,4 @@ ...@@ -158,4 +158,4 @@
} }
} }
} }
</style> </style>
\ No newline at end of file
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
@reset="doResetClick"> @reset="doResetClick">
</Search> </Search>
</div> </div>
<div class="general-list-main-pack pl-15 pr-15"> <div class="general-list-main-pack pl-15 pr-15 pb-15">
<div> <div>
<Table <Table
:tableConfig="tableConfig" :tableConfig="tableConfig"
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.page-pack { .page-pack {
position: relative; position: relative;
height: 100%; min-height: 100%;
width: 100%; width: 100%;
border: 1px solid #d2d3d5; border: 1px solid #d2d3d5;
background-color: #fff; background-color: #fff;
...@@ -237,4 +237,4 @@ ...@@ -237,4 +237,4 @@
} }
} }
} }
</style> </style>
\ No newline at end of file
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
@reset="doResetClick"> @reset="doResetClick">
</Search> </Search>
</div> </div>
<div class="general-list-main-pack pl-15 pr-15"> <div class="general-list-main-pack pl-15 pr-15 pb-15">
<div> <div>
<Table <Table
:tableConfig="tableConfig" :tableConfig="tableConfig"
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.page-pack { .page-pack {
position: relative; position: relative;
height: 100%; min-height: 100%;
width: 100%; width: 100%;
border: 1px solid #d2d3d5; border: 1px solid #d2d3d5;
background-color: #fff; background-color: #fff;
...@@ -217,4 +217,4 @@ ...@@ -217,4 +217,4 @@
} }
} }
} }
</style> </style>
\ No newline at end of file
This diff is collapsed.
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</span> </span>
</div> </div>
</div> </div>
<div class="tool-pack clear-float pl-15 pr-15"> <div class="tool-pack clear-float pl-15 pr-15 pb-15">
<Search <Search
v-if="searchComponentRenderToggle" v-if="searchComponentRenderToggle"
:searchCode="currentSearchCode" :searchCode="currentSearchCode"
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</el-button> </el-button>
</div> </div>
</div> </div>
<div class="general-list-main-pack pl-15 pr-15"> <div class="general-list-main-pack pl-15 pr-15 pb-15">
<div> <div>
<PreviewTable <PreviewTable
:tableConfig="tableConfig" :tableConfig="tableConfig"
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
mounted () { mounted () {
setTimeout(() => { setTimeout(() => {
this.treeHeight = { 'height': `${document.body.offsetHeight - 180}px` } this.treeHeight = { 'height': `${document.body.offsetHeight - 180}px` }
this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 205 this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 210
this.$refs.sortTree.setCurrentKey(this.sortTreeData[0].id) this.$refs.sortTree.setCurrentKey(this.sortTreeData[0].id)
this.currentSort = _.cloneDeep(this.sortTreeData[0]) this.currentSort = _.cloneDeep(this.sortTreeData[0])
this.currentSearchCode = _.cloneDeep(this.sortTreeData[0].code) this.currentSearchCode = _.cloneDeep(this.sortTreeData[0].code)
...@@ -271,7 +271,7 @@ ...@@ -271,7 +271,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.page-pack { .page-pack {
height: 100%; min-height: 100%;
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
...@@ -297,7 +297,6 @@ ...@@ -297,7 +297,6 @@
height: 100%; height: 100%;
border: 1px solid #d2d3d5; border: 1px solid #d2d3d5;
background-color: #fff; background-color: #fff;
overflow-y: auto;
.title-pack { .title-pack {
height: 38px; height: 38px;
...@@ -316,4 +315,4 @@ ...@@ -316,4 +315,4 @@
} }
} }
} }
</style> </style>
\ No newline at end of file
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</el-button> </el-button>
</div> </div>
</div> </div>
<div class="general-list-main-pack pl-15 pr-15"> <div class="general-list-main-pack pl-15 pr-15 pb-15">
<div> <div>
<PreviewTable <PreviewTable
:tableConfig="tableConfig" :tableConfig="tableConfig"
...@@ -264,7 +264,7 @@ ...@@ -264,7 +264,7 @@
mounted () { mounted () {
setTimeout(() => { setTimeout(() => {
this.treeHeight = { 'height': `${document.body.offsetHeight - 180}px` } this.treeHeight = { 'height': `${document.body.offsetHeight - 180}px` }
this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 205 this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 210
this.$refs.sortTree.setCurrentKey(this.sortTreeData[0].id) this.$refs.sortTree.setCurrentKey(this.sortTreeData[0].id)
this.currentSort = _.cloneDeep(this.sortTreeData[0]) this.currentSort = _.cloneDeep(this.sortTreeData[0])
this.currentSearchCode = _.cloneDeep(this.sortTreeData[0].code) this.currentSearchCode = _.cloneDeep(this.sortTreeData[0].code)
...@@ -281,7 +281,7 @@ ...@@ -281,7 +281,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.page-pack { .page-pack {
height: 100%; min-height: 100%;
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
...@@ -326,4 +326,4 @@ ...@@ -326,4 +326,4 @@
} }
} }
} }
</style> </style>
\ No newline at end of file
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</el-button> </el-button>
</div> </div>
</div> </div>
<div class="general-list-main-pack pl-15 pr-15"> <div class="general-list-main-pack pl-15 pr-15 pb-15">
<div> <div>
<PreviewTable <PreviewTable
:tableConfig="tableConfig" :tableConfig="tableConfig"
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
mounted () { mounted () {
setTimeout(() => { setTimeout(() => {
this.treeHeight = { 'height': `${document.body.offsetHeight - 180}px` } this.treeHeight = { 'height': `${document.body.offsetHeight - 180}px` }
this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 205 this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 210
this.$refs.sortTree.setCurrentKey(this.sortTreeData[0].id) this.$refs.sortTree.setCurrentKey(this.sortTreeData[0].id)
this.currentSort = _.cloneDeep(this.sortTreeData[0]) this.currentSort = _.cloneDeep(this.sortTreeData[0])
this.currentSearchCode = _.cloneDeep(this.sortTreeData[0].code) this.currentSearchCode = _.cloneDeep(this.sortTreeData[0].code)
...@@ -276,7 +276,7 @@ ...@@ -276,7 +276,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.page-pack { .page-pack {
height: 100%; min-height: 100%;
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
...@@ -321,4 +321,4 @@ ...@@ -321,4 +321,4 @@
} }
} }
} }
</style> </style>
\ No newline at end of file
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</el-button> </el-button>
</div> </div>
</div> </div>
<div class="general-list-main-pack pl-15 pr-15"> <div class="general-list-main-pack pl-15 pr-15 pb-15">
<div> <div>
<PreviewTable <PreviewTable
:tableConfig="tableConfig" :tableConfig="tableConfig"
...@@ -278,7 +278,7 @@ ...@@ -278,7 +278,7 @@
mounted () { mounted () {
setTimeout(() => { setTimeout(() => {
this.treeHeight = { 'height': `${document.body.offsetHeight - 180}px` } this.treeHeight = { 'height': `${document.body.offsetHeight - 180}px` }
this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 205 this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 210
this.$refs.sortTree.setCurrentKey(this.sortTreeData[0].id) this.$refs.sortTree.setCurrentKey(this.sortTreeData[0].id)
this.currentSort = _.cloneDeep(this.sortTreeData[0]) this.currentSort = _.cloneDeep(this.sortTreeData[0])
this.currentSearchCode = _.cloneDeep(this.sortTreeData[0].code) this.currentSearchCode = _.cloneDeep(this.sortTreeData[0].code)
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.page-pack { .page-pack {
height: 100%; min-height: 100%;
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
...@@ -321,7 +321,6 @@ ...@@ -321,7 +321,6 @@
height: 100%; height: 100%;
border: 1px solid #d2d3d5; border: 1px solid #d2d3d5;
background-color: #fff; background-color: #fff;
overflow-y: auto;
.title-pack { .title-pack {
height: 38px; height: 38px;
...@@ -340,4 +339,4 @@ ...@@ -340,4 +339,4 @@
} }
} }
} }
</style> </style>
\ No newline at end of file
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</el-button> </el-button>
</div> </div>
</div> </div>
<div class="general-list-main-pack pl-15 pr-15"> <div class="general-list-main-pack pl-15 pr-15 pb-15">
<div> <div>
<PreviewTable <PreviewTable
:tableConfig="tableConfig" :tableConfig="tableConfig"
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
mounted () { mounted () {
setTimeout(() => { setTimeout(() => {
this.treeHeight = { 'height': `${document.body.offsetHeight - 180}px` } this.treeHeight = { 'height': `${document.body.offsetHeight - 180}px` }
this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 205 this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 210
this.$refs.sortTree.setCurrentKey(this.sortTreeData[0].id) this.$refs.sortTree.setCurrentKey(this.sortTreeData[0].id)
this.currentSort = _.cloneDeep(this.sortTreeData[0]) this.currentSort = _.cloneDeep(this.sortTreeData[0])
this.currentSearchCode = _.cloneDeep(this.sortTreeData[0].code) this.currentSearchCode = _.cloneDeep(this.sortTreeData[0].code)
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.page-pack { .page-pack {
height: 100%; min-height: 100%;
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
...@@ -306,4 +306,4 @@ ...@@ -306,4 +306,4 @@
} }
} }
} }
</style> </style>
\ No newline at end of file
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</el-button> </el-button>
</div> </div>
</div> </div>
<div class="general-list-main-pack pl-15 pr-15"> <div class="general-list-main-pack pl-15 pr-15 pb-15">
<div> <div>
<PreviewTable <PreviewTable
:tableConfig="tableConfig" :tableConfig="tableConfig"
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
mounted () { mounted () {
setTimeout(() => { setTimeout(() => {
this.treeHeight = { 'height': `${document.body.offsetHeight - 180}px` } this.treeHeight = { 'height': `${document.body.offsetHeight - 180}px` }
this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 205 this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 210
this.$refs.sortTree.setCurrentKey(this.sortTreeData[0].id) this.$refs.sortTree.setCurrentKey(this.sortTreeData[0].id)
this.currentSort = _.cloneDeep(this.sortTreeData[0]) this.currentSort = _.cloneDeep(this.sortTreeData[0])
this.currentSearchCode = _.cloneDeep(this.sortTreeData[0].code) this.currentSearchCode = _.cloneDeep(this.sortTreeData[0].code)
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.page-pack { .page-pack {
height: 100%; min-height: 100%;
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
...@@ -306,4 +306,4 @@ ...@@ -306,4 +306,4 @@
} }
} }
} }
</style> </style>
\ No newline at end of file
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