Ver código fonte

部分UI修复

洪海涛 4 anos atrás
pai
commit
1d0e237689

+ 6 - 1
src/components/searchHeader/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="searchHeader">
     <div class="defaultBox Layout">
-      <div class="content mt5">
+      <div class="content" :class="{mt5: isMt5}">
         <searchBox
           :list="data.default"
           @change="$emit('search')"
@@ -58,6 +58,11 @@ export default {
       required: false,
       default: () => {}
     },
+    isMt5: {
+      type: Boolean,
+      required: false,
+      default: () => true
+    },
     isHiddenTime: {
       type: Boolean,
       required: false,

+ 3 - 0
src/styles/index.less

@@ -144,6 +144,9 @@ div:focus {
 .mb25 {
   margin-bottom: 25px;
 }
+.mb20 {
+  margin-bottom: 20px;
+}
 .mb10 {
   margin-bottom: 10px;
 }

+ 6 - 3
src/views/dataBigManage/components/dataItem/index.vue

@@ -19,7 +19,7 @@
             {{ item.subTitle }}%
           </span>
         </span>
-        <span v-else v-html="item.subTitle" />
+        <span v-else style="font-weight: 600" v-html="item.subTitle" />
       </div>
     </div>
   </div>
@@ -69,10 +69,13 @@ export default {
       color: #999;
       font-size: 12px;
      .item-up {
-        color:#F32850
+       color:#F32850;
+       font-weight: 600;
       }
       .item-down {
-        color:#9FFF39
+        //color:#9FFF39
+        color:#7Ed321;
+        font-weight: 600;
       }
     }
   }

+ 4 - 1
src/views/dataBigManage/components/efficiencyModule/index.vue

@@ -367,6 +367,7 @@ export default {
           .num {
             font-size: 18px;
             cursor: pointer;
+            font-weight: 600;
           }
           .unit {
             font-size: 14px;
@@ -379,6 +380,7 @@ export default {
           }
           .num {
             font-size: 12px;
+            font-weight: 600;
           }
         }
       }
@@ -425,7 +427,8 @@ export default {
       color:#F32850
     }
     .item-down {
-      color:#9FFF39
+      //color:#9FFF39
+      color:#7Ed321
     }
 }
 </style>

+ 1 - 0
src/views/dataBigManage/components/qualityModule/index.vue

@@ -429,6 +429,7 @@ export default {
     align-items: center;
     .rollBackItem {
       color: #666;
+      margin-bottom: 10px;
       .numText {
         color: #409EFF;
         font-weight: 600;

+ 8 - 2
src/views/dataBigManage/components/throughputModule/index.vue

@@ -15,7 +15,7 @@
             @click="changeTab('wholeTab', item)"
           >{{ item }}</span>
         </div>
-        <div class="list">
+        <div v-loading="listLoading" class="list">
           <div
             v-for="item in mainData.throughputList"
             :key="item.pointer"
@@ -118,6 +118,11 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    listLoading: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
   data() {
@@ -200,7 +205,8 @@ export default {
     color:#F32850
   }
   .item-down {
-    color:#9FFF39
+    //color:#9FFF39
+    color:#7Ed321
   }
   .itemBox {
     box-shadow: 0px 6px 50px rgba(0, 0, 0, 0.05);

+ 2 - 1
src/views/dataBigManage/data.js

@@ -7,7 +7,8 @@ export const listSearchData = {
         key: 'deptCode',
         type: 'cascader',
         placeholder: '请选择部门',
-        option: []
+        option: [],
+        styles: { minWidth: '435px', width: 'auto' }
       },
       {
         name: '时间',

+ 16 - 6
src/views/dataBigManage/index.vue

@@ -2,6 +2,7 @@
   <div class="page-wrap data-big-wrapper" style="min-width: 1320px" @click="openDrawer=false">
     <div class="page-header detial">
       <searchHeader
+        :is-mt5="false"
         :data="listSearch"
         :is-hidden-time="true"
         @search="search"
@@ -10,7 +11,7 @@
       />
     </div>
     <div class="page-content detial">
-      <header class="header mb25">
+      <header class="header mb10">
         <headTitle title="质量" />
       </header>
       <qualityModule
@@ -19,16 +20,17 @@
         @search="qualitySearch"
         @checkDetialModal="(data) => checkDetialModal({...data, headerTitle: '质量' })"
       />
-      <header class="header mb25 mt40">
+      <header class="header mb10 mt40">
         <headTitle title="吞吐量" />
       </header>
       <throughputModule
         :datas="mainData.throughput"
         :loading="throughputLoading"
+        :list-loading="throughputListLoading"
         @search="qualitySearch"
         @checkDetialModal="(data) => checkDetialModal({...data, headerTitle: '吞吐量' })"
       />
-      <header class="header mb25 mt40">
+      <header class="header mb10 mt40">
         <headTitle title="效率" />
       </header>
       <efficiencyModule
@@ -109,6 +111,7 @@ export default {
       },
       qualityLoading: false,
       throughputLoading: false,
+      throughputListLoading: false,
       efficiencyLoading: false
     }
   },
@@ -183,7 +186,7 @@ export default {
       } else if (key === 'offlineProblemViweType') {
         this.getOfflineProblemChartData(this.params)
       } else if (key === 'wholeTab') {
-        this.getThroughputData(this.params)
+        this.getThroughputData(this.params, key)
       } else if (key === 'requirementBacklogType') {
         this.getRequirementBacklogRateChartData(this.params)
       }
@@ -321,8 +324,13 @@ export default {
       })
     },
     // 需求任务项目列表
-    getThroughputData(params) {
-      this.throughputLoading = true
+    getThroughputData(params, key) {
+      if (key) {
+        this.throughputListLoading = true
+      } else {
+        this.throughputLoading = true
+      }
+
       getThroughputDataRequest({
         ...params,
         extensionType: params.wholeTab
@@ -332,8 +340,10 @@ export default {
           throughput: { ...this.mainData.throughput, throughputList: res.data }
         }
         this.throughputLoading = false
+        this.throughputListLoading = false
       }).catch(() => {
         this.throughputLoading = false
+        this.throughputListLoading = false
       })
     },
     // 需求积压率