From 625c16cf57c35a0d45c8b4cc278a0a0b41c63589 Mon Sep 17 00:00:00 2001 From: lijing Date: Thu, 14 Nov 2024 11:01:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E9=87=8F=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E6=B5=8B=E9=87=8F=E5=80=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/bad-table/bad-table.vue | 9 ++++++++- src/pages/login/login/index.vue | 2 +- .../quality/Materialinspection/index.vue | 15 +++++++------- src/utils/request.ts | 20 +++++++++---------- 4 files changed, 27 insertions(+), 19 deletions(-) diff --git a/src/components/bad-table/bad-table.vue b/src/components/bad-table/bad-table.vue index 3c87b95..6ba09d4 100644 --- a/src/components/bad-table/bad-table.vue +++ b/src/components/bad-table/bad-table.vue @@ -5,7 +5,7 @@ {{ item.label }} - + @@ -75,6 +75,13 @@ export default { console.log('e:', item); console.log('this.tagslist[index]:', this.tagslist[index]); }, + changeInput(event, index) { + console.log(event, index, 'sddww11', this.tagslist[index].defect, event === '0'); + // if (event === '0') { + // this.tagslist[index].value = null; + // } + }, + cancel() { this.tagslist = this.tagslistcopy; this.tagslist.forEach((item) => { diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index ee22464..5a28682 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -142,7 +142,7 @@ export default class LoginPage extends BasePage { // console.log('Version////', this.Version); } ///********版本号修改区域********** - version = '0.0.138'; //正式版本号 + version = '0.0.139'; //正式版本号 //version = '0.0.14'; //测试版本号 //***************标志修改区域:是否是测试标志: false 正式版本; true 测试版本**************** //isTest = true; diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue index 4452a26..bd6cb98 100644 --- a/src/pages/quality/Materialinspection/index.vue +++ b/src/pages/quality/Materialinspection/index.vue @@ -942,12 +942,12 @@ export default class PurchaseWHSRM extends BasePage { if (!item.files) { item.files = []; ///......... } else { - // item.files = item.files.map((item) => { - // return item.fileAddress; - // }); - item.files.map((item) => { - item.fileListStr.push(item.fileAddress); + item.files = item.files.map((item) => { + return item.fileAddress; }); + // item.files.map((item) => { + // item.fileListStr.push(item.fileAddress); + // }); item.fileListStr = item.files.join(','); } let classTypeCodeslist = []; @@ -1239,6 +1239,7 @@ export default class PurchaseWHSRM extends BasePage { this.tagsvalue = null; this.equipmentindex.push(index); this.isshow = true; + this.tagsvalue = 0; } nopoup() { this.show = false; @@ -1795,8 +1796,8 @@ export default class PurchaseWHSRM extends BasePage { tempFilePaths.map((item) => { uni.uploadFile({ - url: 'http://192.168.202.20:9000/prod-api/file/upload', - // url: '/prod-api/file/upload', + // url: 'http://192.168.202.20:9000/prod-api/file/upload', + url: '/prod-api/file/upload', //url: '/dev-api/file/upload', fileType: 'image', filePath: item, diff --git a/src/utils/request.ts b/src/utils/request.ts index e440645..5789ba5 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -25,16 +25,16 @@ http.interceptors.request.use( config.timeout = 1000 * 60 * 60; //console.log('123456',config) //生产请将注释解开重要重要 - if (config.url.includes('/api')) { - config.baseURL = 'http://192.168.202.23:5001'; - } else if (config.url.includes('http')) { - //直接使用写死地址 - } else { - config.baseURL = 'http://192.168.202.34:30000'; //正式 - // config.baseURL = 'http://192.168.202.20:9000'//测试 - //'http://192.168.202.20:9000' ///测试 - //'http://192.168.202.34:30000'; //正式 - } + // if (config.url.includes('/api')) { + // config.baseURL = 'http://192.168.202.23:5001'; + // } else if (config.url.includes('http')) { + // //直接使用写死地址 + // } else { + // config.baseURL = 'http://192.168.202.34:30000'; //正式 + // // config.baseURL = 'http://192.168.202.20:9000'//测试 + // //'http://192.168.202.20:9000' ///测试 + // //'http://192.168.202.34:30000'; //正式 + // } // 所有请求默认提示加载中 if (config.url == '/prod-api/quality/handCheck/commitCheckResultsCg') { loading = undefined;