diff --git a/package-lock.json b/package-lock.json index c6da42a..ddebaf4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,6 +7,7 @@ "dependencies": { "@ant-design/icons": "^5.2.6", "@antv/data-set": "0.9.6", + "@jiaminghi/data-view-react": "^1.2.5", "antd": "^3.26.20", "autobind-decorator": "2.3.1", "babel-plugin-import": "1.11.0", @@ -1776,6 +1777,63 @@ "node": ">=10" } }, + "node_modules/@jiaminghi/bezier-curve": { + "version": "0.0.9", + "resolved": "https://registry.npmmirror.com/@jiaminghi/bezier-curve/-/bezier-curve-0.0.9.tgz", + "integrity": "sha512-u9xJPOEl6Dri2E9FfmJoGxYQY7vYJkURNX04Vj64tdi535tPrpkuf9Sm0lNr3QTKdHQh0DdNRsaa62FLQNQEEw==", + "dependencies": { + "@babel/runtime": "^7.5.5" + } + }, + "node_modules/@jiaminghi/c-render": { + "version": "0.4.3", + "resolved": "https://registry.npmmirror.com/@jiaminghi/c-render/-/c-render-0.4.3.tgz", + "integrity": "sha512-FJfzj5hGj7MLqqqI2D7vEzHKbQ1Ynnn7PJKgzsjXaZpJzTqs2Yw5OSeZnm6l7Qj7jyPAP53lFvEQNH4o4j6s+Q==", + "dependencies": { + "@babel/runtime": "^7.5.5", + "@jiaminghi/bezier-curve": "*", + "@jiaminghi/color": "*", + "@jiaminghi/transition": "*" + } + }, + "node_modules/@jiaminghi/charts": { + "version": "0.2.18", + "resolved": "https://registry.npmmirror.com/@jiaminghi/charts/-/charts-0.2.18.tgz", + "integrity": "sha512-K+HXaOOeWG9OOY1VG6M4mBreeeIAPhb9X+khG651AbnwEwL6G2UtcAQ8GWCq6GzhczcLwwhIhuaHqRygwHC0sA==", + "dependencies": { + "@babel/runtime": "^7.5.5", + "@jiaminghi/c-render": "^0.4.3" + } + }, + "node_modules/@jiaminghi/color": { + "version": "1.1.3", + "resolved": "https://registry.npmmirror.com/@jiaminghi/color/-/color-1.1.3.tgz", + "integrity": "sha512-ZY3hdorgODk4OSTbxyXBPxAxHPIVf9rPlKJyK1C1db46a50J0reFKpAvfZG8zMG3lvM60IR7Qawgcu4ZDO3+Hg==" + }, + "node_modules/@jiaminghi/data-view-react": { + "version": "1.2.5", + "resolved": "https://registry.npmmirror.com/@jiaminghi/data-view-react/-/data-view-react-1.2.5.tgz", + "integrity": "sha512-hxlfg0yULj7nUde8oj5hB9pUWrHqFyuPUeJWNG70YPPHFnWXqmlWCx1aB1OpqD3lwxaI1aKkA4YJRhkvfLyKrg==", + "dependencies": { + "@jiaminghi/charts": "^0.2" + }, + "engines": { + "node": ">=8", + "npm": ">=5" + }, + "peerDependencies": { + "react": "^16.8.0", + "react-dom": "^16.8.0" + } + }, + "node_modules/@jiaminghi/transition": { + "version": "1.1.11", + "resolved": "https://registry.npmmirror.com/@jiaminghi/transition/-/transition-1.1.11.tgz", + "integrity": "sha512-owBggipoHMikDHHDW5Gc7RZYlVuvxHADiU4bxfjBVkHDAmmck+fCkm46n2JzC3j33hWvP9nSCAeh37t6stgWeg==", + "dependencies": { + "@babel/runtime": "^7.5.5" + } + }, "node_modules/@types/history": { "version": "4.7.3", "integrity": "sha512-cS5owqtwzLN5kY+l+KgKdRJ/Cee8tlmQoGQuIE9tWnSmS3JMKzmxo2HIAk2wODMifGwO20d62xZQLYz+RLfXmw==", @@ -26773,6 +26831,55 @@ "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz", "integrity": "sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==" }, + "@jiaminghi/bezier-curve": { + "version": "0.0.9", + "resolved": "https://registry.npmmirror.com/@jiaminghi/bezier-curve/-/bezier-curve-0.0.9.tgz", + "integrity": "sha512-u9xJPOEl6Dri2E9FfmJoGxYQY7vYJkURNX04Vj64tdi535tPrpkuf9Sm0lNr3QTKdHQh0DdNRsaa62FLQNQEEw==", + "requires": { + "@babel/runtime": "^7.5.5" + } + }, + "@jiaminghi/c-render": { + "version": "0.4.3", + "resolved": "https://registry.npmmirror.com/@jiaminghi/c-render/-/c-render-0.4.3.tgz", + "integrity": "sha512-FJfzj5hGj7MLqqqI2D7vEzHKbQ1Ynnn7PJKgzsjXaZpJzTqs2Yw5OSeZnm6l7Qj7jyPAP53lFvEQNH4o4j6s+Q==", + "requires": { + "@babel/runtime": "^7.5.5", + "@jiaminghi/bezier-curve": "*", + "@jiaminghi/color": "*", + "@jiaminghi/transition": "*" + } + }, + "@jiaminghi/charts": { + "version": "0.2.18", + "resolved": "https://registry.npmmirror.com/@jiaminghi/charts/-/charts-0.2.18.tgz", + "integrity": "sha512-K+HXaOOeWG9OOY1VG6M4mBreeeIAPhb9X+khG651AbnwEwL6G2UtcAQ8GWCq6GzhczcLwwhIhuaHqRygwHC0sA==", + "requires": { + "@babel/runtime": "^7.5.5", + "@jiaminghi/c-render": "^0.4.3" + } + }, + "@jiaminghi/color": { + "version": "1.1.3", + "resolved": "https://registry.npmmirror.com/@jiaminghi/color/-/color-1.1.3.tgz", + "integrity": "sha512-ZY3hdorgODk4OSTbxyXBPxAxHPIVf9rPlKJyK1C1db46a50J0reFKpAvfZG8zMG3lvM60IR7Qawgcu4ZDO3+Hg==" + }, + "@jiaminghi/data-view-react": { + "version": "1.2.5", + "resolved": "https://registry.npmmirror.com/@jiaminghi/data-view-react/-/data-view-react-1.2.5.tgz", + "integrity": "sha512-hxlfg0yULj7nUde8oj5hB9pUWrHqFyuPUeJWNG70YPPHFnWXqmlWCx1aB1OpqD3lwxaI1aKkA4YJRhkvfLyKrg==", + "requires": { + "@jiaminghi/charts": "^0.2" + } + }, + "@jiaminghi/transition": { + "version": "1.1.11", + "resolved": "https://registry.npmmirror.com/@jiaminghi/transition/-/transition-1.1.11.tgz", + "integrity": "sha512-owBggipoHMikDHHDW5Gc7RZYlVuvxHADiU4bxfjBVkHDAmmck+fCkm46n2JzC3j33hWvP9nSCAeh37t6stgWeg==", + "requires": { + "@babel/runtime": "^7.5.5" + } + }, "@types/history": { "version": "4.7.3", "integrity": "sha512-cS5owqtwzLN5kY+l+KgKdRJ/Cee8tlmQoGQuIE9tWnSmS3JMKzmxo2HIAk2wODMifGwO20d62xZQLYz+RLfXmw==" diff --git a/package.json b/package.json index b4479fa..f38d430 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "dependencies": { "@ant-design/icons": "^5.2.6", "@antv/data-set": "0.9.6", + "@jiaminghi/data-view-react": "^1.2.5", "antd": "^3.26.20", "autobind-decorator": "2.3.1", "babel-plugin-import": "1.11.0", diff --git a/src/assets/risk/1-1-1.png b/src/assets/risk/1-1-1.png new file mode 100644 index 0000000..63264eb Binary files /dev/null and b/src/assets/risk/1-1-1.png differ diff --git a/src/assets/risk/1-1.png b/src/assets/risk/1-1.png new file mode 100644 index 0000000..e1436ab Binary files /dev/null and b/src/assets/risk/1-1.png differ diff --git a/src/assets/risk/1-2.png b/src/assets/risk/1-2.png new file mode 100644 index 0000000..9765973 Binary files /dev/null and b/src/assets/risk/1-2.png differ diff --git a/src/assets/risk/1-3.png b/src/assets/risk/1-3.png new file mode 100644 index 0000000..44fbec6 Binary files /dev/null and b/src/assets/risk/1-3.png differ diff --git a/src/assets/risk/1-4.png b/src/assets/risk/1-4.png new file mode 100644 index 0000000..a6d6826 Binary files /dev/null and b/src/assets/risk/1-4.png differ diff --git a/src/assets/risk/1.png b/src/assets/risk/1.png new file mode 100644 index 0000000..f3cd09d Binary files /dev/null and b/src/assets/risk/1.png differ diff --git a/src/assets/risk/2-1-1.png b/src/assets/risk/2-1-1.png new file mode 100644 index 0000000..055768e Binary files /dev/null and b/src/assets/risk/2-1-1.png differ diff --git a/src/assets/risk/2-1.png b/src/assets/risk/2-1.png new file mode 100644 index 0000000..eeb473b Binary files /dev/null and b/src/assets/risk/2-1.png differ diff --git a/src/assets/risk/2-2.png b/src/assets/risk/2-2.png new file mode 100644 index 0000000..dbca85d Binary files /dev/null and b/src/assets/risk/2-2.png differ diff --git a/src/assets/risk/2-3.png b/src/assets/risk/2-3.png new file mode 100644 index 0000000..12d05c5 Binary files /dev/null and b/src/assets/risk/2-3.png differ diff --git a/src/assets/risk/2-4.png b/src/assets/risk/2-4.png new file mode 100644 index 0000000..a7d688c Binary files /dev/null and b/src/assets/risk/2-4.png differ diff --git a/src/assets/risk/3-1-1.png b/src/assets/risk/3-1-1.png new file mode 100644 index 0000000..ae7385a Binary files /dev/null and b/src/assets/risk/3-1-1.png differ diff --git a/src/assets/risk/3-1.png b/src/assets/risk/3-1.png new file mode 100644 index 0000000..28d6788 Binary files /dev/null and b/src/assets/risk/3-1.png differ diff --git a/src/assets/risk/3-2.png b/src/assets/risk/3-2.png new file mode 100644 index 0000000..77f1c3f Binary files /dev/null and b/src/assets/risk/3-2.png differ diff --git a/src/assets/risk/3-3.png b/src/assets/risk/3-3.png new file mode 100644 index 0000000..3c6a6d5 Binary files /dev/null and b/src/assets/risk/3-3.png differ diff --git a/src/assets/risk/3-4.png b/src/assets/risk/3-4.png new file mode 100644 index 0000000..dca1bd1 Binary files /dev/null and b/src/assets/risk/3-4.png differ diff --git a/src/assets/risk/4-1-1.png b/src/assets/risk/4-1-1.png new file mode 100644 index 0000000..845c7ac Binary files /dev/null and b/src/assets/risk/4-1-1.png differ diff --git a/src/assets/risk/4-1.png b/src/assets/risk/4-1.png new file mode 100644 index 0000000..010e211 Binary files /dev/null and b/src/assets/risk/4-1.png differ diff --git a/src/assets/risk/4-2.png b/src/assets/risk/4-2.png new file mode 100644 index 0000000..5cb1fd8 Binary files /dev/null and b/src/assets/risk/4-2.png differ diff --git a/src/assets/risk/4-3.png b/src/assets/risk/4-3.png new file mode 100644 index 0000000..5be16c2 Binary files /dev/null and b/src/assets/risk/4-3.png differ diff --git a/src/assets/risk/4-4.png b/src/assets/risk/4-4.png new file mode 100644 index 0000000..1f35ec0 Binary files /dev/null and b/src/assets/risk/4-4.png differ diff --git a/src/assets/risk/5-1-1.png b/src/assets/risk/5-1-1.png new file mode 100644 index 0000000..f730234 Binary files /dev/null and b/src/assets/risk/5-1-1.png differ diff --git a/src/assets/risk/5-1.png b/src/assets/risk/5-1.png new file mode 100644 index 0000000..574201d Binary files /dev/null and b/src/assets/risk/5-1.png differ diff --git a/src/assets/risk/5-2.png b/src/assets/risk/5-2.png new file mode 100644 index 0000000..f5bdb7f Binary files /dev/null and b/src/assets/risk/5-2.png differ diff --git a/src/assets/risk/5-3.png b/src/assets/risk/5-3.png new file mode 100644 index 0000000..b8bf8a7 Binary files /dev/null and b/src/assets/risk/5-3.png differ diff --git a/src/assets/risk/5-4.png b/src/assets/risk/5-4.png new file mode 100644 index 0000000..6fa4938 Binary files /dev/null and b/src/assets/risk/5-4.png differ diff --git a/src/assets/risk/6-1-1.png b/src/assets/risk/6-1-1.png new file mode 100644 index 0000000..3173ff6 Binary files /dev/null and b/src/assets/risk/6-1-1.png differ diff --git a/src/assets/risk/6-1.png b/src/assets/risk/6-1.png new file mode 100644 index 0000000..50e8485 Binary files /dev/null and b/src/assets/risk/6-1.png differ diff --git a/src/assets/risk/6-2.png b/src/assets/risk/6-2.png new file mode 100644 index 0000000..16529c4 Binary files /dev/null and b/src/assets/risk/6-2.png differ diff --git a/src/assets/risk/6-3.png b/src/assets/risk/6-3.png new file mode 100644 index 0000000..4c43020 Binary files /dev/null and b/src/assets/risk/6-3.png differ diff --git a/src/assets/risk/6-4.png b/src/assets/risk/6-4.png new file mode 100644 index 0000000..7278e2a Binary files /dev/null and b/src/assets/risk/6-4.png differ diff --git a/src/assets/risk/7-1-1.png b/src/assets/risk/7-1-1.png new file mode 100644 index 0000000..627712d Binary files /dev/null and b/src/assets/risk/7-1-1.png differ diff --git a/src/assets/risk/7-1.png b/src/assets/risk/7-1.png new file mode 100644 index 0000000..8f76dde Binary files /dev/null and b/src/assets/risk/7-1.png differ diff --git a/src/assets/risk/7-2.png b/src/assets/risk/7-2.png new file mode 100644 index 0000000..b63a609 Binary files /dev/null and b/src/assets/risk/7-2.png differ diff --git a/src/assets/risk/7-3.png b/src/assets/risk/7-3.png new file mode 100644 index 0000000..14517ae Binary files /dev/null and b/src/assets/risk/7-3.png differ diff --git a/src/assets/risk/7-4.png b/src/assets/risk/7-4.png new file mode 100644 index 0000000..a4debf7 Binary files /dev/null and b/src/assets/risk/7-4.png differ diff --git a/src/assets/risk/back.jpg b/src/assets/risk/back.jpg new file mode 100644 index 0000000..f743ff1 Binary files /dev/null and b/src/assets/risk/back.jpg differ diff --git a/src/assets/risk/backno.jpg b/src/assets/risk/backno.jpg new file mode 100644 index 0000000..de19e97 Binary files /dev/null and b/src/assets/risk/backno.jpg differ diff --git a/src/assets/risk/blue.png b/src/assets/risk/blue.png new file mode 100644 index 0000000..d1217c0 Binary files /dev/null and b/src/assets/risk/blue.png differ diff --git a/src/assets/risk/orange.png b/src/assets/risk/orange.png new file mode 100644 index 0000000..9f409f7 Binary files /dev/null and b/src/assets/risk/orange.png differ diff --git a/src/assets/risk/red.png b/src/assets/risk/red.png new file mode 100644 index 0000000..1a1bc40 Binary files /dev/null and b/src/assets/risk/red.png differ diff --git a/src/assets/risk/yellow.png b/src/assets/risk/yellow.png new file mode 100644 index 0000000..43def5a Binary files /dev/null and b/src/assets/risk/yellow.png differ diff --git a/src/layout/Header.js b/src/layout/Header.js index e70bffa..0cde44b 100644 --- a/src/layout/Header.js +++ b/src/layout/Header.js @@ -1,4 +1,4 @@ -import React, { useState, useMemo } from "react"; +import React, { useState, useMemo ,useEffect} from "react"; import { connect } from "dva"; import { withRouter } from "dva/router"; import { Dropdown, Icon, Menu, message, Button, Modal, Input } from "antd"; @@ -8,10 +8,11 @@ import FoUserInfoShow from "../components/MainPage/FoUserInfoShow"; import FeedbackQuestion from "../components/MainPage/FeedbackQuestion"; import GuideCanvas from "../components/MainPage/GuideCanvas"; import IconFont from "../utils/iconFont"; -import { initFilter } from "../utils/common"; +import { initFilter,requestFullScreenMethod } from "../utils/common"; import config from "../config"; import "./header.less"; import Option from "./Option"; +import RiskFourPage from "./RiskFour"; // 投屏 const DataV = (props) => { @@ -317,6 +318,88 @@ const GuideCodePage = (props) => { const GuideCode = withRouter( connect(({ login }) => ({ login }))(GuideCodePage) ); +const RiskFourColorOpton = (props) => { + const [showModal, setshowModal] = useState(false); + const escFunction = () => { + let isFull = !!( + document.fullscreen || + document.mozFullScreen || + document.webkitIsFullScreen || + document.webkitFullScreen || + document.msFullScreen + ); + if (isFull) { + // / + }else{ + // requestFullScreenMethod(document.body); + setshowModal(false); + } + }; + useEffect(() => { + // 监听退出全屏事件 --- chrome 用 esc 退出全屏并不会触发 keyup 事件 + document.addEventListener( + "webkitfullscreenchange", + escFunction + ); /* Chrome, Safari and Opera */ + document.addEventListener("mozfullscreenchange", escFunction); /* Firefox */ + document.addEventListener( + "fullscreenchange", + escFunction + ); /* Standard syntax */ + document.addEventListener( + "msfullscreenchange", + escFunction + ); /* IE / Edge */ + return () => { + //销毁时清除监听 + document.removeEventListener("webkitfullscreenchange", escFunction); + document.removeEventListener("mozfullscreenchange", escFunction); + document.removeEventListener("fullscreenchange", escFunction); + document.removeEventListener("MSFullscreenChange", escFunction); + }; + }, []); + + if (window.navigator.userAgent.indexOf("Windows") < 1) { + return
; + } else { + return ( +