From dac2e095e190046110a0b282b9d2219012840228 Mon Sep 17 00:00:00 2001 From: xuziqiang <1344691446@qq.com> Date: Mon, 15 Jul 2024 17:15:59 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix=EF=BC=9A=E5=88=86=E7=BB=84=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hx-ai-intelligent/src/view/equipmentManage/group/edit.vue | 1 + hx-ai-intelligent/src/view/equipmentManage/group/editCal.vue | 1 + hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/edit.vue b/hx-ai-intelligent/src/view/equipmentManage/group/edit.vue index 9ce1621..f9785ef 100644 --- a/hx-ai-intelligent/src/view/equipmentManage/group/edit.vue +++ b/hx-ai-intelligent/src/view/equipmentManage/group/edit.vue @@ -45,6 +45,7 @@ const clearData = () => { dataSource.value = []; targetKeys.value = []; + currentId.value = ''; }; const toggle = () => { visible.value = !visible.value; diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/editCal.vue b/hx-ai-intelligent/src/view/equipmentManage/group/editCal.vue index 2f2ca8f..5d29b12 100644 --- a/hx-ai-intelligent/src/view/equipmentManage/group/editCal.vue +++ b/hx-ai-intelligent/src/view/equipmentManage/group/editCal.vue @@ -45,6 +45,7 @@ const clearData = () => { dataSource.value = []; targetKeys.value = []; + currentId.value = ''; }; const toggle = () => { visible.value = !visible.value; diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue b/hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue index 97bb5fd..85ef207 100644 --- a/hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue +++ b/hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue @@ -16,8 +16,8 @@ @@ -161,6 +161,7 @@ () => [ createVNode(DeleteOutlined, { style: { color: 'red', cursor: 'pointer' }, + title: '删除', // onClick: () => delGroup(record.id), }), ], From 1aa294b998d8672f3422a7efbf7f87509330f1a8 Mon Sep 17 00:00:00 2001 From: xuziqiang <1344691446@qq.com> Date: Mon, 15 Jul 2024 17:51:30 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E8=AE=BE=E5=A4=87=E5=9E=8B=E5=8F=B7?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hx-ai-intelligent/src/view/equipmentManage/group/config.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts index abd7710..5288eeb 100644 --- a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts +++ b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts @@ -497,7 +497,6 @@ export const tableConfigCal = (el, elGroup, elFormula, defaultParams) => { defaultParams: defaultParams.value, componentProps: { placeholder: '请选择设备型号', - mode: 'multiple', api: (params: any) => { return http.post(group.dropGroupInfoFilter, params).then((res: any) => { const result = [...new Set(res.data)]; From dc0f2a164b32fb9a991ce8c80bc1cdbb8b53621f Mon Sep 17 00:00:00 2001 From: xuziqiang <1344691446@qq.com> Date: Tue, 16 Jul 2024 10:48:10 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=A4=9A=E9=87=8Dsubmit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/saas/view/system/login.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/saas/view/system/login.vue b/lib/saas/view/system/login.vue index 187327a..83bc5be 100644 --- a/lib/saas/view/system/login.vue +++ b/lib/saas/view/system/login.vue @@ -131,6 +131,8 @@ }); validator(null, value?.code) .then(() => { + console.log('登录'); + // 记住密码 rememberFunc(data); loading.value = true; @@ -257,13 +259,13 @@ created() { const _this = this; window.sessionStorage.clear(); - document.onkeydown = function (e) { - const key = window.event === undefined ? e.keyCode : window.event.keyCode; - key === 13 ? _this.submit() : ''; - }; + // document.onkeydown = function (e) { + // const key = window.event === undefined ? e.keyCode : window.event.keyCode; + // key === 13 ? _this.submit() : ''; + // }; }, beforeUnmount() { - document.onkeydown = function (e) {}; + // document.onkeydown = function (e) {}; }, mounted() { From 48569345aa99beb9ef24aee584843128f4da3acc Mon Sep 17 00:00:00 2001 From: xuziqiang <1344691446@qq.com> Date: Tue, 16 Jul 2024 14:31:27 +0800 Subject: [PATCH 4/7] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=AF=86?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hx-ai-intelligent/src/config/app.config.ts | 2 +- hx-op/src/config/app.config.ts | 4 ++-- lib/saas/view/service/updatePassWord.vue | 26 ++++++++++++-------------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/hx-ai-intelligent/src/config/app.config.ts b/hx-ai-intelligent/src/config/app.config.ts index 9f2881a..11df6ca 100644 --- a/hx-ai-intelligent/src/config/app.config.ts +++ b/hx-ai-intelligent/src/config/app.config.ts @@ -103,7 +103,7 @@ export const appConfig = { updatePassWordInfo: { title: '修改密码', subtitle: 'huaxing平台', - api: '/carbon-smart/api/user/password', + api: '/carbon-smart/api/user/update/password', }, // headerBellInfo: { // isShow: true, diff --git a/hx-op/src/config/app.config.ts b/hx-op/src/config/app.config.ts index b5bd1b2..4dff0a0 100644 --- a/hx-op/src/config/app.config.ts +++ b/hx-op/src/config/app.config.ts @@ -89,8 +89,8 @@ export const appConfig = { // 修改密码配置 updatePassWordInfo: { title: '修改密码', - subtitle: 'huaxing平台', - api: '/api/web/objs/User/changePassword', + subtitle: 'huaxing管理平台', + api: '/carbon-smart/api/user/update/password', }, // headerBellInfo: { // isShow: true, diff --git a/lib/saas/view/service/updatePassWord.vue b/lib/saas/view/service/updatePassWord.vue index e75810f..6743c02 100644 --- a/lib/saas/view/service/updatePassWord.vue +++ b/lib/saas/view/service/updatePassWord.vue @@ -19,7 +19,7 @@
@@ -32,8 +32,6 @@
- 登录已有豪恩账号 > - @@ -69,7 +67,7 @@ const { navigateBackV2: navigateBack } = useNavigate(); const formSchema = reactive([ { - field: 'oldPassword', + field: 'originPassword', label: '原密码', component: 'NsInputPassword', componentProps: { @@ -86,7 +84,7 @@ }, { - field: 'newPassword', + field: 'password', label: '新密码', component: 'NsInputPassword', componentProps: { @@ -147,7 +145,7 @@ if (!value) { return; } - if (value !== data.newPassword) { + if (value !== data.password) { return Promise.reject('两次密码不一致'); } }, @@ -166,14 +164,14 @@ async function update() { try { const res = await http.post(configStore.updatePassWordInfo?.api, data); - if (res.success) { - NsMessage.success('修改成功，需重新登陆', 1, () => { - Cookies.remove(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`); - sessionStorage.clear(); - router.push('/login'); - authorizationStore.clearAuthorization(); - }); - } + // if (res.success) { + NsMessage.success('修改成功，需重新登陆', 1, () => { + Cookies.remove(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`); + sessionStorage.clear(); + router.replace('/login'); + authorizationStore.clearAuthorization(); + }); + // } loading.value = false; } catch (err) { loading.value = false; From 0b619fe937c6d39dac5e4a67258df688b73ad16e Mon Sep 17 00:00:00 2001 From: xuziqiang <1344691446@qq.com> Date: Tue, 16 Jul 2024 15:22:29 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hx-ai-intelligent/src/view/equipmentManage/group/config.ts | 1 + hx-ai-intelligent/src/view/equipmentManage/group/edit.vue | 5 ++++- hx-ai-intelligent/src/view/equipmentManage/group/editCal.vue | 5 ++++- hx-ai-intelligent/src/view/equipmentManage/group/editFormula.vue | 6 +++++- hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue | 4 ++++ hx-ai-intelligent/src/view/equipmentManage/group/index.vue | 4 ---- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts index 5288eeb..be69c2c 100644 --- a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts +++ b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts @@ -227,6 +227,7 @@ export const tableConfig = (el, elGroup, elFormula, defaultParams) => { label: '编辑', name: 'groupEdit', type: 'primary', + dynamicDisabled: () => !defaultParams.value?.id, handle: (a, b) => { el.value.toggle(); }, diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/edit.vue b/hx-ai-intelligent/src/view/equipmentManage/group/edit.vue index f9785ef..455cc0f 100644 --- a/hx-ai-intelligent/src/view/equipmentManage/group/edit.vue +++ b/hx-ai-intelligent/src/view/equipmentManage/group/edit.vue @@ -59,7 +59,10 @@ const btnClick = () => { // visible.value = false; - + if (!currentId.value) { + NsMessage.warn('请先选择公司'); + return; + } http .post(group.saveGroupList, { ...props.params, diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/editCal.vue b/hx-ai-intelligent/src/view/equipmentManage/group/editCal.vue index 5d29b12..f60b997 100644 --- a/hx-ai-intelligent/src/view/equipmentManage/group/editCal.vue +++ b/hx-ai-intelligent/src/view/equipmentManage/group/editCal.vue @@ -60,7 +60,10 @@ }; const btnClick = () => { - // visible.value = false; + if (!currentId.value) { + NsMessage.warn('请先选择公司'); + return; + } http .post(group.saveComputeList, { diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/editFormula.vue b/hx-ai-intelligent/src/view/equipmentManage/group/editFormula.vue index 905f7fa..8ab2a97 100644 --- a/hx-ai-intelligent/src/view/equipmentManage/group/editFormula.vue +++ b/hx-ai-intelligent/src/view/equipmentManage/group/editFormula.vue @@ -2,7 +2,7 @@ @@ -140,6 +140,10 @@ ]; const btnClick = () => { + if (!model.value?.formula) { + NsMessage.warn('请填写公式'); + return; + } http .post(group.formula, { ...props.params, diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue b/hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue index 85ef207..6240169 100644 --- a/hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue +++ b/hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue @@ -267,6 +267,10 @@ }; const btnClick = () => { + if (!selectedRowKeys.value[0]) { + NsMessage.warn('请选择分组'); + return; + } http .post(group.saveComputeGroupInfo, { ...props.params, diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/index.vue b/hx-ai-intelligent/src/view/equipmentManage/group/index.vue index 7eb9cd3..0ee490a 100644 --- a/hx-ai-intelligent/src/view/equipmentManage/group/index.vue +++ b/hx-ai-intelligent/src/view/equipmentManage/group/index.vue @@ -5,10 +5,6 @@ - -
From 6278e3ff1763bf2db40563ff1e7fdbdc43e2db8c Mon Sep 17 00:00:00 2001 From: fks-yangshouda Date: Tue, 16 Jul 2024 15:31:05 +0800 Subject: [PATCH 6/7] =?UTF-8?q?1.=E7=9B=91=E6=8E=A7=E4=B8=AD=E5=BF=83=20-?= =?UTF-8?q?=20=E7=8E=AF=E5=A2=83=E7=9B=91=E6=B5=8B=20=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E6=8C=87=E6=95=B0=E5=88=86=E6=9E=90=E6=B7=BB=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=83=A8=E5=88=86=202.=E4=BF=AE=E6=94=B9=20=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=E4=B8=AD=E5=BF=83=20-=20=E8=83=BD=E8=80=97=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=E5=B7=A6=E4=BE=A7=E6=A0=91=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/view/monitor/energyMonitor/tree/index.vue | 48 +++---- .../environmentMonitor/aggregateData/index.vue | 160 ++++++++++++++++++++- 2 files changed, 178 insertions(+), 30 deletions(-) diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue index f6e8062..b599c83 100644 --- a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue +++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue @@ -40,18 +40,22 @@
- + 查询 @@ -89,15 +93,15 @@ // 能耗类型list const options1 = ref([]); - // 采集频率list + // 日期类型list const options2 = ref([]); const mode = ref('1'); // 能耗类型 const selectedValue = ref(); - // 采集频率 - const frequencyValue = ref(); + // 日期类型 + const dateTypeValue = ref(); // 时间 - const dateRange = ref<[Dayjs, Dayjs] | undefined>(); + const dateValue = ref<[Dayjs, Dayjs] | undefined>(); // 页面初始化参数 const getOptionsList = async () => { @@ -115,20 +119,12 @@ } options2.value = [ { - value: '1', - label: '5分钟', - }, - { - value: '2', - label: '10分钟', + value: 'month', + label: '月', }, { - value: '3', - label: '30分钟', - }, - { - value: '4', - label: '1小时', + value: 'year', + label: '年', }, ]; }; @@ -691,9 +687,9 @@ } }; - const onChange = (val: RangeValue) => { - dateRange.value = val; - }; + // const onChange = (val: RangeValue) => { + // dateRange.value = val; + // }; const onCalendarChange = (val: RangeValue) => { dates.value = val; @@ -716,8 +712,8 @@ options2, mode, selectedValue, - frequencyValue, - dateRange, + dateTypeValue, + dateValue, getOptionsList, getSelect, getSelect11, @@ -725,7 +721,7 @@ disabledDate, onCalendarChange, onOpenChange, - onChange, + // onChange, hackValue, treeLoading, changeEnergyType, diff --git a/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue b/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue index 1536c37..1831fc5 100644 --- a/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue +++ b/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue @@ -1,3 +1,4 @@ +