Merge branch 'develop' into developer/yanjiaxu

# Conflicts:
#	public/index.html

src/views/index.vue

@@ -83,14 +83,9 @@
           <div class="cardTitle">任务完成情况占比</div>
           <div style="display: flex; justify-content: space-between">
             <div class="cardChild" style="background: rgba(18, 190, 223, 0.08)">
-              <div
-                style="
-                  width: 36px;
-                  height: 36px;
-                  background: #12bedf;
-                  border-radius: 8px;
-                "
-              ></div>
+              <div>
+                <iconpark-icon name="renwuwancheng" size="36"></iconpark-icon>
+              </div>
               <span>已完成 ：43个</span>
               <div>
                 <el-progress
@@ -103,14 +98,12 @@
               </div>
             </div>
             <div class="cardChild" style="background: rgba(230, 88, 104, 0.08)">
-              <div
-                style="
-                  width: 36px;
-                  height: 36px;
-                  background: #e55868;
-                  border-radius: 8px;
-                "
-              ></div>
+              <div>
+                <iconpark-icon
+                  name="renwuweiwancheng"
+                  size="36"
+                ></iconpark-icon>
+              </div>
               <span>已完成 ：43个</span>
               <div>
                 <el-progress
@@ -150,17 +143,23 @@
                   style="background: rgba(230, 88, 104, 0.08)"
                 >
                   <div class="lineOne">高危</div>
-                  <div>高危</div>
+                  <div>
+                    <iconpark-icon name="gaowei" size="24"></iconpark-icon>
+                  </div>
                   <div class="lineLast">83</div>
                 </div>
                 <div class="dangerousCard" style="background: #fef6e9">
                   <div class="lineOne">中危</div>
-                  <div>高危</div>
+                  <div>
+                    <iconpark-icon name="zhongwei" size="24"></iconpark-icon>
+                  </div>
                   <div class="lineLast">45</div>
                 </div>
                 <div class="dangerousCard" style="background: #e8f1fb">
                   <div class="lineOne">低危</div>
-                  <div>高危</div>
+                  <div>
+                    <iconpark-icon name="diwei" size="24"></iconpark-icon>
+                  </div>
                   <div class="lineLast">78</div>
                 </div>
               </div>

src/views/processing/carTest/review-form/index.vue

@@ -49,7 +49,7 @@
             <col style="width: 100px" />
             <thead>
               <tr>
-                <th>章节号</th>
+                <th style="width: 100px">章节号</th>
                 <th>标准技术要求</th>
                 <th>标准测试方法</th>
                 <th>测试场景</th>
@@ -58,7 +58,7 @@
                 <th>用例名称</th>
                 <th>工具</th>
                 <th>对应输入</th>
-                <th>测试用例</th>
+                <th style="width: 370px">测试用例</th>
               </tr>
             </thead>
             <tbody>

src/views/setting/sample/index.vue

@@ -360,7 +360,7 @@
               height="150px"
             ></image-preview>
           </div>
-          <div v-else>暂无数据</div>
+          <div v-else>--未上传--</div>
         </el-form-item>
         <el-form-item label="样品照片:" prop="samplePhotos">
           <div v-if="clickNameForm.samplePhotos">
@@ -373,7 +373,7 @@
               :src="item"
             ></image-preview>
           </div>
-          <div v-else>暂无数据</div>
+          <div v-else>--未上传--</div>
         </el-form-item>
       </el-form>
     </el-dialog>
