采油模版加字段

src/permission.js

@@ -7,7 +7,7 @@ import { getToken, removeToken } from '@/utils/auth' // get token from cookie
 import Cookies from 'js-cookie'
 import getPageTitle from '@/utils/get-page-title'
 // 1为单点登录，其他不是
-Cookies.set('sso', 1)
+Cookies.set('sso', 0)
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
 const whiteList = ['/login'] // no redirect whitelist

src/views/cost/diesel/index.vue

@@ -98,6 +98,16 @@
         <template slot-scope="scope">
           <span>{{ scope.row.nowPrice }}</span>
         </template>
+      </el-table-column>
+        <el-table-column label="录用人" width="80px" align="center">
+        <template slot-scope="scope">
+          <span>{{ employename }}</span>
+        </template>
+      </el-table-column>
+        <el-table-column label="柴油类型" width="80px" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.oilName }}</span>
+        </template>
       </el-table-column>
       <el-table-column label="备注" min-width="110px" align="center">
         <template slot-scope="scope">
@@ -348,6 +358,7 @@ export default {
   directives: { waves },
   data() {
     return {
+      employename: Cookies.get('employename'),
       isokDisable: false,
       isDieselUpdate: [],
       isDieselDel: [],
@@ -513,7 +524,7 @@ export default {
     uploadData() {
       return {
         name: 'importDiesel',
-        importParams: '牧场,油卡编号,设备名称,设备编号,加油日期,加油量(升),单价,录入人,加油人,备注,柴油类型',
+        importParams: '牧场,油卡编号,设备名称,设备编号,加油日期,加油量(升),单价,加油人,录入人,柴油类型,备注',
         sheetname: 'SheetJS',
         pastureId:Cookies.get('pastureid')
       }
@@ -839,10 +850,10 @@ export default {
             const list1 = response.data.list
             console.log(list1,'list1')
             const tHeader = [
-              '编号', '牧场', '油卡编号', '设备名称', '设备编号', '加油日期', '加油量(升)', '单价', '录入人', '加油人', '备注','柴油类型'
+              '编号', '牧场', '油卡编号', '设备名称', '设备编号', '加油日期', '加油量(升)', '单价', '加油工', '录入人', '备注','柴油类型'
             ]
             const filterVal = [
-              'i', 'pastureName', 'cardNumber', 'assetName', 'assetNumber', 'day', '加油量(L)', '单价', 'name', '加油人', '备注','柴油类型'
+              'i', 'pastureName', 'cardNumber', 'assetName', 'assetNumber', 'day', '加油量(L)', '单价', '加油工', 'name', '备注','柴油类型'
             ]
             const data1 = this.formatJson(filterVal, list1)
             excel.export_json_to_excel({

src/views/report/queryCombustion/index.vue

@@ -20,6 +20,17 @@
         <div id="chart1" style="width: 100%;height:400px;" />
       </el-col>
     </el-row>
+    <el-row v-if="isChart1"  style="position: relative;">
+       <p style="position: absolute;top:-12px;left:40%;color:rgb(130, 165, 252);background:rgb(230, 243, 255);border:1px solid rgb(130, 165, 252);padding:10px;border-radius:10px">
+         柴油用量
+       </p>
+        <div style="height: 50px;">
+          <el-select style="float: right;margin-right: 20px;" v-model="getChart5Parm.parammaps.deptName" placeholder="部门" @change="changeDept()">
+            <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.name"> </el-option>
+          </el-select>
+        </div>
+        <div id="chart5" style="width: 100%;height:400px;" />
+    </el-row>
     <!-- <el-row v-if="isChart1"  style="position: relative;">
        <p style="position: absolute;top:-12px;left:40%;color:rgb(130, 165, 252);background:rgb(230, 243, 255);border:1px solid rgb(130, 165, 252);padding:10px;border-radius:10px">
          柴油用量
@@ -271,6 +282,7 @@ export default {
         this.pastureName = [Cookies.get('pasturename')]
         // this.getChart4()
         this.getChart6()
+        this.getChart5()
       }
     },
     // 各牧场燃动费用对比
@@ -491,7 +503,7 @@ export default {
           data1:data1,
           xdata:xdata
         }
-        // this.roadChart5(this.chart_data5)
+        this.roadChart5(this.chart_data5)
       })
     },
     // 牧场每月用油量对比