feat: 计划时间取值字段更改; 修复0通道没有任务的情况下1通道的数据跑到左边的问题

songshankun

2023-10-23 2280d3aaaf652a89159efbe196356d9c6c35bbe8

 src/views/visualization.vue

@@ -145,9 +145,9 @@
                  {{ taskData.Procedure.procedure.workHours || "--" }}
                </el-descriptions-item>
                <el-descriptions-item label="计划时间"
                  >{{ formatDate(taskData.Order.startTime) || "--" }}
                  >{{ formatDate(taskData.Procedure.startTime) || "--" }}
                  -
                  {{ formatDate(taskData.Order.endTime) }}</el-descriptions-item
                  {{ formatDate(taskData.Procedure.endTime) }}</el-descriptions-item
                >
                <el-descriptions-item label="通道">
                  {{ channelNameConfig[taskData.Channel] || "--" }}
@@ -306,7 +306,7 @@
                      </div>
                      <div class="card_top-2">
                        <div style="line-height: 45px; text-align: center">
                          {{ taskData?.plcStatus === 3 ? '待机' : (taskData.Procedure.Status==3?'生产完成':'生产中') }}
                          {{ displayProcedureStatus(taskData) }}
                        </div>
                        <!-- <span class="card-top-r-t">完成进度：50%</span>
                          <span class="card-top-r-b">12月28日 08:24</span> -->
@@ -803,6 +803,37 @@
    }
  },
  methods: {
    newTaskPlaceholder(channel){
      return {
        Order: {},
        Procedure: {
          procedure: { inputMaterials: [], outputMaterials: [], workers: [] },
        },
        Channel:channel,
        inputMaterials: [],
        outputMaterials: [],
        procedureList: [],
      }
    },
    /**
     * 展示工序状态
     * 如果PLC的状态是待机要跟随PLC状态
     * @param taskData
     * @return {string}
     */
    displayProcedureStatus(taskData){
      if (taskData?.plcStatus === 3){
        return '待机'
      }
      if (!taskData?.Procedure?.Status){
        return ''
      }
      if (taskData.Procedure.Status===3){
        return '生产完成'
      }else{
        return '生产中'
      }
    },
    /**
     * 从任务中获取加工数和目标数
     * @param taskData
@@ -1127,29 +1158,22 @@
      this.TasksCopy=[]
      getTaskInfo({taskMode:2}).then((res) => {
        if (res.code == 200&&res.data) {
          // let arr=[]
          if(res.data.Tasks){
            res.data.Tasks.sort(function(a,b){
            return (a.Channel - b.Channel)
           })
          }
          this.TasksCopy = res.data.Tasks ? res.data.Tasks : [];
          this.TasksCopy = 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
          this.plcNotConnected=res.data.Prompt.plcNotConnected ?? ''
          this.ChannelAmount=res.data.ChannelAmount ?? 1
          // if(this.ChannelAmount>1 &&this.TasksCopy.length<2){
          //   this.TasksCopy.push(this.object)
          // }
          this.TaskCount=res.data.TaskCount?res.data.TaskCount:0
          this.TaskCount=res.data.TaskCount ?? 0

          if ((this.TasksCopy.length ==0 )||!this.TasksCopy) {
            if (this.activeName == 1||this.activeName == 3) {
              this.TasksCopy.push(this.object);
            } else {
              this.TasksCopy.push(this.object);
              this.TasksCopy.push(this.object);
            }
          }
          // 找出缺少任务数据的通道, 使用占位数据占住对应通道
          const channelNumbers = this.TasksCopy.map(task=>task.Channel)
          const allChannels = [0,1];
          const lackChannels = _.chain(allChannels).difference(channelNumbers).value()
          lackChannels.forEach(channel => this.TasksCopy.push(this.newTaskPlaceholder(channel)))
          this.TasksCopy.sort((a,b)=>a.Channel - b.Channel)

          this.workers=res.data.workers?res.data.workers:[]

          // 将值班人根据通道号分组