进度填报大屏界面基本功能

src/api/progress/plan/index.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { ProgressCategoryVO, ProgressCategoryForm, ProgressCategoryQuery, ProgressPlanForm, lastTimeVo, workScheduleListVO, workScheduleListQuery, progressPlanDetailForm } from '@/api/progress/plan/types';
+import { ProgressCategoryVO, ProgressCategoryForm, ProgressCategoryQuery, ProgressPlanForm, lastTimeVo, workScheduleListVO, workScheduleListQuery, progressPlanDetailForm, pvModuleListQuery, pvModuleListVO } from '@/api/progress/plan/types';
 
 /**
  * 查询进度类别列表
@@ -99,7 +99,7 @@ export const workScheduleAddPlan = (data: ProgressPlanForm) => {
 
 /**
  * 获取进度计划详细信息
- * @param data
+ * @param params
  */
 export const workScheduleList = (query: workScheduleListQuery):AxiosPromise<workScheduleListVO[]> => {
   return request({
@@ -109,6 +109,17 @@ export const workScheduleList = (query: workScheduleListQuery):AxiosPromise<work
   });
 };
 
+/**
+ * 获取进度类别坐标信息
+ * @param params
+ */
+export const workScheduleListPosition = (id: string):AxiosPromise<any> => {
+  return request({
+    url: '/progress/progressCategory/coordinate/' + id,
+    method: 'get',
+  });
+};
+
 /**
  * 新增进度计划详情（百分比设施）
  * @param data
@@ -120,9 +131,53 @@ export const workScheduleSubmit = (data: progressPlanDetailForm) => {
     data: data
   });
 };
-export const workScheduleDel=()=>{}
-      
-export const pvModuleList=()=>{}
-export const addDaily=()=>{}
-export const getDailyBook=()=>{}
-export const deleteDaily=()=>{}
+
+/**
+ * 获取进度计划详情未完成设施详细信息
+ * @param params
+ */
+export const pvModuleList = (query: pvModuleListQuery):AxiosPromise<pvModuleListVO[]> => {
+  return request({
+    url: '/progress/progressPlanDetail/detail/unFinish/' + query.id ,
+    method: 'get',
+    params:query
+  });
+};
+
+/**
+ * 新增进度计划详情（普通设施）
+ * @param data
+ */
+export const addDaily = (data: progressPlanDetailForm) => {
+  return request({
+    url: '/progress/progressPlanDetail/insert/detail',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 获取进度计划详情已完成设施详细信息
+ * @param params
+ */
+export const getDailyBook = (query: pvModuleListQuery):AxiosPromise<pvModuleListVO[]> => {
+  return request({
+    url: '/progress/progressPlanDetail/detail/finished/'+ query.id,
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 删除进度计划详情
+ * @param id
+ */
+export const deleteDaily = (query: {id:string,detailIdList:string[]}) => {
+  return request({
+    url: '/progress/progressPlanDetail/remove/detail',
+    method: 'delete',
+    params: query
+  });
+};
+
+export const workScheduleDel=()=>{}

src/api/progress/plan/types.ts

@@ -28,6 +28,8 @@ export interface ProgressCategoryVO {
    * 子对象
    */
   children: ProgressCategoryVO[];
+  threeChildren: any[];
+  hasChildren:any;
 }
 
 export interface ProgressCategoryForm extends BaseEntity {
@@ -88,9 +90,22 @@ export interface workScheduleListVO {
   }[];
 }
 
+export interface pvModuleListQuery {
+  id: string | number;
+  pageSize?: number;
+  pageNum?: number;
+}
+
+export interface pvModuleListVO {
+  id: string | number;
+  name: string;
+  status: string;
+}
+
 export interface progressPlanDetailForm {
   id: string | number;
-  finishedNumber: number;
+  finishedNumber?: number;
+  finishedDetailIdList?: any[];
   submitTime?: string;
 }
 

src/api/progress/progressCategoryTemplate/index.ts

@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ProgressCategoryTemplateVO, ProgressCategoryTemplateForm, ProgressCategoryTemplateQuery } from '@/api/progress/progressCategoryTemplate/types';
+
+/**
+ * 查询进度类别模版列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listProgressCategoryTemplate = (query?: ProgressCategoryTemplateQuery): AxiosPromise<ProgressCategoryTemplateVO[]> => {
+  return request({
+    url: '/progress/progressCategoryTemplate/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询进度类别模版详细
+ * @param id
+ */
+export const getProgressCategoryTemplate = (id: string | number): AxiosPromise<ProgressCategoryTemplateVO> => {
+  return request({
+    url: '/progress/progressCategoryTemplate/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增进度类别模版
+ * @param data
+ */
+export const addProgressCategoryTemplate = (data: ProgressCategoryTemplateForm) => {
+  return request({
+    url: '/progress/progressCategoryTemplate',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改进度类别模版
+ * @param data
+ */
+export const updateProgressCategoryTemplate = (data: ProgressCategoryTemplateForm) => {
+  return request({
+    url: '/progress/progressCategoryTemplate',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除进度类别模版
+ * @param id
+ */
+export const delProgressCategoryTemplate = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/progress/progressCategoryTemplate/' + id,
+    method: 'delete'
+  });
+};

src/api/progress/progressCategoryTemplate/types.ts

@@ -0,0 +1,105 @@
+export interface ProgressCategoryTemplateVO {
+  /**
+   * 类别名称
+   */
+  name: string;
+
+  /**
+   * 计量方式（0无 1数量 2百分比）
+   */
+  unitType: string;
+
+  /**
+   * 工作类型
+   */
+  workType: string;
+
+  /**
+   * 项目id（0表示共用）
+   */
+  projectId: string | number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+    /**
+     * 子对象
+     */
+    children: ProgressCategoryTemplateVO[];
+}
+
+export interface ProgressCategoryTemplateForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 父类别id
+   */
+  pid?: string | number;
+
+  /**
+   * 类别名称
+   */
+  name?: string;
+
+  /**
+   * 计量方式（0无 1数量 2百分比）
+   */
+  unitType?: string;
+
+  /**
+   * 工作类型
+   */
+  workType?: string;
+
+  /**
+   * 项目id（0表示共用）
+   */
+  projectId?: string | number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface ProgressCategoryTemplateQuery {
+
+  /**
+   * 父类别id
+   */
+  pid?: string | number;
+
+  /**
+   * 类别名称
+   */
+  name?: string;
+
+  /**
+   * 计量方式（0无 1数量 2百分比）
+   */
+  unitType?: string;
+
+  /**
+   * 工作类型
+   */
+  workType?: string;
+
+  /**
+   * 项目id（0表示共用）
+   */
+  projectId?: string | number;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+