zcloud_gbs
/
zcloud_gbs_inspection-react
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zcloud_gbs:d3c9cd4a3d2bc579d44694fa47b245fd8f2a8e38
Branches Tags
zcloud_gbs:master
..
compare: zcloud_gbs:589dbbe3ef429198b0f9d65c84d6230f5babfd44
Branches Tags
zcloud_gbs:master

No commits in common. "d3c9cd4a3d2bc579d44694fa47b245fd8f2a8e38" and "589dbbe3ef429198b0f9d65c84d6230f5babfd44" have entirely different histories.
d3c9cd4a3d ... 589dbbe3ef

4 changed files with 5 additions and 7 deletions
Show Stats Expand all files Collapse all files

2
jjb.config.js
View File

@ -10,7 +10,7 @@ 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: "", API_HOST: "https://gbs-gateway.qhdsafety.com",
}, },
production: { production: {
// 应用后端分支名称，部署上线需要 // 应用后端分支名称，部署上线需要

2
package.json
View File

@ -32,7 +32,7 @@
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-to-print": "^3.2.0", "react-to-print": "^3.2.0",
"zy-react-library": "^1.2.3" "zy-react-library": "^1.1.42"
}, },
"devDependencies": { "devDependencies": {
"@antfu/eslint-config": "^5.4.1", "@antfu/eslint-config": "^5.4.1",

4
src/main.js
View File

@ -1,5 +1,4 @@
import { setJJBCommonAntdMessage } from "@cqsjjb/jjb-common-lib"; import { setJJBCommonAntdMessage } from "@cqsjjb/jjb-common-lib";
import { getFileUrlFromServer } from "zy-react-library/utils";
import { setup } from "@cqsjjb/jjb-dva-runtime"; import { setup } from "@cqsjjb/jjb-dva-runtime";
import { message } from "antd"; import { message } from "antd";
import dayjs from "dayjs"; import dayjs from "dayjs";
@ -8,14 +7,13 @@ import "../blessed_by_buddha";
require("antd/dist/reset.css"); require("antd/dist/reset.css");
require("zy-react-library/css/common.less"); require("zy-react-library/css/common.less");
getFileUrlFromServer();
dayjs.locale("zh-cn"); dayjs.locale("zh-cn");
setJJBCommonAntdMessage(message); setJJBCommonAntdMessage(message);
const app = setup(); const app = setup();
window.mapLongitude = "119.69457721306945"; window.mapLongitude = "119.69457721306945";
window.mapLatitude = "39.940504336846665"; window.mapLatitude = "39.940504336846665";
window.mapBaiDuKey = "OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr";
window.mapObliquePhotography = [ 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%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/%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",

4
src/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionDetails/index.js
View File

@ -22,7 +22,7 @@ function PersonnelExecutionDetails(props) {
}); });
return ( return (
<Page headerTitle="人员执行情况" contentPadding="0 20px 20px 20px"> <Page headerTitle="计划执行总次数" contentPadding="0 20px 20px 20px">
<Divider orientation="left">计划信息</Divider> <Divider orientation="left">计划信息</Divider>
<ViewInfo id={query.planId} supervision={props.supervision} /> <ViewInfo id={query.planId} supervision={props.supervision} />
<Divider orientation="left">人员执行详情</Divider> <Divider orientation="left">人员执行详情</Divider>
@ -52,7 +52,7 @@ function PersonnelExecutionDetails(props) {
<Button <Button
type="link" type="link"
onClick={() => { onClick={() => {
props.history.push(props.supervision === "1" ? `../../inspectionView?id=${record.id}&inspectionId=${record.inspectionId}` : `../../inspectionView?id=${record.id}&inspectionId=${record.inspectionId}`); props.history.push(props.supervision === "1" ? `../inspectionView?id=${record.id}&inspectionId=${record.inspectionId}` : `../../inspectionView?id=${record.id}&inspectionId=${record.inspectionId}`);
}} }}
> >
查看 查看