Răsfoiți Sursa

优化样式

qinzhipeng_v@didiglobal.com 4 ani în urmă
părinte
comite
6250fc1f80

BIN
src/assets/current.png


BIN
src/assets/expand.png


+ 10 - 2
src/components/newLayout/Aside.vue

@@ -10,15 +10,15 @@
     >
       <div class="business">
         <div
+          v-if="false"
           class="business-select"
           :class="{ 'show-business-all': showBizIdSelect }"
-          @click="handleClickRouter({ name: '业务线选择' })"
           @mouseenter="showBizIdSelect = true"
           @mouseleave="showBizIdSelect = false"
         >
           <img src="../../assets/业务线选择.png" class="business-logo"><span v-show="showBizIdSelect">项目管理首页</span>
         </div>
-        {{ bizName }}
+        {{ bizName }}<span class="el-icon-edit iconFont" @click="handleClickRouter({ name: '业务线选择' })" />
       </div>
       <ul class="all-pages-list">
         <li v-for="item in routesList" :key="item.path" @click="handleClickRouter(item)">
@@ -344,4 +344,12 @@ section {
     border-bottom-right-radius: 4px;
   }
 }
+.iconFont {
+  font-size: 14px;
+  margin: 3px 4px 0;
+}
+.iconFont:hover {
+  cursor: pointer;
+  color: #409eff;
+}
 </style>

+ 2 - 1
src/components/newLayout/Head.vue

