diff --git a/hx-ai-intelligent/src/api/planToAdd.ts b/hx-ai-intelligent/src/api/planToAdd.ts index 746abe9..cf24f60 100644 --- a/hx-ai-intelligent/src/api/planToAdd.ts +++ b/hx-ai-intelligent/src/api/planToAdd.ts @@ -1,6 +1,5 @@ export enum planToAddApi { - getActivatedPlanTree = '/carbon-smart/deviceCtrlPlan/getActivatedPlanTree', //计划树 - getActivatedPlanListByTree = '/carbon-smart/deviceCtrlPlan/getActivatedPlanListByTree', //计划列表 - updPlan = '', //修改计划 - delPlan = '', //修改计划 + getActivatedPlanTree = '/carbon-smart/api/api/deviceCtrlPlan/getActivatedPlanTree', //计划树 + getActivatedPlanListByTree = '/carbon-smart/api/deviceCtrlPlan/getActivatedPlanListByTree', //计划列表 + updPlan = '/carbon-smart/api/deviceCtrlPlan/updateActivatedPlan', //修改计划 } diff --git a/hx-ai-intelligent/src/view/equipmentControl/planToAdd/config.ts b/hx-ai-intelligent/src/view/equipmentControl/planToAdd/config.ts index 6c97814..b851ba2 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/planToAdd/config.ts +++ b/hx-ai-intelligent/src/view/equipmentControl/planToAdd/config.ts @@ -115,7 +115,7 @@ export const tableConfig = ( dynamicParams: ['uuid', 'appealType'], confirm: true, handle: (data: any) => { - http.post(planToAddApi.delPlan, { id: data.id, orgId: data.orgId }).then((res) => { + http.post(planToAddApi.updPlan, { id: data.id, isDeleted: 1 }).then((res) => { if (res.msg === 'success') { NsMessage.success('操作成功'); mainRef.value?.nsTableRef.reload(); @@ -123,7 +123,6 @@ export const tableConfig = ( NsMessage.error(res.msg); } }); - console.log(data, '删除'); mainRef.value?.nsTableRef.reload(); }, }, diff --git a/hx-ai-intelligent/src/view/equipmentControl/planToAdd/index.vue b/hx-ai-intelligent/src/view/equipmentControl/planToAdd/index.vue index 65303a6..82a6758 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/planToAdd/index.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/planToAdd/index.vue @@ -13,6 +13,8 @@ import { ref, onMounted } from 'vue'; import NsModalFrom from '/@/components/ns-modal-form.vue'; import { planToAddApi } from '/@/api/planToAdd'; + import { NsMessage } from '/nerv-lib/component'; + //页面 创建 const orgId = ref(''); const projectId = ref(''); @@ -24,7 +26,7 @@ const modalFormRef = ref(null); const getData = (record: any) => { return record.startTime - ? record.startTime.substring(0, 10) + ' - ' + record.endTime.substring(0, 10) + ? record.startTime.substring(0, 10) + ' - ' + record.endTime.substring(0, 10) : '未配置时间'; }; const nsModalFormConfig = ref({ @@ -41,7 +43,7 @@ allowClear: true, fieldMap: ['startTime', 'endTime'], componentProps: { - valueFormat: 'YYYY-MM-DD', + valueFormat: 'YYYY-MM-DD hh:mm:ss', placeholder: ['开始日期', '结束日期'], }, rules: [ @@ -56,8 +58,11 @@ bodyStyle: { paddingBottom: 0 }, }, success: (data: any) => { - console.log(data, '数据'); - mainRef.value?.nsTableRef.reload(); + if (data.msg === 'success') { + mainRef.value?.nsTableRef.reload(); + } else { + NsMessage.error(data.msg); + } }, }); //创建页面调用方法