From 541cfbd08dca39d805a0c09147897659228809b5 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Tue, 13 May 2025 17:09:41 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=A2=9E=E5=8A=A0=20?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/pro/outsourcingPro.js | 58 +++-- src/views/IndexPage/index_owner.vue | 213 +++++++++++++++--- src/views/pro/apply/list/equipList.vue | 26 +-- .../constructionPro/index.vue | 203 +++++++++-------- .../outsourcingPro/index.vue | 201 ++++++++++------- 5 files changed, 460 insertions(+), 241 deletions(-) diff --git a/src/api/pro/outsourcingPro.js b/src/api/pro/outsourcingPro.js index f8de241..6143a6e 100644 --- a/src/api/pro/outsourcingPro.js +++ b/src/api/pro/outsourcingPro.js @@ -5,7 +5,7 @@ export function listPost(query) { return request({ url: '/project/outsourcingPro/list', method: 'get', - params: query + params: query, }) } // 查询外委外包工程列表 @@ -13,7 +13,7 @@ export function listPosts(query) { return request({ url: '/project/outsourcingPro/lists', method: 'get', - params: query + params: query, }) } /*--------------------------------监理单位信息接口--------------------------------------*/ @@ -22,7 +22,7 @@ export function listSupervisor(data) { return request({ url: '/project/outsourcingPro/listSupervisor', method: 'get', - params: data + params: data, }) } // 查询监理单位信息 @@ -30,7 +30,7 @@ export function listSupervisorPerson(data) { return request({ url: '/project/outsourcingPro/listSupervisorPerson', method: 'get', - params: data + params: data, }) } // 根据id查询人员详细信息 @@ -38,7 +38,7 @@ export function listSupervisorPersonById(data) { return request({ url: '/project/outsourcingPro/listSupervisorPersonById', method: 'post', - data: data + data: data, }) } /*--------------------------------承包商信息接口--------------------------------------*/ @@ -47,7 +47,7 @@ export function selectConArr(data) { return request({ url: '/project/outsourcingPro/selectConArr', method: 'post', - data: data + data: data, }) } // 根据ID获取承包商信息 @@ -55,7 +55,7 @@ export function getConsDetailsInfo(data) { return request({ url: '/project/outsourcingPro/getConsDetailsInfo', method: 'post', - data: data + data: data, }) } // 根据ID获取分包商信息 @@ -63,7 +63,7 @@ export function getSubList(data) { return request({ url: '/project/outsourcingPro/getSubList', method: 'get', - params: data + params: data, }) } // 根据ID获取施工人员信息 @@ -71,7 +71,7 @@ export function getConsPersonList(data) { return request({ url: '/project/outsourcingPro/getConsPersonList', method: 'get', - params: data + params: data, }) } // 根据ID获取工程材料 @@ -79,7 +79,7 @@ export function getProProfile(data) { return request({ url: '/project/outsourcingPro/getProProfile', method: 'get', - params: data + params: data, }) } // 根据ID获取工器具信息 @@ -87,7 +87,7 @@ export function getConsEquipList(data) { return request({ url: '/project/outsourcingPro/getConsEquipList', method: 'get', - params: data + params: data, }) } // 根据ID获取施工材料信息 @@ -95,7 +95,7 @@ export function getConsMaterialsList(data) { return request({ url: '/project/outsourcingPro/getConsMaterialsList', method: 'get', - params: data + params: data, }) } // 根据ID获取人员详情 @@ -103,7 +103,7 @@ export function getConstructionPersonnelDetails(data) { return request({ url: '/project/outsourcingPro/getConstructionPersonnelDetails', method: 'post', - data: data + data: data, }) } // 根据ID获取工器具详情 @@ -111,7 +111,7 @@ export function getEquipDetails(data) { return request({ url: '/project/outsourcingPro/getEquipDetails', method: 'post', - data: data + data: data, }) } // 根据ID获取分包商详情 @@ -119,7 +119,7 @@ export function getSubDetailsInfo(data) { return request({ url: '/project/outsourcingPro/getSubDetailsInfo', method: 'post', - data: data + data: data, }) } // 根据ID获取分包商施工人员 @@ -127,7 +127,7 @@ export function getSubPersonList(data) { return request({ url: '/project/outsourcingPro/getSubPersonList', method: 'get', - params: data + params: data, }) } // 根据ID获取分包商施工人员详情信息 @@ -135,14 +135,14 @@ export function getSubPersonnelDetails(data) { return request({ url: '/project/outsourcingPro/getSubPersonnelDetails', method: 'post', - data: data + data: data, }) } export function getNum(data) { return request({ url: '/project/outsourcingPro/getNum', method: 'post', - data: data + data: data, }) } // 依据供应商id 和工程id 查询 必填资料 @@ -150,7 +150,7 @@ export function getProRequest(data) { return request({ url: '/project/pro/getProRequest', method: 'post', - data: data + data: data, }) } /** @@ -162,7 +162,21 @@ export function getNumList(data) { return request({ url: '/project/outsourcingPro/getNumList', method: 'get', - params: data + params: data, + }) +} +export function getSpecialPersonNumListApi(data) { + return request({ + url: '/project/admissionRequest/listPersonnelInfo', + method: 'get', + params: data, + }) +} +export function getSpecialEquipNumListApi(data) { + return request({ + url: '/project/equip/listEquipment', + method: 'get', + params: data, }) } @@ -175,7 +189,7 @@ export function addAnnotations(data) { return request({ url: '/project/outsourcingPro/addAnnotations', method: 'post', - data: data + data: data, }) } /** @@ -187,6 +201,6 @@ export function delPersonByIdCardAndPhone(data) { return request({ url: '/project/SupervisionUnit/delSupervisoryPersonApply', method: 'post', - data: data + data: data, }) } diff --git a/src/views/IndexPage/index_owner.vue b/src/views/IndexPage/index_owner.vue index 0c4ee7d..656a9ab 100644 --- a/src/views/IndexPage/index_owner.vue +++ b/src/views/IndexPage/index_owner.vue @@ -8,7 +8,6 @@ 在建/筹备工程数 {{ proNum }} - @@ -25,7 +24,7 @@
-
+
特殊工种总人数 {{ specialPersonNum }}
@@ -45,8 +44,8 @@
-
- 特殊设备总数 +
+ 特种设备总数 {{ specialEquipNum }}
@@ -56,12 +55,7 @@ - + @@ -82,23 +76,121 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -171,7 +329,9 @@ export default { width: 100%; height: 30%; margin-bottom: 20px; - display: flex;margin-top: 20px;justify-content: space-around; + display: flex; + margin-top: 20px; + justify-content: space-around; &:last-child { margin-bottom: 0; } @@ -203,7 +363,7 @@ export default { display: flex; justify-content: center; align-items: flex-start; - font-family: sans-serif + font-family: sans-serif; } .p2 { @@ -211,7 +371,7 @@ export default { display: flex; justify-content: center; align-items: flex-start; - font-family: sans-serif + font-family: sans-serif; } .p3 { @@ -219,14 +379,14 @@ export default { display: flex; justify-content: center; align-items: flex-start; - font-family: sans-serif + font-family: sans-serif; } .p4 { background: linear-gradient(to bottom, #eee2fb, #fff); display: flex; justify-content: center; align-items: flex-start; - font-family: sans-serif + font-family: sans-serif; } .p5 { @@ -234,7 +394,7 @@ export default { display: flex; justify-content: center; align-items: flex-start; - font-family: sans-serif + font-family: sans-serif; } .title { @@ -253,11 +413,10 @@ export default { margin-left: 15px; font-size: 30px; } -.hhh{ +.hhh { display: flex; flex-direction: column; flex-wrap: wrap; align-content: flex-start; } - diff --git a/src/views/pro/apply/list/equipList.vue b/src/views/pro/apply/list/equipList.vue index d8d4fef..b83ce99 100644 --- a/src/views/pro/apply/list/equipList.vue +++ b/src/views/pro/apply/list/equipList.vue @@ -46,18 +46,13 @@ - + -
+
- -
@@ -119,13 +112,12 @@ export default { pageNum: 1, pageSize: 10, equipName: undefined, - type: '列表' + type: '列表', }, // 表单参数 form: {}, // 表单校验 - rules: {} - + rules: {}, } }, created() { @@ -153,7 +145,7 @@ export default { reset() { this.form = { equipName: undefined, - postSort: 0 + postSort: 0, } this.resetForm('form') }, @@ -190,7 +182,7 @@ export default { this.fileList = response.fileList this.loading = false }) - } - } + }, + }, } diff --git a/src/views/pro/projectManagement/constructionPro/index.vue b/src/views/pro/projectManagement/constructionPro/index.vue index 56d87f9..ce0817a 100644 --- a/src/views/pro/projectManagement/constructionPro/index.vue +++ b/src/views/pro/projectManagement/constructionPro/index.vue @@ -7,7 +7,8 @@ placeholder="请输入工程名称" maxlength="60" show-word-limit - clearable v-no-whitespace + clearable + v-no-whitespace @keyup.enter.native="handleQuery" /> @@ -17,36 +18,34 @@ placeholder="请输入工程负责人姓名" maxlength="20" show-word-limit - clearable v-no-whitespace + clearable + v-no-whitespace @keyup.enter.native="handleQuery" /> - + - + - + - + 搜索 重置 导出数据 + > + 导出数据 - - + - - - + + + - - - - - - + + + + + + diff --git a/src/views/pro/projectManagement/outsourcingPro/index.vue b/src/views/pro/projectManagement/outsourcingPro/index.vue index 0791053..9eb2db0 100644 --- a/src/views/pro/projectManagement/outsourcingPro/index.vue +++ b/src/views/pro/projectManagement/outsourcingPro/index.vue @@ -7,7 +7,8 @@ placeholder="请输入工程名称" maxlength="60" show-word-limit - clearable v-no-whitespace + clearable + v-no-whitespace @keyup.enter.native="handleQuery" /> @@ -17,35 +18,34 @@ placeholder="请输入工程负责人姓名" maxlength="20" show-word-limit - clearable v-no-whitespace + clearable + v-no-whitespace @keyup.enter.native="handleQuery" /> - + - + - + - + 搜索 重置 导出数据 - + > + 导出数据 + - + - + - +