seimin 1 nedēļu atpakaļ
vecāks
revīzija
e7f9247d37
3 mainītis faili ar 153 papildinājumiem un 6 dzēšanām
  1. 149 4
      package-lock.json
  2. 2 1
      package.json
  3. 2 1
      src/components/PriceProportion.vue

+ 149 - 4
package-lock.json

@@ -9,6 +9,7 @@
9
       "version": "0.1.0",
9
       "version": "0.1.0",
10
       "dependencies": {
10
       "dependencies": {
11
         "axios": "^0.19.2",
11
         "axios": "^0.19.2",
12
+        "big.js": "^7.0.1",
12
         "core-js": "^3.6.5",
13
         "core-js": "^3.6.5",
13
         "echarts": "^4.0.4",
14
         "echarts": "^4.0.4",
14
         "moment": "^2.27.0",
15
         "moment": "^2.27.0",
@@ -3691,12 +3692,16 @@
3691
       }
3692
       }
3692
     },
3693
     },
3693
     "node_modules/big.js": {
3694
     "node_modules/big.js": {
3694
-      "version": "5.2.2",
3695
-      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
3696
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
3697
-      "dev": true,
3695
+      "version": "7.0.1",
3696
+      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-7.0.1.tgz",
3697
+      "integrity": "sha512-iFgV784tD8kq4ccF1xtNMZnXeZzVuXWWM+ERFzKQjv+A5G9HC8CY3DuV45vgzFFcW+u2tIvmF95+AzWgs6BjCg==",
3698
+      "license": "MIT",
3698
       "engines": {
3699
       "engines": {
3699
         "node": "*"
3700
         "node": "*"
3701
+      },
3702
+      "funding": {
3703
+        "type": "opencollective",
3704
+        "url": "https://opencollective.com/bigjs"
3700
       }
3705
       }
3701
     },
3706
     },
3702
     "node_modules/binary-extensions": {
3707
     "node_modules/binary-extensions": {
@@ -4113,6 +4118,16 @@
4113
         "webpack": "^4.0.0"
4118
         "webpack": "^4.0.0"
4114
       }
4119
       }
4115
     },
4120
     },
4121
+    "node_modules/cache-loader/node_modules/big.js": {
4122
+      "version": "5.2.2",
4123
+      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
4124
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
4125
+      "dev": true,
4126
+      "license": "MIT",
4127
+      "engines": {
4128
+        "node": "*"
4129
+      }
4130
+    },
4116
     "node_modules/cache-loader/node_modules/json5": {
4131
     "node_modules/cache-loader/node_modules/json5": {
4117
       "version": "1.0.2",
4132
       "version": "1.0.2",
4118
       "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
4133
       "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
@@ -4947,6 +4962,16 @@
4947
         "webpack": "^4.0.0 || ^5.0.0"
4962
         "webpack": "^4.0.0 || ^5.0.0"
4948
       }
4963
       }
4949
     },
4964
     },
4965
+    "node_modules/copy-webpack-plugin/node_modules/big.js": {
4966
+      "version": "5.2.2",
4967
+      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
4968
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
4969
+      "dev": true,
4970
+      "license": "MIT",
4971
+      "engines": {
4972
+        "node": "*"
4973
+      }
4974
+    },
4950
     "node_modules/copy-webpack-plugin/node_modules/find-cache-dir": {
4975
     "node_modules/copy-webpack-plugin/node_modules/find-cache-dir": {
4951
       "version": "2.1.0",
4976
       "version": "2.1.0",
4952
       "resolved": "https://registry.npmmirror.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
4977
       "resolved": "https://registry.npmmirror.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
@@ -5324,6 +5349,16 @@
5324
         "webpack": "^4.0.0 || ^5.0.0"
5349
         "webpack": "^4.0.0 || ^5.0.0"
5325
       }
5350
       }
5326
     },
5351
     },
5352
+    "node_modules/css-loader/node_modules/big.js": {
5353
+      "version": "5.2.2",
5354
+      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
5355
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
5356
+      "dev": true,
5357
+      "license": "MIT",
5358
+      "engines": {
5359
+        "node": "*"
5360
+      }
5361
+    },
5327
     "node_modules/css-loader/node_modules/camelcase": {
5362
     "node_modules/css-loader/node_modules/camelcase": {
5328
       "version": "5.3.1",
5363
       "version": "5.3.1",
5329
       "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz",
5364
       "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz",
@@ -6662,6 +6697,16 @@
6662
         "webpack": ">=2.0.0 <5.0.0"
6697
         "webpack": ">=2.0.0 <5.0.0"
6663
       }
6698
       }
6664
     },
6699
     },
6700
+    "node_modules/eslint-loader/node_modules/big.js": {
6701
+      "version": "5.2.2",
6702
+      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
6703
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
6704
+      "dev": true,
6705
+      "license": "MIT",
6706
+      "engines": {
6707
+        "node": "*"
6708
+      }
6709
+    },
6665
     "node_modules/eslint-loader/node_modules/json5": {
6710
     "node_modules/eslint-loader/node_modules/json5": {
6666
       "version": "1.0.2",
6711
       "version": "1.0.2",
6667
       "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
6712
       "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
@@ -7535,6 +7580,16 @@
7535
         "webpack": "^4.0.0"
7580
         "webpack": "^4.0.0"
7536
       }
7581
       }
