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

Compare commits

base: wyw:d639c3b3e238b9674217d09140b4ecee066533f0
Branches Tags
wyw:master
wyw:dev_csw
..
compare: wyw:733342c0d403b9231ef927a0b46d464daf514aa2
Branches Tags
wyw:master
wyw:dev_csw

No commits in common. "d639c3b3e238b9674217d09140b4ecee066533f0" and "733342c0d403b9231ef927a0b46d464daf514aa2" have entirely different histories.
d639c3b3e2 ... 733342c0d4

3 changed files with 15 additions and 21 deletions
Show Stats Expand all files Collapse all files

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

@ -139,20 +139,17 @@ 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={18}> <td colSpan={2}>
{Msg} {Msg}
</td> </td>
</tr> </tr>
: :
<tr style={{ color: 'red' }}> <tr style={{ color: 'red' }}>
<td colSpan={18}> <td colSpan={2}>
{Msg} {Msg}
</td> </td>
</tr> </tr>

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

@ -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>}
{!signable && <td colSpan={4} rowSpan={1} className={styles.fontBold} style={{ display: this.state.isShow }}>查看试卷</td>} <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,13 +381,12 @@ 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 看附件 */}
{ {
!signable && (
this.state.isShow && data.Nav_Notify.CHECKTYPE ? ( this.state.isShow && data.Nav_Notify.CHECKTYPE ? (
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> 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} > {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)

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

@ -333,15 +333,15 @@ class SE018PaperPage extends React.Component {
} }
} }
if (this.state.filepath && this.state.filepath.length > 0 && this.state.filepath.indexOf('/VIDEO/') > -1) { if (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 && this.state.filepath.length > 0 && (this.state.filepath.indexOf('.mp4') > -1 || this.state.filepath } else if (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,10 +354,8 @@ 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
if (this.state.filepath && this.state.filepath.length > 0) {
this.state.filepathf = getFileShow(this.state.filepath) this.state.filepathf = getFileShow(this.state.filepath)
} }
}
this.setState({ this.setState({
indexCour: this.state.indexCour, indexCour: this.state.indexCour,
btnText: this.state.btnText, btnText: this.state.btnText,
@ -736,7 +734,7 @@ class SE018PaperPage extends React.Component {
</tr> : null </tr> : null
} }
{ {
isCourEdit && !isViedo && filepathf && filepathf.length > 0 ? <tr > isCourEdit && !isViedo ? <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}>
{ {