diff --git a/fuintAdmin/.env.development b/fuintAdmin/.env.development
index d120c332b..13f6cd034 100644
--- a/fuintAdmin/.env.development
+++ b/fuintAdmin/.env.development
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = fuint会员营销管理系统
+VUE_APP_TITLE = 蓝鲸智慧油站系统
 
 # 开发环境配置
 ENV = 'development'
@@ -11,4 +11,4 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_APP_PUBLIC_PATH = '/'
 
 # 后端接口地址
-VUE_APP_SERVER_URL = 'http://localhost:8080/'
+VUE_APP_SERVER_URL = 'http://192.168.1.4:8080/'
diff --git a/fuintAdmin/.env.production b/fuintAdmin/.env.production
index b2565cdd2..0f63273d9 100644
--- a/fuintAdmin/.env.production
+++ b/fuintAdmin/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = fuint会员营销管理系统
+VUE_APP_TITLE = 蓝鲸智慧油站系统
 
 # 生产环境配置
 ENV = 'production'
@@ -11,4 +11,4 @@ VUE_APP_BASE_API = '/fuint-application/'
 VUE_APP_PUBLIC_PATH = '/fuintAdmin/'
 
 # 后端接口地址
-VUE_APP_SERVER_URL = 'https://www.fuint.cn/fuint-application/'
+VUE_APP_SERVER_URL = 'http://192.168.1.4:8080/'
diff --git a/fuintAdmin/.env.staging b/fuintAdmin/.env.staging
index 6faf2d62a..2c8784644 100644
--- a/fuintAdmin/.env.staging
+++ b/fuintAdmin/.env.staging
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = fuint会员营销管理系统
+VUE_APP_TITLE = 蓝鲸智慧油站系统
 
 # 测试环境配置
 ENV = 'staging'
@@ -11,4 +11,4 @@ VUE_APP_BASE_API = '/stage-api'
 VUE_APP_PUBLIC_PATH = '/'
 
 # 后端接口地址
-VUE_APP_SERVER_URL = 'http://localhost:8082/stage-api/'
+VUE_APP_SERVER_URL = 'http://192.168.1.4:8080/'
diff --git a/fuintAdmin/src/App.vue b/fuintAdmin/src/App.vue
index 391d951c4..66ed62ffb 100644
--- a/fuintAdmin/src/App.vue
+++ b/fuintAdmin/src/App.vue
@@ -5,15 +5,15 @@
 </template>
 
 <script>
