附件1

src/views/mes/pro/machineryJob/index.vue

@@ -142,6 +142,7 @@
         <template slot-scope="scope">
           <el-tag type="danger" v-if="scope.row.jobStatus === 'WORKING'">进行中</el-tag>
           <el-tag type="success" v-if="scope.row.jobStatus === 'FINISHED'">已完成</el-tag>
+          <el-tag type="warning" v-if="scope.row.jobStatus === 'CANCEL'">已撤销</el-tag>
         </template>
       </el-table-column>
       <el-table-column
@@ -445,10 +446,9 @@ export default {
       this.loading = true;
       listProgress({
         ...this.queryParams,
- 
-          startTime: this.dateRange[0],
-          endTime: this.dateRange[1],
-        
+
+        startTime: this.dateRange[0],
+        endTime: this.dateRange[1],
       }).then((response) => {
         this.tableList = response.rows;
         this.total = response.total;