Преглед изворни кода

feat(securityPatrolApi): 修改结束巡查接口路径

王杰 пре 3 месеци
родитељ
комит
be9d24a6dd

+ 0 - 7
default_prod.conf

@@ -14,13 +14,6 @@ server {
         try_files         $uri                   $uri/                  /index.html;
         index             index.html             index.htm;
     }
-    location /api {
-        proxy_set_header Host                        $http_host;
-        proxy_set_header X-Real-IP                   $remote_addr;
-        proxy_set_header REMOTE-HOST                 $remote_addr;
-        proxy_set_header X-Forwarded-For             $proxy_add_x_forwarded_for;
-        proxy_pass       http://10.130.128.3:28132;
-    }
     error_page           500   502            503 504 403 404 405 301 /50x.html;
     location = /50x.html {
         root html;

Разлика између датотеке није приказан због своје велике величине
+ 1 - 1
public/geojson/农村区段.geojson


Разлика између датотеке није приказан због своје велике величине
+ 1 - 1
public/geojson/城市核心区右岸.geojson


+ 2 - 2
src/utils/request.js

@@ -12,8 +12,8 @@ const service = axios.create({
 service.interceptors.request.use(
   (config) => {
     const token =
-      'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImExNDZhYTM0LTBkNTYtNDU5My1iOWVkLTdiMDkxZDYwYWM5ZSJ9.SY61O-6bGj8NsPEgKDhIeUO4ywEZFHoUKbbwL-NK68PckviJhIXuKKdD5laNPhCRvDJT5h2aC614SL7GEqOfWw'
-    // config.headers['Authorization'] = 'Bearer ' + Cookies.get('Admin-Token')
+    //  'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImExNDZhYTM0LTBkNTYtNDU5My1iOWVkLTdiMDkxZDYwYWM5ZSJ9.SY61O-6bGj8NsPEgKDhIeUO4ywEZFHoUKbbwL-NK68PckviJhIXuKKdD5laNPhCRvDJT5h2aC614SL7GEqOfWw'
+    config.headers['Authorization'] = 'Bearer ' + Cookies.get('Admin-Token')
     config.headers['Authorization'] = 'Bearer ' + token
     return config
   },

+ 1 - 1
src/views/components/layerList/index.vue

@@ -449,7 +449,7 @@ export default {
               deviceCode: item.deviceCode,
               channelCode: item.channelCode,
               netType: '1',
-              protocolType: 5,
+              protocolType: 9,
               streamType: 1
             },
             {},

+ 1 - 1
src/views/safety-inspection/addInspectionTask.vue

@@ -193,7 +193,7 @@ export default {
               deviceCode: item.deviceCode,
               channelCode: item.channelCode,
               netType: '1',
-              protocolType: 5,
+              protocolType: 9,
               streamType: 1
             },
             {},

+ 1 - 1
src/views/safety-inspection/index.vue

@@ -91,7 +91,7 @@ export default {
               deviceCode: item.deviceCode,
               channelCode: item.channelCode,
               netType: '1',
-              protocolType: 5,
+              protocolType: 9,
               streamType: 1
             },
             {},

+ 1 - 1
src/views/safety-inspection/right.vue

@@ -183,7 +183,7 @@ export default {
               deviceCode: item.deviceCode,
               channelCode: item.channelCode,
               netType: '1',
-              protocolType: 5,
+              protocolType: 9,
               streamType: 1
             },
             {},

+ 3 - 2
src/views/water-station-popup/index.vue

@@ -275,13 +275,14 @@ export default {
       })
     },
     getAroundAnalysisOwnList() {
+      let radius = this.radius?parseFloat(this.radius) * 1000:1000;
       window
         .requestSDK(
           '/sddnWeiHe/device/aroundAnalysisList',
           {
             longitude: this.stationGraphic.coordinate[0],
             latitude: this.stationGraphic.coordinate[1],
-            radius: this.radius,
+            radius: radius,
             type: '1',
             pageNum: 1,
             pageSize: 5,
@@ -311,7 +312,7 @@ export default {
             deviceCode: row.deviceCode,
             channelCode: row.channelCode,
             netType: '1',
-            protocolType: 5,
+            protocolType: 9,
             streamType: 1
           },
           {},