zcy 4 年 前
コミット
f6591f0a64

BIN
src/assets/404_images/logo.jpg


BIN
src/assets/404_images/logo1.jpg


+ 6 - 5
src/layout/components/Sidebar/Logo.vue

@@ -14,6 +14,7 @@
 </template>
 
 <script>
+import logo from '@/assets/404_images/logo1.jpg'
 export default {
   name: 'SidebarLogo',
   props: {
@@ -25,7 +26,7 @@ export default {
   data() {
     return {
       title: '供电生产管理系统',
-      logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png'
+      logo: logo
     }
   }
 }
@@ -46,7 +47,7 @@ export default {
   width: 100%;
   height: 50px;
   line-height: 50px;
-  background: #2b2f3a;
+  background: #ffffff;
   text-align: center;
   overflow: hidden;
 
@@ -58,16 +59,16 @@ export default {
       width: 32px;
       height: 32px;
       vertical-align: middle;
-      margin-right: 12px;
+      margin-right: 5px;
     }
 
     & .sidebar-title {
       display: inline-block;
       margin: 0;
-      color: #fff;
+      color: #406ae0;
       font-weight: 600;
       line-height: 50px;
-      font-size: 14px;
+      font-size: 18px;
       font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
       vertical-align: middle;
     }

+ 1 - 1
src/layout/components/Sidebar/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :class="{'has-logo':showLogo}">
+  <div :class="{'has-logo':showLogo}"  style="border-right: 1px solid #f8f7f7">
     <logo v-if="showLogo" :collapse="isCollapse" />
     <el-scrollbar wrap-class="scrollbar-wrapper">
       <el-menu

+ 6 - 6
src/styles/variables.scss

@@ -9,15 +9,15 @@ $yellow:#FEC171;
 $panGreen: #30B08F;
 
 // sidebar
-$menuText:#bfcbd9;
+$menuText: #727272;
 $menuActiveText:#409EFF;
-$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951
+$subMenuActiveText: #a1ceff; // https://github.com/ElemeFE/element/issues/12951
 
-$menuBg:#304156;
-$menuHover:#263445;
+$menuBg: #ffffff;
+$menuHover: #e7e7e7;
 
-$subMenuBg:#1f2d3d;
-$subMenuHover:#001528;
+$subMenuBg: #ffffff;
+$subMenuHover: #e7e7e7;
 
 $sideBarWidth: 210px;
 

+ 6 - 6
src/views/basics/check/view/dc/indexColumns.js

@@ -18,8 +18,8 @@ function columns(vm) {
     {
       title: '线别',
       align: 'center',
-      dataIndex: 'xingbie',
-      key: 'xingbie'
+      dataIndex: '',
+      key: ''
     },
     {
       title: '区间站场',
@@ -48,14 +48,14 @@ function columns(vm) {
     {
       title: '磁枕里程',
       align: 'center',
-      dataIndex: 'cdh',
-      key: 'cdh'
+      dataIndex: '',
+      key: ''
     },
     {
       title: '设备编号',
       align: 'center',
-      dataIndex: 'cdh',
-      key: 'cdh'
+      dataIndex: '',
+      key: ''
     },
     {
       title: '操作',