fix-油耗登记优化

src/views/clw/KeyCase/modules/TableInfo.vue

@@ -16,7 +16,7 @@
             <span class="unit">归还时间</span>
             <span class="unit" style="margin-right: -10px">操作</span>
           </div>
-          <div v-if="carList.length > 0">
+          <div v-if="carList.length > 0" style="overflow-y: scroll; height: 300px">
             <ul style="padding-left: 0" v-for="(item, index) in carList" :key="index">
               <li class="row" @click="MessageReminder(item.id)">
                 <span class="type">{{ item.plateNumber }}</span>
@@ -111,6 +111,13 @@ export default {
       font-size: 10px;
     }
   }
+  ::-webkit-scrollbar-track-piece {
+    background: #eeeff0;
+  }
+
+  ::-webkit-scrollbar {
+    width: 6px;
+  }
   li.row > span {
     //   text-align: center;
     font-size: 12px;

src/views/clw/fuelConsumptionLog/index.vue

@@ -18,8 +18,8 @@
             </a-col>
             <template>
               <a-col :span="6">
-                <a-form-item label="车牌号码" prop="plateNumber">
-                  <a-input v-model="queryParam.plateNumber" placeholder="请输入车牌号码" allow-clear />
+                <a-form-item label="车牌号码" prop="itemName">
+                  <a-input v-model="queryParam.itemName" placeholder="请输入车牌号码" allow-clear />
                 </a-form-item>
               </a-col>
             </template>
@@ -85,6 +85,9 @@
         <span slot="gasCardType" slot-scope="text, record">
           <dict-tag :options="dict.type['gas_car_type']" :value="record.gasCardType" />
         </span>
+        <span slot="gasType" slot-scope="text, record">
+          <dict-tag :options="dict.type['gas_type']" :value="record.gasType" />
+        </span>
         <span slot="operation" slot-scope="text, record">
           <!-- <a-divider type="vertical" v-hasPermi="['clw:fuelConsumptionLog:edit']" /> -->
           <a @click="$refs.createForm.handleUpdate(record, undefined)" v-hasPermi="['clw:fuelConsumptionLog:edit']">
@@ -138,7 +141,7 @@ export default {
         createTime: null,
         gasCardType: null,
         categoryId: null,
-        plateNumber: null,
+        itemName: null,
         applyUserName:null,
         params:{},
         pageNum: 1,
@@ -188,6 +191,7 @@ export default {
         {
           title: '油品',
           dataIndex: 'gasType',
+          scopedSlots: { customRender: 'gasType' },
           ellipsis: true,
           align: 'center',
           width: '60px',
@@ -207,6 +211,13 @@ export default {
           align: 'center',
           width: '60px',
         },
+        {
+          title: '部门名称',
+          dataIndex: 'deptName',
+          ellipsis: true,
+          align: 'center',
+          width: '150px',
+        },
         {
           title: '申请人',
           dataIndex: 'applyUserName',
@@ -231,7 +242,7 @@ export default {
       ],
     }
   },
-  dicts: ['gas_car_type'],
+  dicts: ['gas_car_type','gas_type'],
   filters: {},
   created() {
     this.getList()
@@ -264,7 +275,7 @@ export default {
         createTime: undefined,
         gasCardType: undefined,
         categoryId: undefined,
-        plateNumber: undefined,
+        itemName: undefined,
         applyUserName:undefined,
         params:{},
         pageNum: 1,
@@ -321,7 +332,7 @@ export default {
         {
           ...this.queryParam,
         },
-        `fuelConsumptionLog_${new Date().getTime()}.xlsx`
+        `油耗登记${new Date().getTime()}.xlsx`
       )
     },
   },

src/views/vehicle/components/RefuelingStatistics.vue

@@ -10,12 +10,12 @@
           </div>
           <div>总油耗</div>
         </div>
-        <div style="display: flex; justify-content: space-between; margin-top: 6px">
-          <div>
-            <span>92#汽油：</span>
-            <span>{{ list[3]?.value }}L</span>
+        <div style="display: flex; justify-content: space-between; margin-top: 6px;font-size: 10px;">
+          <div v-for="(item,index) in list " :key=index>
+            <span>{{ item.name}}：</span>
+            <span>{{ item.value}}L</span>
           </div>
-          <div>
+          <!-- <div>
             <span>95#汽油：</span>
             <span>{{ list[2]?.value }}L</span>
           </div>
@@ -25,8 +25,8 @@
           </div>
           <div>
             <span>柴油：</span>
-            <span>{{ list[1]?.value }}L</span>
-          </div>
+            <span>{{ list[0]?.value }}L</span>
+          </div> -->
         </div>
       </div>
     </div>

vue.config.js

@@ -110,7 +110,7 @@ const vueConfig = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `https://ruoyi.setworld.net`,
-        // target: `http://113.249.153.164:7618/api`,
+        // target: `http://113.249.153.164:7618/`,
         target:`http://172.20.16.92:8080/`,
         changeOrigin: true,
         pathRewrite: {