fix bug

ruoyi-ui/src/api/data/liuData.js

@@ -2,26 +2,27 @@ import request from '@/utils/request'
 
 // 查询阈值
 export function getThresholdList(query) {
-  return request({
-    url: 'threshold/list',
-    method: 'get',
-    params: query
-  })
+    return request({
+        url: 'threshold/list',
+        method: 'get',
+        params: query
+    })
 }
 
 // 修改阈值
 export function getThresholdEdit(query) {
-  return request({
-    url: 'threshold/edit',
-    method: 'put',
-    data: query
-  })
+    return request({
+        url: 'threshold/edit',
+        method: 'put',
+        data: query
+    })
 }
 
 export function getLiuList(query) {
-  return request({
-    url: 'so2/list',
-    method: 'get',
-    params: query
-  })
-}
+    return request({
+        url: 'so2/list',
+        method: 'get',
+        // FormData: query
+        params: query
+    })
+}

ruoyi-ui/src/components/map/index.vue

@@ -253,10 +253,12 @@
     <div class="icon_div">
          <div style="margin-top:5rem"><div style="float:left;margin-left:5rem"><img src="../../assets/images/icon/zc.png"></img></div><div style="float:left;margin-left:8rem"><span class="line_font">正常船舶</span></div></div>
          <br/>
-         <div style="margin-top:5rem"><div style="float:left;margin-left:5rem"><img src="../../assets/images/icon/xy.png"></img></div><div style="float:left;margin-left:8rem"><span class="line_font">硫超标嫌疑船舶</span></div></div>
-         <br/>
-         <div style="margin-top:5rem"><div style="float:left;margin-left:5rem"><img src="../../assets/images/icon/wg.png"></img></div><div style="float:left;margin-left:8rem"><span class="line_font">黑烟嫌疑船舶</span></div></div>
+         <div style="margin-top:8rem"><div style="float:left;margin-left:5rem"><img src="../../assets/images/icon/xy.png"></img></div><div style="float:left;margin-left:8rem"><span class="line_font">硫超标嫌疑船舶</span></div></div>
          <br/>
+         <div style="margin-top:8rem"><div style="float:left;margin-left:5rem"><img src="../../assets/images/icon/wg.png"></img></div><div style="float:left;margin-left:8rem"><span class="line_font">黑烟嫌疑船舶</span></div></div>
+            <!-- <div style="margin-top:75rem"><div></div><span class="line_font">支路</span></div> -->
+    </div>
+     <div class="icon_div" style="right: 263rem;">
          <div style="margin-top:5rem"><div style="float:left;margin-left:5rem"><img src="../../assets/images/icon/hy.png"></img></div><div style="float:left;margin-left:8rem"><span class="line_font">黑烟设备</span></div></div>
          <br/>
          <div style="margin-top:8rem"><div style="float:left;margin-left:5rem"><img src="../../assets/images/icon/ais.png"></img></div><div style="float:left;margin-left:8rem"><span class="line_font">光谱设备</span></div></div>
@@ -678,10 +680,10 @@ export default {
 
 .icon_div{
   position: absolute;
-  top: 300rem;
+  top: 330rem;
   right: 160rem;
   width: 70rem;
-  height: 80rem;
+  min-height: 40rem;
   background-color: white;
 }
 
@@ -691,8 +693,11 @@ export default {
   left: 120rem;
   width: 40rem;
   height: 30rem;
-  padding-top: 5rem;
+  padding-top: 2rem;
   padding-left: 5rem;
   background-color: white;
 }
+.radio_div>div{
+  line-height: 10rem;
+}
 </style>

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

@@ -60,21 +60,21 @@ export default {
             scroll(){
                     let con1 = this.$refs.con1;
                 //     console.log(con1);
-                    con1.style.marginTop='-29rem';
+                    // con1.style.marginTop='-29rem';
                     this.animate=!this.animate;
                     var that = this; // 在异步函数中会出现this的偏移问题，此处一定要先保存好this的指向
                     setTimeout(function(){
                     that.items.push(that.items[0]);
                     that.items.shift();
-                    con1.style.marginTop='0px';
+                    // con1.style.marginTop='0px';
                     that.animate=!that.animate; // 这个地方如果不把animate 取反会出现消息回滚的现象，此时把ul 元素的过渡属性取消掉就可以完美实现无缝滚动的效果了
                     },500)
             },
-            mEnter () {     
-                    clearInterval(this.timer1) 
+            mEnter () {
+                    clearInterval(this.timer1)
             },
-            mLeave () {            
-                    this.timer1= setInterval(this.scroll,3000)           
+            mLeave () {
+                    this.timer1= setInterval(this.scroll,3000)
             },
 
         },
@@ -103,5 +103,5 @@ transition: all 0.5s;
 list-style: none;
 line-height: 10rem;
 height: 10rem;
-} 
-</style>
+}
+</style>

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

@@ -268,7 +268,15 @@ export default {
     getBlackList() {
       // console.log('1'+this.queryParams);
       this.loading = true;
-      getBlackList(this.queryParams).then(response => {
+
+       var dateRange = '';
+    if(this.queryParams.beginTime!=undefined && this.queryParams.beginTime!="" &&this.queryParams.endTime!=undefined && this.queryParams.endTime!=""){
+        dateRange = [];
+        dateRange.push(this.queryParams.beginTime.toJSON().split("T")[0]);
+        dateRange.push(this.queryParams.endTime.toJSON().split("T")[0]);
+    }
+
+      getBlackList(this.addDateRange(this.queryParams, dateRange)).then(response => {
         this.tableData = response.rows;
         this.total = response.total;
         console.log(response);