分级查看的框架完成

src/api/system/dept.js

@@ -88,3 +88,20 @@ export function delDept(deptId) {
     method: 'delete'
   })
 }
+
+// 查询部门列表
+export function getGroups() {
+  return request({
+    url: '/system/dept/groupList',
+    method: 'get'
+  })
+}
+
+// 查询
+export function getStations(query) {
+  return request({
+    url: '/system/dept/searchDeptList',
+    method: 'get',
+    params: query
+  })
+}

src/components/Breadcrumb/index.vue

@@ -25,9 +25,6 @@ export default {
         return
       }
       this.getBreadcrumb()
-      setTimeout(() => {
-        console.log(this.levelList);
-      })
     }
   },
   created() {

src/components/SelectDept/index.vue

@@ -1,13 +1,15 @@
 <template>
   <div>
     <!--顶级按钮-->
-    <div class="btn-group mr-1">
+    <div class="btn-group mr-1" 
+      v-if="jiBie == 0"
+    >
       <button
         type="button"
         @click="selectAgency"
         class="btn btn-sm btn-outline-secondary"
       >
-        智慧易加
+        {{ $store.state.user.agentFlag ? $store.state.user.nickName : "智慧易加"}}
       </button>
       <button
         type="button"
@@ -31,13 +33,15 @@
             id="exampleDropdownFormEmail1"
             placeholder=""
             autocomplete="off"
+            @input="filterMethod"
+            v-model="filterText"
           />
         </form>
         <div class="dropdown-divider"></div>
         <a
           class="dropdown-item"
           href="#"
-          v-for="ele in groups"
+          v-for="ele in filteredGroups"
           :key="ele.deptId"
           @click="selectGroup(ele)"
           >{{ ele.deptName }}</a
@@ -45,13 +49,16 @@
       </div>
     </div>
     <!--集团按钮-->
-    <div class="btn-group mr-1" v-if="!!currentGroup">
+    <div class="btn-group mr-1" 
+      v-show="!!currentGroup"
+      v-if="jiBie == 0 || jiBie == 1 "
+    >
       <button
         @click="selectGroup(currentGroup)"
         type="button"
         class="btn btn-sm btn-outline-secondary"
       >
-        {{ currentGroup.deptName }}
+        {{ (currentGroup||{}).deptName }}
       </button>
       <button
         type="button"
@@ -75,13 +82,15 @@
             id="exampleDropdownFormEmail1"
             placeholder=""
             autocomplete="off"
+            @input="filterMethod"
+            v-model="filterText"
           />
         </form>
         <div class="dropdown-divider"></div>
         <a
           class="dropdown-item"
           href="#"
-          v-for="ele in stations"
+          v-for="ele in filteredStations"
           :key="ele.deptId"
           @click="selectStation(ele)"
           >{{ ele.deptName }}</a
@@ -89,14 +98,15 @@
       </div>
     </div>
     <!--站点-->
-    <button type="button" class="btn btn-sm btn-outline-success" disabled>
-      {{ currentShow.deptName }}
+    <button type="button" class="btn btn-sm btn-success" disabled>
+      {{ tip  + (jiBie !=2 ? "：" : "") + currentShow.deptName }}
     </button>
   </div>
 </template>
 
 <script>
-import { userdepttree } from "@/api/system/dept";
+import { userdepttree, getGroups, getStations  } from "@/api/system/dept";
+import { mapMutations } from 'vuex'
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -108,6 +118,7 @@ export default {
       options: [],
       Infinity: 2,
       num: 0,
+      tip:'',
       Agency: {
         deptId: 1,
         deptName: this.$store.state.user.deptName,
@@ -134,6 +145,9 @@ export default {
       ],
       currentStation: undefined,
       currentGroup: undefined,
+      filterText:"",
+      filterStationText:"",
+      filterTimer:null
     };
   },
   computed: {
@@ -146,27 +160,86 @@ export default {
       }
       return this.Agency;
     },
+    filteredGroups(){
+      return this.groups.filter((ele)=>{
+        return ele.deptId.toString().includes(this.filterText) || ele.deptName.includes(this.filterText)
+      })
+    },
+    filteredStations(){
+      return this.stations.filter((ele)=>{
+        return ele.deptId.toString().includes(this.filterText) || ele.deptName.includes(this.filterText)
+      })
+    }
   },
   watch: {
     // 监听deptId
     value: "currDeptChange",
   },
   created() {
-    // this.getTreeselect();
+    this.init();
   },
   methods: {
-    selectAgency(agency) {
+    ...mapMutations({
+      setLevelId:"SET_LEVELID"
+    }),
+    init() {
+      if(this.jiBie == 0){
+        this.tip = this.$store.state.user.agentFlag ? '代理' : "全站"
+        this.setLevelId(this.$store.state.user.agentFlag ? this.$store.state.user.userId : this.deptId)
+        this.selectAgency();
+      }else if(this.jiBie == 1){
+        this.tip = "集团"
+        this.currentGroup = {
+          deptId: this.deptId,
+          deptName: this.$store.state.user.deptName
+        }
+        this.setLevelId(this.currentGroup.deptId) 
+        this.selectGroup(this.currentGroup);
+      }else if(this.jiBie == 2){
+        this.setLevelId(this.deptId) 
+      }
+    },
+    selectAgency() {
+      this.tip = this.$store.state.user.agentFlag ? '代理' : "全站";
+      this.filterText = "";
       this.currentGroup = undefined;
       this.currentStation = undefined;
+      this.setLevelId(this.$store.state.user.agentFlag ? this.$store.state.user.userId : this.deptId)
+      getGroups().then((res)=>{
+        if(res.code == 200){
+          this.groups = res.data
+        }else{
+          throw new Error("");
+        }
+      }).catch(()=>{
+        this.msgError("拉取首页菜单的集团列表失败，请刷新网页")
+      })
       this.refreshTagView();
     },
     selectGroup(group) {
+      this.tip = "集团";
+      this.filterText = "";
       this.currentGroup = group;
       this.currentStation = undefined;
+      this.setLevelId(this.currentGroup.deptId);
+      getStations({
+        deptId: group.deptId
+      }).then((res)=>{
+        if(res.code == 200){
+          this.stations = res.data
+        }else{
+          throw new Error("");
+        }
+      }).catch(()=>{
+        this.msgError("拉取首页菜单的站点列表失败，请刷新网页")
+      })
       this.refreshTagView();
     },
     selectStation(station) {
+      this.tip = "站点";
+      this.filterText = "";
       this.currentStation = station;
+      this.setLevelId(this.currentStation.deptId) 
       this.refreshTagView();
     },
     /** 查询部门下拉树结构 */
@@ -245,6 +318,12 @@ export default {
           });
       })
     },
+    filterMethod(e){
+      clearTimeout(this.filterTimer);
+      this.filterTimer = setTimeout(()=>{
+        this.filterText = e.target.value  
+      }, 800)
+    },
   },
 };
 </script>

src/main.js

@@ -83,6 +83,10 @@ Vue.mixin({
     deptId:()=>{
       return store.state.user.deptId
     },
+    levelId:()=>{
+      // 非代理人 ，返回部分的id
+      return store.state.user.levelId;
+    }
   }
 })
 

