From 6817c96db53ac16f5d5eca72b73230d898f32126 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期四, 11 四月 2024 09:43:32 +0800
Subject: [PATCH] Merge branch 'master' into dev-threejs
---
src/views/system/threshold/index.vue | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/views/system/threshold/index.vue b/src/views/system/threshold/index.vue
index a334492..5b536ca 100644
--- a/src/views/system/threshold/index.vue
+++ b/src/views/system/threshold/index.vue
@@ -24,10 +24,17 @@
</template>
</el-table-column>
<el-table-column label="瓒呮椂澶╂暟" align="center" prop="timeout"/>
- <el-table-column label="鎸囨爣" align="center" prop="indicator">
+ <el-table-column label="宸ュ崟闃堝��" align="center" prop="indicator">
<template slot-scope="scope">
<div v-for="item in JSON.parse(scope.row.indicator)" :key="item">
{{ item.label }}锛歿{ item.value }}
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column label="涓嬪彂闃堝��" align="center" prop="indicator">
+ <template slot-scope="scope">
+ <div v-for="item in JSON.parse(scope.row.indicator)" :key="item">
+ {{ item.label }}锛歿{ item.value2 }}
</div>
</template>
</el-table-column>
@@ -75,7 +82,8 @@
<el-input type="number" min="0" max="1000" v-model="form.timeout" placeholder="璇疯緭鍏ヨ秴鏃跺ぉ鏁�"/>
</el-form-item>
<el-form-item :label="indicator.label" prop="indexOneValue" v-for="indicator in indicators" label-width="150px">
- <el-input class="el-input-width" v-model="indicator.value" :placeholder="'璇疯緭鍏�' + indicator.label"/>
+ <el-input class="el-input-half-width" v-model="indicator.value" placeholder="宸ュ崟闃堝��"/>
+ <el-input style="float: right;" class="el-input-half-width" v-model="indicator.value2" placeholder="涓嬪彂闃堝��"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -325,3 +333,8 @@
}
}
</script>
+<style>
+.el-input-half-width {
+ width: calc(50% - 6px); /* 鍑忓幓涓�浜涢棿闅� */
+}
+</style>
\ No newline at end of file
--
Gitblit v1.8.0