1901010343 4 лет назад
Родитель
Сommit
43ef8c63cd

+ 16 - 2
echarts-screen/package-lock.json

@@ -7339,8 +7339,7 @@
     "lodash": {
       "version": "4.17.15",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-      "dev": true
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
     },
     "lodash.defaultsdeep": {
       "version": "4.6.1",
@@ -9986,6 +9985,11 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
       "dev": true
     },
+    "resize-detector": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/resize-detector/-/resize-detector-0.1.10.tgz",
+      "integrity": "sha512-iLcXC8A6Fb0DfA+TRiywrK/0A22bFqkhntjMJMEzXDA4XkcEkfwpNbv7W8iewUiD0xYIaeiXOfiEehTqGKsUFw=="
+    },
     "resolve": {
       "version": "1.17.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
@@ -11906,6 +11910,16 @@
       "integrity": "sha512-6R4OVBVNtQTlcbXu6SJ8ENR35M2/CdWt3Jmv57jOUM+1ojiFmjVGvZPH8DfHpMDSA+ITs+EW5V6qthADxeyYOQ==",
       "dev": true
     },
+    "vue-echarts": {
+      "version": "5.0.0-beta.0",
+      "resolved": "https://registry.npmjs.org/vue-echarts/-/vue-echarts-5.0.0-beta.0.tgz",
+      "integrity": "sha512-QZFKGXDAYFQo+F20REpzcdLx79nsl4kOorJRpN+08aYq4YiIlmtWss1Lxadm7Fo+NYyWm8nnT+h4xHv3uqWIDQ==",
+      "requires": {
+        "core-js": "^3.4.4",
+        "lodash": "^4.17.15",
+        "resize-detector": "^0.1.10"
+      }
+    },
     "vue-eslint-parser": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.0.0.tgz",

+ 1 - 0
echarts-screen/package.json

@@ -9,6 +9,7 @@
   "dependencies": {
     "core-js": "^3.6.4",
     "vue": "^2.6.11",
+    "vue-echarts": "^5.0.0-beta.0",
     "vue-router": "^3.1.6",
     "vue-seamless-scroll": "^1.1.21",
     "vuex": "^3.2.0"

+ 2 - 2
echarts-screen/public/index.html

@@ -8,11 +8,11 @@
     <title><%= htmlWebpackPlugin.options.title %></title>
 </head>
 <body>
-<!--<script src="//cdn.bootcdn.net/ajax/libs/jquery/1.10.2/jquery.min.js"></script>-->
+<script src="//cdn.bootcdn.net/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
 <script src="//cdn.bootcdn.net/ajax/libs/echarts/4.7.0/echarts.min.js"></script>
 <script src="//www.echartsjs.com/zh/dist/echarts-gl.min.js"></script>
 <script src="//www.echartsjs.com/resource/echarts-liquidfill-latest/dist/echarts-liquidfill.min.js"></script>
-<!--<script src="//cdn.bootcdn.net/ajax/libs/axios/0.19.0/axios.min.js"></script>-->
+<script src="//cdn.bootcdn.net/ajax/libs/axios/0.19.0/axios.min.js"></script>
 <noscript>
     <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
         Please enable it to continue.</strong>

+ 2 - 5
echarts-screen/src/main.js

@@ -2,20 +2,17 @@ import Vue from 'vue'
 import App from './App.vue'
 import router from './router'
 import store from './store'
-// import vueParticles from 'vue-particles'
 import Vcomp from './components/index'
-// import Toast from './components/toast'
+import Echarts from 'vue-echarts'
 
 import '@/assets/styles/base.scss'
 import '@/assets/styles/common.scss'
 
-// Vue.use(vueParticles)
 Vue.use(Vcomp)
+Vue.use(Echarts)
 
 Vue.config.productionTip = false
 
-// Vue.prototype.$Toast = Toast
-
 
 router.beforeEach((to, from, next) => {
 	if (to.meta.title) {