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

Merge pull request 'lukeyan' (#97) from lukeyan into master

Browse Source 
Reviewed-on: #97
pull/101/head^2
lukeyan 1 year ago
parent a41105ac23 faa98a569c
commit 932c4daadf
6 changed files with 135 additions and 78 deletions
Show Stats Download Patch File Download Diff File

9
src/views/closeLoopDispose/components/backlog.vue
Unescape View File

@ -33,13 +33,13 @@
: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="procDefName" label="流程名称" width="420"> <el-table-column prop="procDefName" label="流程名称" width="380">
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="创建时间" width="280"> <el-table-column prop="createTime" label="创建时间" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="course_type" label="流程类型" width="280"> <el-table-column prop="course_type" label="流程类型" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="process_status" label="流程状态" width="220"> <el-table-column prop="process_status" label="流程状态">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{ color: styleChange(scope.row.process_status) }"> <div :style="{ color: styleChange(scope.row.process_status) }">
{{ scope.row.process_status }} {{ scope.row.process_status }}
@ -333,6 +333,7 @@ export default {
.el-input__inner { .el-input__inner {
// width: 300px; // width: 300px;
border-radius: 0px; border-radius: 0px;
height: 3.7vh;
border: 1px solid #3d505e; border: 1px solid #3d505e;
// border: 0.5px dashed; // border: 0.5px dashed;
background: #283436; background: #283436;

5
src/views/closeLoopDispose/components/complete.vue
Unescape View File

@ -47,9 +47,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="procDefName" label="流程名称" width="420"> <el-table-column prop="procDefName" label="流程名称" width="380">
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="创建时间" width="240"> <el-table-column prop="createTime" label="创建时间" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="processType" label="流程类型" width="160"> <el-table-column prop="processType" label="流程类型" width="160">
</el-table-column> </el-table-column>
@ -368,6 +368,7 @@ export default {
.el-input__inner { .el-input__inner {
// width: 300px; // width: 300px;
border-radius: 0px; border-radius: 0px;
height: 3.7vh;
border: 1px solid #3d505e; border: 1px solid #3d505e;
// border: 0.5px dashed; // border: 0.5px dashed;
background: #283436; background: #283436;

4
src/views/closeLoopDispose/components/copy.vue
Unescape View File

@ -47,9 +47,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="processName" label="流程名称" width="420"> <el-table-column prop="processName" label="流程名称" width="380">
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="创建时间" width="240"> <el-table-column prop="createTime" label="创建时间" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="course_type" label="流程类型" width="200"> <el-table-column prop="course_type" label="流程类型" width="200">
</el-table-column> </el-table-column>

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

@ -44,13 +44,13 @@
: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="procDefName" label="流程名称" width="420"> <el-table-column prop="procDefName" label="流程名称" width="380">
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="创建时间" width="280"> <el-table-column prop="createTime" label="创建时间" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="processType" label="流程类型" width="280"> <el-table-column prop="processType" label="流程类型" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="process_status" label="流程状态" width="220"> <el-table-column prop="process_status" label="流程状态">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{ color: styleChange(scope.row.process_status) }"> <div :style="{ color: styleChange(scope.row.process_status) }">
{{ scope.row.process_status }} {{ scope.row.process_status }}
@ -368,6 +368,7 @@ export default {
.el-input__inner { .el-input__inner {
// width: 300px; // width: 300px;
border-radius: 0px; border-radius: 0px;
height: 3.7vh;
border: 1px solid #3d505e; border: 1px solid #3d505e;
// border: 0.5px dashed; // border: 0.5px dashed;
background: #283436; background: #283436;

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

@ -67,7 +67,7 @@
</div> </div>
<div class="score_name">人员安全</div> <div class="score_name">人员安全</div>
<div class="score_num"> <div class="score_num">
{{ this.score_five }} {{ this.score_two }}
</div> </div>
</div> </div>
<div class="score_portion"> <div class="score_portion">
@ -76,16 +76,16 @@
</div> </div>
<div class="score_name">消防安全</div> <div class="score_name">消防安全</div>
<div class="score_num"> <div class="score_num">
{{ this.score_four }} {{ this.score_three }}
</div> </div>
</div> </div>
<div class="score_portion"> <div class="score_portion">
<div class="score_img"> <div class="score_img">
<div class="img_box img_03"></div> <div class="img_box img_03"></div>
</div> </div>
<div class="score_name">危化品运输安全</div> <div class="score_name">危化运输安全</div>
<div class="score_num"> <div class="score_num">
{{ this.score_three }} {{ this.score_four }}
</div> </div>
</div> </div>
<div class="score_portion"> <div class="score_portion">
@ -94,7 +94,7 @@
</div> </div>
<div class="score_name">列管物品安全</div> <div class="score_name">列管物品安全</div>
<div class="score_num"> <div class="score_num">
{{ this.score_eight }} {{ this.score_five }}
</div> </div>
</div> </div>
<div class="score_portion"> <div class="score_portion">
@ -103,7 +103,7 @@
</div> </div>
<div class="score_name">内部治安安全</div> <div class="score_name">内部治安安全</div>
<div class="score_num"> <div class="score_num">
{{ this.score_two }} {{ this.score_six }}
</div> </div>
</div> </div>
<div class="score_portion"> <div class="score_portion">
@ -121,7 +121,7 @@
</div> </div>
<div class="score_name">防攻击安全</div> <div class="score_name">防攻击安全</div>
<div class="score_num"> <div class="score_num">
{{ this.score_nine }} {{ this.score_eight }}
</div> </div>
</div> </div>
<div class="score_portion"> <div class="score_portion">
@ -130,7 +130,7 @@
</div> </div>
<div class="score_name">网络安全</div> <div class="score_name">网络安全</div>
<div class="score_num"> <div class="score_num">
{{ this.score_six }} {{ this.score_nine }}
</div> </div>
</div> </div>
</div> </div>
@ -223,23 +223,23 @@ export default {
this.company_score = this.deatail_data.score; this.company_score = this.deatail_data.score;
// 主页表格数据展示顺序被打乱了 // 主页表格数据展示顺序被打乱了
this.score_one = this.score_one =
this.deatail_data.tbSafeCompanyStatisticsScoreDetails[8].score; this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '防疫安全').score
this.score_two = this.score_two =
this.deatail_data.tbSafeCompanyStatisticsScoreDetails[3].score; this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '人员安全').score
this.score_three = this.score_three =
this.deatail_data.tbSafeCompanyStatisticsScoreDetails[5].score; this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '消防安全').score
this.score_four = this.score_four =
this.deatail_data.tbSafeCompanyStatisticsScoreDetails[6].score; this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '危化运输安全').score
this.score_five = this.score_five =
this.deatail_data.tbSafeCompanyStatisticsScoreDetails[7].score; this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '列管物品安全').score
this.score_six = this.score_six =
this.deatail_data.tbSafeCompanyStatisticsScoreDetails[0].score; this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '内部治安安全').score
this.score_seven = this.score_seven =
this.deatail_data.tbSafeCompanyStatisticsScoreDetails[2].score; this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '道路安全').score
this.score_eight = this.score_eight =
this.deatail_data.tbSafeCompanyStatisticsScoreDetails[4].score; this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '防攻击安全').score
this.score_nine = this.score_nine =
this.deatail_data.tbSafeCompanyStatisticsScoreDetails[1].score; this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '网络安全').score
}, },
mounted() { mounted() {
this.get_time(); this.get_time();

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

@ -12,59 +12,113 @@
</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="指标得分">
<el-table-column <el-table-column label="防疫安全" width="130">
prop="tbSafeCompanyStatisticsScoreDetails[8].score" <template slot-scope="scope">
label="防疫安全" <div
width="130" v-for="item in scope.row.tbSafeCompanyStatisticsScoreDetails"
> :key="item.id"
>
<span v-if="item.levelIndexOne == '防疫安全'">{{
item.score
}}</span>
</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="人员安全" width="120">
prop="tbSafeCompanyStatisticsScoreDetails[7].score" <template slot-scope="scope">
label="人员安全" <div
width="120" v-for="item in scope.row.tbSafeCompanyStatisticsScoreDetails"
> :key="item.id"
>
<span v-if="item.levelIndexOne == '人员安全'">{{
item.score
}}</span>
</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="消防安全" width="120">
prop="tbSafeCompanyStatisticsScoreDetails[6].score" <template slot-scope="scope">
label="消防安全" <div
width="120" v-for="item in scope.row.tbSafeCompanyStatisticsScoreDetails"
> :key="item.id"
>
<span v-if="item.levelIndexOne == '消防安全'">{{
item.score
}}</span>
</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="危化运输安全" width="140">
prop="tbSafeCompanyStatisticsScoreDetails[5].score" <template slot-scope="scope">
label="危化品运输安全" <div
width="140" v-for="item in scope.row.tbSafeCompanyStatisticsScoreDetails"
> :key="item.id"
>
<span v-if="item.levelIndexOne == '危化运输安全'">{{
item.score
}}</span>
</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="列管物品安全" width="140">
prop="tbSafeCompanyStatisticsScoreDetails[4].score" <template slot-scope="scope">
label="列管物品安全" <div
width="140" v-for="item in scope.row.tbSafeCompanyStatisticsScoreDetails"
> :key="item.id"
>
<span v-if="item.levelIndexOne == '列管物品安全'">{{
item.score
}}</span>
</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="内部治安安全" width="140">
prop="tbSafeCompanyStatisticsScoreDetails[3].score" <template slot-scope="scope">
label="内部治安安全" <div
width="140" v-for="item in scope.row.tbSafeCompanyStatisticsScoreDetails"
> :key="item.id"
>
<span v-if="item.levelIndexOne == '内部治安安全'">{{
item.score
}}</span>
</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="道路安全" width="120">
prop="tbSafeCompanyStatisticsScoreDetails[2].score" <template slot-scope="scope">
label="道路安全" <div
width="120" v-for="item in scope.row.tbSafeCompanyStatisticsScoreDetails"
> :key="item.id"
>
<span v-if="item.levelIndexOne == '道路安全'">{{
item.score
}}</span>
</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="防攻击安全" width="130">
prop="tbSafeCompanyStatisticsScoreDetails[1].score" <template slot-scope="scope">
label="防攻击安全" <div
width="130" v-for="item in scope.row.tbSafeCompanyStatisticsScoreDetails"
> :key="item.id"
>
<span v-if="item.levelIndexOne == '防攻击安全'">{{
item.score
}}</span>
</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="网络安全" width="120">
prop="tbSafeCompanyStatisticsScoreDetails[0].score" <template slot-scope="scope">
label="网络安全" <div
width="120" v-for="item in scope.row.tbSafeCompanyStatisticsScoreDetails"
> :key="item.id"
>
<span v-if="item.levelIndexOne == '网络安全'">{{
item.score
}}</span>
</div>
</template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column prop="operation" label="操作"> <el-table-column prop="operation" label="操作">
@ -87,7 +141,7 @@ export default {
jump_params: { jump_params: {
type: Object, type: Object,
default: () => {}, default: () => {},
} },
}, },
data() { data() {
return { return {
@ -97,11 +151,11 @@ export default {
methods: { methods: {
jump(val) { jump(val) {
// console.log("jump_val", 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); console.log("jump_val", val);
this.$router.push({ this.$router.push({
path:'/home/systemManagement/companyDetails', path: "/home/systemManagement/companyDetails",
query:val query: val,
}); });
}, },
// 表头样式 // 表头样式

Write Preview
Loading…
Cancel
Save