-
- {{ workDetail.workTicketCode }}
+
+ {{ workDetail.applicantName }}
-
- {{ workDetail.jobApplicationTime }}
-
-
-
- {{ workDetail.fireLocationAndFirePart }}
-
+
+ {{ workDetail.constructionLocation }}
- {{ workDetail.jobContent }}
+ {{ workDetail.workContent }}
+
+
+ {{ workDetail.workHeight }}
-
+
+
+ {{ workCategoryList[workDetail.workCategory - 1].workCategoryName }}
-
- {{ workDetail.hotMethod }}
+
+ {{ workDetail.workerName }}
-
- {{ workDetail.hotWorkLevel }}
-
-
- {{ workDetail.assignmentPersonInChargeName }}
-
-
-
- {{ workDetail.firemanAndCertificateNo }}
-
-
- {{ workDetail.otherRelatedSpecialTask }}
-
-
-
+
-
-
-
-
-
-
-
-
-
- {{ workDetail.riskIdentificationResult }}
-
-
+
-
-
-
-
-
+ -->
-
-
- 代表性气体
- {{
- item.representativeGas ? item.representativeGas : "--"
- }}
-
-
-
- 分析结果/%
- {{
- item.analyzeResult ?
- item.analyzeResult : "--" }}
-
-
-
- 分析人
- {{ item.analyzer ?
- item.analyzer : "--" }}
-
-
+
+
+
+ | 序号 |
+ 作业危害识别 |
+ 安全控制措施（有√无×） |
+ 确认（） |
+ 落实人签名 |
+
+
+
+
+
+ | {{ index == 0 ? eIndex + 1 : countName(workDetail.tableList, index) +
+ eIndex + 1 }} |
+
+ {{ option.title }}
+ |
+
+ {{ ele.titleName }}
+ |
+
+ {{ ele.isAffirm ? ele.isAffirm : '--' }}
+ |
+
+ {{ workerListOptionsUp(ele.isAffirmName) }}
+ |
+
+
+
+
+
+
+
+
+
+
+ {{ workDetail.applicantTeamLeaderName }}
+
+
+ {{ workDetail.applicantTeamLeaderTime }}
+
+
+ {{ workDetail.guardianContractorName }}
+
+
+ {{ workDetail.guardianContractorTime }}
+
+
+
+
+ {{ workDetail.constructionContractorManagerName }}
+
+
+ {{ workDetail.constructionContractorManagerTime }}
+
+
+ {{ workDetail.epcContractorManagerName }}
+
+
+ {{ workDetail.epcContractorManagerTime }}
+
+
+ {{ workDetail.supervisionUnitManagerName }}
+
+
+ {{ workDetail.supervisionUnitManagerTime }}
+
+
+ {{ workDetail.projectTeamName }}
+
+
+ {{ workDetail.projectTeamTime }}
+
+
+ {{ workDetail.safetyDepartmentManagerName }}
+
+
+ {{ workDetail.safetyDepartmentManagerTime }}
+
+
@@ -322,20 +495,17 @@ import moment from "moment";
import detail from "./detail.vue";
import editPlan from "./editPlan.vue";
import {
- selectDangerousEngineeringRecordApi,
- addDangerousEngineeringRecordApi,
- deleteDangerousEngineeringRecordApi,
- selectDangerousEngineeringTypeApi,
- editDangerousEngineeringRecordApi,
-} from "@/assets/js/api/dangerousBigProject";
-
-import {
- getFireSafetyPageApi,
getEnterpriseInfoListApi,
- getFireSafetyQueryByIdApi,
- getFireSafetydeleteApi,
} from "@/assets/js/api/specialWork";
+import {
+ getHighPermitPageApi,
+ getHighPermitByIdApi,
+ deleteHighPermitApi,
+ addHighPermitApi,
+ editHighPermitApi,
+} from "@/assets/js/api/operationManage";
+import { getWorkerInfoList } from '@/assets/js/api/laborPerson.js'
import { getCooperatorListApi } from "@/assets/js/api/cooperationUnit";
export default {
components: {
@@ -346,9 +516,8 @@ export default {
data() {
return {
formInline: {
- firemanName: "",
+ applicantTeamLeaderName : "",
enterpriseId: "",
- workTicketCode: "",
},
formLabelWidthDetail: "270px",
detailData: {},
@@ -420,12 +589,108 @@ export default {
fileName3: "",
styleType: 1,
isUpdate: false,
+
+ workCategoryList: [{
+ id: 1,
+ workCategoryName: "一级(2-5m)"
+ }, {
+ id: 2,
+ workCategoryName: "二级(5-15m)"
+ }, {
+ id: 3,
+ workCategoryName: "三级(15-30m)"
+ }, {
+ id: 4,
+ workCategoryName: "特级(>30m)"
+ }, {
+ id: 5,
+ workCategoryName: "特殊"
+ }],
+ cardDialogTitle: "",
+ cardDialog: false,
+ cardForm: {},
+ cardFormRules: {
+ deviceUnitId: [
+ {
+ required: true,
+ message: this.$t("message.personnelPosition.required"),
+ trigger: "changer",
+ },
+ ],
+ deviceUnitNo: [
+ {
+ required: true,
+ message: this.$t("message.personnelPosition.required"),
+ trigger: "blur",
+ },
+ ],
+ exampleProjectName: [
+ {
+ required: true,
+ message: this.$t("message.personnelPosition.required"),
+ trigger: "blur",
+ },
+ ],
+ technicalOperation: [
+ {
+ required: true,
+ message: this.$t("message.personnelPosition.mandatory"),
+ trigger: "change",
+ },
+ ],
+ contractingType: [
+ {
+ required: true,
+ message: this.$t("message.personnelPosition.mandatory"),
+ trigger: "change",
+ },
+ ],
+ projectGroupId: [
+ {
+ required: true,
+ message: this.$t("message.personnelPosition.mandatory"),
+ trigger: "change",
+ },
+ ],
+ supervisingUnitId: [
+ {
+ required: true,
+ message: this.$t("message.personnelPosition.mandatory"),
+ trigger: "change",
+ },
+ ],
+ epcContractorId: [
+ {
+ required: true,
+ message: this.$t("message.personnelPosition.mandatory"),
+ trigger: "change",
+ },
+ ],
+ constructionUnitId: [
+ {
+ required: true,
+ message: this.$t("message.personnelPosition.mandatory"),
+ trigger: "change",
+ },
+ ],
+ },
+ isAdd: -1,
+ isAffirmList: [{
+ isAffirmName: "是", isAffirm: true
+ }, {
+ isAffirmName: "否", isAffirm: false
+ }],
+ cooperatorList: [], // 所有企业信息
+ workerListOptions: [], // 工人列表
};
},
created() {
this.projectSn = this.$store.state.projectSn;
this.styleType = this.$store.state.userInfo.styleType;
this.initData();
+ this.initCardFormData();
+ this.getCooperatorList();
+ this.getDutyPerson();
this.getEnterpriseInfoList();
},
mounted() { },
@@ -437,6 +702,222 @@ export default {
},
},
methods: {
+ isAddPoint(type, item) {
+ this.isAdd = type;
+ this.cardDialog = true;
+ if (type == 1) {
+ this.initCardFormData();
+ this.$nextTick(() => {
+ this.$refs["cardForm"] && this.$refs["cardForm"].resetFields();
+ });
+ this.cardDialogTitle = this.$t("message.laborDev.add2");
+ } else if (type == 2) {
+ this.cardDialogTitle = this.$t("message.laborDev.btn_edit"); //编辑卡片
+ console.log(item);
+ this.cardForm = {
+ ...item,
+ hotWorkExecutionTime: [item.workerTimeBegin, item.workerTimeEnd],
+ tableList: JSON.parse(item.safeControlMeasure).reduce((prev, ele, index) => {
+ const findIndex = prev.findIndex(item => item.title == ele["field2632657741490"]);
+ if (findIndex == -1) {
+ prev.push({
+ id: index + 1,
+ title: ele["field2632657741490"],
+ detailList: [
+ {
+ id: 'id-' + Math.random().toString(36).substr(2, 9),
+ titleName: ele["field9539657401800"],
+ isAffirm: ele["field9282320023273"],
+ isAffirmName: ele["field8640601863915"],
+ }
+ ]
+ });
+ return prev;
+ }
+ prev[findIndex].detailList.push({
+ id: 'id-' + Math.random().toString(36).substr(2, 9),
+ titleName: ele["field9539657401800"],
+ isAffirm: ele["field9282320023273"],
+ isAffirmName: ele["field8640601863915"],
+ });
+ return prev;
+ }, []),
+ };
+ }
+ },
+ //添加或编辑卡片
+ saveCardFn() {
+ this.$refs["cardForm"].validate((valid) => {
+ if (valid) {
+ const result = {
+ ...this.cardForm,
+ workerTimeBegin: this.cardForm.hotWorkExecutionTime[0],
+ workerTimeEnd: this.cardForm.hotWorkExecutionTime[1],
+ }
+ const newTableList = this.cardForm.tableList.reduce((prev, item) => {
+ item.detailList.forEach(ele => {
+ prev.push({
+ "field2632657741490": item.title,
+ "field9539657401800": ele.titleName,
+ "field9282320023273": ele.isAffirm,
+ "field8640601863915": ele.isAffirmName,
+ });
+ });
+ return prev;
+ }, []);
+ result.safeControlMeasure = JSON.stringify(newTableList);
+ console.log(result, this.cardForm.tableList);
+ if (this.isAdd == 1) {
+ // this.cardForm.floorId = this.currentFloorDetail.floorId
+ addHighPermitApi(result).then((res) => {
+ this.cardDialog = false;
+ this.initData();
+ this.$message.success(
+ this.$t("message.personnelPosition.add_success")
+ ); //添加成功！
+ });
+ } else if (this.isAdd == 2) {
+ editHighPermitApi(result).then((res) => {
+ this.cardDialog = false;
+ this.initData();
+ this.$message.success(
+ this.$t("message.personnelPosition.edit_success")
+ ); //编辑成功！
+ });
+ }
+ } else {
+ console.log("error submit!!");
+ return false;
+ }
+ });
+ },
+ // 初始化
+ initCardFormData() {
+ this.cardForm = {
+ applicant: "",
+ constructionLocation: "",
+ workContent: "",
+ workHeight: "",
+ workCategory: "",
+ supplementaryMeasure: "",
+ applicantTeamLeader: "",
+ applicantTeamLeaderTime: "",
+ hotWorkExecutionTime: [],
+ guardianContractor: "",
+ guardianContractorTime: "",
+ constructionContractorManager: "",
+ constructionContractorManagerTime: "",
+ epcContractorManager: "",
+ epcContractorManagerTime: "",
+ supervisionUnitManager: "",
+ supervisionUnitManagerTime: "",
+ projectTeam: "",
+ projectTeamTime: "",
+ safetyDepartmentManager: "",
+ safetyDepartmentManagerTime: "",
+ guardian: "",
+ guardianTime: "",
+ tableList: [{
+ id: 1,
+ title: "作业前安全措施不落实或不到位，可造成人员坠落事故",
+ detailList: [{
+ id: 'id-' + Math.random().toString(36).substr(2, 9),
+ titleName: "现场搭设的脚手架、防护网、围栏合格并符合安全规程，验收合格",
+ isAffirm: "",
+ isAffirmName: "",
+ }, {
+ id: 'id-' + Math.random().toString(36).substr(2, 9),
+ titleName: "垂直分层作业中间及四周应有隔离防护设施",
+ isAffirm: "",
+ isAffirmName: "",
+ }, {
+ id: 'id-' + Math.random().toString(36).substr(2, 9),
+ titleName: "作业使用上下通道、安全梯、安全绳符合安全要求",
+ isAffirm: "",
+ isAffirmName: "",
+ }, {
+ id: 'id-' + Math.random().toString(36).substr(2, 9),
+ titleName: "作业人员身体条件符合要求，体检合格，特种作业人员持证上岗",
+ isAffirm: "",
+ isAffirmName: "",
+ }, {
+ id: 'id-' + Math.random().toString(36).substr(2, 9),
+ titleName: "轻型棚的承重梁、柱能承重符合",
+ isAffirm: "",
+ isAffirmName: "",
+ }, {
+ id: 'id-' + Math.random().toString(36).substr(2, 9),
+ titleName: "六级以上强风、浓雾、暴雨等恶劣天气，不得进行高处作业",
+ isAffirm: "",
+ isAffirmName: "",
+ }]
+ }, {
+ id: 2,
+ title: "作业过程中，安全措施不落实，监护不到位，可造成人员坠落、中毒窒息、爆燃事故",
+ detailList: [{
+ id: 'id-' + Math.random().toString(36).substr(2, 9),
+ titleName: "下方进行刷油作业时，上方不得从事电焊、切割等动火作业",
+ isAffirm: "",
+ isAffirmName: "",
+ }, {
+ id: 'id-' + Math.random().toString(36).substr(2, 9),
+ titleName: "采光不足、夜间作业有充足照明，安装临时灯、防爆灯",
+ isAffirm: "",
+ isAffirmName: "",
+ }, {
+ id: 'id-' + Math.random().toString(36).substr(2, 9),
+ titleName: "30米以上进行高处作业配备通讯、联络工具，要有应急预案",
+ isAffirm: "",
+ isAffirmName: "",
+ }, {
+ id: 'id-' + Math.random().toString(36).substr(2, 9),
+ titleName: "高处交叉作业应按坠落半径采取隔离措施，如安全网、错时作业等",
+ isAffirm: "",
+ isAffirmName: "",
+ }, {
+ id: 'id-' + Math.random().toString(36).substr(2, 9),
+ titleName: "作业用具、材料等在架上稳固摆放，不得投掷，使用工具用安全绳栓牢",
+ isAffirm: "",
+ isAffirmName: "",
+ }, {
+ id: 'id-' + Math.random().toString(36).substr(2, 9),
+ titleName: "在可燃、有毒环境作业，应进行环境监测；有毒有害气体和粉尘超标场所或下风侧严禁高处作业；发生泄漏应采取安全措施后，再进行作业",
+ isAffirm: "",
+ isAffirmName: "",
+ }]
+ }, {
+ id: 3,
+ title: "个人防护不到位，应急器材不足，施救部及时，造成事故扩大",
+ detailList: [{
+ id: 'id-' + Math.random().toString(36).substr(2, 9),
+ titleName: "作业人员佩带安全带，安全带要高挂抵用，防止磨损和断裂",
+ isAffirm: "",
+ isAffirmName: "",
+ }, {
+ id: 'id-' + Math.random().toString(36).substr(2, 9),
+ titleName: "作业人员着装符合要求，佩戴合格安全帽、劳保服、劳保鞋、套防服等",
+ isAffirm: "",
+ isAffirmName: "",
+ }, {
+ id: 'id-' + Math.random().toString(36).substr(2, 9),
+ titleName: "作业人员携带有工具袋，行走及爬梯时，应将工具放入袋中",
+ isAffirm: "",
+ isAffirmName: "",
+ }, {
+ id: 'id-' + Math.random().toString(36).substr(2, 9),
+ titleName: "进行可能产生静电、带电作业时，应配备相应保护用品",
+ isAffirm: "",
+ isAffirmName: "",
+ }, {
+ id: 'id-' + Math.random().toString(36).substr(2, 9),
+ titleName: "作业人员应佩带A、过滤式呼吸器B、空气式呼吸器",
+ isAffirm: "",
+ isAffirmName: "",
+ }]
+ }],
+ projectSn: this.$store.state.projectSn,
+ };
+ },
// downloadFile(url, fileName) {
// const link = document.createElement('a');
// link.href = url;
@@ -457,8 +938,7 @@ export default {
},
onRefresh() {
this.formInline.enterpriseId = "";
- this.formInline.firemanName = "";
- this.formInline.workTicketCode = "";
+ this.formInline.applicantTeamLeaderName = "";
this.pageNo = 1;
this.initData();
@@ -475,35 +955,17 @@ export default {
},
initData() {
let data = {
- jobApplicationUnit: this.formInline.enterpriseId,
- firemanName: this.formInline.firemanName,
- workTicketCode: this.formInline.workTicketCode,
+ applicant: this.formInline.enterpriseId,
+ applicantTeamLeaderName : this.formInline.applicantTeamLeaderName ,
pageNo: this.pageNo,
pageSize: this.pageSize,
projectSn: this.projectSn,
// assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
};
- getFireSafetyPageApi(data).then((res) => {
+ getHighPermitPageApi(data).then((res) => {
if (res.result) {
console.log(res.result.records, 1);
- this.tableData = res.result.records.map((item) => {
- if (item.firemanAndCertificateNo) {
- const firemanAndCertificateNo =
- item.firemanAndCertificateNo.includes("[") &&
- item.firemanAndCertificateNo.includes("]")
- ? JSON.parse(item.firemanAndCertificateNo).join("、")
- : item.firemanAndCertificateNo;
- return {
- ...item,
- firemanAndCertificateNo,
- };
- } else {
- return {
- ...item,
- firemanAndCertificateNo: ''
- }
- }
- });
+ this.tableData = res.result.records;
this.total = res.result.total;
}
});
@@ -511,17 +973,17 @@ export default {
handleSelectionChange(val) {
this.multipleSelection = val;
},
- deleteRow(index, rows) {
- if (rows[index].finalAcceptanceStatus === 2) {
+ deleteRow(rows) {
+ if (rows.finalAcceptanceStatus === 2) {
this.$message.warning("该项特种作业已闭合，请勿操作");
return;
}
- // console.log(index,rows[index].id)
- this.deleteId = rows[index].id;
+ // console.log(rows.id)
+ this.deleteId = rows.id;
this.deleteDialog = true;
},
checkDelete() {
- getFireSafetydeleteApi({ id: this.deleteId }).then((res) => {
+ deleteHighPermitApi({ id: this.deleteId }).then((res) => {
console.log(res);
if (res.code == 200) {
this.$message.success(res.message);
@@ -547,7 +1009,7 @@ export default {
this.dialogTitle = this.$t("message.dangerousBigProject.detailed");
this.detailId = val.id;
- getFireSafetyQueryByIdApi({
+ getHighPermitByIdApi({
id: val.id,
}).then((res) => {
if (res.result) {
@@ -557,37 +1019,154 @@ export default {
...res.result,
// xzGasAnalyzeList: res.result.xzGasAnalyzeList,
hotWorkExecutionTime: [
- res.result.hotWorkExecutionBeginTime ? res.result.hotWorkExecutionBeginTime : '',
- res.result.hotWorkExecutionEndTime ? res.result.hotWorkExecutionEndTime : '',
+ res.result.workerTimeBegin ? res.result.workerTimeBegin : '',
+ res.result.workerTimeEnd ? res.result.workerTimeEnd : '',
],
- firemanAndCertificateNo: val.firemanAndCertificateNo,
+ tableList: JSON.parse(val.safeControlMeasure).reduce((prev, ele, index) => {
+ const findIndex = prev.findIndex(item => item.title == ele["field2632657741490"]);
+ if (findIndex == -1) {
+ prev.push({
+ id: index + 1,
+ title: ele["field2632657741490"],
+ detailList: [
+ {
+ id: 'id-' + Math.random().toString(36).substr(2, 9),
+ titleName: ele["field9539657401800"],
+ isAffirm: ele["field9282320023273"],
+ isAffirmName: ele["field8640601863915"],
+ }
+ ]
+ });
+ return prev;
+ }
+ prev[findIndex].detailList.push({
+ id: 'id-' + Math.random().toString(36).substr(2, 9),
+ titleName: ele["field9539657401800"],
+ isAffirm: ele["field9282320023273"],
+ isAffirmName: ele["field8640601863915"],
+ });
+ return prev;
+ }, []),
};
- if (this.workDetail.fieldWorkingEnvironment) {
- this.workDetail.fieldWorkingEnvironment = JSON.parse(
- this.workDetail.fieldWorkingEnvironment
- );
- this.workDetail.fieldWorkingEnvironment.map((item) => {
- item.url = this.$store.state.FILEURL + item.url;
- });
- }
- if (this.workDetail.safetyAndTechnologyDisclosure) {
- this.workDetail.safetyAndTechnologyDisclosure = JSON.parse(
- this.workDetail.safetyAndTechnologyDisclosure
- );
- this.workDetail.safetyAndTechnologyDisclosure.map((item) => {
- item.url = this.$store.state.FILEURL + item.url;
- });
- }
}
});
this.isSuperDanger = val.issuperdanger;
},
+ // 关闭前执行
+ handleClose(done) {
+ this.initData();
+ this.$refs["cardForm"].resetFields();
+ // console.log(this.$refs["cardForm"].resetFields())
+ if (done) {
+ done();
+ } else {
+ this.cardDialog = false;
+ }
+ },
+ countName(list, rowIndex) {
+ return list.reduce((prev, item, index) => {
+ // console.log(index == rowIndex, prev);
+ if (index < rowIndex) {
+ prev += item.detailList.length;
+ return prev;
+ }
+ return prev;
+ }, 0);
+ },
+ //获取列表数据
+ getCooperatorList() {
+ let data = {
+ projectSn: this.$store.state.projectSn,
+ pageNo: 1,
+ pageSize: -1,
+ // enterpriseTypeId: this.enterpriseTypeSelectId,
+ };
+ getCooperatorListApi(data).then((res) => {
+ if (res.code == 200) {
+ this.cooperatorList = res.result.records;
+ }
+ });
+ },
+ //查询选择人员下拉
+ getDutyPerson() {
+ let data = {
+ projectSn: this.$store.state.projectSn,
+ // isFilterQualityRegionEnterprise: 1
+ }
+ getWorkerInfoList(data).then(res => {
+ if (res.code == 200) {
+ this.workerListOptions = res.result.records
+ console.log('获取施工人员下拉', this.workerListOptions)
+ } else {
+ this.$message.error(res.message)
+ }
+ })
+ },
},
+ computed: {
+ workerListOptionsUp() {
+ return (workerName) => {
+ const find = this.workerListOptions.find(item => item.id == workerName);
+ return find ? find.workerName : '--';
+ }
+ },
+ }
};
+}
+
\ No newline at end of file