浏览代码

用户权限模块功能

李顺 2 年之前
父节点
当前提交
d9b4815e99

+ 199 - 186
package-lock.json

@@ -4242,16 +4242,6 @@
           "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
           "dev": true
         },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "cache-loader": {
           "version": "4.1.0",
           "resolved": "https://registry.npmmirror.com/cache-loader/-/cache-loader-4.1.0.tgz",
@@ -4266,44 +4256,6 @@
             "schema-utils": "^2.0.0"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "cosmiconfig": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-          "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "@types/parse-json": "^4.0.0",
-            "import-fresh": "^3.1.0",
-            "parse-json": "^5.0.0",
-            "path-type": "^4.0.0",
-            "yaml": "^1.7.2"
-          }
-        },
-        "deepmerge": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-          "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-          "dev": true,
-          "optional": true
-        },
         "find-cache-dir": {
           "version": "3.3.2",
           "resolved": "https://registry.npmmirror.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
@@ -4325,101 +4277,6 @@
             "path-exists": "^4.0.0"
           }
         },
-        "fork-ts-checker-webpack-plugin-v5": {
-          "version": "npm:fork-ts-checker-webpack-plugin@5.2.1",
-          "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.1.tgz",
-          "integrity": "sha512-SVi+ZAQOGbtAsUWrZvGzz38ga2YqjWvca1pXQFUArIVXqli0lLoDQ8uS0wg0kSpcwpZmaW5jVCZXQebkyUQSsw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "@babel/code-frame": "^7.8.3",
-            "@types/json-schema": "^7.0.5",
-            "chalk": "^4.1.0",
-            "cosmiconfig": "^6.0.0",
-            "deepmerge": "^4.2.2",
-            "fs-extra": "^9.0.0",
-            "memfs": "^3.1.2",
-            "minimatch": "^3.0.4",
-            "schema-utils": "2.7.0",
-            "semver": "^7.3.2",
-            "tapable": "^1.0.0"
-          },
-          "dependencies": {
-            "chalk": {
-              "version": "4.1.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            },
-            "lru-cache": {
-              "version": "6.0.0",
-              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-              "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "yallist": "^4.0.0"
-              }
-            },
-            "semver": {
-              "version": "7.3.8",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-              "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "lru-cache": "^6.0.0"
-              }
-            }
-          }
-        },
-        "fs-extra": {
-          "version": "9.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "at-least-node": "^1.0.0",
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^6.0.1",
-            "universalify": "^2.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "import-fresh": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-          "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "parent-module": "^1.0.0",
-            "resolve-from": "^4.0.0"
-          }
-        },
-        "jsonfile": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "graceful-fs": "^4.1.6",
-            "universalify": "^2.0.0"
-          }
-        },
         "locate-path": {
           "version": "5.0.0",
           "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
@@ -4480,13 +4337,6 @@
           "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
           "dev": true
         },
-        "path-type": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-          "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-          "dev": true,
-          "optional": true
-        },
         "pkg-dir": {
           "version": "4.2.0",
           "resolved": "https://registry.npmmirror.com/pkg-dir/-/pkg-dir-4.2.0.tgz",
@@ -4508,13 +4358,6 @@
             "type-fest": "^0.6.0"
           }
         },
-        "resolve-from": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-          "dev": true,
-          "optional": true
-        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.0.tgz",
@@ -4529,30 +4372,6 @@
           "requires": {
             "ansi-regex": "^5.0.1"
           }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "universalify": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-          "dev": true,
-          "optional": true
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true,
-          "optional": true
         }
       }
     },
@@ -11189,6 +11008,200 @@
         "worker-rpc": "^0.1.0"
       }
     },
