Merge branch 'developer/yanjiaxu' into develop

src/assets/styles/index.scss

@@ -389,6 +389,6 @@ aside {
   font-family: 微软雅黑;
 }
 
-.el-input__inner{
+.el-input__inner {
   font-family: 微软雅黑;
 }

src/assets/styles/process.scss

@@ -705,8 +705,7 @@
   width: 90px !important;
   text-align: center !important;
 }
-.written-by
-{
+.written-by {
   width: 120px !important;
   // text-align: center !important;
 }

src/components/Breadcrumb/index.vue

@@ -44,10 +44,16 @@ export default {
       if (!this.isDashboard(first)) {
         matched = [{ path: '/index', meta: { title: '首页' } }].concat(matched)
       }
-      const temp = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
+      const temp = matched.filter(
+        item => item.meta && item.meta.title && item.meta.breadcrumb !== false
+      )
       // 为三级面包屑提供逻辑 从$route parentName取值
       if (this.$route.meta.secondaryMenuName) {
-        temp.splice(-1, 0, { redirect: 'noRedirect', meta: { title: this.$route.meta.secondaryMenuName }, path: 'secondaryMenuName' })
+        temp.splice(-1, 0, {
+          redirect: 'noRedirect',
+          meta: { title: this.$route.meta.secondaryMenuName },
+          path: 'secondaryMenuName'
+        })
       }
       this.levelList = this.removeDuplicateTitles(temp)
     },

src/components/Page/TaskStandard.vue

@@ -40,7 +40,7 @@ export default {
       const currentRoute = this.$router.currentRoute
       // 获取来源页面的路由信息
       const fromRoute = currentRoute.from
-      console.log(currentRoute);
+      console.log(currentRoute)
     }
   }
 }

src/mixins/router.js

