From 72a44ac572da24630556403e699ad057493490ef Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 01 十二月 2022 10:59:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/doublePrevent/riskLevel/map/components/rectifyDialog.vue | 94 ++++++-----------------------------------------
1 files changed, 12 insertions(+), 82 deletions(-)
diff --git a/src/views/doublePrevent/riskLevel/map/components/rectifyDialog.vue b/src/views/doublePrevent/riskLevel/map/components/rectifyDialog.vue
index 8bc9c69..7f76331 100644
--- a/src/views/doublePrevent/riskLevel/map/components/rectifyDialog.vue
+++ b/src/views/doublePrevent/riskLevel/map/components/rectifyDialog.vue
@@ -7,62 +7,25 @@
<el-row :gutter="25">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="隐患描述" prop="dangerDesc">
- <el-input
- class="input-add"
- v-model.trim="reportForm.dangerDesc"
- placeholder="请输入隐患情况描述"
- clearable
- ></el-input>
+ <el-input class="input-add" v-model.trim="reportForm.dangerDesc" placeholder="请输入隐患情况描述" clearable></el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="隐患所属部门" prop="depId">
- <el-cascader
- :options="departmentList"
- :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }"
- placeholder="请选择部门"
- clearable
- filterable
- class="input-add"
- v-model="reportForm.depId"
- >
- </el-cascader>
+ <el-cascader :options="departmentList" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" placeholder="请选择部门" clearable filterable class="input-add" v-model="reportForm.depId"> </el-cascader>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="生产装置" prop="produceDeviceId">
- <el-select
- class="input-add"
- v-model="reportForm.produceDeviceId"
- placeholder="请输入生产装置"
- clearable
- filterable
- @change="changeUnit"
- >
- <el-option
- v-for="item in allProduceDeviceData"
- :key="item.id"
- :label="item.produceDeviceName"
- :value="item.id"
- ></el-option>
+ <el-select class="input-add" v-model="reportForm.produceDeviceId" placeholder="请输入生产装置" clearable filterable @change="changeUnit">
+ <el-option v-for="item in allProduceDeviceData" :key="item.id" :label="item.produceDeviceName" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="风险分析单元" prop="riskUnitId">
- <el-select
- class="input-add"
- v-model.trim="reportForm.riskUnitId"
- placeholder="请输入风险分析单元"
- clearable
- filterable
- >
- <el-option
- v-for="item in safetyRiskUnitData"
- :key="item.id"
- :label="item.riskUnitName"
- :value="item.id"
- ></el-option>
+ <el-select class="input-add" v-model.trim="reportForm.riskUnitId" placeholder="请输入风险分析单元" clearable filterable>
+ <el-option v-for="item in safetyRiskUnitData" :key="item.id" :label="item.riskUnitName" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -89,27 +52,14 @@
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="隐患可能后果" prop="dangerResult">
- <el-select
- class="input-add"
- v-model="reportForm.dangerResult"
- placeholder="请选择隐患可能后果"
- clearable
- filterable
- >
+ <el-select class="input-add" v-model="reportForm.dangerResult" placeholder="请选择隐患可能后果" clearable filterable>
<el-option v-for="item in dangerResultList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12">
<el-form-item label="隐患产生原因" prop="dangerReason">
- <el-input
- class="input-add"
- type="textarea"
- :rows="2"
- style="padding-bottom: 10px"
- v-model.trim="reportForm.dangerReason"
- placeholder="请输入隐患产生原因"
- ></el-input>
+ <el-input class="input-add" type="textarea" :rows="2" style="padding-bottom: 10px" v-model.trim="reportForm.dangerReason" placeholder="请输入隐患产生原因"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -123,23 +73,11 @@
<el-row>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="整改类型" prop="dangerResult">
- <el-select class="input-add" v-model="reportForm.dangerResult" placeholder="请选择整改类型" clearable filterable>
- <el-option
- v-for="item in RFIDList"
- :key="item.id"
- :label="item.rfidName"
- :value="item.id"
- ></el-option> </el-select
+ <el-select class="input-add" v-model="reportForm.dangerResult" placeholder="请选择整改类型" clearable filterable> <el-option v-for="item in RFIDList" :key="item.id" :label="item.rfidName" :value="item.id"></el-option> </el-select
></el-form-item> </el-col
><el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="整改责任人" prop="dangerResult">
- <el-select
- class="input-add"
- v-model="reportForm.dangerResult"
- placeholder="请选择整改责任人"
- clearable
- filterable
- >
+ <el-select class="input-add" v-model="reportForm.dangerResult" placeholder="请选择整改责任人" clearable filterable>
<el-option v-for="item in RFIDList" :key="item.id" :label="item.rfidName" :value="item.id"></el-option>
</el-select>
</el-form-item>
@@ -158,14 +96,7 @@
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12">
<el-form-item label="整改内容" prop="rectifyDesc">
- <el-input
- class="input-add"
- type="textarea"
- :rows="2"
- style="padding-bottom: 10px"
- v-model.trim="reportForm.rectifyDesc"
- placeholder="请输入整改内容"
- ></el-input>
+ <el-input class="input-add" type="textarea" :rows="2" style="padding-bottom: 10px" v-model.trim="reportForm.rectifyDesc" placeholder="请输入整改内容"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -175,7 +106,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="isShowReportDialog = !isShowReportDialog" size="default">取 消</el-button>
- <el-button type="primary" @click="submitReport" v-throttle size="default">确 实</el-button>
+ <el-button type="primary" @click="submitReport" v-throttle size="default">确 定</el-button>
</span>
</template>
</el-dialog>
@@ -374,7 +305,6 @@
};
const changeUnit = () => {
- debugger;
state.reportForm.riskUnitId = null;
state.safetyRiskUnitData = state.allSafetyRiskUnitData.filter((item) => item.produceDeviceId === state.reportForm.produceDeviceId);
};
--
Gitblit v1.9.2