From 6ef9e5189ac1888b8c4c504d5c5d3f431807ff56 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期六, 15 三月 2025 11:57:40 +0800
Subject: [PATCH] 修改电路试验单位
---
src/components/view/a6-device-management.vue | 91 +++++++++++++++++----------------------------
1 files changed, 34 insertions(+), 57 deletions(-)
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index addc892..478341e 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -225,20 +225,6 @@
</el-upload>
</div>
</el-form-item>
- <el-form-item label="妫�娴嬬殑鏂囦欢绫诲瀷:">
- <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="閲囬泦鍦板潃:" 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>
@@ -382,20 +368,6 @@
</el-upload>
</div>
</el-form-item>
- <el-form-item label="妫�娴嬬殑鏂囦欢绫诲瀷:">
- <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="閲囬泦鍦板潃:" 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>
@@ -449,7 +421,7 @@
</el-row>
</span>
</el-dialog>
- <dataAcquisitionConfig v-if="showData" :tableList="tableList"/>
+ <dataAcquisitionConfig v-if="showData" :deviceId="deviceId"/>
</div>
</template>
@@ -463,6 +435,7 @@
},
data() {
return {
+ deviceId: '',
fileTypeOptions: [
{label: 'csv', value: '.csv'},
{label: 'db', value: '.db'},
@@ -513,15 +486,17 @@
font: '妗ｆ淇',
type: 'text',
method: 'isUpdate'
- }, {
- id: 'handleConfig',
- font: '鏁伴噰閰嶇疆',
- type: 'text',
- method: 'handleConfig',
- disabFun: (row, index) => {
- return row.insProductItem === ''
- }
- }],
+ }
+ // , {
+ // id: 'handleConfig',
+ // font: '鏁伴噰閰嶇疆',
+ // type: 'text',
+ // method: 'handleConfig',
+ // disabFun: (row, index) => {
+ // return row.insProductItem === ''
+ // }
+ // }
+ ],
headNoShow:['enDeviceName'],
tagField: {
deviceStatus: {
@@ -556,7 +531,8 @@
}
},
requiredAdd: [],
- requiredUp: []
+ requiredUp: [],
+ needSort: ['deviceName', 'acquisitionDate', 'activationDate', 'lastCalibrationDate', 'nextCalibrationDate', 'deviceStatus'],
},
entityCopy: {},
upIndex: 0,
@@ -611,8 +587,8 @@
this.subordinateDepartmentsList = data
})
},
- refreshTable() {
- this.$refs['ValueTable'].selectList()
+ refreshTable(e) {
+ this.$refs['ValueTable'].selectList(e)
},
refresh() {
this.componentData.entity = this.HaveJson(this.entityCopy)
@@ -639,17 +615,17 @@
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, {
@@ -835,7 +811,7 @@
}
this.$message.success('淇敼鎴愬姛')
this.upLoad = false
- this.refreshTable()
+ this.refreshTable('page')
this.dialogVisible = false
}).catch(e => {
this.$message.error('淇敼澶辫触')
@@ -864,7 +840,7 @@
this.$message.error('鏈緭鍏ュ惎鐢ㄦ棩鏈�')
return
}
- if(!this.formData2.deviceStatus){
+ if(this.formData2.deviceStatus==='' || this.formData2.deviceStatus===null){
this.$message.error('鏈�夋嫨褰撳墠鐘舵��')
return
}
@@ -873,7 +849,7 @@
return
}
this.upLoad2 = true;
- this.formData2.insProductIds = this.formData2.insProductIds.join()
+ this.formData2.insProductIds = this.formData2.insProductIds?this.formData2.insProductIds.join():''
this.$axios.post(this.$api.deviceScope.addDeviceParameter, this.formData2, {
headers: {
'Content-Type': 'application/json'
@@ -885,7 +861,7 @@
}
this.$message.success('鎻愪氦鎴愬姛')
this.upLoad2 = false
- this.refreshTable()
+ this.refreshTable('page')
this.dialogVisible2 = false
this.formData2 = {
imageUpload: '',
@@ -914,6 +890,7 @@
list2.push(obj)
})
this.tableList = list2
+ this.deviceId = row.id
},
closeDataVue () {
this.showData = false
@@ -955,7 +932,7 @@
return
}
this.$message.success('鎿嶄綔鎴愬姛')
- this.refreshTable()
+ this.refreshTable('page')
this.dialogVisible3 = false
}).catch(e => {
this.$message.error('鎿嶄綔澶辫触')
--
Gitblit v1.9.3