feat: 任务弹窗添加翻页展示

songshankun

2023-10-08 e9c1bc5f107ebfdb58b6c85e01a719bbeb643d66

 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) *
@@ -336,7 +336,7 @@
                    </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>
@@ -360,9 +360,9 @@
              ></p>
              <div class="right-small-btn bottom-box-btn">
                <el-button type="primary"> 打印</el-button>
                <el-button v-if="taskData.Procedure.Status==3" type="primary" class="huise"> 完成</el-button>

                <el-popover
                 v-else
                v-if="taskData.Procedure.Status && taskData.Procedure.Status!==3"
                  placement="top-end"
                  width="160"
                  class="button-finish"
@@ -385,6 +385,7 @@
                  </div>
                  <el-button type="primary" slot="reference"> 完成</el-button>
                </el-popover>
                <el-button  v-else type="primary" class="huise"> 完成</el-button>
              </div>
            </div>
            <i class="el-icon-arrow-right font-arrow-20 color_318583"></i>
@@ -456,13 +457,10 @@
          <template
              v-if="activeName == 2 &&(!taskData||Object.keys(taskData).length==0)"
            >
            

            <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">
@@ -532,9 +530,9 @@
              <!-- <span>{{ item.phoneNum || "" }}</span> -->
              <span class="color_yellow"><i class="el-icon-star-on" /><i class="el-icon-star-on" /><i class="el-icon-star-on" /><i class="el-icon-star-on" /><i class="el-icon-star-on" /></span>
            </dl>
           

          </div>
         

          <!-- <div
            style="
              width: 100%;
@@ -590,20 +588,21 @@
          </div>
        </div>
      </div>
      

    </template> -->
    <!-- 控制的弹框 -->
    <AddControl ref="control" :Arr="Arr" />
    <!-- 控制的弹框 -->
    <AddIssue
    <TaskControlModal
      ref="control"
      :Arr="Arr"
      :ArrError="ArrError"
      :safeProduce="safeProduce"
      :taskData="taskData"
      :Order="taskData.Order"
      @getSetProductNumber="getTaskInfo"
      :activeName="activeName"
      @getSetProductNumber="reloadPage"
      @isTip="isTip"
    />
    <!-- 工艺模型 -->
    <ProcessModel
      ref="processModel"
      :processList="processList"
    />
  </div>
</template>
@@ -623,15 +622,20 @@
import Knowledge from "../components/Knowledge.vue";
import AddControl from "../components/AddControl.vue";
import AddIssue from "../components/AddIssue.vue";
import ProcessModel from  "../components/ProcessModel.vue";
import TaskControlModal from "@/components/TaskControlModal.vue";
export default {
  components: {
    TaskControlModal,
    Card,
    Knowledge,
    AddControl,
    AddIssue,
    ProcessModel,
  },
  data() {
    return {
      pollingTaskCountTimer: null,
      activeName: 1,
      progress: 70, //进度
      passrate: 30, //合格率
@@ -739,6 +743,25 @@
      // 设备断开的原因
      plcNotConnected:'',
      ChannelAmount:0,
      object:{
        Order: {},
        Procedure: {
          procedure: { inputMaterials: [], outputMaterials: [], workers: [] },
        },
        inputMaterials: [],
        outputMaterials: [],
        procedureList: [],
      },
      processList:[
        {
          name:'产品1+工艺2',
          number:'v1.0'
        },
        {
          name:'产品1+工艺2',
          number:'v2.0'
        }
      ]
    };
  },
  mounted() {
@@ -754,6 +777,10 @@
      this.getDate2();
    }, 5000);
    this.getTaskInfo();
    this.getTaskCountStatistics()
  },
  beforeDestroy() {
    clearTimeout(this.pollingTaskCountTimer)
  },
  watch:{
    // isFinsh(){
@@ -765,8 +792,8 @@
  methods: {
    taskClick(){
      if(this.TaskCount>0){
        this.getStartArr()
        this.$refs.control.islook=true
        // this.getStartArr()
        this.$refs.control.show=true
      }else{
        this.$message({
          message:'目前没有任务！',
@@ -783,17 +810,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) => {
@@ -813,6 +849,8 @@
        }
      });
    },



    getDateObj(date, fmt) {
      if (/(y+)/.test(fmt)) {
@@ -876,7 +914,7 @@
        let String=now-date*1000;
        let seconds=Math.floor(String/1000)
        let minutes=Math.floor(seconds/60)
        

        let days=Math.floor(String/1000/60/60/24)
        let hours=Math.floor(minutes/60)-days*24
        let m=minutes-days*24*60-hours*60
@@ -886,7 +924,7 @@
      setInterval(() => {
       d= getCha();
      }, 6000);
      return d;
      return date?d:'--';
    },
    setInterCard(value, name, i) {
      if (this.TasksCopy[i].Procedure.procedure[value]!=null) {
@@ -927,32 +965,26 @@
      }
    },

    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'
        //     },
        //   ]
        ],
      };
    /**
     * 轮询获取任务数量
     */
    getTaskCountStatistics(){
      getTaskInfo({taskMode:1}).then((res) => {
        if (res.code === 200&&res.data) {
          this.TaskCount=res.data?.TaskCount ?? 0
        }
      },err=>{
        this.TaskCount = 0
        console.error(err)
      }).finally(()=>{
        this.pollingTaskCountTimer = setTimeout(()=>{
          this.getTaskCountStatistics()
        //   20秒一次轮询
        },20000)
      });
    },

    getTaskInfo(val) {
      this.Tasks = [];
      this.TasksCopy=[]
      getTaskInfo({taskMode:2}).then((res) => {
@@ -963,22 +995,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.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:[]
@@ -999,7 +1030,7 @@
                ...this.TasksCopy[i].Procedure.procedure,
              },
            ]);
           

            if (this.TasksCopy[i].Procedure.ID) {
              startTask({ id: this.TasksCopy[i].Procedure.ID }).then((res) => {
                if (res.code == 200) {
@@ -1032,10 +1063,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,12 +1080,12 @@
        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 : []
                }else{
                  this.ArrError=res.msg;
                  this.ArrError=res.msg?res.msg:'获取工艺参数失败！';
                }
              });
            }
@@ -1077,7 +1108,7 @@
          });
        }
      }
      

    },
    // 设置
    setUrl() {
@@ -1108,7 +1139,7 @@
        finishTask({ id: taskData.Procedure.ID }).then((res) => {
          if (res.code == 200) {
            this.finishShow['finishShow&'+i] = false;
            this.getTaskInfo();
            this.reloadPage(this.activeName?this.activeName:1);
            this.$message.success("操作成功！");
          }
        });
@@ -1135,7 +1166,7 @@
 background:#12234a!important;
 color:#fff!important;
 border-color: #09e5ed !important;
 

 .popper__arrow::after{
  border-top-color:#09e5ed !important;
 }
@@ -1184,7 +1215,7 @@
    box-sizing: border-box;
    border-right: 1px solid #eee;
  }
  

  .small_title {
    margin-bottom: 30px;
  }
@@ -1240,7 +1271,7 @@
      font-size:14px;
    }
  }
  

  .el-step{
    .el-step__icon{
     background:#00cc66;
@@ -1742,7 +1773,7 @@
            border-radius: 5px 5px 0 0;
            background: rgb(19, 35, 90);
          }
          


          .card_contentRight {
            width: 100%;
@@ -1813,7 +1844,7 @@
          display:inline-block;
        }
      }
      

      .yuandian {
        width: 25px;
        height: 25px;