diff --git a/README.md b/README.md index 912a488..8adcaef 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## 垛机监控系统 +# 垛机监控系统 ### Project setup @@ -30,7 +30,9 @@ See [Configuration Reference](https://cli.vuejs.org/config/). #### 2、简介： 垛机监控系统是一款TOB的项目，由哲合科技有限公司承担研发，主要为甲方在仓储方面的出入库过程中，提供拍照取证，实时录像，盘点管理等功能。项目主要涵盖实时视频流、历史数据、盘点管理、巷道管理、球机管理、个人中心等。基于vue-cli3.x + Ant Design Vue搭建,rtsp视频流采用VLC插件结合Firefox火狐浏览器运行的方式播放，因VLC支持性问题需回退Firefox火狐浏览器版本至51版之前，详情请见 [VLC开发文档](https://wiki.videolan.org/Documentation:WebPlugin/#Introduction:_Building_Web_pages_with_Video) -#### 3、测试环境地址：暂无(详情请看下面注释) 测试环境账号：暂无(详情请看下面注释) +#### 3、测试环境地址： + +暂无(详情请看下面注释) 测试环境账号：暂无(详情请看下面注释) #### 4、项目打包命令：npm run build（环境未作区分，详情请看下面注释） >注释：因项目采用直接打包给后端，后端再配置nginx的形式，接口统一走的ip地址代理，并非域名代理，需后端本地起服务内网访问，前端与其连接在同一宽带网段中即可请求接口。所以暂未区分开发环境dev、测试环境test、生产环境prod等，相应的也无测试环境地址和账号一说，直接ip地址访问（具体ip地址询问后端） diff --git a/src/api/http/http-api.js b/src/api/http/http-api.js index 260e171..8adf18a 100644 --- a/src/api/http/http-api.js +++ b/src/api/http/http-api.js @@ -106,6 +106,12 @@ export default { name: '分类列表', method: 'POST' }, + //盘点管理输入框搜索时联想用 + getCategoryList: { + url: '/category/list', + name: '分类列表', + method: 'GET' + }, addCategory: { url: '/category', name: '新增分类', @@ -136,5 +142,20 @@ export default { name: '导出所有巷道', method: 'GET' }, + stockCheckCorrect: { + url: '/stock/checkCorrect', + name: '人工复核正确', + method: 'POST' + }, + stockCheckByMan: { + url: '/stock/checkByMan', + name: '人工复核', + method: 'POST' + }, + getStockpage: { + url: '/stock/page', + name: '库存列表', + method: 'POST' + }, } diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue index b2b983c..9f0e7f3 100644 --- a/src/views/checkManage/checkOperation.vue +++ b/src/views/checkManage/checkOperation.vue @@ -31,48 +31,70 @@ -
-

工单号：{{checkObj.orderNum}}

-
-
- -

操作前照片

-
-
- -

操作后照片

-
-
-
-
-

系统登记品规：{{checkObj.category}}

-

系统登记数量：{{checkObj.count}}

-
-
- 未核对 -
-
- 已核对：核对正确 -
-
- 已核对：核对错误 -
-
- 核对错误 - 核对正确 - -
-
-
+
+

工单号：{{checkObj.orderNum}}

+
+
+ +

操作前照片

+
+
+ +

操作后照片

+
+
+
+
+

系统登记品规：{{checkObj.category}}

+

系统登记数量：{{checkObj.count}}

