代码回滚

README.md

-# 信息化管理系统
+# 网络设备监控管理平台
 
 ## Build Setup
 
@@ -45,4 +45,4 @@ npm run lint
 
 # 代码格式检查并自动修复
 npm run lint -- --fix
-```
+```
\ No newline at end of file

configuration/Jenkinsfile

@@ -16,8 +16,8 @@ pipeline {
     REGISTRY = 'harbor.91isoft.com:100'
     HARBOR_NAMESPACE = 'cy'
     GITLAB_ACCOUNT = 'licongyang@91isoft.com'
-    APP_NAME = '91isoft-sys-web'
-    GIT_LAB_PROJECT = 'http://gitlab.91isoft.com:90/zhangbotao/91isoft_sys_web.git'
+    APP_NAME = 'network_minor_web'
+    GIT_LAB_PROJECT = 'http://gitlab.91isoft.com:90/zhangyichen/network_minor_web.git'
 
   }
   stages {

deploy/dev/devops-rc-process-web.yaml

@@ -2,24 +2,24 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: rcisoft-sys
-    component: rcisoft-sys-web
+    app: network-minor
+    component: network-minor-web
     tier: front
-  name: rcisoft-sys-deploy
+  name: network-minor-deploy
   namespace: rcisoft-v2
 spec:
   progressDeadlineSeconds: 600
   replicas: 1
   selector:
     matchLabels:
-      app: rcisoft-sys
-      component: rcisoft-sys-web
+      app: network-minor
+      component: network-minor-web
       tier: front
   template:
     metadata:
       labels:
-        app: rcisoft-sys
-        component: rcisoft-sys-web
+        app: network-minor
+        component: network-minor-web
         tier: front
     spec:
       volumes:
@@ -49,7 +49,7 @@ spec:
           #  timeoutSeconds: 10
           #  failureThreshold: 30
           #  periodSeconds: 5
-          name: rcisoft-sys
+          name: network-minor
           imagePullPolicy: Always
           ports:
             - containerPort: 80
@@ -86,19 +86,19 @@ spec:
 kind: Service
 apiVersion: v1
 metadata:
-  name: rcisoft-sys-svc
+  name: network-minor-svc
   namespace: rcisoft-v2
   labels:
-    app: rcisoft-sys
+    app: network-minor
 spec:
   ports:
     - name: tcp-80
       protocol: TCP
       port: 80
       targetPort: 80
-      nodePort: 7880
+      nodePort: 7881
   selector:
-    app: rcisoft-sys
-    component: rcisoft-sys-web
+    app: network-minor
+    component: network-minor-web
     tier: front
   type: NodePort

public/index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>home_logo.png">
+    <link rel="icon" href="<%= BASE_URL %>logo3.png">
     <link rel="stylesheet" href="//at.alicdn.com/t/font_2011217_f70ptj9y4oc.css">
     <title><%= webpackConfig.name %></title>
   </head>

src/layout/components/AppMain.vue

@@ -47,7 +47,7 @@ export default {
 // fix css style bug in open el-dialog
 .el-popup-parent--hidden {
   .fixed-header {
-    padding-right: 15px;
+    // padding-right: 15px;
   }
 }
 </style>

src/layout/components/Sidebar/Logo.vue

@@ -24,8 +24,8 @@ export default {
   },
   data() {
     return {
-      title: '信息化管理系统',
-      logo: require('@/assets/image/logo.png')
+      title: '网络设备监控管理平台',
+      logo: require('@/assets/image/logo_index.png')
     }
   }
 }
@@ -56,8 +56,8 @@ export default {
     width: 100%;
 
     & .sidebar-logo {
-      width: 32px;
-      height: 32px;
+      width: 34px;
+      height: 39px;
       vertical-align: middle;
       margin-right: 12px;
     }
@@ -68,7 +68,7 @@ export default {
       color: #fff;
       font-weight: 600;
       line-height: 50px;
-      font-size: 16px;
+      font-size: 18px;
       font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
       vertical-align: middle;
     }

src/layoutLogin/components/logo.vue

@@ -24,7 +24,7 @@ export default {
   },
   data() {
     return {
-      title: '信息化管理系统',
+      title: '网络设备监控管理平台',
       logo: 'https://image-1252351428.cos.ap-beijing.myqcloud.com/home_logo.png'
     }
   },

src/settings.js

 module.exports = {
 
-  title: '信息化管理系统',
+  title: '网络设备监控管理平台',
 
   /**
    * @type {boolean} true | false

src/styles/element-ui.scss

@@ -391,3 +391,9 @@ label {
     text-align: left;
   }
 }
+
+.el-button--primary {
+  color: #fff;
+  background-color: #168DE8;
+  border-color: #168DE8;
+}

src/styles/sidebar.scss

@@ -29,6 +29,7 @@
 
     .scrollbar-wrapper {
       overflow-x: hidden !important;
+      background-color: #1D3D55;
     }
 
     .el-scrollbar__bar.is-vertical {
@@ -218,57 +219,52 @@
   background-color: #fff !important;
 }
 
-#app .sidebar-container .el-submenu .el-menu-item.is-active {
-  background-color: #fff !important;
-}
-
 .router-link-active .el-menu-item.is-active {
   background-color: #ffffff !important;
 }
 
 // hover样式
 .el-submenu__title:hover {
-  color: #46bcf2 !important;
+  color: #fff !important;
   .el-submenu__icon-arrow {
-    color: #46bcf2 !important;
+    color: #fff !important;
   }
 }
 .nest-menu .el-submenu > .el-submenu__title:hover {
   background-color: #fff !important;
-  color: #46bcf2 !important;
+  color: #fff !important;
 }
 .is-active > .el-submenu__title:hover {
-  color: #46bcf2 !important;
+  color: #fff !important;
 }
 .el-submenu .el-menu-item:hover {
-  color: #46bcf2 !important;
+  color: #fff !important;
 }
 .el-menu-item.submenu-title-noDropdown:hover {
-  color: #46bcf2 !important;
+  color: #fff !important;
 }
 .el-menu--vertical .el-menu-item:hover {
-  color: #46bcf2 !important;
+  color: #fff !important;
 }
-
 .el-submenu.is-opened {
   background-color: #FFFFFF !important;
 
   > .el-submenu__title {
-    background-color: #fff !important;
-    color: #46bcf2 !important;
+    background-color: #168DE8 !important;
+    color: #fff !important;
 
     .el-submenu__icon-arrow {
-      color: #46bcf2 !important;
+      color: #fff !important;
     }
   }
 
   .el-menu {
     .el-menu-item {
-      background-color: #fff !important;
-      color: #000000 !important;
+      background-color: #142A3B !important;
+      color: #fff !important;
 
       &.is-active {
-        color: #46bcf2 !important;
+        color: #fff !important;
       }
     }
   }
@@ -279,8 +275,19 @@
       color: #000000 !important;
 
       .el-submenu__icon-arrow {
-        color: #46bcf2 !important;
+        color: #fff !important;
       }
     }
   }
 }
+#app .sidebar-container .el-submenu .el-menu-item.is-active {
+  // background-color: #168DE8 !important;
+  color: #168DE8 !important;
+}
+#app .sidebar-container .el-submenu .el-menu-item:hover {
+  background-color: #142A3B !important;
+  color: #168DE8 !important;
+}
+#app .sidebar-container .nest-menu li {
+  padding-left: 70px !important;
+}

src/styles/variables.scss

 // 主题色
-$color-theme: #46BCF3;
+$color-theme: #168DE8;
 $color-red: #F57b7b;
 $color-purple: #ff33a9;
 $color-orange: #f4ac10;
@@ -23,7 +23,7 @@ $color-grey-light: #f4f4f4;
 // 列表表头底色
 $color-grey-light: #ecf9fe;
 // 统计折线图背景色
-$color-green: #49cec9;
+$color-green: #25B86E;
 // 统计折线图折线
 $color-green-deep: #1cc2bc;
 $color-green-light-btn: #6dd8e4;
@@ -40,7 +40,7 @@ $blue-prime: #46BCF3;
 $blue-prime-hover: #6bc9f5;
 $blue-prime-active: #0098de;
 // 导出 导入 修改
-$green-prime: #49cec9;
+$green-prime: #25B86E;
 $green-prime-hover: #6dd8d4;
 $green-prime-active: #1cc2bc;
 // 文件上传
@@ -84,8 +84,8 @@ $menuText:#fff;
 $menuActiveText:#46BCF2;
 $subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951
 
-$menuBg:#46BCF2;
-$menuHover:#fff;
+$menuBg: #1D3D55;
+$menuHover: #168DE8;
 
 $subMenuBg:#46BCF2;
 $subMenuHover:#fff;

src/views/integratedManagement/dataIntegrated.vue

@@ -68,7 +68,7 @@
             </el-table-column>
             <el-table-column label="操作">
               <template slot-scope="scope">
-                <el-button v-hasPermi="['zt:dataCenter:update']" type="text" style="color: #49cec9" size="mini" @click="handleEdit(scope.$index, scope.row)">修改</el-button>
+                <el-button v-hasPermi="['zt:dataCenter:update']" type="text" style="color: #25B86E" size="mini" @click="handleEdit(scope.$index, scope.row)">修改</el-button>
                 <el-button v-hasPermi="['zt:dataCenter:delete']" type="text" size="mini" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
               </template>
             </el-table-column>

src/views/login/login.vue

 <template>
   <div class="login">
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-<!--      <img class="fy-logo" src="../../assets/image/denglu_logo.png">-->
-      <h3 class="title">信息化管理系统</h3>
+    <div class="login-form1"></div>
+    <div class="login-form">
+      <el-form ref="loginForm" :model="loginForm" :rules="loginRules">
+        <div class="fy-logo">
+          <img src="../../assets/image/logo_index.png">
+        </div>
+      <h3 class="title">网络设备监控管理平台</h3>
       <div class="login-form-content">
         <el-form-item prop="username">
           <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="请输入用户名" :maxlength="30">
@@ -21,7 +25,7 @@
             <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
           </el-input>
         </el-form-item>
-        <el-form-item style="width:80%;margin-bottom: 20px">
+        <el-form-item style="margin-bottom: 20px;margin-top: 15px;">
           <el-button
             class="blue-btn"
             :loading="loading"
@@ -36,10 +40,11 @@
         <div
           class="buttons-content"
         >
-          <el-checkbox v-model="loginForm.rememberMe" class="rem-code">记住密码</el-checkbox>
+          <el-checkbox v-model="loginForm.rememberMe" class="rem-code">记住用户名</el-checkbox>
         </div>
       </div>
     </el-form>
+    </div>
     <!--  底部  -->
     <div class="el-login-footer" />
   </div>
@@ -141,8 +146,11 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../../assets/image/login-background.jpg");
+  background-image: url("../../assets/image/bg1.png");
   background-size: cover;
+  .el-form-item--small .el-form-item__error {
+    padding-top: 8px;
+  }
 	.el-input__prefix{
 		left: 14px;
 	}
@@ -151,52 +159,82 @@ export default {
 		font-size: 16px;
 	}
 	.el-form-item {
-		margin-bottom: 4vh;
+		margin-bottom: 30px;
 	}
+  .login-form .el-input input {
+    height: 44px;
+  }
+  .login-form .login-form-content .el-form-item .el-input__inner {
+    border-radius: 6px;
+  }
+  .login-form .input-icon {
+    height: 44px;
+  }
+  .login-form .input-icon {
+    margin-left: 6px;
+    transform: scale(1.3, 1.5);
+    color: #1f6aa2;
+  }
 }
 .fy-logo{
-  position: fixed;
-  top: 20px;
-  left: 45%;
-  width: 8vw;
+  // position: fixed;
+  margin: 0 auto;
+  width: 76px;
+  height: 88px;
+  img {
+    width: 100%;
+    height: 100%;
+  }
 }
 .title {
-  margin: 7vh auto 7vh auto;
+  margin: 38px auto 0 auto;
   text-align: center;
-  color: black;
-  font-size: 36px;
+  color: #fff;
+  font-size: 26px;
+}
+.login-form1 {
+  position: absolute;
+  left: 50%;
+  bottom: 50%;
+  transform: translate(-50%, 50%);
+  background: rgba(255,255,255,0.2) ;
+  border-radius: 15px;
+  width: 472px;
+  height: 585px;
 }
-
 .login-form {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-end;
-  border-radius: 6px;
-  background: #ffffff no-repeat;
-  background-size: 59%;
-  background-position-y: 57px;
-  width: 78vw;
-  height: 76vh;
-  padding: 25px 25px 5px 25px;
+  position: absolute;
+  //background: rgba(255,255,255,.2);
+  left: 50%;
+  bottom: 50%;
+  transform: translate(-50%, 50%);
+  border-radius: 15px;
+  width: 472px;
+  height: 585px;
+  padding: 41px 44px;
   .login-form-content{
-    position: absolute;
-    top: 40%;
-    right: 28%;
-    width: 45%;
+    margin-top: 69px;
+    width: 100%;
     display: flex;
     flex-direction: column;
     align-items: center;
     .el-form-item{
-      width: 80%;
+      width: 100%;
       .el-input__inner{
         border-radius: 4px;
       }
     }
     .blue-btn{
-      width: 36vw;
+      width: 100%;
       height: 40px;
       border-radius: 4px;
       font-size: 18px;
+      background-color: #1f6aa2;
+      border-color: #1f6aa2;
+    }
+    .blue-btn:hover {
+      background-color: #168DE8;
+      border-color: #168DE8;
     }
   }
   .el-input {
@@ -239,17 +277,32 @@ export default {
 }
   .buttons-content{
     display: flex;
-    width: 80%;
+    width: 100%;
     justify-content: space-between;
-    padding: 0 14px;
     .rem-code span{
-      color: $font-dark;
+      color: #fff;
     }
     .el-link span{
-      color: $color-theme;
+      color: #fff;
+    }
+    .el-checkbox__input.is-checked+.el-checkbox__label {
+      color: #fff;
     }
     .rem-code span, .el-link span{
       font-size: 16px;
     }
+    .el-checkbox__input.is-checked+.el-checkbox__label {
+      // color: #333;
+    }
+    .el-checkbox .el-checkbox__inner:hover {
+      // border: 1px solid #333;
+    }
+    .el-checkbox__input.is-checked .el-checkbox__inner {
+      background-color: #fff;
+      // border-color: #333;
+    }
+    .el-checkbox__inner::after {
+      border-color: #333;
+    }
   }
 </style>