距离任务 倒计时 为0的时候筛选获取任务的接口

haoxuan

2023-09-25 722231fc31750241c78a63ce7934905ca1892cd9

 src/views/visualization.vue

@@ -143,8 +143,8 @@
                <el-descriptions-item label="完成度" style="width: 100%">
                  <!--:text-format="format"  -->
                  <el-progress
                    define-back-color="#133EAF"
                    color="#09E5ED"
                    define-back-color="#132f6e"
                    color="#00cc66"
                    text-color="#fff"
                    :text-inside="true"
                    :stroke-width="30"
@@ -223,7 +223,7 @@
                <i class="el-icon-phone-outline" />物料呼叫</el-button
              >
            </div>
            <i class="el-icon-arrow-right font-arrow-20 color_4efefa"></i>
            <i class="el-icon-arrow-right font-arrow-20 color_318583"></i>
            <div class="bottom_list">
              <div class="bottom-title">
                当前工序:{{ taskData.Procedure.procedure.procedureName || "" }}
@@ -274,8 +274,8 @@
                        >
                        <span class="card-top-r-b">
                          <el-progress
                            define-back-color="#133EAF"
                            color="#09E5ED"
                            define-back-color="#132f6e"
                            color="#00cc66"
                            text-color="#fff"
                            :text-inside="true"
                            :stroke-width="10"
@@ -337,7 +337,7 @@
                  v-model="finishShow['finishShow&'+index]"
                  trigger="click"
                >
                  <p>请确认是否已完成该生产任务?</p>
                  <p><i class="el-icon-error" style="color:red;margin-right:5px;"/>请确认是否已完成该生产任务?</p>
                  <div style="text-align: right; margin: 0">
                    <el-button size="mini" @click="finishShow['finishShow&'+index] = false">
                      取消</el-button
@@ -345,6 +345,7 @@
                    <el-button
                      type="primary"
                      size="mini"
                      class="color_f70f83"
                      @click="finishClick(index, taskData)"
                    >
                      确定</el-button
@@ -354,7 +355,7 @@
                </el-popover>
              </div>
            </div>
            <i class="el-icon-arrow-right font-arrow-20 color_4efefa"></i>
            <i class="el-icon-arrow-right font-arrow-20 color_318583"></i>
            <div class="bottom_list">
              <div class="bottom-title">
                <span>输出资源</span>
@@ -485,7 +486,7 @@
          </div> -->
        </div>
        <div class="right_base">
          <div class="right-small-title" style="line-height: 40px">知识库</div>
          <div class="right-small-title" style="line-height: 40px;margin-top:20px;">知识库</div>
          <Knowledge />
          <div class="right-base-btn call">
            <el-button type="primary"
@@ -664,6 +665,7 @@
      TaskCount:0,
      plcStatus:0,
      isTipShow:false,
      isFinsh:0,
    };
  },
  mounted() {
@@ -679,6 +681,13 @@
      this.getDate2();
    }, 5000);
    this.getTaskInfo();
  },
  watch:{
    isFinsh(){
      if(this.isFinsh==this.Tasks.length){
        this.getStartArr()
      }
    }
  },
  methods: {
    taskClick(){
@@ -711,6 +720,9 @@
          this.countDownMinute = res.data.CountDownMinute
            ? res.data.CountDownMinute
            : 0;
            if(this.countDownHour==0&& this.countDownMinute==0){
              this.getTaskInfo();
            }
        }
      });
    },
