@@ -42,7 +44,7 @@ export default {
withoutAnimation: this.sidebar.withoutAnimation,
mobile: this.device === 'mobile'
}
- }
+ },
},
methods: {
handleClickOutside() {
@@ -78,20 +80,4 @@ export default {
z-index: 999;
}
-.fixed-header {
- position: fixed;
- top: 0;
- right: 0;
- z-index: 9;
- width: calc(100% - #{$sideBarWidth});
- transition: width 0.28s;
-}
-
-.hideSidebar .fixed-header {
- width: calc(100% - 54px)
-}
-
-.mobile .fixed-header {
- width: 100%;
-}
diff --git a/FlowerGully/src/main.js b/FlowerGully/src/main.js
index d8a6698..e88a5bc 100644
--- a/FlowerGully/src/main.js
+++ b/FlowerGully/src/main.js
@@ -22,7 +22,7 @@ if (process.env.NODE_ENV === 'production') {
//打印
import Print from 'vue-print-nb'
Vue.use(Print)
-import echarts from 'echarts';
+import * as echarts from 'echarts';
Vue.prototype.$echarts = echarts;
Vue.prototype.$axios = axios
Vue.config.productionTip = false
diff --git a/FlowerGully/src/router/index.js b/FlowerGully/src/router/index.js
index 5f1fa11..6bbc772 100644
--- a/FlowerGully/src/router/index.js
+++ b/FlowerGully/src/router/index.js
@@ -27,7 +27,7 @@ export const constantRoutes = [
path: '/',
component: App,
redirect: '/DataPreview/ParkProfile',
- meta: { title: '数据预览', icon: 'dashboard' },
+ meta: { title: '数据预览', icon: 'Marketmanagement' },
children: [{
path: 'DataPreview',
name: 'DataPreview',
diff --git a/FlowerGully/src/router/modules/BasicInformation.js b/FlowerGully/src/router/modules/BasicInformation.js
index 90e8ab1..c7f67f2 100644
--- a/FlowerGully/src/router/modules/BasicInformation.js
+++ b/FlowerGully/src/router/modules/BasicInformation.js
@@ -7,7 +7,7 @@ export default {
name: 'BasicInformation',
meta: {
title: '基础信息',
- icon: 'dashboard'
+ icon: 'basicinformation'
},
children: [
{
diff --git a/FlowerGully/src/router/modules/Equipment.js b/FlowerGully/src/router/modules/Equipment.js
index fdd160c..61bd57b 100644
--- a/FlowerGully/src/router/modules/Equipment.js
+++ b/FlowerGully/src/router/modules/Equipment.js
@@ -7,7 +7,7 @@ export default {
name: 'Equipment',
meta: {
title: '设备管理',
- icon: 'dashboard'
+ icon: 'greenhouse'
},
children: [
{
diff --git a/FlowerGully/src/router/modules/GreenhouseVR.js b/FlowerGully/src/router/modules/GreenhouseVR.js
index c7bb6af..39068d9 100644
--- a/FlowerGully/src/router/modules/GreenhouseVR.js
+++ b/FlowerGully/src/router/modules/GreenhouseVR.js
@@ -4,6 +4,7 @@ export default {
path: '/GreenhouseVR',
component: Layout,
name: 'GreenhouseVR',
+ hidden: true,
children: [
{
path: '',
diff --git a/FlowerGully/src/router/modules/Inspection.js b/FlowerGully/src/router/modules/Inspection.js
index c3b31e0..62b8977 100644
--- a/FlowerGully/src/router/modules/Inspection.js
+++ b/FlowerGully/src/router/modules/Inspection.js
@@ -11,7 +11,7 @@ export default {
name: 'Inspection',
meta: {
title: '送检管理',
- icon: 'dashboard'
+ icon: 'inspect'
}
},
]
diff --git a/FlowerGully/src/router/modules/MarketMonitoring.js b/FlowerGully/src/router/modules/MarketMonitoring.js
index 4921fb6..958ea55 100644
--- a/FlowerGully/src/router/modules/MarketMonitoring.js
+++ b/FlowerGully/src/router/modules/MarketMonitoring.js
@@ -4,6 +4,7 @@ export default {
path: '/MarketMonitoring',
component: Layout,
name: 'MarketMonitoring',
+ hidden: true,
children: [
{
path: '',
diff --git a/FlowerGully/src/router/modules/ParkPanoramicVR.js b/FlowerGully/src/router/modules/ParkPanoramicVR.js
index d510501..f8d4d60 100644
--- a/FlowerGully/src/router/modules/ParkPanoramicVR.js
+++ b/FlowerGully/src/router/modules/ParkPanoramicVR.js
@@ -4,6 +4,7 @@ export default {
path: '/ParkPanoramicVR',
component: Layout,
name: 'ParkPanoramicVR',
+ hidden: true,
children: [
{
path: '',
diff --git a/FlowerGully/src/router/modules/Production.js b/FlowerGully/src/router/modules/Production.js
index 30c8289..e7924d1 100644
--- a/FlowerGully/src/router/modules/Production.js
+++ b/FlowerGully/src/router/modules/Production.js
@@ -7,7 +7,7 @@ export default {
name: 'Production',
meta: {
title: '生产管理',
- icon: 'dashboard'
+ icon: 'facility'
},
children: [
{
diff --git a/FlowerGully/src/router/modules/Sales.js b/FlowerGully/src/router/modules/Sales.js
index 1d5e4a4..4e023c1 100644
--- a/FlowerGully/src/router/modules/Sales.js
+++ b/FlowerGully/src/router/modules/Sales.js
@@ -11,7 +11,7 @@ export default {
name: 'Sales',
meta: {
title: '销售管理',
- icon: 'dashboard'
+ icon: 'market'
}
},
]
diff --git a/FlowerGully/src/router/modules/Traceability.js b/FlowerGully/src/router/modules/Traceability.js
index 537c33c..5da75ed 100644
--- a/FlowerGully/src/router/modules/Traceability.js
+++ b/FlowerGully/src/router/modules/Traceability.js
@@ -7,7 +7,7 @@ export default {
name: 'Traceability',
meta: {
title: '溯源管理',
- icon: 'dashboard'
+ icon: 'productionmanagement'
},
children: [
{
diff --git a/FlowerGully/src/views/BasicInformation/Base.vue b/FlowerGully/src/views/BasicInformation/Base.vue
index b84aa65..b7872b5 100644
--- a/FlowerGully/src/views/BasicInformation/Base.vue
+++ b/FlowerGully/src/views/BasicInformation/Base.vue
@@ -1,5 +1,6 @@
+
@@ -10,24 +11,24 @@
@click="search">查询