Skip to content

M
mes-ui
Commit e45158fd authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

parents 5ac24381 99b0d476
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
pages/aps/aps/components/edit.vue
View file @ e45158fd
...@@ -110,7 +110,7 @@ export default { ...@@ -110,7 +110,7 @@ export default {
watch: { watch: {
row(v) { row(v) {
if (v != {}) { if (v != {}) {
alert(JSON.stringify(v)) //alert(JSON.stringify(v))
this.entity = v this.entity = v
} }
} }
......
plugins/request/index.js
View file @ e45158fd
...@@ -53,7 +53,7 @@ function errorLog (err) { ...@@ -53,7 +53,7 @@ function errorLog (err) {
// 创建一个 axios 实例 // 创建一个 axios 实例
const service = axios.create({ const service = axios.create({
baseURL: Setting.apiBaseURL, baseURL: Setting.apiBaseURL,
timeout: 5000, // 请求超时时间 timeout: 20000, // 请求超时时间
transformRequest:[(data)=>{ transformRequest:[(data)=>{
function dateFormat(date, fmt) { function dateFormat(date, fmt) {
if (null == date || undefined == date) return ''; if (null == date || undefined == date) return '';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment