样式调整

admin-web/index.html

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <meta name="keywords" content="vue-next-admin"/>
     <meta name="description" content="快与慢运营管理平台"/>
-    <link rel="icon" href="/favicon.png"/>
+    <link rel="icon" href="public/logo.png"/>
     <title>快与慢运营管理平台</title>
 
 </head>

admin-web/src/layout/logo/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="layout-logo" v-if="setShowLogo" @click="onThemeConfigChange">
 		<img :src="logoMini" class="layout-logo-medium-img" />
-		<span>{{ themeConfig.globalTitle }}</span>
+    <span><font color="#ffffff" ><b>{{ themeConfig.globalTitle }}</b></font></span>
 	</div>
 	<div class="layout-logo-size" v-else @click="onThemeConfigChange">
 		<img :src="logoMini" class="layout-logo-size-img" />
@@ -13,7 +13,7 @@ import { useRouter} from 'vue-router';
 import { computed } from 'vue';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
-import logoMini from '/@/assets/logo.png';
+import logoMini from '/public/logo.png';
 
 // 定义变量内容
 const router = useRouter();

admin-web/src/layout/navBars/tagsView/tagsView.vue

@@ -615,7 +615,7 @@ watch(
 		list-style: none;
 		margin: 0;
 		padding: 0;
-		height: 34px;
+		height: 14px;
 		display: flex;
 		align-items: center;
 		color: var(--el-text-color-regular);

admin-web/src/stores/themeConfig.ts

@@ -20,7 +20,7 @@ export const useThemeConfig = defineStore('themeConfig', {
              * 全局主题
              */
             // 默认 primary 主题颜色
-            primary: '#D0D0D0',
+            primary: '#081C34',
             // 是否开启深色模式
             isIsDark: false,
 
@@ -28,7 +28,7 @@ export const useThemeConfig = defineStore('themeConfig', {
              * 顶栏设置
              */
             // 默认顶栏导航背景颜色
-            topBar: '#ffffff',
+            topBar: '#FFFFFF',
             // 默认顶栏导航字体颜色
             topBarColor: '#606266',
             // 是否开启顶栏背景颜色渐变
@@ -38,13 +38,13 @@ export const useThemeConfig = defineStore('themeConfig', {
              * 菜单设置
              */
             // 默认菜单导航背景颜色
-            menuBar: '#12756A',
+            menuBar: '#081C34',
             // 默认菜单导航字体颜色
             menuBarColor: '#FFFFFF',
             // 默认菜单高亮背景色
-            menuBarActiveColor: 'rgba(13, 58, 2, 0.2)',
+            menuBarActiveColor: 'rgba(197, 197, 197, 0.61)',
             // 是否开启菜单背景颜色渐变
-            isMenuBarColorGradual: true,
+            isMenuBarColorGradual: false,
 
             /**
              * 分栏设置
@@ -66,7 +66,7 @@ export const useThemeConfig = defineStore('themeConfig', {
             // 是否开启菜单手风琴效果
             isUniqueOpened: true,
             // 是否开启固定 Header
-            isFixedHeader: false,
+            isFixedHeader: true,
             // 初始化变量，用于更新菜单 el-scrollbar 的高度，请勿删除
             isFixedHeaderChange: false,
             // 是否开启经典布局分割菜单（仅经典布局生效）
@@ -139,7 +139,7 @@ export const useThemeConfig = defineStore('themeConfig', {
              * 全局网站标题 / 副标题
              */
             // 网站主标题（菜单导航、浏览器当前网页标题）
-            globalTitle: '快与慢充电运营平台',
+            globalTitle: '快与慢充电运营',
             // 网站副标题（登录页顶部文字）
             globalViceTitle: '运营管理平台',
             // 网站副标题（登录页顶部文字）

admin-web/src/views/admin/ordering/index.vue

@@ -49,14 +49,14 @@
         </el-input>
         <el-input
             v-model="state.formQuery.startChargeSeq"
-            placeholder="充电订单号（EN+）"
+            placeholder="充电订单号"
             clearable
             @blur="loadData(true)"
             class="wd150 mr10">
         </el-input>
         <el-input
             v-model="state.formQuery.connectorId"
-            placeholder="充电设备接口编码（EN+）"
+            placeholder="充电设备接口编码"
             clearable
             @blur="loadData(true)"
             class="wd150 mr10">
@@ -93,14 +93,14 @@
             @blur="loadData(true)"
             class="wd150 mr10">
         </ext-d-select>
-        <ext-d-select
-            v-model="state.formQuery.stopReason"
-            placeholder="充电停止原因"
-            clearable
-            type="ChargeOrder.stopReason"
-            @blur="loadData(true)"
-            class="wd150 mr10">
-        </ext-d-select>
+<!--        <ext-d-select-->
+<!--            v-model="state.formQuery.stopReason"-->
+<!--            placeholder="充电停止原因"-->
+<!--            clearable-->
+<!--            type="ChargeOrder.stopReason"-->
+<!--            @blur="loadData(true)"-->
+<!--            class="wd150 mr10">-->
+<!--        </ext-d-select>-->
         <ext-d-select
             v-model="state.formQuery.invoiceStatus"
             placeholder="发票状态"
@@ -214,20 +214,21 @@ const state = reactive({
     data: [] as Array < any >,
     loading: false,
     columns: [
-      {label: '站点ID', prop: 'stationId',width:130, resizable: true, fixed: 'left'},
-      {label: '充电订单号（EN+）', prop: 'startChargeSeq', width:300, resizable: true, fixed: 'left'},
-      {label: '充电设备接口编码（EN+）', prop: 'connectorId', width:200, resizable: true},
-      {label: '充电开始时间', prop: 'startTime', sortable: 'custom', width:180, resizable: true},
-      {label: '充电结束时间', prop: 'endTime', sortable: 'custom',width:180,  resizable: true},
+      {label: '站点ID',  prop: 'stationId',width:80, resizable: true, fixed: 'left'},
+      {label: '充电订单号', prop: 'startChargeSeq', width:170, resizable: true, fixed: 'left'},
+      {label: '充电设备接口编码', prop: 'connectorId', width:160, resizable: true},
+      {label: '充电开始时间', prop: 'startTime', sortable: 'custom', width:160, resizable: true},
+      {label: '充电结束时间', prop: 'endTime', sortable: 'custom',width:160,  resizable: true},
+      {label: '充电量（度）', prop: 'totalPower', width:120, resizable: true},
       {label: '累积总金额（元）', prop: 'totalMoney', width:150, resizable: true},
-      {label: '累积电费（元）', prop: 'elecMoney', width:150, resizable: true},
+      {label: '累积电费（元）', prop: 'elecMoney', width:140, resizable: true},
       {label: '累积服务费（元）', prop: 'serviceMoney', width:150, resizable: true},
       // {label: '时段数：0~32', prop: 'sumPeriod', width:150, resizable: true},
       // {label: '充电明细信息', prop: 'chargeDetail', width:150, resizable: true},
-      {label: '订单状态', prop: 'orderStatus', width:150, resizable: true},
-      {label: '充电状态', prop: 'chargeStatus', width:150, resizable: true},
+      {label: '订单状态', prop: 'orderStatus', width:120, resizable: true},
+      {label: '充电状态', prop: 'chargeStatus', width:120, resizable: true},
       {label: '充电停止原因', prop: 'stopReason', width:150, resizable: true},
-      {label: '发票状态', prop: 'invoiceStatus', width:150, resizable: true},
+      {label: '发票状态', prop: 'invoiceStatus', width:120, resizable: true},
       // {label: '创建时间', prop: 'createTime', sortable: 'custom', width:150, resizable: true},
       // {label: '更新时间', prop: 'updateTime', sortable: 'custom',width:150,  resizable: true},
       {

admin-web/src/views/login/index.vue

@@ -47,7 +47,7 @@ import { defineAsyncComponent, onMounted, reactive, computed } from 'vue';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import { NextLoading } from '/@/utils/loading';
-import logoMini from '/@/assets/logo.png';
+import logoMini from '/public/logo.png';
 import loginMain from '/@/assets/login-main.svg';
 import loginBg from '/@/assets/login-bg.svg';