Merge remote-tracking branch 'remotes/origin/shf' into master

lyfO_o

2022-04-07 3114376a8a061ae86762155a7da0b3d5afef1ceb

 src/views/safetyproduction/checklist.vue

@@ -79,6 +79,22 @@
              </p></el-col
            >
          </el-row>
          <el-row>
            <el-col :span="2"><p class="title">否决项：</p></el-col>
            <el-col :span="9"
              ><p class="title-type">
                {{ item.veto }}
              </p></el-col
            >
            <el-col :span="2" :offset="1"
              ><p class="title">扣分项：</p></el-col
            >
            <el-col :span="10"
              ><p class="title-type">
                {{ item.deductionList[index].name}}
              </p></el-col
            >
          </el-row>
        </div>
      </div>
      <!-- 修改 -->
@@ -147,7 +163,6 @@
                    v-model="form.standardizationRequirements"
                    placeholder=""
                    maxlength="250"
                    show-word-limit
                  ></el-input>
                </el-form-item>
              </el-col>
@@ -161,7 +176,6 @@
                    v-model="form.enterpriseStandard"
                    placeholder=""
                    maxlength="250"
                    show-word-limit
                  ></el-input>
                </el-form-item>
              </el-col>
@@ -175,7 +189,6 @@
                    v-model="form.reviewMethod"
                    placeholder=""
                    maxlength="250"
                    show-word-limit
                  ></el-input>
                </el-form-item>
              </el-col>
@@ -192,7 +205,6 @@
                    v-model="form.veto"
                    placeholder=""
                    maxlength="250"
                    show-word-limit
                  ></el-input>
                </el-form-item>
              </el-col>
@@ -364,6 +376,7 @@
      this.listQuery.filter.elementB = data.value;
      safetyInspectionItemList(this.listQuery).then((res) => {
        this.list = res.data.result.records;
        console.log("xxx",this.list)
      });
    },
    safetyInspectionItemC(id, type) {
@@ -509,7 +522,7 @@
}
.box-left {
  width: 20%;
  min-height: 800px;
  min-height: 850px;
  background-color: white;
  border-radius: 5px;
}
@@ -520,11 +533,15 @@
  width: 79%;
  background-color: rgb(223, 229, 235);
  border-radius: 5px;
  height: 850px;
  overflow-y:overlay;
}
.box-rights {
  width: 79%;
  background-color: #fff;
  border-radius: 5px;
   height: 850px;
  overflow-y:overlay;
}
.box-rightXQ {
  margin-bottom: 10px;