From 38e6f27a8082e1173e3c02a33da5da39b6c6872c Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 31 七月 2024 13:33:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b6-device-management/b6-data-acquisition-config.vue | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 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 2d4c12e..83bb496 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: {
@@ -315,13 +334,16 @@
this.$axios.get(this.$api.deviceScope.queryDataAcquisitionConfiguration + "?deviceId=" + this.deviceId + "&isDevice=" + false).then(res => {
this.tableList = res.data
this.tableList.forEach(i => {
- i.sample = i.sample.replaceAll('"', '').replaceAll("],", '锛�').replaceAll("[", '').replaceAll('"', '').replaceAll(']', '')
+ // replace(/=/g, ' ')
+ i.sample = i.sample.replace(/"/g, '').replace(/],/g, '锛�').replace(/\[/g, '').replace(/]/g, '')
})
if(this.tableList[0]) {
this.$set(this.configForm, 'fileType', this.tableList[0].fileType)
this.$set(this.configForm, 'collectUrl', this.tableList[0].collectUrl)
this.$set(this.configForm, 'storageUrl', this.tableList[0].storageUrl)
this.$set(this.configForm, 'ip', this.tableList[0].ip)
+ this.$set(this.configForm, 'mdbEntrustCode', this.tableList[0].mdbEntrustCode)
+ this.$set(this.configForm, 'mdbSampleCode', this.tableList[0].mdbSampleCode)
}
// 涓�鑸殑鍚堝苟琛�
if (this.spanConfig != undefined && this.spanConfig.rows && this.spanConfig.rows.length >
@@ -357,7 +379,9 @@
collectUrl: this.configForm.collectUrl,
storageUrl: this.configForm.storageUrl,
ip: this.configForm.ip,
- isDevice: true
+ isDevice: true,
+ mdbEntrustCode: this.configForm.mdbEntrustCode,
+ mdbSampleCode: this.configForm.mdbSampleCode
})
this.upLoad4 = true
this.$axios.post(this.$api.deviceScope.saveDataAcquisitionConfiguration + "?deviceId=" + this.deviceId, obj, {headers: {
@@ -503,6 +527,10 @@
</script>
<style scoped>
+.itemFomItem {
+ margin-left: 20px;
+}
+
.search_thing {
width: 350px;
display: flex;
--
Gitblit v1.9.3