修改

package-lock.json

@@ -4242,16 +4242,6 @@
           "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
           "dev": true
         },
-        "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"
-          }
-        },
         "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.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.3.0",
-          "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.3.0.tgz",
-          "integrity": "sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og==",
-          "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.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": {
-            "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"
-              }
-            },
-            "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"
-              }
-            },
-            "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"
-              }
-            }
-          }
-        },
-        "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"
-          }
-        },
         "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.npmmirror.com/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.npmmirror.com/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.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
         }
       }
     },
@@ -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.3.0",
+          "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.3.0.tgz",
+          "integrity": "sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og==",
+          "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",

src/components/Base/Table/index.vue

@@ -10,7 +10,7 @@
       v-if="!rerender"
     >
       <template slot="empty">
-        <img src="@/assets/icon/null.png" alt="暂无数据" />
+        <img src="@/assets/icon/null.png" />
       </template>
       <template v-for="{ prop, type, _slot, ...col } of columns">
         <template v-if="_slot">

src/components/CommonTable/index.vue

@@ -37,7 +37,7 @@
       <!-- @current-change="TablehandleCurrentChange" -->
       <template slot="empty">
         <img src="@/assets/icon/null.png" alt="" />
-        <p class="empty-p">暂无数据</p>
+        <!-- <p class="empty-p">暂无数据</p> -->
       </template>
       <el-table-column v-if="multiple" type="selection" width="40" />
       <!-- <el-table-column v-if="forId" label="序号" type="index" width="50" /> -->

src/components/Table/index.vue

@@ -34,7 +34,7 @@
       <!-- @current-change="TablehandleCurrentChange" -->
       <template slot="empty">
         <img src="@/assets/icon/null.png" alt="" />
-        <p class="empty-p">暂无数据</p>
+        <!-- <p class="empty-p">暂无数据</p> -->
       </template>
       <el-table-column v-if="multiple" type="selection" width="40" />
       <el-table-column v-if="forId" label="序号" type="index" width="50" />

src/layout/components/Header/index.vue

@@ -42,7 +42,7 @@
       </div>
       <div class="right-menu">
         <div class="btn_box">
-          <i class="el-icon-bell bell-info" title="消息提示" @click="notificationDialog = true">
+          <i class="el-icon-message-solid" title="消息提示" @click="notificationDialog = true">
             <span v-show="notificationNum !== 0" class="bell-dot">{{
               notificationNum > 100 ? '99+' : notificationNum
             }}</span>
@@ -56,7 +56,7 @@
             </audio> -->
           </i>
           <i v-if="showDashboard" class="el-icon-s-home" title="首页" @click="home" />
-          <i v-if="showSystemSetting" class="el-icon-setting" title="系统管理" @click="handleSys('sysSetting')" />
+          <i v-if="showSystemSetting" class="el-icon-s-tools" title="系统管理" @click="handleSys('sysSetting')" />
           <!-- <span class="home" title="首页" @click="home" />
           <i class="el-icon-s-tools" title="系统管理" @click="handleSys('sysSeting')" />
           <i class="el-icon-chat-dot-round" title="消息提示" /> -->

src/views/OnlineImport/widgets/DataImport/widget.vue

@@ -72,7 +72,7 @@
       <div class="content-body" style="height:410px;">
         <tf-table @page-change="onPageChange" :data="onlineRecords" :pagination="pagination">
           <template slot="empty">
-            <img src="@/assets/icon/null.png" alt="暂无数据" />
+            <img src="@/assets/icon/null.png"   />
           </template>
           <el-table-column prop="id" label="ID" width="100"></el-table-column>
           <el-table-column prop="areaName" label="所属区域"></el-table-column>

src/views/OnlineImport/widgets/PipeOnlineImport/widget.vue

@@ -155,7 +155,7 @@
               <div class="content-body" style="height:410px;">
                 <tf-table @page-change="onPageChange" :data="onlineRecords" :pagination="pagination">
                   <template slot="empty">
-                    <img src="@/assets/icon/null.png" alt="暂无数据" />
+                    <img src="@/assets/icon/null.png"   />
                   </template>
                   <el-table-column prop="id" label="ID" width="100"></el-table-column>
                   <el-table-column prop="areaName" label="所属区域"></el-table-column>

src/views/currentSystem/authorityManagement/coveringSpecification/comComponents.vue

@@ -61,7 +61,7 @@
     <div v-else style="width:100%;height:100%">
       <div style="position: relative;float: left;left: calc((100% - 50px)/2);top: calc((100% - 50px)/2);">
         <img src="@/assets/icon/null.png" alt="" />
-        <p class="empty-p">暂无数据</p>
+        <!-- <p class="empty-p">暂无数据</p> -->
       </div>
     </div>
   </form>

src/views/currentSystem/authorityManagement/dictManagement/index.vue

@@ -70,7 +70,7 @@
             >
               <template slot="empty">
                 <img src="@/assets/icon/null.png" alt="" />
-                <p class="empty-p">暂无数据</p>
+                <!-- <p class="empty-p">暂无数据</p> -->
               </template>
               <!-- <el-table-column type="selection" width="65" align="center"></el-table-column> -->
               <el-table-column label="序号" width="80" align="center">

src/views/currentSystem/authorityManagement/dictManagement/widgets/dicValue.vue

@@ -19,7 +19,7 @@
         <!-- <el-table-column type="selection" width="65" align="center"></el-table-column> -->
         <template slot="empty">
           <img src="@/assets/icon/null.png" alt="" />
-          <p class="empty-p">暂无数据</p>
+          <!-- <p class="empty-p">暂无数据</p> -->
         </template>
         <el-table-column label="序号" width="80" align="center" type="index" />
         <el-table-column prop="notes" label="字典名称" show-overflow-tooltip align="center"></el-table-column>

src/views/currentSystem/authorityManagement/section/index copy.vue

@@ -57,7 +57,7 @@
     >
       <template slot="empty">
         <img src="@/assets/icon/null.png" alt="" />
-        <p class="empty-p">暂无数据</p>
+        <!-- <p class="empty-p">暂无数据</p> -->
       </template>
       <!-- <el-table-column type="selection" align='center' width="55"  /> -->
       <!-- <el-table-column type="index" width="50" label="序号" /> -->

src/views/currentSystem/authorityManagement/section/index.vue

@@ -22,7 +22,7 @@
     >
       <template slot="empty">
         <img src="@/assets/icon/null.png" alt="" />
-        <p class="empty-p">暂无数据</p>
+        <!-- <p class="empty-p">暂无数据</p> -->
       </template>
       <!-- <el-table-column type="selection" align='center' width="55"  /> -->
       <!-- <el-table-column type="index" width="50" label="序号" /> -->

src/views/currentSystem/dashboard/components/Layout/MoreInfos.vue

@@ -16,7 +16,7 @@
     >
       <template slot="empty">
         <img src="@/assets/icon/null.png" alt="">
-        <p class="empty-p">暂无数据</p>
+        <!-- <p class="empty-p">暂无数据</p> -->
       </template>
       <template v-for="col in columns">
         <el-table-column v-if="col.prop !== 'action'" :key="col.prop" :type="col.type" :prop="col.prop" :label="col.label" :width="col.width" :align="col.align" :formatter="col.formatter" />

src/views/groupPage/districtPageModules/customTools/excavationAnalysis/detailsTable.vue

@@ -20,7 +20,7 @@
     >
       >
       <template slot="empty">
-        <p class="empty-p">暂无数据</p>
+        <!-- <p class="empty-p">暂无数据</p> -->
       </template>
       <el-table-column label="序号" type="index" width="50">
         <template slot-scope="scope">

src/views/pipelineDefect/analysis/defectSortStatis/widget.vue

@@ -134,7 +134,7 @@
         style="height: 100%; display: flex; justify-content: center; align-items: center"
       >
         <div style="text-align: center">
-        <img src="@/assets/icon/null.png" alt="暂无数据" />
+        <img src="@/assets/icon/null.png"   />
         </div>
       </div>
     </div>

