diff --git a/src/lang/i18n-en-US.js b/src/lang/i18n-en-US.js index ea5e31e..ab812a2 100644 --- a/src/lang/i18n-en-US.js +++ b/src/lang/i18n-en-US.js @@ -471,6 +471,7 @@ export default { "工业物联网监控平台": "Industrial Internet of Things Monitoring Platform", "今日":"Tody", "本周": "The Week", - "本月": "The Month" + "本月": "The Month", + "故障": "Fault", } } \ No newline at end of file diff --git a/src/lang/i18n-zh-CN.js b/src/lang/i18n-zh-CN.js index ac9252b..76ced08 100644 --- a/src/lang/i18n-zh-CN.js +++ b/src/lang/i18n-zh-CN.js @@ -466,6 +466,7 @@ export default { "工业物联网监控平台": "工业物联网监控平台", "今日":"今日", "本周":"本周", - "本月":"本月" + "本月":"本月", + '故障':'故障', } } \ No newline at end of file diff --git a/src/main.js b/src/main.js index ef4b52c..36d5bb4 100644 --- a/src/main.js +++ b/src/main.js @@ -42,7 +42,7 @@ import { CanvasRenderer } from 'echarts/renderers' import { - PieChart,LineChart,BarChart + PieChart,LineChart,BarChart,GaugeChart } from 'echarts/charts' import { TitleComponent, @@ -58,7 +58,8 @@ use([ GridComponent, PieChart, LineChart, - BarChart + BarChart, + GaugeChart ]); diff --git a/src/views/history/index.vue b/src/views/history/index.vue index 40aee71..7aca718 100644 --- a/src/views/history/index.vue +++ b/src/views/history/index.vue @@ -1,10 +1,18 @@ diff --git a/src/views/screen/components/lcenter1.vue b/src/views/screen/components/lcenter1.vue new file mode 100644 index 0000000..12f5ff2 --- /dev/null +++ b/src/views/screen/components/lcenter1.vue @@ -0,0 +1,204 @@ + + + + + \ No newline at end of file diff --git a/src/views/screen/components/lcenter2.vue b/src/views/screen/components/lcenter2.vue new file mode 100644 index 0000000..73db653 --- /dev/null +++ b/src/views/screen/components/lcenter2.vue @@ -0,0 +1,385 @@ + + + + + \ No newline at end of file diff --git a/src/views/screen/components/ltop2.vue b/src/views/screen/components/ltop2.vue new file mode 100644 index 0000000..a1702b7 --- /dev/null +++ b/src/views/screen/components/ltop2.vue @@ -0,0 +1,142 @@ + + + + + diff --git a/src/views/screen/components/ltop3.vue b/src/views/screen/components/ltop3.vue new file mode 100644 index 0000000..df9052f --- /dev/null +++ b/src/views/screen/components/ltop3.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/screen/image/u65.png b/src/views/screen/image/u65.png new file mode 100644 index 0000000..b8ba27f Binary files /dev/null and b/src/views/screen/image/u65.png differ diff --git a/src/views/screen/index.vue b/src/views/screen/index.vue index a6fa0c4..341491a 100644 --- a/src/views/screen/index.vue +++ b/src/views/screen/index.vue @@ -2,10 +2,17 @@
- + + + +
+
+ + +
+
+
-
-
@@ -17,6 +24,27 @@