From 0a3b4bac16a4cf49deaddc6b4f3a2aeee90e9061 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 21 五月 2024 16:33:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
vue.config.js | 12 ++++++++++--
src/views/product/producttraceability/index.vue | 8 ++++----
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/views/product/producttraceability/index.vue b/src/views/product/producttraceability/index.vue
index 437b369..8685e96 100644
--- a/src/views/product/producttraceability/index.vue
+++ b/src/views/product/producttraceability/index.vue
@@ -382,9 +382,9 @@
>
<template slot-scope="scope">
{{
- scope.row.isQualified == 0
+ scope.row.result == 0
? '涓嶅悎鏍�'
- : (scope.row.isQualified==1?'鍚堟牸':'')
+ : (scope.row.result==1?'鍚堟牸':'')
}}
</template>
</el-table-column>
@@ -433,9 +433,9 @@
>
<template slot-scope="scope">
{{
- scope.row.isQualified == 0
+ scope.row.result == 0
? '涓嶅悎鏍�'
- : (scope.row.isQualified==1?'鍚堟牸':'')
+ : (scope.row.result==1?'鍚堟牸':'')
}}
</template>
</el-table-column>
diff --git a/vue.config.js b/vue.config.js
index 545c796..d768c80 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,3 +1,11 @@
+/***
+ * @Author licp lichunping@guanfang.com.cn
+ * @Date 2024-05-13 10:35:46
+ * @LastEditors licp lichunping@guanfang.com.cn
+ * @LastEditTime 2024-05-21 14:44:16
+ * @FilePath \mes-ocea-before\vue.config.js
+ * @Description 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
/**
* 閰嶇疆鍙傝��:
* https://cli.vuejs.org/zh/config/
@@ -5,8 +13,8 @@
-// const url = 'https://ztms-mes.chinaztt.cn/'
-const url = 'http://localhost:9999'
+const url = 'https://ztms-mes.chinaztt.cn/'
+// const url = 'http://localhost:9999'
//const url = 'http://192.168.32.45:9999'
--
Gitblit v1.9.3