diff --git a/public/assets/xyt/fxdd/bzt5.svg b/public/assets/xyt/fxdd/bzt5.svg new file mode 100644 index 000000000..6daa0d90f --- /dev/null +++ b/public/assets/xyt/fxdd/bzt5.svg @@ -0,0 +1,3091 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/utils/request.js b/src/utils/request.js index 85be348c9..3c6ea73f3 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -40,12 +40,12 @@ async function send(url, options) { } const { code } = res.data; - // if (code === 401) { - // // debugger; - // //window.location.href = '/mgr/home';// /mgr/home /login - // window.location.href = '/tsg/#/login'; - // // window.location.hash = '#/login'; - // } + if (code === 405) { + // debugger; + //window.location.href = '/mgr/home';// /mgr/home /login + window.location.href = '/tsg/#/login'; + // window.location.hash = '#/login'; + } return res.data; } catch (e) { //message.error(e); diff --git a/src/views/Home/homePanelsLayoutPage/item_gongcheng.js b/src/views/Home/homePanelsLayoutPage/item_gongcheng.js index 4f36b1384..df37a6ebf 100644 --- a/src/views/Home/homePanelsLayoutPage/item_gongcheng.js +++ b/src/views/Home/homePanelsLayoutPage/item_gongcheng.js @@ -25,7 +25,7 @@ const Page = () => { return [ { title: '监测点', key: 'stationCode', dataIndex: 'stationCode',align: "center", ellipsis: true }, { title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 150, ellipsis: true, render:(v,row)=>
{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}
}, ] }else{ return [ diff --git a/src/views/Home/homePanelsLayoutPage/item_yanhejuminhu.js b/src/views/Home/homePanelsLayoutPage/item_yanhejuminhu.js index 07b164ca8..8745f51b2 100644 --- a/src/views/Home/homePanelsLayoutPage/item_yanhejuminhu.js +++ b/src/views/Home/homePanelsLayoutPage/item_yanhejuminhu.js @@ -31,8 +31,8 @@ const Page = () => { if(code!==200){ return } - const list = data.filter(o=>o.adcd.indexOf('421181113')===0) - setTableData(list) + // const list = data.filter(o=>o.adcd.indexOf('421181113')===0) + setTableData(data) })() },[]) diff --git a/src/views/Home/homePanelsLayoutPage/item_yujing/index.js b/src/views/Home/homePanelsLayoutPage/item_yujing/index.js index 1657ba7b9..f11e4578d 100644 --- a/src/views/Home/homePanelsLayoutPage/item_yujing/index.js +++ b/src/views/Home/homePanelsLayoutPage/item_yujing/index.js @@ -58,7 +58,7 @@ const Page = ({mySetTms}) => { } -
水位告警
+
超汛限告警
{setOpen(true);setkey('气象预警')}}> diff --git a/src/views/gcaqjc/bzt/index.js b/src/views/gcaqjc/bzt/index.js index d94e9f7f9..39ee4ab2f 100644 --- a/src/views/gcaqjc/bzt/index.js +++ b/src/views/gcaqjc/bzt/index.js @@ -57,7 +57,7 @@ export default function Page({isHome}) { console.log(1111) // 大于0:滚轮向上滚动 小于0:滚轮向下滚动 if (e.wheelDelta > 0) { - scale += 0.02; + scale += 0.05; img.style.transform = `scale(${scale})`; } else { if (scale == 1) { @@ -66,7 +66,7 @@ export default function Page({isHome}) { } // 缩放值大于1时,可以缩小,反之亦然 if (scale > 1) { - scale -= 0.02; + scale -= 0.05; img.style.transform = `scale(${scale})`; } } @@ -130,7 +130,7 @@ export default function Page({isHome}) { >
- + { syList.map((item)=>
{ @@ -138,21 +138,21 @@ export default function Page({isHome}) { setModalData(item) }}> {item.stationCode} - +
) } - { + {/* { slList.map((item)=>
{ setOpenSl(true) setModalData(item) }}> {item.stationCode} - +
) - } + } */} { wyList.map((item)=>
{ @@ -160,23 +160,23 @@ export default function Page({isHome}) { setModalData(item) }}> {item.stationCode} - +
) } - { + {/* { dmList.map((item)=>
{ setOpenDm(true) setModalData(item) }}> - +
) - } + } */} diff --git a/src/views/gcaqjc/bzt/index.less b/src/views/gcaqjc/bzt/index.less index e761a11db..ff93a6564 100644 --- a/src/views/gcaqjc/bzt/index.less +++ b/src/views/gcaqjc/bzt/index.less @@ -114,113 +114,270 @@ left: 0; top: 0; } - .gcaqjc_bzt_sy_SY09{ - left: 544px; - top: 157px; - } - .gcaqjc_bzt_sy_SY10{ - left: 544px; - top: 242px; - } - .gcaqjc_bzt_sy_SY13{ - left: 444px; - top: 157px; - } - .gcaqjc_bzt_sy_SY14{ - left: 444px; - top: 242px; - } - .gcaqjc_bzt_sy_SY05{ - left: 644px; - top: 157px; - } - .gcaqjc_bzt_sy_SY06{ - left: 644px; - top: 242px; - } - .gcaqjc_bzt_sy_SY15{ - left: 444px; - top: 429px; - } - .gcaqjc_bzt_sy_SY16{ - left: 444px; - top: 542px; - } - .gcaqjc_bzt_sy_SY11{ - left: 544px; - top: 429px; - } - .gcaqjc_bzt_sy_SY12{ - left: 544px; - top: 542px; - } - .gcaqjc_bzt_sy_SY07{ - left: 644px; - top: 430px; - } - .gcaqjc_bzt_sy_SY08{ - left: 644px; - top: 542px; - } + .gcaqjc_bzt_sy_SY01{ - left: 29px; - top: 242px; + left: 336px; + top: 388px; } .gcaqjc_bzt_sy_SY02{ - left: 29px; - top: 314px; - } + left: 604px; + top: 407px; + } .gcaqjc_bzt_sy_SY03{ - left: 990px; - top: 242px; - } + left: 843px; + top: 384px; + } .gcaqjc_bzt_sy_SY04{ - left: 990px; - top: 314px; + left: 336px; + top: 418px; + } + .gcaqjc_bzt_sy_SY05{ + left: 604px; + top: 436px; + } + .gcaqjc_bzt_sy_SY06{ + left: 843px; + top: 419px; + } + .gcaqjc_bzt_sy_SY07{ + left: 336px; + top: 478px; + } + .gcaqjc_bzt_sy_SY08{ + left: 604px; + top: 494px; + } + .gcaqjc_bzt_sy_SY09{ + left: 843px; + top: 487px; + } + .gcaqjc_bzt_sy_SY10{ + left: 370px; + top: 421px; + } + .gcaqjc_bzt_sy_SY11{ + left: 638px; + top: 434px; + } + .gcaqjc_bzt_sy_SY12{ + left: 875px; + top: 417px; + } + .gcaqjc_bzt_sy_SY13{ + left: 370px; + top: 480px; + } + .gcaqjc_bzt_sy_SY14{ + left: 639px; + top: 491px; + } + .gcaqjc_bzt_sy_SY15{ + left: 878px; + top: 484px; } - .gcaqjc_bzt_sl_SL01{ - left: 479px; - top: 594px; + .gcaqjc_bzt_wy_WY-01{ + left: 192px; + top: 378px; + } + .gcaqjc_bzt_wy_WY-02{ + left: 293px; + top: 385px; + } + .gcaqjc_bzt_wy_WY-03{ + left: 451px; + top: 396px; + } + .gcaqjc_bzt_wy_WY-04{ + left: 561px; + top: 404px; + } + .gcaqjc_bzt_wy_WY-05{ + left: 699px; + top: 400px; + } + .gcaqjc_bzt_wy_WY-07{ + left: 943px; + top: 410px; + } + .gcaqjc_bzt_wy_WY-08{ + left: 192px; + top: 408px; + } + .gcaqjc_bzt_wy_WY-09{ + left: 293px; + top: 415px; + } + .gcaqjc_bzt_wy_WY-10{ + left: 451px; + top: 426px; + } + .gcaqjc_bzt_wy_WY-11{ + left: 561px; + top: 434px; + } + .gcaqjc_bzt_wy_WY-12{ + left: 699px; + top: 433px; + } + .gcaqjc_bzt_wy_WY-14{ + left: 943px; + top: 438px; + } + .gcaqjc_bzt_wy_WY-15{ + left: 192px; + top: 438px; + } + .gcaqjc_bzt_wy_WY-16{ + left: 293px; + top: 445px; + } + .gcaqjc_bzt_wy_WY-17{ + left: 451px; + top: 456px; + } + .gcaqjc_bzt_wy_WY-18{ + left: 561px; + top: 464px; + } + .gcaqjc_bzt_wy_WY-19{ + left: 699px; + top: 460px; + } + .gcaqjc_bzt_wy_WY-21{ + left: 943px; + top: 474px; + } + .gcaqjc_bzt_wy_WY-22{ + left: 192px; + top: 538px; + } + .gcaqjc_bzt_wy_WY-23{ + left: 345px; + top: 551px; + } + .gcaqjc_bzt_wy_WY-24{ + left: 449px; + top: 563px; + } + .gcaqjc_bzt_wy_WY-25{ + left: 565px; + top: 574px; + } + .gcaqjc_bzt_wy_WY-26{ + left: 710px; + top: 560px; + } + .gcaqjc_bzt_wy_WY-27{ + left: 839px; + top: 555px; } - .gcaqjc_bzt_sl_SL02{ - left: 679px; - top: 594px; - } - .gcaqjc_bzt_wy_WY-G100{ - left: 394px; - top: 376px; - } - .gcaqjc_bzt_wy_WY-G101{ - left: 594px; - top: 376px; - } - .gcaqjc_bzt_dm_DM0234205820000010{ - left: 655px; - top: 379px; - } - .gcaqjc_bzt_dm_DM0234205820000011{ - left: 555px; - top: 379px; - } - .gcaqjc_bzt_dm_DM0234205820000012{ - left: 455px; - top: 379px; - } - .gcaqjc_bzt_dm_DM0234205820000013{ - left: 1003px; - top: 379px; - } - .gcaqjc_bzt_dm_DM0234205820000014{ - left: 42px; - top: 379px; - } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + // .gcaqjc_bzt_sl_SL01{ + // left: 479px; + // top: 594px; + // } + + // .gcaqjc_bzt_sl_SL02{ + // left: 679px; + // top: 594px; + // } + + // .gcaqjc_bzt_wy_WY-G100{ + // left: 394px; + // top: 376px; + // } + // .gcaqjc_bzt_wy_WY-G101{ + // left: 594px; + // top: 376px; + // } + + // .gcaqjc_bzt_dm_DM0234205820000010{ + // left: 655px; + // top: 379px; + // } + + // .gcaqjc_bzt_dm_DM0234205820000011{ + // left: 555px; + // top: 379px; + // } + + // .gcaqjc_bzt_dm_DM0234205820000012{ + // left: 455px; + // top: 379px; + // } + + // .gcaqjc_bzt_dm_DM0234205820000013{ + // left: 1003px; + // top: 379px; + // } + + // .gcaqjc_bzt_dm_DM0234205820000014{ + // left: 42px; + // top: 379px; + // } } \ No newline at end of file diff --git a/src/views/gcaqjc/gcaqyj/yjgzpz/form.js b/src/views/gcaqjc/gcaqyj/yjgzpz/form.js index 18bbcf262..32a93410a 100644 --- a/src/views/gcaqjc/gcaqyj/yjgzpz/form.js +++ b/src/views/gcaqjc/gcaqyj/yjgzpz/form.js @@ -137,7 +137,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => { useEffect(()=>{ if (mode !== "save" ) { // getFileInfo(record) - // setCondition("1") + setCondition(record?.condition) setTypes(record.type) } }, [record, mode]) diff --git a/src/views/rcgl/aqgl/fxgkqd/index.js b/src/views/rcgl/aqgl/fxgkqd/index.js index c5287ea72..ceaa0720e 100644 --- a/src/views/rcgl/aqgl/fxgkqd/index.js +++ b/src/views/rcgl/aqgl/fxgkqd/index.js @@ -49,7 +49,7 @@ const Page = () => { title: '可能导致的后果', key: 'result', dataIndex: 'result', width: 250, ellipsis: true,align: 'center', render: (value) => {value ? value.map(item => item.dictNm).join():''} }, - {title: '主要防范措施', key: 'preventMeasure', dataIndex: 'preventMeasure', width: 200,align: 'center',}, + {title: '主要防范措施', key: 'preventMeasure', dataIndex: 'preventMeasure', width: 300,ellipsis: true,align: 'center',}, {title: '创建日期', key: 'createDate', dataIndex: 'createDate', width: 200,align: 'center',}, { title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center', diff --git a/src/views/rcgl/xcxj/xjrw/form.js b/src/views/rcgl/xcxj/xjrw/form.js index bafed5bd2..3b6aa3b07 100644 --- a/src/views/rcgl/xcxj/xjrw/form.js +++ b/src/views/rcgl/xcxj/xjrw/form.js @@ -59,10 +59,12 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { } const onfinish = (values) => { - const userId = localStorage.getItem('userId') + const userId = localStorage.getItem('userId') + const userName = localStorage.getItem('userName') values.startDate = values.startDate?moment(values.startDate).format("YYYY-MM-DD 00:00:00"):'' values.endDate = values.endDate ? moment(values.endDate).format("YYYY-MM-DD 00:00:00") : '' values.createUserId = userId + values.createUserName = userName; values.inspectUserName = deptUserList?.find(item => item.userId == values.inspectUserId)?.nickName values.items = itemParams; if (mode === 'save') { diff --git a/src/views/sq/qzq/gcdsj/index.js b/src/views/sq/qzq/gcdsj/index.js index 40f07e735..5eb10cbc0 100644 --- a/src/views/sq/qzq/gcdsj/index.js +++ b/src/views/sq/qzq/gcdsj/index.js @@ -120,7 +120,7 @@ const viewPdf = (params) => {
{item.eventsDate} -
+
{item.eventsDesc}
附件： diff --git a/src/views/sq/qzq/gcdsj/index.less b/src/views/sq/qzq/gcdsj/index.less index e0bd72879..4f76f2278 100644 --- a/src/views/sq/qzq/gcdsj/index.less +++ b/src/views/sq/qzq/gcdsj/index.less @@ -23,7 +23,7 @@ display: flex; // align-items: center; column-gap: 20px; - .item-right{ + .dsj-item-right{ flex:1 } } diff --git a/src/views/sz/pxjlgl/index.js b/src/views/sz/pxjlgl/index.js index 0e9e7f5ae..9650fe25e 100644 --- a/src/views/sz/pxjlgl/index.js +++ b/src/views/sz/pxjlgl/index.js @@ -166,8 +166,8 @@ const Page = () => { callback={refresh} /> -
- +
+