diff --git a/.env.production b/.env.production index 705ef50..8323fa2 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ # VITE_BASE_API=http://192.168.10.246:9001/smart # VITE_BASE_API=http://10.34.48.206:9000/smart -VITE_BASE_API=http://192.168.10.241:5223/ \ No newline at end of file +VITE_BASE_API=http://192.168.88.105:5223/ diff --git a/src/api/equipment/model/equipment.ts b/src/api/equipment/model/equipment.ts index e32405f..6dc6280 100644 --- a/src/api/equipment/model/equipment.ts +++ b/src/api/equipment/model/equipment.ts @@ -13,7 +13,7 @@ export class EquipmentEntity { state!: string; activated!: boolean; model!:string; - isAlarm!:boolean; + isMaintain!:boolean; ordrNo!: number; remark!: string; } diff --git a/src/pages/equipment/components/addOrEditDialog.vue b/src/pages/equipment/components/addOrEditDialog.vue index 3e09431..caeac2b 100644 --- a/src/pages/equipment/components/addOrEditDialog.vue +++ b/src/pages/equipment/components/addOrEditDialog.vue @@ -35,8 +35,8 @@ emit-value map-options label="模式" @update:model-value="modelUpdate" />
- +
{ addOrEditFormTitle.value = '新增设备'; addOrEditFormData.value.model = 'Auto'; isAlarmFlag.value = false; - addOrEditFormData.value.isAlarm = false; + addOrEditFormData.value.IsMaintain = false; addOrEditFormData.value.activated = true; } visible.value = true; @@ -155,11 +155,11 @@ const modelUpdate = (val: any) => { isAlarmFlag.value = true; } else { isAlarmFlag.value = false; - addOrEditFormData.value.isAlarm = false; + addOrEditFormData.value.IsMaintain = false; } } defineExpose({ clickForm, }); - \ No newline at end of file + diff --git a/src/pages/equipment/index.vue b/src/pages/equipment/index.vue index 407b747..412235a 100644 --- a/src/pages/equipment/index.vue +++ b/src/pages/equipment/index.vue @@ -69,10 +69,10 @@ :color="helper.getModel(props.row.model).color" :label="helper.getModel(props.row.model).text" /> - + :color="helper.getIsAlarm(props.row.isMaintain).color" + :label="helper.getIsAlarm(props.row.isMaintain).text" /> {{ props.row.ordrNo @@ -153,7 +153,7 @@ const columns = ref([ { name: 'equipmentType', align: 'center', label: '设备类型', field: 'equipmentType', 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: 'model', align: 'center', label: '模式', field: 'model', headerStyle: 'background-color: #5186ec;color: white;font-weight: bold;font-size:20px;' }, - { name: 'isAlarm', align: 'center', label: '是否报警', field: 'isAlarm', headerStyle: 'background-color: #5186ec;color: white;font-weight: bold;font-size:20px;' }, + { name: 'isMaintain', align: 'center', label: '是否维护', field: 'isMaintain', headerStyle: 'background-color: #5186ec;color: white;font-weight: bold;font-size:20px;' }, { name: 'ordrNo', align: 'center', label: '排序', field: 'ordrNo', 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;' }, @@ -219,4 +219,4 @@ const delFunc = (e: any) => { color: #2196f3; /* background-color: yellow; */ } - \ No newline at end of file +