ZheJiangNingBo
/
pingAnQiYeWeb
7
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

赋分更改

Browse Source
pull/72/head
lukeyan 1 year ago
parent 66f8909673
commit 1b1ee35d98
11 changed files with 161 additions and 129 deletions
Show Stats Download Patch File Download Diff File

18
src/api/closeLoopDispose/index.js
Unescape View File

@ -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
})
}

5
src/utils/request.js
Unescape View File

@ -4,9 +4,10 @@ import vm from "../main";
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
const request = axios.create({ 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://192.168.0.188:8888/zhapi',
baseURL: `http://${window.location.host}/zhapi`, //baseURL: `http://${window.location.host}/zhapi`,
timeout: 50000, timeout: 50000,
headers: { 'content-type': 'application/json' }, headers: { 'content-type': 'application/json' },
}) })

102
src/views/closeLoopDispose/components/myCourse.vue
Unescape View File

@ -9,7 +9,7 @@
</div> </div>
<el-form :model="search" class="search_top_form"> <el-form :model="search" class="search_top_form">
<el-form-item label="流程状态"> <el-form-item label="流程状态">
<el-select v-model="search.course_select" @change="change_course"> <el-select v-model="search.course_status" @change="change_course">
<el-option <el-option
v-for="item in course_list" v-for="item in course_list"
:key="item.value" :key="item.value"
@ -44,9 +44,9 @@
:header-cell-style="table_header" :header-cell-style="table_header"
:cell-style="{ background: 'revert', 'text-align': 'center' }" :cell-style="{ background: 'revert', 'text-align': 'center' }"
> >
<el-table-column prop="course_name" label="流程名称" width="420"> <el-table-column prop="procDefName" label="流程名称" width="420">
</el-table-column> </el-table-column>
<el-table-column prop="create_time" label="创建时间" width="280"> <el-table-column prop="createTime" label="创建时间" width="280">
</el-table-column> </el-table-column>
<el-table-column prop="course_type" label="流程类型" width="280"> <el-table-column prop="course_type" label="流程类型" width="280">
</el-table-column> </el-table-column>
@ -57,9 +57,9 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="tips" label="当前节点" width="220"> <el-table-column prop="taskName" label="当前节点" width="220">
</el-table-column> </el-table-column>
<el-table-column prop="person" label="未操作者" width="280"> <el-table-column prop="nextNodeUsers" label="未操作者" width="280">
</el-table-column> </el-table-column>
<el-table-column prop="operation" label="操作"> <el-table-column prop="operation" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
@ -92,21 +92,22 @@
</div> </div>
</template> </template>
<script> <script>
import { get_my_course } from "@/api/closeLoopDispose";
export default { export default {
name: "MyCourse", name: "MyCourse",
data() { data() {
return { return {
search: { search: {
course_select: "待审核", course_status: "",
course_num: "1", // 表格查询待定入参 procStatus: "0", // 表格查询待定入参
course_time: [this.get_today(), this.get_tomorrow()], course_time: [this.get_today(), this.get_tomorrow()],
word: "", word: "",
}, },
course_list: [ course_list: [
{ label: "待审核", value: "1" }, { label: "进行中", value: "1" },
{ label: "通过", value: "2" }, { label: "审核通过", value: "2" },
{ label: "驳回", value: "3" }, { label: "驳回", value: "3" },
{ label: "处置中", value: "4" }, // { label: "处置中", value: "4" },
], ],
pickerOptions: { pickerOptions: {
shortcuts: [ shortcuts: [
@ -139,63 +140,43 @@ export default {
}, },
], ],
}, },
table_data: [ table_data: [],
{
course_name: "宁波市北越石化有限公司-核酸检测率-异常处置",
create_time: "2023-06-06 12:53:30",
course_type: "防疫安全",
course_status: "进行中",
tips: "治安大队",
person: "王伟、李勋勋",
},
{
course_name: "宁波市北越石化有限公司-核酸检测率-异常处置",
create_time: "2023-06-06 12:53:30",
course_type: "防疫安全",
course_status: "处置成功",
tips: "治安大队",
person: "王伟、李勋勋",
},
{
course_name: "宁波市北越石化有限公司-核酸检测率-异常处置",
create_time: "2023-06-06 12:53:30",
course_type: "防疫安全",
course_status: "处置失败",
tips: "治安大队",
person: "王伟、李勋勋",
},
],
pageSize: 10, pageSize: 10,
pageNum: 1, pageNum: 1,
total: 0, total: 0,
}; };
}, },
created() {}, created() {
this.search_data();
},
methods: { methods: {
change_course(val) { change_course(val) {
this.search.course_num = this.course_list.find((item) => { this.search.procStatus = this.course_list.find(
item.label === val; (item) => item.label === val
}).value; ).value;
}, },
// 查询 // 查询
search_data() { search_data() {
console.log("this.search.course_time", this.search.course_time);
let param = { let param = {
startTime: pageSize: this.pageSize,
this.search.course_time == null page: this.pageNum,
? "" // isAsc: "desc",
: this.dateConversion(this.search.course_time[0]), // orderByColumn: "id",
endTime: startTime: this.dateConversion(this.search.course_time[0]),
this.search.course_time == null endTime: this.dateConversion(this.search.course_time[1]),
? "" searchKey: this.search.word,
: this.dateConversion(this.search.course_time[1]), procStatus: this.search.procStatus,
}; };
console.log("param", param); get_my_course(param).then((res) => {
console.log("get_data", res);
this.table_data = res.rows;
this.total = res.total;
});
}, },
// 重置查询 // 重置查询
reset() { reset() {
this.search.course_select = "待审核"; this.search.procStatus = "0";
this.search.course_num = "1"; this.search.course_status = "";
this.search.course_time = [this.get_today(), this.get_tomorrow()]; this.search.course_time = [this.get_today(), this.get_tomorrow()];
this.search.word = ""; this.search.word = "";
this.search_data(); this.search_data();
@ -203,7 +184,7 @@ export default {
// 详情点击跳转 // 详情点击跳转
check_details(val) { check_details(val) {
console.log(val); console.log(val);
this.$emit("change_to_detail"); this.$emit("change_to_detail" ,val); // 通知跳转
}, },
// 转换时间格式 // 转换时间格式
dateConversion(value) { dateConversion(value) {
@ -297,11 +278,9 @@ export default {
#2f6363 5%, #2f6363 5%,
#233b38 80% #233b38 80%
) !important; ) !important;
& th { & th {
background-color: transparent; background-color: transparent;
} }
& tr { & tr {
background-color: transparent; background-color: transparent;
} }
@ -311,6 +290,19 @@ export default {
background: rgba(0, 0, 0, 0); background: rgba(0, 0, 0, 0);
} }
} }
/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;
}
/deep/ .el-table td.el-table__cell, /deep/ .el-table td.el-table__cell,
.el-table th.el-table__cell.is-leaf { .el-table th.el-table__cell.is-leaf {
border: 0.1px solid #3f5564; border: 0.1px solid #3f5564;

8
src/views/closeLoopDispose/components/myCourseDetail.vue
Unescape View File

@ -3,13 +3,13 @@
<div> <div>
<el-tabs v-model="activeName"> <el-tabs v-model="activeName">
<el-tab-pane label="表单信息" name="first"> <el-tab-pane label="表单信息" name="first">
<MyCourseDetailForm ref="myCourseDetailForm"></MyCourseDetailForm> <MyCourseDetailForm ref="myCourseDetailForm" :send_detail="send_detail"></MyCourseDetailForm>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="流程图" name="second"> <el-tab-pane label="流程图" name="second">
<MyCourseDetailPicture ref="myCourseDetailPicture"></MyCourseDetailPicture> <MyCourseDetailPicture ref="myCourseDetailPicture"></MyCourseDetailPicture>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="流转记录" name="third"> <el-tab-pane label="流转记录" name="third">
<MyCourseDetailRecords ref="myCourseDetailRecords"></MyCourseDetailRecords> <MyCourseDetailRecords ref="myCourseDetailRecords" :send_detail="send_detail"></MyCourseDetailRecords>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
@ -25,11 +25,15 @@ export default {
MyCourseDetailPicture, MyCourseDetailPicture,
MyCourseDetailRecords MyCourseDetailRecords
}, },
props:{
send_detail:{}, // -> 从myCourse传过来的单条表格详情数据
},
data() { data() {
return { return {
activeName: "first", activeName: "first",
}; };
}, },
methods:{},
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>

11
src/views/closeLoopDispose/components/myCourseDetailForm.vue
Unescape View File

@ -13,10 +13,10 @@
<!-- 此列为数据展示 --> <!-- 此列为数据展示 -->
<div class="basic_message_value_one"> <div class="basic_message_value_one">
<div class="basic_message_value"> <div class="basic_message_value">
宁波市北越石化有限公司-核酸检测率-异常处置 {{ this.send_detail.procDefName }}
</div> </div>
<div class="basic_message_value">防疫安全</div> <div class="basic_message_value">防疫安全</div>
<div class="basic_message_value">2023-06-06 12:53:30</div> <div class="basic_message_value">{{ this.send_detail.createTime }}</div>
<div class="basic_message_value">二级</div> <div class="basic_message_value">二级</div>
</div> </div>
<div class="basic_message_text_two"> <div class="basic_message_text_two">
@ -83,6 +83,9 @@
<script> <script>
export default { export default {
name: "MyCourseDetailForm", name: "MyCourseDetailForm",
props:{
send_detail:{}
},
data() { data() {
return { return {
attachment_show: true, // 附件 按需显示或者隐藏 attachment_show: true, // 附件 按需显示或者隐藏
@ -128,6 +131,10 @@ export default {
], ],
}; };
}, },
created() {
console.log('send_detail',this.send_detail); // -> 从myCourse传过来的单条表格详情数据
},
methods:{},
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>

105
src/views/closeLoopDispose/components/myCourseDetailRecords.vue
Unescape View File

@ -2,13 +2,15 @@
<!-- 流程记录 --> <!-- 流程记录 -->
<div class="record_body"> <div class="record_body">
<div class="all_step"> <div class="all_step">
<div class="record_step" v-for="item in record_list" :key="item.id"> <div class="record_step" v-for="item in record_list" :key="item.taskId">
<!-- 侧边进度图标 --> <!-- 侧边进度图标 -->
<div class="step"> <div class="step">
<div class="step_icon"> <div class="step_icon">
<i v-if="icon_show" class="el-icon-success"></i> <!-- assigneeId为空的时候为待选图标,为数值的时候为确定图标 -->
<i v-if="item.assigneeId != ''" class="el-icon-success"></i>
<i v-else class="el-icon-time"></i> <i v-else class="el-icon-time"></i>
</div> </div>
<!-- 进度线 -->
<div class="step_line"></div> <div class="step_line"></div>
</div> </div>
<div class="step_table"> <div class="step_table">
@ -57,72 +59,57 @@
</div> </div>
</template> </template>
<script> <script>
import { get_my_course_record } from "@/api/closeLoopDispose";
export default { export default {
name: "MyCourseDetailRecords", name: "MyCourseDetailRecords",
props: {
send_detail: {},
},
data() { data() {
return { return {
record_list: [ record_list: [
{ // {
id: "1", // id: "1",
name: "卫健部门", // name: "卫健部门",
opeartion_num: "2", // opeartion_num: "2",
have_opeartion_num: "1", // have_opeartion_num: "1",
not_opeartion_num: "1", // not_opeartion_num: "1",
table_list: [ // table_list: [
{ // {
change: "吴沁", // change: "吴沁",
under_change: "治安大队", // under_change: "治安大队",
type: "已操作", // type: "已操作",
load_time: "2023-06-06 12:53:30", // load_time: "2023-06-06 12:53:30",
time: "2023-06-06 12:53:30", // time: "2023-06-06 12:53:30",
use_time: "2秒", // use_time: "2秒",
}, // },
{ // ],
change: "吴沁", // },
under_change: "治安大队", // {
type: "已操作", // id: "2",
load_time: "2023-06-06 12:53:30", // },
time: "2023-06-06 12:53:30", // {
use_time: "2秒", // id: "3",
}, // name: "发布人",
{ // },
change: "吴沁",
under_change: "治安大队",
type: "已操作",
load_time: "2023-06-06 12:53:30",
time: "2023-06-06 12:53:30",
use_time: "2秒",
},
{
change: "吴沁",
under_change: "治安大队",
type: "已操作",
load_time: "2023-06-06 12:53:30",
time: "2023-06-06 12:53:30",
use_time: "2秒",
},
{
change: "吴沁",
under_change: "治安大队",
type: "已操作",
load_time: "2023-06-06 12:53:30",
time: "2023-06-06 12:53:30",
use_time: "2秒",
},
],
},
{
id: "2",
},
{
id: "3",
name: "发布人",
},
], ],
src: require("../../../assets/companyFile/loadtrue.png"), src: require("../../../assets/companyFile/loadtrue.png"),
icon_show: true, // 控制图标显示隐藏 icon_show: true, // 控制图标显示隐藏
}; };
}, },
created() {
console.log("send_detail2", this.send_detail);
let param = {
definitionId: this.send_detail.procDefId,
deployId: this.send_detail.deployId,
procInsId: this.send_detail.procInsId,
taskId: this.send_detail.taskId,
};
get_my_course_record(param).then((res) => {
this.record_list = res.data.wfDetailVo.historyTaskList
console.log('this.record_list',this.record_list);
});
},
methods: { methods: {
// 表头样式 // 表头样式
table_header({ row, rowIndex }) { table_header({ row, rowIndex }) {
@ -203,7 +190,7 @@ export default {
width: 90vw; width: 90vw;
// height: 30vh; // height: 30vh;
.step_table_top { .step_table_top {
// border: 0.1px solid #fff; // border: 0.1px solid #fff;
width: 90vw; width: 90vw;
height: 5vh; height: 5vh;
display: flex; display: flex;

5
src/views/closeLoopDispose/index.vue
Unescape View File

@ -24,6 +24,7 @@
<el-tab-pane label="抄送我的" name="fourth">抄送我的</el-tab-pane> <el-tab-pane label="抄送我的" name="fourth">抄送我的</el-tab-pane>
</el-tabs> </el-tabs>
<MyCourseDetail <MyCourseDetail
:send_detail="send_detail"
ref="myCourseDetail" ref="myCourseDetail"
v-else-if="is_flag === '1'" v-else-if="is_flag === '1'"
></MyCourseDetail> ></MyCourseDetail>
@ -42,12 +43,14 @@ export default {
return { return {
activeName: "first", activeName: "first",
is_flag: "0", // 面包屑显示 tab对应详情页显示 is_flag: "0", // 面包屑显示 tab对应详情页显示
send_detail: {},
}; };
}, },
methods: { methods: {
// 我的流程子组件触发，点击使之切换到详情页面 // 我的流程子组件触发，点击使之切换到详情页面
change_to_detail() { change_to_detail(val) {
this.is_flag = "1"; this.is_flag = "1";
this.send_detail = val; // -> 传到myCourseDetailForm里面的单条详情数据
}, },
// 点击回归首页 // 点击回归首页
back_home_page() { back_home_page() {

6
src/views/systemManagement/companyScore/components/companyDetails.vue
Unescape View File

@ -478,7 +478,7 @@ export default {
height: 7vh; height: 7vh;
// border: 0.1px solid #4d8f89; // border: 0.1px solid #4d8f89;
color: #fff; color: #fff;
font-size: 30px; font-size: 65px;
font-weight: 700; font-weight: 700;
text-align: center; text-align: center;
line-height: 7vh; line-height: 7vh;
@ -574,7 +574,7 @@ export default {
height: 4vh; height: 4vh;
// border: 0.1px solid #4d8f89; // border: 0.1px solid #4d8f89;
color: #fff; color: #fff;
font-size: 20px; font-size: 18px;
font-weight: 500; font-weight: 500;
text-shadow: 0 0 9px rgba(21, 255, 198, 0.64); text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
text-align: center; text-align: center;
@ -587,7 +587,7 @@ export default {
text-align: center; text-align: center;
line-height: 4vh; line-height: 4vh;
color: #fff; color: #fff;
font-size: 18px; font-size: 35px;
font-weight: 700; font-weight: 700;
text-shadow: 0 0 9px rgba(21, 255, 198, 0.64); text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
} }

18
src/views/systemManagement/companyScore/components/companyTable.vue
Unescape View File

@ -3,11 +3,12 @@
<el-table <el-table
:data="table_data" :data="table_data"
class="company_table" class="company_table"
height="662"
:stripe="stripe" :stripe="stripe"
:header-cell-style="table_header" :header-cell-style="table_header"
:cell-style="{ background: 'revert', 'text-align': 'center' }" :cell-style="{ background: 'revert', 'text-align': 'center' }"
> >
<el-table-column prop="companyName" label="企业名称" width="240"> <el-table-column prop="companyName" label="企业名称" width="300">
</el-table-column> </el-table-column>
<el-table-column prop="score" label="平安指数"> </el-table-column> <el-table-column prop="score" label="平安指数"> </el-table-column>
<el-table-column label="指标得分"> <el-table-column label="指标得分">
@ -119,7 +120,7 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
/deep/.company_table.el-table { /deep/.company_table.el-table {
// width: 85.2vw; // width: 85.2vw;
height: 65vh; // height: 61vh;
background: rgba(0, 0, 0, 0); background: rgba(0, 0, 0, 0);
border: 0.1px solid #3f5564; border: 0.1px solid #3f5564;
thead { thead {
@ -167,4 +168,17 @@ export default {
.el-table th.el-table__cell.is-leaf { .el-table th.el-table__cell.is-leaf {
border: 0.1px solid #3f5564; 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;
}
</style> </style>

2
src/views/systemManagement/companyScore/components/detailsTable.vue
Unescape View File

@ -9,7 +9,7 @@
<div class="input_body"> <div class="input_body">
<el-input <el-input
v-model="person_input" v-model="person_input"
placeholder="请输入数量 (人)" placeholder="请输入数量(人)"
></el-input> ></el-input>
<el-button>提交</el-button> <el-button>提交</el-button>
</div> </div>

10
src/views/systemManagement/companyScore/index.vue
Unescape View File

@ -68,6 +68,7 @@
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:page-sizes="[5, 10]" :page-sizes="[5, 10]"
:pager-count="5"
:page-size="pageSize" :page-size="pageSize"
:current-page="pageNum" :current-page="pageNum"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
@ -260,7 +261,7 @@ export default {
.search_right { .search_right {
display: flex; display: flex;
.el-button { .el-button {
font-size: 18px; font-size: 17px;
height: 4vh; height: 4vh;
border-radius: 0px; border-radius: 0px;
color: #fff; color: #fff;
@ -323,34 +324,39 @@ export default {
height: 2.6vh; height: 2.6vh;
} }
/deep/.el-pagination { /deep/.el-pagination {
margin-left: 70%; margin-left: 75%;
margin-top: 2vh; margin-top: 2vh;
.el-pagination__total { .el-pagination__total {
color: #fff; color: #fff;
} }
.el-input__inner { .el-input__inner {
border-radius: 0px; border-radius: 0px;
border: 0.1px solid #277f79;
background: #3c4b4a; background: #3c4b4a;
color: #fff; color: #fff;
} }
.btn-prev { .btn-prev {
border-radius: 0px; border-radius: 0px;
border: 0.1px solid #277f79;
background: #3c4b4a; background: #3c4b4a;
color: #fff; color: #fff;
} }
ul { ul {
li { li {
border: 0.1px solid #277f79;
background: #3c4b4a; background: #3c4b4a;
color: #fff; color: #fff;
} }
} }
.btn-next { .btn-next {
border: 0.1px solid #277f79;
border-radius: 0px; border-radius: 0px;
background: #3c4b4a; background: #3c4b4a;
color: #fff; color: #fff;
} }
.el-pager { .el-pager {
li { li {
border: 0.1px solid #34a6a6;
background: #3c4b4a !important; background: #3c4b4a !important;
} }
} }

Write Preview
Loading…
Cancel
Save