Skip to content

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

fea(设备运行时间): 功能联调、更换logo，网页标签logo及系统显示文字(中通SCADA+AVI系统)

parent 1b6ea19d
Hide whitespace changes
Inline Side-by-side
Showing with 124 additions and 16 deletions
index.html
View file @ b7e9c338
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>中通</title> <title>中通SCADA+AVI系统</title>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
......
src/assets/images/Layout/logo.png
View replaced file @ 1b6ea19d View file @ b7e9c338
src/assets/images/Layout/logo.png

17.2 KB | W: | H:

src/assets/images/Layout/logo.png

9.69 KB | W: | H:

src/assets/images/Layout/logo.png
src/assets/images/Layout/logo.png
src/assets/images/Layout/logo.png
src/assets/images/Layout/logo.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/images/favicon.ico
View replaced file @ 1b6ea19d View file @ b7e9c338
src/assets/images/favicon.ico

524 Bytes | W: | H:

src/assets/images/favicon.ico

1.58 KB | W: | H:

src/assets/images/favicon.ico
src/assets/images/favicon.ico
src/assets/images/favicon.ico
src/assets/images/favicon.ico
  • 2-up
  • Swipe
  • Onion skin
src/interface/apis.js
View file @ b7e9c338
/* eslint-disable */ /* eslint-disable */
export default { export default {
"basic-info-controller": {
"equipCreate-post": {
"url": "/api/basicinfo/equipCreate",
"method": "post"
},
"equipDelete-delete": {
"url": "/api/basicinfo/equipDelete",
"method": "delete"
},
"equipPage-post": {
"url": "/api/basicinfo/equipPage",
"method": "post"
},
"equipUpdate-put": {
"url": "/api/basicinfo/equipUpdate",
"method": "put"
},
"stationCreate-post": {
"url": "/api/basicinfo/stationCreate",
"method": "post"
},
"stationDelete-delete": {
"url": "/api/basicinfo/stationDelete",
"method": "delete"
},
"stationPage-post": {
"url": "/api/basicinfo/stationPage",
"method": "post"
},
"stationUpdate-put": {
"url": "/api/basicinfo/stationUpdate",
"method": "put"
}
},
"equip-date-channel-controller": { "equip-date-channel-controller": {
"insert-post": { "insert-post": {
"url": "/api/channel/insert", "url": "/api/channel/insert",
...@@ -18,12 +52,6 @@ ...@@ -18,12 +52,6 @@
"method": "get" "method": "get"
} }
}, },
"demo-controller": {
"page-post": {
"url": "/api/demo/page",
"method": "post"
}
},
"equip-info-controller": { "equip-info-controller": {
"equipCode-get": { "equipCode-get": {
"url": "/api/equip/equipCode/{equipCode}", "url": "/api/equip/equipCode/{equipCode}",
...@@ -55,6 +83,10 @@ ...@@ -55,6 +83,10 @@
"url": "/api/equipment/equip/findByType", "url": "/api/equipment/equip/findByType",
"method": "get" "method": "get"
}, },
"upload-post": {
"url": "/api/equipment/file/upload",
"method": "post"
},
"transfer-post": { "transfer-post": {
"url": "/api/equipment/program/transfer", "url": "/api/equipment/program/transfer",
"method": "post" "method": "post"
...@@ -64,6 +96,16 @@ ...@@ -64,6 +96,16 @@
"method": "post" "method": "post"
} }
}, },
"run-record-controller": {
"faultPage-post": {
"url": "/api/equipment/faultPage",
"method": "post"
},
"runtimePage-post": {
"url": "/api/equipment/runtimePage",
"method": "post"
}
},
"show-field-controller": { "show-field-controller": {
"showField-get": { "showField-get": {
"url": "/api/field/showField", "url": "/api/field/showField",
......
src/views/DeviceRunning/DeviceRunningTime/list.vue
View file @ b7e9c338
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<span class="page-title-text">设备运行时间</span> <span class="page-title-text">设备运行时间</span>
</div> </div>
<div class="float-right page-refresh"> <div class="float-right page-refresh">
<span @click="doRefreshClick()" class="pointer"> <span @click="doRefreshClick" class="pointer">
<svg-icon icon-class="refresh"></svg-icon> <svg-icon icon-class="refresh"></svg-icon>
<span class="ml-10">刷新</span> <span class="ml-10">刷新</span>
</span> </span>
...@@ -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="MATERIEL_RECORD" searchCode="MACHINE_RUNTIME_RECORD"
@search="doSearchClick" @search="doSearchClick"
@reset="doResetClick"> @reset="doResetClick">
</Search> </Search>
...@@ -21,7 +21,9 @@ ...@@ -21,7 +21,9 @@
<div class="general-list-main-pack pl-15 pr-15"> <div class="general-list-main-pack pl-15 pr-15">
<div> <div>
<Table <Table
:tableConfig="tableConfig"> :tableConfig="tableConfig"
@onPageSizeChange="onSizeChange"
@onCurrentPageChange="onCurrentChange">
</Table> </Table>
</div> </div>
</div> </div>
...@@ -40,11 +42,19 @@ ...@@ -40,11 +42,19 @@
}, },
data () { data () {
return { return {
// 精准搜索关键字列表
searchList: {},
// 表格配置项 // 表格配置项
tableConfig: { tableConfig: {
height: 0, height: 0,
data: [], data: [],
fieldList: [], fieldList: [
{ label: '车间', value: 'workshopCode' },
{ label: '设备编号', value: 'equipCode' },
{ label: '设备名称', value: 'alias' },
{ label: '当班运行时间', value: 'currentRuntime' },
{ label: '累计运行时间', value: 'totalRuntime' }
],
paginationToggle: true, paginationToggle: true,
paginationConfig: { paginationConfig: {
total: 0, total: 0,
...@@ -56,15 +66,70 @@ ...@@ -56,15 +66,70 @@
}, },
methods: { methods: {
// 点击刷新按钮 // 点击刷新按钮
doRefreshClick () {}, doRefreshClick () {
// 获取表格数据
this.getTableLIst().then(response => {
this.$message.success('刷新成功！')
})
},
// 点击搜索组件搜索按钮 // 点击搜索组件搜索按钮
doSearchClick () {}, doSearchClick (searchValue) {
this.searchList = searchValue
this.tableConfig.paginationConfig.currentPage = 1
// 获取表格数据
this.getTableLIst()
},
// 点击搜索组件重置按钮 // 点击搜索组件重置按钮
doResetClick () {} doResetClick (searchValue) {
this.searchList = { ...searchList, filters: [] }
this.tableConfig.paginationConfig.currentPage = 1
this.tableConfig.paginationConfig.pageSize = 20
// 获取表格数据
this.getTableLIst()
},
// 获取表格数据
getTableLIst () {
let queryParams = {
searchCode: this.searchList.searchCode || 'MACHINE_RUNTIME_RECORD',
filters: this.searchList.filters || [],
pageSize: this.tableConfig.paginationConfig.pageSize,
pageNum: this.tableConfig.paginationConfig.currentPage
}
return new Promise((resolve, reject) => {
this.$fetch('run-record-controller/runtimePage-post', queryParams).then((response) => {
if (response.list.length === 0 && response.pageNum !== 1) {
this.tableConfig.paginationConfig.currentPage -= 1
// 获取表格数据
this.getTableLIst()
} else {
this.tableConfig.data = _.cloneDeep(response.list)
this.tableConfig.paginationConfig.total = _.cloneDeep(response.total)
resolve()
}
}).catch(error => {
reject(error)
})
})
},
// 当前分页数量发生了变化
onSizeChange (pageSize) {
this.tableConfig.paginationConfig.currentPage = 1
this.tableConfig.paginationConfig.pageSize = pageSize
// 获取表格数据
this.getTableLIst()
},
// 当前分页页数发生了变化
onCurrentChange (currentPage) {
this.tableConfig.paginationConfig.currentPage = currentPage
// 获取表格数据
this.getTableLIst()
}
}, },
mounted () { mounted () {
setTimeout(() => { setTimeout(() => {
this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 180 this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 180
// 获取表格数据
this.getTableLIst()
}, 0) }, 0)
} }
} }
...@@ -77,6 +142,7 @@ ...@@ -77,6 +142,7 @@
width: 100%; width: 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;
......
src/views/Layout/components/Sidebar.vue
View file @ b7e9c338
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</sidebar-item> </sidebar-item>
</el-menu> </el-menu>
</div> </div>
<div class="support-pack" :style="{'display': sidebarClosed ? 'none' : 'block'}">山东万腾提供技术支持</div> <div class="support-pack" :style="{'display': sidebarClosed ? 'none' : 'block'}">山东万腾电子科技有限公司提供技术支持</div>
</div> </div>
</template> </template>
......
src/views/Welcome/index.vue
View file @ b7e9c338
<template> <template>
<div class="welcome-page"> <div class="welcome-page">
<span class="vertical-line"></span> <span class="vertical-line"></span>
<span class="text-pack"><span style="font-size: 20px;">欢迎登录，</span><br/> 华莹生产制造执行系统</span> <span class="text-pack"><span style="font-size: 20px;">欢迎登录，</span><br/> 中通SCADA+AVI系统</span>
<img class="img" src="../../assets/images/Welcome/welcome_bg.png" alt=""> <img class="img" src="../../assets/images/Welcome/welcome_bg.png" alt="">
</div> </div>
</template> </template>
......
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