From dcdd7bc7f9df40a6d0d3f8427bd1dcf87cb55363 Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Fri, 8 May 2026 14:30:49 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/FullOther/ClassBuild.js | 4 ++-- src/layout/FullOther/DangerJob.js | 13 ++++++++++++- src/layout/FullOther/HiddenSolve.js | 22 ++++++++++------------ src/layout/FullOther/HomeContent.js | 23 +++++++++++------------ src/layout/FullOther/RiskControl.js | 15 +++++++-------- src/layout/FullOther/TrainingContent.js | 22 ++++++++++++++-------- src/layout/FullScreenInter.js | 2 +- 7 files changed, 57 insertions(+), 44 deletions(-) diff --git a/src/layout/FullOther/ClassBuild.js b/src/layout/FullOther/ClassBuild.js index 293ffd6..6d011a7 100644 --- a/src/layout/FullOther/ClassBuild.js +++ b/src/layout/FullOther/ClassBuild.js @@ -70,8 +70,8 @@ class ClassBuild extends React.Component { } // 注意：数据结构是 { companyName: '邦泰', rate: '52%' } - const companyNames = companyList.map((item) => item.companyName); - const rates = companyList.map((item) => { + const companyNames = companyList?.map((item) => item.companyName); + const rates = companyList?.map((item) => { // 处理 rate 可能是字符串带百分号的情况 const rateValue = typeof item.rate === 'string' ? parseFloat(item.rate.replace('%', '')) : item.rate; return isNaN(rateValue) ? 0 : rateValue; diff --git a/src/layout/FullOther/DangerJob.js b/src/layout/FullOther/DangerJob.js index 348588b..27468a8 100644 --- a/src/layout/FullOther/DangerJob.js +++ b/src/layout/FullOther/DangerJob.js @@ -102,7 +102,18 @@ class DangerJob extends React.Component { companyName = selectedCompanyObj?.NAME || ''; } return ( -
+
{selectedCompany ? `${companyName}暂无危险作业数据` : '暂无危险作业数据'}
); diff --git a/src/layout/FullOther/HiddenSolve.js b/src/layout/FullOther/HiddenSolve.js index 18815e1..77f0b6a 100644 --- a/src/layout/FullOther/HiddenSolve.js +++ b/src/layout/FullOther/HiddenSolve.js @@ -122,18 +122,17 @@ class HiddenSolve extends React.Component { }, legend: { data: ['重大隐患', '一般隐患'], - orient: 'vertical', right: '3%', - top: '5%', - itemGap: 16, - itemWidth: 18, - itemHeight: 12, - textStyle: { color: '#000', fontSize: 14 }, + top: '10%', + itemGap: 12, + itemWidth: 16, + itemHeight: 10, + textStyle: { color: '#000', fontSize: 12 }, }, grid: { left: '8%', right: '5%', - top: '18%', + top: '28%', bottom: '8%', containLabel: true, }, @@ -275,18 +274,17 @@ class HiddenSolve extends React.Component { }, legend: { data: ['重大隐患量', '重大隐患未整改量', '一般隐患量', '一般隐患未整改量'], - orient: 'vertical', right: '3%', - top: '5%', + top: '10%', itemGap: 12, - itemWidth: 18, - itemHeight: 12, + itemWidth: 16, + itemHeight: 10, textStyle: { color: '#000', fontSize: 12 }, }, grid: { left: '8%', right: '5%', - top: '18%', + top: '28%', bottom: '8%', containLabel: true, }, diff --git a/src/layout/FullOther/HomeContent.js b/src/layout/FullOther/HomeContent.js index b49b45c..3bff94c 100644 --- a/src/layout/FullOther/HomeContent.js +++ b/src/layout/FullOther/HomeContent.js @@ -92,7 +92,7 @@ class HomeContent extends React.Component { label: { show: true, position: 'inside', - formatter: '{a|{b}：{c}}\n\n\n{e|({d}%)}', // 添加 \n 换行符 + formatter: '{d}%', // 添加 \n 换行符 color: '#000', textBorderWidth: 0, rich: { @@ -194,7 +194,7 @@ class HomeContent extends React.Component { }, legend: { data: legendData, - right: 0, + right: '3%', top: '10%', itemGap: 12, itemWidth: 16, @@ -405,7 +405,7 @@ class HomeContent extends React.Component { this.echartsInstances.backLogChart = echarts.init(backLogCharts); this.echartsInstances.backLogChart.setOption({ title: { - text: '当月工作培训统计数量', + text: '当月培训统计数量', x: 'center', y: '25%', textStyle: { fontSize: 16, color: '#999' }, @@ -428,7 +428,7 @@ class HomeContent extends React.Component { const option = { title: { - text: '当月工作培训统计数量', + text: '当月培训统计数量', x: 'center', y: '5%', textStyle: { fontSize: 16, color: '#000' }, @@ -446,18 +446,17 @@ class HomeContent extends React.Component { }, legend: { data: ['培训人次', '培训场次'], - orient: 'vertical', - right: 0, - top: 'middle', - itemGap: 16, - itemWidth: 18, - itemHeight: 12, - textStyle: { color: '#000', fontSize: 14 }, + right: '3%', + top: '10%', + itemGap: 12, + itemWidth: 16, + itemHeight: 10, + textStyle: { color: '#000', fontSize: 12 }, }, grid: { left: '5%', right: '5%', - top: '18%', + top: '28%', bottom: '5%', containLabel: true, }, diff --git a/src/layout/FullOther/RiskControl.js b/src/layout/FullOther/RiskControl.js index 0667af8..f07baae 100644 --- a/src/layout/FullOther/RiskControl.js +++ b/src/layout/FullOther/RiskControl.js @@ -96,18 +96,17 @@ class RiskControl extends React.Component { }, legend: { data: ['重大风险', '较大风险', '一般风险', '低风险'], - orient: 'vertical', right: '3%', - top: '5%', - itemGap: 16, - itemWidth: 18, - itemHeight: 12, - textStyle: { color: '#000', fontSize: 14 }, + top: '10%', + itemGap: 12, + itemWidth: 16, + itemHeight: 10, + textStyle: { color: '#000', fontSize: 12 }, }, grid: { left: '8%', right: '5%', - top: '18%', + top: '28%', bottom: '8%', containLabel: true, }, @@ -281,7 +280,7 @@ class RiskControl extends React.Component { axisTick: { show: false }, axisLabel: { textStyle: { color: '#000' }, - // rotate: typeNames.length > 4 ? 15 : 0, + rotate: typeNames.length > 4 ? 15 : 0, interval: 0, fontSize: 12, }, diff --git a/src/layout/FullOther/TrainingContent.js b/src/layout/FullOther/TrainingContent.js index 5c8bcbf..21f4291 100644 --- a/src/layout/FullOther/TrainingContent.js +++ b/src/layout/FullOther/TrainingContent.js @@ -98,7 +98,7 @@ class TrainingContent extends React.Component { legend: { data: ['培训人次', '培训场次'], right: '3%', // 靠右 - top: '5%', // 垂直居中 + top: '10%', // 垂直居中 itemGap: 16, itemWidth: 18, itemHeight: 12, @@ -107,7 +107,7 @@ class TrainingContent extends React.Component { grid: { left: '5%', right: '5%', // 为右侧垂直图例留出空间 - top: '18%', + top: '28%', bottom: '8%', containLabel: true, }, @@ -267,7 +267,7 @@ class TrainingContent extends React.Component { legend: { data: ['培训人次', '培训场次'], right: '3%', // 靠右 - top: '5%', // 垂直居中 + top: '10%', // 垂直居中 itemGap: 16, itemWidth: 18, itemHeight: 12, @@ -276,7 +276,7 @@ class TrainingContent extends React.Component { grid: { left: '5%', right: '5%', // 为右侧垂直图例留出空间 - top: '18%', + top: '28%', bottom: '8%', containLabel: true, }, @@ -416,7 +416,7 @@ class TrainingContent extends React.Component { legend: { data: ['培训人次', '培训场次'], right: '3%', // 靠右 - top: '5%', // 垂直居中 + top: '10%', // 垂直居中 itemGap: 16, itemWidth: 18, itemHeight: 12, @@ -425,7 +425,7 @@ class TrainingContent extends React.Component { grid: { left: '5%', right: '5%', // 为右侧垂直图例留出空间 - top: '18%', + top: '28%', bottom: '8%', containLabel: true, }, @@ -512,6 +512,8 @@ class TrainingContent extends React.Component { const headers = trainingSubIDCard[0] || []; // 数据行（从第二行开始） const dataRows = trainingSubIDCard.slice(1); + // 生成稳定的 key，当数据变化时强制重新创建表格 + const tableKey = `${headers.join('-')}-${dataRows.length}`; // 计算每列的最小宽度（根据表头文字长度） const getColumnWidth = (header) => { const chineseCharWidth = 14; // 中文字符宽度(px) @@ -530,7 +532,7 @@ class TrainingContent extends React.Component { key: `col${index}`, align: 'center', width: getColumnWidth(header), - fixed: index === 0 ? 'left' : index === headers.length - 1 ? 'right' : undefined, + fixed: index === 0 ? 'left' : undefined, render: (text) => { if (header === '小计') { return {text}; @@ -553,11 +555,12 @@ class TrainingContent extends React.Component { }); // 横向滚动配置（当列数过多时） - const scrollConfig = columns.length > 10 ? { x: columns.length * 100, y: 380 } : { y: 380 }; + const scrollConfig = { x: columns.length * 100, y: 380 }; return (
Date: Fri, 8 May 2026 17:08:36 +0800 Subject: [PATCH 2/9] 1 --- src/layout/FullOther/HomeContent.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/layout/FullOther/HomeContent.js b/src/layout/FullOther/HomeContent.js index 3bff94c..0441520 100644 --- a/src/layout/FullOther/HomeContent.js +++ b/src/layout/FullOther/HomeContent.js @@ -703,7 +703,7 @@ class HomeContent extends React.Component { if (!currentAnnouncement) return null; - const { TITLE, ABSTRACT, START, END, CONTENT, Nav_Files = [] } = currentAnnouncement; + const { TITLE, ABSTRACT, START, END, CONTENT, CREATE_USER_NAME, Nav_Files = [] } = currentAnnouncement; return (
@@ -728,7 +728,8 @@ class HomeContent extends React.Component { {/* 日期 */}
- {START} 至 {END} + {START ? START : '--'} 至 {END ? END : '--'} + {CREATE_USER_NAME ? CREATE_USER_NAME : ''}
{/* 分割线 */} @@ -861,7 +862,7 @@ class HomeContent extends React.Component {
年度隐患数据
-
年度重大隐患数
+
年度重大隐患数量
{hiddenSummary.majorQty}
From 86e6fdb3e5d9a12f6e4f9b73d7434904aa7ed1a1 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Sat, 9 May 2026 16:09:34 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=B8=89=E7=BA=A7=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E6=95=99=E8=82=B2=20=E6=98=BE=E7=A4=BA=20=E5=9F=B9=E8=AE=AD?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E3=80=81=E5=9F=B9=E8=AE=AD=E8=80=81=E5=B8=88?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=20=E6=A0=87=E8=AF=AD=20=E9=9D=99=E9=BB=98?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E6=A0=87=E8=AF=AD=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomPages/SE/SE061ShowPrint.js | 9 +++++---- src/files/edit/PF155.js | 7 ++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/components/CustomPages/SE/SE061ShowPrint.js b/src/components/CustomPages/SE/SE061ShowPrint.js index 69d61ac..5daf395 100644 --- a/src/components/CustomPages/SE/SE061ShowPrint.js +++ b/src/components/CustomPages/SE/SE061ShowPrint.js @@ -1,6 +1,6 @@ import { Button, Descriptions, Modal, Popconfirm, Row, Col, Form, Input, Select, Table, Icon } from 'antd'; import React from 'react'; -import { initFilter, extendRule, extendInclude, setDataFieldValue, showApprove, guid, initQueryFilter, GetFileModel, showFiles } from '../../../utils/common'; +import { initFilter, extendRule, extendInclude, setDataFieldValue, showApprove, guid, initQueryFilter, GetFileModel, showFiles, getArryPropShow } from '../../../utils/common'; import ReactToPrint from 'react-to-print'; import { ExportToExcel } from '@woowalker/feui' import XLSX from 'xlsx'; @@ -103,6 +103,7 @@ class SE061ShowPrint extends React.Component { extendInclude(json, 'Nav_Department') extendInclude(json, 'Nav_User') extendInclude(json, 'Nav_Content') + extendInclude(json, 'Nav_Teachers.Nav_User') extendInclude(json, 'Nav_Files.Nav_ImgFile') extendInclude(json, 'Nav_NewUserDetail.Nav_User') extendInclude(json, 'Nav_NewUserDetail.Nav_Department') @@ -140,7 +141,7 @@ class SE061ShowPrint extends React.Component {
(this.componentRef = el)} style={{ padding: '20px', paddingTop: '20px' }} id={'tableId' + this.props.data.id}>

三级安全教育记录

{ - data ?
+ data ?
{data.Nav_Department.NAME} {data.Nav_User.NAME} @@ -149,8 +150,8 @@ class SE061ShowPrint extends React.Component { {data.END_TIME} {data.TRAINNING_TIME} {data.TAINNING_ADDR} - {data.TEACHER} - {data ? this.returnModel(data.TRAIN_MODEL) : null} + {getArryPropShow(data.Nav_Teachers, "Nav_User.NAME")} + {enums.TrainType.enums[data.TRAINTYPE]} {data.Nav_Content.NAME} {showFiles(data.Nav_Files, config.picServerHost, this)} {data.IS_CREATETEST ? "是" : "否"} diff --git a/src/files/edit/PF155.js b/src/files/edit/PF155.js index 5242924..11c90e8 100644 --- a/src/files/edit/PF155.js +++ b/src/files/edit/PF155.js @@ -38,7 +38,12 @@ export default { onBlur={(editorState) => { const htmlContent = editorState.toHTML(); if (params.record.TITLE != htmlContent) { - params.setFieldValue('TITLE', htmlContent); + var plainText = htmlContent.replace(/<[^>]+>/g, ''); + const temps = []; + temps.push({ field: 'TITLE', value: htmlContent }) + temps.push({ field: 'TITLE_SHOW', value: plainText }) + params.setFieldValueByBatch(temps); + // params.setFieldValue('TITLE', htmlContent); } }} placeholder={placeholder} From 7725b0f1fce3512ec1574ac407970f2ed726b7ec Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Sat, 9 May 2026 17:12:28 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=92=AD=E6=94=BE=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=B8=8E=E5=85=B3?= =?UTF-8?q?=E8=81=94=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/files/edit/PF159.js | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/files/edit/PF159.js b/src/files/edit/PF159.js index cea51b3..9addf43 100644 --- a/src/files/edit/PF159.js +++ b/src/files/edit/PF159.js @@ -1,3 +1,4 @@ +import { message } from "antd/lib/index"; import React, { useState } from 'react'; import { Form, Col } from 'antd' import { extendInclude, extendRule, initFilter } from "../../utils/common"; @@ -9,12 +10,29 @@ import 'braft-editor/dist/index.css'; */ export default { - onBeforeEdit: ({ isNew, login, stateData }) => { + onBeforeEdit: ({ isNew, login, stateData, setFieldValue }) => { if (isNew) { stateData.STATUS = 0 + setFieldValue('V_ISSHOWCONTROL', true); } }, onBeforeSaveHandleRecord(params) { params.record.STATUS = params.customParams + }, + onChange: ({ value, colInfo, getFieldValue, setFieldVisible, setFieldValue, setFieldEditable, stateData }) => { + if (colInfo.FIELD_NAME == 'V_ISAUTO') { + if (value == true) { + setFieldValue('V_ISSILENT', true); + setFieldEditable('V_ISSILENT', false); + } else { + setFieldEditable('V_ISSILENT', true); + } + } else if (colInfo.FIELD_NAME == 'V_ISSHOWCONTROL') { + if (value == false) { + if (stateData.V_ISAUTO == undefined || stateData.V_ISAUTO == false) { + message.warn("必须自动才能不显示控制器"); + } + } + } } }; \ No newline at end of file From 248d4e6f000e19efe3b5e6f1fd838a2853deae5c Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Mon, 11 May 2026 09:27:49 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/FullOther/HomeContent.js | 52 ++++++----------------------- src/layout/FullScreenInter.js | 2 +- 2 files changed, 12 insertions(+), 42 deletions(-) diff --git a/src/layout/FullOther/HomeContent.js b/src/layout/FullOther/HomeContent.js index 0441520..b7f055a 100644 --- a/src/layout/FullOther/HomeContent.js +++ b/src/layout/FullOther/HomeContent.js @@ -7,7 +7,8 @@ import echarts from 'echarts'; import configc from '../../config'; import 'slick-carousel/slick/slick.css'; import 'slick-carousel/slick/slick-theme.css'; -import { extendRule } from '../../utils/common'; +import { extendRule, showFileModal, showFiles, GetFileModel } from '../../utils/common'; +import FormPage from '../../components/FormPage'; class HomeContent extends React.Component { constructor(props) { @@ -22,6 +23,12 @@ class HomeContent extends React.Component { this.chartResizeHandlers = {}; this.isUnmounted = false; this.autoplayTimer = null; + this.state = { + fileForm: { + title: '', + visible: false, + }, + }; } waitForElement = (elementId, maxRetries = 10) => { @@ -753,46 +760,9 @@ class HomeContent extends React.Component {
附件 ({Nav_Files.length}个)
-
- {Nav_Files.map((file, index) => ( -
- - - {file.Nav_ImgFile?.FILE_NAME || '未知文件'} - -
- - -
-
- ))} -
+ {showFiles(Nav_Files, configc.picServerHost, this)} + {GetFileModel(Modal, FormPage, this, this.state.fileForm.visible)} +
)}
diff --git a/src/layout/FullScreenInter.js b/src/layout/FullScreenInter.js index 67c9945..3a184d9 100644 --- a/src/layout/FullScreenInter.js +++ b/src/layout/FullScreenInter.js @@ -170,7 +170,7 @@ class FullScreen extends React.Component { this.props.dispatch({ type: 'app/getDataByPost', payload: json, - url: 'PF/Annourcement/Get', + url: 'PF/PFAnnourcement/Get', onComplete: (ret) => { if (ret && !this.isUnmounted) { this.setState({ From 3f8852e51489290ce240b2239d07d73c0ccbb20a Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Mon, 11 May 2026 17:23:26 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=B8=89=E7=BA=A7=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E6=95=99=E8=82=B2=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2=E5=AE=8C?= =?UTF-8?q?=E5=96=84=20=E8=AF=95=E9=A2=98=20=E6=98=AF=E9=9D=9E=E9=A2=98=20?= =?UTF-8?q?=20=E3=80=90=E6=AD=A3=E7=A1=AE=E3=80=91=E3=80=90=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E3=80=91=20=E4=B8=8E=E5=AF=BC=E5=85=A5=E3=80=81?= =?UTF-8?q?=E7=AD=94=E9=A2=98=20=E6=98=BE=E7=A4=BA=E4=BF=9D=E6=8C=81?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomPages/SE/SE001EditPage.js | 4 +-- .../CustomPages/SE/SE061ShowPrint.js | 30 ++++++++++--------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/components/CustomPages/SE/SE001EditPage.js b/src/components/CustomPages/SE/SE001EditPage.js index a8cfc74..39ee028 100644 --- a/src/components/CustomPages/SE/SE001EditPage.js +++ b/src/components/CustomPages/SE/SE001EditPage.js @@ -511,8 +511,8 @@ class SE001EditPage extends React.Component { ANSWER: value }); }}> - - + + ) } diff --git a/src/components/CustomPages/SE/SE061ShowPrint.js b/src/components/CustomPages/SE/SE061ShowPrint.js index 5daf395..71b478f 100644 --- a/src/components/CustomPages/SE/SE061ShowPrint.js +++ b/src/components/CustomPages/SE/SE061ShowPrint.js @@ -153,7 +153,7 @@ class SE061ShowPrint extends React.Component { {getArryPropShow(data.Nav_Teachers, "Nav_User.NAME")} {enums.TrainType.enums[data.TRAINTYPE]} {data.Nav_Content.NAME} - {showFiles(data.Nav_Files, config.picServerHost, this)} + {showFiles(data.Nav_Files, config.picServerHost, this)} {data.IS_CREATETEST ? "是" : "否"}
: null @@ -170,26 +170,28 @@ class SE061ShowPrint extends React.Component {
- + {data?.Nav_NewUserDetail?.map((item, i) => { - return - - - - - - - - - - - + if (item.IS_DELETED == null || item.IS_DELETED == false) { + return + + + + + + + + + + + + } })}
姓名 身份证号 入职时间分数 部门 岗位分数 考核结果 查看试卷 附件
{item.CODE} {item.Nav_User?.NAME} {item.ID_CARD_NUMBER} {moment(item.IN_TIME).format('YYYY-MM-DD')} {item.SCORE} {item.Nav_Department?.NAME} {item.Nav_Post?.NAME} {enums.SEExaminationResultsEnum.enums[item.EXAMINATION_RESULTS]}
this.showDetailModal(item.ID)}>
{showFiles(item.Nav_Files, config.picServerHost, this)}
{item.CODE} {item.Nav_User?.NAME} {item.ID_CARD_NUMBER} {moment(item.IN_TIME).format('YYYY-MM-DD')} {item.Nav_Department?.NAME} {item.Nav_Post?.NAME} {item.SCORE} {enums.SEExaminationResultsEnum.enums[item.EXAMINATION_RESULTS]}
this.showDetailModal(item.ID)}>
{showFiles(item.Nav_Files, config.picServerHost, this)}
From 08f404d8f979c754fd11b40e3598d50b8d97fe5c Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Tue, 12 May 2026 08:48:10 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E8=AE=A1=E5=88=92?= =?UTF-8?q?=EF=BC=8C=E5=90=91=E4=B8=8B=E5=90=8C=E6=AD=A5=E5=9F=B9=E8=AE=AD?= =?UTF-8?q?=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/files/edit/SE071.js | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/files/edit/SE071.js b/src/files/edit/SE071.js index 5d95100..2136fd5 100644 --- a/src/files/edit/SE071.js +++ b/src/files/edit/SE071.js @@ -161,4 +161,27 @@ export default { } } }, + //向下同步培训组织 单选 + btnSyncRole: ({ stateData, saveRowRecord }) => { + var totalCount = stateData.Nav_ListPlanDetail.length + if (totalCount < 2) { + return + } + var ApproveRole = {} + for (var i = 1; i < totalCount; i++) { + //本行数据 如果为空 取上一行的 APPROVAL_ROLE_ID Nav_ApproveRole + if ((stateData.Nav_ListPlanDetail[i].APPROVAL_ROLE_ID == null || stateData.Nav_ListPlanDetail[i].APPROVAL_ROLE_ID == undefined) && stateData.Nav_ListPlanDetail[i - 1].APPROVAL_ROLE_ID) { + ApproveRole = { + ID: stateData.Nav_ListPlanDetail[i - 1].APPROVAL_ROLE_ID, + NAME: stateData.Nav_ListPlanDetail[i - 1].Nav_ApproveRole.NAME + } + if (ApproveRole.ID != null && ApproveRole.ID != undefined) { + let iRow = { ...stateData.Nav_ListPlanDetail[i] }; + iRow.APPROVAL_ROLE_ID = ApproveRole.ID + iRow.Nav_ApproveRole = ApproveRole + saveRowRecord({ record: iRow, editCode: "T_SE_TRAIN_PLAN_DETAIL" }) + } + } + } + }, } From d442f4bb46f908bbe78f94577255b9c5f0c2448f Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Tue, 12 May 2026 11:34:09 +0800 Subject: [PATCH 8/9] 1 --- src/layout/FullOther/HiddenSolve.js | 4 ++-- src/layout/FullOther/HomeContent.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/layout/FullOther/HiddenSolve.js b/src/layout/FullOther/HiddenSolve.js index 77f0b6a..a80abbb 100644 --- a/src/layout/FullOther/HiddenSolve.js +++ b/src/layout/FullOther/HiddenSolve.js @@ -250,9 +250,9 @@ class HiddenSolve extends React.Component { const companyNames = hiddenRectifyList.map((item) => item.companyName); const majorTotal = hiddenRectifyList.map((item) => item.majorCount); - const majorRectified = hiddenRectifyList.map((item) => (item.majorCount || 0) - (item.majorCountNo || 0)); + const majorRectified = hiddenRectifyList.map((item) => item.majorCountNo); const generalTotal = hiddenRectifyList.map((item) => item.generalCount); - const generalRectified = hiddenRectifyList.map((item) => (item.generalCount || 0) - (item.generalCountNo || 0)); + const generalRectified = hiddenRectifyList.map((item) => item.generalCountNo); const option = { title: { diff --git a/src/layout/FullOther/HomeContent.js b/src/layout/FullOther/HomeContent.js index b7f055a..e5fa090 100644 --- a/src/layout/FullOther/HomeContent.js +++ b/src/layout/FullOther/HomeContent.js @@ -374,6 +374,7 @@ class HomeContent extends React.Component { }, label: { show: true, position: 'top', textStyle: { color: '#000', fontSize: 12 }, formatter: '{c}' }, barWidth: '60%', + barMaxWidth: 40, }, ], }; From d0dc35e3c024054b0e5936f7b2ccac17809e5386 Mon Sep 17 00:00:00 2001 From: chenshaowei Date: Tue, 12 May 2026 15:33:53 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=A0=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/baseComponents/TableBaseComponent/index.js | 2 -- src/feui/search/AdvanceSearch.js | 1 - src/index.js | 8 +++++++- src/models/listPage.js | 3 --- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/baseComponents/TableBaseComponent/index.js b/src/baseComponents/TableBaseComponent/index.js index 000cf5b..0cdc613 100644 --- a/src/baseComponents/TableBaseComponent/index.js +++ b/src/baseComponents/TableBaseComponent/index.js @@ -417,7 +417,6 @@ class TableBaseComponent extends ComponentBase { 实际加载表数据 */ doLoadTableData = (loadParamJson, tableCode, onComplete, onLoadData) => { - console.log('调用查询实际过程', 6); const payloadJson = this.getLoadTableDataParams(loadParamJson, tableCode); if (!payloadJson) return; @@ -426,7 +425,6 @@ class TableBaseComponent extends ComponentBase { } const tableConfig = this.getTableConfig({ tableCode }); const { api } = tableConfig ? tableConfig : {}; - console.log('调用查询实际过程', 7, api); this.props.dispatch({ type: 'listPage/getTableData', diff --git a/src/feui/search/AdvanceSearch.js b/src/feui/search/AdvanceSearch.js index 544c759..5a04a97 100644 --- a/src/feui/search/AdvanceSearch.js +++ b/src/feui/search/AdvanceSearch.js @@ -297,7 +297,6 @@ class AdvanceSearch extends Component { */ handleSearch = (self = true) => { if (this.setShareIns(self)) return - console.log('调用查询开始', 1) const { onSearch } = this.props onSearch instanceof Function && onSearch() } diff --git a/src/index.js b/src/index.js index 990ef7f..99a1062 100644 --- a/src/index.js +++ b/src/index.js @@ -85,4 +85,10 @@ app.router(require('./router').default); // 5. Start app.start('#root'); -window.g_app = app; \ No newline at end of file +window.g_app = app; + +const { localStorage } = window +for (let i = 0; i < localStorage.length; i++) { + const key = localStorage.key(i) + key.indexOf('_requestKey') > -1 && localStorage.removeItem(key) +} \ No newline at end of file diff --git a/src/models/listPage.js b/src/models/listPage.js index 3b856ef..32dc2d0 100644 --- a/src/models/listPage.js +++ b/src/models/listPage.js @@ -22,11 +22,8 @@ export default { return ret }, *getTableData ({ payload, url, onComplete }, { call, put }) { - console.log('执行前',appService.getTableData) const ret = yield call(appService.getTableData, { payload, url }) - console.log('执行后') if (typeof onComplete === 'function') { - console.log('执行后',ret) onComplete(ret) } return ret