Bladeren bron

'1.1.2.5'

哥哥玩剑魂呢 4 jaren geleden
bovenliggende
commit
ff2480c7c5
5 gewijzigde bestanden met toevoegingen van 309 en 313 verwijderingen
  1. 180 209
      package-lock.json
  2. 1 1
      package.json
  3. 86 86
      src/home.vue
  4. 17 16
      src/views/abPoint/apply_list.vue
  5. 25 1
      src/views/set/rule.vue

+ 180 - 209
package-lock.json

@@ -1069,21 +1069,6 @@
       "integrity": "sha1-K1o6s/kYzKSKjHVMCBaOPwPrphs=",
       "dev": true
     },
-    "@npmcli/move-file": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/@npmcli/move-file/download/@npmcli/move-file-1.0.1.tgz",
-      "integrity": "sha1-3hAwcNrA9IzknPZpPCOvWcD3BGQ=",
-      "requires": {
-        "mkdirp": "^1.0.4"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npm.taobao.org/mkdirp/download/mkdirp-1.0.4.tgz?cache=0&sync_timestamp=1587535418745&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmkdirp%2Fdownload%2Fmkdirp-1.0.4.tgz",
-          "integrity": "sha1-PrXtYmInVteaXw4qIh3+utdcL34="
-        }
-      }
-    },
     "@polka/url": {
       "version": "1.0.0-next.11",
       "resolved": "https://registry.npm.taobao.org/@polka/url/download/@polka/url-1.0.0-next.11.tgz",
@@ -1925,6 +1910,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npm.taobao.org/aggregate-error/download/aggregate-error-3.0.1.tgz",
       "integrity": "sha1-2y/nJG5Tb0DZtUQqOeEX191qJOA=",
+      "dev": true,
       "requires": {
         "clean-stack": "^2.0.0",
         "indent-string": "^4.0.0"
@@ -1951,7 +1937,8 @@
     "ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1595907068314&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz",
-      "integrity": "sha1-MfKdpatuANHC0yms97WSlhTVAU0="
+      "integrity": "sha1-MfKdpatuANHC0yms97WSlhTVAU0=",
+      "dev": true
     },
     "alphanum-sort": {
       "version": "1.0.2",
@@ -2322,7 +2309,8 @@
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
     },
     "base": {
       "version": "0.11.2",
@@ -2519,6 +2507,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz",
       "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
+      "dev": true,
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -3067,7 +3056,8 @@
     "clean-stack": {
       "version": "2.2.0",
       "resolved": "https://registry.npm.taobao.org/clean-stack/download/clean-stack-2.2.0.tgz?cache=0&sync_timestamp=1592035200599&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fclean-stack%2Fdownload%2Fclean-stack-2.2.0.tgz",
-      "integrity": "sha1-7oRy27Ep5yezHooQpCfe6d/kAIs="
+      "integrity": "sha1-7oRy27Ep5yezHooQpCfe6d/kAIs=",
+      "dev": true
     },
     "cli-cursor": {
       "version": "2.1.0",
@@ -3286,7 +3276,8 @@
     "commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/commondir/download/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
     },
     "component-emitter": {
       "version": "1.3.0",
@@ -3342,189 +3333,183 @@
       }
     },
     "compression-webpack-plugin": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npm.taobao.org/compression-webpack-plugin/download/compression-webpack-plugin-6.1.1.tgz?cache=0&sync_timestamp=1610367212945&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcompression-webpack-plugin%2Fdownload%2Fcompression-webpack-plugin-6.1.1.tgz",
-      "integrity": "sha1-ro5LL/23OWu3duZpGNdRog2Mzw4=",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-1.1.12.tgz",
+      "integrity": "sha512-UpBXSHbrCSdSZieAffqXlAQpLO2fikVVRYibrWlbHYzKpOw1Y4jwkVZ/+S91GzWuJvXSbc8SBy/e8fQJh8uEMQ==",
+      "dev": true,
       "requires": {
-        "cacache": "^15.0.5",
-        "find-cache-dir": "^3.3.1",
-        "schema-utils": "^3.0.0",
-        "serialize-javascript": "^5.0.1",
-        "webpack-sources": "^1.4.3"
+        "cacache": "^10.0.1",
+        "find-cache-dir": "^1.0.0",
+        "neo-async": "^2.5.0",
+        "serialize-javascript": "^1.4.0",
+        "webpack-sources": "^1.0.1"
       },
       "dependencies": {
-        "@types/json-schema": {
-          "version": "7.0.6",
-          "resolved": "https://registry.npm.taobao.org/@types/json-schema/download/@types/json-schema-7.0.6.tgz?cache=0&sync_timestamp=1605053861867&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fjson-schema%2Fdownload%2F%40types%2Fjson-schema-7.0.6.tgz",
-          "integrity": "sha1-9MfsQ+gbMZqYFRFQMXCfJph4kfA="
-        },
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.6.tgz?cache=0&sync_timestamp=1609583946707&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.6.tgz",
-          "integrity": "sha1-uvWmLoArB9l3A0WG+MO69a3ybfQ=",
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
         "cacache": {
-          "version": "15.0.5",
-          "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-15.0.5.tgz?cache=0&sync_timestamp=1594429684526&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-15.0.5.tgz",
-          "integrity": "sha1-aRYoM9opFw1nMjNGQ8YOAF9fF9A=",
+          "version": "10.0.4",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
+          "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
+          "dev": true,
           "requires": {
-            "@npmcli/move-file": "^1.0.1",
-            "chownr": "^2.0.0",
-            "fs-minipass": "^2.0.0",
-            "glob": "^7.1.4",
-            "infer-owner": "^1.0.4",
-            "lru-cache": "^6.0.0",
-            "minipass": "^3.1.1",
-            "minipass-collect": "^1.0.2",
-            "minipass-flush": "^1.0.5",
-            "minipass-pipeline": "^1.2.2",
-            "mkdirp": "^1.0.3",
-            "p-map": "^4.0.0",
+            "bluebird": "^3.5.1",
+            "chownr": "^1.0.1",
+            "glob": "^7.1.2",
+            "graceful-fs": "^4.1.11",
+            "lru-cache": "^4.1.1",
+            "mississippi": "^2.0.0",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
             "promise-inflight": "^1.0.1",
-            "rimraf": "^3.0.2",
-            "ssri": "^8.0.0",
-            "tar": "^6.0.2",
-            "unique-filename": "^1.1.1"
+            "rimraf": "^2.6.2",
+            "ssri": "^5.2.4",
+            "unique-filename": "^1.1.0",
+            "y18n": "^4.0.0"
           }
         },
-        "chownr": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npm.taobao.org/chownr/download/chownr-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchownr%2Fdownload%2Fchownr-2.0.0.tgz",
-          "integrity": "sha1-Fb++U9LqtM9w8YqM1o6+Wzyx3s4="
-        },
         "find-cache-dir": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npm.taobao.org/find-cache-dir/download/find-cache-dir-3.3.1.tgz",
-          "integrity": "sha1-ibM/rUpGcNqpT4Vff74x1thP6IA=",
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
+          "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
+          "dev": true,
           "requires": {
             "commondir": "^1.0.1",
-            "make-dir": "^3.0.2",
-            "pkg-dir": "^4.1.0"
+            "make-dir": "^1.0.0",
+            "pkg-dir": "^2.0.0"
           }
         },
         "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-4.1.0.tgz?cache=0&sync_timestamp=1597169795121&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffind-up%2Fdownload%2Ffind-up-4.1.0.tgz",
