Merge remote-tracking branch 'origin/master'

ruoyi-ui/package.json

@@ -40,7 +40,7 @@
     "axios": "0.21.0",
     "clipboard": "2.0.6",
     "core-js": "3.8.1",
-    "echarts": "4.9.0",
+    "echarts": "^4.9.0",
     "element-ui": "2.15.2",
     "file-saver": "2.0.4",
     "fuse.js": "6.4.3",

ruoyi-ui/src/App.vue

@@ -7,6 +7,18 @@
 <script>
 export default  {
   name:  'App',
+    created() {
+      var w = window.screen.width;
+      var h = window.screen.height;
+      // console.log(h);
+      var style = document.createElement("style");
+      style.type = "text/css";
+      style.innerHTML =
+        "html,body {margin: 0;background: #fff;width: 100%;font-size: " +
+        (w * 1) / 800 +
+        "px;}";
+      document.body.appendChild(style);
+    },
     metaInfo() {
         return {
             title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,

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

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询黑烟列表
+export function getBlackList(query) {
+  return request({
+    url: 'black/list',
+    method: 'get',
+    params: query
+  })
+}

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

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

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

@@ -0,0 +1,55 @@
+import request from '@/utils/request'
+
+// 查询设备安装位置统计
+export function getStaticDevice() {
+  return request({
+    url: 'so2/static/device',
+    method: 'get'
+  })
+}
+
+  // 查询设备类型统计
+  export function getDeviceType() {
+    return request({
+      url: 'so2/static/deviceType',
+      method: 'get'
+    })
+  }  
+
+
+    // 查询黑烟抓拍分布统计
+    export function getBlackSnapPos(query) {
+      return request({
+        url: 'black/snapPos/static',
+        method: 'get',
+        params: query
+      })
+    }  
+
+    // 查询硫抓拍分布统计
+    export function getSo2SnapPos(query) {
+      return request({
+        url: 'so2/snapPos/static',
+        method: 'get',
+        params: query
+      })
+    }  
+
+    
+    // 查询硫超标统计
+    export function getSo2Time(query) {
+      return request({
+        url: 'so2/timeStatic',
+        method: 'get',
+        params: query
+      })
+    }  
+
+        // 查询超标船舶统计
+        export function getIllegalShipStatic(query) {
+          return request({
+            url: 'gas/common/illegalShipStatic',
+            method: 'get',
+            params: query
+          })
+        }