lishenfeng
/
tsg-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lishenfeng:6988a7afcb8e04d879c446975188ef7fe887c2f1
Branches Tags
lishenfeng:master
lishenfeng:qzc-dev
lishenfeng:qzc-dev-demo
lishenfeng:lsf-dev
..
compare: lishenfeng:68ef68f86708f774abe24864be550a012ca4b312
Branches Tags
lishenfeng:master
lishenfeng:qzc-dev
lishenfeng:qzc-dev-demo
lishenfeng:lsf-dev

No commits in common. "6988a7afcb8e04d879c446975188ef7fe887c2f1" and "68ef68f86708f774abe24864be550a012ca4b312" have entirely different histories.
6988a7afcb ... 68ef68f867

13 changed files with 67 additions and 62 deletions
Show Stats Expand all files Collapse all files

BIN
build.rar
View File

Binary file not shown.

4
src/views/Home/MapCtrl/Pops/XunJian.js
View File

@ -54,9 +54,7 @@ function Wxq({ id, data, dispatch }) {
<Descriptions labelStyle={{padding:"5px 0"}}> <Descriptions labelStyle={{padding:"5px 0"}}>
<Descriptions.Item label="巡查完成日期" span={3} contentStyle={{ padding: "5px 0" }}>{data?.finishTime || detail?.adnm}</Descriptions.Item> <Descriptions.Item label="巡查完成日期" span={3} contentStyle={{ padding: "5px 0" }}>{data?.finishTime || detail?.adnm}</Descriptions.Item>
<Descriptions.Item label="检查人" span={3} contentStyle={{padding:"5px 0"}}>{data?.inspectUserName || detail?.ptcount}</Descriptions.Item> <Descriptions.Item label="检查人" span={3} contentStyle={{padding:"5px 0"}}>{data?.inspectUserName || detail?.ptcount}</Descriptions.Item>
<Descriptions.Item label="任务类型" span={3} contentStyle={{padding:"5px 0"}}> <Descriptions.Item label="任务类型" span={3} contentStyle={{padding:"5px 0"}}>{data?.etcount || detail?.etcount}</Descriptions.Item>
{{0: "日常巡查",1: "特别检查",2: "汛前巡检"}?.[data?.taskType]}
</Descriptions.Item>
<Descriptions.Item label="问题数量" span={3} contentStyle={{padding:"5px 0"}}>{data.problemNum || detail?.htcount}</Descriptions.Item> <Descriptions.Item label="问题数量" span={3} contentStyle={{padding:"5px 0"}}>{data.problemNum || detail?.htcount}</Descriptions.Item>
<Descriptions.Item label="待处理" span={3} contentStyle={{padding:"5px 0"}}>{data.handleNum || detail?.htcount}</Descriptions.Item> <Descriptions.Item label="待处理" span={3} contentStyle={{padding:"5px 0"}}>{data.handleNum || detail?.htcount}</Descriptions.Item>
</Descriptions> </Descriptions>

4
src/views/Home/homePanelsLayoutPage/item_gongshui.js
View File

@ -43,7 +43,7 @@ const Page = () => {
<div className="home_gongshui_item"> <div className="home_gongshui_item">
<div className="home_gongshui_item_title"> <div className="home_gongshui_item_title">
<img width={50} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/gongshui2.png`} alt=""/> <img width={50} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/gongshui2.png`} alt=""/>
灌溉发电 生态供水
</div> </div>
<div className="home_gongshui_item_text" style={{display:'flex',flexDirection:'column'}}> <div className="home_gongshui_item_text" style={{display:'flex',flexDirection:'column'}}>
<div style={{display:'flex'}}> <div style={{display:'flex'}}>
@ -67,7 +67,7 @@ const Page = () => {
<div className="home_gongshui_item"> <div className="home_gongshui_item">
<div className="home_gongshui_item_title"> <div className="home_gongshui_item_title">
<img width={50} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/gongshui1.png`} alt=""/> <img width={50} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/gongshui1.png`} alt=""/>
水厂取水 生活供水
</div> </div>
<div className="home_gongshui_item_text" style={{display:'flex',flexDirection:'column'}}> <div className="home_gongshui_item_text" style={{display:'flex',flexDirection:'column'}}>
<div style={{display:'flex'}}> <div style={{display:'flex'}}>

18
src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js
View File

@ -164,15 +164,15 @@ const Page = ({mySetTms}) => {
onRow={ onRow={
(data)=>({ (data)=>({
onClick:()=>{ onClick:()=>{
data.data = { // data.data = {
"type":"MultiLineString", // "type":"MultiLineString",
"coordinates":[ // "coordinates":[
[ // [
[114.746, 31.479], // [114.746, 31.479],
[114.776, 31.509] // [114.776, 31.509]
] // ]
] // ]
} // }
if(!data.data){ if(!data.data){
message.error('无轨迹信息') message.error('无轨迹信息')
return return

8
src/views/sq/qys/gcys/xlLine/drpOption.js
View File

@ -7,12 +7,14 @@ export default function drpOption({data}) {
const maxValX = Math.max(...data.map(obj => obj.z)) const maxValX = Math.max(...data.map(obj => obj.z))
const minValX = Math.min(...data.map(obj => obj.z)) const minValX = Math.min(...data.map(obj => obj.z))
let arr =[] let arr =[]
data.forEach(item=>{ data.forEach(item=>{
arr.push([item.z,item.q]) console.log(data);
arr.push([item.q,item.z])
}) })
console.log(arr,data.map(o => o.z),'jhsdjkashdjkahjk'); // console.log(GetInterval(minValX,maxValX),'jhsdjkashdjkahjk');
// debugger;
return { return {
toolbox: { toolbox: {
show: true, show: true,

71
src/views/sq/qys/kqys/index.js
View File

@ -20,35 +20,35 @@ const Page = () => {
setUrl(item.img) setUrl(item.img)
} }
useEffect(() => { useEffect(() => {
// let scale = 1 let scale = 1
// const img = document.getElementById("img"); const img = document.getElementById("img");
// const fun = (e) => { const fun = (e) => {
// console.log(1111) console.log(1111)
// // 大于0:滚轮向上滚动 小于0:滚轮向下滚动 // 大于0:滚轮向上滚动 小于0:滚轮向下滚动
// if (e.wheelDelta > 0) { if (e.wheelDelta > 0) {
// scale += 0.05; scale += 0.05;
// img.style.transform = `scale(${scale})`; img.style.transform = `scale(${scale})`;
// } else { } else {
// if (scale == 1) { if (scale == 1) {
// img.style.left = 0 + "px"; img.style.left = 0 + "px";
// img.style.top = 0 + "px"; img.style.top = 0 + "px";
// } }
// // 缩放值大于1时,可以缩小,反之亦然 // 缩放值大于1时,可以缩小,反之亦然
// if (scale > 1) { if (scale > 1) {
// scale -= 0.05; scale -= 0.05;
// img.style.transform = `scale(${scale})`; img.style.transform = `scale(${scale})`;
// } }
// } }
// } }
// img.addEventListener("wheel", fun) img.addEventListener("wheel", fun)
// // getSyData() // getSyData()
// // getSlData() // getSlData()
// // getWyData() // getWyData()
// // getDmData() // getDmData()
// return () => { return () => {
// img.removeEventListener("wheel", fun) img.removeEventListener("wheel", fun)
// } }
}, []) }, [])
return ( return (
@ -56,9 +56,20 @@ const Page = () => {
<div style={{ display: 'flex', justifyContent: 'start', alignItems: 'center', padding: 10 }}> <div style={{ display: 'flex', justifyContent: 'start', alignItems: 'center', padding: 10 }}>
{list.map(item => <div className={url == item.img ? stylesCss.active : stylesCss.tabCheck} onClick={() => tabClick(item)}>{item.name}</div>)} {list.map(item => <div className={url == item.img ? stylesCss.active : stylesCss.tabCheck} onClick={() => tabClick(item)}>{item.name}</div>)}
</div> </div>
<div style={{height: 'calc(100% - 60px)',textAlign:'center',padding:20,overflow:'auto'}}> <Rnd
<Image src={url} width='80%' preview={false} /> default={{
x: 200,
y: 60,
width: '80%',
height: 'calc(100% - 200px)'
}}
>
<div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', width:'72%',height:'98%',}}>
<Image src={url} id="img" style={{margin:'auto',margin:'20px',height:'750px'}} preview={false} />
</div> </div>
</Rnd>
</div> </div>
) )
} }

2
src/views/sq/qys/xyys/index.js
View File

@ -25,7 +25,7 @@ const Page = () => {
<div className={styles.title}> <div className={styles.title}>
<Image src={title} />转移路线示意图 <Image src={title} />转移路线示意图
</div> </div>
<div style={{height: 'calc(100% - 40px)',textAlign:'center'}}> <div style={{display:'flex',justifyContent:'center',height: 'calc(100% - 40px)',alignItems:'center'}}>
<Image src={zd} width='80%' preview={false} /> <Image src={zd} width='80%' preview={false} />
</div> </div>

3
src/views/sq/qys/xyys/index.module.less
View File

@ -2,8 +2,7 @@
font-size: 16px; font-size: 16px;
color: #000000; color: #000000;
// width: 112px; // width: 112px;
height: 32px; height: 32px
margin-bottom:20px;
} }
.content{ .content{
font-size: 17px; font-size: 17px;

4
src/views/sz/flfg/index.js
View File

@ -12,7 +12,6 @@ import { CrudOpRender_text } from '../../../components/crud/CrudOpRender';
import { render } from 'react-dom'; import { render } from 'react-dom';
import { httpgetExport } from '../../../utils/request'; import { httpgetExport } from '../../../utils/request';
import { exportFile } from '../../../utils/tools'; import { exportFile } from '../../../utils/tools';
import dayjs from 'dayjs';
const url = "http://223.75.53.141:9102/test.by-lyf.tmp" const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
const typeOb={0:'宪法',1:'法律',2:'行政法规',3:'督察法规',4:'司法解释',5:'地方性法规'} const typeOb={0:'宪法',1:'法律',2:'行政法规',3:'督察法规',4:'司法解释',5:'地方性法规'}
@ -43,8 +42,7 @@ const Page = () => {
</> </>
}, },
{ {
title: '公布日期', key: 'announcementDate', dataIndex: 'announcementDate', title: '公布日期', key: 'announcementDate', dataIndex: 'announcementDate'
render: (value) => <span>{dayjs(value).format('YYYY-MM-DD')}</span>,
}, },
{ {
title: '施行日期', key: 'implementationDate', dataIndex: 'implementationDate' title: '施行日期', key: 'implementationDate', dataIndex: 'implementationDate'

3
src/views/sz/szzf/ajdj/index.js
View File

@ -30,7 +30,7 @@ const Page = () => {
const [isFetch, setIsFetch] = useState(false) const [isFetch, setIsFetch] = useState(false)
const columns = [ const columns = [
{ title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" }, { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
{ title: '填报时间', key: 'createTime', dataIndex: 'createTime', ellipsis: true,render: (value) => <span>{dayjs(value).format('YYYY-MM-DD HH:mm')}</span>, }, { title: '填报时间', key: 'createTime', dataIndex: 'createTime', ellipsis: true },
{ {
title: '案件名称', key: 'caseName', dataIndex: 'caseName', title: '案件名称', key: 'caseName', dataIndex: 'caseName',
}, },
@ -40,7 +40,6 @@ const Page = () => {
}, },
{ {
title: '发现时间', key: 'caseDate', dataIndex: 'caseDate', title: '发现时间', key: 'caseDate', dataIndex: 'caseDate',
render: (value) => <span>{dayjs(value).format('YYYY-MM-DD')}</span>,
}, },
{ {

2
src/views/sz/szzf/ajtj/ldCharts.js
View File

@ -39,7 +39,7 @@ const Page = ({ title = '标题' }) => {
}, },
radiusAxis: { radiusAxis: {
min:MaxMin.min-1, min:0,
max:MaxMin.max, max:MaxMin.max,
interval: 1, interval: 1,
// // 刻度 // // 刻度

4
src/views/sz/zdgl/index.js
View File

@ -11,7 +11,6 @@ import { createCrudService } from '../../../components/crud/_';
import { CrudOpRender_text } from '../../../components/crud/CrudOpRender'; import { CrudOpRender_text } from '../../../components/crud/CrudOpRender';
import { httpgetExport } from '../../../utils/request'; import { httpgetExport } from '../../../utils/request';
import { exportFile } from '../../../utils/tools'; import { exportFile } from '../../../utils/tools';
import dayjs from 'dayjs';
const url = "http://223.75.53.141:9102/test.by-lyf.tmp" const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
const obj={0:"党支部工作制度",1:"行政工作制度",2:"部门工作制度",3:"安全管理制度",4:"工程管理制度",5:"技术规程",6:"岗位责任制"} const obj={0:"党支部工作制度",1:"行政工作制度",2:"部门工作制度",3:"安全管理制度",4:"工程管理制度",5:"技术规程",6:"岗位责任制"}
@ -32,8 +31,7 @@ const Page = () => {
title: '制度类型', key: 'type', dataIndex: 'type',render:(v)=><>{obj[v]}</> title: '制度类型', key: 'type', dataIndex: 'type',render:(v)=><>{obj[v]}</>
}, },
{ {
title: '发布日期', key: 'releaseDate', dataIndex: 'releaseDate', title: '发布日期', key: 'releaseDate', dataIndex: 'releaseDate'
render: (value) => <span>{dayjs(value).format('YYYY-MM-DD')}</span>,
}, },
{ {
title: '发布单位', key: 'fillUnit', dataIndex: 'fillUnit' title: '发布单位', key: 'fillUnit', dataIndex: 'fillUnit'

2
src/views/szydd/ddjl/form.js
View File

@ -76,7 +76,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
if (mode === 'edit') { if (mode === 'edit') {
values.files = oldFiles; values.files = oldFiles;
values.id = record.id; values.id = record.id;
values.createTime = record.createTime; // values.opUserId = record.opUserId;
onEdit(apiurl.ddjl.edit,values) onEdit(apiurl.ddjl.edit,values)
} }
if (mode === 'save') { if (mode === 'save') {