From 2dbec630c2e618606f5625ca08e261ee0caba60f Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期五, 20 五月 2022 17:15:33 +0800
Subject: [PATCH] 'lct'
---
src/api/riskLevelManage.js | 11 ++
src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue | 5
src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue | 4
src/views/specialWorkManage/specialWork/taskCreate/components/taskBasic/index.vue | 36 ++++++--
src/views/specialWorkManage/specialWork/taskCreate/components/taskCreate.vue | 3
src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue | 13 ---
src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue | 39 +++++++--
src/views/doublePreventAction/riskLevelManage/analyseUnit/components/departmentChart.vue | 89 ++++++++++++++++++++++
src/views/doublePreventAction/hiddenDanger/inspectionRecord/components/detail.vue | 9 +-
src/components/Tab/Marker.vue | 12 +-
10 files changed, 176 insertions(+), 45 deletions(-)
diff --git a/src/api/riskLevelManage.js b/src/api/riskLevelManage.js
index a9c61fb..0bd178c 100644
--- a/src/api/riskLevelManage.js
+++ b/src/api/riskLevelManage.js
@@ -149,3 +149,14 @@
method: 'get',
})
}
+
+
+export function getDepartmentChart() {
+ return request({
+ headers: {
+ 'Authorization': getToken()
+ },
+ url: process.env.BASE_API + '/riskAnaUnit/department-analysis',
+ method: 'post',
+ })
+}
diff --git a/src/components/Tab/Marker.vue b/src/components/Tab/Marker.vue
index f3149da..37f2391 100644
--- a/src/components/Tab/Marker.vue
+++ b/src/components/Tab/Marker.vue
@@ -1,12 +1,12 @@
<template>
<div class="container">
<div class="images">
- <img
- v-for="image in images"
- :key="image.url"
- :src="image.url"
- @click="clickCreateHandle(image.url)"
- />
+<!-- <img-->
+<!-- v-for="image in images"-->
+<!-- :key="image.url"-->
+<!-- :src="image.url"-->
+<!-- @click="clickCreateHandle(image.url)"-->
+<!-- />-->
</div>
<div class="model-panel-list">
<el-row :gutter="10">
diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionRecord/components/detail.vue b/src/views/doublePreventAction/hiddenDanger/inspectionRecord/components/detail.vue
index c3fc9e0..f9b28b2 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionRecord/components/detail.vue
+++ b/src/views/doublePreventAction/hiddenDanger/inspectionRecord/components/detail.vue
@@ -232,7 +232,7 @@
ifNormal:false,
userList:[],
fileList:[],
- resultList:[{id:1,name:'正常'},{id:2,name:'异常'}],
+ resultList:[{id:0,name:'未操作'},{id:1,name:'正常'},{id:2,name:'异常'}],
typeList:[{id:1,name:'日常检查'},{id:2,name:'周期检查'}],
statusList:[{id:1,name:'待巡检'},{id:2,name:'巡检中'},{id:3,name:'已完成'},{id:4,name:'超时未巡检'},{id:5,name:'已取消'}],
}
@@ -252,10 +252,10 @@
this.titleDetail = '巡检单元查看'
this.ifShow = true
this.inspectionRecordDetailForm = JSON.parse(JSON.stringify(value))
- if(value.result === 2){
+ if(value.result !== 1){
this.ifNormal = true
this.fileList = []
- this.fileList.push({url:process.env.IMG_API + value.img})
+ this.fileList =(value.img === null ? [] : [ {url:process.env.IMG_API + value.img} ])
}
}else{
this.titleDetail = '巡检单元上报'
@@ -285,7 +285,7 @@
if(valid){
submitUnitOne(this.inspectionRecordDetailForm).then( res =>{
if(res.data.code === '200'){
- this.inspectionRecordDetailFormVisible = false
+
this.$message({
type:'success',
message:'上报成功',
@@ -299,6 +299,7 @@
type:'warning'
})
}
+ this.inspectionRecordDetailFormVisible = false
})
}else{
this.$message({
diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue b/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue
index 80ae467..9a16baa 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue
@@ -7,7 +7,7 @@
</div>
<div class="basic_search">
<span>结束时间：</span>
- <el-date-picker v-model="listQuery.startTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="巡检结束时间"></el-date-picker>
+ <el-date-picker v-model="listQuery.endTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="巡检结束时间"></el-date-picker>
</div>
<div class="basic_search">
<span>任务类型：</span>
@@ -35,17 +35,6 @@
<span>巡检任务创建人员：</span>
<el-select v-model="listQuery.createUid" filterable clearable>
<el-option
- v-for="item in userList"
- :key="item.id"
- :value="item.id"
- :label="item.realname"
- ></el-option>
- </el-select>
- </div>
- <div class="basic_search">
- <span>异常通知人员：</span>
- <el-select v-model="listQuery.noticeUid" filterable clearable>
- <el-option
v-for="item in userList"
:key="item.id"
:value="item.id"
diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue b/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
index 01f12bd..eb6c39d 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
@@ -445,7 +445,7 @@
if(type === '新增'){
this.ifShow = false
this.title = '新建巡检计划设定'
- this.noticeDepartment = ''
+ // this.noticeDepartment = ''
this.execDepartment = ''
this.inspectionTaskForm = {
type:null,
@@ -467,6 +467,7 @@
}else{
this.ifShow = true
this.title = '编辑巡检计划设定'
+ debugger
// this.noticeDepartment = this.handleDepartment(JSON.parse(JSON.stringify(value)).noticeUid)
// this.changeNotice()
this.execDepartment = this.handleDepartment(JSON.parse(JSON.stringify(value)).execUid)
@@ -481,6 +482,7 @@
}
},
handleDepartment(value){
+ debugger
let department = ''
for(let i in this.userList){
if(this.userList[i].id === value){
diff --git a/src/views/doublePreventAction/riskLevelManage/analyseUnit/components/departmentChart.vue b/src/views/doublePreventAction/riskLevelManage/analyseUnit/components/departmentChart.vue
new file mode 100644
index 0000000..94a4888
--- /dev/null
+++ b/src/views/doublePreventAction/riskLevelManage/analyseUnit/components/departmentChart.vue
@@ -0,0 +1,89 @@
+<template>
+ <el-dialog title="各部门风险分析单元" :visible.sync="chartsVisible" :modal-append-to-body="false" :close-on-click-modal="false" width="600px">
+ <div id="departmentChart" style="width:90%;height:360px;margin: 0 auto;">
+ </div>
+ </el-dialog>
+</template>
+
+<script>
+ import {getDepartmentChart} from "../../../../../api/riskLevelManage";
+
+ export default {
+ name: "departmentChart",
+ data() {
+ return {
+ numData:[],
+ departmentData:[],
+ myChart:'',
+ chartsVisible:false,
+ }
+ },
+ mounted() {
+
+ },
+ methods : {
+ show(){
+ this.chartsVisible = true
+ this.getChart()
+ },
+ async getChart() {
+ let res = await getDepartmentChart()
+ if(res.data.code === '200') {
+ debugger
+ this.numData = res.data.result.map(item =>{
+ return item["count"]
+ })
+ this.departmentData = res.data.result.map(item =>{
+ return item.department
+ })
+ this.myChart = this.$echarts.init(document.getElementById('departmentChart'))
+ this.myChart.setOption({
+ tooltip: {
+ trigger: 'item'
+ },
+ legend: {
+ top: '5%',
+ left: 'center',
+ orient:'vertical'
+ },
+ xAxis: {
+ type: 'category',
+ data: this.departmentData
+ },
+ yAxis: {
+ type: 'value'
+ },
+ series: [
+ {
+ data: this.numData,
+ type: 'bar',
+ itemStyle: {
+ normal: {
+ color: function(params) {
+ // 给出颜⾊组
+ var colorList = ['#fac858','#5470c6','#91cc75','#fac858','#ee6666','#73c0de','#fc8452','#3ba272','#9a60b4','#ea7ccc'];
+ return colorList[params.dataIndex]
+ },
+ }
+ },
+ showBackground: true,
+ backgroundStyle: {
+ color: '#5470c6'
+ }
+ }]
+ })
+ }else{
+ this.$message({
+ type:'warning',
+ message:res.data.message
+ })
+ }
+
+ },
+ }
+ }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
index a1749f7..b5ec3a3 100644
--- a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
@@ -82,14 +82,23 @@
<el-dialog :title="title" :visible.sync="analyseUnitVisible" :modal-append-to-body="false" :close-on-click-modal="false" width="600px">
<el-form ref="analyseUnitForm" :rules="analyseUnitFormRules" :model="analyseUnitForm" label-position="right" label-width="165px">
<el-form-item label="责任部门" prop="hazardDep">
- <el-select v-model="analyseUnitForm.hazardDep" value-key="item" class="analyseUnit_input" @change="departmentChange" @clear="departmentClear">
- <el-option
- v-for="item in departmentList"
- :key="item.id"
- :value="item"
- :label="item.department"
- ></el-option>
- </el-select>
+ <el-row>
+ <el-col :span="21">
+ <el-select v-model="analyseUnitForm.hazardDep" value-key="item" class="analyseUnit_input" @change="departmentChange" @clear="departmentClear">
+ <el-option
+ v-for="item in departmentList"
+ :key="item.id"
+ :value="item"
+ :label="item.department"
+ ></el-option>
+ </el-select>
+ </el-col>
+ <el-col :span="3">
+ <img src="../../../../assets/map.png" class="image" @click="showDepartmentChart"></img>
+ </el-col>
+ </el-row>
+
+
</el-form-item>
<el-form-item label="责任人" prop="hazardLiablePerson">
<el-select v-model="analyseUnitForm.hazardLiablePerson" value-key="item" class="analyseUnit_input"@change="personChange" @clear="personClear" >
@@ -113,15 +122,19 @@
<el-button type="primary" @click="submitAnalyseUnit()">确认</el-button>
</div>
</el-dialog>
+ <department-chart ref="chart"></department-chart>
+
</div>
</template>
<script>
+ import departmentChart from "./components/departmentChart";
import { mapGetters } from 'vuex'
import { computePageCount } from '@/utils'
import { addAnalyseUnit, deleteAnalyseUnit, getAnalyseUnitList, updateAnalyseUnit } from '@/api/riskLevelManage'
import {getAllDepartment, getDepartmentList} from "../../../../api/departmentManage";
import {safetyInspectionItemName} from "../../../../api/safetySelfInspection";
+ import {getDepartmentChart} from "../../../../api/riskLevelManage";
export default {
name: 'index',
filters: {
@@ -137,6 +150,9 @@
...mapGetters([
'userType'
])
+ },
+ components :{
+ departmentChart
},
data() {
return {
@@ -228,6 +244,9 @@
type:'warning'
})
}
+ },
+ showDepartmentChart() {
+ this.$refs.chart.show()
},
showAnalyseUnitForm(value,type){
this.analyseUnitVisible = true
@@ -359,4 +378,8 @@
.analyseUnit_input{
width:320px;
}
+ .image{
+ width:70%;
+ height:70%;
+ }
</style>
diff --git a/src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue b/src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue
index f593625..bc116f5 100644
--- a/src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue
@@ -174,7 +174,6 @@
status: null
},
listQuery:{
- eid:'',
status:0,
},
}
@@ -187,7 +186,6 @@
async getSafetyRiskSpaceData(){
this.listLoading = true
let params = {}
- params["eid"] = (this.listQuery.eid === '' ? Cookies.get('companyid') : this.listQuery.eid)
params["status"] = this.listQuery.status
let res = await getSafetyRiskSpaceList(params)
if(res.data.code === '200'){
@@ -230,7 +228,7 @@
if(type === '新增'){
this.title = '新增'
this.safetyRiskSpaceForm = {
- createUid: Cookies.get('userId'),
+ createUid: parseInt(Cookies.get('userId')),
descInfo: null,
img: null,
}
@@ -296,6 +294,7 @@
if(response.code === '200'){
debugger
this.safetyRiskSpaceForm.img = response.result.path
+ this.fileList = []
this.fileList.push({url:process.env.IMG_API + response.result.path})
this.$notify({
type:'success',
diff --git a/src/views/specialWorkManage/specialWork/taskCreate/components/taskBasic/index.vue b/src/views/specialWorkManage/specialWork/taskCreate/components/taskBasic/index.vue
index 6d3e3fa..63505c9 100644
--- a/src/views/specialWorkManage/specialWork/taskCreate/components/taskBasic/index.vue
+++ b/src/views/specialWorkManage/specialWork/taskCreate/components/taskBasic/index.vue
@@ -71,15 +71,18 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="16">
- <el-form-item label="作业地点:" prop="area">
- <el-input v-model="taskBasicForm.area"></el-input>
+ <el-col :span="8">
+ <el-form-item label="吨位类型:" prop="etype" >
+ <el-select v-model="taskBasicForm.etype" clearable class="taskBasic_select">
+ <el-option
+ v-for="item in etypeList"
+ :key="item.id"
+ :value="item.id"
+ :label="item.name"
+ ></el-option>
+ </el-select>
</el-form-item>
</el-col>
- </el-row>
-
- <el-row>
-
<el-col :span="8">
<el-form-item label="是否节假日:" prop="isholiday" >
<el-select v-model="taskBasicForm.isholiday" clearable class="taskBasic_select">
@@ -92,7 +95,17 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="16">
+
+ </el-row>
+
+ <el-row>
+
+ <el-col :span="12">
+ <el-form-item label="作业地点:" prop="area">
+ <el-input v-model="taskBasicForm.area"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="作业内容:" prop="description">
<el-input v-model="taskBasicForm.description"></el-input>
</el-form-item>
@@ -678,13 +691,15 @@
description:'',
isanalysis:'',
analysisarea:'',
- analysismedium:''
+ analysismedium:'',
+ etype:'',
},
activeNames:['0'],
companyList:[],
fireTypeList:[],
hazardList:[],
userList:[],
+ etypeList:[{id:1,name:'60万吨'},{id:2,name:'130万吨'}],
list:[{id:0,name:'否'},{id:1,name:'是'}],
levelList:[{id:2,name:'特级'},{id:1,name:'一级'},{id:0,name:'二级'},],
spaceCategoryList:[{id:0,name:'密闭设备：如船舱、贮罐、车载槽罐、反应塔（釜）、冷藏箱、压力容器、管道、烟道、锅炉等'},{id:1,name:'地下有限空间：如地下管道、地下室、地下仓库、地下工程、暗沟、隧道、涵洞、地坑、废井、地窖、污水池（井）、沼气池、化粪池、下水道等'},{id:2,name:'地上有限空间：如储藏室、酒糟池、发酵池、垃圾站、温室、冷库、粮仓、料仓等'},],
@@ -731,7 +746,8 @@
description:[{ required: true, message: '作业内容不能为空', trigger: 'blur' }],
isanalysis:[{ required: true, message: '是否需要气体检测不能为空', trigger: 'change' }],
analysisarea:[{ required: true, message: '分析地点不能为空', trigger: 'blur' }],
- analysismedium:[{ required: true, message: '分析介质不能为空', trigger: 'blur' }]
+ analysismedium:[{ required: true, message: '分析介质不能为空', trigger: 'blur' }],
+ etype:[{ required: true, message: '吨位类型不能为空', trigger: 'change' }]
},
ifIncludeArea:null,
ifHoisting:null,
diff --git a/src/views/specialWorkManage/specialWork/taskCreate/components/taskCreate.vue b/src/views/specialWorkManage/specialWork/taskCreate/components/taskCreate.vue
index 87e4ab7..a6e7317 100644
--- a/src/views/specialWorkManage/specialWork/taskCreate/components/taskCreate.vue
+++ b/src/views/specialWorkManage/specialWork/taskCreate/components/taskCreate.vue
@@ -253,7 +253,8 @@
description:'',
isanalysis:'',
analysisarea:'',
- analysismedium:''
+ analysismedium:'',
+ etype:'',
}
this.$refs.taskBasic.ifIncludeArea = null
this.$refs.taskBasic.ifHoisting = null
--
Gitblit v1.9.2