diff --git a/web/.eslintrc.js b/web/.eslintrc.js
index 4e7041d..02e0935 100644
--- a/web/.eslintrc.js
+++ b/web/.eslintrc.js
@@ -60,18 +60,7 @@ module.exports = defineConfig({
'vue/require-default-prop': 'off',
'vue/require-explicit-emits': 'off',
'vue/require-toggle-inside-transition': 'off',
- 'vue/html-self-closing': [
- 'error',
- {
- html: {
- void: 'always',
- normal: 'never',
- component: 'always'
- },
- svg: 'always',
- math: 'always'
- }
- ],
+ 'vue/html-self-closing':'off',
'vue/multi-word-component-names': 'off',
'vue/no-v-html': 'off',
'prettier/prettier': 'off', // 芋艿:默认关闭 prettier 的 ESLint 校验,因为我们使用的是 IDE 的 Prettier 插件
diff --git a/web/src/utils/dict.ts b/web/src/utils/dict.ts
index 94e9e32..490c152 100644
--- a/web/src/utils/dict.ts
+++ b/web/src/utils/dict.ts
@@ -174,6 +174,6 @@ export enum DICT_TYPE {
HAND_DETECTOR_FENCE_TYPE = 'hand_detector_fence_type', // HAND 手持探测器围栏类型 1:超出报警;2:进入报警
HAND_DETECTOR_FENCE_STATUS = 'hand_detector_fence_status', // HAND 手持探测器围栏状态 1:启用;2:禁用
HAND_DETECTOR_ALARM_LEVEL = 'hand_detector_alarm_level', // HAND 手持探测器警报方式/级别 0:正常状态;1:一级警报;2:二级警报;3:弹窗警报
- HAND_DETECTOR_HANDLE_STATUS = 'hand_detector_handle_status', // HAND 手持探测器处理状态 0:待处理;1:处理中;1:已处理
+ HAND_DETECTOR_HANDLE_STATUS = 'hand_detector_chandle_status', // HAND 手持探测器处理状态 0:待处理;1:处理中;1:已处理
HAND_DETECTOR_VALUE_DIRECTION = 'hand_detector_value_direction' // HAND 手持探测器最值方向 0:小;1:大
}
diff --git a/web/src/views/gas/handalarm/index.vue b/web/src/views/gas/handalarm/index.vue
index 8593e75..be2b359 100644
--- a/web/src/views/gas/handalarm/index.vue
+++ b/web/src/views/gas/handalarm/index.vue
@@ -8,9 +8,9 @@
:inline="true"
label-width="120px"
>
-
+
@@ -34,22 +34,39 @@
class="!w-240px"
/>
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
搜索
重置
@@ -123,30 +153,27 @@
@selection-change="handleRowCheckboxChange"
>
-
-
+
+
-
+
{{
- handDetectorStore.getAlarmTypes.find((item) => item.id === scope.row.alarmType)?.name
+ handDetectorStore.getAlarmTypes.find((item) => item.level === scope.row.alarmLevel)
+ ?.name
}}
-
-
- {{ handDetectorStore.getGasTypes.find((item) => item.id === scope.row.gasType)?.name }}
-
-
-
-
-
+
+
+
+
+ {{
+ getIntDictOptions(DICT_TYPE.HAND_DETECTOR_HANDLE_STATUS).find(
+ (item) => item.value === scope.row.status
+ )?.label
+ }}
+
+