diff --git a/jjb.config.js b/jjb.config.js index 8412e69..f7af4ce 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -10,7 +10,7 @@ module.exports = { javaGitBranch: "", // 接口服务地址 // API_HOST: "http://192.168.20.100:30140", - API_HOST: "https://gbs-gateway.qhdsafety.com", + API_HOST: "", }, production: { // 应用后端分支名称,部署上线需要 diff --git a/package.json b/package.json index 7d135d8..fccb4c0 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-to-print": "^3.2.0", - "zy-react-library": "^1.1.42" + "zy-react-library": "^1.2.3" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/src/main.js b/src/main.js index 0d36e2d..49352b1 100644 --- a/src/main.js +++ b/src/main.js @@ -1,4 +1,5 @@ import { setJJBCommonAntdMessage } from "@cqsjjb/jjb-common-lib"; +import { getFileUrlFromServer } from "zy-react-library/utils"; import { setup } from "@cqsjjb/jjb-dva-runtime"; import { message } from "antd"; import dayjs from "dayjs"; @@ -7,13 +8,14 @@ import "../blessed_by_buddha"; require("antd/dist/reset.css"); require("zy-react-library/css/common.less"); - +getFileUrlFromServer(); dayjs.locale("zh-cn"); setJJBCommonAntdMessage(message); const app = setup(); window.mapLongitude = "119.69457721306945"; window.mapLatitude = "39.940504336846665"; +window.mapBaiDuKey = "OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr"; window.mapObliquePhotography = [ "http://192.168.192.215:8021/ware/upload/%E6%9B%B9%E5%A6%83%E7%94%B8%E6%B8%AF%E4%B8%9C/%E6%9B%B9%E5%A6%83%E7%94%B8%E6%B8%AF%E4%B8%9C/merge_tile.json", "http://192.168.192.215:8021/ware/upload/%E6%9B%B9%E5%A6%83%E7%94%B8%E6%B8%AF%E8%A5%BF/%E6%9B%B9%E5%A6%83%E7%94%B8%E6%B8%AF%E8%A5%BF/merge_tile.json", diff --git a/src/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionDetails/index.js b/src/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionDetails/index.js index 1f07f40..3efc0d5 100644 --- a/src/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionDetails/index.js +++ b/src/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionDetails/index.js @@ -22,7 +22,7 @@ function PersonnelExecutionDetails(props) { }); return ( - + 计划信息 人员执行详情