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 @@
-
- 左侧区域
-
-
-
-
-
-
- 搜索
- 重置
-
-
-
-
- 增加
-
-
-
- 批量删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 修改
-
- 删除
-
-
-
-
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+ 增加
+
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传
+
+
+
+
+
-
-
-
-
-
+
+
@@ -75,11 +99,30 @@