合并

src/api/cory/contactnotice/index.ts

@@ -16,6 +16,17 @@ export const listContactnotice = (query?: ContactnoticeQuery): AxiosPromise<Cont
   });
 };
 
+/**
+ * 根据项目id查询项目班组班组长信息列表
+ * @param projectId
+ */
+export const listProjectTeamForeman = (projectId: string | number): AxiosPromise<any[]> => {
+  return request({
+    url: '/project/projectTeam/listForeman/' + projectId,
+    method: 'get'
+  });
+};
+
 /**
  * 查询联系单详细
  * @param id

src/api/gis/index.ts

@@ -1,4 +1,5 @@
 import request from '@/utils/request-go';
+import request1 from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import {
   QualityVO,
@@ -172,7 +173,7 @@ export const getweatherList = (): AxiosPromise<weatherVO[]> => {
  */
 
 export const getSafetyDay = (id?: string): AxiosPromise<safetyDayVO> => {
-  return request({
+  return request1({
     url: '/project/project/safetyDay/' + id,
     method: 'get'
   });

src/api/machinery/machinery/index.ts

@@ -1,63 +1,45 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { MachineryForm, MachineryQuery, MachineryVO } from '@/api/machinery/machinery/types';
-
-/**
- * 查询机械列表
- * @param query
- * @returns {*}
- */
-
-export const listMachinery = (query?: MachineryQuery): AxiosPromise<MachineryVO[]> => {
+import request from '@/utils/request-go';
+// 查询机械列表
+export function listBusMachinery(query: object) {
   return request({
-    url: '/machinery/machinery/list',
+    url: '/zm/api/v1/system/busMachinery/list',
     method: 'get',
     params: query
   });
-};
-
-/**
- * 查询机械详细
- * @param id
- */
-export const getMachinery = (id: string | number): AxiosPromise<MachineryVO> => {
+}
+// 查询机械详细
+export function getBusMachinery(id: number) {
   return request({
-    url: '/machinery/machinery/' + id,
-    method: 'get'
+    url: '/zm/api/v1/system/busMachinery/get',
+    method: 'get',
+    params: {
+      id: id.toString()
+    }
   });
-};
-
-/**
- * 新增机械
- * @param data
- */
-export const addMachinery = (data: MachineryForm): AxiosPromise<string | number> => {
+}
+// 新增机械
+export function addBusMachinery(data: object) {
   return request({
-    url: '/machinery/machinery',
+    url: '/zm/api/v1/system/busMachinery/add',
     method: 'post',
     data: data
   });
-};
-
-/**
- * 修改机械
- * @param data
- */
-export const updateMachinery = (data: MachineryForm) => {
+}
+// 修改机械
+export function updateBusMachinery(data: object) {
   return request({
-    url: '/machinery/machinery',
+    url: '/zm/api/v1/system/busMachinery/edit',
     method: 'put',
     data: data
   });
-};
-
-/**
- * 删除机械
- * @param id
- */
-export const delMachinery = (id: string | number | Array<string | number>) => {
+}
+// 删除机械
+export function delBusMachinery(ids: number[]) {
   return request({
-    url: '/machinery/machinery/' + id,
-    method: 'delete'
+    url: '/zm/api/v1/system/busMachinery/delete',
+    method: 'delete',
+    data: {
+      ids: ids
+    }
   });
-};
+}

src/api/machinery/machineryDetail/index.ts

@@ -1,63 +1,45 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { MachineryDetailForm, MachineryDetailQuery, MachineryDetailVO } from '@/api/machinery/machineryDetail/types';
-
-/**
- * 查询机械详情列表
- * @param query
- * @returns {*}
- */
-
-export const listMachineryDetail = (query?: MachineryDetailQuery): AxiosPromise<MachineryDetailVO[]> => {
+import request from '@/utils/request-go';
+// 查询机械详情列表
+export function listBusMachineryDetail(query: object) {
   return request({
-    url: '/machinery/machineryDetail/list',
+    url: '/zm/api/v1/system/busMachineryDetail/list',
     method: 'get',
     params: query
   });
-};
-
-/**
- * 查询机械详情详细
- * @param id
- */
-export const getMachineryDetail = (id: string | number): AxiosPromise<MachineryDetailVO> => {
+}
+// 查询机械详情详细
+export function getBusMachineryDetail(id: number) {
   return request({
-    url: '/machinery/machineryDetail/' + id,
-    method: 'get'
+    url: '/zm/api/v1/system/busMachineryDetail/get',
+    method: 'get',
+    params: {
+      id: id.toString()
+    }
   });
-};
-
-/**
- * 新增机械详情
- * @param data
- */
-export const addMachineryDetail = (data: MachineryDetailForm): AxiosPromise<string | number> => {
+}
+// 新增机械详情
+export function addBusMachineryDetail(data: object) {
   return request({
-    url: '/machinery/machineryDetail',
+    url: '/zm/api/v1/system/busMachineryDetail/add',
     method: 'post',
     data: data
   });
-};
-
-/**
- * 修改机械详情
- * @param data
- */
-export const updateMachineryDetail = (data: MachineryDetailForm) => {
+}
+// 修改机械详情
+export function updateBusMachineryDetail(data: object) {
   return request({
-    url: '/machinery/machineryDetail',
+    url: '/zm/api/v1/system/busMachineryDetail/edit',
     method: 'put',
     data: data
   });
-};
-
-/**
- * 删除机械详情
- * @param id
- */
-export const delMachineryDetail = (id: string | number | Array<string | number>) => {
+}
+// 删除机械详情
+export function delBusMachineryDetail(ids: number[]) {
   return request({
-    url: '/machinery/machineryDetail/' + id,
-    method: 'delete'
+    url: '/zm/api/v1/system/busMachineryDetail/delete',
+    method: 'delete',
+    data: {
+      ids: ids
+    }
   });
-};
+}

src/api/materials/company/index.ts

@@ -1,4 +1,5 @@
-import request from '@/utils/request-go';
+import requestGo from '@/utils/request-go';
+import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { CompanyForm, CompanyQuery, CompanyVO } from '@/api/materials/company/types';
 
@@ -9,7 +10,7 @@ import { CompanyForm, CompanyQuery, CompanyVO } from '@/api/materials/company/ty
  */
 
 export const listCompany = (query?: CompanyQuery): AxiosPromise<CompanyVO[]> => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busCompany/list',
     method: 'get',
     params: query

src/api/materials/materials/index.ts

@@ -1,4 +1,5 @@
-import request from '@/utils/request-go';
+import requestGo from '@/utils/request-go';
+import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { MaterialsForm, MaterialsQuery, MaterialsVO } from '@/api/materials/materials/types';
 
@@ -8,7 +9,7 @@ import { MaterialsForm, MaterialsQuery, MaterialsVO } from '@/api/materials/mate
  * @returns {*}
  */
 export const listMaterials = (query?: MaterialsQuery): AxiosPromise<MaterialsVO[]> => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busEquipmentMaterials/list',
     method: 'get',
     params: query
@@ -20,7 +21,7 @@ export const listMaterials = (query?: MaterialsQuery): AxiosPromise<MaterialsVO[
  * @param id
  */
 export const getMaterials = (id: string | number): AxiosPromise<MaterialsVO> => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busEquipmentMaterials/get',
     method: 'get',
     params: {

src/api/materials/materialsInventory/index.ts

@@ -1,4 +1,5 @@
-import request from '@/utils/request-go';
+import requestGo from '@/utils/request-go';
+import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { MaterialsInventoryForm, MaterialsInventoryQuery, MaterialsInventoryVO } from '@/api/materials/materialsInventory/types';
 
@@ -9,7 +10,7 @@ import { MaterialsInventoryForm, MaterialsInventoryQuery, MaterialsInventoryVO }
  */
 
 export const listMaterialsInventory = (query?: MaterialsInventoryQuery): AxiosPromise<MaterialsInventoryVO[]> => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busEquipmentMaterialsInventory/excellist',
     method: 'get',
     params: query

src/api/project/constructionUser/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-go';
+import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import {
   ConstructionUserForm,
@@ -23,7 +23,7 @@ import requestGo from '@/utils/request-go';
  */
 
 export const listConstructionMonth = (query?: ConstructionMonthQuery): AxiosPromise<AttendanceMonthVO[]> => {
-  return request({
+  return requestGo({
     url: '/zm/api/wxApplet/wxApplet/busAttendance/byOpenId',
     method: 'get',
     params: query
@@ -62,7 +62,7 @@ export const listConstructionUserInTeam = (query?: ConstructionUserQuery): Axios
  * @param id
  */
 export const getConstructionUser = (id: string | number): AxiosPromise<ConstructionUserVO> => {
-  return request({
+  return requestGo({
     url: '/zm/api/wxApplet/wxApplet/busConstructionUser/getDetails?id=' + id,
     method: 'get'
   });
@@ -73,7 +73,7 @@ export const getConstructionUser = (id: string | number): AxiosPromise<Construct
  * @param data
  */
 export const transferConstructionUser = (data: skipType) => {
-  return request({
+  return requestGo({
     url: '/zm/api/wxApplet/wxApplet/busConstructionUser/changePay',
     method: 'put',
     data: data
@@ -84,7 +84,7 @@ export const transferConstructionUser = (data: skipType) => {
  * 查询项目以及项目下的分包公司列表
  */
 export const getProjectContractorList = () => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/sysProject/list?pageNum=1&pageSize=1000',
     method: 'get'
   });
@@ -95,7 +95,7 @@ export const getProjectContractorList = () => {
  * @param data
  */
 export const addConstructionUser = (data: ConstructionUserForm): AxiosPromise<string | number> => {
-  return request({
+  return requestGo({
     url: '/zm/api/wxApplet/wxApplet/busConstructionUser/add',
     method: 'post',
     data: data
@@ -107,7 +107,7 @@ export const addConstructionUser = (data: ConstructionUserForm): AxiosPromise<st
  * @param data
  */
 export const updateConstructionUser = (data: ConstructionUserForm) => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busConstructionUser/pcEdit',
     method: 'put',
     data: data
@@ -119,7 +119,7 @@ export const updateConstructionUser = (data: ConstructionUserForm) => {
  * @param id
  */
 export const delConstructionUser = (data) => {
-  return request({
+  return requestGo({
     url: '/zm/api/wxApplet/wxApplet/busConstructionUser/delete',
     method: 'delete',
     data
@@ -131,7 +131,7 @@ export const delConstructionUser = (data) => {
  * @param data
  */
 export const updateConstructionUserStatus = (data: ConstructionUserStatusForm) => {
-  return request({
+  return requestGo({
     url: '/zm/api/wxApplet/wxApplet/busConstructionUser/changeState',
     method: 'delete',
     data: data
@@ -143,7 +143,7 @@ export const updateConstructionUserStatus = (data: ConstructionUserStatusForm) =
  * @param data
  */
 export const updateConstructionUserPlayCardStatus = (data: ConstructionUserPlayCardForm) => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busConstructionUser/oneClickOpen',
     method: 'put',
     data: data
@@ -155,7 +155,7 @@ export const updateConstructionUserPlayCardStatus = (data: ConstructionUserPlayC
  * @param data
  */
 export const updateConstructionUserPlayCardOneStatus = (data: ConstructionUserPlayCardForm) => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busConstructionUser/clockingCondition',
     method: 'put',
     data: data
@@ -167,7 +167,7 @@ export const updateConstructionUserPlayCardOneStatus = (data: ConstructionUserPl
  * @param data
  */
 export const updateConstructionUserSalary = (data: ConstructionUserSalaryForm) => {
-  return request({
+  return requestGo({
     url: '/zm/api/wxApplet/wxApplet/busConstructionUser/payEdit',
     method: 'put',
     data: data
@@ -179,7 +179,7 @@ export const updateConstructionUserSalary = (data: ConstructionUserSalaryForm) =
  * @param query
  */
 export const getConstructionUserExit = (query: ConstructionUserExitForm) => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busConstructionUser/departureRecord',
     method: 'post',
     data: query
@@ -191,7 +191,7 @@ export const getConstructionUserExit = (query: ConstructionUserExitForm) => {
  * @param query
  */
 export const dowloadConstructionUserTemplate = (query: ConstructionUserTemplateForm) => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busConstructionUser/templateExport',
     method: 'get',
     params: query
@@ -208,7 +208,7 @@ export const dowloadConstructionUserTemplate = (query: ConstructionUserTemplateF
  * @param data
  */
 export const delConstructionUserMember = (data: ConstructionUserMembeForm) => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busConstructionUser/departure',
     method: 'post',
     data

src/api/quality/qualityConstructionLog/index.ts

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

src/api/safety/safetyWeeklyReport/index.ts

@@ -1,4 +1,5 @@
-import request from '@/utils/request-go';
+import requestGo from '@/utils/request-go';
+import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { SafetyWeeklyReportForm, SafetyWeeklyReportQuery, SafetyWeeklyReportVO } from '@/api/safety/safetyWeeklyReport/types';
 
@@ -9,7 +10,7 @@ import { SafetyWeeklyReportForm, SafetyWeeklyReportQuery, SafetyWeeklyReportVO }
  */
 
 export const listSafetyWeeklyReport = (query?: SafetyWeeklyReportQuery): AxiosPromise<SafetyWeeklyReportVO[]> => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busWeeklySecurityReport/list',
     method: 'get',
     params: query
@@ -32,7 +33,7 @@ export const getSafetyWeeklyReport = (id: string | number): AxiosPromise<SafetyW
  * @param data
  */
 export const addSafetyWeeklyReport = (data: SafetyWeeklyReportForm) => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busWeeklySecurityReport/add',
     method: 'post',
     data: data
@@ -56,7 +57,7 @@ export const updateSafetyWeeklyReport = (data: SafetyWeeklyReportForm) => {
  * @param id
  */
 export const delSafetyWeeklyReport = (id: string | number | Array<string | number>) => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busWeeklySecurityReport/delete',
     method: 'delete',
     data: { ids: id }