diff --git a/.env.development b/.env.development index 5854b6a..9c26bdc 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,7 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://111.198.10.15:11309 # VITE_APP_API_BASEURL = http://111.198.10.15:21409 -VITE_APP_API_BASEURL = http://111.198.10.15:11411 +VITE_APP_API_BASEURL = http://139.198.29.133:11411 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.development b/.env.development index 5854b6a..9c26bdc 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,7 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://111.198.10.15:11309 # VITE_APP_API_BASEURL = http://111.198.10.15:21409 -VITE_APP_API_BASEURL = http://111.198.10.15:11411 +VITE_APP_API_BASEURL = http://139.198.29.133:11411 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 99c9299..0ef7631 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -4,16 +4,17 @@ "DataVUrl":[ { "name": "碳足迹监测", - "url": "https://share.shanhaibi.com/6482e0dc0987c/" + "url": "http://111.198.10.15:11418/jc/" }, { "name": "碳足迹评价", - "url": "https://share.shanhaibi.com/64867996e5a73/" + "url": "http://111.198.10.15:11418/pj/" }, { "name": "碳足迹预警", - "url": "https://share.shanhaibi.com/64867d25bd589/" + "url": "http://111.198.10.15:11418/yj/" } ] } + diff --git a/.env.development b/.env.development index 5854b6a..9c26bdc 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,7 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://111.198.10.15:11309 # VITE_APP_API_BASEURL = http://111.198.10.15:21409 -VITE_APP_API_BASEURL = http://111.198.10.15:11411 +VITE_APP_API_BASEURL = http://139.198.29.133:11411 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 99c9299..0ef7631 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -4,16 +4,17 @@ "DataVUrl":[ { "name": "碳足迹监测", - "url": "https://share.shanhaibi.com/6482e0dc0987c/" + "url": "http://111.198.10.15:11418/jc/" }, { "name": "碳足迹评价", - "url": "https://share.shanhaibi.com/64867996e5a73/" + "url": "http://111.198.10.15:11418/pj/" }, { "name": "碳足迹预警", - "url": "https://share.shanhaibi.com/64867d25bd589/" + "url": "http://111.198.10.15:11418/yj/" } ] } + diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue index 7893e43..ef73a01 100644 --- a/src/components/map/infoWindow.vue +++ b/src/components/map/infoWindow.vue @@ -42,7 +42,7 @@ 节点编号 : {{ info?.busId }}
- 负荷有功功率 : {{ info?.pd }} MW 负荷无功功率 : {{ info?.qd }} MW + 负荷有功功率 : {{ info?.pd }} KW 负荷无功功率 : {{ info?.qd }} KW
节点碳势 : {{ info?.en }} gCO2/kWh 节点负荷碳流率 : {{ info?.flowRate }} kgCO2/h diff --git a/.env.development b/.env.development index 5854b6a..9c26bdc 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,7 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://111.198.10.15:11309 # VITE_APP_API_BASEURL = http://111.198.10.15:21409 -VITE_APP_API_BASEURL = http://111.198.10.15:11411 +VITE_APP_API_BASEURL = http://139.198.29.133:11411 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 99c9299..0ef7631 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -4,16 +4,17 @@ "DataVUrl":[ { "name": "碳足迹监测", - "url": "https://share.shanhaibi.com/6482e0dc0987c/" + "url": "http://111.198.10.15:11418/jc/" }, { "name": "碳足迹评价", - "url": "https://share.shanhaibi.com/64867996e5a73/" + "url": "http://111.198.10.15:11418/pj/" }, { "name": "碳足迹预警", - "url": "https://share.shanhaibi.com/64867d25bd589/" + "url": "http://111.198.10.15:11418/yj/" } ] } + diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue index 7893e43..ef73a01 100644 --- a/src/components/map/infoWindow.vue +++ b/src/components/map/infoWindow.vue @@ -42,7 +42,7 @@ 节点编号 : {{ info?.busId }}
- 负荷有功功率 : {{ info?.pd }} MW 负荷无功功率 : {{ info?.qd }} MW + 负荷有功功率 : {{ info?.pd }} KW 负荷无功功率 : {{ info?.qd }} KW
节点碳势 : {{ info?.en }} gCO2/kWh 节点负荷碳流率 : {{ info?.flowRate }} kgCO2/h diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue index e4aca59..ddb676f 100644 --- a/src/components/map/infoWindow2.vue +++ b/src/components/map/infoWindow2.vue @@ -42,7 +42,7 @@ 光伏挂载节点 : {{ info?.nodeId }}
- 发电机组有功 : {{ info?.pg }} MW 发电机组无功 : {{ info?.qg }} MW + 发电机组有功 : {{ info?.pg }} KW 发电机组无功 : {{ info?.qg }} KW
碳排强度 : {{ info?.strength }} gCO2·/kWh diff --git a/.env.development b/.env.development index 5854b6a..9c26bdc 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,7 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://111.198.10.15:11309 # VITE_APP_API_BASEURL = http://111.198.10.15:21409 -VITE_APP_API_BASEURL = http://111.198.10.15:11411 +VITE_APP_API_BASEURL = http://139.198.29.133:11411 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 99c9299..0ef7631 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -4,16 +4,17 @@ "DataVUrl":[ { "name": "碳足迹监测", - "url": "https://share.shanhaibi.com/6482e0dc0987c/" + "url": "http://111.198.10.15:11418/jc/" }, { "name": "碳足迹评价", - "url": "https://share.shanhaibi.com/64867996e5a73/" + "url": "http://111.198.10.15:11418/pj/" }, { "name": "碳足迹预警", - "url": "https://share.shanhaibi.com/64867d25bd589/" + "url": "http://111.198.10.15:11418/yj/" } ] } + diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue index 7893e43..ef73a01 100644 --- a/src/components/map/infoWindow.vue +++ b/src/components/map/infoWindow.vue @@ -42,7 +42,7 @@ 节点编号 : {{ info?.busId }}
- 负荷有功功率 : {{ info?.pd }} MW 负荷无功功率 : {{ info?.qd }} MW + 负荷有功功率 : {{ info?.pd }} KW 负荷无功功率 : {{ info?.qd }} KW
节点碳势 : {{ info?.en }} gCO2/kWh 节点负荷碳流率 : {{ info?.flowRate }} kgCO2/h diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue index e4aca59..ddb676f 100644 --- a/src/components/map/infoWindow2.vue +++ b/src/components/map/infoWindow2.vue @@ -42,7 +42,7 @@ 光伏挂载节点 : {{ info?.nodeId }}
- 发电机组有功 : {{ info?.pg }} MW 发电机组无功 : {{ info?.qg }} MW + 发电机组有功 : {{ info?.pg }} KW 发电机组无功 : {{ info?.qg }} KW
碳排强度 : {{ info?.strength }} gCO2·/kWh diff --git a/src/components/map/trendChart.vue b/src/components/map/trendChart.vue index 5fbdd3d..22f012d 100644 --- a/src/components/map/trendChart.vue +++ b/src/components/map/trendChart.vue @@ -24,7 +24,7 @@ }, }) const loading = ref(true) -const range = ref('') +const range = ref('hour') const flag = ref(true) // defineExpose({ range }) const yAxisData = ref([]) @@ -45,11 +45,11 @@ xAxisData.value = data.monitorTrends?.rp?.map((item: any) => item.time) yAxisData.value = [ { - name: '有功功率(MW)', + name: '有功功率(KW)', data: data.monitorTrends?.rp?.map((item: any) => Number(item.value)), }, { - name: '无功功率(MVAr)', + name: '无功功率(KVAr)', data: data.monitorTrends?.ap?.map((item: any) => Number(item.value)), }, ] @@ -73,13 +73,13 @@ // 监听 监测趋势时间段 变化 重新获取数据 watch(() => props.deviceId, (newVal) => { if (newVal) { - range.value = 'day' + range.value = 'hour' fetchDeviceAnalysis() } if (Number(props.deviceType) === 1) { selected.value = { - '有功功率(MW)': true, - '无功功率(MVAr)': false, + '有功功率(KW)': true, + '无功功率(KVAr)': false, } } else { @@ -108,7 +108,7 @@ xAxisData.value = [] yAxisData.value = [] setTimeout(() => { - range.value = 'day' + range.value = 'hour' }) } } @@ -130,6 +130,9 @@
+ + 小时 + 日 diff --git a/.env.development b/.env.development index 5854b6a..9c26bdc 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,7 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://111.198.10.15:11309 # VITE_APP_API_BASEURL = http://111.198.10.15:21409 -VITE_APP_API_BASEURL = http://111.198.10.15:11411 +VITE_APP_API_BASEURL = http://139.198.29.133:11411 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 99c9299..0ef7631 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -4,16 +4,17 @@ "DataVUrl":[ { "name": "碳足迹监测", - "url": "https://share.shanhaibi.com/6482e0dc0987c/" + "url": "http://111.198.10.15:11418/jc/" }, { "name": "碳足迹评价", - "url": "https://share.shanhaibi.com/64867996e5a73/" + "url": "http://111.198.10.15:11418/pj/" }, { "name": "碳足迹预警", - "url": "https://share.shanhaibi.com/64867d25bd589/" + "url": "http://111.198.10.15:11418/yj/" } ] } + diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue index 7893e43..ef73a01 100644 --- a/src/components/map/infoWindow.vue +++ b/src/components/map/infoWindow.vue @@ -42,7 +42,7 @@ 节点编号 : {{ info?.busId }}
- 负荷有功功率 : {{ info?.pd }} MW 负荷无功功率 : {{ info?.qd }} MW + 负荷有功功率 : {{ info?.pd }} KW 负荷无功功率 : {{ info?.qd }} KW
节点碳势 : {{ info?.en }} gCO2/kWh 节点负荷碳流率 : {{ info?.flowRate }} kgCO2/h diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue index e4aca59..ddb676f 100644 --- a/src/components/map/infoWindow2.vue +++ b/src/components/map/infoWindow2.vue @@ -42,7 +42,7 @@ 光伏挂载节点 : {{ info?.nodeId }}
- 发电机组有功 : {{ info?.pg }} MW 发电机组无功 : {{ info?.qg }} MW + 发电机组有功 : {{ info?.pg }} KW 发电机组无功 : {{ info?.qg }} KW
碳排强度 : {{ info?.strength }} gCO2·/kWh diff --git a/src/components/map/trendChart.vue b/src/components/map/trendChart.vue index 5fbdd3d..22f012d 100644 --- a/src/components/map/trendChart.vue +++ b/src/components/map/trendChart.vue @@ -24,7 +24,7 @@ }, }) const loading = ref(true) -const range = ref('') +const range = ref('hour') const flag = ref(true) // defineExpose({ range }) const yAxisData = ref([]) @@ -45,11 +45,11 @@ xAxisData.value = data.monitorTrends?.rp?.map((item: any) => item.time) yAxisData.value = [ { - name: '有功功率(MW)', + name: '有功功率(KW)', data: data.monitorTrends?.rp?.map((item: any) => Number(item.value)), }, { - name: '无功功率(MVAr)', + name: '无功功率(KVAr)', data: data.monitorTrends?.ap?.map((item: any) => Number(item.value)), }, ] @@ -73,13 +73,13 @@ // 监听 监测趋势时间段 变化 重新获取数据 watch(() => props.deviceId, (newVal) => { if (newVal) { - range.value = 'day' + range.value = 'hour' fetchDeviceAnalysis() } if (Number(props.deviceType) === 1) { selected.value = { - '有功功率(MW)': true, - '无功功率(MVAr)': false, + '有功功率(KW)': true, + '无功功率(KVAr)': false, } } else { @@ -108,7 +108,7 @@ xAxisData.value = [] yAxisData.value = [] setTimeout(() => { - range.value = 'day' + range.value = 'hour' }) } } @@ -130,6 +130,9 @@
+ + 小时 + 日 diff --git a/src/views/data/device/detail.vue b/src/views/data/device/detail.vue index d579a44..e28fc32 100644 --- a/src/views/data/device/detail.vue +++ b/src/views/data/device/detail.vue @@ -49,17 +49,17 @@ xAxisData1.value = data.monitorTrends?.rp?.map((item: any) => item.time) data1.value = [ { - name: '有功功率(MW)', + name: '有功功率(KW)', data: data.monitorTrends?.rp?.map((item: any) => item.value), }, { - name: '无功功率(MVAr)', + name: '无功功率(KVAr)', data: data.monitorTrends?.ap?.map((item: any) => item.value), }, ] selected.value = { - '有功功率(MW)': true, - '无功功率(MVAr)': false, + '有功功率(KW)': true, + '无功功率(KVAr)': false, } } // 整理节点监测趋势数据-用热/用气 @@ -168,6 +168,9 @@ 日 + + 小时 + diff --git a/.env.development b/.env.development index 5854b6a..9c26bdc 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,7 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://111.198.10.15:11309 # VITE_APP_API_BASEURL = http://111.198.10.15:21409 -VITE_APP_API_BASEURL = http://111.198.10.15:11411 +VITE_APP_API_BASEURL = http://139.198.29.133:11411 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 99c9299..0ef7631 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -4,16 +4,17 @@ "DataVUrl":[ { "name": "碳足迹监测", - "url": "https://share.shanhaibi.com/6482e0dc0987c/" + "url": "http://111.198.10.15:11418/jc/" }, { "name": "碳足迹评价", - "url": "https://share.shanhaibi.com/64867996e5a73/" + "url": "http://111.198.10.15:11418/pj/" }, { "name": "碳足迹预警", - "url": "https://share.shanhaibi.com/64867d25bd589/" + "url": "http://111.198.10.15:11418/yj/" } ] } + diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue index 7893e43..ef73a01 100644 --- a/src/components/map/infoWindow.vue +++ b/src/components/map/infoWindow.vue @@ -42,7 +42,7 @@ 节点编号 : {{ info?.busId }}
- 负荷有功功率 : {{ info?.pd }} MW 负荷无功功率 : {{ info?.qd }} MW + 负荷有功功率 : {{ info?.pd }} KW 负荷无功功率 : {{ info?.qd }} KW
节点碳势 : {{ info?.en }} gCO2/kWh 节点负荷碳流率 : {{ info?.flowRate }} kgCO2/h diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue index e4aca59..ddb676f 100644 --- a/src/components/map/infoWindow2.vue +++ b/src/components/map/infoWindow2.vue @@ -42,7 +42,7 @@ 光伏挂载节点 : {{ info?.nodeId }}
- 发电机组有功 : {{ info?.pg }} MW 发电机组无功 : {{ info?.qg }} MW + 发电机组有功 : {{ info?.pg }} KW 发电机组无功 : {{ info?.qg }} KW
碳排强度 : {{ info?.strength }} gCO2·/kWh diff --git a/src/components/map/trendChart.vue b/src/components/map/trendChart.vue index 5fbdd3d..22f012d 100644 --- a/src/components/map/trendChart.vue +++ b/src/components/map/trendChart.vue @@ -24,7 +24,7 @@ }, }) const loading = ref(true) -const range = ref('') +const range = ref('hour') const flag = ref(true) // defineExpose({ range }) const yAxisData = ref([]) @@ -45,11 +45,11 @@ xAxisData.value = data.monitorTrends?.rp?.map((item: any) => item.time) yAxisData.value = [ { - name: '有功功率(MW)', + name: '有功功率(KW)', data: data.monitorTrends?.rp?.map((item: any) => Number(item.value)), }, { - name: '无功功率(MVAr)', + name: '无功功率(KVAr)', data: data.monitorTrends?.ap?.map((item: any) => Number(item.value)), }, ] @@ -73,13 +73,13 @@ // 监听 监测趋势时间段 变化 重新获取数据 watch(() => props.deviceId, (newVal) => { if (newVal) { - range.value = 'day' + range.value = 'hour' fetchDeviceAnalysis() } if (Number(props.deviceType) === 1) { selected.value = { - '有功功率(MW)': true, - '无功功率(MVAr)': false, + '有功功率(KW)': true, + '无功功率(KVAr)': false, } } else { @@ -108,7 +108,7 @@ xAxisData.value = [] yAxisData.value = [] setTimeout(() => { - range.value = 'day' + range.value = 'hour' }) } } @@ -130,6 +130,9 @@
+ + 小时 + 日 diff --git a/src/views/data/device/detail.vue b/src/views/data/device/detail.vue index d579a44..e28fc32 100644 --- a/src/views/data/device/detail.vue +++ b/src/views/data/device/detail.vue @@ -49,17 +49,17 @@ xAxisData1.value = data.monitorTrends?.rp?.map((item: any) => item.time) data1.value = [ { - name: '有功功率(MW)', + name: '有功功率(KW)', data: data.monitorTrends?.rp?.map((item: any) => item.value), }, { - name: '无功功率(MVAr)', + name: '无功功率(KVAr)', data: data.monitorTrends?.ap?.map((item: any) => item.value), }, ] selected.value = { - '有功功率(MW)': true, - '无功功率(MVAr)': false, + '有功功率(KW)': true, + '无功功率(KVAr)': false, } } // 整理节点监测趋势数据-用热/用气 @@ -168,6 +168,9 @@ 日 + + 小时 + diff --git a/src/views/data/electricity/components/networkBusbar.vue b/src/views/data/electricity/components/networkBusbar.vue index 9c0c6b2..a1512a2 100644 --- a/src/views/data/electricity/components/networkBusbar.vue +++ b/src/views/data/electricity/components/networkBusbar.vue @@ -38,8 +38,8 @@ // { text: '母线省损耗区域', value: 'zone', align: 'center' }, // { text: '节点最大电压', value: 'vmax', align: 'center' }, // { text: '节点最小电压', value: 'vmin', align: 'center' }, - { text: '负荷有功功率(MW)', value: 'pd', align: 'center' }, - { text: '负荷无功功率(MW)', value: 'qd', align: 'center' }, + { text: '负荷有功功率(KW)', value: 'pd', align: 'center' }, + { text: '负荷无功功率(KW)', value: 'qd', align: 'center' }, { text: '节点碳势(gCO2/kWh)', value: 'en', align: 'center' }, { text: '负荷碳流率(kgCO2/h)', value: 'flowRate', align: 'center' }, { text: '采集时间', value: 'colTime', align: 'center' }, diff --git a/.env.development b/.env.development index 5854b6a..9c26bdc 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,7 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://111.198.10.15:11309 # VITE_APP_API_BASEURL = http://111.198.10.15:21409 -VITE_APP_API_BASEURL = http://111.198.10.15:11411 +VITE_APP_API_BASEURL = http://139.198.29.133:11411 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 99c9299..0ef7631 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -4,16 +4,17 @@ "DataVUrl":[ { "name": "碳足迹监测", - "url": "https://share.shanhaibi.com/6482e0dc0987c/" + "url": "http://111.198.10.15:11418/jc/" }, { "name": "碳足迹评价", - "url": "https://share.shanhaibi.com/64867996e5a73/" + "url": "http://111.198.10.15:11418/pj/" }, { "name": "碳足迹预警", - "url": "https://share.shanhaibi.com/64867d25bd589/" + "url": "http://111.198.10.15:11418/yj/" } ] } + diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue index 7893e43..ef73a01 100644 --- a/src/components/map/infoWindow.vue +++ b/src/components/map/infoWindow.vue @@ -42,7 +42,7 @@ 节点编号 : {{ info?.busId }}
- 负荷有功功率 : {{ info?.pd }} MW 负荷无功功率 : {{ info?.qd }} MW + 负荷有功功率 : {{ info?.pd }} KW 负荷无功功率 : {{ info?.qd }} KW
节点碳势 : {{ info?.en }} gCO2/kWh 节点负荷碳流率 : {{ info?.flowRate }} kgCO2/h diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue index e4aca59..ddb676f 100644 --- a/src/components/map/infoWindow2.vue +++ b/src/components/map/infoWindow2.vue @@ -42,7 +42,7 @@ 光伏挂载节点 : {{ info?.nodeId }}
- 发电机组有功 : {{ info?.pg }} MW 发电机组无功 : {{ info?.qg }} MW + 发电机组有功 : {{ info?.pg }} KW 发电机组无功 : {{ info?.qg }} KW
碳排强度 : {{ info?.strength }} gCO2·/kWh diff --git a/src/components/map/trendChart.vue b/src/components/map/trendChart.vue index 5fbdd3d..22f012d 100644 --- a/src/components/map/trendChart.vue +++ b/src/components/map/trendChart.vue @@ -24,7 +24,7 @@ }, }) const loading = ref(true) -const range = ref('') +const range = ref('hour') const flag = ref(true) // defineExpose({ range }) const yAxisData = ref([]) @@ -45,11 +45,11 @@ xAxisData.value = data.monitorTrends?.rp?.map((item: any) => item.time) yAxisData.value = [ { - name: '有功功率(MW)', + name: '有功功率(KW)', data: data.monitorTrends?.rp?.map((item: any) => Number(item.value)), }, { - name: '无功功率(MVAr)', + name: '无功功率(KVAr)', data: data.monitorTrends?.ap?.map((item: any) => Number(item.value)), }, ] @@ -73,13 +73,13 @@ // 监听 监测趋势时间段 变化 重新获取数据 watch(() => props.deviceId, (newVal) => { if (newVal) { - range.value = 'day' + range.value = 'hour' fetchDeviceAnalysis() } if (Number(props.deviceType) === 1) { selected.value = { - '有功功率(MW)': true, - '无功功率(MVAr)': false, + '有功功率(KW)': true, + '无功功率(KVAr)': false, } } else { @@ -108,7 +108,7 @@ xAxisData.value = [] yAxisData.value = [] setTimeout(() => { - range.value = 'day' + range.value = 'hour' }) } } @@ -130,6 +130,9 @@
+ + 小时 + 日 diff --git a/src/views/data/device/detail.vue b/src/views/data/device/detail.vue index d579a44..e28fc32 100644 --- a/src/views/data/device/detail.vue +++ b/src/views/data/device/detail.vue @@ -49,17 +49,17 @@ xAxisData1.value = data.monitorTrends?.rp?.map((item: any) => item.time) data1.value = [ { - name: '有功功率(MW)', + name: '有功功率(KW)', data: data.monitorTrends?.rp?.map((item: any) => item.value), }, { - name: '无功功率(MVAr)', + name: '无功功率(KVAr)', data: data.monitorTrends?.ap?.map((item: any) => item.value), }, ] selected.value = { - '有功功率(MW)': true, - '无功功率(MVAr)': false, + '有功功率(KW)': true, + '无功功率(KVAr)': false, } } // 整理节点监测趋势数据-用热/用气 @@ -168,6 +168,9 @@ 日 + + 小时 + diff --git a/src/views/data/electricity/components/networkBusbar.vue b/src/views/data/electricity/components/networkBusbar.vue index 9c0c6b2..a1512a2 100644 --- a/src/views/data/electricity/components/networkBusbar.vue +++ b/src/views/data/electricity/components/networkBusbar.vue @@ -38,8 +38,8 @@ // { text: '母线省损耗区域', value: 'zone', align: 'center' }, // { text: '节点最大电压', value: 'vmax', align: 'center' }, // { text: '节点最小电压', value: 'vmin', align: 'center' }, - { text: '负荷有功功率(MW)', value: 'pd', align: 'center' }, - { text: '负荷无功功率(MW)', value: 'qd', align: 'center' }, + { text: '负荷有功功率(KW)', value: 'pd', align: 'center' }, + { text: '负荷无功功率(KW)', value: 'qd', align: 'center' }, { text: '节点碳势(gCO2/kWh)', value: 'en', align: 'center' }, { text: '负荷碳流率(kgCO2/h)', value: 'flowRate', align: 'center' }, { text: '采集时间', value: 'colTime', align: 'center' }, diff --git a/src/views/data/electricity/page.vue b/src/views/data/electricity/page.vue index e414999..c937616 100644 --- a/src/views/data/electricity/page.vue +++ b/src/views/data/electricity/page.vue @@ -30,15 +30,15 @@ const columns = ref([ { text: '机组名称', value: 'stationName', align: 'center' }, { text: '发电机组对应节点数', value: 'nodeId', align: 'center' }, - { text: '发电机有功(MW)', value: 'pg', align: 'center' }, - { text: '发电机无功(MW)', value: 'qg', align: 'center' }, - { text: '最大无功(MVAr)', value: 'qmax', align: 'center' }, - { text: '最小无功(MVAr)', value: 'qmin', align: 'center' }, + { text: '发电机有功(KW)', value: 'pg', align: 'center' }, + { text: '发电机无功(KW)', value: 'qg', align: 'center' }, + { text: '最大无功(KVAr)', value: 'qmax', align: 'center' }, + { text: '最小无功(KVAr)', value: 'qmin', align: 'center' }, { text: '节点电压', value: 'vg', align: 'center' }, { text: '发电机容量', value: 'mbase', align: 'center' }, { text: '运行状态', value: 'sttusName', align: 'center' }, - { text: '最大有功(MW)', value: 'pmax', align: 'center' }, - { text: '最小有功(MW)', value: 'pmin', align: 'center' }, + { text: '最大有功(KW)', value: 'pmax', align: 'center' }, + { text: '最小有功(KW)', value: 'pmin', align: 'center' }, { text: '碳排强度(gCO2·/kWh)', value: 'strength', align: 'center' }, ]) // 表格 const total = ref(0) diff --git a/.env.development b/.env.development index 5854b6a..9c26bdc 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,7 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://111.198.10.15:11309 # VITE_APP_API_BASEURL = http://111.198.10.15:21409 -VITE_APP_API_BASEURL = http://111.198.10.15:11411 +VITE_APP_API_BASEURL = http://139.198.29.133:11411 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 99c9299..0ef7631 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -4,16 +4,17 @@ "DataVUrl":[ { "name": "碳足迹监测", - "url": "https://share.shanhaibi.com/6482e0dc0987c/" + "url": "http://111.198.10.15:11418/jc/" }, { "name": "碳足迹评价", - "url": "https://share.shanhaibi.com/64867996e5a73/" + "url": "http://111.198.10.15:11418/pj/" }, { "name": "碳足迹预警", - "url": "https://share.shanhaibi.com/64867d25bd589/" + "url": "http://111.198.10.15:11418/yj/" } ] } + diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue index 7893e43..ef73a01 100644 --- a/src/components/map/infoWindow.vue +++ b/src/components/map/infoWindow.vue @@ -42,7 +42,7 @@ 节点编号 : {{ info?.busId }}
- 负荷有功功率 : {{ info?.pd }} MW 负荷无功功率 : {{ info?.qd }} MW + 负荷有功功率 : {{ info?.pd }} KW 负荷无功功率 : {{ info?.qd }} KW
节点碳势 : {{ info?.en }} gCO2/kWh 节点负荷碳流率 : {{ info?.flowRate }} kgCO2/h diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue index e4aca59..ddb676f 100644 --- a/src/components/map/infoWindow2.vue +++ b/src/components/map/infoWindow2.vue @@ -42,7 +42,7 @@ 光伏挂载节点 : {{ info?.nodeId }}
- 发电机组有功 : {{ info?.pg }} MW 发电机组无功 : {{ info?.qg }} MW + 发电机组有功 : {{ info?.pg }} KW 发电机组无功 : {{ info?.qg }} KW
碳排强度 : {{ info?.strength }} gCO2·/kWh diff --git a/src/components/map/trendChart.vue b/src/components/map/trendChart.vue index 5fbdd3d..22f012d 100644 --- a/src/components/map/trendChart.vue +++ b/src/components/map/trendChart.vue @@ -24,7 +24,7 @@ }, }) const loading = ref(true) -const range = ref('') +const range = ref('hour') const flag = ref(true) // defineExpose({ range }) const yAxisData = ref([]) @@ -45,11 +45,11 @@ xAxisData.value = data.monitorTrends?.rp?.map((item: any) => item.time) yAxisData.value = [ { - name: '有功功率(MW)', + name: '有功功率(KW)', data: data.monitorTrends?.rp?.map((item: any) => Number(item.value)), }, { - name: '无功功率(MVAr)', + name: '无功功率(KVAr)', data: data.monitorTrends?.ap?.map((item: any) => Number(item.value)), }, ] @@ -73,13 +73,13 @@ // 监听 监测趋势时间段 变化 重新获取数据 watch(() => props.deviceId, (newVal) => { if (newVal) { - range.value = 'day' + range.value = 'hour' fetchDeviceAnalysis() } if (Number(props.deviceType) === 1) { selected.value = { - '有功功率(MW)': true, - '无功功率(MVAr)': false, + '有功功率(KW)': true, + '无功功率(KVAr)': false, } } else { @@ -108,7 +108,7 @@ xAxisData.value = [] yAxisData.value = [] setTimeout(() => { - range.value = 'day' + range.value = 'hour' }) } } @@ -130,6 +130,9 @@
+ + 小时 + 日 diff --git a/src/views/data/device/detail.vue b/src/views/data/device/detail.vue index d579a44..e28fc32 100644 --- a/src/views/data/device/detail.vue +++ b/src/views/data/device/detail.vue @@ -49,17 +49,17 @@ xAxisData1.value = data.monitorTrends?.rp?.map((item: any) => item.time) data1.value = [ { - name: '有功功率(MW)', + name: '有功功率(KW)', data: data.monitorTrends?.rp?.map((item: any) => item.value), }, { - name: '无功功率(MVAr)', + name: '无功功率(KVAr)', data: data.monitorTrends?.ap?.map((item: any) => item.value), }, ] selected.value = { - '有功功率(MW)': true, - '无功功率(MVAr)': false, + '有功功率(KW)': true, + '无功功率(KVAr)': false, } } // 整理节点监测趋势数据-用热/用气 @@ -168,6 +168,9 @@ 日 + + 小时 + diff --git a/src/views/data/electricity/components/networkBusbar.vue b/src/views/data/electricity/components/networkBusbar.vue index 9c0c6b2..a1512a2 100644 --- a/src/views/data/electricity/components/networkBusbar.vue +++ b/src/views/data/electricity/components/networkBusbar.vue @@ -38,8 +38,8 @@ // { text: '母线省损耗区域', value: 'zone', align: 'center' }, // { text: '节点最大电压', value: 'vmax', align: 'center' }, // { text: '节点最小电压', value: 'vmin', align: 'center' }, - { text: '负荷有功功率(MW)', value: 'pd', align: 'center' }, - { text: '负荷无功功率(MW)', value: 'qd', align: 'center' }, + { text: '负荷有功功率(KW)', value: 'pd', align: 'center' }, + { text: '负荷无功功率(KW)', value: 'qd', align: 'center' }, { text: '节点碳势(gCO2/kWh)', value: 'en', align: 'center' }, { text: '负荷碳流率(kgCO2/h)', value: 'flowRate', align: 'center' }, { text: '采集时间', value: 'colTime', align: 'center' }, diff --git a/src/views/data/electricity/page.vue b/src/views/data/electricity/page.vue index e414999..c937616 100644 --- a/src/views/data/electricity/page.vue +++ b/src/views/data/electricity/page.vue @@ -30,15 +30,15 @@ const columns = ref([ { text: '机组名称', value: 'stationName', align: 'center' }, { text: '发电机组对应节点数', value: 'nodeId', align: 'center' }, - { text: '发电机有功(MW)', value: 'pg', align: 'center' }, - { text: '发电机无功(MW)', value: 'qg', align: 'center' }, - { text: '最大无功(MVAr)', value: 'qmax', align: 'center' }, - { text: '最小无功(MVAr)', value: 'qmin', align: 'center' }, + { text: '发电机有功(KW)', value: 'pg', align: 'center' }, + { text: '发电机无功(KW)', value: 'qg', align: 'center' }, + { text: '最大无功(KVAr)', value: 'qmax', align: 'center' }, + { text: '最小无功(KVAr)', value: 'qmin', align: 'center' }, { text: '节点电压', value: 'vg', align: 'center' }, { text: '发电机容量', value: 'mbase', align: 'center' }, { text: '运行状态', value: 'sttusName', align: 'center' }, - { text: '最大有功(MW)', value: 'pmax', align: 'center' }, - { text: '最小有功(MW)', value: 'pmin', align: 'center' }, + { text: '最大有功(KW)', value: 'pmax', align: 'center' }, + { text: '最小有功(KW)', value: 'pmin', align: 'center' }, { text: '碳排强度(gCO2·/kWh)', value: 'strength', align: 'center' }, ]) // 表格 const total = ref(0) diff --git a/src/views/data/useHeat/page.vue b/src/views/data/useHeat/page.vue index 34029a4..37f9e7d 100644 --- a/src/views/data/useHeat/page.vue +++ b/src/views/data/useHeat/page.vue @@ -46,8 +46,8 @@ { text: '设备类型', value: 'deviceTypeName', align: 'center' }, { text: '设备编号', value: 'deviceNo', align: 'center' }, { text: '安装位置', value: 'installLocaltion', align: 'center' }, - { text: props.type === '0' ? '负荷有功功率(MW)' : '数值', value: props.type === '0' ? 'pd' : 'monitorVal', align: 'center' }, - { text: props.type === '0' ? '负荷无功功率(MW)' : '单位', value: props.type === '0' ? 'qd' : 'monitorUnit', align: 'center' }, + { text: props.type === '0' ? '负荷有功功率(KW)' : '数值', value: props.type === '0' ? 'pd' : 'monitorVal', align: 'center' }, + { text: props.type === '0' ? '负荷无功功率(KW)' : '单位', value: props.type === '0' ? 'qd' : 'monitorUnit', align: 'center' }, { text: '上传时间', value: 'createTime', align: 'center' }, ]) // 表格 const total = ref(0)