-          "integrity": "sha1-l6/n1s3AvFkoWEt8jXsW6KmqXRk=",
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
           "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
+            "locate-path": "^2.0.0"
           }
         },
         "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-5.0.0.tgz",
-          "integrity": "sha1-Gvujlq/WdqbUJQTQpno6frn2KqA=",
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
           "requires": {
-            "p-locate": "^4.1.0"
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
           }
         },
         "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npm.taobao.org/lru-cache/download/lru-cache-6.0.0.tgz?cache=0&sync_timestamp=1594427582110&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flru-cache%2Fdownload%2Flru-cache-6.0.0.tgz",
-          "integrity": "sha1-bW/mVw69lqr5D8rR2vo7JWbbOpQ=",
+          "version": "4.1.5",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+          "dev": true,
           "requires": {
-            "yallist": "^4.0.0"
+            "pseudomap": "^1.0.2",
+            "yallist": "^2.1.2"
           }
         },
         "make-dir": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npm.taobao.org/make-dir/download/make-dir-3.1.0.tgz?cache=0&sync_timestamp=1587567572251&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmake-dir%2Fdownload%2Fmake-dir-3.1.0.tgz",
-          "integrity": "sha1-QV6WcEazp/HRhSd9hKpYIDcmoT8=",
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+          "dev": true,
           "requires": {
-            "semver": "^6.0.0"
+            "pify": "^3.0.0"
           }
         },
