From 89b24e8ac8377c8f438eae301845cd1e44f0a4ef Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期二, 10 五月 2022 08:38:04 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/ztqt
---
src/views/doublePreventAction/riskLevelManage/controlAction/index.vue | 21 ++++++++--
src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue | 18 ++++----
src/views/doublePreventAction/riskLevelManage/event/index.vue | 9 +++-
src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue | 16 +++++++-
4 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
index 0538c5d..4c6825c 100644
--- a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
@@ -2,7 +2,17 @@
<div class="app-container">
<div class="filter-container">
<div class="basic_search">
- <span>单位名称：</span>
+ <span>责任部门：</span>
+ <el-input v-model="listQuery.filter.riskUnitName" style="width:200px">
+ </el-input>
+ </div>
+ <div class="basic_search">
+ <span>责任人：</span>
+ <el-input v-model="listQuery.filter.hazardLiablePerson" style="width:200px">
+ </el-input>
+ </div>
+ <div class="basic_search">
+ <span>单元名称：</span>
<el-input v-model="listQuery.filter.riskUnitName" style="width:200px">
</el-input>
</div>
@@ -146,7 +156,9 @@
pageIndex:1,
pageSize:10,
filter:{
- riskUnitName:'',
+ hazardLiablePerson:'',
+ hazardDep:'',
+ riskUnitName:''
}
},
}
diff --git a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
index cecbb5b..6edc6a2 100644
--- a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
@@ -2,9 +2,20 @@
<div class="app-container">
<div class="filter-container">
<div class="basic_search">
- <span>单位名称：</span>
- <el-input v-model="listQuery.filter.riskUnitName" style="width:200px">
+ <span>事件名称：</span>
+ <el-input v-model="listQuery.filter.riskEventName" style="width:200px">
</el-input>
+ </div>
+ <div class="basic_search">
+ <span>事件名称：</span>
+ <el-select v-model="listQuery.filter.dataSrc" clearable style="width:200px">
+ <el-option
+ v-for="item in DataSrcList"
+ :key="item.id"
+ :value="item.text"
+ :label="item.text"
+ ></el-option>
+ </el-select>
</div>
<el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-refresh" @click="refreshHandle">搜索</el-button>
<el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-plus" @click="showRiskControlMeasureForm('','新增')" v-show="showCurrent">新增</el-button>
@@ -201,7 +212,7 @@
pageIndex:1,
pageSize:10,
filter:{
- riskUnitName:'',
+ riskEventName:'',
}
},
}
@@ -411,8 +422,8 @@
this.riskControlMeasureForm = riskControlMeasureForm
this.$emit('closeDialog')
})
-
-
+
+
}
}
}
diff --git a/src/views/doublePreventAction/riskLevelManage/event/index.vue b/src/views/doublePreventAction/riskLevelManage/event/index.vue
index 5c9aefb..93f1019 100644
--- a/src/views/doublePreventAction/riskLevelManage/event/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/event/index.vue
@@ -2,8 +2,13 @@
<div class="app-container">
<div class="filter-container">
<div class="basic_search">
- <span>单位名称：</span>
- <el-input v-model="listQuery.filter.riskUintName" style="width:200px">
+ <span>事件名称：</span>
+ <el-input v-model="listQuery.filter.riskEventName" style="width:200px">
+ </el-input>
+ </div>
+ <div class="basic_search">
+ <span>单元名称：</span>
+ <el-input v-model="listQuery.filter.riskUnitName" style="width:200px">
</el-input>
</div>
<el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-refresh" @click="refreshHandle">搜索</el-button>
diff --git a/src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue b/src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue
index e8a3ff3..0319cd9 100644
--- a/src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue
@@ -1,14 +1,14 @@
<template>
<div class="app-container">
<div class="filter-container">
- <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>
- </div>
- <div class="basic_search">
- <span>巡检结束时间:</span>
- <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>-->
+<!-- <el-date-picker v-model="listQuery.startTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="开始时间"></el-date-picker>-->
+<!-- </div>-->
+<!-- <div class="basic_search">-->
+<!-- <span>巡检结束时间:</span>-->
+<!-- <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>
<el-input v-model="listQuery.name" class="analyseUnit_input">
@@ -131,7 +131,7 @@
style="float:right;"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
- />
+ />
<br>
</div>
<el-dialog :title="title" :visible.sync="riskSourceVisible" :modal-append-to-body="false" :close-on-click-modal="false" width="600px">
--
Gitblit v1.9.2