hy-dispatch-ui-v3 0.2.66 → 0.2.68

package/es/utils/map/hook/leafletjs.mjs

@@ -48,9 +48,7 @@ const DEFAULT_MAP_OPTIONS = {
   // 禁止鼠标滚动缩放
 };
 const remToPx = (rem) => {
-  const rootFontSize = parseFloat(
-    getComputedStyle(document.documentElement).fontSize
-  );
+  const rootFontSize = parseFloat(getComputedStyle(document.documentElement).fontSize);
   return rem * rootFontSize;
 };
 const createUniqueId = () => {
@@ -164,11 +162,7 @@ function wrapDrawLayer(layer) {
   const bounds = layer.getBounds();
   if (!layer.getLatLngs) {
     layer.getLatLngs = () => {
-      const points = circleToPolygonPoints(
-        layer.getLatLng(),
-        layer.getRadius() / 1e3,
-        true
-      );
+      const points = circleToPolygonPoints(layer.getLatLng(), layer.getRadius() / 1e3, true);
       return [latLngListCheckExport(points)];
     };
   } else {
@@ -229,11 +223,11 @@ function getCrs(crs) {
       70.53121499999999,
       35.26560700000001
     ].map((item) => 0.0254 * item / (96 * (Math.PI * 2 * 6378137 / 360)));
-    L.CRS.CRS4490 = new L.Proj.CRS(
-      "EPSG:4490",
-      "+proj=longlat +ellps=GRS80 +no_defs +type=crs",
-      { matrixIds, resolutions, origin: [-180, 90] }
-    );
+    L.CRS.CRS4490 = new L.Proj.CRS("EPSG:4490", "+proj=longlat +ellps=GRS80 +no_defs +type=crs", {
+      matrixIds,
+      resolutions,
+      origin: [-180, 90]
+    });
   }
   return crs ? L.CRS[`${crs}`] : DEFAULT_CRS;
 }
@@ -306,6 +300,7 @@ class Leafletjs extends EventEmitter {
       return createMapProxy(polygon, handlers);
     });
     this.initParams = request;
