Merge branch 'develop' of http://gitlab.91isoft.com:90/car-test/web into mengzixuan

 Conflicts:
	src/views/setting/scene/index.vue

src/assets/styles/process.scss

@@ -412,6 +412,7 @@
 .table {
   border-collapse: collapse;
   width: 100%;
+  table-layout: fixed;
   thead {
     background-color: #e7e6e6;
   }
@@ -421,7 +422,7 @@
     border: 1px solid #ebebeb;
     padding: 8px;
     text-align: left;
-    width: 300px;
+    width: 40%;
     height: 100%;
   }
 }
@@ -692,3 +693,18 @@
     margin: 0 10px;
   }
 }
+.label-required::before {
+  content: '*';
+  color: #db4747;
+  margin-right: 4px;
+}
+
+.investigate-result {
+  width: 90px !important;
+  text-align: center !important;
+}
+.written-by
+{
+  width: 120px !important;
+  // text-align: center !important;
+}

src/store/modules/permission.js

@@ -38,6 +38,17 @@ const permission = {
           const rdata = JSON.parse(JSON.stringify(res.data))
           const sidebarRoutes = filterAsyncRouter(sdata)
           const rewriteRoutes = filterAsyncRouter(rdata, false, true)
+          rewriteRoutes.forEach(item => {
+            if (item.children && item.children.length > 0){
+              for (let i = 0; i < item.children.length; i++) {
+                // 将parentName字段放入meta中
+                if (item.children[i].secondaryMenuName) {
+                  item.children[i].meta['secondaryMenuName'] = item.children[i].secondaryMenuName
+                  // item.children[i - 1].meta['activeMenu'] = `${item.path === '/' ? '' : item.path}/${item.children[i].path}`
+                }
+              }
+            }
+          })
           const asyncRoutes = filterDynamicRoutes(dynamicRoutes)
           rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
           router.addRoutes(asyncRoutes)

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

@@ -88,8 +88,8 @@
                 <tr>
                   <th>审查要点</th>
                   <th>审查细则</th>
-                  <th>审查结果</th>
-                  <th>填写人</th>
+                  <th class="investigate-result">审查结果</th>
+                  <th class="written-by">填写人</th>
                 </tr>
                 <template v-for="(keyPoint, keyPointKey) in item.keyPointList">
                   <tr :key="keyPointKey">
@@ -104,7 +104,7 @@
                   >
                     <tr :key="reviewDetailKey">
                       <td align="center">{{ reviewDetail.text }}</td>
-                      <td align="center">
+                      <td align="center" class="investigate-result">
                         {{
                           reviewDetail.result
                             ? reviewDetail.result.passed === null
@@ -115,7 +115,7 @@
                             : '__'
                         }}
                       </td>
-                      <td align="center">
+                      <td align="center" class="written-by">
                         {{
                           reviewDetail.result
                             ? reviewDetail.result.userName

src/views/processing/carReview/source-record/index.vue

@@ -169,9 +169,9 @@
                 <tr>
                   <th>审查要点</th>
                   <th>审查细则</th>
-                  <th>审查结果</th>
+                  <th class="investigate-result">审查结果</th>
                   <th>记录</th>
-                  <th>填写人</th>
+                  <th class="written-by">填写人</th>
                 </tr>
                 <template v-for="(keyPoint, keyPointKey) in item.keyPointList">
                   <tr :key="keyPointKey">
@@ -186,7 +186,7 @@
                   >
                     <tr :key="reviewDetailKey">
                       <td align="center">{{ reviewDetail.text }}</td>
-                      <td align="center">
+                      <td align="center" class="investigate-result">
                         <div v-if="reviewDetail.result">
                           <div v-if="reviewDetail.result">
                             <el-tag
@@ -218,7 +218,7 @@
                         </div>
                         <div v-else>__</div>
                       </td>
-                      <td align="center">
+                      <td align="center" class="written-by">
                         {{
                           reviewDetail.result
                             ? reviewDetail.result.userName
@@ -300,7 +300,7 @@ export default {
       auditRequirement: 0,
       testScenarioList: [
         { value: 0, label: 'TBOX-蜂窝以太网接口', check: false },
-        { value: 1, label: 'WiFi API接口', 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 },
@@ -396,21 +396,6 @@ export default {
       if (result.code === 200) {
         this.task = result.data
       }
-    },
-    handleTestScenario(item) {
-      // 查看item.value在this.checkTestScenarioList里面存不存在
-      // 存在则删除
-      if (this.checkTestScenarioList.includes(item.value)) {
-        this.checkTestScenarioList.splice(
-          this.checkTestScenarioList.indexOf(item.label),
-          1
-        )
-        item.check = false
-      } else {
-        item.check = true
-        this.checkTestScenarioList.push(item.value)
-      }
-      console.log('李斯特', this.checkTestScenarioList)
     }
   }
 }

src/views/processing/carReview/vehicle-type/index.vue

@@ -169,8 +169,8 @@
                 <tr>
                   <th>审查要点</th>
                   <th>审查细则</th>
-                  <th>审查结果</th>
-                  <th>填写人</th>
+                  <th class="investigate-result">审查结果</th>
+                  <th class="written-by">填写人</th>
                 </tr>
                 <template v-for="(keyPoint, keyPointKey) in item.keyPointList">
                   <tr :key="keyPointKey">
@@ -185,7 +185,7 @@
                   >
                     <tr :key="reviewDetailKey">
                       <td align="center">{{ reviewDetail.text }}</td>
-                      <td align="center">
+                      <td align="center" class="investigate-result">
                         <el-tag
                           v-if="reviewDetail.result.passed === 1"
                           size="medium"
@@ -199,7 +199,7 @@
                           >不符合</el-tag
                         >
                       </td>
-                      <td align="center">
+                      <td align="center" class="written-by">
                         {{
                           reviewDetail.result
                             ? reviewDetail.result.userName
@@ -221,13 +221,9 @@
             <span class="title-i"></span>
             <span class="title-content">确定车型试验范围</span>
           </div>
-
-          <!-- <div class="el-form-item  el-form-item--medium">
-            <label for="inspectionLeader" class="el-form-item__label"
-              >选择测试场景</label
-            >
-            <div class="el-form-item__content">
-          </div> -->
+          <div class="img-item">
+            <div class="img-label" style="margin-top: 20px">选择测试场景</div>
+          </div>
           <!--   测试场景   -->
           <div class="test-scenario-container">
             <div
@@ -253,7 +249,7 @@
 
           <div class="img-display">
             <div class="img-item">
-              <div class="img-label">车企负责人</div>
+              <div class="img-label label-required">车企负责人</div>
               <img
                 v-if="ruleForm.enterpriseLeader"
                 class="img"
@@ -265,7 +261,7 @@
               </div>
             </div>
             <div class="img-item">
-              <div class="img-label">检验负责人</div>
+              <div class="img-label label-required">检验负责人</div>
               <img
                 v-if="ruleForm.inspectionLeader"
                 class="img"
@@ -317,7 +313,7 @@ export default {
       auditRequirement: 0,
       testScenarioList: [
         { value: 0, label: 'TBOX-蜂窝以太网接口', check: false },
-        { value: 1, label: 'WiFi API接口', 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 },
@@ -409,14 +405,14 @@ export default {
     },
     /* 返回跳转*/
     goToProcessedReview() {
-      if (!this.ruleForm.enterpriseLeader) {
-        this.$message.error('请车企负责人签字')
-        return
-      }
-      if (!this.ruleForm.inspectionLeader) {
-        this.$message.error('请检验负责人签字')
-        return
-      }
+      // if (!this.ruleForm.enterpriseLeader) {
+      //   this.$message.error('请车企负责人签字')
+      //   return
+      // }
+      // if (!this.ruleForm.inspectionLeader) {
+      //   this.$message.error('请检验负责人签字')
+      //   return
+      // }
       this.ruleForm.taskId = this.taskId
       const formData = {
         imagesUrl: [

src/views/processing/carReview/write-check-form/components/previewView.vue

@@ -60,7 +60,7 @@
               <th>审查细则</th>
               <th>审查结果</th>
               <th>记录</th>
-              <th>填写人</th>
+              <th class="written-by">填写人</th>
             </tr>
             <template v-for="(keyPoint, keyPointKey) in item.keyPointList">
               <tr :key="keyPointKey">
@@ -75,7 +75,7 @@
               >
                 <tr :key="reviewDetailKey">
                   <td align="center">{{ reviewDetail.text }}</td>
-                  <td align="center">
+                  <td align="center" class="investigate-result">
                     <div v-if="reviewDetail.result">
                       <el-tag
                         v-if="reviewDetail.result.passed === 1"
@@ -104,7 +104,7 @@
                     </div>
                     <div v-else>__</div>
                   </td>
-                  <td align="center">
+                  <td align="center" class="written-by">
                     {{
                       reviewDetail.result
                         ? reviewDetail.result.userName

src/views/processing/carReview/write-check-form/index.vue

@@ -620,7 +620,7 @@ export default {
                   this.handleCircle(0)
                 }
                 this.oldForm = this.form
-                this.$modal.msgSuccess('提交表单成功')
+                this.$modal.msgSuccess('保存当前条目成功')
               } else {
                 this.$modal.msgError(res.msg)
               }
@@ -638,9 +638,7 @@ export default {
       carReviewTaskConfirm({
         taskId: this.taskId
       }).then(res => {
-        this.$router.push({
-          path: '/processing/carReview/vehicle-type?id' + this.taskId
-        })
+        this.$router.go(-1)
       })
     },
     confirmDetailChange() {

src/views/processing/fileLibrary/index.vue

@@ -65,6 +65,7 @@
       </el-table-column>
       <el-table-column
         label="所属车企"
+        sortable
         min-width="210"
         prop="enterpriseName"
         align="left"
@@ -162,7 +163,6 @@
       >
         <template slot-scope="scope">
           <page-button
-            v-hasPermi="['setting:standard:update']"
             style="margin: 0 auto"
             icon="edit"
             title="修改"

src/views/processing/systemReview/confirm-result/index.vue

@@ -169,8 +169,8 @@
                 <tr>
                   <th>审查要点</th>
                   <th>审查细则</th>
-                  <th>审查结果</th>
-                  <th>填写人</th>
+                  <th class="investigate-result">审查结果</th>
+                  <th class="written-by">填写人</th>
                 </tr>
                 <template v-for="(keyPoint, keyPointKey) in item.keyPointList">
                   <tr :key="keyPointKey">
@@ -185,7 +185,7 @@
                   >
                     <tr :key="reviewDetailKey">
                       <td align="center">{{ reviewDetail.text }}</td>
-                      <td align="center">
+                      <td align="center" class="investigate-result">
                         <el-tag
                           v-if="reviewDetail.result.passed === 1"
                           size="medium"
@@ -199,7 +199,7 @@
                           >不符合</el-tag
                         >
                       </td>
-                      <td align="center">
+                      <td align="center" class="written-by">
                         {{
                           reviewDetail.result
                             ? reviewDetail.result.userName
@@ -224,7 +224,7 @@
 
           <div class="img-display">
             <div class="img-item">
-              <div class="img-label">车企负责人</div>
+              <div class="img-label label-required">车企负责人</div>
               <img
                 v-if="ruleForm.enterpriseLeader"
                 class="img"
@@ -235,7 +235,7 @@
                 <div class="img-text">暂无签字</div>
               </div>
             </div>
-            <div class="img-item">
+            <div class="img-item label-required">
               <div class="img-label">检验负责人</div>
               <img
                 v-if="ruleForm.inspectionLeader"
@@ -348,14 +348,14 @@ export default {
     },
     /* 返回跳转*/
     goToProcessedReview() {
-      if (!this.ruleForm.enterpriseLeader) {
-        this.$message.error('请车企负责人签字')
-        return
-      }
-      if (!this.ruleForm.inspectionLeader) {
-        this.$message.error('请检验负责人签字')
-        return
-      }
+      // if (!this.ruleForm.enterpriseLeader) {
+      //   this.$message.error('请车企负责人签字')
+      //   return
+      // }
+      // if (!this.ruleForm.inspectionLeader) {
+      //   this.$message.error('请检验负责人签字')
+      //   return
+      // }
       this.ruleForm.taskId = this.taskId
       const formData = {
         imagesUrl: [

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

@@ -87,8 +87,8 @@
                 <tr>
                   <th>审查要点</th>
                   <th>审查细则</th>
-                  <th>审查结果</th>
-                  <th>填写人</th>
+                  <th class="investigate-result">审查结果</th>
+                  <th class="written-by">填写人</th>
                 </tr>
                 <template v-for="(keyPoint, keyPointKey) in item.keyPointList">
                   <tr :key="keyPointKey">
@@ -103,18 +103,21 @@
                   >
                     <tr :key="reviewDetailKey">
                       <td align="center">{{ reviewDetail.text }}</td>
-                      <td align="center">
-                        {{
-                          reviewDetail.result
-                            ? reviewDetail.result.passed === null
-                              ? '__'
-                              : reviewDetail.result.passed === 0
-                              ? '不通过'
-                              : '通过'
-                            : '__'
-                        }}
+                      <td align="center" class="investigate-result">
+                        <el-tag
+                          v-if="reviewDetail.result.passed === 1"
+                          size="medium"
+                          type="success"
+                          >符合</el-tag
+                        >
+                        <el-tag
+                          v-if="reviewDetail.result.passed === 0"
+                          size="medium"
+                          type="danger"
+                          >不符合</el-tag
+                        >
                       </td>
-                      <td align="center">
+                      <td align="center" class="written-by">
                         {{
                           reviewDetail.result
                             ? reviewDetail.result.userName

src/views/processing/systemReview/source-record/index.vue

@@ -169,9 +169,9 @@
                 <tr>
                   <th>审查要点</th>
                   <th>审查细则</th>
-                  <th>审查结果</th>
+                  <th class="investigate-result">审查结果</th>
                   <th>记录</th>
-                  <th>填写人</th>
+                  <th class="written-by">填写人</th>
                 </tr>
                 <template v-for="(keyPoint, keyPointKey) in item.keyPointList">
                   <tr :key="keyPointKey">
@@ -186,7 +186,7 @@
                   >
                     <tr :key="reviewDetailKey">
                       <td align="center">{{ reviewDetail.text }}</td>
-                      <td align="center">
+                      <td align="center" class="investigate-result">
                         <div v-if="reviewDetail.result">
                           <div v-if="reviewDetail.result">
                             <el-tag
@@ -218,7 +218,7 @@
                         </div>
                         <div v-else>__</div>
                       </td>
-                      <td align="center">
+                      <td align="center" class="written-by">
                         {{
                           reviewDetail.result
                             ? reviewDetail.result.userName

src/views/processing/systemReview/write-check-form/components/previewView.vue

@@ -58,9 +58,9 @@
             <tr>
               <th>审查要点</th>
               <th>审查细则</th>
-              <th>审查结果</th>
+              <th class="investigate-result">审查结果</th>
               <th>记录</th>
-              <th>填写人</th>
+              <th class="written-by">填写人</th>
             </tr>
             <template v-for="(keyPoint, keyPointKey) in item.keyPointList">
               <tr :key="keyPointKey">
@@ -75,7 +75,7 @@
               >
                 <tr :key="reviewDetailKey">
                   <td align="center">{{ reviewDetail.text }}</td>
-                  <td align="center">
+                  <td align="center" class="investigate-result">
                     <div v-if="reviewDetail.result">
                       <el-tag
                         v-if="reviewDetail.result.passed === 1"
@@ -104,7 +104,7 @@
                     </div>
                     <div v-else>__</div>
                   </td>
-                  <td align="center">
+                  <td align="center" class="written-by">
                     {{
                       reviewDetail.result
                         ? reviewDetail.result.userName

src/views/processing/systemReview/write-check-form/index.vue

@@ -630,7 +630,7 @@ export default {
                   this.handleCircle(0)
                 }
                 this.oldForm = this.form
-                this.$modal.msgSuccess('提交表单成功')
+                this.$modal.msgSuccess('保存当前条目成功')
               } else {
                 this.$modal.msgError(res.msg)
               }

src/views/setting/company/index.vue

@@ -216,7 +216,8 @@ export default {
     handleDelete(id) {
       this.$modal
         .confirm('是否确定删除该条数据？', {
-          title: '操作确认',
+          type: 'warning',
+          title: '删除',
           closeOnClickModal: false
         })
         .then(() => {

src/views/setting/rules/index.vue

@@ -363,7 +363,8 @@ export default {
       // console.log(node, data)
       this.$modal
         .confirm('是否确定删除该条数据？', {
-          title: '操作确认',
+          type: 'warning',
+          title: '删除',
           closeOnClickModal: false
         })
         .then(() => {

src/views/setting/standard/index.vue

@@ -186,7 +186,8 @@ export default {
     handleDelete(row) {
       this.$modal
         .confirm('是否确定删除该条数据？', {
-          title: '操作确认',
+          type: 'warning',
+          title: '删除',
           closeOnClickModal: false
         })
         .then(() => {

src/views/system/menu/index.vue

@@ -550,7 +550,8 @@ export default {
     handleDelete(row) {
       this.$modal
         .confirm('是否确定删除该条数据？', {
-          title: '操作确认',
+          type: 'warning',
+          title: '删除',
           closeOnClickModal: false
         })
         .then(function () {

src/views/task/confirm-result/index.vue

@@ -114,8 +114,8 @@
                   <th>审查要点</th>
                   <th>审查细则</th>
                   <th>符合场景</th>
-                  <th>审查结果</th>
-                  <th>填写人</th>
+                  <th class="investigate-result">审查结果</th>
+                  <th class="written-by">填写人</th>
                 </tr>
               </thead>
               <tbody>

src/views/task/edit/index.vue

@@ -224,7 +224,6 @@
           >
             <template slot-scope="scope">
               <div class="actions-container">
-                <span v-show="scope.row.userId === ''">-</span>
                 <page-button
                   v-show="scope.row.userId !== ''"
                   icon="edit"
@@ -240,6 +239,13 @@
                   class="button-item"
                   @click.native="handleDelete(scope.row)"
                 ></page-button>
+                <page-button
+                  v-show="scope.row.userId === ''"
+                  icon="delete"
+                  title="取消"
+                  class="button-item"
+                  @click.native="handleCancelPeople()"
+                ></page-button>
               </div>
             </template>
           </el-table-column>

src/views/task/new/index.vue

@@ -224,7 +224,6 @@
           >
             <template slot-scope="scope">
               <div class="actions-container">
-                <span v-show="scope.row.userId === ''">-</span>
                 <!--                <page-button-->
                 <!--                  v-show="scope.row.userId === ''"-->
                 <!--                  icon="hard-disk-one"-->
@@ -247,13 +246,13 @@
                   class="button-item"
                   @click.native="handleDelete(scope.row)"
                 ></page-button>
-                <!--                <page-button-->
-                <!--                  v-show="scope.row.userId === ''"-->
-                <!--                  icon="delete"-->
-                <!--                  title="取消"-->
-                <!--                  class="button-item"-->
-                <!--                  @click.native="handleCancelPeople()"-->
-                <!--                ></page-button>-->
+                <page-button
+                  v-show="scope.row.userId === ''"
+                  icon="delete"
+                  title="取消"
+                  class="button-item"
+                  @click.native="handleCancelPeople()"
+                ></page-button>
               </div>
             </template>
           </el-table-column>

src/views/task/on/index.vue

 <template>
   <page-standard>
+    <div slot="tab">
+      <el-tabs v-model="queryParams.taskStatus" @tab-click="loadData">
+        <el-tab-pane
+          v-for="(dict, key) in reviewTypeList"
+          :key="key"
+          :label="dict.label"
+          :name="dict.value"
+        >
+        </el-tab-pane>
+      </el-tabs>
+    </div>
     <el-form ref="queryForm" :model="queryParams" size="small" :inline="true">
       <template v-if="showSearch">
         <el-form-item label="检验依据">
@@ -139,18 +150,13 @@
                     :underline="false"
                     @click="
                       handleSystemReviewTestContent(
-                        item.reviewStatus,
+                        'NEW',
                         item.systemReviewTaskId,
                         item.id
                       )
                     "
                   >
-                    {{
-                      getDictData(
-                        dict.type.system_review_test_btn,
-                        item.reviewStatus
-                      )
-                    }}
+                    {{ getDictData(dict.type.system_review_test_btn, 'NEW') }}
                   </el-link>
                   <br />
                 </div>
@@ -163,18 +169,13 @@
                     :underline="false"
                     @click="
                       handleCarTypeReviewTaskContent(
-                        item.carReviewStatus,
+                        'NEW',
                         item.carReviewTaskId,
                         item.id
                       )
                     "
                   >
-                    {{
-                      getDictData(
-                        dict.type.test_cartype_type_btn,
-                        item.carReviewStatus
-                      )
-                    }}
+                    {{ getDictData(dict.type.test_cartype_type_btn, 'NEW') }}
                   </el-link>
                 </div>
                 <div
@@ -184,16 +185,9 @@
                   <el-link
                     type="primary"
                     :underline="false"
-                    @click="
-                      handleCarTypeTestTaskContent(item.carTestStatus, item.id)
-                    "
+                    @click="handleCarTypeTestTaskContent('NEW', item.id)"
                   >
-                    {{
-                      getDictData(
-                        dict.type.test_cartype_task_btn,
-                        item.carTestStatus
-                      )
-                    }}
+                    {{ getDictData(dict.type.test_cartype_task_btn, 'NEW') }}
                   </el-link>
                 </div>
               </div>
@@ -509,6 +503,24 @@ export default {
   mixins: [page],
   data() {
     return {
+      reviewTypeList: [
+        {
+          label: '全部',
+          value: ''
+        },
+        {
+          label: '未开始',
+          value: 'NEW'
+        },
+        {
+          label: '进行中',
+          value: 'PENDING'
+        },
+        {
+          label: '已完成',
+          value: 'FINISH'
+        }
+      ],
       // 子任务内容跳转文字map
       dialogVisible: false,
       listUrl: '/task/findCreate',
@@ -604,7 +616,8 @@ export default {
     teakDelete(id) {
       this.$modal
         .confirm('是否确定删除该条数据？', {
-          title: '操作确认',
+          type: 'warning',
+          title: '删除',
           closeOnClickModal: false
         })
         .then(() => {

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

@@ -70,7 +70,6 @@
                     'test-scenario': item.check === false,
                     'check-test-scenario': item.check === true
                   }"
-                  @click="handleTestScenario(item)"
                 >
                   <div>{{ item.label }}</div>
                 </div>