diff --git a/public/assets/duibi2.png b/public/assets/duibi2.png new file mode 100644 index 0000000..226e5c9 Binary files /dev/null and b/public/assets/duibi2.png differ diff --git a/public/assets/gantanh.png b/public/assets/gantanh.png new file mode 100644 index 0000000..f867dc8 Binary files /dev/null and b/public/assets/gantanh.png differ diff --git a/public/assets/gantanhpng.png b/public/assets/gantanhpng.png new file mode 100644 index 0000000..623c05c Binary files /dev/null and b/public/assets/gantanhpng.png differ diff --git a/public/assets/gaoguan.mp4 b/public/assets/gaoguan.mp4 new file mode 100644 index 0000000..7979ba2 Binary files /dev/null and b/public/assets/gaoguan.mp4 differ diff --git a/public/assets/pietl.jpg b/public/assets/pietl.jpg new file mode 100644 index 0000000..1c2119b Binary files /dev/null and b/public/assets/pietl.jpg differ diff --git a/public/assets/shuikugh.png b/public/assets/shuikugh.png new file mode 100644 index 0000000..40b2321 Binary files /dev/null and b/public/assets/shuikugh.png differ diff --git a/public/assets/sjti2.png b/public/assets/sjti2.png new file mode 100644 index 0000000..04f26e8 Binary files /dev/null and b/public/assets/sjti2.png differ diff --git a/public/assets/sjtj1.jpg b/public/assets/sjtj1.jpg new file mode 100644 index 0000000..2841fa0 Binary files /dev/null and b/public/assets/sjtj1.jpg differ diff --git a/public/assets/sjyf.jpg b/public/assets/sjyf.jpg new file mode 100644 index 0000000..5c5222e Binary files /dev/null and b/public/assets/sjyf.jpg differ diff --git a/public/assets/xcxq.png b/public/assets/xcxq.png new file mode 100644 index 0000000..c1253b9 Binary files /dev/null and b/public/assets/xcxq.png differ diff --git a/public/mapbox/sprite@2x.json b/public/mapbox/sprite@2x.json index 3a2a505..c88673f 100644 --- a/public/mapbox/sprite@2x.json +++ b/public/mapbox/sprite@2x.json @@ -70,6 +70,14 @@ "y": 0, "pixelRatio": 1, "visible": true + }, + "巡查": { + "width": 32, + "height": 32, + "x": 128, + "y": 32, + "pixelRatio": 1, + "visible": true }, "水库-离线": { "width": 32, diff --git a/public/mapbox/sprite@2x.png b/public/mapbox/sprite@2x.png index 5193efd..5384240 100644 Binary files a/public/mapbox/sprite@2x.png and b/public/mapbox/sprite@2x.png differ diff --git a/src/models/map/index.js b/src/models/map/index.js index aeb3e65..4ed6b64 100644 --- a/src/models/map/index.js +++ b/src/models/map/index.js @@ -467,8 +467,7 @@ const map = { dispatch.runtime.setLayerSetting({ planeArea: null }); dispatch.map.setLayerVisible({ ContourLayer: false }); } - - if (id === 201 || id === 205) { + if (id === 201) { dispatch.map.setLayerSetting({ dom: false }); map.setLayoutProperty('热力图', 'visibility', 'visible'); } else { diff --git a/src/models/map/layout.js b/src/models/map/layout.js index d7c90bb..469a76f 100644 --- a/src/models/map/layout.js +++ b/src/models/map/layout.js @@ -95,7 +95,7 @@ export default function calcLayout(view, rightStack, hidePanels) { } else if (view === 206) { left = [ { key: '天气' }, - { key: '水库管理', style: { height: '40rem', flexGrow: 1 } }, + { key: '巡查任务总览', style: { height: '40rem', flexGrow: 1 } }, ]; leftFullHeight = true; } else if (view === 207) { @@ -289,7 +289,8 @@ export default function calcLayout(view, rightStack, hidePanels) { ]; } else if (view === 206) { right = [ - { key: '警报' }, + { key: '巡查问题看板', style: { height: '70%', flexGrow: 1 } }, + { key: '水库管护', style: { height: '10rem', flexGrow: 1 } }, ]; } else if (view === 207) { right = [ diff --git a/src/views/Home/InfoDlg/HistoryYyDlg/VideoCom.js b/src/views/Home/InfoDlg/HistoryYyDlg/VideoCom.js index a003f60..25d8c40 100644 --- a/src/views/Home/InfoDlg/HistoryYyDlg/VideoCom.js +++ b/src/views/Home/InfoDlg/HistoryYyDlg/VideoCom.js @@ -5,7 +5,7 @@ import { Box, } from '@material-ui/core'; import { makeStyles } from '@material-ui/core/styles'; - +import clsx from "clsx" import PlayArrowIcon from '@material-ui/icons/PlayArrow'; import PauseIcon from '@material-ui/icons/Pause'; @@ -35,15 +35,33 @@ const useStyles = makeStyles((theme) => ({ display: 'flex', alignItems: 'center', gap: theme.spacing(2), + }, + controls1: { + position: 'absolute', + top: '50%', + left: '50%', + transform: 'translate(-50%, -50%)', + padding: theme.spacing(2), + background: 'rgba(0,0,0,0.7)', + borderRadius: theme.spacing(1), + display: 'flex', + alignItems: 'center', + gap: theme.spacing(2), + width: '800px', + maxWidth: '90%', + pointerEvents: 'none', + }, playButton: { color: '#fff', + pointerEvents: 'auto', '&:hover': { backgroundColor: 'rgba(255,255,255,0.1)', }, }, slider: { color: '#1976d2', + pointerEvents: 'auto', flex: 1, '& .MuiSlider-rail': { backgroundColor: 'rgba(255,255,255,0.3)', @@ -65,6 +83,7 @@ const useStyles = makeStyles((theme) => ({ fontSize: '0.875rem', minWidth: 100, textAlign: 'right', + pointerEvents: 'auto', }, dateDisplay: { position: 'absolute', @@ -75,9 +94,13 @@ const useStyles = makeStyles((theme) => ({ fontWeight: 500, textShadow: '1px 1px 2px rgba(0,0,0,0.5)', }, + odd: { + zIndex: 1, + position: 'absolute' + } })); -const VideoPlayer = ({ videoUrl, date }) => { +const VideoPlayer = ({ videoUrl, date,odd=false }) => { const classes = useStyles(); const [playing, setPlaying] = useState(false); const [progress, setProgress] = useState(0); @@ -120,7 +143,7 @@ const VideoPlayer = ({ videoUrl, date }) => { }; return ( -
+