创建厂务管理/下片检测和详情页面
This commit is contained in:
parent
6815ac4cc4
commit
101eac890c
@ -3,8 +3,8 @@
|
||||
* @version:
|
||||
* @Author: fzq
|
||||
* @Date: 2022-11-25 09:51:46
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2023-02-09 14:40:52
|
||||
* @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
|
||||
* @LastEditTime: 2023-09-20 11:15:04
|
||||
-->
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
@ -40,25 +40,29 @@
|
||||
<% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
|
||||
<script>
|
||||
// window.SITE_CONFIG['apiURL'] = 'http://192.168.1.8';
|
||||
window.SITE_CONFIG['apiURL'] = 'http://india.mes.picaiba.com/';
|
||||
// window.SITE_CONFIG['apiURL'] = 'http://india.mes.picaiba.com/';
|
||||
window.SITE_CONFIG['apiURL'] = 'http://127.0.0.1:8080/';
|
||||
</script>
|
||||
<% } %>
|
||||
<!-- 集成测试环境 -->
|
||||
<% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %>
|
||||
<script>
|
||||
window.SITE_CONFIG['apiURL'] = 'http://india.mes.picaiba.com/';
|
||||
// window.SITE_CONFIG['apiURL'] = 'http://india.mes.picaiba.com/';
|
||||
window.SITE_CONFIG['apiURL'] = 'http://127.0.0.1:8080/';
|
||||
</script>
|
||||
<% } %>
|
||||
<!-- 验收测试环境 -->
|
||||
<% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %>
|
||||
<script>
|
||||
window.SITE_CONFIG['apiURL'] = 'http://india.mes.picaiba.com/';
|
||||
// window.SITE_CONFIG['apiURL'] = 'http://india.mes.picaiba.com/';
|
||||
window.SITE_CONFIG['apiURL'] = 'http://127.0.0.1:8080/';
|
||||
</script>
|
||||
<% } %>
|
||||
<!-- 生产环境 -->
|
||||
<% if (process.env.VUE_APP_NODE_ENV === 'prod') { %>
|
||||
<script>
|
||||
window.SITE_CONFIG['apiURL'] = 'http://india.mes.picaiba.com/';
|
||||
// window.SITE_CONFIG['apiURL'] = 'http://india.mes.picaiba.com/';
|
||||
window.SITE_CONFIG['apiURL'] = 'http://127.0.0.1:8080/';
|
||||
</script>
|
||||
<% } %>
|
||||
</head>
|
||||
|
||||
@ -27,6 +27,7 @@ t.routes['字典管理'] = 'Dict Management'
|
||||
t.routes['PLC信息'] = 'PLC'
|
||||
// Relations between
|
||||
t.routes['设备与PLC关联配置'] = 'PLC & Equipments'
|
||||
t.routes['下片监测'] = 'Unload Log'
|
||||
t.routes['近24小时设备生产数据'] = 'Equipment Data'
|
||||
t.routes['近24小时产线生产数据'] = 'Productline Data'
|
||||
t.routes['近24小时质量检查数据'] = 'Quality Inspection Data'
|
||||
@ -67,6 +68,7 @@ t.routes['设备信息'] = 'Equipment Details'
|
||||
t.routes['设备参数状态监控'] = 'Current Equipment State'
|
||||
t.routes['设备分组报警信息'] = 'Equipment Group Alarm'
|
||||
t.routes['设备历史参数'] = 'Equipment Historical Parameters'
|
||||
t.routes['下片详情'] = 'Unload Detail'
|
||||
t.routes['质量检测类型'] = 'Quality Inpection Types'
|
||||
t.routes['质量检测信息'] = 'Quality Inpection Details'
|
||||
t.routes['安灯检测盒'] = 'Andeng inspection box'
|
||||
@ -422,6 +424,13 @@ t.pl.choose = 'Please select equipment'
|
||||
t.pl.confirm = 'Confirm'
|
||||
t.pl.cancel = 'Cancel'
|
||||
t.pl.success = 'The new device data is obtained successfully'
|
||||
t.pl.paperLaying = 'Paper Laying Machine Number'
|
||||
t.pl.robotNo = 'Robot Number'
|
||||
t.pl.glassNumber = 'Pallet Glass Number'
|
||||
t.pl.glassLength = 'Glass Length'
|
||||
t.pl.glassWidth = 'Glass Width'
|
||||
t.pl.thick = 'Glass Thcikness'
|
||||
t.pl.quantity = 'Pallet Quantity'
|
||||
|
||||
|
||||
t.prompt = {}
|
||||
|
||||
@ -27,6 +27,7 @@ t.routes['设备'] = '设备'
|
||||
t.routes['字典管理'] = '字典管理'
|
||||
t.routes['PLC信息'] = 'PLC信息'
|
||||
t.routes['设备与PLC关联配置'] = '设备与PLC关联配置' // ?
|
||||
t.routes['下片监测'] = '下片监测'
|
||||
t.routes['近24小时设备生产数据'] = '近24小时设备生产数据'
|
||||
t.routes['近24小时产线生产数据'] = '近24小时产线生产数据'
|
||||
t.routes['近24小时质量检查数据'] = '近24小时质量检查数据'
|
||||
@ -67,6 +68,7 @@ t.routes['设备信息'] = '设备信息'
|
||||
t.routes['设备参数状态监控'] = '设备参数状态监控'
|
||||
t.routes['设备分组报警信息'] = '设备分组报警信息'
|
||||
t.routes['设备历史参数'] = '设备历史参数'
|
||||
t.routes['下片详情'] = '下片详情'
|
||||
t.routes['质量检测类型'] = '质量检测类型'
|
||||
t.routes['质量检测信息'] = '质量检测信息'
|
||||
t.routes['安灯检测盒'] = '安灯检测盒'
|
||||
@ -423,6 +425,14 @@ t.pl.success = '新设备数据获取成功'
|
||||
t.pl.choose = '请选择设备'
|
||||
t.pl.confirm = '确定'
|
||||
t.pl.cancel = '取消'
|
||||
t.pl.paperLaying = '铺纸机名称'
|
||||
t.pl.robotNo = '下片机名称'
|
||||
t.pl.glassNumber = '木托玻璃数'
|
||||
t.pl.glassLength = '玻璃长度'
|
||||
t.pl.glassWidth = '玻璃宽度'
|
||||
t.pl.thick = '玻璃厚度'
|
||||
t.pl.quantity = '木托数量'
|
||||
|
||||
|
||||
|
||||
t.prompt = {}
|
||||
|
||||
@ -8,8 +8,8 @@ import merge from 'lodash/merge'
|
||||
|
||||
const http = axios.create({
|
||||
// baseURL: window.SITE_CONFIG['apiURL'],
|
||||
baseURL: '/api',
|
||||
// baseURL: '/yd-monitor',
|
||||
// baseURL: '/api',
|
||||
baseURL: '/yd-monitor',
|
||||
// baseURL: process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor',
|
||||
timeout: 1000 * 180,
|
||||
withCredentials: true
|
||||
|
||||
355
src/views/modules/monitoring/downloadLog.vue
Normal file
355
src/views/modules/monitoring/downloadLog.vue
Normal file
@ -0,0 +1,355 @@
|
||||
<template>
|
||||
<div class="mod-config">
|
||||
<el-form :inline="true" :model="dataForm" @keyup.enter.native="currentChangeHandle(1)" class="blueTip" size="small">
|
||||
<el-form-item>
|
||||
{{ $t('pl.name') }}
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<!-- @input="getLineEqList($event)" -->
|
||||
<el-select v-model="dataForm.lineId" :placeholder="$t('pl.name')" clearable filterable >
|
||||
<el-option v-for="line in lineList" :key="line.code" :value="line.id" :label="line.name" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item>
|
||||
{{ $t('eq.name') }}
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-select v-model="dataForm.equipmentId" :placeholder="$t('eq.name')" clearable filterable>
|
||||
<el-option v-for="eq in eqList" :key="eq.code" :value="eq.id" :label="eq.name" />
|
||||
</el-select>
|
||||
</el-form-item> -->
|
||||
<el-form-item>
|
||||
{{ $t('startTime') }}
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-date-picker v-model="startTime" type="datetime" :placeholder="$t('hints.date')" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-ddTHH:mm:ss" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
{{ $t('endTime') }}
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-date-picker v-model="endTime" type="datetime" :placeholder="$t('hints.date')" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-ddTHH:mm:ss" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
{{ $t('pl.thick') }}
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-select v-model="glassThick" :placeholder="$t('pl.thick')">
|
||||
<el-option
|
||||
v-for="item in glassOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<!-- <el-button class="buttonColor" @click="currentChangeHandle(1)">{{ $t('query') }}</el-button> -->
|
||||
<el-button class="buttonColor" @click="getDataList()">{{ $t('query') }}</el-button>
|
||||
<!-- <el-button v-if="$hasPermission('monitoring:equipmentgroup:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<base-table
|
||||
:data="dataList"
|
||||
:table-head-configs="tableConfigs"
|
||||
:max-height="calcMaxHeight(8)"
|
||||
@operate-event="handleOperations"
|
||||
@refreshDataList="getDataList" />
|
||||
<!-- layout="total, sizes, prev, pager, next, jumper" -->
|
||||
<el-pagination
|
||||
@size-change="sizeChangeHandle"
|
||||
@current-change="currentChangeHandle"
|
||||
:current-page="pageIndex"
|
||||
:page-sizes="[10, 20, 50, 100]"
|
||||
:page-size="pageSize"
|
||||
:total="totalPage"
|
||||
layout="total"
|
||||
>
|
||||
</el-pagination>
|
||||
<!-- 弹窗, 新增 / 修改 -->
|
||||
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { calcMaxHeight } from '@/utils'
|
||||
import { timeFilter } from '@/utils/filters'
|
||||
import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
|
||||
// import AddOrUpdate from './equipmentGroup-add-or-update'
|
||||
import i18n from '@/i18n'
|
||||
import BaseTable from '@/components/base-table'
|
||||
// import TableOperateComponent from '@/components/base-table/components/operationComponent'
|
||||
import TableTextComponent from '@/components/base-table/components/detailComponent'
|
||||
|
||||
const tableConfigs = [
|
||||
{
|
||||
type: 'index',
|
||||
width: 100,
|
||||
name: i18n.t('index')
|
||||
},
|
||||
{ prop: 'lineName', name: i18n.t('pl.name') },
|
||||
{ prop: 'location', name: i18n.t('pl.paperLaying') },
|
||||
{ prop: 'equipmentName', name: i18n.t('pl.robotNo') },
|
||||
{ prop: 'quantity', name: i18n.t('pl.quantity') },
|
||||
{ prop: 'glassNumber', name: i18n.t('pl.glassNumber') },
|
||||
{ prop: 'startTime', name: i18n.t('startTime') },
|
||||
{ prop: 'endTime', name: i18n.t('endTime') },
|
||||
{ prop: 'glassLength', name: i18n.t('pl.glassLength') },
|
||||
{ prop: 'glassWidth', name: i18n.t('pl.glassWidth') },
|
||||
{ prop: 'glassThickness', name: i18n.t('pl.thick') },
|
||||
{
|
||||
prop: 'detail',
|
||||
name: i18n.t('detail'),
|
||||
buttonContent: i18n.t('detail'),
|
||||
subcomponent: TableTextComponent,
|
||||
emitFullData: true,
|
||||
actionName: 'view-detail'
|
||||
}
|
||||
|
||||
// { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
|
||||
]
|
||||
|
||||
const addOrUpdateConfigs = {
|
||||
type: 'dialog',
|
||||
infoUrl: '/monitoring/downloadLog/getTimeDet',
|
||||
fields: [{ name: 'equipmentName', label: i18n.t('eq.groupname') }, { name: 'equipmentName', label: i18n.t('eq.groupname') }],
|
||||
operations: [
|
||||
{ name: 'cancel', showAlways: true },
|
||||
{ name: 'save', url: '/monitoring/equipmentGroup', permission: 'monitoring:equipmentgroup:save', showOnEdit: false },
|
||||
{ name: 'update', url: '/monitoring/equipmentGroup', permission: 'monitoring:equipmentgroup:update', showOnEdit: true }
|
||||
]
|
||||
}
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
addOrUpdateConfigs,
|
||||
calcMaxHeight,
|
||||
tableConfigs,
|
||||
dataForm: {
|
||||
equipmentId: '',
|
||||
lineId: ''
|
||||
},
|
||||
dataList: [],
|
||||
eqList: [],
|
||||
lineList: [],
|
||||
pageIndex: 1,
|
||||
pageSize: 10,
|
||||
totalPage: 0,
|
||||
dataListLoading: false,
|
||||
dataListSelections: [],
|
||||
addOrUpdateVisible: false,
|
||||
startTime: '',
|
||||
endTime: '',
|
||||
glassNumber: 95,
|
||||
glassLength: 2272,
|
||||
glassWidth: 1128,
|
||||
glassThick: 3.2,
|
||||
glassOptions: [{
|
||||
value: 3.2,
|
||||
label: '3.2mm'
|
||||
}, {
|
||||
value: 2,
|
||||
label: '2mm'
|
||||
}],
|
||||
value: ''
|
||||
}
|
||||
},
|
||||
components: {
|
||||
AddOrUpdate,
|
||||
BaseTable
|
||||
},
|
||||
activated() {
|
||||
// this.getEqList()
|
||||
this.getLineList()
|
||||
|
||||
this.getDataList()
|
||||
},
|
||||
methods: {
|
||||
// destroy dialog
|
||||
handleDestroyDialog() {
|
||||
setTimeout(() => {
|
||||
this.addOrUpdateVisible = false
|
||||
}, /** after dialog animated */ 200)
|
||||
},
|
||||
|
||||
// 产线对应设备
|
||||
getLineEqList(event) {
|
||||
// console.log(event)
|
||||
this.$http({
|
||||
url: this.$http.adornUrl('/monitoring/equipment/page'),
|
||||
method: 'get',
|
||||
params: this.$http.adornParams({
|
||||
limit: 99999,
|
||||
page: 1,
|
||||
lineId: event
|
||||
})
|
||||
}).then(({ data }) => {
|
||||
if (data && data.code === 0) {
|
||||
let fileterEqList = data.data.list.filter((t) => {
|
||||
return t.lineId == event
|
||||
})
|
||||
this.eqList = fileterEqList
|
||||
} else {
|
||||
this.eqList = []
|
||||
}
|
||||
})
|
||||
},
|
||||
// 产线
|
||||
getLineList() {
|
||||
this.$http({
|
||||
url: this.$http.adornUrl('/monitoring/productionLine/list'),
|
||||
method: 'get'
|
||||
}).then(({ data }) => {
|
||||
if (data && data.code === 0) {
|
||||
this.lineList = data.data
|
||||
} else {
|
||||
this.lineList = []
|
||||
}
|
||||
})
|
||||
},
|
||||
// 获取数据列表
|
||||
getDataList() {
|
||||
this.addOrUpdateVisible = false
|
||||
this.dataListLoading = true
|
||||
// this.$http({
|
||||
// url: this.$http.adornUrl('/monitoring/downloadLog/getTimeCount'),
|
||||
// method: 'POST',
|
||||
// params: this.$http.adornParams({
|
||||
// // page: this.pageIndex,
|
||||
// // limit: this.pageSize,
|
||||
// // lineId: this.dataForm.lineId,
|
||||
// 'startTime': this.startTime,
|
||||
// 'endTime': this.endTime
|
||||
// }
|
||||
// )
|
||||
this.$http({
|
||||
url: this.$http.adornUrl('/monitoring/downloadLog/getTimeCount'),
|
||||
method: 'POST',
|
||||
data: {
|
||||
// page: this.pageIndex,
|
||||
// limit: this.pageSize,
|
||||
// lineId: this.dataForm.lineId,
|
||||
'startTime': this.startTime,
|
||||
'endTime': this.endTime
|
||||
}
|
||||
}).then(({ data }) => {
|
||||
if ((data && data.code === 0) && (this.dataForm.lineId != '')) {
|
||||
// console.log('this.dataForm.lineId', this.dataForm.lineId);
|
||||
let fileterLineList = data.data.filter((t) => {
|
||||
return t.lineId == this.dataForm.lineId
|
||||
})
|
||||
this.dataList = fileterLineList
|
||||
// this.dataList = data.data
|
||||
this.totalPage = this.dataList.length
|
||||
// console.log('this.totalPage',this.totalPage)
|
||||
} else if (this.dataForm.lineId == '') {
|
||||
this.dataList = data.data
|
||||
this.totalPage = data.data.length
|
||||
}
|
||||
else {
|
||||
this.dataList = []
|
||||
this.totalPage = 0
|
||||
}
|
||||
for(let i =0;i<this.dataList.length;i++){
|
||||
this.dataList[i].glassNumber = ( this.glassThick == 3.2 ) ? 95 :150
|
||||
this.dataList[i].glassThickness = this.glassThick
|
||||
this.dataList[i].glassLength = 2272
|
||||
this.dataList[i].glassWidth = 1128
|
||||
this.dataList[i].endTime = this.dataList[i].endTime == null ? '-' : this.dataList[i].endTime
|
||||
this.dataList[i].startTime = this.dataList[i].startTime == null ? '-' : this.dataList[i].startTime
|
||||
}
|
||||
// console.log(this.dataList);
|
||||
this.dataListLoading = false
|
||||
})
|
||||
},
|
||||
// 每页数
|
||||
sizeChangeHandle(val) {
|
||||
this.pageSize = val
|
||||
this.pageIndex = 1
|
||||
this.getDataList()
|
||||
},
|
||||
// 当前页
|
||||
currentChangeHandle(val) {
|
||||
this.pageIndex = val
|
||||
this.getDataList()
|
||||
},
|
||||
// 多选
|
||||
selectionChangeHandle(val) {
|
||||
this.dataListSelections = val
|
||||
},
|
||||
handleOperations({ type, data }) {
|
||||
switch (type) {
|
||||
case 'view-detail':
|
||||
const { equipmentId: id , equipmentName: name} = data
|
||||
this.$router.push({
|
||||
name: 'monitoring-unloadDetail',
|
||||
params: { id, name }
|
||||
})
|
||||
break
|
||||
// case 'edit':
|
||||
// return this.addOrUpdateHandle(id)
|
||||
// case 'delete':
|
||||
// return this.deleteHandle(id)
|
||||
}
|
||||
},
|
||||
// 新增 / 修改
|
||||
addOrUpdateHandle(id) {
|
||||
this.addOrUpdateVisible = true
|
||||
this.$nextTick(() => {
|
||||
this.$refs.addOrUpdate.init(id)
|
||||
})
|
||||
},
|
||||
// 删除
|
||||
deleteHandle(id) {
|
||||
var ids = id
|
||||
? [id]
|
||||
: this.dataListSelections.map((item) => {
|
||||
return item.id
|
||||
})
|
||||
this.$confirm(`${i18n.t('prompt.info', { handle: id ? i18n.t('delete').toLowerCase() : i18n.t('deleteBatch').toLowerCase() })}`, i18n.t('prompt.title'), {
|
||||
confirmButtonText: i18n.t('confirm'),
|
||||
cancelButtonText: i18n.t('cancel'),
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
this.$http({
|
||||
url: this.$http.adornUrl('/monitoring/equipmentGroup'),
|
||||
method: 'delete',
|
||||
data: this.$http.adornData(ids, false, 'raw')
|
||||
}).then(({ data }) => {
|
||||
if (data && data.code === 0) {
|
||||
this.$message({
|
||||
message: i18n.t('prompt.success'),
|
||||
type: 'success',
|
||||
duration: 1500,
|
||||
onClose: () => {
|
||||
this.getDataList()
|
||||
}
|
||||
})
|
||||
} else {
|
||||
this.$message.error(data.msg)
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.blueTip::before {
|
||||
display: inline-block;
|
||||
content: '';
|
||||
width: 4px;
|
||||
height: 24px;
|
||||
background: #0b58ff;
|
||||
border-radius: 1px;
|
||||
margin-right: 8px;
|
||||
margin-top: 4px;
|
||||
}
|
||||
.buttonColor {
|
||||
color: #fff;
|
||||
background: #0b58ff;
|
||||
}
|
||||
</style>
|
||||
@ -5,7 +5,7 @@
|
||||
{{ $t('pl.name') }}
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-select v-model="dataForm.lineId" :placeholder="$t('pl.name')" clearable filterable>
|
||||
<el-select v-model="dataForm.lineId" :placeholder="$t('pl.name')" clearable filterable @input="getLineEqList($event)">
|
||||
<el-option v-for="line in lineList" :key="line.code" :value="line.id" :label="line.name" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
@ -150,8 +150,9 @@ export default {
|
||||
BaseTable
|
||||
},
|
||||
activated() {
|
||||
this.getEqList()
|
||||
// this.getEqList()
|
||||
this.getLineList()
|
||||
this.getEqList()
|
||||
this.getDataList()
|
||||
},
|
||||
methods: {
|
||||
@ -178,6 +179,28 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
// 产线对应设备
|
||||
getLineEqList(event) {
|
||||
console.log(event)
|
||||
this.$http({
|
||||
url: this.$http.adornUrl('/monitoring/equipment/page'),
|
||||
method: 'get',
|
||||
params: this.$http.adornParams({
|
||||
limit: 99999,
|
||||
page: 1,
|
||||
lineId: event
|
||||
})
|
||||
}).then(({ data }) => {
|
||||
if (data && data.code === 0) {
|
||||
let fileterEqList = data.data.list.filter((t) => {
|
||||
return t.lineId == event
|
||||
})
|
||||
this.eqList = fileterEqList
|
||||
} else {
|
||||
this.eqList = []
|
||||
}
|
||||
})
|
||||
},
|
||||
// 产线
|
||||
getLineList() {
|
||||
this.$http({
|
||||
|
||||
@ -14,7 +14,8 @@ export default {
|
||||
// url: window.SITE_CONFIG['apiURL'] + this.$http.adornUrl('/ureport/designer')
|
||||
// url: this.$http.adornUrl('/ureport/designer')
|
||||
// url: (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + '/ureport/designer'
|
||||
url: '/api/ureport/designer'
|
||||
// url: '/api/ureport/designer'
|
||||
url: '/yd-monitor/ureport/designer'
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<!--
|
||||
* @Author: gtz
|
||||
* @Date: 2021-03-07 18:39:03
|
||||
* @LastEditors: gtz
|
||||
* @LastEditTime: 2022-02-24 16:35:51
|
||||
* @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
|
||||
* @LastEditTime: 2023-09-20 11:14:33
|
||||
* @Description: file content
|
||||
-->
|
||||
<template>
|
||||
@ -24,7 +24,8 @@ export default {
|
||||
// url: process.env.VUE_APP_REPORT_VIEW_URL
|
||||
// url: window.SITE_CONFIG['apiURL'] + this.$http.adornUrl('/ureport/preview')
|
||||
// url: (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + '/ureport/preview'
|
||||
url: '/api/ureport/preview'
|
||||
// url: '/api/ureport/preview'
|
||||
url: '/yd-monitor/ureport/preview'
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
|
||||
209
src/views/modules/monitoring/unloadDetail.vue
Normal file
209
src/views/modules/monitoring/unloadDetail.vue
Normal file
@ -0,0 +1,209 @@
|
||||
<template>
|
||||
<el-form :model="dataForm" :inline="true" class="blueTip" size="small">
|
||||
<el-form-item>
|
||||
{{ $t('pl.robotNo') }}
|
||||
</el-form-item>
|
||||
<!-- <el-form-item :label="$t('equCode')">
|
||||
<strong>{{ equipmentCode }}</strong>
|
||||
</el-form-item> -->
|
||||
<el-form-item >
|
||||
{{ equipmentName }}
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
{{ $t('startTime') }}
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-date-picker v-model="startTime" type="datetime" :placeholder="$t('hints.date')" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-ddTHH:mm:ss" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
{{ $t('endTime') }}
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-date-picker v-model="endTime" type="datetime" :placeholder="$t('hints.date')" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-ddTHH:mm:ss" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
{{ $t('pl.thick') }}
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-select v-model="glassThick" :placeholder="$t('pl.thick')">
|
||||
<el-option
|
||||
v-for="item in glassOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<!-- <el-button class="buttonColor" @click="currentChangeHandle(1)">{{ $t('query') }}</el-button> -->
|
||||
<el-button class="buttonColor" @click="getDataList()">{{ $t('query') }}</el-button>
|
||||
<!-- <el-button v-if="$hasPermission('monitoring:equipmentgroup:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
|
||||
</el-form-item>
|
||||
<base-table
|
||||
:page="pageIndex"
|
||||
:size="pageSize"
|
||||
:data="dataList"
|
||||
:table-head-configs="tableConfigs"
|
||||
:max-height="calcMaxHeight(8)"
|
||||
@refreshDataList="getDataList" />
|
||||
<!-- layout="total, sizes, prev, pager, next, jumper" -->
|
||||
<el-pagination
|
||||
@size-change="sizeChangeHandle"
|
||||
@current-change="currentChangeHandle"
|
||||
:current-page="pageIndex"
|
||||
:page-sizes="[10, 20, 50, 100]"
|
||||
:page-size="pageSize"
|
||||
:total="totalPage"
|
||||
layout="total"
|
||||
>
|
||||
</el-pagination>
|
||||
</el-form>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { calcMaxHeight } from '@/utils'
|
||||
import { timeFilter } from '@/utils/filters'
|
||||
import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
|
||||
import i18n from '@/i18n'
|
||||
import BaseTable from '@/components/base-table'
|
||||
import { pick } from 'lodash/object'
|
||||
import equipmentVue from './equipment.vue'
|
||||
|
||||
const tableConfigs = [
|
||||
{
|
||||
type: 'index',
|
||||
width: 100,
|
||||
name: i18n.t('index')
|
||||
},
|
||||
{ prop: 'lineName', name: i18n.t('pl.name') },
|
||||
{ prop: 'location', name: i18n.t('pl.paperLaying') },
|
||||
{ prop: 'equipmentName', name: i18n.t('pl.robotNo') },
|
||||
{ prop: 'glassNumber', name: i18n.t('pl.glassNumber') },
|
||||
{ prop: 'startTime', name: i18n.t('startTime') },
|
||||
{ prop: 'endTime', name: i18n.t('endTime') },
|
||||
{ prop: 'glassLength', name: i18n.t('pl.glassLength') },
|
||||
{ prop: 'glassWidth', name: i18n.t('pl.glassWidth') },
|
||||
{ prop: 'glassThickness', name: i18n.t('pl.thick') },
|
||||
|
||||
// { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
|
||||
]
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
calcMaxHeight,
|
||||
tableConfigs,
|
||||
dataForm: {
|
||||
equipmentId: '',
|
||||
lineId: ''
|
||||
},
|
||||
dataList: [],
|
||||
eqList: [],
|
||||
lineList: [],
|
||||
pageIndex: 1,
|
||||
pageSize: 10,
|
||||
totalPage: 0,
|
||||
equId: null,
|
||||
dataListLoading: false,
|
||||
dataListSelections: [],
|
||||
addOrUpdateVisible: false,
|
||||
startTime: '',
|
||||
endTime: '',
|
||||
glassNumber: 95,
|
||||
glassLength: 2272,
|
||||
glassWidth: 1128,
|
||||
glassThick: 3.2,
|
||||
glassOptions: [{
|
||||
value: 3.2,
|
||||
label: '3.2mm'
|
||||
}, {
|
||||
value: 2,
|
||||
label: '2mm'
|
||||
}],
|
||||
value: '',
|
||||
equipmentName: this.$route.params.name
|
||||
|
||||
}
|
||||
},
|
||||
components: {
|
||||
AddOrUpdate,
|
||||
BaseTable
|
||||
},
|
||||
activated() {
|
||||
this.getDataList()
|
||||
},
|
||||
mouted() {
|
||||
this.getDataList()
|
||||
},
|
||||
created() {
|
||||
// console.log('params',this.$route.params)
|
||||
},
|
||||
methods: {
|
||||
// destroy dialog
|
||||
handleDestroyDialog() {
|
||||
setTimeout(() => {
|
||||
this.addOrUpdateVisible = false
|
||||
}, /** after dialog animated */ 200)
|
||||
},
|
||||
// 获取数据列表
|
||||
getDataList() {
|
||||
// console.log('this.$route.params.name',this.$route.params.name);
|
||||
this.equipmentName = this.$route.params.name
|
||||
this.dataListLoading = true
|
||||
this.$http({
|
||||
// url: this.$http.adornUrl(`/monitoring/downloadLog/getTimeDet/${this.$route.params.id}`),
|
||||
url: this.$http.adornUrl('/monitoring/downloadLog/getTimeCount'),
|
||||
method: 'POST',
|
||||
data: {
|
||||
// page: this.pageIndex,
|
||||
// limit: this.pageSize,
|
||||
// lineId: this.dataForm.lineId,
|
||||
equId: this.$route.params.id,
|
||||
'startTime': this.startTime,
|
||||
'endTime': this.endTime
|
||||
}
|
||||
}).then(({ data }) => {
|
||||
if (data && data.code === 0) {
|
||||
// let fileterLineList = data.data.filter((t) => {
|
||||
// return t.lineId == this.dataForm.lineId
|
||||
// })
|
||||
// this.dataList = fileterLineList
|
||||
this.dataList = data.data
|
||||
this.totalPage = this.dataList.length
|
||||
// console.log('this.totalPage',this.totalPage)
|
||||
} else if (this.dataForm.lineId == '') {
|
||||
this.dataList = data.data
|
||||
this.totalPage = data.data.length
|
||||
// console.log('this.dataList',this.dataList);
|
||||
}
|
||||
else {
|
||||
this.dataList = []
|
||||
this.totalPage = 0
|
||||
}
|
||||
for(let i =0;i<this.dataList.length;i++){
|
||||
this.dataList[i].glassNumber = ( this.glassThick == 3.2 ) ? 95 :150
|
||||
this.dataList[i].glassThickness = this.glassThick
|
||||
this.dataList[i].glassLength = 2272
|
||||
this.dataList[i].glassWidth = 1128
|
||||
this.dataList[i].endTime = this.dataList[i].endTime == null ? '-' : this.dataList[i].endTime
|
||||
this.dataList[i].startTime = this.dataList[i].startTime == null ? '-' : this.dataList[i].startTime
|
||||
}
|
||||
// console.log(this.dataList);
|
||||
this.dataListLoading = false
|
||||
}).catch(()=>{}) //---去除无效报错---
|
||||
},
|
||||
// 每页数
|
||||
sizeChangeHandle(val) {
|
||||
this.pageSize = val
|
||||
this.pageIndex = 1
|
||||
this.getDataList()
|
||||
},
|
||||
// 当前页
|
||||
currentChangeHandle(val) {
|
||||
this.pageIndex = val
|
||||
this.getDataList()
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@ -30,7 +30,8 @@ export default {
|
||||
this.visible = true
|
||||
// this.url = `${window.SITE_CONFIG['apiURL']}/sys/oss/upload?token=${Cookies.get('token')}`
|
||||
// this.url = (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + `/sys/oss/upload?token=${Cookies.get('token')}`
|
||||
this.url = `/api/sys/oss/upload?token=${Cookies.get('token')}`
|
||||
// this.url = `/api/sys/oss/upload?token=${Cookies.get('token')}`
|
||||
this.url = `/yd-monitor/sys/oss/upload?token=${Cookies.get('token')}`
|
||||
this.num = 0
|
||||
this.fileList = []
|
||||
},
|
||||
|
||||
@ -166,7 +166,8 @@ export default {
|
||||
this.dataForm.uuid = getUUID()
|
||||
// this.captchaPath = `${window.SITE_CONFIG['apiURL']}/captcha?uuid=${this.dataForm.uuid}`
|
||||
// this.captchaPath = (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + `/captcha?uuid=${this.dataForm.uuid}`
|
||||
this.captchaPath = `/api/captcha?uuid=${this.dataForm.uuid}`
|
||||
// this.captchaPath = `/api/captcha?uuid=${this.dataForm.uuid}`
|
||||
this.captchaPath = `/yd-monitor/captcha?uuid=${this.dataForm.uuid}`
|
||||
},
|
||||
// 表单提交
|
||||
dataFormSubmitHandle: debounce(
|
||||
|
||||
@ -29,13 +29,16 @@ module.exports = {
|
||||
},
|
||||
proxy: {
|
||||
'/api': {
|
||||
target: 'http://india.mes.picaiba.com/'
|
||||
// target: 'http://india.mes.picaiba.com/'
|
||||
target: 'http://127.0.0.1:8080/'
|
||||
},
|
||||
'/yd-monitor': {
|
||||
target: 'http://192.168.1.18:8080/' // 开发地址
|
||||
// target: 'http://192.168.1.18:8080/' // 开发地址
|
||||
target: 'http://127.0.0.1:8080/'
|
||||
},
|
||||
'/ureport': {
|
||||
target: 'http://india.mes.picaiba.com/' // ureporter
|
||||
// target: 'http://india.mes.picaiba.com/' // ureporter
|
||||
target: 'http://127.0.0.1:8080/'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user