Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station

fuintAdmin/src/assets/styles/sidebar.scss

@@ -2,6 +2,7 @@
 #app {
 
   .main-container {
+    background: #f6f8f9 !important;
     min-height: 100%;
     transition: margin-left .28s;
     //margin-left: $base-sidebar-width;

fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue

@@ -174,6 +174,7 @@
       </el-drawer>
 
       <el-dialog
+        :close-on-click-modal="false"
         :title="titles"
         :visible.sync="dialog"
         width="50%"
@@ -355,7 +356,7 @@
         </div>
       </el-dialog>
 <!--      弹窗-->
-      <el-dialog title="优惠券列表" :visible.sync="dialogTableVisible">
+      <el-dialog :close-on-click-modal="false" title="优惠券列表" :visible.sync="dialogTableVisible">
         <div style="display: flex;align-items: center; margin-bottom: 20px ">
           <el-input v-model="youhuiquan.name" placeholder="优惠券名称"></el-input>
           <el-button type="primary" icon="el-icon-search" @click="getlistFavorable" >搜索</el-button>
@@ -417,7 +418,7 @@
 
       </el-dialog>
       <!--      规则-->
-      <el-dialog title="编辑储值卡规则" :visible.sync="Crule">
+      <el-dialog :close-on-click-modal="false" title="编辑储值卡规则" :visible.sync="Crule">
         <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" :label-position="labelPosition">
           <el-form-item label="名称" prop="name">
             <el-input disabled v-model="ruleForm.name"></el-input>

fuintAdmin/src/views/EventMarketing/giftBlock/index.vue

@@ -240,6 +240,7 @@
     <el-dialog
       title="上传礼品卡数据"
       :visible.sync="uploadingShow"
+      :close-on-click-modal="false"
       width="40%"
       @close="handleClose2"
     >
@@ -297,6 +298,7 @@
     <el-dialog
       title="新增/修改礼品卡活动"
       :visible.sync="centerDialogVisible"
+      :close-on-click-modal="false"
       width="40%"
       @close="handleClose1"
     >
@@ -350,6 +352,7 @@
     <el-dialog
       title="密码加密"
       :visible.sync="Encryption"
+      :close-on-click-modal="false"
       width="30%"
     >
       <div class="d-b">

fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue

@@ -220,6 +220,7 @@
     </div>
     <el-dialog
       :title="titles"
+      :close-on-click-modal="false"
       :visible.sync="centerDialogVisible"
       width="40%">
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm">
@@ -314,6 +315,7 @@
     </el-dialog>
     <el-dialog
       :title="titles1"
+      :close-on-click-modal="false"
       :visible.sync="showDialogVisible"
       width="60%">
       <el-form :model="ruleForm1" :rules="rules" ref="ruleForm1" label-width="120px" class="demo-ruleForm">

fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue

@@ -221,6 +221,7 @@
     <el-dialog
       :title="titles"
       :visible.sync="centerDialogVisible"
+      :close-on-click-modal="false"
       center
       width="35%">
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm">
@@ -273,9 +274,10 @@
           >
             <template slot-scope="scope">
               <el-form-item
+                label-width="0px"
                 :prop="'oilList.' + scope.$index + '.price'"
                 :rules="rules['oilList.*.price']"
-                class="custom-form-itemMy100989"
+               style="margin-left: 0px"
               >
                 <el-input
                   v-model="scope.row.price"
@@ -315,6 +317,7 @@
       :title="titles1"
       center
       :visible.sync="showDialogVisible"
+      :close-on-click-modal="false"
       width="60%">
       <el-form :model="ruleForm1" :rules="rules" ref="ruleForm1" label-width="120px" class="demo-ruleForm">
         <div style="display: flex;width: 100%; margin-bottom: 20px">

fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue

@@ -187,7 +187,7 @@
         </div>
       </el-drawer>
       <!--      规则-->
-      <el-dialog title="编辑囤油卡规则" width="30%" :visible.sync="Crule">
+      <el-dialog :close-on-click-modal="false" title="编辑囤油卡规则" width="30%" :visible.sync="Crule">
         <el-form :model="oilForm" :rules="ruleInfo" ref="oilForm" label-width="70px" class="demo-ruleForm" >
           <el-form-item label="名称" prop="name">
             <el-input disabled v-model="oilForm.name"></el-input>
@@ -210,6 +210,7 @@
         title="囤油卡操作"
         :visible.sync="centerDialogVisible"
         width="30%"
+        :close-on-click-modal="false"
         center>
 
         <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px" class="demo-ruleForm">

fuintAdmin/src/views/member/index.vue

@@ -637,7 +637,7 @@
     </el-dialog>
 
     <!--    批量录入会员信息-->
-    <el-dialog :title="title" width="500px" :visible.sync="openUpload" append-to-body>
+    <el-dialog :title="title" :close-on-click-modal="false" width="500px" :visible.sync="openUpload" append-to-body>
       <el-form ref="form1" :model="form1" :rules="rules1" label-width="90px">
         <el-row>
           <el-col :span="24">

fuintAdmin/src/views/member/manage.vue

@@ -369,7 +369,7 @@
 
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="55%" append-to-body>
+    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="55%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
           <div class="flax_box">
             <el-form-item label="分组名称" prop="groupName">
@@ -509,7 +509,7 @@
     </el-dialog>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open1" width="35%" append-to-body>
+    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open1" width="35%" append-to-body>
       <el-form ref="form1" :model="form1" :rules="rules" label-width="80px">
 
         <el-form-item label="活动名称" prop="name">

fuintAdmin/src/views/oilConfig/oilStatistics/list.vue

@@ -1,14 +1,14 @@
 <template>
-  <div class="app-container">
+  <div class="app-cont">
     <!--    搜索框-->
-    <el-card>
+    <div class="card_box">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="tankName">
           <el-input
             v-model="queryParams.tankName"
             placeholder="请输入油罐名称"
             clearable
-            style="width: 240px;"
+
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
@@ -46,7 +46,7 @@
         </el-form-item>
       </el-form>
 
-      <div style="height: 76vh;overflow: auto">
+      <div style="height: 77vh;overflow: auto">
         <el-table key="2" ref="tables"
                   v-loading="loading"
                   :data="statisticsList"
@@ -61,12 +61,6 @@
           <el-table-column label="当前成本价（元/L）" align="center" prop="discountedPrice"/>
           <el-table-column label="成本金额（元）" align="center" prop="totalPrice"/>
           <el-table-column label="状态" align="center" prop="inventoryStatistics">
-            <!--            <template slot-scope="scope">-->
-            <!--              <div slot="reference" class="name-wrapper">-->
-            <!--                <el-tag v-if="scope.row.inventoryStatistics == '启用'" size="success">启用</el-tag>-->
-            <!--                <el-tag v-if="scope.row.inventoryStatistics == '禁用'" type="danger" size="medium">禁用</el-tag>-->
-            <!--              </div>-->
-            <!--            </template>-->
             <template slot-scope="scope">
               <el-switch
                 disabled
@@ -105,7 +99,7 @@
         :limit.sync="queryParams.pageSize"
         @pagination="getList"
       />
-    </el-card>
+    </div>
 
 
     <el-drawer
@@ -117,7 +111,7 @@
 
       <div style="display: grid; place-items: center;">
         <div class="box-card" style="">
-          <div style="display: flex; justify-content: space-between;margin-bottom: 10px">
+          <div style="display: flex; justify-content: space-between;margin-bottom: 10px;font-size: 14px;color: #808285">
             <span>油罐名称：{{ statisticsForm.tankName }}</span>
             <span>油品油号：{{ statisticsForm.oilNumber }}</span>
             <span>库存数量（L）：{{ statisticsForm.storedQuantity }}{{ statisticsForm.unit }}</span>
@@ -287,11 +281,6 @@ export default {
 
     handleClose(done) {
       done();
-      // this.$confirm('确认关闭？')
-      //   .then(_ => {
-      //     done();
-      //   })
-      //   .catch(_ => {});
     },
 
     // 选择油品号
@@ -314,9 +303,10 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.app-container {
+.app-cont {
   width: 100%;
-  height: 100vh;
+box-sizing: border-box;
+  padding: 10px;
   background: #f6f8f9;
 }
 
@@ -345,5 +335,10 @@ export default {
 .el-form--inline .el-form-item {
   margin-right: 44px;
 }
-
+.card_box{
+  border-radius: 8px;
+  background: #fff;
+  box-sizing: border-box;
+  padding: 15px;
+}
 </style>

fuintAdmin_zt/src/views/Site/add.vue

@@ -51,6 +51,9 @@ export default {
 
   },
   methods: {
+    goback(){
+      this.$router.go(-1)
+    },
     // 查询菜单树结构
     getMenuTreeselect() {
       // merchantId 代表deptType
@@ -311,6 +314,10 @@ export default {
 </script>
 
 <template>
+  <div>
+    <div class="top-box">
+      <span style="cursor: pointer; text-indent: 20px;" @click="goback()">当前位置：机构管理 / 角色信息  /  新增角色</span>
+    </div>
     <div class="container">
     <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="110px">
     <div class="top-box">
@@ -410,6 +417,8 @@ export default {
     </div>
     </el-form>
   </div>
+  </div>
+
 </template>
 
 <style scoped lang="scss">
@@ -422,13 +431,15 @@ export default {
 
 .top-box{
   width: 100%;
+  background: #fff;
   box-sizing: border-box;
   padding: 20px;
   display: flex;
   align-items: center;
-  background: #FFFFFF;
+  font-weight: 400;
-  box-shadow: 0px 3px 6px 1px rgba(255, 255, 255, 0.4), inset 0px 3px 6px 1px rgba(255, 255, 255, 0.5);
+  font-size: 14px;
-  border-radius: 10px 10px 10px 10px;
+  color: #999;
+  padding-left: 25px;
 }
 
 .demo-ruleForm {

fuintAdmin_zt/src/views/homeComponents/agent.vue

@@ -284,7 +284,7 @@ export default {
         start.setMinutes(0)
         start.setSeconds(0)
         start.setMilliseconds(0)
-        this.value2 = [start,new Date()];
+        this.value2 = [parseTime(start),parseTime(new Date())];
       } else if (this.timeList[index]=='近一周'){
         let nowDate = new Date();
         let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)

fuintAdmin_zt/src/views/setting/hardware.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
+  <div class="card-change"  style="min-height: 500px; margin-left: 20px; margin-top: 20px; margin-right: 20px;" shadow="never">
-    <div class="card-change" >
+    <div>
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="90px">
         <el-form-item label="" prop="name">
           <el-input
@@ -374,5 +374,10 @@ export default {
   width: 98px;
   height: 98px;
 }
+
+
+
+
+
 </style>