-        "mkdirp": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npm.taobao.org/mkdirp/download/mkdirp-1.0.4.tgz?cache=0&sync_timestamp=1587535418745&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmkdirp%2Fdownload%2Fmkdirp-1.0.4.tgz",
-          "integrity": "sha1-PrXtYmInVteaXw4qIh3+utdcL34="
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npm.taobao.org/p-locate/download/p-locate-4.1.0.tgz?cache=0&sync_timestamp=1597081369770&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fp-locate%2Fdownload%2Fp-locate-4.1.0.tgz",
-          "integrity": "sha1-o0KLtwiLOmApL2aRkni3wpetTwc=",
+        "mississippi": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
+          "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
+          "dev": true,
           "requires": {
-            "p-limit": "^2.2.0"
+            "concat-stream": "^1.5.0",
+            "duplexify": "^3.4.2",
+            "end-of-stream": "^1.1.0",
+            "flush-write-stream": "^1.0.0",
+            "from2": "^2.1.0",
+            "parallel-transform": "^1.1.0",
+            "pump": "^2.0.1",
+            "pumpify": "^1.3.3",
+            "stream-each": "^1.1.0",
+            "through2": "^2.0.0"
           }
         },
-        "p-map": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npm.taobao.org/p-map/download/p-map-4.0.0.tgz",
-          "integrity": "sha1-uy+Vpe2i7BaOySdOBqdHw+KQTSs=",
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
           "requires": {
-            "aggregate-error": "^3.0.0"
+            "p-try": "^1.0.0"
           }
         },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npm.taobao.org/path-exists/download/path-exists-4.0.0.tgz",
-          "integrity": "sha1-UTvb4tO5XXdi6METfvoZXGxhtbM="
-        },
-        "pkg-dir": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npm.taobao.org/pkg-dir/download/pkg-dir-4.2.0.tgz",
-          "integrity": "sha1-8JkTPfft5CLoHR2ESCcO6z5CYfM=",
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
           "requires": {
-            "find-up": "^4.0.0"
+            "p-limit": "^1.1.0"
           }
         },
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npm.taobao.org/rimraf/download/rimraf-3.0.2.tgz?cache=0&sync_timestamp=1581229865753&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frimraf%2Fdownload%2Frimraf-3.0.2.tgz",
-          "integrity": "sha1-8aVAK6YiCtUswSgrrBrjqkn9Bho=",
-          "requires": {
-            "glob": "^7.1.3"
-          }
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
         },
-        "schema-utils": {
+        "pify": {
           "version": "3.0.0",
-          "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-3.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-3.0.0.tgz",
-          "integrity": "sha1-Z1AvaqK2ai1AMrQnmilEl4oJE+8=",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+          "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+          "dev": true,
           "requires": {
-            "@types/json-schema": "^7.0.6",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
+            "find-up": "^2.1.0"
           }
         },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1606853731020&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz",
-          "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0="
-        },
-        "serialize-javascript": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npm.taobao.org/serialize-javascript/download/serialize-javascript-5.0.1.tgz",
-          "integrity": "sha1-eIbshIBJpGJGepfT2Rjrsqr5NPQ=",
+        "pump": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+          "dev": true,
           "requires": {
-            "randombytes": "^2.1.0"
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
           }
         },
+        "serialize-javascript": {
+          "version": "1.9.1",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz",
+          "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==",
+          "dev": true
+        },
         "ssri": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npm.taobao.org/ssri/download/ssri-8.0.0.tgz",
-          "integrity": "sha1-ecp04h+M6u3fy0uQFDxFi42YiAg=",
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz",
+          "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
+          "dev": true,
           "requires": {
-            "minipass": "^3.1.1"
+            "safe-buffer": "^5.1.1"
           }
         },
         "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npm.taobao.org/yallist/download/yallist-4.0.0.tgz",
