diff --git a/.gitignore b/.gitignore index a0dddc6..6b08825 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,7 @@ yarn-error.log* *.njsproj *.sln *.sw? + +debug.log +**/debug.log + diff --git a/package-lock.json b/package-lock.json index 2bc7c83..9f3ed09 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,6 +17,7 @@ "vue": "^2.6.11", "vue-awesome": "^4.0.2", "vue-router": "^3.1.5", + "vue-seamless-scroll": "^1.1.23", "vuex": "^3.1.2", "webpack": "^4.23.0", "webpack-cli": "^3.3.10" @@ -5103,6 +5104,11 @@ "dev": true, "license": "MIT" }, + "node_modules/comutils": { + "version": "1.1.19", + "resolved": "https://registry.npmmirror.com/comutils/-/comutils-1.1.19.tgz", + "integrity": "sha512-JxXB67juILiwhdLwOsYyjUqwWEhHdObI0EClOPk+JDtEuTbac59s0pxGpfCBnNNQ5JommifmcMGneW/4Cg7YWw==" + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz", @@ -16278,6 +16284,14 @@ "integrity": "sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ==", "license": "MIT" }, + "node_modules/vue-seamless-scroll": { + "version": "1.1.23", + "resolved": "https://registry.npmmirror.com/vue-seamless-scroll/-/vue-seamless-scroll-1.1.23.tgz", + "integrity": "sha512-HBjUub8WwsKJzbFCrwKPDrZn4e+SSbkKgwWtjKtfLwesiFGwSsVxP44/Z6d3kpXy94qIFOiflJH6l0/9pj7SGA==", + "dependencies": { + "comutils": "^1.1.9" + } + }, "node_modules/vue-style-loader": { "version": "4.1.3", "resolved": "https://registry.npmmirror.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz", @@ -21449,6 +21463,11 @@ } } }, + "comutils": { + "version": "1.1.19", + "resolved": "https://registry.npmmirror.com/comutils/-/comutils-1.1.19.tgz", + "integrity": "sha512-JxXB67juILiwhdLwOsYyjUqwWEhHdObI0EClOPk+JDtEuTbac59s0pxGpfCBnNNQ5JommifmcMGneW/4Cg7YWw==" + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz", @@ -29604,6 +29623,14 @@ "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-3.6.5.tgz", "integrity": "sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ==" }, + "vue-seamless-scroll": { + "version": "1.1.23", + "resolved": "https://registry.npmmirror.com/vue-seamless-scroll/-/vue-seamless-scroll-1.1.23.tgz", + "integrity": "sha512-HBjUub8WwsKJzbFCrwKPDrZn4e+SSbkKgwWtjKtfLwesiFGwSsVxP44/Z6d3kpXy94qIFOiflJH6l0/9pj7SGA==", + "requires": { + "comutils": "^1.1.9" + } + }, "vue-style-loader": { "version": "4.1.3", "resolved": "https://registry.npmmirror.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz", diff --git a/package.json b/package.json index 6e2c4b0..b1620ca 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "vue": "^2.6.11", "vue-awesome": "^4.0.2", "vue-router": "^3.1.5", + "vue-seamless-scroll": "^1.1.23", "vuex": "^3.1.2", "webpack": "^4.23.0", "webpack-cli": "^3.3.10" @@ -55,4 +56,4 @@ "> 1%", "last 2 versions" ] -} \ No newline at end of file +} diff --git a/src/api/kanban.js b/src/api/kanban.js new file mode 100644 index 0000000..85d1f84 --- /dev/null +++ b/src/api/kanban.js @@ -0,0 +1,53 @@ +import request from '../utils/request' +//生产任务 +export function gettaskList(data) { + return request({ + url: '/api/bi/zhusu-factory-data', + method: 'post', + data +}) +} + + export function getzlList (params) { + return request({ + url: '/api/bi/zl-bi-data', + method: 'POST', + type: 'change', + data: params + }) + } + + + export function getmjList (params) { + return request({ + url: '/api/bi/mold-manager-data', + method: 'POST', + type: 'change', + data: params + }) + } + export function getzzList (params) { + return request({ + url: '/api/bi/zuzhuang-factory-data', + method: 'POST', + type: 'change', + data: params + }) + } + export function getjcList (data) { + return request({ + url: '/api/bi/jichu-factory-data', + method: 'POST', + type: 'change', + data + }) + } + + export function getsbList (data) { + return request({ + url: '/api/bi/equip-manager-data', + method: 'POST', + type: 'change', + data + }) + } \ No newline at end of file diff --git a/src/assets/images/completion-board/dangri.png b/src/assets/images/completion-board/dangri.png new file mode 100644 index 0000000..4a29290 Binary files /dev/null and b/src/assets/images/completion-board/dangri.png differ diff --git a/src/assets/images/completion-board/jihuashu.png b/src/assets/images/completion-board/jihuashu.png new file mode 100644 index 0000000..3812244 Binary files /dev/null and b/src/assets/images/completion-board/jihuashu.png differ diff --git a/src/assets/images/completion-board/shengchanqitao.png b/src/assets/images/completion-board/shengchanqitao.png new file mode 100644 index 0000000..905b74b Binary files /dev/null and b/src/assets/images/completion-board/shengchanqitao.png differ diff --git a/src/assets/images/completion-board/wancheng.png b/src/assets/images/completion-board/wancheng.png new file mode 100644 index 0000000..81703cc Binary files /dev/null and b/src/assets/images/completion-board/wancheng.png differ diff --git a/src/assets/images/completion-board/weiwancheng.png b/src/assets/images/completion-board/weiwancheng.png new file mode 100644 index 0000000..6e5d7b1 Binary files /dev/null and b/src/assets/images/completion-board/weiwancheng.png differ diff --git a/src/assets/images/completion-board/yxkuang.png b/src/assets/images/completion-board/yxkuang.png new file mode 100644 index 0000000..53b8ae8 Binary files /dev/null and b/src/assets/images/completion-board/yxkuang.png differ diff --git a/src/assets/images/completion-board/zhanyong.png b/src/assets/images/completion-board/zhanyong.png new file mode 100644 index 0000000..97cbda9 Binary files /dev/null and b/src/assets/images/completion-board/zhanyong.png differ diff --git a/src/assets/images/ctu-board/dangri.png b/src/assets/images/ctu-board/dangri.png new file mode 100644 index 0000000..4a29290 Binary files /dev/null and b/src/assets/images/ctu-board/dangri.png differ diff --git a/src/assets/images/ctu-board/gzcl.png b/src/assets/images/ctu-board/gzcl.png new file mode 100644 index 0000000..dffe123 Binary files /dev/null and b/src/assets/images/ctu-board/gzcl.png differ diff --git a/src/assets/images/ctu-board/jianbian.png b/src/assets/images/ctu-board/jianbian.png new file mode 100644 index 0000000..4d918a8 Binary files /dev/null and b/src/assets/images/ctu-board/jianbian.png differ diff --git a/src/assets/images/ctu-board/jichu.png b/src/assets/images/ctu-board/jichu.png new file mode 100644 index 0000000..3479478 Binary files /dev/null and b/src/assets/images/ctu-board/jichu.png differ diff --git a/src/assets/images/ctu-board/yxsj.png b/src/assets/images/ctu-board/yxsj.png new file mode 100644 index 0000000..5631356 Binary files /dev/null and b/src/assets/images/ctu-board/yxsj.png differ diff --git a/src/assets/images/ctu-board/yysl.png b/src/assets/images/ctu-board/yysl.png new file mode 100644 index 0000000..386a0b0 Binary files /dev/null and b/src/assets/images/ctu-board/yysl.png differ diff --git a/src/assets/images/ctu-board/zzyx.png b/src/assets/images/ctu-board/zzyx.png new file mode 100644 index 0000000..9ebd3c1 Binary files /dev/null and b/src/assets/images/ctu-board/zzyx.png differ diff --git a/src/assets/images/instock-select-board/jianbian.png b/src/assets/images/instock-select-board/jianbian.png new file mode 100644 index 0000000..46f5027 Binary files /dev/null and b/src/assets/images/instock-select-board/jianbian.png differ diff --git a/src/assets/images/instock-select-board/jinrishouhuo.png b/src/assets/images/instock-select-board/jinrishouhuo.png new file mode 100644 index 0000000..e1d1dff Binary files /dev/null and b/src/assets/images/instock-select-board/jinrishouhuo.png differ diff --git a/src/assets/images/instock-select-board/rkwlfb.png b/src/assets/images/instock-select-board/rkwlfb.png new file mode 100644 index 0000000..170ea88 Binary files /dev/null and b/src/assets/images/instock-select-board/rkwlfb.png differ diff --git a/src/assets/images/instock-select-board/rkwlfb2.png b/src/assets/images/instock-select-board/rkwlfb2.png new file mode 100644 index 0000000..7213b6b Binary files /dev/null and b/src/assets/images/instock-select-board/rkwlfb2.png differ diff --git a/src/assets/images/instock-select-board/shqkfx.png b/src/assets/images/instock-select-board/shqkfx.png new file mode 100644 index 0000000..4cf43ec Binary files /dev/null and b/src/assets/images/instock-select-board/shqkfx.png differ diff --git a/src/assets/images/instock-select-board/zongdanshu.png b/src/assets/images/instock-select-board/zongdanshu.png new file mode 100644 index 0000000..49ee467 Binary files /dev/null and b/src/assets/images/instock-select-board/zongdanshu.png differ diff --git a/src/assets/images/instock-select-board/入库分拣看板_slices.zip b/src/assets/images/instock-select-board/入库分拣看板_slices.zip new file mode 100644 index 0000000..b4d9787 Binary files /dev/null and b/src/assets/images/instock-select-board/入库分拣看板_slices.zip differ diff --git a/src/assets/images/prod-instock-board/kucunkuang.png b/src/assets/images/prod-instock-board/kucunkuang.png new file mode 100644 index 0000000..b99764d Binary files /dev/null and b/src/assets/images/prod-instock-board/kucunkuang.png differ diff --git a/src/assets/images/prod-instock-board/mingxikuang.png b/src/assets/images/prod-instock-board/mingxikuang.png new file mode 100644 index 0000000..17e9a61 Binary files /dev/null and b/src/assets/images/prod-instock-board/mingxikuang.png differ diff --git a/src/assets/images/prod-instock-board/rukukuang.png b/src/assets/images/prod-instock-board/rukukuang.png new file mode 100644 index 0000000..ed8f5aa Binary files /dev/null and b/src/assets/images/prod-instock-board/rukukuang.png differ diff --git a/src/assets/images/prod-outstock-board/danjumingxi.png b/src/assets/images/prod-outstock-board/danjumingxi.png new file mode 100644 index 0000000..2701b7f Binary files /dev/null and b/src/assets/images/prod-outstock-board/danjumingxi.png differ diff --git a/src/assets/images/sum-board/bg.png b/src/assets/images/sum-board/bg.png new file mode 100644 index 0000000..2fce46e Binary files /dev/null and b/src/assets/images/sum-board/bg.png differ diff --git a/src/assets/images/sum-board/head.png b/src/assets/images/sum-board/head.png new file mode 100644 index 0000000..170c725 Binary files /dev/null and b/src/assets/images/sum-board/head.png differ diff --git a/src/assets/images/sum-board/jrck.png b/src/assets/images/sum-board/jrck.png new file mode 100644 index 0000000..97aacca Binary files /dev/null and b/src/assets/images/sum-board/jrck.png differ diff --git a/src/assets/images/sum-board/jrfh.png b/src/assets/images/sum-board/jrfh.png new file mode 100644 index 0000000..02b028c Binary files /dev/null and b/src/assets/images/sum-board/jrfh.png differ diff --git a/src/assets/images/sum-board/jrrk.png b/src/assets/images/sum-board/jrrk.png new file mode 100644 index 0000000..04bd770 Binary files /dev/null and b/src/assets/images/sum-board/jrrk.png differ diff --git a/src/assets/images/sum-board/jrsh.png b/src/assets/images/sum-board/jrsh.png new file mode 100644 index 0000000..99e7147 Binary files /dev/null and b/src/assets/images/sum-board/jrsh.png differ diff --git a/src/assets/images/sum-board/zkuang.png b/src/assets/images/sum-board/zkuang.png new file mode 100644 index 0000000..bb9875a Binary files /dev/null and b/src/assets/images/sum-board/zkuang.png differ diff --git a/src/assets/images/sum-board/zskuang.png b/src/assets/images/sum-board/zskuang.png new file mode 100644 index 0000000..69df836 Binary files /dev/null and b/src/assets/images/sum-board/zskuang.png differ diff --git a/src/assets/jcj.png b/src/assets/jcj.png new file mode 100644 index 0000000..fce5b62 Binary files /dev/null and b/src/assets/jcj.png differ diff --git a/src/assets/scss/CenterTopbox.scss b/src/assets/scss/CenterTopbox.scss new file mode 100644 index 0000000..5985bc3 --- /dev/null +++ b/src/assets/scss/CenterTopbox.scss @@ -0,0 +1,68 @@ +.box { + display: flex; + justify-content: space-between; + align-items: center; + flex-direction: row; + width: 772px; + height: 128px; + margin-top: 10px; + .cell { + width: 193px; + .item { + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + margin-left: 30px; + margin-top: 20px; + width: 100%; + .text{ + font-size:12px; + } + .num{ + font-size: 20px; + margin-bottom:10px; + } + } + } + .jrrk { + background-image: url("@/assets/images/sum-board/jrrk.png"); + background-repeat: no-repeat; + background-position: center center; + //background-attachment: fixed; + background-size: 169px 74px; + .num{ + color:#1FEEF7; + } + } + .jrck { + background-image: url("@/assets/images/sum-board/jrck.png"); + background-repeat: no-repeat; + background-position: center center; + //background-attachment: fixed; + background-size: 169px 74px; + .num{ + color:#208DF0; + } + } + .jrfh { + background-image: url("@/assets/images/sum-board/jrfh.png"); + background-repeat: no-repeat; + background-position: center center; + //background-attachment: fixed; + background-size: 169px 74px; + .num{ + color:#16FFA5; + } + } + .jrsh { + background-image: url("@/assets/images/sum-board/jrsh.png"); + background-repeat: no-repeat; + background-position: center center; + //background-attachment: fixed; + background-size: 169px 74px; + .num{ + color:#CFD243; + } + } + } \ No newline at end of file diff --git a/src/assets/scss/header.scss b/src/assets/scss/header.scss new file mode 100644 index 0000000..b648e05 --- /dev/null +++ b/src/assets/scss/header.scss @@ -0,0 +1,14 @@ +.container { + width: 100vw; + height: 100%; + line-height: 100px; + background-image: url("../images/sum-board/head.png"); + font-size: 45px; + color: #fff; + // text-shadow: 0 0 8px rgba(255, 255, 255, 0.4), + // 0 0 8px rgba(255, 255, 255, 0.1),0 0 8px rgba(255, 255, 255, 0); + //filter: drop-shadow(0 0 10px white) drop-shadow(0 0 20px white) drop-shadow(0 0 30px white); + background-repeat: no-repeat; + background-size: contain; + font-weight: 500; + } \ No newline at end of file diff --git a/src/assets/scss/index.scss b/src/assets/scss/index.scss index ecc2176..e8fffc4 100644 --- a/src/assets/scss/index.scss +++ b/src/assets/scss/index.scss @@ -8,7 +8,7 @@ transform: translate(-50%, -50%); transform-origin: left top; overflow: hidden; - + .bg { width: 100%; height: 100%; @@ -19,23 +19,18 @@ } .host-body { - height: 100%; - .dv-dec-10, .dv-dec-10-s { width: 33.3%; height: 5px; } - .dv-dec-10-s { transform: rotateY(180deg); } - .dv-dec-8 { width: 200px; height: 50px; } - .title { position: relative; width: 500px; @@ -44,7 +39,7 @@ background-repeat: no-repeat; .title-text { - font-size: 35px; + font-size: 24px; position: absolute; bottom: 0; left: 50%; @@ -65,7 +60,6 @@ .aside-width { width: 40%; } - .react-r-s, .react-l-s { background-color: #0f1325; @@ -77,7 +71,6 @@ text-align: right; width: 500px; } - font-size: 18px; width: 300px; line-height: 50px; @@ -101,13 +94,10 @@ } .react-left { - user-select: none; - &.react-l-s { width: 500px; text-align: left; } - font-size: 18px; width: 300px; height: 50px; @@ -133,7 +123,6 @@ } .body-box { - // height: 100%; margin-top: 16px; display: flex; flex-direction: column; @@ -141,15 +130,11 @@ //下方区域的布局 .content-box { display: grid; - grid-template-columns: 2fr 3fr 5fr 3fr 2fr; + grid-template-columns: 3fr 9fr 3fr; } // 底部数据 - .bottom-box { - margin-top: 10px; - display: grid; - grid-template-columns: repeat(2, 50%); - } + } } -} \ No newline at end of file +} diff --git a/src/assets/zz01.png b/src/assets/zz01.png new file mode 100644 index 0000000..79bf570 Binary files /dev/null and b/src/assets/zz01.png differ diff --git a/src/assets/zz03.png b/src/assets/zz03.png new file mode 100644 index 0000000..dc65f0a Binary files /dev/null and b/src/assets/zz03.png differ diff --git a/src/assets/zz04.png b/src/assets/zz04.png new file mode 100644 index 0000000..c253b14 Binary files /dev/null and b/src/assets/zz04.png differ diff --git a/src/assets/zz1.png b/src/assets/zz1.png new file mode 100644 index 0000000..b7c8326 Binary files /dev/null and b/src/assets/zz1.png differ diff --git a/src/assets/zz2.png b/src/assets/zz2.png new file mode 100644 index 0000000..7f273cd Binary files /dev/null and b/src/assets/zz2.png differ diff --git a/src/assets/zz22.jpg b/src/assets/zz22.jpg new file mode 100644 index 0000000..0b804a5 Binary files /dev/null and b/src/assets/zz22.jpg differ diff --git a/src/assets/zzj.png b/src/assets/zzj.png new file mode 100644 index 0000000..66a68c0 Binary files /dev/null and b/src/assets/zzj.png differ diff --git a/src/common/echart/index.vue b/src/common/echart/index.vue index 6473245..bb8f868 100644 --- a/src/common/echart/index.vue +++ b/src/common/echart/index.vue @@ -57,6 +57,9 @@ export default { // 初始化echart this.chart = this.$echarts.init(this.$el, 'tdTheme') this.chart.setOption(this.options, true) + window.addEventListener('resize', function() { + this.chart.resize(); + }); } } } diff --git a/src/components/ChartProgress.vue b/src/components/ChartProgress.vue new file mode 100644 index 0000000..62a9924 --- /dev/null +++ b/src/components/ChartProgress.vue @@ -0,0 +1,157 @@ + + + + + diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue new file mode 100644 index 0000000..546ebbc --- /dev/null +++ b/src/components/HelloWorld.vue @@ -0,0 +1,43 @@ + + + + + diff --git a/src/components/LightingCircle.vue b/src/components/LightingCircle.vue new file mode 100644 index 0000000..e716327 --- /dev/null +++ b/src/components/LightingCircle.vue @@ -0,0 +1,189 @@ + + + + + diff --git a/src/components/ScaleBox.vue b/src/components/ScaleBox.vue new file mode 100644 index 0000000..04d13fe --- /dev/null +++ b/src/components/ScaleBox.vue @@ -0,0 +1,80 @@ + + + + + \ No newline at end of file diff --git a/src/components/VEcharts.vue b/src/components/VEcharts.vue new file mode 100644 index 0000000..42507ad --- /dev/null +++ b/src/components/VEcharts.vue @@ -0,0 +1,72 @@ + + + diff --git a/src/components/echart/bottom/bottomLeftChart/chart.vue b/src/components/echart/bottom/bottomLeftChart/chart.vue index a4e2534..d3d5eff 100644 --- a/src/components/echart/bottom/bottomLeftChart/chart.vue +++ b/src/components/echart/bottom/bottomLeftChart/chart.vue @@ -4,7 +4,7 @@ @@ -31,6 +31,20 @@ export default { cdata: { handler (newData) { this.options = { + title: { +show: true, // 是否显示标题,默认为true +text: newData.title, // 主标题文本 +x: 'center', // 标题水平位置,默认为'left' +y: 'top', // 标题垂直位置,默认为'top' +textStyle: { +color: '#fff', // 主标题文字颜色 +fontStyle: 'normal', // 主标题文字风格 +fontWeight: 'bold', // 主标题文字粗细 +fontFamily: 'Arial, Verdana, sans-serif', // 主标题文字字体 +fontSize: 18 // 主标题文字大小 +}, + +}, tooltip: { trigger: "axis", backgroundColor: "rgba(255,255,255,0.1)", @@ -43,71 +57,71 @@ export default { } }, legend: { - data: ["已贯通", "计划贯通", "贯通率"], + // data: ["已贯通", "计划贯通", "贯通率"], textStyle: { color: "#B4B4B4" }, top: "0%" }, grid: { + top:'24%', x: "8%", width: "88%", + bottom:'28%', y: "4%" }, xAxis: { - data: newData.category, + data: newData.chart_x, axisLine: { lineStyle: { - color: "#B4B4B4" + color: "#0735a2" } }, + axisLabel: { + interval:0, + rotate:20, + fontSize:10, + fontFamily: 'Microsoft YaHei' +}, axisTick: { show: false } }, yAxis: [ { - splitLine: { show: false }, + name:'%', axisLine: { - lineStyle: { - color: "#B4B4B4" - } - }, - +show: false, // 是否显示坐标轴轴线 +}, +splitLine: { +show: true, // 是否显示网格线 +lineStyle: { +color: '#0735a2', // 网格线颜色 +width: 1, // 网格线的宽度 +type: 'dashed' // 网格线类型 +} +}, axisLabel: { - formatter: "{value} " - } - }, - { - splitLine: { show: false }, - axisLine: { - lineStyle: { - color: "#B4B4B4" - } - }, - axisLabel: { - formatter: "{value} " + formatter: "{value}" } } ], + dataZoom: [{ +show: false, +type: 'slider', +realtime: true, +startValue: newData.start, +endValue: newData.end, +xAxisIndex: [0], +bottom: '10', +left: '30', +height: 10, +borderColor: 'rgba(0,0,0,0)', +textStyle: { color: '#05D5FF' } +}], series: [ { - name: "贯通率", - type: "line", - smooth: true, - showAllSymbol: true, - symbol: "emptyCircle", - symbolSize: 8, - yAxisIndex: 1, - itemStyle: { - normal: { - color: "#F02FC2" - } - }, - data: newData.rateData - }, - { - name: "已贯通", + name: "", type: "bar", barWidth: 10, itemStyle: { @@ -119,26 +133,17 @@ export default { ]) } }, - data: newData.barData - }, - { - name: "计划贯通", - type: "bar", - barGap: "-100%", - barWidth: 10, - itemStyle: { - normal: { - barBorderRadius: 5, - color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [ - { offset: 0, color: "rgba(156,107,211,0.8)" }, - { offset: 0.2, color: "rgba(156,107,211,0.5)" }, - { offset: 1, color: "rgba(156,107,211,0.2)" } - ]) - } - }, - z: -12, - data: newData.lineData + label: { + show: true, //开启显示 + position: 'top', //在上方显示 + textStyle: { //数值样式 + color: 'pink',//字体颜色 + fontSize: 10//字体大小 } + }, + data: newData.chart_y + }, + ] } }, diff --git a/src/components/echart/bottom/bottomLeftChart/index.vue b/src/components/echart/bottom/bottomLeftChart/index.vue index 1a78ba5..218a284 100644 --- a/src/components/echart/bottom/bottomLeftChart/index.vue +++ b/src/components/echart/bottom/bottomLeftChart/index.vue @@ -7,116 +7,12 @@ \ No newline at end of file diff --git a/src/components/echart/bottom/bottomLeftChart1/index.vue b/src/components/echart/bottom/bottomLeftChart1/index.vue new file mode 100644 index 0000000..218a284 --- /dev/null +++ b/src/components/echart/bottom/bottomLeftChart1/index.vue @@ -0,0 +1,37 @@ + + + + + \ No newline at end of file diff --git a/src/components/echart/bottom/bottomLeftChart2/chart.vue b/src/components/echart/bottom/bottomLeftChart2/chart.vue new file mode 100644 index 0000000..b0847ff --- /dev/null +++ b/src/components/echart/bottom/bottomLeftChart2/chart.vue @@ -0,0 +1,153 @@ + + + \ No newline at end of file diff --git a/src/components/echart/bottom/bottomLeftChart2/index.vue b/src/components/echart/bottom/bottomLeftChart2/index.vue new file mode 100644 index 0000000..218a284 --- /dev/null +++ b/src/components/echart/bottom/bottomLeftChart2/index.vue @@ -0,0 +1,37 @@ + + + + + \ No newline at end of file diff --git a/src/components/echart/bottom/bottomLeftChartsb/chart.vue b/src/components/echart/bottom/bottomLeftChartsb/chart.vue new file mode 100644 index 0000000..eda6f51 --- /dev/null +++ b/src/components/echart/bottom/bottomLeftChartsb/chart.vue @@ -0,0 +1,173 @@ + + + \ No newline at end of file diff --git a/src/components/echart/bottom/bottomLeftChartsb/index.vue b/src/components/echart/bottom/bottomLeftChartsb/index.vue new file mode 100644 index 0000000..218a284 --- /dev/null +++ b/src/components/echart/bottom/bottomLeftChartsb/index.vue @@ -0,0 +1,37 @@ + + + + + \ No newline at end of file diff --git a/src/components/echart/center/centerChartRate/index.vue b/src/components/echart/center/centerChartRate/index.vue index ddc1210..71650ae 100644 --- a/src/components/echart/center/centerChartRate/index.vue +++ b/src/components/echart/center/centerChartRate/index.vue @@ -4,8 +4,8 @@ @@ -59,7 +59,7 @@ export default { y: "center", textStyle: { color: this.colorObj.textStyle, - fontSize: 16 + fontSize: 25 } }, series: [ @@ -71,7 +71,8 @@ export default { color: this.colorObj.series.color, label: { normal: { - show: false + show: false, + } }, data: [ diff --git a/src/components/echart/center/centerChartRate1/index.vue b/src/components/echart/center/centerChartRate1/index.vue new file mode 100644 index 0000000..8c4b115 --- /dev/null +++ b/src/components/echart/center/centerChartRate1/index.vue @@ -0,0 +1,104 @@ + + + + + \ No newline at end of file diff --git a/src/components/echart/centerLeft/centerLeft1Chart/chart.vue b/src/components/echart/centerLeft/centerLeft1Chart/chart.vue index d600744..48a2109 100644 --- a/src/components/echart/centerLeft/centerLeft1Chart/chart.vue +++ b/src/components/echart/centerLeft/centerLeft1Chart/chart.vue @@ -3,8 +3,8 @@ @@ -29,46 +29,47 @@ export default { watch: { cdata: { handler (newData) { - this.options = { - color: [ - "#37a2da", - "#32c5e9", - "#9fe6b8", - "#ffdb5c", - "#ff9f7f", - "#fb7293", - "#e7bcf3", - "#8378ea" - ], - tooltip: { - trigger: "item", - formatter: "{a}
{b} : {c} ({d}%)" - }, - toolbox: { - show: true - }, - calculable: true, - legend: { - orient: "horizontal", - icon: "circle", - bottom: 0, - x: "center", - data: newData.xData, - textStyle: { - color: "#fff" - } - }, - series: [ - { - name: "通过率统计", - type: "pie", - radius: [10, 50], - roseType: "area", - center: ["50%", "40%"], - data: newData.seriesData - } - ] + this.options ={ + title: { + left: 'center' + }, + tooltip: { + trigger: 'item' + }, + legend: { + orient: 'vertical', + right: 0, + top: 0, + }, + series: [ + { + name: '', + type: 'pie', + radius: '50%', + center: ['50%', '50%'], + data: newData.data, + itemStyle: { +normal: { +label: { +show: true, +formatter: '{b} : ({c})' +}, +labelLine: { +show: true +} +} +}, + emphasis: { + itemStyle: { + shadowBlur: 10, + shadowOffsetX: 0, + shadowColor: 'rgba(0, 0, 0, 0.5)' } + } + } + ] +} + }, immediate: true, deep: true diff --git a/src/components/echart/centerLeft/centerLeft1Chart/index.vue b/src/components/echart/centerLeft/centerLeft1Chart/index.vue index 583b417..ea569d0 100644 --- a/src/components/echart/centerLeft/centerLeft1Chart/index.vue +++ b/src/components/echart/centerLeft/centerLeft1Chart/index.vue @@ -1,25 +1,18 @@ diff --git a/src/views/bottomLeft2.vue b/src/views/bottomLeft2.vue new file mode 100644 index 0000000..9fb6948 --- /dev/null +++ b/src/views/bottomLeft2.vue @@ -0,0 +1,55 @@ + + + + + diff --git a/src/views/bottomLeftsb.vue b/src/views/bottomLeftsb.vue new file mode 100644 index 0000000..71616c4 --- /dev/null +++ b/src/views/bottomLeftsb.vue @@ -0,0 +1,55 @@ + + + + + diff --git a/src/views/bottomRight.vue b/src/views/bottomRight.vue index dc86fa6..8b50f3f 100644 --- a/src/views/bottomRight.vue +++ b/src/views/bottomRight.vue @@ -1,22 +1,116 @@ - \ No newline at end of file diff --git a/src/views/bottomRightjichu.vue b/src/views/bottomRightjichu.vue new file mode 100644 index 0000000..b03864a --- /dev/null +++ b/src/views/bottomRightjichu.vue @@ -0,0 +1,195 @@ + + + + + \ No newline at end of file diff --git a/src/views/bottomRightzuzhuang.vue b/src/views/bottomRightzuzhuang.vue new file mode 100644 index 0000000..0bd99db --- /dev/null +++ b/src/views/bottomRightzuzhuang.vue @@ -0,0 +1,196 @@ + + + + + \ No newline at end of file diff --git a/src/views/center.vue b/src/views/center.vue index d4b6d9e..e79f927 100644 --- a/src/views/center.vue +++ b/src/views/center.vue @@ -1,48 +1,53 @@