diff --git a/PVDEMCSUI/src/Utils/helper.ts b/PVDEMCSUI/src/Utils/helper.ts index c614abb..e3bab19 100644 --- a/PVDEMCSUI/src/Utils/helper.ts +++ b/PVDEMCSUI/src/Utils/helper.ts @@ -427,6 +427,9 @@ export default class helper { case 'Alarm': textStatus = '报警'; break; + default: + textStatus = ''; + break; } return textStatus; }; diff --git a/PVDEMCSUI/src/pages/equipment/index.vue b/PVDEMCSUI/src/pages/equipment/index.vue index 3943f5f..5de4570 100644 --- a/PVDEMCSUI/src/pages/equipment/index.vue +++ b/PVDEMCSUI/src/pages/equipment/index.vue @@ -62,7 +62,8 @@ {{ helper.getEquipmentState( props.row.state) }} - {{ props.row.activated + {{ props.row.activated == + true ? '是' : '否' }} {{ props.row.remark }} @@ -132,7 +133,6 @@ const columns = ref([ }, { name: 'equipmentName', align: 'center', label: '设备名称', field: 'equipmentName', headerStyle: 'background-color: #5186ec;color: white;font-weight: bold;font-size:20px;' }, { name: 'equipmentType', align: 'center', label: '设备类型', field: 'equipmentType', headerStyle: 'background-color: #5186ec;color: white;font-weight: bold;font-size:20px;' }, - { name: 'configType', align: 'center', label: '是否系统内置', field: 'configType', headerStyle: 'background-color: #5186ec;color: white;font-weight: bold;font-size:20px;' }, { name: 'state', align: 'center', label: '设备状态', field: 'state', headerStyle: 'background-color: #5186ec;color: white;font-weight: bold;font-size:20px;' }, { name: 'activated', align: 'center', label: '设备启停用', field: 'activated', headerStyle: 'background-color: #5186ec;color: white;font-weight: bold;font-size:20px;' }, { name: 'remark', align: 'center', label: '备注', field: 'remark', headerStyle: 'background-color: #5186ec;color: white;font-weight: bold;font-size:20px;' },