From 6f0855ab8c685bf8e96160687899da796a179f3a Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 31 十月 2024 13:46:20 +0800
Subject: [PATCH] 修改培训后的优化
---
src/components/do/b1-ins-order/add.vue | 2 +-
src/main.js | 6 +++---
src/components/do/b1-inspect-order-plan/Inspection.vue | 11 +++++++++--
src/components/view/b1-inspection-order.vue | 6 ++++--
4 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 4fbf10a..87986a4 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -1303,7 +1303,7 @@
requiredUp: []
},
ruleInfo:{
- rule:null,
+ rule:1,
num:null,
},
powerShow:false,
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index c2bf51b..ebed918 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -735,7 +735,7 @@
</div>
<!-- 鍔熺巼璇曢獙 -->
<div v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName.includes('鍔熺巼瀹归噺')">
- <PowerCapacity :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :isLook="isLook" :num="currentSample.num1" />
+ <PowerCapacity :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :isLook="isLook" :num="currentSample.num1"/>
</div>
<el-upload :action="action"
:data="{
@@ -3266,8 +3266,15 @@
}
},
handleSubmit(){
+ if(!this.otherForm.temperature){
+ this.$message.error('璇疯緭鍏ユ俯搴�')
+ return
+ }
+ if(!this.otherForm.humidity){
+ this.$message.error('璇疯緭鍏ユ箍搴�')
+ return
+ }
this.experimentDia = true
- console.log(6666,this.sampleProduct)
if (this.sonLaboratory === '鐢佃矾璇曢獙') {
this.experimentDia0 = true
}
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 9c1b6e6..9e26214 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -410,7 +410,8 @@
<el-col :span="8"><span> 鐢垫満缂栧彿: </span>{{ item.motorNumber }}</el-col>
</el-row>
<el-row style="margin-top: 1px;font-size: 16px;">
- <el-col><span> 鏍锋満瀹屾垚鏃堕棿: </span>{{ item.issueTime }}</el-col>
+ <el-col :span="16"><span> 鏍锋満瀹屾垚鏃堕棿: </span>{{ item.issueTime }}</el-col>
+ <el-col :span="8"><span> 鏍锋満鍛�: </span>{{ item.issueName }}</el-col>
</el-row>
<el-row style="margin-top: 1px;font-size: 16px;" class="ellipsis-multiline">
<el-col><span> 妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
@@ -446,7 +447,8 @@
<el-col :span="7"><span>鐢垫満缂栧彿: </span>{{ item.motorNumber }}</el-col>
</el-row>
<el-row style="margin-top: 1px;font-size: 16px;">
- <el-col><span>鏍锋満瀹屾垚鏃堕棿: </span>{{ item.issueTime }}</el-col>
+ <el-col :span="16"><span>鏍锋満瀹屾垚鏃堕棿: </span>{{ item.issueTime }}</el-col>
+ <el-col :span="7"><span>鏍锋満鍛�: </span>{{ item.issueName }}</el-col>
</el-row>
<el-row style="margin-top: 1px;font-size: 16px;" class="ellipsis-multiline">
<el-col><span>妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
diff --git a/src/main.js b/src/main.js
index fc67442..afa39b8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -21,15 +21,15 @@
//鏈湴
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
-// const javaApi = 'http://172.20.10.5:8001';
+const javaApi = 'http://172.20.10.5:8001';
// //閫氫俊娴嬭瘯搴�
// Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
// const javaApi = 'http://10.1.13.77:8001';
// 閫氫俊姝ｅ紡搴�
-Vue.prototype.LOCATIONVUE = "https://ztwxlims.ztt.cn:7443";
-const javaApi = 'https://ztwxlims.ztt.cn:7443/lims/';
+// Vue.prototype.LOCATIONVUE = "https://ztwxlims.ztt.cn:7443";
+// const javaApi = 'https://ztwxlims.ztt.cn:7443/lims/';
//浜�
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
--
Gitblit v1.9.3