Merge branch 'master' of http://47.103.92.60:3003/skyversation/qp_onemap_ui into MicroFunction

package-lock.json

@@ -25,6 +25,7 @@
         "@vue/cli-plugin-router": "~5.0.0",
         "@vue/cli-plugin-vuex": "~5.0.0",
         "@vue/cli-service": "~5.0.0",
+        "baseline-browser-mapping": "^2.9.15",
         "compression-webpack-plugin": "^10.0.0",
         "less": "^4.0.0",
         "less-loader": "^8.0.0"
@@ -1404,7 +1405,9 @@
       "license": "MIT"
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.8.29",
+      "version": "2.9.15",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/baseline-browser-mapping/-/baseline-browser-mapping-2.9.15.tgz",
+      "integrity": "sha512-kX8h7K2srmDyYnXRIppo4AH/wYgzWVCs+eKr3RusRSQ5PvRYoEFmR/I0PbdTjKFAoKqp5+kbxnNTFO9jOfSVJg==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {

package.json

@@ -24,6 +24,7 @@
     "@vue/cli-plugin-router": "~5.0.0",
     "@vue/cli-plugin-vuex": "~5.0.0",
     "@vue/cli-service": "~5.0.0",
+    "baseline-browser-mapping": "^2.9.15",
     "compression-webpack-plugin": "^10.0.0",
     "less": "^4.0.0",
     "less-loader": "^8.0.0"

src/api/count.js

@@ -13,6 +13,30 @@ const oauthCountPermission = oauthPath + "/permission/countPermission"
 
 const preCountDmsId = 1652
 
