From 47431e32e426d14736415ac0cc9cdcd88f7c07e5 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 22 四月 2024 18:02:20 +0800
Subject: [PATCH] 优化检验任务计算
---
src/view/notice.vue | 16 ++++++++--------
src/main.js | 4 ++--
src/components/do/b1-inspect-order-plan/Inspection.vue | 12 ++++++++++--
3 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index e45dc8f..b7b216e 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -784,7 +784,15 @@
valueList.forEach(b => {
str = str.replace(b.name, b.value)
})
- comResult = eval(str)
+ if(item.v.f.includes('/')>-1){
+ if(Object.getOwnPropertyNames(comValue).length==valueList.length){
+ comResult = eval(str)
+ }else{
+ comResult = ''
+ }
+ }else{
+ comResult = eval(str)
+ }
break;
}
list.forEach(a => {
@@ -835,7 +843,7 @@
let regex = /[=\+\-\*\%\(\)\/\s]/g
let mode = item.v.f.replace(regex, ' ').split(' ');
mode.filter(m => m && !Number(m)).forEach(m => {
- let r = m.split('')[1] - 1
+ let r = m.replace(/[a-zA-Z]/g, "") - 1
let c = this.comparisonList.find(j => j.label == m.split('')[0]).value
valueList.push({
c,
diff --git a/src/main.js b/src/main.js
index 31d5bfc..a14d504 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,9 +13,9 @@
//鏈湴
Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
-// const javaApi = 'http://192.168.0.24:8001';//鏉�
+const javaApi = 'http://192.168.11.200:8001';//鏉�
// const javaApi = 'http://192.168.11.249:8001';//寮�
-const javaApi = 'http://192.168.11.50:8001';//濮�
+// const javaApi = 'http://192.168.11.50:8001';//濮�
// const javaApi = 'http://114.132.189.42:9006';//娴嬭瘯鏈�
//鑳滀簯鏈嶅姟鍣�
// Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";
diff --git a/src/view/notice.vue b/src/view/notice.vue
index b8657b1..44aabd0 100644
--- a/src/view/notice.vue
+++ b/src/view/notice.vue
@@ -69,14 +69,14 @@
<div class="content">
<img :src="`../../static/img/notice-${m.type}.svg`" alt="" style="width: 50px;margin-right: 18px;">
<div class="content-info">
- <h4 style="font-weight: normal;margin-bottom: 6px;display: flex;align-items: center;justify-content: space-between;">
+ <h4 style="font-weight: normal;margin-bottom: 4px;display: flex;align-items: center;justify-content: space-between;">
<span>{{ m.title }}</span>
- <span class="time" style="color: #999999;font-size: 14px;">{{ m.time }}</span>
+ <span class="time" style="color: #999999;font-size: 12px;">{{ m.time }}</span>
</h4>
- <p style="color: #999999;font-size: 14px;margin-bottom: 8px;" class="ellipsis-multiline">{{ m.content }}</p>
- <el-tag type="danger" v-if="m.status==0">宸叉嫆缁�</el-tag>
- <el-tag type="success" v-if="m.status==1">宸叉帴鏀�</el-tag>
- <p style="font-size: 14px;color: #999999;display: flex;align-items: center;justify-content: space-between;">
+ <p style="color: #999999;font-size: 14px;margin-bottom: 6px;" class="ellipsis-multiline">{{ m.content }}</p>
+ <el-tag type="danger" size="small" v-if="m.status==0" style="margin-bottom: 4px;">宸叉嫆缁�</el-tag>
+ <el-tag type="success" size="small" v-if="m.status==1" style="margin-bottom: 4px;">宸叉帴鏀�</el-tag>
+ <p style="font-size: 12px;color: #999999;display: flex;align-items: center;justify-content: space-between;">
<span>鍙戦�佷汉锛歿{m.sendUser}}</span>
<span>鏀朵欢浜猴細{{ m.getUser }}</span>
</p>
@@ -95,7 +95,7 @@
export default {
data(){
return{
- drawer:true,
+ drawer:false,
direction:'rtl',
options:[],
type:'0',
@@ -105,7 +105,7 @@
title:'鏍囬',
content:'鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭鍐呭',
time:'2019-08-07 15:34:26',
- status:1,//娑堟伅鐘舵�侊細鎷掔粷銆佹帴鏀�
+ status:0,//娑堟伅鐘舵�侊細鎷掔粷銆佹帴鏀�
isRead:0,//鏄惁宸茶
sendUser:'灏忔槑',
getUser:'鏉庡崕',
--
Gitblit v1.9.3