浏览代码

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	echarts-screen/src/components/index.js
gxr 4 年之前
父节点
当前提交
af20206bd6

+ 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"

+ 9 - 8
echarts-screen/public/index.html

@@ -1,20 +1,21 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-  <title><%= htmlWebpackPlugin.options.title %></title>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <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>
+    <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
+        Please enable it to continue.</strong>
 </noscript>
 <div id="app"></div>
 <!-- built files will be auto injected -->

文件差异内容过多而无法显示
+ 18 - 0
echarts-screen/src/components/PieCon.vue


+ 0 - 6
echarts-screen/src/components/RoseCon.vue

@@ -1,9 +1,3 @@
-<!--
- 描述: 客户分布
- 作者: Jack Chen
- 日期: 2020-05-09
--->
-
 <template>
   <div class="RoseCon-container">
     <div class="chart" id="chart_right2"></div>

+ 4 - 69
echarts-screen/src/components/index.js

@@ -1,76 +1,11 @@
-/*
- * 描述: 封装组件库
- * 作者: Jack Chen
- * 日期: 2020-04-18
- */
 
-// import bgAnimation from './bgAnimation' // 登录界面背景图动画
-// import modal from './modal' // 自定义全局模态框
-// import sinan from './sinan' // 司南排名图
-// import seamless from './seamless' // 新闻无缝滚动
-// import pyramid from './pyramid' // 金字塔动画
-// import scrollArc from './scrollArc' // 滚动弧形线
-// import szBar from './szBar' // 双轴柱状图
-// import ringPin from './ringPin' // 环形气泡图
-// import rotateColorful from './rotateColorful' // 旋转多彩图
-// import circleRunway from './circleRunway' // 环形跑道图
-// import scanRadius from './scanRadius' // 扫描半径图
-// import cakeLinkage from './cakeLinkage' // 柱饼组合联动
-// import dynamicLine from './dynamicLine' // 动态轮播折线图
-// import pyramidTrend from './pyramidTrend' // 金字塔趋势
-// import staffMix from './staffMix' // 人员占比
-// import flashCloud from './flashCloud' // 闪动云
-// import ringPie from './ringPie' // 环形饼图
-// import colorfulRadar from './colorfulRadar' // 多彩雷达
-// import dynamicList from './dynamicList' // 动态列表动画
-// import bar3d from './bar3d' // 3D立体柱状图
-// import colorfulArea from './colorfulArea' // 多彩轮播面积
-// import rainbow from './rainbow' // 彩虹轨道图
-// import gauge from './gauge' // 仪表盘
-// import waterPolo from './waterPolo' // 水球图
-// import circleNesting from './circleNesting' // 圆环套圆环
+import RoseCon from './RoseCon' // 客户分布
 
-import business from './business' // 业务范围
-import talent from './talent' // 人才队伍
-import income from './income' // 营业收入
-import wordCloud from './wordCloud' // 产品热词
-import distribution from './distribution' // 客户分布
-import history from './history' // 发展历程
+import PieCon from './PieCon' // 发展历程
 
 const components = {
-  // bgAnimation,
-  // modal,
-  // sinan,
-  // seamless,
-  // pyramid,
-  // scrollArc,
-  // szBar,
-  // ringPin,
-  // rotateColorful,
-  // circleRunway,
-  // scanRadius,
-  // cakeLinkage,
-  // dynamicLine,
-  // pyramidTrend,
-  // staffMix,
-  // flashCloud,
-  // ringPie,
-  // colorfulRadar,
-  // dynamicList,
-  // bar3d,
-  // colorfulArea,
-  // rainbow,
-  // gauge,
-  // waterPolo,
-  // circleNesting,
-
-  business,
-  talent,
-  income,
-  wordCloud,
-  distribution,
-  history,
-  
+  RoseCon,
+  PieCon,
 };
 
 const install = (Vue = {}) => {

+ 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) {

部分文件因为文件数量过多而无法显示