郭超 4 yıl önce
ebeveyn
işleme
71872edaa3
1 değiştirilmiş dosya ile 0 ekleme ve 4 silme
  1. 0 4
      src/components/task/Task.vue

+ 0 - 4
src/components/task/Task.vue

@@ -46,16 +46,12 @@
                 <el-radio :label="0">协同</el-radio>
                 <el-radio :label="1">非协同</el-radio>
               </el-radio-group>
-<<<<<<< HEAD
               {{task.endPoint.collaborativeType}}
               <span v-if="!isModifyMode">{{ task.endPoint.collaborativeType ? '非协同' : '协同' }}</span>
-=======
-              <span v-if="!isModifyMode">{{ task.endPoint.collaborativeType == 1 ? '非协同' : '协同' }}</span>
             </el-form-item>
 
             <el-form-item label="众测序号" prop="endPoint.caseId" v-if="currType.type==1 && task.endPoint.caseId !=null && !isModifyMode">
               <span>{{ task.endPoint.caseId}}</span>
->>>>>>> 517e05937e67e50d61eea1b7e250be34cedceaa2
             </el-form-item>
 
             <el-form-item label="任务可见性" prop="resource">