+    this.tileLayerList = [];
   }
   // 初始化地图
   InitMap(domId, option) {
@@ -325,6 +320,7 @@ class Leafletjs extends EventEmitter {
     const newMap = L.map(domId, option);
     newMap.getInitMap = () => newMap;
     const wrappedHandlers = createWrappedHandlerStore();
+    const _this = this;
     const handlers = {
       // 删除地图
       removeMap: function(target, params) {
@@ -400,6 +396,10 @@ class Leafletjs extends EventEmitter {
       off: function(target, types, fn, context) {
         const wrappedFn = wrappedHandlers.take(types, fn);
         return target.off(types, wrappedFn || fn, context);
+      },
+      /* 判断地图颜色 */
+      satelliteMapFn: function(target, satelliteMap) {
+        _this.setLayersUrl(target, satelliteMap !== 2);
       }
     };
     const map = createMapProxy(newMap, handlers);
@@ -409,7 +409,7 @@ class Leafletjs extends EventEmitter {
         option.completeCallbacks();
       }
     });
-    this.setLayersUrl(map);
+    this.setLayersUrl(map, option.satelliteMap !== 2);
     return map;
   }
   // 设置地图瓦片地址
@@ -424,22 +424,23 @@ class Leafletjs extends EventEmitter {
     if (mapServerType === "WMTS" || mapServerType === "Dynamic") {
       return this.createLayers(map, layersUrls);
     }
+    this.tileLayerList.forEach((tileLayer) => {
+      tileLayer?.remove();
+    });
+    this.tileLayerList = [];
     layersUrls.split(",").forEach((layersUrl) => {
+      let tileLayer = null;
       if (changeColorType) {
-        this.createCustomLayers(map, layersUrl);
+        tileLayer = this.createCustomLayers(map, layersUrl);
       } else {
-        this.createLayers(map, layersUrl);
+        tileLayer = this.createLayers(map, layersUrl);
       }
+      this.tileLayerList.push(tileLayer);
     });
   }
   // 超图 WMTS 图层（不适用所有的WMTS图层，目前仅支持超图WMTS，因不同的WMTS服务规范不一样，主要体现在路由访问参数）
   createWMTSLayer(map, option = {}) {
-    const {
-      url,
-      layer,
-      tilematrixSet,
-      format = "image/png"
-    } = typeof option === "string" ? { url: option } : option;
+    const { url, layer, tilematrixSet, format = "image/png" } = typeof option === "string" ? { url: option } : option;
     const crs = getCrs(this.initParams.crs);
     if (!L.WMTSLayer) {
       L.WMTSLayer = L.TileLayer.extend({
@@ -515,8 +516,7 @@ class Leafletjs extends EventEmitter {
   createLayers(map, url, option = {}) {
     const { zoomOffset, mapServerType } = this.initParams;
     if (mapServerType === "WMTS") return this.createWMTSLayer(map, url);
-    if (mapServerType === "Dynamic")
-      return this.createDynamicLayer(map, url.url || url);
+    if (mapServerType === "Dynamic") return this.createDynamicLayer(map, url.url || url);
     const newLeayer = L.tileLayer(url, {
       ...option,
       zoomOffset: zoomOffset || 0
@@ -528,8 +528,7 @@ class Leafletjs extends EventEmitter {
   createCustomLayers(map, url, option = {}) {
     const { zoomOffset, mapServerType } = this.initParams;
     if (mapServerType === "WMTS") return this.createWMTSLayer(map, url);
-    if (mapServerType === "Dynamic")
-      return this.createDynamicLayer(map, url.url || url);
+    if (mapServerType === "Dynamic") return this.createDynamicLayer(map, url.url || url);
     const filter = option.filter || DEFAULT_TILE_FILTER;
     const CustomTileLayer = L.TileLayer.extend({
       options: {
@@ -633,12 +632,7 @@ class Leafletjs extends EventEmitter {
       },
       on: function(target, types, fn, context) {
         if (types === "click") {
-          const customClickHandler = createClickHandler(
-            fn,
-            context,
-            target,
-            true
-          );
+          const customClickHandler = createClickHandler(fn, context, target, true);
           wrappedHandlers.remember(types, fn, customClickHandler);
           return target.on(types, customClickHandler, context);
         }
@@ -726,10 +720,7 @@ class Leafletjs extends EventEmitter {
       },
       // 圆形转多边形坐标
       getLatLngs: function(target) {
-        const points = circleToPolygonPoints(
-          target.getLatLng(),
-          target.getRadius() / 1e3
-        );
+        const points = circleToPolygonPoints(target.getLatLng(), target.getRadius() / 1e3);
         return [latLngListCheckExport(points)];
       }
     };
@@ -811,12 +802,7 @@ class Leafletjs extends EventEmitter {
     if (latLngList && latLngList.length !== 0) {
       latLngList = latLngListCheck(latLngList);
     }
-    const polyline = L.motion.polyline(
-      latLngList,
-      option,
-      motionOption,
-      markerOption
-    );
+    const polyline = L.motion.polyline(latLngList, option, motionOption, markerOption);
     return createMapProxy(polyline, {
       addTo: function(target, map) {
         return target.addTo(generalMapMethods.getMap(map));
@@ -1037,20 +1023,14 @@ class Leafletjs extends EventEmitter {
     function calcTotalDistance(index, preIndex) {
       const current = rangingMarker[index].options.extData.latlng;
       const previous = rangingMarker[preIndex].options.extData.latlng;
-      const distance = parseFloat(
-        (map.distance(current, previous) / 1e3).toFixed(2)
-      );
-      const total = parseFloat(
-        rangingMarker[preIndex].options.extData.distance || 0
-      );
+      const distance = parseFloat((map.distance(current, previous) / 1e3).toFixed(2));
+      const total = parseFloat(rangingMarker[preIndex].options.extData.distance || 0);
       return (distance + total).toFixed(2);
     }
     function setStartIcon(index) {
       const markerItem = rangingMarker[index];
       markerItem.setIcon({
-        divIcon: _this.DivIcon(
-          rangingStartIconOption(options, markerItem.options.extData.dicId)
-        )
+        divIcon: _this.DivIcon(rangingStartIconOption(options, markerItem.options.extData.dicId))
       });
       markerItem.options.extData.distance = 0;
     }
@@ -1068,14 +1048,7 @@ class Leafletjs extends EventEmitter {
       const markerItem = rangingMarker[index];
       const isLast = showDeleteAll ?? !rangingMarker[index + 1]?.options?.extData?.distance;
       markerItem.setIcon({
-        divIcon: _this.DivIcon(
-          rangingPointIconOption(
-            options,
-            distance,
-            markerItem.options.extData.dicId,
-            isLast
-          )
-        )
+        divIcon: _this.DivIcon(rangingPointIconOption(options, distance, markerItem.options.extData.dicId, isLast))
       });
       markerItem.options.extData.distance = distance;
     }
@@ -1103,10 +1076,7 @@ class Leafletjs extends EventEmitter {
         rangingPointsIng.push({ lat, lng });
       } else {
         const latlngs = [
-          [
-            rangingPointsIng[rangingPointsIng.length - 1].lat,
-            rangingPointsIng[rangingPointsIng.length - 1].lng
-          ],
+          [rangingPointsIng[rangingPointsIng.length - 1].lat, rangingPointsIng[rangingPointsIng.length - 1].lng],
           [lat, lng]
         ];
         const polyline = _this.Polyline(latlngs, {
@@ -1124,13 +1094,9 @@ class Leafletjs extends EventEmitter {
           { lat: latlngs[1][0], lng: latlngs[1][1] }
         );
         distance = parseFloat((distance / 1e3).toFixed(2));
-        const total = parseFloat(
-          rangingMarker[rangingMarker.length - 1].options.extData.distance || 0
-        );
+        const total = parseFloat(rangingMarker[rangingMarker.length - 1].options.extData.distance || 0);
         distance = (distance + total).toFixed(2);
-        const customIcon = _this.DivIcon(
-          rangingPointIconOption(options, distance, dicId)
-        );
+        const customIcon = _this.DivIcon(rangingPointIconOption(options, distance, dicId));
         const markerItem = _this.Marker({
           icon: customIcon,
           position: { lat, lng },
@@ -1196,10 +1162,7 @@ class Leafletjs extends EventEmitter {
               if (changeIndex - 1 === index) {
                 setStartIcon(changeIndex);
               } else {
-                setPointIcon(
-                  changeIndex,
-                  calcTotalDistance(changeIndex, changeIndex - 1)
-                );
+                setPointIcon(changeIndex, calcTotalDistance(changeIndex, changeIndex - 1));
               }
               changeIndex++;
             }
@@ -1232,10 +1195,7 @@ class Leafletjs extends EventEmitter {
             let changeIndex = index + 1;
             while (rangingMarker[changeIndex]?.options?.extData?.distance) {
               const disIndex = changeIndex - 1 === index ? changeIndex - 2 : changeIndex - 1;
-              setPointIcon(
-                changeIndex,
-                calcTotalDistance(changeIndex, disIndex)
-              );
+              setPointIcon(changeIndex, calcTotalDistance(changeIndex, disIndex));
               changeIndex++;
             }
             setTimeout(() => {
@@ -1246,11 +1206,7 @@ class Leafletjs extends EventEmitter {
             const beforeDistance = rangingMarker[index - 1]?.options?.extData?.distance;
             if (beforeDistance) {
               removeLineBetween(rangEndIndex, index - 1, index);
-              setPointIcon(
-                index - 1,
-                rangingMarker[index - 1].options.extData.distance,
-                true
-              );
+              setPointIcon(index - 1, rangingMarker[index - 1].options.extData.distance, true);
               setTimeout(() => {
                 rangingMarker[index].remove();
                 rangingMarker.splice(index, 1);

package/es/utils/map/index.mjs

@@ -18,15 +18,9 @@ const AMAP_PLUGINS = [
 ];
 const staticAssets = {
   "bigemap.js": new URL("../../static/map/bigemap.js", import.meta.url).href,
-  "markercluster.js": new URL(
-    "../../static/map/markercluster.js",
-    import.meta.url
-  ).href,
+  "markercluster.js": new URL("../../static/map/markercluster.js", import.meta.url).href,
   "bmDraw.js": new URL("../../static/map/bmDraw.js", import.meta.url).href,
-  "bm.geometryutil.js": new URL(
-    "../../static/map/bm.geometryutil.js",
-    import.meta.url
-  ).href,
+  "bm.geometryutil.js": new URL("../../static/map/bm.geometryutil.js", import.meta.url).href,
   "moveMarker.js": new URL("../../static/map/moveMarker.js", import.meta.url).href
 };
 const normalizeStaticBaseUrl = (baseUrl) => {
@@ -230,7 +224,7 @@ class InitMap extends EventEmitter {
       /*  === leafletjs === */
       ...option
     };
-    return this.map.InitMap(domId, option);
+    return this.map?.InitMap(domId, option);
   }
   // 自定义 h5 图标
   DivIcon(option) {

package/es/utils/map/js/webgis.mjs

@@ -32,9 +32,9 @@ function ToLon(x, y) {
   return ret;
 }
 const Coordinate = {
-  "WGS84": 0,
-  "GCJ02": 1,
-  "BD09": 2
+  WGS84: 0,
+  GCJ02: 1,
+  BD09: 2
 };
 const reverseCoordinate = {
   0: "WGS84",
@@ -42,17 +42,17 @@ const reverseCoordinate = {
   2: "BD09"
 };
 const conversionCoordinateMap = {
-  "WGS84": {
-    "GCJ02": WGS84ToGCJ02,
-    "BD09": WGS84ToBD09
+  WGS84: {
+    GCJ02: WGS84ToGCJ02,
+    BD09: WGS84ToBD09
   },
-  "GCJ02": {
-    "WGS84": GCJ02ToWGS84,
-    "BD09": GCJ02ToBD09
+  GCJ02: {
+    WGS84: GCJ02ToWGS84,
+    BD09: GCJ02ToBD09
   },
-  "BD09": {
-    "GCJ02": BD09ToGCJ02,
-    "WGS84": BD09ToWGS84
+  BD09: {
+    GCJ02: BD09ToGCJ02,
+    WGS84: BD09ToWGS84
   }
 };
 function getMapConfig() {

package/es/version.mjs

@@ -1,3 +1,3 @@
-const version = "0.2.65";
+const version = "0.2.67";
 
 export { version };

package/lib/api/device.js

@@ -2,18 +2,17 @@
 
 require('../hooks/index.js');
 var vue = require('vue');
-var useLocale = require('../hooks/useLocale.js');
 var useApi = require('../hooks/useApi.js');
+var useLocale = require('../hooks/useLocale.js');
 
 function detailApi(deviceId) {
   return new Promise((resolve, reject) => {
-    const { t } = useLocale.useLocale();
     const { api } = useApi.useApi();
     const http = vue.unref(api);
     http.post("device/detail", { deviceId }).then((res) => {
       resolve(res);
     }).catch((res) => {
-      reject(new Error(t("interfaceError")));
+      reject(new Error(useLocale.$t("hy")));
     });
   });
 }

package/lib/api/exportExcel.js

@@ -0,0 +1,62 @@
+'use strict';
+
+var vue = require('vue');
+require('../hooks/index.js');
+var useApi = require('../hooks/useApi.js');
+
+function exportDailyCheckReportApi(url) {
+  return new Promise((resolve, reject) => {
+    const { api } = useApi.useApi();
+    const http = vue.unref(api);
+    http.get(url, {
+      responseType: "blob"
+    }).then((res) => {
+      resolve(res);
+    }).catch((err) => {
+      reject(err);
+    });
+  });
+}
+function exportDailyCheckReportPostApi(url, params) {
+  return new Promise((resolve, reject) => {
+    const { api } = useApi.useApi();
+    const http = vue.unref(api);
+    http.post(url, params, {
+      responseType: "blob",
+      isJSON: true
+    }).then((res) => {
+      resolve(res);
+    }).catch((err) => {
+      reject(err);
+    });
+  });
+}
+function exportDailyCheckReportPostToFormApi(url, params) {
+  return new Promise((resolve, reject) => {
+    const { api } = useApi.useApi();
+    const http = vue.unref(api);
+    http.post(url, params, {
+      responseType: "blob"
+    }).then((res) => {
+      resolve(res);
+    }).catch((err) => {
+      reject(err);
+    });
+  });
+}
+function exportExcelFnApi(url) {
+  return new Promise((resolve, reject) => {
+    const { api } = useApi.useApi();
+    const http = vue.unref(api);
+    http.get(url).then((res) => {
+      resolve(res);
+    }).catch((err) => {
+      reject(err);
+    });
+  });
+}
+
+exports.exportDailyCheckReportApi = exportDailyCheckReportApi;
+exports.exportDailyCheckReportPostApi = exportDailyCheckReportPostApi;
+exports.exportDailyCheckReportPostToFormApi = exportDailyCheckReportPostToFormApi;
+exports.exportExcelFnApi = exportExcelFnApi;

package/lib/api/index.js

@@ -2,37 +2,36 @@
 
 require('../hooks/index.js');
 var vue = require('vue');
-var useLocale = require('../hooks/useLocale.js');
 var useApi = require('../hooks/useApi.js');
+var useLocale = require('../hooks/useLocale.js');
 
-const { t } = useLocale.useLocale();
 function selectApi(controller, params) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve, reject2) => {
     const { api } = useApi.useApi();
     const http = vue.unref(api);
     if (!params) {
-      return reject(new Error(t("iDNotPassed")));
+      return reject2(new Error(useLocale.$t("iDNotPassed")));
     }
     http.post(controller + "/select", {
       id: params !== -1 ? params : null
     }).then((res) => {
       resolve(res);
     }).catch((res) => {
-      reject(new Error(t("interfaceError")));
+      reject2(new Error(useLocale.$t("interfaceError")));
     });
   });
 }
 function detailApi(controller, params) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve, reject2) => {
     const { api } = useApi.useApi();
     const http = vue.unref(api);
     if (!params) {
-      return reject(new Error(t("iDNotPassed")));
+      return reject2(new Error(useLocale.$t("iDNotPassed")));
     }
     http.post(controller + "/detail", { id: params }).then((res) => {
       resolve(res);
     }).catch((res) => {
-      reject(new Error(t("interfaceError")));
+      reject2(new Error(useLocale.$t("interfaceError")));
     });
   });
 }
@@ -45,11 +44,13 @@ function insertFnApi(controller, params) {
     }
   }
   const url = controller + "/insert";
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve, reject2) => {
     const { api } = useApi.useApi();
     const http = vue.unref(api);
     http.post(url, params, { isJSON: true }).then((res) => {
       return resolve(res);
+    }).catch((err) => {
+      reject2(err);
     });
   });
 }
@@ -62,13 +63,13 @@ function saveFnApi(controller, params, options) {
     }
   }
   const url = controller + "/save";
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve, reject2) => {
     const { api } = useApi.useApi();
     const http = vue.unref(api);
     http.post(url, params, { isJSON: true, ...options }).then((res) => {
       return resolve(res);
     }).catch((res) => {
-      reject(res);
+      reject2(res);
     });
   });
 }
@@ -86,41 +87,49 @@ function saveApi(controller, params) {
   } else {
     url = controller + "/insert";
   }
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve, reject2) => {
     const { api } = useApi.useApi();
     const http = vue.unref(api);
     http.post(url, params, { isJSON: true }).then((res) => {
       return resolve(res);
+    }).catch((err) => {
+      reject2(err);
     });
   });
 }
 function findAllApi(controller, params) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve, reject2) => {
     const { api } = useApi.useApi();
     const http = vue.unref(api);
     http.post(controller + "/findAll", params).then((res) => {
       resolve(res);
+    }).catch((err) => {
+      reject2(err);
     });
   });
 }
 function pageApi(controller, params, isJsonData) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve, reject2) => {
     const { api } = useApi.useApi();
     const http = vue.unref(api);
     http.post(controller + "/page", params, { isJSON: isJsonData }).then((res) => {
       resolve(res);
+    }).catch((err) => {
+      reject2(err);
     });
   });
 }
 function deleteBatchApi(controller, ids) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve, reject2) => {
     const { api } = useApi.useApi();
     const http = vue.unref(api);
     if (!ids) {
-      return reject(new Error(t("iDNotPassed")));
+      return reject2(new Error(useLocale.$t("iDNotPassed")));
     }
     http.post(controller + "/deleteBatch", { ids }).then((res) => {
       resolve(res);
+    }).catch((err) => {
+      reject2(err);
     });
   });
 }
@@ -133,6 +142,8 @@ function displayChangeApi(controller, ids, display) {
       display
     }).then(() => {
       resolve();
+    }).catch((err) => {
+      reject(err);
     });
   });
 }

package/lib/api/mapRail.js

@@ -0,0 +1,34 @@
+'use strict';
+
+var vue = require('vue');
+require('../hooks/index.js');
+var useApi = require('../hooks/useApi.js');
+var useLocale = require('../hooks/useLocale.js');
+
+function findAllMapRailLocationApi(params) {
+  return new Promise((resolve, reject) => {
+    const { api } = useApi.useApi();
+    const http = vue.unref(api);
+    http.post("mapRail/location/findAll", params, { isJSON: true }).then((res) => {
+      resolve(res);
+    }).catch((res) => {
+      reject(new Error(useLocale.$t("interfaceError")));
+    });
+  });
+}
+function batchMapRailUserSaveApi(params) {
+  return new Promise((resolve, reject) => {
+    const { api } = useApi.useApi();
+    const http = vue.unref(api);
+    http.post("mapRail/mapRailUser/saveBatch", params, {
+      isJSON: true
+    }).then((res) => {
+      resolve(res);
+    }).catch((res) => {
+      resolve(res);
+    });
+  });
+}
+
+exports.batchMapRailUserSaveApi = batchMapRailUserSaveApi;
+exports.findAllMapRailLocationApi = findAllMapRailLocationApi;

package/lib/api/organization.js

@@ -1,47 +1,56 @@
 'use strict';
 
-require('../hooks/index.js');
 var vue = require('vue');
-var useLocale = require('../hooks/useLocale.js');
+require('../hooks/index.js');
 var useApi = require('../hooks/useApi.js');
+var useLocale = require('../hooks/useLocale.js');
 
 function orgListWithDev3Api(params) {
   return new Promise((resolve, reject) => {
-    const { t } = useLocale.useLocale();
     const { api } = useApi.useApi();
     const http = vue.unref(api);
     http.post("organization/orgTree", params).then((res) => {
       resolve(res.data);
     }).catch((res) => {
-      reject(new Error(t("interfaceError")));
+      reject(new Error(useLocale.$t("interfaceError")));
     });
   });
 }
 function orgTreeWithGroupAndDeviceApi(params) {
   return new Promise((resolve, reject) => {
-    const { t } = useLocale.useLocale();
     const { api } = useApi.useApi();
     const http = vue.unref(api);
     http.post("organization/orgTreeWithGroupAndDevice", params).then((res) => {
       return resolve(res.data);
     }).catch((res) => {
-      reject(new Error(t("interfaceError")));
+      reject(new Error(useLocale.$t("interfaceError")));
     });
   });
 }
 function orgTreeWithPlanGroupAndDeviceApi(params) {
   return new Promise((resolve, reject) => {
-    const { t } = useLocale.useLocale();
     const { api } = useApi.useApi();
     const http = vue.unref(api);
     http.post("organization/orgTreeWithPlanGroupAndDevice", params).then((res) => {
       return resolve(res.data);
     }).catch((res) => {
-      reject(new Error(t("interfaceError")));
+      reject(new Error(useLocale.$t("interfaceError")));
+    });
+  });
+}
+function orgTreeApi(params, options = {}) {
+  return new Promise((resolve, reject) => {
+    const { api } = useApi.useApi();
+    const http = vue.unref(api);
+    http.post("/organization/orgTree", params, { ...options }).then((res) => {
+      resolve(res);
+    }).catch((err) => {
+      reject(err);
     });
   });
 }
 
 exports.orgListWithDev3Api = orgListWithDev3Api;
+exports.orgTreeApi = orgTreeApi;
 exports.orgTreeWithGroupAndDeviceApi = orgTreeWithGroupAndDeviceApi;
 exports.orgTreeWithPlanGroupAndDeviceApi = orgTreeWithPlanGroupAndDeviceApi;