7537
     },
7582
     },
7583
+    "node_modules/file-loader/node_modules/big.js": {
7584
+      "version": "5.2.2",
7585
+      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
7586
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
7587
+      "dev": true,
7588
+      "license": "MIT",
7589
+      "engines": {
7590
+        "node": "*"
7591
+      }
7592
+    },
7538
     "node_modules/file-loader/node_modules/json5": {
7593
     "node_modules/file-loader/node_modules/json5": {
7539
       "version": "1.0.2",
7594
       "version": "1.0.2",
7540
       "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
7595
       "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
@@ -9810,6 +9865,16 @@
9810
         "webpack": "^2.0.0 || ^3.0.0 || ^4.0.0"
9865
         "webpack": "^2.0.0 || ^3.0.0 || ^4.0.0"
9811
       }
9866
       }
9812
     },
9867
     },
9868
+    "node_modules/less-loader/node_modules/big.js": {
9869
+      "version": "5.2.2",
9870
+      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
9871
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
9872
+      "dev": true,
9873
+      "license": "MIT",
9874
+      "engines": {
9875
+        "node": "*"
9876
+      }
9877
+    },
9813
     "node_modules/less-loader/node_modules/json5": {
9878
     "node_modules/less-loader/node_modules/json5": {
9814
       "version": "1.0.2",
9879
       "version": "1.0.2",
9815
       "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
9880
       "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
@@ -9963,6 +10028,16 @@
9963
         "node": ">=8.9.0"
10028
         "node": ">=8.9.0"
9964
       }
10029
       }
9965
     },
10030
     },
10031
+    "node_modules/loader-utils/node_modules/big.js": {
10032
+      "version": "5.2.2",
10033
+      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
10034
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
10035
+      "dev": true,
10036
+      "license": "MIT",
10037
+      "engines": {
10038
+        "node": "*"
10039
+      }
10040
+    },
9966
     "node_modules/locate-path": {
10041
     "node_modules/locate-path": {
9967
       "version": "5.0.0",
10042
       "version": "5.0.0",
9968
       "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
10043
       "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
@@ -10282,6 +10357,16 @@
10282
         "webpack": "^4.4.0"
10357
         "webpack": "^4.4.0"
10283
       }
10358
       }
10284
     },
10359
     },
10360
+    "node_modules/mini-css-extract-plugin/node_modules/big.js": {
10361
+      "version": "5.2.2",
10362
+      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
10363
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
10364
+      "dev": true,
10365
+      "license": "MIT",
10366
+      "engines": {
10367
+        "node": "*"
10368
+      }
10369
+    },
10285
     "node_modules/mini-css-extract-plugin/node_modules/json5": {
10370
     "node_modules/mini-css-extract-plugin/node_modules/json5": {
10286
       "version": "1.0.2",
10371
       "version": "1.0.2",
10287
       "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
10372
       "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
@@ -11725,6 +11810,16 @@
11725
         "node": ">= 6"
11810
         "node": ">= 6"
11726
       }
11811
       }
11727
     },
11812
     },
11813
+    "node_modules/postcss-loader/node_modules/big.js": {
11814
+      "version": "5.2.2",
11815
+      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
11816
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
11817
+      "dev": true,
11818
+      "license": "MIT",
11819
+      "engines": {
11820
+        "node": "*"
11821
+      }
11822
+    },
11728
     "node_modules/postcss-loader/node_modules/json5": {
11823
     "node_modules/postcss-loader/node_modules/json5": {
11729
       "version": "1.0.2",
11824
       "version": "1.0.2",
11730
       "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
11825
       "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
@@ -14526,6 +14621,16 @@
14526
         "webpack": "^2.0.0 || ^3.0.0 || ^4.0.0"
14621
         "webpack": "^2.0.0 || ^3.0.0 || ^4.0.0"
14527
       }
14622
       }
14528
     },
14623
     },
14624
+    "node_modules/thread-loader/node_modules/big.js": {
14625
+      "version": "5.2.2",
14626
+      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
14627
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
14628
+      "dev": true,
14629
+      "license": "MIT",
14630
+      "engines": {
14631
+        "node": "*"
14632
+      }
14633
+    },
14529
     "node_modules/thread-loader/node_modules/json5": {
14634
     "node_modules/thread-loader/node_modules/json5": {
14530
       "version": "1.0.2",
14635
       "version": "1.0.2",
14531
       "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
14636
       "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
@@ -15211,6 +15316,16 @@
15211
         }
15316
         }
15212
       }
15317
       }
15213
     },
15318
     },
