Skip to content

Z
zhongtong-avi-web
Commit a39c149b authored by 车宾's avatar 车宾
Browse files
Options

Merge branch 'dev' into feature-electrophoresis

parents 5f900e54 f640a56d
Hide whitespace changes
Inline Side-by-side
Showing with 630 additions and 4 deletions
config/index.js
View file @ a39c149b
...@@ -13,7 +13,8 @@ module.exports = { ...@@ -13,7 +13,8 @@ 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',// 东伟服务器地址
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 @ a39c149b
/* eslint-disable */ /* eslint-disable */
export default { export default {
"pda-controller": {
"bound-post": {
"url": "/PDA/bound",
"method": "post"
}
},
"basic-info-controller": { "basic-info-controller": {
"area-get": { "area-get": {
"url": "/api/basicinfo/area", "url": "/api/basicinfo/area",
...@@ -60,6 +66,44 @@ ...@@ -60,6 +66,44 @@
"method": "get" "method": "get"
} }
}, },
"daily-check-controller": {
"addCheckRecord-post": {
"url": "/api/check/addCheckRecord",
"method": "post"
},
"deleteCheckItemModelById-delete": {
"url": "/api/check/deleteCheckItemModelById",
"method": "delete"
},
"expert-post": {
"url": "/api/check/expert",
"method": "post"
},
"getCheckByType-get": {
"url": "/api/check/getCheckByType",
"method": "get"
},
"electrophoresis-post": {
"url": "/api/check/getCheckRecord/electrophoresis",
"method": "post"
},
"pickling-post": {
"url": "/api/check/getCheckRecord/pickling",
"method": "post"
},
"pretreatment-post": {
"url": "/api/check/getCheckRecord/pretreatment",
"method": "post"
},
"getCheckRecordDetailsByID-get": {
"url": "/api/check/getCheckRecordDetailsByID",
"method": "get"
},
"saveCheckItemModel-post": {
"url": "/api/check/saveCheckItemModel",
"method": "post"
}
},
"equip-info-controller": { "equip-info-controller": {
"equipCode-get": { "equipCode-get": {
"url": "/api/equip/equipCode/{equipCode}", "url": "/api/equip/equipCode/{equipCode}",
...@@ -124,6 +168,24 @@ ...@@ -124,6 +168,24 @@
"method": "get" "method": "get"
} }
}, },
"report-data-source-controller": {
"reportDataSource-post": {
"url": "/api/reportDataSource",
"method": "post"
},
"reportDataSource-put": {
"url": "/api/reportDataSource",
"method": "put"
},
"findPage-post": {
"url": "/api/reportDataSource/findPage",
"method": "post"
},
"reportDataSourceId-delete": {
"url": "/api/reportDataSource/{reportDataSourceId}",
"method": "delete"
}
},
"search-controller": { "search-controller": {
"filterList-get": { "filterList-get": {
"url": "/api/search/filterList", "url": "/api/search/filterList",
...@@ -616,6 +678,20 @@ ...@@ -616,6 +678,20 @@
"method": "post" "method": "post"
} }
}, },
"report-jdbc-controller": {
"ping-put": {
"url": "/report/jdbc/ping",
"method": "put"
},
"runQuery-put": {
"url": "/report/jdbc/runQuery",
"method": "put"
},
"schema-put": {
"url": "/report/jdbc/schema",
"method": "put"
}
},
"task-manage-controller": { "task-manage-controller": {
"jobGroup-post": { "jobGroup-post": {
"url": "/task/resume/{jobName}/{jobGroup}", "url": "/task/resume/{jobName}/{jobGroup}",
......
src/lang/zh/route.js
View file @ a39c149b
...@@ -16,6 +16,11 @@ export default { ...@@ -16,6 +16,11 @@ export default {
Chassis: '底盘车间', Chassis: '底盘车间',
Final: '总装车间', Final: '总装车间',
Trial: '试交车间', Trial: '试交车间',
// 化验室数据
Laboratory: '化验室数据',
Pickling: '酸化-磷化线槽液日常检测报告',
ElectrophoresisTank: '电泳槽液日常检测报告',
Pretreatment: '前处理槽液日常检测报告',
// 设备运行时间 // 设备运行时间
DeviceRunning: '设备运行时间', DeviceRunning: '设备运行时间',
DeviceRunningTime: '设备运行时间', DeviceRunningTime: '设备运行时间',
......
src/router/index.js
View file @ a39c149b
...@@ -15,6 +15,8 @@ import Router from 'vue-router' ...@@ -15,6 +15,8 @@ import Router from 'vue-router'
import welcomeRouter from './modules/welcome' import welcomeRouter from './modules/welcome'
// 车间（设备数据） // 车间（设备数据）
import workshopRouter from './modules/workshop' import workshopRouter from './modules/workshop'
// 化验室数据
import laboratoryRouter from './modules/laboratory'
// 设备运行时间 // 设备运行时间
import deviceRunningTimeRouter from './modules/deviceRunning' import deviceRunningTimeRouter from './modules/deviceRunning'
// 基础数据 // 基础数据
...@@ -101,6 +103,7 @@ export const constantRouterMap = [{ ...@@ -101,6 +103,7 @@ export const constantRouterMap = [{
export const asyncRouterMap = [ export const asyncRouterMap = [
welcomeRouter, welcomeRouter,
workshopRouter, workshopRouter,
laboratoryRouter,
deviceRunningTimeRouter, deviceRunningTimeRouter,
basicRouter, basicRouter,
monitorRouter, monitorRouter,
......
src/router/modules/laboratory.js 0 → 100644
View file @ a39c149b
export default {
path: '/laboratory',
component: () => import('@/views/Layout'),
redirect: '/laboratory/pickling',
meta: {title: 'Laboratory', icon: 'template'},
alwaysShow: true,
children: [
{
path: 'pickling',
component: () => import('@/views/Laboratory/Pickling/list'),
name: 'Pickling',
meta: { title: 'Pickling', icon: 'template', noCache: false }
},
{
path: 'electrophoresisTank',
component: () => import('@/views/Laboratory/ElectrophoresisTank/list'),
name: 'ElectrophoresisTank',
meta: { title: 'ElectrophoresisTank', icon: 'template', noCache: false }
},
{
path: 'pretreatment',
component: () => import('@/views/Laboratory/Pretreatment/list'),
name: 'Pretreatment',
meta: { title: 'Pretreatment', icon: 'template', noCache: false }
}
]
}
src/views/Laboratory/ElectrophoresisTank/list.vue 0 → 100644
View file @ a39c149b
<template>
<div class="page-pack">
<div class="title-pack clear-float pl-15 pr-15">
<div class="float-left">
<span class="page-title-text">电泳槽液日常检测报告</span>
</div>
<div class="float-right page-refresh">
<span @click="doRefreshClick" class="pointer">
<svg-icon icon-class="refresh"></svg-icon>
<span class="ml-10">刷新</span>
</span>
</div>
</div>
<div class="tool-pack clear-float pl-15 pr-15">
<Search
searchCode="SCADA_EQUIP_INFO"
@search="doSearchClick"
@reset="doResetClick">
</Search>
<div class="float-left">
<el-button
size="small"
type="primary"
@click="doAddClick">
新增报告
</el-button>
</div>
</div>
</div>
</template>
<script>
import Table from '@/components/Table/index.vue'
import Search from '@/components/Search'
export default {
components: {
Table,
Search
},
data () {
return {}
},
methods: {
// 点击刷新按钮
doRefreshClick () {},
// 点击搜索按钮
doSearchClick () {},
// 点击重置按钮
doResetClick () {},
// 点击新增报告按钮
doAddClick () {}
}
}
</script>
<style lang="scss" scoped>
.page-pack {
position: relative;
min-height: 100%;
width: 100%;
border: 1px solid #d2d3d5;
background-color: #fff;
overflow-y: auto;
.title-pack {
height: 38px;
line-height: 38px;
border-bottom: 1px solid #d2d3d5;
}
.tool-pack {
padding-top: 16px;
padding-bottom: 16px;
.tool-tag {
height: 32px;
line-height: 32px;
font-size: 14px;
}
}
.edit-button {
color: #538FFD;
}
.status-circle {
display: inline-block;
width: 6px;
height: 6px;
border-radius: 6px;
margin-right: 5px;
vertical-align: middle;
}
.delete-button {
color: #F47476;
}
.view-span {
color: #1284fa;
border-bottom: 1px solid #1284fa;
&:hover {
cursor: pointer;
}
}
.el-dialog__body {
padding: 30px 30px 10px 20px!important;
.el-row {
.el-col {
line-height: 35px;
.el-form-item {
width: 100%;
.el-form-item__content {
width: 100%;
.el-input {
font-size: 12px;
height: 32px;
}
.el-input__inner {
height: 32px;
}
.el-select {
width: 100%!important;
font-size: 12px;
height: 32px;
}
.el-date-editor {
width: 100%!important;
}
}
}
}
}
}
}
</style>
\ No newline at end of file
src/views/Laboratory/Pickling/list.vue 0 → 100644
View file @ a39c149b
<template>
<div class="page-pack">
<div class="title-pack clear-float pl-15 pr-15">
<div class="float-left">
<span class="page-title-text">酸化-磷化线槽液日常检测报告</span>
</div>
<div class="float-right page-refresh">
<span @click="doRefreshClick" class="pointer">
<svg-icon icon-class="refresh"></svg-icon>
<span class="ml-10">刷新</span>
</span>
</div>
</div>
<div class="tool-pack clear-float pl-15 pr-15">
<Search
searchCode="DAILY_CHECK_RECORD"
@search="doSearchClick"
@reset="doResetClick">
</Search>
<div class="float-left">
<el-button
size="small"
type="primary"
@click="doAddClick">
新增报告
</el-button>
</div>
</div>
<div class="general-list-main-pack pl-15 pr-15 pb-15">
<div>
<Table
:tableConfig="tableConfig"
@onPageSizeChange="onPageSizeChange"
@onCurrentPageChange="onCurrentPageChange">
<template slot="operationColumn">
<el-table-column
fixed="right"
width="100"
label="操作">
<template slot-scope="scope">
<el-button
type="text">
查看报告
</el-button>
</template>
</el-table-column>
</template>
</Table>
</div>
</div>
</div>
</template>
<script>
import Table from '@/components/Table'
import Search from '@/components/Search'
export default {
name: 'Pickling',
components: {
Table,
Search
},
data () {
return {
// 搜索组件关键字列表
searchList: {},
// 表格配置项
tableConfig: {
height: 0,
data: [],
fieldList: [
{ label: '序号', value: 'id' },
{ label: '版本状态/Rev', value: 'rev' },
{ label: '记录编号/Sheet No.', value: 'sheetNo' },
{ label: '流水码/No.', value: 'no' },
{ label: '化验员', value: 'createBy' },
{ label: '检测日期', value: 'createTime' }
],
paginationToggle: true,
paginationConfig: {
total: 0,
currentPage: 1,
pageSize: 20
}
}
}
},
methods: {
// 点击刷新按钮
doRefreshClick () {},
// 点击搜索按钮
doSearchClick (searchValue) {
this.searchList = searchValue
this.tableConfig.paginationConfig.currentPage = 1
// 获取设备点检记录列表
this.getCheckRecordList()
},
// 点击重置按钮
doResetClick (searchValue) {
this.searchList = { ...searchValue, filters: [] }
this.tableConfig.paginationConfig.currentPage = 1
this.tableConfig.paginationConfig.pageSize = 20
// 获取设备点检记录列表
this.getCheckRecordList()
},
// 触发列表分页数量改变事件
onPageSizeChange (pageSize) {
this.tableConfig.paginationConfig.currentPage = 1
this.tableConfig.paginationConfig.pageSize = pageSize
// 获取设备点检记录列表
this.getCheckRecordList()
},
// 触发列表分页页数改变事件
onCurrentPageChange (currentPage) {
this.tableConfig.paginationConfig.currentPage = currentPage
// 获取设备点检记录列表
this.getCheckRecordList()
},
// 点击新增报告按钮
doAddClick () {},
// 获取设备点检记录列表
getCheckRecordList () {
let queryParams = {
searchCode: 'DAILY_CHECK_RECORD',
filters: this.searchList.filters || [],
pageSize: this.tableConfig.paginationConfig.pageSize,
pageNum: this.tableConfig.paginationConfig.currentPage
}
return new Promise((resolve, reject) => {
this.$fetch('daily-check-controller/pickling-post', queryParams).then(response => {
this.tableConfig.data = _.cloneDeep(response.list)
this.tableConfig.paginationConfig.total = _.cloneDeep(response.total)
resolve()
})
})
}
},
mounted () {
setTimeout(() => {
this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 210
// 获取设备点检记录列表
this.getCheckRecordList()
}, 0)
}
}
</script>
<style lang="scss" scoped>
.page-pack {
position: relative;
min-height: 100%;
width: 100%;
border: 1px solid #d2d3d5;
background-color: #fff;
overflow-y: auto;
.title-pack {
height: 38px;
line-height: 38px;
border-bottom: 1px solid #d2d3d5;
}
.tool-pack {
padding-top: 16px;
padding-bottom: 16px;
.tool-tag {
height: 32px;
line-height: 32px;
font-size: 14px;
}
}
.edit-button {
color: #538FFD;
}
.status-circle {
display: inline-block;
width: 6px;
height: 6px;
border-radius: 6px;
margin-right: 5px;
vertical-align: middle;
}
.delete-button {
color: #F47476;
}
.view-span {
color: #1284fa;
border-bottom: 1px solid #1284fa;
&:hover {
cursor: pointer;
}
}
.el-dialog__body {
padding: 30px 30px 10px 20px!important;
.el-row {
.el-col {
line-height: 35px;
.el-form-item {
width: 100%;
.el-form-item__content {
width: 100%;
.el-input {
font-size: 12px;
height: 32px;
}
.el-input__inner {
height: 32px;
}
.el-select {
width: 100%!important;
font-size: 12px;
height: 32px;
}
.el-date-editor {
width: 100%!important;
}
}
}
}
}
}
}
</style>
\ No newline at end of file
src/views/Laboratory/Pretreatment/list.vue 0 → 100644
View file @ a39c149b
<template>
<div class="page-pack">
<div class="title-pack clear-float pl-15 pr-15">
<div class="float-left">
<span class="page-title-text">前处理槽液日常检测报告</span>
</div>
<div class="float-right page-refresh">
<span @click="doRefreshClick" class="pointer">
<svg-icon icon-class="refresh"></svg-icon>
<span class="ml-10">刷新</span>
</span>
</div>
</div>
<div class="tool-pack clear-float pl-15 pr-15">
<Search
searchCode="SCADA_EQUIP_INFO"
@search="doSearchClick"
@reset="doResetClick">
</Search>
<div class="float-left">
<el-button
size="small"
type="primary"
@click="doAddClick">
新增报告
</el-button>
</div>
</div>
</div>
</template>
<script>
import Table from '@/components/Table/index.vue'
import Search from '@/components/Search'
export default {
components: {
Table,
Search
},
data () {
return {}
},
methods: {
// 点击刷新按钮
doRefreshClick () {},
// 点击搜索按钮
doSearchClick () {},
// 点击重置按钮
doResetClick () {},
// 点击新增报告按钮
doAddClick () {}
}
}
</script>
<style lang="scss" scoped>
.page-pack {
position: relative;
min-height: 100%;
width: 100%;
border: 1px solid #d2d3d5;
background-color: #fff;
overflow-y: auto;
.title-pack {
height: 38px;
line-height: 38px;
border-bottom: 1px solid #d2d3d5;
}
.tool-pack {
padding-top: 16px;
padding-bottom: 16px;
.tool-tag {
height: 32px;
line-height: 32px;
font-size: 14px;
}
}
.edit-button {
color: #538FFD;
}
.status-circle {
display: inline-block;
width: 6px;
height: 6px;
border-radius: 6px;
margin-right: 5px;
vertical-align: middle;
}
.delete-button {
color: #F47476;
}
.view-span {
color: #1284fa;
border-bottom: 1px solid #1284fa;
&:hover {
cursor: pointer;
}
}
.el-dialog__body {
padding: 30px 30px 10px 20px!important;
.el-row {
.el-col {
line-height: 35px;
.el-form-item {
width: 100%;
.el-form-item__content {
width: 100%;
.el-input {
font-size: 12px;
height: 32px;
}
.el-input__inner {
height: 32px;
}
.el-select {
width: 100%!important;
font-size: 12px;
height: 32px;
}
.el-date-editor {
width: 100%!important;
}
}
}
}
}
}
}
</style>
\ No newline at end of file
src/views/Workshop/Welding/list.vue
View file @ a39c149b
...@@ -87,16 +87,21 @@ ...@@ -87,16 +87,21 @@
}, },
{ {
id: 2, id: 2,
label: 'PLC数控合装胎', label: 'PLC数控合装胎1',
code: 'PLC_CONTROL_TIRE' code: 'PLC_CONTROL_TIRE_1'
}, },
{ {
id: 3, id: 3,
label: 'PLC数控合装胎2',
code: 'PLC_CONTROL_TIRE_2'
},
{
id: 4,
label: '板链', label: '板链',
code: 'PLATE_CHAIN' code: 'PLATE_CHAIN'
}, },
{ {
id: 4, id: 5,
label: '旋转辊床', label: '旋转辊床',
code: 'ROTARY_ROLLER_BED' code: 'ROTARY_ROLLER_BED'
} }
......
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