From 83aa32b14d8589d8c4a7c77f64f0effd9320807c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 15 十月 2024 13:28:52 +0800
Subject: [PATCH] 修改工时提交
---
src/components/view/a6-device-management.vue | 65 ++++++--------------------------
1 files changed, 12 insertions(+), 53 deletions(-)
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index f7973f5..0cc801f 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="妫�娴嬬殑鏂囦欢绫诲瀷:" 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>
@@ -382,20 +368,6 @@
</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>
@@ -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'},
@@ -556,7 +529,8 @@
}
},
requiredAdd: [],
- requiredUp: []
+ requiredUp: [],
+ needSort: ['deviceName', 'acquisitionDate', 'activationDate', 'lastCalibrationDate', 'nextCalibrationDate', 'deviceStatus'],
},
entityCopy: {},
upIndex: 0,
@@ -611,8 +585,8 @@
this.subordinateDepartmentsList = data
})
},
- refreshTable() {
- this.$refs['ValueTable'].selectList()
+ refreshTable(e) {
+ this.$refs['ValueTable'].selectList(e)
},
refresh() {
this.componentData.entity = this.HaveJson(this.entityCopy)
@@ -818,14 +792,6 @@
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
@@ -843,7 +809,7 @@
}
this.$message.success('淇敼鎴愬姛')
this.upLoad = false
- this.refreshTable()
+ this.refreshTable('page')
this.dialogVisible = false
}).catch(e => {
this.$message.error('淇敼澶辫触')
@@ -872,7 +838,7 @@
this.$message.error('鏈緭鍏ュ惎鐢ㄦ棩鏈�')
return
}
- if(!this.formData2.deviceStatus){
+ if(this.formData2.deviceStatus==='' || this.formData2.deviceStatus===null){
this.$message.error('鏈�夋嫨褰撳墠鐘舵��')
return
}
@@ -880,16 +846,8 @@
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.formData2.insProductIds = this.formData2.insProductIds?this.formData2.insProductIds.join():''
this.$axios.post(this.$api.deviceScope.addDeviceParameter, this.formData2, {
headers: {
'Content-Type': 'application/json'
@@ -901,7 +859,7 @@
}
this.$message.success('鎻愪氦鎴愬姛')
this.upLoad2 = false
- this.refreshTable()
+ this.refreshTable('page')
this.dialogVisible2 = false
this.formData2 = {
imageUpload: '',
@@ -930,6 +888,7 @@
list2.push(obj)
})
this.tableList = list2
+ this.deviceId = row.id
},
closeDataVue () {
this.showData = false
@@ -971,7 +930,7 @@
return
}
this.$message.success('鎿嶄綔鎴愬姛')
- this.refreshTable()
+ this.refreshTable('page')
this.dialogVisible3 = false
}).catch(e => {
this.$message.error('鎿嶄綔澶辫触')
--
Gitblit v1.9.3