From 5c7a1056ae7d6c9b28f554b83d0fb6c4bd9d7adc Mon Sep 17 00:00:00 2001 From: hh <292475944@qq.com> Date: Wed, 11 Nov 2020 13:55:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BA=E4=BB=B6=E4=B8=8A=E4=BC=A0&=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=B1=BB=E5=9E=8B+=E5=AE=A2=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/hardware/product.js | 7 + src/api/system/user.js | 8 + src/utils/request.js | 2 +- src/views/firmware/firmwareList/index.vue | 218 ++++++++++---- src/views/system/user/index.vue | 339 +++++++--------------- 5 files changed, 287 insertions(+), 287 deletions(-) diff --git a/src/api/hardware/product.js b/src/api/hardware/product.js index 44d1227..3ff5404 100644 --- a/src/api/hardware/product.js +++ b/src/api/hardware/product.js @@ -43,3 +43,10 @@ export function del(ids) { }) } +// 产品下拉 +export function select() { + return request({ + url: '/system/product/select', + method: 'get', + }) +} \ No newline at end of file diff --git a/src/api/system/user.js b/src/api/system/user.js index 3b9a776..5e5d739 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -125,3 +125,11 @@ export function importTemplate() { method: 'get' }) } + +// 获取客户下拉 +export function userSelect() { + return request({ + url: '/system/user/select', + method: 'get' + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index 112d453..1e8a645 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -10,7 +10,7 @@ const service = axios.create({ // axios中请求配置有baseURL选项，表示请求URL公共部分 baseURL: process.env.VUE_APP_BASE_API, // 超时 - timeout: 10000 + // timeout: 10000 }) // request拦截器 service.interceptors.request.use(config => { diff --git a/src/views/firmware/firmwareList/index.vue b/src/views/firmware/firmwareList/index.vue index 657023f..67a11fc 100644 --- a/src/views/firmware/firmwareList/index.vue +++ b/src/views/firmware/firmwareList/index.vue @@ -1,66 +1,90 @@