大屏以及质量管理

src/api/gis/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request';
+import request from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import {
   QualityVO,
@@ -12,15 +12,29 @@ import {
   weatherVO,
   safetyDayVO
 } from './type';
+/**
+ * 查询大屏质量列表
+ * @param query
+ * @returns {*}
+ */
+
+export const getQualityList = (query?: any): AxiosPromise<QualityVO> => {
+  return request({
+    url: '/zm/api/v1/system/busInspectionTicket/gisQualityManagementList',
+    method: 'get',
+    params: query
+  });
+};
+
 /**
  * 查询大屏质量信息
  * @param query
  * @returns {*}
  */
 
-export const getQualityList = (query?: Query): AxiosPromise<QualityVO> => {
+export const getQualityMsg = (query?: any): AxiosPromise<QualityVO> => {
   return request({
-    url: '/quality/qualityInspection/gis',
+    url: '/zm/api/v1/system/busInspectionTicket/gisQualityManagement',
     method: 'get',
     params: query
   });
@@ -32,14 +46,27 @@ export const getQualityList = (query?: Query): AxiosPromise<QualityVO> => {
  * @returns {*}
  */
 
-export const getprojectNewsList = (query?: Query): AxiosPromise<projectNewsVO[]> => {
+export const getprojectNewsList = (query?: any): AxiosPromise<projectNewsVO[]> => {
   return request({
-    url: '/project/projectNews/list/gis',
+    url: '/zm/api/v1/system/sysProjectIntroduce/list',
     method: 'get',
     params: query
   });
 };
 
+/**
+ * 查询进度管理列表
+ * @param query
+ * @returns {*}
+ */
+export const getProgressList = (): AxiosPromise<any> => {
+  return request({
+    url: '/zm/api/v1/system/workStatus/getParentProgress',
+    method: 'get',
+    params: { fangzhenId: 22034 }
+  });
+};
+
 /**
  * 获取项目新闻详细信息
  * @param query
@@ -48,8 +75,9 @@ export const getprojectNewsList = (query?: Query): AxiosPromise<projectNewsVO[]>
 
 export const getprojectNewsDetailList = (id: number): AxiosPromise<projectNewsDetailVO> => {
   return request({
-    url: '/project/projectNews/' + id,
-    method: 'get'
+    url: '/zm/api/v1/system/sysProjectIntroduce/get',
+    method: 'get',
+    params: { id }
   });
 };
 
@@ -59,9 +87,23 @@ export const getprojectNewsDetailList = (id: number): AxiosPromise<projectNewsDe
  * @returns {*}
  */
 
-export const getsafetyInspectionList = (query?: Query): AxiosPromise<safetyInspectionVO> => {
+export const getsafetyInspectionMsg = (query?: Query): AxiosPromise<safetyInspectionVO> => {
   return request({
-    url: '/safety/safetyInspection/gis',
+    url: '/zm/api/v1/system/busHseManagement/gisSafetyManagement',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询大屏安全列表
+ * @param query
+ * @returns {*}
+ */
+
+export const getsafetyInspectionList = (query?: any): AxiosPromise<safetyInspectionVO> => {
+  return request({
+    url: '/zm/api/v1/system/busHseManagement/gisSafetyManagementList',
     method: 'get',
     params: query
   });
@@ -75,7 +117,7 @@ export const getsafetyInspectionList = (query?: Query): AxiosPromise<safetyInspe
 
 export const getConstructionUserList = (query?: Query): AxiosPromise<ConstructionUserVO> => {
   return request({
-    url: '/project/constructionUser/gis',
+    url: '/zm/api/wxApplet/wxApplet/busConstructionUser/attendanceCount',
     method: 'get',
     params: query
   });
@@ -89,7 +131,7 @@ export const getConstructionUserList = (query?: Query): AxiosPromise<Constructio
 
 export const getMachineryrList = (query?: Query): AxiosPromise<MachineryrVO[]> => {
   return request({
-    url: '/machinery/machinery/list/gis',
+    url: '/zm/api/v1/system/busMachinery/mechanicalCondition',
     method: 'get',
     params: query
   });
@@ -103,7 +145,7 @@ export const getMachineryrList = (query?: Query): AxiosPromise<MachineryrVO[]> =
 
 export const getMaterialsList = (query?: Query): AxiosPromise<MaterialsVO[]> => {
   return request({
-    url: '/materials/materials/list/gis',
+    url: '/zm/api/v1/system/busEquipmentMaterialsInventory/excelindex',
     method: 'get',
     params: query
   });
@@ -115,10 +157,11 @@ export const getMaterialsList = (query?: Query): AxiosPromise<MaterialsVO[]> =>
  * @returns {*}
  */
 
-export const getweatherList = (id?: string): AxiosPromise<weatherVO[]> => {
+export const getweatherList = (): AxiosPromise<weatherVO[]> => {
   return request({
-    url: '/project/project/weather/' + id,
-    method: 'get'
+    url: '/zm/api/wxApplet/wxApplet/busConstructionUser/weather',
+    method: 'get',
+    params: { location: '106.54,23.47' }
   });
 };
 
@@ -134,3 +177,16 @@ export const getSafetyDay = (id?: string): AxiosPromise<safetyDayVO> => {
     method: 'get'
   });
 };
+
+/**
+ * 查询项目Ai检测
+ * @param query
+ * @returns {*}
+ */
+export const getAISafetyInspectionList = (query?: any): AxiosPromise<any> => {
+  return request({
+    url: '/zm/api/v1/system/busTour/tourSearchAllList',
+    method: 'get',
+    params: query
+  });
+};

src/api/project/constructionUser/index.ts

@@ -1,4 +1,4 @@
-import request, { download } from '@/utils/request';
+import request from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import {
   ConstructionUserForm,
@@ -177,7 +177,7 @@ export const getConstructionUserExit = (query: ConstructionUserExitForm) => {
 export const dowloadConstructionUserTemplate = (query: ConstructionUserTemplateForm) => {
   let { projectId } = query;
   const fileName = projectId + '_project.zip';
-  return download('/contractor/constructionUserFile/exportFileTemplate', query, fileName);
+  return request.download('/contractor/constructionUserFile/exportFileTemplate', query, fileName);
 };
 
 /**
@@ -186,8 +186,8 @@ export const dowloadConstructionUserTemplate = (query: ConstructionUserTemplateF
  */
 export const delConstructionUserMember = (data: ConstructionUserMembeForm) => {
   return request({
-    url: '/contractor/projectTeamMember/',
-    method: 'delete',
+    url: '/zm/api/v1/system/busConstructionUser/departure',
+    method: 'post',
     data
   });
 };

src/api/project/projectTeam/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request';
+import request from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import { ProjectTeamForemanResp, ProjectTeamForm, ProjectTeamQuery, ProjectTeamVO } from '@/api/project/projectTeam/types';
 
@@ -10,7 +10,7 @@ import { ProjectTeamForemanResp, ProjectTeamForm, ProjectTeamQuery, ProjectTeamV
 
 export const listProjectTeam = (query?: ProjectTeamQuery): AxiosPromise<ProjectTeamVO[]> => {
   return request({
-    url: '/project/projectTeam/list',
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeam/list',
     method: 'get',
     params: query
   });
@@ -22,8 +22,9 @@ export const listProjectTeam = (query?: ProjectTeamQuery): AxiosPromise<ProjectT
  */
 export const listProjectTeamForeman = (projectId: string | number): AxiosPromise<ProjectTeamForemanResp[]> => {
   return request({
-    url: '/project/projectTeam/listForeman/' + projectId,
-    method: 'get'
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeam/get',
+    method: 'get',
+    params: { projectId }
   });
 };
 
@@ -33,8 +34,9 @@ export const listProjectTeamForeman = (projectId: string | number): AxiosPromise
  */
 export const getProjectTeam = (id: string | number): AxiosPromise<ProjectTeamVO> => {
   return request({
-    url: '/project/projectTeam/' + id,
-    method: 'get'
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeam/get',
+    method: 'get',
+    params: { id }
   });
 };
 
@@ -44,7 +46,7 @@ export const getProjectTeam = (id: string | number): AxiosPromise<ProjectTeamVO>
  */
 export const addProjectTeam = (data: ProjectTeamForm): AxiosPromise<string | number> => {
   return request({
-    url: '/project/projectTeam',
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeam/add',
     method: 'post',
     data: data
   });
@@ -56,7 +58,7 @@ export const addProjectTeam = (data: ProjectTeamForm): AxiosPromise<string | num
  */
 export const updateProjectTeam = (data: ProjectTeamForm) => {
   return request({
-    url: '/project/projectTeam',
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeam/edit',
     method: 'put',
     data: data
   });
@@ -66,9 +68,10 @@ export const updateProjectTeam = (data: ProjectTeamForm) => {
  * 删除项目班组
  * @param id
  */
-export const delProjectTeam = (id: string | number | Array<string | number>) => {
+export const delProjectTeam = (ids: string | number | Array<string | number>) => {
   return request({
-    url: '/project/projectTeam/' + id,
-    method: 'delete'
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeam/delete',
+    method: 'delete',
+    params: { ids }
   });
 };

src/api/project/projectTeamMember/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request';
+import request from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import { ProjectTeamMemberForm, ProjectTeamMemberQuery, ProjectTeamMemberVO } from '@/api/project/projectTeamMember/types';
 
@@ -10,7 +10,7 @@ import { ProjectTeamMemberForm, ProjectTeamMemberQuery, ProjectTeamMemberVO } fr
 
 export const listProjectTeamMember = (query?: ProjectTeamMemberQuery): AxiosPromise<ProjectTeamMemberVO[]> => {
   return request({
-    url: '/project/projectTeamMember/list',
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeamMember/list',
     method: 'get',
     params: query
   });
@@ -22,8 +22,9 @@ export const listProjectTeamMember = (query?: ProjectTeamMemberQuery): AxiosProm
  */
 export const getProjectTeamMember = (id: string | number): AxiosPromise<ProjectTeamMemberVO> => {
   return request({
-    url: '/project/projectTeamMember/' + id,
-    method: 'get'
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeamMember/get',
+    method: 'get',
+    params: { id }
   });
 };
 
@@ -33,7 +34,7 @@ export const getProjectTeamMember = (id: string | number): AxiosPromise<ProjectT
  */
 export const addProjectTeamMember = (data: ProjectTeamMemberForm): AxiosPromise<string | number> => {
   return request({
-    url: '/project/projectTeamMember',
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeamMember/add',
     method: 'post',
     data: data
   });
@@ -45,7 +46,7 @@ export const addProjectTeamMember = (data: ProjectTeamMemberForm): AxiosPromise<
  */
 export const updateProjectTeamMember = (data: ProjectTeamMemberForm) => {
   return request({
-    url: '/project/projectTeamMember',
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeamMember/edit',
     method: 'put',
     data: data
   });
@@ -57,7 +58,8 @@ export const updateProjectTeamMember = (data: ProjectTeamMemberForm) => {
  */
 export const delProjectTeamMember = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/project/projectTeamMember/' + id,
-    method: 'delete'
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeamMember/delete',
+    method: 'delete',
+    params: { ids: id }
   });
 };

src/api/quality/qualityConstructionLog/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request';
+import request from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import { QualityConstructionLogVO, QualityConstructionLogForm, QualityConstructionLogQuery } from '@/api/quality/qualityConstructionLog/types';
 
@@ -10,7 +10,7 @@ import { QualityConstructionLogVO, QualityConstructionLogForm, QualityConstructi
 
 export const listQualityConstructionLog = (query?: QualityConstructionLogQuery): AxiosPromise<QualityConstructionLogVO[]> => {
   return request({
-    url: '/quality/qualityConstructionLog/list',
+    url: '/zm/api/v1/system/busConstructionLog/list',
     method: 'get',
     params: query
   });
@@ -22,8 +22,9 @@ export const listQualityConstructionLog = (query?: QualityConstructionLogQuery):
  */
 export const getQualityConstructionLog = (id: string | number): AxiosPromise<QualityConstructionLogVO> => {
   return request({
-    url: '/quality/qualityConstructionLog/' + id,
-    method: 'get'
+    url: 'zm/api/v1/system/busConstructionLog/get',
+    method: 'get',
+    params: { id }
   });
 };
 

src/api/quality/qualityInspection/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request';
+import request from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import { QualityInspectionVO, QualityInspectionForm, QualityInspectionQuery } from '@/api/quality/qualityInspection/types';
 
@@ -10,7 +10,7 @@ import { QualityInspectionVO, QualityInspectionForm, QualityInspectionQuery } fr
 
 export const listQualityInspection = (query?: QualityInspectionQuery): AxiosPromise<QualityInspectionVO[]> => {
   return request({
-    url: '/quality/qualityInspection/list',
+    url: '/zm/api/v1/system/busInspectionTicket/list',
     method: 'get',
     params: query
   });
@@ -22,8 +22,9 @@ export const listQualityInspection = (query?: QualityInspectionQuery): AxiosProm
  */
 export const getQualityInspection = (id: string | number): AxiosPromise<QualityInspectionVO> => {
   return request({
-    url: '/quality/qualityInspection/' + id,
-    method: 'get'
+    url: '/zm/api/v1/system/busInspectionTicket/get',
+    method: 'get',
+    params: { id }
   });
 };
 
@@ -33,7 +34,7 @@ export const getQualityInspection = (id: string | number): AxiosPromise<QualityI
  */
 export const addQualityInspection = (data: QualityInspectionForm) => {
   return request({
-    url: '/quality/qualityInspection',
+    url: '/zm/api/v1/system/busInspectionTicket/add',
     method: 'post',
     data: data
   });
@@ -61,3 +62,8 @@ export const delQualityInspection = (id: string | number | Array<string | number
     method: 'delete'
   });
 };
+
+// 下载OSS对象存储
+export function downLoadOss(ossId: { id?: string | number; idList?: string | number | Array<string | number> }, url: string, fileName: string) {
+  return request.download(url, ossId, fileName);
+}

src/api/types.ts

@@ -67,6 +67,7 @@ export interface UserProject {
   projectId: string;
   projectName: string;
   shortName: string;
+  goId: string;
 }
 
 export interface IdAndNameVO {