@@ -143,7 +143,8 @@ export default {
   font-size: 14px;
   color: #ffffff;
   text-align: center;
-  margin-bottom: 28px;
+  margin-bottom: 20px;
+  padding: 5px 0 9px 0;
   cursor: pointer;
   .icon {
     position: relative;

+ 2 - 3
src/styles/detail-pages.scss

@@ -11,7 +11,7 @@
   display:flex;
   align-items: center;
   justify-content: center;
-  margin-top: 10px;
+  // margin-top: 10px;
   padding-top: 70px;
   .el-main {
     background-color: #FFFFFF;
@@ -49,14 +49,13 @@
   top: 0;
   width: calc(100% - 150px);
 }
-@mixin main-header { 
+@mixin main-header {
   height: 60px;
   padding-left: 30px;
   background-color: #ffffff;
   display: flex;
   justify-content: space-between;
   align-items: center;
-  border-top: 10px solid #F2F3F6;
   box-sizing: content-box;
   .header-title{
     float: left;

+ 1 - 1
src/views/ToConfigure/components/bizConfigure.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="margin: 0 10px;">
     <p class="biz_property">业务线属性</p>
     <el-radio-group v-model="radio" :disabled="Prohibit" class="biz_radio">
       <el-radio label="0"> 公开 </el-radio>

+ 1 - 1
src/views/ToConfigure/components/memberConfiguration.vue

@@ -141,7 +141,7 @@ export default {
 }
 .member_main {
   min-height: calc(100vh - 203px);
-  padding: 20px 0 20px 20px;
+  padding: 20px 0 20px 30px;
 }
 .member_footer {
   text-align: center;

+ 52 - 34
src/views/business/bizIdSelect.vue

@@ -15,7 +15,8 @@
               :class="'business-item' + (index % 4)"
               @click="enter(item,'my')"
             >
-              {{ item.name }}
+              <img v-show="item.code === bizId || item.code === bizs" src="@/assets/current.png" class="biz-img">
+              <span class="biz-name">{{ item.name }}</span>
             </div>
           </div>
         </div>
@@ -29,7 +30,8 @@
               :class="['business-item' + (index % 4), item.isSecret?'disable':'']"
               @click="enter(item,'all')"
             >
-              {{ item.name }}
+              <img v-show="item.code === bizId || item.code === bizs" src="@/assets/current.png" class="biz-img">
+              <span class="biz-name">{{ item.name }}</span>
             </div>
           </div>
         </div>
@@ -53,7 +55,8 @@ export default {
   data() {
     return {
       bizSelectList: [], // 业务线选择列表
-      myBusiness: []
+      myBusiness: [],
+      bizs: ''
     }
   },
   computed: {
@@ -67,6 +70,9 @@ export default {
     this.settingGetBizList()
     this.getPersonBizList()
   },
+  mounted() {
+    if (this.bizId === -1) this.bizs = Number(localStorage.getItem('bizId'))
+  },
   methods: {
     async settingGetBizList() {
       const res = await settingGetBizList({})
@@ -119,7 +125,7 @@ export default {
 .business-contain {
   height: 100%;
   width: 100%;
-  padding: 120px 130px;
+  padding: 70px 130px 120px;
   background-color: #f7f8fc;
 }
 .bizId-select {
@@ -163,7 +169,8 @@ export default {
   .my-business-list {
     padding: 27px 32px;
     display: grid;
-    grid-template-columns: repeat(4, 25%);
+    text-align: center;
+    grid-template-columns: repeat(5, 20%);
     grid-gap: 50px 0;
   }
 }
@@ -175,7 +182,8 @@ export default {
   .all-business-list {
     padding: 27px 32px;
     display: grid;
-    grid-template-columns: repeat(4, 25%);
+    text-align: center;
+    grid-template-columns: repeat(5, 20%);
     grid-gap: 50px 0;
   }
 }
@@ -200,41 +208,41 @@ export default {
   background-color: #409eff;
 }
 .business-item0 {
-  color: #409eff;
-  border: 1px solid #409eff;
-  box-shadow: 0px 6px 12px rgba(64, 158, 255, 0.2);
-}
-.business-item0:hover {
-  color: #ffffff;
-  background-color: #409eff;
+  color: #333;
+  border: 1px solid #666;
+  box-shadow: 0px 6px 12px rgba(153, 153, 153, 0.2);
 }
+// .business-item0:hover {
+//   color: #ffffff;
+//   background-color: #409eff;
+// }
 .business-item1 {
-  color: #f88c51;
-  border: 1px solid #f88c51;
-  box-shadow: 0px 6px 12px rgba(239, 160, 117, 0.2);
-}
-.business-item1:hover {
-  color: #ffffff;
-  background-color: #f88c51;
+  color: #333;
+  border: 1px solid #666;
+  box-shadow: 0px 6px 12px rgba(153, 153, 153, 0.2);
 }
+// .business-item1:hover {
+//   color: #ffffff;
+//   background-color: #f88c51;
+// }
 .business-item2 {
-  color: #ae61cf;
-  border: 1px solid #ae61cf;
-  box-shadow: 0px 6px 12px rgba(174, 97, 207, 0.2);
-}
-.business-item2:hover {
-  color: #ffffff;
-  background-color: #ae61cf;
+  color: #333;
+  border: 1px solid #666;
+  box-shadow: 0px 6px 12px rgba(153, 153, 153, 0.2);
 }
+// .business-item2:hover {
+//   color: #ffffff;
+//   background-color: #ae61cf;
+// }
 .business-item3 {
-  color: #13cbc2;
-  border: 1px solid #13cbc2;
-  box-shadow: 0px 6px 12px rgba(19, 203, 194, 0.2);
-}
-.business-item3:hover {
-  color: #ffffff;
-  background-color: #13cbc2;
+  color: #333;
+  border: 1px solid #666;
+  box-shadow: 0px 6px 12px rgba(153, 153, 153, 0.2);
 }
+// .business-item3:hover {
+//   color: #ffffff;
+//   background-color: #13cbc2;
+// }
 .business-tips {
   margin-top: 43px;
   margin-bottom: 50px;
@@ -265,4 +273,14 @@ export default {
   color: #999999;
   background-color: #ffffff;
 }
+.biz-img {
+  display: inline-block;
+  width: 15px;
+  position: relative;
+  top: -7px;
+  left: 11px;
+}
+.biz-name {
+  width: 150px;
+}
 </style>

+ 2 - 2
src/views/quality/defectStatistics.vue

@@ -756,7 +756,7 @@ export default {
   .defect-main {
     padding: 20px 20px 0 20px;
     height:100%;
-    width: calc(100%-60px);
+    width: calc(100%-20px);
     background:#ffffff;
     margin: 10px;
     border-radius: 4px;
@@ -859,7 +859,7 @@ export default {
   }
   .charts-main {
     padding-bottom: 20px;
-    width:calc(100%-60px);
+    width:calc(100% - 20px);
     background:#ffffff;
     margin: 10px;
     border-radius: 4px;