diff --git a/src/pages.json b/src/pages.json
index 6f169c7..34887c2 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -8,11 +8,11 @@
"navigationBarTitleText": "登录"
}
},
- // 首页
+ // 业务办理
{
"path": "pages/index/index",
"style": {
- "navigationBarTitleText": "首页"
+ "navigationBarTitleText": "业务办理"
}
},
// 工作台
@@ -22,6 +22,13 @@
"navigationBarTitleText": "工作台"
}
},
+ // 查询
+ {
+ "path": "pages/search/index",
+ "style": {
+ "navigationBarTitleText": "查询"
+ }
+ },
// 我的
{
"path": "pages/my/index",
@@ -457,21 +464,27 @@
"list": [
{
"pagePath": "pages/index/index",
- "text": "首页",
- "iconPath": "static/home.png",
- "selectedIconPath": "static/homeSelected.png"
+ "text": "业务办理",
+ "iconPath": "static/yeWuBanLi.png",
+ "selectedIconPath": "static/yeWuBanLiSelected.png"
},
{
"pagePath": "pages/work/index",
"text": "工作台",
- "iconPath": "static/my.png",
- "selectedIconPath": "static/mySelected.png"
+ "iconPath": "static/work.png",
+ "selectedIconPath": "static/workSelected.png"
+ },
+ {
+ "pagePath": "pages/search/index",
+ "text": "查询",
+ "iconPath": "static/search.png",
+ "selectedIconPath": "static/searchSelected.png"
},
{
"pagePath": "pages/my/index",
"text": "我的",
- "iconPath": "static/workSpace.png",
- "selectedIconPath": "static/workSpaceSelected.png"
+ "iconPath": "static/my.png",
+ "selectedIconPath": "static/mySelected.png"
}
]
},
diff --git a/src/pages/back/backCode.vue b/src/pages/back/backCode.vue
index f98c228..0ddb529 100644
--- a/src/pages/back/backCode.vue
+++ b/src/pages/back/backCode.vue
@@ -67,12 +67,12 @@
外观判定:
-
+
完好
损坏
-
+
附件:
diff --git a/src/pages/back/backCodeAdd.vue b/src/pages/back/backCodeAdd.vue
index 7128ae8..76a8ead 100644
--- a/src/pages/back/backCodeAdd.vue
+++ b/src/pages/back/backCodeAdd.vue
@@ -65,7 +65,7 @@
外观判定:
-
+
完好
损坏
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index a42d59b..a7da54c 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,12 +1,182 @@
- 首页
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
-
diff --git a/src/pages/search/index.vue b/src/pages/search/index.vue
new file mode 100644
index 0000000..1d79826
--- /dev/null
+++ b/src/pages/search/index.vue
@@ -0,0 +1,287 @@
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/work/index.vue b/src/pages/work/index.vue
index 39494b8..f85fb11 100644
--- a/src/pages/work/index.vue
+++ b/src/pages/work/index.vue
@@ -57,7 +57,7 @@
-
+
{{ item.title }}
@@ -104,7 +104,7 @@
-
+
@@ -202,6 +202,16 @@ const partList = ref([
title: '配件领料',
url: '/pages/part/part-lease/index',
iconSrc: '../../static/workbench/partInbound.png',
+ },
+ {
+ title: '配件新购入库',
+ url: '',
+ iconSrc: '../../static/workbench/partIn.png',
+ },
+ {
+ title: '配件领用申请',
+ url: '',
+ iconSrc: '../../static/workbench/partApprove.png',
}
])
@@ -234,48 +244,48 @@ const boxList = ref([
{
title: '标准箱管理',
url: '/pages/standardBox/index',
- iconSrc: '../../static/workbench/fetchMaterialOutStore.png',
+ iconSrc: '../../static/workbench/boxManage.png',
},
{
title: '标准箱移交',
url: '/pages/standardBox/transferBox',
- iconSrc: '../../static/workbench/fetchMaterialOutStore.png',
+ iconSrc: '../../static/workbench/boxHandOver.png',
},
{
title: '标准箱接收',
url: '/pages/standardBox/acceptBox',
- iconSrc: '../../static/workbench/fetchMaterialOutStore.png',
+ iconSrc: '../../static/workbench/boxRecept.png',
},
])
-// 库存查询
-const searchList = ref([
- {
- title: '机具查询',
- url: '/pages/stquery/deviceStatusRecord/index',
- iconSrc: '../../static/workbench/fix.png',
- },
+// // 库存查询
+// const searchList = ref([
+// {
+// title: '机具查询',
+// url: '/pages/stquery/deviceStatusRecord/index',
+// iconSrc: '../../static/workbench/fix.png',
+// },
-])
+// ])
-// 设备信息查询
-const deviceList = ref([
- {
- title: '二维码',
- url: '/pages/devicesSearch/qrSearch',
- iconSrc: '../../static/workbench/fetchMaterialOutStore.png',
- },
- {
- title: 'OCR',
- url: '/pages/devicesSearch/ocrSearch',
- iconSrc: '../../static/workbench/fetchMaterialOutStore.png',
- },
- {
- title: '设备编号',
- url: '/pages/devicesSearch/codeSearch',
- iconSrc: '../../static/workbench/fetchMaterialOutStore.png',
- },
-])
+// // 设备信息查询
+// const deviceList = ref([
+// {
+// title: '二维码',
+// url: '/pages/devicesSearch/qrSearch',
+// iconSrc: '../../static/workbench/fetchMaterialOutStore.png',
+// },
+// {
+// title: 'OCR',
+// url: '/pages/devicesSearch/ocrSearch',
+// iconSrc: '../../static/workbench/fetchMaterialOutStore.png',
+// },
+// {
+// title: '设备编号',
+// url: '/pages/devicesSearch/codeSearch',
+// iconSrc: '../../static/workbench/fetchMaterialOutStore.png',
+// },
+// ])
const onNavigateTo = (url) => {
uni.navigateTo({ url })
@@ -297,8 +307,8 @@ page {
.new-purchase {
background-color: #fff;
border-radius: 20rpx;
- padding: 32rpx 24rpx;
- margin-bottom: 24rpx;
+ padding: 20rpx 16rpx;
+ margin-bottom: 16rpx;
box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
display: flex;
flex-wrap: wrap;
@@ -311,8 +321,8 @@ page {
}
.title-text {
- margin-top: 20px;
- padding: 10px 0;
+ margin-top: 10px;
+ padding: 0px 0;
display: flex;
align-items: center;
// font-size: 14px;
@@ -335,7 +345,7 @@ page {
display: flex;
flex-direction: column;
align-items: center;
- padding: 24rpx 0;
+ padding: 4rpx 0;
transition: all 0.3s ease;
&:active {
@@ -345,9 +355,9 @@ page {
// 图标样式
image {
- width: 180rpx;
- height: 180rpx;
- margin-bottom: 16rpx;
+ width: 170rpx;
+ height: 170rpx;
+ margin-bottom: 6rpx;
}
// 文字样式
diff --git a/src/static/search.png b/src/static/search.png
new file mode 100644
index 0000000..aea1b72
Binary files /dev/null and b/src/static/search.png differ
diff --git a/src/static/searchModel/backRecord.png b/src/static/searchModel/backRecord.png
new file mode 100644
index 0000000..08003b8
Binary files /dev/null and b/src/static/searchModel/backRecord.png differ
diff --git a/src/static/searchModel/bindRecord.png b/src/static/searchModel/bindRecord.png
new file mode 100644
index 0000000..de01848
Binary files /dev/null and b/src/static/searchModel/bindRecord.png differ
diff --git a/src/static/searchModel/costRecord.png b/src/static/searchModel/costRecord.png
new file mode 100644
index 0000000..4283827
Binary files /dev/null and b/src/static/searchModel/costRecord.png differ
diff --git a/src/static/searchModel/electTag.png b/src/static/searchModel/electTag.png
new file mode 100644
index 0000000..2e95368
Binary files /dev/null and b/src/static/searchModel/electTag.png differ
diff --git a/src/static/searchModel/handOverRecord.png b/src/static/searchModel/handOverRecord.png
new file mode 100644
index 0000000..e6b4568
Binary files /dev/null and b/src/static/searchModel/handOverRecord.png differ
diff --git a/src/static/searchModel/infoRecord.png b/src/static/searchModel/infoRecord.png
new file mode 100644
index 0000000..83c197a
Binary files /dev/null and b/src/static/searchModel/infoRecord.png differ
diff --git a/src/static/searchModel/inventoryRecord.png b/src/static/searchModel/inventoryRecord.png
new file mode 100644
index 0000000..8e07b5a
Binary files /dev/null and b/src/static/searchModel/inventoryRecord.png differ
diff --git a/src/static/searchModel/leaseRecord.png b/src/static/searchModel/leaseRecord.png
new file mode 100644
index 0000000..d479d37
Binary files /dev/null and b/src/static/searchModel/leaseRecord.png differ
diff --git a/src/static/searchModel/outBoundRecord.png b/src/static/searchModel/outBoundRecord.png
new file mode 100644
index 0000000..69d3f90
Binary files /dev/null and b/src/static/searchModel/outBoundRecord.png differ
diff --git a/src/static/searchModel/partRecord.png b/src/static/searchModel/partRecord.png
new file mode 100644
index 0000000..c474826
Binary files /dev/null and b/src/static/searchModel/partRecord.png differ
diff --git a/src/static/searchModel/qrCode.png b/src/static/searchModel/qrCode.png
new file mode 100644
index 0000000..cb68194
Binary files /dev/null and b/src/static/searchModel/qrCode.png differ
diff --git a/src/static/searchModel/receptRecord.png b/src/static/searchModel/receptRecord.png
new file mode 100644
index 0000000..76203a7
Binary files /dev/null and b/src/static/searchModel/receptRecord.png differ
diff --git a/src/static/searchModel/reliefRecord.png b/src/static/searchModel/reliefRecord.png
new file mode 100644
index 0000000..adaaafc
Binary files /dev/null and b/src/static/searchModel/reliefRecord.png differ
diff --git a/src/static/searchModel/straightRecord.png b/src/static/searchModel/straightRecord.png
new file mode 100644
index 0000000..f93feeb
Binary files /dev/null and b/src/static/searchModel/straightRecord.png differ
diff --git a/src/static/searchSelected.png b/src/static/searchSelected.png
new file mode 100644
index 0000000..c599d88
Binary files /dev/null and b/src/static/searchSelected.png differ
diff --git a/src/static/work.png b/src/static/work.png
new file mode 100644
index 0000000..dddcfca
Binary files /dev/null and b/src/static/work.png differ
diff --git a/src/static/workSelected.png b/src/static/workSelected.png
new file mode 100644
index 0000000..c2d9c0c
Binary files /dev/null and b/src/static/workSelected.png differ
diff --git a/src/static/workbench/boxHandOver.png b/src/static/workbench/boxHandOver.png
new file mode 100644
index 0000000..acd5f67
Binary files /dev/null and b/src/static/workbench/boxHandOver.png differ
diff --git a/src/static/workbench/boxManage.png b/src/static/workbench/boxManage.png
new file mode 100644
index 0000000..deda52a
Binary files /dev/null and b/src/static/workbench/boxManage.png differ
diff --git a/src/static/workbench/boxRecept.png b/src/static/workbench/boxRecept.png
new file mode 100644
index 0000000..253f489
Binary files /dev/null and b/src/static/workbench/boxRecept.png differ
diff --git a/src/static/workbench/partApprove.png b/src/static/workbench/partApprove.png
new file mode 100644
index 0000000..a471e77
Binary files /dev/null and b/src/static/workbench/partApprove.png differ
diff --git a/src/static/workbench/partIn.png b/src/static/workbench/partIn.png
new file mode 100644
index 0000000..a6ad77a
Binary files /dev/null and b/src/static/workbench/partIn.png differ
diff --git a/src/static/yeWuBanLi.png b/src/static/yeWuBanLi.png
new file mode 100644
index 0000000..b204bac
Binary files /dev/null and b/src/static/yeWuBanLi.png differ
diff --git a/src/static/yeWuBanLiSelected.png b/src/static/yeWuBanLiSelected.png
new file mode 100644
index 0000000..cca18f8
Binary files /dev/null and b/src/static/yeWuBanLiSelected.png differ
diff --git a/src/utils/http.js b/src/utils/http.js
index 9d5651a..a6e8491 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -9,7 +9,7 @@ const ENV = process.env.NODE_ENV
// export const baseURL = ENV === 'development' ? 'http://192.168.0.244:18580' : 'http://192.168.0.244:18580'//测试
// export const baseURL = ENV === 'development' ? 'http://36.33.26.201:19988/prod-api/' : 'http://36.33.26.201:19988/prod-api/'//生产
// export const baseURL = ENV === 'development' ? 'http://192.168.0.234:18080' : '***'
-export const baseURL = ENV === 'development' ? 'http://192.168.2.247:18080' : 'http://192.168.2.247:18080'//马
+export const baseURL = ENV === 'development' ? 'http://192.168.2.23:18080' : 'http://192.168.2.23:18080'//马
// export const baseURL = ENV === 'development' ? '/api' : '***'
// **********OCR识别为NVUE文件页面请求URL需要同步配置**********