diff --git a/.env.development b/.env.development
index 5b175c6e..43b7f6b8 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,10 @@
# 页面标题
-VUE_APP_TITLE = 安徽机械化装备共享平台
+VUE_APP_TITLE = 智联装备云控平台
# 开发环境配置
ENV = 'development'
-# 安徽机械化装备共享平台/开发环境
+# 智联装备云控平台/开发环境
VUE_APP_BASE_API = '/dev-api'
# 路由懒加载
diff --git a/.env.production b/.env.production
index 21746d47..4313d271 100644
--- a/.env.production
+++ b/.env.production
@@ -1,10 +1,10 @@
# 页面标题
-VUE_APP_TITLE = 安徽机械化装备共享平台
+VUE_APP_TITLE = 智联装备云控平台
# 生产环境配置
ENV = 'production'
-# 安徽机械化装备共享平台/生产环境
-# VUE_APP_BASE_API = '/prod-api'
+# 智联装备云控平台/生产环境
+VUE_APP_BASE_API = '/prod-api'
# 宏源
-VUE_APP_BASE_API = '/iws/jxhzb-api'
\ No newline at end of file
+# VUE_APP_BASE_API = '/iws/jxhzb-api'
\ No newline at end of file
diff --git a/.env.staging b/.env.staging
index 4cdb3668..9662686d 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,10 +1,10 @@
# 页面标题
-VUE_APP_TITLE = 安徽机械化装备共享平台
+VUE_APP_TITLE = 智联装备云控平台
NODE_ENV = production
# 测试环境配置
ENV = 'production'
-# 安徽机械化装备共享平台/测试环境
+# 智联装备云控平台/测试环境
VUE_APP_BASE_API = '/prod-api'
diff --git a/public/favicon.jpg b/public/favicon.jpg
new file mode 100644
index 00000000..4f9f8cdf
Binary files /dev/null and b/public/favicon.jpg differ
diff --git a/public/index.html b/public/index.html
index 925455ca..384ff142 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,7 @@
-
+
<%= webpackConfig.name %>
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index fc6eaa13..933f9757 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -106,7 +106,7 @@ export default {
if (process.env.VUE_APP_BASE_API == '/iws/jxhzb-api') {
window.location.href = 'http://sgwpdm.ah.sgcc.com.cn/iws'
} else {
- this.$router.push({ path: "login" })
+ this.$router.push({ path: "/login" })
}
});
})
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 22804ed8..afe4e623 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -102,8 +102,8 @@ export default {
activeStyle(tag) {
if (!this.isActive(tag)) return {};
return {
- "background-color": "#00ad9d",
- "border-color": "#00ad9d",
+ "background-color": "#00377a",
+ "border-color": "#00377a",
};
},
isAffix(tag) {
@@ -295,9 +295,9 @@ export default {
margin-right: 15px;
}
&.active {
- background-color: #42b983;
+ background-color: #00377a;
color: #fff;
- border-color: #42b983;
+ border-color: #00377a;
&::before {
content: "";
background: #fff;
diff --git a/src/views/index.vue b/src/views/index.vue
index 186c4c84..fb5ccaa9 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -2,7 +2,7 @@
- 安徽机械化装备共享平台
+ 智联装备云控平台
diff --git a/src/views/login.vue b/src/views/login.vue
index e929bb43..bdd89421 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -6,7 +6,7 @@
:rules="loginRules"
class="login-form"
>
- 安徽机械化装备共享平台
+ 智联装备云控平台
- 安徽机械化装备共享平台
+ 智联装备云控平台
- 安徽机械化装备共享平台
+ 智联装备云控平台
- 安徽机械化装备共享平台
+ 智联装备云控平台
@@ -243,7 +243,7 @@
border
show-overflow-tooltip
:header-cell-style="{
- background: '#00a288',
+ background: '#00377a',
color: '#fff',
}"
>
@@ -271,7 +271,7 @@
border
show-overflow-tooltip
:header-cell-style="{
- background: '#00a288',
+ background: '#00377a',
color: '#fff',
}"
>
@@ -300,7 +300,7 @@
border
show-overflow-tooltip
:header-cell-style="{
- background: '#00a288',
+ background: '#00377a',
color: '#fff',
}"
>
@@ -327,7 +327,7 @@
border
show-overflow-tooltip
:header-cell-style="{
- background: '#00a288',
+ background: '#00377a',
color: '#fff',
}"
>
@@ -617,7 +617,7 @@ export default {
.goods-info {
display: flex;
align-content: center;
- border-bottom: 1px solid #00a288;
+ border-bottom: 1px solid #00377a;
img {
width: 140px;
height: 80px;
diff --git a/src/views/search/order/index.vue b/src/views/search/order/index.vue
index f189c91a..ed5bc379 100644
--- a/src/views/search/order/index.vue
+++ b/src/views/search/order/index.vue
@@ -356,7 +356,7 @@
show-overflow-tooltip
:header-cell-style="{
color: '#fff',
- background: '#00a288',
+ background: '#00377a',
}"
>
@@ -420,7 +420,7 @@
border
show-overflow-tooltip
:header-cell-style="{
- background: '#00a288',
+ background: '#00377a',
color: '#fff',
}"
>
@@ -478,7 +478,7 @@
border
show-overflow-tooltip
:header-cell-style="{
- background: '#00a288',
+ background: '#00377a',
color: '#fff',
}"
>
@@ -537,7 +537,7 @@
border
show-overflow-tooltip
:header-cell-style="{
- background: '#00a288',
+ background: '#00377a',
color: '#fff',
}"
>
@@ -579,7 +579,7 @@
border
show-overflow-tooltip
:header-cell-style="{
- background: '#00a288',
+ background: '#00377a',
color: '#fff',
}"
>
@@ -862,7 +862,7 @@
.goods-info {
display: flex;
align-content: center;
- border-bottom: 1px solid #00a288;
+ border-bottom: 1px solid #00377a;
img {
width: 180px;
diff --git a/vue.config.js b/vue.config.js
index 7bb455da..1cd2d763 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -7,7 +7,7 @@ function resolve(dir) {
const CompressionPlugin = require('compression-webpack-plugin')
-const name = process.env.VUE_APP_TITLE || '安徽机械化装备共享平台' // 网页标题
+const name = process.env.VUE_APP_TITLE || '智联装备云控平台' // 网页标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口