工序弹框的 列表和详情的更新同步

haoxuan

2023-10-11 a1a6630f2eabfc78a379b5808b1bf7231a084d0b

 src/views/visualization.vue

@@ -90,7 +90,7 @@
            </span> -->
          </div>
          <div class="gongx">
          <el-steps v-if="taskData.AllProcedures" :active="taskData.CurrentProcedureIndex?taskData.CurrentProcedureIndex:0"  finish-status="success" class="steps">
          <el-steps v-if="taskData.AllProcedures" :active="taskData.CurrentProcedureIndex ?? 0"  finish-status="success" class="steps">
            <el-step icon="" :title="item" v-for="(item,index) in taskData.AllProcedures" :key="index"></el-step>
          </el-steps>
        </div>
@@ -124,6 +124,10 @@
              </div>
            </div>
            <div class="content_right">
              <div class="gif" v-if="taskData.Procedure.ID" @click="processModelClick(taskData,index)">
                    <img v-if="taskData.isUpdateIcon"  src="../../public/shan.gif" />
                    <span v-else class="yuandian"></span>
               </div>
              <el-descriptions :column="(activeName == 1||activeName == 3) ? 2 : 1" :colon="true">
                <el-descriptions-item label="产品名称">{{
                  taskData.Order.productName || "--"
@@ -143,10 +147,10 @@
                  -
                  {{ formatDate(taskData.Order.endTime) }}</el-descriptions-item
                >
                <el-descriptions-item label="货物描述">{{
                  taskData.Order.orderAttr || "--"
                }}</el-descriptions-item>
                <el-descriptions-item label="客户名称">{{
                <el-descriptions-item label="通道">
                  {{ channelNameConfig[taskData.Channel] || "--" }}
                </el-descriptions-item>
                <el-descriptions-item label="客户编码">{{
                  taskData.Order.customer || "--"
                }}</el-descriptions-item>
                <el-descriptions-item label="参数要求">{{
@@ -271,11 +275,12 @@
                  v-for="(item, index) in taskData.procedureList"
                >
                  <div
                    class="card"
                    :key="index2"
                    v-for="(list, index2) in item"
                  >
                    <template v-if="list.name == '工序'">
                    <div
                      class="card"
                      v-if="list.name == '工序'">
                      <div class="card_content">
                        <div class="card_contentLeft color_blue font_dian">
                          <!-- {{ list.deviceName }} -->
@@ -333,24 +338,34 @@
                        <!-- <span class="card-top-r-t">完成进度：50%</span>
                          <span class="card-top-r-b">12月28日 08:24</span> -->
                      </div>
                    </template>
                    <template v-else>
                      <!-- <div class="card_content">

                      </div> -->
                      <div :class="(activeName==1||activeName == 3)?'card_top-4 font_size_20px':'card_top-4'">
                        <div>工艺编号：<div >{{ list.number }}</div></div>
                        <!-- <div
                          style="
                            font-size: 14px;
                            color: #cfcfcf;
                            line-height: 20px;
                          "
                    </div>
                    <div v-else class="process-params">
                      <div class="process-params-title">
                        <el-popover
                          width="200"
                          :content="list.number"
                          placement="top-start"
                          trigger="click"
                        >
                          工艺的具体信息请点击控制查看！
                        </div> -->
                          <span slot="reference">工艺编号：{{ list.number }}</span>
                        </el-popover>

                      </div>
                    </template>
                      <div class="process-params-value">
                        <!-- 工艺参数-->
                        {{mergeProcessParams(taskData.Arr)}}
                      </div>

                      <!-- <div
                        style="
                          font-size: 14px;
                          color: #cfcfcf;
                          line-height: 20px;
                        "
                      >
                        工艺的具体信息请点击控制查看！
                      </div> -->
                    </div>
                  </div>
                </el-carousel-item>
              </el-carousel>
@@ -496,7 +511,6 @@
            <span v-else>
              <img  v-if="plcStatus == 1&&!plcNotConnected"  src="../../public/duan.png" />
              <img  v-else src="../../public/lian.png" />
              <!-- <span class="yuandian"></span> -->
              {{ plcStatus==1?'断开':(plcStatus==2?'生产中':'待机') }}
            </span>
          </span>
@@ -510,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>
@@ -591,8 +605,6 @@

    </template> -->
    <!-- 控制的弹框 -->
    <AddControl ref="control" :Arr="Arr" />
    <!-- 控制的弹框 -->
    <TaskControlModal
      ref="control"
      :activeName="activeName"
@@ -602,7 +614,8 @@
    <!-- 工艺模型 -->
    <ProcessModel
      ref="processModel"
      :processList="processList"
      :listData="listData"
      @updateGet="updateGet"
    />
  </div>
</template>
@@ -617,6 +630,7 @@
  getProgress,
  countdown,
  getTaskUnStarted,
  processModelList,
} from "@/api/home/index"; // 产线
import Card from "@/components/Card.vue";
import Knowledge from "../components/Knowledge.vue";
@@ -624,6 +638,8 @@
import AddIssue from "../components/AddIssue.vue";
import ProcessModel from  "../components/ProcessModel.vue";
import TaskControlModal from "@/components/TaskControlModal.vue";
import {channelNameConfig} from "@/common/constants";
import _ from 'lodash'
export default {
  components: {
    TaskControlModal,
@@ -645,6 +661,8 @@
      // 右侧完成
      finishShow:{},
      workers:[],
      // 保存当前不同通道的值班人
      channelWorkersMap:{0:[],1:[]},
      TasksCopy:[],
      Tasks: [
        {
@@ -735,6 +753,7 @@
      // 记录定时器状态
      procInfoTimer: null,
      cutdownTimer: null,
      ProcessModelTimer: null,
      TaskCount:0,
      plcStatus:0,
      isTipShow:false,
@@ -752,16 +771,12 @@
        outputMaterials: [],
        procedureList: [],
      },
      processList:[
        {
          name:'产品1+工艺2',
          number:'v1.0'
        },
        {
          name:'产品1+工艺2',
          number:'v2.0'
        }
      ]
      processList:[],
      listData:[],
      resResult:[],
      resprocInfoTimer:null,
      channelNameConfig: channelNameConfig,
      index:null,
    };
  },
  mounted() {
@@ -776,11 +791,17 @@
      this.getDate3();
      this.getDate2();
    }, 5000);
    this.getTaskInfo();

    let channelType = this.getChannelTypeFromUrl()
    channelType = channelType ?? 1
    this.activeName = channelType
    this.getTaskInfo(channelType);
    this.getTaskCountStatistics()
  },
  beforeDestroy() {
    clearTimeout(this.pollingTaskCountTimer)
    clearTimeout(this.procInfoTimer)
    clearTimeout(this.ProcessModelTimer)
  },
  watch:{
    // isFinsh(){
@@ -790,6 +811,82 @@
    // }
  },
  methods: {
    deduplicateWorkers(workers){
      return _.uniqBy(workers,ele=>ele.workerName)
    },
    updateGet(number,val){
      if(val){
        this.getTaskInfo(this.activeName,'new')
        return true;
      }
      this.listData.number=number
      if(this.index){
        this.TasksCopy[this.index].number=number
      }
    },
    getModelList(){
      for (let i in this.TasksCopy){
        this.TasksCopy[i].isUpdateIcon=false;
        if(this.TasksCopy[i].Procedure.ID&&this.TasksCopy[i].number){
          processModelList({
            procedureId: this.TasksCopy[i].Procedure.ID,
            page: 1,
            pageSize:6,
            number:this.TasksCopy[i].number
          }).then(res=>{
            if(res.code==200){
              this.processList=res.data?res.data:[];
              if(this.processList.length>0){
                for(let j in this.processList){
                  if(this.processList[j].isUpdate){
                    this.TasksCopy[i].isUpdateIcon=true;
                    this.$forceUpdate()
                    break;
                  }
                }
              }
            }
            this.resResult[i]=res;
            console.log( this.resResult[i],'===res111')
          })
        }
      }
    },
    processModelClick(list,index){
      this.listData=list;
      this.index=index
      if( Object.keys(this.listData).length > 0){
        if(this.listData.Procedure.ID&&this.listData.number){
          this.$refs.processModel.islook=true
          return true;
        }
      }
      this.$message.error('当前工序无编号，无法查看工序!')
    },
    getProcessModelList(){
      this.getModelList()
      let string=false;
      if(this.resResult.length>0){
        for(let i in this.resResult){
          if(this.resResult[i]){
            string=false;
          }
        }
      }
      if (!this.ProcessModelTimer&&!string) {
          this.ProcessModelTimer = setInterval(() => {
            this.resResult=[]
          this.getModelList();
        }, 5000)
      }
    },
    mergeProcessParams(params){
      if (params?.length){
        return params.map(ele=> `${ele.Key}: ${ele.Value}`).join(' ')
      }else{
        return ''
      }
    },
    taskClick(){
      if(this.TaskCount>0){
        // this.getStartArr()
@@ -807,6 +904,7 @@
    },
    cutClick(val) {
      this.activeName = val;
      this.updateChannelTypeToUrl(val)
      if(this.activeName==2){
        this.Tasks=this.TasksCopy.slice(0,2)
        if(this.Tasks.length<2){
@@ -849,9 +947,6 @@
        }
      });
    },



    getDateObj(date, fmt) {
      if (/(y+)/.test(fmt)) {
        fmt = fmt.replace(
@@ -984,14 +1079,33 @@
      });
    },

    getTaskInfo(val) {
    /**
     * 根据当前展示的是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=[]
      getTaskInfo({taskMode:2}).then((res) => {
        if (res.code == 200&&res.data) {
          let arr=[]
          // let arr=[]
          if(res.data.Tasks){
           arr.sort(function(a,b){
            res.data.Tasks.sort(function(a,b){
            return (a.Channel - b.Channel)
           })
          }
@@ -1013,11 +1127,23 @@
            }
          }
          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 = [];
            this.TasksCopy[i].outputMaterials = [];
            this.TasksCopy[i].finishNumber = 0;
            this.TasksCopy[i].number=0;
            this.TasksCopy[i].isUpdateIcon=false;
            this.finishShow['finishShow&'+i]=false
            this.TasksCopy[i].Procedure.procedure.workers = this.TasksCopy[i].Procedure
              .procedure.workers
@@ -1034,25 +1160,33 @@
            if (this.TasksCopy[i].Procedure.ID) {
              startTask({ id: this.TasksCopy[i].Procedure.ID }).then((res) => {
                if (res.code == 200) {
                  this.TasksCopy[i].number=res.data.Number
                  // res.data.number
                  this.TasksCopy[i].procedureList[0].push({
                    number: res.data.Number,
                  });
                  // this.TasksCopy[i].Arr=res.data.Params ? res.data.Params : []
                  this.TasksCopy[i].Arr=res.data.Params ? res.data.Params : []
                  // this.isFinsh=Number(i)+1
                  this.$forceUpdate()
                }
              });
            }
            this.setInterCard("inputMaterials", "cardBox1&" + i, i);
            this.setInterCard("outputMaterials", "cardBox3&" + i, i);
          }
          this.getProcessModelList();
          this.getStartArr()
          this.cutClick(val?val:1)
          if(info=='new'){
            return true;
          }

          this.getProgressInfo();
              if (!this.procInfoTimer) {
              if (!this.procInfoTimer&&!this.resprocInfoTimer) {
                this.procInfoTimer = setInterval(() => {
                  this.getProgressInfo();
                }, 3000);
          }
              }
        }
        // if (res.code != 200 || this.TasksCopy.length == 0) {
        //   this.getcountdown();
@@ -1063,7 +1197,7 @@
        //     }, 60000);
        //   }
        // }
        this.cutClick(val?val:1)

      });
      // this.TasksCopy.push(this.object)
      // this.TasksCopy.push(this.object)
@@ -1092,7 +1226,29 @@
        }
      })
    },
    /**
     * 向URL中设置当前通道展示类型
     * @param {number} type 通道展示类型
     */
    updateChannelTypeToUrl(type){
      const activeName = this.getChannelTypeFromUrl();
      if (activeName === type){
        return
      }
      let path = this.$router.history.current.path
      this.$router.push({path, query: {activeName:  `${type ?? 1}`}})
    },
    /**
     * 从URL获取当前通道展示类型
     * @return {number}
     */
    getChannelTypeFromUrl(){
      let activeName = new URLSearchParams(location.search).get('activeName')
      activeName = activeName ? +activeName : undefined
      return activeName
    },
    getProgressInfo() {
      this.resprocInfoTimer=null
      for (let i in this.TasksCopy){
        if(this.TasksCopy[i].Procedure.ID){
          getProgress({
@@ -1105,10 +1261,10 @@
                : 0;
                this.plcStatus=res.data.plcStatus?res.data.plcStatus:0
            }
            this.resprocInfoTimer=res;
          });
        }
      }

    },
    // 设置
    setUrl() {
@@ -1282,19 +1438,47 @@
      }
    }
  }
  .el-step__head.is-process{
    color: #00cc66 !important;
    border-color:#00cc66;
  }
  .el-step__title.is-process{
    color: #00cc66 !important;
  }
  .el-step__head.is-wait{
    color:#fff;
    border-color:#fff;
  }
  .el-step__title.is-wait{
    color:#fff;
  }

  // 使步骤条节点状态成功时,前面的线同步更改颜色
  .steps{
    /* 进行中状态：圈线 */
    &  .el-step__head.is-process {
      color: #00cc66;
      border-color: #00cc66;
    }
    /* 进行中状态：圈内 */
    &  .el-step__head.is-process > .el-step__icon {
      background: #00cc66;
      color: #00cc66;
    }
    /* 进行中状态：title（文字） */
    &  .el-step__title.is-process {
      color: #00cc66;
    }

    /* 完成状态：圈线 */
    &  .el-step__head.is-success {
      color: #00cc66;
      border-color: #00cc66;
    }
    /* 完成状态：title（文字） */
    &  .el-step__title.is-success {
      color: #00cc66;
    }
    /* 完成状态：line
     * 描述：第一步完成，第二步进行时，之间的进度条有颜色
     */
    &  .el-step__head.is-success > .el-step__line > .el-step__line-inner {
      width: 100% !important;
      border-width: 1px !important;
    }
  }
}
.set-title {
@@ -1399,6 +1583,16 @@
  background: #09e5ed !important;
  color: #333 !important;
}
.yuandian {
        width: 35px;
        height: 35px;
        display:inline-block;
        // background: #15d815;
        background:red;
        border-radius: 50%;
        // margin-top:-5px;
        vertical-align: middle;
      }
.bottom_list {
  position: relative;
  padding: 10px;
@@ -1459,8 +1653,7 @@
      overflow-y:auto;
    }
    .el-carousel__item{
    //  height:auto;
     min-height:160px;
      height:auto;
    }
  }
  .bottom-box-btn{
@@ -1468,6 +1661,10 @@
    position:absolute;
    bottom:10px;
    left:10px;
    .el-button{
      height: 40px;

    }
  }
}

