监控室，摄像头工作列表

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<Ys7DeviceVO> => {
+  return request({
+    url: '/other/ys7Device/list/project',
+    method: 'get',
+    params
+  });
+};

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;
+}

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<Ys7DeviceImgVO[]> => {
+  return request({
+    url: '/other/ys7DeviceImg/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询萤石摄像头图片详细
+ * @param id
+ */
+export const getYs7DeviceImg = (id: string | number): AxiosPromise<Ys7DeviceImgVO> => {
+  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<string | number>) => {
+  return request({
+    url: '/other/ys7DeviceImg/' + id,
+    method: 'delete'
+  });
+};

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;
+}

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'
   });
 };

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;
 }
-
-
-