src/store/modules/user.js

@@ -6,12 +6,16 @@ const user = {
   state: {
     token: getToken(),
     name: '',
+    nickName:'',
     deptId:'',
     avatar: '',
     roles: [],
     permissions: [],
     jiBie:'',
-    deptName:''
+    deptName:'',
+    agentFlag:false,
+    userId:'',
+    levelId:''
   },
 
   mutations: {
@@ -21,6 +25,9 @@ const user = {
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_NICKNAME: (state, nickName) => {
+      state.nickName = nickName
+    },
     SET_AVATAR: (state, avatar) => {
       state.avatar = avatar
     },
@@ -34,10 +41,19 @@ const user = {
       state.deptId=deptId
     },
     SET_JIBIE:(state, jiBie)=>{
-      state.jiBie=jiBie
+      state.jiBie = jiBie
     },
     SET_DEPTNAME:(state, deptName)=>{
-      state.deptName=deptName
+      state.deptName = deptName
+    },
+    SET_AGENTFLAG:(state, agentFlag)=>{
+      state.agentFlag = state.jiBie != 0 ? false : agentFlag === "1" ? true : false;
+    },
+    SET_USERID:(state, userId)=>{
+      state.userId = userId
+    },
+    SET_LEVELID:(state, levelId)=>{
+      state.levelId = levelId
     }
   },
 
@@ -72,15 +88,15 @@ const user = {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
           commit('SET_NAME', user.userName)
+          commit('SET_NICKNAME', user.nickName)
           commit('SET_AVATAR', avatar)
           commit('SET_DEPT', user.deptId)
-          getDept(user.deptId).then((info)=>{
-            if(info.code !== 200){
-              throw new Error(info.msg)
-            }
-            commit("SET_JIBIE",info.data.jiBie)
-            commit("SET_DEPTNAME",info.data.deptName)
-          }) 
+          
+          commit("SET_USERID",user.userId)
+          commit("SET_JIBIE",user.dept.jiBie)
+          commit("SET_DEPTNAME",user.dept.deptName)
+          commit("SET_AGENTFLAG",user.agentFlag)
+
           resolve(res)
         }).catch(error => {
           reject(error)

src/views/dataSource/saleReport.vue

@@ -341,7 +341,6 @@ export default {
       this.queryParams.endTime =this.getEndFormatDate(new Date());
       this.queryParams.stationId=this.$store.selectDeptId;
       this.getList();
-      console.log("this.queryParams",this.queryParams);
       listCZXFData(this.queryParams).then(response => {
         if(response.hasOwnProperty('data')){
           if(response.data.czAmt){

src/views/dev/Dev_Test.vue

@@ -1,619 +1,839 @@
 <template>
-  <div v-if="pageStatus == 0">配置加载中...</div>
-  <div v-else-if="pageStatus == 1">此页面不对此账号开放</div>
-  <div v-else-if="pageStatus == 2">
-    没有此页内容的配置权限，请检查集团上的配置
-  </div>
-  <div v-else-if="pageStatus == 3">加载发生错误</div>
-  <div v-else-if="pageStatus == 4" class="app-container">
-    <div class="card mx-auto shadow" style="width: 310px">
-      <div class="card-body">
-        <el-form
-          ref="ruleForm"
-          :model="ruleForm"
-          :rules="rules"
-          label-width="80px"
-        >
-          <el-form-item label="当前方案">
-            {{ currentDiscountName }}
-          </el-form-item>
+    <section class="content">
+      <div class="container-fluid">
+        <!-- Info boxes -->
+        <div class="row">
+          <div class="col-12 col-sm-6 col-md-3">
+            <div class="info-box">
+              <span class="info-box-icon bg-info elevation-1"><i class="fas fa-cog"></i></span>
 
-          <el-form-item label="变改方案">
-            <el-select
-              v-model="ruleForm.discountSetting"
-              placeholder="请选择优惠方案"
-              clearable
-              size="small"
-              style="width: 100px"
-              @change="discountSettingChang"
-            >
-              <el-option label="无" value="0"></el-option>
-              <el-option label="满减" value="1"></el-option>
-              <el-option label="立减" value="2"></el-option>
-              <el-option label="直降" value="3"></el-option>
-              <el-option label="阶梯直降" value="4"></el-option>
-            </el-select>
-            <button
-              href="#"
-              type="button"
-              @click="save"
-              class="btn btn-primary btn-sm ml-3 mb-1"
-            >
-              执行
-            </button>
-          </el-form-item>
-        </el-form>
-      </div>
-    </div>
-
-    <hr />
-    <el-dialog
-      :visible.sync="openDialog"
-      width="520px"
-      append-to-body
-      :title="
-        ['', '满减方案', '立减方案', '直降方案', '阶梯直降'][discountSetting]
-      "
-    >
-      <el-form
-        ref="updateForm"
-        :model="updateForm"
-        :rules="rules"
-        label-width="170px"
-      >
-        <el-form-item label="方案名称" prop="grade" class="input-group-sm">
-          <input
-            v-model="updateForm.grade"
-            placeholder=""
-            class="form-control form-control-sm w-50"
-          />
-        </el-form-item>
-        <el-form-item label="油品名称" prop="oilName">
-          <select
-            v-model="updateForm.oilName"
-            class="form-control form-control-sm w-50"
-            :disabled="ladderUp"
-          >
-            <option
-              v-for="dict in filterOilNameOptions"
-              :key="dict.oilName"
-              :value="dict.oilName"
-            >
-              {{ dict.oilName }}
-            </option>
-          </select>
-        </el-form-item>
-
-        <!-- 阶梯直降没有此规则 -->
-        <el-form-item
-          label="优惠条件"
-          prop="gasoilDiscountAmt"
-          :rules="{
-            required: discountSetting != 4,
-            message: '请填写优惠条件',
-            trigger: 'change',
-          }"
-          v-if="discountSetting != 4"
-        >
-          <el-radio-group
-            v-model="updateForm.discountTerm"
-            v-if="discountSetting == 3"
-          >
-            <el-radio label="2">按加油金额</el-radio>
-            <el-radio label="1">按加油升数</el-radio>
-          </el-radio-group>
-          <div
-            v-show="
-              updateForm.discountTerm == 2 ||
-              updateForm.discountTerm == 1 ||
-              discountSetting == 1 ||
-              discountSetting == 2
-            "
-          >
-            {{ ["", "每满", "满", "满"][discountSetting] }}
-            <!-- <el-input-number
-              v-model="updateForm.discountAmt"
-              size="mini"
-              :min="0"
-            /> -->
-            <input
-              v-model="updateForm.discountAmt"
-              class="form-control form-control-sm"
-              style="width: 50px; display: inline-block"
-            />
+              <div class="info-box-content">
+                <span class="info-box-text">CPU Traffic</span>
+                <span class="info-box-number">
+                  10
+                  <small>%</small>
+                </span>
+              </div>
+              <!-- /.info-box-content -->
+            </div>
+            <!-- /.info-box -->
+          </div>
+          <!-- /.col -->
+          <div class="col-12 col-sm-6 col-md-3">
+            <div class="info-box mb-3">
+              <span class="info-box-icon bg-danger elevation-1"><i class="fas fa-thumbs-up"></i></span>
 
-            <span>{{
-              updateForm.discountTerm == 1 && discountSetting == 3 ? "L" : "元"
-            }}</span>
-            ，{{ ["", "减", "减", "每升优惠"][discountSetting] }}
-            <!-- <el-input-number
-              v-model="updateForm.gasoilDiscountAmt"
-              size="mini"
-              :min="0"
-            /> -->
-            <input
-              v-model="updateForm.gasoilDiscountAmt"
-              class="form-control form-control-sm"
-              style="width: 50px; display: inline-block"
-            />
-            元
+              <div class="info-box-content">
+                <span class="info-box-text">Likes</span>
+                <span class="info-box-number">41,410</span>
+              </div>
+              <!-- /.info-box-content -->
+            </div>
+            <!-- /.info-box -->
           </div>
-        </el-form-item>
+          <!-- /.col -->
 
-        <!-- 阶梯直降没有此规则 -->
-        <el-form-item
-          label="会员日"
-          prop="discountSettingFlag"
-          :rules="{
-            required: discountSetting != 4,
-            message: '请选择是否开启会员日',
-            trigger: 'change',
-          }"
-          v-if="discountSetting != 4"
-        >
-          <el-radio-group v-model="updateForm.discountSettingFlag">
-            <el-radio label="0">关闭</el-radio>
-            <el-radio label="1">开启</el-radio>
-          </el-radio-group>
-        </el-form-item>
+          <!-- fix for small devices only -->
+          <div class="clearfix hidden-md-up"></div>
 
-        <el-form-item
-          label="会员日周期类型"
-          prop="discountType"
-          v-show="updateForm.discountSettingFlag == 1"
-          :rules="{
-            required: updateForm.discountSettingFlag == 1,
-            message: '请选择会员日的周期类型',
-            trigger: 'change',
-          }"
-        >
-    
-          <select
-            v-model="updateForm.discountType"
-            class="form-control form-control-sm w-50"
-            @change="timeClear"
-          >
-            <option value="1">每周指定日</option>
-            <option value="2">每月指定日</option>
-            <option value="3">固定活动日</option>
-          </select>
+          <div class="col-12 col-sm-6 col-md-3">
+            <div class="info-box mb-3">
+              <span class="info-box-icon bg-success elevation-1"><i class="fas fa-shopping-cart"></i></span>
 
-          <div
-            v-show="updateForm.discountType != 3"
-            style="
-              display: flex;
-              flex-wrap: wrap;
-              border-style: solid;
-              border-color: #f5f7fa;
-            "
-          >
-            <div
-              v-for="(item, index) in timeSelect[updateForm.discountType]"
-              :key="index"
-              style="margin: 3px"
-            >
-              <div
-                class="hover-style"
-                style="
-                  border-radius: 5px;
-                  font-weight: bold;
-                  font-size: 12px;
-                  cursor: pointer;
-                "
-                @click="clickCalendar(index)"
-              >
-                <div>{{ item }}</div>
-                <div
-                  v-if="updateForm.collectClickCalendar.indexOf(index) > -1"
-                  style="
-                    width: 4px;
-                    height: 4px;
-                    border-radius: 50%;
-                    background-color: red;
-                    position: relative;
-                    left: calc(50% - 2px);
-                  "
-                ></div>
-                <div v-else style="width: 4px; height: 4px"></div>
+              <div class="info-box-content">
+                <span class="info-box-text">Sales</span>
+                <span class="info-box-number">760</span>
               </div>
+              <!-- /.info-box-content -->
             </div>
+            <!-- /.info-box -->
           </div>
-          <div v-show="updateForm.discountType == 3" >
-            <el-date-picker
-              clearable
-              size="small"
-              style="width: 200px"
-              v-model="updateForm.collectClickDay"
-              type="dates"
-              value-format="yyyy-MM-dd"
-              placeholder="选择提醒时间设置"
-            >
-            </el-date-picker>
-          </div>
-        </el-form-item>
+          <!-- /.col -->
+          <div class="col-12 col-sm-6 col-md-3">
+            <div class="info-box mb-3">
+              <span class="info-box-icon bg-warning elevation-1"><i class="fas fa-users"></i></span>
 
-        <el-form-item
-          label="会员日优惠条件"
-          prop="discountActivityAmt"
-          v-show="updateForm.discountSettingFlag == 1"
-          :rules="{
-            required: updateForm.discountSettingFlag == 1,
-            message: '请填写会员日的优惠金额',
-            trigger: 'change',
-          }"
-        >
-          <div>
-            {{ ["", "每满", "满", "满"][discountSetting] }}
-            <!--
-            <el-input-number
-              v-model="updateForm.discountAmt"
-              size="mini"
-              :min="0"
-              disabled
-            />
-            -->
-            <input
-              v-model="updateForm.discountAmt"
-              class="form-control form-control-sm"
-              style="width: 50px; display: inline-block"
-              disabled
-            />
-
-            <span>{{
-              updateForm.discountTerm == 1 && discountSetting == 3 ? "L" : "元"
-            }}</span>
-            ，{{ ["", "减", "减", "每升优惠"][discountSetting] }}
-            <input
-              v-model="updateForm.discountActivityAmt"
-              class="form-control form-control-sm"
-              style="width: 50px; display: inline-block"
-            />元
+              <div class="info-box-content">
+                <span class="info-box-text">New Members</span>
+                <span class="info-box-number">2,000</span>
+              </div>
+              <!-- /.info-box-content -->
+            </div>
+            <!-- /.info-box -->
           </div>
-        </el-form-item>
+          <!-- /.col -->
+        </div>
+        <!-- /.row -->
 
-        <el-form-item label="叠加等级优惠" prop="vipDiscountyPlus">
-          <el-radio-group v-model="updateForm.vipDiscountyPlus">
-            <el-radio label="1">叠加</el-radio>
-            <el-radio label="0">不叠加</el-radio>
-          </el-radio-group>
-          <!--
-          <div style="margin-left: 20px; color: red; font-size: 12px">
-            注："否" 客户只享受 {{ discountName }} 优惠
-          </div>
-          -->
-        </el-form-item>
+        <div class="row">
+          <div class="col-md-12">
+            <div class="card">
+              <div class="card-header">
+                <h5 class="card-title">Monthly Recap Report</h5>
 
-        <!--
-        <el-form-item label="可否叠加劵" prop="couponPlus">
-          <el-radio-group v-model="updateForm.couponPlus">
-            <el-radio label="1">是</el-radio>
-            <el-radio label="0">否</el-radio>
-          </el-radio-group>
-          <div style="margin-left: 20px; color: red; font-size: 12px">
-            注："否" 客户只享受 {{ discountName }} 优惠
-          </div>
-        </el-form-item>
-        -->
+                <div class="card-tools">
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
+                  </button>
+                  <div class="btn-group">
+                    <button type="button" class="btn btn-tool dropdown-toggle" data-toggle="dropdown">
+                      <i class="fas fa-wrench"></i>
+                    </button>
+                    <div class="dropdown-menu dropdown-menu-right" role="menu">
+                      <a href="#" class="dropdown-item">Action</a>
+                      <a href="#" class="dropdown-item">Another action</a>
+                      <a href="#" class="dropdown-item">Something else here</a>
+                      <a class="dropdown-divider"></a>
+                      <a href="#" class="dropdown-item">Separated link</a>
+                    </div>
+                  </div>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
+                  </button>
+                </div>
+              </div>
+              <!-- /.card-header -->
+              <div class="card-body">
+                <div class="row">
+                  <div class="col-md-8">
+                    <p class="text-center">
+                      <strong>Sales: 1 Jan, 2014 - 30 Jul, 2014</strong>
+                    </p>
+
+                    <div class="chart">
+                      <!-- Sales Chart Canvas -->
+                      <canvas id="salesChart" height="180" style="height: 180px;"></canvas>
+                    </div>
+                    <!-- /.chart-responsive -->
+                  </div>
+                  <!-- /.col -->
+                  <div class="col-md-4">
+                    <p class="text-center">
+                      <strong>Goal Completion</strong>
+                    </p>
 
-        <!-- 只有阶梯直降有此规则 -->
-        <el-form-item
-          label="优惠条件"
-          prop="discountTerm"
-          :rules="{
-            required: discountSetting == 4,
-            message: '请填写优惠条件',
-            trigger: 'change',
-          }"
-          v-if="discountSetting == 4"
-        >
-          <el-radio-group v-model="updateForm.discountTerm">
-            <el-radio label="2">按加油金额</el-radio>
-            <el-radio label="1">按加油升数</el-radio>
-          </el-radio-group>
-        </el-form-item>
+                    <div class="progress-group">
+                      Add Products to Cart
+                      <span class="float-right"><b>160</b>/200</span>
+                      <div class="progress progress-sm">
+                        <div class="progress-bar bg-primary" style="width: 80%"></div>
+                      </div>
+                    </div>
+                    <!-- /.progress-group -->
 
-        <!-- 只有阶梯直降有此规则 -->
-        <el-form-item
-          label="阶梯设置"
-          prop="list"
+                    <div class="progress-group">
+                      Complete Purchase
+                      <span class="float-right"><b>310</b>/400</span>
+                      <div class="progress progress-sm">
+                        <div class="progress-bar bg-danger" style="width: 75%"></div>
+                      </div>
+                    </div>
 
-          v-if="discountSetting == 4"
-        >
-          <el-button
-            icon="el-icon-plus"
-            size="mini"
-            class="mb-3 mr-4"
-            @click="addLadder"
-            type="secondary"
-          >
-            添加规则
-          </el-button>
-        </el-form-item>
+                    <!-- /.progress-group -->
+                    <div class="progress-group">
+                      <span class="progress-text">Visit Premium Page</span>
+                      <span class="float-right"><b>480</b>/800</span>
+                      <div class="progress progress-sm">
+                        <div class="progress-bar bg-success" style="width: 60%"></div>
+                      </div>
+                    </div>
 
-        <div
-          class="mx-auto mb-4 bg-light pt-4 pb-2 px-1 rounded"
-          style="width: 450px"
-          v-if="discountSetting == 4"
-        >
-          <div
-            class="input-group input-group-sm mb-4 mt-1"
-            v-for="(item, index) in updateForm.list"
-            :key="index"
-          >
-            <input
-              type="text"
-              class="form-control"
-              v-model="item.discountAmt"
-            />
-            <div class="input-group-append">
-              <span class="input-group-text">
-                {{
-                  updateForm.discountTerm == 1
-                    ? "升&lt;= 加油升数 &lt;"
-                    : "元&lt;= 加油金额 &lt;"
-                }}
-              </span>
+                    <!-- /.progress-group -->
+                    <div class="progress-group">
+                      Send Inquiries
+                      <span class="float-right"><b>250</b>/500</span>
+                      <div class="progress progress-sm">
+                        <div class="progress-bar bg-warning" style="width: 50%"></div>
+                      </div>
+                    </div>
+                    <!-- /.progress-group -->
+                  </div>
+                  <!-- /.col -->
+                </div>
+                <!-- /.row -->
+              </div>
+              <!-- ./card-body -->
+              <div class="card-footer">
+                <div class="row">
+                  <div class="col-sm-3 col-6">
+                    <div class="description-block border-right">
+                      <span class="description-percentage text-success"><i class="fas fa-caret-up"></i> 17%</span>
+                      <h5 class="description-header">$35,210.43</h5>
+                      <span class="description-text">TOTAL REVENUE</span>
+                    </div>
+                    <!-- /.description-block -->
+                  </div>
+                  <!-- /.col -->
+                  <div class="col-sm-3 col-6">
+                    <div class="description-block border-right">
+                      <span class="description-percentage text-warning"><i class="fas fa-caret-left"></i> 0%</span>
+                      <h5 class="description-header">$10,390.90</h5>
+                      <span class="description-text">TOTAL COST</span>
+                    </div>
+                    <!-- /.description-block -->
+                  </div>
+                  <!-- /.col -->
+                  <div class="col-sm-3 col-6">
+                    <div class="description-block border-right">
+                      <span class="description-percentage text-success"><i class="fas fa-caret-up"></i> 20%</span>
+                      <h5 class="description-header">$24,813.53</h5>
+                      <span class="description-text">TOTAL PROFIT</span>
+                    </div>
+                    <!-- /.description-block -->
+                  </div>
+                  <!-- /.col -->
+                  <div class="col-sm-3 col-6">
+                    <div class="description-block">
+                      <span class="description-percentage text-danger"><i class="fas fa-caret-down"></i> 18%</span>
+                      <h5 class="description-header">1200</h5>
+                      <span class="description-text">GOAL COMPLETIONS</span>
+                    </div>
+                    <!-- /.description-block -->
+                  </div>
+                </div>
+                <!-- /.row -->
+              </div>
+              <!-- /.card-footer -->
             </div>
-            <input
-              type="text"
-              class="form-control"
-              v-model="item.discountAmtEnd"
-            />
-            <div class="input-group-append">
-              <span class="input-group-text"
-                >{{
-                  updateForm.discountTerm == 1 ? "升" : "元"
-                }}，每升优惠</span
-              >
+            <!-- /.card -->
+          </div>
+          <!-- /.col -->
+        </div>
+        <!-- /.row -->
+
+        <!-- Main row -->
+        <div class="row">
+          <!-- Left col -->
+          <div class="col-md-8">
+            <!-- MAP & BOX PANE -->
+            <div class="card">
+              <div class="card-header">
+                <h3 class="card-title">US-Visitors Report</h3>
+
+                <div class="card-tools">
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
+                  </button>
+                </div>
+              </div>
+              <!-- /.card-header -->
+              <div class="card-body p-0">
+                <div class="d-md-flex">
+                  <div class="p-1 flex-fill" style="overflow: hidden">
+                    <!-- Map will be created here -->
+                    <div id="world-map-markers" style="height: 325px; overflow: hidden">
+                      <div class="map"></div>
+                    </div>
+                  </div>
+                  <div class="card-pane-right bg-success pt-2 pb-2 pl-4 pr-4">
+                    <div class="description-block mb-4">
+                      <div class="sparkbar pad" data-color="#fff">90,70,90,70,75,80,70</div>
+                      <h5 class="description-header">8390</h5>
+                      <span class="description-text">Visits</span>
+                    </div>
+                    <!-- /.description-block -->
+                    <div class="description-block mb-4">
+                      <div class="sparkbar pad" data-color="#fff">90,50,90,70,61,83,63</div>
+                      <h5 class="description-header">30%</h5>
+                      <span class="description-text">Referrals</span>
+                    </div>
+                    <!-- /.description-block -->
+                    <div class="description-block">
+                      <div class="sparkbar pad" data-color="#fff">90,50,90,70,61,83,63</div>
+                      <h5 class="description-header">70%</h5>
+                      <span class="description-text">Organic</span>
+                    </div>
+                    <!-- /.description-block -->
+                  </div><!-- /.card-pane-right -->
+                </div><!-- /.d-md-flex -->
+              </div>
+              <!-- /.card-body -->
             </div>
-            <input
-              type="text"
-              class="form-control"
-              v-model="item.gasoilDiscountAmt"
-            />
-            <div class="input-group-append">
-              <span class="input-group-text">元</span>
+            <!-- /.card -->
+            <div class="row">
+              <div class="col-md-6">
+                <!-- DIRECT CHAT -->
+                <div class="card direct-chat direct-chat-warning">
+                  <div class="card-header">
+                    <h3 class="card-title">Direct Chat</h3>
+
+                    <div class="card-tools">
+                      <span title="3 New Messages" class="badge badge-warning">3</span>
+                      <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                        <i class="fas fa-minus"></i>
+                      </button>
+                      <button type="button" class="btn btn-tool" title="Contacts" data-widget="chat-pane-toggle">
+                        <i class="fas fa-comments"></i>
+                      </button>
+                      <button type="button" class="btn btn-tool" data-card-widget="remove">
+                        <i class="fas fa-times"></i>
+                      </button>
+                    </div>
+                  </div>
+                  <!-- /.card-header -->
+                  <div class="card-body">
+                    <!-- Conversations are loaded here -->
+                    <div class="direct-chat-messages">
+                      <!-- Message. Default to the left -->
+                      <div class="direct-chat-msg">
+                        <div class="direct-chat-infos clearfix">
+                          <span class="direct-chat-name float-left">Alexander Pierce</span>
+                          <span class="direct-chat-timestamp float-right">23 Jan 2:00 pm</span>
+                        </div>
+                        <!-- /.direct-chat-infos -->
+                        <img class="direct-chat-img" src="dist/img/user1-128x128.jpg" alt="message user image">
+                        <!-- /.direct-chat-img -->
+                        <div class="direct-chat-text">
+                          Is this template really for free? That's unbelievable!
+                        </div>
+                        <!-- /.direct-chat-text -->
+                      </div>
+                      <!-- /.direct-chat-msg -->
+
+                      <!-- Message to the right -->
+                      <div class="direct-chat-msg right">
+                        <div class="direct-chat-infos clearfix">
+                          <span class="direct-chat-name float-right">Sarah Bullock</span>
+                          <span class="direct-chat-timestamp float-left">23 Jan 2:05 pm</span>
+                        </div>
+                        <!-- /.direct-chat-infos -->
+                        <img class="direct-chat-img" src="dist/img/user3-128x128.jpg" alt="message user image">
+                        <!-- /.direct-chat-img -->
+                        <div class="direct-chat-text">
+                          You better believe it!
+                        </div>
+                        <!-- /.direct-chat-text -->
+                      </div>
+                      <!-- /.direct-chat-msg -->
+
+                      <!-- Message. Default to the left -->
+                      <div class="direct-chat-msg">
+                        <div class="direct-chat-infos clearfix">
+                          <span class="direct-chat-name float-left">Alexander Pierce</span>
+                          <span class="direct-chat-timestamp float-right">23 Jan 5:37 pm</span>
+                        </div>
+                        <!-- /.direct-chat-infos -->
+                        <img class="direct-chat-img" src="dist/img/user1-128x128.jpg" alt="message user image">
+                        <!-- /.direct-chat-img -->
+                        <div class="direct-chat-text">
+                          Working with AdminLTE on a great new app! Wanna join?
+                        </div>
+                        <!-- /.direct-chat-text -->
+                      </div>
+                      <!-- /.direct-chat-msg -->
+
+                      <!-- Message to the right -->
+                      <div class="direct-chat-msg right">
+                        <div class="direct-chat-infos clearfix">
+                          <span class="direct-chat-name float-right">Sarah Bullock</span>
+                          <span class="direct-chat-timestamp float-left">23 Jan 6:10 pm</span>
+                        </div>
+                        <!-- /.direct-chat-infos -->
+                        <img class="direct-chat-img" src="dist/img/user3-128x128.jpg" alt="message user image">
+                        <!-- /.direct-chat-img -->
+                        <div class="direct-chat-text">
+                          I would love to.
+                        </div>
+                        <!-- /.direct-chat-text -->
+                      </div>
+                      <!-- /.direct-chat-msg -->
+
+                    </div>
+                    <!--/.direct-chat-messages-->
+
+                    <!-- Contacts are loaded here -->
+                    <div class="direct-chat-contacts">
+                      <ul class="contacts-list">
+                        <li>
+                          <a href="#">
+                            <img class="contacts-list-img" src="dist/img/user1-128x128.jpg" alt="User Avatar">
+
+                            <div class="contacts-list-info">
+                              <span class="contacts-list-name">
+                                Count Dracula
+                                <small class="contacts-list-date float-right">2/28/2015</small>
+                              </span>
+                              <span class="contacts-list-msg">How have you been? I was...</span>
+                            </div>
+                            <!-- /.contacts-list-info -->
+                          </a>
+                        </li>
+                        <!-- End Contact Item -->
+                        <li>
+                          <a href="#">
+                            <img class="contacts-list-img" src="dist/img/user7-128x128.jpg" alt="User Avatar">
+
+                            <div class="contacts-list-info">
+                              <span class="contacts-list-name">
+                                Sarah Doe
+                                <small class="contacts-list-date float-right">2/23/2015</small>
+                              </span>
+                              <span class="contacts-list-msg">I will be waiting for...</span>
+                            </div>
+                            <!-- /.contacts-list-info -->
+                          </a>
+                        </li>
+                        <!-- End Contact Item -->
+                        <li>
+                          <a href="#">
+                            <img class="contacts-list-img" src="dist/img/user3-128x128.jpg" alt="User Avatar">
+
+                            <div class="contacts-list-info">
+                              <span class="contacts-list-name">
+                                Nadia Jolie
+                                <small class="contacts-list-date float-right">2/20/2015</small>
+                              </span>
+                              <span class="contacts-list-msg">I'll call you back at...</span>
+                            </div>
+                            <!-- /.contacts-list-info -->
+                          </a>
+                        </li>
+                        <!-- End Contact Item -->
+                        <li>
+                          <a href="#">
+                            <img class="contacts-list-img" src="dist/img/user5-128x128.jpg" alt="User Avatar">
+
+                            <div class="contacts-list-info">
+                              <span class="contacts-list-name">
+                                Nora S. Vans
+                                <small class="contacts-list-date float-right">2/10/2015</small>
+                              </span>
+                              <span class="contacts-list-msg">Where is your new...</span>
+                            </div>
+                            <!-- /.contacts-list-info -->
+                          </a>
+                        </li>
+                        <!-- End Contact Item -->
+                        <li>
+                          <a href="#">
+                            <img class="contacts-list-img" src="dist/img/user6-128x128.jpg" alt="User Avatar">
+
+                            <div class="contacts-list-info">
+                              <span class="contacts-list-name">
+                                John K.
+                                <small class="contacts-list-date float-right">1/27/2015</small>
+                              </span>
+                              <span class="contacts-list-msg">Can I take a look at...</span>
+                            </div>
+                            <!-- /.contacts-list-info -->
+                          </a>
+                        </li>
+                        <!-- End Contact Item -->
+                        <li>
+                          <a href="#">
+                            <img class="contacts-list-img" src="dist/img/user8-128x128.jpg" alt="User Avatar">
+
+                            <div class="contacts-list-info">
+                              <span class="contacts-list-name">
+                                Kenneth M.
+                                <small class="contacts-list-date float-right">1/4/2015</small>
+                              </span>
+                              <span class="contacts-list-msg">Never mind I found...</span>
+                            </div>
+                            <!-- /.contacts-list-info -->
+                          </a>
+                        </li>
+                        <!-- End Contact Item -->
+                      </ul>
+                      <!-- /.contacts-list -->
+                    </div>
+                    <!-- /.direct-chat-pane -->
+                  </div>
+                  <!-- /.card-body -->
+                  <div class="card-footer">
+                    <form action="#" method="post">
+                      <div class="input-group">
+                        <input type="text" name="message" placeholder="Type Message ..." class="form-control">
+                        <span class="input-group-append">
+                          <button type="button" class="btn btn-warning">Send</button>
+                        </span>
+                      </div>
+                    </form>
+                  </div>
+                  <!-- /.card-footer-->
+                </div>
+                <!--/.direct-chat -->
+              </div>
+              <!-- /.col -->
+
+              <div class="col-md-6">
+                <!-- USERS LIST -->
+                <div class="card">
+                  <div class="card-header">
+                    <h3 class="card-title">Latest Members</h3>
+
+                    <div class="card-tools">
+                      <span class="badge badge-danger">8 New Members</span>
+                      <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                        <i class="fas fa-minus"></i>
+                      </button>
+                      <button type="button" class="btn btn-tool" data-card-widget="remove">
+                        <i class="fas fa-times"></i>
+                      </button>
+                    </div>
+                  </div>
+                  <!-- /.card-header -->
+                  <div class="card-body p-0">
+                    <ul class="users-list clearfix">
+                      <li>
+                        <img src="dist/img/user1-128x128.jpg" alt="User Image">
+                        <a class="users-list-name" href="#">Alexander Pierce</a>
+                        <span class="users-list-date">Today</span>
+                      </li>
+                      <li>
+                        <img src="dist/img/user8-128x128.jpg" alt="User Image">
+                        <a class="users-list-name" href="#">Norman</a>
+                        <span class="users-list-date">Yesterday</span>
+                      </li>
+                      <li>
+                        <img src="dist/img/user7-128x128.jpg" alt="User Image">
+                        <a class="users-list-name" href="#">Jane</a>
+                        <span class="users-list-date">12 Jan</span>
+                      </li>
+                      <li>
+                        <img src="dist/img/user6-128x128.jpg" alt="User Image">
+                        <a class="users-list-name" href="#">John</a>
+                        <span class="users-list-date">12 Jan</span>
+                      </li>
+                      <li>
+                        <img src="dist/img/user2-160x160.jpg" alt="User Image">
+                        <a class="users-list-name" href="#">Alexander</a>
+                        <span class="users-list-date">13 Jan</span>
+                      </li>
+                      <li>
+                        <img src="dist/img/user5-128x128.jpg" alt="User Image">
+                        <a class="users-list-name" href="#">Sarah</a>
+                        <span class="users-list-date">14 Jan</span>
+                      </li>
+                      <li>
+                        <img src="dist/img/user4-128x128.jpg" alt="User Image">
+                        <a class="users-list-name" href="#">Nora</a>
+                        <span class="users-list-date">15 Jan</span>
+                      </li>
+                      <li>
+                        <img src="dist/img/user3-128x128.jpg" alt="User Image">
+                        <a class="users-list-name" href="#">Nadia</a>
+                        <span class="users-list-date">15 Jan</span>
+                      </li>
+                    </ul>
+                    <!-- /.users-list -->
+                  </div>
+                  <!-- /.card-body -->
+                  <div class="card-footer text-center">
+                    <a href="javascript:">View All Users</a>
+                  </div>
+                  <!-- /.card-footer -->
+                </div>
+                <!--/.card -->
+              </div>
+              <!-- /.col -->
             </div>
-            <div class="input-group-append" id="button-addon4">
-              <button
-                class="btn btn-danger"
-                type="button"
-                @click="delLadder(index)"
-              >
-                删除
-              </button>
+            <!-- /.row -->
+
+            <!-- TABLE: LATEST ORDERS -->
+            <div class="card">
+              <div class="card-header border-transparent">
+                <h3 class="card-title">Latest Orders</h3>
+
+                <div class="card-tools">
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
+                  </button>
+                </div>
+              </div>
+              <!-- /.card-header -->
+              <div class="card-body p-0">
+                <div class="table-responsive">
+                  <table class="table m-0">
+                    <thead>
+                    <tr>
+                      <th>Order ID</th>
+                      <th>Item</th>
+                      <th>Status</th>
+                      <th>Popularity</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr>
+                      <td><a href="pages/examples/invoice.html">OR9842</a></td>
+                      <td>Call of Duty IV</td>
+                      <td><span class="badge badge-success">Shipped</span></td>
+                      <td>
+                        <div class="sparkbar" data-color="#00a65a" data-height="20">90,80,90,-70,61,-83,63</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td><a href="pages/examples/invoice.html">OR1848</a></td>
+                      <td>Samsung Smart TV</td>
+                      <td><span class="badge badge-warning">Pending</span></td>
+                      <td>
+                        <div class="sparkbar" data-color="#f39c12" data-height="20">90,80,-90,70,61,-83,68</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td><a href="pages/examples/invoice.html">OR7429</a></td>
+                      <td>iPhone 6 Plus</td>
+                      <td><span class="badge badge-danger">Delivered</span></td>
+                      <td>
+                        <div class="sparkbar" data-color="#f56954" data-height="20">90,-80,90,70,-61,83,63</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td><a href="pages/examples/invoice.html">OR7429</a></td>
+                      <td>Samsung Smart TV</td>
+                      <td><span class="badge badge-info">Processing</span></td>
+                      <td>
+                        <div class="sparkbar" data-color="#00c0ef" data-height="20">90,80,-90,70,-61,83,63</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td><a href="pages/examples/invoice.html">OR1848</a></td>
+                      <td>Samsung Smart TV</td>
+                      <td><span class="badge badge-warning">Pending</span></td>
+                      <td>
+                        <div class="sparkbar" data-color="#f39c12" data-height="20">90,80,-90,70,61,-83,68</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td><a href="pages/examples/invoice.html">OR7429</a></td>
+                      <td>iPhone 6 Plus</td>
+                      <td><span class="badge badge-danger">Delivered</span></td>
+                      <td>
+                        <div class="sparkbar" data-color="#f56954" data-height="20">90,-80,90,70,-61,83,63</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td><a href="pages/examples/invoice.html">OR9842</a></td>
+                      <td>Call of Duty IV</td>
+                      <td><span class="badge badge-success">Shipped</span></td>
+                      <td>
+                        <div class="sparkbar" data-color="#00a65a" data-height="20">90,80,90,-70,61,-83,63</div>
+                      </td>
+                    </tr>
+                    </tbody>
+                  </table>
+                </div>
+                <!-- /.table-responsive -->
+              </div>
+              <!-- /.card-body -->
+              <div class="card-footer clearfix">
+                <a href="javascript:void(0)" class="btn btn-sm btn-info float-left">Place New Order</a>
+                <a href="javascript:void(0)" class="btn btn-sm btn-secondary float-right">View All Orders</a>
+              </div>
+              <!-- /.card-footer -->
             </div>
+            <!-- /.card -->
           </div>
-        </div>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="handleSubmit">确 定</el-button>
-        <el-button @click="cancelSubmit">取 消</el-button>
-      </div>
-    </el-dialog>
+          <!-- /.col -->
 
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      :inline="true"
-      label-width="68px"
-      v-show="discountSetting != 0"
-      class="mx-auto"
-    >
-      <div>
-        <el-button
-          icon="el-icon-plus"
-          size="mini"
-          class="mb-3 mr-4"
-          @click="handleUpdateClick"
-          style="float: right"
-          type="warning"
-        >
-          {{
-            this.discountSetting == 1
-              ? "添加满减方案规则"
-              : this.discountSetting == 2
-              ? "添加立减方案规则"
-              : this.discountSetting == 3
-              ? "添加直降方案规则"
-              : this.discountSetting == 4
-              ? "添加阶梯直降规则"
-              : "无"
-          }}
-        </el-button>
-      </div>
-    </el-form>
-    <el-table
-      :data="discountList"
-      v-show="discountSetting != 0 && discountSetting != 4"
-      class="shadow"
-    >
-      <af-table-column label="id" align="center" prop="id" v-if="false" />
-      <af-table-column label="方案名称" align="center" prop="grade" />
-      <af-table-column label="油品名称" align="center" prop="oilName" />
-      <af-table-column
-        label="优惠条件"
-        align="center"
-        v-if="discountSetting == 3"
-      >
-        <template slot-scope="scope">
-          满 {{ scope.row.discountAmt }}
-          {{ scope.row.discountTerm == 2 ? "元" : "L" }}，每升优惠
-          {{ scope.row.gasoilDiscountAmt }} 元
-        </template>
-      </af-table-column>
-      <af-table-column
-        label="优惠条件"
-        align="center"
-        v-if="discountSetting == 1"
-      >
-        <template slot-scope="scope">
-          每满 {{ scope.row.discountAmt }} 元，减
-          {{ scope.row.gasoilDiscountAmt }} 元
-        </template>
-      </af-table-column>
-      <af-table-column
-        label="优惠条件"
-        align="center"
-        v-if="discountSetting == 2"
-      >
-        <template slot-scope="scope">
-          满 {{ scope.row.discountAmt }} 元，减
-          {{ scope.row.gasoilDiscountAmt }} 元
-        </template>
-      </af-table-column>
-      <af-table-column
-        label="会员日"
-        align="center"
-        v-if="discountSetting != 4"
-      >
-        <template slot-scope="scope">
-          <span v-if="scope.row.discountSettingFlag == 0"> 无活动 </span>
-          <span v-else-if="scope.row.discountSettingFlag == 1">
-            {{ discountSettingTranslate(scope.row) }}
-          </span>
-        </template>
-      </af-table-column>
-      <af-table-column
-        label="叠加等级优惠"
-        align="center"
-        prop="vipDiscountyPlus"
-        :formatter="vipDiscountyPlusFotmat"
-      />
-      <!--
-      <af-table-column
-        label="叠加劵"
-        align="center"
-        prop="couponPlus"
-        :formatter="couponPlusFotmat"
-      />
-      -->
-      <af-table-column
-        label="优惠方案类型"
-        v-if="false"
-        align="center"
-        prop="discountPlanType"
-      />
-      <af-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            >删除</el-button
-          >
-        </template>
-      </af-table-column>
-    </el-table>
-    <el-table
-      :data="discountListTep"
-      v-show="discountSetting == 4"
-      type="expand"
-      class="shadow"
-    >
-      <af-table-column type="expand">
-        <template slot-scope="props">
-          <div class="container">
-            <div class="row">
-              <div
-              class="input-group input-group-sm mb-4 mt-1 col-lg-6"
-              v-for="(item, index) in props.row.list"
-              :key="index"
-              style="width:600px;"
-            >
-              <div class="input-group-append">
-                <span class="input-group-text"> 规则 {{index + 1}}： </span>
+          <div class="col-md-4">
+            <!-- Info Boxes Style 2 -->
+            <div class="info-box mb-3 bg-warning">
+              <span class="info-box-icon"><i class="fas fa-tag"></i></span>
+
+              <div class="info-box-content">
+                <span class="info-box-text">Inventory</span>
+                <span class="info-box-number">5,200</span>
+              </div>
+              <!-- /.info-box-content -->
+            </div>
+            <!-- /.info-box -->
+            <div class="info-box mb-3 bg-success">
+              <span class="info-box-icon"><i class="far fa-heart"></i></span>
+
+              <div class="info-box-content">
+                <span class="info-box-text">Mentions</span>
+                <span class="info-box-number">92,050</span>
               </div>
-              <input
-                type="text"
-                class="form-control"
-                v-model="item.discountAmt"
-                disabled
-                
-              />
-              <div class="input-group-append">
-                <span class="input-group-text"> {{updateForm.discountTerm==1 ? '升&lt;= 加油升数 &lt;': "元&lt;= 加油金额 &lt;"}}  </span>
+              <!-- /.info-box-content -->
+            </div>
+            <!-- /.info-box -->
+            <div class="info-box mb-3 bg-danger">
+              <span class="info-box-icon"><i class="fas fa-cloud-download-alt"></i></span>
+
+              <div class="info-box-content">
+                <span class="info-box-text">Downloads</span>
+                <span class="info-box-number">114,381</span>
               </div>
-              <input
-                type="text"
-                class="form-control"
-                v-model="item.discountAmtEnd"
-                disabled
-              />
-              <div class="input-group-append">
-                <span class="input-group-text">{{updateForm.discountTerm==1 ? '升，':'元，'}}</span>
+              <!-- /.info-box-content -->
+            </div>
+            <!-- /.info-box -->
+            <div class="info-box mb-3 bg-info">
+              <span class="info-box-icon"><i class="far fa-comment"></i></span>
+
+              <div class="info-box-content">
+                <span class="info-box-text">Direct Messages</span>
+                <span class="info-box-number">163,921</span>
               </div>
-              <div class="input-group-append">
-                <span class="input-group-text">每升优惠</span>
+              <!-- /.info-box-content -->
+            </div>
+            <!-- /.info-box -->
+
+            <div class="card">
+              <div class="card-header">
+                <h3 class="card-title">Browser Usage</h3>
+
+                <div class="card-tools">
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
+                  </button>
+                </div>
               </div>
-              <input
-                type="text"
-                class="form-control"
-                v-model="item.gasoilDiscountAmt"
-                disabled
-              />
-              <div class="input-group-append">
-                <span class="input-group-text">元</span>
+              <!-- /.card-header -->
+              <div class="card-body">
+                <div class="row">
+                  <div class="col-md-8">
+                    <div class="chart-responsive">
+                      <canvas id="pieChart" height="150"></canvas>
+                    </div>
+                    <!-- ./chart-responsive -->
+                  </div>
+                  <!-- /.col -->
+                  <div class="col-md-4">
+                    <ul class="chart-legend clearfix">
+                      <li><i class="far fa-circle text-danger"></i> Chrome</li>
+                      <li><i class="far fa-circle text-success"></i> IE</li>
+                      <li><i class="far fa-circle text-warning"></i> FireFox</li>
+                      <li><i class="far fa-circle text-info"></i> Safari</li>
+                      <li><i class="far fa-circle text-primary"></i> Opera</li>
+                      <li><i class="far fa-circle text-secondary"></i> Navigator</li>
+                    </ul>
+                  </div>
+                  <!-- /.col -->
+                </div>
+                <!-- /.row -->
               </div>
-              <div class="input-group-append" id="button-addon4">
+              <!-- /.card-body -->
+              <div class="card-footer p-0">
+                <ul class="nav nav-pills flex-column">
+                  <li class="nav-item">
+                    <a href="#" class="nav-link">
+                      United States of America
+                      <span class="float-right text-danger">
+                        <i class="fas fa-arrow-down text-sm"></i>
+                        12%</span>
+                    </a>
+                  </li>
+                  <li class="nav-item">
+                    <a href="#" class="nav-link">
+                      India
+                      <span class="float-right text-success">
+                        <i class="fas fa-arrow-up text-sm"></i> 4%
+                      </span>
+                    </a>
+                  </li>
+                  <li class="nav-item">
+                    <a href="#" class="nav-link">
+                      China
+                      <span class="float-right text-warning">
+                        <i class="fas fa-arrow-left text-sm"></i> 0%
+                      </span>
+                    </a>
+                  </li>
+                </ul>
               </div>
+              <!-- /.footer -->
             </div>
+            <!-- /.card -->
+
+            <!-- PRODUCT LIST -->
+            <div class="card">
+              <div class="card-header">
+                <h3 class="card-title">Recently Added Products</h3>
+
+                <div class="card-tools">
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
+                  </button>
+                </div>
+              </div>
+              <!-- /.card-header -->
+              <div class="card-body p-0">
+                <ul class="products-list product-list-in-card pl-2 pr-2">
+                  <li class="item">
+                    <div class="product-img">
+                      <img src="dist/img/default-150x150.png" alt="Product Image" class="img-size-50">
+                    </div>
+                    <div class="product-info">
+                      <a href="javascript:void(0)" class="product-title">Samsung TV
+                        <span class="badge badge-warning float-right">$1800</span></a>
+                      <span class="product-description">
+                        Samsung 32" 1080p 60Hz LED Smart HDTV.
+                      </span>
+                    </div>
+                  </li>
+                  <!-- /.item -->
+                  <li class="item">
+                    <div class="product-img">
+                      <img src="dist/img/default-150x150.png" alt="Product Image" class="img-size-50">
+                    </div>
+                    <div class="product-info">
+                      <a href="javascript:void(0)" class="product-title">Bicycle
+                        <span class="badge badge-info float-right">$700</span></a>
+                      <span class="product-description">
+                        26" Mongoose Dolomite Men's 7-speed, Navy Blue.
+                      </span>
+                    </div>
+                  </li>
+                  <!-- /.item -->
+                  <li class="item">
+                    <div class="product-img">
+                      <img src="dist/img/default-150x150.png" alt="Product Image" class="img-size-50">
+                    </div>
+                    <div class="product-info">
+                      <a href="javascript:void(0)" class="product-title">
+                        Xbox One <span class="badge badge-danger float-right">
+                        $350
+                      </span>
+                      </a>
+                      <span class="product-description">
+                        Xbox One Console Bundle with Halo Master Chief Collection.
+                      </span>
+                    </div>
+                  </li>
+                  <!-- /.item -->
+                  <li class="item">
+                    <div class="product-img">
+                      <img src="dist/img/default-150x150.png" alt="Product Image" class="img-size-50">
+                    </div>
+                    <div class="product-info">
+                      <a href="javascript:void(0)" class="product-title">PlayStation 4
+                        <span class="badge badge-success float-right">$399</span></a>
+                      <span class="product-description">
+                        PlayStation 4 500GB Console (PS4)
+                      </span>
+                    </div>
+                  </li>
+                  <!-- /.item -->
+                </ul>
+              </div>
+              <!-- /.card-body -->
+              <div class="card-footer text-center">
+                <a href="javascript:void(0)" class="uppercase">View All Products</a>
+              </div>
+              <!-- /.card-footer -->
             </div>
+            <!-- /.card -->
           </div>
-        </template>
-      </af-table-column>
-      <af-table-column label="方案名称" align="center" prop="grade" />
-      <af-table-column label="油品名称" align="center" prop="oilName" />
-      <af-table-column
-        label="叠加等级优惠"
-        align="center"
-        prop="vipDiscountyPlus"
-        :formatter="vipDiscountyPlusFotmat"
-      />
-      <!--
-      <af-table-column
-        label="叠加劵"
-        align="center"
-        prop="couponPlus"
-        :formatter="couponPlusFotmat"
-      />
-      -->
-      <af-table-column
-        label="优惠方案类型"
-        v-if="false"
-        align="center"
-        prop="discountPlanType"
-      />
-      <af-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-        width="200px"
-      >
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleLadderUpdata(scope.row)"
-            >修改规则</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDeleteLadder(scope.row)"
-            >删除</el-button
-          >
-        </template>
-      </af-table-column>
-    </el-table>
-  </div>
+          <!-- /.col -->
+        </div>
+        <!-- /.row -->
+      </div><!--/. container-fluid -->
+      
+    </section>
+    
 </template>
 
 <script>

src/views/overview/Overview_AccountingReport.vue

@@ -285,13 +285,10 @@ export default {
   methods: {
     /** 查询【请填写功能名称】列表 */
     getList() {
-      console.log("这个", this.queryParams, this.dateRangeCreatedDate);
       listSummary(
         this.addDateRange(this.queryParams, this.dateRangeCreatedDate)
       ).then((response) => {
-        console.log("条件", response);
         this.summaryList = response.rows;
-        console.log("summaryList", this.summaryList);
         this.total = response.total;
       });
     },