-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -66,46 +65,35 @@
style="width: 100%"
tooltip-effect="dark"
>
-
-
-
- {{
- scope.row.createTime
- }}
-
-
-
-
- {{ scope.row.operationType === 1 ? "插入" : "删除" }}
- 修改
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 8e7e73adc96f0215a258b9761ae9bbfe8828bd68..6abb328b847babd9ae12652c0444aab7944a4d63 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -68,7 +68,7 @@ export default {
window.localStorage.setItem('userName', JSON.stringify(res.data.userName))
window.localStorage.setItem('staffNumber', JSON.stringify(this.loginForm.staffNumber))
}
- await this.$router.replace('/mainPage')
+ await this.$router.replace('/NewMainPage')
}, 2000)
} else {
this.$message.error('请正确输入用户名或密码')
diff --git a/src/views/NewMainPage.vue b/src/views/NewMainPage.vue
index 5a0287d2cf8c1ded9a5485c0c520a936efae217f..c0fcce1245977d55b82fee290405f73c126d7a64 100644
--- a/src/views/NewMainPage.vue
+++ b/src/views/NewMainPage.vue
@@ -1,17 +1,529 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.createTime
+ }}
+
+
+
+
+ {{ scope.row.operationType === 1 ? "插入" : "删除" }}
+ 修改
+
+
+
+
+
+
+
+
+
+
+
- 111
-
+
+ 安检门
+
+
+
+ 人脸ESD
+
+
+
+ 手探
+
+
+
+
+
+ 后台
+
+
+ 炸探/液探
+
+
+
+ X光机
+
+
+
+
+
+
+
+
+
+
+
+
+ 设备状态总览
+
+
+
+
+ 1
+
+
+
+
+ + 端口号:41111 + +
+
+
+ + 服务器 +
+ + IP地址:{{ netWorkIp }} ++ + 端口号:41111 + +
+ 1
+
+
+
+
+ + 端口号:8 +
+ + 数量:1 + +
+
+
+ + 主交换机 +
+ + 型号:RG-S2628G ++ + 端口号:8 +
+ + 数量:1 + +
+ 1
+
+
+
+
+ + 端口号:8 +
+ + 数量:1 + +
+
+ + 无线路由器 +
+ + 型号:RG-S2628G ++ + 端口号:8 +
+ + 数量:1 + +
+
+
+
+
+
+ + 设备:{{ item.regionVO.number }} + + + + + +
+
+
+ + {{ item.regionVO.areaId }} +
+ + 位置:{{ item.regionVO.address }} ++ + 设备:{{ item.regionVO.number }} + + + + + +
+ 
+ {{ item.topTenChartVO.currentPassageNumber }}
+
+ +
+ {{ item.topTenChartVO.currentPoliceNumber }}
+
+ +
+ {{ item.topTenChartVO.alarmRate }}
+
+
+
+
+ + 安检门 +
+ +
+ {{ item.topTenChartVO.currentPassageNumber }}
+ + +
+ {{ item.topTenChartVO.currentPoliceNumber }}
+ + +
+ {{ item.topTenChartVO.alarmRate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/NewMainPageComponents/LeftTop.vue b/src/views/NewMainPageComponents/LeftTop.vue
new file mode 100644
index 0000000000000000000000000000000000000000..e4b12ccced17aba261d2d2c92e74674f690e7f50
--- /dev/null
+++ b/src/views/NewMainPageComponents/LeftTop.vue
@@ -0,0 +1,52 @@
+
+
+ 报警Top10
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+ + 加载中... +
++ 没有更多了 +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/NewMainPageComponents/LowerLeft.vue b/src/views/NewMainPageComponents/LowerLeft.vue
new file mode 100644
index 0000000000000000000000000000000000000000..7ca5c0ea320ff76c463e902881db4aa4417c2ade
--- /dev/null
+++ b/src/views/NewMainPageComponents/LowerLeft.vue
@@ -0,0 +1,115 @@
+
+
+ 设备概况
+
+
+
+
+ {{ leftTopVO.equipmentNumber }}
+
+
+ {{ leftTopVO.onLineNumber }}
+
+
+ {{ leftTopVO.offLineNumber }}
+
+
+
+
+
+ {{ leftTopVO.passedNumber }}
+
+
+ {{ leftTopVO.policeNumber }}
+
+
+ {{ leftTopVO.policeRate }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/NewMainPageComponents/RightBottom.vue b/src/views/NewMainPageComponents/RightBottom.vue
new file mode 100644
index 0000000000000000000000000000000000000000..ed07d4ca1565564500b17706bc1eacac3cbee345
--- /dev/null
+++ b/src/views/NewMainPageComponents/RightBottom.vue
@@ -0,0 +1,185 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/NewMainPageComponents/RightMiddle.vue b/src/views/NewMainPageComponents/RightMiddle.vue
new file mode 100644
index 0000000000000000000000000000000000000000..8fea51179006a50fbbcd42682398814534d221dd
--- /dev/null
+++ b/src/views/NewMainPageComponents/RightMiddle.vue
@@ -0,0 +1,347 @@
+
+
+
+
+
+
+ 异常提醒
+
+
+
+ 报警率超阈值
+
+
+
+
+
+
+
+ + 加载中... +
++ 没有更多了 +
+
+
+
+
+ 不活跃度超阈值
+
+
+
+
+
+
+
+ + 加载中... +
++ 没有更多了 +
+
+
+
+
+
+
+
diff --git a/src/views/NewMainPageComponents/RightTop.vue b/src/views/NewMainPageComponents/RightTop.vue
new file mode 100644
index 0000000000000000000000000000000000000000..d81d4d08d1d14483689ed97896b7d03e031068ec
--- /dev/null
+++ b/src/views/NewMainPageComponents/RightTop.vue
@@ -0,0 +1,238 @@
+
+
+ 数据环比
+
+
+
+
+ 以天
+
+
+ 以月
+
+
+ 指定
+
+
+
+
+
+
+
+ 报警率
+
+
+
+
+ 本周期
+ {{ currentCycle }} +
+ + {{ currentCycle }} +
+ 上周期
+ {{ lastCycle }} +
+ + {{ lastCycle }} +
+
+
+
+ 不活跃度
+
+
+
+
+ 本周期
+ {{ currentCycleInactivity }} +
+ + {{ currentCycleInactivity }} +
+ 上周期
+ {{ lastCycleInactivity }} +
+ + {{ lastCycleInactivity }} +
+
+
+
+
+
+
+
diff --git a/yarn.lock b/yarn.lock
index 459f63673b9d926a17dc03573b820d57a921daa7..58e4bdf287859c27fd21a9cc9dc5aefa5ebbb421 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2483,7 +2483,7 @@
optionalDependencies:
"fsevents" "^1.2.7"
-"chokidar@^3.4.1":
+"chokidar@^3.4.1", "chokidar@>=2.0.0 <4.0.0":
"integrity" "sha1-26OXb8rbAW9m/TZQIdkWANAcHnU="
"resolved" "https://registry.nlark.com/chokidar/download/chokidar-3.5.2.tgz"
"version" "3.5.2"
@@ -2610,6 +2610,15 @@
"strip-ansi" "^6.0.0"
"wrap-ansi" "^7.0.0"
+"clone-deep@^4.0.1":
+ "integrity" "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ=="
+ "resolved" "https://registry.npmmirror.com/clone-deep/-/clone-deep-4.0.1.tgz"
+ "version" "4.0.1"
+ dependencies:
+ "is-plain-object" "^2.0.4"
+ "kind-of" "^6.0.2"
+ "shallow-clone" "^3.0.0"
+
"clone@^1.0.2":
"integrity" "sha1-2jCcwmPfFZlMaIypAheco8fNfH4="
"resolved" "https://registry.npm.taobao.org/clone/download/clone-1.0.4.tgz"
@@ -7650,6 +7659,24 @@
"resolved" "https://registry.npm.taobao.org/safer-buffer/download/safer-buffer-2.1.2.tgz"
"version" "2.1.2"
+"sass-loader@^8.0.2":
+ "integrity" "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ=="
+ "resolved" "https://registry.npmmirror.com/sass-loader/-/sass-loader-8.0.2.tgz"
+ "version" "8.0.2"
+ dependencies:
+ "clone-deep" "^4.0.1"
+ "loader-utils" "^1.2.3"
+ "neo-async" "^2.6.1"
+ "schema-utils" "^2.6.1"
+ "semver" "^6.3.0"
+
+"sass@^1.26.5", "sass@^1.3.0":
+ "integrity" "sha512-FG2swzaZUiX53YzZSjSakzvGtlds0lcbF+URuU9mxOv7WBh7NhXEVDa4kPKN4hN6fC2TkOTOKqiqp6d53N9X5Q=="
+ "resolved" "https://registry.npmmirror.com/sass/-/sass-1.26.5.tgz"
+ "version" "1.26.5"
+ dependencies:
+ "chokidar" ">=2.0.0 <4.0.0"
+
"sax@~1.2.4":
"integrity" "sha1-KBYjTiN4vdxOU1T6tcqold9xANk="
"resolved" "https://registry.npm.taobao.org/sax/download/sax-1.2.4.tgz"
@@ -7664,7 +7691,7 @@
"ajv-errors" "^1.0.0"
"ajv-keywords" "^3.1.0"
-"schema-utils@^2.0.0", "schema-utils@^2.5.0", "schema-utils@^2.6.5", "schema-utils@^2.7.0":
+"schema-utils@^2.0.0", "schema-utils@^2.5.0", "schema-utils@^2.6.1", "schema-utils@^2.6.5", "schema-utils@^2.7.0":
"integrity" "sha1-HKTzLRskxZDCA7jnpQvw6kzTlNc="
"resolved" "https://registry.npm.taobao.org/schema-utils/download/schema-utils-2.7.1.tgz"
"version" "2.7.1"
@@ -7802,6 +7829,13 @@
"inherits" "^2.0.1"
"safe-buffer" "^5.0.1"
+"shallow-clone@^3.0.0":
+ "integrity" "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA=="
+ "resolved" "https://registry.npmmirror.com/shallow-clone/-/shallow-clone-3.0.1.tgz"
+ "version" "3.0.1"
+ dependencies:
+ "kind-of" "^6.0.2"
+
"shebang-command@^1.2.0":
"integrity" "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo="
"resolved" "https://registry.npm.taobao.org/shebang-command/download/shebang-command-1.2.0.tgz"
@@ -9083,7 +9117,7 @@
"source-list-map" "^2.0.0"
"source-map" "~0.6.1"
-"webpack@^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^3.0.0 || ^4.1.0 || ^5.0.0-0", "webpack@^4.0.0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.4.0", "webpack@>=1.11.0", "webpack@>=2", "webpack@>=2.0.0 <5.0.0", "webpack@>=4.0.0":
+"webpack@^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^3.0.0 || ^4.1.0 || ^5.0.0-0", "webpack@^4.0.0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.36.0 || ^5.0.0", "webpack@^4.4.0", "webpack@>=1.11.0", "webpack@>=2", "webpack@>=2.0.0 <5.0.0", "webpack@>=4.0.0":
"integrity" "sha1-v5tEBOogoHNgXgoBHRiNd8tq1UI="
"resolved" "https://registry.nlark.com/webpack/download/webpack-4.46.0.tgz"
"version" "4.46.0"
+ 数据统计
+
+
+
+
+
+ 以天
+
+
+ 以月
+
+
+ 指定
+
+