upright
/
duoji-frontend
mirror of https://gitlab.hzleaper.com:81/duoji/duoji-frontend.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

盘点剩余功能完善0329

Browse Source
merge-requests/1/head
张鑫 5 years ago
parent 45952b0413
commit 8702df4f10
9 changed files with 200 additions and 281 deletions
Show Stats Download Patch File Download Diff File

160
package-lock.json generated
Unescape Escape View File

@ -1859,16 +1859,6 @@
"integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==",
"dev": true "dev": true
}, },
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"cacache": { "cacache": {
"version": "13.0.1", "version": "13.0.1",
"resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz", "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz",
@ -1895,34 +1885,6 @@
"unique-filename": "^1.1.1" "unique-filename": "^1.1.1"
} }
}, },
"chalk": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true,
"optional": true
},
"debug": { "debug": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@ -1953,25 +1915,6 @@
"path-exists": "^4.0.0" "path-exists": "^4.0.0"
} }
}, },
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"optional": true
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"locate-path": { "locate-path": {
"version": "5.0.0", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@ -2042,16 +1985,6 @@
"minipass": "^3.1.1" "minipass": "^3.1.1"
} }
}, },
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
},
"terser-webpack-plugin": { "terser-webpack-plugin": {
"version": "2.3.8", "version": "2.3.8",
"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz", "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz",
@ -2068,18 +2001,6 @@
"terser": "^4.6.12", "terser": "^4.6.12",
"webpack-sources": "^1.4.3" "webpack-sources": "^1.4.3"
} }
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.1.1",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.1.tgz",
"integrity": "sha512-wz/+HFg/3SBayHWAlZXARcnDTl3VOChrfW9YnxvAweiuyKX/7IGx1ad/4yJHmwhgWlOVYMAbTiI7GV8G33PfGQ==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
}
} }
} }
}, },
@ -12696,6 +12617,87 @@
} }
} }
}, },
"vue-loader-v16": {
"version": "npm:vue-loader@16.2.0",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz",
"integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true,
"optional": true
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"optional": true
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
}
}
},
"vue-ref": { "vue-ref": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/vue-ref/-/vue-ref-2.0.0.tgz", "resolved": "https://registry.npmjs.org/vue-ref/-/vue-ref-2.0.0.tgz",

148
s RETURN)
Unescape Escape View File

