首页 发现 帮助
登录
xuyunhui
/
E-commerce
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

Merge branch 'dev' of http://gogs.gzzzyd.com/xiaowenhua/vueDataV into dev

Cooklalala 11 月之前
父节点
973c3cfea1 805bd885eb
当前提交
4bc1e7c1d8
共有 11 个文件被更改，包括 145 次插入 和 17 次删除
分列视图 显示文件统计
  1. 3 3
      mm/mm.config.js
  2. 1 1
      package.json
  3. 10 0
      public/animate.min.css
  4. 1 0
      public/axios.min.js
  5. 0 0
      public/echarts-gl.min.js
  6. 0 0
      public/echarts-liquidfill.min.js
  7. 34 0
      public/echarts.min.js
  8. 6 6
      public/index.html
  9. 3 0
      public/jquery.min.js
  10. 1 1
      src/views/page3/leftBox2.vue
  11. 86 6
      yarn.lock

+ 3 - 3
mm/mm.config.js
查看文件 

@@ -233,7 +233,7 @@ module.exports = async (util) => {
 
           )
 
         },
 
       }),
 
-      'get /base': util.side({
 
+      'get /api/base': util.side({
 
         tags: [`增删改查`, `种植分析`, `种值分析详情`],
 
         summary: `基地 crud`,
 
         schema: {
 
@@ -250,7 +250,7 @@ module.exports = async (util) => {
 
             .description(`搜索项`),
 
         },
 
         async action(req, res, next) {
 
-          next()
 
+          res.redirect(req.originalUrl.replace(`/api`, ``))
 
         },
 
       }),
 
       'get /api/holePunchingMachine': util.side({
 
@@ -265,7 +265,7 @@ module.exports = async (util) => {
 
             .description(`搜索项`),
 
         },
 
         async action(req, res, next) {
 
-          next()
 
+          res.redirect(req.originalUrl.replace(`/api`, ``))
 
         },
 
       }),
 
       'get /api/transplantAreaInEachRegion2': util.side({

+ 1 - 1
package.json
查看文件 

@@ -39,7 +39,7 @@
 
     "eslint-plugin-vue": "^6.2.2",
 
     "less": "^4.2.0",
 
     "less-loader": "6.x",
 
-    "mockm": "^1.1.27-alpha.9",
 
+    "mockm": "^1.1.27-alpha.10",
 
     "node-sass": "^4.13.1",
 
     "prettier": "^2.2.1",
 
     "sass-loader": "^8.0.2",

文件差异内容过多而无法显示
+ 10 - 0
public/animate.min.css


文件差异内容过多而无法显示
+ 1 - 0
public/axios.min.js


文件差异内容过多而无法显示
+ 0 - 0
public/echarts-gl.min.js


文件差异内容过多而无法显示
+ 0 - 0
public/echarts-liquidfill.min.js


文件差异内容过多而无法显示
+ 34 - 0
public/echarts.min.js


+ 6 - 6
public/index.html
查看文件 

@@ -8,12 +8,12 @@
 
     <title><%= htmlWebpackPlugin.options.title %></title>
 
   </head>
 
   <body>
 
-    <script src="//cdn.staticfile.org/jquery/1.10.2/jquery.min.js"></script>
 
-    <script src="//cdn.jsdelivr.net/npm/echarts/dist/echarts.min.js"></script>
 
-    <script src="//cdn.jsdelivr.net/npm/echarts-gl/dist/echarts-gl.min.js"></script>
 
-    <script src="//cdn.jsdelivr.net/npm/echarts-liquidfill@3.1.0/dist/echarts-liquidfill.min.js"></script>
 
-    <script src="//cdn.staticfile.org/axios/0.19.0/axios.min.js"></script>
 
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.2/animate.min.css">
 
+    <script src="<%= BASE_URL %>jquery.min.js"></script>
 
+    <script src="<%= BASE_URL %>echarts.min.js"></script>
 
+    <script src="<%= BASE_URL %>echarts-gl.min.js"></script>
 
+    <script src="<%= BASE_URL %>echarts-liquidfill.min.js"></script>
 
+    <script src="<%= BASE_URL %>axios.min.js"></script>
 
+    <link rel="stylesheet" href="<%= BASE_URL %>animate.min.css">
 
     <noscript>
 
       <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
 
     </noscript>

文件差异内容过多而无法显示
+ 3 - 0
public/jquery.min.js


+ 1 - 1
src/views/page3/leftBox2.vue
查看文件 

@@ -61,7 +61,7 @@ export default {
 
   methods: {
 
     async infoFn() {
 
       const baseId = this.$route.query.baseId || 1
 
-      const data = await this.$http.get(`/base/${baseId}`)
 
+      const data = await this.$http.get(`/api/base/${baseId}`)
 
       this.leftBox = data
 
       this.leftBox.天气图标 =
 
         getWeather(this.leftBox.天气).icon || `icon-duoyun`

+ 86 - 6
yarn.lock
查看文件 

@@ -2659,6 +2659,11 @@
 
   resolved "https://registry.npmmirror.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"

   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==

 

+"@yarnpkg/lockfile@^1.1.0":

+  version "1.1.0"

+  resolved "https://registry.npmmirror.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"

+  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==

+

 a-sync-waterfall@^1.0.0:

   version "1.0.1"

   resolved "https://registry.npmmirror.com/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz#75b6b6aa72598b497a125e7a2770f14f4c8a1fa7"

@@ -3658,6 +3663,11 @@ ci-info@^1.5.0:
 
   resolved "https://registry.npmmirror.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"

   integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==

 

+ci-info@^3.7.0:

+  version "3.9.0"

+  resolved "https://registry.npmmirror.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"

+  integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==

+

 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:

   version "1.0.5"

   resolved "https://registry.npmmirror.com/cipher-base/-/cipher-base-1.0.5.tgz#749f80731c7821e9a5fabd51f6998b696f296686"

@@ -5438,6 +5448,13 @@ find-up@^4.0.0, find-up@^4.1.0:
 
     locate-path "^5.0.0"

     path-exists "^4.0.0"

 

+find-yarn-workspace-root@^2.0.0:

+  version "2.0.0"

+  resolved "https://registry.npmmirror.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd"

+  integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==

+  dependencies:

+    micromatch "^4.0.2"

+

 flat-cache@^2.0.1:

   version "2.0.1"

   resolved "https://registry.npmmirror.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"

@@ -5535,7 +5552,7 @@ from2@^2.1.0:
 
     inherits "^2.0.1"

     readable-stream "^2.0.0"

 

-fs-extra@^9.1.0:

+fs-extra@^9.0.0, fs-extra@^9.1.0:

   version "9.1.0"

   resolved "https://registry.npmmirror.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"

   integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==

@@ -6830,6 +6847,16 @@ json-stable-stringify-without-jsonify@^1.0.1:
 
   resolved "https://registry.npmmirror.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"

   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==

 

+json-stable-stringify@^1.0.2:

+  version "1.1.1"

+  resolved "https://registry.npmmirror.com/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz#52d4361b47d49168bcc4e564189a42e5a7439454"

+  integrity sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==

+  dependencies:

+    call-bind "^1.0.5"

+    isarray "^2.0.5"

+    jsonify "^0.0.1"

+    object-keys "^1.1.1"

+

 json-stringify-safe@~5.0.1:

   version "5.0.1"

   resolved "https://registry.npmmirror.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"

@@ -6856,6 +6883,11 @@ jsonfile@^6.0.1:
 
   optionalDependencies:

     graceful-fs "^4.1.6"

 

+jsonify@^0.0.1:

+  version "0.0.1"

+  resolved "https://registry.npmmirror.com/jsonify/-/jsonify-0.0.1.tgz#2aa3111dae3d34a0f151c63f3a45d995d9420978"

+  integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==

+

 jsprim@^1.2.2:

   version "1.4.2"

   resolved "https://registry.npmmirror.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"

@@ -6892,6 +6924,13 @@ kind-of@^6.0.2:
 
   resolved "https://registry.npmmirror.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"

   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==

 

+klaw-sync@^6.0.0:

+  version "6.0.0"

+  resolved "https://registry.npmmirror.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c"

+  integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==

+  dependencies:

+    graceful-fs "^4.1.11"

+

 klona@^2.0.5:

   version "2.0.6"

   resolved "https://registry.npmmirror.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22"

@@ -7517,10 +7556,10 @@ mlly@^1.7.1, mlly@^1.7.2, mlly@^1.7.3:
 
     pkg-types "^1.2.1"

     ufo "^1.5.4"

 

-mockm@^1.1.27-alpha.9:

-  version "1.1.27-alpha.9"

-  resolved "https://registry.npmmirror.com/mockm/-/mockm-1.1.27-alpha.9.tgz#515425bce661c750a8792f197f69feced4655454"

-  integrity sha512-DDFfTZ3lamyPR8EP0LS12tbgpre4jNMIac6wRpADcDmkE8SfsS4dkdvs/JTfW2sfvvHBOM8E9ITAElbLM+mnXg==

+mockm@^1.1.27-alpha.10:

+  version "1.1.27-alpha.10"

+  resolved "https://registry.npmmirror.com/mockm/-/mockm-1.1.27-alpha.10.tgz#c2aef02a1b6f18ba1b50561cf90e16c1e77a95aa"

+  integrity sha512-9BckBQ3dn/uKIbXXXxt2mJuxQqA5rM32wnd0m9br72Xvx+WhGXFObTevi/IxEWMAKiRzjUQxB2PDkH++qCpdLA==

   dependencies:

     "@babel/runtime-corejs3" "^7.17.2"

     "@httptoolkit/httpolyglot" "^2.1.0"

@@ -7545,7 +7584,9 @@ mockm@^1.1.27-alpha.9:
 
     mime "^3.0.0"

     morgan "^1.10.0"

     node-http-proxy-json "^0.1.9"

+    patch-package "^8.0.0"

     path-to-regexp "0.1.7"

+    postinstall-postinstall "^2.1.0"

     vm2 "^3.9.12"

     whatnpm "^1.0.0"

   optionalDependencies:

@@ -8029,6 +8070,14 @@ open@^6.3.0:
 
   dependencies:

     is-wsl "^1.1.0"

 

+open@^7.4.2:

+  version "7.4.2"

+  resolved "https://registry.npmmirror.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"

+  integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==

+  dependencies:

+    is-docker "^2.0.0"

+    is-wsl "^2.1.1"

+

 open@^8.0.2, open@^8.0.9:

   version "8.4.2"

   resolved "https://registry.npmmirror.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"

@@ -8294,6 +8343,27 @@ pascalcase@^0.1.1:
 
   resolved "https://registry.npmmirror.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"

   integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==

 

+patch-package@^8.0.0:

+  version "8.0.0"

+  resolved "https://registry.npmmirror.com/patch-package/-/patch-package-8.0.0.tgz#d191e2f1b6e06a4624a0116bcb88edd6714ede61"

+  integrity sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==

+  dependencies:

+    "@yarnpkg/lockfile" "^1.1.0"

+    chalk "^4.1.2"

+    ci-info "^3.7.0"

+    cross-spawn "^7.0.3"

+    find-yarn-workspace-root "^2.0.0"

+    fs-extra "^9.0.0"

+    json-stable-stringify "^1.0.2"

+    klaw-sync "^6.0.0"

+    minimist "^1.2.6"

+    open "^7.4.2"

+    rimraf "^2.6.3"

+    semver "^7.5.3"

+    slash "^2.0.0"

+    tmp "^0.0.33"

+    yaml "^2.2.2"

+

 path-browserify@0.0.1:

   version "0.0.1"

   resolved "https://registry.npmmirror.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"

@@ -8814,6 +8884,11 @@ postcss@^8.2.6, postcss@^8.3.5, postcss@^8.4.14, postcss@^8.4.31, postcss@^8.4.3
 
     picocolors "^1.1.1"

     source-map-js "^1.2.1"

 

+postinstall-postinstall@^2.1.0:

+  version "2.1.0"

+  resolved "https://registry.npmmirror.com/postinstall-postinstall/-/postinstall-postinstall-2.1.0.tgz#4f7f77441ef539d1512c40bd04c71b06a4704ca3"

+  integrity sha512-7hQX6ZlZXIoRiWNrbMQaLzUUfH+sSx39u8EJ9HYuDc1kLo9IXKWjM5RSquZN1ad5GnH8CGFM78fsAAQi3OKEEQ==

+

 prelude-ls@~1.1.2:

   version "1.1.2"

   resolved "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"

@@ -9535,7 +9610,7 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1:
 
   resolved "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"

   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==

 

-semver@^7.3.4, semver@^7.3.5, semver@^7.5.4:

+semver@^7.3.4, semver@^7.3.5, semver@^7.5.3, semver@^7.5.4:

   version "7.6.3"

   resolved "https://registry.npmmirror.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"

   integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==

@@ -11385,6 +11460,11 @@ yaml@1.10.2, yaml@^1.10.0, yaml@^1.10.2:
 
   resolved "https://registry.npmmirror.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"

   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==

 

+yaml@^2.2.2:

+  version "2.6.1"

+  resolved "https://registry.npmmirror.com/yaml/-/yaml-2.6.1.tgz#42f2b1ba89203f374609572d5349fb8686500773"

+  integrity sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==

+

 yamljs@^0.3.0:

   version "0.3.0"

   resolved "https://registry.npmmirror.com/yamljs/-/yamljs-0.3.0.tgz#dc060bf267447b39f7304e9b2bfbe8b5a7ddb03b"

部分文件因为文件数量过多而无法显示