fix: 70973 70978

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">
@@ -67,7 +68,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['sidebar', 'device']),
+    ...mapGetters(['sidebar', 'device', 'name']),
     setting: {
       get() {
         return this.$store.state.settings.showSettings
@@ -177,7 +178,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

@@ -71,7 +71,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)
             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/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

@@ -85,6 +85,18 @@
         width="260"
         align="left"
       ></el-table-column>
+      <el-table-column
+        prop="address"
+        label="地址"
+        width="260"
+        align="left"
+      ></el-table-column>
+      <el-table-column
+        prop="postcode"
+        label="邮政编码"
+        width="260"
+        align="left"
+      ></el-table-column>
       <el-table-column
         prop="orderNum"
         label="排序"

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

 <template>
   <div>
-    <div class="user-info-head" @click="editCropper()">
+    <!-- <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" />
     </div>
-    <el-dialog
+    <!-- <el-dialog
       :title="title"
       :visible.sync="open"
       width="800px"
@@ -81,20 +84,21 @@
           >
         </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,
       // 是否显示弹出层
       open: false,
       // 是否显示cropper
@@ -197,21 +201,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>

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">