From adfe1ca87e734e564b56a42c6fc5d015b4858eb3 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 04 六月 2024 20:37:49 +0800
Subject: [PATCH] 修改任务检验
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 9 +++-
src/components/view/a6-device-management.vue | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/assets/api/controller.js | 2 +
3 files changed, 117 insertions(+), 3 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 46df052..e4d62e7 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -144,6 +144,8 @@
uploadFile: "/deviceScope/uploadFile", //涓婁紶鍥剧墖
selectDevicePrincipal: "/user/getDeviceManager", //鑾峰彇璁惧璐熻矗浜�
selectDeviceByCode: "/deviceScope/selectDeviceByCode", //閫氳繃璁惧缂栧彿鑾峰彇璁惧鍒楄〃
+ getNumberCollect: "/deviceScope/getNumberCollect", //鏌ヨ鏁伴噰閰嶇疆
+ numberCollect: "/deviceScope/numberCollect", //缁存姢鏁伴噰閰嶇疆
}
const insOrder = {
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index b48d136..0979be9 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -514,7 +514,7 @@
this.$axios.post(this.$api.insOrderPlan.doInsOrder, {
id: val,
laboratory: this.sonLaboratory
- }).then(res => {
+ }).then(async res => {
this.insOrder = res.data.insOrder;
this.urgentList.forEach(m => {
if (m.value == this.insOrder.type) {
@@ -523,6 +523,8 @@
})
this.sampleProduct = res.data.sampleProduct
this.currentSample = this.HaveJson(this.sampleProduct[0])
+ let list = await this.getCurrentProduct(this.currentSample.id,0)
+ this.currentSample.insProduct = this.HaveJson(list)
this.currentSample.insProduct.forEach(a => {
this.param[a.id] = {
insValue: [],
@@ -638,6 +640,7 @@
this.bushing = []
this.currentBushing = null;
this.sampleVisible = false;
+ this.currentSample = this.HaveJson(row)
let list = await this.getCurrentProduct(row.id,0)
this.currentSample.insProduct = this.HaveJson(list)
this.currentSample.insProduct.forEach(a => {
@@ -1483,7 +1486,7 @@
flag = false;
});
},
- caretSample(num){
+ async caretSample(num){
let index = this.currentKey + num
if(index < 1){
this.$message.error('褰撳墠鏄涓�涓牱鍝�')
@@ -1494,6 +1497,8 @@
}
this.currentKey = index
this.currentSample = this.HaveJson(this.sampleProduct[index - 1])
+ let list = await this.getCurrentProduct(this.currentSample.id,0)
+ this.currentSample.insProduct = this.HaveJson(list)
this.currentSample.insProduct.forEach(a => {
this.param[a.id] = {
insValue: [],
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index 24d2283..a44150a 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -378,6 +378,49 @@
</el-row>
</span>
</el-dialog>
+ <el-dialog title="鏁伴噰閰嶇疆" :visible.sync="dialogVisible3" width="400px">
+ <div class="search_thing" style="margin-bottom: 14px;">
+ <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>IP锛�</div>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="configForm.ip"></el-input>
+ </div>
+ <div class="search_thing" style="margin-bottom: 14px;">
+ <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>閲囬泦鍦板潃锛�</div>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="configForm.collectUrl"></el-input>
+ </div>
+ <div class="search_thing" style="margin-bottom: 14px;">
+ <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>鍌ㄥ瓨鍦板潃锛�</div>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="configForm.storageUrl"></el-input>
+ </div>
+ <div class="search_thing" style="margin-bottom: 14px;">
+ <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>鍙傜収锛�</div>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="configForm.refer"></el-input>
+ </div>
+ <div class="search_thing" style="margin-bottom: 14px;">
+ <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>X锛�</div>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="configForm.x"></el-input>
+ </div>
+ <div class="search_thing" style="margin-bottom: 14px;">
+ <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>Y锛�</div>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="configForm.y"></el-input>
+ </div>
+ <div class="search_thing">
+ <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>鍏紡锛�</div>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="configForm.formula"></el-input>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-row>
+ <el-button @click="dialogVisible3=false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitForm3" :loading="upLoad3">纭� 瀹�</el-button>
+ </el-row>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -428,6 +471,11 @@
font: '妗ｆ淇',
type: 'text',
method: 'isUpdate'
+ }, {
+ id: 'handleConfig',
+ font: '鏁伴噰閰嶇疆',
+ type: 'text',
+ method: 'handleConfig'
}],
tagField: {
deviceStatus: {
@@ -480,6 +528,9 @@
subordinateDepartmentsList: [],
upLoad: false,
upLoad2: false,
+ dialogVisible3:false,
+ upLoad3:false,
+ configForm:{}
}
},
computed: {
@@ -773,7 +824,63 @@
this.dialogVisible2 = false
this.upLoad2 = false
})
- }
+ },
+ handleConfig(row){
+ this.configForm = {}
+ this.dialogVisible3 = true
+ this.$axios.post(this.$api.deviceScope.getNumberCollect+'?id='+row.id).then(res => {
+ this.configForm = res.data
+ })
+ },
+ submitForm3(){
+ if(!this.configForm.ip){
+ this.$message.error('璇峰～鍐橧P');
+ return
+ }
+ if(!this.configForm.collectUrl){
+ this.$message.error('璇峰～鍐欓噰闆嗗湴鍧�');
+ return
+ }
+ if(!this.configForm.storageUrl){
+ this.$message.error('璇峰～鍐欏偍瀛樺湴鍧�');
+ return
+ }
+ if(!this.configForm.refer){
+ this.$message.error('璇峰～鍐欏弬鐓�');
+ return
+ }
+ if(!this.configForm.x){
+ this.$message.error('璇峰～鍐橷');
+ return
+ }
+ if(!this.configForm.y){
+ this.$message.error('璇峰～鍐橸');
+ return
+ }
+ if(!this.configForm.formula){
+ this.$message.error('璇峰～鍐欏叕寮�');
+ return
+ }
+
+ this.upLoad3 = true
+ this.$axios.post(this.$api.deviceScope.numberCollect, this.configForm, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ this.upLoad3 = false
+ if (res.code === 201) {
+ return
+ }
+ this.$message.success('鎿嶄綔鎴愬姛')
+ this.refreshTable()
+ this.dialogVisible3 = false
+ }).catch(e => {
+ this.$message.error('鎿嶄綔澶辫触')
+ this.dialogVisible3 = false
+ this.upLoad3 = false
+ })
+ }
}
}
</script>
--
Gitblit v1.9.3