diff --git a/public/antd_color.less b/public/antd_color.less
index b746b9c..d06c6c0 100644
--- a/public/antd_color.less
+++ b/public/antd_color.less
@@ -42,7 +42,7 @@ html {--antd-wave-shadow-color: @primary-color;}
.ant-alert-info .ant-alert-icon {color: #1890ff;}
.ant-alert-warning {background-color: #fffbe6;border: 1px solid #ffe58f;}
.ant-alert-warning .ant-alert-icon {color: #faad14;}
-.ant-alert-error {background-color: #fff1f0;border: 1px solid #ffa39e;}
+.ant-alert-error {background-color: color(~`colorPalette("@{text-color-secondary}", 1)`);border: 1px solid #ffa39e;}
.ant-alert-error .ant-alert-icon {color: #f5222d;}
.ant-alert-close-icon {background-color: transparent;border: none;}
.ant-alert-close-icon .anticon-close {color: @text-color-secondary;}
@@ -1377,7 +1377,7 @@ tr.ant-table-expanded-row:hover {background: #fbfbfb;}
.ant-tag-pink-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;}
.ant-tag-magenta {color: #eb2f96;background: #fff0f6;border-color: #ffadd2;}
.ant-tag-magenta-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;}
-.ant-tag-red {color: #f5222d;background: #fff1f0;border-color: #ffa39e;}
+.ant-tag-red {color: #f5222d;background: color(~`colorPalette("@{text-color-secondary}", 1)`);border-color: #ffa39e;}
.ant-tag-red-inverse {color: #fff;background: #f5222d;border-color: #f5222d;}
.ant-tag-volcano {color: #fa541c;background: #fff2e8;border-color: #ffbb96;}
.ant-tag-volcano-inverse {color: #fff;background: #fa541c;border-color: #fa541c;}
diff --git a/src/api/http/http-api.js b/src/api/http/http-api.js
index c9da053..c5223b8 100644
--- a/src/api/http/http-api.js
+++ b/src/api/http/http-api.js
@@ -6,7 +6,7 @@ export default {
},
getRealTimeList: {
method: "POST",
- url: "/realTime",
+ url: "/cameraIo/realTimeCamera",
name: "获取实时监控列表"
},
getHistoryList: {
@@ -242,6 +242,47 @@ export default {
url: '/category/export/model',
name: '品规模板下载',
method: 'GET'
+ },
+ EaseAiController: {
+ url: '/EaseAiController',
+ name: 'easeai简单测试',
+ method: 'POST'
+ },
+ cameraIoConfigPage: {
+ url: '/cameraIo/config/page',
+ name: '获取列表',
+ method: 'POST'
+ },
+ cameraIoConfigAdd: {
+ url: '/cameraIo/config',
+ name: '新增预置点',
+ method: 'POST'
+ },
+ cameraIoConfigDel: {
+ url: '/cameraIo/config',
+ name: '删除预置点',
+ method: 'DELETE'
+ },
+ sseGetUid: {
+ url: '/sse/index',
+ name: '获取sseUid',
+ method: 'GET'
+ },
+
+ getDeviceTree: {
+ url: '/cameraIo/getDeviceTree',
+ name: '获取设备树',
+ method: 'POST'
+ },
+ sseClose: {
+ url: '/sse/closeSse',
+ name: '断连sse',
+ method: 'POST'
+ },
+ cameraIoConfigPut: {
+ url: '/cameraIo/config',
+ name: '修改预置点',
+ method: 'PUT'
},
stockExportModel: {
url: '/stock/export/model',
diff --git a/src/layouts/PageHeader.vue b/src/layouts/PageHeader.vue
index 8a06236..34e4ff5 100644
--- a/src/layouts/PageHeader.vue
+++ b/src/layouts/PageHeader.vue
@@ -10,7 +10,7 @@
{{ title }}
-
diff --git a/src/router/index.js b/src/router/index.js
index fb15f7a..c086252 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -51,15 +51,25 @@ const routes = [{
},
{
- path: 'historyMonitoring',
- name: 'historyMonitoring',
+ path: 'test',
+ name: 'test',
meta: {
- icon: 'book',
- name: '历史数据'
+ icon: 'video-camera',
+ name: '测试'
},
- component: () => import('@/views/historyMonitoring/index')
+ component: () => import('@/views/picTest/index'),
+
},
// {
+ // path: 'historyMonitoring',
+ // name: 'historyMonitoring',
+ // meta: {
+ // icon: 'book',
+ // name: '历史数据'
+ // },
+ // component: () => import('@/views/historyMonitoring/index')
+ // },
+ // {
// path: 'alarmLog',
// name: 'alarmLog',
// meta: {
@@ -68,32 +78,32 @@ const routes = [{
// },
// component: () => import('@/views/alarmVideos/alarmLog')
// },
- {
- path: 'checkManage',
- name: 'checkManage',
- meta: {
- icon: 'form',
- name: '盘点管理',
- },
- component: () => import('@/views/checkManage/index'),
- },
- {
- path: 'checkOperation',
- name: 'checkOperation',
- meta: {
- name: '盘点操作'
- },
- component: () => import('@/views/checkManage/checkOperation'),
- },
- {
- path: 'checkHistory',
- name: 'checkHistory',
- meta: {
- icon: 'tag',
- name: '盘点历史',
- },
- component: () => import('@/views/historyCheck/index'),
- },
+ // {
+ // path: 'checkManage',
+ // name: 'checkManage',
+ // meta: {
+ // icon: 'form',
+ // name: '盘点管理',
+ // },
+ // component: () => import('@/views/checkManage/index'),
+ // },
+ // {
+ // path: 'checkOperation',
+ // name: 'checkOperation',
+ // meta: {
+ // name: '盘点操作'
+ // },
+ // component: () => import('@/views/checkManage/checkOperation'),
+ // },
+ // {
+ // path: 'checkHistory',
+ // name: 'checkHistory',
+ // meta: {
+ // icon: 'tag',
+ // name: '盘点历史',
+ // },
+ // component: () => import('@/views/historyCheck/index'),
+ // },
// {
// path: 'stockHistory',
// name: 'stockHistory',
@@ -111,15 +121,15 @@ const routes = [{
// },
// component: () => import('@/views/stockLog/logPage'),
// },
- {
- path: 'roadwayManage',
- name: 'roadwayManage',
- meta: {
- icon: 'build',
- name: '巷道管理'
- },
- component: () => import('@/views/roadwayManage/index')
- },
+ // {
+ // path: 'roadwayManage',
+ // name: 'roadwayManage',
+ // meta: {
+ // icon: 'build',
+ // name: '巷道管理'
+ // },
+ // component: () => import('@/views/roadwayManage/index')
+ // },
{
path: 'cameraManage',
name: 'cameraManage',
diff --git a/src/views/cameraManage/controllerModel.vue b/src/views/cameraManage/controllerModel.vue
index 3976d7b..bad842a 100644
--- a/src/views/cameraManage/controllerModel.vue
+++ b/src/views/cameraManage/controllerModel.vue
@@ -311,8 +311,11 @@ export default {
if(this.type=='test') {
this.$router.go(-1);
}else if(this.type=='config') {
+ if(this.player != null){
+ this.player.destroy()
+ }
this.$router.go(-1);
- this.player.destroy();
+
}
},
diff --git a/src/views/cameraManage/index.vue b/src/views/cameraManage/index.vue
index 70ff2cb..8d8be70 100644
--- a/src/views/cameraManage/index.vue
+++ b/src/views/cameraManage/index.vue
@@ -47,12 +47,20 @@
@sure="submit"
@close="closeModel"
/>
+
diff --git a/src/views/cameraManage/modelCamera.vue b/src/views/cameraManage/modelCamera.vue
new file mode 100644
index 0000000..a6115aa
--- /dev/null
+++ b/src/views/cameraManage/modelCamera.vue
@@ -0,0 +1,790 @@
+
+
+
+
+
+
+
+
+
+
![]()
+
变倍
+
![]()
+
+
+
![]()
+
变焦
+
![]()
+
+
+
![]()
+
光圈
+
![]()
+
+
+
+
+
+
![]()
+
![]()
+
+
+
+
+
球机配置
+
+
+ {{text}}({{record.code}})
+
+
+
+
+ 写入
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/picTest/index.vue b/src/views/picTest/index.vue
new file mode 100644
index 0000000..6865c90
--- /dev/null
+++ b/src/views/picTest/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+ 点击选择图片
+
+
+
+
+
提交
+
清除
+
+
+
+
坐标: {{ coordinates }}
+
+
+
+
![Selected Image]()
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/realTimeMonitoring/index.vue b/src/views/realTimeMonitoring/index.vue
index 16f514f..ca32a05 100644
--- a/src/views/realTimeMonitoring/index.vue
+++ b/src/views/realTimeMonitoring/index.vue
@@ -1,11 +1,184 @@
-
-
-
-
+
+
+
+
+
+
+ {{ title.substr(0, title.indexOf(searchValue)) }}
+ {{ searchValue }}
+ {{ title.substr(title.indexOf(searchValue) + searchValue.length) }}
+
+ {{ title }}
+
+
+
+
+
+
+
+
+
+
![]()
+
变倍
+
![]()
+
+
+
![]()
+
变焦
+
![]()
+
+
+
![]()
+
光圈
+
![]()
+
+
+
+
+
+
![]()
+
![]()
+
+
+
+
+
+
+
+
-
+
@@ -502,80 +769,80 @@ export default {
.realTime {
padding: 10px;
}
- //全屏按钮
-
- //播放按钮
- video::-webkit-media-controls-play-button {
- display: none;
- }
- //进度条
- video::-webkit-media-controls-timeline {
- display: none;
- }
- //观看的当前时间
- video::-webkit-media-controls-current-time-display{
- display: none;
- }
- //剩余时间
- video::-webkit-media-controls-time-remaining-display {
- display: none;
- }
- //音量按钮
- video::-webkit-media-controls-mute-button {
- display: none;
- }
- video::-webkit-media-controls-toggle-closed-captions-button {
- display: none;
- }
- //音量的控制条
- video::-webkit-media-controls-volume-slider {
- display: none;
- }
- //所有控件
- video::-webkit-media-controls-enclosure{
- display: none;
- }
- .operation-list {
- position: absolute;
- right: 200px;
- bottom: 20px;
- /*width: 150px;*/
- /*border: solid 1px blue;*/
- z-index: 10;
- .operation-item{
- img{
- width: 32px;
- -webkit-user-select: none;
- -ms-user-select: none;
- -webkit-user-drag: none;
- user-select: none;
- }
- span{
- padding: 3px 6px;
- background: rgba(0,0,0,0.5);
- font-size: 16px;
- color: #ffffff;
- }
- }
+//全屏按钮
+
+//播放按钮
+video::-webkit-media-controls-play-button {
+ display: none;
+}
+//进度条
+video::-webkit-media-controls-timeline {
+ display: none;
+}
+//观看的当前时间
+video::-webkit-media-controls-current-time-display {
+ display: none;
+}
+//剩余时间
+video::-webkit-media-controls-time-remaining-display {
+ display: none;
+}
+//音量按钮
+video::-webkit-media-controls-mute-button {
+ display: none;
+}
+video::-webkit-media-controls-toggle-closed-captions-button {
+ display: none;
+}
+//音量的控制条
+video::-webkit-media-controls-volume-slider {
+ display: none;
+}
+//所有控件
+video::-webkit-media-controls-enclosure {
+ display: none;
+}
+.operation-list {
+ position: absolute;
+ right: 200px;
+ bottom: 20px;
+ /*width: 150px;*/
+ /*border: solid 1px blue;*/
+ z-index: 10;
+ .operation-item {
+ img {
+ width: 32px;
+ -webkit-user-select: none;
+ -ms-user-select: none;
+ -webkit-user-drag: none;
+ user-select: none;
}
- .direction-list{
- position: absolute;
- right: 30px;
- bottom: 20px;
- width: 150px;
- z-index: 10;
- /*border: solid 1px blue;*/
- .direction-item{
- display: flex;
- align-items: center;
- justify-content: space-between;
- img{
- width: 32px;
- -webkit-user-select: none;
- -ms-user-select: none;
- -webkit-user-drag: none;
- user-select: none;
- }
- }
+ span {
+ padding: 3px 6px;
+ background: rgba(0, 0, 0, 0.5);
+ font-size: 16px;
+ color: #ffffff;
}
+ }
+}
+.direction-list {
+ position: absolute;
+ right: 30px;
+ bottom: 20px;
+ width: 150px;
+ z-index: 10;
+ /*border: solid 1px blue;*/
+ .direction-item {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ img {
+ width: 32px;
+ -webkit-user-select: none;
+ -ms-user-select: none;
+ -webkit-user-drag: none;
+ user-select: none;
+ }
+ }
+}