gtz #7

Merged
gtz217 merged 4 commits from gtz into master 2022-11-11 16:15:12 +08:00
6 changed files with 43 additions and 59 deletions

View File

@ -1,6 +1,6 @@
<template> <template>
<div id="v3d-outter" ref="v3d-outter"> <div id="v3d-outter" ref="v3d-outter">
<!-- <V3DApp @3d-loaded="handle3DLoaded" /> --> <V3DApp @3d-loaded="handle3DLoaded" />
<!-- 正式内容: --> <!-- 正式内容: -->
<!-- <div v-if="showPage" id="v3d-main-content"> --> <!-- <div v-if="showPage" id="v3d-main-content"> -->
<div v-if="true" id="v3d-main-content"> <div v-if="true" id="v3d-main-content">

View File

@ -99,23 +99,19 @@ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
label: i18n.t('module.factory.abnormalAlarm.alarmTime'), label: i18n.t('module.factory.abnormalAlarm.alarmTime'),
filter: timeFormatter, filter: timeFormatter
align: 'center'
}, },
{ {
prop: 'alarmType', prop: 'alarmType',
label: i18n.t('module.factory.abnormalAlarm.alarmType'), label: i18n.t('module.factory.abnormalAlarm.alarmType')
align: 'center'
}, },
{ {
prop: 'alarmGrade', prop: 'alarmGrade',
label: i18n.t('module.factory.abnormalAlarm.alarmLevel'), label: i18n.t('module.factory.abnormalAlarm.alarmLevel')
align: 'center'
}, },
{ {
prop: 'alarmContent', prop: 'alarmContent',
label: i18n.t('module.factory.abnormalAlarm.alarmReason'), label: i18n.t('module.factory.abnormalAlarm.alarmReason')
align: 'center'
}, },
// { // {
// prop: 'alarmNotify', // prop: 'alarmNotify',
@ -131,7 +127,6 @@ const tableProps = [
{ {
prop: 'status', prop: 'status',
label: i18n.t('module.factory.abnormalAlarm.status'), label: i18n.t('module.factory.abnormalAlarm.status'),
align: 'center',
filter: factory('alarmStatus') filter: factory('alarmStatus')
} }
// { // {

View File

@ -88,50 +88,41 @@ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
label: i18n.t('module.factory.abnormalAlarm.alarmStartTime'), label: i18n.t('module.factory.abnormalAlarm.alarmStartTime'),
filter: timeFormatter, filter: timeFormatter
align: 'center'
}, },
{ {
prop: 'handleTime', prop: 'handleTime',
label: i18n.t('module.factory.abnormalAlarm.alarmEndTime'), label: i18n.t('module.factory.abnormalAlarm.alarmEndTime'),
filter: timeFormatter, filter: timeFormatter
align: 'center'
}, },
{ {
prop: 'equipmentName', prop: 'equipmentName',
label: i18n.t('module.factory.abnormalAlarm.equipmentName'), label: i18n.t('module.factory.abnormalAlarm.equipmentName')
align: 'center'
}, },
{ {
prop: 'alarmGrade', prop: 'alarmGrade',
label: i18n.t('module.basicData.alarmManagement.AlarmLevel'), label: i18n.t('module.basicData.alarmManagement.AlarmLevel')
align: 'center'
}, },
{ {
prop: 'equipmentArea', prop: 'equipmentArea',
label: i18n.t('module.factory.abnormalAlarm.equipmentArea'), label: i18n.t('module.factory.abnormalAlarm.equipmentArea')
align: 'center'
}, },
{ {
prop: 'alarmContent', prop: 'alarmContent',
label: i18n.t('module.factory.abnormalAlarm.alarmInfo'), label: i18n.t('module.factory.abnormalAlarm.alarmInfo')
align: 'center'
}, },
{ {
prop: 'alarmNotify', prop: 'alarmNotify',
label: i18n.t('module.factory.abnormalAlarm.alarmNotify'), label: i18n.t('module.factory.abnormalAlarm.alarmNotify')
align: 'center'
}, },
{ {
prop: 'status', prop: 'status',
label: i18n.t('module.factory.abnormalAlarm.alarmStatus'), label: i18n.t('module.factory.abnormalAlarm.alarmStatus'),
align: 'center',
subcomponent: AlarmStatus subcomponent: AlarmStatus
}, },
{ {
prop: 'remark', prop: 'remark',
label: i18n.t('module.basicData.visual.Remarks'), label: i18n.t('module.basicData.visual.Remarks')
align: 'center'
} }
] ]
export default { export default {

View File

@ -107,29 +107,24 @@ const tableProps = [
{ {
prop: 'planHandoverTime', prop: 'planHandoverTime',
label: i18n.t('module.teamManager.shift.onlineTime'), label: i18n.t('module.teamManager.shift.onlineTime'),
filter: timeFormatter, filter: timeFormatter
align: 'center'
}, },
{ {
prop: 'planOfflineTime', prop: 'planOfflineTime',
label: i18n.t('module.teamManager.shift.offlineTime'), label: i18n.t('module.teamManager.shift.offlineTime'),
filter: timeFormatter, filter: timeFormatter
align: 'center'
}, },
{ {
prop: 'className', prop: 'className',
label: i18n.t('module.teamManager.shift.teamName'), label: i18n.t('module.teamManager.shift.teamName')
align: 'center'
}, },
{ {
prop: 'classCode', prop: 'classCode',
label: i18n.t('module.teamManager.shift.teamCode'), label: i18n.t('module.teamManager.shift.teamCode')
align: 'center'
}, },
{ {
prop: 'planSection', prop: 'planSection',
label: i18n.t('module.teamManager.shift.lineOrProcess'), label: i18n.t('module.teamManager.shift.lineOrProcess'),
align: 'center',
// subcomponent: shiftManagerLine // subcomponent: shiftManagerLine
subcomponent: { subcomponent: {
props: { props: {
@ -161,18 +156,15 @@ const tableProps = [
}, },
{ {
prop: 'planTeamName', prop: 'planTeamName',
label: i18n.t('module.teamManager.shift.handoverTeam'), label: i18n.t('module.teamManager.shift.handoverTeam')
align: 'center'
}, },
{ {
prop: 'planTeamLeader', prop: 'planTeamLeader',
label: i18n.t('module.teamManager.shift.handoverMonitor'), label: i18n.t('module.teamManager.shift.handoverMonitor')
align: 'center'
}, },
{ {
prop: 'handoverStatus', prop: 'handoverStatus',
label: i18n.t('module.teamManager.shift.status'), label: i18n.t('module.teamManager.shift.status'),
align: 'center',
subcomponent: shiftManagerStatus subcomponent: shiftManagerStatus
}, },
// { // {

View File

@ -98,35 +98,29 @@ const tableProps = [
// }, // },
{ {
prop: 'className', prop: 'className',
label: i18n.t('module.teamManager.teamInfo.className'), label: i18n.t('module.teamManager.teamInfo.className')
align: 'center'
}, },
{ {
prop: 'classCode', prop: 'classCode',
label: i18n.t('module.teamManager.teamInfo.classCode'), label: i18n.t('module.teamManager.teamInfo.classCode')
align: 'center'
}, },
{ {
prop: 'planTeamName', prop: 'planTeamName',
label: i18n.t('module.teamManager.teamInfo.planTeamName'), label: i18n.t('module.teamManager.teamInfo.planTeamName')
align: 'center'
}, },
{ {
prop: 'planPreTeamName', prop: 'planPreTeamName',
label: i18n.t('module.teamManager.teamInfo.planPreTeamName'), label: i18n.t('module.teamManager.teamInfo.planPreTeamName')
align: 'center'
}, },
{ {
prop: 'planHandoverTime', prop: 'planHandoverTime',
label: i18n.t('module.teamManager.teamInfo.onlineTime'), label: i18n.t('module.teamManager.teamInfo.onlineTime'),
filter: timeFormatter, filter: timeFormatter
align: 'center'
}, },
{ {
prop: 'planOfflineTime', prop: 'planOfflineTime',
label: i18n.t('module.teamManager.teamInfo.offlineTime'), label: i18n.t('module.teamManager.teamInfo.offlineTime'),
filter: timeFormatter, filter: timeFormatter
align: 'center'
} }
// { // {
// prop: 'workStatus', // prop: 'workStatus',

View File

@ -7,7 +7,6 @@
--> -->
<template> <template>
<div class="app-container"> <div class="app-container">
<top-title />
<head-form <head-form
:form-config="headFormConfig" :form-config="headFormConfig"
@headBtnClick="btnClick" @headBtnClick="btnClick"
@ -45,11 +44,16 @@ const tableBtn = [{
btnName: 'btn.delete' btnName: 'btn.delete'
}] }]
const tableProps = [{ const tableProps = [{
prop: '',
label: '',
width: 700
}, {
prop: 'name', prop: 'name',
label: i18n.t('module.formManage.formSort.name'), label: i18n.t('module.formManage.formSort.name')
align: 'center'
}] }]
import TopTitle from '@/components/TopTitle'
let resizeEventListener = null
import HeadForm from '@/components/basicData/HeadForm' import HeadForm from '@/components/basicData/HeadForm'
import AddForm from './AddForm' import AddForm from './AddForm'
import EditForm from './EditForm' import EditForm from './EditForm'
@ -61,7 +65,7 @@ import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
import i18n from '@/lang' import i18n from '@/lang'
export default { export default {
name: 'OrgManager', name: 'OrgManager',
components: { TopTitle, HeadForm, Pagination, BaseTable, MethodBtn, AddForm, EditForm }, components: { HeadForm, Pagination, BaseTable, MethodBtn, AddForm, EditForm },
props: {}, props: {},
data() { data() {
return { return {
@ -100,7 +104,15 @@ export default {
this.getList() this.getList()
// this.listLoading = false // this.listLoading = false
}, },
mounted() {}, mounted() {
this.$set(this.tableProps[0], 'width', 700 * (document.body.offsetWidth / 1920))
addEventListener('resize', resizeEventListener = () => {
this.$set(this.tableProps[0], 'width', 700 * (document.body.offsetWidth / 1920))
})
},
destroyed() {
removeEventListener('resize', resizeEventListener)
},
methods: { methods: {
handleClick(raw) { handleClick(raw) {
console.log(raw) console.log(raw)