From eb0b9f907acf2258df14d8ac2271c4c5d249cd90 Mon Sep 17 00:00:00 2001 From: fangjiakai <450850793@qq.com> Date: Tue, 17 Mar 2026 16:41:36 +0800 Subject: [PATCH] =?UTF-8?q?fix(branch-ledger):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=88=86=E6=94=AF=E5=85=AC=E5=8F=B8=E5=8F=B0=E8=B4=A6=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=88=A0=E9=99=A4=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在删除按钮权限判断中增加source字段限制条件 - 禁止source为4或5的数据记录被删除 - 添加倾斜摄影地图配置参数 - 更新API_HOST配置为空字符串以支持动态获取 --- jjb.config.js | 3 ++- src/main.js | 11 ++++++++++- .../BranchCompany/Average/Ledger/List/index.js | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) 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) && ( ) }