fix: 代码修改

src/layout/components/Navbar.vue

@@ -51,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 {
@@ -64,11 +64,10 @@ export default {
   },
   data() {
     return {
-      avatar
     }
   },
   computed: {
-    ...mapGetters(['sidebar', 'device', 'name']),
+    ...mapGetters(['sidebar', 'device', 'name','avatar']),
     setting: {
       get() {
         return this.$store.state.settings.showSettings

src/store/modules/user.js

@@ -73,6 +73,7 @@ const user = {
             commit('SET_ID', user.userId)
             commit('SET_NAME', user.nickName)
             commit('SET_AVATAR', avatar)
+            
             resolve(res)
           })
           .catch(error => {

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/setting/sample/taskDetails/index.vue

@@ -70,7 +70,7 @@
           </el-col>
           <el-col :span="8" class="card-title">
             <el-form-item label="委托单位：">
-              <el-link @click="dialogVisible = true">{{
+              <el-link type="primary" @click="dialogVisible = true">{{
                 taskForm.entrustedUnit
               }}</el-link>
             </el-form-item>

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

 <template>
   <div>
-    <!-- <div class="user-info-head" @click="editCropper()">
-      <img :src="options.img" title="点击上传头像" class="img-circle img-lg" />
-    </div> -->
     <div class="user-info-head" @click="editCropper()">
-      <img :src="avatar" title="点击上传头像" class="img-circle img-lg" />
+      <img :src="options.img" title="点击上传头像" class="img-circle img-lg" />
     </div>
-    <!-- <el-dialog
+
+    <el-dialog
       :title="title"
       :visible.sync="open"
       width="800px"
@@ -84,18 +82,18 @@
           >
         </el-col>
       </el-row>
-    </el-dialog> -->
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import store from '@/store'
-// import { VueCropper } from 'vue-cropper'
+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 },
+  components: { VueCropper },
   data() {
     return {
       avatar,
@@ -201,21 +199,21 @@ export default {
   height: 120px;
 }
 
-// .user-info-head:hover:after {
-//   content: '+';
-//   position: absolute;
-//   left: 0;
-//   right: 0;
-//   top: 0;
-//   bottom: 0;
-//   color: #eee;
-//   background: rgba(0, 0, 0, 0.5);
-//   font-size: 24px;
-//   font-style: normal;
-//   -webkit-font-smoothing: antialiased;
-//   -moz-osx-font-smoothing: grayscale;
-//   cursor: pointer;
-//   line-height: 110px;
-//   border-radius: 50%;
-// }
+.user-info-head:hover:after {
+  content: '+';
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  color: #eee;
+  background: rgba(0, 0, 0, 0.5);
+  font-size: 24px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  cursor: pointer;
+  line-height: 110px;
+  border-radius: 50%;
+}
 </style>