From e55393fe37469411fc2b0c8323c9ae07d587be8e Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 18 五月 2022 17:35:38 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/ztqt
---
src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue | 2
src/views/safetyproduction/gojudging.vue | 3 -
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/components/reportView.vue | 4
src/views/safetyproduction/checklist.vue | 1
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/components/reportDialog.vue | 4
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/components/rectifyDialog.vue | 4
src/views/contractor/troubleStatistics/components/troubleDetail/index.vue | 2
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/index.vue | 26 +++++++-
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/components/acceptDialog.vue | 4
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/index.vue | 25 +++++++-
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/statistics/index.vue | 26 +++++++-
src/views/safetyproduction/new.vue | 3 -
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/index.vue | 25 +++++++-
13 files changed, 99 insertions(+), 30 deletions(-)
diff --git a/src/views/contractor/troubleStatistics/components/troubleDetail/index.vue b/src/views/contractor/troubleStatistics/components/troubleDetail/index.vue
index daead62..680f480 100644
--- a/src/views/contractor/troubleStatistics/components/troubleDetail/index.vue
+++ b/src/views/contractor/troubleStatistics/components/troubleDetail/index.vue
@@ -16,7 +16,7 @@
<el-table-column label="作业编号" prop="taskcode" align="center" />
<el-table-column label="隐患等级" prop="level" align="center" >
<template slot-scope="scope">
- <el-tag :type="scope.row.level == '紧急'?'danger':'warning'">{{scope.row.level}}</el-tag>
+ <el-tag :type="scope.row.level == '重大隐患'?'danger':'warning'">{{scope.row.level}}</el-tag>
</template>
</el-table-column>
<el-table-column label="上报人" prop="requestor" align="center" />
diff --git a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/components/acceptDialog.vue b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/components/acceptDialog.vue
index 89b65ff..b077a72 100644
--- a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/components/acceptDialog.vue
+++ b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/components/acceptDialog.vue
@@ -151,8 +151,8 @@
isReject:false,
submiting:false,
levels:[
- {"key":"URGENT","value":"紧急"},
- {"key":"COMMON","value":"一般"},
+ {"key":"URGENT","value":"重大隐患"},
+ {"key":"COMMON","value":"一般隐患"},
],
dataForm: {
id:'',
diff --git a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/index.vue b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/index.vue
index 9d4bf81..b302709 100644
--- a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/index.vue
@@ -14,6 +14,16 @@
</el-select>
<span class="span-filter-label">整改人</span>
<el-input style="width: 160px" v-model="filter.filter.rectifierName"></el-input>
+
+ <span class="span-filter-label">隐患来源</span>
+ <el-select v-model="filter.filter.source" clearable placeholder="请选择">
+ <el-option
+ v-for="item in sources"
+ :key="item.key"
+ :label="item.value"
+ :value="item.key">
+ </el-option>
+ </el-select>
<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search"
@click="queryHandle"/>
</div>
@@ -37,7 +47,12 @@
</el-table-column>
<el-table-column label="隐患等级" prop="level" align="center" >
<template slot-scope="scope">
- <el-tag :type="scope.row.level == '紧急'?'danger':'warning'">{{scope.row.level}}</el-tag>
+ <el-tag :type="scope.row.level == '重大隐患'?'danger':'warning'">{{scope.row.level}}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="隐患来源" prop="source" align="center" >
+ <template slot-scope="scope">
+ <span>{{sources.find(item=>item.key === scope.row.source).value}}</span>
</template>
</el-table-column>
<el-table-column label="上报人" prop="requestor" align="center" />
@@ -101,8 +116,12 @@
tableData:[],
listLoading: true,
levels:[
- {"key":"URGENT","value":"紧急"},
- {"key":"COMMON","value":"一般"},
+ {"key":"URGENT","value":"重大隐患"},
+ {"key":"COMMON","value":"一般隐患"},
+ ],
+ sources:[
+ {"key":1,"value":"隐患上报"},
+ {"key":2,"value":"巡检上报"},
],
dataForm: {
id:'',
@@ -117,6 +136,7 @@
code:'',
level:null,
rectifierName:'',
+ source:'',
}
}
}
diff --git a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/components/reportView.vue b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/components/reportView.vue
index 66274e5..1ce0071 100644
--- a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/components/reportView.vue
+++ b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/components/reportView.vue
@@ -111,8 +111,8 @@
dialogFormVisible:false,
listLoading: true,
levels:[
- {"key":"URGENT","value":"紧急"},
- {"key":"COMMON","value":"普通"},
+ {"key":"URGENT","value":"重大隐患"},
+ {"key":"COMMON","value":"一般隐患"},
],
dataForm: {
},
diff --git a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/components/rectifyDialog.vue b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/components/rectifyDialog.vue
index 9f38d2d..855b925 100644
--- a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/components/rectifyDialog.vue
+++ b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/components/rectifyDialog.vue
@@ -174,8 +174,8 @@
submiting:false,
dataFormRules:{},
levels:[
- {"key":"URGENT","value":"紧急"},
- {"key":"COMMON","value":"一般"},
+ {"key":"URGENT","value":"重大隐患"},
+ {"key":"COMMON","value":"一般隐患"},
],
dataForm: {
id:'',
diff --git a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/index.vue b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/index.vue
index 046dbf6..2e8191b 100644
--- a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/index.vue
@@ -32,6 +32,16 @@
<span class="span-filter-label">上报人</span>
<el-input style="width: 160px" v-model="filter.filter.requestorName"></el-input>
+
+ <span class="span-filter-label">隐患来源</span>
+ <el-select v-model="filter.filter.source" clearable placeholder="请选择">
+ <el-option
+ v-for="item in sources"
+ :key="item.key"
+ :label="item.value"
+ :value="item.key">
+ </el-option>
+ </el-select>
<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search"
@click="queryHandle"/>
</div>
@@ -55,7 +65,12 @@
</el-table-column>
<el-table-column label="隐患等级" prop="level" align="center" >
<template slot-scope="scope">
- <el-tag :type="scope.row.level == '紧急'?'danger':'warning'">{{scope.row.level}}</el-tag>
+ <el-tag :type="scope.row.level == '重大隐患'?'danger':'warning'">{{scope.row.level}}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="隐患来源" prop="source" align="center" >
+ <template slot-scope="scope">
+ <span>{{sources.find(item=>item.key === scope.row.source).value}}</span>
</template>
</el-table-column>
<el-table-column label="上报人" prop="requestor" align="center" />
@@ -115,8 +130,12 @@
tableData:[],
listLoading: false,
levels:[
- {"key":"URGENT","value":"紧急"},
- {"key":"COMMON","value":"一般"},
+ {"key":"URGENT","value":"重大隐患"},
+ {"key":"COMMON","value":"一般隐患"},
+ ],
+ sources:[
+ {"key":1,"value":"隐患上报"},
+ {"key":2,"value":"巡检上报"},
],
reportStatus:[
{"key":"TORECTIFY","value":"待整改"},
diff --git a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/components/reportDialog.vue b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/components/reportDialog.vue
index a45846c..60efbd7 100644
--- a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/components/reportDialog.vue
+++ b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/components/reportDialog.vue
@@ -111,8 +111,8 @@
},
submiting:false,
levels:[
- {"key":"URGENT","value":"紧急"},
- {"key":"COMMON","value":"一般"},
+ {"key":"URGENT","value":"重大隐患"},
+ {"key":"COMMON","value":"一般隐患"},
],
pickerOptions:{
disabledDate(now){
diff --git a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/index.vue b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/index.vue
index 262f5f0..9eaf8b7 100644
--- a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/index.vue
@@ -33,6 +33,16 @@
<span class="span-filter-label">整改人</span>
<el-input style="width: 160px" v-model="filter.filter.rectifierName"></el-input>
+ <span class="span-filter-label">隐患来源</span>
+ <el-select v-model="filter.filter.source" clearable placeholder="请选择">
+ <el-option
+ v-for="item in sources"
+ :key="item.key"
+ :label="item.value"
+ :value="item.key">
+ </el-option>
+ </el-select>
+
<el-button class="filter-item" style="margin-left: 10px;" type="primary"
icon="el-icon-plus" @click="showCreateHandle">新增
@@ -60,7 +70,12 @@
</el-table-column>
<el-table-column label="隐患等级" prop="level" align="center" >
<template slot-scope="scope">
- <el-tag :type="scope.row.level == '紧急'?'danger':'warning'">{{scope.row.level}}</el-tag>
+ <el-tag :type="scope.row.level == '重大隐患'?'danger':'warning'">{{scope.row.level}}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="隐患来源" prop="source" align="center" >
+ <template slot-scope="scope">
+ <span>{{sources.find(item=>item.key === scope.row.source).value}}</span>
</template>
</el-table-column>
<el-table-column label="上报人" prop="requestor" align="center" />
@@ -123,8 +138,12 @@
tableData:[],
listLoading: true,
levels:[
- {"key":"URGENT","value":"紧急"},
- {"key":"COMMON","value":"一般"},
+ {"key":"URGENT","value":"重大隐患"},
+ {"key":"COMMON","value":"一般隐患"},
+ ],
+ sources:[
+ {"key":1,"value":"隐患上报"},
+ {"key":2,"value":"巡检上报"},
],
reportStatus:[
{"key":"TORECTIFY","value":"待整改"},
diff --git a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/statistics/index.vue b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/statistics/index.vue
index cf5ed03..1394757 100644
--- a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/statistics/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/statistics/index.vue
@@ -34,6 +34,16 @@
<el-input style="width: 140px" v-model="filter.filter.requestorName" ></el-input>
<span class="span-filter-label">整改人</span>
<el-input style="width: 140px" v-model="filter.filter.rectifierName"></el-input>
+
+ <span class="span-filter-label">隐患来源</span>
+ <el-select v-model="filter.filter.source" clearable placeholder="请选择">
+ <el-option
+ v-for="item in sources"
+ :key="item.key"
+ :label="item.value"
+ :value="item.key">
+ </el-option>
+ </el-select>
<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search"
@click="queryHandle"/>
</div>
@@ -69,7 +79,12 @@
</el-table-column>
<el-table-column label="隐患等级" prop="level" align="center" >
<template slot-scope="scope">
- <el-tag :type="scope.row.level == '紧急'?'danger':'warning'">{{scope.row.level}}</el-tag>
+ <el-tag :type="scope.row.level == '重大隐患'?'danger':'warning'">{{scope.row.level}}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="隐患来源" prop="source" align="center" >
+ <template slot-scope="scope">
+ <span>{{sources.find(item=>item.key === scope.row.source).value}}</span>
</template>
</el-table-column>
<el-table-column label="上报人" prop="requestor" align="center" />
@@ -130,8 +145,12 @@
tableData:[],
showData:[],
levels:[
- {"key":"URGENT","value":"紧急"},
- {"key":"COMMON","value":"一般"},
+ {"key":"URGENT","value":"重大隐患"},
+ {"key":"COMMON","value":"一般隐患"},
+ ],
+ sources:[
+ {"key":1,"value":"隐患上报"},
+ {"key":2,"value":"巡检上报"},
],
reportStatus:[
{"key":"TORECTIFY","value":"待整改"},
@@ -149,6 +168,7 @@
level:null,
requestorName:'',
rectifierName:'',
+ source:''
}
}
diff --git a/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue b/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
index 89a65cd..e25e617 100644
--- a/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
+++ b/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
@@ -209,13 +209,11 @@
methods: {
alarmMajorEquipmentErt(){
majorEquipmentErt().then(res=>{
- console.log(res)
this.equipmentName=res.data.result
})
},
async elementManagementL() {
var res = await majorEquipmentList(this.listQuery);
- console.log(res);
if (res.data.code == 200) {
this.list = res.data.result.records;
this.recordTotal = res.data.result.total
diff --git a/src/views/safetyproduction/checklist.vue b/src/views/safetyproduction/checklist.vue
index f89104c..50966ff 100644
--- a/src/views/safetyproduction/checklist.vue
+++ b/src/views/safetyproduction/checklist.vue
@@ -412,7 +412,6 @@
this.listQuery.filter.elementB = data.value;
safetyInspectionItemList(this.listQuery).then((res) => {
this.list = res.data.result.records;
- console.log(123,this.list)
});
}
},
diff --git a/src/views/safetyproduction/gojudging.vue b/src/views/safetyproduction/gojudging.vue
index c561318..67f708e 100644
--- a/src/views/safetyproduction/gojudging.vue
+++ b/src/views/safetyproduction/gojudging.vue
@@ -178,7 +178,6 @@
})
.then(() => {
safetySelfInspectionFinish({ id: this.id }).then((res) => {
- console.log(123, res);
if (res.data.code === "200") {
this.$notify({
title: "成功",
@@ -213,7 +212,6 @@
arr[i].child.points = arr[i].child.point;
}
this.lists = arr;
- console.log("tag", arr);
});
},
checkSameDataA(resData) {
@@ -246,7 +244,6 @@
dataInfo[elementBName].child.push(item);
});
let list = Object.values(dataInfo); // list 转换成功的数据
- // console.log("数据",list)
for (var i = 0; i < list.length; i++) {
var pot = list[i].points;
for (var j = 0; j < list[i].child.length; j++) {
diff --git a/src/views/safetyproduction/new.vue b/src/views/safetyproduction/new.vue
index cb0e53c..f0c84be 100644
--- a/src/views/safetyproduction/new.vue
+++ b/src/views/safetyproduction/new.vue
@@ -234,7 +234,6 @@
safetyInspectionItemId: "",
}
arr[i].child[j].deductionList= arr[i].child[j].selfDeductionList
- console.log(arr[i].child[j])
capB.safetySelfInspectionId=arr[i].child[j].safetySelfInspectionId
capB.safetyInspectionItemId=arr[i].child[j].safetyInspectionItemId
cser.push(capB)
@@ -393,7 +392,6 @@
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.id == "添加") {
- console.log("添加",this.form)
safetySelfInspectionAdd(this.form).then((res) => {
if (res.data.code == 200) {
this.dialogVisible = false;
@@ -409,7 +407,6 @@
}
});
} else if (this.id == "编辑") {
- console.log('编辑',this.form)
safetySelfInspectionMod(this.form).then((res) => {
this.dialogVisible = false;
this.$notify({
--
Gitblit v1.9.2