From cac56cfeb343eab7cd7b35b7ebe2e8d5827cc363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98lijianhao=E2=80=99?= Date: Thu, 28 Jul 2022 11:04:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/organization/components/depModal.js | 4 +++- web/client/src/sections/organization/containers/user.js | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/web/client/src/sections/organization/components/depModal.js b/web/client/src/sections/organization/components/depModal.js index 8f6d7471..1a8417df 100644 --- a/web/client/src/sections/organization/components/depModal.js +++ b/web/client/src/sections/organization/components/depModal.js @@ -7,11 +7,13 @@ const DepModal = (props) => { const { visible, onVisibleChange, onConfirm, depModalType, depData, data } = props; const formRef = useRef(); const onFinish = (values) => { + console.log('values:',values); if (onConfirm) { if (depModalType === 'edit') { let value = { name: values.name, - depId: data.id + depId: data.id, + dependence:values.dependence } onConfirm(value) } else { diff --git a/web/client/src/sections/organization/containers/user.js b/web/client/src/sections/organization/containers/user.js index f5ac9ac9..b32dffc2 100644 --- a/web/client/src/sections/organization/containers/user.js +++ b/web/client/src/sections/organization/containers/user.js @@ -168,7 +168,10 @@ const UserManage = (props) => { } //部门新增及编辑 const onDepConfirm = (data) => { + console.log('depModalType:',depModalType); + console.log('data:',data); if (depModalType == 'edit') { + dispatch(updateDep(data)).then(res => { if (res.success) { setDepModalVisible(false); From bbfbd67132f54ce23b9dbba1515ea511d1e3ccdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98lijianhao=E2=80=99?= Date: Thu, 28 Jul 2022 11:05:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E9=99=A4log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/organization/components/depModal.js | 1 - 1 file changed, 1 deletion(-) diff --git a/web/client/src/sections/organization/components/depModal.js b/web/client/src/sections/organization/components/depModal.js index 1a8417df..efb14b30 100644 --- a/web/client/src/sections/organization/components/depModal.js +++ b/web/client/src/sections/organization/components/depModal.js @@ -7,7 +7,6 @@ const DepModal = (props) => { const { visible, onVisibleChange, onConfirm, depModalType, depData, data } = props; const formRef = useRef(); const onFinish = (values) => { - console.log('values:',values); if (onConfirm) { if (depModalType === 'edit') { let value = { From 3802e8501201a16cecc2cf7ed4b5e8b566dc2931 Mon Sep 17 00:00:00 2001 From: dengyinhuan Date: Thu, 28 Jul 2022 11:07:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E9=99=A4log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sections/quanju/containers/footer/build/Leftbottom.js | 4 ++-- .../sections/quanju/containers/footer/build/Rightcenter.js | 4 ++-- .../src/sections/quanju/containers/footer/build/index.js | 2 +- .../src/sections/quanju/containers/footer/guanli/index.js | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/web/client/src/sections/quanju/containers/footer/build/Leftbottom.js b/web/client/src/sections/quanju/containers/footer/build/Leftbottom.js index 3e9123ff..396b74bb 100644 --- a/web/client/src/sections/quanju/containers/footer/build/Leftbottom.js +++ b/web/client/src/sections/quanju/containers/footer/build/Leftbottom.js @@ -24,8 +24,8 @@ function Leftbottom(props) { const chartTitle = '道路总公里'; const title = '基础设施安全监测版块'; let name = [], emptyName = [] - console.log(data,'传入的值') - console.log(emptyName,'第二个') + // console.log(data,'传入的值') + // console.log(emptyName,'第二个') // const name = data?.map(d) data?.forEach(d => { name.push(d.name) diff --git a/web/client/src/sections/quanju/containers/footer/build/Rightcenter.js b/web/client/src/sections/quanju/containers/footer/build/Rightcenter.js index ad0ac359..8c62e979 100644 --- a/web/client/src/sections/quanju/containers/footer/build/Rightcenter.js +++ b/web/client/src/sections/quanju/containers/footer/build/Rightcenter.js @@ -27,7 +27,7 @@ const THIRD = "linear-gradient(360deg, rgba(148, 148, 255, 0.1) 0%, rgba(148, 14 const OTHER = "linear-gradient(360deg, rgba(28, 96, 253, 0) 0%, rgba(28, 96, 253, 0.2) 100%)" let TOTALS = data?.map(({ name, total }, index) => { let max = Math.max(...data.map(item=>item.total)) - console.log(data.map(item=>item.total),'好朋友吗') + // console.log(data.map(item=>item.total),'好朋友吗') return { name, value: total, @@ -38,7 +38,7 @@ let new_TOTALS = TOTALS && TOTALS.length > 10 ? TOTALS.slice(0, 10) : TOTALS function Cell(props) { const { name, rank, value, percent, style = {},cebg } = props let bg = RNAKS[rank] || OTHER - console.log(percent,'百分比') + // console.log(percent,'百分比') return
{ // setdata(alltype.filter(item=>item.name!=='null')) setxuandata(res.payload.data) - console.log(res.payload.data,'宣传栏数据') + // console.log(res.payload.data,'宣传栏数据') } let t1 = Object.values(buildingnumber?.townRoad || {}) diff --git a/web/client/src/sections/quanju/containers/footer/guanli/index.js b/web/client/src/sections/quanju/containers/footer/guanli/index.js index 631b4f00..8942a4d1 100644 --- a/web/client/src/sections/quanju/containers/footer/guanli/index.js +++ b/web/client/src/sections/quanju/containers/footer/guanli/index.js @@ -39,14 +39,14 @@ const Guanli = (props) => { return item.processingTime = `${(item.processingTime.match(/^([^.]*)(.[^.]*)/)[0])}.0${parseInt(item.processingTime.match(/([^.]*)$/)[0])}` } // console.log(d3,'好评') - console.log(item.processingTime.match(/([^.]*)$/)[0],'kk') + // console.log(item.processingTime.match(/([^.]*)$/)[0],'kk') }) d.sort((a, b) => b.processingTime.localeCompare(a.processingTime)) setrightDatas(res.payload.data) setrightitemlist(d) - console.log(d,'对比的数据') + // console.log(d,'对比的数据') // console.log(d2,'完美') - console.log(res.payload.data,'嘿嘿嘿') + // console.log(res.payload.data,'嘿嘿嘿') } useEffect(()=>{ requestleftDatas();