From 4e6b43538ec4a7694250600ab233f2cd3cff8577 Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Thu, 29 Jun 2023 19:11:45 +0800 Subject: [PATCH] =?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/api/closeLoopDispose/index.js | 2 +- src/utils/request.js | 4 +- .../closeLoopDispose/components/backlog.vue | 3 +- .../components/backlogDetailDialog.vue | 4 +- .../components/backlogDetailForm.vue | 38 ------------------- .../closeLoopDispose/components/complete.vue | 5 ++- .../closeLoopDispose/components/copy.vue | 5 ++- .../closeLoopDispose/components/myCourse.vue | 6 ++- .../companyList/components/clearDialog.vue | 9 +++-- .../companyScore/components/companyTable.vue | 2 + .../systemManagement/companyScore/index.vue | 2 +- 11 files changed, 26 insertions(+), 54 deletions(-) diff --git a/src/api/closeLoopDispose/index.js b/src/api/closeLoopDispose/index.js index b0aea83..976f3de 100644 --- a/src/api/closeLoopDispose/index.js +++ b/src/api/closeLoopDispose/index.js @@ -35,7 +35,7 @@ export function get_backlog_company_tree(params) { // 审批流程 export function get_backlog_approve(data) { return request({ - url: '/workflow/external/task/approve', + url: '/closedloopdisposal/workflow/updateFlowableStatus', method: 'post', data }) diff --git a/src/utils/request.js b/src/utils/request.js index 2835a24..affd2a5 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.11//.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/backlog.vue b/src/views/closeLoopDispose/components/backlog.vue index 879724a..d0a4eae 100644 --- a/src/views/closeLoopDispose/components/backlog.vue +++ b/src/views/closeLoopDispose/components/backlog.vue @@ -30,10 +30,11 @@
- + diff --git a/src/views/closeLoopDispose/components/backlogDetailDialog.vue b/src/views/closeLoopDispose/components/backlogDetailDialog.vue index 6d4169c..a3b41e8 100644 --- a/src/views/closeLoopDispose/components/backlogDetailDialog.vue +++ b/src/views/closeLoopDispose/components/backlogDetailDialog.vue @@ -180,7 +180,7 @@ export default { margin-left: 8px; width: 550px; // border: 0.1px solid #5b748c; - height: 49vh; + height: 38vh; // overflow-y: auto; } // .section_tree::-webkit-scrollbar { @@ -211,7 +211,7 @@ export default { } .el-tree { /* 树形数据过长添加滚动条 */ - height: 49vh; + height: 38vh; overflow: auto; // box-shadow: 5px 5px 10px #126a58; border-radius: 0px; diff --git a/src/views/closeLoopDispose/components/backlogDetailForm.vue b/src/views/closeLoopDispose/components/backlogDetailForm.vue index 9a9a896..4052bfd 100644 --- a/src/views/closeLoopDispose/components/backlogDetailForm.vue +++ b/src/views/closeLoopDispose/components/backlogDetailForm.vue @@ -166,44 +166,6 @@ export default { section: "", }, backlog_list: [ - { - id: "1", - personUrl: "../../../assets/companyFile/avatar.png", - name: "吴沁", - team: "技侦大队", - backlog_value: - "2022年8月20日0时32分,我队接到预警称浙江浙江鑫甬生物化工股份有限公司存在运输车辆频繁违章情况。接报后值班民警于立即到达现场,经现场了解到:危化品运输车(浙B2M50R)为外来租赁货车,司机王某(身份证号:42109119880717****)疑似前科重点人员。目前司机已经带回所以便进一步调查。2022年8月20日0时32分,我队接到预警称浙江浙江鑫甬生物化工股份有限公司存在运输车辆频繁违章情况。接报后值班民警于立即到达现场,经现场了解到:危化品运输车(浙B2M50R)为外来租赁货车,司机王某(身份证号:42109119880717****)疑似前科重点人员。目前司机已经带回所以便进一步调查。", - attachment_value: "20220820现场处置照片.jpg", - send_person: "蔡坤、黄毅、李丹丹、张强强", - backlog_time: "2022-11-13 12:10:08", - }, - { - id: "2", - personUrl: "../../../assets/companyFile/avatar.png", - name: "吴沁", - team: "技侦大队", - backlog_value: - "2022年8月26日12时许,经过分析,我队决定对浙江浙江鑫甬生物化工股份有限公司的外来租赁危化品运输车(浙B2M50R)司机王某(身份证号:42109119880717****）做出吊销货车驾照处罚，立即执行。", - }, - { - id: "3", - personUrl: "../../../assets/companyFile/avatar.png", - name: "吴沁", - team: "技侦大队", - backlog_value: - "2022年8月26日12时许,经过分析,我队决定对浙江浙江鑫甬生物化工股份有限公司的外来租赁危化品运输车(浙B2M50R)司机王某(身份证号:42109119880717****）做出吊销货车驾照处罚，立即执行。", - }, - { - id: "4", - personUrl: "../../../assets/companyFile/avatar.png", - name: "吴沁", - team: "技侦大队", - backlog_value: - "2022年8月20日0时32分,我队接到预警称浙江浙江鑫甬生物化工股份有限公司存在运输车辆频繁违章情况。接报后值班民警于立即到达现场,经现场了解到:危化品运输车(浙B2M50R)为外来租赁货车,司机王某(身份证号:42109119880717****)疑似前科重点人员。目前司机已经带回所以便进一步调查。2022年8月20日0时32分,我队接到预警称浙江浙江鑫甬生物化工股份有限公司存在运输车辆频繁违章情况。接报后值班民警于立即到达现场,经现场了解到:危化品运输车(浙B2M50R)为外来租赁货车,司机王某(身份证号:42109119880717****)疑似前科重点人员。目前司机已经带回所以便进一步调查。", - attachment_value: "20220820现场处置照片.jpg", - send_person: "蔡坤、黄毅、李丹丹、张强强", - backlog_time: "2022-11-13 12:10:08", - }, ], status_list: [ { label: "待审核", value: "1" }, diff --git a/src/views/closeLoopDispose/components/complete.vue b/src/views/closeLoopDispose/components/complete.vue index 5af094c..d83419c 100644 --- a/src/views/closeLoopDispose/components/complete.vue +++ b/src/views/closeLoopDispose/components/complete.vue @@ -44,10 +44,11 @@
- + @@ -113,7 +114,7 @@ export default { // { label: "待审核", value: "1" }, { label: "审核中", value: "1" }, { label: "审核完成", value: "2" }, - { label: "驳回完成", value: "3" }, + { label: "驳回", value: "3" }, ], pickerOptions: { shortcuts: [ diff --git a/src/views/closeLoopDispose/components/copy.vue b/src/views/closeLoopDispose/components/copy.vue index ce3b5cc..0bc1b61 100644 --- a/src/views/closeLoopDispose/components/copy.vue +++ b/src/views/closeLoopDispose/components/copy.vue @@ -44,6 +44,7 @@
@@ -73,7 +74,7 @@ size="small" class="operation" @click="check_details(scope.row)" - >处置 + >详情 @@ -112,7 +113,7 @@ export default { // { label: "待审核", value: "1" }, { label: "审核中", value: "1" }, { label: "审核完成", value: "2" }, - { label: "驳回完成", value: "3" }, + { label: "驳回", value: "3" }, ], pickerOptions: { shortcuts: [ diff --git a/src/views/closeLoopDispose/components/myCourse.vue b/src/views/closeLoopDispose/components/myCourse.vue index 51d325f..03e95cf 100644 --- a/src/views/closeLoopDispose/components/myCourse.vue +++ b/src/views/closeLoopDispose/components/myCourse.vue @@ -41,10 +41,11 @@
- + @@ -106,7 +107,7 @@ export default { // { label: "待审核", value: "1" }, { label: "审核中", value: "1" }, { label: "审核完成", value: "2" }, - { label: "驳回完成", value: "3" }, + { label: "驳回", value: "3" }, ], pickerOptions: { shortcuts: [ @@ -396,6 +397,7 @@ export default { .btn { margin-left: 8px; margin-right: 2px; + height: 3.7vh; .el-button { width: 70px; height: 3.7vh !important; diff --git a/src/views/systemManagement/companyList/components/clearDialog.vue b/src/views/systemManagement/companyList/components/clearDialog.vue index 34d479c..dcf16cf 100644 --- a/src/views/systemManagement/companyList/components/clearDialog.vue +++ b/src/views/systemManagement/companyList/components/clearDialog.vue @@ -9,7 +9,7 @@
删除后将同时清空企业的全部信息，确认继续吗？
确 定 - 取 消 + 取 消
@@ -25,12 +25,12 @@ export default { }, methods: { open(num, item) { - console.log(num,item,'item'); + console.log(num, item, "item"); this.visible = true; this.id = item.id; }, saveFormData() { - const params = `idList=${this.id}` + const params = `idList=${this.id}`; deleteCompanyList(params).then((res) => { if (res.code === 200) { this.$message.success("删除成功"); @@ -42,6 +42,9 @@ export default { } }); }, + close() { + this.visible = false; + }, }, }; diff --git a/src/views/systemManagement/companyScore/components/companyTable.vue b/src/views/systemManagement/companyScore/components/companyTable.vue index 8422a94..3fea506 100644 --- a/src/views/systemManagement/companyScore/components/companyTable.vue +++ b/src/views/systemManagement/companyScore/components/companyTable.vue @@ -223,12 +223,14 @@ export default { 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; diff --git a/src/views/systemManagement/companyScore/index.vue b/src/views/systemManagement/companyScore/index.vue index 1591812..7d932d8 100644 --- a/src/views/systemManagement/companyScore/index.vue +++ b/src/views/systemManagement/companyScore/index.vue @@ -275,7 +275,7 @@ export default { } .table_body { width: 85.2vw; - height: 71vh; + height: 68vh; margin-top: 3vh; // border: 0.1px solid #4d8f89; } -- 2.36.3