如果沒有任务前端需要是模拟后台数据结push空数据进去+2个任务的时候下发成功，跳转的不是当前选中的

haoxuan

2023-09-28 a4a0ddef7658e6b7ae7cfb807af19f089f96acc8

如果沒有任务前端需要是模拟后台数据结push空数据进去+2个任务的时候下发成功，跳转的不是当前选中的

 src/components/AddIssue.vue

@@ -41,7 +41,7 @@
            </div>
            
          </template>
          <template v-else>
          <template v-else-if="Object.keys(taskData).length > 0 ">
            <div class="title-box margin_bottom_13">
              <div class="title-item color_4efefa font_size_20 title-bng">
                当前任务：{{ taskData.Procedure.procedure.procedureName || "" }}
@@ -240,7 +240,13 @@
      default: () => {
        return '';
      },
    }
    },
    activeName:{
      type: [String,Number],
      default: () => {
        return 1;
      },
    },
  },
  data() {
    return {
@@ -314,16 +320,16 @@
    getInfo() {
      // 1 未生产 2生产中 3生产完成
      if (
        Object.keys(this.taskData).length > 0 &&
        this.taskData.Procedure.ID &&
        this.taskData.Procedure.Status == 1
        Object.keys(this.taskData).length > 0 && this.taskData.Procedure.ID &&
          this.taskData.Procedure.Status == 1
      ) {
        this.num = 0;
        this.showBtn = 1;
        this.islook = true;
          this.num = 0;
          this.showBtn = 1;
          this.islook = true;
      } else {
        this.islook = false;
        // this.islook = true;
        //  this.islook = true;
        
      }
      if(this.ArrError){
        this.messageError=this.ArrError;
@@ -415,7 +421,7 @@
          this.num = 0;
          this.showBtn= 1
          this.shutdown();
          this.$emit('getSetProductNumber')
          this.$emit('getSetProductNumber',this.activeName)
          // this.$message.success("下发生产数量成功！");
        }
      } else {

 src/views/visualization.vue

@@ -104,7 +104,7 @@
                      style="font-size: 35px; font-weight: 600"
                      class="color_green"
                    >
                      {{ taskData.finishNumber }}{{ taskData.Order.unit }}
                      {{ taskData.finishNumber || 0 }}{{ taskData.Order.unit }}
                    </dd>
                  </dl>
                </div>
@@ -126,31 +126,31 @@
            <div class="content_right">
              <el-descriptions :column="(activeName == 1||activeName == 3) ? 2 : 1" :colon="true">
                <el-descriptions-item label="产品名称">{{
                  taskData.Order.productName || ""
                  taskData.Order.productName || "--"
                }}</el-descriptions-item>
                <el-descriptions-item label="数量"
                  >{{ taskData.Order.amount || 0
                  }}{{ taskData.Order.unit }}</el-descriptions-item
                >
                <el-descriptions-item label="交货日期">{{
                  taskData.Order.deliverDate || ""
                  taskData.Order.deliverDate || "--"
                }}</el-descriptions-item>
                <el-descriptions-item label="工时">
                  {{ taskData.Procedure.procedure.workHours || "" }}
                  {{ taskData.Procedure.procedure.workHours || "--" }}
                </el-descriptions-item>
                <el-descriptions-item label="计划时间"
                  >{{ formatDate(taskData.Order.startTime) || "" }}
                  >{{ formatDate(taskData.Order.startTime) || "--" }}
                  -
                  {{ formatDate(taskData.Order.endTime) }}</el-descriptions-item
                >
                <el-descriptions-item label="货物描述">{{
                  taskData.Order.orderAttr || ""
                  taskData.Order.orderAttr || "--"
                }}</el-descriptions-item>
                <el-descriptions-item label="客户名称">{{
                  taskData.Order.customer || ""
                  taskData.Order.customer || "--"
                }}</el-descriptions-item>
                <el-descriptions-item label="参数要求">{{
                  taskData.Order.parameter || ""
                  taskData.Order.parameter || "--"
                }}</el-descriptions-item>
              </el-descriptions>
              <el-descriptions :column="1" :colon="true">
@@ -163,7 +163,7 @@
                    :text-inside="true"
                    :stroke-width="30"
                    :percentage="
                      (taskData.Order && taskData.finishNumber != 0)
                      (taskData.Order && taskData.finishNumber != 0 && taskData.Order.amount)
                        ? parseInt(
                            (taskData.finishNumber / taskData.Order.amount) *
                              100
@@ -293,7 +293,7 @@
                      <div class="card_top-3">
                        <span class="card-top-r-t"
                          >完成进度：{{
                            taskData.Order && taskData.finishNumber != 0
                            (taskData.Order && taskData.finishNumber != 0 && taskData.Order.amount)
                              ? parseInt(
                                  (taskData.finishNumber /
                                    taskData.Order.amount) *
@@ -460,9 +460,6 @@
            <el-empty description="暂无任务..."></el-empty>
          </template>
        </div>
        <template v-if="!Tasks||Tasks.length==0">
          <el-empty description="暂无任务..."></el-empty>
        </template>
      </div>
      <div class="right">
        <div class="right_top">
@@ -598,11 +595,12 @@
    <AddIssue
      ref="control"
      :Arr="Arr"
      :activeName="activeName"
      :ArrError="ArrError"
      :safeProduce="safeProduce"
      :taskData="taskData"
      :Order="taskData.Order"
      @getSetProductNumber="getTaskInfo"
      @getSetProductNumber="reloadPage"
      @isTip="isTip"
    />
  </div>
@@ -739,6 +737,15 @@
      // 设备断开的原因
      plcNotConnected:'',
      ChannelAmount:0,
      object:{
        Order: {},
        Procedure: {
          procedure: { inputMaterials: [], outputMaterials: [], workers: [] },
        },
        inputMaterials: [],
        outputMaterials: [],
        procedureList: [],
      },
    };
  },
  mounted() {
@@ -783,17 +790,26 @@
      if(this.activeName==2){
        this.Tasks=this.TasksCopy.slice(0,2)
        if(this.Tasks.length<2){
          this.Tasks.push(null)
          if(this.Tasks.length==0){
            this.Tasks.push(this.object)
          }
          this.Tasks.push(this.object)
        }
      }else if(this.activeName==1){
        this.Tasks=this.TasksCopy.slice(0,1)
        if(this.Tasks.length<1){
          this.Tasks.push(this.object)
        }
      }else if(this.activeName==3){
        this.Tasks=this.TasksCopy.slice(1)
        if(this.Tasks.length<1){
          this.Tasks.push(this.object)
        }
      }
    },
    reloadPage() {
    reloadPage(val) {
      // window.location.reload();
      this.getTaskInfo();
      this.getTaskInfo(val);
    },
    getcountdown() {
      countdown().then((res) => {
@@ -886,7 +902,7 @@
      setInterval(() => {
       d= getCha();
      }, 6000);
      return d;
      return date?d:'--';
    },
    setInterCard(value, name, i) {
      if (this.TasksCopy[i].Procedure.procedure[value]!=null) {
@@ -927,32 +943,7 @@
      }
    },

    getTaskInfo() {
      let object = {
        Order: {},
        Procedure: {
          procedure: { inputMaterials: [], outputMaterials: [], workers: [] },
        },
        inputMaterials: [],
        outputMaterials: [
            // [
            //   {
            //    materialId:11111,
            //    materialName:'272大家啊放假了卡艰苦奋斗垃圾发快递垃圾反馈来得及克隆',
            //    amount:100,
            //    unit:'件'
            //   }
            // ]
        ],
        procedureList: [
        //  [ 
        //     {
        //       name:"工序",
        //       deviceName:'1111dhafjdhajkhf jkdahjkf打法即可打開鏈接肯德基啊看來jdad大风京东卡老司机番窠倒臼开了房金阿奎第十六届反馈拉德斯基k打卡机阿珂附件打开了点击阿里卡减肥的卡拉胶开了房大街上克隆fk啦大家防空雷達數據看i'
        //     },
        //   ]
        ],
      };
    getTaskInfo(val) {
      this.Tasks = [];
      this.TasksCopy=[]
      getTaskInfo({taskMode:2}).then((res) => {
@@ -963,22 +954,21 @@
            return (a.Channel - b.Channel)
           })
          }
          this.activeName=1;
          this.TasksCopy = res.data.Tasks ? res.data.Tasks : [];
          this.safeProduce=res.data.Prompt.safeProduce?res.data.Prompt.safeProduce:''
          this.plcNotConnected=res.data.Prompt.plcNotConnected?res.data.Prompt.plcNotConnected:''
          this.ChannelAmount=res.data.ChannelAmount?res.data.ChannelAmount:1
          // if(this.ChannelAmount>1 &&this.TasksCopy.length<2){
          //   this.TasksCopy.push(object)
          //   this.TasksCopy.push(this.object)
          // }
          this.TaskCount=res.data.TaskCount?res.data.TaskCount:0
          
          if (this.TasksCopy.length == 0&&this.TaskCount==0) {
          if ((this.TasksCopy.length ==0 )||!this.TasksCopy) {
            if (this.activeName == 1||this.activeName == 3) {
              this.TasksCopy.push(object);
              this.TasksCopy.push(this.object);
            } else {
              this.TasksCopy.push(object);
              this.TasksCopy.push(object);
              this.TasksCopy.push(this.object);
              this.TasksCopy.push(this.object);
            }
          }
          this.workers=res.data.workers?res.data.workers:[]
@@ -1032,10 +1022,10 @@
        //     }, 60000);
        //   }
        // }
        this.cutClick(1)
        this.cutClick(val?val:1)
      });
      // this.TasksCopy.push(object)
      // this.TasksCopy.push(object)
      // this.TasksCopy.push(this.object)
      // this.TasksCopy.push(this.object)
    },
    getStartArr(){
      // for (let i in this.TasksCopy) {
@@ -1049,7 +1039,7 @@
        if(res.code==200){
          this.taskData=res.data.Tasks?res.data.Tasks[0]:{};
          this.ArrError=''
          if (this.taskData.Procedure.ID) {
          if (Object.keys(this.taskData).length > 0 &&this.taskData.Procedure.ID) {
              startTask({ id: this.taskData.Procedure.ID }).then((res) => {
                if (res.code == 200) {
                  this.Arr =res.data.Params ? res.data.Params : []