master
lion 2 years ago
parent 5aad9de754
commit 18edfdfe99

Binary file not shown.

After

Width:  |  Height:  |  Size: 443 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 470 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 487 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 517 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 435 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 460 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 441 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 346 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 496 B

@ -294,33 +294,128 @@
</el-table> --> </el-table> -->
</div> </div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div ref="lxTable" class="table-tree"> <div ref="lxTable" class="table-tree">
<div style="padding: 15px;background-color: #fff;" class="form-sub-title"> <div style="display:flex;justify-content: space-between;;padding: 15px;padding-left: 20px;background-color: #fff;" class="form-sub-title">
<el-link type="primary" style="font-size:18px" href="#/lawsfile/article">综合数据</el-link> <el-link type="primary" style="font-size:18px" href="#/lawsfile/article">综合数据</el-link>
<p class="no-redirect"></p> <div>
</div> <span style="background-color: #95ca7a;display: inline-block;width:50px;height: 20px;
<div class="overall"> vertical-align: bottom;border-radius: 5px;margin:0 5px"></span>已完成
<div> <span style="background-color: #dddddd;display: inline-block;width:50px;height: 20px;
<p><span>年度计划任务</span>0</p> vertical-align: bottom;border-radius: 5px;margin:0 5px"></span>未完成
<p><span>已完成任务</span>0</p> </div>
<p><span>进度</span>0</p> </div>
</div> <div class="overall">
<div> <el-descriptions class="margin-top" :labelStyle="{'color':'#2c2d2f'}"
<p><span>安全检查/</span>0</p> :contentStyle="{'font-size':'24px','color':'#333333','padding-left':'25px'}"
<p><span>安全培训/</span>0</p> contentClassName="contentClass" labelClassName="labelClass" :colon='false' title="" :column="4"
</div> direction="vertical">
<div> <el-descriptions-item span="2">
<p><span>应急演练</span>0</p> <template slot='label'>
<p><span>专项任务开展</span>0</p> <div style='display: flex;'>
</div> <p style="margin-right: 20%;">
<div> <img :src="icon1" alt="">
<p><span>安全隐患数量</span>0</p> 年度计划任务
<p><span>安全事件</span>0</p> </p>
</div> <p>
</div> <img :src="icon2" alt="">
</div> 已完成任务
<!-- <div ref="lxTable" class="table-tree"> </p>
</div>
</template>
<div style="display: flex;">
<p style="margin-right: 46%;">0<span></span></p>
<p>0<span></span></p>
</div>
</el-descriptions-item>
<el-descriptions-item span="2">
<template slot='label'>
<img :src="icon3" alt="">
进度
</template>
<div style="margin-left:-23px">
<el-progress :stroke-width="26" :percentage="0" color="#95ca7a"></el-progress>
</div>
</el-descriptions-item>
<el-descriptions-item span="2">
<template slot='label'>
<img :src="icon4" alt="">
安全检查 <span>/</span>
</template>
<div>
10 / 100<span></span>
</div>
</el-descriptions-item>
<el-descriptions-item span="2">
<template slot='label'>
<img :src="icon5" alt="">
安全培训<span>/</span>
</template>
<div>
0 / 0<span></span>
</div>
</el-descriptions-item>
<el-descriptions-item span="2">
<template slot='label'>
<img :src="icon6" alt="">
应急演练<span></span>
</template>
<div>
5<span></span>
</div>
</el-descriptions-item>
<el-descriptions-item span="2">
<template slot='label'>
<img :src="icon7" alt="">
专项任务开展<span></span>
</template>
<div>
5<span></span>
</div>
</el-descriptions-item>
<el-descriptions-item span="2">
<template slot='label'>
<img :src="icon8" alt="">
安全隐患数量
</template>
<div>
6<span></span>
</div>
</el-descriptions-item>
<el-descriptions-item span="2">
<template slot='label'>
<img :src="icon9" alt="">
安全事件
</template>
<div>
2<span></span>
</div>
</el-descriptions-item>
</el-descriptions>
<!-- <div>
<p><span>年度计划任务</span>0</p>
<p><span>已完成任务</span>0</p>
<p><span>进度</span>0</p>
</div>
<div>
<p><span>安全检查/</span>0</p>
<p><span>安全培训/</span>0</p>
</div>
<div>
<p><span>应急演练</span>0</p>
<p><span>专项任务开展</span>0</p>
</div>
<div>
<p><span>安全隐患数量</span>0</p>
<p><span>安全事件</span>0</p>
</div> -->
</div>
</div>
<!-- <div ref="lxTable" class="table-tree">
<div style="padding: 15px;background-color: #fff;" class="form-sub-title"> <div style="padding: 15px;background-color: #fff;" class="form-sub-title">
<el-link type="primary" style="font-size:18px" href="#/lawsfile/article">任务进展</el-link> <el-link type="primary" style="font-size:18px" href="#/lawsfile/article">任务进展</el-link>
<p class="no-redirect"></p> <p class="no-redirect"></p>
@ -330,29 +425,33 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div ref="lxTable" class="table-tree"> <div ref="lxTable" class="table-tree">
<div style="padding: 15px;background-color: #fff;" class="form-sub-title"> <div style="padding: 15px;background-color: #fff;" class="form-sub-title">
<div> <div style="display: flex;justify-content: space-between;">
<el-link type="primary" style="font-size:18px" href="#/lawsfile/article">检查整改</el-link> <el-link type="primary" style="font-size:18px" href="#/lawsfile/article">检查整改</el-link>
<p class="no-redirect"></p> <!-- <p class="no-redirect"></p> -->
</div> <Select placeholder="数据类型" v-model="select.question_type" style="width:130px;margin-left:5px">
<Option v-for="item in typeList" :value="item.id" :key="item.value">{{ item.value }}</Option>
</Select>
</div>
<div> <div>
<Select placeholder="问题类型" v-model="select.question_type" style="width:130px;margin-left:5px">
<Option v-for="item in questionList" :value="item.id" :key="item.value">{{ item.value }}</Option> <!-- <Select placeholder="问题类型" v-model="select.question_type" style="width:130px;margin-left:5px">
</Select> <Option v-for="item in questionList" :value="item.id" :key="item.value">{{ item.value }}</Option>
<Select placeholder="检查类型" v-model="select.check_type" style="width:130px;margin-left:5px"> </Select>
<Option v-for="item in checkList" :value="item.id" :key="item.value">{{ item.value }}</Option> <Select placeholder="检查类型" v-model="select.check_type" style="width:130px;margin-left:5px">
</Select> <Option v-for="item in checkList" :value="item.id" :key="item.value">{{ item.value }}</Option>
<Select placeholder="责任科室" v-model="select.department_id" style="width:130px;margin-left:5px"> </Select>
<Option v-for="item in departmentList" :value="item.id" :key="item.value">{{ item.name }}</Option> <Select placeholder="责任科室" v-model="select.department_id" style="width:130px;margin-left:5px">
</Select> <Option v-for="item in departmentList" :value="item.id" :key="item.value">{{ item.name }}</Option>
<DatePicker placeholder="月份" placement="bottom" </Select>
style="width: 130px;margin-left:5px" type="month" @on-change="changeMonth"></DatePicker> <DatePicker placeholder="月份" placement="bottom" style="width: 130px;margin-left:5px" type="month"
<DatePicker placeholder="年份" placement="bottom" @on-change="changeMonth"></DatePicker>
style="width: 130px;margin-left:5px" type="year" @on-change="changeYear"></DatePicker> <DatePicker placeholder="年份" placement="bottom" style="width: 130px;margin-left:5px" type="year"
@on-change="changeYear"></DatePicker> -->
</div> </div>
</div> </div>
<myecharts :height="'317px'" :data="inspection_data"></myecharts> <myecharts :height="'345px'" :data="inspection_data"></myecharts>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
@ -430,12 +529,12 @@
} from '@/api/task/patrol.js' } from '@/api/task/patrol.js'
import checkUnit from '@/views/task/list/components/checkUnit.vue' import checkUnit from '@/views/task/list/components/checkUnit.vue'
import addPatrol from '@/views/task/list/components/addPatrol.vue' import addPatrol from '@/views/task/list/components/addPatrol.vue'
import showPatrol from '@/views/task/list/components/showPatrol.vue' import showPatrol from '@/views/task/list/components/showPatrol.vue'
import { import {
getparameteritem getparameteritem
} from "@/api/system/dictionary.js"; } from "@/api/system/dictionary.js";
import { import {
listdept listdept
} from "@/api/system/department.js" } from "@/api/system/department.js"
export default { export default {
name: 'Dashboard', name: 'Dashboard',
@ -455,17 +554,33 @@
showPatrol showPatrol
}, },
data() { data() {
return { return {
select:{ icon1: require('@/assets/index/icon1.png'),
question_type:'', icon2: require('@/assets/index/icon2.png'),
year:'2023', icon3: require('@/assets/index/icon3.png'),
department_id:'', icon4: require('@/assets/index/icon4.png'),
month:'', icon5: require('@/assets/index/icon5.png'),
check_type:'' icon6: require('@/assets/index/icon6.png'),
}, icon7: require('@/assets/index/icon7.png'),
questionList:[], icon8: require('@/assets/index/icon8.png'),
departmentList:[], icon9: require('@/assets/index/icon9.png'),
checkList:[{ typeList:[{id:1,value:'责任科室'},
{id:1,value:'问题类型'},
{id:1,value:'检查类型'},
{id:1,value:'月份'},
{id:1,value:'年份'}
],
select: {
question_type: '',
year: '2023',
department_id: '',
month: '',
check_type: ''
},
questionList: [],
departmentList: [],
checkList: [{
id: 1, id: 1,
value: '专项检查' value: '专项检查'
}, { }, {
@ -653,7 +768,7 @@
} }
preview-src-list = { preview-src-list = {
arr arr
}> } >
</el-image>) </el-image>)
}) })
} </div>) } </div>)
@ -676,7 +791,7 @@
{ {
whiteSpace: 'normal' whiteSpace: 'normal'
} }
}> { } > {
row.fix_files.map(item => { row.fix_files.map(item => {
arr.push(item.url) arr.push(item.url)
return ( <el-image style = { return ( <el-image style = {
@ -691,7 +806,7 @@
} }
preview-src-list = { preview-src-list = {
arr arr
}> } >
</el-image>) </el-image>)
}) })
} </div>) } </div>)
@ -761,29 +876,29 @@
}, },
created() { created() {
this.uploadOther.token = getToken(); this.uploadOther.token = getToken();
// this.initLoad(); // this.initLoad();
this.getQuestion() this.getQuestion()
this.loadDeptOptions() this.loadDeptOptions()
this.getInspectionData() this.getInspectionData()
this.getMissionData() this.getMissionData()
this.load(); this.load();
}, },
methods: { methods: {
changeYear(e){}, changeYear(e) {},
changeMonth(e){}, changeMonth(e) {},
async getQuestion() { async getQuestion() {
const res = await getparameteritem('askList') const res = await getparameteritem('askList')
this.questionList = res.detail this.questionList = res.detail
}, },
loadDeptOptions() { loadDeptOptions() {
listdept(). listdept().
then((res) => { then((res) => {
this.departmentList = res this.departmentList = res
}).catch(error => { }).catch(error => {
console.log(error) console.log(error)
reject(error) reject(error)
}) })
}, },
initLoad() { initLoad() {
var that = this; var that = this;
@ -977,27 +1092,48 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.labelClass {
.progress-card { img {
display: flex; vertical-align: sub;
margin-right: 5px;
&-item { }
text-align: center;
flex: 1; >span {
color: #5b5d61;
&__label { font-weight: normal;
font-size: 14px; }
} }
&__num { .contentClass {
font-size: 20px;
font-weight: 600; span {
color: #9c9ea4;
padding: 6px 0; font-size: 16px;
} margin-left:5px;
} }
} }
.progress-card {
display: flex;
&-item {
text-align: center;
flex: 1;
&__label {
font-size: 14px;
}
&__num {
font-size: 20px;
font-weight: 600;
padding: 6px 0;
}
}
}
::v-deep .elrows { ::v-deep .elrows {
.el-col { .el-col {
padding: 10px !important padding: 10px !important
@ -1027,21 +1163,25 @@
.dialogConcent { .dialogConcent {
overflow-y: auto; overflow-y: auto;
} }
.overall{
background-color: #fff; .overall {
height:350px; background-color: #fff;
padding: 15px; height: 350px;
padding-top: 0; padding: 15px;
font-size: 18px; padding-left: 20px;
>div{ padding-top: 0;
display: flex; font-size: 18px;
justify-content: space-between;
>p{ >div {
max-width: 50%; display: flex;
width:50%; justify-content: space-between;
margin-bottom: 60px;
} >p {
} max-width: 50%;
width: 50%;
margin-bottom: 60px;
}
}
} }
</style> </style>

@ -92,7 +92,7 @@
<el-descriptions class="margin-top" :column="3" border> <el-descriptions class="margin-top" :column="3" border>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
确认结果 规计科确认结果
</template> </template>
<div> <div>
<span v-if='showform.status==6'> <span v-if='showform.status==6'>
@ -262,7 +262,7 @@
<el-descriptions class="margin-top" :column="3" border> <el-descriptions class="margin-top" :column="3" border>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
整改审核结果 规计科审核结果
</template> </template>
<div> <div>
<span v-if='showform.status==5'> <span v-if='showform.status==5'>
@ -811,10 +811,10 @@
value: '已撤回' value: '已撤回'
}, { }, {
id: 0, id: 0,
value: '待审核' value: '待确认'
}, { }, {
id: 1, id: 1,
value: '待领导意见' value: '待领导确认'
}, { }, {
id: 2, id: 2,
value: '已分发,待接收' value: '已分发,待接收'
@ -829,7 +829,7 @@
value: '已整改' value: '已整改'
}, { }, {
id: 6, id: 6,
value: '不通过' value: '退回'
}, { }, {
id: 7, id: 7,
value: '整改不通过,重新整改' value: '整改不通过,重新整改'
@ -838,7 +838,7 @@
value: '部门退回' value: '部门退回'
}, { }, {
id: 9, id: 9,
value: '待领导意见整改' value: '待领导审核'
}], }],
id: '', id: '',
uploadOther: { uploadOther: {

Loading…
Cancel
Save