Merge remote-tracking branch 'origin/master'

jiangping

2024-12-19 e661ea6782bf6e7283689224506eef0869a27e6d

 admin/src/views/platform/index.vue

@@ -98,9 +98,10 @@
                <el-button v-if="task.status == 5 || task.status == 8" plain
                  @click="handleTransform(item, task)">转移月台</el-button>
                <el-button v-if="task.status == 4" plain @click="handlePass(task)">过号</el-button>
                <el-button v-preventReClick :loading="loadingFinish" v-if="task.status == 5 || task.status == 8" type="primary"
                  @click="handleFinish(task)">作业完成</el-button>
                <el-button v-preventReClick :loading="loadingOpen" v-if="task.status == 4" type="primary" @click="handleWork(task)">开始作业</el-button>
                <el-button v-preventReClick :loading="loadingFinish" v-if="task.status == 5 || task.status == 8"
                  type="primary" @click="handleFinish(task)">作业完成</el-button>
                <el-button v-preventReClick :loading="loadingOpen" v-if="task.status == 4" type="primary"
                  @click="handleWork(task)">开始作业</el-button>
              </div>
            </div>
          </div>
@@ -229,7 +230,7 @@
        this.loadingFinish = false
        Message.success('完成作业')
        this.getPlatGroupList()
      },() => {
      }, () => {
        this.loadingFinish = false
      })
    },