diff --git a/package.json b/package.json index e367652..47a7843 100644 --- a/package.json +++ b/package.json @@ -52,6 +52,7 @@ "mockjs": "^1.1.0", "node-ssh": "^13.2.0", "nprogress": "^0.2.0", + "qrcode": "^1.5.4", "qs": "^6.10.1", "quill-image-drop-module": "^1.0.3", "quill-image-resize-module": "^3.0.0", diff --git a/src/i18n/language/en.js b/src/i18n/language/en.js index 34be8ee..f63449e 100644 --- a/src/i18n/language/en.js +++ b/src/i18n/language/en.js @@ -225,6 +225,7 @@ const en = { dw: 'Unit', dxqx: 'Read-write permission', sjgs: 'Data format', + cgqlx: 'sensor type', sfdtxs: 'Display on map page or not', sxgs: 'Uplink formula', xsgs: 'Downlink formula', diff --git a/src/i18n/language/zh.js b/src/i18n/language/zh.js index 098eef1..e9e0961 100644 --- a/src/i18n/language/zh.js +++ b/src/i18n/language/zh.js @@ -224,6 +224,7 @@ const zh = { dw: '单位', dxqx: '读写权限', sjgs: '数据格式', + cgqlx: '传感器类型', sfdtxs: '是否在地图页面显示', sxgs: '上行公式', xsgs: '下行公式', diff --git a/src/views/iot/sensor/add.vue b/src/views/iot/sensor/add.vue index b04a921..6283353 100644 --- a/src/views/iot/sensor/add.vue +++ b/src/views/iot/sensor/add.vue @@ -6,12 +6,7 @@ @close="close" >
- + @@ -77,7 +72,7 @@ - + - +
- -
{{ currentDate }}
{{ sn }}
diff --git a/src/views/server/siteDetails/index.vue b/src/views/server/siteDetails/index.vue index bfafff1..bb2e1a2 100644 --- a/src/views/server/siteDetails/index.vue +++ b/src/views/server/siteDetails/index.vue @@ -28,25 +28,25 @@
- + + + - --> - + +
@@ -156,7 +156,7 @@ export default { }, data() { return { - activeName: 'first', + activeName: 'second', activeDataName: 'data-first', listLoading: false, deviceData: [],