Skip to content

Z
zhengyuan-danger-chemistry-manage
Commit 8458df71 authored by 王晓倩's avatar 王晓倩
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents a52fe9d6 97c556be
Hide whitespace changes
Inline Side-by-side
Showing with 158 additions and 139 deletions
danger-manage-system/src/main/java/com/zehong/system/domain/TRiskManager.java
View file @ 8458df71
......@@ -6,10 +6,10 @@ import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
/**
* 【请填写功能名称】对象 t_risk_manager
*
* 风险信息对象 t_risk_manager
*
* @author zehong
* @date 2022-07-01
* @date 2022-11-24
*/
public class TRiskManager extends BaseEntity
{
......@@ -40,81 +40,81 @@ public class TRiskManager extends BaseEntity
/** 责任部门 */
@Excel(name = "责任部门")
private int riskDept;
private Long riskDept;
/** 责任人 */
@Excel(name = "责任人")
private String riskPerson;
public void setId(Long id)
public void setId(Long id)
{
this.id = id;
}
public Long getId()
public Long getId()
{
return id;
}
public void setRiskPart(String riskPart)
public void setRiskPart(String riskPart)
{
this.riskPart = riskPart;
}
public String getRiskPart()
public String getRiskPart()
{
return riskPart;
}
public void setRiskContent(String riskContent)
public void setRiskContent(String riskContent)
{
this.riskContent = riskContent;
}
public String getRiskContent()
public String getRiskContent()
{
return riskContent;
}
public void setRiskLevel(String riskLevel)
public void setRiskLevel(String riskLevel)
{
this.riskLevel = riskLevel;
}
public String getRiskLevel()
public String getRiskLevel()
{
return riskLevel;
}
public void setRiskType(String riskType)
public void setRiskType(String riskType)
{
this.riskType = riskType;
}
public String getRiskType()
public String getRiskType()
{
return riskType;
}
public void setRiskControl(String riskControl)
public void setRiskControl(String riskControl)
{
this.riskControl = riskControl;
}
public String getRiskControl()
public String getRiskControl()
{
return riskControl;
}
public void setRiskDept(int riskDept)
public void setRiskDept(Long riskDept)
{
this.riskDept = riskDept;
}
public int getRiskDept()
public Long getRiskDept()
{
return riskDept;
}
public void setRiskPerson(String riskPerson)
public void setRiskPerson(String riskPerson)
{
this.riskPerson = riskPerson;
}
public String getRiskPerson()
public String getRiskPerson()
{
return riskPerson;
}
......@@ -122,14 +122,14 @@ public class TRiskManager extends BaseEntity
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("riskPart", getRiskPart())
.append("riskContent", getRiskContent())
.append("riskLevel", getRiskLevel())
.append("riskType", getRiskType())
.append("riskControl", getRiskControl())
.append("riskDept", getRiskDept())
.append("riskPerson", getRiskPerson())
.toString();
.append("id", getId())
.append("riskPart", getRiskPart())
.append("riskContent", getRiskContent())
.append("riskLevel", getRiskLevel())
.append("riskType", getRiskType())
.append("riskControl", getRiskControl())
.append("riskDept", getRiskDept())
.append("riskPerson", getRiskPerson())
.toString();
}
}
danger-manage-system/src/main/resources/mapper/system/TRiskManagerMapper.xml
View file @ 8458df71
......@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zehong.system.mapper.TRiskManagerMapper">
<resultMap type="TRiskManager" id="TRiskManagerResult">
<result property="id" column="id" />
<result property="riskPart" column="risk_part" />
......@@ -21,22 +21,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTRiskManagerList" parameterType="TRiskManager" resultMap="TRiskManagerResult">
<include refid="selectTRiskManagerVo"/>
<where>
<if test="riskPart != null and riskPart != ''"> and risk_part = #{riskPart}</if>
<where>
<if test="riskPart != null and riskPart != ''"> and risk_part LIKE concat('%',#{riskPart},'%')</if>
<if test="riskContent != null and riskContent != ''"> and risk_content = #{riskContent}</if>
<if test="riskLevel != null and riskLevel != ''"> and risk_level = #{riskLevel}</if>
<if test="riskType != null and riskType != ''"> and risk_type = #{riskType}</if>
<if test="riskControl != null and riskControl != ''"> and risk_control = #{riskControl}</if>
<if test="riskDept != null and riskDept != ''"> and risk_dept = #{riskDept}</if>
<if test="riskDept != null"> and risk_dept = #{riskDept}</if>
<if test="riskPerson != null and riskPerson != ''"> and risk_person = #{riskPerson}</if>
</where>
</select>
<select id="selectTRiskManagerById" parameterType="Long" resultMap="TRiskManagerResult">
<include refid="selectTRiskManagerVo"/>
where id = #{id}
</select>
<insert id="insertTRiskManager" parameterType="TRiskManager" useGeneratedKeys="true" keyProperty="id">
insert into t_risk_manager
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteTRiskManagerByIds" parameterType="String">
delete from t_risk_manager where id in
delete from t_risk_manager where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
......
danger-manage-system/src/main/resources/mapper/system/TStaffMapper.xml
View file @ 8458df71
......@@ -63,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND date_format(t.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where>
group by t.user_id desc
</select>
<select id="selectTStaffById" parameterType="Long" resultMap="TStaffResult">
......
danger-manage-web/src/components/DangerousMark/NewWorkPermitDetail.vue
View file @ 8458df71
......@@ -50,17 +50,18 @@
</td>
</tr>
<tr>
<td rowspan="4" colspan="2">批准人填写</td>
<td rowspan="4" colspan="2">许可证</td>
<td rowspan="3" colspan="2">批准人填写</td>
<td rowspan="3" colspan="2">许可证</td>
<td colspan="6" style="text-align: left">是否需要进一步的JSA: <input disabled type="checkbox" v-model="licenceInfo.jsa.yes"/>否<input type="checkbox" disabled v-model="licenceInfo.jsa.no"/>是 JSA[<input class="editInput" disabled v-model="licenceInfo.jsa.num" style="width: 250px" placeholder="填写JSA编号"/>]</td>
</tr>
<tr>
<!--<tr>
<td colspan="6" style="text-align: left"><input disabled type="checkbox" v-model="licenceInfo.specialLicence"/>0无需特殊工作许可</td>
</tr>
</tr>-->
<tr>
<td colspan="6" style="text-align: left">
<div><input type="checkbox" disabled v-model="licenceInfo.lockListing.isChecked"/>1-1锁定挂牌记录表 [<input class="editInput" disabled v-model="licenceInfo.lockListing.num" style="width: 250px" placeholder="填写编号"/>]</div>
<div><input type="checkbox" disabled v-model="licenceInfo.blindPlate.isChecked"/>1-2盲板抽堵作业许可 [<input class="editInput" disabled v-model="licenceInfo.blindPlate.num" style="width: 250px" placeholder="填写编号"/>]</div>
<!--<div><input type="checkbox" disabled v-model="licenceInfo.lockListing.isChecked"/>1-1锁定挂牌记录表 [<input class="editInput" disabled v-model="licenceInfo.lockListing.num" style="width: 250px" placeholder="填写编号"/>]</div>
<div><input type="checkbox" disabled v-model="licenceInfo.blindPlate.isChecked"/>1-2盲板抽堵作业许可 [<input class="editInput" disabled v-model="licenceInfo.blindPlate.num" style="width: 250px" placeholder="填写编号"/>]</div>-->
<input type="checkbox" disabled v-model="licenceInfo.blindPlate.isChecked"/>1盲板抽堵作业许可 [<input class="editInput" disabled v-model="licenceInfo.blindPlate.num" style="width: 250px" placeholder="填写编号"/>]
</td>
</tr>
<tr>
......@@ -68,10 +69,10 @@
<div><input type="checkbox" disabled v-model="licenceInfo.flareUp.isChecked"/>2动火作业许可证 [<input class="editInput" disabled v-model="licenceInfo.flareUp.num" style="width: 250px" placeholder="填写编号"/>]</div>
<div><input type="checkbox" disabled v-model="licenceInfo.heightWork.isChecked"/>3高处作业许可证 [<input class="editInput" disabled v-model="licenceInfo.heightWork.num" style="width: 250px" placeholder="填写编号"/>]</div>
<div><input type="checkbox" disabled v-model="licenceInfo.breakGround.isChecked"/>4动土作业许可证 [<input class="editInput" disabled v-model="licenceInfo.breakGround.num" style="width: 250px" placeholder="填写编号"/>]</div>
<div><input type="checkbox" disabled v-model="licenceInfo.hoisting.isChecked"/>5吊装作业许可证 [<input class="editInput" disabled v-model="licenceInfo.hoisting.num" style="width: 250px" placeholder="填写编号"/>]</div>
<!--<div><input type="checkbox" disabled v-model="licenceInfo.hoisting.isChecked"/>5吊装作业许可证 [<input class="editInput" disabled v-model="licenceInfo.hoisting.num" style="width: 250px" placeholder="填写编号"/>]</div>
<div><input type="checkbox" disabled v-model="licenceInfo.limitSpace.isChecked"/>6受限空间作业许可证 [<input class="editInput" disabled v-model="licenceInfo.limitSpace.num" style="width: 250px" placeholder="填写编号"/>]</div>
<div><input type="checkbox" disabled v-model="licenceInfo.electricityUse.isChecked"/>7临时用电许可证 [<input class="editInput" disabled v-model="licenceInfo.electricityUse.num" style="width: 250px" placeholder="填写编号"/>]</div>
<div><input type="checkbox" disabled v-model="licenceInfo.ray.isChecked"/>8射线探伤许可证 [<input class="editInput" disabled v-model="licenceInfo.ray.num" style="width: 250px" placeholder="填写编号"/>]</div>
<div><input type="checkbox" disabled v-model="licenceInfo.ray.isChecked"/>8射线探伤许可证 [<input class="editInput" disabled v-model="licenceInfo.ray.num" style="width: 250px" placeholder="填写编号"/>]</div>-->
</td>
</tr>
<tr>
......
danger-manage-web/src/components/NewSaftyWork/BlindPlate.vue
View file @ 8458df71
......@@ -229,7 +229,7 @@
<td colspan="3" v-if="(applyStatus-0) ==1"><input :disabled="item.staffId != $store.state.user.userId" v-model="item.opinion" class="editInput"/></td>
<td colspan="3" v-if="(applyStatus-0) !=1"><input disabled v-model="item.opinion" class="editInput"/></td>
<td colspan="1">签字:</td>
<td colspan="2"><NewEsign :resultImg.sync ="item.signName" :isDisabled="item.staffId != $store.state.user.userId" :isReWrite="(applyStatus-0) ==1" :width="918" :height="100"/></td>
<td colspan="2"><NewEsign :resultImg.sync ="item.signName" :isDisabled="item.staffId != $store.state.user.userId" :isReWrite="(applyStatus-0) ==1" :width="918" :height="180"/></td>
<td colspan="2" v-if="(applyStatus-0) ==1">
<el-date-picker clearable size="small"
v-model="item.signDate"
......@@ -267,9 +267,9 @@
<el-select v-model="leaderAuditor" filterable placeholder="请选择审核人">
<el-option
v-for="item in leaderUserList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId"
>
</el-option>
</el-select>
......@@ -295,9 +295,9 @@
<el-select v-model="workAuditor" filterable placeholder="请选择审核人">
<el-option
v-for="item in workUserList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId"
>
</el-option>
</el-select>
......@@ -323,9 +323,9 @@
<el-select v-model="auditDeptAuditor" filterable placeholder="请选择审核人">
<el-option
v-for="item in auditUserList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId"
>
</el-option>
</el-select>
......@@ -351,9 +351,9 @@
<el-select v-model="approvalAuditor" filterable placeholder="请选择审核人">
<el-option
v-for="item in approvalUserList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId"
>
</el-option>
</el-select>
......@@ -379,9 +379,9 @@
<el-select v-model="completeAuditor" filterable placeholder="请选择审核人">
<el-option
v-for="item in completeUserList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId"
>
</el-option>
</el-select>
......@@ -403,7 +403,8 @@
<script>
import { listDept } from "@/api/system/dept";
import { listUser } from "@/api/system/user";
//import { listUser } from "@/api/system/user";
import { listStaff } from "@/api/safetyManagement/staff";
import { addSpecialPermit, getSpecialWorkPermitByWorkPermitId } from "@/api/workPermit/specialPermit";
import { addSign, listSign, batchUpdateSignWorkPermit } from "@/api/workPermit/workPermitSign";
import { judgeSignUpdateTWorkPermit } from "@/api/workPermit/permit";
......@@ -529,7 +530,7 @@
},
//部门切换
switchDept(deptId,type){
listUser({ pageNum: 1,pageSize: 99999,deptId:deptId}).then(response => {
listStaff({ pageNum: 1,pageSize: 99999,deptId:deptId}).then(response => {
if(type == 1){
this.leaderUserList = response.rows;
}
......
danger-manage-web/src/components/NewSaftyWork/BreakGround.vue
View file @ 8458df71
......@@ -277,9 +277,9 @@
<el-select v-model="leaderAuditor" filterable placeholder="请选择审核人">
<el-option
v-for="item in leaderUserList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId"
>
</el-option>
</el-select>
......@@ -305,9 +305,9 @@
<el-select v-model="workAuditor" filterable placeholder="请选择审核人">
<el-option
v-for="item in workUserList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId"
>
</el-option>
</el-select>
......@@ -333,9 +333,9 @@
<el-select v-model="auditDeptAuditor" filterable placeholder="请选择审核人">
<el-option
v-for="item in auditUserList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId"
>
</el-option>
</el-select>
......@@ -361,9 +361,9 @@
<el-select v-model="approvalAuditor" filterable placeholder="请选择审核人">
<el-option
v-for="item in approvalUserList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId"
>
</el-option>
</el-select>
......@@ -389,9 +389,9 @@
<el-select v-model="completeAuditor" filterable placeholder="请选择审核人">
<el-option
v-for="item in completeUserList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId"
>
</el-option>
</el-select>
......@@ -413,7 +413,8 @@
<script>
import { listDept } from "@/api/system/dept";
import { listUser } from "@/api/system/user";
//import { listUser } from "@/api/system/user";
import { listStaff } from "@/api/safetyManagement/staff";
import { addSpecialPermit, getSpecialWorkPermitByWorkPermitId } from "@/api/workPermit/specialPermit";
import { addSign, listSign, batchUpdateSignWorkPermit } from "@/api/workPermit/workPermitSign";
import { judgeSignUpdateTWorkPermit } from "@/api/workPermit/permit";
......@@ -536,7 +537,7 @@
},
//部门切换
switchDept(deptId,type){
listUser({ pageNum: 1,pageSize: 99999,deptId:deptId}).then(response => {
listStaff({ pageNum: 1,pageSize: 99999,deptId:deptId}).then(response => {
if(type == 1){
this.leaderUserList = response.rows;
}
......
danger-manage-web/src/components/NewSaftyWork/FlareUp.vue
View file @ 8458df71
......@@ -373,9 +373,9 @@
<el-select v-model="leaderAuditor" filterable placeholder="请选择审核人">
<el-option
v-for="item in leaderUserList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId"
>
</el-option>
</el-select>
......@@ -401,9 +401,9 @@
<el-select v-model="beyondUnitAuditor" filterable placeholder="请选择审核人">
<el-option
v-for="item in beyondUnitUserList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId"
>
</el-option>
</el-select>
......@@ -429,9 +429,9 @@
<el-select v-model="auditDeptAuditor" filterable placeholder="请选择审核人">
<el-option
v-for="item in auditDeptUserList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId"
>
</el-option>
</el-select>
......@@ -457,9 +457,9 @@
<el-select v-model="approvalAuditor" filterable placeholder="请选择审核人">
<el-option
v-for="item in approvalUserList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId"
>
</el-option>
</el-select>
......@@ -485,9 +485,9 @@
<el-select v-model="fireBeforeAuditor" filterable placeholder="请选择审核人">
<el-option
v-for="item in fireBeforeUserList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId"
>
</el-option>
</el-select>
......@@ -513,9 +513,9 @@
<el-select v-model="completeAuditor" filterable placeholder="请选择审核人">
<el-option
v-for="item in completeUserList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId"
>
</el-option>
</el-select>
......@@ -537,7 +537,8 @@
<script>
import { listDept } from "@/api/system/dept";
import { listUser } from "@/api/system/user";
//import { listUser } from "@/api/system/user";
import { listStaff } from "@/api/safetyManagement/staff";
import { addSpecialPermit, getSpecialWorkPermitByWorkPermitId } from "@/api/workPermit/specialPermit";
import { addSign, listSign, batchUpdateSignWorkPermit } from "@/api/workPermit/workPermitSign";
import { judgeSignUpdateTWorkPermit } from "@/api/workPermit/permit";
......@@ -731,7 +732,7 @@
},
//部门切换
switchDept(deptId,type){
listUser({ pageNum: 1,pageSize: 99999,deptId:deptId}).then(response => {
listStaff({ pageNum: 1,pageSize: 99999,deptId:deptId}).then(response => {
if(type == 1){
this.leaderUserList = response.rows;
}
......
danger-manage-web/src/components/NewSaftyWork/HeightWork.vue
View file @ 8458df71
......@@ -292,9 +292,9 @@
<el-select v-model="leaderAuditor" filterable placeholder="请选择审核人">
<el-option
v-for="item in leaderUserList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId"
>
</el-option>
</el-select>
......@@ -320,9 +320,9 @@
<el-select v-model="workAuditor" filterable placeholder="请选择审核人">
<el-option
v-for="item in workUserList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId"
>
</el-option>
</el-select>
......@@ -348,9 +348,9 @@
<el-select v-model="auditDeptAuditor" filterable placeholder="请选择审核人">
<el-option
v-for="item in auditUserList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId"
>
</el-option>
</el-select>
......@@ -376,9 +376,9 @@
<el-select v-model="approvalAuditor" filterable placeholder="请选择审核人">
<el-option
v-for="item in approvalUserList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId"
>
</el-option>
</el-select>
......@@ -404,9 +404,9 @@
<el-select v-model="completeAuditor" filterable placeholder="请选择审核人">
<el-option
v-for="item in completeUserList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId"
>
</el-option>
</el-select>
......@@ -429,7 +429,8 @@
<script>
import { listDept } from "@/api/system/dept";
import { listUser } from "@/api/system/user";
//import { listUser } from "@/api/system/user";
import { listStaff } from "@/api/safetyManagement/staff";
import { addSpecialPermit, getSpecialWorkPermitByWorkPermitId } from "@/api/workPermit/specialPermit";
import { addSign, listSign, batchUpdateSignWorkPermit } from "@/api/workPermit/workPermitSign";
import { judgeSignUpdateTWorkPermit } from "@/api/workPermit/permit";
......@@ -557,7 +558,7 @@
},
//部门切换
switchDept(deptId,type){
listUser({ pageNum: 1,pageSize: 99999,deptId:deptId}).then(response => {
listStaff({ pageNum: 1,pageSize: 99999,deptId:deptId}).then(response => {
if(type == 1){
this.leaderUserList = response.rows;
}
......
danger-manage-web/src/components/SaftyWork/NewEsign.vue
View file @ 8458df71
<template>
<div>
<input class="editInput" placeholder="请签名" :disabled="isDisabled" v-if="resultImg == '' || resultImg == null" @click="signName"/>
<el-dialog title="签名" :visible.sync="signOpen" :close-on-click-modal="false" :z-index="2000">
<el-dialog title="签名" :visible.sync="signOpen" :close-on-click-modal="false" append-to-body :z-index="1800">
<div style="border: 1px solid #cccccc">
<vue-esign ref="esign" :width="width" :height="height" :isCrop="isCrop" :lineWidth="lineWidth" :lineColor="lineColor" :bgColor.sync="bgColor" />
<div style="text-align: right">
<button @click="handleReset" style="margin-right: 2px">清空</button>
<button @click="handleGenerate">确定</button>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleGenerate">确定</el-button>
<el-button @click="handleReset" style="margin-right: 2px">清空</el-button>
</div>
</el-dialog>
<div>
......
danger-manage-web/src/views/newWorkPermit/index.vue
View file @ 8458df71
......@@ -206,17 +206,18 @@
</td>
</tr>
<tr>
<td rowspan="4" colspan="2">批准人填写</td>
<td rowspan="4" colspan="2">许可证</td>
<td rowspan="3" colspan="2">批准人填写</td>
<td rowspan="3" colspan="2">许可证</td>
<td colspan="6" style="text-align: left">是否需要进一步的JSA: <input type="checkbox" v-model="licenceInfo.jsa.yes"/>否<input type="checkbox" v-model="licenceInfo.jsa.no"/>是 JSA[<input class="editInput" v-model="licenceInfo.jsa.num" style="width: 250px" placeholder="填写JSA编号"/>]</td>
</tr>
<tr>
<!--<tr>
<td colspan="6" style="text-align: left"><input type="checkbox" v-model="licenceInfo.specialLicence"/>0无需特殊工作许可</td>
</tr>
</tr>-->
<tr>
<td colspan="6" style="text-align: left">
<div><input type="checkbox" v-model="licenceInfo.lockListing.isChecked"/>1-1锁定挂牌记录表 [<input class="editInput" v-model="licenceInfo.lockListing.num" style="width: 250px" placeholder="填写编号"/>]</div>
<div><input type="checkbox" v-model="licenceInfo.blindPlate.isChecked"/>1-2盲板抽堵作业许可 [<input class="editInput" v-model="licenceInfo.blindPlate.num" style="width: 250px" placeholder="填写编号"/>]</div>
<!--<div><input type="checkbox" v-model="licenceInfo.lockListing.isChecked"/>1-1锁定挂牌记录表 [<input class="editInput" v-model="licenceInfo.lockListing.num" style="width: 250px" placeholder="填写编号"/>]</div>
<div><input type="checkbox" v-model="licenceInfo.blindPlate.isChecked"/>1-2盲板抽堵作业许可 [<input class="editInput" v-model="licenceInfo.blindPlate.num" style="width: 250px" placeholder="填写编号"/>]</div>-->
<input type="checkbox" v-model="licenceInfo.blindPlate.isChecked"/>1盲板抽堵作业许可 [<input class="editInput" v-model="licenceInfo.blindPlate.num" style="width: 250px" placeholder="填写编号"/>]
</td>
</tr>
<tr>
......@@ -224,10 +225,10 @@
<div><input type="checkbox" v-model="licenceInfo.flareUp.isChecked"/>2动火作业许可证 [<input class="editInput" v-model="licenceInfo.flareUp.num" style="width: 250px" placeholder="填写编号"/>]</div>
<div><input type="checkbox" v-model="licenceInfo.heightWork.isChecked"/>3高处作业许可证 [<input class="editInput" v-model="licenceInfo.heightWork.num" style="width: 250px" placeholder="填写编号"/>]</div>
<div><input type="checkbox" v-model="licenceInfo.breakGround.isChecked"/>4动土作业许可证 [<input class="editInput" v-model="licenceInfo.breakGround.num" style="width: 250px" placeholder="填写编号"/>]</div>
<div><input type="checkbox" v-model="licenceInfo.hoisting.isChecked"/>5吊装作业许可证 [<input class="editInput" v-model="licenceInfo.hoisting.num" style="width: 250px" placeholder="填写编号"/>]</div>
<!-- <div><input type="checkbox" v-model="licenceInfo.hoisting.isChecked"/>5吊装作业许可证 [<input class="editInput" v-model="licenceInfo.hoisting.num" style="width: 250px" placeholder="填写编号"/>]</div>
<div><input type="checkbox" v-model="licenceInfo.limitSpace.isChecked"/>6受限空间作业许可证 [<input class="editInput" v-model="licenceInfo.limitSpace.num" style="width: 250px" placeholder="填写编号"/>]</div>
<div><input type="checkbox" v-model="licenceInfo.electricityUse.isChecked"/>7临时用电许可证 [<input class="editInput" v-model="licenceInfo.electricityUse.num" style="width: 250px" placeholder="填写编号"/>]</div>
<div><input type="checkbox" v-model="licenceInfo.ray.isChecked"/>8射线探伤许可证 [<input class="editInput" v-model="licenceInfo.ray.num" style="width: 250px" placeholder="填写编号"/>]</div>
<div><input type="checkbox" v-model="licenceInfo.ray.isChecked"/>8射线探伤许可证 [<input class="editInput" v-model="licenceInfo.ray.num" style="width: 250px" placeholder="填写编号"/>]</div>-->
</td>
</tr>
<tr>
......@@ -269,9 +270,9 @@
<el-select v-model="produceComfirm.monitorId" filterable placeholder="请选择生产组当班班长">
<el-option
v-for="item in userList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId"
>
</el-option>
</el-select>
......@@ -284,7 +285,7 @@
</el-dialog>
<!-- 作业单申请 -->
<el-dialog title="作业单申请" :visible.sync="certificateApprovalApplyOpen" append-to-body :close-on-click-modal="false" @close="cancelCertificateApply">
<el-dialog title="作业单申请" :visible.sync="certificateApprovalApplyOpen" append-to-body :close-on-click-modal="false" @close="cancelCertificateApply" :z-index="2000">
<div class="tags_box">
<div v-for="item in tags" class="tags">
<div :class="{isActive:item.name==active}" @click="handelToogel(item.name,'1')">{{item.name}}</div>
......@@ -322,7 +323,7 @@
</el-dialog>
<!-- 作业单审核 -->
<el-dialog title="作业单审核" :visible.sync="certificateApprovalOpen" append-to-body :close-on-click-modal="false">
<el-dialog title="作业单审核" :visible.sync="certificateApprovalOpen" append-to-body :close-on-click-modal="false" :z-index="1000">
<div class="tags_box">
<div v-for="item in specialWorkPermits" class="tags">
<div :class="{isActive:item.specialWorkType==approvalActive}" @click="handelToogel(item.specialWorkType,'2')">{{ getTagName(item.specialWorkType) }}</div>
......@@ -477,6 +478,7 @@
import { listPermit, selectTWorkPermitListByLoginUser, getPermit, delPermit, addPermit, updatePermit, exportPermit } from "@/api/workPermit/permit";
import { getSpecialWorkPermitByWorkPermitId,addBatchSpecialPermit } from "@/api/workPermit/specialPermit";
import { listUser,getAllUserName } from "@/api/system/user";
import { listStaff } from "@/api/safetyManagement/staff";
import { listAll } from "@/api/contractor/contractorInfo";
import FlareUp from "@/components/NewSaftyWork/FlareUp";
import BlindPlate from "@/components/NewSaftyWork/BlindPlate";
......@@ -1011,7 +1013,7 @@
//部门切换
switchDept(){
this.produceComfirm.monitorId = "";
listUser({ pageNum: 1,pageSize: 99999,deptId:this.produceComfirm.leaderDeptId}).then(response => {
listStaff({ pageNum: 1,pageSize: 99999,deptId:this.produceComfirm.leaderDeptId}).then(response => {
this.userList = response.rows;
});
},
......
danger-manage-web/src/views/riskManager/riskMsg/index.vue
View file @ 8458df71
......@@ -104,7 +104,13 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" width="55" align="center" prop="id" />
<el-table-column label="辨识部位" width="135" align="center" prop="riskPart" />
<el-table-column label="存在风险" align="center" prop="riskContent" />
<el-table-column label="存在风险" align="center" prop="riskContent" >
<template slot-scope="scope">
<dl v-html="scope.row.riskContent">
{{scope.row.riskContent}}
</dl>
</template>
</el-table-column>
<el-table-column label="风险等级" width="75" align="center" prop="riskLevel" :formatter="riskLevelFormat"/>
<el-table-column label="事故类型" width="95" align="center" prop="riskType" :formatter="riskTypeFormat"/>
<el-table-column label="管控措施" align="center" prop="riskControl" />
......@@ -240,6 +246,12 @@ export default {
form: {},
// 表单校验
rules: {
riskPart: [
{ required: true, message: "辨识部位不能为空", trigger: "blur" }
],
riskDept: [
{ required: true, message: "责任部门不能为空", trigger: "blur" }
],
}
};
},
......
danger-manage-web/src/views/safetyManagement/staff/index.vue
View file @ 8458df71
......@@ -171,7 +171,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.staffName==null">
<el-row >
<el-col :span="11">
<el-form-item label="账号" prop="userName">
<el-input v-model="form.userName" placeholder="请输账号" />
......
danger-manage-web/vue.config.js
View file @ 8458df71
......@@ -35,8 +35,7 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: process.env.VUE_APP_TARGET,
// target: `http://192.168.2.16:8908/dangerManage`,
// target: `http://192.168.2.17:8908/dangerManage`,
//target: `http://192.168.31.87:8908/dangerManage`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment