From 103f328ed8055d859061bf08baf4ab3787bc9894 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 七月 2024 13:19:19 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b6-device-management/b6-data-acquisition-config.vue | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/components/do/b6-device-management/b6-data-acquisition-config.vue b/src/components/do/b6-device-management/b6-data-acquisition-config.vue
index cf5af10..a212452 100644
--- a/src/components/do/b6-device-management/b6-data-acquisition-config.vue
+++ b/src/components/do/b6-device-management/b6-data-acquisition-config.vue
@@ -83,9 +83,29 @@
</el-form-item>
</div>
<div class="fomItem2">
- <el-form-item class="fomItemInput1" label="鍏紡:">
- <!-- <formula :returnFormula="evalResult"/> -->
- <el-input type="textarea" autosi:autosize="{ minRows: 2, maxRows: 4}"ze placeholder="璇疯緭鍏ュ唴瀹�" v-model="configForm.formula" @change="evalResult"> </el-input>
+ <el-form-item class="fomItemInput1">
+ <template v-slot="label">
+ 鍏紡锛�
+ <el-tooltip class="itemFomItem" effect="dark" content="姹傚弬鏁版渶澶у�硷紝鍙傛暟涓暟鏈�灏戜袱涓紝濡傦細MAX(1,2)" placement="top">
+ <label>MAX()</label>
+ </el-tooltip>
+ <el-tooltip class="itemFomItem" effect="dark" content="姹傚弬鏁版渶灏忓�硷紝鍙傛暟涓暟鏈�灏戜袱涓紝濡傦細MIN(1,2)" placement="top">
+ <label>MIN()</label>
+ </el-tooltip>
+ <el-tooltip class="itemFomItem" effect="dark" content="姹傚拰锛屽弬鏁颁釜鏁版渶灏戜袱涓紝濡傦細SUM(1,2)" placement="top">
+ <label>SUM()</label>
+ </el-tooltip>
+ <el-tooltip class="itemFomItem" effect="dark" content="姹傜粷瀵瑰�硷紝鍙傛暟涓暟鏈�灏戜竴涓紝濡傦細ABS(1)" placement="top">
+ <label>ABS()</label>
+ </el-tooltip>
+ <el-tooltip class="itemFomItem" effect="dark" content="姹傚钩鍧囧�硷紝鍙傛暟涓暟鏈�灏戜袱涓釜锛屽锛欰VERAGE(1,2)" placement="top">
+ <label>AVERAGE()</label>
+ </el-tooltip>
+ <el-tooltip class="itemFomItem" effect="dark" content="姹備腑鍊硷紝鍙傛暟涓暟鏈�灏戜袱涓釜锛屽锛歁EDIAN(1,2)" placement="top">
+ <label>MEDIAN()</label>
+ </el-tooltip>
+ <el-input type="textarea" autosi:autosize="{ minRows: 2, maxRows: 4}"ze placeholder="璇疯緭鍏ュ唴瀹�" v-model="configForm.formula" @change="evalResult"> </el-input>
+ </template>
</el-form-item>
</div>
</el-form>
@@ -144,12 +164,11 @@
</template>
<script>
-import formula from '../../tool/formula.vue'
+
export default {
name: "dataAcquisitionConfig",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: {
- formula
},
props: {
deviceId: {
@@ -507,6 +526,10 @@
</script>
<style scoped>
+.itemFomItem {
+ margin-left: 20px;
+}
+
.search_thing {
width: 350px;
display: flex;
--
Gitblit v1.9.3