-
-
- 联系人名单
+ ![]()
- {{ record.userRoleInfos?.[0].deptRoleInfoList }}
+ {{ record?.deptRoleInfoList || record.userRoleInfos?.[0].deptRoleInfoList }}
- 移除
+ 移除
@@ -85,12 +69,11 @@
+
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: ['开始日期', '结束日期'],
},
},
],
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
index cf05dbf..3bb69b9 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
@@ -707,16 +707,17 @@
{
field: 'emissionProcess',
label: '排放环节',
- component: 'NsSelect',
+ component: 'NsInput',
componentProps: {
- allowClear: true,
+ // allowClear: true,
placeholder: '请选择排放环节',
- options: [
- {
- label: '消费环节',
- value: 0,
- }
- ],
+ maxLength: 30,
+ // options: [
+ // {
+ // label: '消费环节',
+ // value: 0,
+ // }
+ // ],
},
},
{
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index copy.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index copy.vue
new file mode 100644
index 0000000..62c8b54
--- /dev/null
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index copy.vue
@@ -0,0 +1,306 @@
+
+ -->
+ = {
energyType: [{ required: true, message: '请输入能源种类', trigger: 'change' }],
@@ -229,19 +233,182 @@
queryParams.value.year = selectYear.value
getTableList()
}
+ const mainRef = ref();
+ const year = selectYear.value.format('YYYY')
+ const tableConfig = ref({
+ title: '能耗统计',
+ api: energyConsumption.pageList,
+ params: queryParams.value,
+ headerActions: [
+ {
+ label: '新增',
+ name: 'userAdd',
+ type: 'primary',
+ handle: () => {
+ getDictList()
+ visible.value = true
+ },
+ },
+ {
+ label: '导入',
+ type: 'primary',
+ name: 'userImport',
+ handle: () => {},
+ },
+ {
+ label: '导出',
+ type: 'primary',
+ name: 'userExports',
+ },
+ {
+ label: '模板下载',
+ type: 'primary',
+ name: 'userExports',
+ },
+ {
+ label: '上传凭证',
+ type: 'primary',
+ handle: () => {
+ openUpload.value = true;
+ },
+ },
+ {
+ label: '凭证下载',
+ type: 'primary',
+ name: 'userExports',
+ },
+ ],
+ columns: [
+ {
+ title: '序号',
+ customRender: (text: any) => {
+ return text.index + 1;
+ },
+ },
+ {
+ title: '能源种类',
+ dataIndex: 'energyType',
+ },
+ {
+ title: '计量单位',
+ className: 'unitName',
+ dataIndex: 'unitName',
+ },
+ {
+ title: '全年',
+ dataIndex: 'yearly',
+ },
+ {
+ title: '1月',
+ dataIndex: 'jan',
+ // customRender: ({ text, record }) => ({
+ // children: text,
+ // attrs: {
+ // style: record.janFlag === 1 ? 'color: red' : 'color: blue'
+ // }
+ // })
+ },
+ {
+ title: '2月',
+ dataIndex: 'feb',
+ },
+ {
+ title: '3月',
+ dataIndex: 'mar',
+ },
+ {
+ title: '4月',
+ dataIndex: 'apr',
+ },
+ {
+ title: '5月',
+ dataIndex: 'may',
+ },
+ {
+ title: '6月',
+ dataIndex: 'jun',
+ },
+ {
+ title: '7月',
+ dataIndex: 'jul',
+ },
+ {
+ title: '8月',
+ dataIndex: 'aug',
+ },
+ {
+ title: '9月',
+ dataIndex: 'sep',
+ },
+ {
+ title: '10月',
+ dataIndex: 'oct',
+ },
+ {
+ title: '11月',
+ dataIndex: 'nov',
+ },
+ {
+ title: '12月',
+ dataIndex: 'dec',
+ },
+ ],
+ columnActions: {
+ title: '操作',
+ actions: [
+ {
+ label: '编辑',
+ name: 'userEdit',
+ handle: (record: any) => {
+ getDictList()
+ visible.value = true
+ fetch(energyConsumption.findById , {id : record.id }).then((res) => {
+ // if(res.data.unit){
+ // res.data.unit = res.data.unit.split(',')
+ // }
+ formState.value = res.data
+ });
+ },
+ },
+ {
+ label: '删除',
+ name: 'userDelete',
+ dynamicParams: { id: 'id' },
+ confirm: true,
+ isReload: true,
+ api: energyConsumption.del,
+ },
+ ],
+ },
+
+ formConfig: {
+ schemas: [
+ {
+ field: 'year',
+ label: '年份',
+ component: 'NsDatePicker',
+ componentProps: {
+ picker: 'year',
+ valueFormat: 'YYYY',
+ defaultValue: selectYear.value.format('YYYY'),
+ },
+ },
+ ],
+ params: {},
+ },
+ rowKey: 'id',
+ });
// 获取表格数据
const getTableList = () => {
fetch(energyConsumption.pageList , queryParams.value).then((res) => {
data.value = res.data.records
- total.value = res.data.total
});
};
- getTableList()
// 分页器
const onChange = (pageNumber: number,size: number) => {
queryParams.value.pageNum = pageNumber;
queryParams.value.pageSize = size;
- getTableList()
+ mainRef.value?.nsTableRef.reload();
};
// 计算碳排切换
const changeRadio = (e) => {
@@ -258,28 +425,29 @@
.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 = {
+ orgId: orgId.value,
+ }
message.success('操作成功！');
- getTableList()
+ mainRef.value?.nsTableRef.reload();
});
}else{
fetch(energyConsumption.creat , formState.value).then((res) => {
if(res.data === '新增数据已存在'){
visible.value = false
- queryParams.value = formState.value
- queryParams.value.pageNum = 1,
- queryParams.value.pageSize = 10,
- queryParams.value.orgId = orgId.value,
- queryParams.value.year = selectYear.value.format('YYYY')
- getTableList()
+ NsMessage.warning(res.data);
}else{
visible.value = false
+ formState.value = {
+ orgId: orgId.value,
+ }
message.success('操作成功！');
- getTableList()
+ mainRef.value?.nsTableRef.reload();
}
});
}
@@ -298,10 +466,10 @@
fetch(carbonEmissionFactorLibrary.dictionaryUnitManagement, { grp: 'MEASUREMENT_UNIT'}).then((res) => {
measurementUnit.value = res.data
measurementUnit.value = measurementUnit.value.map(item => ({
- value: item.cnValue,
+ value: item.id,
label: item.cnValue,
children: item.children ? item.children.map(child => ({
- value: child.cnValue,
+ value: child.id,
label: child.cnValue
})) : []
}));
@@ -310,10 +478,10 @@
fetch(group.queryDeviceGroupTree, { energyType: 'ELECTRICITY_USAGE',orgId: orgId.value }).then((res) => {
treeData.value = res.data
treeData.value = treeData.value.map(item => ({
- value: item.pointName,
+ value: item.id,
label: item.pointName,
children: item.children ? item.children.map(child => ({
- value: child.pointName,
+ value: child.id,
label: child.pointName
})) : []
}));
@@ -329,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
});
@@ -346,7 +514,7 @@
onOk() {
fetch(energyConsumption.del , {id : record.id }).then((res) => {
message.success('操作成功！');
- getTableList()
+ mainRef.value?.nsTableRef.reload();
});
},
onCancel() {
@@ -357,6 +525,9 @@
// 关闭新增抽屉
const onClose = () => {
visible.value = false;
+ 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 c45e65d..602471f 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
@@ -39,7 +39,7 @@
+ 联系人名单
+
+
+
+
+
+
\ No newline at end of file
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 78ff753..c4a1582 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -1,6 +1,6 @@
- 凭证下载
-
-
- 新增
-
+ -->
+
+
+
+
+
+
+
+
-
-
-
+
+
-
+
+
+
-
+
'), - }), + createVNode(Badge, { + onClick: () => + NsModal.info({ + icon: null, + content: createVNode('div', { + innerHTML: value.map((item) => item?.deptRoleInfoList).join('
'), }), + }), + size: 'small', + style: { + transform: 'translateY(-4px)', + cursor: 'pointer', }, - `+${value.length}`, - ), + count: value.length - 1, + }), ]); }, }, @@ -596,6 +601,12 @@ .main { background-color: @ns-content-bg; display: flex; + + .top, + :deep(.ns-table-search), + :deep(.ns-table-main) { + box-shadow: @ns-content-box-shadow; + } } .left { width: 300px; 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: [], }, }, 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; }