src/views/pipelineDefect/analysis/evaluateStatis/widget.vue

@@ -92,7 +92,7 @@
                 show-summary
               >
                 <template slot="empty">
-                  <img src="@/assets/icon/null.png" alt="暂无数据" />
+                  <img src="@/assets/icon/null.png"   />
                 </template>
                 <el-table-column header-align="center" align="center" label="管道评估统计表">
                   <el-table-column

src/views/pipelineDefect/components/checkDetails.vue

@@ -130,7 +130,7 @@
               <div class="detailsTitle">功能性缺陷信息（{{ structDefectArr.length }}）</div>
 
               <div v-if="!structDefectArr" style="text-align: center">
-        <img src="@/assets/icon/null.png" alt="暂无数据" />
+        <img src="@/assets/icon/null.png"   />
               </div>
               <div v-show="structDefectArr" v-for="(v, i) in structDefectArr" :key="i" style="margin-top: 20px; height: 200px">
                 <div class="info-title">（{{ v.defectCode }}）{{ v.defectName }} 距离：{{ v.direction }}m</div>
@@ -187,7 +187,7 @@
               <div class="detailsTitle">结构性缺陷信息（{{ funcDefectArr.length }}）</div>
 
               <div v-if="!funcDefectArr" style="text-align: center">
-        <img src="@/assets/icon/null.png" alt="暂无数据" />
+        <img src="@/assets/icon/null.png"   />
               </div>
 
               <div v-show="funcDefectArr" v-for="(v, i) in funcDefectArr" :key="i" style="margin-top: 20px; height: 240px">

src/views/pipelineDefect/manage/defect/widget.vue

@@ -85,7 +85,7 @@
         :row-style="{ height: '40px' }"
       >
         <template slot="empty">
-          <img src="@/assets/icon/null.png" alt="暂无数据" />
+          <img src="@/assets/icon/null.png"   />
         </template>
         <el-table-column header-align="center" align="center" type="selection" width="55"> </el-table-column>
         <el-table-column align="center" type="index" label="序号" width="50"> </el-table-column>

src/views/pipelineDefect/manage/evaluate/widget.vue

@@ -82,7 +82,7 @@
         :default-sort="{ prop: 'date', order: 'descending' }"
       >
         <template slot="empty">
-          <img src="@/assets/icon/null.png" alt="暂无数据" />
+          <img src="@/assets/icon/null.png"   />
         </template>
         <el-table-column header-align="center" align="center" type="selection" width="55"> </el-table-column>
         <el-table-column header-align="center" align="center" type="index" label="序号" width="50"> </el-table-column>

src/views/pipelineDefect/manage/history/widget.vue

@@ -70,7 +70,7 @@
         :default-sort="{ prop: 'date', order: 'descending' }"
       >
         <template slot="empty">
-        <img src="@/assets/icon/null.png" alt="暂无数据" />
+        <img src="@/assets/icon/null.png"   />
         </template>
         <el-table-column header-align="center" align="center" type="selection" width="55"> </el-table-column>
         <el-table-column  align="center" type="index" label="序号" width="50"> </el-table-column>

src/views/pipelineDefect/manage/report/widget.vue

@@ -88,7 +88,7 @@
         :default-sort="{ prop: 'date', order: 'descending' }"
       >
         <template slot="empty">
-          <img src="@/assets/icon/null.png" alt="暂无数据" />
+          <img src="@/assets/icon/null.png"   />
         </template>
         <el-table-column header-align="center" :selectable="checkSelect" align="center" type="selection" width="55">
         </el-table-column>
@@ -232,7 +232,7 @@
                   height="250"
                 >
                   <template slot="empty">
-                    <img src="@/assets/icon/null.png" alt="暂无数据" />
+                    <img src="@/assets/icon/null.png"   />
                   </template>
 
                   <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
@@ -325,7 +325,7 @@
                   height="250"
                 >
                   <template slot="empty">
-        <img src="@/assets/icon/null.png" alt="暂无数据" />
+        <img src="@/assets/icon/null.png"   />
                   </template>
                   <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
                   <el-table-column property="name" label="视频名称" show-overflow-tooltip align="center">

src/views/pipelineDefect/manage/testPipelineDefect/widget.vue

@@ -28,7 +28,7 @@
         @row-click="openPromptBox"
       >
         <template slot="empty">
-        <img src="@/assets/icon/null.png" alt="暂无数据" />
+        <img src="@/assets/icon/null.png"   />
         </template>
         <el-table-column header-align="center" align="center" type="selection" width="55"> </el-table-column>
         <el-table-column align="center" type="index" label="序号" width="50"> </el-table-column>

src/views/pipelineDefect/manage/testPipelineEvaluation/widget.vue

@@ -28,7 +28,7 @@
         @row-click="openPromptBox"
       >
         <template slot="empty">
-        <img src="@/assets/icon/null.png" alt="暂无数据" />
+        <img src="@/assets/icon/null.png"   />
         </template>
         <el-table-column header-align="center" align="center" type="selection" width="55"> </el-table-column>
         <el-table-column align="center" type="index" label="序号" width="50"> </el-table-column>

src/views/spectrum/common/siteIcon/siteIcon.ts

@@ -119,6 +119,15 @@ export function getSiteIcon(deviceItem, isWarning = true) {
         })
         return require(`@/views/spectrum/common/images/${icon.path}`);
     }
