From d95eb4355cf1a265885ca642f6b53d229d0084b3 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 11 七月 2024 15:05:41 +0800
Subject: [PATCH] 修改中文判断逻辑
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 5c222e7..c754568 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -278,11 +278,11 @@
</el-radio-group>
<el-form :inline="true" :model="otherForm" class="form-inline" label-width="50px" style="padding-top: 0;padding-left: 10px;" v-if="PROJECT=='妫�娴嬩腑蹇�'">
<el-form-item label="娓╁害:" style="margin-bottom: 0;">
- <el-input clearable v-model="otherForm.temperature" size="small" placeholder="" style="width: 100px;" @change="m=>subOtherForm(m,'temperature')"></el-input>
+ <el-input v-model="otherForm.temperature" size="small" placeholder="" style="width: 90px;" @change="m=>subOtherForm(m,'temperature')"></el-input>
<span style="margin-left: 4px;">鈩�</span>
</el-form-item>
<el-form-item label="婀垮害:" style="margin-bottom: 0;">
- <el-input clearable v-model="otherForm.humidity" size="small" placeholder="" style="width: 100px;" @change="m=>subOtherForm(m,'humidity')"></el-input>
+ <el-input v-model="otherForm.humidity" size="small" placeholder="" style="width: 90px;" @change="m=>subOtherForm(m,'humidity')"></el-input>
<span style="margin-left: 4px;">%</span>
</el-form-item>
</el-form>
@@ -517,7 +517,7 @@
<el-table-column
prop="comValue"
align="center"
- label="骞冲潎鍊�"
+ label="琛板噺绯绘暟"
min-width="150">
</el-table-column>
<el-table-column
@@ -1702,12 +1702,16 @@
this.result = JSON.parse(event.data);
switch (this.result.method){
case 'saveInsContext':
- this.tableList = this.result.value.tableList
- this.param = this.result.value.param
- this.saveInsContext()
+ this.$nextTick(()=>{
+ this.tableList = this.result.value.tableList
+ this.param = this.result.value.param
+ this.saveInsContext()
+ })
break;
case 'tableList':
- this.tableList = this.result.value
+ this.$nextTick(()=>{
+ this.tableList = this.result.value
+ })
break;
case 'getCurrentInsProduct':
this.getCurrentInsProduct(this.result.value)
@@ -1820,7 +1824,7 @@
}
},
getValue(v){
- let str = v.v?v.v:(v.ct&&v.ct.s?v.ct.s.length>0&&v.ct.s[0].v.replace(new RegExp('\n', 'g'), '<br/>'):'')
+ let str = v.v?v.v:(v.ct&&v.ct.s?v.ct.s.length>0&&v.ct.s[0].v.replace(new RegExp('\n', 'g'), '<br/>').replace(new RegExp('@', 'g'), '<br/>'):'')
// str.replace(new RegExp(search, 'g'), replace)
return str
},
--
Gitblit v1.9.3