@@ -831,14 +843,14 @@
        },
        inputMaterials: [],
        outputMaterials: [
            [
              {
               materialId:11111,
               materialName:'272大家啊放假了卡艰苦奋斗垃圾发快递垃圾反馈来得及克隆',
               amount:100,
               unit:'件'
              }
            ]
            // [
            //   {
            //    materialId:11111,
            //    materialName:'272大家啊放假了卡艰苦奋斗垃圾发快递垃圾反馈来得及克隆',
            //    amount:100,
            //    unit:'件'
            //   }
            // ]
        ],
        procedureList: [
        //  [ 
@@ -861,6 +873,14 @@
          this.Tasks = res.data.Tasks ? res.data.Tasks : [];
          
          this.TaskCount=res.data.TaskCount?res.data.TaskCount:0
          if (this.Tasks.length == 0&&this.TaskCount==0) {
            if (this.activeName == 1) {
              this.Tasks.push(object);
            } else {
              this.Tasks.push(object);
              this.Tasks.push(object);
            }
          }
          this.workers=res.data.workers?res.data.workers:[]
          for (let i in this.Tasks) {
            this.Tasks[i].procedureList = [];
@@ -872,29 +892,30 @@
              .procedure.workers
              ? this.Tasks[i].Procedure.procedure.workers
              : [];

            this.Tasks[i].procedureList.push([
              {
                name: "工序",
                ...this.Tasks[i].Procedure.procedure,
              },
            ]);
            
           
            if (this.Tasks[i].Procedure.ID) {
              startTask({ id: this.Tasks[i].Procedure.ID }).then((res) => {
                if (res.code == 200) {
                  // res.data.number
                  this.Tasks[i].procedureList[0].push({
                    number: res.data.Number,
                    name: "工艺",
                    Arr:res.data.Params ? res.data.Params : [],
                  });
                  this.Tasks[i].Arr=res.data.Params ? res.data.Params : []
                  this.isFinsh=Number(i)+1
                }
              });
            }
            this.setInterCard("inputMaterials", "cardBox1&" + i, i);
            this.setInterCard("outputMaterials", "cardBox3&" + i, i);
          }
          this.getStartArr()
        
          this.getProgressInfo();
              if (!this.procInfoTimer) {
                this.procInfoTimer = setInterval(() => {
@@ -902,14 +923,6 @@
                }, 3000);
          }
        }
          if (this.Tasks.length == 0) {
            if (this.activeName == 1) {
              this.Tasks.push(object);
            } else {
              this.Tasks.push(object);
              this.Tasks.push(object);
            }
          }
        if (res.code != 200 || this.Tasks.length == 0) {
          this.getcountdown();
          // 控制重新请求getTaskInfo, 只开启一个定时器
@@ -921,13 +934,13 @@
        }
      });
      
      this.Tasks.push(object)
      this.Tasks.push(object)
      // this.Tasks.push(object)
      // this.Tasks.push(object)
    },
    getStartArr(){
      for (let i in this.Tasks) {
        if (this.Tasks[i].Procedure.Status==1) {
            this.Arr = this.Tasks[i].procedureList[0].Arr ?this.Tasks[i].procedureList[0].Arr: [];
            this.Arr = this.Tasks[i].Arr ?this.Tasks[i].Arr: [];
            this.taskData=this.Tasks[i];
            break;
        }
@@ -1003,8 +1016,20 @@
  width:200px;
  line-height:1.3!important;
}
.el-popover{
 background:#12234a!important;
 color:#fff!important;
 border-color: #09e5ed !important;
 
 .popper__arrow::after{
  border-top-color:#09e5ed !important;
 }
}
.color_yellow{
  color:yellow;
}
.color_318583{
 color:#318583;
}
.el-empty{
  height:100%;
@@ -1024,10 +1049,10 @@
    margin-bottom: 20px;
  }
  .content {
    height: 240px;
    height: 300px;
  }
  .bottom {
    height: calc(100% - 410px);
    height: calc(100% - 470px);
  }
  .font_size_20px{
    font-size:20px!important;
@@ -1059,18 +1084,18 @@
    line-height: 20px;
  }
  .content {
    height: 370px;
    height: 430px;

    .content-top {
      height: calc(50% - 20px) !important;
      padding-top: 10px !important;
      height: calc(50% - 30px) !important;
      padding-top: 20px !important;
    }
    .el-descriptions__body {
      font-size: 16px !important;
    }
  }
  .bottom {
    height: calc(100% - 560px);
    height: calc(100% - 610px);
  }
  .bottom_list .bottom-title {
    font-size: 16px;
@@ -1424,6 +1449,9 @@
        background: rgb(22 72 173);
        border-radius: 6px;
        // background: #233b9e;
        .el-descriptions-row{
          height:45px;
        }
        .el-descriptions__body {
          background: transparent;
          font-size: 18px;
@@ -1463,15 +1491,22 @@
        margin-top: 10px;
        color: #333;
        position: relative;
        .card_top-2{
          width:35%;
        }
        .card-top-input-out-r,
        .card_top-3 {
          width:65%;
        }
        .card_top-2,.card-top-input-out-r,
        .card_top-3 {
          width: 50%;
          height: 45px;
          border-radius: 5px;
          background: #6b83ff;
          font-size: 12px;
          font-size: 13px;
          color: #fff;
          float: left;
          font-weight: 700;
          .card-top-r-t {
            width: 100%;
            text-align: center;
@@ -1680,7 +1715,7 @@
    .right_dutyLst {
      width: calc(106% - 20px);
      // height: 270px;
      height: 310px;
      height: 370px;
      border-radius: 4px;
      line-height: 30px;
      overflow: hidden;
@@ -1699,7 +1734,7 @@
      }
      .right-person-box {
        width: 100%;
        height: calc(100% - 40px);
        height: calc(100% - 60px);
        overflow: auto;
        margin-top: -10px;
      }
@@ -1729,7 +1764,7 @@
    }
    .right_base {
      width: 100%;
      height: calc(100% - 520px);
      height: calc(100% - 580px);
      min-height: 200px;
      // overflow-y:auto;
      position: relative;