zhangys36 2 éve
szülő
commit
5da9d30fda

BIN
public/static/images/bg.png


BIN
public/static/images/header.png


BIN
public/static/images/header@2x.png


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

@@ -25,7 +25,7 @@ export default {
   },
   data() {
     return {
-      title: '供电生产管理系统',
+      title: '变电配电大数据可视化系统',
       logo: logo
     }
   }

+ 22 - 10
src/router/index.js

@@ -48,11 +48,6 @@ export const constantRoutes = [
     component: () => import('@/views/login/index'),
     hidden: true
   },
-  {
-    path: '/login1',
-    component: () => import('@/views/login/index'),
-    hidden: true
-  },
   {
     path: '/',
     component: Layout,
@@ -75,16 +70,33 @@ export const constantRoutes = [
   //     }
   //   ]
   // },
-  {
-    path: '/dashboard-screen',
-    component: () => import('@/views/dashboard-screen/index') // Parent router-view
-  },
+
   // 404 page must be placed at the end !!!
   {
     path: '/404',
     component: () => import('@/views/404'),
     hidden: true
-  }
+  },
+
+  {
+    path: '/dashboard-screen',
+    component: FullScreenLayout,
+    // redirect: '/catenary/fault',
+    name: 'dashboard-screen',
+    meta: {
+      title: '',
+      icon: 'icon-jiechuwang',
+      pages: ['pc:catenary']
+    },
+    children: [
+      {
+        path: '',
+        component: () => import('@/views/dashboard-screen/index'), // Parent router-view
+        name: 'fault',
+        meta: { title: '大屏', pages: ['pc:catenary:jlgz'] }
+      }
+    ]
+  },
 
 ]
 export const asyncRoutes = [

+ 1 - 1
src/settings.js

@@ -1,5 +1,5 @@
 module.exports = {
-  title: '供电生产管理系统',
+  title: '变电配电大数据可视化系统',
 
   /**
    * @type {boolean} true | false

+ 1 - 1
src/utils/get-page-title.js

@@ -1,6 +1,6 @@
 import defaultSettings from '@/settings'
 
-const title = defaultSettings.title || '供电生产管理系统'
+const title = defaultSettings.title || '变电配电大数据可视化系统'
 
 export default function getPageTitle(pageTitle) {
   if (pageTitle) {

+ 43 - 55
src/views/dashboard-screen/index.vue

@@ -1,13 +1,20 @@
 <template>
   <div class="dashboard-container">
-    123
+    <div class="header"></div>
+    <div class="content-wrap">
+      <div class="coner left">
+        <div></div>
+      </div>
+      <div class="coner right"></div>
+    </div>
+
   </div>
 </template>
 
 <script>
 
 export default {
-  name: 'Login',
+  name: 'Dashboard',
   data() {
     return {}
   },
@@ -25,64 +32,45 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .dashboard-container {
-  background-image: url('../../assets/login/bg.png');
-  background-size: 100% 100%;
-
-  .el-form {
-    width: 70%;
-    margin: 0 auto;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: flex-start;
+  background-image: url("/static/images/bg.png");
+  background-repeat: no-repeat;
+  background-size: cover;
 
-    .el-input__inner {
-      height: 40px;
-    }
+  .header {
+    width: 100%;
+    height: 88px;
+    flex-shrink: 0;
+    background-image: url("/static/images/header@2x.png");
+    background-repeat: no-repeat;
+    background-size: cover;
   }
 
-}
-</style>
-
-<style lang="css" scoped>
-.title-container {
-  color: #547BD4;
-  font-family: Noto Sans Malayalam UI;
-  font-size: 28px;
-  line-height: 26px;
-  letter-spacing: 0px;
-}
-
-/deep/ .el-input__inner {
-  border: 0;
-  border-bottom: 1px solid #DCDFE6;
-  border-radius: 0;
-  padding: 0;
-}
-
-/deep/ .el-form-item__label {
-  padding: 0;
-}
-
-.login-container {
-  min-height: 100%;
-  width: 100%;
-  overflow: hidden;
-}
-
-/deep/ .el-form-item {
-  margin-bottom: 4px;
-}
+  .content-wrap {
+    width: 100%;
+    height: 100%;
+    flex-grow: 1;
+    display: grid;
+    grid-template-columns: 4fr 1fr;
+    grid-template-rows: 100%;
+    grid-auto-flow: row;
 
-.window-login {
-  overflow: hidden;
-  border-radius: 15px;
-  margin: 0 auto;
-  margin-top: 3%;
-  width: 800px;
-  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1)
-}
+    .coner {
+      &.left {
+        //background: teal;
+      }
 
-.picColor {
-  background: linear-gradient(166.06deg, #2782DF 0%, #003DAE 100%);
-  box-shadow: 0px 4px 8px 0px #46BBFD5B;
+      &.right {
+        //background: snow;
+      }
+    }
+  }
 }
 </style>

+ 1 - 1
src/views/dashboard/index.vue

@@ -2,7 +2,7 @@
   <el-card class="content-z ddd" style="display: flex;justify-content: center">
     <img :src="index" alt="" style="margin-top:20px;height: 65%">
     <h3 class="wl">WELCOME</h3>
-    <h3 class="title">欢迎进入供电生产管理系统</h3>
+    <h3 class="title">欢迎进入变电配电大数据可视化系统</h3>
   </el-card>
 </template>