+
- {
padding: 10px 0;
max-height: 15vw;
}
+.modal-content-right{
+ flex: 1;
+ overflow-y: auto;
+ padding: 10px 0;
+ max-height: 15vw;
+}
.search-box {
position: relative;
diff --git a/src/components/common/SelectModal/index.vue b/src/components/common/SelectModal/index.vue
index c4707e7..061d1e2 100644
--- a/src/components/common/SelectModal/index.vue
+++ b/src/components/common/SelectModal/index.vue
@@ -1,5 +1,5 @@
@@ -20,6 +22,9 @@ const deviceInfo = ref(deviceStore.deviceInfo)
初始化状态:{{ deviceInfo.deviceTypeInited ? '已初始化' : '未初始化' }}
+
+
设备屏幕尺寸:宽:{{ screenWidth }} 高:{{ screenHeight }}
+
diff --git a/src/components/setting/SystemDate.vue b/src/components/setting/SystemDate.vue
index 60fae30..ef45acb 100644
--- a/src/components/setting/SystemDate.vue
+++ b/src/components/setting/SystemDate.vue
@@ -5,7 +5,6 @@ import { formatDateTime } from '@/libs/utils'
import { ref } from 'vue'
const dateVal = ref(formatDateTime())
-
const onChangeDate = async (value: string) => {
if (value) {
const splitDate = value.split(' ') // 先以空格分隔
@@ -55,6 +54,7 @@ const onChangeDate = async (value: string) => {
设置日期:
{
startTimer(30 * 1000, (times: string) => {
@@ -19,6 +20,8 @@ const countdownToReconnection = () => {
}
watchEffect(() => {
+ console.log('systemStore.websocketConnected---', systemStore.websocketConnected)
+ websocketConnected.value = systemStore.websocketConnected
if (!systemStore.websocketConnected) {
countdownToReconnection()
}
@@ -29,14 +32,14 @@ watchEffect(() => {
-
+
正在重连中 {{ timer }}
- 请稍候,系统正在尝试重新连接网格...
+ 请稍候,系统正在尝试重新连接网络...
diff --git a/src/layouts/default.vue b/src/layouts/default.vue
index 1fe578a..c088b72 100644
--- a/src/layouts/default.vue
+++ b/src/layouts/default.vue
@@ -175,7 +175,7 @@ const onLogout = () => {
{{ currentTime }}
-
+
@@ -262,7 +262,7 @@ const onLogout = () => {
width: 10rem;
display: flex;
gap: 5px;
- font-size: 16px;
+ font-size: 1.6vw;
background: white;
}
.menu-tags{
diff --git a/src/libs/constant.ts b/src/libs/constant.ts
index 4fa070b..7929c6b 100644
--- a/src/libs/constant.ts
+++ b/src/libs/constant.ts
@@ -5,16 +5,16 @@ export const HEADER_TOKEN_KEY = 'Authorization'
export const SESSIONSTORAGE_TOKEN_KEY = 'web_token'
export const formulaNameMap: Record = {
- stoped_gs: '停止过氧化氢溶度',
- continued_gs: '继续过氧化氢溶度',
- stoped_satur: '停止过氧化氢相对饱和度',
- continued_satur: '继续过氧化氢相对饱和度',
- max_humidity: '允许消毒最大湿度',
+ stoped_gs: '停止H2o2浓度',
+ continued_gs: '继续H2o2浓度',
+ stoped_satur: '停止H2o2饱和度',
+ continued_satur: '继续H2o2饱和度',
+ max_humidity: '消毒最大湿度',
injection_pump_speed: '喷射蠕动泵转速',
pre_heat_time_s: '预热时间',
stoped_humi: '停止相对湿度',
- continued_humi: '继续相对湿度',
- proportional_valve_default_value: '正负压默认开合比例',
+ continued_humi: '湿度',
+ proportional_valve_default_value: '正负压比例',
loglevel: '消毒等级',
}
diff --git a/src/libs/socket.ts b/src/libs/socket.ts
index 227ff31..93063bd 100644
--- a/src/libs/socket.ts
+++ b/src/libs/socket.ts
@@ -14,7 +14,6 @@ export class WebSocketClient {
private eventListeners = new Map void)[]>()
private connectCount = 0
- private maxConnectCount = 10
private intervalVal: any = 0
constructor(url: string) {
@@ -29,6 +28,8 @@ export class WebSocketClient {
this.isConnecting = false
this.isConnected.value = true
this.connectionError.value = null
+ this.connectCount = 0
+ clearInterval(this.intervalVal)
}
socket.onclose = (event) => {
this.isConnected.value = false
@@ -164,11 +165,11 @@ export class WebSocketClient {
// 重连逻辑
private reconnect() {
- if (this.connectCount > this.maxConnectCount) {
- clearInterval(this.intervalVal)
- console.log('-----达到最大重连次数,停止重连------')
- return
- }
+ // if (this.connectCount > this.maxConnectCount) {
+ // clearInterval(this.intervalVal)
+ // console.log('-----达到最大重连次数,停止重连------')
+ // return
+ // }
this.isConnecting = true
if (this.socket.readyState !== WebSocket.CLOSED && this.socket.readyState !== WebSocket.CLOSING) {
this.socket.close()
diff --git a/src/stores/formulaStore.ts b/src/stores/formulaStore.ts
index e2a84cc..0dec9ac 100644
--- a/src/stores/formulaStore.ts
+++ b/src/stores/formulaStore.ts
@@ -187,7 +187,7 @@ export const useFormulaStore = defineStore('formula', () => {
* @param {Formula.FormulaItem} formData - 配方数据
* @desc 保存消毒配方并启动消毒程序
*/
- const saveDisinfectFormula = async (formData: Formula.FormulaItem) => {
+ const startDisinfectFormula = async (formData: Formula.FormulaItem) => {
try {
const params = {
className: 'DisinfectionCtrlServiceExt',
@@ -225,7 +225,7 @@ export const useFormulaStore = defineStore('formula', () => {
initFormulaList,
updateSelectedFormulaDataByList,
updateFormulaConfigData,
- saveDisinfectFormula,
+ startDisinfectFormula,
updateLogLevel,
resetToDefaultFormula,
getFormualDefaultData,
diff --git a/src/stores/homeStore.ts b/src/stores/homeStore.ts
index 89142d6..f4f9b89 100644
--- a/src/stores/homeStore.ts
+++ b/src/stores/homeStore.ts
@@ -37,6 +37,7 @@ export const useHomeStore = defineStore('home', () => {
const curStateRemainTime = ref()
const disinfectionState = ref(initDisinfectState) // 当前设备消毒状态
let renderTimer: any
+ const defaultIntensityValue = ref(0)
/**
* @function updateHomeData
@@ -79,7 +80,7 @@ export const useHomeStore = defineStore('home', () => {
const intensityParams = {
className: 'PipelinePressureControl',
fnName: 'setIntensity',
- params: { intensity },
+ params: { intensity: Number(intensity) },
}
syncSendCmd(intensityParams)
}
@@ -120,18 +121,27 @@ export const useHomeStore = defineStore('home', () => {
return disinfectionState.value.state.toLocaleLowerCase() === DEVICE_STATES.IDLE || disinfectionState.value.state === DEVICE_STATES.FINISHED
})
+ const updateDefaultIntensityValue = (value: number) => {
+ defaultIntensityValue.value = value
+ }
+
return {
- // 状态属性
- h2O2SensorData,
- disinfectionState,
- pressureConfig,
- curStateRemainTime,
isDeviceIdle,
- // 操作方法
+
+ h2O2SensorData,
updateHomeData,
+
updatePressure,
+ disinfectionState,
+
+ curStateRemainTime,
updateHomeDisinfectionState,
+
+ pressureConfig,
updatePressureConfig,
updateHomeRemainTime,
+
+ defaultIntensityValue,
+ updateDefaultIntensityValue,
}
})
diff --git a/src/views/audit/index.vue b/src/views/audit/index.vue
index e71673b..a1e7342 100644
--- a/src/views/audit/index.vue
+++ b/src/views/audit/index.vue
@@ -103,14 +103,12 @@ const handleSelectionChange = (users: Audit.AuditItem[]) => {
@click="onExportRecord"
/>
-