diff --git a/.env.development b/.env.development index 6e07116..b59befd 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VITE_APP_TITLE = 煤科建管平台 VITE_APP_ENV = 'development' # 开发环境 -VITE_APP_BASE_API = 'http://192.168.110.149:8899' +VITE_APP_BASE_API = 'http://192.168.110.180:8899' # 无人机接口地址 diff --git a/src/api/bidding/biddingLimit/index.ts b/src/api/bidding/biddingLimit/index.ts index 4415568..c70d466 100644 --- a/src/api/bidding/biddingLimit/index.ts +++ b/src/api/bidding/biddingLimit/index.ts @@ -53,3 +53,18 @@ export const sheetList = (query) => { params: query }); }; +//获取sheet +export const obtainAllVersionNumbers = (query) => { + return request({ + url: '/bidding/biddingLimitList/obtainAllVersionNumbers', + method: 'get', + params: query + }); +}; +//获取sheet +export const getVersionDetail = (id) => { + return request({ + url: '/bidding/biddingLimitList/getVersionDetail/' + id, + method: 'get' + }); +}; diff --git a/src/api/bidding/listOfWinningBids/index.ts b/src/api/bidding/listOfWinningBids/index.ts index f943e08..8e509df 100644 --- a/src/api/bidding/listOfWinningBids/index.ts +++ b/src/api/bidding/listOfWinningBids/index.ts @@ -8,7 +8,7 @@ import { ListOfWinningBidsVO, ListOfWinningBidsForm, ListOfWinningBidsQuery } fr * @returns {*} */ -export const listListOfWinningBids = (query?: ListOfWinningBidsQuery): AxiosPromise => { +export const listListOfWinningBids = (query) => { return request({ url: '/bidding/listOfWinningBids/list', method: 'get', diff --git a/src/api/ctr/expensesContract/index.ts b/src/api/ctr/expensesContract/index.ts new file mode 100644 index 0000000..3b2c2bb --- /dev/null +++ b/src/api/ctr/expensesContract/index.ts @@ -0,0 +1,83 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { ExpensesContractVO, ExpensesContractForm, ExpensesContractQuery } from '@/api/ctr/expensesContract/types'; + +/** + * 查询支出合同列表 + * @param query + * @returns {*} + */ + +export const listExpensesContract = (query?: ExpensesContractQuery): AxiosPromise => { + return request({ + url: '/ctr/expensesContract/list', + method: 'get', + params: query + }); +}; + +/** + * 查询支出合同详细 + * @param id + */ +export const getExpensesContract = (id: string | number): AxiosPromise => { + return request({ + url: '/ctr/expensesContract/' + id, + method: 'get' + }); +}; + +/** + * 新增支出合同 + * @param data + */ +export const addExpensesContract = (data: ExpensesContractForm) => { + return request({ + url: '/ctr/expensesContract', + method: 'post', + data: data + }); +}; + +/** + * 修改支出合同 + * @param data + */ +export const updateExpensesContract = (data: ExpensesContractForm) => { + return request({ + url: '/ctr/expensesContract', + method: 'put', + data: data + }); +}; + +/** + * 删除支出合同 + * @param id + */ +export const delExpensesContract = (id: string | number | Array) => { + return request({ + url: '/ctr/expensesContract/' + id, + method: 'delete' + }); +}; +/** + * 查看支出合同附件列表 + * @param id + */ +export const getFileList = (data) => { + return request({ + url: '/ctr/expensesContract/file/list', + method: 'get', + params: data + }) +} + +// 获取招标计划 +export const getTenderPlan = (data) => { + return request({ + url: '/ctr/expensesContract/tender/list', + method: 'get', + params: data + }) +} \ No newline at end of file diff --git a/src/api/ctr/expensesContract/types.ts b/src/api/ctr/expensesContract/types.ts new file mode 100644 index 0000000..304cda9 --- /dev/null +++ b/src/api/ctr/expensesContract/types.ts @@ -0,0 +1,141 @@ +export interface ExpensesContractVO { + /** + * 主键ID + */ + id: string | number; + + /** + * 项目ID + */ + projectId: string | number; + + /** + * 合同编号 + */ + contractCode: string; + + /** + * 合同类型 + */ + contractType: string; + + /** + * 供应商 + */ + contractSupplier: string; + + /** + * 分包内容 + */ + contractedContent: string; + + /** + * 合同金额 + */ + amount: number; + + /** + * 招标Id + */ + tenderId: string | number; + + /** + * 备注 + */ + remark: string; + +} + +export interface ExpensesContractForm extends BaseEntity { + /** + * 主键ID + */ + id?: string | number; + + /** + * 项目ID + */ + projectId?: string | number; + + /** + * 合同编号 + */ + contractCode?: string; + + /** + * 合同类型 + */ + contractType?: string; + + /** + * 供应商 + */ + contractSupplier?: string; + + /** + * 分包内容 + */ + contractedContent?: string; + + /** + * 合同金额 + */ + amount?: number; + + /** + * 招标Id + */ + tenderId?: string | number; + + /** + * 备注 + */ + remark?: string; + +} + +export interface ExpensesContractQuery extends PageQuery { + + /** + * 项目ID + */ + projectId?: string | number; + + /** + * 合同编号 + */ + contractCode?: string; + + /** + * 合同类型 + */ + contractType?: string; + + /** + * 供应商 + */ + contractSupplier?: string; + + /** + * 分包内容 + */ + contractedContent?: string; + + /** + * 合同金额 + */ + amount?: number; + + /** + * 招标Id + */ + tenderId?: string | number; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/ctr/incomeContract/index.ts b/src/api/ctr/incomeContract/index.ts new file mode 100644 index 0000000..eda6901 --- /dev/null +++ b/src/api/ctr/incomeContract/index.ts @@ -0,0 +1,74 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { IncomeContractVO, IncomeContractForm, IncomeContractQuery } from '@/api/ctr/incomeContract/types'; + +/** + * 查询收入合同列表 + * @param query + * @returns {*} + */ + +export const listIncomeContract = (query?: IncomeContractQuery): AxiosPromise => { + return request({ + url: '/ctr/incomeContract/list', + method: 'get', + params: query + }); +}; + +/** + * 查询收入合同详细 + * @param id + */ +export const getIncomeContract = (id: string | number): AxiosPromise => { + return request({ + url: '/ctr/incomeContract/' + id, + method: 'get' + }); +}; + +/** + * 新增收入合同 + * @param data + */ +export const addIncomeContract = (data: IncomeContractForm) => { + return request({ + url: '/ctr/incomeContract', + method: 'post', + data: data + }); +}; + +/** + * 修改收入合同 + * @param data + */ +export const updateIncomeContract = (data: IncomeContractForm) => { + return request({ + url: '/ctr/incomeContract', + method: 'put', + data: data + }); +}; + +/** + * 删除收入合同 + * @param id + */ +export const delIncomeContract = (id: string | number | Array) => { + return request({ + url: '/ctr/incomeContract/' + id, + method: 'delete' + }); +}; +/** + * 查看收入合同附件列表 + * @param id + */ +export const getFileList = (data) => { + return request({ + url: '/ctr/incomeContract/file/list', + method: 'get', + params: data + }) +} \ No newline at end of file diff --git a/src/api/ctr/incomeContract/types.ts b/src/api/ctr/incomeContract/types.ts new file mode 100644 index 0000000..f2657d7 --- /dev/null +++ b/src/api/ctr/incomeContract/types.ts @@ -0,0 +1,126 @@ +export interface IncomeContractVO { + /** + * 主键ID + */ + id: string | number; + + /** + * 项目ID + */ + projectId: string | number; + + /** + * 合同编号 + */ + contractCode: string; + + /** + * 合同类型 + */ + contractType: string; + + /** + * 业主单位 + */ + contractOwner: string; + + /** + * 承包内容 + */ + contractedContent: string; + + /** + * 合同金额 + */ + amount: number; + + /** + * 备注 + */ + remark: string; + +} + +export interface IncomeContractForm extends BaseEntity { + /** + * 主键ID + */ + id?: string | number; + + /** + * 项目ID + */ + projectId?: string | number; + + /** + * 合同编号 + */ + contractCode?: string; + + /** + * 合同类型 + */ + contractType?: string; + + /** + * 业主单位 + */ + contractOwner?: string; + + /** + * 承包内容 + */ + contractedContent?: string; + + /** + * 合同金额 + */ + amount?: number; + + /** + * 备注 + */ + remark?: string; + +} + +export interface IncomeContractQuery extends PageQuery { + + /** + * 项目ID + */ + projectId?: string | number; + + /** + * 合同编号 + */ + contractCode?: string; + + /** + * 合同类型 + */ + contractType?: string; + + /** + * 业主单位 + */ + contractOwner?: string; + + /** + * 承包内容 + */ + contractedContent?: string; + + /** + * 合同金额 + */ + amount?: number; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/design/Professional/index.ts b/src/api/design/Professional/index.ts index 7f13895..977300e 100644 --- a/src/api/design/Professional/index.ts +++ b/src/api/design/Professional/index.ts @@ -31,3 +31,11 @@ export const getFileList = (id) => { method: 'get' }); }; +// 获取专业 +export const extractUserMajor = (params) => { + return request({ + url: '/design/extract/userMajor', + method: 'get', + params + }); +}; diff --git a/src/api/materials/materialsInventory/types.ts b/src/api/materials/materialsInventory/types.ts index 1f727ae..e7c2110 100644 --- a/src/api/materials/materialsInventory/types.ts +++ b/src/api/materials/materialsInventory/types.ts @@ -82,7 +82,10 @@ export interface MaterialsInventoryForm extends BaseEntity { * 主键id */ id?: string | number; - + /** + * 使用部位 + */ + usePart?: string; /** * 材料id */ diff --git a/src/api/materials/purchaseDoc/index.ts b/src/api/materials/purchaseDoc/index.ts index 64ec1ab..465a657 100644 --- a/src/api/materials/purchaseDoc/index.ts +++ b/src/api/materials/purchaseDoc/index.ts @@ -124,7 +124,7 @@ export const logisticsDetial = (id) => { export const getDetailBASE = (id) => { return request({ - url: '/cailiaoshebei/purchaseDoc/pic/' + id, + url: '/cailiaoshebei/purchaseDoc/pdf/' + id, method: 'get' }); }; diff --git a/src/assets/large/down.png b/src/assets/large/down.png new file mode 100644 index 0000000..bd2f400 Binary files /dev/null and b/src/assets/large/down.png differ diff --git a/src/assets/large/top1.png b/src/assets/large/top1.png new file mode 100644 index 0000000..a5b8268 Binary files /dev/null and b/src/assets/large/top1.png differ diff --git a/src/assets/large/top2.png b/src/assets/large/top2.png new file mode 100644 index 0000000..9334e6d Binary files /dev/null and b/src/assets/large/top2.png differ diff --git a/src/assets/large/top3.png b/src/assets/large/top3.png new file mode 100644 index 0000000..4a67e61 Binary files /dev/null and b/src/assets/large/top3.png differ diff --git a/src/assets/large/top4.png b/src/assets/large/top4.png new file mode 100644 index 0000000..1cbe562 Binary files /dev/null and b/src/assets/large/top4.png differ diff --git a/src/assets/large/up.png b/src/assets/large/up.png new file mode 100644 index 0000000..6cabc10 Binary files /dev/null and b/src/assets/large/up.png differ diff --git a/src/assets/projectLarge/border.svg b/src/assets/projectLarge/border.svg new file mode 100644 index 0000000..1a1a3d8 --- /dev/null +++ b/src/assets/projectLarge/border.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/assets/projectLarge/leftarrow.png b/src/assets/projectLarge/leftarrow.png new file mode 100644 index 0000000..55c4b79 Binary files /dev/null and b/src/assets/projectLarge/leftarrow.png differ diff --git a/src/assets/projectLarge/map.svg b/src/assets/projectLarge/map.svg new file mode 100644 index 0000000..36621d3 --- /dev/null +++ b/src/assets/projectLarge/map.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/assets/projectLarge/people.svg b/src/assets/projectLarge/people.svg new file mode 100644 index 0000000..b1af157 --- /dev/null +++ b/src/assets/projectLarge/people.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/projectLarge/rightarrow.png b/src/assets/projectLarge/rightarrow.png new file mode 100644 index 0000000..723df81 Binary files /dev/null and b/src/assets/projectLarge/rightarrow.png differ diff --git a/src/assets/projectLarge/robot.svg b/src/assets/projectLarge/robot.svg new file mode 100644 index 0000000..8f38136 --- /dev/null +++ b/src/assets/projectLarge/robot.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/projectLarge/round.svg b/src/assets/projectLarge/round.svg new file mode 100644 index 0000000..21ae9e4 --- /dev/null +++ b/src/assets/projectLarge/round.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/projectLarge/section.svg b/src/assets/projectLarge/section.svg new file mode 100644 index 0000000..2b9d23b --- /dev/null +++ b/src/assets/projectLarge/section.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/assets/projectLarge/swiper.png b/src/assets/projectLarge/swiper.png new file mode 100644 index 0000000..32520bd Binary files /dev/null and b/src/assets/projectLarge/swiper.png differ diff --git a/src/components/FileList/index.vue b/src/components/FileList/index.vue new file mode 100644 index 0000000..3b39562 --- /dev/null +++ b/src/components/FileList/index.vue @@ -0,0 +1,52 @@ + + diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index 43dd41a..8bfd847 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -1,28 +1,11 @@