From 1b1ee35d983e2cae328338d7f8b756d087aec95c Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Fri, 16 Jun 2023 10:21:55 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=B5=8B=E5=88=86=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/closeLoopDispose/index.js | 18 +++ src/utils/request.js | 5 +- .../closeLoopDispose/components/myCourse.vue | 102 ++++++++--------- .../components/myCourseDetail.vue | 8 +- .../components/myCourseDetailForm.vue | 11 +- .../components/myCourseDetailRecords.vue | 105 ++++++++---------- src/views/closeLoopDispose/index.vue | 5 +- .../components/companyDetails.vue | 6 +- .../companyScore/components/companyTable.vue | 18 ++- .../companyScore/components/detailsTable.vue | 2 +- .../systemManagement/companyScore/index.vue | 10 +- 11 files changed, 161 insertions(+), 129 deletions(-) create mode 100644 src/api/closeLoopDispose/index.js diff --git a/src/api/closeLoopDispose/index.js b/src/api/closeLoopDispose/index.js new file mode 100644 index 0000000..cb644ba --- /dev/null +++ b/src/api/closeLoopDispose/index.js @@ -0,0 +1,18 @@ +// 闭环处置 +import request from '@/utils/request' +// 我的流程查询 +export function get_my_course(data) { + return request({ + url: '/workflow/external/ownList', + method: 'post', + data + }) +} +// 我的流程流转记录查询 +export function get_my_course_record(data) { + return request({ + url: '/workflow/external/workDetail', + method: 'post', + data + }) +} \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index 552561c..cb5b8a0 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -4,9 +4,10 @@ import vm from "../main"; import { getToken } from '@/utils/auth' axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' const request = axios.create({ - //baseURL: 'http://172.18.113.50:8080/zhapi', + baseURL: 'http://172.18.113.50:8080/zhapi', + //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强 //baseURL: 'http://192.168.0.188:8888/zhapi', - baseURL: `http://${window.location.host}/zhapi`, + //baseURL: `http://${window.location.host}/zhapi`, timeout: 50000, headers: { 'content-type': 'application/json' }, }) diff --git a/src/views/closeLoopDispose/components/myCourse.vue b/src/views/closeLoopDispose/components/myCourse.vue index 5e9680b..283ccce 100644 --- a/src/views/closeLoopDispose/components/myCourse.vue +++ b/src/views/closeLoopDispose/components/myCourse.vue @@ -9,7 +9,7 @@ - + - + - + @@ -57,9 +57,9 @@ - + - + \ No newline at end of file diff --git a/src/views/systemManagement/companyScore/components/detailsTable.vue b/src/views/systemManagement/companyScore/components/detailsTable.vue index f81532e..0b3e7f0 100644 --- a/src/views/systemManagement/companyScore/components/detailsTable.vue +++ b/src/views/systemManagement/companyScore/components/detailsTable.vue @@ -9,7 +9,7 @@
提交
diff --git a/src/views/systemManagement/companyScore/index.vue b/src/views/systemManagement/companyScore/index.vue index a59f258..02033aa 100644 --- a/src/views/systemManagement/companyScore/index.vue +++ b/src/views/systemManagement/companyScore/index.vue @@ -68,6 +68,7 @@ @size-change="handleSizeChange" @current-change="handleCurrentChange" :page-sizes="[5, 10]" + :pager-count="5" :page-size="pageSize" :current-page="pageNum" layout="total, sizes, prev, pager, next, jumper" @@ -260,7 +261,7 @@ export default { .search_right { display: flex; .el-button { - font-size: 18px; + font-size: 17px; height: 4vh; border-radius: 0px; color: #fff; @@ -323,34 +324,39 @@ export default { height: 2.6vh; } /deep/.el-pagination { - margin-left: 70%; + margin-left: 75%; margin-top: 2vh; .el-pagination__total { color: #fff; } .el-input__inner { border-radius: 0px; + border: 0.1px solid #277f79; background: #3c4b4a; color: #fff; } .btn-prev { border-radius: 0px; + border: 0.1px solid #277f79; background: #3c4b4a; color: #fff; } ul { li { + border: 0.1px solid #277f79; background: #3c4b4a; color: #fff; } } .btn-next { + border: 0.1px solid #277f79; border-radius: 0px; background: #3c4b4a; color: #fff; } .el-pager { li { + border: 0.1px solid #34a6a6; background: #3c4b4a !important; } } From 036d761426743f8fffaae6f187eaea960eb078cd Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Fri, 16 Jun 2023 10:23:29 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index cb5b8a0..0da7b9c 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -4,10 +4,10 @@ import vm from "../main"; import { getToken } from '@/utils/auth' axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' const request = axios.create({ - baseURL: 'http://172.18.113.50:8080/zhapi', + //baseURL: 'http://172.18.113.50:8080/zhapi', //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强 //baseURL: 'http://192.168.0.188:8888/zhapi', - //baseURL: `http://${window.location.host}/zhapi`, + baseURL: `http://${window.location.host}/zhapi`, timeout: 50000, headers: { 'content-type': 'application/json' }, }) From 866c5ca47b7601f3676f35e7b2bd55cd574ce3db Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Fri, 16 Jun 2023 21:37:31 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E8=B5=8B=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../systemManagement/companyScore/index.js | 23 +++ src/utils/request.js | 2 +- .../companyScore/components/detailsTable.vue | 122 ++++++++++++--- .../components/detailsTableDelete.vue | 102 ++++++++++++ .../components/detailsTableDialog.vue | 145 ++++++++++++++++++ .../components/indexmassageThree.vue | 2 + 6 files changed, 372 insertions(+), 24 deletions(-) create mode 100644 src/views/systemManagement/companyScore/components/detailsTableDelete.vue create mode 100644 src/views/systemManagement/companyScore/components/detailsTableDialog.vue diff --git a/src/api/systemManagement/companyScore/index.js b/src/api/systemManagement/companyScore/index.js index d59dda5..a2c942e 100644 --- a/src/api/systemManagement/companyScore/index.js +++ b/src/api/systemManagement/companyScore/index.js @@ -15,4 +15,27 @@ export function getSafeCompanyDetail(params) { method: 'post', params }) +} +// 增加企业赋分上报数据 +export function addSafeCompanyDetail(data) { + return request({ + url: '/safety/system/tbSafeCompanyScoreDetail', + method: 'post', + data + }) +} +// 编辑企业赋分上报数据 +export function changeSafeCompanyDetail(data) { + return request({ + url: '/safety/system/tbSafeCompanyScoreDetail', + method: 'put', + data + }) +} +// 删除企业赋分上报数据 +export function deleteSafeCompanyDetail(params) { + return request({ + url: '/safety/system/tbSafeCompanyScoreDetail?' + params, + method: 'delete', + }) } \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index 0da7b9c..7cf545e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -74,7 +74,7 @@ request.interceptors.response.use( content: response.data.msg, duration: 3 }) - return response.data3 + return response.data } } diff --git a/src/views/systemManagement/companyScore/components/detailsTable.vue b/src/views/systemManagement/companyScore/components/detailsTable.vue index 0b3e7f0..98c55bb 100644 --- a/src/views/systemManagement/companyScore/components/detailsTable.vue +++ b/src/views/systemManagement/companyScore/components/detailsTable.vue @@ -7,11 +7,8 @@ {{ this.input_text }}
- - 提交 + + 提交
@@ -31,7 +29,7 @@ 编辑 - 删除 @@ -43,6 +41,7 @@ @size-change="handleSizeChange" @current-change="handleCurrentChange" :page-sizes="[4]" + :pager-count="5" :page-size="pageSize" :current-page="pageNum" layout="total, sizes, prev, pager, next, jumper" @@ -51,14 +50,25 @@
+ + + \ No newline at end of file diff --git a/src/views/systemManagement/companyScore/components/detailsTableDialog.vue b/src/views/systemManagement/companyScore/components/detailsTableDialog.vue new file mode 100644 index 0000000..a5608d2 --- /dev/null +++ b/src/views/systemManagement/companyScore/components/detailsTableDialog.vue @@ -0,0 +1,145 @@ + + + \ No newline at end of file diff --git a/src/views/systemManagement/safeIndex/components/indexmassageThree.vue b/src/views/systemManagement/safeIndex/components/indexmassageThree.vue index e84cf2c..9bf6c8d 100644 --- a/src/views/systemManagement/safeIndex/components/indexmassageThree.vue +++ b/src/views/systemManagement/safeIndex/components/indexmassageThree.vue @@ -563,12 +563,14 @@ export default { background: #233438 !important; } /deep/.el-table__body-wrapper.is-scrolling-none::-webkit-scrollbar { + display: none; width: 6px; background-color: #5e666a; border-radius: 4px; } /deep/.el-table__body-wrapper.is-scrolling-none::-webkit-scrollbar-thumb { + display: none; width: 5px; background-color: #3c4b4a; border-radius: 4px; From 1918f61fe12bc1a60cd1c2e9e6a20ad98a49e2b1 Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Fri, 16 Jun 2023 22:11:50 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../companyScore/components/detailsTable.vue | 23 +++++++++++++++++-- .../components/detailsTableDialog.vue | 2 +- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/views/systemManagement/companyScore/components/detailsTable.vue b/src/views/systemManagement/companyScore/components/detailsTable.vue index 98c55bb..5fa96f7 100644 --- a/src/views/systemManagement/companyScore/components/detailsTable.vue +++ b/src/views/systemManagement/companyScore/components/detailsTable.vue @@ -7,13 +7,14 @@ {{ this.input_text }}
- + 提交
@@ -221,6 +222,7 @@ export default { // 刷新 refresh() { this.get_detail_data() + this.person_input = '' }, // 表头样式 table_header({ row, rowIndex }) { @@ -325,7 +327,7 @@ export default { } /deep/.el-table { // width: 85.2vw; - height: 29vh; + // height: 29vh; background: rgba(0, 0, 0, 0); border: 0.1px solid #3f5564; thead { @@ -352,6 +354,23 @@ export default { background: rgba(0, 0, 0, 0); } } +/deep/ .el-table td.el-table__cell, +.el-table th.el-table__cell.is-leaf { + border: 0.1px solid #3f5564; +} +/deep/.el-table__body-wrapper::-webkit-scrollbar { + display: none; + width: 6px; + background-color: #5e666a; + border-radius: 4px; +} + +/deep/.el-table__body-wrapper::-webkit-scrollbar-thumb { + display: none; + width: 5px; + background-color: #3c4b4a; + border-radius: 4px; +} .table_pagination { width: 51vw; height: 5vh; diff --git a/src/views/systemManagement/companyScore/components/detailsTableDialog.vue b/src/views/systemManagement/companyScore/components/detailsTableDialog.vue index a5608d2..75159d7 100644 --- a/src/views/systemManagement/companyScore/components/detailsTableDialog.vue +++ b/src/views/systemManagement/companyScore/components/detailsTableDialog.vue @@ -11,7 +11,7 @@
{{ this.input_title }}
- +
From 1b6de7ad60e44f766e9523f63f047a0ec316ad19 Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Sat, 17 Jun 2023 09:25:00 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 4 +- .../components/companyDetails.vue | 6 +-- .../components/detailsTableDelete.vue | 2 +- .../{indexTable.vue => indexTableDetail.vue} | 42 +++++++++---------- 4 files changed, 27 insertions(+), 27 deletions(-) rename src/views/systemManagement/companyScore/components/{indexTable.vue => indexTableDetail.vue} (96%) diff --git a/src/utils/request.js b/src/utils/request.js index 7cf545e..3319acb 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -4,10 +4,10 @@ import vm from "../main"; import { getToken } from '@/utils/auth' axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' const request = axios.create({ - //baseURL: 'http://172.18.113.50:8080/zhapi', + baseURL: 'http://172.18.113.50:8080/zhapi', //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强 //baseURL: 'http://192.168.0.188:8888/zhapi', - baseURL: `http://${window.location.host}/zhapi`, + //baseURL: `http://${window.location.host}/zhapi`, timeout: 50000, headers: { 'content-type': 'application/json' }, }) diff --git a/src/views/systemManagement/companyScore/components/companyDetails.vue b/src/views/systemManagement/companyScore/components/companyDetails.vue index fe7358d..1507759 100644 --- a/src/views/systemManagement/companyScore/components/companyDetails.vue +++ b/src/views/systemManagement/companyScore/components/companyDetails.vue @@ -138,7 +138,7 @@
赋分
- +