diff --git a/src/assets/images/hygiene/center_title_1.png b/src/assets/images/hygiene/center_title_1.png new file mode 100644 index 0000000..21bf2c1 Binary files /dev/null and b/src/assets/images/hygiene/center_title_1.png differ diff --git a/src/assets/images/hygiene/center_title_2.png b/src/assets/images/hygiene/center_title_2.png new file mode 100644 index 0000000..d5ded56 Binary files /dev/null and b/src/assets/images/hygiene/center_title_2.png differ diff --git a/src/assets/images/hygiene/left_title_1.png b/src/assets/images/hygiene/left_title_1.png new file mode 100644 index 0000000..930dda6 Binary files /dev/null and b/src/assets/images/hygiene/left_title_1.png differ diff --git a/src/assets/images/hygiene/left_title_2.png b/src/assets/images/hygiene/left_title_2.png new file mode 100644 index 0000000..87a426b Binary files /dev/null and b/src/assets/images/hygiene/left_title_2.png differ diff --git a/src/assets/images/hygiene/left_title_3.png b/src/assets/images/hygiene/left_title_3.png new file mode 100644 index 0000000..a18219d Binary files /dev/null and b/src/assets/images/hygiene/left_title_3.png differ diff --git a/src/assets/images/hygiene/right_title_1.png b/src/assets/images/hygiene/right_title_1.png new file mode 100644 index 0000000..df2b833 Binary files /dev/null and b/src/assets/images/hygiene/right_title_1.png differ diff --git a/src/assets/images/hygiene/right_title_2.png b/src/assets/images/hygiene/right_title_2.png new file mode 100644 index 0000000..01a8285 Binary files /dev/null and b/src/assets/images/hygiene/right_title_2.png differ diff --git a/src/assets/images/hygiene/right_title_3.png b/src/assets/images/hygiene/right_title_3.png new file mode 100644 index 0000000..a69035e Binary files /dev/null and b/src/assets/images/hygiene/right_title_3.png differ diff --git a/src/assets/images/hygiene/shang.png b/src/assets/images/hygiene/shang.png new file mode 100644 index 0000000..06b4cc4 Binary files /dev/null and b/src/assets/images/hygiene/shang.png differ diff --git a/src/assets/images/hygiene/shang_left.png b/src/assets/images/hygiene/shang_left.png new file mode 100644 index 0000000..221bc61 Binary files /dev/null and b/src/assets/images/hygiene/shang_left.png differ diff --git a/src/assets/images/hygiene/table_bg.png b/src/assets/images/hygiene/table_bg.png new file mode 100644 index 0000000..fcaf4f2 Binary files /dev/null and b/src/assets/images/hygiene/table_bg.png differ diff --git a/src/assets/images/hygiene/xia.png b/src/assets/images/hygiene/xia.png new file mode 100644 index 0000000..ec0194d Binary files /dev/null and b/src/assets/images/hygiene/xia.png differ diff --git a/src/assets/images/hygiene/xia_right.png b/src/assets/images/hygiene/xia_right.png new file mode 100644 index 0000000..fdf8f24 Binary files /dev/null and b/src/assets/images/hygiene/xia_right.png differ diff --git a/src/assets/images/hygiene/yb_1.png b/src/assets/images/hygiene/yb_1.png new file mode 100644 index 0000000..adddbb9 Binary files /dev/null and b/src/assets/images/hygiene/yb_1.png differ diff --git a/src/assets/images/hygiene/yb_1_1.png b/src/assets/images/hygiene/yb_1_1.png new file mode 100644 index 0000000..c8c006f Binary files /dev/null and b/src/assets/images/hygiene/yb_1_1.png differ diff --git a/src/assets/images/hygiene/yb_2.png b/src/assets/images/hygiene/yb_2.png new file mode 100644 index 0000000..665ac47 Binary files /dev/null and b/src/assets/images/hygiene/yb_2.png differ diff --git a/src/assets/images/hygiene/yb_2_1.png b/src/assets/images/hygiene/yb_2_1.png new file mode 100644 index 0000000..7a20fca Binary files /dev/null and b/src/assets/images/hygiene/yb_2_1.png differ diff --git a/src/view/echarts_education/pieRose.vue b/src/view/echarts_education/pieRose.vue index 71a4c89..d20b300 100644 --- a/src/view/echarts_education/pieRose.vue +++ b/src/view/echarts_education/pieRose.vue @@ -9,48 +9,93 @@ import * as echarts from "echarts"; const chart = ref(); // 创建DOM引用 +var colors = [ + '#4EC2FF', + '#FF805C', + '#12F7D5', + '#268FFF', + '#FFE986' +] + var data = [ { - name: '农业专业合作社', - value: 7 + name: '正常', + value: 17 }, { - name: '农业企业', - value: 6 + name: '关注', + value: 16 }, { - name: '农业冷藏冷库', + name: '追踪', value: 14 }, { - name: '农业园区', - value: 4 + name: '异常', + value: 8 + }, + { + name: '警戒', + value: 8 } ]; let option = { + color: colors, + legend: { + orient: 'vertical', + top: 'center', + right: '6%', + icon: "circle", + itemGap: 20, + itemWidth: 10, + itemHeight: 10, + textStyle: { + color: '#fff', + fontSize: 18 + }, + formatter: function (name) { + var target; + for (var i = 0, l = data.length; i < l; i++) { + if (data[i].name == name) { + target = data[i].value; + } + } + + return ` ${name} ${target} `; + }, + }, + tooltip: { + trigger: 'item', + formatter: '{a}
{b} : {c} ({d}%)' + }, series: [ + + /*内心原型图,展示整体数据概览*/ + { + name: '测评分析', + type: 'pie', + radius: ['20%', '70%'], + center: ['30%', '50%'], + roseType: 'radius', + minShowLabelAngle: 30, + label: { + show: false, + }, + data: data + }, // 内圈背景 { type: "pie", - center: ["50%", "50%"], - radius: ["20%", "32%"], + center: ["30%", "50%"], + radius: ["20%", "26%"], hoverAnimation: false, clockWise: false, itemStyle: { normal: { borderWidth: 1, borderColor: "rgba(193, 229, 255, .1)", - color: new echarts.graphic.LinearGradient(1, 1, 1, 0, [ - { - offset: 1, - color: "rgba(127, 242, 255, .2)", - }, - { - offset: 0, - color: "rgba(109, 195, 255, 0)", - }, - ]), + color: 'rgba(14, 59, 123, 0.60)' }, }, tooltip: { @@ -61,39 +106,6 @@ let option = { }, data: [100], }, - /*内心原型图,展示整体数据概览*/ - { - name: '半径模式', - type: 'pie', - radius: ['20%', '50%'], - center: ['35%', '50%'], - roseType: 'radius', - minShowLabelAngle: 60, - label: { - show: true, - normal: { - position: 'outside', - fontSize: 16, - formatter: (params) => { - return ( - params.name + - // '(' + - // ((params.value / total) * 100).toFixed(2) + - // '%)' + - // '\n' + - params.value + - '个' - ); - } - } - }, - labelLine: { - length: 1, - length2: 10, - smooth: true - }, - data: data - } ] }; diff --git a/src/view/echarts_hygiene/bubble.vue b/src/view/echarts_hygiene/bubble.vue deleted file mode 100644 index 5e5f966..0000000 --- a/src/view/echarts_hygiene/bubble.vue +++ /dev/null @@ -1,150 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/view/echarts_hygiene/eP2.vue b/src/view/echarts_hygiene/eP2.vue new file mode 100644 index 0000000..32a8ed6 --- /dev/null +++ b/src/view/echarts_hygiene/eP2.vue @@ -0,0 +1,159 @@ + + + + + diff --git a/src/view/echarts_hygiene/eP3.vue b/src/view/echarts_hygiene/eP3.vue new file mode 100644 index 0000000..7a3ebd5 --- /dev/null +++ b/src/view/echarts_hygiene/eP3.vue @@ -0,0 +1,207 @@ + + + + + \ No newline at end of file diff --git a/src/view/echarts_hygiene/eP4.vue b/src/view/echarts_hygiene/eP4.vue new file mode 100644 index 0000000..83250eb --- /dev/null +++ b/src/view/echarts_hygiene/eP4.vue @@ -0,0 +1,149 @@ + + + + + \ No newline at end of file diff --git a/src/view/echarts_hygiene/eP5.vue b/src/view/echarts_hygiene/eP5.vue new file mode 100644 index 0000000..7540f39 --- /dev/null +++ b/src/view/echarts_hygiene/eP5.vue @@ -0,0 +1,146 @@ + + + + + \ No newline at end of file diff --git a/src/view/echarts_hygiene/eP6.vue b/src/view/echarts_hygiene/eP6.vue new file mode 100644 index 0000000..76dc00f --- /dev/null +++ b/src/view/echarts_hygiene/eP6.vue @@ -0,0 +1,123 @@ + + + + + \ No newline at end of file diff --git a/src/view/echarts_hygiene/eP7.vue b/src/view/echarts_hygiene/eP7.vue new file mode 100644 index 0000000..baad6cf --- /dev/null +++ b/src/view/echarts_hygiene/eP7.vue @@ -0,0 +1,208 @@ + + + + + \ No newline at end of file diff --git a/src/view/echarts_hygiene/pie.vue b/src/view/echarts_hygiene/pie.vue new file mode 100644 index 0000000..e743c70 --- /dev/null +++ b/src/view/echarts_hygiene/pie.vue @@ -0,0 +1,165 @@ + + + + + \ No newline at end of file diff --git a/src/view/echarts_hygiene/pie2.vue b/src/view/echarts_hygiene/pie2.vue new file mode 100644 index 0000000..9ca95a7 --- /dev/null +++ b/src/view/echarts_hygiene/pie2.vue @@ -0,0 +1,122 @@ + + + + + \ No newline at end of file diff --git a/src/view/education.vue b/src/view/education.vue index b67580f..e9b66f3 100644 --- a/src/view/education.vue +++ b/src/view/education.vue @@ -21,13 +21,8 @@
- - + +
@@ -804,7 +799,7 @@ const options = [ } .selectLint { - width: 100%; + width: 94%; display: flex; margin: 30px 0 10px; justify-content: space-between; @@ -822,20 +817,19 @@ const options = [ .el-select--large .el-select__wrapper { font-size: 18px !important; } + .el-select__wrapper { background-color: rgba(255, 255, 255, 0) !important; + } + .el-select__placeholder { color: #fff !important; } + .el-select__caret { color: #fff !important; font-size: 18px !important; } - .el-select-dropdown__item { - color: #fff !important; - } - .el-select-dropdown__wrap { - } } diff --git a/src/view/hygiene.vue b/src/view/hygiene.vue index ca3956f..f954aeb 100644 --- a/src/view/hygiene.vue +++ b/src/view/hygiene.vue @@ -1,273 +1,315 @@