+
+    // 波纹效果
+    if(deviceItem.siteState == 10){
+        // const icon = icons.find(item => {
+        //     return item.type == deviceItem.deviceType && item.state == 3;
+        // })
+        return require(`@/views/spectrum/common/images/dbs_8.png`);
+    }
+
     // 站点在在用情况下
     if (deviceItem.siteState == 1) {
         // 报警
@@ -152,7 +161,7 @@ export function getSiteIcon(deviceItem, isWarning = true) {
 }
 
 function timeSpan(direct_time) {
-    var now_time = Date.parse(new Date().toDateString());//当前时间的时间戳
+    var now_time = Date.parse(new Date().toDateString());//当前时间的时间戳1
     var end_time = Date.parse(new Date(direct_time).toDateString());//指定时间的时间戳
     if (end_time > now_time || !direct_time) {
         //截止时间已过

src/views/spectrum/configuration/point/widget.vue

@@ -114,7 +114,8 @@
       export: false
     }
 
-    pagination: IPagination = getDefaultPagination()
+    // 页数改变
+    pagination: IPagination = { current: 1, size: 100 }
 
     query: IQuery = {}
     levels: IOriginalDictionary[] = []

src/views/spectrum/configuration/utils.ts

@@ -107,12 +107,11 @@ export const pointCols: ColItem[] = [
   { type: 'index', label: '序号', width: '60px' },
   { prop: 'partitionName', label: '排水分区', minWidth: '100px', ...elTableAlignLeft() },
   { prop: 'groupByName', label: '监测分组', minWidth: '130px', ...elTableAlignLeft() },
-  { prop: 'siteCode', label: '站点编码', minWidth: '130px', ...elTableAlignLeft() },
-  { prop: 'siteName', label: '站点名称', minWidth: '140px', ...elTableAlignLeft() },
-  { prop: 'siteAddress', label: '站点地址', minWidth: '120px', ...elTableAlignLeft() },
-  { prop: 'deviceSn', label: 'SN序列号', minWidth: '130px', ...elTableAlignLeft() },
+  // { prop: 'siteCode', label: '站点编码', minWidth: '130px', ...elTableAlignLeft() },
+  { prop: 'siteName', label: '站点名称', minWidth: '250px', ...elTableAlignLeft() },
+  // { prop: 'deviceSn', label: 'SN序列号', minWidth: '130px', ...elTableAlignLeft() },
+  { prop: 'deviceName', label: '关联设备名称', minWidth: '200px', ...elTableAlignLeft() },
   { prop: 'deviceTypeName', label: '设备类型', minWidth: '120px', ...elTableAlignLeft() },
-  { prop: 'deviceName', label: '设备名称', minWidth: '130px', ...elTableAlignLeft() },
   // { prop: 'installPeople', label: '负责人', minWidth: '80px', ...elTableAlignLeft() },
   // { prop: 'liaisonPhone', label: '联系方式', minWidth: '120px', ...elTableAlignLeft() },
   { prop: 'drainageName', label: '关联排水设施', minWidth: '130px', ...elTableAlignLeft() },
@@ -124,5 +123,6 @@ export const pointCols: ColItem[] = [
     ...elTableAlignLeft(),
     formatter: ({ installTime }: IPoint) => (installTime ? moment(installTime).format('YYYY-MM-DD') : '')
   },
+  { prop: 'siteAddress', label: '站点地址', minWidth: '120px', ...elTableAlignLeft() },
   { prop: 'siteState', label: '站点状态', minWidth: '70px', _slot: true }
 ]

src/views/spectrum/dynamicMonitor/realTimeMonitor/widget.vue

@@ -39,9 +39,6 @@
             <el-button type="text" @click="openCurve(row)" style="padding:0">监测曲线</el-button>
           </template>
         </el-table-column>
-        <el-table-column prop="partitionName" label="排水分区" show-overflow-tooltip width="150" align="center"></el-table-column>
-        <el-table-column prop="groupByName" label="监测分组" show-overflow-tooltip width="150" align="center"></el-table-column>
-        <el-table-column prop="deviceTypeName" label="监测设备类型" show-overflow-tooltip width="150" align="center"></el-table-column>
         <el-table-column prop="siteName" label="监测点名称" show-overflow-tooltip width="150" align="center"></el-table-column>
         <el-table-column prop="siteState" label="站点状态" show-overflow-tooltip width="150" align="center">
           <template slot-scope="{ row }">{{ ['正常', '报警', '离线', '维护中'][row.siteState - 1] }}</template>
@@ -50,6 +47,9 @@
           <template slot-scope="{ row }">{{ getIntervalMinutes(row.collectionDate) }}</template>
         </el-table-column>
         <el-table-column prop="collectionDate" label="最近一次数据采集时间" show-overflow-tooltip width="180" align="center"></el-table-column>
+        <el-table-column prop="liquid" label="液位(m)" show-overflow-tooltip width="150" align="center">
+          <template slot-scope="{ row }">{{ row.liquid ? row.liquid : '/' }}</template>
+        </el-table-column>
         <el-table-column prop="temperature" label="温度(℃)" show-overflow-tooltip width="150" align="center">
           <template slot-scope="{ row }">{{ row.temperature ? row.temperature : '/' }}</template>
         </el-table-column>
@@ -77,9 +77,9 @@
         <el-table-column prop="tss" label="悬浮物(mg/L)" show-overflow-tooltip width="150" align="center">
           <template slot-scope="{ row }">{{ row.tss ? row.tss : '/' }}</template>
         </el-table-column>
-        <el-table-column prop="liquid" label="液位" show-overflow-tooltip width="150" align="center">
-          <template slot-scope="{ row }">{{ row.liquid ? row.liquid : '/' }}</template>
-        </el-table-column>
+        <el-table-column prop="partitionName" label="排水分区" show-overflow-tooltip width="150" align="center"></el-table-column>
+        <el-table-column prop="groupByName" label="监测分组" show-overflow-tooltip width="150" align="center"></el-table-column>
+        <el-table-column prop="deviceTypeName" label="监测设备类型" show-overflow-tooltip width="150" align="center"></el-table-column>
       </el-table>
     </div>
     <!-- 分页 -->
@@ -94,7 +94,7 @@
 import { getSites, getPGBSiteData } from '@/views/spectrum/dynamicMonitor/api/api'
 
 import historyCurve from '@/views/spectrum/common/historyCurve/index'
-import { getSiteIcon } from '@/views/spectrum/common/siteIcon/siteIcon' // 站点图标
+import { getSiteIcon } from '@/views/spectrum/common/siteIcon/siteIcon' // 站点图标1
 export default {
   components: {
     historyCurve
@@ -114,7 +114,7 @@ export default {
     this.getPGBSiteData()
     this.interVal = setInterval(() => {
       this.getPGBSiteData()
-    }, 60000)
+    }, 600000)
   },
   destroyed() {
     if (this.interVal) clearInterval(this.interVal)

src/views/spectrum/dynamicMonitor/waterQualityLedger/widget.vue

@@ -1,3 +1,4 @@
+<!-- 增加液位 -->
 <template>
   <div class="content">
     <!-- 头部 -->
@@ -42,17 +43,17 @@
         <el-table-column prop="date" label="序号" width="50" align="center">
           <template slot-scope="scope">{{scope.$index+1}}</template>
         </el-table-column>
-        <el-table-column prop="partitionName" label="排水分区" show-overflow-tooltip width="150" align="center"></el-table-column>
-        <el-table-column prop="groupByName" label="监测分组" show-overflow-tooltip width="150" align="center"></el-table-column>
-        <el-table-column prop="deviceTypeName" label="监测设备类型" show-overflow-tooltip width="150" align="center"></el-table-column>
-        <el-table-column prop="siteName" label="监测点名称" show-overflow-tooltip width="150" align="center"></el-table-column>
-        <el-table-column prop="collectionDate" label="采集数据时间" show-overflow-tooltip width="150" align="center"></el-table-column>
+        <el-table-column prop="siteName" label="监测点名称" show-overflow-tooltip width="200" align="center"></el-table-column>
+        <el-table-column prop="collectionDate" label="采集数据时间" show-overflow-tooltip width="200" align="center"></el-table-column>
         <el-table-column prop="isWarning" label="是否存在报警" show-overflow-tooltip width="150" align="center">
           <template slot-scope="{row}">
             <span :style="{color:row.isWarning=='是'?'red':'#606266'}">{{row.isWarning}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="temperature" label="温度(℃)" show-overflow-tooltip width="150" align="center">
+        <el-table-column prop="liquid" label="液位(m)" show-overflow-tooltip width="150" align="center">
+          <template slot-scope="{ row }">{{ row.liquid ? row.liquid : '/' }}</template>
+        </el-table-column>
+        <el-table-column prop="temperature" label="温度(℃)" show-overflow-tooltip width="100" align="center">
           <template slot-scope="{row}">{{row.temperature?row.temperature:"/"}}</template>
         </el-table-column>
         <el-table-column prop="turb" label="浊度(NTU)" show-overflow-tooltip width="150" align="center">
@@ -79,6 +80,9 @@
         <el-table-column prop="tss" label="悬浮物(mg/L)" show-overflow-tooltip width="150" align="center">
           <template slot-scope="{row}">{{row.tss?row.tss:"/"}}</template>
         </el-table-column>
+        <el-table-column prop="partitionName" label="排水分区" show-overflow-tooltip width="150" align="center"></el-table-column>
+        <el-table-column prop="groupByName" label="监测分组" show-overflow-tooltip width="150" align="center"></el-table-column>
+        <el-table-column prop="deviceTypeName" label="监测设备类型" show-overflow-tooltip width="150" align="center"></el-table-column>
         <el-table-column prop="isvalidName" label="是否有效" show-overflow-tooltip width="150" align="center">
           <template slot-scope="{row}">{{row.isvalidName?row.isvalidName:"/"}}</template>
         </el-table-column>

src/views/spectrum/health/flaw/AlarmConfigForm.vue

@@ -0,0 +1,282 @@
+<template>
+  <tf-dialog
+    v-bind="$attrs"
+    v-on="listeners"
+    @submit="onSubmit"
+    :loading="loading"
+    :width="formData.defectinfo.interfaceCode ? '768px' : '768px'"
+  >
+    <el-form class="form" ref="form" v-bind="{ labelWidth: 'auto', size: 'small' }" :model="formData" :rules="rules">
+      <el-row type="flex" :gutter="15">
+        <el-col :span="formData.defectinfo.interfaceCode ? 24 : 24">
+          
+          <el-form-item label="算法名称" prop="defectinfo.interfaceName">
+            <el-select
+              v-model="formData.defectinfo.interfaceCode"
+              placeholder="请选择算法名称"
+              @change="onInterfaceChange"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item of interfaces"
+                :key="item.id"
+                :value="item.interfaceCode"
+                :label="item.interfaceName"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="报警参数" prop="defectinfo.alarmParam">
+            <el-input
+              v-model="formData.defectinfo.alarmParam"
+              placeholder="请输入报警参数"
+              clearable
+            />
+          </el-form-item>
+
+          <!-- 报警等级 -->
+          <el-row v-for="(item, index) in siteGroups" :key="index">
+              <el-button
+                v-if="index == siteGroups.length - 1"
+                type="text"
+                class="row-btn"
+                icon="el-icon-circle-plus-outline"
+                @click="addSiteItem()"
+              ></el-button>
+              <el-button
+                v-else
+                type="text"
+                class="row-btn"
+                style="color: #f40;"
+                icon="el-icon-remove-outline"
+                @click="romoveSiteItem(index)"
+              ></el-button>
+              <el-col :span="8">
+                <el-form-item label="报警等级" prop="alarmGrade">
+                  <el-select
+                    v-model="item.value"
+                    filterable
+                    placeholder="选择报警等级"
+                    value-key="id"
+                    clearable
+                    style="width: 100%"
+                    @change="selectSite(item.site, index)"
+                  >
+                    <!-- <el-option v-for="(site, index) in siteOption" :key="index" :label="site.siteName" :value="site">
+                    </el-option> -->
+                    <el-option label="1级" value="1级"></el-option>
+                    <el-option label="2级" value="2级"></el-option>
+                    <el-option label="3级" value="3级"></el-option>
+                    <el-option label="4级" value="4级"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="下限" prop="min">
+                  <el-input v-model="item.minValue" placeholder="下限">
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="上限" prop="max">
+                  <el-input v-model="item.maxValue" placeholder="上限">
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+        </el-col>
+
+      </el-row>
+    </el-form>
+  </tf-dialog>
+</template>
+
+<script lang="ts">
+  import { Vue, Component, Prop, Watch, Ref } from 'vue-property-decorator'
+  import { ElForm } from 'element-ui/types/form'
+  import { IFlaw, IFlawParam, IInterface, IParam } from '../api/common'
+  import { IDictionary } from '@/api/common'
+  import { fetchParams, fetchPointsByUpAndDown } from '../api/flaw'
+  import { IPoint } from '../../configuration/api/common'
+  import { flawPointParamCols } from '../utils'
+
+  const getDefaultFormData = () => ({
+    defectinfo: {
+      id: undefined,
+      // 算法名称
+      interfaceName: '',
+      // 监测时间
+      times:'',
+      // 报警参数
+      alarmParam:'',
+    },
+    defectinfoParmSet: []
+  })
+
+  @Component({ name: 'TeamForm', components: {} })
+  export default class TeamForm extends Vue {
+    @Prop({ type: Object, default: () => ({}) }) data!: object
+    @Prop({ type: Boolean, default: false }) loading!: boolean
+    @Prop({ type: Array, default: () => [] }) types!: IDictionary[]
+    @Prop({ type: Array, default: () => ({}) }) interfaces!: IInterface[]
+    @Prop({ type: Array, default: () => ({}) }) points!: IPoint[]
+    @Ref('form') formRef: ElForm
+
+    formData: IFlawParam = getDefaultFormData()
+
+    currentInterface: Partial<IInterface> = {}
+
+    params: IParam[] = []
+
+    columns = flawPointParamCols
+
+    fetchingParams: boolean = false
+
+    compare = []
+    upAndDown = []
+
+    siteGroups = [
+          {
+            site: null,
+            targets: [],
+            target: null,
+            symbol: null,
+            // 下限
+            minValue: '',
+            // 上限
+            maxValue: '',
+          },
+        ]
+
+        siteOption = []
+
+    get listeners() {
+      const { submit, ...rest } = this.$listeners
+      return rest
+    }
+
+    get computedPoints() {
+      return this.compare.length > 0 ? this.upAndDown : this.points
+    }
+
+    rules = {
+      'defectinfo.interfaceName': [{ required: true, message: '请选择算法名称', trigger: 'blur' }],
+      'grade': [{ required: true, message: '请选择报警等级', trigger: 'blur' }],
+      'min': [{ required: true, message: '请输入下限', trigger: 'blur' }],
+      'max': [{ required: true, message: '请输入上限', trigger: 'blur' }],
+    }
+
+    onInterfaceChange(code: string) {
+      const current = this.interfaces.find((item) => item.interfaceCode === code)
+      this.currentInterface = current
+      const { interfaceName, interfaceCode, interfaceDescription, algorithmNote } = current || {}
+      this.formData = {
+        ...this.formData,
+        defectinfo: { ...this.formData.defectinfo, interfaceName, interfaceDescription, algorithmNote }
+      }
+      this.fetchParams(interfaceCode)
+    }
+
+    async fetchParams(code: string) {
+      this.fetchingParams = true
+      try {
+        const { result } = await fetchParams(code)
+        this.formData.defectinfoParmSet = result || []
+      } catch (error) {
+        console.log(error)
+      }
+      this.fetchingParams = false
+    }
+
+    /**
+  * 添加条件
+  */
+    addSiteItem() {
+      this.siteGroups.push({
+        site: null,
+        targets: [],
+        target: null,
+        symbol: null,
+        targetUnit: '',
+      })
+    }
+
+    /**
+ * 移除条件
+ */
+    romoveSiteItem(index) {
+      this.siteGroups.splice(index, 1)
+    }
+
+    /**
+ * 站点选择
+ */
+    selectSite(site, index) {
+      if (!site) {
+        this.$set(this.siteGroups[index], 'target', null)
+        this.$set(this.siteGroups[index], 'targetUnit', null)
+        return
+      }
+    }
+
+    // 提交表单内容
+    onSubmit() {
+      this.formRef.validate((valid) => {
+        if (valid) {
+          const {
+            defectinfo: { monitorIds, ...rest },
+            defectinfoParmSet
+          } = this.formData
+          this.$emit('submit', { defectinfo: { ...rest, monitorIds: monitorIds.join() }, defectinfoParmSet })
+        }
+      })
+    }
+    async fetchPointsByUpAndDown(type: string) {
+      const { result } = await fetchPointsByUpAndDown({ type })
+      this.upAndDown = result
+    }
+
+    @Watch('compare')
+    onCompareChange(val) {
+      this.fetchPointsByUpAndDown(val.join())
+    }
+
+    @Watch('data', { immediate: true })
+    setDefaultData(val: IFlaw) {
+      const { id, interfaceCode, monitorIds } = val || {}
+      this.formData = id
+        ? {
+            defectinfo: {
+              ...val,
+              monitorIds: String(monitorIds || '')
+                .split(',')
+                .filter((item) => !!item)
+                .map((num) => Number(num))
+            },
+            defectinfoParmSet: []
+          }
+        : getDefaultFormData()
+      this.currentInterface = {}
+      if (interfaceCode) {
+        this.onInterfaceChange(interfaceCode)
+      }
+    }
+
+  }
+</script>
+<style lang="scss" scoped>
+.form {
+  /deep/ .input input {
+    text-align: center;
+  }
+}
+
+.row-btn {
+  position: absolute;
+  left: -18px;
+  top: 5px;
+  font-size: 18px;
+  padding: 0;
+}
+</style>

src/views/spectrum/health/flaw/FengxianForm.vue

@@ -0,0 +1,190 @@
+<template>
+  <tf-dialog
+    v-bind="$attrs"
+    v-on="listeners"
+    @submit="onSubmit"
+    :loading="loading"
+    :width="formData.defectinfo.interfaceCode ? '568px' : '568px'"
+  >
+    <el-form class="form" ref="form" v-bind="{ labelWidth: 'auto', size: 'small' }" :model="formData" :rules="rules">
+      <el-row type="flex" :gutter="15">
+        <el-col :span="formData.defectinfo.interfaceCode ? 24 : 24">
+          
+          <el-form-item label="算法名称" prop="defectinfo.interfaceName">
+            <el-select
+              v-model="formData.defectinfo.interfaceCode"
+              placeholder="请选择算法名称"
+              @change="onInterfaceChange"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item of interfaces"
+                :key="item.id"
+                :value="item.interfaceCode"
+                :label="item.interfaceName"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="监测时间" prop="defectinfo.times">
+            <el-date-picker
+              v-model="formData.defectinfo.times"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              style="width: 100%">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+
+      <el-button type="danger" plain @click="clear" class="row-btn" size="small">清空已有分析结果</el-button>
+    </el-form>
+  </tf-dialog>
+</template>
+
+<script lang="ts">
+  import { Vue, Component, Prop, Watch, Ref } from 'vue-property-decorator'
+  import { ElForm } from 'element-ui/types/form'
+  import { IFlaw, IFlawParam, IInterface, IParam } from '../api/common'
+  import { IDictionary } from '@/api/common'
+  import { fetchParams, fetchPointsByUpAndDown } from '../api/flaw'
+  import { IPoint } from '../../configuration/api/common'
+  import { flawPointParamCols } from '../utils'
+
+  const getDefaultFormData = () => ({
+    defectinfo: {
+      id: undefined,
+      interfaceName: '',
+      times:'',
+    },
+    defectinfoParmSet: []
+  })
+
+  @Component({ name: 'TeamForm', components: {} })
+  export default class TeamForm extends Vue {
+    @Prop({ type: Object, default: () => ({}) }) data!: object
+    @Prop({ type: Boolean, default: false }) loading!: boolean
+    @Prop({ type: Array, default: () => [] }) types!: IDictionary[]
+    @Prop({ type: Array, default: () => ({}) }) interfaces!: IInterface[]
+    @Prop({ type: Array, default: () => ({}) }) points!: IPoint[]
+    @Ref('form') formRef: ElForm
+
+    formData: IFlawParam = getDefaultFormData()
+
+    currentInterface: Partial<IInterface> = {}
+
+    params: IParam[] = []
+
+    columns = flawPointParamCols
+
+    fetchingParams: boolean = false
+
+    compare = []
+    upAndDown = []
+
+    get listeners() {
+      const { submit, ...rest } = this.$listeners
+      return rest
+    }
+
+    get computedPoints() {
+      return this.compare.length > 0 ? this.upAndDown : this.points
+    }
+
+    rules = {
+      'defectinfo.interfaceName': [{ required: true, message: '请选择算法名称', trigger: 'blur' }],
+      'defectinfo.times': [{ required: true, message: '请选择监测时间', trigger: 'blur' }],
+    }
+
+    onInterfaceChange(code: string) {
+      const current = this.interfaces.find((item) => item.interfaceCode === code)
+      this.currentInterface = current
+      const { interfaceName, interfaceCode, interfaceDescription, algorithmNote } = current || {}
+      this.formData = {
+        ...this.formData,
+        defectinfo: { ...this.formData.defectinfo, interfaceName, interfaceDescription, algorithmNote }
+      }
+      this.fetchParams(interfaceCode)
+    }
+
+    async fetchParams(code: string) {
+      this.fetchingParams = true
+      try {
+        const { result } = await fetchParams(code)
+        this.formData.defectinfoParmSet = result || []
+      } catch (error) {
+        console.log(error)
+      }
+      this.fetchingParams = false
+    }
+
+    // 清空已有数据
+    clear(){
+      this.$confirm(`是否确认清空已有数据？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+      
+    }
+
+    onSubmit() {
+      this.formRef.validate((valid) => {
+        if (valid) {
+          const {
+            defectinfo: { monitorIds, ...rest },
+            defectinfoParmSet
+          } = this.formData
+          this.$emit('submit', { defectinfo: { ...rest, monitorIds: monitorIds.join() }, defectinfoParmSet })
+        }
+      })
+    }
+
+    async fetchPointsByUpAndDown(type: string) {
+      const { result } = await fetchPointsByUpAndDown({ type })
+      this.upAndDown = result
+    }
+
+    @Watch('compare')
+    onCompareChange(val) {
+      this.fetchPointsByUpAndDown(val.join())
+    }
+
+    @Watch('data', { immediate: true })
+    setDefaultData(val: IFlaw) {
+      const { id, interfaceCode, monitorIds } = val || {}
+      this.formData = id
+        ? {
+            defectinfo: {
+              ...val,
+              monitorIds: String(monitorIds || '')
+                .split(',')
+                .filter((item) => !!item)
+                .map((num) => Number(num))
+            },
+            defectinfoParmSet: []
+          }
+        : getDefaultFormData()
+      this.currentInterface = {}
+      if (interfaceCode) {
+        this.onInterfaceChange(interfaceCode)
+      }
+    }
+  }
+</script>
+<style lang="scss" scoped>
+  .form {
+    /deep/ .input input {
+      text-align: center;
+    }
+  }
+
+  .row-btn {
+  position: absolute;
+  left: 20px;
+  top: 213px;
+}
+</style>

src/views/spectrum/health/flaw/QueryForm.vue

@@ -45,6 +45,29 @@
       >
         删除
       </el-button>
+
+      <el-button
+        type="primary"
+        size="small"
+        :loading="loading.analyse"
+        :disabled="loading.analyse"
+        @click="$emit('analyse')"
+    
+      >
+        缺陷分析
+      </el-button>
+
+      <el-button
+        type="primary"
+        size="small"
+        :loading="loading.alarm"
+        :disabled="loading.alarm"
+        @click="$emit('alarm')"
+    
+      >
+        报警等级配置
+      </el-button>
+
     </el-form-item>
   </el-form>
 </template>
@@ -58,6 +81,8 @@
     add: boolean
     update: boolean
     del: boolean
+    analyse: boolean
+    alarm: boolean
   }
 
   @Component({ name: 'QueryForm' })

src/views/spectrum/health/flaw/widget.vue

@@ -9,6 +9,8 @@
         @update="onUpdate"
         @del="onDel"
         @export="onExport"
+        @analyse="onAnalyse"
+        @alarm="onAlarm"
       />
     </template>
     <tf-table
@@ -40,6 +42,28 @@
       :interfaces="interfaces"
       :points="points"
     />
+
+    <FengxianForm
+      :visible.sync="visibleFengXian"
+      :title="`算法执行`"
+      :data="current"
+      @submit="onSubmit"
+      :loading="loading.analyse"
+      :types="drainageTypes"
+      :interfaces="interfaces"
+      :points="points"
+    />
+
+    <AlarmConfigForm
+      :visible.sync="visibleAlarmConfig"
+      :title="`报警等级配置`"
+      :data="current"
+      @submit="onSubmit"
+      :loading="loading.alarm"
+      :types="drainageTypes"
+      :interfaces="interfaces"
+      :points="points"
+    />
   </tf-page>
 </template>
 
@@ -47,6 +71,8 @@
   import { Vue, Component, Prop, Watch } from 'vue-property-decorator'
   import QueryForm from './QueryForm.vue'
   import FlawForm from './FlawForm.vue'
+  import FengxianForm from './FengxianForm.vue'
+  import AlarmConfigForm from './AlarmConfigForm.vue'
   import { getDefaultPagination } from '@/utils/constant'
   import { flawCols } from '../utils'
   import { IOriginalDictionary, IPagination } from '@/api/common'
@@ -62,20 +88,26 @@
   import { IFlaw, IFlawParam, IInterface } from '../api/common'
   import { IPoint } from '../../configuration/api/common'
 
-  @Component({ name: 'Device', components: { QueryForm, FlawForm } })
+  @Component({ name: 'Device', components: { QueryForm, FlawForm, FengxianForm, AlarmConfigForm } })
   export default class Device extends Vue {
     @Prop({ type: Boolean, default: false }) isActive!: boolean
     teamCols = flawCols
 
     visible = false
 
+    // 缺陷
+    visibleFengXian = false
+
+    // 报警
+    visibleAlarmConfig = false
+
     current: Partial<IFlaw> = {}
 
     selected: IFlaw[] = []
 
     teams: IFlaw[] = []
 
-    loading = { query: false, del: false, export: false, add: false, update: false }
+    loading = { query: false, del: false, export: false, add: false, update: false, analyse:  false, alarm: false}
 
     pagination: IPagination = getDefaultPagination()
 
@@ -133,6 +165,16 @@
       this.visible = true
     }
 
+    onAnalyse(){
+      this.current = {}
+      this.visibleFengXian = true
+    }
+
+    onAlarm(){
+      this.current = {}
+      this.visibleAlarmConfig = true
+    }
+
     onUpdate(row) {
       this.current = { ...row }
       this.visible = true

src/views/spectrum/monitorWarning/alarmHistory/widget.vue

@@ -44,7 +44,7 @@
       { prop: 'groupByName', label: '监测分组', minWidth: '120px', ...elTableAlignLeft() },
       { prop: 'deviceTypeName', label: '设备类型', minWidth: '120px', ...elTableAlignLeft() },
       { prop: 'deviceName', label: '设备名称', minWidth: '130px', ...elTableAlignLeft() },
-      { prop: 'deviceCode', label: '设备编号', minWidth: '150px', ...elTableAlignLeft() },
+      // { prop: 'deviceCode', label: '设备编号', minWidth: '150px', ...elTableAlignLeft() },
       { prop: 'collectionDate', label: '采集数据时间', minWidth: '170px', ...elTableAlignLeft() },
       {
         prop: 'type',
@@ -53,8 +53,8 @@
         formatter: ({ type }: IWarningInfo) => ({ '0': '报警', '1': '预警' }[String(type)] || type)
       },
       { prop: 'targetName', label: '参数', minWidth: '150px', ...elTableAlignLeft() },
-      { prop: 'checkValue', label: '检测值', minWidth: '100px', ...elTableAlignLeft() },
-      { prop: 'warningName', label: '预警等级', minWidth: '100px' },
+      { prop: 'checkValue', label: '监测值', minWidth: '100px', ...elTableAlignLeft() },
+      { prop: 'warningName', label: '预警等级', minWidth: '200px' },
       { prop: 'upperLimit', label: '上限', minWidth: '100px', ...elTableAlignLeft() },
       { prop: 'lowerLimit', label: '下限', minWidth: '100px', ...elTableAlignLeft() },
       {

src/views/spectrum/reform/afterAssess/style.scss

@@ -35,7 +35,7 @@
         border-top-left-radius: 5px;
         border-bottom-left-radius: 5px;
         box-sizing: border-box;
-        padding: 20px 20px;
+        padding: 20px 5px;
         overflow-y: auto;
         position: relative;
         overflow: hidden;
@@ -49,7 +49,7 @@
         border-top-right-radius: 5px;
         border-bottom-right-radius: 5px;
         box-sizing: border-box;
-        padding: 10px 20px;
+        padding: 10px 10px;
         padding-left: 10px;
         overflow-y: auto;
 

src/views/spectrum/reform/afterAssess/widget.vue

@@ -181,7 +181,7 @@
           max-height="400px"
         >
           <template slot="empty">
-            <img src="@/assets/icon/null.png" alt="暂无数据" style="width: 100px" />
+            <img src="@/assets/icon/null.png"   style="width: 100px" />
           </template>
           <el-table-column prop="monitorName" label="站点名称" align="center" show-overflow-tooltip></el-table-column>
           <el-table-column

src/views/spectrum/reform/connectivity/tableWidget/index.vue

@@ -2,7 +2,7 @@
   <el-table :data="tableData" style="width: 100%" :header-cell-style="{ background: 'rgba(45, 116, 231,0.2)', 
       color: '#333333', height: '35px', textAlign: 'center' }" :cell-style="{padding:'5px 0'}" height="200px" @row-dblclick="rowClick">
     <template slot="empty">
-      <img src="@/assets/icon/null.png" alt="暂无数据" style="width:100px" />
+      <img src="@/assets/icon/null.png"   style="width:100px" />
     </template>
     <el-table-column label="序号" align="center" width="50">
       <template slot-scope="scope">{{scope.$index+1}}</template>

src/views/spectrum/reform/connectivity/widget.vue

@@ -58,7 +58,7 @@
           textAlign: 'center'
         }" :cell-style="{ padding: '5px 0' }" height="200px">
         <template slot="empty">
-          <img src="@/assets/icon/null.png" alt="暂无数据" style="width: 100px" />
+          <img src="@/assets/icon/null.png"   style="width: 100px" />
         </template>
         <el-table-column label="序号" align="center">
           <template slot-scope="scope">{{ scope.$index + 1 }}</template>

src/views/spectrum/reform/groundWater/style.scss

@@ -54,7 +54,7 @@
     border-top-left-radius: 5px;
     border-bottom-left-radius: 5px;
     box-sizing: border-box;
-    padding: 20px 20px;
+    padding: 20px 5px;
     overflow-y: auto;
     position: relative;
     overflow: hidden;
@@ -68,7 +68,7 @@
     border-top-right-radius: 5px;
     border-bottom-right-radius: 5px;
     box-sizing: border-box;
-    padding: 10px 20px;
+    padding: 10px 10px;
     overflow-y: auto;
 
     .chart-panel {

src/views/spectrum/reform/groundWater/widget.vue

@@ -44,17 +44,17 @@
           height="200px"
         >
           <template slot="empty">
-            <img src="@/assets/icon/null.png" alt="暂无数据" style="width: 100px" />
+            <img src="@/assets/icon/null.png"   style="width: 100px" />
           </template>
           <el-table-column label="序号" align="center" width="50">
             <template slot-scope="scope">{{ scope.$index + 1 }}</template>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             prop="deviceTypeName"
             label="监测类型"
             align="center"
             show-overflow-tooltip
-          ></el-table-column>
+          ></el-table-column> -->
           <el-table-column prop="siteName" label="监测点" align="center" show-overflow-tooltip>
             <template slot-scope="{ row }">
               <el-button type="text" style="padding: 0" @click="locationSite(row)">{{ row.siteName }}</el-button>
@@ -111,7 +111,7 @@
           height="calc(100% - 51px)"
         >
           <template slot="empty">
-            <img src="@/assets/icon/null.png" alt="暂无数据" style="width: 100px" />
+            <img src="@/assets/icon/null.png"   style="width: 100px" />
           </template>
           <el-table-column label="序号" align="center" width="50">
             <template slot-scope="scope">{{ scope.$index + 1 }}</template>

src/views/spectrum/reform/preAssess/style.scss

@@ -32,7 +32,7 @@
         border-top-left-radius: 5px;
         border-bottom-left-radius: 5px;
         box-sizing: border-box;
-        padding: 20px 20px;
+        padding: 20px 5px;
         overflow-y: auto;
         position: relative;
         overflow: hidden;
@@ -45,7 +45,7 @@
         border-top-right-radius: 5px;
         border-bottom-right-radius: 5px;
         box-sizing: border-box;
-        padding: 10px 20px;
+        padding: 10px 10px;
         padding-left: 10px;
         overflow-y: auto;
         .chart-panel {

src/views/spectrum/reform/preAssess/widget.vue

@@ -14,31 +14,31 @@
         <div class="chart-box" style="padding-right: 20px">
           <div class="chart-title">
             <span style="color: #2d74e7">管网破损：</span>
-            <span v-if="pipeBroken">
-              <span style="color: #f59421; font-size: 16px">{{ pipeBroken.monitor || 0 }}</span>
+            <span v-if="pipeBroken" style="font-size: 14px;">
+              <span style="color: #f59421; font-size: 24px">{{ pipeBroken.monitor || 0 }}</span>
               个监测点发现
-              <span style="color: #f59421; font-size: 16px">{{ parseFloat(pipeBroken.length).toFixed(3) || 0 }}</span>
+              <span style="color: #f59421; font-size: 24px">{{ parseFloat(pipeBroken.length).toFixed(3) || 0 }}</span>
               公里排水管网存在此隐患
             </span>
             <span v-else>暂未发现</span>
           </div>
           <div class="chart" ref="chart1">
-            <img src="@/assets/icon/null.png" alt="暂无数据" style="width: 100px" />
+            <img src="@/assets/icon/null.png"   style="width: 100px" />
           </div>
         </div>
         <div class="chart-box" style="padding-left: 20px">
           <div class="chart-title">
             <span style="color: #2d74e7">雨污混接：</span>
-            <span v-if="rainHybrid">
-              <span style="color: #f59421; font-size: 16px">{{ rainHybrid.monitor || 0 }}</span>
+            <span v-if="rainHybrid" style="font-size: 14px;">
+              <span style="color: #f59421; font-size: 24px">{{ rainHybrid.monitor || 0 }}</span>
               个监测点发现
-              <span style="color: #f59421; font-size: 16px">{{ parseFloat(rainHybrid.length).toFixed(3) || 0 }}</span>
+              <span style="color: #f59421; font-size: 24px">{{ parseFloat(rainHybrid.length).toFixed(3) || 0 }}</span>
               公里排水管网存在此隐患
             </span>
             <span v-else>暂未发现</span>
           </div>
           <div class="chart" ref="chart2">
-            <img src="@/assets/icon/null.png" alt="暂无数据" style="width: 100px" />
+            <img src="@/assets/icon/null.png"   style="width: 100px" />
           </div>
         </div>
       </div>
@@ -66,28 +66,27 @@
           height="240px"
         >
           <template slot="empty">
-            <img src="@/assets/icon/null.png" alt="暂无数据" style="width: 100px" />
+            <img src="@/assets/icon/null.png"   style="width: 100px" />
           </template>
-          <el-table-column label="序号" align="center">
+          <el-table-column label="序号" align="center" width="50px">
             <template slot-scope="scope">{{ scope.$index + 1 }}</template>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             prop="deviceTypeName"
             label="监测类型"
             align="center"
             show-overflow-tooltip
-          ></el-table-column>
+          ></el-table-column> -->
           <el-table-column prop="siteName" label="监测点" align="center" show-overflow-tooltip>
             <template slot-scope="{ row }">
               <el-button type="text" style="padding: 0" @click="locationSite(row)">{{ row.siteName }}</el-button>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="upstreamMonitor"
-            label="上游监测点"
-            align="center"
-            show-overflow-tooltip
-          ></el-table-column>
+          <el-table-column prop="upstreamMonitor" label="上游监测点" align="center" show-overflow-tooltip>
+          <template slot-scope="{ row }">
+              <el-button type="text" style="padding: 0" @click="locationSite(row)">{{ row.upstreamMonitor }}</el-button>
+            </template>
+        </el-table-column>
           <el-table-column prop="wellName" label="关联检查井" align="center" show-overflow-tooltip></el-table-column>
           <el-table-column prop="hiddenDangerType" label="发现隐患类型" align="center"></el-table-column>
           <el-table-column prop="hiddenDangerTime" label="发现隐患时间" align="center"></el-table-column>
@@ -115,7 +114,7 @@
               height="260px"
             >
               <template slot="empty">
-                <img src="@/assets/icon/null.png" alt="暂无数据" style="width: 100px" />
+                <img src="@/assets/icon/null.png"   style="width: 100px" />
               </template>
               <el-table-column prop="remouldPriority" label="工作优先级" align="center"></el-table-column>
               <el-table-column prop="drainageType" label="排水类型" align="center"></el-table-column>
@@ -176,7 +175,7 @@
               height="calc(100% - 74px)"
             >
               <template slot="empty">
-                <img src="@/assets/icon/null.png" alt="暂无数据" style="width: 100px" />
+                <img src="@/assets/icon/null.png"   style="width: 100px" />
               </template>
               <el-table-column label="序号" align="center" width="50">
                 <template slot-scope="scope">{{ scope.$index + 1 }}</template>

src/views/spectrum/reform/relevance/components/manDetection/widget.vue

@@ -17,7 +17,7 @@
       <el-table :data="tableData" style="width: 100%" :header-cell-style="{ background: 'rgba(45, 116, 231,0.2)', 
       color: '#333333', height: '40px', textAlign: 'center' }" height="100%">
         <template slot="empty">
-          <img src="@/assets/icon/null.png" alt="暂无数据" />
+          <img src="@/assets/icon/null.png"   />
         </template>
         <el-table-column type="index" label="序号" align="center" width="50"></el-table-column>
         <el-table-column prop="expNo" label="管段编号" align="center" show-overflow-tooltip></el-table-column>

src/views/spectrum/reform/relevance/components/relevanceNew/widget.vue

@@ -20,7 +20,7 @@
       <el-table :data="tableData" style="width: 100%" :header-cell-style="{ background: '#eaf1fd', 
       color: '#333333', height: '34px', textAlign: 'center' }" height="100%">
         <template slot="empty">
-          <img src="@/assets/icon/null.png" alt="暂无数据" />
+          <img src="@/assets/icon/null.png"   />
         </template>
         <el-table-column prop="code" label="管线唯一编码" align="center"></el-table-column>
         <el-table-column prop="pipeId" label="管线标识码" align="center"></el-table-column>

src/views/spectrum/reform/relevance/components/relevanceStock/widget.vue

@@ -20,7 +20,7 @@
       <el-table :data="tableData" style="width: 100%" :header-cell-style="{ background: '#eaf1fd', 
       color: '#333333', height: '34px', textAlign: 'center' }" height="100%">
         <template slot="empty">
-          <img src="@/assets/icon/null.png" alt="暂无数据" />
+          <img src="@/assets/icon/null.png"   />
         </template>
         <el-table-column prop="code" label="管线唯一编码" align="center"></el-table-column>
         <el-table-column prop="pipeId" label="管线标识码" align="center"></el-table-column>

src/views/spectrum/reform/relevance/widget.vue

@@ -1,3 +1,4 @@
+<!-- 数据关联分析定位点 -->
 <template>
   <div class="page-panel">
     <div class="params-panel">
@@ -33,7 +34,7 @@
           textAlign: 'center'
         }" height="200px">
         <template slot="empty">
-          <img src="@/assets/icon/null.png" alt="暂无数据" style="width: 100px" />
+          <img src="@/assets/icon/null.png"   style="width: 100px" />
         </template>
         <el-table-column label="序号" align="center" width="50" type="index" />
         <el-table-column prop="projectName" minWidth="180px" label="新建管网工程" align="center" show-overflow-tooltip />
@@ -50,7 +51,7 @@
           textAlign: 'center'
         }" height="200px">
         <template slot="empty">
-          <img src="@/assets/icon/null.png" alt="暂无数据" style="width: 100px" />
+          <img src="@/assets/icon/null.png"   style="width: 100px" />
         </template>
         <el-table-column prop="defectName" label="缺陷名称" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="defectLevel" label="缺陷等级" align="center" show-overflow-tooltip></el-table-column>
@@ -66,7 +67,7 @@
           textAlign: 'center'
         }" :cell-style="{ padding: '5px 0' }" height="200px">
         <template slot="empty">
-          <img src="@/assets/icon/null.png" alt="暂无数据" style="width: 100px" />
+          <img src="@/assets/icon/null.png"   style="width: 100px" />
         </template>
         <el-table-column label="序号" align="center" width="50">
           <template slot-scope="scope">{{ scope.$index + 1 }}</template>
@@ -325,7 +326,7 @@ export default {
     /**
      * 获取站点实时数据
      */
-    getSiteNewData(sites) {
+    getSiteNewData(sites, ) {
       let ids = sites.map((item) => {
         return item.id
       })
@@ -379,20 +380,20 @@ export default {
         let entity = new Cesium.Entity({
           id: site.id,
           position: position,
-          label: {
-            //文字标签
-            text: site.siteName,
-            font: '300 15px Microsoft Yahei',
-            fillColor: Cesium.Color.WHITE, //字体颜色new Cesium.Color.fromCssColorString('#6ab4fff2')
-            // backgroundColor: Cesium.Color.WHITE,    //背景颜色
-            backgroundColor: new Cesium.Color.fromCssColorString('#2D74E7'), //背景颜色
-            showBackground: true, //是否显示背景颜色
-            style: Cesium.LabelStyle.FILL, //label样式
-            backgroundPadding: new Cesium.Cartesian2(10, 10),
-            pixelOffset: new Cesium.Cartesian2(0, -95), //偏移量
-            heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-            disableDepthTestDistance: Number.POSITIVE_INFINITY
-          },
+          // label: {
+          //   //文字标签
+          //   text: site.siteName,
+          //   font: '300 15px Microsoft Yahei',
+          //   fillColor: Cesium.Color.WHITE, //字体颜色new Cesium.Color.fromCssColorString('#6ab4fff2')
+          //   // backgroundColor: Cesium.Color.WHITE,    //背景颜色
+          //   backgroundColor: new Cesium.Color.fromCssColorString('#2D74E7'), //背景颜色
+          //   showBackground: true, //是否显示背景颜色
+          //   style: Cesium.LabelStyle.FILL, //label样式
+          //   backgroundPadding: new Cesium.Cartesian2(10, 10),
+          //   pixelOffset: new Cesium.Cartesian2(0, -95), //偏移量
+          //   heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+          //   disableDepthTestDistance: Number.POSITIVE_INFINITY
+          // },
           billboard: {
             image: getSiteIcon(site),
             width: 34,
@@ -406,7 +407,7 @@ export default {
         this.e_sites.push(entity)
         viewer.entities.add(entity)
       })
-      viewer.flyTo(this.e_sites)
+     viewer.flyTo(this.e_sites)
       // 点击
       this.initClick()
     },

src/views/spectrum/reform/sewageDirect/style.scss

@@ -32,7 +32,7 @@
     border-top-left-radius: 5px;
     border-bottom-left-radius: 5px;
     box-sizing: border-box;
-    padding: 20px 20px;
+    padding: 20px 5px;
     overflow-y: auto;
     position: relative;
     overflow: hidden;
@@ -45,7 +45,7 @@
     border-top-right-radius: 5px;
     border-bottom-right-radius: 5px;
     box-sizing: border-box;
-    padding: 10px 20px;
+    padding: 10px 10px;
     overflow-y: auto;
     .chart-panel {
       font-size: 0;

src/views/spectrum/reform/sewageDirect/widget.vue

@@ -44,17 +44,17 @@
           height="200px"
         >
           <template slot="empty">
-            <img src="@/assets/icon/null.png" alt="暂无数据" style="width: 100px" />
+            <img src="@/assets/icon/null.png"  style="width: 100px" />
           </template>
           <el-table-column label="序号" align="center" width="50">
             <template slot-scope="scope">{{ scope.$index + 1 }}</template>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             prop="deviceTypeName"
             label="监测类型"
             align="center"
             show-overflow-tooltip
-          ></el-table-column>
+          ></el-table-column> -->
           <el-table-column prop="siteName" label="监测点" align="center" show-overflow-tooltip>
             <template slot-scope="{ row }">
               <el-button type="text" style="padding: 0" @click="locationSite(row)">{{ row.siteName }}</el-button>
@@ -131,7 +131,7 @@
           height="300px"
         >
           <template slot="empty">
-            <img src="@/assets/icon/null.png" alt="暂无数据" style="width: 100px" />
+            <img src="@/assets/icon/null.png" style="width: 100px" />
           </template>
           <el-table-column label="序号" align="center" width="50">
             <template slot-scope="scope">{{ scope.$index + 1 }}</template>
@@ -376,7 +376,7 @@
        */
       locationSite(row) {
         const site = JSON.parse(JSON.stringify(row))
-        // site['siteState'] = 2
+        site['siteState'] = 10
         const { latitude, longitude } = site
         this.$refs.minimap.addMarker([longitude, latitude], {
           icon: getSiteIcon(site, false)

src/views/spectrum/reform/utils.ts

@@ -6,10 +6,10 @@ export const dataQueryCols: ColItem[] = [
   // { type: 'selection', width: '50px' },
   { type: 'index', label: '序号', width: '60px' },
   { prop: 'partitionName', label: '排水分区', minWidth: '110px', ...elTableAlignLeft() },
-  { prop: 'groupName', label: '监测分组', minWidth: '110px', ...elTableAlignLeft() },
-  { prop: 'siteName', label: '监测站点', minWidth: '110px', ...elTableAlignLeft() },
-  { prop: 'siteAddress', label: '地址', minWidth: '170px', ...elTableAlignLeft() },
-  { prop: 'collectTime', label: '数据时间', width: '170px' },
+  // { prop: 'groupName', label: '监测分组', minWidth: '110px', ...elTableAlignLeft() },
+  { prop: 'siteName', label: '监测站点', minWidth: '250px', ...elTableAlignLeft() },
+  // { prop: 'siteAddress', label: '地址', minWidth: '170px', ...elTableAlignLeft() },
+  { prop: 'collectTime', label: '数据时间', width: '200px' },
   { prop: 'checkTargetName', label: '监测指标', minWidth: '140px', ...elTableAlignLeft() },
   { prop: 'checkValue', label: '监测值', minWidth: '110px', ...elTableAlignLeft() },
   { prop: 'unit', label: '单位', width: '80px' },

src/views/spectrum/report/utils.ts

@@ -15,5 +15,5 @@ export const rainfallCols: ColItem[] = [
       `${String(day || '').replace(' 00:00:00', '')}  ${String(hour || '')}${hour ? ':00' : '-'}`
   },
   // { prop: 'hour', label: '小时', width: '120px' },
-  { prop: 'rfall', label: '降雨量', minWidth: '120px' }
+  { prop: 'rfall', label: '降雨量(mm)', minWidth: '120px' }
 ]

src/views/spectrum/statisticalAnalysis/wqMultipleSites/sitesanalysisResult/widget.vue

@@ -205,7 +205,7 @@ export default {
           ? `
           <span>${this.dateCollection[index] ? this.dateCollection[index] : '/'}</span>
           <span>${this.param.targetName}：${_site.values[index] ? _site.values[index] : '/'}</span>`
-          : `<span>暂无数据</span>`
+          : `<span></span>`
       })
     },
     /**

src/views/spectrum/statisticalAnalysis/wqMultipleSites/widget.vue

@@ -20,7 +20,7 @@
         </el-form-item>
         <el-form-item :label="'上游站点：('+upper.length+'/'+checkedUppers.length+')'" class="block-item">
           <div class="data-container">
-            <div v-if="upper.length==0" class="empty">暂无数据</div>
+            <div v-if="upper.length==0" class="empty"></div>
             <el-checkbox-group v-model="checkedUppers" @change="getSelectedSite()">
               <ul>
                 <li v-for="(item,index) in upper" :key="index">
@@ -35,7 +35,7 @@
         </el-form-item>
         <el-form-item :label="'下游站点：('+lower.length+'/'+checkedLowers.length+')'" class="block-item">
           <div class="data-container">
-            <div v-if="lower.length==0" class="empty">暂无数据</div>
+            <div v-if="lower.length==0" class="empty"></div>
             <el-checkbox-group v-model="checkedLowers" @change="getSelectedSite()">
               <ul>
                 <li v-for="(item,index) in lower" :key="index">
@@ -50,7 +50,7 @@
         </el-form-item>
         <el-form-item :label="'其他站点：('+other.length+'/'+checkedOthers.length+')'" class="block-item">
           <div class="data-container" style="height:100px">
-            <div v-if="other.length==0" class="empty">暂无数据</div>
+            <div v-if="other.length==0" class="empty"></div>
             <el-checkbox-group v-model="checkedOthers" @change="getSelectedSite()">
               <ul>
                 <li v-for="(item,index) in other" :key="index">