-          "integrity": "sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI="
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+          "dev": true
         }
       }
     },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npm.taobao.org/concat-map/download/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
     },
     "concat-stream": {
       "version": "1.6.2",
@@ -5292,7 +5277,8 @@
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz?cache=0&sync_timestamp=1591599697571&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-deep-equal%2Fdownload%2Ffast-deep-equal-3.1.3.tgz",
-      "integrity": "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU="
+      "integrity": "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU=",
+      "dev": true
     },
     "fast-glob": {
       "version": "2.2.7",
@@ -5334,7 +5320,8 @@
     "fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npm.taobao.org/fast-json-stable-stringify/download/fast-json-stable-stringify-2.1.0.tgz?cache=0&sync_timestamp=1576340291001&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-json-stable-stringify%2Fdownload%2Ffast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha1-h0v2nG9ATCtdmcSBNBOZ/VWJJjM="
+      "integrity": "sha1-h0v2nG9ATCtdmcSBNBOZ/VWJJjM=",
+      "dev": true
     },
     "fast-levenshtein": {
       "version": "2.0.6",
@@ -5586,6 +5573,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npm.taobao.org/fs-minipass/download/fs-minipass-2.1.0.tgz?cache=0&sync_timestamp=1579628575109&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffs-minipass%2Fdownload%2Ffs-minipass-2.1.0.tgz",
       "integrity": "sha1-f1A2/b8SxjwWkZDL5BmchSJx+fs=",
+      "dev": true,
       "requires": {
         "minipass": "^3.0.0"
       }
@@ -5605,7 +5593,8 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/fs.realpath/download/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
     },
     "fsevents": {
       "version": "2.1.3",
@@ -5666,6 +5655,7 @@
       "version": "7.1.6",
       "resolved": "https://registry.npm.taobao.org/glob/download/glob-7.1.6.tgz?cache=0&sync_timestamp=1573078121947&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglob%2Fdownload%2Fglob-7.1.6.tgz",
       "integrity": "sha1-FB8zuBp8JJLhJVlDB0gMRmeSeKY=",
+      "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -6217,12 +6207,14 @@
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npm.taobao.org/imurmurhash/download/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
     },
     "indent-string": {
       "version": "4.0.0",
       "resolved": "https://registry.npm.taobao.org/indent-string/download/indent-string-4.0.0.tgz",
-      "integrity": "sha1-Yk+PRJfWGbLZdoUx1Y9BIoVNclE="
+      "integrity": "sha1-Yk+PRJfWGbLZdoUx1Y9BIoVNclE=",
+      "dev": true
     },
     "indexes-of": {
       "version": "1.0.1",
@@ -6233,12 +6225,14 @@
     "infer-owner": {
       "version": "1.0.4",
       "resolved": "https://registry.npm.taobao.org/infer-owner/download/infer-owner-1.0.4.tgz",
-      "integrity": "sha1-xM78qo5RBRwqQLos6KPScpWvlGc="
+      "integrity": "sha1-xM78qo5RBRwqQLos6KPScpWvlGc=",
+      "dev": true
     },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npm.taobao.org/inflight/download/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -6247,7 +6241,8 @@
     "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npm.taobao.org/inherits/download/inherits-2.0.4.tgz",
-      "integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w="
+      "integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w=",
+      "dev": true
     },
     "inquirer": {
       "version": "7.3.3",
@@ -6813,7 +6808,8 @@
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA="
+      "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
+      "dev": true
     },
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -7322,6 +7318,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz",
       "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
+      "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -7336,6 +7333,7 @@
       "version": "3.1.3",
       "resolved": "https://registry.npm.taobao.org/minipass/download/minipass-3.1.3.tgz",
       "integrity": "sha1-fUL/HzljVILhX5zbUxhN7r1YFf0=",
+      "dev": true,
       "requires": {
         "yallist": "^4.0.0"
       },
@@ -7343,7 +7341,8 @@
         "yallist": {
           "version": "4.0.0",
           "resolved": "https://registry.npm.taobao.org/yallist/download/yallist-4.0.0.tgz",
-          "integrity": "sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI="
+          "integrity": "sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI=",
+          "dev": true
         }
       }
     },
@@ -7351,6 +7350,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npm.taobao.org/minipass-collect/download/minipass-collect-1.0.2.tgz",
       "integrity": "sha1-IrgTv3Rdxu26JXa5QAIq1u3Ixhc=",
+      "dev": true,
       "requires": {
         "minipass": "^3.0.0"
       }
@@ -7359,6 +7359,7 @@
       "version": "1.0.5",
       "resolved": "https://registry.npm.taobao.org/minipass-flush/download/minipass-flush-1.0.5.tgz",
       "integrity": "sha1-gucTXX6JpQ/+ZGEKeHlTxMTLs3M=",
+      "dev": true,
       "requires": {
         "minipass": "^3.0.0"
       }
@@ -7367,26 +7368,11 @@
       "version": "1.2.4",
       "resolved": "https://registry.npm.taobao.org/minipass-pipeline/download/minipass-pipeline-1.2.4.tgz?cache=0&sync_timestamp=1595998621838&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fminipass-pipeline%2Fdownload%2Fminipass-pipeline-1.2.4.tgz",
       "integrity": "sha1-aEcveXEcCEZXwGfFxq2Tzd6oIUw=",
+      "dev": true,
       "requires": {
         "minipass": "^3.0.0"
       }
     },
