diff --git a/public/favicon.ico b/public/favicon.ico index 64d817f..e960bef 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/logo-blue.png b/public/logo-blue.png deleted file mode 100644 index e0049c3..0000000 Binary files a/public/logo-blue.png and /dev/null differ diff --git a/src/assets/banshou.png b/src/assets/banshou.png deleted file mode 100644 index 0d978c1..0000000 Binary files a/src/assets/banshou.png and /dev/null differ diff --git a/src/assets/imgs/face.jpg b/src/assets/imgs/face.jpg new file mode 100644 index 0000000..408e320 Binary files /dev/null and b/src/assets/imgs/face.jpg differ diff --git a/src/assets/imgs/logo.png b/src/assets/imgs/logo.png deleted file mode 100644 index 4238ba6..0000000 Binary files a/src/assets/imgs/logo.png and /dev/null differ diff --git a/src/assets/lantou.png b/src/assets/lantou.png deleted file mode 100644 index e1f26a0..0000000 Binary files a/src/assets/lantou.png and /dev/null differ diff --git a/src/assets/logo-blue.png b/src/assets/logo-blue.png deleted file mode 100644 index 6752080..0000000 Binary files a/src/assets/logo-blue.png and /dev/null differ diff --git a/src/assets/logo-mini-blue.png b/src/assets/logo-mini-blue.png deleted file mode 100644 index 71f6117..0000000 Binary files a/src/assets/logo-mini-blue.png and /dev/null differ diff --git a/src/assets/logo-mini.png b/src/assets/logo-mini.png index 33fda49..ee58bc9 100644 Binary files a/src/assets/logo-mini.png and b/src/assets/logo-mini.png differ diff --git a/src/assets/logo.png b/src/assets/logo.png index 3374c7c..6c4f75c 100644 Binary files a/src/assets/logo.png and b/src/assets/logo.png differ diff --git a/src/assets/toolbox.png b/src/assets/toolbox.png deleted file mode 100644 index d84ac15..0000000 Binary files a/src/assets/toolbox.png and /dev/null differ diff --git a/src/assets/toolbox_on.png b/src/assets/toolbox_on.png deleted file mode 100644 index d9839ab..0000000 Binary files a/src/assets/toolbox_on.png and /dev/null differ diff --git a/src/components/LxHeader/index.vue b/src/components/LxHeader/index.vue index 96a7ba7..c697192 100644 --- a/src/components/LxHeader/index.vue +++ b/src/components/LxHeader/index.vue @@ -1,64 +1,73 @@ - - - diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index bfcdc99..23a1283 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -7,7 +7,7 @@
- +
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 603ff92..d65ab95 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -2,10 +2,10 @@
- + - @@ -23,7 +23,7 @@ }, data() { return { - title: '智能工具箱管理平台', + title: '泵故障监测云平台', logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png' } } @@ -36,7 +36,7 @@ } .sidebar-name-logo { width: 120px; - height: 38px; + height: 28px; } .sidebarLogoFade-enter, diff --git a/src/settings.js b/src/settings.js index 4b997ba..88bd6fd 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,6 +1,6 @@ module.exports = { - title: '智能工具箱管理平台', + title: '泵故障监测云平台', /** * @type {boolean} true | false diff --git a/src/styles/element-variables.scss b/src/styles/element-variables.scss index 3fbc7c0..892703a 100644 --- a/src/styles/element-variables.scss +++ b/src/styles/element-variables.scss @@ -1,5 +1,5 @@ /* 改变主题色变量 */ -$--color-primary: #122583; +$--color-primary: #0a729b; /* 改变 icon 字体路径变量，必需 */ $--font-path: '~element-ui/lib/theme-chalk/fonts'; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 302d239..ff74359 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -18,7 +18,7 @@ bottom: 0; left: 0; z-index: 1001; - overflow: hidden; + overflow: visible; // reset element-ui css .horizontal-collapse-transition { @@ -87,7 +87,7 @@ //border-right: 5px solid $subMenuActiveText !important; } .is-active>.el-submenu__title { - color: $subMenuActiveText !important; + // color: $subMenuActiveText !important; } diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 9ee6e73..bcfb187 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1,19 +1,19 @@ // sidebar $menuText:#606266; -$menuActiveText:#122583; -$subMenuActiveText:#122583; //https://github.com/ElemeFE/element/issues/12951 +$menuActiveText:#ffffff; +$subMenuActiveText:#ffffff; //https://github.com/ElemeFE/element/issues/12951 $menuBg:#ffffff;//#304156 -$menuHover:#e0f2ff; -$menuActiveBg:#1ea946; +$menuHover:#70a1b4; +$menuActiveBg:#0a729b; $subMenuBg:#ffffff;//#1f2d3d -$subMenuHover:#edf6ff; -$submenuActiveBg:#1ea946; +$subMenuHover:#70a1b4; +$submenuActiveBg:#0a729b; $sideBarWidth: 210px; -$primaryColor: #122583; +$primaryColor: #0a729b; // the :export directive is the magic sauce for webpack // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass :export { diff --git a/src/styles/viewui-mine.less b/src/styles/viewui-mine.less index b984936..e3dd9ab 100644 --- a/src/styles/viewui-mine.less +++ b/src/styles/viewui-mine.less @@ -1,4 +1,4 @@ @import '~view-design/src/styles/index.less'; // Here are the variables to cover, such as: -@primary-color: #122583; +@primary-color: #0a729b; diff --git a/src/views/login/index.vue b/src/views/login/index.vue index a512798..3bd26b3 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -9,7 +9,7 @@ label-position="left">
-

朗业前端初始化界面

+

“赛特勒”泵故障监测云平台

diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue index e233acb..70b8f5e 100644 --- a/src/views/system/menu.vue +++ b/src/views/system/menu.vue @@ -118,11 +118,6 @@ message: '请输入菜单路径', trigger: 'blur' }], - icon: [{ - required: true, - message: '请输入图标', - trigger: 'blur' - }], visible: [{ required: true, message: '请选择是否显示', diff --git a/vue.config.js b/vue.config.js index da718f1..61383c2 100644 --- a/vue.config.js +++ b/vue.config.js @@ -6,14 +6,14 @@ function resolve(dir) { return path.join(__dirname, dir) } -const name = defaultSettings.title || '朗业初始化项目' // page title +const name = defaultSettings.title || '泵故障监测云平台' // page title // If your port is set to 80, // use administrator privileges to execute the command line. // For example, Mac: sudo npm run // You can change the port by the following methods: // port = 9528 npm run dev OR npm run dev --port = 9528 -const port = process.env.port || process.env.npm_config_port || 8001 // dev port +const port = process.env.port || process.env.npm_config_port || 8018 // dev port // All configuration item explanations can be find in https://cli.vuejs.org/config/ module.exports = { @@ -46,7 +46,7 @@ module.exports = { //before: require('./mock/mock-server.js'), proxy: { [process.env.VUE_APP_BASE_API]: { - target: 'http://118.31.104.155:8082/', + target: 'http://saitele-pump.langye.net/', changeOrigin: true, //配置跨域 pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''