fix

ruoyi-ui/src/views/components/table/homeTable.vue

@@ -155,43 +155,8 @@ export default {
         mmsi: undefined,
         radio: 1
       },
-      tableData: [{
-        date: '2016-05-02',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄',
-        value: 0.19,
-        count: 1.9,
-      }, {
-        date: '2016-05-04',
-        name: '王小虎',
-        value: 0.1,
-        count: 1.3,
-        address: '上海市普陀区金沙江路 1517 弄'
-      }, {
-        date: '2016-05-01',
-        name: '王小虎',
-        value: 0.2,
-        count: 2,
-        address: '上海市普陀区金沙江路 1519 弄'
-      }, {
-        date: '2016-05-03',
-        name: '王小虎',
-        value: 0.08,
-        count: 0.6,
-        address: '上海市普陀区金沙江路 1516 弄'
-      }/*, {
-        date: '2016-05-03',
-        name: '王小虎',
-        value: 0.03,
-        count: 0.2,
-        address: '上海市普陀区金沙江路 1516 弄'
-      }, {
-        date: '2016-05-03',
-        name: '王小虎',
-        value: 0.09,
-        count: 0.3,
-        address: '上海市普陀区金沙江路 1516 弄'
-      }*/], shipDate: {
+      tableData: [],
+      shipDate: {
         startMonth: '',
         endMonth: ''
       },
@@ -235,11 +200,11 @@ export default {
         {"name": "润扬大桥光谱2", "locations": [[119.369724, 32.204459]]},
       ],
       ship: [
-        {"name": "一号船", "locations": [[118.639711, 31.96602]], 'type': 1},
-        {"name": "二号船", "locations": [[118.649839, 31.970352]], 'type': 2},
-        {"name": "三号船", "locations": [[118.638466, 31.970716]], 'type': 1},
-        {"name": "四号船", "locations": [[118.643402, 31.961505]], 'type': 3},
-        {"name": "五号船", "locations": [[118.64941, 31.973519]], 'type': 2},
+        // {"name": "一号船", "locations": [[118.639711, 31.96602]], 'type': 1},
+        // {"name": "二号船", "locations": [[118.649839, 31.970352]], 'type': 2},
+        // {"name": "三号船", "locations": [[118.638466, 31.970716]], 'type': 1},
+        // {"name": "四号船", "locations": [[118.643402, 31.961505]], 'type': 3},
+        // {"name": "五号船", "locations": [[118.64941, 31.973519]], 'type': 2},
       ]
     }
   }, mounted() {

ruoyi-ui/src/views/components/table/scroll.vue

@@ -35,7 +35,7 @@ export default {
         for (var index in this.items) {
           if (this.items[index].illegalType === 'heiyan') {
             var obj = this.items[index]
-            obj.name = (parseInt(index) + 1) + '.' + obj.aisShipName + "在" + obj.snapPos + "监测点检测黑度为" + obj.rcgSoot
+            obj.name = (parseInt(index) + 1) + '.' + obj.shipName + "在" + obj.monitorPointName + "监测点检测黑度为" + obj.rcgSoot
             obj.time = this.timeFormate(obj.snapTimeFmt)
           }
           if (this.items[index].illegalType !== 'heiyan') {