-    "minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npm.taobao.org/minizlib/download/minizlib-2.1.2.tgz",
-      "integrity": "sha1-6Q00Zrogm5MkUVCKEc49NjIUWTE=",
-      "requires": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
-      "dependencies": {
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npm.taobao.org/yallist/download/yallist-4.0.0.tgz",
-          "integrity": "sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI="
-        }
-      }
-    },
     "mississippi": {
       "version": "3.0.0",
       "resolved": "https://registry.npm.taobao.org/mississippi/download/mississippi-3.0.0.tgz",
@@ -7832,6 +7818,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npm.taobao.org/once/download/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
       "requires": {
         "wrappy": "1"
       }
@@ -7939,6 +7926,7 @@
       "version": "2.3.0",
       "resolved": "https://registry.npm.taobao.org/p-limit/download/p-limit-2.3.0.tgz?cache=0&sync_timestamp=1594559734248&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fp-limit%2Fdownload%2Fp-limit-2.3.0.tgz",
       "integrity": "sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE=",
+      "dev": true,
       "requires": {
         "p-try": "^2.0.0"
       }
@@ -7973,7 +7961,8 @@
     "p-try": {
       "version": "2.2.0",
       "resolved": "https://registry.npm.taobao.org/p-try/download/p-try-2.2.0.tgz",
-      "integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY="
+      "integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY=",
+      "dev": true
     },
     "pako": {
       "version": "1.0.11",
@@ -8092,7 +8081,8 @@
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/path-is-absolute/download/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
     },
     "path-is-inside": {
       "version": "1.0.2",
@@ -8928,7 +8918,8 @@
     "promise-inflight": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/promise-inflight/download/promise-inflight-1.0.1.tgz",
-      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+      "dev": true
     },
     "promise-polyfill": {
       "version": "7.1.2",
@@ -9021,7 +9012,8 @@
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npm.taobao.org/punycode/download/punycode-2.1.1.tgz",
-      "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew="
+      "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=",
+      "dev": true
     },
     "q": {
       "version": "1.5.1",
@@ -9031,7 +9023,7 @@
     },
     "qrcodejs2": {
       "version": "0.0.2",
-      "resolved": "https://registry.npm.taobao.org/qrcodejs2/download/qrcodejs2-0.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/qrcodejs2/-/qrcodejs2-0.0.2.tgz",
       "integrity": "sha1-Rlr+Xjnxn6zsuTLBH3oYYQkUauE="
     },
     "qs": {
@@ -9072,6 +9064,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npm.taobao.org/randombytes/download/randombytes-2.1.0.tgz",
       "integrity": "sha1-32+ENy8CcNxlzfYpE0mrekc9Tyo=",
+      "dev": true,
       "requires": {
         "safe-buffer": "^5.1.0"
       }
@@ -9476,7 +9469,8 @@
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz",
-      "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0="
+      "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=",
+      "dev": true
     },
     "safe-regex": {
       "version": "1.1.0",
@@ -10009,7 +10003,8 @@
     "source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npm.taobao.org/source-list-map/download/source-list-map-2.0.1.tgz",
-      "integrity": "sha1-OZO9hzv8SEecyp6jpUeDXHwVSzQ="
+      "integrity": "sha1-OZO9hzv8SEecyp6jpUeDXHwVSzQ=",
+      "dev": true
     },
     "source-map": {
       "version": "0.5.7",
@@ -10683,36 +10678,6 @@
       "integrity": "sha1-ofzMBrWNth/XpF2i2kT186Pme6I=",
       "dev": true
     },
-    "tar": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npm.taobao.org/tar/download/tar-6.1.0.tgz?cache=0&sync_timestamp=1610045450553&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftar%2Fdownload%2Ftar-6.1.0.tgz",
-      "integrity": "sha1-0XJOm8wEuXexjVxXOzM6IgcimoM=",
-      "requires": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^3.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
-      },
-      "dependencies": {
-        "chownr": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npm.taobao.org/chownr/download/chownr-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchownr%2Fdownload%2Fchownr-2.0.0.tgz",
-          "integrity": "sha1-Fb++U9LqtM9w8YqM1o6+Wzyx3s4="
-        },
-        "mkdirp": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npm.taobao.org/mkdirp/download/mkdirp-1.0.4.tgz?cache=0&sync_timestamp=1587535418745&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmkdirp%2Fdownload%2Fmkdirp-1.0.4.tgz",
-          "integrity": "sha1-PrXtYmInVteaXw4qIh3+utdcL34="
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npm.taobao.org/yallist/download/yallist-4.0.0.tgz",
-          "integrity": "sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI="
-        }
-      }
-    },
     "terser": {
       "version": "4.8.0",
       "resolved": "https://registry.npm.taobao.org/terser/download/terser-4.8.0.tgz?cache=0&sync_timestamp=1593953638544&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser%2Fdownload%2Fterser-4.8.0.tgz",
@@ -11098,6 +11063,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npm.taobao.org/unique-filename/download/unique-filename-1.1.1.tgz",
       "integrity": "sha1-HWl2k2mtoFgxA6HmrodoG1ZXMjA=",
+      "dev": true,
       "requires": {
         "unique-slug": "^2.0.0"
       }
@@ -11106,6 +11072,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npm.taobao.org/unique-slug/download/unique-slug-2.0.2.tgz",
       "integrity": "sha1-uqvOkQg/xk6UWw861hPiZPfNTmw=",
+      "dev": true,
       "requires": {
         "imurmurhash": "^0.1.4"
       }
@@ -11184,6 +11151,7 @@
       "version": "4.2.2",
       "resolved": "https://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz",
       "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
+      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -12103,6 +12071,7 @@
       "version": "1.4.3",
       "resolved": "https://registry.npm.taobao.org/webpack-sources/download/webpack-sources-1.4.3.tgz",
       "integrity": "sha1-7t2OwLko+/HL/plOItLYkPMwqTM=",
+      "dev": true,
       "requires": {
         "source-list-map": "^2.0.0",
         "source-map": "~0.6.1"
@@ -12111,7 +12080,8 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz?cache=0&sync_timestamp=1571657176668&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsource-map%2Fdownload%2Fsource-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "dev": true
         }
       }
     },
