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

# Conflicts:
#	src/store/modules/user.js

src/assets/styles/process.scss

@@ -79,7 +79,12 @@
 .orange {
   color: #f9a221;
 }
-
+.taskLeader {
+  width:120px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 .standard-box {
   display: flex;
   justify-content: space-between;

src/components/ImageUpload/index.vue

@@ -133,6 +133,7 @@ export default {
         // const regex = /[\s~`!@#$%^&*()\-_=+[\]{}|;:'",<>/?]/
         const regex = /[~`!@#$%^&*=[\]{}|;:'",<>/?]/
         const result = regex.test(file.name)
+
         if (result === true) {
           this.fileList = []
           // this.$refs.imageUpload.clearFiles()
@@ -141,6 +142,7 @@ export default {
           let isImg = false
           if (this.fileType.length) {
             let fileExtension = ''
+    
             if (file.name.lastIndexOf('.') > -1) {
               fileExtension = file.name.slice(file.name.lastIndexOf('.') + 1)
             }
@@ -149,6 +151,7 @@ export default {
               if (fileExtension && fileExtension.indexOf(type) > -1) return true
               return false
             })
+            console.log(isImg)
           } else {
             isImg = file.type.indexOf('image') > -1
           }

src/layout/components/Navbar.vue

@@ -26,6 +26,7 @@
       >
         <div class="avatar-wrapper">
           <img :src="avatar" class="user-avatar" />
+          <div class="user-name">{{ name }}</div>
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
@@ -50,7 +51,7 @@ import Breadcrumb from '@/components/Breadcrumb'
 import TopNav from '@/components/TopNav'
 import Hamburger from '@/components/Hamburger'
 import QuickNew from '@/components/QuickNew'
-import avatar from '@/assets/images/touxiang.png'
+// import avatar from '@/assets/images/touxiang.png'
 // import QuickNew from '@/components/QuickNew'
 // import MessageWaring from '@/components/MessageWaring'
 export default {
@@ -63,11 +64,10 @@ export default {
   },
   data() {
     return {
-      avatar
     }
   },
   computed: {
-    ...mapGetters(['sidebar', 'device']),
+    ...mapGetters(['sidebar', 'device', 'name','avatar']),
     setting: {
       get() {
         return this.$store.state.settings.showSettings
@@ -177,7 +177,19 @@ export default {
       .avatar-wrapper {
         margin-top: 5px;
         position: relative;
-
+        display: flex;
+        align-items: flex;
+
+        .user-name {
+          line-height: 40px;
+          font-size: 14px;
+          font-weight: bold;
+          max-width: 100px;
+          margin: 0 10px;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
         .user-avatar {
           cursor: pointer;
           width: 40px;

src/store/modules/user.js

@@ -75,7 +75,7 @@ const user = {
               commit('SET_ROLES', ['ROLE_DEFAULT'])
             }
             commit('SET_ID', user.userId)
-            commit('SET_NAME', user.userName)
+            commit('SET_NAME', user.nickName)
             commit('SET_AVATAR', avatar)
             commit('SET_DEPT', res.user.dept)
             resolve(res)

src/views/processing/archivedTask/index.vue

@@ -136,7 +136,9 @@
                     style="margin-right: 5px"
                     fill="#999999"
                   />
-                  {{ item.leader ? item.leader : '---' }}
+                  <span class="taskLeader">{{
+                    item.leader ? item.leader : '---'
+                  }}</span>
                 </div>
               </div>
             </div>

src/views/processing/carTest/confirmation-test/index.vue

@@ -15,25 +15,27 @@
           <div class="task-item">
             <span class="task-label">任务编号:</span>
             <span class="task-content">
-              {{ task.taskNo }}
+              {{ taskDetail.taskNo }}
             </span>
           </div>
           <div class="task-item">
             <span class="task-label">任务名称:</span>
             <span class="task-content">
-              {{ task.taskName }}
+              {{ taskDetail.taskName }}
             </span>
           </div>
           <div class="task-item">
             <span class="task-label">委托单位:</span>
             <span class="task-content">
-              {{ task.entrustedUnit }}
+              {{ taskDetail.entrustedUnit }}
             </span>
           </div>
           <div class="task-item">
             <span class="task-label">任务状态:</span>
             <span class="task-content">
-              {{ getDictData(dict.type.task_test_status, task.taskStatus) }}
+              {{
+                getDictData(dict.type.task_test_status, taskDetail.taskStatus)
+              }}
             </span>
           </div>
         </div>
@@ -268,6 +270,7 @@ export default {
         reviewSceneChangeTasks: {},
         detailsList: []
       },
+      taskDetail: {},
       ruleForm: {
         enterpriseLeader: '',
         inspectionLeader: '',
@@ -338,7 +341,8 @@ export default {
     getTestDetail() {
       this.loading = true
       testDetail({ taskId: this.$route.query.id }).then(res => {
-        this.tableData = res.data
+        this.taskDetail = res.data
+        this.tableData = res.data.modelTestTaskViewResponseList
         this.loading = false
         this.openAll()
       })

src/views/processing/carTest/execution-test-plan/components/SchemeView.vue

@@ -229,7 +229,8 @@ export default {
     async getTestDetail(id) {
       this.loading = true
       const res = await testDetail({ taskId: id })
-      this.model = res.data
+
+      this.model = res.data.modelTestTaskViewResponseList
       this.loading = false
     },
     /** 全部展开 */

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

@@ -19,25 +19,25 @@
         <div class="task-item">
           <span class="task-label">任务编号:</span>
           <span class="task-content">
-            {{ task.taskNo }}
+            {{ taskDetail.taskNo }}
           </span>
         </div>
         <div class="task-item">
           <span class="task-label">任务名称:</span>
           <span class="task-content">
-            {{ task.taskName }}
+            {{ taskDetail.taskName }}
           </span>
         </div>
         <div class="task-item">
           <span class="task-label">委托单位:</span>
           <span class="task-content">
-            {{ task.entrustedUnit }}
+            {{ taskDetail.entrustedUnit }}
           </span>
         </div>
         <div class="task-item">
           <span class="task-label">任务状态:</span>
           <span class="task-content">
-            {{ getDictData(dict.type.task_test_status, task.taskStatus) }}
+            {{ getDictData(dict.type.task_test_status, taskDetail.taskStatus) }}
           </span>
         </div>
       </div>
@@ -87,7 +87,7 @@
                     </div>
                   </div>
                   <div class="standard-result">
-                    <el-button type="text" @click="testmMthod(item)"
+                    <el-button type="text" @click.stop="testmMthod(item)"
                       >标准测试方法</el-button
                     >
                   </div>
@@ -164,6 +164,7 @@ export default {
       open: false,
       tableData: [],
       activeNames: [],
+      taskDetail: {},
       model: {
         systemReviewTask: {},
         reviewSceneChangeTasks: {},
@@ -211,7 +212,8 @@ export default {
     getTestDetail() {
       this.loading = true
       testDetail({ taskId: this.$route.query.id }).then(res => {
-        this.tableData = res.data
+        this.taskDetail = res.data
+        this.tableData = res.data.modelTestTaskViewResponseList
         this.loading = false
         this.openAll()
       })

src/views/processing/processed-review/index.vue

@@ -135,7 +135,9 @@
                   style="margin-right: 5px"
                   fill="#999999"
                 />
-                {{ item.leader ? item.leader : '---' }}
+                <span class="taskLeader">{{
+                  item.leader ? item.leader : '---'
+                }}</span>
               </div>
             </div>
             <div class="card-buttons">

src/views/processing/unprocessed-review/index.vue

@@ -127,7 +127,9 @@
                     style="margin-right: 5px"
                     fill="#999999"
                   />
-                  {{ item.leader ? item.leader : '---' }}
+                  <span class="taskLeader">{{
+                    item.leader ? item.leader : '---'
+                  }}</span>
                 </div>
               </div>
             </div>

src/views/system/dept/index.vue

@@ -82,6 +82,22 @@
       <el-table-column
         prop="deptName"
         label="部门名称"
+        show-overflow-tooltip
+        width="260"
+        align="left"
+      ></el-table-column>
+      <el-table-column
+        prop="address"
+        label="地址"
+        show-overflow-tooltip
+        width="260"
+        align="left"
+      ></el-table-column>
+
+      <el-table-column
+        prop="postcode"
+        label="邮政编码"
+        show-overflow-tooltip
         width="260"
         align="left"
       ></el-table-column>

src/views/system/user/profile/userAvatar.vue

@@ -3,6 +3,7 @@
     <div class="user-info-head" @click="editCropper()">
       <img :src="options.img" title="点击上传头像" class="img-circle img-lg" />
     </div>
+
     <el-dialog
       :title="title"
       :visible.sync="open"
@@ -90,11 +91,12 @@ import store from '@/store'
 import { VueCropper } from 'vue-cropper'
 import { uploadAvatar } from '@/api/system/user'
 import { debounce } from '@/utils'
-
+import avatar from '@/assets/images/touxiang.png'
 export default {
   components: { VueCropper },
   data() {
     return {
+      avatar,
       // 是否显示弹出层
       open: false,
       // 是否显示cropper

src/views/task/on/index.vue

@@ -137,7 +137,9 @@
                   style="margin-right: 5px"
                   fill="#999999"
                 />
-                {{ item.leader ? item.leader : '---' }}
+                <span class="taskLeader">{{
+                  item.leader ? item.leader : '---'
+                }}</span>
               </div>
             </div>
             <div class="card-cell">
@@ -406,7 +408,9 @@
                   style="margin-right: 5px"
                   fill="#999999"
                 />
-                {{ item.leader ? item.leader : '---' }}
+                <span class="taskLeader">{{
+                  item.leader ? item.leader : '---'
+                }}</span>
               </div>
             </div>
             <div class="card-buttons">