diff --git a/package.json b/package.json index 3c9689b..14a15de 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "echarts": "^5.4.1", "element-plus": "^2.2.26", "file-saver": "^2.0.5", + "flv-extend": "^0.3.0", "flv.js": "^1.6.2", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/package.json b/package.json index 3c9689b..14a15de 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "echarts": "^5.4.1", "element-plus": "^2.2.26", "file-saver": "^2.0.5", + "flv-extend": "^0.3.0", "flv.js": "^1.6.2", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d373cf0..a4f5b2b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -35,6 +35,7 @@ eslint: ^8.27.0 esno: ^0.16.3 file-saver: ^2.0.5 + flv-extend: ^0.3.0 flv.js: ^1.6.2 fs-extra: ^10.1.0 hotkeys-js: ^3.10.0 @@ -111,6 +112,7 @@ echarts: 5.5.1 element-plus: 2.8.5_vue@3.4.4 file-saver: 2.0.5 + flv-extend: 0.3.0 flv.js: 1.6.2 hotkeys-js: 3.13.7 html2canvas: 1.4.1 @@ -5682,6 +5684,12 @@ resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==} dev: true + /flv-extend/0.3.0: + resolution: {integrity: sha512-lG+tXm+NQYps80QY44F/ZxvFTprLvXeuG/d6LZbqwNliIas8OMGKqwYKnim8Exj5J3laVZ/8mFY1SDfsosqO5A==} + dependencies: + mpegts.js: 1.8.0 + dev: false + /flv.js/1.6.2: resolution: {integrity: sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==} dependencies: @@ -7489,6 +7497,13 @@ dependencies: commander: 12.1.0 + /mpegts.js/1.8.0: + resolution: {integrity: sha512-ZtujqtmTjWgcDDkoOnLvrOKUTO/MKgLHM432zGDI8oPaJ0S+ebPxg1nEpDpLw6I7KmV/GZgUIrfbWi3qqEircg==} + dependencies: + es6-promise: 4.2.8 + webworkify-webpack: github.com/xqq/webworkify-webpack/24d1e719b4a6cac37a518b2bb10fe124527ef4ef + dev: false + /ms/2.0.0: resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} dev: true @@ -10692,3 +10707,9 @@ dependencies: tslib: 2.3.0 dev: false + + github.com/xqq/webworkify-webpack/24d1e719b4a6cac37a518b2bb10fe124527ef4ef: + resolution: {tarball: https://codeload.github.com/xqq/webworkify-webpack/tar.gz/24d1e719b4a6cac37a518b2bb10fe124527ef4ef} + name: webworkify-webpack + version: 2.1.5 + dev: false diff --git a/package.json b/package.json index 3c9689b..14a15de 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "echarts": "^5.4.1", "element-plus": "^2.2.26", "file-saver": "^2.0.5", + "flv-extend": "^0.3.0", "flv.js": "^1.6.2", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d373cf0..a4f5b2b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -35,6 +35,7 @@ eslint: ^8.27.0 esno: ^0.16.3 file-saver: ^2.0.5 + flv-extend: ^0.3.0 flv.js: ^1.6.2 fs-extra: ^10.1.0 hotkeys-js: ^3.10.0 @@ -111,6 +112,7 @@ echarts: 5.5.1 element-plus: 2.8.5_vue@3.4.4 file-saver: 2.0.5 + flv-extend: 0.3.0 flv.js: 1.6.2 hotkeys-js: 3.13.7 html2canvas: 1.4.1 @@ -5682,6 +5684,12 @@ resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==} dev: true + /flv-extend/0.3.0: + resolution: {integrity: sha512-lG+tXm+NQYps80QY44F/ZxvFTprLvXeuG/d6LZbqwNliIas8OMGKqwYKnim8Exj5J3laVZ/8mFY1SDfsosqO5A==} + dependencies: + mpegts.js: 1.8.0 + dev: false + /flv.js/1.6.2: resolution: {integrity: sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==} dependencies: @@ -7489,6 +7497,13 @@ dependencies: commander: 12.1.0 + /mpegts.js/1.8.0: + resolution: {integrity: sha512-ZtujqtmTjWgcDDkoOnLvrOKUTO/MKgLHM432zGDI8oPaJ0S+ebPxg1nEpDpLw6I7KmV/GZgUIrfbWi3qqEircg==} + dependencies: + es6-promise: 4.2.8 + webworkify-webpack: github.com/xqq/webworkify-webpack/24d1e719b4a6cac37a518b2bb10fe124527ef4ef + dev: false + /ms/2.0.0: resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} dev: true @@ -10692,3 +10707,9 @@ dependencies: tslib: 2.3.0 dev: false + + github.com/xqq/webworkify-webpack/24d1e719b4a6cac37a518b2bb10fe124527ef4ef: + resolution: {tarball: https://codeload.github.com/xqq/webworkify-webpack/tar.gz/24d1e719b4a6cac37a518b2bb10fe124527ef4ef} + name: webworkify-webpack + version: 2.1.5 + dev: false diff --git a/public/config/config.json b/public/config/config.json index 6aa50b7..4e242df 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -11,7 +11,7 @@ "maxZoom": "18", "zoom": "15", "timeGap": 600000, - "systemType": "sm", + "systemType": "gm", "lineWidth": "3", "lineColor": "#1aa034", "fontSize": "18px", diff --git a/package.json b/package.json index 3c9689b..14a15de 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "echarts": "^5.4.1", "element-plus": "^2.2.26", "file-saver": "^2.0.5", + "flv-extend": "^0.3.0", "flv.js": "^1.6.2", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d373cf0..a4f5b2b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -35,6 +35,7 @@ eslint: ^8.27.0 esno: ^0.16.3 file-saver: ^2.0.5 + flv-extend: ^0.3.0 flv.js: ^1.6.2 fs-extra: ^10.1.0 hotkeys-js: ^3.10.0 @@ -111,6 +112,7 @@ echarts: 5.5.1 element-plus: 2.8.5_vue@3.4.4 file-saver: 2.0.5 + flv-extend: 0.3.0 flv.js: 1.6.2 hotkeys-js: 3.13.7 html2canvas: 1.4.1 @@ -5682,6 +5684,12 @@ resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==} dev: true + /flv-extend/0.3.0: + resolution: {integrity: sha512-lG+tXm+NQYps80QY44F/ZxvFTprLvXeuG/d6LZbqwNliIas8OMGKqwYKnim8Exj5J3laVZ/8mFY1SDfsosqO5A==} + dependencies: + mpegts.js: 1.8.0 + dev: false + /flv.js/1.6.2: resolution: {integrity: sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==} dependencies: @@ -7489,6 +7497,13 @@ dependencies: commander: 12.1.0 + /mpegts.js/1.8.0: + resolution: {integrity: sha512-ZtujqtmTjWgcDDkoOnLvrOKUTO/MKgLHM432zGDI8oPaJ0S+ebPxg1nEpDpLw6I7KmV/GZgUIrfbWi3qqEircg==} + dependencies: + es6-promise: 4.2.8 + webworkify-webpack: github.com/xqq/webworkify-webpack/24d1e719b4a6cac37a518b2bb10fe124527ef4ef + dev: false + /ms/2.0.0: resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} dev: true @@ -10692,3 +10707,9 @@ dependencies: tslib: 2.3.0 dev: false + + github.com/xqq/webworkify-webpack/24d1e719b4a6cac37a518b2bb10fe124527ef4ef: + resolution: {tarball: https://codeload.github.com/xqq/webworkify-webpack/tar.gz/24d1e719b4a6cac37a518b2bb10fe124527ef4ef} + name: webworkify-webpack + version: 2.1.5 + dev: false diff --git a/public/config/config.json b/public/config/config.json index 6aa50b7..4e242df 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -11,7 +11,7 @@ "maxZoom": "18", "zoom": "15", "timeGap": 600000, - "systemType": "sm", + "systemType": "gm", "lineWidth": "3", "lineColor": "#1aa034", "fontSize": "18px", diff --git a/src/api/alarm/dangerAssessment/group.ts b/src/api/alarm/dangerAssessment/group.ts new file mode 100644 index 0000000..1ccc025 --- /dev/null +++ b/src/api/alarm/dangerAssessment/group.ts @@ -0,0 +1,89 @@ +// 分组授权接口 +import request from '../../index' +// 列表 +export function getGroupListPage(data: any) { + return request({ + url: 'sys/risk/group/listPage', + method: 'get', + params: data, + data, + }) +} +// 新增 +export function addGroup(data: any) { + return request({ + url: 'sys/risk/group/add', + method: 'post', + data, + }) +} +// 修改 +export function editGroup(data: any) { + return request({ + url: 'sys/risk/group/update', + method: 'post', + data, + }) +} +// 删除 +export function deleteGroup(data: { id: string }) { + return request({ + url: 'sys/risk/group/delete', + method: 'post', + params: data.id, + }) +} +// 风险点树查询 +export function videoTree(data: { riskType: string }) { + return request({ + url: 'sys/risk/group/tree', + method: 'post', + params: data, + }) +} +// 用户树查询 +export function personTree() { + return request({ + url: 'sys/risk/group/person/tree', + method: 'get', + }) +} + +// 分组人员列表（不分页） +export function getGroupUserList(data: any) { + return request({ + url: 'sys/risk/group/groupUserList', + method: 'get', + params: data, + data, + }) +} + +// 分组人员列表（分页） +export function getGroupUserListPage(data: any) { + return request({ + url: 'sys/risk/group/groupUserPage', + method: 'get', + params: data, + data, + }) +} + +// 用户人员删除 +export function deletePersonTree(data: { id: string }) { + return request({ + url: '/sys/risk/group/user/delete', + method: 'get', + params: data.id, + }) +} + +export function fileUpload(data: object) { + return request({ + url: 'file/upload', + method: 'post', + headers: { 'Content-Type': 'multipart/form-data' }, + params: data, + data, + }) +} diff --git a/package.json b/package.json index 3c9689b..14a15de 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "echarts": "^5.4.1", "element-plus": "^2.2.26", "file-saver": "^2.0.5", + "flv-extend": "^0.3.0", "flv.js": "^1.6.2", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d373cf0..a4f5b2b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -35,6 +35,7 @@ eslint: ^8.27.0 esno: ^0.16.3 file-saver: ^2.0.5 + flv-extend: ^0.3.0 flv.js: ^1.6.2 fs-extra: ^10.1.0 hotkeys-js: ^3.10.0 @@ -111,6 +112,7 @@ echarts: 5.5.1 element-plus: 2.8.5_vue@3.4.4 file-saver: 2.0.5 + flv-extend: 0.3.0 flv.js: 1.6.2 hotkeys-js: 3.13.7 html2canvas: 1.4.1 @@ -5682,6 +5684,12 @@ resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==} dev: true + /flv-extend/0.3.0: + resolution: {integrity: sha512-lG+tXm+NQYps80QY44F/ZxvFTprLvXeuG/d6LZbqwNliIas8OMGKqwYKnim8Exj5J3laVZ/8mFY1SDfsosqO5A==} + dependencies: + mpegts.js: 1.8.0 + dev: false + /flv.js/1.6.2: resolution: {integrity: sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==} dependencies: @@ -7489,6 +7497,13 @@ dependencies: commander: 12.1.0 + /mpegts.js/1.8.0: + resolution: {integrity: sha512-ZtujqtmTjWgcDDkoOnLvrOKUTO/MKgLHM432zGDI8oPaJ0S+ebPxg1nEpDpLw6I7KmV/GZgUIrfbWi3qqEircg==} + dependencies: + es6-promise: 4.2.8 + webworkify-webpack: github.com/xqq/webworkify-webpack/24d1e719b4a6cac37a518b2bb10fe124527ef4ef + dev: false + /ms/2.0.0: resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} dev: true @@ -10692,3 +10707,9 @@ dependencies: tslib: 2.3.0 dev: false + + github.com/xqq/webworkify-webpack/24d1e719b4a6cac37a518b2bb10fe124527ef4ef: + resolution: {tarball: https://codeload.github.com/xqq/webworkify-webpack/tar.gz/24d1e719b4a6cac37a518b2bb10fe124527ef4ef} + name: webworkify-webpack + version: 2.1.5 + dev: false diff --git a/public/config/config.json b/public/config/config.json index 6aa50b7..4e242df 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -11,7 +11,7 @@ "maxZoom": "18", "zoom": "15", "timeGap": 600000, - "systemType": "sm", + "systemType": "gm", "lineWidth": "3", "lineColor": "#1aa034", "fontSize": "18px", diff --git a/src/api/alarm/dangerAssessment/group.ts b/src/api/alarm/dangerAssessment/group.ts new file mode 100644 index 0000000..1ccc025 --- /dev/null +++ b/src/api/alarm/dangerAssessment/group.ts @@ -0,0 +1,89 @@ +// 分组授权接口 +import request from '../../index' +// 列表 +export function getGroupListPage(data: any) { + return request({ + url: 'sys/risk/group/listPage', + method: 'get', + params: data, + data, + }) +} +// 新增 +export function addGroup(data: any) { + return request({ + url: 'sys/risk/group/add', + method: 'post', + data, + }) +} +// 修改 +export function editGroup(data: any) { + return request({ + url: 'sys/risk/group/update', + method: 'post', + data, + }) +} +// 删除 +export function deleteGroup(data: { id: string }) { + return request({ + url: 'sys/risk/group/delete', + method: 'post', + params: data.id, + }) +} +// 风险点树查询 +export function videoTree(data: { riskType: string }) { + return request({ + url: 'sys/risk/group/tree', + method: 'post', + params: data, + }) +} +// 用户树查询 +export function personTree() { + return request({ + url: 'sys/risk/group/person/tree', + method: 'get', + }) +} + +// 分组人员列表（不分页） +export function getGroupUserList(data: any) { + return request({ + url: 'sys/risk/group/groupUserList', + method: 'get', + params: data, + data, + }) +} + +// 分组人员列表（分页） +export function getGroupUserListPage(data: any) { + return request({ + url: 'sys/risk/group/groupUserPage', + method: 'get', + params: data, + data, + }) +} + +// 用户人员删除 +export function deletePersonTree(data: { id: string }) { + return request({ + url: '/sys/risk/group/user/delete', + method: 'get', + params: data.id, + }) +} + +export function fileUpload(data: object) { + return request({ + url: 'file/upload', + method: 'post', + headers: { 'Content-Type': 'multipart/form-data' }, + params: data, + data, + }) +} diff --git a/src/router/modules/alarm.ts b/src/router/modules/alarm.ts index 908735c..db6656e 100644 --- a/src/router/modules/alarm.ts +++ b/src/router/modules/alarm.ts @@ -137,6 +137,16 @@ auth: '/alarm/dangerAssessment/assessment', }, }, + { + path: 'groupList', + name: 'GroupList', + component: () => import('@/views/alarm/dangerAssessment/group/list.vue'), + meta: { + title: '分组授权', + icon: 'ep:key', + auth: '/alarm/dangerAssessment/group', + }, + }, ], }, { diff --git a/package.json b/package.json index 3c9689b..14a15de 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "echarts": "^5.4.1", "element-plus": "^2.2.26", "file-saver": "^2.0.5", + "flv-extend": "^0.3.0", "flv.js": "^1.6.2", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d373cf0..a4f5b2b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -35,6 +35,7 @@ eslint: ^8.27.0 esno: ^0.16.3 file-saver: ^2.0.5 + flv-extend: ^0.3.0 flv.js: ^1.6.2 fs-extra: ^10.1.0 hotkeys-js: ^3.10.0 @@ -111,6 +112,7 @@ echarts: 5.5.1 element-plus: 2.8.5_vue@3.4.4 file-saver: 2.0.5 + flv-extend: 0.3.0 flv.js: 1.6.2 hotkeys-js: 3.13.7 html2canvas: 1.4.1 @@ -5682,6 +5684,12 @@ resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==} dev: true + /flv-extend/0.3.0: + resolution: {integrity: sha512-lG+tXm+NQYps80QY44F/ZxvFTprLvXeuG/d6LZbqwNliIas8OMGKqwYKnim8Exj5J3laVZ/8mFY1SDfsosqO5A==} + dependencies: + mpegts.js: 1.8.0 + dev: false + /flv.js/1.6.2: resolution: {integrity: sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==} dependencies: @@ -7489,6 +7497,13 @@ dependencies: commander: 12.1.0 + /mpegts.js/1.8.0: + resolution: {integrity: sha512-ZtujqtmTjWgcDDkoOnLvrOKUTO/MKgLHM432zGDI8oPaJ0S+ebPxg1nEpDpLw6I7KmV/GZgUIrfbWi3qqEircg==} + dependencies: + es6-promise: 4.2.8 + webworkify-webpack: github.com/xqq/webworkify-webpack/24d1e719b4a6cac37a518b2bb10fe124527ef4ef + dev: false + /ms/2.0.0: resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} dev: true @@ -10692,3 +10707,9 @@ dependencies: tslib: 2.3.0 dev: false + + github.com/xqq/webworkify-webpack/24d1e719b4a6cac37a518b2bb10fe124527ef4ef: + resolution: {tarball: https://codeload.github.com/xqq/webworkify-webpack/tar.gz/24d1e719b4a6cac37a518b2bb10fe124527ef4ef} + name: webworkify-webpack + version: 2.1.5 + dev: false diff --git a/public/config/config.json b/public/config/config.json index 6aa50b7..4e242df 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -11,7 +11,7 @@ "maxZoom": "18", "zoom": "15", "timeGap": 600000, - "systemType": "sm", + "systemType": "gm", "lineWidth": "3", "lineColor": "#1aa034", "fontSize": "18px", diff --git a/src/api/alarm/dangerAssessment/group.ts b/src/api/alarm/dangerAssessment/group.ts new file mode 100644 index 0000000..1ccc025 --- /dev/null +++ b/src/api/alarm/dangerAssessment/group.ts @@ -0,0 +1,89 @@ +// 分组授权接口 +import request from '../../index' +// 列表 +export function getGroupListPage(data: any) { + return request({ + url: 'sys/risk/group/listPage', + method: 'get', + params: data, + data, + }) +} +// 新增 +export function addGroup(data: any) { + return request({ + url: 'sys/risk/group/add', + method: 'post', + data, + }) +} +// 修改 +export function editGroup(data: any) { + return request({ + url: 'sys/risk/group/update', + method: 'post', + data, + }) +} +// 删除 +export function deleteGroup(data: { id: string }) { + return request({ + url: 'sys/risk/group/delete', + method: 'post', + params: data.id, + }) +} +// 风险点树查询 +export function videoTree(data: { riskType: string }) { + return request({ + url: 'sys/risk/group/tree', + method: 'post', + params: data, + }) +} +// 用户树查询 +export function personTree() { + return request({ + url: 'sys/risk/group/person/tree', + method: 'get', + }) +} + +// 分组人员列表（不分页） +export function getGroupUserList(data: any) { + return request({ + url: 'sys/risk/group/groupUserList', + method: 'get', + params: data, + data, + }) +} + +// 分组人员列表（分页） +export function getGroupUserListPage(data: any) { + return request({ + url: 'sys/risk/group/groupUserPage', + method: 'get', + params: data, + data, + }) +} + +// 用户人员删除 +export function deletePersonTree(data: { id: string }) { + return request({ + url: '/sys/risk/group/user/delete', + method: 'get', + params: data.id, + }) +} + +export function fileUpload(data: object) { + return request({ + url: 'file/upload', + method: 'post', + headers: { 'Content-Type': 'multipart/form-data' }, + params: data, + data, + }) +} diff --git a/src/router/modules/alarm.ts b/src/router/modules/alarm.ts index 908735c..db6656e 100644 --- a/src/router/modules/alarm.ts +++ b/src/router/modules/alarm.ts @@ -137,6 +137,16 @@ auth: '/alarm/dangerAssessment/assessment', }, }, + { + path: 'groupList', + name: 'GroupList', + component: () => import('@/views/alarm/dangerAssessment/group/list.vue'), + meta: { + title: '分组授权', + icon: 'ep:key', + auth: '/alarm/dangerAssessment/group', + }, + }, ], }, { diff --git a/src/views/alarm/accidentTracing/list.vue b/src/views/alarm/accidentTracing/list.vue index 9ad7a7d..2d00940 100644 --- a/src/views/alarm/accidentTracing/list.vue +++ b/src/views/alarm/accidentTracing/list.vue @@ -165,8 +165,8 @@ function searchBackList(row: any, index: number) { palyIndex.value = index const currentDate = dayjs(row.alarmTime, 'YYYY-MM-DD HH:mm:ss') - const startTime = currentDate.subtract(2, 'minute').format('YYYY-MM-DD HH:mm:ss') - const endTime = currentDate.add(2, 'minute').format('YYYY-MM-DD HH:mm:ss') + const startTime = currentDate.subtract(3, 'minute').format('YYYY-MM-DD HH:mm:ss') + const endTime = currentDate.add(3, 'minute').format('YYYY-MM-DD HH:mm:ss') const params = { startTime, // 开始时间 endTime, // 结束时间 diff --git a/package.json b/package.json index 3c9689b..14a15de 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "echarts": "^5.4.1", "element-plus": "^2.2.26", "file-saver": "^2.0.5", + "flv-extend": "^0.3.0", "flv.js": "^1.6.2", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d373cf0..a4f5b2b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -35,6 +35,7 @@ eslint: ^8.27.0 esno: ^0.16.3 file-saver: ^2.0.5 + flv-extend: ^0.3.0 flv.js: ^1.6.2 fs-extra: ^10.1.0 hotkeys-js: ^3.10.0 @@ -111,6 +112,7 @@ echarts: 5.5.1 element-plus: 2.8.5_vue@3.4.4 file-saver: 2.0.5 + flv-extend: 0.3.0 flv.js: 1.6.2 hotkeys-js: 3.13.7 html2canvas: 1.4.1 @@ -5682,6 +5684,12 @@ resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==} dev: true + /flv-extend/0.3.0: + resolution: {integrity: sha512-lG+tXm+NQYps80QY44F/ZxvFTprLvXeuG/d6LZbqwNliIas8OMGKqwYKnim8Exj5J3laVZ/8mFY1SDfsosqO5A==} + dependencies: + mpegts.js: 1.8.0 + dev: false + /flv.js/1.6.2: resolution: {integrity: sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==} dependencies: @@ -7489,6 +7497,13 @@ dependencies: commander: 12.1.0 + /mpegts.js/1.8.0: + resolution: {integrity: sha512-ZtujqtmTjWgcDDkoOnLvrOKUTO/MKgLHM432zGDI8oPaJ0S+ebPxg1nEpDpLw6I7KmV/GZgUIrfbWi3qqEircg==} + dependencies: + es6-promise: 4.2.8 + webworkify-webpack: github.com/xqq/webworkify-webpack/24d1e719b4a6cac37a518b2bb10fe124527ef4ef + dev: false + /ms/2.0.0: resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} dev: true @@ -10692,3 +10707,9 @@ dependencies: tslib: 2.3.0 dev: false + + github.com/xqq/webworkify-webpack/24d1e719b4a6cac37a518b2bb10fe124527ef4ef: + resolution: {tarball: https://codeload.github.com/xqq/webworkify-webpack/tar.gz/24d1e719b4a6cac37a518b2bb10fe124527ef4ef} + name: webworkify-webpack + version: 2.1.5 + dev: false diff --git a/public/config/config.json b/public/config/config.json index 6aa50b7..4e242df 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -11,7 +11,7 @@ "maxZoom": "18", "zoom": "15", "timeGap": 600000, - "systemType": "sm", + "systemType": "gm", "lineWidth": "3", "lineColor": "#1aa034", "fontSize": "18px", diff --git a/src/api/alarm/dangerAssessment/group.ts b/src/api/alarm/dangerAssessment/group.ts new file mode 100644 index 0000000..1ccc025 --- /dev/null +++ b/src/api/alarm/dangerAssessment/group.ts @@ -0,0 +1,89 @@ +// 分组授权接口 +import request from '../../index' +// 列表 +export function getGroupListPage(data: any) { + return request({ + url: 'sys/risk/group/listPage', + method: 'get', + params: data, + data, + }) +} +// 新增 +export function addGroup(data: any) { + return request({ + url: 'sys/risk/group/add', + method: 'post', + data, + }) +} +// 修改 +export function editGroup(data: any) { + return request({ + url: 'sys/risk/group/update', + method: 'post', + data, + }) +} +// 删除 +export function deleteGroup(data: { id: string }) { + return request({ + url: 'sys/risk/group/delete', + method: 'post', + params: data.id, + }) +} +// 风险点树查询 +export function videoTree(data: { riskType: string }) { + return request({ + url: 'sys/risk/group/tree', + method: 'post', + params: data, + }) +} +// 用户树查询 +export function personTree() { + return request({ + url: 'sys/risk/group/person/tree', + method: 'get', + }) +} + +// 分组人员列表（不分页） +export function getGroupUserList(data: any) { + return request({ + url: 'sys/risk/group/groupUserList', + method: 'get', + params: data, + data, + }) +} + +// 分组人员列表（分页） +export function getGroupUserListPage(data: any) { + return request({ + url: 'sys/risk/group/groupUserPage', + method: 'get', + params: data, + data, + }) +} + +// 用户人员删除 +export function deletePersonTree(data: { id: string }) { + return request({ + url: '/sys/risk/group/user/delete', + method: 'get', + params: data.id, + }) +} + +export function fileUpload(data: object) { + return request({ + url: 'file/upload', + method: 'post', + headers: { 'Content-Type': 'multipart/form-data' }, + params: data, + data, + }) +} diff --git a/src/router/modules/alarm.ts b/src/router/modules/alarm.ts index 908735c..db6656e 100644 --- a/src/router/modules/alarm.ts +++ b/src/router/modules/alarm.ts @@ -137,6 +137,16 @@ auth: '/alarm/dangerAssessment/assessment', }, }, + { + path: 'groupList', + name: 'GroupList', + component: () => import('@/views/alarm/dangerAssessment/group/list.vue'), + meta: { + title: '分组授权', + icon: 'ep:key', + auth: '/alarm/dangerAssessment/group', + }, + }, ], }, { diff --git a/src/views/alarm/accidentTracing/list.vue b/src/views/alarm/accidentTracing/list.vue index 9ad7a7d..2d00940 100644 --- a/src/views/alarm/accidentTracing/list.vue +++ b/src/views/alarm/accidentTracing/list.vue @@ -165,8 +165,8 @@ function searchBackList(row: any, index: number) { palyIndex.value = index const currentDate = dayjs(row.alarmTime, 'YYYY-MM-DD HH:mm:ss') - const startTime = currentDate.subtract(2, 'minute').format('YYYY-MM-DD HH:mm:ss') - const endTime = currentDate.add(2, 'minute').format('YYYY-MM-DD HH:mm:ss') + const startTime = currentDate.subtract(3, 'minute').format('YYYY-MM-DD HH:mm:ss') + const endTime = currentDate.add(3, 'minute').format('YYYY-MM-DD HH:mm:ss') const params = { startTime, // 开始时间 endTime, // 结束时间 diff --git a/src/views/alarm/dangerAssessment/group/edit.vue b/src/views/alarm/dangerAssessment/group/edit.vue new file mode 100644 index 0000000..5d26c60 --- /dev/null +++ b/src/views/alarm/dangerAssessment/group/edit.vue @@ -0,0 +1,364 @@ + + + + + + diff --git a/package.json b/package.json index 3c9689b..14a15de 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "echarts": "^5.4.1", "element-plus": "^2.2.26", "file-saver": "^2.0.5", + "flv-extend": "^0.3.0", "flv.js": "^1.6.2", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d373cf0..a4f5b2b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -35,6 +35,7 @@ eslint: ^8.27.0 esno: ^0.16.3 file-saver: ^2.0.5 + flv-extend: ^0.3.0 flv.js: ^1.6.2 fs-extra: ^10.1.0 hotkeys-js: ^3.10.0 @@ -111,6 +112,7 @@ echarts: 5.5.1 element-plus: 2.8.5_vue@3.4.4 file-saver: 2.0.5 + flv-extend: 0.3.0 flv.js: 1.6.2 hotkeys-js: 3.13.7 html2canvas: 1.4.1 @@ -5682,6 +5684,12 @@ resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==} dev: true + /flv-extend/0.3.0: + resolution: {integrity: sha512-lG+tXm+NQYps80QY44F/ZxvFTprLvXeuG/d6LZbqwNliIas8OMGKqwYKnim8Exj5J3laVZ/8mFY1SDfsosqO5A==} + dependencies: + mpegts.js: 1.8.0 + dev: false + /flv.js/1.6.2: resolution: {integrity: sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==} dependencies: @@ -7489,6 +7497,13 @@ dependencies: commander: 12.1.0 + /mpegts.js/1.8.0: + resolution: {integrity: sha512-ZtujqtmTjWgcDDkoOnLvrOKUTO/MKgLHM432zGDI8oPaJ0S+ebPxg1nEpDpLw6I7KmV/GZgUIrfbWi3qqEircg==} + dependencies: + es6-promise: 4.2.8 + webworkify-webpack: github.com/xqq/webworkify-webpack/24d1e719b4a6cac37a518b2bb10fe124527ef4ef + dev: false + /ms/2.0.0: resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} dev: true @@ -10692,3 +10707,9 @@ dependencies: tslib: 2.3.0 dev: false + + github.com/xqq/webworkify-webpack/24d1e719b4a6cac37a518b2bb10fe124527ef4ef: + resolution: {tarball: https://codeload.github.com/xqq/webworkify-webpack/tar.gz/24d1e719b4a6cac37a518b2bb10fe124527ef4ef} + name: webworkify-webpack + version: 2.1.5 + dev: false diff --git a/public/config/config.json b/public/config/config.json index 6aa50b7..4e242df 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -11,7 +11,7 @@ "maxZoom": "18", "zoom": "15", "timeGap": 600000, - "systemType": "sm", + "systemType": "gm", "lineWidth": "3", "lineColor": "#1aa034", "fontSize": "18px", diff --git a/src/api/alarm/dangerAssessment/group.ts b/src/api/alarm/dangerAssessment/group.ts new file mode 100644 index 0000000..1ccc025 --- /dev/null +++ b/src/api/alarm/dangerAssessment/group.ts @@ -0,0 +1,89 @@ +// 分组授权接口 +import request from '../../index' +// 列表 +export function getGroupListPage(data: any) { + return request({ + url: 'sys/risk/group/listPage', + method: 'get', + params: data, + data, + }) +} +// 新增 +export function addGroup(data: any) { + return request({ + url: 'sys/risk/group/add', + method: 'post', + data, + }) +} +// 修改 +export function editGroup(data: any) { + return request({ + url: 'sys/risk/group/update', + method: 'post', + data, + }) +} +// 删除 +export function deleteGroup(data: { id: string }) { + return request({ + url: 'sys/risk/group/delete', + method: 'post', + params: data.id, + }) +} +// 风险点树查询 +export function videoTree(data: { riskType: string }) { + return request({ + url: 'sys/risk/group/tree', + method: 'post', + params: data, + }) +} +// 用户树查询 +export function personTree() { + return request({ + url: 'sys/risk/group/person/tree', + method: 'get', + }) +} + +// 分组人员列表（不分页） +export function getGroupUserList(data: any) { + return request({ + url: 'sys/risk/group/groupUserList', + method: 'get', + params: data, + data, + }) +} + +// 分组人员列表（分页） +export function getGroupUserListPage(data: any) { + return request({ + url: 'sys/risk/group/groupUserPage', + method: 'get', + params: data, + data, + }) +} + +// 用户人员删除 +export function deletePersonTree(data: { id: string }) { + return request({ + url: '/sys/risk/group/user/delete', + method: 'get', + params: data.id, + }) +} + +export function fileUpload(data: object) { + return request({ + url: 'file/upload', + method: 'post', + headers: { 'Content-Type': 'multipart/form-data' }, + params: data, + data, + }) +} diff --git a/src/router/modules/alarm.ts b/src/router/modules/alarm.ts index 908735c..db6656e 100644 --- a/src/router/modules/alarm.ts +++ b/src/router/modules/alarm.ts @@ -137,6 +137,16 @@ auth: '/alarm/dangerAssessment/assessment', }, }, + { + path: 'groupList', + name: 'GroupList', + component: () => import('@/views/alarm/dangerAssessment/group/list.vue'), + meta: { + title: '分组授权', + icon: 'ep:key', + auth: '/alarm/dangerAssessment/group', + }, + }, ], }, { diff --git a/src/views/alarm/accidentTracing/list.vue b/src/views/alarm/accidentTracing/list.vue index 9ad7a7d..2d00940 100644 --- a/src/views/alarm/accidentTracing/list.vue +++ b/src/views/alarm/accidentTracing/list.vue @@ -165,8 +165,8 @@ function searchBackList(row: any, index: number) { palyIndex.value = index const currentDate = dayjs(row.alarmTime, 'YYYY-MM-DD HH:mm:ss') - const startTime = currentDate.subtract(2, 'minute').format('YYYY-MM-DD HH:mm:ss') - const endTime = currentDate.add(2, 'minute').format('YYYY-MM-DD HH:mm:ss') + const startTime = currentDate.subtract(3, 'minute').format('YYYY-MM-DD HH:mm:ss') + const endTime = currentDate.add(3, 'minute').format('YYYY-MM-DD HH:mm:ss') const params = { startTime, // 开始时间 endTime, // 结束时间 diff --git a/src/views/alarm/dangerAssessment/group/edit.vue b/src/views/alarm/dangerAssessment/group/edit.vue new file mode 100644 index 0000000..5d26c60 --- /dev/null +++ b/src/views/alarm/dangerAssessment/group/edit.vue @@ -0,0 +1,364 @@ + + + + + + diff --git a/src/views/alarm/dangerAssessment/group/list.vue b/src/views/alarm/dangerAssessment/group/list.vue new file mode 100644 index 0000000..6344494 --- /dev/null +++ b/src/views/alarm/dangerAssessment/group/list.vue @@ -0,0 +1,203 @@ + + + + diff --git a/package.json b/package.json index 3c9689b..14a15de 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "echarts": "^5.4.1", "element-plus": "^2.2.26", "file-saver": "^2.0.5", + "flv-extend": "^0.3.0", "flv.js": "^1.6.2", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d373cf0..a4f5b2b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -35,6 +35,7 @@ eslint: ^8.27.0 esno: ^0.16.3 file-saver: ^2.0.5 + flv-extend: ^0.3.0 flv.js: ^1.6.2 fs-extra: ^10.1.0 hotkeys-js: ^3.10.0 @@ -111,6 +112,7 @@ echarts: 5.5.1 element-plus: 2.8.5_vue@3.4.4 file-saver: 2.0.5 + flv-extend: 0.3.0 flv.js: 1.6.2 hotkeys-js: 3.13.7 html2canvas: 1.4.1 @@ -5682,6 +5684,12 @@ resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==} dev: true + /flv-extend/0.3.0: + resolution: {integrity: sha512-lG+tXm+NQYps80QY44F/ZxvFTprLvXeuG/d6LZbqwNliIas8OMGKqwYKnim8Exj5J3laVZ/8mFY1SDfsosqO5A==} + dependencies: + mpegts.js: 1.8.0 + dev: false + /flv.js/1.6.2: resolution: {integrity: sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==} dependencies: @@ -7489,6 +7497,13 @@ dependencies: commander: 12.1.0 + /mpegts.js/1.8.0: + resolution: {integrity: sha512-ZtujqtmTjWgcDDkoOnLvrOKUTO/MKgLHM432zGDI8oPaJ0S+ebPxg1nEpDpLw6I7KmV/GZgUIrfbWi3qqEircg==} + dependencies: + es6-promise: 4.2.8 + webworkify-webpack: github.com/xqq/webworkify-webpack/24d1e719b4a6cac37a518b2bb10fe124527ef4ef + dev: false + /ms/2.0.0: resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} dev: true @@ -10692,3 +10707,9 @@ dependencies: tslib: 2.3.0 dev: false + + github.com/xqq/webworkify-webpack/24d1e719b4a6cac37a518b2bb10fe124527ef4ef: + resolution: {tarball: https://codeload.github.com/xqq/webworkify-webpack/tar.gz/24d1e719b4a6cac37a518b2bb10fe124527ef4ef} + name: webworkify-webpack + version: 2.1.5 + dev: false diff --git a/public/config/config.json b/public/config/config.json index 6aa50b7..4e242df 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -11,7 +11,7 @@ "maxZoom": "18", "zoom": "15", "timeGap": 600000, - "systemType": "sm", + "systemType": "gm", "lineWidth": "3", "lineColor": "#1aa034", "fontSize": "18px", diff --git a/src/api/alarm/dangerAssessment/group.ts b/src/api/alarm/dangerAssessment/group.ts new file mode 100644 index 0000000..1ccc025 --- /dev/null +++ b/src/api/alarm/dangerAssessment/group.ts @@ -0,0 +1,89 @@ +// 分组授权接口 +import request from '../../index' +// 列表 +export function getGroupListPage(data: any) { + return request({ + url: 'sys/risk/group/listPage', + method: 'get', + params: data, + data, + }) +} +// 新增 +export function addGroup(data: any) { + return request({ + url: 'sys/risk/group/add', + method: 'post', + data, + }) +} +// 修改 +export function editGroup(data: any) { + return request({ + url: 'sys/risk/group/update', + method: 'post', + data, + }) +} +// 删除 +export function deleteGroup(data: { id: string }) { + return request({ + url: 'sys/risk/group/delete', + method: 'post', + params: data.id, + }) +} +// 风险点树查询 +export function videoTree(data: { riskType: string }) { + return request({ + url: 'sys/risk/group/tree', + method: 'post', + params: data, + }) +} +// 用户树查询 +export function personTree() { + return request({ + url: 'sys/risk/group/person/tree', + method: 'get', + }) +} + +// 分组人员列表（不分页） +export function getGroupUserList(data: any) { + return request({ + url: 'sys/risk/group/groupUserList', + method: 'get', + params: data, + data, + }) +} + +// 分组人员列表（分页） +export function getGroupUserListPage(data: any) { + return request({ + url: 'sys/risk/group/groupUserPage', + method: 'get', + params: data, + data, + }) +} + +// 用户人员删除 +export function deletePersonTree(data: { id: string }) { + return request({ + url: '/sys/risk/group/user/delete', + method: 'get', + params: data.id, + }) +} + +export function fileUpload(data: object) { + return request({ + url: 'file/upload', + method: 'post', + headers: { 'Content-Type': 'multipart/form-data' }, + params: data, + data, + }) +} diff --git a/src/router/modules/alarm.ts b/src/router/modules/alarm.ts index 908735c..db6656e 100644 --- a/src/router/modules/alarm.ts +++ b/src/router/modules/alarm.ts @@ -137,6 +137,16 @@ auth: '/alarm/dangerAssessment/assessment', }, }, + { + path: 'groupList', + name: 'GroupList', + component: () => import('@/views/alarm/dangerAssessment/group/list.vue'), + meta: { + title: '分组授权', + icon: 'ep:key', + auth: '/alarm/dangerAssessment/group', + }, + }, ], }, { diff --git a/src/views/alarm/accidentTracing/list.vue b/src/views/alarm/accidentTracing/list.vue index 9ad7a7d..2d00940 100644 --- a/src/views/alarm/accidentTracing/list.vue +++ b/src/views/alarm/accidentTracing/list.vue @@ -165,8 +165,8 @@ function searchBackList(row: any, index: number) { palyIndex.value = index const currentDate = dayjs(row.alarmTime, 'YYYY-MM-DD HH:mm:ss') - const startTime = currentDate.subtract(2, 'minute').format('YYYY-MM-DD HH:mm:ss') - const endTime = currentDate.add(2, 'minute').format('YYYY-MM-DD HH:mm:ss') + const startTime = currentDate.subtract(3, 'minute').format('YYYY-MM-DD HH:mm:ss') + const endTime = currentDate.add(3, 'minute').format('YYYY-MM-DD HH:mm:ss') const params = { startTime, // 开始时间 endTime, // 结束时间 diff --git a/src/views/alarm/dangerAssessment/group/edit.vue b/src/views/alarm/dangerAssessment/group/edit.vue new file mode 100644 index 0000000..5d26c60 --- /dev/null +++ b/src/views/alarm/dangerAssessment/group/edit.vue @@ -0,0 +1,364 @@ + + + + + + diff --git a/src/views/alarm/dangerAssessment/group/list.vue b/src/views/alarm/dangerAssessment/group/list.vue new file mode 100644 index 0000000..6344494 --- /dev/null +++ b/src/views/alarm/dangerAssessment/group/list.vue @@ -0,0 +1,203 @@ + + + + diff --git a/src/views/bigScreen/flvExtend.vue b/src/views/bigScreen/flvExtend.vue new file mode 100644 index 0000000..f7839f2 --- /dev/null +++ b/src/views/bigScreen/flvExtend.vue @@ -0,0 +1,80 @@ + + + + + + diff --git a/package.json b/package.json index 3c9689b..14a15de 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "echarts": "^5.4.1", "element-plus": "^2.2.26", "file-saver": "^2.0.5", + "flv-extend": "^0.3.0", "flv.js": "^1.6.2", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d373cf0..a4f5b2b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -35,6 +35,7 @@ eslint: ^8.27.0 esno: ^0.16.3 file-saver: ^2.0.5 + flv-extend: ^0.3.0 flv.js: ^1.6.2 fs-extra: ^10.1.0 hotkeys-js: ^3.10.0 @@ -111,6 +112,7 @@ echarts: 5.5.1 element-plus: 2.8.5_vue@3.4.4 file-saver: 2.0.5 + flv-extend: 0.3.0 flv.js: 1.6.2 hotkeys-js: 3.13.7 html2canvas: 1.4.1 @@ -5682,6 +5684,12 @@ resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==} dev: true + /flv-extend/0.3.0: + resolution: {integrity: sha512-lG+tXm+NQYps80QY44F/ZxvFTprLvXeuG/d6LZbqwNliIas8OMGKqwYKnim8Exj5J3laVZ/8mFY1SDfsosqO5A==} + dependencies: + mpegts.js: 1.8.0 + dev: false + /flv.js/1.6.2: resolution: {integrity: sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==} dependencies: @@ -7489,6 +7497,13 @@ dependencies: commander: 12.1.0 + /mpegts.js/1.8.0: + resolution: {integrity: sha512-ZtujqtmTjWgcDDkoOnLvrOKUTO/MKgLHM432zGDI8oPaJ0S+ebPxg1nEpDpLw6I7KmV/GZgUIrfbWi3qqEircg==} + dependencies: + es6-promise: 4.2.8 + webworkify-webpack: github.com/xqq/webworkify-webpack/24d1e719b4a6cac37a518b2bb10fe124527ef4ef + dev: false + /ms/2.0.0: resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} dev: true @@ -10692,3 +10707,9 @@ dependencies: tslib: 2.3.0 dev: false + + github.com/xqq/webworkify-webpack/24d1e719b4a6cac37a518b2bb10fe124527ef4ef: + resolution: {tarball: https://codeload.github.com/xqq/webworkify-webpack/tar.gz/24d1e719b4a6cac37a518b2bb10fe124527ef4ef} + name: webworkify-webpack + version: 2.1.5 + dev: false diff --git a/public/config/config.json b/public/config/config.json index 6aa50b7..4e242df 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -11,7 +11,7 @@ "maxZoom": "18", "zoom": "15", "timeGap": 600000, - "systemType": "sm", + "systemType": "gm", "lineWidth": "3", "lineColor": "#1aa034", "fontSize": "18px", diff --git a/src/api/alarm/dangerAssessment/group.ts b/src/api/alarm/dangerAssessment/group.ts new file mode 100644 index 0000000..1ccc025 --- /dev/null +++ b/src/api/alarm/dangerAssessment/group.ts @@ -0,0 +1,89 @@ +// 分组授权接口 +import request from '../../index' +// 列表 +export function getGroupListPage(data: any) { + return request({ + url: 'sys/risk/group/listPage', + method: 'get', + params: data, + data, + }) +} +// 新增 +export function addGroup(data: any) { + return request({ + url: 'sys/risk/group/add', + method: 'post', + data, + }) +} +// 修改 +export function editGroup(data: any) { + return request({ + url: 'sys/risk/group/update', + method: 'post', + data, + }) +} +// 删除 +export function deleteGroup(data: { id: string }) { + return request({ + url: 'sys/risk/group/delete', + method: 'post', + params: data.id, + }) +} +// 风险点树查询 +export function videoTree(data: { riskType: string }) { + return request({ + url: 'sys/risk/group/tree', + method: 'post', + params: data, + }) +} +// 用户树查询 +export function personTree() { + return request({ + url: 'sys/risk/group/person/tree', + method: 'get', + }) +} + +// 分组人员列表（不分页） +export function getGroupUserList(data: any) { + return request({ + url: 'sys/risk/group/groupUserList', + method: 'get', + params: data, + data, + }) +} + +// 分组人员列表（分页） +export function getGroupUserListPage(data: any) { + return request({ + url: 'sys/risk/group/groupUserPage', + method: 'get', + params: data, + data, + }) +} + +// 用户人员删除 +export function deletePersonTree(data: { id: string }) { + return request({ + url: '/sys/risk/group/user/delete', + method: 'get', + params: data.id, + }) +} + +export function fileUpload(data: object) { + return request({ + url: 'file/upload', + method: 'post', + headers: { 'Content-Type': 'multipart/form-data' }, + params: data, + data, + }) +} diff --git a/src/router/modules/alarm.ts b/src/router/modules/alarm.ts index 908735c..db6656e 100644 --- a/src/router/modules/alarm.ts +++ b/src/router/modules/alarm.ts @@ -137,6 +137,16 @@ auth: '/alarm/dangerAssessment/assessment', }, }, + { + path: 'groupList', + name: 'GroupList', + component: () => import('@/views/alarm/dangerAssessment/group/list.vue'), + meta: { + title: '分组授权', + icon: 'ep:key', + auth: '/alarm/dangerAssessment/group', + }, + }, ], }, { diff --git a/src/views/alarm/accidentTracing/list.vue b/src/views/alarm/accidentTracing/list.vue index 9ad7a7d..2d00940 100644 --- a/src/views/alarm/accidentTracing/list.vue +++ b/src/views/alarm/accidentTracing/list.vue @@ -165,8 +165,8 @@ function searchBackList(row: any, index: number) { palyIndex.value = index const currentDate = dayjs(row.alarmTime, 'YYYY-MM-DD HH:mm:ss') - const startTime = currentDate.subtract(2, 'minute').format('YYYY-MM-DD HH:mm:ss') - const endTime = currentDate.add(2, 'minute').format('YYYY-MM-DD HH:mm:ss') + const startTime = currentDate.subtract(3, 'minute').format('YYYY-MM-DD HH:mm:ss') + const endTime = currentDate.add(3, 'minute').format('YYYY-MM-DD HH:mm:ss') const params = { startTime, // 开始时间 endTime, // 结束时间 diff --git a/src/views/alarm/dangerAssessment/group/edit.vue b/src/views/alarm/dangerAssessment/group/edit.vue new file mode 100644 index 0000000..5d26c60 --- /dev/null +++ b/src/views/alarm/dangerAssessment/group/edit.vue @@ -0,0 +1,364 @@ + + + + + + diff --git a/src/views/alarm/dangerAssessment/group/list.vue b/src/views/alarm/dangerAssessment/group/list.vue new file mode 100644 index 0000000..6344494 --- /dev/null +++ b/src/views/alarm/dangerAssessment/group/list.vue @@ -0,0 +1,203 @@ + + + + diff --git a/src/views/bigScreen/flvExtend.vue b/src/views/bigScreen/flvExtend.vue new file mode 100644 index 0000000..f7839f2 --- /dev/null +++ b/src/views/bigScreen/flvExtend.vue @@ -0,0 +1,80 @@ + + + + + + diff --git a/src/views/login.vue b/src/views/login.vue index 8801e38..2b616c5 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -204,6 +204,12 @@ getBaseConfig() }) const gmStopLoinPage = ref('0') + +onBeforeMount(() => { + // 登录之前清理Token + localStorage.setItem('token', '') + userStore.setToken('') +}) onMounted(() => { gmStopLoinPage.value = window.localStorage.getItem('gmStopLoinPage')! })