Merge pull request 'gtz' (#7) from gtz into master

Reviewed-on: #7
This commit is contained in:
高天泽 2022-11-11 16:15:11 +08:00
commit add78fef04
6 changed files with 43 additions and 59 deletions

View File

@ -1,6 +1,6 @@
<template>
<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="true" id="v3d-main-content">

View File

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

View File

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

View File

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

View File

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

View File

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