diff --git a/xiuosiot-frontend/package-lock.json b/xiuosiot-frontend/package-lock.json
index 3ef5b83..b8a6235 100644
--- a/xiuosiot-frontend/package-lock.json
+++ b/xiuosiot-frontend/package-lock.json
@@ -39,6 +39,7 @@
"html-webpack-plugin": "3.2.0",
"lodash": "^4.17.21",
"mockjs": "1.0.1-beta3",
+ "qs": "^6.5.3",
"runjs": "4.3.2",
"sass": "1.26.8",
"sass-loader": "8.0.2",
@@ -3145,6 +3146,7 @@
"merge-source-map": "^1.1.0",
"postcss": "^7.0.36",
"postcss-selector-parser": "^6.0.2",
+ "prettier": "^1.18.2 || ^2.0.0",
"source-map": "~0.6.1",
"vue-template-es2015-compiler": "^1.9.0"
},
@@ -5042,6 +5044,7 @@
"dependencies": {
"anymatch": "~3.1.2",
"braces": "~3.0.2",
+ "fsevents": "~2.3.2",
"glob-parent": "~5.1.2",
"is-binary-path": "~2.1.0",
"is-glob": "~4.0.1",
@@ -7413,7 +7416,8 @@
"esprima": "^4.0.1",
"estraverse": "^4.2.0",
"esutils": "^2.0.2",
- "optionator": "^0.8.1"
+ "optionator": "^0.8.1",
+ "source-map": "~0.6.1"
},
"bin": {
"escodegen": "bin/escodegen.js",
@@ -11301,6 +11305,7 @@
"@jest/types": "^24.9.0",
"anymatch": "^2.0.0",
"fb-watchman": "^2.0.0",
+ "fsevents": "^1.2.7",
"graceful-fs": "^4.1.15",
"invariant": "^2.2.4",
"jest-serializer": "^24.9.0",
@@ -12098,6 +12103,9 @@
"resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-4.0.0.tgz",
"integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
"dev": true,
+ "dependencies": {
+ "graceful-fs": "^4.1.6"
+ },
"optionalDependencies": {
"graceful-fs": "^4.1.6"
}
@@ -19237,8 +19245,10 @@
"integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
"dev": true,
"dependencies": {
+ "chokidar": "^3.4.1",
"graceful-fs": "^4.1.2",
- "neo-async": "^2.5.0"
+ "neo-async": "^2.5.0",
+ "watchpack-chokidar2": "^2.0.1"
},
"optionalDependencies": {
"chokidar": "^3.4.1",
@@ -19276,6 +19286,7 @@
"anymatch": "^2.0.0",
"async-each": "^1.0.1",
"braces": "^2.3.2",
+ "fsevents": "^1.2.7",
"glob-parent": "^3.1.0",
"inherits": "^2.0.3",
"is-binary-path": "^1.0.0",
@@ -19573,6 +19584,7 @@
"anymatch": "^2.0.0",
"async-each": "^1.0.1",
"braces": "^2.3.2",
+ "fsevents": "^1.2.7",
"glob-parent": "^3.1.0",
"inherits": "^2.0.3",
"is-binary-path": "^1.0.0",
diff --git a/xiuosiot-frontend/package.json b/xiuosiot-frontend/package.json
index 8f9a29f..14a700d 100644
--- a/xiuosiot-frontend/package.json
+++ b/xiuosiot-frontend/package.json
@@ -44,6 +44,7 @@
"html-webpack-plugin": "3.2.0",
"lodash": "^4.17.21",
"mockjs": "1.0.1-beta3",
+ "qs": "^6.5.3",
"runjs": "4.3.2",
"sass": "1.26.8",
"sass-loader": "8.0.2",
diff --git a/xiuosiot-frontend/src/api/terminal/elecDetail.js b/xiuosiot-frontend/src/api/terminal/elecDetail.js
new file mode 100644
index 0000000..1b93d13
--- /dev/null
+++ b/xiuosiot-frontend/src/api/terminal/elecDetail.js
@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+export function getCertainData(data) {
+ return request({
+ url: '/qianjiang/elec/getCertainData',
+ method: 'get',
+ params: data || {}
+ })
+}
+
+export function types(data) {
+ return request({
+ url: '/qianjiang/elec/types',
+ method: 'get',
+ params: data || {}
+ })
+}
diff --git a/xiuosiot-frontend/src/assets/images/4G.png b/xiuosiot-frontend/src/assets/images/4G.png
new file mode 100644
index 0000000..9aeb2f4
Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/4G.png differ
diff --git a/xiuosiot-frontend/src/assets/images/back.png b/xiuosiot-frontend/src/assets/images/back.png
new file mode 100644
index 0000000..0e323a3
Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/back.png differ
diff --git a/xiuosiot-frontend/src/assets/images/border.png b/xiuosiot-frontend/src/assets/images/border.png
new file mode 100644
index 0000000..833423c
Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/border.png differ
diff --git a/xiuosiot-frontend/src/assets/images/power_room.png b/xiuosiot-frontend/src/assets/images/power_room.png
new file mode 100644
index 0000000..a17a724
Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/power_room.png differ
diff --git a/xiuosiot-frontend/src/assets/images/terminal.png b/xiuosiot-frontend/src/assets/images/terminal.png
new file mode 100644
index 0000000..5cdd756
Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/terminal.png differ
diff --git a/xiuosiot-frontend/src/assets/images/test.png b/xiuosiot-frontend/src/assets/images/test.png
new file mode 100644
index 0000000..6df18a9
Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/test.png differ
diff --git a/xiuosiot-frontend/src/layout/components/AppMain.vue b/xiuosiot-frontend/src/layout/components/AppMain.vue
index 03fc37f..456434f 100644
--- a/xiuosiot-frontend/src/layout/components/AppMain.vue
+++ b/xiuosiot-frontend/src/layout/components/AppMain.vue
@@ -22,7 +22,7 @@ export default {
/*50 = navbar */
background-color: #fafdff;
min-height: calc(100vh - 140px);
- height:calc(100vh - 50px);
+ /* height:calc(100vh - 50px); */
width: 100%;
position: relative;
/* overflow: hidden; */
diff --git a/xiuosiot-frontend/src/router/index.js b/xiuosiot-frontend/src/router/index.js
index 1532529..0523f84 100644
--- a/xiuosiot-frontend/src/router/index.js
+++ b/xiuosiot-frontend/src/router/index.js
@@ -152,7 +152,20 @@ export const asyncRouter = [
path: 'monitor',
name: 'Monitor',
component: () => import('@/views/terminal/monitor/index'),
- meta: { title: '设备监控', permission: ['dashengda', 'hangxiao', 'qianjiangdianqi'] }
+ meta: { title: '设备监控', permission: ['dashengda', 'hangxiao'] }
+ },
+ {
+ path: 'qjdqMonitor',
+ name: 'QJDQMonitor',
+ component: () => import('@/views/terminal/qjdqMonitor/index'),
+ meta: { title: '设备监控', permission: ['qianjiangdianqi'] }
+ },
+ {
+ path: 'elecDetail',
+ name: 'ElecDetail',
+ hidden: true,
+ component: () => import('@/views/terminal/qjdqMonitor/elecDetail'),
+ meta: { title: '电表详情', permission: ['qianjiangdianqi'] }
},
{
path: 'alarm',
diff --git a/xiuosiot-frontend/src/views/rule/dataTransfer/index.vue b/xiuosiot-frontend/src/views/rule/dataTransfer/index.vue
index 30add23..56af8a9 100644
--- a/xiuosiot-frontend/src/views/rule/dataTransfer/index.vue
+++ b/xiuosiot-frontend/src/views/rule/dataTransfer/index.vue
@@ -211,6 +211,7 @@ export default {
.catch((err) => {})
},
add() {
+ this.type = 0
this.visible = true
},
view(index) {
diff --git a/xiuosiot-frontend/src/views/rule/ruleManage/index.vue b/xiuosiot-frontend/src/views/rule/ruleManage/index.vue
index 7352e36..6e01711 100644
--- a/xiuosiot-frontend/src/views/rule/ruleManage/index.vue
+++ b/xiuosiot-frontend/src/views/rule/ruleManage/index.vue
@@ -47,7 +47,7 @@
>
+
+
+
+