diff --git a/src/views/Home/MapCtrl/Pops/DuanMian/drpOption.js b/src/views/Home/MapCtrl/Pops/DuanMian/drpOption.js
index 9778c0a1a..0bdb86d26 100644
--- a/src/views/Home/MapCtrl/Pops/DuanMian/drpOption.js
+++ b/src/views/Home/MapCtrl/Pops/DuanMian/drpOption.js
@@ -31,7 +31,7 @@ export default function drpOption(data) {
{
type: 'category',
data: data.map(o => o.tm),
- inverse: true,
+ inverse: false,
splitLine: {
show: false
},
diff --git a/src/views/Home/MapCtrl/Pops/DuanMian/toolbar.js b/src/views/Home/MapCtrl/Pops/DuanMian/toolbar.js
index f3cdc2669..9d0733e42 100644
--- a/src/views/Home/MapCtrl/Pops/DuanMian/toolbar.js
+++ b/src/views/Home/MapCtrl/Pops/DuanMian/toolbar.js
@@ -18,7 +18,7 @@ const ToolBar = ({search, setTabVal, setTms}) => {
obj.drp))
- // const max1 = Math.max(...data.map(obj => obj.x))
const max1 = Math.max(...[...data.map(obj => obj.x),...data.map(obj => obj.y),...data.map(obj => obj.h),...yjData.map(obj => obj.value)])
const min1 = Math.min(...[...data.map(obj => obj.x),...data.map(obj => obj.y),...data.map(obj => obj.h),...yjData.map(obj => obj.value)])
- // const min1 = Math.min(...data.map(obj => obj.x))
const max2 = Math.max(...data.map(obj => obj.rz))
const min2 = Math.min(...data.map(obj => obj.rz))
@@ -52,7 +49,7 @@ export default function drpOption(data,yjData) {
{
type: 'category',
data: data.map(o => o.tm),
- inverse: true,
+ inverse: false,
splitLine: {
show: false
},
diff --git a/src/views/Home/tqyb/index.js b/src/views/Home/tqyb/index.js
index d52017f59..9ce110d1f 100644
--- a/src/views/Home/tqyb/index.js
+++ b/src/views/Home/tqyb/index.js
@@ -12,12 +12,13 @@ const { Panel } = Collapse;
const Page = ({showPanels}) => {
const dispatch = useDispatch();
const [myKey, setMyKey] = useState('1')
- const [badgeType, setBadgeType] = useState('雷达回波')
+ const [badgeType, setBadgeType] = useState('')
const [tmObj,setTmObj] = useState({
tm:moment(),
hours:'08'
})
useEffect(()=>{
+ setBadgeType('雷达回波')
dispatch.runtime.setCameraTarget({
center: [115.2, 31.18],
zoom: 9,
@@ -66,8 +67,7 @@ const Page = ({showPanels}) => {
{
- (badgeType === '雷达回波'&&myKey==='1')
- ? (
+ (badgeType === '雷达回波'&&myKey==='1') ? (
{v?.slice(5,16)}
},
- { title: '渗流量(L/s)', key: 'q', dataIndex: 'q',align: "center", ellipsis: true, render:(v,row)=>{v}
},
+ { title: '渗流量(L/s)', key: 'value', dataIndex: 'value',align: "center", ellipsis: true, render:(v,row)=>{v}
},
]
const columnsWy = [
@@ -57,7 +57,7 @@ export default function Page({isHome}) {
console.log(1111)
// 大于0:滚轮向上滚动 小于0:滚轮向下滚动
if (e.wheelDelta > 0) {
- scale += 0.05;
+ scale += 0.02;
img.style.transform = `scale(${scale})`;
} else {
if (scale == 1) {
@@ -66,7 +66,7 @@ export default function Page({isHome}) {
}
// 缩放值大于1时,可以缩小,反之亦然
if (scale > 1) {
- scale -= 0.05;
+ scale -= 0.02;
img.style.transform = `scale(${scale})`;
}
}
diff --git a/src/views/szydd/ddjl/form.js b/src/views/szydd/ddjl/form.js
index f9bb86af9..ad8ba75ff 100644
--- a/src/views/szydd/ddjl/form.js
+++ b/src/views/szydd/ddjl/form.js
@@ -219,7 +219,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
}
-
+
{
fileList?.length > 0 && fileList?.map(file => {
return (