Bläddra i källkod

fix-整体修改

LAPTOP-U5GOA5HA\zz 1 år sedan
förälder
incheckning
1e8d0debb1
3 ändrade filer med 15 tillägg och 12 borttagningar
  1. 4 4
      src/components/timeLinne.vue
  2. 1 1
      src/utils/request.js
  3. 10 7
      src/views/vehicle/components/FuelRanking.vue

+ 4 - 4
src/components/timeLinne.vue

@@ -14,17 +14,17 @@
             <div style="margin-left: 25px; margin-bottom: 4px; font-size: 16px">{{ t.nodeRole }}</div>
             <div class="timeline-content" v-if="t.list">
               <div class="timeline-date" v-for="(item, index1) in t.list" :key="index1">
-                <span style="display: inline-block; margin-bottom: 15px"> 审核人:{{ item.userName }}</span>
+                <span style="display: inline-block; margin-bottom: 15px;color:rgb(6, 208, 239)">{{ item.userName }}</span>
                 <div class="timeline-title">审核时间:{{ item.approvalTime }}</div>
                 <div class="timeline-title">备注:{{ item.comment ? item.comment : '无' }}</div>
                 <div class="timeline-desc">
                   审核状态:
                   <span v-show="item.status == 0" style="color: rgba(14, 116, 218, 1)">待审批</span>
-                  <span v-show="item.status == 1" style="color: rgb(18, 164, 52)">已归档</span>
+                  <span v-show="item.status == 1" style="color: rgb(18, 164, 52)">已抄送</span>
                   <span v-show="item.status == 2" style="color: rgb(201, 46, 46)">已撤销</span>
                   <span v-show="item.status == 3" style="color: rgb(201, 46, 46)">已驳回</span>
-                  <span v-show="item.status == 4" style="color: rgba(14, 116, 218, 1)">审批中</span>
-                  <span v-show="item.status == 5" style="color: rgb(230, 150, 22)">已审批</span>
+                  <span v-show="item.status == 4" style="color: rgba(14, 116, 218, 1)">已同意</span>
+                  <span v-show="item.status == 5" style="color: rgb(230, 150, 22)">待抄送</span>
                 </div>
               </div>
             </div>

+ 1 - 1
src/utils/request.js

@@ -18,7 +18,7 @@ const request = axios.create({
   // API 请求的默认前缀
   baseURL: process.env.VUE_APP_BASE_API,
   // baseURL: 'https://ruoyi.setworld.net',
-  timeout: 6000 // 请求超时时间
+  timeout: 10000 // 请求超时时间
 })
 
 // 异常拦截处理器

+ 10 - 7
src/views/vehicle/components/FuelRanking.vue

@@ -17,11 +17,11 @@
             <span class="unit">名次</span>
           </div>
           <ul style="padding-left: 0">
-            <li class="row" v-for="(item, index) in listStatistics" :key="index">
-              <span class="type">{{ item.rank }}</span>
-              <span class="count">{{ item.name }}</span>
-              <span class="time">{{ item.value }}</span>
-              <span class="unit">
+            <li class="row textw" v-for="(item, index) in listStatistics" :key="index">
+              <span class="type" style="text-align:center;width: 10px;margin-left: -15px;">{{ item.rank }}</span>
+              <span class="count" style="text-align:center; width: 80px;margin-left: -26px;">{{ item.name }}</span>
+              <span class="time" style="text-align:center; width: 30px;margin-left: -26px;">{{ item.value }}</span>
+              <span class="unit" style="text-align:center; width: 40px;margin-right: -20px;">
                 <img v-if="item.changeRank>0" src="../../../assets/vehicle/Vector (6).png" />
                 <img v-else-if="item.changeRank<0" src="../../../assets/vehicle/Vector (5).png" />
                 <span v-if="item.changeRank!=0">{{ Math.abs(item.changeRank) }}</span>
@@ -120,11 +120,10 @@ export default {
     //   background-color: rgba(0, 0, 0, 0.2);
     color: #fff;
     margin-top: 5px;
-    .type,
     .unit {
       // display: flex;
       // justify-content: center;
-      // // align-items: center;
+      // align-items: center;
       // flex: 0.15;
       img {
         display: inline-block;
@@ -150,6 +149,10 @@ export default {
     //     flex: 0.35;
     //   }
   }
+  // .textw:first-child{
+  //   color: aqua;
+  //  margin-right: 20px;
+  // }
 }
 .active{
   color:#fff ;