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 | 104 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 80 insertions(+), 24 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 d0e0a6a..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
@@ -19,12 +19,13 @@
<el-table-column prop="fileType" align="center" label="鏂囦欢鍚庣紑"></el-table-column>
<el-table-column prop="collectUrl" align="center" min-width="100" show-overflow-tooltip label="閲囬泦鍦板潃"></el-table-column>
<el-table-column prop="storageUrl" align="center" min-width="100" show-overflow-tooltip label="瀛樺偍鍦板潃"></el-table-column>
- <el-table-column prop="ip" align="center" label="IP鍦板潃"></el-table-column>
+ <el-table-column prop="ip" align="center" label="IP鍦板潃" min-width="100"></el-table-column>
+ <el-table-column prop="sample" align="center" label="妫�楠屽璞�" show-overflow-tooltip min-width="150"></el-table-column>
<el-table-column prop="inspectionItem" align="center" label="妫�楠岄」" min-width="100"></el-table-column>
- <el-table-column prop="inspectionItemSubClass" align="center" label="妫�楠岄」瀛愰」" min-width="100"></el-table-column>
- <el-table-column prop="referx" align="center" label="鍙傜収X"></el-table-column>
+ <el-table-column prop="inspectionItemSubclass" align="center" label="妫�楠岄」瀛愰」" min-width="100"></el-table-column>
+ <el-table-column prop="referx" align="center" label="鍙傜収X" min-width="100"></el-table-column>
<el-table-column prop="x" align="center" label="X"></el-table-column>
- <el-table-column prop="refery" align="center" label="鍙傜収Y"></el-table-column>
+ <el-table-column prop="refery" align="center" label="鍙傜収Y" min-width="100"></el-table-column>
<el-table-column prop="y" align="center" label="Y"></el-table-column>
<el-table-column prop="formula" align="center" label="鍏紡"></el-table-column>
<el-table-column prop="section" label="鎿嶄綔" width="120">
@@ -82,8 +83,29 @@
</el-form-item>
</div>
<div class="fomItem2">
- <el-form-item class="fomItemInput1" label="鍏紡:">
- <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>
@@ -121,6 +143,16 @@
</el-option>
</el-select>
</div>
+ <div v-if="configForm.fileType == '.mdb'" class="search_thing" style="margin-bottom: 14px;">
+ <div class="search_label">濮旀墭瀛楁锛�</div>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="configForm.mdbEntrustCode"></el-input>
+ </div>
+ <div v-if="configForm.fileType == '.mdb'" class="search_thing" style="margin-bottom: 14px;">
+ <div class="search_label">鏍峰搧瀛楁锛�</div>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="configForm.mdbSampleCode"></el-input>
+ </div>
<span slot="footer" class="dialog-footer">
<el-row>
<el-button @click="dialogVisible4=false">鍙� 娑�</el-button>
@@ -132,10 +164,12 @@
</template>
<script>
+
export default {
name: "dataAcquisitionConfig",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: {},
+ components: {
+ },
props: {
deviceId: {
type: Number,
@@ -181,7 +215,7 @@
specialSpanList: [],
spanConfig: {
special: {
- main: "inspectionItemSubClass",
+ main: "inspectionItemSubclass",
rows:[
{
name:'deviceName',
@@ -208,16 +242,16 @@
index:6
},
{
- name:'inspectionItemSubClass',
+ name:'inspectionItemSubclass',
index:7
},
{
- name:'inspectionItemSubClass',
- index:12
+ name:'formula',
+ index:13
},
{
- name:'inspectionItemSubClass',
- index:13
+ name:'inspectionItemSubclass',
+ index:14
}
]
}
@@ -296,14 +330,20 @@
}
},
init() {
- this.tableList = []
+ // this.tableList = []
this.$axios.get(this.$api.deviceScope.queryDataAcquisitionConfiguration + "?deviceId=" + this.deviceId + "&isDevice=" + false).then(res => {
this.tableList = res.data
+ this.tableList.forEach(i => {
+ // 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 >
@@ -339,17 +379,21 @@
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: {
'Content-Type': 'application/json'
}}).then(res => {
- this.tableList = res.data
- this.dialogVisible4 = false
- this.upLoad4 = false
- this.init()
- this.$message.success('鎿嶄綔鎴愬姛')
+ if(res.code == 200) {
+ this.tableList = res.data
+ this.dialogVisible4 = false
+ this.init()
+ this.$message.success('鎿嶄綔鎴愬姛')
+ }
+ this.upLoad4 = false
}).catch(err => {
this.upLoad4 = false
})
@@ -357,10 +401,15 @@
dataConfig (row) {
this.configForm = {
deviceId: row.deviceId,
- insProductItem: row.inspectionItemSubClass.trim()
+ inspectionItem: row.inspectionItem.trim(),
+ inspectionItemSubclass: row.inspectionItemSubclass,
+ structureItemParameterId: row.structureItemParameterId
}
this.dialogVisible3 = true
- this.$axios.get(this.$api.deviceScope.queryDataAcquisitionConfiguration + "?deviceId=" + this.deviceId + "&insProductItem=" + row.inspectionItemSubClass.trim() + "&isDevice=" + true).then(res => {
+ this.$axios.get(this.$api.deviceScope.queryDataAcquisitionConfiguration + "?deviceId=" + this.deviceId +
+ "&inspectionItem=" + row.inspectionItem.trim() +
+ "&isDevice=" + true +
+ "&inspectionItemSubclass=" + row.inspectionItemSubclass.trim()).then(res => {
const data = res.data
if(data[0]) {
this.domains.splice(0, 1)
@@ -395,7 +444,9 @@
}
i.formula = this.configForm.formula
i.deviceId = this.deviceId
- i.insProductItem = this.configForm.insProductItem
+ i.inspectionItem = this.configForm.inspectionItem
+ i.inspectionItemSubclass = this.configForm.inspectionItemSubclass
+ i.structureItemParameterId = this.configForm.structureItemParameterId
})
this.$axios.post(this.$api.deviceScope.saveDataAcquisitionConfiguration + "?deviceId=" + this.deviceId, {dataConfigList: this.domains, isDevice: false},{headers: {
'Content-Type': 'application/json'
@@ -449,7 +500,8 @@
id: ''
});
},
- evalResult () {
+ evalResult (val) {
+ this.configForm.formula = val
// 鏍规嵁鍏紡璁＄畻鍑虹粨鏋�
},
sizeChange(val) {
@@ -475,6 +527,10 @@
</script>
<style scoped>
+.itemFomItem {
+ margin-left: 20px;
+}
+
.search_thing {
width: 350px;
display: flex;
--
Gitblit v1.9.3