Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe_web
This commit is contained in:
commit
5a6278a90f
12
public/web.config
Normal file
12
public/web.config
Normal 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>
|
||||
@ -139,17 +139,20 @@ class SC022Import extends React.Component {
|
||||
</Button>
|
||||
</Upload>
|
||||
</td>
|
||||
<td colSpan={16}>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
{
|
||||
isMsgShow ? (
|
||||
isOk ? <tr >
|
||||
<td colSpan={2}>
|
||||
<td colSpan={18}>
|
||||
{Msg}
|
||||
</td>
|
||||
</tr>
|
||||
:
|
||||
<tr style={{ color: 'red' }}>
|
||||
<td colSpan={2}>
|
||||
<td colSpan={18}>
|
||||
{Msg}
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@ -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>
|
||||
{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>
|
||||
</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) { */}
|
||||
{/* 线上考核 51 看试卷 56 81 看附件 */}
|
||||
{
|
||||
!signable && (
|
||||
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>
|
||||
: <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={6} rowSpan={1}>
|
||||
{
|
||||
showUserSign(it.Nav_User, config.picServerHost)
|
||||
|
||||
@ -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.filepath = configc.videoServerHost + this.state.filepath
|
||||
this.state.filepathf = []
|
||||
if (ISEND && VIEWSEC == 0) {
|
||||
ISEND = false
|
||||
}
|
||||
} else if (this.state.filepath.indexOf('.mp4') > -1 || this.state.filepath
|
||||
.indexOf('.avi') > -1) {
|
||||
} else if (this.state.filepath && this.state.filepath.length > 0 && (this.state.filepath.indexOf('.mp4') > -1 || this.state.filepath
|
||||
.indexOf('.avi') > -1)) {
|
||||
//暂时不应该进来
|
||||
this.state.isViedo = true
|
||||
if (ISEND) {
|
||||
@ -354,8 +354,10 @@ class SE018PaperPage extends React.Component {
|
||||
this.state.isViedo = false
|
||||
// this.state.isVideoEnd = true
|
||||
this.state.filepath = this.state.filepath
|
||||
if (this.state.filepath && this.state.filepath.length > 0) {
|
||||
this.state.filepathf = getFileShow(this.state.filepath)
|
||||
}
|
||||
}
|
||||
this.setState({
|
||||
indexCour: this.state.indexCour,
|
||||
btnText: this.state.btnText,
|
||||
@ -734,7 +736,7 @@ class SE018PaperPage extends React.Component {
|
||||
</tr> : null
|
||||
}
|
||||
{
|
||||
isCourEdit && !isViedo ? <tr >
|
||||
isCourEdit && !isViedo && filepathf && filepathf.length > 0 ? <tr >
|
||||
<td colSpan={4} rowSpan={1} className={styles.fontBold}>课件附件</td>
|
||||
<td colSpan={20} rowSpan={1} className={styles.fontBold}>
|
||||
{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user