@@ -646,8 +646,10 @@ export default {
     clickSampleName(row) {
       this.dialogFormVisible = true
       this.clickNameForm = row
-      this.clickNameForm.samplePhotos =
-        this.clickNameForm.samplePhotos.split(',')
+      if (this.clickNameForm.samplePhotos) {
+        this.clickNameForm.samplePhotos =
+          this.clickNameForm.samplePhotos.split(',')
+      }
       console.log(row)
     },
     closeSamplePhoto() {

src/views/system/user/index.vue

@@ -142,17 +142,17 @@
               >删除</el-button
             >
           </el-col>
-          <el-col :span="1.5">
-            <el-button
-              v-hasPermi="['system:user:import']"
-              type="info"
-              plain
-              icon="el-icon-upload2"
-              size="mini"
-              @click="handleImport"
-              >导入</el-button
-            >
-          </el-col>
+          <!--          <el-col :span="1.5">-->
+          <!--            <el-button-->
+          <!--              v-hasPermi="['system:user:import']"-->
+          <!--              type="info"-->
+          <!--              plain-->
+          <!--              icon="el-icon-upload2"-->
+          <!--              size="mini"-->
+          <!--              @click="handleImport"-->
+          <!--              >导入</el-button-->
+          <!--            >-->
+          <!--          </el-col>-->
           <!-- <el-col :span="1.5">
             <el-button
               v-hasPermi="['system:user:export']"
@@ -245,7 +245,7 @@
           <el-table-column
             label="操作"
             align="center"
-            width="160"
+            min-width="200"
             class-name="small-padding fixed-width"
           >
             <template v-if="scope.row.userId !== 1" slot-scope="scope">
@@ -779,8 +779,8 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         closeOnClickModal: false,
-        inputPattern: /^.{5,20}$/,
-        inputErrorMessage: '用户密码长度必须介于 5 和 20 之间'
+        inputPattern: /^.{6,20}$/,
+        inputErrorMessage: '用户密码长度必须介于 6 和 20 之间'
       })
         .then(({ value }) => {
           resetUserPwd(row.userId, value).then(response => {

src/views/task/edit/index.vue

@@ -39,7 +39,11 @@
                     'test-scenario': item.check === false,
                     'check-test-scenario': item.check === true
                   }"
-                  @click="handleInspectionItem(item)"
+                  @click="
+                    taskDetail.taskStatus === 'NEW'
+                      ? handleInspectionItem(item)
+                      : ''
+                  "
                 >
                   <div>{{ item.label }}</div>
                 </div>
@@ -53,6 +57,13 @@
               label="请选择测试场景(可多选)"
               prop="testScenarioList"
             >
+              <footer-button
+                style="width: 80px; height: 25px"
+                type="primary"
+                @click="selectAll"
+              >
+                全部选择
+              </footer-button>
               <div class="test-scenario-container">
                 <div
                   v-for="(item, index) in testScenarioList"
@@ -414,29 +425,6 @@ export default {
       // 小组成员回显数据
       tableData: [],
       inspectionItemList: [],
-      // testScenarioList: [
-      //   { 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 },
-      //   { value: 10, label: 'XCB标定', check: false },
-      //   { value: 11, label: 'CCP标定', check: false },
-      //   { value: 12, label: '安全启动', check: false },
-      //   { value: 13, label: '远程控车', check: false },
-      //   { value: 14, label: 'V2X', check: false },
-      //   { value: 15, label: 'BT', check: false },
-      //   { 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: 'ECU固件', check: false }
-      // ],
       rules: {
         testScenarioList: [
           {
@@ -697,6 +685,14 @@ export default {
         console.log('model', this.model)
       })
     },
+    selectAll() {
+      this.testScenarioList.forEach(obj => {
+        obj.check = true
+      })
+      this.model.testScenarioList = this.testScenarioList.map(obj => {
+        return obj.value
+      })
+    },
     getInspectionItemDict() {
       getDicts('inspection_item').then(response => {
         this.inspectionItemList = response.data.map(

src/views/task/new/components/PartInfo.vue

@@ -19,6 +19,7 @@
           <el-select
             v-model="card.sampleNumber"
             :disabled="!isEdit"
+            :placeholder="isDetail ? '--' : '请选择'"
             @change="handleSampleNumberChange(card, $event)"
           >
             <el-option
@@ -31,7 +32,11 @@
           </el-select>
         </el-form-item>
         <el-form-item label="样品名称">
-          <el-input v-model="card.sampleName" disabled />
+          <el-input
+            v-model="card.sampleName"
+            disabled
+            :placeholder="isDetail ? '--' : ''"
+          />
         </el-form-item>
       </el-form>
     </el-card>
@@ -61,6 +66,10 @@ export default {
     isEdit: {
       type: Boolean,
       default: true
+    },
+    isDetail: {
+      type: Boolean,
+      default: false
     }
   },
   watch: {

src/views/task/new/index.vue

@@ -49,6 +49,13 @@
               label="请选择测试场景(可多选)"
               prop="testScenarioList"
             >
+              <footer-button
+                style="width: 80px; height: 25px"
+                type="primary"
+                @click="selectAll"
+              >
+                全部选择
+              </footer-button>
               <div class="test-scenario-container">
                 <div
                   v-for="(item, index) in testScenarioList"
@@ -677,6 +684,15 @@ export default {
         console.log('model', this.model)
       })
     },
+    // 全选
+    selectAll() {
+      this.testScenarioList.forEach(obj => {
+        obj.check = true
+      })
+      this.model.testScenarioList = this.testScenarioList.map(obj => {
+        return obj.value
+      })
+    },
     getInspectionItemDict() {
       getDicts('inspection_item').then(response => {
         this.inspectionItemList = response.data.map(
@@ -1057,10 +1073,6 @@ export default {
             this.$message.error('请填写整车样品信息')
             return
           }
-          // else if (this.currentPartSampleInformation.length === 0) {
-          //   this.$message.error('请填写零部件样品信息')
-          //   return
-          // }
           this.$confirm('是否确认进行发布功能', '发布', {
             confirmButtonText: '确定',
             concelButtonText: '取消',

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

@@ -245,6 +245,7 @@
         v-model="partInfoArr"
         class="global-left-margin"
         :is-edit="false"
+        :is-detail="true"
         :part-sample-information="partSampleInformationList"
         @change="handleModChange"
       />