+    "fork-ts-checker-webpack-plugin-v5": {
+      "version": "npm:fork-ts-checker-webpack-plugin@5.2.1",
+      "resolved": "https://registry.npmmirror.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.1.tgz",
+      "integrity": "sha512-SVi+ZAQOGbtAsUWrZvGzz38ga2YqjWvca1pXQFUArIVXqli0lLoDQ8uS0wg0kSpcwpZmaW5jVCZXQebkyUQSsw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "@babel/code-frame": "^7.8.3",
+        "@types/json-schema": "^7.0.5",
+        "chalk": "^4.1.0",
+        "cosmiconfig": "^6.0.0",
+        "deepmerge": "^4.2.2",
+        "fs-extra": "^9.0.0",
+        "memfs": "^3.1.2",
+        "minimatch": "^3.0.4",
+        "schema-utils": "2.7.0",
+        "semver": "^7.3.2",
+        "tapable": "^1.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "cosmiconfig": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmmirror.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
+          "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "@types/parse-json": "^4.0.0",
+            "import-fresh": "^3.1.0",
+            "parse-json": "^5.0.0",
+            "path-type": "^4.0.0",
+            "yaml": "^1.7.2"
+          }
+        },
+        "deepmerge": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.2.2.tgz",
+          "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+          "dev": true,
+          "optional": true
+        },
+        "fs-extra": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-9.1.0.tgz",
+          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "at-least-node": "^1.0.0",
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "import-fresh": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmmirror.com/import-fresh/-/import-fresh-3.3.0.tgz",
+          "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "parent-module": "^1.0.0",
+            "resolve-from": "^4.0.0"
+          }
+        },
+        "jsonfile": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-6.1.0.tgz",
+          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "graceful-fs": "^4.1.6",
+            "universalify": "^2.0.0"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "parse-json": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmmirror.com/parse-json/-/parse-json-5.2.0.tgz",
+          "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "@babel/code-frame": "^7.0.0",
+            "error-ex": "^1.3.1",
+            "json-parse-even-better-errors": "^2.3.0",
+            "lines-and-columns": "^1.1.6"
+          }
+        },
+        "path-type": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/path-type/-/path-type-4.0.0.tgz",
+          "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+          "dev": true,
+          "optional": true
+        },
+        "resolve-from": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/resolve-from/-/resolve-from-4.0.0.tgz",
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+          "dev": true,
+          "optional": true
+        },
+        "semver": {
+          "version": "7.3.8",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "universalify": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmmirror.com/universalify/-/universalify-2.0.0.tgz",
+          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+          "dev": true,
+          "optional": true
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
     "form-data": {
       "version": "2.3.3",
       "resolved": "https://registry.npm.taobao.org/form-data/download/form-data-2.3.3.tgz",
@@ -12642,8 +12655,8 @@
     },
     "increase-memory-limit": {
       "version": "1.0.7",
-      "resolved": "https://registry.npm.taobao.org/increase-memory-limit/download/increase-memory-limit-1.0.7.tgz",
-      "integrity": "sha1-gEF+c25F/P1qPVFbQ14urqTmIjM=",
+      "resolved": "https://registry.npmmirror.com/increase-memory-limit/-/increase-memory-limit-1.0.7.tgz",
+      "integrity": "sha512-ozyn+HHAPD9VxMT1U50A7G8XXlktUWhnnEDYSeDYnQjKsNrBWHqq6XfEA0uhMdDPD+q/7rXWlzF1CbXX/c1LiQ==",
       "dev": true,
       "requires": {
         "glob": "^7.1.1"
@@ -15357,9 +15370,9 @@
       }
     },
     "memfs": {
-      "version": "3.4.7",
-      "resolved": "https://registry.npmmirror.com/memfs/-/memfs-3.4.7.tgz",
-      "integrity": "sha512-ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw==",
+      "version": "3.4.10",
+      "resolved": "https://registry.npmmirror.com/memfs/-/memfs-3.4.10.tgz",
+      "integrity": "sha512-0bCUP+L79P4am30yP1msPzApwuMQG23TjwlwdHeEV5MxioDR1a0AgB0T9FfggU52eJuDCq8WVwb5ekznFyWiTQ==",
       "dev": true,
       "optional": true,
       "requires": {

+ 1 - 1
src/settings.js

@@ -48,5 +48,5 @@ module.exports = {
   settings: true,
 
   // 系统名称
-  sysTitle: '三峡发展智慧EPC综合决策分析平台'
+  sysTitle: '沃特数据校验系统'
 }

+ 0 - 139
src/store/modules/bigScreen.ts

@@ -1,139 +0,0 @@
-
-import { appconfig } from '@/config/bigScreenConfig'
-import { GetUserInitData } from '@/api/APIs'
-const groupPageInfo = () => {
-  return {
-    //集团、分公司信息
-    groupProject: [],
-    groupName: null,
-    groupCodeValue: null,
-  }
-}
-const getDefaultState = () => {
-  return {
-    //地图配置信息
-    tdttoken: '75293e320524bb2be0a5f14fa887e46f',
-    mapConfig: null,
-    isInitViewer: false,//三维场景是否初始化
-    mapContainerId: '',//地图容器Id
-    //项目级信息
-    currentPrjId: 45,
-    currentActive: null,//项目当前激活模块
-    customToolList: [],//自定义工具激活集合
-    currentTool: '',//当前激活工具
-    isShowPipeSpeedInfoCheck: false,//显示进度查看弹窗
-    monitorTreeCheckHistory: null,//设备监测树历史记录
-    currentDeviceShow: null,//当前查看设备
-    isShowExcavationAnalysis: false,//显示开挖分析窗体
-    isShowSearchBox: false,//显示搜索栏
-    //-->统计分析模块
-    currentStatisticalActive: null
-  }
-}
-const state = { ...groupPageInfo(), ...getDefaultState() }
-//检查是否存在已有数据方法
-function some(arr, str) {
-  const result = arr.some((item) => {
-    if (item.name === str) {
-      return true
-    }
-  })
-  return result
-}
-function delOne(arr, str) {
-  return arr.filter(item => item.name !== str)
-}
-const mutations = {
-  SET_GISSOURCE: (state, payload) => {
-    state.mapConfig = payload
-  },
-  SET_TOOL: (state, data) => {
-    state.currentTool = data.name
-    if (!some(state.customToolList, data.name)) {
-      state.customToolList.push(data)
-    } else {
-      state.customToolList = state.customToolList.slice()
-    }
-  },
-  DEL_TOOL: (state, data) => {
-    state.customToolList = delOne(state.customToolList, data)
-    if (state.customToolList.length > 0) {
-      state.currentTool = state.customToolList[state.customToolList.length - 1].name
-    }
-  },
-  DEL_ALLTOOL: (state) => {
-    state.customToolList = []
-  },
-  RESET_ALL: (state) => {
-    Object.assign(state, getDefaultState())
-  }
-}
-
-function isEmpty(obj) {
-  if (Object.keys(obj).length === 0) return true
-  else return false
-}
-function short(key) {
-  return key.substring(key.indexOf("_") + 1, key.length)
-}
-const actions = {
-  initGISResource({ commit }) {
-    return new Promise((resolve, reject) => {
-      GetUserInitData({ platform: 1 }).then(res => {
-        const result = res.result.progisresource.find(e => e.code == "groupPageMapService")
-        if (!result) return
-        let mapSource = appconfig.bigScreenMapSettings.gisResource
-        let terrain = {}, img = {}, scenes = {}, maps = {},
-          tiplayers = {}, geometry = {}, theme = {}
-        result.config.forEach(item => {
-          if (item.key.indexOf('terrain') != -1) terrain[short(item.key)] = { "name": item.name, "url": item.url }
-          if (item.key.indexOf('tiled') != -1) img[short(item.key)] = { "name": item.name, "url": item.url }
-          if (item.key.indexOf('scene') != -1) scenes[short(item.key)] = { "name": item.name, "url": item.url }
-          if (item.key.indexOf('map') != -1) maps[short(item.key)] = { "name": item.name, "url": item.url }
-          if (item.key.indexOf('data') != -1) tiplayers[short(item.key)] = { "name": item.name, "url": item.url }
-          if (item.key.indexOf('spatialanalyst') != -1) geometry[short(item.key)] = { "name": item.name, "url": item.url }
-          if (item.key.indexOf('theme') != -1) theme[short(item.key)] = { "name": item.name, "url": item.url, "isDisplay": item.isDisplay ? item.isDisplay : '0' }
-        });
-        Object.keys(mapSource).forEach(item => {
-          switch (mapSource[item].type) {
-            case "terrain": if (!isEmpty(terrain)) mapSource[item].config = terrain; break;
-            case "tiled": if (!isEmpty(img)) mapSource[item].config = img; break;
-            case "scene": if (!isEmpty(scenes)) mapSource[item].config = scenes; break;
-            case "map": if (!isEmpty(maps)) mapSource[item].config = maps; break;
-            case "data": if (!isEmpty(tiplayers)) mapSource[item].config = tiplayers; break;
-            case "spatialanalyst": if (!isEmpty(geometry)) mapSource[item].config = geometry; break;
-            case "theme": if (!isEmpty(theme)) mapSource[item].config = theme; break;
-          }
-        })
-        appconfig.bigScreenMapSettings.gisResource = mapSource
-        commit('SET_GISSOURCE', appconfig.bigScreenMapSettings);
-        resolve(appconfig.bigScreenMapSettings);
-      }).catch(err => {
-        reject(err)
-      })
-    })
-  },
-  // 添加工具集
-  changeToolList({ commit, state }, value) {
-    commit('SET_TOOL', value)
-  },
-  //移除工具集
-  removeSingleTool({ commit, state }, value) {
-    commit('DEL_TOOL', value)
-  },
-  //移除所有工具
-  removeAllTool({ commit, state }, value) {
-    commit('DEL_ALLTOOL', value)
-  },
-  //重置state数据
-  resetState({ commit, state }, value) {
-    commit('RESET_ALL', value)
-  },
-}
-
-export default {
-  namespaced: true,
-  state,
-  mutations,
-  actions
-}

+ 0 - 9
src/store/modules/routeSetting.ts

@@ -17,14 +17,6 @@ const prjSelectionRoutes = {
   label: '项目选择',
   icon: 'el-icon-star-on'
 }
-const groupPageRoutes = {
-  path: '/groupPage',
-  component: () => import('@/views/groupPage/index.vue'),
-  meta: { title: '决策分析平台' },
-  type: 'sys',
-  label: '决策分析平台',
-  icon: 'el-icon-star-on'
-}
 const dashboardRoute = {
   path: '/',
   component: () => import('@/layout/index.vue'),
@@ -146,7 +138,6 @@ const actions = {
 
             const addRouter = packageRouter(routes)
             commit('SET_ROUTES', addRouter)
-            if (data.some((item) => item.type === 'groupPage')) addRouter.unshift(groupPageRoutes)
             if (data.some((item) => item.type === 'prjSelection')) addRouter.unshift(prjSelectionRoutes)
             if (data.some((item) => item.type === 'map' || gisNames.includes(item.type))) addRouter.unshift(mapRoute)
             if (data.some((item) => item.type === 'dashboard')) addRouter.unshift(dashboardRoute)

+ 1 - 43
src/store/modules/user.ts

@@ -55,49 +55,7 @@ const actions = {
     const { username, password, msg } = userInfo
     // setSessionStorage('username', username)
     return new Promise((resolve, reject) => {
-      loginwithcode({ username: username, password: sha1Hex(password), shortMessageCode: msg })
-        .then((response) => {
-          // console.log('2222', response)
-          // const data = {
-          //   accessToken: 1111111,
-          //   username: 'admin',
-          //   realName: '超级管理员'
-          // }
-          const { accessToken, username, avatar, realName, id, departmentId } = response.result
-          // const { accessToken, username, avatar, realName } = data
-          // setToken(accessToken)
-          commit('SET_TOKEN', accessToken)
-          commit('SET_USERNAME', username)
-          commit('SET_REALNAME', realName)
-          commit('SET_USERID', id)
-          commit('SET_DEPTS', departmentId)
-          setSessionStorage('token', accessToken)
-          setSessionStorage('username', username)
-          setSessionStorage('realName', realName)
-          setSessionStorage('userId', id)
-          setSessionStorage('departmentId', departmentId)
-          if (avatar) {
-            // getRemoteFile(avatar).then(res => {
-            //   if (res.status === 200) {
-            //     commit('SET_AVATAR', res.config.url)
-            //     setSessionStorage('avatar', res.config.url)
-            //   }
-            // })
-            commit('SET_AVATAR', getRemoteFile(avatar))
-            setSessionStorage('avatar', getRemoteFile(avatar))
-          }
-          resolve(response)
-        })
-        .catch((error) => {
-          reject(error)
-        })
-    })
-  },
-  mydeskLogin({commit,state,dispatch},userInfo){
-    const { token } = userInfo
-    // setSessionStorage('username', username)
-    return new Promise((resolve, reject) => {
-      loginwithcode(userInfo)
+      login({ username: username, password: sha1Hex(password) })
         .then((response) => {
           // console.log('2222', response)
           // const data = {

+ 3 - 3
src/utils/request.ts

@@ -47,8 +47,8 @@ declare module 'axios' {
 // 创建axios实例
 // export const IP = 'https://yeepms.yeec.com.cn/yclw-api' // 开发2
 
-//export const IP = 'http://192.168.2.235:7081' // 开发2
- export const IP = 'http://221.182.8.141:7081' // 开发2
+export const IP = 'http://192.168.2.235:9001' // 开发2
+ //export const IP = 'http://221.182.8.141:7081' // 开发2
 
 // 暴露IP地址
 export const baseAddress = IP
@@ -65,7 +65,7 @@ let requestTimes = 0
 // 请求拦截器
 service.interceptors.request.use(
   (config) => {
-    if (config.method === 'post' && config.url === '/auth/oauth/tokenWithShort') {
+    if (config.method === 'post' && config.url === '/auth/oauth/login') {
       // 请求为post    使用qs转换数据
       // if (config.method === 'post') { // 请求为post    使用qs转换数据
       config.data = qs.stringify(config.data)

+ 2 - 54
src/views/login/index.vue

@@ -4,7 +4,7 @@
       {{ title }}
       <!-- <img src="./images/logo.png" /> -->
     </div>
-    <div class="fill-container" v-show="isMydesk">
+    <div class="fill-container">
       <div class="left">
         <img src="./images/background3.png" />
       </div>
@@ -135,67 +135,15 @@ export default class Login extends Vue {
   }
   pwdRules = {}
   userId = ''
-  /**是否从mydesk跳转 */
-  isMydesk=true;
-  mydeskUrl='https://uac.ctg.com.cn/sso/login'
   get sysTitle() {
     return this.$store.state.settings.sysTitle
   }
-  /**mydesk登录验证 */
-  beforeMount() {
-    const search = window.location.hash.split('?')[1];
-    const SYS_ADDR = location.href.replace(/\#\/login.*$/, '')
-    console.log(SYS_ADDR)
-    if (search) {
-      const typeIndex = search.indexOf('type')
-      const tokenIndex = search.indexOf('token')
-      const rtype = this.getSearchString('type', search)
-      if(typeIndex>-1&&rtype === 'mydesk'){
-          this.isMydesk=false;
-      }
-      if (typeIndex > -1 && tokenIndex === -1) {
-        if (rtype === 'mydesk') {
-          window.location.href = this.mydeskUrl + '?url=' + SYS_ADDR + '#/login?type=mydesk'
-        }
-      } else if (typeIndex > -1 && tokenIndex > -1) {
-        const token = this.getSearchString('token', search)
-        this.loginWithTokenCheck(token)
-        return
-      }
-    } else {
-      alert('登录口令缺失')
-    }
-  }
   mounted() {
     this.pwdRules = {
       pass: [{ required: true, validator: this.validatePwd1st, trigger: 'blur' }],
       checkPass: [{ required: true, validator: this.validatePwd2nd, trigger: 'blur' }]
     }
   }
-  getSearchString(key, Url) {
-    var str = Url
-    //str = str.substring(1, str.length) // 获取URL中?之后的字符(去掉第一位的问号)
-    // 以&分隔字符串,获得类似name=xiaoli这样的元素数组
-    var arr = str.split('&')
-    var obj = new Object()
-    // 将每一个数组元素以=分隔并赋给obj对象
-    for (var i = 0; i < arr.length; i++) {
-      var tmp_arr = arr[i].split('=')
-      obj[decodeURIComponent(tmp_arr[0])] = decodeURIComponent(tmp_arr[1])
-    }
-    return obj[key]
-  }
-  /**
-   * 根据mydesk token登录
-   * @param {*} token
-   */
-  loginWithTokenCheck(token) {
-    this.$store.dispatch('user/mydeskLogin', { token: token }).then((result) => {
-      setTimeout(() => {
-        this.$router.push({ path: '/prjSelection' })
-      }, 0)
-    })
-  }
   validatePwd1st(rule, value, callback) {
     if (value === '') {
       callback(new Error('请输入密码!'))
@@ -294,7 +242,7 @@ export default class Login extends Vue {
                 } else {
                   this.loading = false
                   setTimeout(() => {
-                    this.$router.push({ path: '/prjSelection' })
+                    this.$router.push({ path: '/dashboard' })
                   }, 0)
                 }
               })

+ 71 - 71
src/views/widgets/cesiumMap.vue

@@ -209,77 +209,77 @@ export default {
      * 加载初始化场景
      */
     addInitScene() {
-      var scenes = this.AppX.appConfig.gisResource[this.baseScene]
-      if (scenes && scenes.config) {
-        this.scenesIndex = 0
-        Object.keys(scenes.config).forEach(
-          function (keyName, index) {
-            const item = scenes.config[keyName]
-            var promise = this.viewer.scene.open(item.url, undefined, {
-              autoSetView: false
-            })
-            Cesium.when(
-              promise,
-              function (layers) {
-                this.scenesIndex += 1
-                for (var i = 0; i < layers.length; i++) {
-                  var ly = layers[i]
-                  ly.selectEnabled = false
-                  ly.clearMemoryImmediately = false
-                  ly.cullEnabled = false
-                  //ly.lodRangeScale=0.01
-                  var model = BaseConfig.layers[ly.name]
-                  if (BaseConfig.sjpipeLayers.indexOf(ly.name) > -1) {
-                    let style3d = new Cesium.Style3D()
-                    style3d.altitudeMode = 0
-                    style3d.bottomAltitude = 0 - AppX.appConfig.downDepth
-                    ly.style3D = style3d
-                    //ly.visibleDistanceMax=800;
-                    ly.maxVisibleAltitude = BaseConfig.pipeMaxVisibel
-                  }
-                  //普查管线初始隐藏
-                  if (BaseConfig.pcpipeLayers.indexOf(ly.name) > -1) {
-                    let style3d = new Cesium.Style3D()
-                    style3d.altitudeMode = 0
-                    style3d.bottomAltitude = 0 - AppX.appConfig.downDepth
-                    ly.style3D = style3d
-                    ly.visible = false
-                    ly.maxVisibleAltitude = BaseConfig.pipeMaxVisibel
-                  }
-                  if (BaseConfig.pipeSelectLayers.indexOf(ly.name) > -1) {
-                    ly.selectedColor = Cesium.Color.DARKRED
-                    ly.selectColorType = 1
-                  }
-                  if (BaseConfig.pipeLineLayer.indexOf(ly.name) > -1) {
-                    ly.lodRangeScale = 20
-                  }
-                  if (model) {
-                    let style3d = new Cesium.Style3D()
-                    style3d.altitudeMode = 0
-                    style3d.bottomAltitude = model.bottomAltitude
-                    ly.visible = model.visible
-                    ly.style3D = style3d
-                    //ly.brightness = model.brightness;
-                    //ly.contrast = model.contrast;
-                    //ly.hue = model.hue;
-                    //ly.saturation = model.saturation;
-                    //ly.gamma = model.gamma;
-                    //if (Cesium.defined(model.maxVisibleAltitude)) ly.maxVisibleAltitude = model.maxVisibleAltitude;
-                    //if(Cesium.defined(model.maxVisibleDistance)) ly.visibleDistanceMax=model.maxVisibleDistance;
-                  }
-                  ly.refresh()
-                }
-                if (!this.AppX.runtimeConfig.activeView.scene.pickPositionSupported) {
-                  console.error('不支持深度纹理,无法拾取位置!')
-                }
-              }.bind(this),
-              function (e) {
-                console.error('加载SCP失败,请检查网络连接状态或者url地址是否正确?')
-              }
-            )
-          }.bind(this)
-        )
-      }
+      // var scenes = this.AppX.appConfig.gisResource[this.baseScene]
+      // if (scenes && scenes.config) {
+      //   this.scenesIndex = 0
+      //   Object.keys(scenes.config).forEach(
+      //     function (keyName, index) {
+      //       const item = scenes.config[keyName]
+      //       var promise = this.viewer.scene.open(item.url, undefined, {
+      //         autoSetView: false
+      //       })
+      //       Cesium.when(
+      //         promise,
+      //         function (layers) {
+      //           this.scenesIndex += 1
+      //           for (var i = 0; i < layers.length; i++) {
+      //             var ly = layers[i]
+      //             ly.selectEnabled = false
+      //             ly.clearMemoryImmediately = false
+      //             ly.cullEnabled = false
+      //             //ly.lodRangeScale=0.01
+      //             var model = BaseConfig.layers[ly.name]
+      //             if (BaseConfig.sjpipeLayers.indexOf(ly.name) > -1) {
+      //               let style3d = new Cesium.Style3D()
+      //               style3d.altitudeMode = 0
+      //               style3d.bottomAltitude = 0 - AppX.appConfig.downDepth
+      //               ly.style3D = style3d
+      //               //ly.visibleDistanceMax=800;
+      //               ly.maxVisibleAltitude = BaseConfig.pipeMaxVisibel
+      //             }
+      //             //普查管线初始隐藏
+      //             if (BaseConfig.pcpipeLayers.indexOf(ly.name) > -1) {
+      //               let style3d = new Cesium.Style3D()
+      //               style3d.altitudeMode = 0
+      //               style3d.bottomAltitude = 0 - AppX.appConfig.downDepth
+      //               ly.style3D = style3d
+      //               ly.visible = false
+      //               ly.maxVisibleAltitude = BaseConfig.pipeMaxVisibel
+      //             }
+      //             if (BaseConfig.pipeSelectLayers.indexOf(ly.name) > -1) {
+      //               ly.selectedColor = Cesium.Color.DARKRED
+      //               ly.selectColorType = 1
+      //             }
+      //             if (BaseConfig.pipeLineLayer.indexOf(ly.name) > -1) {
+      //               ly.lodRangeScale = 20
+      //             }
+      //             if (model) {
+      //               let style3d = new Cesium.Style3D()
+      //               style3d.altitudeMode = 0
+      //               style3d.bottomAltitude = model.bottomAltitude
+      //               ly.visible = model.visible
+      //               ly.style3D = style3d
+      //               //ly.brightness = model.brightness;
+      //               //ly.contrast = model.contrast;
+      //               //ly.hue = model.hue;
+      //               //ly.saturation = model.saturation;
+      //               //ly.gamma = model.gamma;
+      //               //if (Cesium.defined(model.maxVisibleAltitude)) ly.maxVisibleAltitude = model.maxVisibleAltitude;
+      //               //if(Cesium.defined(model.maxVisibleDistance)) ly.visibleDistanceMax=model.maxVisibleDistance;
+      //             }
+      //             ly.refresh()
+      //           }
+      //           if (!this.AppX.runtimeConfig.activeView.scene.pickPositionSupported) {
+      //             console.error('不支持深度纹理,无法拾取位置!')
+      //           }
+      //         }.bind(this),
+      //         function (e) {
+      //           console.error('加载SCP失败,请检查网络连接状态或者url地址是否正确?')
+      //         }
+      //       )
+      //     }.bind(this)
+      //   )
+      // }
     },
     /**
      * 该方法用于初始化cesium属性

+ 4 - 12
src/views/zhpt/index.vue

@@ -8,9 +8,7 @@
         }"
       >
         <el-main>
-          <!-- 排水检测弹窗 -->
-          <popup-window :rootPage='this' ref="popupwindow">
-          </popup-window>
+          
           <check-dialog @sendBool="setDetailVisible" v-if="detailsDialogFormVisible" :checkParam="DetailsId"></check-dialog>
 
           <div id="mapView" class="mapView">
@@ -102,21 +100,15 @@
 <script lang="ts">
   import { Vue, Component, Watch, Prop } from 'vue-property-decorator'
   import { HalfPanels, FullPanels, FloatPanels, SidePanels } from '@/layout/components/index'
-  import cesiumMap from '@/views/widgets/cesiumMap.vue'
-  import popupWindow from '@/views/pipelineDefect/components/popupWindow.vue'
-  import checkDialog from '@/views/pipelineDefect/components/checkDetails.vue'
-  import HandleManage from '../pipelineDefect/common/cesiumEvent'
   import { appconfig } from 'staticPub/config'
-  import CesiumUtil from '../pipelineDefect/common/cesiumUtil'
+  declare var CesiumUtil
+  // import CesiumUtil from '../pipelineDefect/common/cesiumUtil'
   @Component({
     components: {
       HalfPanels,
       FullPanels,
       FloatPanels,
-      SidePanels,
-      cesiumMap,
-      popupWindow,
-      checkDialog
+      SidePanels
     }
   })
   export default class BaseMap extends Vue {