Переглянути джерело

优化导航栏和登陆头像

qinzhipeng_v 5 роки тому
батько
коміт
4cea22ba8d

+ 1 - 1
src/components/Hamburger/index.vue

@@ -10,7 +10,7 @@
       height="64"
     >
       <!-- <path d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" /> -->
-      <path d="M0 0m70.550626 0l987.708758 0q70.550626 0 70.550625 70.550626l0 0q0 70.550626-70.550625 70.550625l-987.708758 0q-70.550626 0-70.550626-70.550625l0 0q0-70.550626 70.550626-70.550626Z" fill="#FFFFFF" p-id="567" /><path d="M0 423.303754m70.550626 0l564.405004 0q70.550626 0 70.550626 70.550625l0 0q0 70.550626-70.550626 70.550626l-564.405004 0q-70.550626 0-70.550626-70.550626l0 0q0-70.550626 70.550626-70.550625Z" fill="#FFFFFF" p-id="568" /><path d="M0 846.607507m70.550626 0l987.708758 0q70.550626 0 70.550625 70.550626l0 0q0 70.550626-70.550625 70.550625l-987.708758 0q-70.550626 0-70.550626-70.550625l0 0q0-70.550626 70.550626-70.550626Z" fill="#FFFFFF" p-id="569" />
+      <path d="M0 0m70.550626 0l987.708758 0q70.550626 0 70.550625 70.550626l0 0q0 70.550626-70.550625 70.550625l-987.708758 0q-70.550626 0-70.550626-70.550625l0 0q0-70.550626 70.550626-70.550626Z" fill="#6F7C93" p-id="567" /><path d="M0 423.303754m70.550626 0l564.405004 0q70.550626 0 70.550626 70.550625l0 0q0 70.550626-70.550626 70.550626l-564.405004 0q-70.550626 0-70.550626-70.550626l0 0q0-70.550626 70.550626-70.550625Z" fill="#6F7C93" p-id="568" /><path d="M0 846.607507m70.550626 0l987.708758 0q70.550626 0 70.550625 70.550626l0 0q0 70.550626-70.550625 70.550625l-987.708758 0q-70.550626 0-70.550626-70.550625l0 0q0-70.550626 70.550626-70.550626Z" fill="#6F7C93" p-id="569" />
     </svg>
   </div>
 </template>

+ 16 - 8
src/layout/components/Navbar.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="navbar">
     <div>
-      <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+      <!-- <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" /> -->
       <breadcrumb class="breadcrumb-container" />
     </div>
     <div>
       <div class="right-menu" style="display: fiex; align-items: center; justify-content: space-between;">
-        <el-avatar style="vertical-align: middle;" size="small" src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png" />
+        <el-avatar style="vertical-align: middle; background: #FFF;" size="small"><img :src="options.phoneUrl"></el-avatar>
         <el-dropdown placement="bottom" trigger="click">
           <span class="el-dropdown-link avatar-container" style="color: #FFFFFF; cursor: pointer;" @click="show2 = !show2">
             {{ username }}
@@ -24,20 +24,22 @@
 <script>
 import { mapGetters } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
+// import Hamburger from '@/components/Hamburger'
 import { settingQueryBizTypeList } from '@/api/settingQueryBizTypeList.js'
 import Utils from '../../util.js'
 import { logoutUrl } from '@/apiConfig/requestIP.js'
+import { memberQueryMemberInfoByIDAPorName } from '@/api/projectIndex'
 
 export default {
   components: {
-    Breadcrumb,
-    Hamburger
+    Breadcrumb
+    // Hamburger
   },
   data() {
     return {
       bizOptions: [],
       show2: false,
+      options: [],
       bizShow: {
         id: ''
       }
@@ -56,9 +58,9 @@ export default {
     this.get_bizArr()
   },
   methods: {
-    toggleSideBar() {
-      this.$store.dispatch('app/toggleSideBar')
-    },
+    // toggleSideBar() {
+    //   this.$store.dispatch('app/toggleSideBar')
+    // },
     // logout() {
     //   // await this.$store.dispatch('user/logout')
     //   // this.$router.push(`/login?redirect=${this.$route.fullPath}`)
@@ -70,6 +72,9 @@ export default {
         var int = Number(localStorage.getItem('key'))
         int === 0 ? int = '' : ''
         this.bizShow.id = int
+        memberQueryMemberInfoByIDAPorName({ memberIDAP: localStorage.getItem('realname') }).then(res => {
+          this.options = res.data[0]
+        })
       })
     },
     bizchnage(ele) {
@@ -88,6 +93,9 @@ export default {
 .navbar .rotateNone {
   transform: rotate(270deg);
 }
+.navbar img {
+    margin: 0 auto;
+}
 .navbar .rotate {
   transform: rotate(90deg);
 }

Різницю між файлами не показано, бо вона завелика
+ 0 - 10
src/layout/components/Sidebar/index.vue


+ 6 - 0
src/views/projectManage/bugList/css/index.css

@@ -105,6 +105,12 @@
 .Parent .el-dialog__header {
   padding: 0;
 }
+.Parent .el-dialog__body {
+  padding: 30px 20px 15px 20px;
+  color: #606266;
+  font-size: 14px;
+  word-break: break-all;
+}
 
 .he {
   margin: 0 4% 2% 4%;

+ 1 - 10
src/views/projectManage/bugList/file/createdBug.vue

@@ -155,7 +155,7 @@
             </div>
           </div>
         </div>
-        <el-form-item style="text-align: right;margin: 0% 4%;">
+        <el-form-item style="text-align: right;margin: 15px 4% 0 4%;">
           <el-button size="small" @click="modalShow = false">取 消</el-button>
           <el-button :disabled="dis" type="primary" size="small" @click="bug_created(formInline)">创 建</el-button>
         </el-form-item>
@@ -387,15 +387,6 @@ export default {
             }))
           }))
         }))
-        // this.BusinessLine = res.data // 业务线
-        // this.BusinessLine.map(item => {
-        //   item.child !== null ? item.child.map(value => {
-        //     this.arr_platform.push(value) // 平台数据
-        //     value.child.map(num => {
-        //       this.arr_Modular.push(num) // 模块数据
-        //     })
-        //   }) : ''
-        // })
       })
     }
   }

Деякі файли не було показано, через те що забагато файлів було змінено