fix

ruoyi-ui/package.json

@@ -1,89 +1,89 @@
 {
-    "name": "ruoyi",
-    "version": "3.6.0",
-    "description": "江苏海事局船舶尾气排放遥感监测系统",
-    "author": "新通",
-    "license": "MIT",
-    "scripts": {
-        "dev": "vue-cli-service serve",
-        "build:prod": "vue-cli-service build",
-        "build:stage": "vue-cli-service build --mode staging",
-        "preview": "node build/index.js --preview",
-        "lint": "eslint --ext .js,.vue src"
-    },
-    "husky": {
-        "hooks": {
-            "pre-commit": "lint-staged"
-        }
-    },
-    "lint-staged": {
-        "src/**/*.{js,vue}": [
-            "eslint --fix",
-            "git add"
-        ]
-    },
-    "keywords": [
-        "vue",
-        "admin",
-        "dashboard",
-        "element-ui",
-        "boilerplate",
-        "admin-template",
-        "management-system"
-    ],
-    "repository": {
-        "type": "git",
-        "url": "https://gitee.com/y_project/RuoYi-Vue.git"
-    },
-    "dependencies": {
-        "@riophae/vue-treeselect": "0.4.0",
-        "axios": "0.21.0",
-        "clipboard": "2.0.6",
-        "core-js": "3.8.1",
-        "echarts": "^4.9.0",
-        "element-ui": "2.15.2",
-        "file-saver": "2.0.4",
-        "fuse.js": "6.4.3",
-        "highlight.js": "9.18.5",
-        "js-beautify": "1.13.0",
-        "js-cookie": "2.2.1",
-        "jsencrypt": "3.0.0-rc.1",
-        "nprogress": "0.2.0",
-        "ol": "^6.9.0",
-        "quill": "1.3.7",
-        "screenfull": "5.0.2",
-        "sortablejs": "1.10.2",
-        "vue": "2.6.12",
-        "vue-count-to": "1.0.13",
-        "vue-cropper": "0.5.5",
-        "vue-meta": "^2.4.0",
-        "vue-router": "3.4.9",
-        "vuedraggable": "2.24.3",
-        "vuex": "3.6.0"
-    },
-    "devDependencies": {
-        "@vue/cli-plugin-babel": "4.4.6",
-        "@vue/cli-plugin-eslint": "4.4.6",
-        "@vue/cli-service": "4.4.6",
-        "babel-eslint": "10.1.0",
-        "chalk": "4.1.0",
-        "connect": "3.6.6",
-        "eslint": "7.15.0",
-        "eslint-plugin-vue": "7.2.0",
-        "lint-staged": "10.5.3",
-        "runjs": "4.4.2",
-        "sass": "1.32.0",
-        "sass-loader": "10.1.0",
-        "script-ext-html-webpack-plugin": "2.1.5",
-        "svg-sprite-loader": "5.1.1",
-        "vue-template-compiler": "2.6.12"
-    },
-    "engines": {
-        "node": ">=8.9",
-        "npm": ">= 3.0.0"
-    },
-    "browserslist": [
-        "> 1%",
-        "last 2 versions"
+  "name": "ruoyi",
+  "version": "3.6.0",
+  "description": "江苏海事局船舶尾气排放遥感监测系统",
+  "author": "新通",
+  "license": "MIT",
+  "scripts": {
+    "dev": "vue-cli-service serve",
+    "build:prod": "vue-cli-service build",
+    "build:stage": "vue-cli-service build --mode staging",
+    "preview": "node build/index.js --preview",
+    "lint": "eslint --ext .js,.vue src"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "src/**/*.{js,vue}": [
+      "eslint --fix",
+      "git add"
     ]
+  },
+  "keywords": [
+    "vue",
+    "admin",
+    "dashboard",
+    "element-ui",
+    "boilerplate",
+    "admin-template",
+    "management-system"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/y_project/RuoYi-Vue.git"
+  },
+  "dependencies": {
+    "@riophae/vue-treeselect": "0.4.0",
+    "axios": "0.21.0",
+    "clipboard": "2.0.6",
+    "core-js": "^3.19.1",
+    "echarts": "^4.9.0",
+    "element-ui": "2.15.2",
+    "file-saver": "2.0.4",
+    "fuse.js": "6.4.3",
+    "highlight.js": "9.18.5",
+    "js-beautify": "1.13.0",
+    "js-cookie": "2.2.1",
+    "jsencrypt": "3.0.0-rc.1",
+    "nprogress": "0.2.0",
+    "ol": "^6.9.0",
+    "quill": "1.3.7",
+    "screenfull": "5.0.2",
+    "sortablejs": "1.10.2",
+    "vue": "2.6.12",
+    "vue-count-to": "1.0.13",
+    "vue-cropper": "0.5.5",
+    "vue-meta": "^2.4.0",
+    "vue-router": "3.4.9",
+    "vuedraggable": "2.24.3",
+    "vuex": "3.6.0"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "4.4.6",
+    "@vue/cli-plugin-eslint": "4.4.6",
+    "@vue/cli-service": "4.4.6",
+    "babel-eslint": "10.1.0",
+    "chalk": "4.1.0",
+    "connect": "3.6.6",
+    "eslint": "7.15.0",
+    "eslint-plugin-vue": "7.2.0",
+    "lint-staged": "10.5.3",
+    "runjs": "4.4.2",
+    "sass": "1.32.0",
+    "sass-loader": "10.1.0",
+    "script-ext-html-webpack-plugin": "2.1.5",
+    "svg-sprite-loader": "5.1.1",
+    "vue-template-compiler": "2.6.12"
+  },
+  "engines": {
+    "node": ">=8.9",
+    "npm": ">= 3.0.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions"
+  ]
 }

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

@@ -348,7 +348,7 @@
     </div>
 
     <div class="radio_div" style="max-width:44rem">
-          <el-radio-group v-model="caddr" :change="clickcg">
+          <el-radio-group v-model="caddr" @change="clickcg">
               <el-radio v-for="item in addrlist" :key="item.name" :label="item.name"></el-radio>
         </el-radio-group>
     </div>
@@ -373,6 +373,8 @@ import { Vector as LayerVec } from "ol/layer";
 import {queryShipByDeviceId} from "@/api/data/deviceData";
 
 let ispro = process.env.NODE_ENV === "production";
+let that = null;
+let mapv = null;
 //  ispro = false;
 export default {
   props: {
@@ -403,12 +405,13 @@ export default {
     };
   },
   mounted() {
-    var that = this;
+    that = this;
     if (ispro) {
       this.initprod();
     } else {
       this.initdev();
     }
+    mapv = this.map;
 
     this.map.on("click", function(e) {
       console.log(e)
@@ -463,8 +466,7 @@ export default {
         console.log(data);
 
         data.data.forEach(element => {
-          element["values"]= element.illegalType=="heiyan"?element.rcgSoot:(element.illegalType=="guangpu"?element.so2Percent
-:(element.illegalType=="xiutan"?element.so2Percent:0));
+          element["values"]= element.illegalType=="heiyan"?element.rcgSoot:(element.illegalType=="guangpu"?element.so2Percent:(element.illegalType=="xiutan"?element.so2Percent:0));
           this.tabledatas.push(element);
         });
 
@@ -475,7 +477,17 @@ export default {
 
     },
     clickcg:(value)=>{
-      console.log(this.addrlist)
+      // 
+      that.addrlist.forEach(element => {
+        if(element.name==value){
+         
+          var lo = that.transpoints(element.location,0)[0];
+          console.log(lo)
+          mapv.getView().setCenter(lo);
+
+        }
+        
+      });
 
     },
     setaddrlist(list){

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

@@ -84,8 +84,8 @@ export default {
     return {
       months:[],
       hyMonths:[],
-      liuDate:'',
-      blackDate:'',
+      liuDate:new Date(),
+      blackDate:new Date(),
       liuMonth:'',
       blackMonth:'',
       blackName:undefined,
@@ -103,7 +103,7 @@ export default {
        var myDate = new Date();
         var tYear = myDate.getFullYear();
         var tMonth = myDate.getMonth();
-        if(tMonth > 5){
+        if(tMonth < 5){
             for(var m=1;m<7;m++){
                 this.months.push(tYear+"-"+"0"+m);
                 this.hyMonths.push(tYear+"-"+"0"+m);
@@ -111,14 +111,15 @@ export default {
         }else{
            for(var m=7;m<13;m++){
              if(m <10){
-                this.months.push((tYear-1)+"-"+"0"+m); 
-                this.hyMonths.push((tYear-1)+"-"+"0"+m); 
+                this.months.push((tYear)+"-"+"0"+m); 
+                this.hyMonths.push((tYear)+"-"+"0"+m); 
              }else{
-                this.months.push((tYear-1)+"-"+m); 
-                this.hyMonths.push((tYear-1)+"-"+m); 
+                this.months.push((tYear)+"-"+m); 
+                this.hyMonths.push((tYear)+"-"+m); 
              }
             }
         }
+        console.log(tMonth)
      this.getDicts('heiyan_snap_pos');
        this.getDicts('so2_snap_pos');
     //   console.log(this.blackName);

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

@@ -152,8 +152,11 @@
           
             <img style="width:40rem;height:40rem" :src="scope.row.sootImgUrl"/>
            <!-- </div> -->
-            <div v-for="item in scope.row.allImgUrl">
-                <img style="width:40rem;height:40rem" :src="item.replace(' ','')"/>
+            <!-- <div v-for="item in scope.row.allImgUrl"> -->
+            <div v-for="item in [1,1,1,1,1,1]">
+                <!-- <img style="width:40rem;height:40rem" :src="item.replace(' ','')"/> -->
+                <img style="width:40rem;height:40rem" src="https://ns-strategy.cdn.bcebos.com/ns-strategy/upload/fc_big_pic/part-00315-1423.jpg"/> 
+                
                 <!-- <div>{{item.replace(' ','')}}</div> -->
             </div>
           <!-- <video style="width:40rem;height:40rem" controls="" autoplay="" name="media"><source src="http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4" type="video/mp4"></video> -->