zhaohy 4 months ago
parent
commit
a6f77afe70
  1. 7
      hx-ai-intelligent/src/App.vue
  2. 6
      hx-ai-intelligent/src/router/alarmManagement.ts
  3. 6
      hx-ai-intelligent/src/router/carbonEmissionManage.ts
  4. 2
      hx-ai-intelligent/src/router/equipmentControl.ts
  5. 6
      hx-ai-intelligent/src/router/equipmentManage.ts
  6. 2
      hx-ai-intelligent/src/router/home.ts
  7. 8
      hx-ai-intelligent/src/router/monitor.ts
  8. 4
      hx-ai-intelligent/src/router/organizationManage.ts
  9. 2
      hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
  10. 32
      hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
  11. 10
      hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
  12. 10
      hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
  13. 84
      hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
  14. 7
      hx-ai-intelligent/src/view/equipmentManage/group/index.vue
  15. 8
      hx-ai-intelligent/src/view/equipmentManage/ledger/index.vue
  16. 2
      hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue
  17. 6
      hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
  18. 2
      hx-op/src/router/home.ts
  19. 2
      hx-op/src/router/organizationManage.ts
  20. 2
      lib/saas/view/system/application.vue

7
hx-ai-intelligent/src/App.vue

@ -48,11 +48,18 @@
height: 100%; height: 100%;
} }
} }
//
:deep(.ant-tree-node-content-wrapper) { :deep(.ant-tree-node-content-wrapper) {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
text-wrap: nowrap; text-wrap: nowrap;
} }
:deep(.ant-tree-node-selected) {
color: @primary-color !important;
}
// ns-view-list-table
:deep(.ns-table-search) { :deep(.ns-table-search) {
.ns-flexv2-form { .ns-flexv2-form {
.ns-operate { .ns-operate {

6
hx-ai-intelligent/src/router/alarmManagement.ts

@ -18,7 +18,7 @@ const alarmManagement = {
component: () => import('/@/view/alarmManagement/alarmOverview/index.vue'), component: () => import('/@/view/alarmManagement/alarmOverview/index.vue'),
meta: { meta: {
title: '告警总览', title: '告警总览',
keepAlive: true, keepAlive: false,
// backApi: [], // backApi: [],
}, },
}, },
@ -37,7 +37,7 @@ const alarmManagement = {
component: () => import('/@/view/alarmManagement/equipmentAlarm/index.vue'), component: () => import('/@/view/alarmManagement/equipmentAlarm/index.vue'),
meta: { meta: {
title: '设备告警', title: '设备告警',
keepAlive: true, keepAlive: false,
// backApi: [], // backApi: [],
}, },
}, },
@ -56,7 +56,7 @@ const alarmManagement = {
component: () => import('/@/view/alarmManagement/alarmSettings/index.vue'), component: () => import('/@/view/alarmManagement/alarmSettings/index.vue'),
meta: { meta: {
title: '告警设置', title: '告警设置',
keepAlive: true, keepAlive: false,
operates: [ operates: [
{ title: '设备告警新增', code: 'equipmentAlarmAdd' }, { title: '设备告警新增', code: 'equipmentAlarmAdd' },
{ title: '设备告警导入', code: 'equipmentAlarmImport' }, { title: '设备告警导入', code: 'equipmentAlarmImport' },

6
hx-ai-intelligent/src/router/carbonEmissionManage.ts

@ -19,7 +19,7 @@ const equipment = {
component: () => import('/@/view/carbonEmissionManage/carbonEmissionStatistics/index.vue'), component: () => import('/@/view/carbonEmissionManage/carbonEmissionStatistics/index.vue'),
meta: { meta: {
title: '碳排统计', title: '碳排统计',
keepAlive: true, keepAlive: false,
// backApi: [], // backApi: [],
}, },
}, },
@ -39,7 +39,7 @@ const equipment = {
component: () => import('/@/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue'), component: () => import('/@/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue'),
meta: { meta: {
title: '碳排因子库', title: '碳排因子库',
keepAlive: true, keepAlive: false,
// backApi: [], // backApi: [],
}, },
}, },
@ -59,7 +59,7 @@ const equipment = {
component: () => import('/@/view/carbonEmissionManage/carbonInventoryCheck/index.vue'), component: () => import('/@/view/carbonEmissionManage/carbonInventoryCheck/index.vue'),
meta: { meta: {
title: '碳盘查', title: '碳盘查',
keepAlive: true, keepAlive: false,
// backApi: [], // backApi: [],
}, },
}, },

2
hx-ai-intelligent/src/router/equipmentControl.ts

@ -18,7 +18,7 @@ const equipmentControl = {
component: () => import('/@/view/equipmentControl/lightingManage/indexs.vue'), component: () => import('/@/view/equipmentControl/lightingManage/indexs.vue'),
meta: { meta: {
title: '智能照明', title: '智能照明',
keepAlive: true, keepAlive: false,
// backApi: [], // backApi: [],
}, },
}, },

6
hx-ai-intelligent/src/router/equipmentManage.ts

@ -19,7 +19,7 @@ const equipment = {
component: () => import('/@/view/equipmentManage/ledger/index.vue'), component: () => import('/@/view/equipmentManage/ledger/index.vue'),
meta: { meta: {
title: '设备台账', title: '设备台账',
keepAlive: true, keepAlive: false,
// backApi: [], // backApi: [],
}, },
}, },
@ -38,7 +38,7 @@ const equipment = {
component: () => import('/@/view/equipmentManage/group/index.vue'), component: () => import('/@/view/equipmentManage/group/index.vue'),
meta: { meta: {
title: '分组管理', title: '分组管理',
keepAlive: true, keepAlive: false,
// backApi: [], // backApi: [],
}, },
}, },
@ -57,7 +57,7 @@ const equipment = {
// component: () => import('/@/view/equipmentManage/energyMapping/index.vue'), // component: () => import('/@/view/equipmentManage/energyMapping/index.vue'),
// meta: { // meta: {
// title: '能耗映射', // title: '能耗映射',
// keepAlive: true, // keepAlive: false,
// // backApi: [], // // backApi: [],
// }, // },
// }, // },

2
hx-ai-intelligent/src/router/home.ts

@ -17,7 +17,7 @@ const home = {
// name: 'homeIndex', // name: 'homeIndex',
// meta: { // meta: {
// title: '首页', // title: '首页',
// keepAlive: true, // keepAlive: false,
// // backApi: [], // // backApi: [],
// }, // },
// }, // },

8
hx-ai-intelligent/src/router/monitor.ts

@ -18,7 +18,7 @@ const equipment = {
component: () => import('/@/view/monitor/environmentMonitor/index.vue'), component: () => import('/@/view/monitor/environmentMonitor/index.vue'),
meta: { meta: {
title: '环境监测', title: '环境监测',
keepAlive: true, keepAlive: false,
// backApi: [], // backApi: [],
}, },
}, },
@ -37,7 +37,7 @@ const equipment = {
component: () => import('/@/view/monitor/deviceMonitor/index.vue'), component: () => import('/@/view/monitor/deviceMonitor/index.vue'),
meta: { meta: {
title: '设备监测', title: '设备监测',
keepAlive: true, keepAlive: false,
// backApi: [], // backApi: [],
}, },
}, },
@ -56,7 +56,7 @@ const equipment = {
component: () => import('/@/view/monitor/energyMonitor/index.vue'), component: () => import('/@/view/monitor/energyMonitor/index.vue'),
meta: { meta: {
title: '能耗监测', title: '能耗监测',
keepAlive: true, keepAlive: false,
// backApi: [], // backApi: [],
}, },
}, },
@ -75,7 +75,7 @@ const equipment = {
// component: () => import('/@/view/monitor/group/index.vue'), // component: () => import('/@/view/monitor/group/index.vue'),
// meta: { // meta: {
// title: '分组管理', // title: '分组管理',
// keepAlive: true, // keepAlive: false,
// // backApi: [], // // backApi: [],
// }, // },
// }, // },

4
hx-ai-intelligent/src/router/organizationManage.ts

@ -18,7 +18,7 @@ const organizationManage = {
component: () => import('/@/view/organizationManage/usermanage/index.vue'), component: () => import('/@/view/organizationManage/usermanage/index.vue'),
meta: { meta: {
title: '用户管理', title: '用户管理',
keepAlive: true, keepAlive: false,
operates: [ operates: [
{ title: '新增', code: 'userAdd' }, { title: '新增', code: 'userAdd' },
{ title: '导入', code: 'userImport' }, { title: '导入', code: 'userImport' },
@ -48,7 +48,7 @@ const organizationManage = {
component: () => import('/@/view/organizationManage/departmentManage/index.vue'), component: () => import('/@/view/organizationManage/departmentManage/index.vue'),
meta: { meta: {
title: '部门/权限', title: '部门/权限',
keepAlive: true, keepAlive: false,
operates: [ operates: [
{ title: '新增部门', code: 'authorityDeptAdd' }, { title: '新增部门', code: 'authorityDeptAdd' },
{ title: '新增子部门', code: 'authorityDeptSonAdd' }, { title: '新增子部门', code: 'authorityDeptSonAdd' },

2
hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue

@ -83,7 +83,7 @@
}, },
{ {
title: '计量单位', title: '计量单位',
dataIndex: 'unit', dataIndex: 'unitName',
}, },
{ {
title: '加权平均', title: '加权平均',

32
hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue

@ -214,7 +214,9 @@
const wrapperCol = { span: 19 }; const wrapperCol = { span: 19 };
const switchLabelCol = { span: 10 }; const switchLabelCol = { span: 10 };
const switchWrapperCol = { span: 14 }; const switchWrapperCol = { span: 14 };
const formState = ref({}) const formState = ref({
orgId: orgId.value,
})
// form // form
const rules: Record<string, Rule[]> = { const rules: Record<string, Rule[]> = {
energyType: [{ required: true, message: '请输入能源种类', trigger: 'change' }], energyType: [{ required: true, message: '请输入能源种类', trigger: 'change' }],
@ -289,8 +291,8 @@
}, },
{ {
title: '计量单位', title: '计量单位',
className: 'unit', className: 'unitName',
dataIndex: 'unit', dataIndex: 'unitName',
}, },
{ {
title: '全年', title: '全年',
@ -361,9 +363,9 @@
getDictList() getDictList()
visible.value = true visible.value = true
fetch(energyConsumption.findById , {id : record.id }).then((res) => { fetch(energyConsumption.findById , {id : record.id }).then((res) => {
if(res.data.unit){ // if(res.data.unit){
res.data.unit = res.data.unit.split(',') // res.data.unit = res.data.unit.split(',')
} // }
formState.value = res.data formState.value = res.data
}); });
}, },
@ -423,12 +425,14 @@
.then(() => { .then(() => {
console.log('values', formState, toRaw(formState)); console.log('values', formState, toRaw(formState));
if(formState.value.unit){ if(formState.value.unit){
formState.value.unit = formState.value.unit.join(',') formState.value.unit = formState.value.unit.join(',').split(',')[1]
} }
if(formState.value.id){ if(formState.value.id){
fetch(energyConsumption.update , formState.value).then((res) => { fetch(energyConsumption.update , formState.value).then((res) => {
visible.value = false visible.value = false
formState.value = {} formState.value = {
orgId: orgId.value,
}
message.success('操作成功!'); message.success('操作成功!');
mainRef.value?.nsTableRef.reload(); mainRef.value?.nsTableRef.reload();
}); });
@ -439,7 +443,9 @@
NsMessage.warning(res.data); NsMessage.warning(res.data);
}else{ }else{
visible.value = false visible.value = false
formState.value = {} formState.value = {
orgId: orgId.value,
}
message.success('操作成功!'); message.success('操作成功!');
mainRef.value?.nsTableRef.reload(); mainRef.value?.nsTableRef.reload();
} }
@ -491,8 +497,8 @@
getDictList() getDictList()
visible.value = true visible.value = true
fetch(energyConsumption.findById , {id : record.id }).then((res) => { fetch(energyConsumption.findById , {id : record.id }).then((res) => {
if(res.data.unit){ if(res.data.unitName){
res.data.unit = res.data.unit.split(',') res.data.unitName = res.data.unitName.split(',')
} }
formState.value = res.data formState.value = res.data
}); });
@ -519,7 +525,9 @@
// //
const onClose = () => { const onClose = () => {
visible.value = false; visible.value = false;
formState.value = {} formState.value = {
orgId: orgId.value,
}
formRef.value.resetFields(); formRef.value.resetFields();
}; };
// //

10
hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue

@ -319,11 +319,11 @@
label: '编辑', label: '编辑',
name: 'userEdit', name: 'userEdit',
handle: (record: any) => { handle: (record: any) => {
selectedRowKeys.value = [record.carbonId]; selectedRowKeys.value = [record.factorId];
formState.value.id = record.id formState.value.id = record.id
formState.value.emissionFactors = record.emissionFactors formState.value.emissionFactors = record.emissionFactors
formState.value.dateRange = [record.startTime, record.endTime]; formState.value.dateRange = [record.startTime, record.endTime];
formState.value.carbonId = record.carbonId formState.value.factorId = record.factorId
visible.value = true visible.value = true
getNewTable() getNewTable()
}, },
@ -375,7 +375,7 @@
const onSelectionChange = (selectedKeys, selectedRows) => { const onSelectionChange = (selectedKeys, selectedRows) => {
selectedRowKeys.value = selectedKeys; selectedRowKeys.value = selectedKeys;
formState.value.emissionFactors = selectedRows[0].emissionFactors formState.value.emissionFactors = selectedRows[0].emissionFactors
formState.value.carbonId = selectedRows[0].id formState.value.factorId = selectedRows[0].id
}; };
const queryData = ref({ const queryData = ref({
orgId: orgId.value, orgId: orgId.value,
@ -390,11 +390,11 @@
}; };
// //
const editData = (record) =>{ const editData = (record) =>{
selectedRowKeys.value = [record.carbonId]; selectedRowKeys.value = [record.factorId];
formState.value.id = record.id formState.value.id = record.id
formState.value.emissionFactors = record.emissionFactors formState.value.emissionFactors = record.emissionFactors
formState.value.dateRange = [record.startTime, record.endTime]; formState.value.dateRange = [record.startTime, record.endTime];
formState.value.carbonId = record.carbonId formState.value.factorId = record.factorId
visible.value = true visible.value = true
getNewTable() getNewTable()
}; };

10
hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue

@ -0,0 +1,10 @@
<template>
</template>
<script lang="ts" setup>
</script>
<style lang="less" scoped>
</style>

84
hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue

@ -1,5 +1,52 @@
<template> <template>
<!-- 首页 -->
<div v-if="isMainPage">
<ns-view-list-table v-bind="tableConfig" :model="data" ref="mainRef" /> <ns-view-list-table v-bind="tableConfig" :model="data" ref="mainRef" />
</div>
<!-- 填报页 -->
<div v-if="fillInPage">
</div>
<!-- 新增报告弹窗 -->
<a-drawer
:width="500"
:visible="visible"
:body-style="{ paddingBottom: '80px' }"
:footer-style="{ textAlign: 'right' }"
destroyOnClose
@close="onClose">
<a-form
ref="formRef"
:model="formState"
:rules="rules"
:label-col="labelCol"
:wrapper-col="wrapperCol"
>
<a-form-item ref="name" label="报告名称" name="energyType">
<a-input v-model:value="formState.energyType" placeholder="请输入报告名称" />
</a-form-item>
<a-form-item ref="name" label="报告年度" name="energyType">
<a-date-picker v-model:value="value5" picker="year" />
</a-form-item>
<a-form-item ref="name" label="适用标准" name="energyType">
<a-input v-model:value="formState.energyType" placeholder="请输入适用标准" />
</a-form-item>
<a-form-item label="报告周期" name="emissionType" :required="isRequired">
<a-select v-model:value="formState.emissionType" placeholder="请选择排放类型">
<a-select-option v-for="(item, index) in emissionTypeDic" :key="index" :value="item.id">
{{ item.cnValue }}
</a-select-option>
</a-select>
</a-form-item>
<a-form-item ref="name" label="适用标准" name="energyType">
<a-range-picker v-model:value="value4" picker="month" />
</a-form-item>
</a-form>
<template #footer>
<a-button style="margin-right: 8px" @click="onClose">取消</a-button>
<a-button type="primary" @click="onSubmit">确定</a-button>
</template>
</a-drawer>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
@ -13,6 +60,27 @@
const fetch = (api, params = { orgId }) => { const fetch = (api, params = { orgId }) => {
return http.post(api, params); return http.post(api, params);
}; };
//
const isMainPage = ref(false);
const fillInPage = ref(true);
//
const visible = ref(false);
const formState = ref({})
const formRef = ref();
const labelCol = { span: 5 };
const wrapperCol = { span: 19 };
// form
const rules: Record<string, Rule[]> = {
energyType: [{ required: true, message: '请输入能源种类', trigger: 'change' }],
isComputeCarbon: [{ required: true, message: '请选择是否计算碳排', trigger: 'change' }]
};
//
const onClose = () => {
visible.value = false;
formState.value = {}
formRef.value.resetFields();
};
//
const tableConfig = ref({ const tableConfig = ref({
title: '数据库', title: '数据库',
api: carbonEmissionFactorLibrary.getTableList, api: carbonEmissionFactorLibrary.getTableList,
@ -25,6 +93,7 @@
name: 'userAdd', name: 'userAdd',
type: 'primary', type: 'primary',
handle: () => { handle: () => {
visible.value = true
}, },
}, },
], ],
@ -67,12 +136,15 @@
label: '编辑', label: '编辑',
name: 'userEdit', name: 'userEdit',
handle: (record: any) => { handle: (record: any) => {
visible.value = true
}, },
}, },
{ {
label: '填报', label: '填报',
name: 'fillIn', name: 'fillIn',
handle: (record: any) => { handle: (record: any) => {
isMainPage.value = false
fillInPage.value = true
}, },
}, },
{ {
@ -91,7 +163,6 @@
}, },
], ],
}, },
formConfig: { formConfig: {
schemas: [ schemas: [
{ {
@ -103,11 +174,22 @@
maxLength: 30, maxLength: 30,
}, },
}, },
{
field: 'createTime1',
label: '采购日期',
component: 'NsRangePicker',
fieldMap: ['purchaseBeginDate', 'purchaseEndDate'],
componentProps: {
valueFormat: 'YYYY-MM-DD',
placeholder: ['报告年度', '报告年度'],
},
},
], ],
params: {}, params: {},
}, },
rowKey: 'id', rowKey: 'id',
}); });
//
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>

7
hx-ai-intelligent/src/view/equipmentManage/group/index.vue

@ -237,4 +237,11 @@
.common-style; .common-style;
} }
} }
.tree,
:deep(.ns-table-search),
// :deep(.ns-list-table),
:deep(.ns-table-main) {
box-shadow: @ns-content-box-shadow;
}
</style> </style>

8
hx-ai-intelligent/src/view/equipmentManage/ledger/index.vue

@ -13,4 +13,10 @@
name: 'LedgerIndex', // name name: 'LedgerIndex', // name
}); });
</script> </script>
<style lang="less" scoped></style> <style lang="less" scoped>
:deep(.ns-table-search),
:deep(.ns-part-tree),
:deep(.ns-table-main) {
box-shadow: @ns-content-box-shadow;
}
</style>

