Merge branch 'wn' of http://192.168.5.5:10010/r/web/SchedulingDashboard int...

haoxuan

2023-10-08 aa4f970f6d0a2c88111e1e9baf58c8626c38068c

 src/views/visualization.vue

@@ -124,6 +124,10 @@
              </div>
            </div>
            <div class="content_right">
              <div class="gif" v-if="taskData.Procedure.ID" @click="processModelClick(taskData)">
                    <img v-if="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 || "--"
@@ -360,9 +364,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 +389,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>
@@ -495,7 +500,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>
@@ -603,6 +607,11 @@
      @getSetProductNumber="reloadPage"
      @isTip="isTip"
    />
    <!-- 工艺模型 -->
    <ProcessModel
      ref="processModel"
      :listData="listData"
    />
  </div>
</template>

@@ -616,17 +625,20 @@
  getProgress,
  countdown,
  getTaskUnStarted,
  processModelList,
} from "@/api/home/index"; // 产线
import Card from "@/components/Card.vue";
import Knowledge from "../components/Knowledge.vue";
import AddControl from "../components/AddControl.vue";
import AddIssue from "../components/AddIssue.vue";
import ProcessModel from  "../components/ProcessModel.vue";
export default {
  components: {
    Card,
    Knowledge,
    AddControl,
    AddIssue,
    ProcessModel,
  },
  data() {
    return {
@@ -729,6 +741,7 @@
      // 记录定时器状态
      procInfoTimer: null,
      cutdownTimer: null,
      ProcessModelTimer: null,
      TaskCount:0,
      plcStatus:0,
      isTipShow:false,
@@ -746,6 +759,11 @@
        outputMaterials: [],
        procedureList: [],
      },
      processList:[],
      isUpdateIcon:false,
      listData:[],
      resResult:null,
      resprocInfoTimer:null,
    };
  },
  mounted() {
@@ -770,6 +788,51 @@
    // }
  },
  methods: {
    getModelList(){
      this.resResult=null
      for (let i in this.TasksCopy){
        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 i in this.processList){
                  if(this.processList[i].isUpdate){
                    this.isUpdateIcon=true;
                    break;
                  }
                } 
              }
            }
            this.resResult=res; 
          })
        }
      }
    },
    processModelClick(list){
      this.listData=list;
      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()
      if (!this.ProcessModelTimer&&!this.resResult) {
          this.ProcessModelTimer = setInterval(() => {
          this.getModelList();
        }, 10000)
      }
    },
    taskClick(){
      if(this.TaskCount>0){
        this.getStartArr()
@@ -977,6 +1040,7 @@
            this.TasksCopy[i].inputMaterials = [];
            this.TasksCopy[i].outputMaterials = [];
            this.TasksCopy[i].finishNumber = 0;
            this.TasksCopy[i].number=0;
            this.finishShow['finishShow&'+i]=false
            this.TasksCopy[i].Procedure.procedure.workers = this.TasksCopy[i].Procedure
              .procedure.workers
@@ -993,6 +1057,7 @@
            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,
@@ -1007,11 +1072,12 @@
          }
          this.getStartArr()
          this.getProgressInfo();
              if (!this.procInfoTimer) {
              if (!this.procInfoTimer&&!this.resprocInfoTimer) {
                this.procInfoTimer = setInterval(() => {
                  this.getProgressInfo();
                }, 3000);
          }
              }
           this.getProcessModelList();
        }
        // if (res.code != 200 || this.TasksCopy.length == 0) {
        //   this.getcountdown();
@@ -1052,6 +1118,7 @@
      })
    },
    getProgressInfo() {
      this.resprocInfoTimer=null
      for (let i in this.TasksCopy){
        if(this.TasksCopy[i].Procedure.ID){
          getProgress({
@@ -1064,10 +1131,10 @@
                : 0;
                this.plcStatus=res.data.plcStatus?res.data.plcStatus:0
            }
            this.resprocInfoTimer=res;
          });
        }
      }
      
    },
    // 设置
    setUrl() {
@@ -1358,6 +1425,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;
@@ -1562,6 +1639,17 @@
        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;
          img{
            width:100%;
          }
        }
        // background: #233b9e;
        .el-descriptions-row{
          height:45px;
@@ -1802,18 +1890,6 @@
          // float:left;
          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 {