From 5c1a305e8d0ada752d6cc38e500e5e9de9af43a3 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 15 七月 2024 18:52:04 +0800
Subject: [PATCH] 设备数采配置 调整
---
src/components/view/a6-device-management.vue | 118 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 92 insertions(+), 26 deletions(-)
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index a96603f..c9a0423 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -162,7 +162,7 @@
</el-col>
<!-- 鍙宠竟甯冨眬 -->
<el-col :span="7">
- <el-form :label-position="labelPosition" :model="formData" label-width="120px" ref="ruleForm">
+ <el-form :label-position="labelPosition" :model="formData" label-width="140px" ref="ruleForm">
<!-- 瀹為獙瀹ゅ垪琛� -->
<el-form-item label="鎵�灞為儴闂�:">
<el-select :disabled="isUp" v-model="formData.subordinateDepartmentsId" placeholder="璇烽�夋嫨" size="small" style="width:100%">
@@ -225,6 +225,20 @@
</el-upload>
</div>
</el-form-item>
+ <el-form-item label="妫�娴嬬殑鏂囦欢绫诲瀷:" required>
+ <el-select :disabled="isUp" v-model="formData.fileType" placeholder="璇烽�夋嫨鏂囦欢绫诲瀷" clearable>
+ <el-option v-for="item in fileTypeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="閲囬泦鍦板潃:" required clearable>
+ <el-input :disabled="isUp" v-model="formData.collectUrl"></el-input>
+ </el-form-item>
+ <el-form-item label="鍌ㄥ瓨鍦板潃:">
+ <el-input :disabled="isUp" v-model="formData.storageUrl"></el-input>
+ </el-form-item>
</el-form>
</el-col>
</el-row>
@@ -368,6 +382,20 @@
</el-upload>
</div>
</el-form-item>
+ <el-form-item label="妫�娴嬬殑鏂囦欢绫诲瀷:" required>
+ <el-select v-model="formData.fileType" placeholder="璇烽�夋嫨鏂囦欢绫诲瀷" clearable>
+ <el-option v-for="item in fileTypeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="閲囬泦鍦板潃:" required clearable>
+ <el-input v-model="formData.collectUrl"></el-input>
+ </el-form-item>
+ <el-form-item label="鍌ㄥ瓨鍦板潃:">
+ <el-input v-model="formData.storageUrl"></el-input>
+ </el-form-item>
</el-form>
</el-col>
</el-row>
@@ -421,20 +449,29 @@
</el-row>
</span>
</el-dialog>
-<!-- <dataAcquisitionConfig v-if="showData"/>-->
+ <dataAcquisitionConfig v-if="showData" :tableList="tableList"/>
</div>
</template>
<script>
import ValueTable from '../tool/value-table.vue'
- // import dataAcquisitionConfig from '../do/b6-device-management/b6-data-acquisition-config.vue'
+ import dataAcquisitionConfig from '../do/b6-device-management/b6-data-acquisition-config.vue'
export default {
components: {
ValueTable,
- // dataAcquisitionConfig
+ dataAcquisitionConfig
},
data() {
return {
+ fileTypeOptions: [
+ {label: 'csv', value: '.csv'},
+ {label: 'db', value: '.db'},
+ {label: 'mdb', value: '.mdb'},
+ {label: 'word', value: '.docx'},
+ {label: 'excel', value: '.xlsx'},
+ {label: 'txt', value: '.txt'},
+ {label: 'png', value: '.png'},
+ ],
//鏄惁鏄。妗堜慨璁� true涓嶆槸 false鏄�
isUp: true,
formData: {
@@ -451,6 +488,7 @@
dialogVisible2: false,
addPower: false,
showData: false, // 鏁伴噰閰嶇疆椤甸潰
+ tableList: [],
componentData: {
entity: {
deviceStatus: null,
@@ -479,7 +517,10 @@
id: 'handleConfig',
font: '鏁伴噰閰嶇疆',
type: 'text',
- method: 'handleConfig'
+ method: 'handleConfig',
+ disabFun: (row, index) => {
+ return row.insProductItem === ''
+ }
}],
headNoShow:['enDeviceName'],
tagField: {
@@ -594,21 +635,21 @@
if (power[i].menuMethod == 'addDeviceParameter') {
add = true
}
- if (power[i].menuMethod == 'numberCollect') {
+ if (power[i].menuMethod == 'saveDataAcquisitionConfiguration') {
config = true
}
}
- if (!config) {
- this.componentData.do.splice(2, 1)
- }
- if (!up) {
- this.componentData.do.splice(1, 1)
- }
- if (!del) {
- this.componentData.do.splice(0, 1)
- }
- this.addPower = add
- },
+ if (!config) {
+ this.componentData.do.splice(2, 1)
+ }
+ if (!up) {
+ this.componentData.do.splice(1, 1)
+ }
+ if (!del) {
+ this.componentData.do.splice(0, 1)
+ }
+ this.addPower = add
+ },
// 鑾峰彇瀛楀吀
selectEnumByCategory() {
this.$axios.post(this.$api.enums.selectEnumByCategory, {
@@ -760,6 +801,14 @@
this.$message.error('鏈緭鍏ユ牎鍑嗗懆鏈燂紙鏈堬級')
return
}
+ if(!this.formData.fileType){
+ this.$message.error('鏈�夋嫨鏂囦欢鍚庣紑锛�')
+ return
+ }
+ if(!this.formData.collectUrl){
+ this.$message.error('璇疯緭鍏ラ噰闆嗗湴鍧�锛�')
+ return
+ }
delete this.formData.createTime
delete this.formData.updateTime
delete this.formData.createUser
@@ -814,6 +863,14 @@
this.$message.error('杈撳叆鏍″噯鍛ㄦ湡锛堟湀锛�')
return
}
+ if(!this.formData2.fileType){
+ this.$message.error('鏈�夋嫨鏂囦欢鍚庣紑锛�')
+ return
+ }
+ if(!this.formData2.collectUrl){
+ this.$message.error('璇疯緭鍏ラ噰闆嗗湴鍧�锛�')
+ return
+ }
this.upLoad2 = true;
this.formData2.insProductIds = this.formData2.insProductIds.join()
this.$axios.post(this.$api.deviceScope.addDeviceParameter, this.formData2, {
@@ -840,17 +897,26 @@
})
},
handleConfig(row){
- this.configForm = {}
- this.dialogVisible3 = true
- this.$axios.post(this.$api.deviceScope.getNumberCollect+'?id='+row.id).then(res => {
- this.configForm = res.data
+ // this.configForm = {}
+ // this.dialogVisible3 = true
+ // this.$axios.post(this.$api.deviceScope.getNumberCollect+'?id='+row.id).then(res => {
+ // this.configForm = res.data
+ // })
+ this.showData = true
+ const list = row.insProductItem.split(';')
+ let list2 = []
+ list.map((item) => {
+ const obj = Object.assign({
+ deviceId: row.id,
+ insProductItem: item,
+ })
+ list2.push(obj)
})
- // this.showData = true
- // console.log('?????', this.showData)
+ this.tableList = list2
},
- // closeDataVue () {
- // this.showData = false
- // },
+ closeDataVue () {
+ this.showData = false
+ },
submitForm3(){
if(!this.configForm.ip){
this.$message.error('璇峰～鍐橧P');
--
Gitblit v1.9.3