diff --git a/src/api/device-boot/Business.ts b/src/api/device-boot/Business.ts
index 7315c292..137a3c2a 100644
--- a/src/api/device-boot/Business.ts
+++ b/src/api/device-boot/Business.ts
@@ -150,3 +150,10 @@ export function getList(data: any) {
data
})
}
+//查询前置-进程-设备-设备树
+export function nodeDeviceTree() {
+ return createAxios({
+ url: '/device-boot/nodeDevice/nodeDeviceTree',
+ method: 'post',
+ })
+}
diff --git a/src/components/echarts/MyEchart.vue b/src/components/echarts/MyEchart.vue
index 453c7738..b83ff011 100644
--- a/src/components/echarts/MyEchart.vue
+++ b/src/components/echarts/MyEchart.vue
@@ -186,7 +186,7 @@ const handlerYAxis = () => {
color: '#000',
fontSize: 14,
formatter: function (value) {
- return value.toFixed(0) // 格式化显示为一位小数
+ return parseFloat(value.toFixed(1)) // 格式化显示为一位小数
}
},
splitLine: {
diff --git a/src/views/pqs/business/terminal/FrontManagement/bind.vue b/src/views/pqs/business/terminal/FrontManagement/bind.vue
new file mode 100644
index 00000000..5c1485d5
--- /dev/null
+++ b/src/views/pqs/business/terminal/FrontManagement/bind.vue
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/pqs/business/terminal/FrontManagement/index.vue b/src/views/pqs/business/terminal/FrontManagement/index.vue
index 90afc746..38ea530e 100644
--- a/src/views/pqs/business/terminal/FrontManagement/index.vue
+++ b/src/views/pqs/business/terminal/FrontManagement/index.vue
@@ -1,23 +1,65 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 新增
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
{{ node.label }}
+
+ Append
+ 删除
+
+
+
+
+
+
+
- 确 定
+
+
diff --git a/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/index.vue b/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/index.vue
index f64f2343..b8149fd4 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/index.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/index.vue
@@ -13,7 +13,7 @@
-
+
@@ -265,10 +265,8 @@ const options = dictData.getBasicData('Pollution_Statis', [
'Plt',
'Freq_Dev'
])
-const sign = ref([
- { label: '电网侧', id: '0' },
- { label: '用户侧', id: '1' }
-])
+const sign = dictData.getBasicData('power_flag')
+console.log('🚀 ~ sign:', sign)
const tableStore = new TableStore({
url: '/harmonic-boot/PollutionSubstation/deptSubstationRelations',
method: 'POST',
@@ -282,7 +280,7 @@ provide('tableStore', tableStore)
tableStore.table.params.deptIndex = dictData.state.area[0].id
tableStore.table.params.statisticalType = options[0]
tableStore.table.params.monitorFlag = 2
-tableStore.table.params.powerFlag = '2'
+tableStore.table.params.powerFlag = sign[0]?.algoDescribe || 0
tableStore.table.params.reportFlag = 3
tableStore.table.params.serverName = 'event-boot'
const handleTabChange = (val: any) => {
diff --git a/src/views/system/auth/role/index.vue b/src/views/system/auth/role/index.vue
index 913816c7..0104f6fa 100644
--- a/src/views/system/auth/role/index.vue
+++ b/src/views/system/auth/role/index.vue
@@ -162,3 +162,8 @@ const addRole = () => {
popupRef.value.open('新增角色')
}
+