Browse Source

update code

zhuliu 1 year ago
parent
commit
67d29f353a
2 changed files with 18 additions and 7 deletions
  1. 2 2
      pages/monitor/monitor.js
  2. 16 5
      pages/monitor/monitoringRecord.js

+ 2 - 2
pages/monitor/monitor.js

@@ -152,9 +152,9 @@ Page({
   //查看监控结果
   monitoringRecord(params){
     var index = params.index
-    var id = this.data.tableData[index].assoId
+    var product = this.data.tableData[index]
     wx.navigateTo({
-      url: '/pages/monitor/monitoringRecord?id='+id,
+      url: '/pages/monitor/monitoringRecord?id='+product.assoId+'&productName='+product.name,
     })
   },
 

+ 16 - 5
pages/monitor/monitoringRecord.js

@@ -15,7 +15,8 @@ Page({
     triggered:false,
     load:false,
     hasMore:true,
-    id:null
+    id:null,
+    productName:''
   },
 
   /**
@@ -24,7 +25,8 @@ Page({
   onLoad(options) {
     var id = options.id
     this.setData({
-      id:id
+      id:id,
+      productName:productName
     })
   },
 
@@ -79,16 +81,25 @@ Page({
     wx.showLoading({
       title: '加载中',
     })
-    api.selectMonitoring(params).then(res=>{
+    api.selectMonitoringRecord(params).then(res=>{
       if(res.code == 200){
         var data = this.data.tableData
+        var data2 = []
+        res.data.data.forEach(item => {
+          var num = item.num
+          var obj =  {
+            text: item.createTime,
+            desc: `您监控的${{productName}}有${{num}}件新专利。`,
+          }
+          data2.push(obj)
+        });
         if(type){
             var startIndex = (this.data.queryParams.current-1)*this.data.queryParams.size
             var endIndex = data.length
             var len = endIndex - startIndex
-            data.splice(startIndex,len,...res.data.data)
+            data.splice(startIndex,len,...data2)
         }else{
-            data = data.concat(res.data.data)
+            data = data.concat(data2)
         }
         this.setData(
           {