src/components/ProcessModel.vue

@@ -32,8 +32,9 @@
                      <img src="../../public/process-model.png" />
                   </div>
                   <div class="item-r" @click="processDetailsClick(item,index)">
                      <div class="item-r-t font_weight">{{ item.procedure }}</div>
                      <div class="item-r-b">当前工艺编号：{{ item.number }}</div>
                      <div class="item-r-t font_weight">{{ item.number }}</div>
                      <div class="item-r-b">产品：{{ item.product }}</div>
                      <div class="item-r-b">工序：{{ item.procedure }}</div>
                    </div>
                    <div class="tip-r" v-if="item.isUpdate">
                      <img src="../../public/process-tip.png" />
@@ -132,6 +133,7 @@
  },
  watch: {
    islook(){
      this.pageObj.page=1
      this.getProcessModelList()
    },
  },
@@ -149,8 +151,9 @@
      if (
        Object.keys(this.listData).length > 0
      ) {
          this.islook = true;
          this.pageObj.page=1
          this.getProcessModelList()
          this.islook = true;
      } else {
        this.islook = false;
      }
@@ -427,7 +430,7 @@
      width:calc(100% - 20px);
      .title-item{
        width:calc(50%  - 30px);
        height:77px;
        height:92px;
        padding:23px 10px 10px;
        background:#31478f;
        border-radius: 8px;
@@ -450,7 +453,7 @@
        .item-r{
          width:calc(100% - 60px);
          float:left;
          line-height:25px;
          line-height:22px;
          color:#fff;
          font-size:15px;
          cursor:pointer;

 src/views/visualization.vue

@@ -524,7 +524,7 @@
          <div class="right-person-box" v-if="workers && workers.length > 0">
            <dl
              class="right-small-person"
              v-for="(item, index) in workers"
              v-for="(item, index) in deduplicateWorkers(displayWorkers())"
              :key="index"
            >
              <dt>
@@ -639,6 +639,7 @@
import ProcessModel from  "../components/ProcessModel.vue";
import TaskControlModal from "@/components/TaskControlModal.vue";
import {channelNameConfig} from "@/common/constants";
import _ from 'lodash'
export default {
  components: {
    TaskControlModal,
@@ -660,6 +661,8 @@
      // 右侧完成
      finishShow:{},
      workers:[],
      // 保存当前不同通道的值班人
      channelWorkersMap:{0:[],1:[]},
      TasksCopy:[],
      Tasks: [
        {
@@ -808,6 +811,9 @@
    // }
  },
  methods: {
    deduplicateWorkers(workers){
      return _.uniqBy(workers,ele=>ele.workerName)
    },
    updateGet(number,val){
      if(val){
        this.getTaskInfo(this.activeName,'new')
@@ -1073,6 +1079,25 @@
      });
    },

    /**
     * 根据当前展示的是0通道还是1通道还是两个通道展示对应的值班人
     * @return {*[]}
     */
    displayWorkers(){
      let showWorkers = []
      if (this.activeName===1){
        showWorkers =[...this.channelWorkersMap[0]]
      }else if (this.activeName===2){
        showWorkers =[...this.channelWorkersMap[0],...this.channelWorkersMap[1]]
      }else if (this.activeName===3){
        showWorkers =[...this.channelWorkersMap[1]]
      }else {
        return []
      }

      return showWorkers
    },

    getTaskInfo(val,info) {
      this.Tasks = [];
      this.TasksCopy=[]
@@ -1102,6 +1127,16 @@
            }
          }
          this.workers=res.data.workers?res.data.workers:[]

          // 将值班人根据通道号分组
          const groupByChannel= _.groupBy(res.data.Tasks,ele=>ele.Channel)
          const taskList0= _.first(groupByChannel[0])
          const taskList1= _.first(groupByChannel[1])
          const worker0List = taskList0?.Procedure?.procedure?.workers ?? []
          const worker1List = taskList1?.Procedure?.procedure?.workers ?? []
          this.channelWorkersMap['0'] =worker0List
          this.channelWorkersMap['1'] =worker1List

          for (let i in this.TasksCopy) {
            this.TasksCopy[i].procedureList = [];
            this.TasksCopy[i].inputMaterials = [];
@@ -1145,7 +1180,7 @@
          if(info=='new'){
            return true;
          }
          

          this.getProgressInfo();
              if (!this.procInfoTimer&&!this.resprocInfoTimer) {
                this.procInfoTimer = setInterval(() => {