@@ -12201,7 +12171,8 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npm.taobao.org/wrappy/download/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
     },
     "write": {
       "version": "1.0.3",

+ 1 - 1
package.json

@@ -12,7 +12,6 @@
   },
   "dependencies": {
     "axios": "^0.19.2",
-    "compression-webpack-plugin": "^6.1.1",
     "core-js": "^3.6.5",
     "cross-env": "^7.0.3",
     "dingtalk-jsapi": "^2.13.20",
@@ -33,6 +32,7 @@
     "@vue/cli-plugin-vuex": "~4.4.0",
     "@vue/cli-service": "~4.4.0",
     "babel-eslint": "^10.1.0",
+    "compression-webpack-plugin": "^1.1.12",
     "eslint": "^6.7.2",
     "eslint-plugin-vue": "^6.2.2",
     "sass": "^1.26.5",

+ 86 - 86
src/home.vue

@@ -1277,92 +1277,92 @@ export default {
 		window.removeEventListener('resize', this.selfAdaption); //取消echarts自适应
 	},
 	created() {
-	var user = {
-      accedence_time: "2020-12-26 15:04:33",
-      company_id: '',
-      company_info: { creator_ids: [167], id: 15, industry: '计算机软件', is_official: 1, logo_url: '', name: '测试组织', status: 1, user_count_max: 50 },
-      employee_detail: {
-        dept_list: [],
-        manage_scope: [{"id": 164,"name": "刘瑞欣"},{"id": 165,"name": "方慧毅"},{"id": 166,"name": "郭家裕(创始人)"},{"id": 184,"name": "莫仕钊"},{"id": 185,"name": "秦杨升"}],
-        permission_list: [],
-        role_list: [
-          { id: 15, name: 'employee', remark: '员工' },
-          { id: 12, name: 'admin', remark: '公司管理员' },
-        //   { id: 14, name: 'dept_manager', remark: '部门管理者' },
-        //   { id: 13, name: 'point_manager', remark: '积分管理员' },
-        //   { id: 11, name: 'creator', remark: '创始人' }
-        ],
-        superior_list: [{id: 164,name: "刘瑞欣"},
-				{id: 165,name: "方慧毅"},
-				{id: 166,name: "郭家裕(创始人)"},
-				{id: 184,name: "莫仕钊"},
-				{id: 185,name: "秦杨升"},
-				{id: 187,name: "梁丽焕"},
-				{id: 188,name: "刘俊华"},{id: 167,name: "蔡文"}]
-      },
-      id: 186,
-      img_url: "https://static-legacy.dingtalk.com/media/lADPBE1Xcf-wCfbNAwvNAwA_768_779.jpg",
-      is_admin: 0,
-      is_creator: 0,
-      is_official: 1,
-      is_scope: 1,
-      letter_index: 'C',
-      name: '程健',
-      point_config: {
-        deduct_task_monthly: [
-          {
-            name: "A分",
-            point: "0",
-            pt_id: 2
-          },
-          {
-            name: "B分",
-            point: "0",
-            pt_id: 3
-          }
-        ],
-        reward_ratio: 0,
-        exec_count: 0,
-        exec_count_point: 0,
-        reward_ratio_point: 0,
-        service_point: 0,
-        entry_limit: 1000,
-        point_limit: [
-          {
-            name: "A分",
-            point: "200",
-            pt_id: 2
-          },
-          {
-            name: "B分",
-            point: "100",
-            pt_id: 3
-          }
-        ],
-        reward_task_monthly: [
-          {
-            name: "A分",
-            point: "0",
-            pt_id: 2
-          },
-          {
-            name: "B分",
-            point: "0",
-            pt_id: 3
-          }
-        ],
-      },
-      post: '',
-      site_config: {
-        base_point: 120,
-        rule_limit_check: 1,
-        task_review: 0,
-        service_point: 120,
-        a2b: 0
-      },
-      site_id: 15
-    };
-    localStorage.setItem('userData',JSON.stringify(user));
+	// var user = {
+    //   accedence_time: "2020-12-26 15:04:33",
+    //   company_id: '',
+    //   company_info: { creator_ids: [167], id: 15, industry: '计算机软件', is_official: 1, logo_url: '', name: '测试组织', status: 1, user_count_max: 50 },
+    //   employee_detail: {
+    //     dept_list: [],
+    //     manage_scope: [{"id": 164,"name": "刘瑞欣"},{"id": 165,"name": "方慧毅"},{"id": 166,"name": "郭家裕(创始人)"},{"id": 184,"name": "莫仕钊"},{"id": 185,"name": "秦杨升"}],
+    //     permission_list: [],
+    //     role_list: [
+    //       { id: 15, name: 'employee', remark: '员工' },
+    //       { id: 12, name: 'admin', remark: '公司管理员' },
+    //       { id: 14, name: 'dept_manager', remark: '部门管理者' },
+    //       { id: 13, name: 'point_manager', remark: '积分管理员' },
+    //     //   { id: 11, name: 'creator', remark: '创始人' }
+    //     ],
+    //     superior_list: [{id: 164,name: "刘瑞欣"},
+	// 			{id: 165,name: "方慧毅"},
+	// 			{id: 166,name: "郭家裕(创始人)"},
+	// 			{id: 184,name: "莫仕钊"},
+	// 			{id: 185,name: "秦杨升"},
+	// 			{id: 187,name: "梁丽焕"},
+	// 			{id: 188,name: "刘俊华"},{id: 167,name: "蔡文"}]
+    //   },
+    //   id: 186,
+    //   img_url: "https://static-legacy.dingtalk.com/media/lADPBE1Xcf-wCfbNAwvNAwA_768_779.jpg",
+    //   is_admin: 0,
+    //   is_creator: 0,
+    //   is_official: 1,
+    //   is_scope: 1,
+    //   letter_index: 'C',
+    //   name: '程健',
+    //   point_config: {
+    //     deduct_task_monthly: [
+    //       {
+    //         name: "A分",
+    //         point: "0",
+    //         pt_id: 2
+    //       },
+    //       {
+    //         name: "B分",
+    //         point: "0",
+    //         pt_id: 3
+    //       }
+    //     ],
+    //     reward_ratio: 0,
+    //     exec_count: 0,
+    //     exec_count_point: 0,
+    //     reward_ratio_point: 0,
+    //     service_point: 0,
+    //     entry_limit: 1000,
+    //     point_limit: [
+    //       {
+    //         name: "A分",
+    //         point: "200",
+    //         pt_id: 2
+    //       },
+    //       {
+    //         name: "B分",
+    //         point: "100",
+    //         pt_id: 3
+    //       }
+    //     ],
+    //     reward_task_monthly: [
+    //       {
+    //         name: "A分",
+    //         point: "0",
+    //         pt_id: 2
+    //       },
+    //       {
+    //         name: "B分",
+    //         point: "0",
+    //         pt_id: 3
+    //       }
+    //     ],
+    //   },
+    //   post: '',
+    //   site_config: {
+    //     base_point: 120,
+    //     rule_limit_check: 1,
+    //     task_review: 0,
+    //     service_point: 120,
+    //     a2b: 0
+    //   },
+    //   site_id: 15
+    // };
+    // localStorage.setItem('userData',JSON.stringify(user));
 	}
 };
 </script>