-
 export default {
   beforeRouteEnter(to, from, next) {
     next(vm => {
       vm.formPath = from.path
-      console.log(vm.formPath);
+      console.log(vm.formPath)
     })
   },
   data() {
     return {
-      formPath: '',
+      formPath: ''
     }
   },
   methods: {
     /**
-      * 返回上一页
-      */
+     * 返回上一页
+     */
     goBack() {
       if (this.formPath) {
         this.$router.push({

src/store/modules/permission.js

@@ -38,21 +38,26 @@ const permission = {
           const rdata = JSON.parse(JSON.stringify(res.data))
           const sidebarRoutes = filterAsyncRouter(sdata)
           sidebarRoutes.forEach(item => {
-            if (item.children && item.children.length > 0){
+            if (item.children && item.children.length > 0) {
               item.children.forEach(c => {
-                c.meta['activeMenu'] = `${item.path === '/' ? '' : item.path}/${item.children[0].path}`
+                c.meta['activeMenu'] = `${item.path === '/' ? '' : item.path}/${
+                  item.children[0].path
+                }`
               })
             }
           })
           const rewriteRoutes = filterAsyncRouter(rdata, false, true)
           console.log('rewriteRoutes', rewriteRoutes)
           rewriteRoutes.forEach(item => {
-            if (item.children && item.children.length > 0){
+            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].meta['activeMenu'] = `${item.path === '/' ? '' : item.path}/${item.children[i + 1].path}`
+                  item.children[i].meta['secondaryMenuName'] =
+                    item.children[i].secondaryMenuName
+                  item.children[i].meta['activeMenu'] = `${
+                    item.path === '/' ? '' : item.path
+                  }/${item.children[i + 1].path}`
                 }
               }
             }

src/utils/ruoyi.js

@@ -4,10 +4,10 @@
  */
 
 /**
-   * 获取字典
-   * @param {*} options
-   * @param {*} value
-   */
+ * 获取字典
+ * @param {*} options
+ * @param {*} value
+ */
 export function getDictData(options, value) {
   const item = options.filter(v => v.value === value)
   if (item.length > 0) {
@@ -74,8 +74,8 @@ export function addDateRange(params, dateRange, propName) {
   let search = params
   search.params =
     typeof search.params === 'object' &&
-      search.params !== null &&
-      !Array.isArray(search.params)
+    search.params !== null &&
+    !Array.isArray(search.params)
       ? search.params
       : {}
   dateRange = Array.isArray(dateRange) ? dateRange : []

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

@@ -109,7 +109,6 @@
                   >
                     <tr :key="reviewDetailKey">
                       <td align="center">{{ reviewDetail.text }}</td>
-                      <td align="center" class="investigate-result"></td>
                       <td align="center" class="investigate-result">
                         <div v-if="reviewDetail.result">
                           <div v-if="reviewDetail.result">

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

 <template>
   <el-dialog
-    title="新增场景对话框"
+    title="发起场景评审"
     :visible.sync="dialogManger.dialogVisible"
     width="35%"
     append-to-body
@@ -12,7 +12,7 @@
       <div>
         <i
           class="el-icon-info"
-        />新增场景，需要组织评审，评审通过后新增场景自动进入场景库。
+        />新增场景，需要组织评审，评审通过后新增场景自动进入审查场景库。
       </div>
     </div>
     <el-form
@@ -23,11 +23,11 @@
       label-position="top"
       class="scene-form"
     >
-      <el-form-item label="评审类型" prop="reviewType">
+      <el-form-item label="评审要求分类" prop="reviewType">
         <!--  下拉框  -->
         <el-select
           v-model="sceneForm.reviewType"
-          placeholder="请选择评审类型"
+          placeholder="请选择评审要求分类"
           style="width: 100%"
         >
           <el-option
@@ -38,7 +38,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="场景分类" prop="sceneClassification">
+      <el-form-item label="评审类型" prop="sceneClassification">
         <el-select
           v-model="sceneForm.sceneClassification"
           placeholder="请选择评审类型"
@@ -56,6 +56,7 @@
         <el-input
           v-model="sceneForm.sceneContent"
           maxlength="100"
+          placeholder="请输入场景内容"
           show-word-limit
           type="textarea"
         />
@@ -68,6 +69,7 @@
         <el-input
           v-model="sceneForm.remark"
           maxlength="100"
+          placeholder="请输入备注信息"
           show-word-limit
           type="textarea"
         />
@@ -76,7 +78,7 @@
     <span slot="footer" class="dialog-footer">
       <el-button @click="handleSceneClose()">取 消</el-button>
       <el-button type="primary" @click="handleSaveNewScene()">
-        确 定
+        发 起
       </el-button>
     </span>
   </el-dialog>
@@ -112,7 +114,7 @@ export default {
     }
   },
   methods: {
-    // 新增场景对话框关闭时触发的回调函数
+    // 发起场景评审关闭时触发的回调函数
     handleSceneClose() {
       this.dialogManger.dialogVisible = false
       this.$refs.sceneForm.resetFields()

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

@@ -23,7 +23,7 @@
     <header-button icon="plus" type="primary" @click="handleAddScene">
       新增场景
     </header-button>
-    <!--  新增场景对话框  -->
+    <!--  发起场景评审  -->
     <scene-dialog :dialog-manger="sceneManger"></scene-dialog
   ></el-dialog>
 </template>

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

@@ -123,10 +123,7 @@
                 <span>{{ taskModel.reviewKeypointText }}</span>
               </el-form-item>
               <el-form-item class="right-content-item" label="审查细则">
-                <div
-                  class="scene-content"
-                  @click="sceneView(taskModel.reviewSceneList)"
-                >
+                <div class="scene-content">
                   <el-tooltip
                     effect="dark"
                     content="查看场景"
@@ -138,6 +135,7 @@
                       width="30px"
                       height="30px"
                       icon-class="tag_tuijian"
+                      @click.native="sceneView(taskModel.reviewSceneList)"
                     ></svg-icon>
                   </el-tooltip>
 
@@ -263,7 +261,7 @@
     </task-standard>
     <!-- 场景查看对话框 -->
     <scene-view :dialog-manger="sceneViewManger"></scene-view>
-    <!--  新增场景对话框  -->
+    <!--  发起场景评审  -->
     <scene-dialog :dialog-manger="sceneManger"></scene-dialog>
     <preview-view :dialog-manger="previewManger"></preview-view>
   </div>

src/views/processing/fileLibrary/index.vue

@@ -231,6 +231,15 @@ export default {
     this.queryParams.taskId = this.$route.query.id
   },
   methods: {
+    resetQuery() {
+      // this.refs.queryForm.restForm()      this.resetForm("queryForm");
+      this.queryParams = {
+        pageNum: this.queryParams.pageNum,
+        pageSize: this.queryParams.pageSize,
+        taskId: this.$route.query.id
+      }
+      this.handleQuery()
+    },
     handleUpdate(id) {
       this.dialogManger.dialogVisible = true
       this.dialogManger.dialogEditId = id

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

@@ -379,7 +379,9 @@ export default {
       taskSubmit(formData).then(res => {
         if (res.code === 200) {
           this.$modal.msgSuccess('确认提交成功')
-          this.$router.back()
+          this.$router.push({
+            path: '/processing/unprocessed-review'
+          })
         } else {
           this.$modal.msgError(res.msg)
         }

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

@@ -113,7 +113,6 @@
                   >
                     <tr :key="reviewDetailKey">
                       <td align="center">{{ reviewDetail.text }}</td>
-                      <td align="center" class="investigate-result"></td>
                       <td align="center" class="investigate-result">
                         <div v-if="reviewDetail.result">
                           <div v-if="reviewDetail.result">

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

 <template>
   <el-dialog
-    title="新增场景对话框"
+    title="发起场景评审"
     :visible.sync="dialogManger.dialogVisible"
     width="35%"
     append-to-body
@@ -12,7 +12,7 @@
       <div>
         <i
           class="el-icon-info"
-        />新增场景，需要组织评审，评审通过后新增场景自动进入场景库。
+        />新增场景，需要组织评审，评审通过后新增场景自动进入审查场景库。
       </div>
     </div>
     <el-form
@@ -23,11 +23,11 @@
       label-position="top"
       class="scene-form"
     >
-      <el-form-item label="评审类型" prop="reviewType">
+      <el-form-item label="评审要求分类" prop="reviewType">
         <!--  下拉框  -->
         <el-select
           v-model="sceneForm.reviewType"
-          placeholder="请选择评审类型"
+          placeholder="请选择评审要求分类"
           style="width: 100%"
         >
           <el-option
@@ -38,7 +38,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="场景分类" prop="sceneClassification">
+      <el-form-item label="评审类型" prop="sceneClassification">
         <el-select
           v-model="sceneForm.sceneClassification"
           placeholder="请选择评审类型"
@@ -56,6 +56,7 @@
         <el-input
           v-model="sceneForm.sceneContent"
           maxlength="100"
+          placeholder="请输入场景内容"
           show-word-limit
           type="textarea"
         />
@@ -68,6 +69,7 @@
         <el-input
           v-model="sceneForm.remark"
           maxlength="100"
+          placeholder="请输入备注信息"
           show-word-limit
           type="textarea"
         />
@@ -76,7 +78,7 @@
     <span slot="footer" class="dialog-footer">
       <el-button @click="handleSceneClose()">取 消</el-button>
       <el-button type="primary" @click="handleSaveNewScene()">
-        确 定
+        发 起
       </el-button>
     </span>
   </el-dialog>
@@ -112,7 +114,7 @@ export default {
     }
   },
   methods: {
-    // 新增场景对话框关闭时触发的回调函数
+    // 发起场景评审关闭时触发的回调函数
     handleSceneClose() {
       this.dialogManger.dialogVisible = false
       this.$refs.sceneForm.resetFields()

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

@@ -23,7 +23,7 @@
     <header-button icon="plus" type="primary" @click="handleAddScene">
       新增场景
     </header-button>
-    <!--  新增场景对话框  -->
+    <!--  发起场景评审  -->
     <scene-dialog :dialog-manger="sceneManger"></scene-dialog
   ></el-dialog>
 </template>

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

@@ -133,10 +133,7 @@
                 <span>{{ taskModel.reviewKeypointText }}</span>
               </el-form-item>
               <el-form-item class="right-content-item" label="审查细则">
-                <div
-                  class="scene-content"
-                  @click="sceneView(taskModel.reviewSceneList)"
-                >
+                <div class="scene-content">
                   <el-tooltip
                     effect="dark"
                     content="查看场景"
@@ -148,6 +145,7 @@
                       width="30px"
                       height="30px"
                       icon-class="tag_tuijian"
+                      @click.native="sceneView(taskModel.reviewSceneList)"
                     ></svg-icon>
                   </el-tooltip>
 
@@ -273,7 +271,7 @@
     </task-standard>
     <!-- 场景查看对话框 -->
     <scene-view :dialog-manger="sceneViewManger"></scene-view>
-    <!--  新增场景对话框  -->
+    <!--  发起场景评审  -->
     <scene-dialog :dialog-manger="sceneManger"></scene-dialog>
     <preview-view :dialog-manger="previewManger"></preview-view>
   </div>

src/views/setting/testMatrix/useCaseDetails/index.vue

 <!-- 测试用例详情 -->
 <template>
   <page-standard>
-    <div>
-      {{ '测试用例详情' }}
+    <div class="web-page">
+      <iframe
+        :src="url"
+        frameborder="0"
+        style="width: 100%; height: 100%"
+      ></iframe
+      >Ï
     </div>
   </page-standard>
 </template>
@@ -12,11 +17,16 @@ export default {
   name: 'Index',
   data() {
     return {
-      id: this.$route.query
+      id: this.$route.query,
+      url: 'http://10.12.48.80:8089/car/caseManage/case/casePublishDetail/case_items;375'
     }
   },
   mounted() {}
 }
 </script>
 
-<style scoped></style>
+<style scoped>
+.web-page {
+  height: 90vh;
+}
+</style>

src/views/system/role/index.vue

@@ -124,7 +124,12 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="角色编号" align="left" prop="roleId" width="120" />
+      <el-table-column
+        label="角色编号"
+        align="left"
+        prop="roleId"
+        width="120"
+      />
       <el-table-column
         label="角色名称"
         align="left"

src/views/task/on/index.vue

 <template>
   <page-standard>
     <div slot="tab">
-      <el-tabs v-model="queryParams.taskStatus" @tab-click="loadData">
+      <el-tabs v-model="active" @tab-click="loadData">
         <el-tab-pane
           v-for="(dict, key) in reviewTypeList"
           :key="key"
@@ -205,8 +205,8 @@
                       item.reviewStatus !== 'FINISH'
                         ? item.reviewStatus === 'NEW'
                           ? ''
-                          : 'green'
-                        : 'yellow'
+                          : 'yellow'
+                        : 'green'
                     ]"
                   >
                     <span
@@ -220,7 +220,7 @@
                     >
                     <span v-if="item.reviewStatus !== 'NEW'"
                       >{{
-                        item.reviewStatus !== 'FINISH' ? '(共耗时' : '已耗时('
+                        item.reviewStatus !== 'FINISH' ? '(共耗时' : '(已耗时'
                       }}{{ getHourDiff(item.systemTaskBeginTime) }})</span
                     >
                   </div>
@@ -236,8 +236,8 @@
                       item.carReviewStatus !== 'FINISH'
                         ? item.carReviewStatus === 'NEW'
                           ? ''
-                          : 'green'
-                        : 'yellow'
+                          : 'yellow'
+                        : 'green'
                     ]"
                   >
                     <span
@@ -253,7 +253,7 @@
                       >{{
                         item.carReviewStatus !== 'FINISH'
                           ? '(共耗时'
-                          : '已耗时('
+                          : '(已耗时'
                       }}{{ getHourDiff(item.carTaskBeginTime) }})</span
                     >
                   </div>
@@ -268,8 +268,8 @@
                       item.carTestStatus !== 'FINISH'
                         ? item.carTestStatus == 'NEW'
                           ? ''
-                          : 'green'
-                        : 'yellow'
+                          : 'yellow'
+                        : 'green'
                     ]"
                   >
                     <span
@@ -283,7 +283,7 @@
                     >
                     <span v-if="item.carTestStatus !== 'NEW'"
                       >{{
-                        item.carTestStatus !== 'FINISH' ? '(共耗时' : '已耗时('
+                        item.carTestStatus !== 'FINISH' ? '(共耗时' : '(已耗时'
                       }}{{ getHourDiff(item.taskBeginTime) }})</span
                     >
                   </div>
@@ -403,7 +403,7 @@
             </div>
             <div class="card-buttons">
               <el-button
-                v-if="item.reviewStatus !== 'NONE'"
+                v-if="item.reviewStatus && item.reviewStatus !== 'NONE'"
                 type="primary"
                 plain
                 size="mini"
@@ -416,7 +416,7 @@
                 >体系审查原始记录</el-button
               >
               <el-button
-                v-if="item.carReviewStatus !== 'NONE'"
+                v-if="item.carReviewStatus && item.carReviewStatus !== 'NONE'"
                 type="primary"
                 plain
                 size="mini"
@@ -429,7 +429,7 @@
                 >车型审查原始记录</el-button
               >
               <el-button
-                v-if="item.carTestStatus !== 'NONE'"
+                v-if="item.carTestStatus && item.carTestStatus !== 'NONE'"
                 type="primary"
                 plain
                 size="mini"
@@ -531,6 +531,7 @@ export default {
         pageNum: 1,
         pageSize: 10
       },
+      active: 0,
       showSearch: true,
       tableData: []
     }
@@ -544,9 +545,10 @@ export default {
   methods: {
     loadData() {
       this.loading = true
-      console.log(this.queryParams)
-      if (this.queryParams.taskStatus === '0') {
+      if (this.active === '0') {
         this.queryParams.taskStatus = ''
+      } else {
+        this.queryParams.taskStatus = this.active
       }
       request({
         url: this.listUrl,

src/views/task/questionnaire/index.vue

@@ -244,9 +244,9 @@
         >
       </div>
     </el-card>
-    <!--  新增场景对话框  -->
+    <!--  发起场景评审  -->
     <el-dialog
-      title="新增场景对话框"
+      title="发起场景评审"
       :visible.sync="senceDialogVisible"
       width="35%"
       append-to-body
@@ -258,7 +258,7 @@
         <div>
           <i
             class="el-icon-info"
-          />新增场景，需要组织评审，评审通过后新增场景自动进入场景库。
+          />新增场景，需要组织评审，评审通过后新增场景自动进入审查场景库。
         </div>
       </div>
       <el-form
@@ -435,7 +435,7 @@ export default {
       this.$modal.msgSuccess('提交问卷成功')
       this.$router.back()
     },
-    // 新增场景对话框关闭时触发的回调函数
+    // 发起场景评审关闭时触发的回调函数
     handleSceneClose() {
       this.senceDialogVisible = false
       this.$refs.sceneForm.resetFields()

src/views/tool/gen/editTable.vue

@@ -129,7 +129,7 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column align="left"         label="字典类型" min-width="12%">
+          <el-table-column align="left" label="字典类型" min-width="12%">
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.dictType"

src/views/tool/gen/importTable.vue

@@ -62,8 +62,16 @@
           align="left"
           :show-overflow-tooltip="true"
         ></el-table-column>
-        <el-table-column prop="createTime" align="left" label="创建时间"></el-table-column>
-        <el-table-column prop="updateTime" align="left" label="更新时间"></el-table-column>
+        <el-table-column
+          prop="createTime"
+          align="left"
+          label="创建时间"
+        ></el-table-column>
+        <el-table-column
+          prop="updateTime"
+          align="left"
+          label="更新时间"
+        ></el-table-column>
       </el-table>
       <pagination
         v-show="total > 0"