wyw/mh_jy_safe_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe_web

Browse Source
This commit is contained in:
何美荣 2026-04-09 14:57:28 +08:00
commit 5a6278a90f
4 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/web.config Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<location path="index.html">
<system.webServer>
<httpProtocol>
<customHeaders>
<add name="Cache-Control" value="no-cache, no-store, must-revalidate" />
</customHeaders>
</httpProtocol>
</system.webServer>
</location>
</configuration>

7
src/components/CustomPages/SC/SC022Import.js
View File

@ -139,17 +139,20 @@ class SC022Import extends React.Component {
</Button> </Button>
</Upload> </Upload>
</td> </td>
<td colSpan={16}>
</td>
</tr> </tr>
{ {
isMsgShow ? ( isMsgShow ? (
isOk ? <tr > isOk ? <tr >
<td colSpan={2}> <td colSpan={18}>
{Msg} {Msg}
</td> </td>
</tr> </tr>
: :
<tr style={{ color: 'red' }}> <tr style={{ color: 'red' }}>
<td colSpan={2}> <td colSpan={18}>
{Msg} {Msg}
</td> </td>
</tr> </tr>

17
src/components/CustomPages/SE/SE018EditPage.js
View File

@ -279,7 +279,7 @@ class SE018EditPage extends React.Component {
<td colSpan={4} rowSpan={1} className={styles.fontBold}>培训老师</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>培训老师</td>
<td colSpan={4} rowSpan={1} >{data && data.Nav_Notify ? data.Nav_Notify.TRAIN_TEACHER : null}</td> <td colSpan={4} rowSpan={1} >{data && data.Nav_Notify ? data.Nav_Notify.TRAIN_TEACHER : null}</td>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>培训形式</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>培训形式</td>
<td colSpan={4} rowSpan={1} >{data&& data.Nav_Notify && data.Nav_Notify.TRAINTYPE && enums.TrainType.enums[data.Nav_Notify.TRAINTYPE]}</td> <td colSpan={4} rowSpan={1} >{data && data.Nav_Notify && data.Nav_Notify.TRAINTYPE && enums.TrainType.enums[data.Nav_Notify.TRAINTYPE]}</td>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>考核方式</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>考核方式</td>
{/* <td colSpan={4} rowSpan={1} >{data && data.Nav_Notify && data.Nav_Notify.Nav_TrainCheckType ? data.Nav_Notify.Nav_TrainCheckType.NAME : null}</td> */} {/* <td colSpan={4} rowSpan={1} >{data && data.Nav_Notify && data.Nav_Notify.Nav_TrainCheckType ? data.Nav_Notify.Nav_TrainCheckType.NAME : null}</td> */}
<td colSpan={4} rowSpan={1} >{data && data.Nav_Notify && data.Nav_Notify.CHECKTYPE && enums.PlanCheckType.enums[data.Nav_Notify.CHECKTYPE]}</td> <td colSpan={4} rowSpan={1} >{data && data.Nav_Notify && data.Nav_Notify.CHECKTYPE && enums.PlanCheckType.enums[data.Nav_Notify.CHECKTYPE]}</td>
@ -364,7 +364,7 @@ class SE018EditPage extends React.Component {
<td colSpan={4} rowSpan={1} className={styles.fontBold}>姓名</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>姓名</td>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>岗位</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>岗位</td>
{this.state.isExam && <td colSpan={4} rowSpan={1} className={styles.fontBold}>分数</td>} {this.state.isExam && <td colSpan={4} rowSpan={1} className={styles.fontBold}>分数</td>}
<td colSpan={4} rowSpan={1} className={styles.fontBold} style={{ display: this.state.isShow }}>查看试卷</td> {!signable && <td colSpan={4} rowSpan={1} className={styles.fontBold} style={{ display: this.state.isShow }}>查看试卷</td>}
<td colSpan={6} rowSpan={1} className={styles.fontBold}>电子签名</td> <td colSpan={6} rowSpan={1} className={styles.fontBold}>电子签名</td>
</tr> </tr>
{ {
@ -381,12 +381,13 @@ class SE018EditPage extends React.Component {
{/* if (data.Nav_Notify.CHECKTYPE == 51 || data.Nav_Notify.CHECKTYPE == 56 || data.Nav_Notify.CHECKTYPE == 81) { */} {/* if (data.Nav_Notify.CHECKTYPE == 51 || data.Nav_Notify.CHECKTYPE == 56 || data.Nav_Notify.CHECKTYPE == 81) { */}
{/* 线上考核 51 看试卷 56 81 看附件 */} {/* 线上考核 51 看试卷 56 81 看附件 */}
{ {
this.state.isShow && data.Nav_Notify.CHECKTYPE ? ( !signable && (
data.Nav_Notify.CHECKTYPE == 51 ? <td colSpan={4} rowSpan={1} ><div onClick={() => this.showDetailModal(it.RECORD_ID, it.USER_ID)}><Icon type="eye" style={{ color: "#005b9b", cursor: "pointer" }} /></div></td> this.state.isShow && data.Nav_Notify.CHECKTYPE ? (
: <td colSpan={4} rowSpan={1} > {showFiles(it?.Nav_Files, config.picServerHost, this, false)}</td> data.Nav_Notify.CHECKTYPE == 51 ? <td colSpan={4} rowSpan={1} ><div onClick={() => this.showDetailModal(it.RECORD_ID, it.USER_ID)}><Icon type="eye" style={{ color: "#005b9b", cursor: "pointer" }} /></div></td>
) : <td colSpan={4} rowSpan={1} > {showFiles(it?.Nav_Files, config.picServerHost, this, false)}</td>
: <td colSpan={4} rowSpan={1} style={{ display: this.state.isShow }}><div onClick={() => this.showDetailModal(it.RECORD_ID, it.USER_ID)}><Icon type="eye" style={{ color: "#005b9b", cursor: "pointer" }} /></div></td> )
} : <td colSpan={4} rowSpan={1} style={{ display: this.state.isShow }}><div onClick={() => this.showDetailModal(it.RECORD_ID, it.USER_ID)}><Icon type="eye" style={{ color: "#005b9b", cursor: "pointer" }} /></div></td>
)}
<td colSpan={6} rowSpan={1}> <td colSpan={6} rowSpan={1}>
{ {
showUserSign(it.Nav_User, config.picServerHost) showUserSign(it.Nav_User, config.picServerHost)

12
src/components/CustomPages/SE/SE018PaperPage.js
View File

@ -333,15 +333,15 @@ class SE018PaperPage extends React.Component {
} }
} }
if (this.state.filepath.indexOf('/VIDEO/') > -1) { if (this.state.filepath && this.state.filepath.length > 0 && this.state.filepath.indexOf('/VIDEO/') > -1) {
this.state.isViedo = true this.state.isViedo = true
this.state.filepath = configc.videoServerHost + this.state.filepath this.state.filepath = configc.videoServerHost + this.state.filepath
this.state.filepathf = [] this.state.filepathf = []
if (ISEND && VIEWSEC == 0) { if (ISEND && VIEWSEC == 0) {
ISEND = false ISEND = false
} }
} else if (this.state.filepath.indexOf('.mp4') > -1 || this.state.filepath } else if (this.state.filepath && this.state.filepath.length > 0 && (this.state.filepath.indexOf('.mp4') > -1 || this.state.filepath
.indexOf('.avi') > -1) { .indexOf('.avi') > -1)) {
//暂时不应该进来 //暂时不应该进来
this.state.isViedo = true this.state.isViedo = true
if (ISEND) { if (ISEND) {
@ -354,7 +354,9 @@ class SE018PaperPage extends React.Component {
this.state.isViedo = false this.state.isViedo = false
// this.state.isVideoEnd = true // this.state.isVideoEnd = true
this.state.filepath = this.state.filepath this.state.filepath = this.state.filepath
this.state.filepathf = getFileShow(this.state.filepath) if (this.state.filepath && this.state.filepath.length > 0) {
this.state.filepathf = getFileShow(this.state.filepath)
}
} }
this.setState({ this.setState({
indexCour: this.state.indexCour, indexCour: this.state.indexCour,
@ -734,7 +736,7 @@ class SE018PaperPage extends React.Component {
</tr> : null </tr> : null
} }
{ {
isCourEdit && !isViedo ? <tr > isCourEdit && !isViedo && filepathf && filepathf.length > 0 ? <tr >
<td colSpan={4} rowSpan={1} className={styles.fontBold}>课件附件</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>课件附件</td>
<td colSpan={20} rowSpan={1} className={styles.fontBold}> <td colSpan={20} rowSpan={1} className={styles.fontBold}>
{ {