+ 17 - 16
src/views/abPoint/apply_list.vue

@@ -23,9 +23,9 @@
 			</el-table-column>
 			<el-table-column label="积分" prop="review_point" width="120">
 				<template slot-scope="scope">
-					<span :class="{ color_green: scope.row.point < 0, color_red: scope.row.point > 0 }">
-						<span v-show="scope.row.point > 0">+</span>
-						{{ scope.row.point }} {{ scope.row.pt_id == 3 ? 'B分' : scope.row.pt_id == 2 ? 'A分' : scope.row.pt_id == 1 ? '绩效分' : '' }}
+					<span :class="{ color_green: scope.row.review_point < 0, color_red: scope.row.review_point > 0 }">
+						<span v-show="scope.row.review_point > 0">+</span>
+						{{ scope.row.review_point }} {{ scope.row.pt_id == 3 ? 'B分' : scope.row.pt_id == 2 ? 'A分' : scope.row.pt_id == 1 ? '绩效分' : '' }}
 					</span>
 				</template>
 			</el-table-column>
@@ -45,20 +45,20 @@
 			</template>
 		</el-table>
 
-		<el-table :data="dataList" stripe fit v-loading="table_loading" v-if="tabs == 'waiting'" @row-click="openDetail">
+		<el-table :data="dataList" stripe fit v-loading="table_loading" v-show="tabs == 'waiting'" @row-click="openDetail">
 			<el-table-column label="申请内容" prop="remark">
 				<template slot-scope="scope">
 					{{ scope.row.remark.customize || scope.row.remark.rule }}
 				</template>
 			</el-table-column>
