From ea98580b07f2dbc3f8ab1e783cbd3370eb69125b Mon Sep 17 00:00:00 2001 From: Teo <2642673902@qq.com> Date: Thu, 19 Jun 2025 19:58:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=AE=A4=EF=BC=8C=E6=91=84?= =?UTF-8?q?=E5=83=8F=E5=A4=B4=E5=B7=A5=E4=BD=9C=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/other/ys7Device/index.ts | 14 +- src/api/other/ys7Device/types.ts | 9 + src/api/other/ys7DeviceImg/index.ts | 63 ++ src/api/other/ys7DeviceImg/types.ts | 76 +++ src/api/progress/plan/index.ts | 2 +- .../progressCategoryTemplate/types.ts | 27 +- src/views/gisHome/component/map.vue | 20 +- src/views/gisHome/js/renderFacilities.js | 288 +++++---- src/views/monitorRoom/icon/em.png | Bin 0 -> 6068 bytes src/views/monitorRoom/icon/four.png | Bin 0 -> 613 bytes src/views/monitorRoom/icon/four_1.png | Bin 0 -> 555 bytes src/views/monitorRoom/icon/nine.png | Bin 0 -> 940 bytes src/views/monitorRoom/icon/nine_1.png | Bin 0 -> 643 bytes src/views/monitorRoom/icon/one.png | Bin 0 -> 482 bytes src/views/monitorRoom/icon/one_1.png | Bin 0 -> 406 bytes src/views/monitorRoom/icon/six.png | Bin 0 -> 1304 bytes src/views/monitorRoom/icon/six_1.png | Bin 0 -> 615 bytes src/views/monitorRoom/index.vue | 607 ++++++++++++++++++ src/views/other/ys7DeviceImg/index.vue | 202 ++++++ 19 files changed, 1141 insertions(+), 167 deletions(-) create mode 100644 src/api/other/ys7DeviceImg/index.ts create mode 100644 src/api/other/ys7DeviceImg/types.ts create mode 100644 src/views/monitorRoom/icon/em.png create mode 100644 src/views/monitorRoom/icon/four.png create mode 100644 src/views/monitorRoom/icon/four_1.png create mode 100644 src/views/monitorRoom/icon/nine.png create mode 100644 src/views/monitorRoom/icon/nine_1.png create mode 100644 src/views/monitorRoom/icon/one.png create mode 100644 src/views/monitorRoom/icon/one_1.png create mode 100644 src/views/monitorRoom/icon/six.png create mode 100644 src/views/monitorRoom/icon/six_1.png create mode 100644 src/views/monitorRoom/index.vue create mode 100644 src/views/other/ys7DeviceImg/index.vue diff --git a/src/api/other/ys7Device/index.ts b/src/api/other/ys7Device/index.ts index e94e93a..0e70048 100644 --- a/src/api/other/ys7Device/index.ts +++ b/src/api/other/ys7Device/index.ts @@ -1,6 +1,6 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { Ys7DeviceVO, Ys7DeviceForm, Ys7DeviceQuery } from '@/api/other/ys7Device/types'; +import { Ys7DeviceVO, Ys7DeviceForm, Ys7DeviceQuery, CameraListForm } from '@/api/other/ys7Device/types'; /** * 查询萤石摄像头列表 @@ -89,3 +89,15 @@ export const getAccessToken = () => { method: 'get' }); }; + +/** + * 根据项目查询萤石摄像头列表 + * @param id + */ +export const getCameraListByProjectId = (params: CameraListForm): AxiosPromise => { + return request({ + url: '/other/ys7Device/list/project', + method: 'get', + params + }); +}; diff --git a/src/api/other/ys7Device/types.ts b/src/api/other/ys7Device/types.ts index 46de86d..671664f 100644 --- a/src/api/other/ys7Device/types.ts +++ b/src/api/other/ys7Device/types.ts @@ -129,3 +129,12 @@ export interface Ys7DeviceQuery extends PageQuery { */ params?: any; } + +export interface CameraListForm { + /** + * 项目id + */ + projectId: string | number; + pageSize?: number; + pageNum?: number; +} diff --git a/src/api/other/ys7DeviceImg/index.ts b/src/api/other/ys7DeviceImg/index.ts new file mode 100644 index 0000000..bc814c2 --- /dev/null +++ b/src/api/other/ys7DeviceImg/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { Ys7DeviceImgVO, Ys7DeviceImgForm, Ys7DeviceImgQuery } from '@/api/other/ys7DeviceImg/types'; + +/** + * 查询萤石摄像头图片列表 + * @param query + * @returns {*} + */ + +export const listYs7DeviceImg = (query?: Ys7DeviceImgQuery): AxiosPromise => { + return request({ + url: '/other/ys7DeviceImg/list', + method: 'get', + params: query + }); +}; + +/** + * 查询萤石摄像头图片详细 + * @param id + */ +export const getYs7DeviceImg = (id: string | number): AxiosPromise => { + return request({ + url: '/other/ys7DeviceImg/' + id, + method: 'get' + }); +}; + +/** + * 新增萤石摄像头图片 + * @param data + */ +export const addYs7DeviceImg = (data: Ys7DeviceImgForm) => { + return request({ + url: '/other/ys7DeviceImg', + method: 'post', + data: data + }); +}; + +/** + * 修改萤石摄像头图片 + * @param data + */ +export const updateYs7DeviceImg = (data: Ys7DeviceImgForm) => { + return request({ + url: '/other/ys7DeviceImg', + method: 'put', + data: data + }); +}; + +/** + * 删除萤石摄像头图片 + * @param id + */ +export const delYs7DeviceImg = (id: string | number | Array) => { + return request({ + url: '/other/ys7DeviceImg/' + id, + method: 'delete' + }); +}; diff --git a/src/api/other/ys7DeviceImg/types.ts b/src/api/other/ys7DeviceImg/types.ts new file mode 100644 index 0000000..6973205 --- /dev/null +++ b/src/api/other/ys7DeviceImg/types.ts @@ -0,0 +1,76 @@ +export interface Ys7DeviceImgVO { + /** + * 设备序列号 + */ + deviceSerial: string; + id?: string | number; + /** + * 设备名称 + */ + deviceName: string; + + /** + * 图片地址 + */ + url: string; + + /** + * 备注 + */ + createTime: string; +} + +export interface Ys7DeviceImgForm extends BaseEntity { + /** + * 主键id + */ + id?: string | number; + + /** + * 设备id + */ + deviceId?: string | number; + + /** + * 设备序列号 + */ + deviceSerial?: string; + + /** + * 设备名称 + */ + deviceName?: string; + + /** + * 图片地址 + */ + url?: string; + + /** + * 备注 + */ + createTime?: string; +} + +export interface Ys7DeviceImgQuery extends PageQuery { + /** + * 设备id + */ + id?: string | number; + + /** + * 设备序列号 + */ + deviceSerial?: string; + + /** + * 设备名称 + */ + deviceName?: string; + + /** + * 日期范围参数 + */ + params?: any; + createTime?: string; +} diff --git a/src/api/progress/plan/index.ts b/src/api/progress/plan/index.ts index 0f8b668..6abf33d 100644 --- a/src/api/progress/plan/index.ts +++ b/src/api/progress/plan/index.ts @@ -192,7 +192,7 @@ export const deleteDaily = (query: { id: string; detailIdList: string[] }) => { export const workScheduleDel = () => { return request({ - url: '/facility/matrix/gis/position/1933358820034174995', + url: '/facility/matrix/gis/position?projectId=1930896467736707073', method: 'get' }); }; diff --git a/src/api/progress/progressCategoryTemplate/types.ts b/src/api/progress/progressCategoryTemplate/types.ts index 12e0292..66ee461 100644 --- a/src/api/progress/progressCategoryTemplate/types.ts +++ b/src/api/progress/progressCategoryTemplate/types.ts @@ -3,7 +3,11 @@ export interface ProgressCategoryTemplateVO { * 类别名称 */ name: string; - + /** + * 主键id + */ + id?: string | number; + pid?: string | number; /** * 计量方式(0无 1数量 2百分比) */ @@ -24,10 +28,10 @@ export interface ProgressCategoryTemplateVO { */ remark: string; - /** - * 子对象 - */ - children: ProgressCategoryTemplateVO[]; + /** + * 子对象 + */ + children: ProgressCategoryTemplateVO[]; } export interface ProgressCategoryTemplateForm extends BaseEntity { @@ -65,11 +69,9 @@ export interface ProgressCategoryTemplateForm extends BaseEntity { * 备注 */ remark?: string; - } export interface ProgressCategoryTemplateQuery { - /** * 父类别id */ @@ -95,11 +97,8 @@ export interface ProgressCategoryTemplateQuery { */ projectId?: string | number; - /** - * 日期范围参数 - */ - params?: any; + /** + * 日期范围参数 + */ + params?: any; } - - - diff --git a/src/views/gisHome/component/map.vue b/src/views/gisHome/component/map.vue index fd40faf..d5ae124 100644 --- a/src/views/gisHome/component/map.vue +++ b/src/views/gisHome/component/map.vue @@ -1,6 +1,5 @@ + + diff --git a/src/views/other/ys7DeviceImg/index.vue b/src/views/other/ys7DeviceImg/index.vue new file mode 100644 index 0000000..3c4c292 --- /dev/null +++ b/src/views/other/ys7DeviceImg/index.vue @@ -0,0 +1,202 @@ + + +