From cc702f8d62c082c8f4b97b44e094fb8b8c7b97d8 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 31 七月 2024 15:16:06 +0800
Subject: [PATCH] 修改检验任务bug
---
src/components/view/a6-device-management.vue | 98 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 69 insertions(+), 29 deletions(-)
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index 69c9e78..04f59c8 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -51,7 +51,7 @@
<template>
<div class="role_manage">
- <div>
+ <div v-if="!showData">
<el-row class="title">
<el-col :span="12" style="padding-left: 20px;text-align: left;">璁惧宸ュ叿鏄庣粏</el-col>
<el-col :span="12" style="text-align: right;">
@@ -59,7 +59,7 @@
</el-col>
</el-row>
</div>
- <div class="search">
+ <div class="search" v-if="!showData">
<div class="search_thing">
<div class="search_label">鐘舵�侊細</div>
<el-select v-model="componentData.entity.deviceStatus" placeholder="鍏ㄩ儴" size="small">
@@ -82,7 +82,7 @@
<el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
</div>
</div>
- <div class="table">
+ <div class="table" v-if="!showData">
<!-- 璇硶 瀛愮粍浠堕�氳繃 this.$emit +浼犲叆鏂规硶鍚� 璋冪敤鐖剁粍浠舵柟娉� 渚嬪 this.$emit锛坰electAllByOne锛� 灏遍渶鍦ㄧ埗缁勪欢澹版槑骞朵紶鍏� @selectAllByOne="selectAllByOne"-->
<ValueTable @selectAllByOne="selectAllByOne" @isUpdate="isUpdate" ref="ValueTable"
:url="$api.deviceScope.selectDeviceParameter" :upUrl="$api.deviceScope.upDeviceParameter"
@@ -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%">
@@ -410,7 +410,7 @@
v-model="configForm.y"></el-input>
</div>
<div class="search_thing">
- <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>鍏紡锛�</div>
+ <div class="search_label">鍏紡锛�</div>
<el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="configForm.formula"></el-input>
</div>
@@ -421,7 +421,7 @@
</el-row>
</span>
</el-dialog>
- <dataAcquisitionConfig v-if="showData"/>
+ <dataAcquisitionConfig v-if="showData" :deviceId="deviceId"/>
</div>
</template>
@@ -435,6 +435,16 @@
},
data() {
return {
+ deviceId: '',
+ 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 +461,7 @@
dialogVisible2: false,
addPower: false,
showData: false, // 鏁伴噰閰嶇疆椤甸潰
+ tableList: [],
componentData: {
entity: {
deviceStatus: null,
@@ -479,7 +490,10 @@
id: 'handleConfig',
font: '鏁伴噰閰嶇疆',
type: 'text',
- method: 'handleConfig'
+ method: 'handleConfig',
+ disabFun: (row, index) => {
+ return row.insProductItem === ''
+ }
}],
headNoShow:['enDeviceName'],
tagField: {
@@ -570,8 +584,8 @@
this.subordinateDepartmentsList = data
})
},
- refreshTable() {
- this.$refs['ValueTable'].selectList()
+ refreshTable(e) {
+ this.$refs['ValueTable'].selectList(e)
},
refresh() {
this.componentData.entity = this.HaveJson(this.entityCopy)
@@ -594,21 +608,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, {
@@ -658,6 +672,23 @@
this.componentData.tagField.insProductIds.select = [...this.componentData.tagField.insProductIds.select,...children]
this.componentData.selectField.insProductIds.select = [...this.componentData.selectField.insProductIds.select,...children]
return m
+ })
+ this.options.forEach(item=>{
+ if(item.children.length==0){
+ item.children = null;
+ }else{
+ item.children.forEach(m=>{
+ if(m.children.length==0){
+ m.children = null;
+ }else{
+ m.children.forEach(n=>{
+ if(n.children&&n.children.length==0){
+ n.children = null;
+ }
+ })
+ }
+ })
+ }
})
})
},
@@ -777,7 +808,7 @@
}
this.$message.success('淇敼鎴愬姛')
this.upLoad = false
- this.refreshTable()
+ this.refreshTable('page')
this.dialogVisible = false
}).catch(e => {
this.$message.error('淇敼澶辫触')
@@ -827,7 +858,7 @@
}
this.$message.success('鎻愪氦鎴愬姛')
this.upLoad2 = false
- this.refreshTable()
+ this.refreshTable('page')
this.dialogVisible2 = false
this.formData2 = {
imageUpload: '',
@@ -846,7 +877,20 @@
// this.configForm = res.data
// })
this.showData = true
- console.log('?????', this.showData)
+ const list = row.insProductItem.split(';')
+ let list2 = []
+ list.map((item) => {
+ const obj = Object.assign({
+ deviceId: row.id,
+ insProductItem: item,
+ })
+ list2.push(obj)
+ })
+ this.tableList = list2
+ this.deviceId = row.id
+ },
+ closeDataVue () {
+ this.showData = false
},
submitForm3(){
if(!this.configForm.ip){
@@ -873,10 +917,6 @@
this.$message.error('璇峰～鍐橸');
return
}
- if(!this.configForm.formula){
- this.$message.error('璇峰～鍐欏叕寮�');
- return
- }
this.upLoad3 = true
this.$axios.post(this.$api.deviceScope.numberCollect, this.configForm, {
@@ -889,7 +929,7 @@
return
}
this.$message.success('鎿嶄綔鎴愬姛')
- this.refreshTable()
+ this.refreshTable('page')
this.dialogVisible3 = false
}).catch(e => {
this.$message.error('鎿嶄綔澶辫触')
--
Gitblit v1.9.3