-			<el-table-column label="积分" prop="review_point" width="120">
+			<!-- <el-table-column label="积分" prop="review_point" width="120">
 				<template slot-scope="scope">
 					<span>
 						<span v-show="scope.row.point > 0">+</span>
 						{{ scope.row.point }} B分
 					</span>
 				</template>
-			</el-table-column>
+			</el-table-column> -->
 			<el-table-column label="时间" prop="event_time" width="150"></el-table-column>
 			<template slot="empty">
 				<div class="nopoint_box" v-if="!formData.keyword">
@@ -119,7 +119,8 @@
 						<div class="user_text">
 							<p style="margin-left: 10px;">{{detail_info.employee_name}}</p>
 							<!-- 优化 -->
-							<div v-for="(item, index) in detail_info.process" :key="index" v-show="item.review_point != 0">
+							<!-- <div v-for="(item, index) in detail_info.process" :key="index" v-show="item.review_point != 0"> -->
+							<div v-show="detail_info.review_point != 0">
 								<p v-if="detail_info.status == 1">
 									<!-- <span
 										v-show="
@@ -143,25 +144,25 @@
 									</span> -->
 									<span
 										v-show="
-											(item.review_point >= 0 && detail_info.item_prize_type == 1) ||
-												(item.review_point >= 0 && detail_info.item_prize_type == -1) ||
-												(item.review_point >= 0 && detail_info.item_prize_type == 0)
+											(detail_info.review_point >= 0 && detail_info.item_prize_type == 1) ||
+												(detail_info.review_point >= 0 && detail_info.item_prize_type == -1) ||
+												(detail_info.review_point >= 0 && detail_info.item_prize_type == 0)
 										"
 										style="color:#f56c6c;font-size:16px;padding-left:8px"
 									>
-										+{{ item.review_point }}
+										+{{ detail_info.review_point }}
 									</span>
 									<span
 										v-show="
-											(item.review_point <= 0 && detail_info.item_prize_type == 2) ||
-												(item.review_point <= 0 && detail_info.item_prize_type == -1) ||
-												(item.review_point <= 0 && detail_info.item_prize_type == 0)
+											(detail_info.review_point <= 0 && detail_info.item_prize_type == 2) ||
+												(detail_info.review_point <= 0 && detail_info.item_prize_type == -1) ||
+												(detail_info.review_point <= 0 && detail_info.item_prize_type == 0)
 										"
 										style="color:#67C23A;font-size:16px;padding-left:8px"
 									>
-										{{ item.review_point }}
+										{{ detail_info.review_point }}
 									</span>
-									<span v-show="detail_info.point">
+									<span>
 										{{ detail_info.pt_id == 1 ? '绩效分' : detail_info.pt_id == 2 ? 'A分' : detail_info.pt_id == 3 ? 'B分' : '' }}
 									</span>
 								</p>

+ 25 - 1
src/views/set/rule.vue

@@ -351,7 +351,8 @@ export default {
 			import_btn_show: false,
 			fileList: [],
 			file: null,
-			flName: ''
+			flName: '',
+			// item_lists:[],
 		};
 	},
 	components: {
@@ -882,6 +883,15 @@ export default {
 					that.rule_tree = res.data.data.rule_tree || [];
 					that.item_list = list;
 					that.all_item_list = list;
+					
+					// for(let i in item_list){
+					// 	item_list[i].forEach(arr=>{
+					// 		this.item_lists.push(arr)
+					// 	})
+					// }
+					// this.traverse(res.data.data.rule_tree)
+					// console.log(this.item_lists)
+
 					if (is) {
 						that.handleNodeClick(that.selectItem);
 					} else {
@@ -892,6 +902,20 @@ export default {
 					this.rule_loading = false;
 				});
 		},
+		// traverse(rule_tree){
+		// 	// debugger
+		// 	rule_tree.forEach(item=>{
+		// 		if(item.child){
+		// 			for(let i in this.item_lists){
+		// 				if(this.item_lists[i].rule_id == item.id){
+		// 					this.item_lists[i].ruleName = item.name
+		// 					// break
+		// 				}
+		// 			}
+		// 			this.traverse(item.child)
+		// 		}
+		// 	})
+		// },
 		//编辑分组
 		edit_class() {
 			this.class_show = true;