Merge branch 'hjw-spfmui' into 'test-new'

ui

See merge request spfm/spfm-market-front!178

src/pages/main/leader/leaderHprocess.vue

@@ -2,7 +2,7 @@
   <div class="pmain">
     <div class="layui-col-md6" v-for="(ite, index) in funcData" :key="index">
       <div class="mc-nomal-title">
-        <span style="font-size:15px">{{ ite.lineName }}</span>
+        <span style="font-size: 15px">{{ ite.lineName }}</span>
       </div>
       <div class="bg-style">
         <div class="mc-function-box">
@@ -21,37 +21,41 @@
                 :max="99"
                 :hidden="items.noTaskNum == 0"
               >
-                <i
-                  @click="jumpTo(items)"
-                  v-if="items.sts == '0' && items.icon"
-                  v-html="items.icon"
-                >
-                  {{ items.icon }}
-                </i>
-                <i
-                  @click="jumpTo(items)"
-                  :class="'el-icon-user'"
-                  v-if="items.sts == '0' && !items.icon"
-                  style="background: #0b82ff"
-                ></i>
-                <i
-                  :class="'iconfont icon-tongji'"
-                  v-if="items.sts != '0'"
-                  style="background: #ddd"
-                ></i>
-                <el-tooltip
-                  class="item"
-                  effect="dark"
-                  :content="items.moduleName"
-                  placement="bottom"
-                >
-                </el-tooltip>
-                <span style="float: right" @click="jumpTo(items)">
-                  {{ items.moduleName }}
-                  <span class="f-box-tit">
-                    {{ item.unitName }}
-                  </span>
-                </span>
+                <div style="float: left;">
+                  <i
+                    @click="jumpTo(items)"
+                    v-if="items.sts == '0' && items.icon"
+                    v-html="items.icon"
+                  >
+                    {{ items.icon }}
+                  </i>
+                  <i
+                    @click="jumpTo(items)"
+                    :class="'el-icon-user'"
+                    v-if="items.sts == '0' && !items.icon"
+                    style="background: #0b82ff"
+                  ></i>
+                  <i
+                    :class="'iconfont icon-tongji'"
+                    v-if="items.sts != '0'"
+                    style="background: #ddd"
+                  ></i>
+                  <el-tooltip
+                    class="item"
+                    effect="dark"
+                    :content="items.moduleName"
+                    placement="bottom"
+                  >
+                  </el-tooltip>
+                </div>
+                <div class="span" style="float: right;">
+                  <div  @click="jumpTo(items)">
+                    {{ items.moduleName }}
+                    <div class="f-box-tit">
+                      {{ item.unitName }}
+                    </div>
+                  </div>
+                </div>
               </el-badge>
             </div>
             <div class="f-box-info" v-if="item.modList.length == 0"></div>
@@ -181,14 +185,13 @@ export default {
   display: flex;
   flex-wrap: wrap;
   justify-content: space-between;
-  
 
   .layui-col-md6 {
     display: inline-block;
     margin-bottom: 10px;
     width: 100%;
-    background: #FaFaFa;
-    border-radius:5px;
+    background: #fafafa;
+    border-radius: 5px;
   }
 }
 
@@ -259,9 +262,7 @@ export default {
       height: 26px;
       line-height: 26px;
 
-      span {
-        padding-left: 10px;
-      }
+    
     }
   }
 }
@@ -274,7 +275,7 @@ export default {
 
     .f-box-tit {
       font-size: 14px;
-      color: #4AAFF5;
+      color: #4aaff5;
     }
 
     .f-box-info {
@@ -292,10 +293,9 @@ export default {
         text-align: center;
         line-height: 40px;
         cursor: pointer;
-        float: left;
       }
 
-      span {
+      .span {
         font-size: 13px;
         display: block;
         text-align: left;
@@ -304,9 +304,9 @@ export default {
         line-height: 20px;
         cursor: pointer;
       }
-      span:nth-child(even):hover{
-        color: blue;
-      }
+      // span:nth-child(even):hover {
+      //   color: blue;
+      // }
 
       .mybadge {
         top: 0;
@@ -320,17 +320,17 @@ export default {
     }
   }
   .function-box:nth-child(2) {
-    .f-box-tit{
-      color: #9DC914;
+    .f-box-tit {
+      color: #9dc914;
     }
   }
   .function-box:nth-child(3) {
-    .f-box-tit{
-      color: #FFA042;
+    .f-box-tit {
+      color: #ffa042;
     }
   }
   .function-box:nth-child(4) {
-    .f-box-tit{
+    .f-box-tit {
       color: palevioletred;
     }
   }