diff --git a/new-digital-agriculture-screen/src/assets/images/inputs/order.webp b/new-digital-agriculture-screen/src/assets/images/inputs/order.webp
new file mode 100644
index 0000000..eeb19c4
Binary files /dev/null and b/new-digital-agriculture-screen/src/assets/images/inputs/order.webp differ
diff --git a/new-digital-agriculture-screen/src/assets/images/inputs/order2x.webp b/new-digital-agriculture-screen/src/assets/images/inputs/order2x.webp
new file mode 100644
index 0000000..cee5ff6
Binary files /dev/null and b/new-digital-agriculture-screen/src/assets/images/inputs/order2x.webp differ
diff --git a/new-digital-agriculture-screen/src/components/custom-echart-hyaline-cake/index.vue b/new-digital-agriculture-screen/src/components/custom-echart-hyaline-cake/index.vue
index 1164fa9..0a25acf 100644
--- a/new-digital-agriculture-screen/src/components/custom-echart-hyaline-cake/index.vue
+++ b/new-digital-agriculture-screen/src/components/custom-echart-hyaline-cake/index.vue
@@ -259,6 +259,7 @@ export default {
             },
           },
           legend: {
+            type: 'scroll',
             show: true,
             right: '5%',
             top: '25%',
diff --git a/new-digital-agriculture-screen/src/components/custom-echart-hyaline-cake/new-hyaline-cake.vue b/new-digital-agriculture-screen/src/components/custom-echart-hyaline-cake/new-hyaline-cake.vue
index 2f39c56..7d645ea 100644
--- a/new-digital-agriculture-screen/src/components/custom-echart-hyaline-cake/new-hyaline-cake.vue
+++ b/new-digital-agriculture-screen/src/components/custom-echart-hyaline-cake/new-hyaline-cake.vue
@@ -4,11 +4,15 @@
 
 <script setup>
 import { ref, watch, onMounted, nextTick } from 'vue';
-import { cloneDeep } from 'lodash';
+import { merge, cloneDeep } from 'lodash';
 import { useEcharts } from '@/hooks/useEcharts';
 
 defineOptions({ name: 'NewHyalineCake' });
 
+// 记录当前选中和高亮的系列索引
+let selectedIndex = null;
+let hoveredIndex = null;
+
 // 定义组件 props
 const props = defineProps({
   chartData: {
@@ -23,18 +27,13 @@ const props = defineProps({
   option: {
     type: Object,
     default: () => ({
-      // 控制内外径关系的系数，1 表示无内径（实心饼），值越小内径越大
-      k: 1,
-      // 扇形边缘向外偏移距离比例（用于选中效果），单位视图坐标，可调
-      itemGap: 0.2,
-      // 扇形高度（影响z轴拉伸程度）
-      itemHeight: 120,
-      // 自动计算扇形高度时使用的系数（>0时 itemHeight 失效，使用 autoItemHeight * value ）
-      autoItemHeight: 0,
-      // 透明度设置
-      opacity: 0.6,
-      // 图例后缀
-      legendSuffix: '',
+      k: 1, // 控制内外径关系的系数，1 表示无内径（实心饼），值越小内径越大
+      itemGap: 0.1, // 扇形边缘向外偏移距离比例（用于选中效果）,扇形的间距，单位视图坐标，可调
+      itemHeight: 120, // 扇形高度（影响z轴拉伸程度）
+      autoItemHeight: 0, // 自动计算扇形高度时使用的系数（>0时 itemHeight 失效，使用 autoItemHeight * value ）
+      opacity: 0.6, // 透明度设置
+      legendSuffix: '', // 图例后缀
+      // TODO series
     }),
   },
   width: {
@@ -58,8 +57,19 @@ const { setOptions, getInstance } = useEcharts(chartRef);
 // 存储当前的 ECharts 配置项
 const chartOption = ref({});
 
-// 参数方程函数：生成每个扇形曲面的参数方程，用于 series-surface.parametricEquation
-function getParametricEquation(startRatio, endRatio, isSelected, isHovered, k, h) {
+/**
+ * 获取 parametric 曲面方程
+ * @param {Number} startRatio 起点弧度
+ * @param {Number} endRatio 终点弧度
+ * @param {Boolean} isSelected 是否选中
+ * @param {Boolean} isHovered 是否高亮
+ * @param {Number} k 饼图内径/外径的占比
+ * @param {Number} h 饼图高度
+ * @param {Array} offsetZ 浮动系数
+ * @return {Object} parametric 曲面方程
+ */
+function getParametricEquation(startRatio, endRatio, isSelected, isHovered, k, h, offsetZ = 0) {
+  console.log('getParametricEquation params :>> ', startRatio, endRatio, isSelected, isHovered, k, h, offsetZ);
   // 中心弧度用于计算偏移方向
   const midRatio = (startRatio + endRatio) / 2;
   const startRadian = startRatio * Math.PI * 2;
@@ -70,7 +80,7 @@ function getParametricEquation(startRatio, endRatio, isSelected, isHovered, k, h
   if (startRatio === 0 && endRatio === 1) {
     isSelected = false;
   }
-  // k 取默认值 1/3（环的厚度比例），如果传入 k 则使用传入值
+  // k 取默认值 1/3（扇形内径/外径），如果传入 k 则使用传入值
   k = typeof k !== 'undefined' ? k : 1 / 3;
 
   // 计算选中效果的偏移量（基于扇形中心角度）
@@ -117,200 +127,241 @@ function getParametricEquation(startRatio, endRatio, isSelected, isHovered, k, h
     z(u, v) {
       // 在 u < -π/2 时，防止出现不必要的翻转，直接使用基本正弦
       if (u < -Math.PI * 0.5) {
-        return Math.sin(u);
+        return Math.sin(u) + offsetZ * h * 0.1;
       }
       // 在 u > 2.5π 时，处理扇形尾部厚度
       if (u > Math.PI * 2.5) {
-        return Math.sin(u) * h * 0.1;
+        return Math.sin(u) * h * 0.1 + offsetZ * h * 0.1;
       }
       // 正常情况下，z 根据 v 参数控制上下表面的高度差
       // 当前图形的高度是Z根据h（每个value的值决定的）
-      return Math.sin(v) > 0 ? 1 * h * 0.1 : -1;
+      return Math.sin(v) > 0 ? 1 * h * 0.1 + offsetZ * h * 0.1 : -1 + offsetZ * h * 0.1;
     },
   };
 }
 
-// 生成整个 3D 饼图的配置项
-function getPie3D(pieData) {
+/**
+ * 获取 3D 饼图的配置项
+ * @param {Array} pieData 饼图数据
+ * @param {Number} internalDiameterRatio 饼图内径/外径的占比
+ * @return {Object} 配置项
+ */
+function getPie3D(pieData, internalDiameterRatio) {
   const series = [];
   let sumValue = 0;
-  // 计算总值
-  pieData.forEach((item) => {
-    sumValue += item.value;
-  });
+  let startValue = 0;
+  let endValue = 0;
+  const legendData = [];
 
-  // k 为外径厚度系数
-  const k = props.option.k ?? 1;
+  const k = typeof internalDiameterRatio !== 'undefined' ? (1 - internalDiameterRatio) / (1 + internalDiameterRatio) : 1 / 3;
+
+  // 计算总值
+  // pieData.forEach((item) => {
+  //   sumValue += item.value;
+  // });
   // 构建每个扇形的 series 数据
-  pieData.forEach((dataItem, idx) => {
+  for (let i = 0; i < pieData.length; i += 1) {
+    sumValue += pieData[i].value;
+
     const seriesItem = {
-      name: dataItem.name ?? `series${idx}`,
+      name: typeof pieData[i].name === 'undefined' ? `series${i}` : pieData[i].name,
       type: 'surface',
       parametric: true,
       wireframe: { show: false },
-      pieData: dataItem,
-      itemStyle: {
-        opacity: props.option.opacity,
-        borderRadius: 300,
-        borderColor: '#fff',
-        borderWidth: 0,
-      },
+      pieData: pieData[i],
+      // itemStyle: {
+      //   opacity: props.option.opacity,
+      //   borderRadius: 300,
+      //   borderColor: '#fff',
+      // }
       pieStatus: {
-        selected: false,
+        selected: true,
         hovered: false,
         k,
       },
     };
-    // 合并自定义样式（如果有）
-    if (dataItem.itemStyle) {
-      const customStyle = {};
-      if (dataItem.itemStyle.color !== undefined) {
-        customStyle.color = dataItem.itemStyle.color;
-      }
-      if (dataItem.itemStyle.opacity !== undefined) {
-        customStyle.opacity = dataItem.itemStyle.opacity;
-      }
-      seriesItem.itemStyle = { ...seriesItem.itemStyle, ...customStyle };
+    if (typeof pieData[i].itemStyle !== 'undefined') {
+      const { itemStyle } = pieData[i];
+      typeof pieData[i].itemStyle.color !== 'undefined' ? (itemStyle.color = pieData[i].itemStyle.color) : null;
+      typeof pieData[i].itemStyle.opacity !== 'undefined' ? (itemStyle.opacity = pieData[i].itemStyle.opacity) : null;
+
+      seriesItem.itemStyle = itemStyle;
     }
     series.push(seriesItem);
-  });
+  }
+  // 使用上一次遍历时，计算出的数据和 sumValue，调用 getParametricEquation 函数，
+  // 向每个 series-surface 传入不同的参数方程 series-surface.parametricEquation，也就是实现每一个扇形。
+  console.log(series);
+  for (let i = 0; i < series.length; i += 1) {
+    endValue = startValue + series[i].pieData.value;
 
-  // 计算每个扇形的 startRatio/endRatio 和参数方程
-  let startValue = 0;
-  series.forEach((serie) => {
-    const endValue = startValue + serie.pieData.value;
-    const startRatio = startValue / sumValue;
-    const endRatio = endValue / sumValue;
-    serie.pieData.startRatio = startRatio;
-    serie.pieData.endRatio = endRatio;
-    // 初始均为未选中未高亮
-    serie.parametricEquation = getParametricEquation(
-      startRatio,
-      endRatio,
-      false,
-      true,
+    const z = series[i]?.pieData?.floatZ ?? 0;
+    series[i].pieData.startRatio = startValue / sumValue;
+    series[i].pieData.endRatio = endValue / sumValue;
+    series[i].parametricEquation = getParametricEquation(
+      series[i].pieData.startRatio,
+      series[i].pieData.endRatio,
+      series[i].pieStatus.selected,
+      series[i].pieStatus.hovered,
       k,
-      // 扇形高度：根据配置自动计算或使用固定高度
-      props.option.autoItemHeight > 0 ? props.option.autoItemHeight * serie.pieData.value : props.option.itemHeight
+      props.option.autoItemHeight > 0 ? props.option.autoItemHeight * series[i].pieData.value : props.option.itemHeight,
+      z
     );
+
     startValue = endValue;
-  });
-
-  // 添加一个透明圆环，用于实现 hover 在扇形外面时取消高亮
-  series.push({
-    name: 'mouseoutSeries',
-    type: 'surface',
-    parametric: true,
-    wireframe: { show: false },
-    itemStyle: { opacity: 0 },
-    parametricEquation: {
-      u: { min: 0, max: Math.PI * 2, step: Math.PI / 20 },
-      v: { min: 0, max: Math.PI, step: Math.PI / 20 },
-      x(u, v) {
-        return Math.sin(v) * Math.sin(u) + Math.sin(u);
-      },
-      y(u, v) {
-        return Math.sin(v) * Math.cos(u) + Math.cos(u);
-      },
-      z(u, v) {
-        return Math.cos(v) > 0 ? 0.1 : -0.1;
-      },
-    },
-  });
 
+    legendData.push(series[i].name);
+  }
   // 基础配置：坐标轴、视角、图例、提示框等
-  const option = Object.assign(
-    {
-      tooltip: {
-        backgroundColor: 'rgba(18, 55, 85, 0.8)',
-        borderColor: '#35d0c0',
+  // 准备待返回的配置项，把准备好的 legendData、series 传入。
+  const option = {
+    legend: {
+      type: 'scroll',
+      show: true,
+      right: '5%',
+      top: '25%',
+      orient: 'vertical',
+      icon: 'circle',
+      itemHeight: 12,
+      itemWidth: 12,
+      itemGap: 10,
+      textStyle: {
         color: '#fff',
-        position: (point, params, dom, rect, size) => {
-          // 动态调整 tooltip 位置，避免溢出
-          let x = point[0],
-            y = point[1];
-          const [viewW, viewH] = size.viewSize;
-          const [boxW, boxH] = size.contentSize;
-          if (x + boxW > viewW) x -= boxW;
-          if (y + boxH > viewH) y -= boxH;
-          if (x < 0) x = 0;
-          if (y < 0) y = 0;
-          return [x, y];
-        },
-        formatter: (params) => {
-          // 只对非透明环（实际扇形）显示信息
-          if (params.seriesName !== 'mouseoutSeries') {
-            return `
-            <span style="color:#FFF">
-              ${params.seriesName}<br/>
-              <span style="
-                display:inline-block;
-                margin-right:5px;
-                border-radius:10px;
-                width:10px;
-                height:10px;
-                background-color:${params.color};"></span>
-              ${chartOption.value.series[params.seriesIndex].pieData.value}
-            </span>`;
-          }
-          return '';
-        },
+        fontSize: 14,
+        fontWeight: '400',
       },
-      xAxis3D: { min: -1, max: 1 },
-      yAxis3D: { min: -1, max: 1 },
-      zAxis3D: { min: -1, max: 1 },
-      grid3D: {
-        show: false,
-        boxHeight: 5,
-        top: '0',
-        left: '-20%',
-        viewControl: {
-          // 3D 视角设置
-          alpha: 60, // 俯仰角度
-          distance: 240, // 视角距离
-          rotateSensitivity: 10,
-          zoomSensitivity: 10,
-          panSensitivity: 10,
-          autoRotate: true,
-          autoRotateAfterStill: 2,
-        },
+      formatter: (name) => {
+        if (props.chartData.length) {
+          const item = props.chartData.filter((item) => item.name === name)[0];
+          return `  ${name}      ${item.value}${props.option.legendSuffix ?? ''}`;
+        }
       },
-      legend: {
-        show: true,
-        selectedMode: false,
-        right: '5%',
-        top: '25%',
-        orient: 'vertical',
-        icon: 'circle',
-        itemHeight: 12,
-        itemWidth: 12,
-        itemGap: 10,
-        textStyle: {
-          color: '#fff',
-          fontSize: 14,
-          fontWeight: '400',
-        },
-        // 图例标签显示名称和数值
-        formatter: (name) => {
-          const item = props.chartData.find((d) => d.name === name);
-          return item ? `  ${name}      ${item.value}${props.option.legendSuffix || ''}` : name;
-        },
-      },
-      series,
     },
-    // 将外部配置项覆盖基础配置
-    props.option
-  );
-
+    // animation: false,
+    tooltip: {
+      formatter: (params) => {
+        if (params.seriesName !== 'mouseoutSeries') {
+          return `${
+            params.seriesName
+          }<br/><span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:${
+            params.color
+          };"></span>${option.series[params.seriesIndex].pieData.value}`;
+        }
+        return '';
+      },
+    },
+    xAxis3D: {
+      min: -1,
+      max: 1,
+    },
+    yAxis3D: {
+      min: -1,
+      max: 1,
+    },
+    zAxis3D: {
+      min: -1,
+      max: 1,
+    },
+    grid3D: {
+      show: true,
+      boxHeight: 5,
+      top: '-20%',
+      viewControl: {
+        // 3d效果可以放大、旋转等，请自己去查看官方配置
+        alpha: 35,
+        // beta: 30,
+        rotateSensitivity: 1,
+        zoomSensitivity: 0,
+        panSensitivity: 0,
+        autoRotate: true,
+        distance: 150,
+      },
+      // 后处理特效可以为画面添加高光、景深、环境光遮蔽（SSAO）、调色等效果。可以让整个画面更富有质感。
+      postEffect: {
+        // 配置这项会出现锯齿，请自己去查看官方配置有办法解决
+        enable: false,
+        bloom: {
+          enable: true,
+          bloomIntensity: 0.1,
+        },
+        SSAO: {
+          enable: true,
+          quality: 'medium',
+          radius: 2,
+        },
+        // temporalSuperSampling: {
+        //   enable: true,
+        // },
+      },
+    },
+    series,
+  };
   return option;
 }
 
+// 监听 mouseover，近似实现高亮（放大）效果
+function handleMouseover(params) {
+  console.log('mouseover');
+  const idx = params.seriesIndex;
+  const series = chartOption.value.series;
+
+  // 如果当前扇形已经高亮，不做任何操作
+  if (hoveredIndex === idx) return;
+
+  // 1. 取消上一个高亮
+  if (hoveredIndex !== null && hoveredIndex >= 0 && series[hoveredIndex]) {
+    updateSeriesHover(hoveredIndex, false);
+  }
+
+  // 2. 设置当前扇形高亮（排除辅助环）
+  if (params.seriesName !== 'mouseoutSeries' && series[idx]) {
+    updateSeriesHover(idx, true);
+    hoveredIndex = idx;
+  } else {
+    hoveredIndex = null;
+  }
+
+  // 3. 重新渲染
+  setOptions(chartOption.value);
+}
+
+function handleGlobalout() {
+  const idx = hoveredIndex;
+  if (idx !== null && idx >= 0 && chartOption.value.series[idx]) {
+    updateSeriesHover(idx, false);
+    hoveredIndex = null;
+    setOptions(chartOption.value);
+  }
+}
+
+// 抽取高亮／取消高亮的公共逻辑
+function updateSeriesHover(index, toHover) {
+  const item = chartOption.value.series[index];
+  // 安全取 pieStatus，fallback 到空对象
+  const status = item.pieStatus || {};
+  const isSelected = !!status.selected;
+  const start = item.pieData?.startRatio ?? 0;
+  const end = item.pieData?.endRatio ?? 1;
+  const k = typeof status.k === 'number' ? status.k : 1 / 3;
+  // 计算 newHeight：如果 hover，则加 5，否则按原 height
+  const baseHeight = props.option.autoItemHeight > 0 ? props.option.autoItemHeight : props.option.itemHeight;
+  const newHeight = toHover ? baseHeight + 5 : baseHeight;
+  // 更新 parametricEquation
+  item.parametricEquation = getParametricEquation(start, end, isSelected, toHover, k, newHeight);
+  // 更新状态
+  item.pieStatus = {
+    ...status,
+    hovered: toHover,
+  };
+}
+
 // 初始化图表
 function initChart() {
-  // 生成基础的3D饼图配置
-  const baseOption = getPie3D(props.chartData);
+  // 生成基础的3D饼图配置(也就是默认的配置)
+  const baseOption = getPie3D(props.chartData, props.option.k);
   // 合并用户配置，确保不修改原始对象
-  const finalOption = Object.assign({}, baseOption, cloneDeep(props.option || {}));
+  // const finalOption = Object.assign({}, baseOption, cloneDeep(props.option || {}));
+  const finalOption = merge({}, baseOption, cloneDeep(props.option || {}));
   chartOption.value = finalOption;
   // 设置图表配置
   setOptions(chartOption.value);
@@ -323,11 +374,11 @@ function initChart() {
     }
 
     // 避免重复绑定事件
-    chart.off('click');
+    // chart.off('click');
     chart.off('mouseover');
     chart.off('globalout');
 
-    chart.on('click', handleClick);
+    // chart.on('click', handleClick);
     chart.on('mouseover', handleMouseover);
     chart.on('globalout', handleGlobalout);
   });
@@ -380,95 +431,6 @@ window.debugZValues = {
   current: null,
   history: [],
 };
-function handleMouseover(params) {
-  if (params.seriesName === 'mouseoutSeries') return;
-
-  const chart = getInstance();
-  const optionVal = chart.getOption(); // 改用实时获取最新配置
-  const series = optionVal.series;
-  const idx = params.seriesIndex;
-  const hh = series[idx].parametricEquation.z();
-  window.debugZValues.current = hh;
-  window.debugZValues.history.push({
-    event: 'mouseover',
-    series: series[idx].name,
-    zValue: hh,
-    time: new Date().toISOString(),
-  });
-  console.log('当前Z值:', hh, '历史记录:', window.debugZValues.history);
-  // 打印移入前的完整状态（调试用）
-  console.log(
-    '[移入] 当前所有扇形状态',
-    series.map((s) => ({
-      name: s.name,
-      hovered: s.pieStatus?.hovered,
-      selected: s.pieStatus?.selected,
-      height: s.parametricEquation?.z(Math.PI, Math.PI),
-    }))
-  );
-
-  // 取消之前的高亮（确保只修改状态，不破坏参数方程）
-  if (hoveredIndex !== null && hoveredIndex !== idx) {
-    const prev = series[hoveredIndex];
-    prev.pieStatus.hovered = false; // 仅修改状态
-    prev.parametricEquation = getParametricEquation(
-      // 重新生成正确方程
-      prev.pieData.startRatio,
-      prev.pieData.endRatio,
-      prev.pieStatus.selected,
-      false, // isHovered=false
-      prev.pieStatus.k,
-      prev.pieData.value
-    );
-  }
-
-  // 设置新高亮
-  const current = series[idx];
-  current.pieStatus.hovered = true;
-  current.parametricEquation = getParametricEquation(
-    current.pieData.startRatio,
-    current.pieData.endRatio,
-    current.pieStatus.selected,
-    true, // isHovered=true
-    current.pieStatus.k,
-    current.pieData.value
-  );
-
-  hoveredIndex = idx;
-  chart.setOption({ series }); // 仅更新series部分
-}
-function handleGlobalout() {
-  if (hoveredIndex !== null) {
-    const chart = getInstance();
-    const optionVal = chart.getOption();
-    const series = optionVal.series;
-    const prev = series[hoveredIndex];
-
-    // 打印修复前的错误状态（调试用）
-    console.warn('[修复前] 异常状态', {
-      name: prev.name,
-      z: prev.parametricEquation.z(Math.PI, Math.PI),
-      equation: prev.parametricEquation,
-    });
-
-    // 重置状态并重新生成方程
-    prev.pieStatus.hovered = false;
-    prev.parametricEquation = getParametricEquation(
-      prev.pieData.startRatio,
-      prev.pieData.endRatio,
-      prev.pieStatus.selected,
-      false, // isHovered=false
-      prev.pieStatus.k,
-      prev.pieData.value
-    );
-
-    hoveredIndex = null;
-    chart.setOption({ series }, { replaceMerge: 'series' }); // 强制替换series
-  }
-}
-// 记录当前选中和高亮的系列索引
-let selectedIndex = null;
-let hoveredIndex = null;
 
 // 组件挂载后绑定事件
 onMounted(() => {
diff --git a/new-digital-agriculture-screen/src/components/custom-echart-line/index.vue b/new-digital-agriculture-screen/src/components/custom-echart-line/index.vue
index 0569d41..c914dcd 100644
--- a/new-digital-agriculture-screen/src/components/custom-echart-line/index.vue
+++ b/new-digital-agriculture-screen/src/components/custom-echart-line/index.vue
@@ -108,35 +108,31 @@ export default {
       }
       let typeArr = Array.from(new Set(props.chartData.map((item) => item.type)));
       let xAxisData = Array.from(new Set(props.chartData.map((item) => item.name)));
-      let seriesData = [];
-      typeArr.forEach((type, index) => {
-        let obj = {
-          name: type,
-          type: props.type,
-          smooth: true,
-        };
-        if (props.option?.color) {
-          obj.areaStyle = setAreaStyle(props.option?.color[index]);
-        }
-        const findItem = props.chartData.find((item) => item.type == type);
-        if (findItem && findItem.color) {
-          obj.color = findItem.color;
-          obj.areaStyle = setAreaStyle(findItem.color[index]);
-        }
-        let data = [];
-        xAxisData.forEach((x) => {
-          let dataArr = props.chartData.filter((item) => type === item.type && item.name == x);
-          if (dataArr && dataArr.length > 0) {
-            data.push(dataArr[0].value);
-          } else {
-            data.push(null);
-          }
+      // 1. 优先使用外部传入的series配置（如果存在）
+      const externalSeries = props.option?.series || [];
+      option.series = typeArr.map((type, index) => {
+        // 2. 合并外部配置（按type匹配）
+        const externalConfig = externalSeries.find((s) => s.name === type) || {};
+
+        // 3. 动态生成数据
+        const data = xAxisData.map((x) => {
+          const item = props.chartData.find((item) => item.type === type && item.name === x);
+          return item ? item.value : null;
         });
-        obj['data'] = data;
-        seriesData.push(obj);
+
+        // 4. 合并配置（外部配置优先，内部生成配置补充）
+        return {
+          type: props.type, // 默认类型
+          name: type, // 必须字段
+          data, // 动态生成的数据
+          smooth: true, // 默认平滑
+          ...externalConfig, // 外部配置覆盖内部默认值
+          // 特殊处理areaStyle（保留您的颜色逻辑）
+          areaStyle: externalConfig.areaStyle || (props.option?.color ? setAreaStyle(props.option.color[index]) : undefined),
+        };
       });
-      option.series = seriesData;
       option.xAxis.data = xAxisData;
+      // console.log(option.series);
       setOptions(option);
       startAutoPlay({
         interval: 2000,
diff --git a/new-digital-agriculture-screen/src/views/inputs/components/inputsFive.vue b/new-digital-agriculture-screen/src/views/inputs/components/inputsFive.vue
index 9756cb0..dc549af 100644
--- a/new-digital-agriculture-screen/src/views/inputs/components/inputsFive.vue
+++ b/new-digital-agriculture-screen/src/views/inputs/components/inputsFive.vue
@@ -1,116 +1,235 @@
 <template>
-  <custom-echart-line :chart-data="state.data" height="100%" :option="state.option" />
+  <custom-echart-line :chart-data="chartData" :option="chartOption" height="100%" />
 </template>
+
 <script setup>
-import { reactive, watch } from 'vue';
-import { isEmpty, sleep } from '@/utils';
+import { ref } from 'vue';
 
-const props = defineProps({
-  data: {
-    type: Array,
-    default: () => [],
-  },
-  query: {
-    type: String,
-    default: '',
-  },
-});
+// 1. 数据生成（12个月完整数据）
+const chartData = ref(
+  (() => {
+    // 定义波动参数
+    const waveConfig = {
+      // [月份索引]: 调整系数 (1.0为基础值)
+      peaks: { 3: 1.6, 9: 1.5 }, // 4月和10月高峰 (数组索引从0开始)
+      valleys: { 0: 0.7, 6: 0.8, 11: 0.6 }, // 1月、7月、12月低谷
+    };
 
-const state = reactive({
-  option: {
-    color: ['#35D0C0'],
-    grid: {
-      left: '5%',
-      right: '5%',
-      bottom: '5%',
-      top: '10%',
-      containLabel: true,
+    // 生成符合波动要求的数据
+    const generateWaveData = (baseVal) => {
+      return Array.from({ length: 12 }, (_, i) => {
+        if (waveConfig.peaks[i]) return baseVal * waveConfig.peaks[i];
+        if (waveConfig.valleys[i]) return baseVal * waveConfig.valleys[i];
+        // 平滑过渡值（在基础值附近波动）
+        return baseVal * (0.9 + Math.random() * 0.2);
+      }).map((v) => parseFloat(v.toFixed(1)));
+    };
+
+    // 各品类基础值
+    return [
+      { type: '种子种苗', values: generateWaveData(15) },
+      { type: '化肥', values: generateWaveData(20) },
+      { type: '农药', values: generateWaveData(10) },
+    ].flatMap(({ type, values }) =>
+      values.map((value, i) => ({
+        type,
+        name: `${i + 1}月`,
+        value,
+      }))
+    );
+  })()
+);
+function hexToRGBA(hex, alpha = 1) {
+  const r = parseInt(hex.slice(1, 3), 16);
+  const g = parseInt(hex.slice(3, 5), 16);
+  const b = parseInt(hex.slice(5, 7), 16);
+  return `rgba(${r}, ${g}, ${b}, ${alpha})`;
+}
+
+// 2. 图表配置
+const chartOption = ref({
+  color: ['#02FD94', '#FEF906', '#01FEFD'],
+  legend: {
+    data: ['种子种苗', '化肥', '农药'],
+    top: 8,
+    itemWidth: 12, // 矩形宽度
+    itemHeight: 12, // 矩形高度
+    icon: 'rect',
+    itemGap: 20,
+  },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: {
+      type: 'shadow',
     },
-    tooltip: {
-      trigger: 'axis',
-      axisPointer: {
-        type: 'shadow',
-      },
-      backgroundColor: 'rgba(18, 55, 85, 0.8);',
-      borderColor: '#35d0c0',
-      formatter: (data) => {
-        const params = data[0];
-        let str = `<div class="custom-echarts-tips">
-          <span>${params.name}</span><br/>
-          <span>${params.marker} ${params.data} 万元</span>
-        </div>`;
-        return str;
-      },
+    backgroundColor: 'rgba(0,0,0,0.5);',
+    borderColor: '#35d0c0',
+    borderRadius: 8,
+    formatter: (params) => `
+      <div style="font-weight:bold;margin-bottom:5px;color:#fff">${params[0].name}</div>
+      ${params
+        .map(
+          (p) => `
+        <div style="display:flex;align-items:center;margin:3px 0;color:#fff">
+          <span style="display:inline-block;width:8px;height:8px;background:${p.color};margin-right:6px;color:#fff"></span>
+          ${p.seriesName}: <span style="font-weight:bold;margin-left:5px;color:#fff">${p.value} 吨</span>
+        </div>
+      `
+        )
+        .join('')}
+    `,
+    extraCssText: 'backdrop-filter: blur(8px);',
+  },
+  grid: {
+    left: '3%',
+    right: '5%',
+    bottom: '5%',
+    top: '20%',
+    containLabel: true,
+  },
+  yAxis: {
+    type: 'value',
+  },
+  xAxis: {
+    type: 'category',
+    boundaryGap: false,
+    axisLabel: {
+      interval: 0,
+      margin: 15,
+      align: 'center',
     },
-    xAxis: {
-      type: 'category',
-      // name: '年份',
-      axisTick: {
-        show: false,
-        alignWithLabel: false,
-        interval: 'auto',
-        inside: false,
-        length: 5,
-        lineStyle: {
-          type: 'solid',
-          width: 1,
-          color: 'rgba(28, 158, 222, 1)',
+    axisTick: {
+      show: false, // 隐藏刻度线
+    },
+  },
+  series: [
+    {
+      name: '种子种苗',
+      type: 'line',
+      smooth: true,
+      symbol: 'none',
+      lineStyle: {
+        width: 2,
+        color: {
+          type: 'linear',
+          x: 0,
+          x2: 1,
+          y: 0,
+          y2: 0,
+          colorStops: [
+            { offset: 0, color: hexToRGBA('#02FD94', 0) },
+            { offset: 0.2, color: hexToRGBA('#02FD94', 1) },
+            { offset: 0.8, color: hexToRGBA('#02FD94', 1) },
+            { offset: 1, color: hexToRGBA('#02FD94', 0) },
+          ],
         },
       },
+      areaStyle: {
+        color: {
+          type: 'linear',
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 1,
+          colorStops: [
+            { offset: 0, color: hexToRGBA('#02FD94', 1) }, // 底部较实
+            { offset: 1, color: hexToRGBA('#02FD94', 0) }, // 顶部较透明
+          ],
+        },
+      },
+
+      emphasis: {
+        focus: 'series',
+      },
     },
-    yAxis: {
-      type: 'value',
-      // name: '',
+    {
+      name: '化肥',
+      type: 'line',
+      smooth: true,
+      symbol: 'none', // 关键配置：隐藏数据点标记
+      lineStyle: {
+        width: 2,
+        color: {
+          // 线条首尾渐淡
+          type: 'linear',
+          x: 0,
+          x2: 1,
+          y: 0,
+          y2: 0,
+          colorStops: [
+            { offset: 0, color: hexToRGBA('#E0A21C', 0) },
+            { offset: 0.2, color: hexToRGBA('#E0A21C', 1) },
+            { offset: 0.8, color: hexToRGBA('#E0A21C', 1) },
+            { offset: 1, color: hexToRGBA('#E0A21C', 0) },
+          ],
+        },
+      },
+      areaStyle: {
+        color: {
+          type: 'linear',
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 1,
+          colorStops: [
+            { offset: 0, color: hexToRGBA('#FEF906', 1) },
+            { offset: 1, color: hexToRGBA('#FEF906', 0) },
+          ],
+        },
+      },
+
+      emphasis: {
+        focus: 'series',
+      },
     },
-  },
-  data: [],
+    {
+      name: '农药',
+      type: 'line',
+      smooth: true,
+      symbol: 'none', // 关键配置：隐藏数据点标记
+      lineStyle: {
+        width: 2,
+        color: {
+          // 线条首尾渐淡
+          type: 'linear',
+          x: 0,
+          x2: 1,
+          y: 0,
+          y2: 0,
+          colorStops: [
+            { offset: 0, color: hexToRGBA('#01FEFD', 0) },
+            { offset: 0.2, color: hexToRGBA('#01FEFD', 1) },
+            { offset: 0.8, color: hexToRGBA('#01FEFD', 1) },
+            { offset: 1, color: hexToRGBA('#01FEFD', 0) },
+          ],
+        },
+      },
+      areaStyle: {
+        color: {
+          type: 'linear',
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 1,
+          colorStops: [
+            { offset: 0, color: hexToRGBA('#01FEFD', 1) },
+            { offset: 1, color: hexToRGBA('#01FEFD', 0) },
+          ],
+        },
+      },
+
+      emphasis: {
+        focus: 'series',
+      },
+    },
+    // 其他系列同理...
+  ],
 });
-
-const loadData = async (code = '') => {
-  state.loading = true;
-  // GetInputsInfo()
-  //   .then((res) => {
-  //     if (res.code === 200) {
-  //       state.data = res.data;
-  //     }
-  //   })
-  //   .catch((err) => {
-  //     app.$message.error(err.msg);
-  //   });
-  await sleep(500);
-  state.data = [
-    { value: 5, name: '2020' },
-    { value: 36, name: '2021' },
-    { value: 70, name: '2022' },
-    { value: 56, name: '2023' },
-    { value: 70, name: '2024' },
-    { value: 20, name: '2025' },
-  ];
-};
-
-watch(
-  () => props.data,
-  (val) => {
-    if (!isEmpty(val)) {
-      state.data = val;
-    }
-  },
-  {
-    deep: true,
-    immediate: true,
-  }
-);
-
-watch(
-  () => props.query,
-  (val) => {
-    if (!isEmpty(val)) {
-      loadData(val);
-    }
-  },
-  {
-    deep: true,
-    immediate: true,
-  }
-);
 </script>
+
+<style scoped>
+/* 调整倾斜月份标签的间距 */
+:deep(.echarts-axis-x .echarts-axis-tick) {
+  margin-top: 10px;
+}
+</style>
diff --git a/new-digital-agriculture-screen/src/views/inputs/components/inputsFour.vue b/new-digital-agriculture-screen/src/views/inputs/components/inputsFour.vue
index a7b3883..f06f6e1 100644
--- a/new-digital-agriculture-screen/src/views/inputs/components/inputsFour.vue
+++ b/new-digital-agriculture-screen/src/views/inputs/components/inputsFour.vue
@@ -1,272 +1,84 @@
 <template>
-  <custom-echart-pie-3d :chart-data="state.data" height="100%" :option="state.option" @click="handleClick" />
+  <div class="order-stats">
+    <el-row :gutter="20">
+      <el-col v-for="item in state.list" :key="item.label" :span="12">
+        <div class="order-stats-item flex-column">
+          <div class="order-stats-value">
+            {{ item.value }}<span>{{ item.unit }}</span>
+          </div>
+          <div class="order-stats-label">{{ item.label }}</div>
+        </div>
+      </el-col>
+    </el-row>
+  </div>
 </template>
-<script setup>
-import { reactive, watch } from 'vue';
-import { isEmpty } from '@/utils';
 
-const props = defineProps({
-  data: {
-    type: Array,
-    default: () => [],
-  },
-});
+<script setup>
+import { reactive } from 'vue';
 
 const state = reactive({
-  option: {},
-  data: [],
-  text: '',
+  list: [
+    {
+      label: '订单金额',
+      value: '548.86',
+      unit: '万元',
+    },
+    {
+      label: '订单数量',
+      value: '110554',
+      unit: '笔',
+    },
+  ],
 });
-
-function getParametricEquation(startRatio, endRatio, isSelected, isHovered, k, h) {
-  // 计算
-  let midRatio = (startRatio + endRatio) / 2;
-  let startRadian = startRatio * Math.PI * 2;
-  let endRadian = endRatio * Math.PI * 2;
-  let midRadian = midRatio * Math.PI * 2;
-  // 如果只有一个扇形，则不实现选中效果。
-  if (startRatio === 0 && endRatio === 1) {
-    isSelected = false;
-  }
-  // 通过扇形内径/外径的值，换算出辅助参数 k（默认值 1/3）
-  k = typeof k !== 'undefined' ? k : 1 / 3;
-  // 计算选中效果分别在 x 轴、y 轴方向上的位移（未选中，则位移均为 0）
-  let offsetX = isSelected ? Math.cos(midRadian) * 0.1 : 0;
-  let offsetY = isSelected ? Math.sin(midRadian) * 0.1 : 0;
-  // 计算高亮效果的放大比例（未高亮，则比例为 1）
-  let hoverRate = isHovered ? 1.05 : 1;
-  // 返回曲面参数方程
-  return {
-    u: {
-      min: -Math.PI,
-      max: Math.PI * 3,
-      step: Math.PI / 32,
-    },
-    v: {
-      min: 0,
-      max: Math.PI * 2,
-      step: Math.PI / 20,
-    },
-    x: function (u, v) {
-      if (u < startRadian) {
-        return offsetX + Math.cos(startRadian) * (1 + Math.cos(v) * k) * hoverRate;
-      }
-      if (u > endRadian) {
-        return offsetX + Math.cos(endRadian) * (1 + Math.cos(v) * k) * hoverRate;
-      }
-      return offsetX + Math.cos(u) * (1 + Math.cos(v) * k) * hoverRate;
-    },
-    y: function (u, v) {
-      if (u < startRadian) {
-        return offsetY + Math.sin(startRadian) * (1 + Math.cos(v) * k) * hoverRate;
-      }
-      if (u > endRadian) {
-        return offsetY + Math.sin(endRadian) * (1 + Math.cos(v) * k) * hoverRate;
-      }
-      return offsetY + Math.sin(u) * (1 + Math.cos(v) * k) * hoverRate;
-    },
-    z: function (u, v) {
-      if (u < -Math.PI * 0.5) {
-        return Math.sin(u);
-      }
-      if (u > Math.PI * 2.5) {
-        return Math.sin(u) * h * 0.1;
-      }
-      return Math.sin(v) > 0 ? 1 * h * 0.1 : -1;
-    },
-  };
-}
-
-function fomatFloat(num, n) {
-  var f = parseFloat(num);
-  if (isNaN(f)) {
-    return false;
-  }
-  f = Math.round(num * Math.pow(10, n)) / Math.pow(10, n); // n 幂
-  var s = f.toString();
-  var rs = s.indexOf('.');
-  if (rs < 0) {
-    rs = s.length;
-    s += '.';
-  }
-  while (s.length <= rs + n) {
-    s += '0';
-  }
-  return s;
-}
-
-function getHeight3D(series, height) {
-  series.sort((a, b) => {
-    return b.pieData.value - a.pieData.value;
-  });
-  return (height * 20) / series[0].pieData.value;
-}
-
-function getPie3D(pieData, internalDiameterRatio) {
-  let series = [];
-  let sumValue = 0;
-  let startValue = 0;
-  let endValue = 0;
-  let legendData = [];
-  let legendBfb = [];
-  let k = 1 - internalDiameterRatio;
-  pieData.sort((a, b) => {
-    return b.value - a.value;
-  });
-  for (let i = 0; i < pieData.length; i++) {
-    sumValue += pieData[i].value;
-    let seriesItem = {
-      //名称
-      name: typeof pieData[i].name === 'undefined' ? `series${i}` : pieData[i].name,
-      type: 'surface',
-      //是否为参数曲面（是）
-      parametric: true,
-      //曲面图网格线（否）上面一根一根的
-      wireframe: {
-        show: false,
-      },
-      pieData: pieData[i],
-      pieStatus: {
-        selected: false,
-        hovered: false,
-        k: k,
-      },
-
-      //设置饼图在容器中的位置(目前没发现啥用)
-      //   center: ['50%', '100%']
-    };
-
-    //曲面的颜色、不透明度等样式。
-    if (typeof pieData[i].itemStyle != 'undefined') {
-      let itemStyle = {};
-      typeof pieData[i].itemStyle.color != 'undefined' ? (itemStyle.color = pieData[i].itemStyle.color) : null;
-      typeof pieData[i].itemStyle.opacity != 'undefined' ? (itemStyle.opacity = pieData[i].itemStyle.opacity) : null;
-      seriesItem.itemStyle = itemStyle;
-    }
-    series.push(seriesItem);
-  }
-
-  legendData = [];
-  legendBfb = [];
-  for (let i = 0; i < series.length; i++) {
-    endValue = startValue + series[i].pieData.value * 1;
-    series[i].pieData.startRatio = startValue / sumValue;
-    series[i].pieData.endRatio = endValue / sumValue;
-    series[i].parametricEquation = getParametricEquation(
-      series[i].pieData.startRatio,
-      series[i].pieData.endRatio,
-      false,
-      false,
-      k,
-      series[i].pieData.value
-    );
-    startValue = endValue;
-    let bfb = fomatFloat(series[i].pieData.value / sumValue, 4);
-    legendData.push({
-      name: series[i].name,
-      value: bfb,
-    });
-    legendBfb.push({
-      name: series[i].name,
-      value: bfb,
-    });
-  }
-
-  let boxHeight = getHeight3D(series, 15);
-  let option = {
-    legend: {
-      data: legendData,
-      color: ['#8FD7FC', '#466BE7', '#F4BB29', '#49C384', '#8FD7FC', '#466BE7', '#F4BB29', '#49C384'],
-      bottom: 10,
-      itemGap: 20,
-      show: true,
-      icon: 'rect',
-      itemHeight: 10,
-      itemWidth: 10,
-      textStyle: {
-        fontSize: 12,
-        color: '#B8DDFF',
-        lineHeight: 20,
-      },
-    },
-    title: {
-      text: '',
-      x: 'center',
-      y: 'center',
-      textStyle: {
-        rich: {
-          a: {
-            fontSize: 20,
-            color: '#fff',
-          },
-          c: {
-            fontSize: 12,
-            color: '#fff',
-            padding: [15, 0],
-          },
-        },
-      },
-    },
-    xAxis3D: {
-      min: -1,
-      max: 1,
-    },
-    yAxis3D: {
-      min: -1,
-      max: 1,
-    },
-    zAxis3D: {
-      min: -1,
-      max: 1,
-    },
-    grid3D: {
-      show: false,
-      boxHeight: boxHeight,
-      left: 0,
-      top: -30,
-      viewControl: {
-        alpha: 55, //角度(这个很重要 调节角度的)
-        distance: 150, //调整视角到主体的距离，类似调整zoom(这是整体大小)
-        rotateSensitivity: 1, //设置为0无法旋转
-        zoomSensitivity: 0, //设置为0无法缩放
-        panSensitivity: 0, //设置为0无法平移
-        autoRotate: true, //自动旋转
-      },
-    },
-    series: series,
-  };
-  return option;
-}
-
-const initData = (pieData = []) => {
-  const option = getPie3D(pieData, 0.8);
-  const { name, value } = option.series[0].pieData;
-  option.title.text = `{a|${value}%}{c|\n${name}}`;
-  state.option = option;
-  state.data = option.series;
-};
-
-const handleClick = (params) => {
-  const findItem = state.data.find((el) => el.name === params.seriesName);
-  state.option.title.text = `{a|${findItem?.pieData?.value}%}{c|\n${params.seriesName}}`;
-};
-
-watch(
-  () => props.data,
-  (val) => {
-    if (!isEmpty(val)) {
-      const pieData = val.map((row) => {
-        return {
-          name: row.category,
-          value: row.percentage,
-        };
-      });
-      initData(pieData);
-    }
-  },
-  {
-    deep: true,
-    immediate: true,
-  }
-);
 </script>
+
+<style lang="scss" scoped>
+.order-stats {
+  padding: 20px;
+
+  &-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+  }
+
+  &-value {
+    width: 160px;
+    height: 160px;
+    line-height: 100px;
+    text-align: center;
+    margin: 0 auto;
+    background-image: url('@/assets/images/inputs/order.webp');
+    background-size: cover;
+    background-position: center;
+    background-repeat: no-repeat;
+    font-size: 24px;
+    font-weight: 400;
+    color: #fff;
+    position: relative;
+    border-radius: 8px;
+    overflow: hidden;
+
+    span {
+      font-size: 16px;
+    }
+  }
+
+  &-label {
+    width: 120px;
+    height: 24px;
+    line-height: 24px;
+    margin: 10px auto 0;
+    font-size: 16px;
+    color: #fff;
+    text-align: center;
+    background: url('@/assets/images/inputs/bg_label.png') center center no-repeat;
+    text-shadow:
+      0 0 10px #01eeff,
+      0 0 20px #01eeff,
+      0 0 30px #01eeff;
+  }
+}
+</style>
diff --git a/new-digital-agriculture-screen/src/views/inputs/components/inputsMap.vue b/new-digital-agriculture-screen/src/views/inputs/components/inputsMap.vue
index a3421e4..6e89930 100644
--- a/new-digital-agriculture-screen/src/views/inputs/components/inputsMap.vue
+++ b/new-digital-agriculture-screen/src/views/inputs/components/inputsMap.vue
@@ -2,16 +2,22 @@
   <centerMap :dialog-title="'投入品'" @mapclick="doMapclick">
     <template #header>
       <div class="land-map-pop-header">
-        <div class="title">{{ currentRegion && currentRegion.name ? currentRegion.name : '投入品' }}</div>
+        <div class="title">{{ currentRegion?.name || '投入品' }}</div>
+        <a class="view-case" @click.prevent="handleViewCase">查看案件 &gt;</a>
       </div>
     </template>
     <template #dialogContent>
       <div class="land-map-pop-content">
-        <div v-for="(n, index) in list" :key="index" class="list-item">
-          <div class="title">
-            <span class="title-val"> {{ n.title }}</span>
+        <div class="section-title">投入品管控情况：</div>
+        <div class="main-content">
+          <div class="item">
+            <div class="label">巡检次数</div>
+            <div class="value green">562次</div>
+          </div>
+          <div class="item">
+            <div class="label">案件次数</div>
+            <div class="value red">22次</div>
           </div>
-          <div class="value">{{ n.value }}{{ n.unit }}</div>
         </div>
       </div>
     </template>
@@ -19,85 +25,75 @@
 </template>
 
 <script setup>
-import { ref, reactive } from 'vue';
-
-const unit = ref('家');
-const list = reactive([
-  { title: '监管机构', value: '1', color: '#01FEFD', unit: '家' },
-  { title: '监管人员', value: '2', color: '#FEF906', unit: '人' },
-  { title: '村级监管员', value: '5', color: '#02FD94', unit: '人' },
-  { title: '农资经营单位', value: '42', color: '#FE7F03', unit: '家' },
-  { title: '生产主体', value: '2', color: '#41BDFC', unit: '家' },
-  { title: '投入品规模', value: '3000', color: '#FC0003', unit: '万元' },
-]);
+import { ref } from 'vue';
 
 let currentRegion = ref(null);
 const doMapclick = (data) => {
   currentRegion.value = data;
-  list.forEach((v) => {
-    v.value = Number(v.value) + 1 * (Math.floor(Math.random() * (6 - 2 + 1)) + 2.12).toFixed(0);
-  });
+};
+
+const handleViewCase = () => {
+  // 跳转查看案件逻辑
 };
 </script>
 
 <style lang="scss" scoped>
 .land-map-pop-header {
-  display: inline-flex;
+  display: flex;
   justify-content: space-between;
-  width: 100%;
+  align-items: center;
+  padding: 0 6px;
   margin-top: 3px;
-  .title,
-  .value {
-    display: inline-block;
-    vertical-align: middle;
-    color: $color-white;
-  }
+
   .title {
     font-size: 18px;
+    font-weight: bold;
+    color: #00f9ff;
   }
-  .value {
-    font-size: 14px;
+
+  .view-case {
+    font-size: 16px;
+    color: #00ff99;
+    text-decoration: none;
+    cursor: pointer;
   }
 }
+
 .land-map-pop-content {
   width: 100%;
-  gap: 10px;
-  display: inline-flex;
-  justify-content: flex-start;
-  flex-wrap: wrap;
-  .list-item {
-    width: calc((100% - 10px) / 2);
-    display: inline-flex;
-    justify-content: space-between;
-    padding: 6px 0;
-    .title {
-      display: inline-flex;
-      justify-content: flex-start;
-      .before {
-        display: inline-flex;
-        flex-direction: column;
-        justify-content: center;
-      }
-      .b-content {
-        width: 8px;
-        height: 8px;
-        border-radius: 50%;
-        display: inline-block;
-      }
-      .before,
-      .title-val {
-        display: inline-block;
-        vertical-align: middle;
-        padding: 0 5px 0 2px;
-        color: $color-custom-main;
-      }
-    }
+  padding: 4px 10px;
+  color: #ffffff;
 
-    .value {
-      display: inline-block;
-      text-align: right;
-      color: $color-white;
-      font-size: 12px;
+  .section-title {
+    margin-bottom: 12px;
+    font-size: 15px;
+    text-align: left;
+  }
+
+  .main-content {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+
+    .item {
+      display: flex;
+      justify-content: space-between;
+      font-size: 16px;
+
+      .label {
+        color: #ffffff;
+      }
+
+      .value {
+        &.green {
+          color: #01ffb1;
+        }
+
+        &.red {
+          color: #ff4242;
+        }
+      }
     }
   }
 }
diff --git a/new-digital-agriculture-screen/src/views/inputs/components/inputsOne.vue b/new-digital-agriculture-screen/src/views/inputs/components/inputsOne.vue
index bbc155b..b6948a1 100644
--- a/new-digital-agriculture-screen/src/views/inputs/components/inputsOne.vue
+++ b/new-digital-agriculture-screen/src/views/inputs/components/inputsOne.vue
@@ -1,74 +1,79 @@
 <template>
-  <el-row :gutter="20">
-    <el-col v-for="(item, index) in state.list" :key="item.label" :span="12">
-      <div class="inputs-item flex-row">
-        <span class="inputs-item-icon">
-          <img :src="getAssetsFile(`images/inputs/${index + 1}.png`)" />
-        </span>
-        <div class="inputs-item-info flex-column">
-          <b>{{ item.label }}</b>
-          <div class="inputs-item-value flex-row">
-            <em>{{ item.value }}</em>
-            <span>{{ item.unit }}</span>
-          </div>
-        </div>
-      </div>
-    </el-col>
-  </el-row>
+  <div class="inputs">
+    <h2 class="inputs-title">全县投入品数量：291.85万吨</h2>
+    <new-hyaline-cake :chart-data="state.data" :option="state.option" :width="'100%'" :height="'188px'" />
+  </div>
 </template>
 <script setup>
 import { reactive, watch } from 'vue';
-import { getAssetsFile } from '@/utils';
-import { isEmpty } from '@/utils';
-
-const props = defineProps({
-  data: {
-    type: Array,
-    default: () => [],
-  },
-});
-
 const state = reactive({
-  list: [],
-});
-
-watch(
-  () => props.data,
-  (val) => {
-    if (!isEmpty(val)) {
-      state.list = val;
-    }
+  option: {
+    k: 0,
+    opacity: 0.8,
+    itemGap: 0.1,
+    // legendSuffix: '万吨',
+    itemHeight: 200,
+    startAngle: 60,
+    grid3D: {
+      show: false,
+      boxHeight: 2,
+      top: '-20',
+      bottom: '10',
+      // left: '-20%',
+      viewControl: {
+        //3d效果可以放大、旋转等，请自己去查看官方配置
+        alpha: 40, //角度(这个很重要 调节角度的)
+        beta: -40,
+        distance: 260, //调整视角到主体的距离，类似调整zoom(这是整体大小)
+        rotateSensitivity: 0, //设置旋转灵敏度，为0无法旋转
+        zoomSensitivity: 0, //设置缩放灵敏度，为0无法缩放
+        panSensitivity: 0, //设置平移灵敏度，0无法平移
+        autoRotate: false, //自动旋转
+        autoRotateAfterStill: 2, //在鼠标静止操作后恢复自动旋转的时间间隔,在开启 autoRotate 后有效
+      },
+    },
+    legend: {
+      show: true,
+      top: 'bottom',
+      orient: 'horizontal',
+      itemWidth: 12, // 矩形宽度
+      itemHeight: 12, // 矩形高度
+      itemGap: 20,
+      icon: 'rect',
+      left: 'center',
+      textStyle: {
+        color: '#fff', // 根据你的主题调整颜色
+        fontSize: 14,
+      },
+      itemStyle: {
+        display: 'float',
+        top: '120px',
+        backgroundColor: 'rgba(255, 255, 255, 0.2)',
+      },
+      formatter: (name) => name,
+    },
   },
-  {
-    deep: true,
-    immediate: true,
-  }
-);
+  data: [
+    { value: 76, name: '产业运营平台' },
+    { value: 24, name: '其它', floatZ: 1 },
+  ],
+});
 </script>
 <style lang="scss" scoped>
 .inputs {
-  &-item {
-    align-items: center;
+  &-title {
+    width: 270px;
+    height: 40px;
+    line-height: 40px;
+    margin: 24px auto 0;
+    background-image: url('@/assets/images/inputs/bg_title.png');
+    background-position: center bottom;
+    background-repeat: no-repeat;
+    background-size: 100%;
+    font-size: 20px;
+    font-weight: 400;
     color: #fff;
-    padding: 10px 0;
-
-    &-icon {
-      margin-right: 16px;
-    }
-
-    &-info {
-      font-size: 16px;
-      font-weight: bold;
-    }
-
-    &-value {
-      margin-top: 10px;
-      justify-content: space-between;
-      em {
-        color: #02fd94;
-        font-style: normal;
-      }
-    }
+    text-align: center;
   }
 }
 </style>
diff --git a/new-digital-agriculture-screen/src/views/inputs/components/inputsSix.vue b/new-digital-agriculture-screen/src/views/inputs/components/inputsSix.vue
index 14f4e37..c03e32f 100644
--- a/new-digital-agriculture-screen/src/views/inputs/components/inputsSix.vue
+++ b/new-digital-agriculture-screen/src/views/inputs/components/inputsSix.vue
@@ -1,93 +1,194 @@
 <template>
-  <div class="board">
-    <custom-scroll-board v-if="state.loading" :chart-config="state.options" />
+  <div height="100%">
+    <custom-scroll-board :chart-config="chartConfig" />
+    <div class="announcement-bar">
+      <!-- 喇叭图标 -->
+      <div class="horn-icon">
+        <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+          <path d="M3 10V14C3 15.1 3.9 16 5 16H6L9 19V5L6 8H5C3.9 8 3 8.9 3 10Z" fill="#34f9b7" />
+          <path d="M16.5 12C16.5 10.23 15.48 8.71 14 7.97V16.02C15.48 15.29 16.5 13.77 16.5 12Z" fill="#34f9b7" />
+          <path
+            d="M14 3.23V5.29C16.89 6.15 19 8.83 19 12C19 15.17 16.89 17.85 14 18.71V20.77C18.01 19.86 21 16.28 21 12C21 7.72 18.01 4.14 14 3.23Z"
+            fill="#34f9b7"
+          />
+        </svg>
+      </div>
+
+      <!-- 滚动内容容器 -->
+      <div class="scroll-container" ref="scrollContainer">
+        <div class="scroll-content" :style="{ transform: `translateX(${scrollPosition}px)` }">
+          <span class="text-content">
+            距今产业运营平台已为全县投入品花费节省约
+            <span class="highlight">¥1256.8 万元</span>
+            （截至{{ currentDate }}）
+          </span>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
 <script setup>
-import { reactive, watch } from 'vue';
-import { isEmpty } from '@/utils';
-const props = defineProps({
-  data: {
-    type: Array,
-    default: () => [],
+import { ref, onMounted, onUnmounted } from 'vue';
+
+// 表格配置
+const chartConfig = ref({
+  attr: {
+    w: 200, // 容器宽度
+    h: 192, // 容器高度
+  },
+  option: {
+    header: ['投入品种类', '平台价格', '市场价格'],
+    dataset: [
+      ['圆茄种苗', '0.3元/棵', '0.4元/棵'],
+      ['高氮复合肥', '1850元/吨', '1980元/吨'],
+      ['硫酸钾', '1250元/吨', '1380元/吨'],
+      ['西红柿种苗', '0.3元/棵', '0.4元/棵'],
+    ],
+    // 样式配置
+    headerBGC: 'rgba(53, 208, 192, 0.4)', // 表头背景
+    oddRowBGC: 'rgba(0, 59, 81, 0.1)', // 奇数行背景
+    evenRowBGC: 'rgba(10, 39, 50, 0.1)', // 偶数行背景
+    headerHeight: 40, // 表头高度
+    columnWidth: [300, 200, 200], // 列宽分配
+    align: ['left', 'center', 'center'], // 列对齐方式
+    rowNum: 4, // 可视行数
+    waitTime: 3, // 滚动间隔(秒)
+    carousel: 'single', // 滚动方式
+    hoverPause: true, // 悬停暂停
   },
 });
 
-const header = ['白名单企业', '产品名称', '黑名单企业', '产品名称'];
-const len = header.length;
-const state = reactive({
-  loading: false,
-  options: {
-    attr: { w: 200, h: 240 },
-    option: {
-      header,
-      dataset: [
-        // ['富农种源', '京科824', '南方农业', '京科824'],
-        // ['富农种源', '京科824', '南方农业', '京科824'],
-        // ['富农种源', '京科824', '南方农业', '京科824'],
-        // ['富农种源', '京科824', '南方农业', '京科824'],
-        // ['富农种源', '京科824', '南方农业', '京科824'],
-        // ['富农种源', '京科824', '南方农业', '京科824'],
-        // ['富农种源', '京科824', '南方农业', '京科824'],
-      ],
-      index: false,
-      columnWidth: [100, 100, 100, 100],
-      align: new Array(len).fill('center'),
-      rowNum: 5,
-      waitTime: 5,
-      headerHeight: 40,
-      carousel: 'single',
-      headerBGC: 'rgba(53, 208, 192, 0.4)',
-      oddRowBGC: 'rgba(0, 59, 81, 0.1)',
-      evenRowBGC: 'rgba(10, 39, 50, 0.1)',
-    },
-  },
-});
+// 动态数据
+const currentDate = ref('2023年12月15日');
+const scrollPosition = ref(0);
+const scrollContainer = ref(null);
+let animationFrameId = null;
 
-const genBlankAndWihteList = (data = []) => {
-  const rList = data.filter((row) => row.currentRating === 'r');
-  const bList = data.filter((row) => row.currentRating === 'b');
-  const len = rList.length >= bList.length ? rList.length : bList.length;
-  let list = new Array(len).fill(['', '', '', '']);
-  rList.forEach((item, index) => {
-    let temp = new Array(4).fill('');
-    temp[0] = item.belongCompany;
-    temp[1] = item.comName;
-    list[index] = temp;
-  });
-  bList.forEach((item, index) => {
-    list[index][2] = item.belongCompany;
-    list[index][3] = item.comName;
-  });
-  return list;
+// 滚动控制
+const startScrolling = () => {
+  const scrollSpeed = -60; // px/s
+  let lastTime = 0;
+
+  const scroll = (timestamp) => {
+    if (!lastTime) lastTime = timestamp;
+    const delta = (timestamp - lastTime) / 1000; // 秒
+    lastTime = timestamp;
+
+    scrollPosition.value += scrollSpeed * delta;
+
+    // 循环逻辑
+    const containerWidth = scrollContainer.value?.clientWidth || 0;
+    const contentWidth = scrollContainer.value?.scrollWidth || 0;
+
+    if (Math.abs(scrollPosition.value) > contentWidth + 50) {
+      scrollPosition.value = containerWidth;
+    }
+
+    animationFrameId = requestAnimationFrame(scroll);
+  };
+
+  animationFrameId = requestAnimationFrame(scroll);
 };
 
-watch(
-  () => props.data,
-  (val) => {
-    if (!isEmpty(val)) {
-      state.options.option.dataset = genBlankAndWihteList(val);
-      state.loading = true;
-    }
-  },
-  {
-    deep: true,
-    immediate: true,
-  }
-);
+onMounted(() => {
+  // 获取真实日期
+  const now = new Date();
+  currentDate.value = `${now.getFullYear()}年${now.getMonth() + 1}月${now.getDate()}日`;
+
+  startScrolling();
+});
+
+onUnmounted(() => {
+  cancelAnimationFrame(animationFrameId);
+});
 </script>
+
 <style scoped lang="scss">
-.board {
-  padding: 10px 0px;
+/* 自定义样式 */
+.dv-scroll-board {
+  font-family: 'PingFang SC', 'PingFang SC-Regular', sans-serif;
+  color: #ffffff;
+  font-size: 16px;
 
-  &:deep(.row-item) {
-    font-size: 16px;
+  :deep(.header-item) {
+    text-align: left;
+    font-weight: 700;
+    padding-left: 16px;
+  }
 
+  :deep(.row-item) {
+    transition: all 0.5s ease;
+    font-weight: 400;
     .ceil {
-      &:nth-child(3),
-      &:nth-child(4) {
-        color: $color-danger;
+      text-align: left;
+      padding-left: 16px;
+    }
+  }
+}
+
+.announcement-bar {
+  $primary-color: #0e6965;
+  $secondary-color: #34f9b7;
+  $text-color: #b5f5ff;
+  $bg-color: rgba(0, 60, 107, 0.8);
+
+  display: flex;
+  align-items: center;
+  padding: 0.75rem 1.25rem;
+  background: $bg-color;
+  border-radius: 0.5rem;
+  border-left: 0.25rem solid $secondary-color;
+  box-shadow: 0 0.25rem 1rem rgba($primary-color, 0.2);
+  overflow: hidden;
+  position: relative;
+
+  &::after {
+    content: '';
+    position: absolute;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    width: 3rem;
+    background: linear-gradient(90deg, rgba($bg-color, 0) 0%, $bg-color 100%);
+    z-index: 1;
+  }
+
+  .horn-icon {
+    flex-shrink: 0;
+    margin-right: 1rem;
+    color: $secondary-color;
+
+    svg {
+      width: 1.5rem;
+      height: 1.5rem;
+      filter: drop-shadow(0 0 0.25rem rgba($secondary-color, 0.5));
+    }
+  }
+
+  .scroll-container {
+    flex: 1;
+    overflow: hidden;
+    position: relative;
+    height: 1.5rem;
+
+    .scroll-content {
+      position: absolute;
+      white-space: nowrap;
+      will-change: transform;
+      padding-right: 2rem; // 防止文字紧贴边缘
+
+      .text-content {
+        color: $text-color;
+        font-size: 1.125rem;
+        font-weight: 500;
+        text-shadow: 0 0 0.5rem rgba($primary-color, 0.3);
+      }
+
+      .highlight {
+        color: $secondary-color;
+        font-weight: bold;
+        margin: 0 0.25rem;
       }
     }
   }
diff --git a/new-digital-agriculture-screen/src/views/inputs/components/inputsThere.vue b/new-digital-agriculture-screen/src/views/inputs/components/inputsThere.vue
index c2a80c0..5edbd44 100644
--- a/new-digital-agriculture-screen/src/views/inputs/components/inputsThere.vue
+++ b/new-digital-agriculture-screen/src/views/inputs/components/inputsThere.vue
@@ -1,94 +1,120 @@
 <template>
-  <custom-echart-bar :chart-data="state.data" height="100%" :option="state.option" />
+  <custom-echart-bar :chart-data="state.data" height="100%" :option="state.option" :is-series="true" />
 </template>
-<script setup>
-import { reactive, watch } from 'vue';
-import { isEmpty } from '@/utils';
 
-const props = defineProps({
-  data: {
-    type: Array,
-    default: () => [],
-  },
+<script setup>
+import { reactive } from 'vue';
+
+const rawData = [
+  { name: '勐撒镇', type: '种子农药', value: 15 },
+  { name: '勐撒镇', type: '化肥', value: 30 },
+  { name: '勐撒镇', type: '农药', value: 22 },
+  { name: '勐永镇', type: '种子农药', value: 18 },
+  { name: '勐永镇', type: '化肥', value: 28 },
+  { name: '勐永镇', type: '农药', value: 20 },
+  { name: '孟定镇', type: '种子农药', value: 21 },
+  { name: '孟定镇', type: '化肥', value: 25 },
+  { name: '孟定镇', type: '农药', value: 24 },
+  { name: '勐简乡', type: '种子农药', value: 13 },
+  { name: '勐简乡', type: '化肥', value: 20 },
+  { name: '勐简乡', type: '农药', value: 15 },
+  { name: '贺派乡', type: '种子农药', value: 17 },
+  { name: '贺派乡', type: '化肥', value: 18 },
+  { name: '贺派乡', type: '农药', value: 16 },
+  { name: '芒洪乡', type: '种子农药', value: 14 },
+  { name: '芒洪乡', type: '化肥', value: 23 },
+  { name: '芒洪乡', type: '农药', value: 21 },
+  { name: '大兴乡', type: '种子农药', value: 12 },
+  { name: '大兴乡', type: '化肥', value: 17 },
+  { name: '大兴乡', type: '农药', value: 14 },
+  { name: '耿马镇', type: '种子农药', value: 19 },
+  { name: '耿马镇', type: '化肥', value: 26 },
+  { name: '耿马镇', type: '农药', value: 23 },
+];
+
+const towns = ['勐撒镇', '勐永镇', '孟定镇', '勐简乡', '贺派乡', '芒洪乡', '大兴乡', '耿马镇'];
+const types = ['种子农药', '化肥', '农药'];
+const colors = ['#15EB90', '#F3F70F', '#08DFE4'];
+
+const series = types.map((type, idx) => {
+  return {
+    name: type,
+    type: 'bar',
+    barWidth: 16,
+    stack: 'total',
+    itemStyle: {
+      color: colors[idx],
+      barBorderRadius: 8,
+      shadowColor: colors[idx],
+      // shadowBlur: 8,
+      shadowOffsetY: -16,
+    },
+    z: 10 - idx,
+    data: towns.map((town) => {
+      const found = rawData.find((d) => d.name === town && d.type === type);
+      return found ? found.value : 0;
+    }),
+  };
 });
 
 const state = reactive({
+  data: rawData,
   option: {
+    legend: {
+      show: false,
+    },
     grid: {
-      left: '5%',
-      right: '5%',
+      top: '20%',
+      left: '3%',
+      right: '4%',
       bottom: '5%',
-      top: '10%',
       containLabel: true,
     },
+    xAxis: {
+      type: 'category',
+      axisLine: {
+        lineStyle: {
+          opacity: 1,
+          width: 0,
+        },
+      },
+      axisLabel: {
+        margin: 8,
+      },
+      axisTick: {
+        show: false,
+        interval: 0,
+      },
+      data: towns,
+    },
+    yAxis: {
+      type: 'value',
+    },
+    color: colors,
+    series,
     tooltip: {
       trigger: 'axis',
       axisPointer: {
         type: 'shadow',
       },
-      backgroundColor: 'rgba(18, 55, 85, 0.8);',
+      backgroundColor: 'rgba(0,0,0,0.6);',
       borderColor: '#35d0c0',
-      formatter: (data) => {
-        const params = data[0];
-        let str = `<div class="custom-echarts-tips">
-          <span>${params.name}</span><br/>
-          <span>${params.marker} ${params.data} 万元</span>
-        </div>`;
-        return str;
-      },
-    },
-    barStyle: {
-      barWidth: 15,
-      itemStyle: {
-        borderRadius: [8, 8, 0, 0],
-      },
-      color: {
-        type: 'linear',
-        x: 0,
-        y: 0,
-        x2: 0,
-        y2: 1,
-        colorStops: [
-          { offset: 0, color: '#35D0C0' },
-          { offset: 1, color: '#35D0C0' },
-        ],
-        global: false,
-      },
-    },
-    xAxis: {
-      type: 'category',
-      // name: '面积',
-      axisTick: {
-        show: false,
-        alignWithLabel: false,
-        interval: 'auto',
-        inside: false,
-        length: 5,
-        lineStyle: {
-          type: 'solid',
-          width: 1,
-          color: 'rgba(28, 158, 222, 1)',
-        },
-      },
-    },
-    yAxis: {
-      type: 'value',
-      // name: '面积(万亩)',
+      borderRadius: 8,
+      formatter: (params) => `
+      <div style="font-weight:700;margin-bottom:5px;color:#fff;font-size: 16px;">${params[0].name}</div>
+      ${params
+        .map(
+          (p) => `
+        <div style="display:flex;align-items:center;margin:3px 0;color:#fff">
+          <span style="display:inline-block;width:8px;height:8px;border-radius:50%;background:${p.color};margin-right:6px;color:#fff"></span>
+          ${p.seriesName}: <span style="font-weight:bold;margin-left:5px;color:#fff">${p.value} 吨</span>
+        </div>
+      `
+        )
+        .join('')}
+    `,
+      extraCssText: 'backdrop-filter: blur(8px);',
     },
   },
-  data: [],
 });
-
-watch(
-  () => props.data,
-  (val) => {
-    if (!isEmpty(val)) {
-      state.data = val;
-    }
-  },
-  {
-    deep: true,
-    immediate: true,
-  }
-);
 </script>
diff --git a/new-digital-agriculture-screen/src/views/inputs/components/inputsTwo.vue b/new-digital-agriculture-screen/src/views/inputs/components/inputsTwo.vue
index 41837ce..8eb3867 100644
--- a/new-digital-agriculture-screen/src/views/inputs/components/inputsTwo.vue
+++ b/new-digital-agriculture-screen/src/views/inputs/components/inputsTwo.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="inputs">
-    <h2 class="inputs-title">检测批次：{{ state.counts }}次</h2>
+    <h2 class="inputs-title">巡检次数：{{ state.counts }}次</h2>
     <el-row>
       <el-col v-for="item in state.list" :key="item.label" :span="12">
         <div class="inputs-item flex-column">
@@ -31,7 +31,7 @@ const state = reactive({
     },
     {
       label: '检测覆盖率',
-      value: '99.98%',
+      value: '25.46%',
     },
   ],
 });
diff --git a/new-digital-agriculture-screen/src/views/inputs/index.vue b/new-digital-agriculture-screen/src/views/inputs/index.vue
index 3e6583b..3f7b135 100644
--- a/new-digital-agriculture-screen/src/views/inputs/index.vue
+++ b/new-digital-agriculture-screen/src/views/inputs/index.vue
@@ -2,21 +2,21 @@
   <el-row class="data-home-index">
     <el-col :span="6" class="left-charts">
       <div class="left-charts-item">
-        <customBack top-title="投入品监管体系建设" :top-postion="'left'">
+        <customBack top-title="全县投入品数量占比" :top-postion="'left'">
           <template #back>
             <inputsOne :data="state.data.one" />
           </template>
         </customBack>
       </div>
       <div class="left-charts-item">
-        <customBack top-title="投入品检测监管" :top-postion="'left'">
+        <customBack top-title="产业运营平台投入品数量" :top-postion="'left'">
           <template #back>
-            <inputsTwo :data="state.data.InputDetector" />
+            <inputsFive ref="fiveRef" :data="state.data.five" :query="state.queryCode" />
           </template>
         </customBack>
       </div>
       <div class="left-charts-item">
-        <customBack top-title="投入品金额对比" :top-postion="'left'">
+        <customBack top-title="全县投入品使用情况" :top-postion="'left'">
           <template #back>
             <inputsThere :data="state.data.there" />
           </template>
@@ -29,43 +29,38 @@
 
     <el-col :span="6" class="right-charts">
       <div class="right-charts-item">
-        <customBack top-title="生产主体统计" :top-postion="'right'">
+        <customBack top-title="今日投入品价格" :top-postion="'right'">
           <template #back>
-            <inputsFour :data="state.data.ProductEntity" />
+            <inputsSix :data="state.data.BlackWhite" />
+          </template>
+        </customBack>
+      </div>
+      <div class="right-charts-item">
+        <customBack top-title="投入品管控情况" :top-postion="'right'">
+          <template #back>
+            <inputsTwo :data="state.data.InputDetector" />
           </template>
         </customBack>
       </div>
       <div class="right-charts-item">
         <customBack
-          top-title="历年投入品规模对比"
+          top-title="产业运营平台订单统计"
           :top-postion="'right'"
-          :down-title="'全县'"
+          :down-title="'按日'"
           :label-field="'label'"
           :value-field="'value'"
           :down-width="'100px'"
           :options="[
-            { label: '全县', value: '530926' },
-            { label: '耿马镇', value: '42611' },
-            { label: '勐撒镇', value: '9259' },
-            { label: '勐永镇', value: '17787' },
-            { label: '孟定镇', value: '42610' },
-            { label: '勐简乡', value: '17788' },
-            { label: '贺派乡', value: '40161' },
-            { label: '四排山乡', value: '40163' },
-            { label: '大兴乡', value: '40159' },
+            { label: '按日', value: '0' },
+            { label: '按月', value: '1' },
+            { label: '按季度', value: '2' },
+            { label: '按年', value: '3' },
           ]"
           :is-down="true"
-          @command="handleCommand"
+          command="handleCommand"
         >
           <template #back>
-            <inputsFive ref="fiveRef" :data="state.data.five" :query="state.queryCode" />
-          </template>
-        </customBack>
-      </div>
-      <div class="right-charts-item">
-        <customBack top-title="投入品白名单/黑名单" :top-postion="'right'">
-          <template #back>
-            <inputsSix :data="state.data.BlackWhite" />
+            <inputsFour :data="state.data.ProductEntity" />
           </template>
         </customBack>
       </div>
@@ -140,7 +135,7 @@ const loadData = async () => {
         unit: '家',
       },
     ],
-    InputDetector: [{ JCFGL: 33.33, JCYPPC: 15, zero_count: 13, JCHGL: 86.67, counts: 45 }],
+    InputDetector: [{ JCFGL: 33.33, JCYPPC: 15684, zero_count: 13, JCHGL: 86.67, counts: 45 }],
     there: [
       { value: 530, name: '种子' },
       { value: 1215, name: '化肥' },
diff --git a/new-digital-agriculture-screen/src/views/land/components/landFive.vue b/new-digital-agriculture-screen/src/views/land/components/landFive.vue
index 394f99b..9653f60 100644
--- a/new-digital-agriculture-screen/src/views/land/components/landFive.vue
+++ b/new-digital-agriculture-screen/src/views/land/components/landFive.vue
@@ -23,13 +23,13 @@ const state = reactive({
       containLabel: true,
     },
     tooltip: {
-      className: 'custom-tooltip-container',
       trigger: 'axis',
       axisPointer: {
         type: 'shadow',
       },
       backgroundColor: 'rgba(0,0,0,0.6);',
       borderColor: '#35d0c0',
+      borderRadius: 8,
       formatter: (data) => {
         const params = data[0];
         let str = `<div class="custom-echarts-tips" >
diff --git a/new-digital-agriculture-screen/src/views/land/components/landOne.vue b/new-digital-agriculture-screen/src/views/land/components/landOne.vue
index 27ed2f3..51e5bf3 100644
--- a/new-digital-agriculture-screen/src/views/land/components/landOne.vue
+++ b/new-digital-agriculture-screen/src/views/land/components/landOne.vue
@@ -22,13 +22,13 @@ const state = reactive({
       containLabel: true,
     },
     tooltip: {
-      className: 'custom-tooltip-container', // 自定义父容器类名
       trigger: 'axis',
       axisPointer: {
         type: 'shadow',
       },
       backgroundColor: 'rgba(0,0,0,0.5);',
       borderColor: '#35d0c0',
+      borderRadius: 8,
       formatter: (data) => {
         const params = data[0];
         let str = `<div class="custom-echarts-tips" >
@@ -42,7 +42,7 @@ const state = reactive({
     barStyle: {
       barWidth: 16,
       itemStyle: {
-        borderRadius: 8, // 设置柱子的圆角半径
+        borderRadius: 8,
       },
       color: {
         type: 'linear',
diff --git a/new-digital-agriculture-screen/src/views/land/components/landSix.vue b/new-digital-agriculture-screen/src/views/land/components/landSix.vue
index 5caa33b..7db3657 100644
--- a/new-digital-agriculture-screen/src/views/land/components/landSix.vue
+++ b/new-digital-agriculture-screen/src/views/land/components/landSix.vue
@@ -15,14 +15,14 @@ const props = defineProps({
 
 const state = reactive({
   option: {
-    k: 0.5,
+    k: 0,
     opacity: 1,
-    itemGap: 0.1,
+    itemGap: 0.2,
     legendSuffix: '万亩',
     itemHeight: 200,
     grid3D: {
       show: false,
-      boxHeight: 1,
+      boxHeight: 3,
       top: '0',
       left: '-20%',
       viewControl: {
diff --git a/new-digital-agriculture-screen/src/views/land/components/landThere.vue b/new-digital-agriculture-screen/src/views/land/components/landThere.vue
index ba8bf3f..11312a0 100644
--- a/new-digital-agriculture-screen/src/views/land/components/landThere.vue
+++ b/new-digital-agriculture-screen/src/views/land/components/landThere.vue
@@ -27,13 +27,13 @@ const state = reactive({
       containLabel: true,
     },
     tooltip: {
-      className: 'custom-tooltip-container',
       trigger: 'axis',
       axisPointer: {
         type: 'shadow',
       },
       backgroundColor: 'rgba(0,0,0,0.6);',
       borderColor: '#35d0c0',
+      borderRadius: 8,
       formatter: (data) => {
         const params = data[0];
         let str = `<div class="custom-echarts-tips">
diff --git a/yarn.lock b/yarn.lock
index 1cffdcc..c1c1523 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4,22 +4,14 @@
 
 ansi-styles@^3.2.1:
   version "3.2.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-=======
   resolved "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz"
->>>>>>> dev
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
 array-buffer-byte-length@^1.0.1, array-buffer-byte-length@^1.0.2:
   version "1.0.2"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz#384d12a37295aec3769ab022ad323a18a51ccf8b"
-=======
   resolved "https://registry.npmmirror.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz"
->>>>>>> dev
   integrity sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==
   dependencies:
     call-bound "^1.0.3"
@@ -27,11 +19,7 @@ array-buffer-byte-length@^1.0.1, array-buffer-byte-length@^1.0.2:
 
 arraybuffer.prototype.slice@^1.0.4:
   version "1.0.4"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz#9d760d84dbdd06d0cbf92c8849615a1a7ab3183c"
-=======
   resolved "https://registry.npmmirror.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz"
->>>>>>> dev
   integrity sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==
   dependencies:
     array-buffer-byte-length "^1.0.1"
@@ -44,40 +32,24 @@ arraybuffer.prototype.slice@^1.0.4:
 
 async-function@^1.0.0:
   version "1.0.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/async-function/-/async-function-1.0.0.tgz#509c9fca60eaf85034c6829838188e4e4c8ffb2b"
-=======
   resolved "https://registry.npmmirror.com/async-function/-/async-function-1.0.0.tgz"
->>>>>>> dev
   integrity sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==
 
 available-typed-arrays@^1.0.7:
   version "1.0.7"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846"
-=======
   resolved "https://registry.npmmirror.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz"
->>>>>>> dev
   integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==
   dependencies:
     possible-typed-array-names "^1.0.0"
 
 balanced-match@^1.0.0:
   version "1.0.2"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-=======
   resolved "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz"
->>>>>>> dev
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 brace-expansion@^1.1.7:
   version "1.1.11"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-=======
   resolved "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz"
->>>>>>> dev
   integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
@@ -85,11 +57,7 @@ brace-expansion@^1.1.7:
 
 call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
   version "1.0.2"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
-=======
   resolved "https://registry.npmmirror.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz"
->>>>>>> dev
   integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
   dependencies:
     es-errors "^1.3.0"
@@ -97,11 +65,7 @@ call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1, call-bind-apply-
 
 call-bind@^1.0.7, call-bind@^1.0.8:
   version "1.0.8"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c"
-=======
   resolved "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.8.tgz"
->>>>>>> dev
   integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==
   dependencies:
     call-bind-apply-helpers "^1.0.0"
@@ -111,11 +75,7 @@ call-bind@^1.0.7, call-bind@^1.0.8:
 
 call-bound@^1.0.2, call-bound@^1.0.3, call-bound@^1.0.4:
   version "1.0.4"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/call-bound/-/call-bound-1.0.4.tgz#238de935d2a2a692928c538c7ccfa91067fd062a"
-=======
   resolved "https://registry.npmmirror.com/call-bound/-/call-bound-1.0.4.tgz"
->>>>>>> dev
   integrity sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==
   dependencies:
     call-bind-apply-helpers "^1.0.2"
@@ -123,11 +83,7 @@ call-bound@^1.0.2, call-bound@^1.0.3, call-bound@^1.0.4:
 
 chalk@^2.4.1:
   version "2.4.2"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-=======
   resolved "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz"
->>>>>>> dev
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
   dependencies:
     ansi-styles "^3.2.1"
@@ -136,40 +92,24 @@ chalk@^2.4.1:
 
 color-convert@^1.9.0:
   version "1.9.3"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-=======
   resolved "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz"
->>>>>>> dev
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
     color-name "1.1.3"
 
 color-name@1.1.3:
   version "1.1.3"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-=======
   resolved "https://registry.npmmirror.com/color-name/-/color-name-1.1.3.tgz"
->>>>>>> dev
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
 concat-map@0.0.1:
   version "0.0.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-=======
   resolved "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz"
->>>>>>> dev
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 cross-spawn@^6.0.5:
   version "6.0.6"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-6.0.6.tgz#30d0efa0712ddb7eb5a76e1e8721bffafa6b5d57"
-=======
   resolved "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-6.0.6.tgz"
->>>>>>> dev
   integrity sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==
   dependencies:
     nice-try "^1.0.4"
@@ -180,11 +120,7 @@ cross-spawn@^6.0.5:
 
 data-view-buffer@^1.0.2:
   version "1.0.2"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/data-view-buffer/-/data-view-buffer-1.0.2.tgz#211a03ba95ecaf7798a8c7198d79536211f88570"
-=======
   resolved "https://registry.npmmirror.com/data-view-buffer/-/data-view-buffer-1.0.2.tgz"
->>>>>>> dev
   integrity sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==
   dependencies:
     call-bound "^1.0.3"
@@ -193,11 +129,7 @@ data-view-buffer@^1.0.2:
 
 data-view-byte-length@^1.0.2:
   version "1.0.2"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz#9e80f7ca52453ce3e93d25a35318767ea7704735"
-=======
   resolved "https://registry.npmmirror.com/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz"
->>>>>>> dev
   integrity sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==
   dependencies:
     call-bound "^1.0.3"
@@ -206,11 +138,7 @@ data-view-byte-length@^1.0.2:
 
 data-view-byte-offset@^1.0.1:
   version "1.0.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz#068307f9b71ab76dbbe10291389e020856606191"
-=======
   resolved "https://registry.npmmirror.com/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz"
->>>>>>> dev
   integrity sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==
   dependencies:
     call-bound "^1.0.2"
@@ -219,11 +147,7 @@ data-view-byte-offset@^1.0.1:
 
 define-data-property@^1.0.1, define-data-property@^1.1.4:
   version "1.1.4"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
-=======
   resolved "https://registry.npmmirror.com/define-data-property/-/define-data-property-1.1.4.tgz"
->>>>>>> dev
   integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
   dependencies:
     es-define-property "^1.0.0"
@@ -232,11 +156,7 @@ define-data-property@^1.0.1, define-data-property@^1.1.4:
 
 define-properties@^1.2.1:
   version "1.2.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
-=======
   resolved "https://registry.npmmirror.com/define-properties/-/define-properties-1.2.1.tgz"
->>>>>>> dev
   integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
   dependencies:
     define-data-property "^1.0.1"
@@ -245,11 +165,7 @@ define-properties@^1.2.1:
 
 dunder-proto@^1.0.0, dunder-proto@^1.0.1:
   version "1.0.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
-=======
   resolved "https://registry.npmmirror.com/dunder-proto/-/dunder-proto-1.0.1.tgz"
->>>>>>> dev
   integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
   dependencies:
     call-bind-apply-helpers "^1.0.1"
@@ -258,22 +174,14 @@ dunder-proto@^1.0.0, dunder-proto@^1.0.1:
 
 error-ex@^1.3.1:
   version "1.3.2"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-=======
   resolved "https://registry.npmmirror.com/error-ex/-/error-ex-1.3.2.tgz"
->>>>>>> dev
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
 es-abstract@^1.23.2, es-abstract@^1.23.5, es-abstract@^1.23.9:
   version "1.23.9"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/es-abstract/-/es-abstract-1.23.9.tgz#5b45994b7de78dada5c1bebf1379646b32b9d606"
-=======
   resolved "https://registry.npmmirror.com/es-abstract/-/es-abstract-1.23.9.tgz"
->>>>>>> dev
   integrity sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==
   dependencies:
     array-buffer-byte-length "^1.0.2"
@@ -330,40 +238,24 @@ es-abstract@^1.23.2, es-abstract@^1.23.5, es-abstract@^1.23.9:
 
 es-define-property@^1.0.0, es-define-property@^1.0.1:
   version "1.0.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
-=======
   resolved "https://registry.npmmirror.com/es-define-property/-/es-define-property-1.0.1.tgz"
->>>>>>> dev
   integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
 
 es-errors@^1.3.0:
   version "1.3.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
-=======
   resolved "https://registry.npmmirror.com/es-errors/-/es-errors-1.3.0.tgz"
->>>>>>> dev
   integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
 es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
   version "1.1.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
-=======
   resolved "https://registry.npmmirror.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz"
->>>>>>> dev
   integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
   dependencies:
     es-errors "^1.3.0"
 
 es-set-tostringtag@^2.1.0:
   version "2.1.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d"
-=======
   resolved "https://registry.npmmirror.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz"
->>>>>>> dev
   integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==
   dependencies:
     es-errors "^1.3.0"
@@ -373,11 +265,7 @@ es-set-tostringtag@^2.1.0:
 
 es-to-primitive@^1.3.0:
   version "1.3.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/es-to-primitive/-/es-to-primitive-1.3.0.tgz#96c89c82cc49fd8794a24835ba3e1ff87f214e18"
-=======
   resolved "https://registry.npmmirror.com/es-to-primitive/-/es-to-primitive-1.3.0.tgz"
->>>>>>> dev
   integrity sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==
   dependencies:
     is-callable "^1.2.7"
@@ -386,40 +274,24 @@ es-to-primitive@^1.3.0:
 
 escape-string-regexp@^1.0.5:
   version "1.0.5"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-=======
   resolved "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
->>>>>>> dev
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
 for-each@^0.3.3, for-each@^0.3.5:
   version "0.3.5"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/for-each/-/for-each-0.3.5.tgz#d650688027826920feeb0af747ee7b9421a41d47"
-=======
   resolved "https://registry.npmmirror.com/for-each/-/for-each-0.3.5.tgz"
->>>>>>> dev
   integrity sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==
   dependencies:
     is-callable "^1.2.7"
 
 function-bind@^1.1.2:
   version "1.1.2"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
-=======
   resolved "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz"
->>>>>>> dev
   integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
 function.prototype.name@^1.1.6, function.prototype.name@^1.1.8:
   version "1.1.8"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/function.prototype.name/-/function.prototype.name-1.1.8.tgz#e68e1df7b259a5c949eeef95cdbde53edffabb78"
-=======
   resolved "https://registry.npmmirror.com/function.prototype.name/-/function.prototype.name-1.1.8.tgz"
->>>>>>> dev
   integrity sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==
   dependencies:
     call-bind "^1.0.8"
@@ -431,20 +303,12 @@ function.prototype.name@^1.1.6, function.prototype.name@^1.1.8:
 
 functions-have-names@^1.2.3:
   version "1.2.3"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
-=======
   resolved "https://registry.npmmirror.com/functions-have-names/-/functions-have-names-1.2.3.tgz"
->>>>>>> dev
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
 get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@^1.2.7, get-intrinsic@^1.3.0:
   version "1.3.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
-=======
   resolved "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz"
->>>>>>> dev
   integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
   dependencies:
     call-bind-apply-helpers "^1.0.2"
@@ -460,11 +324,7 @@ get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@
 
 get-proto@^1.0.0, get-proto@^1.0.1:
   version "1.0.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
-=======
   resolved "https://registry.npmmirror.com/get-proto/-/get-proto-1.0.1.tgz"
->>>>>>> dev
   integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
   dependencies:
     dunder-proto "^1.0.1"
@@ -472,11 +332,7 @@ get-proto@^1.0.0, get-proto@^1.0.1:
 
 get-symbol-description@^1.1.0:
   version "1.1.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/get-symbol-description/-/get-symbol-description-1.1.0.tgz#7bdd54e0befe8ffc9f3b4e203220d9f1e881b6ee"
-=======
   resolved "https://registry.npmmirror.com/get-symbol-description/-/get-symbol-description-1.1.0.tgz"
->>>>>>> dev
   integrity sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==
   dependencies:
     call-bound "^1.0.3"
@@ -485,11 +341,7 @@ get-symbol-description@^1.1.0:
 
 globalthis@^1.0.4:
   version "1.0.4"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236"
-=======
   resolved "https://registry.npmmirror.com/globalthis/-/globalthis-1.0.4.tgz"
->>>>>>> dev
   integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==
   dependencies:
     define-properties "^1.2.1"
@@ -497,109 +349,65 @@ globalthis@^1.0.4:
 
 gopd@^1.0.1, gopd@^1.2.0:
   version "1.2.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
-=======
   resolved "https://registry.npmmirror.com/gopd/-/gopd-1.2.0.tgz"
->>>>>>> dev
   integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
 
 graceful-fs@^4.1.2:
   version "4.2.11"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
-=======
   resolved "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz"
->>>>>>> dev
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
 has-bigints@^1.0.2:
   version "1.1.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/has-bigints/-/has-bigints-1.1.0.tgz#28607e965ac967e03cd2a2c70a2636a1edad49fe"
-=======
   resolved "https://registry.npmmirror.com/has-bigints/-/has-bigints-1.1.0.tgz"
->>>>>>> dev
   integrity sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==
 
 has-flag@^3.0.0:
   version "3.0.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-=======
   resolved "https://registry.npmmirror.com/has-flag/-/has-flag-3.0.0.tgz"
->>>>>>> dev
   integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
 has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2:
   version "1.0.2"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
-=======
   resolved "https://registry.npmmirror.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz"
->>>>>>> dev
   integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
   dependencies:
     es-define-property "^1.0.0"
 
 has-proto@^1.2.0:
   version "1.2.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/has-proto/-/has-proto-1.2.0.tgz#5de5a6eabd95fdffd9818b43055e8065e39fe9d5"
-=======
   resolved "https://registry.npmmirror.com/has-proto/-/has-proto-1.2.0.tgz"
->>>>>>> dev
   integrity sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==
   dependencies:
     dunder-proto "^1.0.0"
 
 has-symbols@^1.0.3, has-symbols@^1.1.0:
   version "1.1.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
-=======
   resolved "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.1.0.tgz"
->>>>>>> dev
   integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
 
 has-tostringtag@^1.0.2:
   version "1.0.2"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
-=======
   resolved "https://registry.npmmirror.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz"
->>>>>>> dev
   integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
   dependencies:
     has-symbols "^1.0.3"
 
 hasown@^2.0.2:
   version "2.0.2"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
-=======
   resolved "https://registry.npmmirror.com/hasown/-/hasown-2.0.2.tgz"
->>>>>>> dev
   integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
   dependencies:
     function-bind "^1.1.2"
 
 hosted-git-info@^2.1.4:
   version "2.8.9"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
-=======
   resolved "https://registry.npmmirror.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz"
->>>>>>> dev
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 internal-slot@^1.1.0:
   version "1.1.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/internal-slot/-/internal-slot-1.1.0.tgz#1eac91762947d2f7056bc838d93e13b2e9604961"
-=======
   resolved "https://registry.npmmirror.com/internal-slot/-/internal-slot-1.1.0.tgz"
->>>>>>> dev
   integrity sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==
   dependencies:
     es-errors "^1.3.0"
@@ -608,11 +416,7 @@ internal-slot@^1.1.0:
 
 is-array-buffer@^3.0.4, is-array-buffer@^3.0.5:
   version "3.0.5"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/is-array-buffer/-/is-array-buffer-3.0.5.tgz#65742e1e687bd2cc666253068fd8707fe4d44280"
-=======
   resolved "https://registry.npmmirror.com/is-array-buffer/-/is-array-buffer-3.0.5.tgz"
->>>>>>> dev
   integrity sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==
   dependencies:
     call-bind "^1.0.8"
@@ -621,20 +425,12 @@ is-array-buffer@^3.0.4, is-array-buffer@^3.0.5:
 
 is-arrayish@^0.2.1:
   version "0.2.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-=======
   resolved "https://registry.npmmirror.com/is-arrayish/-/is-arrayish-0.2.1.tgz"
->>>>>>> dev
   integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
 is-async-function@^2.0.0:
   version "2.1.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/is-async-function/-/is-async-function-2.1.1.tgz#3e69018c8e04e73b738793d020bfe884b9fd3523"
-=======
   resolved "https://registry.npmmirror.com/is-async-function/-/is-async-function-2.1.1.tgz"
->>>>>>> dev
   integrity sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==
   dependencies:
     async-function "^1.0.0"
@@ -645,22 +441,14 @@ is-async-function@^2.0.0:
 
 is-bigint@^1.1.0:
   version "1.1.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/is-bigint/-/is-bigint-1.1.0.tgz#dda7a3445df57a42583db4228682eba7c4170672"
-=======
   resolved "https://registry.npmmirror.com/is-bigint/-/is-bigint-1.1.0.tgz"
->>>>>>> dev
   integrity sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==
   dependencies:
     has-bigints "^1.0.2"
 
 is-boolean-object@^1.2.1:
   version "1.2.2"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/is-boolean-object/-/is-boolean-object-1.2.2.tgz#7067f47709809a393c71ff5bb3e135d8a9215d9e"
-=======
   resolved "https://registry.npmmirror.com/is-boolean-object/-/is-boolean-object-1.2.2.tgz"
->>>>>>> dev
   integrity sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==
   dependencies:
     call-bound "^1.0.3"
@@ -668,31 +456,19 @@ is-boolean-object@^1.2.1:
 
 is-callable@^1.2.7:
   version "1.2.7"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
-=======
   resolved "https://registry.npmmirror.com/is-callable/-/is-callable-1.2.7.tgz"
->>>>>>> dev
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
 is-core-module@^2.16.0:
   version "2.16.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4"
-=======
   resolved "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.16.1.tgz"
->>>>>>> dev
   integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==
   dependencies:
     hasown "^2.0.2"
 
 is-data-view@^1.0.1, is-data-view@^1.0.2:
   version "1.0.2"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/is-data-view/-/is-data-view-1.0.2.tgz#bae0a41b9688986c2188dda6657e56b8f9e63b8e"
-=======
   resolved "https://registry.npmmirror.com/is-data-view/-/is-data-view-1.0.2.tgz"
->>>>>>> dev
   integrity sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==
   dependencies:
     call-bound "^1.0.2"
@@ -701,11 +477,7 @@ is-data-view@^1.0.1, is-data-view@^1.0.2:
 
 is-date-object@^1.0.5, is-date-object@^1.1.0:
   version "1.1.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/is-date-object/-/is-date-object-1.1.0.tgz#ad85541996fc7aa8b2729701d27b7319f95d82f7"
-=======
   resolved "https://registry.npmmirror.com/is-date-object/-/is-date-object-1.1.0.tgz"
->>>>>>> dev
   integrity sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==
   dependencies:
     call-bound "^1.0.2"
@@ -713,22 +485,14 @@ is-date-object@^1.0.5, is-date-object@^1.1.0:
 
 is-finalizationregistry@^1.1.0:
   version "1.1.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz#eefdcdc6c94ddd0674d9c85887bf93f944a97c90"
-=======
   resolved "https://registry.npmmirror.com/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz"
->>>>>>> dev
   integrity sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==
   dependencies:
     call-bound "^1.0.3"
 
 is-generator-function@^1.0.10:
   version "1.1.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/is-generator-function/-/is-generator-function-1.1.0.tgz#bf3eeda931201394f57b5dba2800f91a238309ca"
-=======
   resolved "https://registry.npmmirror.com/is-generator-function/-/is-generator-function-1.1.0.tgz"
->>>>>>> dev
   integrity sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==
   dependencies:
     call-bound "^1.0.3"
@@ -738,20 +502,12 @@ is-generator-function@^1.0.10:
 
 is-map@^2.0.3:
   version "2.0.3"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e"
-=======
   resolved "https://registry.npmmirror.com/is-map/-/is-map-2.0.3.tgz"
->>>>>>> dev
   integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==
 
 is-number-object@^1.1.1:
   version "1.1.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/is-number-object/-/is-number-object-1.1.1.tgz#144b21e95a1bc148205dcc2814a9134ec41b2541"
-=======
   resolved "https://registry.npmmirror.com/is-number-object/-/is-number-object-1.1.1.tgz"
->>>>>>> dev
   integrity sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==
   dependencies:
     call-bound "^1.0.3"
@@ -759,11 +515,7 @@ is-number-object@^1.1.1:
 
 is-regex@^1.2.1:
   version "1.2.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/is-regex/-/is-regex-1.2.1.tgz#76d70a3ed10ef9be48eb577887d74205bf0cad22"
-=======
   resolved "https://registry.npmmirror.com/is-regex/-/is-regex-1.2.1.tgz"
->>>>>>> dev
   integrity sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==
   dependencies:
     call-bound "^1.0.2"
@@ -773,31 +525,19 @@ is-regex@^1.2.1:
 
 is-set@^2.0.3:
   version "2.0.3"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d"
-=======
   resolved "https://registry.npmmirror.com/is-set/-/is-set-2.0.3.tgz"
->>>>>>> dev
   integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==
 
 is-shared-array-buffer@^1.0.4:
   version "1.0.4"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz#9b67844bd9b7f246ba0708c3a93e34269c774f6f"
-=======
   resolved "https://registry.npmmirror.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz"
->>>>>>> dev
   integrity sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==
   dependencies:
     call-bound "^1.0.3"
 
 is-string@^1.1.1:
   version "1.1.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/is-string/-/is-string-1.1.1.tgz#92ea3f3d5c5b6e039ca8677e5ac8d07ea773cbb9"
-=======
   resolved "https://registry.npmmirror.com/is-string/-/is-string-1.1.1.tgz"
->>>>>>> dev
   integrity sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==
   dependencies:
     call-bound "^1.0.3"
@@ -805,11 +545,7 @@ is-string@^1.1.1:
 
 is-symbol@^1.0.4, is-symbol@^1.1.1:
   version "1.1.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/is-symbol/-/is-symbol-1.1.1.tgz#f47761279f532e2b05a7024a7506dbbedacd0634"
-=======
   resolved "https://registry.npmmirror.com/is-symbol/-/is-symbol-1.1.1.tgz"
->>>>>>> dev
   integrity sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==
   dependencies:
     call-bound "^1.0.2"
@@ -818,42 +554,26 @@ is-symbol@^1.0.4, is-symbol@^1.1.1:
 
 is-typed-array@^1.1.13, is-typed-array@^1.1.14, is-typed-array@^1.1.15:
   version "1.1.15"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/is-typed-array/-/is-typed-array-1.1.15.tgz#4bfb4a45b61cee83a5a46fba778e4e8d59c0ce0b"
-=======
   resolved "https://registry.npmmirror.com/is-typed-array/-/is-typed-array-1.1.15.tgz"
->>>>>>> dev
   integrity sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==
   dependencies:
     which-typed-array "^1.1.16"
 
 is-weakmap@^2.0.2:
   version "2.0.2"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd"
-=======
   resolved "https://registry.npmmirror.com/is-weakmap/-/is-weakmap-2.0.2.tgz"
->>>>>>> dev
   integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==
 
 is-weakref@^1.0.2, is-weakref@^1.1.0:
   version "1.1.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/is-weakref/-/is-weakref-1.1.1.tgz#eea430182be8d64174bd96bffbc46f21bf3f9293"
-=======
   resolved "https://registry.npmmirror.com/is-weakref/-/is-weakref-1.1.1.tgz"
->>>>>>> dev
   integrity sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==
   dependencies:
     call-bound "^1.0.3"
 
 is-weakset@^2.0.3:
   version "2.0.4"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/is-weakset/-/is-weakset-2.0.4.tgz#c9f5deb0bc1906c6d6f1027f284ddf459249daca"
-=======
   resolved "https://registry.npmmirror.com/is-weakset/-/is-weakset-2.0.4.tgz"
->>>>>>> dev
   integrity sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==
   dependencies:
     call-bound "^1.0.3"
@@ -861,38 +581,22 @@ is-weakset@^2.0.3:
 
 isarray@^2.0.5:
   version "2.0.5"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
-=======
   resolved "https://registry.npmmirror.com/isarray/-/isarray-2.0.5.tgz"
->>>>>>> dev
   integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
 
 isexe@^2.0.0:
   version "2.0.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-=======
   resolved "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz"
->>>>>>> dev
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
 json-parse-better-errors@^1.0.1:
   version "1.0.2"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-=======
   resolved "https://registry.npmmirror.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"
->>>>>>> dev
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
 load-json-file@^4.0.0:
   version "4.0.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-=======
   resolved "https://registry.npmmirror.com/load-json-file/-/load-json-file-4.0.0.tgz"
->>>>>>> dev
   integrity sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==
   dependencies:
     graceful-fs "^4.1.2"
@@ -902,49 +606,29 @@ load-json-file@^4.0.0:
 
 math-intrinsics@^1.1.0:
   version "1.1.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
-=======
   resolved "https://registry.npmmirror.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz"
->>>>>>> dev
   integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
 
 memorystream@^0.3.1:
   version "0.3.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
-=======
   resolved "https://registry.npmmirror.com/memorystream/-/memorystream-0.3.1.tgz"
->>>>>>> dev
   integrity sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==
 
 minimatch@^3.0.4:
   version "3.1.2"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-=======
   resolved "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz"
->>>>>>> dev
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
 nice-try@^1.0.4:
   version "1.0.5"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-=======
   resolved "https://registry.npmmirror.com/nice-try/-/nice-try-1.0.5.tgz"
->>>>>>> dev
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 normalize-package-data@^2.3.2:
   version "2.5.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
-=======
   resolved "https://registry.npmmirror.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"
->>>>>>> dev
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
   dependencies:
     hosted-git-info "^2.1.4"
@@ -954,11 +638,7 @@ normalize-package-data@^2.3.2:
 
 npm-run-all@^4.1.5:
   version "4.1.5"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba"
-=======
   resolved "https://registry.npmmirror.com/npm-run-all/-/npm-run-all-4.1.5.tgz"
->>>>>>> dev
   integrity sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==
   dependencies:
     ansi-styles "^3.2.1"
@@ -973,29 +653,17 @@ npm-run-all@^4.1.5:
 
 object-inspect@^1.13.3:
   version "1.13.4"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213"
-=======
   resolved "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.4.tgz"
->>>>>>> dev
   integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==
 
 object-keys@^1.1.1:
   version "1.1.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-=======
   resolved "https://registry.npmmirror.com/object-keys/-/object-keys-1.1.1.tgz"
->>>>>>> dev
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
 object.assign@^4.1.7:
   version "4.1.7"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/object.assign/-/object.assign-4.1.7.tgz#8c14ca1a424c6a561b0bb2a22f66f5049a945d3d"
-=======
   resolved "https://registry.npmmirror.com/object.assign/-/object.assign-4.1.7.tgz"
->>>>>>> dev
   integrity sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==
   dependencies:
     call-bind "^1.0.8"
@@ -1007,11 +675,7 @@ object.assign@^4.1.7:
 
 own-keys@^1.0.1:
   version "1.0.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/own-keys/-/own-keys-1.0.1.tgz#e4006910a2bf913585289676eebd6f390cf51358"
-=======
   resolved "https://registry.npmmirror.com/own-keys/-/own-keys-1.0.1.tgz"
->>>>>>> dev
   integrity sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==
   dependencies:
     get-intrinsic "^1.2.6"
@@ -1020,11 +684,7 @@ own-keys@^1.0.1:
 
 parse-json@^4.0.0:
   version "4.0.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-=======
   resolved "https://registry.npmmirror.com/parse-json/-/parse-json-4.0.0.tgz"
->>>>>>> dev
   integrity sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==
   dependencies:
     error-ex "^1.3.1"
@@ -1032,67 +692,39 @@ parse-json@^4.0.0:
 
 path-key@^2.0.1:
   version "2.0.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-=======
   resolved "https://registry.npmmirror.com/path-key/-/path-key-2.0.1.tgz"
->>>>>>> dev
   integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
 
 path-parse@^1.0.7:
   version "1.0.7"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
-=======
   resolved "https://registry.npmmirror.com/path-parse/-/path-parse-1.0.7.tgz"
->>>>>>> dev
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-type@^3.0.0:
   version "3.0.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-=======
   resolved "https://registry.npmmirror.com/path-type/-/path-type-3.0.0.tgz"
->>>>>>> dev
   integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
   dependencies:
     pify "^3.0.0"
 
 pidtree@^0.3.0:
   version "0.3.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a"
-=======
   resolved "https://registry.npmmirror.com/pidtree/-/pidtree-0.3.1.tgz"
->>>>>>> dev
   integrity sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==
 
 pify@^3.0.0:
   version "3.0.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-=======
   resolved "https://registry.npmmirror.com/pify/-/pify-3.0.0.tgz"
->>>>>>> dev
   integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
 
 possible-typed-array-names@^1.0.0:
   version "1.1.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz#93e3582bc0e5426586d9d07b79ee40fc841de4ae"
-=======
   resolved "https://registry.npmmirror.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz"
->>>>>>> dev
   integrity sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==
 
 read-pkg@^3.0.0:
   version "3.0.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-=======
   resolved "https://registry.npmmirror.com/read-pkg/-/read-pkg-3.0.0.tgz"
->>>>>>> dev
   integrity sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==
   dependencies:
     load-json-file "^4.0.0"
@@ -1101,11 +733,7 @@ read-pkg@^3.0.0:
 
 reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.9:
   version "1.0.10"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz#c629219e78a3316d8b604c765ef68996964e7bf9"
-=======
   resolved "https://registry.npmmirror.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz"
->>>>>>> dev
   integrity sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==
   dependencies:
     call-bind "^1.0.8"
@@ -1119,11 +747,7 @@ reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.9:
 
 regexp.prototype.flags@^1.5.3:
   version "1.5.4"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz#1ad6c62d44a259007e55b3970e00f746efbcaa19"
-=======
   resolved "https://registry.npmmirror.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz"
->>>>>>> dev
   integrity sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==
   dependencies:
     call-bind "^1.0.8"
@@ -1135,11 +759,7 @@ regexp.prototype.flags@^1.5.3:
 
 resolve@^1.10.0:
   version "1.22.10"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39"
-=======
   resolved "https://registry.npmmirror.com/resolve/-/resolve-1.22.10.tgz"
->>>>>>> dev
   integrity sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==
   dependencies:
     is-core-module "^2.16.0"
@@ -1148,11 +768,7 @@ resolve@^1.10.0:
 
 safe-array-concat@^1.1.3:
   version "1.1.3"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz#c9e54ec4f603b0bbb8e7e5007a5ee7aecd1538c3"
-=======
   resolved "https://registry.npmmirror.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz"
->>>>>>> dev
   integrity sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==
   dependencies:
     call-bind "^1.0.8"
@@ -1163,11 +779,7 @@ safe-array-concat@^1.1.3:
 
 safe-push-apply@^1.0.0:
   version "1.0.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/safe-push-apply/-/safe-push-apply-1.0.0.tgz#01850e981c1602d398c85081f360e4e6d03d27f5"
-=======
   resolved "https://registry.npmmirror.com/safe-push-apply/-/safe-push-apply-1.0.0.tgz"
->>>>>>> dev
   integrity sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==
   dependencies:
     es-errors "^1.3.0"
@@ -1175,11 +787,7 @@ safe-push-apply@^1.0.0:
 
 safe-regex-test@^1.1.0:
   version "1.1.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/safe-regex-test/-/safe-regex-test-1.1.0.tgz#7f87dfb67a3150782eaaf18583ff5d1711ac10c1"
-=======
   resolved "https://registry.npmmirror.com/safe-regex-test/-/safe-regex-test-1.1.0.tgz"
->>>>>>> dev
   integrity sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==
   dependencies:
     call-bound "^1.0.2"
@@ -1188,20 +796,12 @@ safe-regex-test@^1.1.0:
 
 "semver@2 || 3 || 4 || 5", semver@^5.5.0:
   version "5.7.2"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
-=======
   resolved "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz"
->>>>>>> dev
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
 set-function-length@^1.2.2:
   version "1.2.2"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
-=======
   resolved "https://registry.npmmirror.com/set-function-length/-/set-function-length-1.2.2.tgz"
->>>>>>> dev
   integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
   dependencies:
     define-data-property "^1.1.4"
@@ -1213,11 +813,7 @@ set-function-length@^1.2.2:
 
 set-function-name@^2.0.2:
   version "2.0.2"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985"
-=======
   resolved "https://registry.npmmirror.com/set-function-name/-/set-function-name-2.0.2.tgz"
->>>>>>> dev
   integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==
   dependencies:
     define-data-property "^1.1.4"
@@ -1227,11 +823,7 @@ set-function-name@^2.0.2:
 
 set-proto@^1.0.0:
   version "1.0.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/set-proto/-/set-proto-1.0.0.tgz#0760dbcff30b2d7e801fd6e19983e56da337565e"
-=======
   resolved "https://registry.npmmirror.com/set-proto/-/set-proto-1.0.0.tgz"
->>>>>>> dev
   integrity sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==
   dependencies:
     dunder-proto "^1.0.1"
@@ -1240,40 +832,24 @@ set-proto@^1.0.0:
 
 shebang-command@^1.2.0:
   version "1.2.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-=======
   resolved "https://registry.npmmirror.com/shebang-command/-/shebang-command-1.2.0.tgz"
->>>>>>> dev
   integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==
   dependencies:
     shebang-regex "^1.0.0"
 
 shebang-regex@^1.0.0:
   version "1.0.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-=======
   resolved "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-1.0.0.tgz"
->>>>>>> dev
   integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==
 
 shell-quote@^1.6.1:
   version "1.8.2"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/shell-quote/-/shell-quote-1.8.2.tgz#d2d83e057959d53ec261311e9e9b8f51dcb2934a"
-=======
   resolved "https://registry.npmmirror.com/shell-quote/-/shell-quote-1.8.2.tgz"
->>>>>>> dev
   integrity sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==
 
 side-channel-list@^1.0.0:
   version "1.0.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"
-=======
   resolved "https://registry.npmmirror.com/side-channel-list/-/side-channel-list-1.0.0.tgz"
->>>>>>> dev
   integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==
   dependencies:
     es-errors "^1.3.0"
@@ -1281,11 +857,7 @@ side-channel-list@^1.0.0:
 
 side-channel-map@^1.0.1:
   version "1.0.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/side-channel-map/-/side-channel-map-1.0.1.tgz#d6bb6b37902c6fef5174e5f533fab4c732a26f42"
-=======
   resolved "https://registry.npmmirror.com/side-channel-map/-/side-channel-map-1.0.1.tgz"
->>>>>>> dev
   integrity sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==
   dependencies:
     call-bound "^1.0.2"
@@ -1295,11 +867,7 @@ side-channel-map@^1.0.1:
 
 side-channel-weakmap@^1.0.2:
   version "1.0.2"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz#11dda19d5368e40ce9ec2bdc1fb0ecbc0790ecea"
-=======
   resolved "https://registry.npmmirror.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz"
->>>>>>> dev
   integrity sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==
   dependencies:
     call-bound "^1.0.2"
@@ -1310,11 +878,7 @@ side-channel-weakmap@^1.0.2:
 
 side-channel@^1.1.0:
   version "1.1.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9"
-=======
   resolved "https://registry.npmmirror.com/side-channel/-/side-channel-1.1.0.tgz"
->>>>>>> dev
   integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==
   dependencies:
     es-errors "^1.3.0"
@@ -1325,11 +889,7 @@ side-channel@^1.1.0:
 
 spdx-correct@^3.0.0:
   version "3.2.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
-=======
   resolved "https://registry.npmmirror.com/spdx-correct/-/spdx-correct-3.2.0.tgz"
->>>>>>> dev
   integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==
   dependencies:
     spdx-expression-parse "^3.0.0"
@@ -1337,20 +897,12 @@ spdx-correct@^3.0.0:
 
 spdx-exceptions@^2.1.0:
   version "2.5.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz#5d607d27fc806f66d7b64a766650fa890f04ed66"
-=======
   resolved "https://registry.npmmirror.com/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz"
->>>>>>> dev
   integrity sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==
 
 spdx-expression-parse@^3.0.0:
   version "3.0.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
-=======
   resolved "https://registry.npmmirror.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"
->>>>>>> dev
   integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
   dependencies:
     spdx-exceptions "^2.1.0"
@@ -1358,20 +910,12 @@ spdx-expression-parse@^3.0.0:
 
 spdx-license-ids@^3.0.0:
   version "3.0.21"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz#6d6e980c9df2b6fc905343a3b2d702a6239536c3"
-=======
   resolved "https://registry.npmmirror.com/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz"
->>>>>>> dev
   integrity sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==
 
 string.prototype.padend@^3.0.0:
   version "3.1.6"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/string.prototype.padend/-/string.prototype.padend-3.1.6.tgz#ba79cf8992609a91c872daa47c6bb144ee7f62a5"
-=======
   resolved "https://registry.npmmirror.com/string.prototype.padend/-/string.prototype.padend-3.1.6.tgz"
->>>>>>> dev
   integrity sha512-XZpspuSB7vJWhvJc9DLSlrXl1mcA2BdoY5jjnS135ydXqLoqhs96JjDtCkjJEQHvfqZIp9hBuBMgI589peyx9Q==
   dependencies:
     call-bind "^1.0.7"
@@ -1381,11 +925,7 @@ string.prototype.padend@^3.0.0:
 
 string.prototype.trim@^1.2.10:
   version "1.2.10"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz#40b2dd5ee94c959b4dcfb1d65ce72e90da480c81"
-=======
   resolved "https://registry.npmmirror.com/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz"
->>>>>>> dev
   integrity sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==
   dependencies:
     call-bind "^1.0.8"
@@ -1398,11 +938,7 @@ string.prototype.trim@^1.2.10:
 
 string.prototype.trimend@^1.0.9:
   version "1.0.9"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz#62e2731272cd285041b36596054e9f66569b6942"
-=======
   resolved "https://registry.npmmirror.com/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz"
->>>>>>> dev
   integrity sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==
   dependencies:
     call-bind "^1.0.8"
@@ -1412,11 +948,7 @@ string.prototype.trimend@^1.0.9:
 
 string.prototype.trimstart@^1.0.8:
   version "1.0.8"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz#7ee834dda8c7c17eff3118472bb35bfedaa34dde"
-=======
   resolved "https://registry.npmmirror.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz"
->>>>>>> dev
   integrity sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==
   dependencies:
     call-bind "^1.0.7"
@@ -1425,40 +957,24 @@ string.prototype.trimstart@^1.0.8:
 
 strip-bom@^3.0.0:
   version "3.0.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-=======
   resolved "https://registry.npmmirror.com/strip-bom/-/strip-bom-3.0.0.tgz"
->>>>>>> dev
   integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
 
 supports-color@^5.3.0:
   version "5.5.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-=======
   resolved "https://registry.npmmirror.com/supports-color/-/supports-color-5.5.0.tgz"
->>>>>>> dev
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
-=======
   resolved "https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"
->>>>>>> dev
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
 typed-array-buffer@^1.0.3:
   version "1.0.3"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz#a72395450a4869ec033fd549371b47af3a2ee536"
-=======
   resolved "https://registry.npmmirror.com/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz"
->>>>>>> dev
   integrity sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==
   dependencies:
     call-bound "^1.0.3"
@@ -1467,11 +983,7 @@ typed-array-buffer@^1.0.3:
 
 typed-array-byte-length@^1.0.3:
   version "1.0.3"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz#8407a04f7d78684f3d252aa1a143d2b77b4160ce"
-=======
   resolved "https://registry.npmmirror.com/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz"
->>>>>>> dev
   integrity sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==
   dependencies:
     call-bind "^1.0.8"
@@ -1482,11 +994,7 @@ typed-array-byte-length@^1.0.3:
 
 typed-array-byte-offset@^1.0.4:
   version "1.0.4"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz#ae3698b8ec91a8ab945016108aef00d5bff12355"
-=======
   resolved "https://registry.npmmirror.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz"
->>>>>>> dev
   integrity sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==
   dependencies:
     available-typed-arrays "^1.0.7"
@@ -1499,11 +1007,7 @@ typed-array-byte-offset@^1.0.4:
 
 typed-array-length@^1.0.7:
   version "1.0.7"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/typed-array-length/-/typed-array-length-1.0.7.tgz#ee4deff984b64be1e118b0de8c9c877d5ce73d3d"
-=======
   resolved "https://registry.npmmirror.com/typed-array-length/-/typed-array-length-1.0.7.tgz"
->>>>>>> dev
   integrity sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==
   dependencies:
     call-bind "^1.0.7"
@@ -1515,11 +1019,7 @@ typed-array-length@^1.0.7:
 
 unbox-primitive@^1.1.0:
   version "1.1.0"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/unbox-primitive/-/unbox-primitive-1.1.0.tgz#8d9d2c9edeea8460c7f35033a88867944934d1e2"
-=======
   resolved "https://registry.npmmirror.com/unbox-primitive/-/unbox-primitive-1.1.0.tgz"
->>>>>>> dev
   integrity sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==
   dependencies:
     call-bound "^1.0.3"
@@ -1529,11 +1029,7 @@ unbox-primitive@^1.1.0:
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
-=======
   resolved "https://registry.npmmirror.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"
->>>>>>> dev
   integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
@@ -1541,11 +1037,7 @@ validate-npm-package-license@^3.0.1:
 
 which-boxed-primitive@^1.1.0, which-boxed-primitive@^1.1.1:
   version "1.1.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz#d76ec27df7fa165f18d5808374a5fe23c29b176e"
-=======
   resolved "https://registry.npmmirror.com/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz"
->>>>>>> dev
   integrity sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==
   dependencies:
     is-bigint "^1.1.0"
@@ -1556,11 +1048,7 @@ which-boxed-primitive@^1.1.0, which-boxed-primitive@^1.1.1:
 
 which-builtin-type@^1.2.1:
   version "1.2.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/which-builtin-type/-/which-builtin-type-1.2.1.tgz#89183da1b4907ab089a6b02029cc5d8d6574270e"
-=======
   resolved "https://registry.npmmirror.com/which-builtin-type/-/which-builtin-type-1.2.1.tgz"
->>>>>>> dev
   integrity sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==
   dependencies:
     call-bound "^1.0.2"
@@ -1579,11 +1067,7 @@ which-builtin-type@^1.2.1:
 
 which-collection@^1.0.2:
   version "1.0.2"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/which-collection/-/which-collection-1.0.2.tgz#627ef76243920a107e7ce8e96191debe4b16c2a0"
-=======
   resolved "https://registry.npmmirror.com/which-collection/-/which-collection-1.0.2.tgz"
->>>>>>> dev
   integrity sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==
   dependencies:
     is-map "^2.0.3"
@@ -1593,11 +1077,7 @@ which-collection@^1.0.2:
 
 which-typed-array@^1.1.16, which-typed-array@^1.1.18:
   version "1.1.19"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/which-typed-array/-/which-typed-array-1.1.19.tgz#df03842e870b6b88e117524a4b364b6fc689f956"
-=======
   resolved "https://registry.npmmirror.com/which-typed-array/-/which-typed-array-1.1.19.tgz"
->>>>>>> dev
   integrity sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==
   dependencies:
     available-typed-arrays "^1.0.7"
@@ -1610,11 +1090,7 @@ which-typed-array@^1.1.16, which-typed-array@^1.1.18:
 
 which@^1.2.9:
   version "1.3.1"
-<<<<<<< HEAD
-  resolved "https://registry.npmmirror.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-=======
   resolved "https://registry.npmmirror.com/which/-/which-1.3.1.tgz"
->>>>>>> dev
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"