@ -1,148 +0,0 @@
3d3669a (HEAD -> zhehe/dev, zhehe/dev) HEAD@{0}: checkout: moving from zhehe/dev to zhehe/dev
3d3669a (HEAD -> zhehe/dev, zhehe/dev) HEAD@{1}: checkout: moving from jiafang/dev to zhehe/dev
284d4ac (jiafang/dev, jiafang/dev) HEAD@{2}: pull --no-commit jiafang dev: Fast-forward
e6ccb6f HEAD@{3}: checkout: moving from zhehe/dev to jiafang/dev
3d3669a (HEAD -> zhehe/dev, zhehe/dev) HEAD@{4}: commit: ！
1a2520a HEAD@{5}: reset: moving to 1a2520aa8af0fcb5847057019614f6adf15fb525
1a2520a HEAD@{6}: reset: moving to 1a2520aa8af0fcb5847057019614f6adf15fb525
284d4ac (jiafang/dev, jiafang/dev) HEAD@{7}: revert: Revert "盘点剩余功能完善"
1a2520a HEAD@{8}: commit: 盘点剩余功能完善
5c1c27a HEAD@{9}: commit: 历史数据 告警视频添加搜索重置功能，以及盘点操作逻辑变动
dc50c3e HEAD@{10}: commit: 品规、库存页面新增下载模板功能
bbbc322 HEAD@{11}: commit: 品规管理、库存管理 table第一列文案渲染更改为序号
e6639fe HEAD@{12}: commit: 告警日志页面接口联调及其他一些页面布局优化
1031fc0 HEAD@{13}: commit: 历史回放页面图片列宽自适应
d52f568 HEAD@{14}: commit: 历史数据分页失效问题
5a7f2bf HEAD@{15}: commit: 库存导入接口联调
01a79f1 HEAD@{16}: commit: 库存列表接口联调，盘点管理页面逻辑变动
e6ccb6f HEAD@{17}: checkout: moving from jiafang/dev to zhehe/dev
e6ccb6f HEAD@{18}: merge zhehe/dev: Fast-forward
4fa236e HEAD@{19}: checkout: moving from zhehe/master to jiafang/dev
5a4e718 (zhehe/master, zhehe/master) HEAD@{20}: merge zhehe/dev: Merge made by the 'recursive' strategy.
8c4b241 HEAD@{21}: checkout: moving from zhehe/dev to zhehe/master
e6ccb6f HEAD@{22}: commit: 盘点操作页接口联调及巷道导出接口联调
43819d6 HEAD@{23}: commit: 盘点管理首页接口联调
4fa236e HEAD@{24}: checkout: moving from jiafang/dev to zhehe/dev
4fa236e HEAD@{25}: merge zhehe/dev: Fast-forward
ea7b01f HEAD@{26}: checkout: moving from zhehe/dev to jiafang/dev
4fa236e HEAD@{27}: checkout: moving from zhehe/master to zhehe/dev
8c4b241 HEAD@{28}: merge zhehe/dev: Merge made by the 'recursive' strategy.
30248b7 HEAD@{29}: checkout: moving from zhehe/dev to zhehe/master
4fa236e HEAD@{30}: checkout: moving from zhehe/master to zhehe/dev
30248b7 HEAD@{31}: checkout: moving from zhehe/dev to zhehe/master
4fa236e HEAD@{32}: commit: md
800c48f HEAD@{33}: checkout: moving from zhehe/master to zhehe/dev
30248b7 HEAD@{34}: merge zhehe/dev: Merge made by the 'recursive' strategy.
3d8428a HEAD@{35}: checkout: moving from zhehe/dev to zhehe/master
800c48f HEAD@{36}: pull zhehe dev: Merge made by the 'recursive' strategy.
ea7b01f HEAD@{37}: checkout: moving from jiafang/dev to zhehe/dev
ea7b01f HEAD@{38}: pull jiafang dev: Fast-forward
d7ec026 HEAD@{39}: checkout: moving from zhehe/dev to jiafang/dev
ea7b01f HEAD@{40}: commit: 品规管理导入接口联调
7f42669 HEAD@{41}: commit: 品规管理新增和编辑接口联调
6bd2e4c HEAD@{42}: commit: 品规管理列表和删除接口联调
0aea6f7 HEAD@{43}: commit: 品规管理新增编辑增加格式提示
bebdc08 HEAD@{44}: commit: README.md错误文案矫正
d7ec026 HEAD@{45}: checkout: moving from zhehe/master to zhehe/dev
3d8428a HEAD@{46}: pull zhehe master: Fast-forward
9871cb5 HEAD@{47}: checkout: moving from zhehe/dev to zhehe/master
d7ec026 HEAD@{48}: checkout: moving from zhehe/master to zhehe/dev
9871cb5 HEAD@{49}: checkout: moving from zhehe/dev to zhehe/master
d7ec026 HEAD@{50}: checkout: moving from jiafang/dev to zhehe/dev
d7ec026 HEAD@{51}: checkout: moving from zhehe/dev to jiafang/dev
d7ec026 HEAD@{52}: checkout: moving from jiafang/dev to zhehe/dev
d7ec026 HEAD@{53}: checkout: moving from zhehe/dev to jiafang/dev
d7ec026 HEAD@{54}: checkout: moving from zhehe/master to zhehe/dev
9871cb5 HEAD@{55}: checkout: moving from zhehe/dev to zhehe/master
d7ec026 HEAD@{56}: checkout: moving from dev to zhehe/dev
d7ec026 HEAD@{57}: commit: ！
a3d5876 HEAD@{58}: commit: 盘点管理视图搭建
ef919ce HEAD@{59}: commit: 解决实时监控vlc崩溃问题，将vlc挂载至ref上再做操作，v-if以及ref混用需this.$nextTick(() => {})处理（注意：vlc一定要如数清空，且在路由离开时的钩子函数里面清）
ad99550 HEAD@{60}: commit: 盘点管理select筛选巷道逻辑完善
de9b827 HEAD@{61}: commit: 盘点管理列表展示巷道静态数据
b6c07fd HEAD@{62}: commit: 球机管理测试和配置由model遮罩更改为router change page方式
d947d93 HEAD@{63}: commit: 球机管理>>配置>>指令写入覆盖入参增加code字段
62e6582 HEAD@{64}: commit: 告警管理model视频弹框组件注册
99d456a HEAD@{65}: commit: 语法检查格式修复
42db7e0 HEAD@{66}: commit: 告警管理接口联调，plc异常页面构建接口联调，实时视频流页面bug修复
c12238e HEAD@{67}: commit: PLC实时状态接口联调
3012bcd HEAD@{68}: commit: README.md文档补全
9fa28b4 HEAD@{69}: commit: 盘点管理tag标签更换为div（解决由于过多tag组件的使用路由加载吃力延迟问题）
c7785a3 HEAD@{70}: commit: 实时视频流页面全屏方式由model组件更为路由跳转形式（解决vlc报错问题）
1c5f22e HEAD@{71}: commit: vxg更换成vlc
4cd91b8 (jiafang/backups) HEAD@{72}: merge backups: Fast-forward
a1030b4 HEAD@{73}: checkout: moving from backups to dev
4cd91b8 (jiafang/backups) HEAD@{74}: commit: 盘点管理细节修改
a1030b4 HEAD@{75}: checkout: moving from dev to backups
a1030b4 HEAD@{76}: checkout: moving from backups to dev
a1030b4 HEAD@{77}: checkout: moving from dev to backups
a1030b4 HEAD@{78}: commit: ~
372fa1c HEAD@{79}: commit: 解决报错
ac29780 HEAD@{80}: commit: 解决报错
1548105 HEAD@{81}: commit: 历史监控页查看视频 video组件引用
52130e6 HEAD@{82}: commit: 历史监控页查看视频 video组件引用
c0ce653 HEAD@{83}: commit: 历史监控页数据重组，新增v-viewer图片预览插件~
f49fa35 HEAD@{84}: commit: 历史监控页数据重组，新增v-viewer图片预览插件
ce8af76 HEAD@{85}: commit: 历史数据接口联调，slot插槽两种用法详见roadwayManage/index和historyMonitoring/index中的slot
2b8d4ab HEAD@{86}: commit: 盘点管理视图构建（报错解决）
74a135d HEAD@{87}: commit: 盘点管理视图构建
00ce7bf HEAD@{88}: commit: IO配置表页面增添返回上一页操作
094a1d7 HEAD@{89}: commit: 实时视频流首页vxg视频蓝框去除
7538484 HEAD@{90}: commit: 库存管理及model页布局构建
27fac4e HEAD@{91}: commit: 品规管理及model页布局构建
21e881b HEAD@{92}: commit: 球机管理=>球机配置列表、转至配置点接口联调
767ccd2 HEAD@{93}: commit: 球机管理=>球机配置列表、指令写入、覆盖接口联调
6764292 HEAD@{94}: commit: 球机IO表配置数据增（包含Excel文件导入）、删、改、查接口联调
4918f7f HEAD@{95}: commit: 球机IO表页面构建
3284f47 HEAD@{96}: commit: 告警视频路由配置，页面构建！
a327c65 HEAD@{97}: commit: 球机管理测试rtsp流视频功能完善（附新增编辑逻辑微调）
00133f3 HEAD@{98}: commit: 历史数据页面tables字段按原型更新
003ca20 HEAD@{99}: commit: 去掉展开收起注释
e27da0b HEAD@{100}: commit: realTimeMonitoring页面beforeRouteLeave路由守卫增加清空vxgplayer实例方法（先清空后跳转）
0c356c5 HEAD@{101}: commit: VXG pnacl下nmf引用失效问题修复，需放在public文件夹下
e7a9850 HEAD@{102}: commit: jsMpeg改为VXG渲染rtsp流
c534076 HEAD@{103}: commit: 部分代码更新
acfccfd HEAD@{104}: commit: Ant Design-tags组件按需注册，paramBehind参数更改。
5b2b747 HEAD@{105}: commit: 1、球机列表没有按四个排列bug修复
52edf8e HEAD@{106}: commit: ws地址修改'ws://127.0.0.1:9007...
e21f2de HEAD@{107}: commit: 实时视频流index页全局刷新改为provide+inject组合局部刷新·
28ff32b HEAD@{108}: commit: 实时视频流index页全局刷新改为provide+inject组合局部刷新
7c66664 HEAD@{109}: commit: 实时视频流增加计时器执行刷新操作，球机编辑渲染字段逻辑更改
bd5335a HEAD@{110}: commit: 球机操作鼠标按下抬起交互反馈icon交替完善
5726546 HEAD@{111}: commit: 实时视频流index页宽高比改为400*225
b852940 HEAD@{112}: commit: 球机操作按钮移入换成手标志
01faadc HEAD@{113}: commit: 球机控制变焦、光圈+ 或 - 接口联调
ded9e9c HEAD@{114}: checkout: moving from 1.0.0 to dev
6c36168 HEAD@{115}: checkout: moving from dev to 1.0.0
ded9e9c HEAD@{116}: commit: 控制后台名称及菜单栏部分名称修改、变倍接口联调
0bf45ec HEAD@{117}: commit: 球机操作控制上、下、左上、左下、右上、右下接口联调
5c91e4b HEAD@{118}: commit: 球机操作左转和右转的开始、停止接口联调
a31ae9d HEAD@{119}: commit: 实时监控操作页面关闭事件处理
d1f35ba HEAD@{120}: commit: 实时监控操作页面构图
e20abdc HEAD@{121}: commit: 实时监控jsMPEG实现实时画面
1ece322 HEAD@{122}: commit: 子组件监听父组件值变化的watch监听更新注释，logo间距微调
0c5c411 HEAD@{123}: commit: 默认首页渲染更改为实时监控
ee1d64e HEAD@{124}: commit: 实时监控及历史监控包名修改，icon更换
7c39f3b HEAD@{125}: commit: 无用注释等删除及部分改动
dae2132 HEAD@{126}: commit: 历史监控包名修改
42881e7 HEAD@{127}: commit: 新增巷道model的selete框数据更改为球机请求列表后的数据
ebaa6e6 HEAD@{128}: commit: 删除球机API配置、接口联调
8e10f09 HEAD@{129}: commit: 编辑球机API配置、接口联调
0049c77 HEAD@{130}: commit: 新增球机API配置、接口联调
35ae290 HEAD@{131}: commit: 获取球机管理列表API配置、接口联调
94615bb HEAD@{132}: commit: 球机管理页面构建、路由配置
27743f1 HEAD@{133}: commit: 巷道管理删除接口联调
8e016af HEAD@{134}: commit: 更新注释
4f4329d HEAD@{135}: commit: 巷道管理新增巷道、编辑巷道接口联调
fae3c1c HEAD@{136}: checkout: moving from 1.0.0 to dev
6c36168 HEAD@{137}: checkout: moving from dev to 1.0.0
fae3c1c HEAD@{138}: commit: 巷道管理新增add、编辑edit，父子组件通信控制显隐model弹框
6c36168 HEAD@{139}: checkout: moving from 1.0.0 to dev
6c36168 HEAD@{140}: checkout: moving from dev to 1.0.0
6c36168 HEAD@{141}: checkout: moving from 1.0.0 to dev
6c36168 HEAD@{142}: merge dev: Fast-forward
37a58ef (jiafang/1.0.0) HEAD@{143}: checkout: moving from dev to 1.0.0
6c36168 HEAD@{144}: commit: 1、api配置文件位置规则修改至src/api/http-api.js,规则配置详见axios.js文件。
42e5873 HEAD@{145}: commit: layouts布局重构！
37a58ef (jiafang/1.0.0) HEAD@{146}: checkout: moving from 1.0.0 to dev
37a58ef (jiafang/1.0.0) HEAD@{147}: clone: from https://gitlab.hzleaper.com:81/duoji/duoji-frontend.git