+const locationParsePath = [
+    "/proxy/geoCoordinate",
+    "/proxy/wgs84ToCGCS2000",
+    "/proxy/cgcs2000ToWGS84",
+    "/proxy/gcj02ToWgs84",
+    "/proxy/wgs84ToGcj02",
+    "/proxy/wgs84ToBD09",
+    "/proxy/bd09ToWgs84",
+    "/proxy/sh2000ToWgs84",
+    "/proxy/wgs84ToSh2000",
+    "/proxy/sh2000xyToWgs84",
+    "/proxy/wgs84ToSh2000xy",
+    "/proxy/mulit84ToSH2000"]
+
+const addressFinderPath = [
+    "/proxy/getWGridCJByLonlat",
+    "/proxy/getGeoInfoByXQName",
+    "/proxy/searchByNameV3",
+    "/proxy/reverseGeocoding",
+    "/proxy/searchByNameV3All",
+    "/proxy/searchByName",
+    "/proxy/searchByLocation",
+]
+
 
 export function countUnitUse(start, end) {
     let data = {
@@ -49,7 +73,6 @@ export function countUnitUse(start, end) {
     }
     return resolveDmsMultiTableResult(postform(multiSearch, data));
 }
-
 export function countAppUseByUnitName(start, end, unitName) {
     let data = {
         "columnId": preCountDmsId,
@@ -91,7 +114,6 @@ export function countAppUseByUnitName(start, end, unitName) {
 
     return resolveDmsMultiTableResult(postform(multiSearch, data));
 }
-
 export function countServiceUseByApp(start, end, app) {
     let data = {
         "columnId": preCountDmsId,
@@ -132,8 +154,7 @@ export function countServiceUseByApp(start, end, app) {
 
     return resolveDmsMultiTableResult(postform(multiSearch, data));
 }
-
-export function topService(num,start, end) {
+export function topService(num, start, end) {
     let data = {
         "columnId": preCountDmsId,
         "autoSelectItem": false,
@@ -167,8 +188,7 @@ export function topService(num,start, end) {
     }
     return resolveDmsMultiTableResult(postform(multiSearch, data));
 }
-
-export function topUnit(num,start, end) {
+export function topUnit(num, start, end) {
     let data = {
         "columnId": preCountDmsId,
         "autoSelectItem": false,
@@ -202,7 +222,7 @@ export function topUnit(num,start, end) {
     }
     return resolveDmsMultiTableResult(postform(multiSearch, data));
 }
-export function topApp(num,start, end) {
+export function topApp(num, start, end) {
     let data = {
         "columnId": preCountDmsId,
         "autoSelectItem": false,
@@ -258,7 +278,90 @@ export function totalCount(start, end) {
 
     return resolveDmsMultiTableResult(postform(multiSearch, data));
 }
+export function locationParseCount(start, end) {
+    let data = {
+        "columnId": preCountDmsId,
+        "autoSelectItem": false,
+        "page": 1,
+        "pageSize": 1,
+        "columnAlias": "precount",
+        "selectItem": JSON.stringify([
+            {
+                "table": "precount",
+                "column": "c_count",
+                "function": "sum",
+                "alias": "count"
+            }
+        ]),
+        "conditionsList": JSON.stringify([
+            ...timeCheckers(start, end),
+            {
+                "columnId": "precount",
+                "columnName": "c_path",
+                "condition": "in",
+                "value": locationParsePath
+            }
+        ]),
+    }
 
+    return resolveDmsMultiTableResult(postform(multiSearch, data));
+} 
+export function addressFinderCount(start, end) {
+    let data = {
+        "columnId": preCountDmsId,
+        "autoSelectItem": false,
+        "page": 1,
+        "pageSize": 1,
+        "columnAlias": "precount",
+        "selectItem": JSON.stringify([
+            {
+                "table": "precount",
+                "column": "c_count",
+                "function": "sum",
+                "alias": "count"
+            }
+        ]),
+        "conditionsList": JSON.stringify([
+            ...timeCheckers(start, end),
+            {
+                "columnId": "precount",
+                "columnName": "c_path",
+                "condition": "in",
+                "value": addressFinderPath
+            }
+        ]),
+    }
+
+    return resolveDmsMultiTableResult(postform(multiSearch, data));
+} 
+export function mapServiceCount(start, end) {
+    let data = {
+        "columnId": preCountDmsId,
+        "autoSelectItem": false,
+        "page": 1,
+        "pageSize": 1,
+        "columnAlias": "precount",
+        "selectItem": JSON.stringify([
+            {
+                "table": "precount",
+                "column": "c_count",
+                "function": "sum",
+                "alias": "count"
+            }
+        ]),
+        "conditionsList": JSON.stringify([
+            ...timeCheckers(start, end),
+            {
+                "columnId": "precount",
+                "columnName": "c_pro_father",
+                "condition": "in",
+                "value": ["MAP","MODEL"]
+            }
+        ]),
+    }
+
+    return resolveDmsMultiTableResult(postform(multiSearch, data));
+}
 export function totalCountGroupByTime(start, end) {
     let data = {
         "columnId": preCountDmsId,
@@ -379,7 +482,7 @@ export function countAppInfo(start, end, app) {
 
     return resolveDmsMultiTableResult(postform(multiSearch, data));
 }
-export function countGroupService(start, end){
+export function countGroupService(start, end) {
     let data = {
         "columnId": preCountDmsId,
         "autoSelectItem": false,
@@ -410,25 +513,25 @@ export function countGroupService(start, end){
             {
                 "table": "precount",
                 "column": "c_path_comment"
-            },{
+            }, {
                 "table": "precount",
                 "column": "c_path"
-            },{
-                
+            }, {
+
                 "table": "precount",
                 "column": "c_type"
             }
         ]),
         "conditionsList": JSON.stringify([
             ...timeCheckers(start, end),
-            ...notNullAndEmptyCheckers("precount","c_path_comment"),
-            ...notNullAndEmptyCheckers("precount","c_path")
+            ...notNullAndEmptyCheckers("precount", "c_path_comment"),
+            ...notNullAndEmptyCheckers("precount", "c_path")
         ]),
     }
 
     return resolveDmsMultiTableResult(postform(multiSearch, data));
 }
-export function countType(start, end){
+export function countType(start, end) {
 
     let data = {
         "columnId": preCountDmsId,
@@ -442,7 +545,7 @@ export function countType(start, end){
                 "column": "c_count",
                 "function": "sum",
                 "alias": "count"
-            },{
+            }, {
                 "table": "precount",
                 "column": "c_type",
                 "alias": "service_type"
@@ -456,15 +559,14 @@ export function countType(start, end){
         ]),
         "conditionsList": JSON.stringify([
             ...timeCheckers(start, end),
-            ...notNullAndEmptyCheckers("precount","c_type"),
+            ...notNullAndEmptyCheckers("precount", "c_type"),
         ]),
     }
 
     return resolveDmsMultiTableResult(postform(multiSearch, data));
 }
-
-export function countUnitActive(start, end){
-     let data = {
+export function countUnitActive(start, end) {
+    let data = {
         "columnId": preCountDmsId,
         "autoSelectItem": false,
         "page": 1,
@@ -476,7 +578,7 @@ export function countUnitActive(start, end){
                 "column": "c_unit",
                 "function": "count",
                 "alias": "count",
-                "disinct":true
+                "disinct": true
             }, {
                 "table": "precount",
                 "column": "c_date",
@@ -497,7 +599,6 @@ export function countUnitActive(start, end){
 
     return resolveDmsMultiTableResult(postform(multiSearch, data));
 }
-
 export function countUserData() {
     return resolveoauthResult(get(oauthCountUser))
 }
@@ -518,20 +619,18 @@ export function countUserDataByTime(time1, time2, time3) {
     }
     return resolveoauthResult(postform(oauthCountUser, data))
 }
-
 export function countUserDataByAutoTime(param) {
     let data = {
         "time": param
     }
     return resolveoauthResult(postform(oauthCountUser, data))
 }
-
 export function coutService(start, end) {
     let data = {
         start: formatDateToDb(start),
         end: formatDateToDb(end)
     };
-    return resolveoauthResult(postform(oauthCountPermission,data))
+    return resolveoauthResult(postform(oauthCountPermission, data))
 }
 
 function timeCheckers(start, end) {