@@ -1475,7 +1672,6 @@
  font-size: 20px;
}
.right-small-btn {
  margin-top: 10px;
  width: calc(100% - 20px);
  margin: 0 auto;
  position: absolute;
@@ -1590,7 +1786,7 @@
          width: 100%;
          height: 30px;
          // text-align: left;
          font-size: 24px;
          font-size: 28px!important;
          margin: 0;
          text-align: center;
          line-height: 36px;
@@ -1603,6 +1799,18 @@
        padding: 0 10px;
        background: rgb(22 72 173);
        border-radius: 6px;
        position:relative;
        .gif{
          position:absolute;
          right:15px;
          top:10px;
          width:35px;
          vertical-align: middle;
          cursor:pointer;
          img{
            width:100%;
          }
        }
        // background: #233b9e;
        .el-descriptions-row{
          height:45px;
@@ -1653,11 +1861,11 @@
            white-space:nowrap;
          }
        .card_top-2{
          width:35%;
          width:38%;
        }
        .card-top-input-out-r,
        .card_top-3 {
          width:65%;
          width:62%;
        }
        .card_top-2,.card-top-input-out-r,
        .card_top-3 {
@@ -1844,18 +2052,6 @@
          display:inline-block;
        }
      }

      .yuandian {
        width: 25px;
        height: 25px;
        line-height: 40px;
        margin-top: 12.5px;
        display: inline-block;
        background: #15d815;
        display: block;
        border-radius: 50%;
        float: right;
      }
    }
    .right-top-m-btn {
      margin-top: 10px;
@@ -1927,7 +2123,7 @@
      .right-base-btn {
        width: 100%;
        position: absolute;
        bottom: 0;
        bottom: 24px;
        left: 0;
        .el-button--primary {
          width: 100%;
@@ -1937,6 +2133,10 @@
          color: #fff;
          font-weight: 700;
          font-size: 18px;
          height: 40px;
          display: flex;
          align-items: center;
          justify-content: center;
        }
      }
      // .call {
@@ -1962,4 +2162,23 @@
  font-weight: 700 !important;
  font-size: 16px;
}
.process-params{
  margin-top: 10px;
  border-radius: 5px;
  overflow: hidden;
  color: #fff;
  font-size: 12px;
  &-title{
    height: 25px;
    padding: 0 5px;
    background-color: #13235a;
    line-height: 25px;
  }
  &-value{
    background-color: #6b83ff;
    min-height: 45px;
    box-sizing: border-box;
    padding: 12px;
  }
}
</style>