Merge branch 'develop' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin into develop

* 'develop' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin:
  no message
  no message

package-lock.json

@@ -8840,11 +8840,6 @@
         "zrender": "5.5.0"
       }
     },
-    "echarts-china-cities-js": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmmirror.com/echarts-china-cities-js/-/echarts-china-cities-js-0.1.1.tgz",
-      "integrity": "sha512-Xc7ShyUCaKeS5JHLygvpdZQ6A2nPN8MdVSMLMJhnl7Inatu1eRCJ6DtkeN4WtrjjpRmFYuQfYxKJ2K6Nb+3KLg=="
-    },
     "editorconfig": {
       "version": "0.15.3",
       "resolved": "https://registry.npmmirror.com/editorconfig/-/editorconfig-0.15.3.tgz",

package.json

@@ -27,7 +27,6 @@
     "concurrent-tasks": "^1.0.7",
     "core-js": "^3.6.5",
     "echarts": "^5.5.0",
-    "echarts-china-cities-js": "^0.1.1",
     "file-saver": "^2.0.5",
     "html2canvas": "^1.4.1",
     "js-cookie": "2.2.0",

src/views/bigViews/dataView1/components/trendChart.vue

@@ -126,9 +126,9 @@ export default {
         },
         yAxis: [
           {
-            min: minY,
-            max: maxY,
-            interval: interval,
+            // min: minY,
+            // max: maxY,
+            // interval: interval,
             type: 'value',
             name: '人（次）',
             nameTextStyle: {