15319
+    "node_modules/url-loader/node_modules/big.js": {
15320
+      "version": "5.2.2",
15321
+      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
15322
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
15323
+      "dev": true,
15324
+      "license": "MIT",
15325
+      "engines": {
15326
+        "node": "*"
15327
+      }
15328
+    },
15214
     "node_modules/url-loader/node_modules/json5": {
15329
     "node_modules/url-loader/node_modules/json5": {
15215
       "version": "1.0.2",
15330
       "version": "1.0.2",
15216
       "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
15331
       "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
@@ -15468,6 +15583,16 @@
15468
         }
15583
         }
15469
       }
15584
       }
15470
     },
15585
     },
15586
+    "node_modules/vue-loader/node_modules/big.js": {
15587
+      "version": "5.2.2",
15588
+      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
15589
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
15590
+      "dev": true,
15591
+      "license": "MIT",
15592
+      "engines": {
15593
+        "node": "*"
15594
+      }
15595
+    },
15471
     "node_modules/vue-loader/node_modules/hash-sum": {
15596
     "node_modules/vue-loader/node_modules/hash-sum": {
15472
       "version": "1.0.2",
15597
       "version": "1.0.2",
15473
       "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
15598
       "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
@@ -15515,6 +15640,16 @@
15515
         "loader-utils": "^1.0.2"
15640
         "loader-utils": "^1.0.2"
15516
       }
15641
       }
15517
     },
15642
     },
15643
+    "node_modules/vue-style-loader/node_modules/big.js": {
15644
+      "version": "5.2.2",
15645
+      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
15646
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
15647
+      "dev": true,
15648
+      "license": "MIT",
15649
+      "engines": {
15650
+        "node": "*"
15651
+      }
15652
+    },
15518
     "node_modules/vue-style-loader/node_modules/hash-sum": {
15653
     "node_modules/vue-style-loader/node_modules/hash-sum": {
15519
       "version": "1.0.2",
15654
       "version": "1.0.2",
15520
       "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
15655
       "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
@@ -16341,6 +16476,16 @@
16341
         "node": ">=0.4.0"
16476
         "node": ">=0.4.0"
16342
       }
16477
       }
16343
     },
16478
     },
16479
+    "node_modules/webpack/node_modules/big.js": {
16480
+      "version": "5.2.2",
16481
+      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
16482
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
16483
+      "dev": true,
16484
+      "license": "MIT",
16485
+      "engines": {
16486
+        "node": "*"
16487
+      }
16488
+    },
16344
     "node_modules/webpack/node_modules/enhanced-resolve": {
16489
     "node_modules/webpack/node_modules/enhanced-resolve": {
16345
       "version": "4.5.0",
16490
       "version": "4.5.0",
16346
       "resolved": "https://registry.npmmirror.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz",
16491
       "resolved": "https://registry.npmmirror.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz",

+ 2 - 1
package.json

@@ -5,13 +5,14 @@
5
   "scripts": {
5
   "scripts": {
6
     "start": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
6
     "start": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
7
     "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
7
     "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
8
-    "lint": "vue-cli-service lint --no-fix",
8
+    "lint": "vue-cli-service lint",
9
     "development": "node ./upload/development.js",
9
     "development": "node ./upload/development.js",
10
     "development120": "node ./upload/development120.js",
10
     "development120": "node ./upload/development120.js",
11
     "production": "node ./upload/production.js"
11
     "production": "node ./upload/production.js"
12
   },
12
   },
13
   "dependencies": {
13
   "dependencies": {
14
     "axios": "^0.19.2",
14
     "axios": "^0.19.2",
15
+    "big.js": "^7.0.1",
15
     "core-js": "^3.6.5",
16
     "core-js": "^3.6.5",
16
     "echarts": "^4.0.4",
17
     "echarts": "^4.0.4",
17
     "moment": "^2.27.0",
18
     "moment": "^2.27.0",

+ 2 - 1
src/components/PriceProportion.vue

@@ -5,6 +5,7 @@
5
 </template>
5
 </template>
6
 
6
 
7
 <script>
7
 <script>
8
+import Big from 'big.js'
8
 import echarts from 'echarts'
9
 import echarts from 'echarts'
9
 import { post, timerCommon } from './../http/http'
10
 import { post, timerCommon } from './../http/http'
10
 export default {
11
 export default {
@@ -113,7 +114,7 @@ export default {
113
           { name: '总工时', value: result.data[0].work_price || 0, percent: result.data[0].workPercent || '0%' },
114
           { name: '总工时', value: result.data[0].work_price || 0, percent: result.data[0].workPercent || '0%' },
114
           { name: '总耗材', value: result.data[0].sum_price || 0, percent: result.data[0].sumPercent || '0%' }
115
           { name: '总耗材', value: result.data[0].sum_price || 0, percent: result.data[0].sumPercent || '0%' }
115
         ]
116
         ]
116
-        this.total = this.gradeRankingList.reduce((pre, cur) => pre + cur.value, 0)
117
+        this.total = this.gradeRankingList.reduce((pre, cur) => Big(pre).plus(cur.value), 0)
117
       } else {
118
       } else {
118
         this.gradeRankingList = []
119
         this.gradeRankingList = []
119
         this.total = 0
120
         this.total = 0