diff --git a/src/utils/rpc.js b/src/utils/rpc.js
index 1fba472..294fc8a 100644
--- a/src/utils/rpc.js
+++ b/src/utils/rpc.js
@@ -17,7 +17,7 @@ const guid = () => {
}
const instance = axios.create({
baseURL: '/',
- timeout: 100000,
+ timeout: 10000,
responseType: 'json',
})
diff --git a/src/views/AutomaticMode/BaseKeyboardInput.vue b/src/views/AutomaticMode/BaseKeyboardInput.vue
new file mode 100644
index 0000000..382985b
--- /dev/null
+++ b/src/views/AutomaticMode/BaseKeyboardInput.vue
@@ -0,0 +1,255 @@
+
+
+
+
+
+ %
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/AutomaticMode/index.vue b/src/views/AutomaticMode/index.vue
index d8921e3..652d32d 100644
--- a/src/views/AutomaticMode/index.vue
+++ b/src/views/AutomaticMode/index.vue
@@ -212,11 +212,12 @@
@@ -243,7 +244,9 @@ import { ref, onMounted, onUnmounted, watch } from 'vue'
import { useRouter } from 'vue-router'
import RPC from '@/utils/rpc'
import dayjs from 'dayjs'
+import BaseKeyboardInput from './BaseKeyboardInput.vue';
const commit_uid = sessionStorage.getItem('central_control_comm_uid')
+// const commit_uid = '868656077692382'
const switchValue = ref(true)
const selectBoxValue = ref([])
diff --git a/src/views/HandleControl/index.vue b/src/views/HandleControl/index.vue
index 2b24edc..6193321 100644
--- a/src/views/HandleControl/index.vue
+++ b/src/views/HandleControl/index.vue
@@ -215,6 +215,7 @@ import RPC from '@/utils/rpc'
import dayjs from 'dayjs'
const commit_uid = sessionStorage.getItem('central_control_comm_uid')
+// const commit_uid = '868656077692382'
const router = useRouter()
const currentTime = ref('')
@@ -226,25 +227,7 @@ const selectedChannelName = ref(null)
const week = ref('')
const weekDays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
-RPC.post('/adl400/readPhaseData', { comm_uid: commit_uid }).then(res => {
- powerPhases.value[0].voltage = res.aVoltage + 'V'
- powerPhases.value[0].current = res.aElectricCurrent + 'A'
- powerPhases.value[0].power = res.aPower + 'kW'
- powerPhases.value[0].factor = res.aPowerFactor
- powerPhases.value[1].voltage = res.bVoltage + 'V'
- powerPhases.value[1].current = res.bElectricCurrent + 'A'
- powerPhases.value[1].power = res.bPower + 'kW'
- powerPhases.value[1].factor = res.bPowerFactor
-
- powerPhases.value[2].voltage = res.cVoltage + 'V'
- powerPhases.value[2].current = res.cElectricCurrent + 'A'
- powerPhases.value[2].power = res.cPower + 'kW'
- powerPhases.value[2].factor = res.cPowerFactor
-
- energyParams.value.activeEnergy = res.activeEnergy + 'A'
- energyParams.value.powerFactor = res.powerFactor
-})
// 电力参数数据
const powerPhases = ref([
@@ -273,7 +256,7 @@ const powerPhases = ref([
const energyParams = ref({
dcVoltage: '0.0V',
- activeEnergy: '0kwh',
+ activeEnergy: '0kW·h',
activePower: '0kW',
powerFactor: '0'
})
@@ -388,7 +371,6 @@ const getInfo = () => {
isInitData.value = false
})
}
-getInfo()
const oldInfo = ref('')
watch(info, () => {
@@ -409,6 +391,34 @@ const sunsetTime = ref('')
RPC.post('/m9z/getDeviceSunRiseTime', { comm_uid: commit_uid }).then(res => {
sunriseTime.value = res.Sunrise ? dayjs(res.Sunrise).format('HH:mm:ss') : ''
sunsetTime.value = res.Sunset ? dayjs(res.Sunset).format('HH:mm:ss') : ''
+}).finally(() => {
+ RPC.post('/m9z/getDeviceManualInfo', { comm_uid: commit_uid }).then(res => {
+ info.value = res
+ setTimeout(() => {
+ isSync.value = false
+ }, 1000);
+ }).finally(() => {
+ RPC.post('/adl400/readPhaseData', { comm_uid: commit_uid }).then(res => {
+ powerPhases.value[0].voltage = res.aVoltage + 'V'
+ powerPhases.value[0].current = res.aElectricCurrent + 'A'
+ powerPhases.value[0].power = res.aPower + 'kW'
+ powerPhases.value[0].factor = res.aPowerFactor
+
+ powerPhases.value[1].voltage = res.bVoltage + 'V'
+ powerPhases.value[1].current = res.bElectricCurrent + 'A'
+ powerPhases.value[1].power = res.bPower + 'kW'
+ powerPhases.value[1].factor = res.bPowerFactor
+
+ powerPhases.value[2].voltage = res.cVoltage + 'V'
+ powerPhases.value[2].current = res.cElectricCurrent + 'A'
+ powerPhases.value[2].power = res.cPower + 'kW'
+ powerPhases.value[2].factor = res.cPowerFactor
+
+ energyParams.value.activeEnergy = res.activeEnergy + 'kW·h'
+ energyParams.value.activePower = res.activePower + "kW"
+ energyParams.value.powerFactor = res.powerFactor
+ })
+ })
})
// 更新时间
diff --git a/src/views/Monitoring/index.vue b/src/views/Monitoring/index.vue
index b16f8e3..ff37cb2 100644
--- a/src/views/Monitoring/index.vue
+++ b/src/views/Monitoring/index.vue
@@ -79,7 +79,7 @@
-
+
回路{{ index + 1 }}:{{ circuit.is_open ? '打开' : '关闭' }}
@@ -100,7 +100,7 @@
-
+
回路{{ index + 6 }}:{{ circuit.is_open ? '打开' : '关闭' }}
@@ -122,7 +122,7 @@
-
+
调光通道{{ index + 1 }}
{{ channel.pwm }}%
@@ -132,7 +132,7 @@
-
+
调光通道{{ index + 6 }}
{{ channel.pwm }}%
@@ -204,6 +204,7 @@ import RPC from '@/utils/rpc'
import dayjs from 'dayjs'
import Linechart from '@/components/Linechart.vue';
+// const commit_uid = '868656077692382'
const commit_uid = sessionStorage.getItem('central_control_comm_uid')
const router = useRouter()
@@ -377,28 +378,30 @@ const getInfo = () => {
// RPC.post('/m9z/getDeviceManualInfo', { comm_uid: commit_uid }).then(res => {
// info.value = res
// })
- RPC.post('/adl400/readPhaseData', { comm_uid: commit_uid }).then(res => {
- powerPhases.value[0].voltage = res.aVoltage + 'V'
- powerPhases.value[0].current = res.aElectricCurrent + 'A'
- powerPhases.value[0].power = res.aPower + 'kW'
- powerPhases.value[0].factor = res.aPowerFactor
-
- powerPhases.value[1].voltage = res.bVoltage + 'V'
- powerPhases.value[1].current = res.bElectricCurrent + 'A'
- powerPhases.value[1].power = res.bPower + 'kW'
- powerPhases.value[1].factor = res.bPowerFactor
-
- powerPhases.value[2].voltage = res.cVoltage + 'V'
- powerPhases.value[2].current = res.cElectricCurrent + 'A'
- powerPhases.value[2].power = res.cPower + 'kW'
- powerPhases.value[2].factor = res.cPowerFactor
-
- energyParams.value.activeEnergy = res.activeEnergy + 'A'
- energyParams.value.powerFactor = res.powerFactor
- })
RPC.post('/m9z/getDeviceStatus2', { comm_uid: commit_uid }).then((res) => {
// 直流电流、电源、功率
info.value = res
+ }).finally(() => {
+ RPC.post('/adl400/readPhaseData', { comm_uid: commit_uid }).then(res => {
+ powerPhases.value[0].voltage = res.aVoltage + 'V'
+ powerPhases.value[0].current = res.aElectricCurrent + 'A'
+ powerPhases.value[0].power = res.aPower + 'kW'
+ powerPhases.value[0].factor = res.aPowerFactor
+
+ powerPhases.value[1].voltage = res.bVoltage + 'V'
+ powerPhases.value[1].current = res.bElectricCurrent + 'A'
+ powerPhases.value[1].power = res.bPower + 'kW'
+ powerPhases.value[1].factor = res.bPowerFactor
+
+ powerPhases.value[2].voltage = res.cVoltage + 'V'
+ powerPhases.value[2].current = res.cElectricCurrent + 'A'
+ powerPhases.value[2].power = res.cPower + 'kW'
+ powerPhases.value[2].factor = res.cPowerFactor
+
+ energyParams.value.activeEnergy = res.activeEnergy + 'kW·h'
+ energyParams.value.activePower = res.activePower + 'kW'
+ energyParams.value.powerFactor = res.powerFactor
+ })
})
// RPC.post('/m9z/getDeviceSunRiseTime', { comm_uid: commit_uid }).then(res => {