-
-
-
+
+
diff --git a/src/components/index.js b/src/components/index.js
index ec25338..b157c74 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -4,6 +4,7 @@ import borderBox3 from './borderBox3/index'
import borderBox4 from './borderBox4/index'
import borderBox5 from './borderBox5/index'
import borderBox6 from './borderBox6/index'
+import borderBox7 from './borderBox7/index'
import decoration1 from './decoration1/index'
import decoration2 from './decoration2/index'
@@ -22,6 +23,8 @@ import scrollBoard from './scrollBoard/index.vue'
import loading from './loading/index.vue'
+import highlightCode from './highlightCode'
+
export default function (Vue) {
Vue.component('borderBox1', borderBox1)
Vue.component('borderBox2', borderBox2)
@@ -29,6 +32,7 @@ export default function (Vue) {
Vue.component('borderBox4', borderBox4)
Vue.component('borderBox5', borderBox5)
Vue.component('borderBox6', borderBox6)
+ Vue.component('borderBox7', borderBox7)
Vue.component('decoration1', decoration1)
Vue.component('decoration2', decoration2)
Vue.component('decoration3', decoration3)
@@ -41,4 +45,5 @@ export default function (Vue) {
Vue.component('numberShow', numberShow)
Vue.component('scrollBoard', scrollBoard)
Vue.component('loading', loading)
+ Vue.component('highlightCode', highlightCode)
}
diff --git a/src/main.js b/src/main.js
index 2a39efc..08895ca 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,18 +1,20 @@
import Vue from 'vue'
import App from './App.vue'
+import router from './router/index'
import './assets/style/index.less'
import plugins from './plugins/index'
-import globalComponents from './components/index'
+import components from './components/index'
Vue.use(plugins)
-Vue.use(globalComponents)
+Vue.use(components)
Vue.config.productionTip = false
new Vue({
+ router,
render: h => h(App)
}).$mount('#app')
diff --git a/src/temp.vue b/src/temp.vue
deleted file mode 100644
index ded6f8f..0000000
--- a/src/temp.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/views/dataView/index.vue b/src/views/dataView/index.vue
new file mode 100644
index 0000000..e234d0d
--- /dev/null
+++ b/src/views/dataView/index.vue
@@ -0,0 +1,36 @@
+
+
+
+ Welcome Data View Page
+
+
+
+
+
+
+
diff --git a/src/views/datavEntrance/index.vue b/src/views/datavEntrance/index.vue
new file mode 100644
index 0000000..22b6606
--- /dev/null
+++ b/src/views/datavEntrance/index.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/demo/borderBoxDemo.vue b/src/views/demo/borderBox.vue
similarity index 95%
rename from src/views/demo/borderBoxDemo.vue
rename to src/views/demo/borderBox.vue
index 13d33f3..5a01880 100644
--- a/src/views/demo/borderBoxDemo.vue
+++ b/src/views/demo/borderBox.vue
@@ -1,5 +1,5 @@
-
+
border-box-1
@@ -39,12 +39,12 @@
diff --git a/src/views/demo/index.vue b/src/views/demo/index.vue
index cae3423..46e6ac2 100644
--- a/src/views/demo/index.vue
+++ b/src/views/demo/index.vue
@@ -1,33 +1,49 @@
+
+
diff --git a/src/views/electronicFile/index.vue b/src/views/electronicFile/index.vue
deleted file mode 100644
index fb1f930..0000000
--- a/src/views/electronicFile/index.vue
+++ /dev/null
@@ -1,806 +0,0 @@
-
-
-
-
-
-
- {{ chart1Name }}
-
- 设备运行总数
{{ chart1Data ? multipleSum(...chart1Data.data.map(({ value }) => value)) : 0 }}
-
-
-
-
- {{ chart2Name }}
- 设备运行总数
{{ chart2Data ? multipleSum(...chart2Data.data.map(({ value }) => value)) : 0 }}
-
-
- {{ chart3Name }}
- 设备运行总数
{{ chart3Data ? multipleSum(...chart3Data.data.map(({ value }) => value)) : 0}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{ chart10Data.data[0].value }}
-
{{ chart10Data.data[0].title }}
-
-
-
{{ chart10Data.data[1].value }}
-
{{ chart10Data.data[1].title }}
-
-
-
-
-
-
-
-
{{ chart10Data.data[2].value }}
-
{{ chart10Data.data[2].title }}
-
-
-
{{ chart10Data.data[3].value }}
-
{{ chart10Data.data[3].title }}
-
-
-
-
-
-
-
-
- {{ chart9Name }}
-
-
-
-
{{ chart9Data ? multipleSum(...chart9Data.data.map(({ value }) => value)) : 0 }}
-
设备运行总数
-
-
-
-
-
-
-
- {{ chart8Name }}
-
-
-
-
{{ chart8Data ? multipleSum(...chart8Data.data.map(({ value }) => value)) : 0}}
-
设备运行总数
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/manageDesk/index.vue b/src/views/manageDesk/index.vue
index 434a867..778e9ce 100644
--- a/src/views/manageDesk/index.vue
+++ b/src/views/manageDesk/index.vue
@@ -1,7 +1,7 @@