Merge branch 'bug-wt' of uskycloud/usky-web-mobile into master

src/pages/business/fireIot/alarmManage/alarmDetails/index.vue

@@ -115,7 +115,7 @@ const state = reactive({
   pageSize: 20,
   current: 1,
   total: 0,
-
+  id:undefined,
   handleContent: "",
   handleRange: 1,
   handleRangeList: [
@@ -144,6 +144,7 @@ function selectListApi() {
     endTime: state.alarmTime,
     current: state.current,
     size: state.pageSize,
+    id:state.contentId
   }).then((requset) => {
     if (requset.status === "SUCCESS") {
       state.array = requset.data.records[0];
@@ -188,7 +189,9 @@ onLoad((options) => {
   if ("alarmTime" in options) {
     state.alarmTime = options.alarmTime;
   }
-
+  if("contentId" in options){
+    state.contentId = options.contentId;
+  }
   init();
 });
 </script>

src/pages/common/appMessage/index.vue

@@ -102,7 +102,7 @@ function goContentDetails(e) {
     updateMceReceiveStatus({ id: e.id });
   }
   if (e.infoType == 4) {
-    proxy.$tab.navigateTo(`/pages/business/fireIot/alarmManage/alarmDetails/index?contentId=${e.contentId}`).then(() => {});
+    proxy.$tab.navigateTo(`/pages/business/fireIot/alarmManage/alarmDetails/index?contentId=${e.moduleId}`).then(() => {});
   } else if (e.infoType == 5) {
     if (e.readFlag != 1) {
       projectApi()