+
+
+ 未核对 +
+
+ 已核对：核对错误 +
+
+ 已核对：核对正确 +
+
+ 人工复核 + + 核对正确 + +
+
+ 核对错误 + + 核对正确 + +
+
+
@@ -84,9 +106,17 @@
+
diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue index d1863c6..ef9b93f 100644 --- a/src/views/checkManage/index.vue +++ b/src/views/checkManage/index.vue @@ -15,42 +15,46 @@ 未盘点 - - - +
-
-
- -
-
-
+
+ +
+
+
+ + + {{row}}-{{column}} + +
-
{{columnItem.row}}-{{columnItem.column}}
+
- - - - > - 外 - - - 内 - - -
+
+ + + + 外 + + + 内 + +
+
@@ -63,17 +67,23 @@
-
-
- -
-
-
+
+ +
+
+
+ + + + {{row}}-{{column}} + +
-
{{columnItem.row}}-{{columnItem.column}}
@@ -81,17 +91,17 @@
- - - - 外 - - - 内 - - -
+
+ + + + 外 + + + 内 + +
@@ -227,7 +237,8 @@ export default { .line { display: flex; transform: rotateX(180deg); //两次垂直镜像翻转让原本由上到下排列的div 更改为由下到上 - .ele { + + .el { width: 46px; height: 25px; margin: 1px 2px; @@ -235,6 +246,15 @@ export default { border-radius: 4px; cursor: pointer; font-size: 14px; + position: relative; + + .default { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + } } } } diff --git a/src/views/checkManage/model.vue b/src/views/checkManage/model.vue new file mode 100644 index 0000000..0de2397 --- /dev/null +++ b/src/views/checkManage/model.vue @@ -0,0 +1,262 @@ + + + diff --git a/src/views/productSpecManage/index.vue b/src/views/productSpecManage/index.vue index 86eb051..b1bd005 100644 --- a/src/views/productSpecManage/index.vue +++ b/src/views/productSpecManage/index.vue @@ -55,13 +55,8 @@ import Model from "./model.vue" import {importCategoryExcelUrl} from "@/api/importExcel"; const columns = [ { - title: '序号', - // dataIndex: 'id', - customRender: (text, record, index) => { - return ( - (record.pageNumber - 1) * 10 + index + 1 - ) - } + title: 'ID', + dataIndex: 'id', }, { title: '品类', diff --git a/src/views/repertoryManage/index.vue b/src/views/repertoryManage/index.vue index 6bbabab..27cf0e9 100644 --- a/src/views/repertoryManage/index.vue +++ b/src/views/repertoryManage/index.vue @@ -22,6 +22,11 @@ :pagination="pagination" @change="handleGetCameraIoList" > + + +
@@ -31,33 +36,24 @@ import { importExcelUrl } from "@/api/importExcel"; const columns = [ { - title: '序号', - // dataIndex: 'id', - customRender: (text, record, index) => { - return ( - (record.pageNumber - 1) * 10 + index + 1 - ) - } - }, - { - title: '商品名', - dataIndex: 'name', + title: 'ID', + dataIndex: 'id', }, { title: '品规', - dataIndex: 'pro', + dataIndex: 'category', }, { title: '数量', - dataIndex: 'num', + dataIndex: 'count', }, { title: '货位', - dataIndex: 'pos', + scopedSlots: {customRender: 'actions'} }, { title: '导入时间', - dataIndex: 'updateTime', + dataIndex: 'exportTime', }, ]; export default { @@ -113,22 +109,22 @@ export default { this.request(); }, request(){ - // this.$api.httpApi.getCameraIoList({ - // data: { - // page:this.pageNum, - // size:this.pageSize, - // } - // }).then(res => { - // const pagination = { ...this.pagination }; - // pagination.total = res.data.total; - // this.data = res.data.list; - // this.pagination = pagination; - // res.data.list.forEach((value,index) => { - // value.pageNumber = this.pagination.current - // }); - // }).catch(err => { - // - // }); + this.$api.httpApi.getStockpage({ + data: { + pageNum: this.pageNum, + pageSize: this.pageSize, + } + }).then(res => { + const pagination = {...this.pagination}; + pagination.total = res.data.total; + this.data = res.data; + this.pagination = pagination; + res.data.list.forEach((value, index) => { + value.pageNumber = this.pagination.current + }); + }).catch(err => { + + }); }, }, components:{