优化

src/api/other/ys7DeviceImg/index.ts

@@ -1,3 +1,4 @@
+import request1 from '@/utils/request-go';
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { Ys7DeviceImgVO, Ys7DeviceImgForm, Ys7DeviceImgQuery } from '@/api/other/ys7DeviceImg/types';
@@ -9,8 +10,8 @@ import { Ys7DeviceImgVO, Ys7DeviceImgForm, Ys7DeviceImgQuery } from '@/api/other
  */
 
 export const listYs7DeviceImg = (query?: Ys7DeviceImgQuery): AxiosPromise<Ys7DeviceImgVO[]> => {
-  return request({
-    url: '/other/ys7DeviceImg/list',
+  return request1({
+    url: '/zm/api/v1/system/ys7DevicesImg/list',
     method: 'get',
     params: query
   });

src/api/project/goUser/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request';
+import request from '@/utils/request-go';
 // 人员 考勤 补卡 请假接口 对接go 后台
 // 获取施工人员列表
 export const getBusConstructionUser = (params) => {
@@ -8,6 +8,15 @@ export const getBusConstructionUser = (params) => {
     params
   });
 };
+// 根据项目获取班组列表
+export const getSysProjectTeamList = (params) => {
+  return request({
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeam/list',
+    method: 'get',
+    params
+  });
+};
+
 // 获取人员详情
 export const getDetails = (id) => {
   return request({
@@ -26,10 +35,18 @@ export const pcSelectBelowProjectOfPersonnel = (params) => {
     params
   });
 };
+// 获取考勤列表数据
+export const busAttendancepCList = (params) => {
+  return request({
+    url: '/zm/api/wxApplet/wxApplet/busAttendance/pCList',
+    method: 'get',
+    params
+  });
+};
 // 获取考勤图表数据
 export const pcCollectDataForTwoWeeks = (params) => {
   return request({
-    url: '/api/v1/system/busConstructionUser/pcCollectDataForTwoWeeks',
+    url: '/zm/api/v1/system/busConstructionUser/pcCollectDataForTwoWeeks',
     method: 'get',
     params
   });
@@ -49,4 +66,22 @@ export const busAskforleaveList = (params) => {
     method: 'get',
     params
   });
+};
+// 获取字典
+export const getDictData = (dictType) => {
+  return request({
+    url: '/zm/api/v1/system/dict/data/getDictData',
+    method: 'get',
+    params: {
+      dictType: dictType,
+      defaultValue: ''
+    }
+  });
+};
+export const busHseSecurityLogList = (params) => {
+  return request({
+    url: '/zm/api/v1/system/busHseSecurityLog/list',
+    method: 'get',
+    params
+  });
 };

src/api/safety/recognizeRecord/index.ts

@@ -1,4 +1,5 @@
 import request from '@/utils/request';
+import request1 from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import { RecognizeRecordVO, RecognizeRecordForm, RecognizeRecordQuery } from '@/api/safety/recognizeRecord/types';
 
@@ -9,8 +10,8 @@ import { RecognizeRecordVO, RecognizeRecordForm, RecognizeRecordQuery } from '@/
  */
 
 export const listRecognizeRecord = (query?: RecognizeRecordQuery): AxiosPromise<RecognizeRecordVO[]> => {
-  return request({
-    url: '/safety/recognizeRecord/list',
+  return request1({
+    url: '/zm/api/v1/system/busTour/list',
     method: 'get',
     params: query
   });

src/api/safety/safetyInspection/index.ts

@@ -1,4 +1,5 @@
 import request from '@/utils/request';
+import request1 from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import { SafetyInspectionForm, SafetyInspectionQuery, SafetyInspectionVO } from '@/api/safety/safetyInspection/types';
 
@@ -9,8 +10,8 @@ import { SafetyInspectionForm, SafetyInspectionQuery, SafetyInspectionVO } from
  */
 
 export const listSafetyInspection = (query?: SafetyInspectionQuery): AxiosPromise<SafetyInspectionVO[]> => {
-  return request({
-    url: '/safety/safetyInspection/list',
+  return request1({
+    url: '/zm/api/v1/system/busHseManagement/list',
     method: 'get',
     params: query
   });
@@ -20,10 +21,11 @@ export const listSafetyInspection = (query?: SafetyInspectionQuery): AxiosPromis
  * 查询安全巡检工单详细
  * @param id
  */
-export const getSafetyInspection = (id: string | number): AxiosPromise<SafetyInspectionVO> => {
-  return request({
-    url: '/safety/safetyInspection/' + id,
-    method: 'get'
+export const getSafetyInspection = (query): AxiosPromise<SafetyInspectionVO> => {
+  return request1({
+    url: '/zm/api/v1/system/busHseManagement/get',
+    method: 'get',
+    params: query
   });
 };
 

src/api/safety/teamMeeting/index.ts

@@ -1,4 +1,5 @@
 import request from '@/utils/request';
+import request1 from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import { TeamMeetingForm, TeamMeetingQuery, TeamMeetingVO } from '@/api/safety/teamMeeting/types';
 
@@ -9,8 +10,8 @@ import { TeamMeetingForm, TeamMeetingQuery, TeamMeetingVO } from '@/api/safety/t
  */
 
 export const listTeamMeeting = (query?: TeamMeetingQuery): AxiosPromise<TeamMeetingVO[]> => {
-  return request({
-    url: '/safety/teamMeeting/list',
+  return request1({
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeamSquad/list',
     method: 'get',
     params: query
   });
@@ -20,10 +21,11 @@ export const listTeamMeeting = (query?: TeamMeetingQuery): AxiosPromise<TeamMeet
  * 查询站班会详细
  * @param id
  */
-export const getTeamMeeting = (id: string | number): AxiosPromise<TeamMeetingVO> => {
-  return request({
-    url: '/safety/teamMeeting/' + id,
-    method: 'get'
+export const getTeamMeeting = (query): AxiosPromise<TeamMeetingVO> => {
+  return request1({
+    url: '/zm/api/wxApplet/wxApplet/sysProjectTeamSquad/get',
+    method: 'get',
+    params: query
   });
 };
 

src/api/safety/violationLevel/index.ts

@@ -1,3 +1,4 @@
+import request1 from '@/utils/request-go';
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { ViolationLevelVO, ViolationLevelForm, ViolationLevelQuery } from '@/api/safety/violationLevel/types';
@@ -9,8 +10,8 @@ import { ViolationLevelVO, ViolationLevelForm, ViolationLevelQuery } from '@/api
  */
 
 export const listViolationLevel = (query?: ViolationLevelQuery): AxiosPromise<ViolationLevelVO[]> => {
-  return request({
-    url: '/safety/violationLevel/list',
+  return request1({
+    url: '/zm/api/v1/system/busViolationLevel/list',
     method: 'get',
     params: query
   });

src/api/safety/violationRecord/index.ts

@@ -1,4 +1,5 @@
 import request from '@/utils/request';
+import request1 from '@/utils/request-go';
 import { AxiosPromise } from 'axios';
 import { ViolationRecordVO, ViolationRecordForm, ViolationRecordQuery } from '@/api/safety/violationRecord/types';
 
@@ -9,8 +10,8 @@ import { ViolationRecordVO, ViolationRecordForm, ViolationRecordQuery } from '@/
  */
 
 export const listViolationRecord = (query?: ViolationRecordQuery): AxiosPromise<ViolationRecordVO[]> => {
-  return request({
-    url: '/safety/violationRecord/list',
+  return request1({
+    url: '/zm/api/v1/system/busViolationRecord/list',
     method: 'get',
     params: query
   });
@@ -20,10 +21,11 @@ export const listViolationRecord = (query?: ViolationRecordQuery): AxiosPromise<
  * 查询违规记录详细
  * @param id
  */
-export const getViolationRecord = (id: string | number): AxiosPromise<ViolationRecordVO> => {
-  return request({
-    url: '/safety/violationRecord/' + id,
-    method: 'get'
+export const getViolationRecord = (query): AxiosPromise<ViolationRecordVO> => {
+  return request1({
+    url: '/zm/api/v1/system/busViolationRecord/get',
+    method: 'get',
+    params: query
   });
 };