Merge branch 'master' of https://sinanoaq.cn:8888/r/ztqt

Your Name

2022-05-11 d813339081185b17cfbb6f60e0b3c09e75441e49

Merge branch 'master' of https://sinanoaq.cn:8888/r/ztqt

 src/views/majorHazardSourceMonitoring/productionEquipment/index.vue

@@ -2,6 +2,13 @@
    <div class="app-container">
        <el-form ref="form" :model="form" label-width="80px">
            <el-row>
                <el-col :span="6">
                    <el-form-item label="设备区域">
                        <el-select v-model="listQuery.filter.areaId" placeholder="请选择设备区域" clearable style="width: 100%">
                            <el-option v-for="item in areaList" :key="item.id" :label="item.value" :value="item.id"></el-option>
                        </el-select>
                    </el-form-item>
                </el-col>
                <el-col :span="5">
                    <el-form-item label="设备名称">
                        <el-input v-model="listQuery.filter.name" placeholder="请输入设备名称" clearable></el-input>
@@ -149,7 +156,6 @@
                                v-model="form.areaId"
                                placeholder="请选择设备区域"
                                style="width: 100%"
                                filterable
                            >
                                <el-option
                                    v-for="item in areaList"

 src/views/safetyproduction/checklist.vue

@@ -48,7 +48,7 @@
              <p class="titles">标准化要求：</p>
            </el-col>
            <el-col :span="20">
              <p class="titles-type">
              <p class="title-type">
                {{ item.standardizationRequirements }}
              </p>
            </el-col>

 src/views/safetyproduction/gojudging.vue

@@ -187,7 +187,7 @@
                  duration: 2000,
                });
                this.$router.push({
                  path: "/checklistself",
                path:"/safetyproduction/safetyproduction/checklistself"
                });
              } else {
                this.$message({

 src/views/safetyproduction/new.vue

@@ -404,7 +404,7 @@
              title: "成功",
            });
            this.$router.push({
              path:"/checklistself"
              path:"/safetyproduction/safetyproduction/checklistself"
            });
          }
        });
@@ -420,7 +420,7 @@
          });
        });
         this.$router.push({
              path:"/checklistself"
              path:"/safetyproduction/safetyproduction/checklistself"
            });
      }
         }

 src/views/safetyproduction/review.vue

@@ -124,7 +124,7 @@
              <el-col :span="24">
                <el-form-item label="是否否决项">
                  <el-radio-group v-model="list.safetyInspectionItemResult">
                    <el-radio :label="0">是</el-radio>
                    <el-radio :label="0" v-if="list.veto!='' && list.veto!=null">是</el-radio>
                    <el-radio :label="1">否</el-radio>
                  </el-radio-group>
                </el-form-item></el-col
@@ -253,41 +253,41 @@
        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,
            message: "提交成功",
            title: "成功",
          });
          this.$router.push({
            path: "/gojudging",
              query:{
          id:this.id
        }
          });
             }else{
        alert(`扣分不得超过总分${this.point}`)
      }
        }
      });
      }else{
          this.$confirm('是否否决项未选择','提示', {
            confirmButtonText: '确认',
            cancelButtonText: '取消',
            type: 'warning'
        })
      }
    },
      modItem() {
          if(this.list.safetyInspectionItemResult!=null){
              let pointFlag = this.pointDel
              for(var i=0;i<this.list.selfDeductionList.length;i++){
                  pointFlag=pointFlag-this.list.selfDeductionList[i].point
              }
              if(pointFlag>=0){
                  safetySelfInspectionModItemInfo(this.list).then((res) => {
                      if (res.data.code == 200) {
                          this.$notify({
                              type: "success",
                              duration: 2000,
                              message: "提交成功",
                              title: "成功",
                          });
                          this.$router.push({
                              path: "/gojudging",
                              query: {
                                  id: this.id
                              }
                          });
                      }
                  })
              }else{
                  alert(`扣分不得超过总分${this.point}`)
              }
          }
          else{
              this.$confirm('是否否决项未选择','提示', {
                  confirmButtonText: '确认',
                  cancelButtonText: '取消',
                  type: 'warning'
              })
          }
      },
    back() {
      this.$router.push({
        path: "/gojudging",
@@ -301,19 +301,19 @@
      // this.form = data;
        this.form=JSON.parse(JSON.stringify(data));
    },
    addC(){
       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){
                this.list.selfDeductionList[i].point = this.form.point
                this.list.selfDeductionList[i].remark = this.form.remark
            }
        }
        }else{
                alert(`扣分不得超过总分${this.point}`)
      addC(){
          if(this.form.point<=this.point){
              for(let i = 0;i<this.list.selfDeductionList.length;i++){
                  if (this.form.safetyInspectionItemDeductionId==this.list.selfDeductionList[i].safetyInspectionItemDeductionId){
                      this.list.selfDeductionList[i].point = this.form.point
                      this.list.selfDeductionList[i].remark = this.form.remark
                  }
              }
      this.dialogVisible = false;
    },
          }else{
              alert(`扣分不得超过总分${this.point}`)
          }
          this.dialogVisible = false;
      },
    lost() {
      this.dialogVisible = false;
      this.itemInfo(this.id);