-export default  {
-  name:  'App',
+  export default  {
+    name:  'App',
     metaInfo() {
-        return {
-            title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
-            titleTemplate: title => {
-                return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE
-            }
+      return {
+        title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
+        titleTemplate: title => {
+          return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE
         }
+      }
     }
-}
+  }
 </script>
diff --git a/fuintAdmin/src/api/dict/type.js b/fuintAdmin/src/api/dict/type.js
new file mode 100644
index 000000000..a0254baa7
--- /dev/null
+++ b/fuintAdmin/src/api/dict/type.js
@@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+// 查询字典类型列表
+export function listType(query) {
+  return request({
+    url: '/system/dict/type/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询字典类型详细
+export function getType(dictId) {
+  return request({
+    url: '/system/dict/type/' + dictId,
+    method: 'get'
+  })
+}
+
+// 新增字典类型
+export function addType(data) {
+  return request({
+    url: '/system/dict/type',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改字典类型
+export function updateType(data) {
+  return request({
+    url: '/system/dict/type',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除字典类型
+export function delType(dictId) {
+  return request({
+    url: '/system/dict/type/' + dictId,
+    method: 'delete'
+  })
+}
+
+// 刷新字典缓存
+export function refreshCache() {
+  return request({
+    url: '/system/dict/type/refreshCache',
+    method: 'delete'
+  })
+}
+
+// 获取字典选择框列表
+export function optionselect() {
+  return request({
+    url: '/system/dict/type/optionselect',
+    method: 'get'
+  })
+}
diff --git a/fuintAdmin/src/assets/images/bolang.png b/fuintAdmin/src/assets/images/bolang.png
new file mode 100644
index 000000000..90b8ec131
Binary files /dev/null and b/fuintAdmin/src/assets/images/bolang.png differ
diff --git a/fuintAdmin/src/assets/logo/logo.png b/fuintAdmin/src/assets/logo/logo.png
index 36d00d37a..2c00c88b4 100644
Binary files a/fuintAdmin/src/assets/logo/logo.png and b/fuintAdmin/src/assets/logo/logo.png differ
diff --git a/fuintAdmin/src/assets/styles/fuint.scss b/fuintAdmin/src/assets/styles/fuint.scss
index 3cdb9c5a1..b12b0896b 100644
--- a/fuintAdmin/src/assets/styles/fuint.scss
+++ b/fuintAdmin/src/assets/styles/fuint.scss
@@ -131,6 +131,7 @@
     margin-bottom: 10px;
     margin-top: 15px;
     padding: 10px 20px !important;
+  background: transparent;
 }
 
 /* tree border */
diff --git a/fuintAdmin/src/assets/styles/index.scss b/fuintAdmin/src/assets/styles/index.scss
index 96095ef6b..defa70e9b 100644
--- a/fuintAdmin/src/assets/styles/index.scss
+++ b/fuintAdmin/src/assets/styles/index.scss
@@ -131,6 +131,7 @@ aside {
 
 .pagination-container {
   margin-top: 30px;
+
 }
 
 .text-center {
diff --git a/fuintAdmin/src/assets/styles/variables.scss b/fuintAdmin/src/assets/styles/variables.scss
index fa32342dd..56415887a 100644
--- a/fuintAdmin/src/assets/styles/variables.scss
+++ b/fuintAdmin/src/assets/styles/variables.scss
@@ -9,16 +9,16 @@ $yellow:#FEC171;
 $panGreen: #30B08F;
 
 // 默认菜单主题风格
-$base-menu-color:#bfcbd9;
-$base-menu-color-active:#f4f4f5;
-$base-menu-background:#304156;
+$base-menu-color:#ffffff;// 菜单全部字体颜色
+$base-menu-color-active:#ffffff;// 父级菜单激活的字体颜色
+$base-menu-background:#1a5982;
 $base-logo-title-color: #ffffff;
 
-$base-menu-light-color:rgba(0,0,0,.70);
+$base-menu-light-color:#ffffff;
 $base-menu-light-background:#ffffff;
-$base-logo-light-title-color: #001529;
+$base-logo-light-title-color: #1a5982;
 
-$base-sub-menu-background:#1f2d3d;
+$base-sub-menu-background:#18547a;//展开的背景色
 $base-sub-menu-hover:#001528;
 
 $base-sidebar-width: 200px;
diff --git a/fuintAdmin/src/components/Pagination/index.vue b/fuintAdmin/src/components/Pagination/index.vue
index 56f5a6b9d..3246c66c1 100644
--- a/fuintAdmin/src/components/Pagination/index.vue
+++ b/fuintAdmin/src/components/Pagination/index.vue
@@ -105,7 +105,7 @@ export default {
 
 <style scoped>
 .pagination-container {
-  background: #fff;
+  background: transparent;
   padding: 32px 16px;
 }
 .pagination-container.hidden {
diff --git a/fuintAdmin/src/components/RightToolbar/index.vue b/fuintAdmin/src/components/RightToolbar/index.vue
index f7663a3c8..86c291a1e 100644
--- a/fuintAdmin/src/components/RightToolbar/index.vue
+++ b/fuintAdmin/src/components/RightToolbar/index.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="top-right-btn">
     <el-row>
-      <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
-        <el-button size="mini" circle icon="el-icon-search" @click="toggleSearch()" />
-      </el-tooltip>
+<!--      <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">-->
+<!--        <el-button size="mini" circle icon="el-icon-search" @click="toggleSearch()" />-->
+<!--      </el-tooltip>-->
       <el-tooltip class="item" effect="dark" content="刷新" placement="top">
         <el-button size="mini" circle icon="el-icon-refresh" @click="refresh()" />
       </el-tooltip>
diff --git a/fuintAdmin/src/layout/components/AppMain.vue b/fuintAdmin/src/layout/components/AppMain.vue
index 0c6f4b784..7247b0da4 100644
--- a/fuintAdmin/src/layout/components/AppMain.vue
+++ b/fuintAdmin/src/layout/components/AppMain.vue
@@ -25,24 +25,25 @@ export default {
 <style lang="scss" scoped>
 .app-main {
   /* 50= navbar  50  */
-  min-height: calc(100vh - 50px);
+  min-height: calc(100vh - 110px);
+
   width: 100%;
   position: relative;
   overflow: hidden;
 }
 
 .fixed-header+.app-main {
-  padding-top: 50px;
+  padding-top: 110px;
 }
 
 .hasTagsView {
   .app-main {
     /* 84 = navbar + tags-view = 50 + 34 */
-    min-height: calc(100vh - 84px);
+    min-height: calc(100vh - 110px);
   }
 
   .fixed-header+.app-main {
-    padding-top: 84px;
+    padding-top: 130px;
   }
 }
 </style>
diff --git a/fuintAdmin/src/layout/components/Navbar.vue b/fuintAdmin/src/layout/components/Navbar.vue
index 58597bec0..ba42331bc 100644
--- a/fuintAdmin/src/layout/components/Navbar.vue
+++ b/fuintAdmin/src/layout/components/Navbar.vue
@@ -1,8 +1,10 @@
 <template>
   <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
-    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
+<!--    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />-->
+<!--    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>-->
+
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
+
     <div class="right-menu">
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
@@ -25,6 +27,15 @@
         </el-dropdown-menu>
       </el-dropdown>
     </div>
+    <div class="title-logo">
+      <div >
+        <img src="../../assets/logo/logo.png" alt="" style="width: 60px;height: 50px; margin-right: 10px">
+      </div>
+      <div>
+        蓝鲸智慧油站欢迎您
+      </div>
+
+    </div>
   </div>
 </template>
 
@@ -93,12 +104,19 @@ export default {
 
 <style lang="scss" scoped>
 .navbar {
-  height: 50px;
+  height: 90px;
   overflow: hidden;
   position: relative;
-  background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  background: #144a6e;
+  background-image: url("../../assets/images/bolang.png") ;
+  background-size: 100% 100%;
+  background-size: cover;
+  background-repeat: no-repeat;
 
+  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  box-sizing: border-box;
+  padding-top:25px ;
+  position: relative;
   .hamburger-container {
     line-height: 46px;
     height: 100%;
@@ -111,6 +129,17 @@ export default {
       background: rgba(0, 0, 0, .025)
     }
   }
+  .title-logo{
+    position: absolute;
+    top: 50%; /* 将元素垂直向上移动容器高度的50% */
+    left: 50%; /* 将元素水平向左移动容器宽度的50% */
+    transform: translate(-50%, -50%); /* 通过移动元素的左上角使其居中 */
+    color: #ffffff;
+    font-size: 24px;
+    font-weight: bold;
+    display: flex;
+    align-items: center;
+  }
 
   .breadcrumb-container {
     float: left;
@@ -140,7 +169,7 @@ export default {
       padding: 0 8px;
       height: 100%;
       font-size: 18px;
-      color: #5a5e66;
+      color: #ffffff;
       vertical-align: text-bottom;
 
       &.hover-effect {
diff --git a/fuintAdmin/src/layout/components/TagsView/index.vue b/fuintAdmin/src/layout/components/TagsView/index.vue
index a46951d60..e1614c1d3 100644
--- a/fuintAdmin/src/layout/components/TagsView/index.vue
+++ b/fuintAdmin/src/layout/components/TagsView/index.vue
@@ -50,9 +50,9 @@ export default {
     routes() {
       return this.$store.state.permission.routes
     },
-    theme() {
-      return this.$store.state.settings.theme;
-    }
+    // theme() {
+    //   return this.$store.state.settings.theme;
+    // }
   },
   watch: {
     $route() {
@@ -68,8 +68,8 @@ export default {
     }
   },
   mounted() {
-    this.initTags()
-    this.addTags()
+    // this.initTags()
+    // this.addTags()
   },
   methods: {
     isActive(route) {
@@ -78,8 +78,8 @@ export default {
     activeStyle(tag) {
       if (!this.isActive(tag)) return {};
       return {
-        "background-color": this.theme,
-        "border-color": this.theme
+        "background-color": '#409EFF',
+        "border-color": '#409EFF',
       };
     },
     isAffix(tag) {
@@ -233,11 +233,13 @@ export default {
 
 <style lang="scss" scoped>
 .tags-view-container {
-  height: 34px;
+  height: 45px;
   width: 100%;
   background: #fff;
   border-bottom: 1px solid #d8dce5;
   box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
+  box-sizing: border-box;
+  padding-top: 5px;
   .tags-view-wrapper {
     .tags-view-item {
       display: inline-block;
diff --git a/fuintAdmin/src/store/index.js b/fuintAdmin/src/store/index.js
index 53b8437ac..f8ca3d9de 100644
--- a/fuintAdmin/src/store/index.js
+++ b/fuintAdmin/src/store/index.js
@@ -17,6 +17,7 @@ const store = new Vuex.Store({
     permission,
     settings
   },
+
   getters
 })
 
diff --git a/fuintAdmin/src/store/modules/settings.js b/fuintAdmin/src/store/modules/settings.js
index d98f37b82..4bfc0afbd 100644
--- a/fuintAdmin/src/store/modules/settings.js
+++ b/fuintAdmin/src/store/modules/settings.js
@@ -5,7 +5,7 @@ const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dyn
 const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
 const state = {
   title: '',
-  theme: storageSetting.theme || '#00acac',
+  theme:  '#409EFF',
   sideTheme: storageSetting.sideTheme || sideTheme,
   showSettings: showSettings,
   topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,
diff --git a/fuintAdmin/src/views/components/charts/chartstwo.vue b/fuintAdmin/src/views/components/charts/chartstwo.vue
new file mode 100644
index 000000000..1823607d4
--- /dev/null
+++ b/fuintAdmin/src/views/components/charts/chartstwo.vue
@@ -0,0 +1,47 @@
+<template>
+  <div id="chart" style="width: 600px; height: 400px;"></div>
+</template>
+
+<script>
+  import echarts from 'echarts'
+
+  export default {
+    name: 'Chart',
+    mounted() {
+      this.initChart()
+    },
+    methods: {
+      initChart() {
+        const chart = echarts.init(document.getElementById('chart'))
+
+        const option = {
+          title: {
+            text: 'ECharts 示例'
+          },
+          tooltip: {
+            trigger: 'axis'
+          },
+          legend: {
+            data: ['销量']
+          },
+          xAxis: {
+            type: 'category',
+            data: ['衬衫', '羊毛衫', '雪纺衫', '裤子', '高跟鞋', '袜子']
+          },
+          yAxis: {
+            type: 'value'
+          },
+          series: [
+            {
+              name: '销量',
+              type: 'bar',
+              data: [5, 20, 36, 10, 10, 20]
+            }
+          ]
+        }
+
+        chart.setOption(option)
+      }
+    }
+  }
+</script>
diff --git a/fuintAdmin/src/views/index.vue b/fuintAdmin/src/views/index.vue
index ba775d68d..fb3f500d0 100644
--- a/fuintAdmin/src/views/index.vue
+++ b/fuintAdmin/src/views/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
       <div class="overview">
-          <div class="title">运营概况</div>
+          <div class="title">运营概况 </div>
           <div class="content" v-loading="loading">
               <el-row class="line">
                 <el-col class="item" :span="6">
@@ -93,16 +93,21 @@
           </el-row>
         </div>
       </div>
+    <div class="overview">
+    <commonChartwo></commonChartwo>
+    </div>
   </div>
 </template>
 
 <script>
 import { getHomeData, getStatisticData } from "@/api/home";
 import commonChart from './components/charts/index'
+import commonChartwo from './components/charts/chartstwo'
 export default {
   name: "HomePage",
   components: {
-    commonChart
+    commonChart,
+    commonChartwo
   },
   data() {
     return {
diff --git a/fuintAdmin/src/views/system/dict/data.vue b/fuintAdmin/src/views/system/dict/data.vue
index ce2c6ebe0..b9729388a 100644
--- a/fuintAdmin/src/views/system/dict/data.vue
+++ b/fuintAdmin/src/views/system/dict/data.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <el-card >
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="字典名称" prop="dictType">
         <el-select v-model="queryParams.dictType">
@@ -34,7 +35,10 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+    </el-card>
 
+
+    <el-card  style="margin-top: 20px">
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -43,53 +47,13 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['system:dict:add']"
+
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:dict:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:dict:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:dict:export']"
-        >导出</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-close"
-          size="mini"
-          @click="handleClose"
-        >关闭</el-button>
-      </el-col>
+
+
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-
     <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="字典编码" align="center" prop="dictCode" />
@@ -119,14 +83,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dict:edit']"
+
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dict:remove']"
+
           >删除</el-button>
         </template>
       </el-table-column>
@@ -139,6 +103,7 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+    </el-card>
 
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -196,6 +161,13 @@ import { listType, getType } from "@/api/system/dict/type";
 export default {
   name: "Data",
   dicts: ['sys_normal_disable'],
+  props:{
+    id:{
+      type:String,
+      default:""
+    }
+
+  },
   data() {
     return {
       // 遮罩层
@@ -272,10 +244,14 @@ export default {
     };
   },
   created() {
-    const dictId = this.$route.params && this.$route.params.dictId;
+
+    const dictId = this.$route.query && this.$route.query.dictId;
     this.getType(dictId);
     this.getTypeList();
   },
+  mounted() {
+    console.log(this.$route.query)
+  },
   methods: {
     /** 查询字典类型详细 */
     getType(dictId) {
@@ -295,8 +271,8 @@ export default {
     getList() {
       this.loading = true;
       listData(this.queryParams).then(response => {
-        this.dataList = response.rows;
-        this.total = response.total;
+        this.dataList = response.data.records;
+        this.total = response.data.total;
         this.loading = false;
       });
     },
@@ -397,3 +373,11 @@ export default {
   }
 };
 </script>
+<style scoped>
+  .app-container{
+    width: 100%;
+    height: 100vh;
+    background: #f6f8f9;
+  }
+</style>
+
diff --git a/fuintAdmin/src/views/system/dict/index.vue b/fuintAdmin/src/views/system/dict/index.vue
index 6afb21608..0de7b7470 100644
--- a/fuintAdmin/src/views/system/dict/index.vue
+++ b/fuintAdmin/src/views/system/dict/index.vue
@@ -1,8 +1,10 @@
 <template>
-  <div class="app-container">
+  <div  class="app-container">
+    <el-card >
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="字典名称" prop="dictName">
+      <el-form-item label="" prop="dictName">
         <el-input
+          size="medium"
           v-model="queryParams.dictName"
           placeholder="请输入字典名称"
           clearable
@@ -10,17 +12,19 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="字典类型" prop="dictType">
+      <el-form-item label="" prop="dictType">
         <el-input
           v-model="queryParams.dictType"
+          size="medium"
           placeholder="请输入字典类型"
           clearable
           style="width: 240px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <el-form-item label="" prop="status">
         <el-select
+          size="medium"
           v-model="queryParams.status"
           placeholder="字典状态"
           clearable
@@ -34,10 +38,11 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="">
         <el-date-picker
           v-model="dateRange"
           style="width: 240px"
+          size="medium"
           value-format="yyyy-MM-dd"
           type="daterange"
           range-separator="-"
@@ -46,63 +51,21 @@
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+    </el-card>
 
+    <el-card style="margin-top: 20px" >
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
-          size="mini"
           @click="handleAdd"
-          v-hasPermi="['system:dict:add']"
         >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:dict:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:dict:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:dict:export']"
-        >导出</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-refresh"
-          size="mini"
-          @click="handleRefreshCache"
-          v-hasPermi="['system:dict:remove']"
-        >刷新缓存</el-button>
+
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -113,9 +76,12 @@
       <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
       <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
-            <span>{{ scope.row.dictType }}</span>
-          </router-link>
+<!--          <router-link :to="'/system/dict/data/' + scope.row.dictId" class="link-type">-->
+<!--            <span>{{ scope.row.dictType }}</span>-->
+<!--          </router-link>-->
+
+            <span style="color: #409EFF;cursor: pointer  " @click="goDedi(scope.row.dictId)">{{ scope.row.dictType }}</span>
+
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
@@ -132,33 +98,36 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-            size="mini"
+
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dict:edit']"
+
           >修改</el-button>
           <el-button
-            size="mini"
+
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dict:remove']"
+
           >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </el-card>
+
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" top="50vh" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="字典名称" prop="dictName">
           <el-input v-model="form.dictName" placeholder="请输入字典名称" />
@@ -188,159 +157,191 @@
 </template>
 
 <script>
-import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
+  import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/dict/type";
 
-export default {
-  name: "Dict",
-  dicts: ['sys_normal_disable'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 字典表格数据
-      typeList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 日期范围
-      dateRange: [],
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        dictName: undefined,
-        dictType: undefined,
-        status: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        dictName: [
-          { required: true, message: "字典名称不能为空", trigger: "blur" }
-        ],
-        dictType: [
-          { required: true, message: "字典类型不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询字典类型列表 */
-    getList() {
-      this.loading = true;
-      listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.typeList = response.rows;
-          this.total = response.total;
-          this.loading = false;
+  export default {
+    name: "Dict",
+    dicts: ['sys_normal_disable'],
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 字典表格数据
+        typeList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 日期范围
+        dateRange: [],
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          dictName: undefined,
+          dictType: undefined,
+          status: undefined
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          dictName: [
+            { required: true, message: "字典名称不能为空", trigger: "blur" }
+          ],
+          dictType: [
+            { required: true, message: "字典类型不能为空", trigger: "blur" }
+          ]
         }
-      );
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        dictId: undefined,
-        dictName: undefined,
-        dictType: undefined,
-        status: "0",
-        remark: undefined
       };
-      this.resetForm("form");
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.page = 1;
+    created() {
       this.getList();
     },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加字典类型";
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dictId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const dictId = row.dictId || this.ids
-      getType(dictId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改字典类型";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.dictId != undefined) {
-            updateType(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addType(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+    methods: {
+      /** 查询字典类型列表 */
+      getList() {
+        this.loading = true;
+        listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+            this.typeList = response.data.records;
+            this.total = response.data.total;
+            this.loading = false;
           }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const dictIds = row.dictId || this.ids;
-      this.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？').then(function() {
-        return delType(dictIds);
-      }).then(() => {
+        );
+      },
+      goDedi(id){
+        console.log('id:',id)
+        this.$router.push({
+          path:"/system/dict/data",
+          query:{
+            dictId:id
+          }
+        })
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          dictId: undefined,
+          dictName: undefined,
+          dictType: undefined,
+          status: "0",
+          remark: undefined
+        };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
         this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/dict/type/export', {
-        ...this.queryParams
-      }, `type_${new Date().getTime()}.xlsx`)
-    },
-    /** 刷新缓存按钮操作 */
-    handleRefreshCache() {
-      refreshCache().then(() => {
-        this.$modal.msgSuccess("刷新成功");
-      });
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.dateRange = [];
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.open = true;
+        this.title = "添加字典类型";
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.dictId)
+        this.single = selection.length!=1
+        this.multiple = !selection.length
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const dictId = row.dictId || this.ids
+        getType(dictId).then(response => {
+          this.form = response.data;
+          this.open = true;
+          this.title = "修改字典类型";
+        });
+      },
+      /** 提交按钮 */
+      submitForm: function() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.dictId != undefined) {
+              updateType(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              addType(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const dictIds = row.dictId || this.ids;
+        this.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？').then(function() {
+          return delType(dictIds);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('system/dict/type/export', {
+          ...this.queryParams
+        }, `type_${new Date().getTime()}.xlsx`)
+      },
+      /** 刷新缓存按钮操作 */
+      handleRefreshCache() {
+        refreshCache().then(() => {
+          this.$modal.msgSuccess("刷新成功");
+          this.$store.dispatch('dict/cleanDict');
+        });
+      }
     }
-  }
-};
+  };
 </script>
+<style scoped>
+  .app-container{
+    width: 100%;
+    height: 100vh;
+    background: #f6f8f9;
+  }
+  .pagin-box{
+    background: white;
+    box-sizing: border-box;
+    padding: 20px;
+  }
+  .baoguo{
+    background: white;
+    box-sizing: border-box;
+    padding: 20px;
+    margin-bottom: 20px;
+  }
+
+
+
+</style>
+
diff --git a/fuintAdmin/vue.config.js b/fuintAdmin/vue.config.js
index a2594ba81..c6b8355d2 100644
--- a/fuintAdmin/vue.config.js
+++ b/fuintAdmin/vue.config.js
@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || 'fuint会员营销管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '蓝鲸智慧油站系统' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 81 // 端口