diff --git a/package.json b/package.json
index 656a2b4..8094f91 100644
--- a/package.json
+++ b/package.json
@@ -24,14 +24,15 @@
"clipboard": "1.7.1",
"codemirror": "^5.38.0",
"connect": "3.6.6",
+ "mathjs": "12.4.2",
"echarts": "^4.1.0",
"element-ui": "^2.15.11",
- "moment": "^2.25.3",
"file-saver": "1.3.8",
"js-cookie": "2.2.0",
"jsencrypt": "^3.0.0-rc.1",
"jszip": "3.1.5",
"mavon-editor": "^2.7.0",
+ "moment": "^2.25.3",
"node-sass": "^6.0.1",
"normalize.css": "7.0.0",
"nprogress": "0.2.0",
@@ -72,7 +73,6 @@
"html-webpack-plugin": "^3.0.0",
"mini-css-extract-plugin": "0.4.1",
"node-notifier": "5.2.1",
-
"optimize-css-assets-webpack-plugin": "5.0.0",
"ora": "3.0.0",
"portfinder": "1.0.16",
diff --git a/src/views/newproject/list.vue b/src/views/newproject/list.vue
index 91a75c9..9740af9 100644
--- a/src/views/newproject/list.vue
+++ b/src/views/newproject/list.vue
@@ -110,17 +110,34 @@
{{ scope.row.projectCost }}
-
+
- {{ scope.row.projectProfit }}
+
+ {{ maolirun(scope.row) }}
+
+
-
+
- {{ scope.row.projectProfitRate }}
+ {{ maolirunlv(scope.row) }}
+
+
+
+
+ {{ fapiaochengben(scope.row) }}
+
+
+
+
+ {{ jinglirun(scope.row) }}
+
+
+
+
+ {{ jinglirunlv(scope.row) }}
-
0) {
+ return data3.toFixed(2) + "%";
+ } else {
+ return 0;
+ }
+ },
+ fapiaochengben(row) {
+ const data1 = this.$math.multiply(row.xpGuessget, 0.08);
+ return data1.toFixed(2);
+ },
+ jinglirun(row) {
+ const data1 = this.maolirun(row);
+ const data2 = this.fapiaochengben(row);
+ const data3 = this.$math.subtract(data1, data2);
+ return data3.toFixed(2);
+ },
+ jinglirunlv(row) {
+ const data1 = this.jinglirun(row);
+ const data2 = this.$math.divide(data1, row.xpGuessget);
+ const data4 = this.$math.multiply(data2, 100);
+ if (row.xpGuessget > 0) {
+ return data4.toFixed(2) + "%";
+ } else {
+ return 0;
+ }
+ },
// 搜索
searchBtn() {
this.listQuery.page = 1;