Merge remote-tracking branch 'origin/V1.0.11' into V1.0.11

src/views/resumption/taskManager/dialog.detail.vue

@@ -94,13 +94,19 @@
                   :show-overflow-tooltip="true"
                 >
                   <template slot-scope="scope">
-                    <span v-if="scope.row.executeResult === '0'">
+                    <span v-if="scope.row.dataStatus === 1">
                       <!-- <i class="circle" style="background-color: #1890ff" /> -->
-                      <label> 正常</label> </span
-                    ><span v-else>
+                      <label></label>
+                    </span>
+                    <span v-if="scope.row.dataStatus === 2">
+                      <span v-if="scope.row.executeResult === '0'">
+                      <!-- <i class="circle" style="background-color: #1890ff" /> -->
+                      <label> 正常</label> </span>
+                      <span v-else>
                       <!-- <i class="circle" style="background-color: #f5222d" /> -->
                       <label> 异常</label>
                     </span>
+                    </span>
                   </template>
                 </el-table-column>
                 <!-- <el-table-column