下发参数 弹框修改 2023-8-28

haoxuan

2023-08-28 4436c040d89980c8624f88cd4876c808806c414f

 src/views/visualization.vue

@@ -1,6 +1,7 @@

<template>
  <div class="home">
    <!--  -->
    <template v-if="Object.keys(taskData).length > 0 && taskData.Procedure.ID">
      <div class="left">
        <p class="title">
@@ -109,7 +110,7 @@
                  text-color="#fff"
                  :text-inside="true"
                  :stroke-width="30"
                  :percentage="taskData.Order?parseInt(finishNumber/taskData.Order.amount):0"
                  :percentage="taskData.Order?parseInt(finishNumber/taskData.Order.amount*100):0"
                ></el-progress>
              </el-descriptions-item>
              <!-- <el-descriptions-item label="合格率" style="width: 100%">
@@ -198,7 +199,7 @@
                    </div>
                    <div class="card_top-3">
                      <span class="card-top-r-t"
                        >完成进度：{{ taskData.Order?parseInt(finishNumber/taskData.Order.amount):0}}</span
                        >完成进度：{{ taskData.Order?parseInt(finishNumber/taskData.Order.amount*100):0}}</span
                      >
                      <span class="card-top-r-b">
                        <el-progress
@@ -207,7 +208,7 @@
                          text-color="#fff"
                          :text-inside="true"
                          :stroke-width="10"
                          :percentage="taskData.Order?parseInt(finishNumber/taskData.Order.amount):0"
                          :percentage="taskData.Order?parseInt(finishNumber/taskData.Order.amount*100):0"
                          :show-text="false"
                        ></el-progress>
                      </span>
@@ -364,7 +365,7 @@
          </span>
        </div>
        <div class="right-top-m-btn">
          <el-button type="primary" @click="controlClick"> 控制</el-button>
          <!-- <el-button type="primary" @click="controlClick"> 控制</el-button> -->
        </div>
        <div class="right_dutyLst">
          <div class="right-small-title">当前值班</div>
@@ -418,6 +419,7 @@
        </div>
      </div>
    </template>
    <!--  -->
    <template v-else>
      <div class="home-img-box">
        <div class="bg-title">
@@ -442,9 +444,9 @@
      </div>
    </template>
    <!-- 控制的弹框 -->
    <AddControl ref="control" :id="taskData.Procedure.ID" />
    <AddControl ref="control" :Arr="Arr" />
    <!-- 控制的弹框 -->
    <AddIssue ref="control" :taskData="taskData" :Order="taskData.Order" @getSetProductNumber="getTaskInfo" />
    <AddIssue ref="control" :Arr="Arr" :taskData="taskData" :Order="taskData.Order" @getSetProductNumber="getTaskInfo" />
  </div>
</template>

@@ -528,6 +530,10 @@
      showCountDown:false,
      countDownHour:0,
      countDownMinute:0,
      Arr:[],
        // 记录定时器状态
        procInfoTimer:null,
       cutdownTimer: null
    };
  },
  mounted() {
@@ -545,6 +551,7 @@
    this.getTaskInfo();
  },
  methods: {
    
    reloadPage() {
      // window.location.reload();
      this.getTaskInfo();
@@ -654,6 +661,7 @@
      };
      getTaskInfo().then((res) => {
        if (res.code == 200) {
          this.procedureList=[]
          this.taskData = res.data
            ? res.data
            : {
@@ -686,12 +694,15 @@
                  number: res.data.Number,
                  name: "工艺",
                });
                this.Arr=res.data.Params?res.data.Params:[];
              }
            });
            this.getProgressInfo();
            setInterval(() => {
              this.getProgressInfo();
            }, 6000);
            if (!this.procInfoTimer) {
                this.procInfoTimer = setInterval(() => {
                  this.getProgressInfo();
                }, 6000);
            }
          }
          console.log(this.procedureList, "===1111procedureList");
          // setTimeout(() => {
@@ -702,9 +713,12 @@
        }
        if(res.code!=200||!this.taskData.Procedure.ID){
          this.getcountdown();
            setInterval(() => {
              this.getcountdown();
            }, 60000);
          // 控制重新请求getTaskInfo, 只开启一个定时器
         if (!this.cutdownTimer) {
          this.cutdownTimer = setInterval(() => {
                 this.getcountdown();
              }, 60000);
          } 
        }
      });
    },
@@ -724,6 +738,7 @@
        this.$refs.control.islook = true;
      } else {
        this.$message.error("当前设备没有工序！");
       
      }
    },
    // 右侧完成
@@ -826,11 +841,7 @@
  font-size: 30px;
  font-weight: 700;
}
.el-button--primary {
  border: 0;
  font-weight: 700 !important;
  font-size: 16px !important;
}

.color_4efefa {
  color: #4efefa;
}
@@ -1257,7 +1268,8 @@
    }
    .right_dutyLst {
      width: calc(100% - 20px);
      height: 270px;
      // height: 270px;
      height: 310px;
      border-radius: 4px;
      line-height: 30px;
      overflow: hidden;
@@ -1342,4 +1354,9 @@
    }
  }
}
.el-button--primary {
  border: 0;
  font-weight: 700 !important;
  font-size: 16px;
}
</style>