Merge branch 'develop' into developer/yanjiaxu

src/views/setting/sample/index.vue

@@ -452,8 +452,8 @@ export default {
       tableData: [],
       total: 0,
       dialogVisible: false,
-      dialogTitle: '新建',
       trademarkDisplay: true,
+      dialogTitle: '新建',
       samplePhotosDisplay: true
     }
   },

src/views/task/task-detail/index.vue

@@ -56,10 +56,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row
-          v-show="model.inspectionItemList.includes('trfis')"
-          :gutter="20"
-        >
+        <el-row v-show="testScenarioShow" :gutter="20">
           <el-col :span="24">
             <el-form-item
               label="请选择测试场景(可多选)"
@@ -211,7 +208,7 @@
           <el-table-column label="所属部门" align="left" prop="dept">
             <template slot-scope="{ row }">
               <span v-if="row.userId === ''">-</span>
-              <span v-else>{{ row.deptName }}</span>
+              <span v-else>{{ row.deptName || '-' }}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -356,13 +353,13 @@ export default {
         // { value: 2, label: '汽车信息安全技术要求', check: false }
       ],
       testScenarioList: [
-        { value: 0, label: '文档审核', check: false },
-        { value: 1, label: 'TBOX-蜂窝以太网接口', check: false },
-        { value: 2, label: 'WiFi AP接口', check: false },
-        { value: 3, label: 'WiFi Client接口', check: false },
-        { value: 4, label: '充电以太网接口', check: false },
-        { value: 5, label: 'CAN 诊断接口（OBD）', check: false },
-        { value: 6, label: '以太网诊断接口（OBD）', check: false },
+        { value: 0, label: 'TBOX-蜂窝以太网接口', check: false },
+        { value: 1, label: 'WiFi AP接口', check: false },
+        { value: 2, label: 'WiFi Client接口', check: false },
+        { value: 3, label: '充电以太网接口', check: false },
+        { value: 4, label: 'CAN 诊断接口（OBD）', check: false },
+        { value: 5, label: '以太网诊断接口（OBD）', check: false },
+        { value: 6, label: '车载摄像头以太网接口（无线）', check: false },
         { value: 7, label: '第三方应用软件', check: false },
         { value: 8, label: '远程控车应用', check: false },
         { value: 9, label: 'USB接口', check: false },
@@ -375,9 +372,8 @@ export default {
         { value: 16, label: 'BLE', check: false },
         { value: 17, label: 'NFC', check: false },
         { value: 18, label: '射频钥匙', check: false },
-        { value: 19, label: '远程控车', check: false },
-        { value: 20, label: '软件升级', check: false },
-        { value: 21, label: 'ECU固件', check: false }
+        { value: 19, label: '软件升级', check: false },
+        { value: 20, label: 'ECU固件', check: false }
       ],
       rules: {
         testScenarioList: [
@@ -495,7 +491,8 @@ export default {
         }
       ],
       // 任务详情
-      taskDetail: {}
+      taskDetail: {},
+      testScenarioShow: false
     }
   },
   watch: {
@@ -583,17 +580,31 @@ export default {
         // 小组信息
         this.tableData = this.taskDetail.auditors
         // 整车样品信息
-        this.carInfoArr = this.taskDetail.completeVehicleSample
-        this.carInfoArr.forEach(item => {
-          item.sampleId = item.id
-          item.flag = 0
-        })
+        if (this.taskDetail.completeVehicleSample !== null) {
+          this.carInfoArr = this.taskDetail.completeVehicleSample
+          this.carInfoArr.forEach(item => {
+            item.sampleId = item.id
+            item.flag = 0
+          })
+        }
         // 零件样品信息
-        this.partInfoArr = this.taskDetail.partVehicleSample
-        this.partInfoArr.forEach(item => {
-          item.sampleId = item.id
-          item.flag = 1
-        })
+        if (this.taskDetail.partVehicleSample !== null) {
+          this.partInfoArr = this.taskDetail.partVehicleSample
+          this.partInfoArr.forEach(item => {
+            item.sampleId = item.id
+            item.flag = 1
+          })
+        }
+
+        if (
+          this.taskDetail.taskList.split(',').length === 1 &&
+          this.taskDetail.taskList.split(',').includes('trfis')
+        ) {
+          this.testScenarioShow = true
+        } else {
+          this.testScenarioShow = false
+        }
+        console.log('哈哈哈', this.testScenarioShow)
         console.log('零件样品信息', this.partInfoArr)
         console.log('model', this.model)
       })
@@ -811,7 +822,7 @@ export default {
   display: flex;
   flex-wrap: wrap;
   .test-scenario {
-    width: 237px;
+    width: 228px;
     height: 32px;
     border: 1px solid #dcdfe6;
     background-color: #ffffff;
@@ -823,7 +834,7 @@ export default {
     }
   }
   .check-test-scenario {
-    width: 237px;
+    width: 228px;
     height: 32px;
     border: 1px solid #1a6fd7;
     background-color: #e3eefc;