diff --git a/public/index.html b/public/index.html
index 71238c5fb7..c6077aa32b 100644
--- a/public/index.html
+++ b/public/index.html
@@ -86,6 +86,7 @@
charset="utf-8"
src="https://hm.baidu.com/hm.js?24f17767262929947cc3631f99bfd274"
>
+
-
+
触发器(Trigger)
@@ -141,7 +141,12 @@
:key="item.objectId"
:label="item.name"
:value="item.objectId"
- />
+ >
+ {{ item.name }}
+
+ {{ item.objectId }}
+
+
@@ -169,7 +174,12 @@
:key="deviceName.objectId"
:label="deviceName.name"
:value="deviceName.objectId"
- />
+ >
+ {{ deviceName.name }}
+
+ {{ deviceName.objectId }}
+
+
@@ -243,7 +253,12 @@
:key="item.objectId"
:label="item.name"
:value="item.objectId"
- />
+ >
+ {{ item.name }}
+
+ {{ item.objectId }}
+
+
@@ -271,11 +286,16 @@
placeholder="请选择设备信息"
>
+ v-for="deviceName in filtersDevice(item.params.productKey)"
+ :key="deviceName.objectId"
+ :label="deviceName.name"
+ :value="deviceName.objectId"
+ >
+ {{ deviceName.name }}
+
+ {{ deviceName.objectId }}
+
+
@@ -412,7 +432,7 @@
-
+
执行条件(Conditions)
@@ -534,7 +554,12 @@
:key="item.objectId"
:label="item.name"
:value="item.objectId"
- />
+ >
+ {{ item.name }}
+
+ {{ item.objectId }}
+
+
@@ -563,11 +588,16 @@
placeholder="请选择设备信息"
>
+ v-for="deviceName in filtersDevice(condition.params.productKey)"
+ :key="deviceName.objectId"
+ :label="deviceName.name"
+ :value="deviceName.objectId"
+ >
+ {{ deviceName.name }}
+
+ {{ deviceName.objectId }}
+
+
diff --git a/src/views/CloudFunction/lowcode/components/ViewEdit.vue b/src/views/CloudFunction/lowcode/components/ViewEdit.vue
index a086a2ee92..f7d6231ae4 100644
--- a/src/views/CloudFunction/lowcode/components/ViewEdit.vue
+++ b/src/views/CloudFunction/lowcode/components/ViewEdit.vue
@@ -36,10 +36,15 @@
>
+ :key="item.label"
+ :label="item.label"
+ :value="item.value"
+ >
+ {{ item.label }}
+
+ {{ item.value }}
+
+
@@ -155,14 +160,42 @@
upKey: new Date().getMilliseconds(),
DbaTable: [],
Types: [
- 'amis',
- 'deviceInfo',
- 'amis_view',
- 'topo',
- 'profile',
- 'content',
- 'notification',
- 'reportFrom',
+ {
+ value: 'amis',
+ label: '低代码',
+ },
+ {
+ value: 'notification',
+ label: '告警联动',
+ },
+ {
+ value: 'reportFrom',
+ label: '报告表单',
+ },
+ {
+ value: 'deviceInfo',
+ label: '设备信息',
+ },
+ {
+ value: 'amis_view',
+ label: '低代码预览',
+ },
+ {
+ value: 'topo',
+ label: '组态',
+ },
+ {
+ value: 'profile',
+ label: '设备控制',
+ },
+ {
+ value: 'content',
+ label: '数据展示',
+ },
+ {
+ value: 'sms_template',
+ label: '短信模板',
+ },
],
keys: [],
activeName: 'first',
diff --git a/src/views/CloudFunction/lowcode/index.vue b/src/views/CloudFunction/lowcode/index.vue
index 73b6b41171..0072cfa81a 100644
--- a/src/views/CloudFunction/lowcode/index.vue
+++ b/src/views/CloudFunction/lowcode/index.vue
@@ -43,10 +43,15 @@
>
+ :key="item.label"
+ :label="item.label"
+ :value="item.value"
+ >
+ {{ item.label }}
+
+ {{ item.value }}
+
+
@@ -358,14 +363,42 @@
{ label: '日本語', value: 'jp' },
],
Types: [
- 'amis',
- 'deviceInfo',
- 'amis_view',
- 'topo',
- 'profile',
- 'content',
- 'notification',
- 'reportFrom',
+ {
+ value: 'amis',
+ label: '低代码',
+ },
+ {
+ value: 'notification',
+ label: '告警联动',
+ },
+ {
+ value: 'reportFrom',
+ label: '报告表单',
+ },
+ {
+ value: 'deviceInfo',
+ label: '设备信息',
+ },
+ {
+ value: 'amis_view',
+ label: '低代码预览',
+ },
+ {
+ value: 'topo',
+ label: '组态',
+ },
+ {
+ value: 'profile',
+ label: '设备控制',
+ },
+ {
+ value: 'content',
+ label: '数据展示',
+ },
+ {
+ value: 'sms_template',
+ label: '短信模板',
+ },
],
DbaTable: [],
keys: [],
diff --git a/src/views/CloudPressure/index.vue b/src/views/CloudPressure/index.vue
index 923f01dbae..1f56178d82 100644
--- a/src/views/CloudPressure/index.vue
+++ b/src/views/CloudPressure/index.vue
@@ -602,8 +602,8 @@
const params = {
reportid: row.objectId,
templateUrl: row.basedata.templateUrl,
- // grafanaHost: location.hostname,
- // parseHost: location.hostname,
+ grafanaHost: location.hostname,
+ parseHost: location.hostname,
}
const res = await axios.post('/grafana/generateReport', params, {
@@ -795,6 +795,7 @@
})
if (product?.[0]?.objectId) {
this.product = product?.[0]?.objectId
+ localStorage.setItem('product_objectid', this.product)
this.fetchData()
}
},
diff --git a/src/views/DeviceCloud/manage/devicelist.vue b/src/views/DeviceCloud/manage/devicelist.vue
index 55e2ce3c57..411399ea89 100644
--- a/src/views/DeviceCloud/manage/devicelist.vue
+++ b/src/views/DeviceCloud/manage/devicelist.vue
@@ -988,6 +988,7 @@
},
async info(row) {
localStorage.setItem('parse_objectid', row.objectId)
+ localStorage.setItem('product_objectid', row.product.objectId)
const { results = [] } = await queryView({
where: {
class: 'Product',
@@ -1009,10 +1010,11 @@
},
async command(row) {
localStorage.setItem('parse_objectid', row.objectId)
+ localStorage.setItem('product_objectid', row.product.objectId)
const { results = [] } = await queryView({
where: {
class: 'Product',
- type: 'amis',
+ type: { $in: ['amis', 'profile', 'content'] },
key: row.product.objectId,
},
})
diff --git a/src/views/DeviceCloud/manage/js/devicesDetailLite.js b/src/views/DeviceCloud/manage/js/devicesDetailLite.js
index 248ae914c1..06861e9aa7 100644
--- a/src/views/DeviceCloud/manage/js/devicesDetailLite.js
+++ b/src/views/DeviceCloud/manage/js/devicesDetailLite.js
@@ -407,6 +407,7 @@ export default {
},
mounted() {
// this.deviceInfo.product.objectId = this.$route.query.productid
+ localStorage.setItem('product_objectid', this.$route.query.productid)
this.getDeviceInfo(this.$route.query.deviceid)
this.setTreeFlag(false)
this.params.style = this.chartType[0].type
@@ -416,6 +417,7 @@ export default {
this.topicKey = this.$dgiotBus.topicKey(this.router, this.subtopic) // dgiot-mqtt topicKey 唯一标识
// if (this.$route.query.deviceid) {
this.deviceid = this.$route.query.deviceid
+ localStorage.setItem('parse_objectid', deviceid)
this.subRealtimedata()
this.initChart()
window.addEventListener('resize', this.resizeTheChart)
diff --git a/src/views/DeviceCloud/manage/js/proddetail.js b/src/views/DeviceCloud/manage/js/proddetail.js
index bb517be6ad..9f08855152 100644
--- a/src/views/DeviceCloud/manage/js/proddetail.js
+++ b/src/views/DeviceCloud/manage/js/proddetail.js
@@ -1046,6 +1046,7 @@ export default {
},
async queryProductInfo(productId) {
const res = await getProduct(productId)
+ localStorage.setItem('product_objectid', productId)
const { thing = { properties: [], events: [], services: [], tags: [] } } =
res
_.merge({ properties: [], events: [], services: [], tags: [] }, thing)