From 07f1903c9897d93a75cf2b9f2b9e55cc1a38ff29 Mon Sep 17 00:00:00 2001 From: zhaohy <1695786511@qq.com> Date: Thu, 15 Aug 2024 11:42:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=89=93=E5=8C=85=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/view/equipmentControl/planToAdd/config.ts | 156 -------------------- .../src/view/equipmentControl/planToAdd/index.vue | 162 +++++++++++++++++++-- 2 files changed, 153 insertions(+), 165 deletions(-) delete mode 100644 hx-ai-intelligent/src/view/equipmentControl/planToAdd/config.ts diff --git a/hx-ai-intelligent/src/view/equipmentControl/planToAdd/config.ts b/hx-ai-intelligent/src/view/equipmentControl/planToAdd/config.ts deleted file mode 100644 index b649ffb..0000000 --- a/hx-ai-intelligent/src/view/equipmentControl/planToAdd/config.ts +++ /dev/null @@ -1,156 +0,0 @@ -import { planToAddApi } from '/@/api/planToAdd'; -import { ref } from 'vue'; -import { http } from '/nerv-lib/util'; -import { getEnum } from '/@/api'; -import { NsMessage } from '/nerv-lib/component'; - -// const enumData: any = await getEnum({ params: { enumType: 'CtrlDeviceType' } }); -//由于打包生产环境编译时await报错,故改为return形式 -const enumData: any = ()=>{ - return getEnum({ params: { enumType: 'CtrlDeviceType' } }) -} -export const tableConfig = ( - orgId: any, - projectId: any, - mainRef: any, - nsModalFormConfig: any, - modalFormRef: any, -) => { - return ref({ - title: '计划库', - api: planToAddApi.getActivatedPlanListByTree, - params: { orgId, projectId, deviceType: enumData.data[0].value }, - treeConfig: { - defaultExpandAll: true, - header: { - icon: 'name', - title: '执行计划', - }, - params: { projectId, deviceType: enumData.data[0].value }, - dynamicParams: { - id: 'id', - pid: 'pid', - level: 'level', - projectId: 'projectId', - deviceType: 'deviceType', - }, - api: planToAddApi.getActivatedPlanTree, - fieldNames: { - title: 'name', - key: 'id', - pid: 'pid', - level: 'level', - projectId: 'projectId', - deviceType: 'deviceType', - children: 'childList', - }, - formConfig: { - schemas: [ - { - field: 'deviceType', - label: '告警优先级', - component: 'nsSelectApi', - autoSubmit: true, - componentProps: { - api: () => getEnum({ params: { enumType: 'CtrlDeviceType' } }), - immediate: true, - resultField: 'data', - labelField: 'label', - valueField: 'value', - placeholder: '请选择告警优先级', - showSearch: true, - autoSelectFirst: true, - filterOption: (input: string, option: any) => { - return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0; - }, - }, - }, - ], - }, - }, - rowSelection: null, - columns: [ - { - title: '执行顺序', - dataIndex: 'address', - width: 100, - customRender: (text: any) => { - return text.index + 1; - }, - }, - { - title: '计划类型', - dataIndex: 'planGroupName', - }, - { - title: '计划名称', - dataIndex: 'planName', - }, - { - title: '执行时间', - dataIndex: 'executionTime', - }, - ], - columnActions: { - title: '操作', - width: 200, - fixed: 'right', - dataIndex: 'tableAction', - actions: [ - { - label: '编辑', - name: 'energyAlarmEdit', - dynamicParams: ['uuid', 'appealType'], - handle: (data: any) => { - const obj = { ...data }; - nsModalFormConfig.value.title = '编辑'; - setTimeout(() => { - nsModalFormConfig.value.data = { - id: obj.id, - }; - if (obj.startTime) { - nsModalFormConfig.value.data.createTime = obj.startTime - ? [obj.startTime, obj.endTime] - : []; - } - }, 1); - modalFormRef.value?.toggle(); - }, - }, - { - label: '删除', - name: 'energyAlarmDel', - dynamicParams: ['uuid', 'appealType'], - confirm: true, - handle: (data: any) => { - http.post(planToAddApi.updPlan, { id: data.id, isDeleted: 1 }).then((res) => { - if (res.msg === 'success') { - NsMessage.success('操作成功'); - mainRef.value?.nsTableRef.reload(); - } else { - NsMessage.error(res.msg); - } - }); - mainRef.value?.nsTableRef.reload(); - }, - }, - ], - }, - formConfig: { - schemas: [ - { - field: 'planName', - label: '计划标题', - component: 'NsInput', - componentProps: { - allowClear: true, - placeholder: '请输入计划名称关键字', - }, - }, - ], - params: {}, - }, - // pagination: { pageSizeOptions: false }, - rowKey: 'uuid', - }); -}; diff --git a/hx-ai-intelligent/src/view/equipmentControl/planToAdd/index.vue b/hx-ai-intelligent/src/view/equipmentControl/planToAdd/index.vue index 0809694..4b521a5 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/planToAdd/index.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/planToAdd/index.vue @@ -9,11 +9,11 @@