Merge branch 'et86-black' into uat

@@ -38,7 +38,6 @@
   "dependencies": {
     "axios": "0.21.1",
     "core-js": "3.8.3",
-    "echarts": "^5.4.3",
     "element-ui": "2.15.3",
     "sortablejs": "^1.15.0",
     "vue": "2.6.14",

-// echarts按需引入
-// 引入 echarts API
-import * as echarts from "echarts/core";
-// 引入echarts图表类型
-import { BarChart } from "echarts/charts";
-// 引入echarts图表配置项
-import {
-  GridComponent,
-  PolarComponent,
-  GeoComponent,
-  SingleAxisComponent,
-  ParallelComponent,
-  CalendarComponent,
-  GraphicComponent,
-  ToolboxComponent,
-  TooltipComponent,
-  AxisPointerComponent,
-  BrushComponent,
-  TitleComponent,
-  TimelineComponent,
-  MarkPointComponent,
-  MarkLineComponent,
-  MarkAreaComponent,
-  LegendComponent,
-  DataZoomComponent,
-  DataZoomInsideComponent,
-  DataZoomSliderComponent,
-  VisualMapComponent,
-  VisualMapContinuousComponent,
-  VisualMapPiecewiseComponent,
-  AriaComponent,
-  DatasetComponent,
-  TransformComponent,
-} from "echarts/components";
-// 引入 Canvas 渲染器渲染
-import { CanvasRenderer } from "echarts/renderers";
-// 将以上引入的组件使用use()方法注册
-echarts.use([
-  BarChart,
-  GridComponent,
-  PolarComponent,
-  GeoComponent,
-  SingleAxisComponent,
-  ParallelComponent,
-  CalendarComponent,
-  GraphicComponent,
-  ToolboxComponent,
-  TooltipComponent,
-  AxisPointerComponent,
-  BrushComponent,
-  TitleComponent,
-  TimelineComponent,
-  MarkPointComponent,
-  MarkLineComponent,
-  MarkAreaComponent,
-  LegendComponent,
-  DataZoomComponent,
-  DataZoomInsideComponent,
-  DataZoomSliderComponent,
-  VisualMapComponent,
-  VisualMapContinuousComponent,
-  VisualMapPiecewiseComponent,
-  AriaComponent,
-  DatasetComponent,
-  TransformComponent,
-  CanvasRenderer,
-]);
-export default echarts;

-<template>
-  <div ref="barEcharts" class="yl-echarts-container bar-echarts"></div>
-</template>
-<script>
-import { optionBar } from "./optionConfig"
-export default {
-  data() {
-    return {};
-  },
-  computed: {},
-  watch: {},
-  created() {},
-  mounted() {
-    // 初始化echarts实例
-    const myChart = this.$echarts.init(this.$refs.barEcharts);
-    console.log(myChart);
-    // 绘制图表
-    myChart.setOption(optionBar);
-  },
-  methods: {},
-};
-</script>
-<style lang='scss'>
-.yl-echarts-container{
-  // height: 200px;
-}
-</style>

-export const optionBar = {
-  xAxis: {
-    type: "category",
-    data: ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
-  },
-  yAxis: {
-    type: "value",
-  },
-  series: [
-    {
-      data: [120, 200, 150, 80, 70, 110, 130],
-      type: "bar",
-      showBackground: true,
-      backgroundStyle: {
-        color: "rgba(180, 180, 180, 0.2)",
-      },
-    },
-  ],
-};

@@ -27,7 +27,6 @@ import tableHeaders from '@/assets/languages/tableHeaders'
 import dictLabels from "@/assets/languages/dictLabels.js"
 import settings from './settings.js'
 import * as filters from "./utils/filters.js";
-import echarts from "@/assets/languages/echarts";
 
 // 全局方法挂载
 Vue.prototype.parseTime = parseTime
@@ -44,7 +43,6 @@ Vue.prototype.isArray = isArray
 Vue.prototype.tableHeaders = tableHeaders
 Vue.prototype.dictLabels = dictLabels
 Vue.prototype.settings = settings
-Vue.prototype.$echarts = echarts;
 Vue.prototype.msgSuccess = function (msg) {
   this.$message({ showClose: true, message: msg, type: "success" });
 }

@@ -74,11 +74,9 @@
 <script>
 import Chart from '@/components/echarts/echarts-series.vue'
 import { findDmPreMdeCondition, findPreMdeReport } from "@/api/preMdeConfig";
-// import YlEchartsBar from "@/components/YlEcharts/YlEchartsBar"
 export default {
     components: {
         Chart,
-        // YlEchartsBar
     },
     data() {
         return {