样式修改

src/api/statisticalReport/companyConsumptionStatistics.js

@@ -4,14 +4,14 @@ var group_name = 'oilOrderInfo'
 export default {
   getStatisticalReportByPage(data) { 
     return request({
-      url: `/xkhl-site/saasBOrderInfo/getStatisticalReportByPage`,
+      url: `/${service_name}/${group_name}/getStatisticalReportByPage`,
       method: 'post',
       data:data
     })
   },
   getAccountTypeByCompanyId(data) { 
     return request({
-      url: `/xkhl-site/saasBOrderInfo/getAccountTypeByCompanyId`,
+      url: `/${service_name}/${group_name}/getAccountTypeByCompanyId`,
       method: 'post',
       data:data
     })

src/views/driver/user/SysCustomerInfoAdd.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 20px;">
     <el-row>
       <el-form
         ref="form"

src/views/driver/user/SysCustomerInfoList.vue

@@ -171,14 +171,15 @@
         </div>
       </ListLayout>
 
-      <!-- 修改密码弹窗 -->
+      <!-- 修改密码抽屉 -->
-      <el-dialog
+      <el-drawer
-        v-el-drag-dialog
-        destroy-on-close
         title="修改密码"
+        class="table-detail-drawer"
         :visible.sync="updatePwdDialog"
-        width="55%"
+        direction="ltr"
+        size="55%"
       >
+      <div style="padding: 20px;">
         <el-form
           ref="form"
           :model="updatePwd"
@@ -193,18 +194,20 @@
           <el-button @click="updatePwdDialog = false;">取消</el-button>
           <el-button type="primary" @click="updatePwdSubmit">提交</el-button>
         </div>
-      </el-dialog>
+      </div>>
+      </el-drawer>
 
-      <!-- 添加弹窗 -->
+      <!-- 添加抽屉 -->
-      <el-dialog
+      <el-drawer
-        v-el-drag-dialog
-        destroy-on-close
         title="添加"
+        class="table-detail-drawer"
         :visible.sync="addDialog"
-        width="55%"
+        direction="ltr"
+        size="55%"
       >
-        <SysCustomerInfoAdd @getByPage="getByPage" @closeDialog="closeDialog" />
+      <SysCustomerInfoAdd @getByPage="getByPage" @closeDialog="closeDialog" />
-      </el-dialog>
+      </el-drawer>
+     
 
       <!-- 导出弹窗 -->
       <el-dialog
@@ -232,20 +235,22 @@
         />
       </el-dialog>
 
-      <!-- 修改弹窗 -->
+      <!-- 修改抽屉 -->
-      <el-dialog
+      <el-drawer
-        destroy-on-close
         title="修改"
+        class="table-detail-drawer"
         :visible.sync="updateDialog"
-        width="55%"
+        direction="ltr"
+        size="55%"
       >
-        <SysCustomerInfoUpdate
+      <SysCustomerInfoUpdate
           v-if="updateDialog"
           :sys-customer-info="sysCustomerInfo"
           @getByPage="getByPage"
           @closeDialog="closeDialog"
         />
-      </el-dialog>
+      </el-drawer>
+   
 
       <!-- 详情抽屉 -->
       <el-drawer
@@ -623,8 +628,8 @@ export default {
   margin-bottom: 20px;
 }
 .table-div >>> .header-container {
-  position: sticky;
+  /* position: sticky;
-  top: 0rem;
+  top: 0rem; */
   min-height: 152px;
   z-index: 4;
   background: #fff;

src/views/driver/user/SysCustomerInfoUpdate.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 20px;">
     <el-row>
       <el-form
         ref="form"

src/views/driver/vehicle/OilVehicleOwnerAdd.vue

@@ -6,7 +6,7 @@
         label-width="100px"
         :size="$store.getters.size"
       >
-        <el-card class="box-card">
+        <el-card class="box-card" style="margin:  0 20px;">
           <div slot="header" class="clearfix">
             <span>车辆基础信息</span>
           </div>
@@ -136,7 +136,7 @@
             <el-col />
           </el-row> -->
         </el-card>
-        <el-col :span="24" style="text-align: right">
+        <el-col :span="24" style="text-align: right;padding: 20px;">
           <el-button @click="close">取消</el-button>
           <el-button type="primary" @click="submit">提交</el-button>
         </el-col>

src/views/driver/vehicle/OilVehicleOwnerList.vue

@@ -669,8 +669,8 @@ export default {
   margin-bottom: 20px;
 }
 .table-div >>> .header-container {
-  position: sticky;
+  /* position: sticky;
-  top: 0rem;
+  top: 0rem; */
   min-height: 152px;
   z-index: 4;
   background: #fff;

src/views/driver/vehicle/OilVehicleOwnerUpdate.vue

@@ -6,7 +6,7 @@
         label-width="100px"
         :size="$store.getters.size"
       >
-        <el-card class="box-card">
+        <el-card class="box-card" style="margin: 0 20px;">
           <div slot="header" class="clearfix">
             <span>车辆基础信息</span>
           </div>
@@ -136,7 +136,7 @@
             <el-col />
           </el-row> -->
         </el-card>
-        <el-col :span="24" style="text-align: right">
+        <el-col :span="24" style="text-align: right;padding: 20px;;">
           <el-button @click="close">取消</el-button>
           <el-button type="primary" @click="submit">提交</el-button>
         </el-col>

src/views/finance/oilCompanyMatch/OilCompanyMatchAdd.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 20px;">
     <el-row>
       <el-form :model="oilCompanyMatch" label-width="140px" :rules="ruleForm" ref="ruleForm" :size="$store.getters.size">
         <el-row :gutter="gridNum.row.gutter">

src/views/finance/oilCompanyMatch/OilCompanyMatchList.vue

@@ -178,15 +178,17 @@
         </div>
       </ListLayout>
 
-      <!-- 添加弹窗 -->
+      <!-- 添加抽屉 -->
-      <el-dialog
+      <el-drawer
-        v-el-drag-dialog
         title="添加"
+        class="table-detail-drawer"
         :visible.sync="addDialog"
-        width="55%"
+        direction="ltr"
+        size="60%"
       >
-        <OilCompanyMatchAdd @getByPage="getByPage" @closeDialog="closeDialog" />
+      <OilCompanyMatchAdd @getByPage="getByPage" @closeDialog="closeDialog" />
-      </el-dialog>
+      </el-drawer>
+    
 
       <!-- 导出弹窗 -->
       <el-dialog
@@ -214,20 +216,22 @@
         />
       </el-dialog>
 
-      <!-- 修改弹窗 -->
+      <!-- 修改抽屉 -->
-      <el-dialog
+      <el-drawer
-        v-el-drag-dialog
         title="修改"
+        class="table-detail-drawer"
         :visible.sync="updateDialog"
-        width="55%"
+        direction="ltr"
+        size="60%"
       >
-        <OilCompanyMatchUpdate
+      <OilCompanyMatchUpdate
           v-if="updateDialog"
           :oil-company-match="oilCompanyMatch"
           @getByPage="getByPage"
           @closeDialog="closeDialog"
         />
-      </el-dialog>
+      </el-drawer>
+
 
       <!-- 详情抽屉 -->
       <el-drawer
@@ -750,8 +754,8 @@ export default {
   margin-bottom: 20px;
 }
 .table-div >>> .header-container {
-  position: sticky;
+  /* position: sticky;
-  top: 0rem;
+  top: 0rem; */
   min-height: 152px;
   z-index: 4;
   background: #fff;

src/views/finance/oilCompanyMatch/OilCompanyMatchUpdate.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 20px;">
     <el-row>
       <el-form :model="oilCompanyMatch" :rules="ruleForm" ref="ruleForm" label-width="140px" :size="$store.getters.size">
         <el-row :gutter="gridNum.row.gutter">

src/views/finance/oilCompanyMatchRecord/OilCompanyMatchRecordList.vue

@@ -588,8 +588,8 @@ export default {
 }
 
 .table-div>>>.header-container {
-  position: sticky;
+  /* position: sticky;
-  top: 0rem;
+  top: 0rem; */
   min-height: 152px;
   z-index: 4;
   background: #fff;

src/views/finance/oilCompanyOrderMatchTask/OilCompanyOrderMatchTaskList.vue

@@ -772,8 +772,8 @@ export default {
 }
 
 .table-div>>>.header-container {
-  position: sticky;
+  /* position: sticky;
-  top: 0rem;
+  top: 0rem; */
   min-height: 152px;
   z-index: 4;
   background: #fff;

src/views/finance/openTicket/openTicketList.vue

@@ -80,7 +80,7 @@
 
                   <el-col :span="9">
                     <el-form-item>
-                      <gl-date-time-picker v-model="page.params.createTime" style="width: 131%" msg="创建时间"
+                      <gl-date-time-picker v-model="page.params.createTime" style="width: 134%" msg="创建时间"
                         @keyup.enter.native="getByPage" />
                     </el-form-item>
                   </el-col>

src/views/login/css/index.css

@@ -1,8 +1,7 @@
 html {
     font-size: 16px !important;
 }
-
+ /* iPhone6的375px尺寸作为16px基准，414px正好18px大小,600 20px */
-/* iPhone6的375px尺寸作为16px基准，414px正好18px大小,600 20px */
 /* @media screen and (min-width:375px) {
     html {
         font-size: calc(100% + 2 * (100vw - 375px) / 39);
@@ -44,44 +43,29 @@ html {
     margin: 0;
     width: 100vw;
     height: 100vh;
-    /* background-size: calc(100vw - 25.5rem) 100%; */
+    background-size: calc(100vw - 25.5rem) 100%;
-    /* background-repeat: no-repeat; */
+    background-repeat: no-repeat;
-    /* background-position: right; */
+    background-position: right;
-    /* background-origin: border-box; */
+    background-origin: border-box;
-    /* background-attachment: fixed; */
+    background-attachment: fixed;
     animation: start .5s;
     overflow: auto;
-    /* background-image: url('../../../assets/img/login/bg@2x.png') !important; */
+    background-image: url('../../../assets/img/login/bg@2x.png') !important;
-    background: linear-gradient(to right, #D3DFFB, #FFFFFF, #F0FBFE);
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
-
-.newlogin_container_tb img {
-    width: 554px;
-    height: 554px;
-    margin-right: 234px;
 }
 
 .newlogin_login_container {
-    /* height: 100%;
+    height: 100%;
-    width: 100%; */
+    width: 100%;
-    /* padding: 5.7rem 0 0 5.7rem; */
+    padding: 5.7rem 0 0 5.7rem;
     animation: move 1s;
     /* animation-delay:1s;
     -webkit-animation-delay:1s;  */
-    box-shadow: 0px 3px 10px 0px rgba(0, 0, 0, 0.1);
-    border-radius: 8px 8px 8px 8px;
-    opacity: 1;
-    padding: 52px 80px 94px 80px;
-    /* width: 460px; */
 
 }
 
 .newlogin_login_logo {
-    width: 147px;
+    width: 10.8rem;
-    height: 46px;
+    height: 3.672rem;
 }
 
 .newlogin_login_logo img {
@@ -90,7 +74,7 @@ html {
 }
 
 .newlogin_login_title {
-    color: #000000;
+    color: #1767F9;
     font-size: 1.45rem;
     margin-top: 2rem;
 }
@@ -101,14 +85,14 @@ html {
 }
 
 .newlogin_container .el-input {
-    /* box-shadow: 0px 0px 6px 0px rgba(7, 0, 2, 0.2) !important; */
+    box-shadow: 0px 0px 6px 0px rgba(7, 0, 2, 0.2) !important;
-    /* border-radius: 36px; */
+    border-radius: 36px;
 }
 
-.newlogin_container .el-input__inner {
+ .newlogin_container .el-input__inner {
     border: 0px !important;
     padding-left: 50px !important;
-    /* border-radius: 36px; */
+    border-radius: 36px;
     height: 2.6rem !important;
     font-size: .8rem !important;
     padding-right: 50px !important;
@@ -116,7 +100,7 @@ html {
 }
 
 .newlogin_container .el-form-item__content .el-input {
-    /* box-shadow: 0px 0px 6px 0px rgba(7, 0, 2, 0.2) !important; */
+    box-shadow: 0px 0px 6px 0px rgba(7, 0, 2, 0.2) !important;
 
 }
 
@@ -128,9 +112,8 @@ html {
 
 .newlogin_login_from_butten {
     width: 100%;
-    /* border-radius: 36px; */
+    border-radius: 36px;
-    font-size: 14px;
+    font-size: 1.16rem;
-    background-color: #409EFF !important;
 }
 
 .newlogin_container .el-form-item {
@@ -150,14 +133,12 @@ html {
 }
 
 .newlogin_container .el-button--primary {
-    background-color: #409EFF !important;
+    background: linear-gradient(to right, #1767F9, #4883ED);
-
 }
 
 .newlogin_container .el-button--primary:hover,
 .newlogin_container .el-button--primary:focus {
-    background-color: #409EFF !important;
+    background: linear-gradient(to right, #1767F9, #4883ED);
-
 
 }
 
@@ -185,7 +166,7 @@ html {
     padding-left: 20px;
     font-size: 0.8rem;
     color: #1767F9;
-    cursor: default
+    cursor:default
 }
 
 .verifyCode .el-input__inner {

src/views/login/index.vue

@@ -1,13 +1,10 @@
 <template>
     <div v-loading="this.$store.getters.loading" class="newlogin_container">
-        <div class="newlogin_container_tb">
-            <img style="" src="../../assets/img/login/img.png" alt="" />
-        </div>
         <div class="newlogin_login_container">
             <div class="newlogin_login_logo">
                 <img style="" src="../../assets/img/login/logo.png" alt="" />
             </div>
-            <div class="newlogin_login_title">欢迎使用中品调度管理平台</div>
+            <div class="newlogin_login_title">星油能源调度管理平台</div>
             <div class="newlogin_login_from_container">
                 <el-form ref="form" :model="loginForm">
                     <el-form-item>

src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue

@@ -37,7 +37,7 @@
               </el-select>
             </el-form-item> -->
             <!-- <el-form-item>
-            <el-input v-model="page.params.enableMark" placeholder="启用标识" clearable @keyup.enter.native="getByPage" /> 
+            <el-input v-model="page.params.enableMark" placeholder="启用标识" clearable @keyup.enter.native="getByPage" />
               <el-select v-model="page.params.enableMark" filterable clearable placeholder="油品启用标识">
                 <el-option value="1" label="油品启用" />
                 <el-option value="0" label="油品禁用" />
@@ -91,7 +91,7 @@
             <el-button class="group-item" :size="$store.getters.size" type="success" @click="piliangAdd"><svg-icon
                 icon-class="iconiconfonticon02" /> 快速调价任务</el-button>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="8">
             <el-button type="primary" :size="$store.getters.size" icon="el-icon-search" @click="search">查询</el-button>
             <el-button :size="$store.getters.size" icon="el-icon-refresh" type="info" @click="
               page.params = {}
@@ -158,11 +158,12 @@
           <!-- 分页组件结束 -->
         </div>
       </ListLayout>
-      <!-- 历史记录弹窗 -->
+      <!-- 历史记录抽屉 -->
-      <el-dialog v-el-drag-dialog title="变更历史" :visible.sync="showHistory" width="55%">
+      <el-drawer :withHeader="false" title="变更历史" :visible.sync="showHistory" direction="ltr" size="55%">
-        <el-table :data="historyData" style="width: 100%">
+       <div style="padding: 20px;">
+        <el-table :data="historyData" style="width: 100%" border>
           <el-table-column prop="createTime" label="创建时间" />
-          
+
           <el-table-column prop="name" label="基础个人价">
             <template slot-scope="scope">
               <div>
@@ -196,7 +197,9 @@
               </template>
           </el-table-column>
         </el-table>
-      </el-dialog>
+       </div>
+      </el-drawer>
+
       <!-- 导出弹窗 -->
       <el-dialog v-el-drag-dialog title="导出" :visible.sync="outPutDialog" width="20%">
         <OilSiteOilsPriceOutput :page="page" :dataPage="dataPage" v-if="outPutDialog"
@@ -292,7 +295,7 @@ export default {
                 return ('禁用');
                }
             }
-          }, 
+          },
             {
               label: '基础个人价',
               value: 'personalPriceBase'

src/views/statisticalReport/companyConsumptionStatistics.vue

@@ -178,6 +178,9 @@
                 <el-form-item label="赊销金额">
                   <span> {{scope.row.chargeRechargeBalance|balanceType}}</span>
                 </el-form-item>
+                <el-form-item label="充返金额">
+                  <span>{{scope.row.rechargeRebateBalance|balanceType}}</span>
+                </el-form-item>
                 <el-form-item label="消返金额">
                   <span>{{scope.row.consumeRebateBalance|balanceType}}</span>
                 </el-form-item>
@@ -189,6 +192,9 @@
                 <el-form-item label="累计赊销金额">
                   <span> {{dataListChild.sxje?dataListChild.sxje:'0.00'}}</span>
                 </el-form-item>
+                <el-form-item label="累计充返金额">
+                  <span>{{dataListChild.cfje?dataListChild.cfje:'0.00'}}</span>
+                </el-form-item>
                 <el-form-item label="累计消返金额">
                   <span>{{dataListChild.xfje?dataListChild.xfje:'0.00'}}</span>
                 </el-form-item>

src/views/system/auth/sysUser/SysCustomerInfoAdd.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 20px;">
     <el-row>
       <el-form ref="form" :rules="rules" :model="sysCustomerInfo" label-width="100px" :size="$store.getters.size">
         <el-row :gutter="gridNum.row.gutter">

src/views/system/auth/sysUser/SysCustomerInfoList.vue

@@ -212,16 +212,15 @@
         </div>
       </ListLayout>
 
-      <!-- 修改密码弹窗 -->
+      <!-- 修改密码抽屉 -->
-      <el-dialog
+      <el-drawer
-        v-el-drag-dialog
-        destroy-on-close
         title="修改密码"
+        class="table-detail-drawer"
         :visible.sync="updatePwdDialog"
-        @closeDialog="closeDialog"
+        direction="ltr"
-        width="55%"
+        size="50%"
-        :before-close="handleClose"
       >
+      <div style="padding: 20px;">
         <el-form
           ref="form"
           :model="updatePwd"
@@ -236,18 +235,20 @@
           <el-button @click="handleClose">取消</el-button>
           <el-button type="primary" @click="updatePwdSubmit">提交</el-button>
         </div>
-      </el-dialog>
+      </div>
-
+      
-      <!-- 添加弹窗 -->
+      </el-drawer>
-      <el-dialog
+     
-        v-el-drag-dialog
+      <!-- 添加抽屉 -->
-        destroy-on-close
+      <el-drawer
         title="添加"
+        class="table-detail-drawer"
         :visible.sync="addDialog"
-        width="55%"
+        direction="ltr"
+        size="50%"
       >
-        <SysCustomerInfoAdd @getByPage="getByPage" @closeDialog="closeDialog" />
+      <SysCustomerInfoAdd @getByPage="getByPage" @closeDialog="closeDialog" />
-      </el-dialog>
+      </el-drawer>
 
       <!-- 登录授权弹窗 -->
       <el-dialog
@@ -290,20 +291,22 @@
         />
       </el-dialog>
 
-      <!-- 修改弹窗 -->
+      <!-- 修改抽屉 -->
-      <el-dialog
+      <el-drawer
-        destroy-on-close
         title="修改"
+        class="table-detail-drawer"
         :visible.sync="updateDialog"
-        width="55%"
+        direction="ltr"
+        size="50%"
       >
-        <SysCustomerInfoUpdate
+      <SysCustomerInfoUpdate
           v-if="updateDialog"
           :sys-customer-info="sysCustomerInfo"
           @getByPage="getByPage"
           @closeDialog="closeDialog"
         />
-      </el-dialog>
+      </el-drawer>
+    
 
       <!-- 详情抽屉 -->
       <el-drawer
@@ -703,8 +706,8 @@ export default {
   margin-bottom: 20px;
 }
 .table-div >>> .header-container {
-  position: sticky;
+ /* position: sticky;
-  top: 0rem;
+  top: 0rem; */
   min-height: 152px;
   z-index: 4;
   background: #fff;

src/views/system/auth/sysUser/SysCustomerInfoUpdate.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 20px;">
     <el-row>
       <el-form ref="form" :rules="rules" :model="sysCustomerInfo" label-width="100px" :size="$store.getters.size">
         <el-row :gutter="gridNum.row.gutter">