diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
index 9945b04..6f92f87 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
@@ -11,6 +11,9 @@
}"
@click="clickSwitch({ enableRules: record.enableRules, record: record })" />
+
+ {{ record.valueType.label }}
+
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
index 2ccca11..f44bf69 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
@@ -235,8 +235,8 @@
};
//取值类型
const qzOptions = ref([
- { value: 1, label: '实时值', code: '1' },
- { value: 2, label: '平均值', code: '2' },
+ { value: 1, label: '实时值' },
+ { value: 2, label: '平均值' },
]);
//逻辑
const ljOptions = ref([
@@ -331,6 +331,7 @@
infoObject.value.alarmList = infoObject.value.hxAlarmRuleLogicList || [];
delete infoObject.value.hxAlarmRuleLogicList;
infoObject.value.deviceType = selectDevice;
+ infoObject.value.valueType = infoObject.value.valueType.value;
infoObject.value.ruleType = infoObject.value.ruleType + '';
}
});
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue
index fd33883..74a5db0 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue
@@ -44,7 +44,7 @@
width: 5px;
height: 15px;
background: inherit;
- background-color: rgba(251, 156, 67, 1);
+ background-color: #2778ff;
border: none;
border-radius: 5px;
-moz-box-shadow: none;
@@ -66,6 +66,9 @@
:scroll="{ x: 800, y: 700 }"
:pagination="pagination">
+
+ {{ record.userRoleInfos?.[0].deptRoleInfoList }}
+
移除
@@ -93,7 +96,7 @@
const columns = [
{
title: '序号',
- dataIndex: 'address',
+ dataIndex: 'index',
width: 80,
fixed: 'left',
customRender: (text: any) => {
@@ -102,7 +105,7 @@
},
{
title: '姓名',
- dataIndex: 'deviceName',
+ dataIndex: 'realName',
width: 80,
fixed: 'left',
key: 'deviceName',
@@ -115,13 +118,13 @@
},
{
title: '组织关系',
- dataIndex: 'site',
+ dataIndex: 'orgName',
key: 'site',
},
{
title: '部门',
- dataIndex: 'department',
- key: 'department',
+ dataIndex: 'address',
+ key: 'address',
},
{
title: '操作',
@@ -155,7 +158,7 @@
visibleModel.value = true;
let ids = [];
dataSource.value.forEach((item) => {
- ids.push(item.id);
+ ids.push(item.userId);
});
linkPeoples.value.getData({ id: ids, data: dataSource });
};
@@ -223,7 +226,7 @@
//移除数据
const remove = (data: any) => {
dataSource.value.forEach((item, index) => {
- if (item.id === data.id) {
+ if (item.userId === data.userId) {
dataSource.value.splice(index, 1);
}
});
@@ -236,7 +239,7 @@
obj.selectList = [];
dataSource.value.forEach((item) => {
obj.selectList.push({
- people: item.id,
+ userId: item.userId,
});
});
console.log(obj, '数据');
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue
index a496735..3a8bd4d 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue
@@ -24,20 +24,18 @@
src="https://files.axshare.com/gsc/4T0UQR/7e/5d/a2/7e5da2a277344db8af30521cefeb70cc/images/告警设置/u150.svg?pageId=1f58c1ba-b461-4fe8-a2b3-295f1e7b0aa0" />
-
人员列表
+ :size="'middle'">
+
+
+ {{ record.userRoleInfos?.[0].deptRoleInfoList }}
+
+
+
@@ -69,51 +74,23 @@
import { ref, watch, computed } from 'vue';
import { defineComponent } from 'vue';
import type { TreeProps } from 'ant-design-vue';
- import { device } from '/@/api/deviceManage';
+ import { origanizemanage } from '/@/api/origanizemanage';
+ import { department } from '/@/api/origanizemanage';
+
import { http } from '/nerv-lib/util';
// import { editTreeConfig } from './config';
-
- const x = 3;
- const y = 2;
- const z = 1;
- const genData: TreeProps['treeData'] = [];
-
- const generateData = (_level: number, _preKey?: string, _tns?: TreeProps['treeData']) => {
- const preKey = _preKey || '0';
- const tns = _tns || genData;
-
- const children = [];
- for (let i = 0; i < x; i++) {
- const key = `${preKey}-${i}`;
- tns.push({ title: key, key });
- if (i < y) {
- children.push(key);
- }
- }
- if (_level < 0) {
- return tns;
- }
- const level = _level - 1;
- children.forEach((key, index) => {
- tns[index].children = [];
- return generateData(level, key, tns[index].children);
- });
- };
- generateData(z);
-
+ //搜索存储
const dataList: TreeProps['treeData'] = [];
const generateList = (data: TreeProps['treeData']) => {
for (let i = 0; i < data.length; i++) {
const node = data[i];
const key = node.key;
- dataList.push({ key, title: key });
+ dataList.push({ key, title: node.title });
if (node.children) {
generateList(node.children);
}
}
};
- generateList(genData);
-
const getParentKey = (
key: string | number,
tree: TreeProps['treeData'],
@@ -133,55 +110,101 @@
};
export default defineComponent({
setup(props, { emit }) {
- // const config = computed(() => {
- // return editTreeConfig(result);
- // });
//组织数
const orgId = ref('');
const result = JSON.parse(sessionStorage.getItem('ORGID')!);
orgId.value = result;
const dataSource = ref([]);
+ const loading = ref(false);
const selectedRowKey = ref([]);
const selectedRow = ref([]);
- const name = ref(null);
+ const realName = ref(null);
+ // 树方法
+ const expandedKeys = ref<(string | number)[]>([]);
+ const selectedKeys = ref([]);
+ const searchValue = ref('');
+ const deviceName = ref('');
+ const autoExpandParent = ref(true);
+ const deptTreeData = ref([]);
+ //选择 组织
+ const selectOrgId = ref('');
+ selectOrgId.value = result;
+ //选择部门
+ const selectDeptId = ref('');
+
const onSearch = () => {
- http
- .post(device.queryDevicePage, {
- pageNum: pagination.value.current,
- pageSize: pagination.value.pageSize,
- deviceName: name.value,
- orgId: orgId.value,
- })
- .then((res) => {
- dataSource.value = res.data.records;
- pagination.value.total = res.data.total;
- });
+ pagination.value.current = 1;
+ getList();
};
const onSelect = (selectedKeys: any, info: any) => {
- console.log('selected', selectedKeys, info.node.dataRef);
+ selectedKeys.value = selectedKeys;
+ if (info.node.dataRef.deptInfo) {
+ selectDeptId.value = info.node.dataRef.deptInfo.deptId;
+ selectOrgId.value = info.node.dataRef.deptInfo.orgId;
+ }
+ if (info.node.dataRef.orgInfo) {
+ selectOrgId.value = info.node.dataRef.orgInfo.orgId;
+ selectDeptId.value = '';
+ }
pagination.value.current = 1;
- onSearch();
+ getList();
+ };
+ // 递归处理部门树数据
+ const processDepartmentTree = (tree) => {
+ tree.forEach((item) => {
+ item.deptInfo = item.deptInfo;
+ item.key = item.deptInfo.deptId;
+ item.title = item.deptInfo.deptName;
+ item.children = processDepartmentTree(item.children); // 递归处理子节点
+ });
+ return tree;
};
- const handleChangePage = (current: number, pageSize: number) => {
- pagination.value.current = current;
- pagination.value.pageSize = pageSize;
+ // 获取部门树
+ const getDepartList = (params) => {
+ return http.post(department.queryDeptTree, params).then((res) => {
+ const result = res.data.map((item) => ({
+ key: item.orgInfo.orgId,
+ orgInfo: item.orgInfo,
+ title: item.orgInfo.orgName,
+ children: processDepartmentTree(item.deptTrees),
+ }));
+
+ return result;
+ });
+ };
+ //获取树
+ const getTreeData = () => {
+ getDepartList({ orgId: orgId.value }).then((res) => {
+ deptTreeData.value = res;
+ selectedKeys.value = [orgId.value];
+ generateList(deptTreeData.value);
+ });
+ };
+ //获取列表
+ const getList = () => {
+ loading.value = true;
http
- .post(device.queryDevicePage, {
+ .post(origanizemanage.userList, {
pageNum: pagination.value.current,
pageSize: pagination.value.pageSize,
- orgId: orgId.value,
+ orgId: selectOrgId.value,
+ deptId: selectDeptId.value,
+ realName: realName.value,
})
.then((res) => {
dataSource.value = res.data.records;
pagination.value.total = res.data.total;
+ loading.value = false;
});
- console.log(selectedRowKey.value, selectedRow.value);
};
- const onSelectChange = (selectedRowKeys: any, selectedRows: any) => {
- console.log(selectedRowKeys, selectedRows);
- console.log(selectedRows, '数据');
+ const handleChangePage = (current: number, pageSize: number) => {
+ pagination.value.current = current;
+ pagination.value.pageSize = pageSize;
+ getList();
+ };
+ const onSelectChange = (selectedRowKeys: any, selectedRows: any) => {
selectedRowKey.value = selectedRowKeys;
selectedRow.value = selectedRows;
};
@@ -200,14 +223,14 @@
const columns = [
{
title: '序号',
- dataIndex: 'address',
+ dataIndex: 'index',
customRender: (text: any) => {
return text.index + 1;
},
},
{
title: '姓名',
- dataIndex: 'deviceName',
+ dataIndex: 'realName',
},
{
title: '性别',
@@ -215,7 +238,7 @@
},
{
title: '组织关系',
- dataIndex: 'address',
+ dataIndex: 'orgName',
},
{
title: '部门 ',
@@ -227,48 +250,32 @@
emit('handleOk', { id: selectedRowKey.value, data: selectedRow.value });
show.value = false;
pagination.value.current = 1;
+ realName.value = null;
+ searchValue.value = '';
};
const getData = (data: any) => {
selectedRow.value = data.data;
selectedRowKey.value = data.id;
show.value = true;
- http
- .post(device.queryDevicePage, {
- pageNum: pagination.value.current,
- pageSize: pagination.value.pageSize,
- orgId: orgId.value,
- })
- .then((res) => {
- dataSource.value = res.data.records;
- pagination.value.total = res.data.total;
- });
+ //获取列表
+ getList();
+ //获取树
+ getTreeData();
};
const show = ref(false);
const handleCancel = () => {
// 处理取消按钮的逻辑
pagination.value.current = 1;
+ realName.value = null;
emit('handleCancel', null);
show.value = false;
};
- // 树方法
- const expandedKeys = ref<(string | number)[]>([]);
- const searchValue = ref('');
- const deviceName = ref('');
- const autoExpandParent = ref(true);
- const gData = ref(genData);
-
- const onExpand = (keys: string[]) => {
- expandedKeys.value = keys;
- autoExpandParent.value = false;
- console.log(keys, '数据');
- };
watch(searchValue, (value) => {
- console.log(gData.value, '数据');
-
const expanded = dataList
.map((item: TreeProps['treeData'][number]) => {
if (item.title.indexOf(value) > -1) {
- return getParentKey(item.key, gData.value);
+ console.log(item.title.indexOf(value));
+ return getParentKey(item.key, deptTreeData.value);
}
return null;
})
@@ -276,30 +283,35 @@
expandedKeys.value = expanded;
searchValue.value = value;
autoExpandParent.value = true;
- console.log(expandedKeys.value, '数据');
});
return {
columns,
- name,
+ realName,
orgId,
- // config,
+ processDepartmentTree,
onSearch,
+ getList,
+ loading,
dataSource,
onSelect,
- gData,
- onExpand,
+ deptTreeData,
selectedRow,
selectedRowKey,
autoExpandParent,
expandedKeys,
+ selectedKeys,
onSelectChange,
pagination,
handleOk,
show,
getData,
+ getTreeData,
+ getDepartList,
searchValue,
deviceName,
handleCancel,
+ selectDeptId,
+ selectOrgId,
};
},
});
@@ -313,7 +325,7 @@
width: 5px;
height: 15px;
background: inherit;
- background-color: rgba(251, 156, 67, 1);
+ background-color: @primary-color;
border: none;
border-radius: 5px;
-moz-box-shadow: none;