diff --git a/ui/dasadmin/src/api/backend/index.ts b/ui/dasadmin/src/api/backend/index.ts
index ab227e86..e3233464 100644
--- a/ui/dasadmin/src/api/backend/index.ts
+++ b/ui/dasadmin/src/api/backend/index.ts
@@ -264,3 +264,69 @@ export function equipDetailsOrg(params: object = {}) {
data: params,
})
}
+
+export function getOtherParamsReq(params: any) {
+ return createAxios({
+ url: '/api/equipment/extProps/query',
+ method: 'POST',
+ data: params,
+ })
+}
+
+
+export function addOtherParamsReq(params: any) {
+ return createAxios({
+ url: '/api/equipment/extProps/add',
+ method: 'POST',
+ data: params,
+ })
+}
+
+export function updateOtherParamsReq(params: any) {
+ return createAxios({
+ url: '/api/equipment/extProps/update',
+ method: 'POST',
+ data: params,
+ })
+}
+
+export function delOtherParamsReq(params: any) {
+ return createAxios({
+ url: '/api/equipment/extProps/delete',
+ method: 'POST',
+ data: params,
+ })
+}
+
+export function uploadOtherParamsFileReq(formData: FormData, V: string) {
+ const token = encrypt_aes(adminInfo.token, V)
+ return createAxios({
+ url: '/api/equipment//file/upload',
+ method: 'POST',
+ data: formData,
+ headers: {
+ 'Content-Type': 'multipart/form-data',
+ V,
+ token,
+ }
+ },
+ { customEncrypt: true })
+}
+
+export function readFileReq(path: string, v: string) {
+ const formData = new FormData()
+ formData.append('path', path)
+ const token = encrypt_aes(adminInfo.token, v)
+ return createAxios({
+ url: '/api/equipment/file/read',
+ method: 'POST',
+ data: formData,
+ headers: {
+ 'Content-Type': 'multipart/form-data',
+ v,
+ token,
+ }
+ }, {
+ customEncrypt: true
+ })
+}
\ No newline at end of file
diff --git a/ui/dasadmin/src/utils/directive.ts b/ui/dasadmin/src/utils/directive.ts
new file mode 100644
index 00000000..10e97330
--- /dev/null
+++ b/ui/dasadmin/src/utils/directive.ts
@@ -0,0 +1,21 @@
+import { useAdminInfo } from '/@/stores/adminInfo'
+
+const authorityStore = useAdminInfo()
+
+export const permission = () => {
+ return {
+ mounted: (el: any, binding: { value: number[] }) => {
+ let hasShow = false
+ for (let item of binding.value) {
+ if (authorityStore.authorities.includes(item)) {
+ hasShow = true
+ break
+ }
+ }
+ if (!hasShow) {
+ el.style.display = 'none'
+ }
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/ui/dasadmin/src/views/backend/WindBlower/index.vue b/ui/dasadmin/src/views/backend/WindBlower/index.vue
index 548f33dd..d2698ca7 100644
--- a/ui/dasadmin/src/views/backend/WindBlower/index.vue
+++ b/ui/dasadmin/src/views/backend/WindBlower/index.vue
@@ -92,7 +92,7 @@
已锁定
{{ realTimeDataState }}
-
+
{
let r = Math.floor(Math.random() * 200) // 限制在0到127之间，以生成较深的颜色
let g = Math.floor(Math.random() * 200)
@@ -180,8 +181,9 @@ const createChartData = (data: { [k: string]: number }, time: string) => {
lastSeriesId.forEach((item: any) => {
if (!attrCode.includes(item)) {
const cur = realDataSeries.findIndex((val: any) => val.id === item)
- // delete cur.id
realDataSeries.splice(cur, 1)
+ const curLegendIndex = realDataLegend.findIndex((val:any)=>val.customKey===item)
+ realDataLegend.splice(curLegendIndex,1)
clearState = true
}
})
@@ -189,13 +191,13 @@ const createChartData = (data: { [k: string]: number }, time: string) => {
chartInstance.setOption(
{
series: realDataSeries,
+ legend: realDataLegend,
},
{
- replaceMerge: ['series'],
+ replaceMerge: ['series','legend'],
}
)
}
-
const seriesData = attrCode.map((item) => {
const curVal = getCutDecimalsValue(data[item], 2)
if (lastSeriesId.includes(item)) {
@@ -208,6 +210,14 @@ const createChartData = (data: { [k: string]: number }, time: string) => {
const len = list.length
const fillData = new Array(len).fill('')
fillData.push(curVal)
+ realDataLegend.push({
+ name:info.name,
+ icon: 'rect',
+ textStyle: {
+ color: color,
+ },
+ customKey:item
+ })
return {
id: item,
name: info.name + ' ' + (info?.unit ?? ''),
@@ -298,6 +308,7 @@ const createChart = () => {
},
yAxis: realDataYAxis,
series: realDataSeries,
+ legend:realDataLegend
}
} else {
option = {
@@ -386,7 +397,7 @@ const createChart = () => {
},
],
legend: {
- data: [],
+ data: realDataLegend,
textStyle: {
color: '#73767a',
},
@@ -394,7 +405,7 @@ const createChart = () => {
series: realDataSeries,
}
}
- chart.setOption(option, { replaceMerge: ['series', 'yAxis'] })
+ chart.setOption(option, { replaceMerge: ['series', 'yAxis','legend'] })
chartInstance = chart
}
diff --git a/ui/dasadmin/src/views/backend/equipment/airBlower/selectPoint.vue b/ui/dasadmin/src/views/backend/equipment/airBlower/selectPoint.vue
index aa5c8ef6..7934081c 100644
--- a/ui/dasadmin/src/views/backend/equipment/airBlower/selectPoint.vue
+++ b/ui/dasadmin/src/views/backend/equipment/airBlower/selectPoint.vue
@@ -88,13 +88,13 @@ import { Top, Bottom, Close } from '@element-plus/icons-vue'
const props = withDefaults(
defineProps<{
defaultAttr: { attributeCode: string; attributeName: string }[]
- visible: boolean,
- iotModelId:string
+ visible: boolean
+ iotModelId: string
}>(),
{
defaultAttr: () => [],
visible: false,
- iotModelId:''
+ iotModelId: '',
}
)
@@ -111,7 +111,7 @@ const subSystemVal = ref('')
const subSystemList = ref()
const getAllSubSystem = () => {
- getAllSubSystemReq({iotModelId:props.iotModelId}).then((res) => {
+ getAllSubSystemReq({ iotModelId: props.iotModelId }).then((res) => {
const data = res.data
.filter((item: any) => item)
.map((item: any) => {
@@ -125,31 +125,34 @@ const getAllSubSystem = () => {
}
const attributeTableData = ref<{ attributeName: string; attributeCode: string }[]>([])
-const selectTable = (section: any) => {
- const defaultCode = props.defaultAttr.map((item: any) => item.attributeCode)
- const addSection = section
- .filter((item: any) => !defaultCode.includes(item.attributeCode.toLowerCase()))
- .map((item: any) => {
- return {
- attributeName: item.attributeName,
- attributeCode: item.attributeCode.toLowerCase(),
- unit: item.unit,
- }
- })
- multipleSelection.value = [...props.defaultAttr, ...addSection]
+const selectTable = (section: any, row: any) => {
+ const hasSelect = section.find((item: any) => item.attributeCode === row.attributeCode)
+ if (hasSelect) {
+ const hasExist = multipleSelection.value.find((item: any) => item.attributeCode === hasSelect.attributeCode.toLowerCase())
+ if (!hasExist) {
+ multipleSelection.value.push(hasSelect)
+ }
+ } else {
+ const index = multipleSelection.value.findIndex((item: any) => item.attributeCode === row.attributeCode.toLowerCase())
+ multipleSelection.value.splice(index, 1)
+ }
}
const selectAllTable = (section: any) => {
- const defaultCode = props.defaultAttr.map((item: any) => item.attributeCode)
- const addSection = section
- .filter((item: any) => !defaultCode.includes(item.attributeCode.toLowerCase()))
- .map((item: any) => {
- return {
- attributeName: item.attributeName,
- attributeCode: item.attributeCode.toLowerCase(),
- unit: item.unit,
- }
- })
- multipleSelection.value = [...props.defaultAttr, ...addSection]
+ if (section.length) {
+ const defaultCode = multipleSelection.value.map((item: any) => item.attributeCode.toLowerCase())
+ const addSection = section
+ .filter((item: any) => !defaultCode.includes(item.attributeCode.toLowerCase()))
+ .map((item: any) => {
+ return {
+ attributeName: item.attributeName,
+ attributeCode: item.attributeCode.toLowerCase(),
+ unit: item.unit,
+ }
+ })
+ multipleSelection.value = [...multipleSelection.value, ...addSection]
+ } else {
+ multipleSelection.value = []
+ }
}
const pageSetting = reactive({
current: 1,
@@ -162,7 +165,7 @@ const pageChange = () => {
}
const attributeTableRef = ref()
-const multipleSelection = ref<{ attributeName: string; attributeCode: string }[]>(props.defaultAttr)
+const multipleSelection = ref<{ attributeName: string; attributeCode: string }[]>([])
const Statistic = computed(() => multipleSelection.value.length)
const clearList = () => {
multipleSelection.value = []
@@ -187,7 +190,7 @@ const moveDown = (index: number) => {
const moveRemove = (index: number, item: any) => {
multipleSelection.value.splice(index, 1)
nextTick(() => {
- const row = attributeTableData.value.find((attr) => attr.attributeCode === item.attributeCode)
+ const row = attributeTableData.value.find((attr) => attr.attributeCode.toLowerCase() === item.attributeCode.toLowerCase())
attributeTableRef.value?.toggleRowSelection(row, false)
})
}
@@ -219,12 +222,14 @@ const getTableData = (customData = {}) => {
})
}
const initSelect = () => {
- const defaultCode = props.defaultAttr.map((item: any) => item.attributeCode)
-
+ const defaultCode = multipleSelection.value.map((item: any) => item.attributeCode.toLowerCase())
const row = attributeTableData.value.filter((item) => defaultCode.includes(item.attributeCode.toLowerCase()))
if (row.length === 0) return
- row.forEach((item) => {
- attributeTableRef.value?.toggleRowSelection(item, true)
+ nextTick(() => {
+ attributeTableRef.value?.clearSelection()
+ row.forEach((item) => {
+ attributeTableRef.value?.toggleRowSelection(item, true)
+ })
})
}
@@ -234,6 +239,8 @@ watch(
if (props.visible) {
pageSetting.current = 1
pageSetting.pageSize = 20
+ multipleSelection.value = JSON.parse(JSON.stringify(props.defaultAttr))
+ initSelect()
}
}
)
@@ -246,6 +253,7 @@ defineExpose({
})
onMounted(() => {
+ multipleSelection.value = JSON.parse(JSON.stringify(props.defaultAttr))
getTableData()
getAllSubSystem()
})
diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
index 9c75668a..bbbe2ce7 100644
--- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
@@ -49,13 +49,22 @@
- 量测
- |
- 调控
- |
- 查看
- |
- 删除
+
+ 量测
+ 调控
+ 查看
+ 删除
+
@@ -74,27 +83,353 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 风机详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情…
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情…
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情…
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情…
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情…
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情…
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情…
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情…
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 塔基柜详情
+
+
+ 机舱柜详情
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
@@ -102,88 +437,49 @@
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -191,7 +487,7 @@
-
+
@@ -241,8 +536,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -457,12 +565,12 @@
-
+
-
+
+
+
+
+
+
+
+
+ 暂无图片
+
+
+
+
+
+
+
+
+
+
+
+
+