bug修改 -回滚

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 = 'network_minor_web'
-    GIT_LAB_PROJECT = 'http://gitlab.91isoft.com:90/zhangyichen/network_minor_web.git'
+    APP_NAME = '91isoft-sys-web'
+    GIT_LAB_PROJECT = 'http://gitlab.91isoft.com:90/zhangbotao/91isoft_sys_web.git'
 
   }
   stages {

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

@@ -2,24 +2,24 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: network-minor
-    component: network-minor-web
+    app: rcisoft-sys
+    component: rcisoft-sys-web
     tier: front
-  name: network-minor-deploy
+  name: rcisoft-sys-deploy
   namespace: rcisoft-v2
 spec:
   progressDeadlineSeconds: 600
   replicas: 1
   selector:
     matchLabels:
-      app: network-minor
-      component: network-minor-web
+      app: rcisoft-sys
+      component: rcisoft-sys-web
       tier: front
   template:
     metadata:
       labels:
-        app: network-minor
-        component: network-minor-web
+        app: rcisoft-sys
+        component: rcisoft-sys-web
         tier: front
     spec:
       volumes:
@@ -49,7 +49,7 @@ spec:
           #  timeoutSeconds: 10
           #  failureThreshold: 30
           #  periodSeconds: 5
-          name: network-minor
+          name: rcisoft-sys
           imagePullPolicy: Always
           ports:
             - containerPort: 80
@@ -86,19 +86,19 @@ spec:
 kind: Service
 apiVersion: v1
 metadata:
-  name: network-minor-svc
+  name: rcisoft-sys-svc
   namespace: rcisoft-v2
   labels:
-    app: network-minor
+    app: rcisoft-sys
 spec:
   ports:
     - name: tcp-80
       protocol: TCP
       port: 80
       targetPort: 80
-      nodePort: 7881
+      nodePort: 7880
   selector:
-    app: network-minor
-    component: network-minor-web
+    app: rcisoft-sys
+    component: rcisoft-sys-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 %>logo3.png">
+    <link rel="icon" href="<%= BASE_URL %>home_logo.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_index.png')
+      title: '信息化管理系统',
+      logo: require('@/assets/image/logo.png')
     }
   }
 }
@@ -56,8 +56,8 @@ export default {
     width: 100%;
 
     & .sidebar-logo {
-      width: 34px;
-      height: 39px;
+      width: 32px;
+      height: 32px;
       vertical-align: middle;
       margin-right: 12px;
     }
@@ -68,7 +68,7 @@ export default {
       color: #fff;
       font-weight: 600;
       line-height: 50px;
-      font-size: 18px;
+      font-size: 16px;
       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,9 +391,3 @@ label {
     text-align: left;
   }
 }
-
-.el-button--primary {
-  color: #fff;
-  background-color: #168DE8;
-  border-color: #168DE8;
-}

src/styles/sidebar.scss

@@ -29,7 +29,6 @@
 
     .scrollbar-wrapper {
       overflow-x: hidden !important;
-      background-color: #1D3D55;
     }
 
     .el-scrollbar__bar.is-vertical {
@@ -219,52 +218,57 @@
   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: #fff !important;
+  color: #46bcf2 !important;
   .el-submenu__icon-arrow {
-    color: #fff !important;
+    color: #46bcf2 !important;
   }
 }
 .nest-menu .el-submenu > .el-submenu__title:hover {
   background-color: #fff !important;
-  color: #fff !important;
+  color: #46bcf2 !important;
 }
 .is-active > .el-submenu__title:hover {
-  color: #fff !important;
+  color: #46bcf2 !important;
 }
 .el-submenu .el-menu-item:hover {
-  color: #fff !important;
+  color: #46bcf2 !important;
 }
 .el-menu-item.submenu-title-noDropdown:hover {
-  color: #fff !important;
+  color: #46bcf2 !important;
 }
 .el-menu--vertical .el-menu-item:hover {
-  color: #fff !important;
+  color: #46bcf2 !important;
 }
+
 .el-submenu.is-opened {
   background-color: #FFFFFF !important;
 
   > .el-submenu__title {
-    background-color: #168DE8 !important;
-    color: #fff !important;
+    background-color: #fff !important;
+    color: #46bcf2 !important;
 
     .el-submenu__icon-arrow {
-      color: #fff !important;
+      color: #46bcf2 !important;
     }
   }
 
   .el-menu {
     .el-menu-item {
-      background-color: #142A3B !important;
-      color: #fff !important;
+      background-color: #fff !important;
+      color: #000000 !important;
 
       &.is-active {
-        color: #fff !important;
+        color: #46bcf2 !important;
       }
     }
   }
@@ -275,19 +279,8 @@
       color: #000000 !important;
 
       .el-submenu__icon-arrow {
-        color: #fff !important;
+        color: #46bcf2 !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: #168DE8;
+$color-theme: #46BCF3;
 $color-red: #F57b7b;
 $color-purple: #ff33a9;
 $color-orange: #f4ac10;
@@ -23,7 +23,7 @@ $color-grey-light: #f4f4f4;
 // 列表表头底色
 $color-grey-light: #ecf9fe;
 // 统计折线图背景色
-$color-green: #25B86E;
+$color-green: #49cec9;
 // 统计折线图折线
 $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: #25B86E;
+$green-prime: #49cec9;
 $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: #1D3D55;
-$menuHover: #168DE8;
+$menuBg:#46BCF2;
+$menuHover:#fff;
 
 $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: #25B86E" size="mini" @click="handleEdit(scope.$index, scope.row)">修改</el-button>
+                <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:delete']" type="text" size="mini" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
               </template>
             </el-table-column>

src/views/login/login.vue

@@ -232,10 +232,6 @@ export default {
       background-color: #1f6aa2;
       border-color: #1f6aa2;
     }
-    .blue-btn:hover {
-      background-color: #168DE8;
-      border-color: #168DE8;
-    }
   }
   .el-input {
     height: 38px;