31
src/views/alarmVideos/alarmLog.vue
Unescape Escape View File

@ -15,7 +15,12 @@
</a-col> </a-col>
<a-col :span="10"> <a-col :span="10">
<a-form-item class="ageInput" label="告警时间"> <a-form-item class="ageInput" label="告警时间">
<a-range-picker @change="onTimeChange" v-model="time"> <a-range-picker
@change="onTimeChange"
v-model="time"
format="YYYY-MM-DD HH:mm:ss"
:show-time="{defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],}"
>
<a-icon slot="suffixIcon" type="calendar"/> <a-icon slot="suffixIcon" type="calendar"/>
</a-range-picker> </a-range-picker>
</a-form-item> </a-form-item>
@ -38,7 +43,7 @@
<span slot="streetType" slot-scope="text"> <span slot="streetType" slot-scope="text">
{{ text === null ? '-' : text === 0 ? '单伸' : '双伸' }} {{ text === null ? '-' : text === 0 ? '单伸' : '双伸' }}
</span> </span>
<span slot="pics" slot-scope="text" style="width:auto"> <span slot="pics" slot-scope="text" style="width:auto">
<template> <template>
<span v-if="text.pics" style="height:100%;"> <span v-if="text.pics" style="height:100%;">
@ -65,7 +70,7 @@
查看视频 查看视频
</a-button> </a-button>
<span v-else> <span v-else>
--
</span> </span>
</span> </span>
<span slot="videoPath2" slot-scope="text"> <span slot="videoPath2" slot-scope="text">
@ -73,7 +78,7 @@
查看视频 查看视频
</a-button> </a-button>
<span v-else> <span v-else>
--
</span> </span>
</span> </span>
</a-table> </a-table>
@ -87,11 +92,15 @@
<script> <script>
import {imgUrl, videoUrl} from "@/api/importExcel"; import {imgUrl, videoUrl} from "@/api/importExcel";
import Model from "./model.vue" import Model from "./model.vue"
import moment from 'moment';
export default { export default {
name: "alarmLog", name: "alarmLog",
data() { data() {
return { return {
queryParam: {}, queryParam: {
startTime: moment().subtract(1, "weeks").format('YYYY-MM-DD HH:mm:ss'), //当前时间的前一个星期时间
endTime: moment().format('YYYY-MM-DD HH:mm:ss')
},
time:[], time:[],
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
@ -149,6 +158,14 @@ export default {
console.log(this.imgUrl) console.log(this.imgUrl)
}, },
methods: { methods: {
moment,
range(start, end) {
const result = [];
for (let i = start; i < end; i++) {
result.push(i);
}
return result;
},
getStreetList(){ getStreetList(){
this.$api.httpApi.getStreetList({ this.$api.httpApi.getStreetList({
data: { data: {
@ -211,8 +228,8 @@ export default {
this.queryParam.endTime = "" this.queryParam.endTime = ""
}, },
reset() { reset() {
this.queryParam.startTime = "" this.queryParam.startTime = moment().subtract(1, "weeks").format('YYYY-MM-DD HH:mm:ss'), //当前时间的前一个星期时间
this.queryParam.endTime = "" this.queryParam.endTime = moment().format('YYYY-MM-DD HH:mm:ss')
this.queryParam.streetId = 0 this.queryParam.streetId = 0
this.time = [] this.time = []
this.handleGetalarmLog() this.handleGetalarmLog()

27
src/views/alarmVideos/index.vue
Unescape Escape View File

@ -5,8 +5,13 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="5" style="text-align: left"> <a-col :span="5" style="text-align: left">
<a-form-item label="时间"> <a-form-item label="时间">
<a-range-picker @change="onTimeChange" v-model="time" <a-range-picker @change="onTimeChange"
format="YYYY-MM-DD HH:mm"> v-model="time"
format="YYYY-MM-DD HH:mm"
:show-time="{
defaultValue: [moment('00:00', 'HH:mm'), moment('23:59', 'HH:mm')],
}"
>
<a-icon slot="suffixIcon" type="calendar"/> <a-icon slot="suffixIcon" type="calendar"/>
</a-range-picker> </a-range-picker>
</a-form-item> </a-form-item>
@ -53,6 +58,7 @@
<script> <script>
import Model from "./model.vue" import Model from "./model.vue"
import {videoUrl} from "@/api/importExcel"; import {videoUrl} from "@/api/importExcel";
import moment from 'moment';
export default { export default {
name: "historyMonitoring", name: "historyMonitoring",
components: { components: {
@ -63,7 +69,10 @@ export default {
return { return {
labelCol: { span: 6 }, labelCol: { span: 6 },
wrapperCol: { span: 18 }, wrapperCol: { span: 18 },
queryParam: {}, queryParam: {
startTime: moment().subtract(1, "days").format('YYYY-MM-DD HH:mm:ss'), //当前时间的前一个天时间
endTime: moment().format('YYYY-MM-DD HH:mm:ss')
},
time:[], time:[],
pageNum:1, pageNum:1,
pageSize:10, pageSize:10,
@ -109,6 +118,14 @@ export default {
this.handleGetalarmList() this.handleGetalarmList()
}, },
methods: { methods: {
moment,
range(start, end) {
const result = [];
for (let i = start; i < end; i++) {
result.push(i);
}
return result;
},
handleSearch(){ handleSearch(){
console.log(this.queryParam) console.log(this.queryParam)
this.handleGetalarmList() this.handleGetalarmList()
@ -159,8 +176,8 @@ export default {
this.vid = data this.vid = data
}, },
reset() { reset() {
this.queryParam.startTime = "" this.queryParam.startTime = moment().subtract(1, "days").format('YYYY-MM-DD HH:mm:ss')
this.queryParam.endTime = "" this.queryParam.endTime = moment().format('YYYY-MM-DD HH:mm:ss')
this.time = [] this.time = []
this.handleGetalarmList() this.handleGetalarmList()
}, },

18
src/views/checkManage/checkOperation.vue
Unescape Escape View File

@ -37,7 +37,7 @@
</a-select> </a-select>
</div> </div>
<div v-if="JSON.stringify(checkObj) !== '{}'"> <div v-if="checkObj.id">
<div v-for="(key,value) in checkList" :key="value"> <div v-for="(key,value) in checkList" :key="value">
<div v-if="checkObj.shelveId == value"> <div v-if="checkObj.shelveId == value">
<!--{{value}}{{key}}--> <!--{{value}}{{key}}-->
@ -160,7 +160,7 @@
<div class="status-btn"> <div class="status-btn">
<a-button class="btn" <a-button class="btn"
type="danger" type="danger"
@click="showModel(index)" @click="showModel({},index)"
>人工复核 >人工复核
</a-button> </a-button>
<a-button class="btn" <a-button class="btn"
@ -318,6 +318,7 @@ export default {
console.log(value) console.log(value)
this.select = value this.select = value
this.id = value this.id = value
console.log(JSON.stringify(this.checkObj))
this.getStreetList() this.getStreetList()
for (var i = 0; i < this.listData.length; i++) { for (var i = 0; i < this.listData.length; i++) {
console.log(this.listData[i]) console.log(this.listData[i])
@ -325,18 +326,18 @@ export default {
if (this.listData[i].leftShelveId) { if (this.listData[i].leftShelveId) {
this.shelveId = this.listData[i].leftShelveId this.shelveId = this.listData[i].leftShelveId
this.selectType = 'left' this.selectType = 'left'
this.selectType2 = 'out' this.selectType2 = 'none'
this.getStockInfo(1, 1, this.listData[i].leftShelveId) this.getStockInfo(1, 1, this.shelveId)
} else if (this.listData[i].leftInsideShelveId) { } else if (this.listData[i].leftInsideShelveId) {
this.shelveId = this.listData[i].leftInsideShelveId this.shelveId = this.listData[i].leftInsideShelveId
this.selectType = 'left' this.selectType = 'left'
this.selectType2 = 'none' this.selectType2 = 'inside'
this.getStockInfo(1, 1, this.listData[i].leftInsideShelveId) this.getStockInfo(1, 1, this.shelveId)
} else if (this.listData[i].leftOutsideShelveId) { } else if (this.listData[i].leftOutsideShelveId) {
this.shelveId = this.listData[i].leftOutsideShelveId this.shelveId = this.listData[i].leftOutsideShelveId
this.selectType = 'left' this.selectType = 'left'
this.selectType2 = 'none' this.selectType2 = 'out'
this.getStockInfo(1, 1, this.listData[i].leftOutsideShelveId) this.getStockInfo(1, 1, this.shelveId)
} }
@ -517,6 +518,7 @@ export default {
flex-direction: column; flex-direction: column;
font-size: 17px; font-size: 17px;
height: 400px; height: 400px;
margin-right: 10px;
img { img {
height: 100% height: 100%
} }

12
src/views/checkManage/index.vue
Unescape Escape View File

@ -1,5 +1,10 @@
<template> <template>
<div class="check-page"> <div class="check-page">
<div style="width:100%;text-align:right;margin-bottom:5px">
<a-button type="primary" @click="exportStock" style="text-align:right">
导出全部巷道
</a-button>
</div>
<div class="title-info"> <div class="title-info">
<span class="explain">颜色说明：</span> <span class="explain">颜色说明：</span>
<span class="info-text"> <span class="info-text">
@ -85,9 +90,6 @@
{{i.name}} {{i.name}}
</a-select-option> </a-select-option>
</a-select> </a-select>
<a-button type="primary" @click="exportStock">
导出全部巷道
</a-button>
</div> </div>
<div class="check-content" v-for="item in data" :key="item.name"> <div class="check-content" v-for="item in data" :key="item.name">
<div class="roadway-buttom" v-if="item.id == select"> <div class="roadway-buttom" v-if="item.id == select">
@ -270,12 +272,12 @@ export default {
.roadway-top { .roadway-top {
padding: 20px 0; padding: 20px 0;
width: 1000px; width: 90%;
} }
.roadway-buttom { .roadway-buttom {
padding: 20px 0 20px 0; padding: 20px 0 20px 0;
width: 1000px; width: 90%;
} }
.scroll-box { .scroll-box {

50
src/views/checkManage/model.vue
Unescape Escape View File

@ -94,30 +94,34 @@ export default {
}, },
methods: { methods: {
handleOk() { handleOk() {
this.confirmLoading = true; if (JSON.stringify(this.mData) !== '{}') {
setTimeout(() => { this.confirmLoading = true;
this.form.validateFields((err, values) => { setTimeout(() => {
console.log(values) this.form.validateFields((err, values) => {
if (!err) { console.log(values)
this.$api.httpApi.stockCheckByMan({ if (!err) {
data: { this.$api.httpApi.stockCheckByMan({
...values, data: {
column: this.mData.column, ...values,
row: this.mData.row, column: this.mData.column,
shelveId: this.mData.shelveId, row: this.mData.row,
} shelveId: this.mData.shelveId,
}).then(res => { }
if (res.code == 200) { }).then(res => {
this.$emit('sure', false, this.i) if (res.code == 200) {
this.$message.success('复核成功'); this.$emit('sure', false, this.i)
} this.$message.success('复核成功');
}).catch(err => { }
}).catch(err => {
}); });
} }
}); });
this.confirmLoading = false; this.confirmLoading = false;
}, 500); }, 500);
} else {
this.$message.error('该货位暂时没有记录');
}
}, },
handleCancel() { handleCancel() {
console.log('Clicked cancel button'); console.log('Clicked cancel button');

33
src/views/historyMonitoring/index.vue
Unescape Escape View File

@ -10,7 +10,14 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item class="ageInput" label="时间"> <a-form-item class="ageInput" label="时间">
<a-range-picker @change="onTimeChange" v-model="time"> <a-range-picker
@change="onTimeChange"
v-model="time"
format="YYYY-MM-DD HH:mm"
:show-time="{
defaultValue: [moment('00:00', 'HH:mm'), moment('23:59', 'HH:mm')],
}"
>
<a-icon slot="suffixIcon" type="calendar"/> <a-icon slot="suffixIcon" type="calendar"/>
</a-range-picker> </a-range-picker>
</a-form-item> </a-form-item>
@ -82,11 +89,14 @@
<script> <script>
import {imgUrl, videoUrl} from "@/api/importExcel"; import {imgUrl, videoUrl} from "@/api/importExcel";
import Model from "./model.vue" import Model from "./model.vue"
import moment from 'moment';
export default { export default {
name: "historyMonitoring", name: "historyMonitoring",
data() { data() {
return { return {
queryParam: {}, queryParam: {
orderNum: ''
},
time:[], time:[],
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
@ -158,8 +168,20 @@ export default {
mounted() { mounted() {
this.handleGetHistoryList() this.handleGetHistoryList()
console.log(this.imgUrl) console.log(this.imgUrl)
if (this.$route.query.orderNum) {
console.log(this.$route.query.orderNum)
this.queryParam.orderNum = this.$route.query.orderNum
}
}, },
methods: { methods: {
moment,
range(start, end) {
const result = [];
for (let i = start; i < end; i++) {
result.push(i);
}
return result;
},
handleSearch() { handleSearch() {
console.log(this.queryParam) console.log(this.queryParam)
this.handleGetHistoryList() this.handleGetHistoryList()
@ -195,7 +217,8 @@ export default {
onTimeChange(date, dateString) { onTimeChange(date, dateString) {
this.handleReset() this.handleReset()
console.log(date) console.log(date)
console.log(date[0].format('YYYY-MM-DD HH:mm:ss')) console.log(dateString)
console.log(date[0].format('YYYY-MM-DD HH:mm'))
this.queryParam.startTimestamp = date[0].format('YYYY-MM-DD HH:mm:ss') this.queryParam.startTimestamp = date[0].format('YYYY-MM-DD HH:mm:ss')
this.queryParam.endTimestamp = date[1].format('YYYY-MM-DD HH:mm:ss') this.queryParam.endTimestamp = date[1].format('YYYY-MM-DD HH:mm:ss')
}, },
@ -212,8 +235,8 @@ export default {
this.vid = data this.vid = data
}, },
reset() { reset() {
this.queryParam.startTime = "" this.queryParam.startTimestamp = ""
this.queryParam.endTime = "" this.queryParam.endTimestamp = ""
this.queryParam.orderNum = "" this.queryParam.orderNum = ""
this.time = [] this.time = []
this.handleGetHistoryList() this.handleGetHistoryList()

2
vue.config.js
Unescape Escape View File

@ -10,7 +10,7 @@ module.exports = {
devServer: { devServer: {
proxy: { proxy: {
'/api': { '/api': {
target: 'http://192.168.66.56:9007', target: 'http://192.168.66.27:8099',
logLevel:'debug', //控制台终端打印代理前的真实地址 logLevel:'debug', //控制台终端打印代理前的真实地址
}, },
}, },

Write Preview
Loading…
Cancel
Save