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..17c8c35 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.11//.13: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/backlog.vue b/src/views/closeLoopDispose/components/backlog.vue index c6dcd73..5fe8016 100644 --- a/src/views/closeLoopDispose/components/backlog.vue +++ b/src/views/closeLoopDispose/components/backlog.vue @@ -30,16 +30,17 @@
- + - + - + - + @@ -112,7 +113,7 @@ export default { // { label: "待审核", value: "1" }, { label: "审核中", value: "1" }, { label: "审核完成", value: "2" }, - { label: "驳回完成", value: "3" }, + { label: "驳回", value: "3" }, ], pickerOptions: { shortcuts: [ @@ -254,7 +255,7 @@ export default { // return "#FDA722"; case "审核完成": return "#2eb9ef"; - case "驳回完成": + case "驳回": return "#e55b5b"; } }, @@ -266,7 +267,7 @@ export default { case 2 : return "审核完成"; case 3 : - return "驳回完成"; + return "驳回"; } }, handleSizeChange(val) { diff --git a/src/views/closeLoopDispose/components/copyDetailForm.vue b/src/views/closeLoopDispose/components/copyDetailForm.vue index 33ae73c..c5d8ed2 100644 --- a/src/views/closeLoopDispose/components/copyDetailForm.vue +++ b/src/views/closeLoopDispose/components/copyDetailForm.vue @@ -85,7 +85,7 @@
处理意见:
-
{{ item.comment }}
+
{{ item.comment.comment }}
diff --git a/src/views/closeLoopDispose/components/myCourse.vue b/src/views/closeLoopDispose/components/myCourse.vue index 168f7f1..3fd1a6e 100644 --- a/src/views/closeLoopDispose/components/myCourse.vue +++ b/src/views/closeLoopDispose/components/myCourse.vue @@ -3,10 +3,10 @@
-
+ @@ -36,21 +36,26 @@ placeholder="请选择关键词" > + + 搜索 + 重置 +
- + - + - + - + @@ -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/companyDetails.vue b/src/views/systemManagement/companyScore/components/companyDetails.vue index 9c22a26..ec981b2 100644 --- a/src/views/systemManagement/companyScore/components/companyDetails.vue +++ b/src/views/systemManagement/companyScore/components/companyDetails.vue @@ -67,7 +67,7 @@
人员安全
- {{ this.score_five }} + {{ this.score_two }}
@@ -76,16 +76,16 @@
消防安全
- {{ this.score_four }} + {{ this.score_three }}
-
危化品运输安全
+
危化运输安全
- {{ this.score_three }} + {{ this.score_four }}
@@ -94,7 +94,7 @@
列管物品安全
- {{ this.score_eight }} + {{ this.score_five }}
@@ -103,7 +103,7 @@
内部治安安全
- {{ this.score_two }} + {{ this.score_six }}
@@ -121,7 +121,7 @@
防攻击安全
- {{ this.score_nine }} + {{ this.score_eight }}
@@ -130,7 +130,7 @@
网络安全
- {{ this.score_six }} + {{ this.score_nine }}
@@ -223,23 +223,23 @@ export default { this.company_score = this.deatail_data.score; // 主页表格数据展示顺序被打乱了 this.score_one = - this.deatail_data.tbSafeCompanyStatisticsScoreDetails[8].score; + this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '防疫安全').score this.score_two = - this.deatail_data.tbSafeCompanyStatisticsScoreDetails[3].score; + this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '人员安全').score this.score_three = - this.deatail_data.tbSafeCompanyStatisticsScoreDetails[5].score; + this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '消防安全').score this.score_four = - this.deatail_data.tbSafeCompanyStatisticsScoreDetails[6].score; + this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '危化运输安全').score this.score_five = - this.deatail_data.tbSafeCompanyStatisticsScoreDetails[7].score; + this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '列管物品安全').score this.score_six = - this.deatail_data.tbSafeCompanyStatisticsScoreDetails[0].score; + this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '内部治安安全').score this.score_seven = - this.deatail_data.tbSafeCompanyStatisticsScoreDetails[2].score; + this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '道路安全').score this.score_eight = - this.deatail_data.tbSafeCompanyStatisticsScoreDetails[4].score; + this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '防攻击安全').score this.score_nine = - this.deatail_data.tbSafeCompanyStatisticsScoreDetails[1].score; + this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '网络安全').score }, mounted() { this.get_time(); diff --git a/src/views/systemManagement/companyScore/components/companyTable.vue b/src/views/systemManagement/companyScore/components/companyTable.vue index ef50346..3fea506 100644 --- a/src/views/systemManagement/companyScore/components/companyTable.vue +++ b/src/views/systemManagement/companyScore/components/companyTable.vue @@ -12,59 +12,113 @@ - + + - + + - + + - + + - + + - + + - + + - + + - + + @@ -87,7 +141,7 @@ export default { jump_params: { type: Object, default: () => {}, - } + }, }, data() { return { @@ -97,11 +151,11 @@ export default { methods: { jump(val) { // console.log("jump_val", val); - val = Object.assign(val,this.jump_params) + val = Object.assign(val, this.jump_params); console.log("jump_val", val); this.$router.push({ - path:'/home/systemManagement/companyDetails', - query:val + path: "/home/systemManagement/companyDetails", + query: val, }); }, // 表头样式 @@ -169,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; }