2
hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue

@ -816,7 +816,7 @@
padding: @ns-gap; padding: @ns-gap;
background-color: @white; background-color: @white;
border-radius: @ns-border-radius; border-radius: @ns-border-radius;
// box-shadow: @ns-content-box-shadow; box-shadow: @ns-content-box-shadow;
} }
.tree { .tree {

6
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;
}
</style> </style>

2
hx-op/src/router/home.ts

@ -11,7 +11,7 @@ const home = {
component: () => import('/@/view/developing.vue'), component: () => import('/@/view/developing.vue'),
meta: { meta: {
title: '首页', title: '首页',
keepAlive: true, keepAlive: false,
// backApi: [], // backApi: [],
}, },
}, },

2
hx-op/src/router/organizationManage.ts

@ -11,7 +11,7 @@ const organizationManage = {
component: () => import('/@/view/organizationManage/enterpriseManage/index.vue'), component: () => import('/@/view/organizationManage/enterpriseManage/index.vue'),
meta: { meta: {
title: '企业管理', title: '企业管理',
keepAlive: true, keepAlive: false,
// backApi: [], // backApi: [],
}, },
}, },

2
lib/saas/view/system/application.vue

@ -337,7 +337,7 @@
height: 100%; height: 100%;
background-color: @white; background-color: @white;
border-radius: @ns-border-radius; border-radius: @ns-border-radius;
overflow-y: auto; // overflow-y: auto;
// overflow-x: hidden; // overflow-x: hidden;
// margin: 0 16px 16px 16px; // margin: 0 16px 16px 16px;
} }

Loading…
Cancel
Save