增加判断

haoxuan

2023-08-21 c3d26d0fe57fd0a46ecb1c2763e1cc66994c6185

增加判断

 src/components/AddControl.vue

@@ -80,11 +80,16 @@
  },
  methods: {
    getStartInfo(){
      startTask({id:this.id}).then(res=>{
        if(res.code==200){
          this.Arr=res.data.params;
        }
      })
      if(this.id){
        startTask({id:this.id}).then(res=>{
          if(res.code==200){
            this.Arr=res.data.params;
          }
        })
      }else{
        this.$message.error("当前设备没有工序！");
      }
      
    },
    validatorNum(rule, value, callback) {
      if (value) {
@@ -105,13 +110,16 @@

    onSubmit() {
      
     
      sendProcessParams({id:this.id}).then(res=>{
        if(res.code==200){
          this.$message.success("下发成功！");
          this.shutdown();
        }
      }) 
      if(this.id){
        sendProcessParams({id:this.id}).then(res=>{
          if(res.code==200){
            this.$message.success("下发成功！");
            this.shutdown();
          }
        }) 
      }else{
        this.$message.error("当前设备没有工序！");
      }
    },
    shutdown() {
      this.islook = false;

 src/views/visualization.vue

@@ -13,8 +13,10 @@
        </p>
        <div class="statelist">
          <span class="title-item"
            >订单编号:
            <span class="color_4efefa">{{ taskData.Order.orderId || "" }}</span>
            >工单编号:
            <span class="color_4efefa">{{
              taskData.Order.workOrderId || ""
            }}</span>
          </span>
          <span class="title-item"
            >当前工序:
@@ -76,9 +78,7 @@
                {{ taskData.Procedure.procedure.workHours || "" }}
              </el-descriptions-item>
              <el-descriptions-item label="起止时间"
                >{{
                  formatDate(taskData.Procedure.procedure.startTime) || ""
                }}
                >{{ formatDate(taskData.Procedure.procedure.startTime) || "" }}
                -
                {{
                  formatDate(taskData.Procedure.procedure.endTime)
@@ -199,14 +199,13 @@
                        }}</span
                      >
                      <span class="card-top-r-b">
                       
                        <el-progress
                          define-back-color="#133EAF"
                          color="#09E5ED"
                          :text-inside="true"
                          :stroke-width="10"
                          :percentage="
                           parseInt(finishNumber / taskData.Order.amount)
                            parseInt(finishNumber / taskData.Order.amount)
                          "
                          :show-text="false"
                        ></el-progress>
@@ -224,8 +223,18 @@
                    <!-- <div class="card_content">
                      
                    </div> -->
                    <div class="card_top-4"><div>工艺编号：{{ list.number }}</div>
                      <div style="font-size:14px;color:#cfcfcf;line-height:20px">工艺的具体信息请点击控制查看！</div></div>
                    <div class="card_top-4">
                      <div>工艺编号：{{ list.number }}</div>
                      <div
                        style="
                          font-size: 14px;
                          color: #cfcfcf;
                          line-height: 20px;
                        "
                      >
                        工艺的具体信息请点击控制查看！
                      </div>
                    </div>
                  </template>
                </div>
              </el-carousel-item>
@@ -395,7 +404,7 @@
          </div> -->
        </div>
        <div class="right_base">
          <div class="right-small-title" style="line-height:40px;">知识库</div>
          <div class="right-small-title" style="line-height: 40px">知识库</div>
          <Knowledge />
          <div class="right-base-btn call">
            <el-button type="primary"
@@ -469,15 +478,14 @@
      outputMaterials: [],
      procedureList: [
        [
        {
            number:10,
            name:'工序'
          {
            number: 10,
            name: "工序",
          },
          {
            number:10,
            number: 10,
          },
          
        ]
        ],
      ],
      taskData: {
        Order: {
@@ -593,9 +601,20 @@
    },

    getTaskInfo() {
      this.taskData = {
        Order: {},
        Procedure: { procedure: { inputMaterials: [], outputMaterials: [] } },
      };
      getTaskInfo().then((res) => {
        if (res.code == 200) {
          this.taskData = res.data;
          this.taskData = res.data
            ? res.data
            : {
                Order: {},
                Procedure: {
                  procedure: { inputMaterials: [], outputMaterials: [] },
                },
              };
          this.procedureList.push([
            {
              name: "工序",
@@ -631,17 +650,25 @@
    },
    // 右侧控制
    controlClick() {
      this.$refs.control.islook = true;
      if (Object.keys(this.taskData).length > 0 && this.taskData.Procedure.ID) {
        this.$refs.control.islook = true;
      } else {
        this.$message.error("当前设备没有工序！");
      }
    },
    // 右侧完成
    finishClick() {
      finishTask({ id: this.taskData.Procedure.ID }).then((res) => {
        if (res.code == 200) {
          this.finishShow = false;
          this.getTaskInfo();
          this.$message.success("操作成功！");
        }
      });
      if (Object.keys(this.taskData).length > 0 && this.taskData.Procedure.ID) {
        finishTask({ id: this.taskData.Procedure.ID }).then((res) => {
          if (res.code == 200) {
            this.finishShow = false;
            this.getTaskInfo();
            this.$message.success("操作成功！");
          }
        });
      } else {
        this.$message.error("当前设备没有工序！");
      }
    },
    getRandomNumber(min, max) {
      return Math.floor(Math.random() * (max - min + 1) + min);
@@ -750,7 +777,7 @@
.right-small-btn {
  margin-top: 10px;
  width: calc(100% - 20px);
  margin:0 auto;
  margin: 0 auto;
  position: absolute;
  bottom: 10px;
  left: 10px;
@@ -977,7 +1004,7 @@
          line-height: 40px;
          color: #fff;
          background: rgb(19, 35, 90);
          font-size:20px;
          font-size: 20px;
        }
        .card-info-box {
          position: absolute;