Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/new_project into ljx

src/api/progress/progressCategory/index.ts

@@ -8,10 +8,11 @@ import { ProgressCategoryVO, ProgressCategoryForm, ProgressCategoryQuery } from
  * @returns {*}
  */
 
-export const listProgressCategory = (id?: string | number): AxiosPromise<any[]> => {
+export const listProgressCategory = (parentId?: string | number,name?:string): AxiosPromise<any[]> => {
   return request({
-    url: '/progress/progressCategory/listByParent/' + id,
-    method: 'get'
+    url: '/progress/progressCategory/listByParent',
+    method: 'get',
+    params:{parentId,name}
   });
 };
 

src/api/progress/progressCategoryTemplate/index.ts

@@ -78,9 +78,10 @@ export const getTabList = (id: string) => {
  * @param parentId
  * @returns {*}
  */
-export const listProgressCategoryTemplateByParent = (parentId: string | number): AxiosPromise<ProgressCategoryTemplateVO[]> => {
+export const listProgressCategoryTemplateByParent = (parentId: string | number,name:string): AxiosPromise<ProgressCategoryTemplateVO[]> => {
   return request({
-    url: '/progress/progressCategoryTemplate/listByParent/' + parentId,
-    method: 'get'
+    url: '/progress/progressCategoryTemplate/listByParent' ,
+    method: 'get',
+    params:{parentId,name}
   });
 };

src/api/project/constructionUser/index.ts

@@ -164,7 +164,7 @@ export const updateConstructionUserSalary = (data: ConstructionUserSalaryForm) =
  */
 export const getConstructionUserExit = (query: ConstructionUserExitForm) => {
   return request({
-    url: '/contractor/constructionUserExit/list',
+    url: '/project/constructionUserExit/list',
     method: 'get',
     params: query
   });
@@ -204,7 +204,6 @@ export const importConstructionUserInfo = (file: string) => {
   });
 };
 
-
 // 获取项目列表
 export const ProjectList = (query) => {
   return request({
@@ -216,7 +215,7 @@ export const ProjectList = (query) => {
 
 // 获取班组列表
 export const TeamList = (query) => {
-  return request({    
+  return request({
     url: '/contractor/constructionUser/teamList',
     method: 'get',
     params: query
@@ -230,4 +229,4 @@ export const TeamDistribution = (data) => {
     method: 'post',
     data: data
   });
-};
+};

src/api/project/constructionUserFile/index.ts

@@ -10,7 +10,7 @@ import { ConstructionUserFileVO, ConstructionUserFileForm, ConstructionUserFileQ
 
 export const listConstructionUserFile = (query?: ConstructionUserFileQuery): AxiosPromise<ConstructionUserFileVO[]> => {
   return request({
-    url: '/project/constructionUserFile/list',
+    url: '/contractor/constructionUserFile/list',
     method: 'get',
     params: query
   });
@@ -22,7 +22,7 @@ export const listConstructionUserFile = (query?: ConstructionUserFileQuery): Axi
  */
 export const setConstructionUserFile = (data: ConstructionUserFileForm): AxiosPromise<string | number> => {
   return request({
-    url: '/project/constructionUserFile/save',
+    url: '/contractor/constructionUserFile/save',
     method: 'post',
     data
   });
@@ -34,7 +34,7 @@ export const setConstructionUserFile = (data: ConstructionUserFileForm): AxiosPr
  */
 export const delConstructionUserFile = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/project/constructionUserFile/' + id,
+    url: '/contractor/constructionUserFile/' + id,
     method: 'delete'
   });
 };

src/api/safety/questionBank/index.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { QuestionBankVO, QuestionBankForm, QuestionBankQuery } from '@/api/safety/questionBank/types';
+import { QuestionBankVO, QuestionBankForm, QuestionBankQuery } from '@/api/safety/wgzQuestionBank/types';
 
 /**
  * 查询题库列表
@@ -10,7 +10,7 @@ import { QuestionBankVO, QuestionBankForm, QuestionBankQuery } from '@/api/safet
 
 export const listQuestionBank = (query?: QuestionBankQuery): AxiosPromise<QuestionBankVO[]> => {
   return request({
-    url: '/safety/questionBank/list',
+    url: '/safety/wgzQuestionBank/list',
     method: 'get',
     params: query
   });
@@ -22,7 +22,7 @@ export const listQuestionBank = (query?: QuestionBankQuery): AxiosPromise<Questi
  */
 export const getQuestionBank = (id: string | number): AxiosPromise<QuestionBankVO> => {
   return request({
-    url: '/safety/questionBank/' + id,
+    url: '/safety/wgzQuestionBank/' + id,
     method: 'get'
   });
 };
@@ -33,7 +33,7 @@ export const getQuestionBank = (id: string | number): AxiosPromise<QuestionBankV
  */
 export const addQuestionBank = (data: QuestionBankForm) => {
   return request({
-    url: '/safety/questionBank',
+    url: '/safety/wgzQuestionBank',
     method: 'post',
     data: data
   });
@@ -45,7 +45,7 @@ export const addQuestionBank = (data: QuestionBankForm) => {
  */
 export const updateQuestionBank = (data: QuestionBankForm) => {
   return request({
-    url: '/safety/questionBank',
+    url: '/safety/wgzQuestionBank',
     method: 'put',
     data: data
   });
@@ -57,7 +57,7 @@ export const updateQuestionBank = (data: QuestionBankForm) => {
  */
 export const delQuestionBank = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/safety/questionBank/' + id,
+    url: '/safety/wgzQuestionBank/' + id,
     method: 'delete'
   });
 };

src/api/safety/questionUserAnswer/index.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { QuestionUserAnswerVO, QuestionUserAnswerForm, QuestionUserAnswerQuery } from '@/api/safety/questionUserAnswer/types';
+import { QuestionUserAnswerVO, QuestionUserAnswerForm, QuestionUserAnswerQuery } from '@/api/safety/wgzQuestionSave/types';
 
 /**
  * 查询用户试卷存储列表
@@ -10,7 +10,7 @@ import { QuestionUserAnswerVO, QuestionUserAnswerForm, QuestionUserAnswerQuery }
 
 export const listQuestionUserAnswer = (query?: QuestionUserAnswerQuery): AxiosPromise<QuestionUserAnswerVO[]> => {
   return request({
-    url: '/safety/questionUserAnswer/list',
+    url: '/safety/wgzQuestionSave/list',
     method: 'get',
     params: query
   });
@@ -22,7 +22,7 @@ export const listQuestionUserAnswer = (query?: QuestionUserAnswerQuery): AxiosPr
  */
 export const getQuestionUserAnswer = (id: string | number): AxiosPromise<QuestionUserAnswerVO> => {
   return request({
-    url: '/safety/questionUserAnswer/' + id,
+    url: '/safety/wgzQuestionSave/' + id,
     method: 'get'
   });
 };
@@ -33,7 +33,7 @@ export const getQuestionUserAnswer = (id: string | number): AxiosPromise<Questio
  */
 export const addQuestionUserAnswer = (data: QuestionUserAnswerForm) => {
   return request({
-    url: '/safety/questionUserAnswer',
+    url: '/safety/wgzQuestionSave',
     method: 'post',
     data: data
   });
@@ -45,7 +45,7 @@ export const addQuestionUserAnswer = (data: QuestionUserAnswerForm) => {
  */
 export const updateQuestionUserAnswer = (data: QuestionUserAnswerForm) => {
   return request({
-    url: '/safety/questionUserAnswer',
+    url: '/safety/wgzQuestionSave',
     method: 'put',
     data: data
   });
@@ -57,7 +57,7 @@ export const updateQuestionUserAnswer = (data: QuestionUserAnswerForm) => {
  */
 export const delQuestionUserAnswer = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/safety/questionUserAnswer/' + id,
+    url: '/safety/wgzQuestionSave/' + id,
     method: 'delete'
   });
 };
@@ -68,7 +68,7 @@ export const delQuestionUserAnswer = (id: string | number | Array<string | numbe
  */
 export const uploadQuestionUserAnswer = (data: any) => {
   return request({
-    url: '/safety/questionUserAnswer/upload/zip',
+    url: '/safety/wgzQuestionSave/upload/zip',
     method: 'post',
     data: data
   });

src/api/safety/questionsCategory/index.ts

@@ -10,7 +10,7 @@ import { QuestionsCategoryVO, QuestionsCategoryForm, QuestionsCategoryQuery } fr
 
 export const listQuestionsCategory = (query?: QuestionsCategoryQuery): AxiosPromise<QuestionsCategoryVO[]> => {
   return request({
-    url: '/safety/questionsCategory/list',
+    url: '/safety/wzgQuestionCategory/list',
     method: 'get',
     params: query
   });
@@ -22,7 +22,7 @@ export const listQuestionsCategory = (query?: QuestionsCategoryQuery): AxiosProm
  */
 export const getQuestionsCategory = (id: string | number): AxiosPromise<QuestionsCategoryVO> => {
   return request({
-    url: '/safety/questionsCategory/' + id,
+    url: '/safety/wzgQuestionCategory' + id,
     method: 'get'
   });
 };
@@ -33,7 +33,7 @@ export const getQuestionsCategory = (id: string | number): AxiosPromise<Question
  */
 export const addQuestionsCategory = (data: QuestionsCategoryForm) => {
   return request({
-    url: '/safety/questionsCategory',
+    url: '/safety/wzgQuestionCategory',
     method: 'post',
     data: data
   });
@@ -45,7 +45,7 @@ export const addQuestionsCategory = (data: QuestionsCategoryForm) => {
  */
 export const updateQuestionsCategory = (data: QuestionsCategoryForm) => {
   return request({
-    url: '/safety/questionsCategory',
+    url: '/safety/wzgQuestionCategory',
     method: 'put',
     data: data
   });
@@ -57,7 +57,7 @@ export const updateQuestionsCategory = (data: QuestionsCategoryForm) => {
  */
 export const delQuestionsCategory = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/safety/questionsCategory/' + id,
+    url: '/safety/wzgQuestionCategory' + id,
     method: 'delete'
   });
 };

src/api/safety/questionsConfig/index.ts

@@ -22,7 +22,7 @@ export const listQuestionsConfig = (query?: QuestionsConfigQuery): AxiosPromise<
  */
 export const getQuestionsConfig = (id: string | number): AxiosPromise<QuestionsConfigVO> => {
   return request({
-    url: '/safety/questionsConfig/' + id,
+    url: '/safety/wzgQuestionsConfiguration/' + id,
     method: 'get'
   });
 };
@@ -45,7 +45,7 @@ export const addQuestionsConfig = (data: QuestionsConfigForm) => {
  */
 export const updateQuestionsConfig = (data: QuestionsConfigForm) => {
   return request({
-    url: '/safety/questionsConfig',
+    url: '/safety/wzgQuestionsConfiguration',
     method: 'put',
     data: data
   });