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

Merge branch 'master' of http://10.0.41.100:3000/lishenfeng/tsg-web

lsf-dev
xielei 2024-10-18 18:02:37 +08:00
parent 460368786c cae47fb0e8
commit d16d881828
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,9 @@ 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"}}>{data?.etcount || detail?.etcount}</Descriptions.Item> <Descriptions.Item label="任务类型" span={3} contentStyle={{padding:"5px 0"}}>
{{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

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.opUserId = record.opUserId; values.createTime = record.createTime;
onEdit(apiurl.ddjl.edit,values) onEdit(apiurl.ddjl.edit,values)
} }
if (mode === 'save') { if (mode === 'save') {