Merge remote-tracking branch 'origin/master'

value

2023-08-28 b1dd7463eebcd7e67f94244988ebbc3b9d29c1b7

 src/views/laboratory/measure/index.vue

@@ -117,12 +117,19 @@
          </div>
        </div>
      </div>
      <div>
        <el-button v-if="selectInfoBtn" @click="combackLookPlan" style="position: fixed;top: 43px;right: 14px; z-index: 1000;" type="primary" icon="el-icon-refresh-left" size="mini" plain >返回</el-button>
        <div v-if="addBtn" style="display: flex;justify-content: center;width: 10%;position: fixed;top: 43px;right: 14px; z-index: 1000;">
          <el-button @click="addTop = -82;addBtn=false" size="mini" style="width: 60px;" >返回</el-button>
          <el-button size="mini" @click="measureAdd" style="width: 60px;" type="primary">保存</el-button>
        </div>
      </div>
      <div
        :style="`position: absolute;top:${addTop}vh;left: 9px;transition: 1s;width: 99%;height: 82vh;background-color: #fff;z-index: 21;`">
        <Add ref="add" />
      </div>
      <div id="myMOdel"
        :style="`position: absolute;transition: 1s;top:${mymodelTop}vh; left: 9px; width: 99%; height: 85vh; background-color: #fff;z-index: 20;`">
        :style="`position: absolute;transition: 1s;top:${mymodelTop}px; left: 9px; width: 99%; height: 100vh; background-color: #fff;z-index: 20;`">
        <el-col :span="10">
          <p style="font-size: 13px;padding-left: 40px;">计划信息</p>
        </el-col>
@@ -150,7 +157,7 @@
          </el-col>
        </el-col>
        <el-col style="width:93%;height: 20vh;margin-top: 30px; margin-left: 40px;">
          <el-table :data="measureData">
          <el-table max-height="300" :data="measureData">
            <el-table-column type="index" label="序号" />
            <el-table-column prop="equipmentCode" label="仪器设备编号" />
            <el-table-column prop="equipmentName" label="仪器设备名称" />
@@ -276,6 +283,8 @@
    return {
      dialogVisible: false,
      tableIndex: null,
      selectInfoBtn: false,
      addBtn: false,
      measureUpInfo: {
        id: null,
        code: null,
@@ -329,7 +338,7 @@
        createPerson: '某某负责人',
        createTime: '2021-09-08'
      },
      mymodelTop: -85,//14
      mymodelTop: -1000,//14
      addTop: -85,
      planId: 0
    }
@@ -370,28 +379,27 @@
      this.measureUpInfo.termValidity = scope.row.termValidity
    },
    measureAdd() {
      let add = this.$refs.add.add()
      if (add) {
        this.addTop = -82
      this.addTop = -82
        this.$message({
          message: '操作成功！',
          type: 'success'
        });
        this.lookVisible = false
      }
    },
    async handleSizeChangePlan(num) {
      this.pageSizePlan = num
      this.currentPage
      await this.limitGetPlanMeasureInstrument()
    },
    async handleCurrentChangePllan(num) {
      this.currentPagePlan = num
      await this.limitGetPlanMeasureInstrument()
    handleCurrentChangePllan(num) {
      this.currentPagePlan = num;
      this.limitGetPlanMeasureInstrument();
    },
    addPlan() {
      this.addTop = 2
      this.lookVisible = true
      this.$parent.mainShowAdd()
      this.addBtn=true
    },
    async limitGetPlanMeasureInstrument() {
      let param = {
@@ -399,15 +407,18 @@
        currentPage: this.currentPagePlan,
        pageSize: this.pageSizePlan
      }
      let res = await limitGetPlanMeasureRequest(param)
      this.totalPlan = res.data.taotal
      this.measureData = res.data.list
      const res = await limitGetPlanMeasureRequest(param);
      console.log(res.data.total);
      // this.totalPlan = res.data.taotal;
      this.measureData = res.data.list;
      console.log(this.totalPlan);
    },
    lookPalan(id) {
      this.planId = id
      this.getPlanAndInfoAndIns(id)
      this.lookVisible = true
      this.mymodelTop = 2
      this.selectInfoBtn=true
      this.$parent.triggerMainBtnPlan()
    },
    async getPlanAndInfoAndIns(id) {
@@ -428,7 +439,8 @@
    },
    combackLookPlan() {
      this.lookVisible = false
      this.mymodelTop = -85
      this.mymodelTop = -1000
      this.selectInfoBtn=false
    },
    blurSearch() {
      if (this.radioValue === 1) {
@@ -510,7 +522,7 @@
}
</script>

<style scoped>
<style scoped lang="scss">
.top-bar {
  margin: -25px -15px;
  background: #fff;