From 45952b0413d8439e798909497527c39f5bb9ec46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=91=AB?= Date: Mon, 29 Mar 2021 18:47:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- s RETURN) | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) create mode 100644 s RETURN) diff --git a/s RETURN) b/s RETURN) new file mode 100644 index 0000000..e021c40 --- /dev/null +++ b/s RETURN) @@ -0,0 +1,148 @@ +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