From 0dd0bf217772b61681f8a24d277305af97d561a2 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 08 一月 2024 11:05:48 +0800
Subject: [PATCH] 1.导入问题修改
---
vue.config.js | 2 +-
src/views/mouldManager/mouldList.vue | 17 ++++++++++-------
src/views/systemSetting/dataImport.vue | 6 ++++--
3 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/views/mouldManager/mouldList.vue b/src/views/mouldManager/mouldList.vue
index 63e0a9b..78768ee 100644
--- a/src/views/mouldManager/mouldList.vue
+++ b/src/views/mouldManager/mouldList.vue
@@ -201,17 +201,20 @@
</el-table-column>
<el-table-column
prop="surp_life"
- label="棰勮瀵垮懡"
+ label="棰勮瀵垮懡(娆�)"
+ width="125"
sortable="custom"
/>
<el-table-column
prop="serlife"
- label="浣跨敤瀵垮懡"
+ label="浣跨敤瀵垮懡(娆�)"
+ width="125"
sortable="custom"
/>
<el-table-column
prop="resi_life"
- label="鍓╀綑瀵垮懡"
+ label="鍓╀綑瀵垮懡(娆�)"
+ width="125"
sortable="custom"
/>
<el-table-column
@@ -324,10 +327,10 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
- <el-form-item label="棰勮瀵垮懡">
+ <el-form-item label="棰勮瀵垮懡(娆�)">
<el-input v-model="dialogForm.surplife" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
</el-form-item>
- <el-form-item label="鍓╀綑瀵垮懡">
+ <el-form-item label="鍓╀綑瀵垮懡(娆�)">
<el-input v-model="dialogForm.resilife" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
</el-form-item>
@@ -418,13 +421,13 @@
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
- 棰勮瀵垮懡(灏忔椂)
+ 棰勮瀵垮懡(娆�)
</template>
{{ formResume.surp_life }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
- 鍓╀綑瀵垮懡(灏忔椂)
+ 鍓╀綑瀵垮懡(娆�)
</template>
{{ formResume.serlife }}
</el-descriptions-item>
diff --git a/src/views/systemSetting/dataImport.vue b/src/views/systemSetting/dataImport.vue
index 5e67f31..7d0ce9a 100644
--- a/src/views/systemSetting/dataImport.vue
+++ b/src/views/systemSetting/dataImport.vue
@@ -830,7 +830,7 @@
}
// 鏁版嵁鎻愪氦鍓嶅幓闄ょ┖鏍兼柟娉�
- this.tableDataTrim()
+ // this.tableDataTrim()
const data = {
fileCode: this.excelCode,
@@ -2171,7 +2171,9 @@
// 妯℃澘涓嬭浇
async getExcel() {
const res = await DownLoadExcel({ FileCode: this.excelCode })
- window.location.href = res.data
+ if (res.code === '200') {
+ window.location.href = res.data
+ }
},
async getSelectArr() {
await this.getPrentOrganization()
diff --git a/vue.config.js b/vue.config.js
index 9964864..ab64f26 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -53,7 +53,7 @@
proxy: {
[process.env.VUE_APP_BASE_API]: {
target: 'http://121.196.36.24:8021', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
- // target: 'http://192.168.18.245:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
+ // target: 'http://122.227.18.22:8000', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃
['^' + process.env.VUE_APP_BASE_API]: '/api/'
--
Gitblit v1.9.3