Merge remote-tracking branch 'origin/master'

Crunchy

2024-05-21 0a3b4bac16a4cf49deaddc6b4f3a2aeee90e9061

Merge remote-tracking branch 'origin/master'

 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>

 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'