diff --git a/.env.development b/.env.development index 302ecd1..1eacd7f 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 b4893b0..d008292 100644 --- a/.env.production +++ b/.env.production @@ -1,8 +1,8 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = 龙行天下智慧车联网后台管理系统 # 生产环境配置 ENV = 'production' -# 若依管理系统/生产环境 +# 龙行天下智慧车联网后台管理系统/生产环境 VUE_APP_BASE_API = '/prod-api' diff --git a/.env.staging b/.env.staging index 361859f..1b9717b 100644 --- a/.env.staging +++ b/.env.staging @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = 龙行天下智慧车联网后台管理系统 NODE_ENV = production # 测试环境配置 ENV = 'staging' -# 若依管理系统/测试环境 +# 龙行天下智慧车联网后台管理系统/测试环境 VUE_APP_BASE_API = '/stage-api' diff --git a/package.json b/package.json index 9a1cc60..b7a9e66 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "dragon", "version": "3.6.3", - "description": "若依管理系统", - "author": "若依", + "description": "智慧车联网系统", + "author": "Micheal", "license": "MIT", "scripts": { "dev": "vue-cli-service serve", diff --git a/src/api/table.js b/src/api/table.js index 2ef3668..775285f 100644 --- a/src/api/table.js +++ b/src/api/table.js @@ -43,3 +43,4 @@ export function insertCar(carInsert) { data:carInsert }) } + diff --git a/src/assets/images/220650_figtibkicokjd.jpg b/src/assets/images/220650_figtibkicokjd.jpg new file mode 100644 index 0000000..c0d100f Binary files /dev/null and b/src/assets/images/220650_figtibkicokjd.jpg differ diff --git a/src/assets/images/profile.jpg b/src/assets/images/profile.jpg index b3a940b..ba4c446 100644 Binary files a/src/assets/images/profile.jpg and b/src/assets/images/profile.jpg differ diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png index 121ffe2..da6d3fa 100644 Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ diff --git a/src/assets/logo/spurs.png b/src/assets/logo/spurs.png new file mode 100644 index 0000000..641c557 Binary files /dev/null and b/src/assets/logo/spurs.png differ diff --git a/src/assets/styles/dragon.scss b/src/assets/styles/dragon.scss index db8c29b..14229ca 100644 --- a/src/assets/styles/dragon.scss +++ b/src/assets/styles/dragon.scss @@ -79,7 +79,7 @@ .el-table__header-wrapper, .el-table__fixed-header-wrapper { th { word-break: break-word; - background-color: #f8f8f9; + background-color: red; color: #515a6e; height: 40px; font-size: 13px; diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index abe5b63..3963367 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -15,7 +15,7 @@ -webkit-transition: width .28s; transition: width 0.28s; width: $base-sidebar-width !important; - background-color: $base-menu-background; + background-color: red; height: 100%; position: fixed; font-size: 0px; diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss index 34484d4..20edb5d 100644 --- a/src/assets/styles/variables.scss +++ b/src/assets/styles/variables.scss @@ -9,17 +9,17 @@ $yellow:#FEC171; $panGreen: #30B08F; // 默认菜单主题风格 -$base-menu-color:#bfcbd9; +$base-menu-color:#BEE7E9; $base-menu-color-active:#f4f4f5; -$base-menu-background:#304156; -$base-logo-title-color: #ffffff; +$base-menu-background:#424c50; +$base-logo-title-color: #F4606C; $base-menu-light-color:rgba(0,0,0,.70); $base-menu-light-background:#ffffff; $base-logo-light-title-color: #001529; -$base-sub-menu-background:#1f2d3d; -$base-sub-menu-hover:#001528; +$base-sub-menu-background:#4682B4; +$base-sub-menu-hover:#FFFF00; // 自定义暗色菜单风格 /** @@ -46,7 +46,7 @@ $base-sidebar-width: 200px; menuColorActive: $base-menu-color-active; menuBackground: $base-menu-background; menuLightBackground: $base-menu-light-background; - subMenuBackground: $base-sub-menu-background; + subMenuBackground: #BEE7E9; subMenuHover: $base-sub-menu-hover; sideBarWidth: $base-sidebar-width; logoTitleColor: $base-logo-title-color; diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 2774cc8..8dcf18a 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -14,7 +14,7 @@ + + + + diff --git a/src/views/electronicFence/MapContainer.vue b/src/views/electronicFence/MapContainer.vue index dab0329..7ed8ad9 100644 --- a/src/views/electronicFence/MapContainer.vue +++ b/src/views/electronicFence/MapContainer.vue @@ -12,8 +12,8 @@ import AMapLoader from '@amap/amap-jsapi-loader'; export default { //import引入的组件需要注入到对象中才能使用" - components: {}, - props: {}, + components: {}, + props: {}, data() { //这里存放数据" @@ -49,6 +49,7 @@ import AMapLoader from '@amap/amap-jsapi-loader'; console.log(e); }); }, + drawPolygon() { this.mouseTool.polygon({ strokeColor: "#FF33FF", diff --git a/src/views/fault/faultList.vue b/src/views/fault/faultList.vue new file mode 100644 index 0000000..1fe39f4 --- /dev/null +++ b/src/views/fault/faultList.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/views/index.vue b/src/views/index.vue index 11a130a..574a824 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1,70 +1,34 @@ diff --git a/src/views/login.vue b/src/views/login.vue index 0e2290e..3b06661 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -1,7 +1,7 @@