From de623a5ec5884b91c0c56ecdbb9222b828a648a5 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 08 四月 2022 09:13:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master
---
src/views/safetyproduction/gojudging.vue | 183 +++++++++++---
src/views/safetyproduction/checklistself.vue | 26 +
src/views/accidentHidden/hiddenDangerList.vue | 304 +++++++++++++++++++++++++
src/views/safetyproduction/review.vue | 18 +
src/views/accidentHidden/majorHidden.vue | 17 +
src/api/safetySelfInspection.js | 13 +
src/router/index.js | 27 ++
src/views/safetyproduction/new.vue | 15
src/views/safetyproduction/checklist.vue | 65 ++++-
9 files changed, 586 insertions(+), 82 deletions(-)
diff --git a/src/api/safetySelfInspection.js b/src/api/safetySelfInspection.js
index af27ced..95d743e 100644
--- a/src/api/safetySelfInspection.js
+++ b/src/api/safetySelfInspection.js
@@ -117,4 +117,15 @@
method: 'post',
data
})
-}
\ No newline at end of file
+}
+
+export function safetySelfInspectionFinish(data) {
+ return request({
+ headers:{
+ 'Authorization': getToken()
+ },
+ url: process.env.BASE_API+'/safetySelfInspection/finish',
+ method: 'post',
+ data
+ })
+}
diff --git a/src/router/index.js b/src/router/index.js
index baee810..eea1f0a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -202,7 +202,32 @@
meta: { title: '仪表实时数据', icon: '' }
},
]
- }
+ },
+ {
+ id: 2,
+ parentId: 0,
+ path: '/accidentHidden',
+ component: Layout,
+ name: '事故隐患排查治理',
+ meta: { title: '事故隐患排查治理', icon: 'el-icon-facilities' },
+ children: [
+ {
+ id: 1,
+ parentId: 0,
+ path: '/majorHidden',
+ name: '重大隐患整改进度',
+ component: () => import('@/views/accidentHidden/majorHidden'),
+ meta: { title: '重大隐患整改进度', icon: '' }
+ },
+ {
+ path: '/hiddenDangerList',
+ // name: '重大隐患整改进度-发送隐患单',
+ component: () => import('@/views/accidentHidden/hiddenDangerList'),
+ // meta: { title: '重大隐患整改进度-发送隐患单', icon: '' }
+ hidden: true
+ },
+ ]
+ }
]
export default new Router({
diff --git a/src/views/accidentHidden/hiddenDangerList.vue b/src/views/accidentHidden/hiddenDangerList.vue
new file mode 100644
index 0000000..e3c762c
--- /dev/null
+++ b/src/views/accidentHidden/hiddenDangerList.vue
@@ -0,0 +1,304 @@
+<template>
+ <div class="app-container">
+ <div style="">
+ <Titlename title="发送隐患单"></Titlename>
+ <div class="whole-form">
+ <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="150px" class="demo-ruleForm"
+ style="margin: 0 14% 0 16%;">
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="隐患编号：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="检查单位：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="检查人：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ <!-- <el-form-item label="检查人：" prop="region">-->
+ <!-- <el-select v-model="ruleForm.region" placeholder="请选择活动区域">-->
+ <!-- <el-option label="区域一" value="shanghai"></el-option>-->
+ <!-- <el-option label="区域二" value="beijing"></el-option>-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="陪检人员：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="检查时间：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ <!-- <el-form-item label="检查时间：" prop="name">-->
+ <!-- <el-date-picker-->
+ <!-- v-model="value1"-->
+ <!-- type="date"-->
+ <!-- placeholder="选择日期">-->
+ <!-- </el-date-picker>-->
+ <!-- </el-form-item>-->
+
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="班次：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="跟班、带班情况：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="跟班、带班人员：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="行走路线：" prop="name">
+ <el-input v-model="ruleForm.name" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="隐患单位：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="隐患部门：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="隐患地点：" prop="name">
+ <el-input v-model="ruleForm.name" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="隐患内容：" prop="name">
+ <el-input v-model="ruleForm.name" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="隐患类别：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="隐患级别：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="整改措施：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="所需资金：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="限改时间：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="责任人：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="完成时间：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="整改完成情况：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="复查时间：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="复查人：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="复查结果：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="整改次数：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="危险源：" prop="name">
+ <el-input v-model="ruleForm.name" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="风险等级：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="业务科室：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="流程信息：" prop="name">
+ <el-input v-model="ruleForm.name" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="发送流程：" prop="name">
+ <el-input v-model="ruleForm.name" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="下一步：" prop="name">
+ <el-input v-model="ruleForm.name" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="是否同意延期：" prop="resource">
+ <el-radio-group v-model="ruleForm.resource">
+ <el-radio label="线上品牌商赞助"></el-radio>
+ <el-radio label="线下场地免费"></el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="限改时间：" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="备注" prop="desc">
+ <el-input type="textarea" v-model="ruleForm.desc"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item style="text-align: center;">
+ <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
+ <el-button @click="close()">关闭</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
+ </div>
+
+ </div>
+</template>
+
+<script>
+ import Titlename from "../../components/Titlename/index.vue";
+
+ export default {
+ components: {Titlename},
+ name: "hiddenDangerList",
+ data() {
+ return {
+ ruleForm: {
+ name: '',
+ region: '',
+ date1: '',
+ date2: '',
+ delivery: false,
+ type: [],
+ resource: '',
+ value1: '',
+ desc: ''
+ },
+ rules: {}
+ };
+ },
+ methods: {
+ submitForm(formName) {
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ alert('submit!');
+ } else {
+ console.log('error submit!!');
+ return false;
+ }
+ });
+ },
+ }
+ }
+</script>
+
+<style scoped>
+ .app-container {
+ padding: 20px;
+ height: 850px;
+ overflow-y: auto;
+ }
+
+ /deep/ .box {
+ padding-top: 0;
+ }
+ /deep/ .multiline .el-input__inner{
+ height: 62px;
+ }
+</style>
diff --git a/src/views/accidentHidden/majorHidden.vue b/src/views/accidentHidden/majorHidden.vue
new file mode 100644
index 0000000..ef11716
--- /dev/null
+++ b/src/views/accidentHidden/majorHidden.vue
@@ -0,0 +1,17 @@
+<template>
+ <div class="app-container">
+
+ </div>
+</template>
+<script>
+ export default{
+ data(){
+ return{
+
+ }
+ }
+ }
+</script>
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/views/safetyproduction/checklist.vue b/src/views/safetyproduction/checklist.vue
index 778720d..1010be4 100644
--- a/src/views/safetyproduction/checklist.vue
+++ b/src/views/safetyproduction/checklist.vue
@@ -64,34 +64,69 @@
>
</el-row>
<el-row>
- <el-col :span="2"><p class="title">企业达标标准：</p></el-col>
- <el-col :span="9"
+ <el-col :span="2"><p class="titles">企业达标标准：</p></el-col>
+ <el-col :span="22"
><p class="title-type">
{{ item.enterpriseStandard }}
</p></el-col
>
- <el-col :span="2" :offset="1"
- ><p class="title">评审方法：</p></el-col
+ <!-- <el-col :span="2" :offset="1"
+ ><p class="titles">评审方法：</p></el-col
>
<el-col :span="10"
+ ><p class="title-type">
+ {{ item.reviewMethod }}
+ </p></el-col
+ > -->
+ </el-row>
+ <el-row>
+ <!-- <el-col :span="2"><p class="titles">企业达标标准：</p></el-col>
+ <el-col :span="9"
+ ><p class="title-type">
+ {{ item.enterpriseStandard }}
+ </p></el-col
+ > -->
+ <el-col :span="2"
+ ><p class="titles">评审方法：</p></el-col
+ >
+ <el-col :span="22"
><p class="title-type">
{{ item.reviewMethod }}
</p></el-col
>
</el-row>
<el-row>
- <el-col :span="2"><p class="title">否决项：</p></el-col>
- <el-col :span="9"
+ <el-col :span="2"><p class="titles">否决项：</p></el-col>
+ <el-col :span="22"
><p class="title-type">
{{ item.veto }}
</p></el-col
>
- <el-col :span="2" :offset="1"
- ><p class="title">扣分项：</p></el-col
+ <!-- <el-col :span="2" :offset="1"
+ ><p class="titles">扣分项：</p></el-col
>
<el-col :span="10"
><p class="title-type">
- {{ item.deductionList[index].name}}
+ {{ item.deductionList}}
+ </p></el-col
+ > -->
+ </el-row>
+ <el-row>
+ <!-- <el-col :span="2"><p class="titles">否决项：</p></el-col>
+ <el-col :span="9"
+ ><p class="title-type">
+ {{ item.veto }}
+ </p></el-col
+ > -->
+ <el-col :span="2"
+ ><p class="titles">扣分项：</p></el-col
+ >
+ <el-col :span="22"
+ ><p class="title-type">
+ <!-- {{ item.deductionList}} -->
+ <span style="line-height:20px" v-for="(item,index) in item.deductionList" :key="index">
+ {{item.name}}
+ </span>
</p></el-col
>
</el-row>
@@ -373,11 +408,13 @@
});
},
safetyInspectionItemL(data) {
- this.listQuery.filter.elementB = data.value;
- safetyInspectionItemList(this.listQuery).then((res) => {
- this.list = res.data.result.records;
- console.log("xxx",this.list)
- });
+ if (data.type== 1) {
+ this.listQuery.filter.elementB = data.value;
+ safetyInspectionItemList(this.listQuery).then((res) => {
+ this.list = res.data.result.records;
+ console.log(123,this.list)
+ });
+ }
},
safetyInspectionItemC(id, type) {
this.show = false;
diff --git a/src/views/safetyproduction/checklistself.vue b/src/views/safetyproduction/checklistself.vue
index 47fa993..97b59cc 100644
--- a/src/views/safetyproduction/checklistself.vue
+++ b/src/views/safetyproduction/checklistself.vue
@@ -71,25 +71,25 @@
</el-table-column>
<el-table-column align="center" label="状态">
<template slot-scope="scope">
- <span v-if="scope.row.status == -1">暂存</span>
- <span v-if="scope.row.status == 0">评审中</span>
- <span v-if="scope.row.status == 1">已评审</span>
+ <span v-if="scope.row.status == 0">暂存</span>
+ <span v-if="scope.row.status == 1">评审中</span>
+ <span v-if="scope.row.status == 2">已评审</span>
</template>
</el-table-column>
<el-table-column align="center" prop="updateTime" label="更新时间">
</el-table-column>
<el-table-column align="center" label="操作">
<template slot-scope="scope">
- <el-button v-if="scope.row.status==-1" @click="handleClick(scope.row)" type="text" size="small"
+ <el-button v-if="scope.row.status==0" @click="handleClick(scope.row)" type="text" size="small"
>编辑</el-button
>
- <el-button v-if="scope.row.status==0" @click="handleClick(scope.row)" type="text" size="small"
+ <el-button v-if="scope.row.status==1" @click="handleClick(scope.row)" type="text" size="small"
>去评审</el-button
>
- <el-button v-if="scope.row.status==1" @click="handleClick(scope.row)" type="text" size="small"
+ <el-button v-if="scope.row.status==2" @click="handleClick(scope.row)" type="text" size="small"
>查看</el-button
>
- <el-button @click="Del(scope.row.id)" v-if="scope.row.status==1?false:true" type="text" size="small" style="color: red"
+ <el-button @click="Del(scope.row.id)" v-if="scope.row.status==0?true:false" type="text" size="small" style="color: red"
>删除</el-button
>
</template>
@@ -156,7 +156,7 @@
});
},
handleClick(val) {
- if(val.status==-1){
+ if(val.status==0){
this.$router.push({
path:"/new",
query:{
@@ -164,13 +164,21 @@
name:'编辑'
}
})
- }else if(val.status==0){
+ }else if(val.status==1){
this.$router.push({
path:"/gojudging",
query:{
id:val.id
}
})
+ }else if(val.status==2){
+ this.$router.push({
+ path:"/gojudging",
+ query:{
+ id:val.id,
+ type:2
+ }
+ })
}
},
find() {
diff --git a/src/views/safetyproduction/gojudging.vue b/src/views/safetyproduction/gojudging.vue
index 230f406..f941b95 100644
--- a/src/views/safetyproduction/gojudging.vue
+++ b/src/views/safetyproduction/gojudging.vue
@@ -1,7 +1,18 @@
<template>
<div>
<div class="box-right">
- <div v-for="(item, index) in lists" :key="index" style="padding:0 0 20px 0">
+ <el-button
+ type="primary"
+ class="btn"
+ v-if="typeId == 2 ? false : true"
+ @click="finish()"
+ >结单</el-button
+ >
+ <div
+ v-for="(item, index) in lists"
+ :key="index"
+ style="padding: 0 0 20px 0"
+ >
<div class="title">
A级要素：<span>{{ item.elementAName }}</span>
</div>
@@ -11,14 +22,20 @@
><p><span>B级要素：</span>{{ item.elementBName }}</p></el-col
>
<el-col :span="6"
- ><p><span>总分：</span>50</p></el-col
+ ><p><span>总分：</span>{{ item.points }}</p></el-col
>
- <el-col :span="6"
- ><p><span>得分：</span>{{item.point}}</p></el-col>
+ <el-col :span="6"
+ ><p><span>得分：</span>{{ item.point }}</p></el-col
+ >
</el-row>
<el-row>
<el-col :span="24">
- <el-table border :data="item.child" :header-cell-style="{background:'#eef1f6',color:'#606266'}" :cell-style="{background:'#fff',color:'#606266'}">
+ <el-table
+ border
+ :data="item.child"
+ :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+ :cell-style="{ background: '#fff', color: '#606266' }"
+ >
<el-table-column
prop="standardizationRequirements"
align="center"
@@ -42,10 +59,10 @@
></el-table-column>
<el-table-column align="center" label="评审结果">
<template slot-scope="scope">
- <span v-if="(scope.row.safetyInspectionItemResult== 0)"
+ <span v-if="scope.row.safetyInspectionItemResult == 0"
>否决</span
>
- <span v-if="(scope.row.safetyInspectionItemResult == 1)"
+ <span v-if="scope.row.safetyInspectionItemResult == 1"
>扣分</span
>
</template>
@@ -56,24 +73,32 @@
type="expand"
width="100px"
>
- <template slot-scope="scope">
- <el-table
- :data="scope.row.selfDeductionList"
- border
- :header-cell-style="{background:'#eef1f6',color:'#606266'}" :cell-style="{background:'#fff',color:'#606266'}"
- >
- <el-table-column prop="name" align="center" label="扣分项">
- </el-table-column>
- <el-table-column prop="point" align="center" label="扣分">
- </el-table-column>
- <el-table-column
- prop="remark"
- align="center"
- label="扣分备注"
+ <template slot-scope="scope">
+ <el-table
+ :data="scope.row.selfDeductionList"
+ border
+ :header-cell-style="{
+ background: '#eef1f6',
+ color: '#606266',
+ }"
+ :cell-style="{ background: '#fff', color: '#606266' }"
>
- </el-table-column>
- </el-table>
- </template>
+ <el-table-column
+ prop="name"
+ align="center"
+ label="扣分项"
+ >
+ </el-table-column>
+ <el-table-column prop="point" align="center" label="扣分">
+ </el-table-column>
+ <el-table-column
+ prop="remark"
+ align="center"
+ label="扣分备注"
+ >
+ </el-table-column>
+ </el-table>
+ </template>
</el-table-column>
<el-table-column
prop="remark"
@@ -86,6 +111,7 @@
@click="handleClick(scope.row)"
type="text"
size="small"
+ :disabled="typeId == 2 ? true : false"
>评价</el-button
>
<!-- <el-button type="text" size="small" style="color: red"
@@ -103,7 +129,10 @@
</template>
<script>
import Titlename from "../../components/Titlename/index.vue";
-import { safetySelfInspectionInfo } from "@/api/safetySelfInspection.js";
+import {
+ safetySelfInspectionInfo,
+ safetySelfInspectionFinish,
+} from "@/api/safetySelfInspection.js";
export default {
components: { Titlename },
data() {
@@ -119,22 +148,72 @@
},
list: [],
lists: [],
+ listType: [],
+ typeId: "",
};
},
created() {
this.id = this.$route.query.id;
+ this.typeId = this.$route.query.type;
this.safeInitem(this.id);
},
methods: {
+ finish() {
+ var faly = "";
+ var bar = [];
+ for (var i = 0; i < this.listType.length; i++) {
+ if (this.listType[i].safetyInspectionItemResult == null) {
+ faly = false;
+ } else {
+ faly = true;
+ }
+ bar.push(faly);
+ }
+ if (bar.indexOf(false) == -1) {
+ let id = this.id;
+ this.$confirm("确定要结单吗？", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ safetySelfInspectionFinish({ id: this.id }).then((res) => {
+ console.log(123, res);
+ if (res.data.code === "200") {
+ this.$notify({
+ title: "成功",
+ message: "结单成功",
+ type: "success",
+ duration: 2000,
+ });
+ this.$router.push({
+ path: "/checklistself",
+ });
+ } else {
+ this.$message({
+ message: res.data.message,
+ type: "warning",
+ });
+ }
+ });
+ })
+ .catch((error) => {});
+ } else {
+ alert("请将所有评分评价后再点结算");
+ }
+ },
+
safeInitem(id) {
safetySelfInspectionInfo({ id: id }).then((res) => {
if (res.data.code == 200) this.list = res.data.result;
+ this.listType = res.data.result.itemList;
var arr = this.checkSameDataA(this.list.itemList);
for (var i = 0; i < arr.length; i++) {
arr[i].child = this.checkSameData(arr[i].child);
+ arr[i].child.points = arr[i].child.point;
}
this.lists = arr;
- // console.log('tag', arr)
+ console.log("tag", arr);
});
},
checkSameDataA(resData) {
@@ -159,30 +238,37 @@
if (!dataInfo[elementBName]) {
dataInfo[elementBName] = {
elementBName,
- point:"",
+ point: "",
+ points: item.point,
child: [],
};
}
dataInfo[elementBName].child.push(item);
});
let list = Object.values(dataInfo); // list 转换成功的数据
- console.log(list)
- for(var i=0;i<list.length;i++){
- var pot=50
- for(var j=0;j<list[i].child.length;j++){
- if(list[i].child[j].safetyInspectionItemResult!=0){
- pot=pot-list[i].child[j].selfDeductionList[0].point
- }else{
- var cont=0
- pot=0
- }
- }
- if(pot>0){
- list[i].point=pot
- }else{
- list[i].point=0
- }
+ // 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++) {
+ if (list[i].child[j].safetyInspectionItemResult != 0) {
+ for (
+ var s = 0;
+ s < list[i].child[j].selfDeductionList.length;
+ s++
+ ) {
+ pot = pot - list[i].child[j].selfDeductionList[s].point;
+ }
+ } else {
+ var cont = 0;
+ pot = 0;
+ }
}
+ if (pot > 0) {
+ list[i].point = pot;
+ } else {
+ list[i].point = 0;
+ }
+ }
return list;
},
handleClick(data) {
@@ -190,7 +276,7 @@
path: "/review",
query: {
idC: data.id,
- id:this.id
+ id: this.id,
},
});
},
@@ -210,7 +296,7 @@
border-radius: 5px;
padding: 20px;
height: 850px;
- overflow-y:overlay;
+ overflow-y: overlay;
}
.title {
font-size: 16px;
@@ -220,7 +306,12 @@
.titles {
font-size: 14px;
}
-.box-right /deep/ .el-table__expanded-cell{
+.box-right /deep/ .el-table__expanded-cell {
background-color: #fff !important;
}
+.btn {
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ float: right;
+}
</style>
diff --git a/src/views/safetyproduction/new.vue b/src/views/safetyproduction/new.vue
index bbf960a..f0e9581 100644
--- a/src/views/safetyproduction/new.vue
+++ b/src/views/safetyproduction/new.vue
@@ -17,10 +17,10 @@
</div>
<div class="box-right" v-if="lists == '' ? false : true">
<div class="btns">
- <el-button type="primary" class="btn" @click="open(0)"
+ <el-button type="primary" class="btn" @click="open(1)"
>添加</el-button
>
- <el-button type="primary" class="btn" @click="open(-1)"
+ <el-button type="primary" class="btn" @click="open(0)"
>暂存</el-button
>
</div>
@@ -225,10 +225,10 @@
trees.push(this.list.itemList[i].elementA);
}
this.treeList = Array.from(new Set(trees));
- var arr = this.checkSameDataA(this.list.itemList);
+ var arr = this.checkSameDataA(this.list.itemList);
for (var i = 0; i < arr.length; i++) {
var cser=[]
- for(var j=0;j<arr[i].child.length;j++){
+ for(var j=0;j<arr[i].child.length;j++){
var capB = {
safetySelfInspectionId: "",
safetyInspectionItemId: "",
@@ -290,7 +290,7 @@
if(this.list.length!=0){
var capA = { elementAName: "", id: [], child: [] };
var atte = [];
-
+
capA.elementAName = this.list[0].elementAName;
for (var i = 0; i < this.list.length; i++) {
var capB = {
@@ -360,7 +360,7 @@
query: {
idX: data.safetyInspectionItemId,
name:this.id,
- id:this.itemId
+ id:this.itemId
},
});
} else {
@@ -369,7 +369,7 @@
query: {
idX: data.id,
name:this.id,
- id:this.itemId
+ id:this.itemId
},
});
}
@@ -377,7 +377,6 @@
open(type) {
this.dialogVisible = true;
this.form.status = type;
- console.log("xxxxx",this.lists)
var arr = [];
for (var i = 0; i < this.lists.length; i++) {
// this.lists[i].id;
diff --git a/src/views/safetyproduction/review.vue b/src/views/safetyproduction/review.vue
index d6517a6..4a471fb 100644
--- a/src/views/safetyproduction/review.vue
+++ b/src/views/safetyproduction/review.vue
@@ -237,6 +237,8 @@
id: "",
form: {},
list: {},
+ point:"",
+ pointDel:""
};
},
created() {
@@ -247,13 +249,20 @@
itemInfo(id) {
safetySelfInspectionItemInfo({id:id}).then((res) => {
this.list = res.data.result;
+ this.point=res.data.result.point
+ this.pointDel=res.data.result.point
});
},
modItem() {
if(this.list.safetyInspectionItemResult!=null){
console.log(this.list)
+ for(var i=0;i<this.list.selfDeductionList.length;i++){
+ this.pointDel=this.pointDel-this.list.selfDeductionList[i].point
+ }
+
safetySelfInspectionModItemInfo(this.list).then((res) => {
if (res.data.code == 200) {
+ if(this.pointDel>=0){
this.$notify({
type: "success",
duration: 2000,
@@ -266,6 +275,9 @@
id:this.id
}
});
+ }else{
+ alert(`扣分不得超过总分${this.point}`)
+ }
}
});
}else{
@@ -290,15 +302,15 @@
this.form=JSON.parse(JSON.stringify(data));
},
addC(){
- if(this.form.point<=50){
+ if(this.form.point<=this.point){
for(let i = 0;i<this.list.selfDeductionList.length;i++){
- if (this.form.id=this.list.selfDeductionList[i].id){
+ if (this.form.id==this.list.selfDeductionList[i].id){
this.list.selfDeductionList[i].point = this.form.point
this.list.selfDeductionList[i].remark = this.form.remark
}
}
}else{
- alert("扣分不得超过总分50")
+ alert(`扣分不得超过总分${this.point}`)
}
this.dialogVisible = false;
},
--
Gitblit v1.9.2