diff --git a/src/api/http/http-api.js b/src/api/http/http-api.js
index 4043d9e..23d7aa4 100644
--- a/src/api/http/http-api.js
+++ b/src/api/http/http-api.js
@@ -198,6 +198,16 @@ export default {
name: '导出单个巷道',
method: 'GET'
},
+ nextOne: {
+ url: '/stock/nextOne',
+ name: '下一个盘点',
+ method: 'POST'
+ },
+ allStockCheck: {
+ url: '/stock/allStockCheck',
+ name: '全部盘点',
+ method: 'POST'
+ },
exportAllStock: {
url: '/stock/exportAll',
name: '导出所有巷道',
diff --git a/src/plugins/antd.js b/src/plugins/antd.js
index 892ed8d..94b8f30 100644
--- a/src/plugins/antd.js
+++ b/src/plugins/antd.js
@@ -15,6 +15,7 @@ import {
Breadcrumb,
Icon,
Tree,
+ Timeline,
message,
result,
Modal,
@@ -50,6 +51,7 @@ Vue.use(Button);
Vue.use(Breadcrumb);
Vue.use(Icon);
Vue.use(Tree);
+Vue.use(Timeline);
try {
Vue.use(result);
}catch (e){
diff --git a/src/views/alarmVideos/alarmLog.vue b/src/views/alarmVideos/alarmLog.vue
index b88205a..3efc473 100644
--- a/src/views/alarmVideos/alarmLog.vue
+++ b/src/views/alarmVideos/alarmLog.vue
@@ -3,8 +3,11 @@
@@ -48,8 +49,10 @@
{{ getRandom(index, latticeColumn, nums.column, total.column) }}
-
-
+
+
+
+
@@ -86,7 +89,7 @@ export default {
default: () => {
return {
row: 10,
- column: 15
+ column: 30
}
}
},
@@ -217,10 +220,18 @@ export default {
getStatusBg(row,column,status) {
var dom = document.getElementById(this.direction+"-"+this.side+"-"+row+'-'+column);
- var color = status == 1 ?'#d81e06': (status == 2|| status == 3) ? '#1afa29': '#bfbfbf';
+ var color;
+ if(status == -1){
+ color = '#f2ed48'
+ }else if(status == 2|| status == 3){
+ color = '#1afa29'
+ }else if(status == 1){
+ color = '#d81e06'
+ }else{
+ color = '#bfbfbf'
+ }
dom.style.background = color
},
-
getStatus(){
var columnTab = []
@@ -246,10 +257,12 @@ export default {
columnTabs: columnTab
}
}).then(res => {
+ console.log(this.status.column)
+ console.log(this.status.row)
if(res.code == 200){
if(res.data.stocks){
for(let a of res.data.stocks){
- this.getStatusBg(a.row,a.column,a.status)
+ this.getStatusBg(a.row,a.column,a.viewStatus)
}
}
diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue
index c31dd21..308323f 100644
--- a/src/views/checkManage/checkOperation.vue
+++ b/src/views/checkManage/checkOperation.vue
@@ -7,8 +7,11 @@
-
-
- {{streetName}}-{{this.direction == 1?"左":"右"}}-{{this.side == 1?"浅":"深"}}-{{row}}层-{{column}}列
+
+ 位置:
+
+
+ {{checkObj.streetName}}-{{checkObj.direction == 1?"左":"右"}}-{{checkObj.side == 1?"浅":"深"}}-{{checkObj.row}}层-{{checkObj.column}}列
-
@@ -90,6 +93,12 @@
@click="checkfalse(checkObj.row,checkObj.column,checkObj.shelveId,index)"
>核对错误
+
+ 下一个盘点
+
@@ -107,6 +116,7 @@
diff --git a/src/views/historyMonitoring/index.vue b/src/views/historyMonitoring/index.vue
index 4ac3354..4bdef1e 100644
--- a/src/views/historyMonitoring/index.vue
+++ b/src/views/historyMonitoring/index.vue
@@ -3,7 +3,20 @@