fix(branch-ledger): 修复分支公司台账列表删除权限控制
- 在删除按钮权限判断中增加source字段限制条件 - 禁止source为4或5的数据记录被删除 - 添加倾斜摄影地图配置参数 - 更新API_HOST配置为空字符串以支持动态获取master
parent
82595a5c03
commit
eb0b9f907a
|
|
@ -10,7 +10,8 @@ module.exports = {
|
||||||
javaGitBranch: "<branch-name>",
|
javaGitBranch: "<branch-name>",
|
||||||
// 接口服务地址
|
// 接口服务地址
|
||||||
// API_HOST: "http://192.168.20.100:30140",
|
// 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: {
|
production: {
|
||||||
// 应用后端分支名称,部署上线需要
|
// 应用后端分支名称,部署上线需要
|
||||||
|
|
|
||||||
11
src/main.js
11
src/main.js
|
|
@ -6,13 +6,22 @@ import { getFileUrlFromServer } from "zy-react-library/utils";
|
||||||
import "dayjs/locale/zh-cn";
|
import "dayjs/locale/zh-cn";
|
||||||
import "../blessed_by_buddha";
|
import "../blessed_by_buddha";
|
||||||
|
|
||||||
|
getFileUrlFromServer();
|
||||||
require("antd/dist/reset.css");
|
require("antd/dist/reset.css");
|
||||||
require("zy-react-library/css/common.less");
|
require("zy-react-library/css/common.less");
|
||||||
|
|
||||||
window.mapLongitude = "119.69457721306945";
|
window.mapLongitude = "119.69457721306945";
|
||||||
window.mapLatitude = "39.940504336846665";
|
window.mapLatitude = "39.940504336846665";
|
||||||
window.mapBaiDuKey = "OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr";
|
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");
|
dayjs.locale("zh-cn");
|
||||||
setJJBCommonAntdMessage(message);
|
setJJBCommonAntdMessage(message);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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) && (
|
||||||
<Button type="link" danger onClick={() => onDelete(record.id)}>删除</Button>
|
<Button type="link" danger onClick={() => onDelete(record.id)}>删除</Button>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue