-
-
联系人名单
+
- {{ record.userRoleInfos?.[0].deptRoleInfoList }}
+ {{ record?.deptRoleInfoList || record.userRoleInfos?.[0].deptRoleInfoList }}
- 移除
+ 移除
@@ -85,12 +69,12 @@
diff --git a/hx-ai-intelligent/src/view/equipmentManage/ledger/index.vue b/hx-ai-intelligent/src/view/equipmentManage/ledger/index.vue
index 4a35850..2cd33ec 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/ledger/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentManage/ledger/index.vue
@@ -13,4 +13,10 @@
name: 'LedgerIndex', // 与页面路由name一致缓存才可生效
});
-
+
diff --git a/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue b/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue
index e7be87b..a49011b 100644
--- a/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue
+++ b/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue
@@ -816,7 +816,7 @@
padding: @ns-gap;
background-color: @white;
border-radius: @ns-border-radius;
- // box-shadow: @ns-content-box-shadow;
+ box-shadow: @ns-content-box-shadow;
}
.tree {
diff --git a/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue b/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
index 9528e9e..79613a5 100644
--- a/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
+++ b/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
@@ -652,4 +652,10 @@
}
}
}
+
+ .top,
+ :deep(.ns-table-search),
+ :deep(.ns-table-main) {
+ box-shadow: @ns-content-box-shadow;
+ }
diff --git a/lib/saas/view/system/application.vue b/lib/saas/view/system/application.vue
index 3b432cf..76a7517 100644
--- a/lib/saas/view/system/application.vue
+++ b/lib/saas/view/system/application.vue
@@ -337,7 +337,7 @@
height: 100%;
background-color: @white;
border-radius: @ns-border-radius;
- overflow-y: auto;
+ // overflow-y: auto;
// overflow-x: hidden;
// margin: 0 16px 16px 16px;
}
From db70343b18d5d354aa4409faf7b369b0791d3f29 Mon Sep 17 00:00:00 2001
From: xuziqiang <1344691446@qq.com>
Date: Thu, 18 Jul 2024 14:56:26 +0800
Subject: [PATCH 05/11] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
hx-ai-intelligent/src/router/alarmManagement.ts | 6 +++---
hx-ai-intelligent/src/router/carbonEmissionManage.ts | 6 +++---
hx-ai-intelligent/src/router/equipmentControl.ts | 2 +-
hx-ai-intelligent/src/router/equipmentManage.ts | 6 +++---
hx-ai-intelligent/src/router/home.ts | 2 +-
hx-ai-intelligent/src/router/monitor.ts | 8 ++++----
hx-ai-intelligent/src/router/organizationManage.ts | 4 ++--
hx-op/src/router/home.ts | 2 +-
hx-op/src/router/organizationManage.ts | 2 +-
9 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/hx-ai-intelligent/src/router/alarmManagement.ts b/hx-ai-intelligent/src/router/alarmManagement.ts
index f9d7428..02aee50 100644
--- a/hx-ai-intelligent/src/router/alarmManagement.ts
+++ b/hx-ai-intelligent/src/router/alarmManagement.ts
@@ -18,7 +18,7 @@ const alarmManagement = {
component: () => import('/@/view/alarmManagement/alarmOverview/index.vue'),
meta: {
title: '告警总览',
- keepAlive: true,
+ keepAlive: false,
// backApi: [],
},
},
@@ -37,7 +37,7 @@ const alarmManagement = {
component: () => import('/@/view/alarmManagement/equipmentAlarm/index.vue'),
meta: {
title: '设备告警',
- keepAlive: true,
+ keepAlive: false,
// backApi: [],
},
},
@@ -56,7 +56,7 @@ const alarmManagement = {
component: () => import('/@/view/alarmManagement/alarmSettings/index.vue'),
meta: {
title: '告警设置',
- keepAlive: true,
+ keepAlive: false,
operates: [
{ title: '设备告警新增', code: 'equipmentAlarmAdd' },
{ title: '设备告警导入', code: 'equipmentAlarmImport' },
diff --git a/hx-ai-intelligent/src/router/carbonEmissionManage.ts b/hx-ai-intelligent/src/router/carbonEmissionManage.ts
index c945868..1ce91af 100644
--- a/hx-ai-intelligent/src/router/carbonEmissionManage.ts
+++ b/hx-ai-intelligent/src/router/carbonEmissionManage.ts
@@ -19,7 +19,7 @@ const equipment = {
component: () => import('/@/view/carbonEmissionManage/carbonEmissionStatistics/index.vue'),
meta: {
title: '碳排统计',
- keepAlive: true,
+ keepAlive: false,
// backApi: [],
},
},
@@ -39,7 +39,7 @@ const equipment = {
component: () => import('/@/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue'),
meta: {
title: '碳排因子库',
- keepAlive: true,
+ keepAlive: false,
// backApi: [],
},
},
@@ -59,7 +59,7 @@ const equipment = {
component: () => import('/@/view/carbonEmissionManage/carbonInventoryCheck/index.vue'),
meta: {
title: '碳盘查',
- keepAlive: true,
+ keepAlive: false,
// backApi: [],
},
},
diff --git a/hx-ai-intelligent/src/router/equipmentControl.ts b/hx-ai-intelligent/src/router/equipmentControl.ts
index 3ed5421..e682e9a 100644
--- a/hx-ai-intelligent/src/router/equipmentControl.ts
+++ b/hx-ai-intelligent/src/router/equipmentControl.ts
@@ -18,7 +18,7 @@ const equipmentControl = {
component: () => import('/@/view/equipmentControl/lightingManage/indexs.vue'),
meta: {
title: '智能照明',
- keepAlive: true,
+ keepAlive: false,
// backApi: [],
},
},
diff --git a/hx-ai-intelligent/src/router/equipmentManage.ts b/hx-ai-intelligent/src/router/equipmentManage.ts
index 576e048..5cb2769 100644
--- a/hx-ai-intelligent/src/router/equipmentManage.ts
+++ b/hx-ai-intelligent/src/router/equipmentManage.ts
@@ -19,7 +19,7 @@ const equipment = {
component: () => import('/@/view/equipmentManage/ledger/index.vue'),
meta: {
title: '设备台账',
- keepAlive: true,
+ keepAlive: false,
// backApi: [],
},
},
@@ -38,7 +38,7 @@ const equipment = {
component: () => import('/@/view/equipmentManage/group/index.vue'),
meta: {
title: '分组管理',
- keepAlive: true,
+ keepAlive: false,
// backApi: [],
},
},
@@ -57,7 +57,7 @@ const equipment = {
// component: () => import('/@/view/equipmentManage/energyMapping/index.vue'),
// meta: {
// title: '能耗映射',
- // keepAlive: true,
+ // keepAlive: false,
// // backApi: [],
// },
// },
diff --git a/hx-ai-intelligent/src/router/home.ts b/hx-ai-intelligent/src/router/home.ts
index 4ef3db5..965c0e4 100644
--- a/hx-ai-intelligent/src/router/home.ts
+++ b/hx-ai-intelligent/src/router/home.ts
@@ -17,7 +17,7 @@ const home = {
// name: 'homeIndex',
// meta: {
// title: '首页',
- // keepAlive: true,
+ // keepAlive: false,
// // backApi: [],
// },
// },
diff --git a/hx-ai-intelligent/src/router/monitor.ts b/hx-ai-intelligent/src/router/monitor.ts
index 8a21dde..e2ee039 100644
--- a/hx-ai-intelligent/src/router/monitor.ts
+++ b/hx-ai-intelligent/src/router/monitor.ts
@@ -18,7 +18,7 @@ const equipment = {
component: () => import('/@/view/monitor/environmentMonitor/index.vue'),
meta: {
title: '环境监测',
- keepAlive: true,
+ keepAlive: false,
// backApi: [],
},
},
@@ -37,7 +37,7 @@ const equipment = {
component: () => import('/@/view/monitor/deviceMonitor/index.vue'),
meta: {
title: '设备监测',
- keepAlive: true,
+ keepAlive: false,
// backApi: [],
},
},
@@ -56,7 +56,7 @@ const equipment = {
component: () => import('/@/view/monitor/energyMonitor/index.vue'),
meta: {
title: '能耗监测',
- keepAlive: true,
+ keepAlive: false,
// backApi: [],
},
},
@@ -75,7 +75,7 @@ const equipment = {
// component: () => import('/@/view/monitor/group/index.vue'),
// meta: {
// title: '分组管理',
- // keepAlive: true,
+ // keepAlive: false,
// // backApi: [],
// },
// },
diff --git a/hx-ai-intelligent/src/router/organizationManage.ts b/hx-ai-intelligent/src/router/organizationManage.ts
index 6b5a52e..1984cd3 100644
--- a/hx-ai-intelligent/src/router/organizationManage.ts
+++ b/hx-ai-intelligent/src/router/organizationManage.ts
@@ -18,7 +18,7 @@ const organizationManage = {
component: () => import('/@/view/organizationManage/usermanage/index.vue'),
meta: {
title: '用户管理',
- keepAlive: true,
+ keepAlive: false,
operates: [
{ title: '新增', code: 'userAdd' },
{ title: '导入', code: 'userImport' },
@@ -48,7 +48,7 @@ const organizationManage = {
component: () => import('/@/view/organizationManage/departmentManage/index.vue'),
meta: {
title: '部门/权限',
- keepAlive: true,
+ keepAlive: false,
operates: [
{ title: '新增部门', code: 'authorityDeptAdd' },
{ title: '新增子部门', code: 'authorityDeptSonAdd' },
diff --git a/hx-op/src/router/home.ts b/hx-op/src/router/home.ts
index b8ea9f4..171c853 100644
--- a/hx-op/src/router/home.ts
+++ b/hx-op/src/router/home.ts
@@ -11,7 +11,7 @@ const home = {
component: () => import('/@/view/developing.vue'),
meta: {
title: '首页',
- keepAlive: true,
+ keepAlive: false,
// backApi: [],
},
},
diff --git a/hx-op/src/router/organizationManage.ts b/hx-op/src/router/organizationManage.ts
index f4ecc42..e0b11ad 100644
--- a/hx-op/src/router/organizationManage.ts
+++ b/hx-op/src/router/organizationManage.ts
@@ -11,7 +11,7 @@ const organizationManage = {
component: () => import('/@/view/organizationManage/enterpriseManage/index.vue'),
meta: {
title: '企业管理',
- keepAlive: true,
+ keepAlive: false,
// backApi: [],
},
},
From 86db377d296a1386a324081b979935528b6c21d4 Mon Sep 17 00:00:00 2001
From: fks-xuxinyue <2822784518@qq.com>
Date: Thu, 18 Jul 2024 15:14:25 +0800
Subject: [PATCH 06/11] =?UTF-8?q?taskid=EF=BC=9A099=20remark:"commit"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../carbonEmissions/index.vue | 2 +-
.../energyConsumption/index.vue | 32 +++++---
.../quickCalculation/index.vue | 10 +--
.../carbonInventoryCheck/fillInPage/index.vue | 10 +++
.../carbonInventoryCheck/index.vue | 88 +++++++++++++++++++++-
5 files changed, 121 insertions(+), 21 deletions(-)
create mode 100644 hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
index 9298666..d792f11 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
@@ -83,7 +83,7 @@
},
{
title: '计量单位',
- dataIndex: 'unit',
+ dataIndex: 'unitName',
},
{
title: '加权平均',
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
index 33312db..c4a1582 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -214,7 +214,9 @@
const wrapperCol = { span: 19 };
const switchLabelCol = { span: 10 };
const switchWrapperCol = { span: 14 };
- const formState = ref({})
+ const formState = ref({
+ orgId: orgId.value,
+ })
// 定义form表单的必填
const rules: Record
= {
energyType: [{ required: true, message: '请输入能源种类', trigger: 'change' }],
@@ -289,8 +291,8 @@
},
{
title: '计量单位',
- className: 'unit',
- dataIndex: 'unit',
+ className: 'unitName',
+ dataIndex: 'unitName',
},
{
title: '全年',
@@ -361,9 +363,9 @@
getDictList()
visible.value = true
fetch(energyConsumption.findById , {id : record.id }).then((res) => {
- if(res.data.unit){
- res.data.unit = res.data.unit.split(',')
- }
+ // if(res.data.unit){
+ // res.data.unit = res.data.unit.split(',')
+ // }
formState.value = res.data
});
},
@@ -423,12 +425,14 @@
.then(() => {
console.log('values', formState, toRaw(formState));
if(formState.value.unit){
- formState.value.unit = formState.value.unit.join(',')
+ formState.value.unit = formState.value.unit.join(',').split(',')[1]
}
if(formState.value.id){
fetch(energyConsumption.update , formState.value).then((res) => {
visible.value = false
- formState.value = {}
+ formState.value = {
+ orgId: orgId.value,
+ }
message.success('操作成功!');
mainRef.value?.nsTableRef.reload();
});
@@ -439,7 +443,9 @@
NsMessage.warning(res.data);
}else{
visible.value = false
- formState.value = {}
+ formState.value = {
+ orgId: orgId.value,
+ }
message.success('操作成功!');
mainRef.value?.nsTableRef.reload();
}
@@ -491,8 +497,8 @@
getDictList()
visible.value = true
fetch(energyConsumption.findById , {id : record.id }).then((res) => {
- if(res.data.unit){
- res.data.unit = res.data.unit.split(',')
+ if(res.data.unitName){
+ res.data.unitName = res.data.unitName.split(',')
}
formState.value = res.data
});
@@ -519,7 +525,9 @@
// 关闭新增抽屉
const onClose = () => {
visible.value = false;
- formState.value = {}
+ formState.value = {
+ orgId: orgId.value,
+ }
formRef.value.resetFields();
};
// 点击上传凭证按钮
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
index 6f1a5d3..602471f 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
@@ -319,11 +319,11 @@
label: '编辑',
name: 'userEdit',
handle: (record: any) => {
- selectedRowKeys.value = [record.carbonId];
+ selectedRowKeys.value = [record.factorId];
formState.value.id = record.id
formState.value.emissionFactors = record.emissionFactors
formState.value.dateRange = [record.startTime, record.endTime];
- formState.value.carbonId = record.carbonId
+ formState.value.factorId = record.factorId
visible.value = true
getNewTable()
},
@@ -375,7 +375,7 @@
const onSelectionChange = (selectedKeys, selectedRows) => {
selectedRowKeys.value = selectedKeys;
formState.value.emissionFactors = selectedRows[0].emissionFactors
- formState.value.carbonId = selectedRows[0].id
+ formState.value.factorId = selectedRows[0].id
};
const queryData = ref({
orgId: orgId.value,
@@ -390,11 +390,11 @@
};
// 点击编辑按钮
const editData = (record) =>{
- selectedRowKeys.value = [record.carbonId];
+ selectedRowKeys.value = [record.factorId];
formState.value.id = record.id
formState.value.emissionFactors = record.emissionFactors
formState.value.dateRange = [record.startTime, record.endTime];
- formState.value.carbonId = record.carbonId
+ formState.value.factorId = record.factorId
visible.value = true
getNewTable()
};
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
new file mode 100644
index 0000000..eb62cd7
--- /dev/null
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
index d1a1a77..89ff479 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
@@ -1,8 +1,55 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.cnValue }}
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
-
+
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
index 8d4092f..069127e 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
@@ -145,7 +145,7 @@ export const notificationtableConfig = (look: any, status: any) => {
fieldMap: ['manufactureBeginDate', 'manufactureEndDate'],
componentProps: {
valueFormat: 'YYYY-MM-DD',
- placeholder: ['设备生产开始日期', '设备生产结束日期'],
+ placeholder: ['开始日期', '结束日期'],
},
},
],
From 429909a7121cea27fc0369d658c27c7be2d98edc Mon Sep 17 00:00:00 2001
From: chenpingsen
Date: Thu, 18 Jul 2024 15:29:22 +0800
Subject: [PATCH 08/11] =?UTF-8?q?add:=E7=85=A7=E6=98=8E=E7=B3=BB=E7=BB=9F?=
=?UTF-8?q?=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
hx-ai-intelligent/src/api/IlluminationInfo.ts | 20 +
.../lightingManage/dialogStyle.less | 9 +
.../equipmentControl/lightingManage/index.less | 67 +-
.../equipmentControl/lightingManage/indexs.vue | 161 +++-
.../equipmentControl/lightingManage/tabs1.less | 439 ++++++++++
.../view/equipmentControl/lightingManage/tabs1.vue | 945 ++++++---------------
.../view/equipmentControl/lightingManage/tabs2.vue | 95 ++-
.../view/equipmentControl/lightingManage/tabs3.vue | 12 +-
8 files changed, 957 insertions(+), 791 deletions(-)
create mode 100644 hx-ai-intelligent/src/api/IlluminationInfo.ts
create mode 100644 hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.less
diff --git a/hx-ai-intelligent/src/api/IlluminationInfo.ts b/hx-ai-intelligent/src/api/IlluminationInfo.ts
new file mode 100644
index 0000000..f6de125
--- /dev/null
+++ b/hx-ai-intelligent/src/api/IlluminationInfo.ts
@@ -0,0 +1,20 @@
+
+// 照明系统及相关接口
+export enum lightingManage {
+
+ // 主页 ========================================================
+
+ // 获得分区与线路
+ getArea = '/carbon-smart/IlluminationInfo/region',
+ // 修改线路的可用/禁用状态
+ setDisable = '/carbon-smart/IlluminationInfo/revisePanel',
+
+ // 计划列表tab页 ================================================
+
+ // 获得计划列表tab页的表格数据
+ getPlanTable = '/carbon-smart/IlluminationPlan/selectPanelPlan',
+ // 获得计划列表tab页的穿梭框左侧数据
+ getLeftPlan = '/carbon-smart/IlluminationPlan/getPlan',
+ // 提交穿梭框被选择的数据
+ submitLeftPlan = '/carbon-smart/IlluminationPlan/joinPlan',
+}
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/dialogStyle.less b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/dialogStyle.less
index 7dee3a5..b3bf2f3 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/dialogStyle.less
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/dialogStyle.less
@@ -3,6 +3,7 @@
right: 496px;
width: 500px;
height: 100%;
+ z-index: 99;
top: 0;
bottom: 0;
margin: auto;
@@ -12,6 +13,7 @@
display: flex;
padding: 25px;
flex-direction: column;
+ transition: all ease 0.5s;
.content {
overflow-y: scroll;
.div-operation {
@@ -138,4 +140,11 @@
color: black;
}
}
+}
+
+.fade-enter-active, .fade-leave-active {
+ transform: translateX(0px);
+}
+.fade-enter-from, .fade-leave-to {
+ transform: translateX(496px);
}
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/index.less b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/index.less
index dd02f25..4b4cf21 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/index.less
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/index.less
@@ -1,7 +1,5 @@
// 页面容器
.lighting-box {
- // width: 100%;
- // height: 100%;
position: relative;
// background: linear-gradient(#badaff, #8cabeb, #7095de);
// 照明设备功能总容器
@@ -47,32 +45,46 @@
height: 240px;
transform: rotateX(79deg) rotateZ(-22deg) skew(29deg);
display: flex;
- gap: 8px;
+ gap: 5px;
.area1 {
- width: 170px;
+ width: 70px;
background: rgba(0, 251, 91, 0.3);
border: 2px solid rgb(0, 251, 91);
display: flex;
}
.area2 {
- width: 240px;
+ width: 200px;
background: rgba(255, 165, 0, 0.3);
border: 2px solid rgb(255, 165, 0);
display: flex;
}
.area3 {
- width: 110px;
+ width: 120px;
background: rgba(255, 0, 0, 0.3);
border: 2px solid rgb(255, 0, 0);
+ display: flex;
}
.area4 {
- flex: 1;
+ width: 70px;
background: rgba(80, 236, 244, 0.3);
border: 2px solid rgb(80, 236, 244);
+ display: flex;
+ }
+ .area5 {
+ flex: 1;
+ background: rgba(0, 251, 91, 0.3);
+ border: 2px solid rgb(0, 251, 91);
+ display: flex;
+ }
+ .area6 {
+ flex: 1;
+ background: rgba(255, 165, 0, 0.3);
+ border: 2px solid rgb(255, 165, 0);
+ display: flex;
}
- // .area-item:hover {
- // transform: scale(1.05);
- // }
+ .area-item:hover {
+ transform: scale(1.05);
+ }
.area-item {
cursor: pointer;
transition: all ease 0.2s;
@@ -82,37 +94,16 @@
display:flex;
justify-content: center;
align-items: center;
- .group-shadow1 {
- width: 35px;
- height: 150px;
- border-radius: 20px;
- background: rgba(0, 0, 0, 0.1);
- }
- .group-shadow2 {
- width: 35px;
- height: 180px;
- border-radius: 20px;
- background: rgba(0, 0, 0, 0.1);
- }
- .group-shadow3 {
- width: 40px;
- height: 180px;
- border-radius: 20px;
- background: rgba(0, 0, 0, 0.1);
- }
- .group-shadow4 {
- width: 40px;
- height: 160px;
+ box-sizing: border-box;
+ padding: 10px;
+ // border: 2px solid red;
+ .shadow-box {
+ width: 30px;
+ height: 200px;
border-radius: 20px;
- background: rgba(0, 0, 0, 0.1);
+ background: rgba(0, 0, 0, 0.2);
}
}
- // .group-shadow {
- // transition: all ease 0.2s;
- // }
- // .group-shadow:hover {
- // transform: scale(1.05);
- // }
}
}
}
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
index a1c1006..dee6eb5 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
@@ -3,25 +3,31 @@
-
-
-
+
+
-
+
+
@@ -44,7 +50,7 @@
:maskStyle="{ 'background-color': 'rgba(0, 0, 0, 0)' }">
-
+
@@ -59,94 +65,170 @@
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
index d0db90a..d1a523d 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
@@ -14,29 +14,29 @@
- {{ row.key }} |
- {{ row.data }} |
+ {{ index + 1 }} |
+ {{ row.startTime }} |
{{ row.planName }} |
-
+ |
|
-
+ |
|
@@ -73,41 +73,53 @@
|