diff --git a/jjb.config.js b/jjb.config.js index 24f8ebd..80b0dec 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -10,7 +10,8 @@ module.exports = { javaGitBranch: "", // 接口服务地址 // API_HOST: "http://192.168.20.100:30140", - API_HOST: "https://gbs-gateway.qhdsafety.com", + // API_HOST: "http://192.168.10.127", + API_HOST: "", }, production: { // 应用后端分支名称,部署上线需要 diff --git a/src/main.js b/src/main.js index 8eb4fed..2850e8b 100644 --- a/src/main.js +++ b/src/main.js @@ -6,13 +6,22 @@ import { getFileUrlFromServer } from "zy-react-library/utils"; import "dayjs/locale/zh-cn"; import "../blessed_by_buddha"; +getFileUrlFromServer(); require("antd/dist/reset.css"); require("zy-react-library/css/common.less"); window.mapLongitude = "119.69457721306945"; window.mapLatitude = "39.940504336846665"; window.mapBaiDuKey = "OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr"; - +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", + "http://192.168.192.215:8021/ware/upload/qhdxys/merge_tile.json", + "http://192.168.192.215:8021/ware/upload/qhdgysh/merge_tile.json", + "http://192.168.192.215:8021/ware/upload/%E6%B2%A7%E5%B7%9E%E6%B8%AF%E8%A5%BF/%E6%B2%A7%E5%B7%9E%E6%B8%AF%E8%A5%BF/merge_tile.json", + "http://192.168.192.215:8021/ware/upload/%E6%B2%A7%E5%B7%9E%E6%B8%AF%E4%B8%9C/%E6%B2%A7%E5%B7%9E%E6%B8%AF%E4%B8%9C/merge_tile.json", +]; dayjs.locale("zh-cn"); setJJBCommonAntdMessage(message); diff --git a/src/pages/Container/BranchCompany/Average/Ledger/List/index.js b/src/pages/Container/BranchCompany/Average/Ledger/List/index.js index ca5becf..9da3ee5 100644 --- a/src/pages/Container/BranchCompany/Average/Ledger/List/index.js +++ b/src/pages/Container/BranchCompany/Average/Ledger/List/index.js @@ -225,7 +225,7 @@ function List(props) { ) } { - (props.permission("fgs-tz-sc") && record.state === 100) && ( + (props.permission("fgs-tz-sc") && record.state === 100) && (record.source !== 4 && record.source !== 5) && ( ) }