1、添加配置视频播放地址 （开发相关，正式环境应该是同一个地址）
2、考试界面 处理 一个课件考完再另一个（添加了一些参数） 3、查看试卷 优化 4、位掩码 根据答案 获取选择项 5、添加 根据附件地址 用公共组件 显示附件 数据装箱方法
This commit is contained in:
wyw
parent
2341cd3197
commit
06539bb26b
@ -73,10 +73,12 @@ const getServiceHost = api => {
|
||||
BI: 5179
|
||||
}, {
|
||||
WB: 5179
|
||||
},{
|
||||
}, {
|
||||
TL: 5179
|
||||
},
|
||||
{ SK: 5180 }
|
||||
{
|
||||
SK: 5180
|
||||
}
|
||||
]
|
||||
let port = 5112
|
||||
for (let i = 0; i < apimodules.length; i++) {
|
||||
@ -105,6 +107,7 @@ if (process.env.CUSTOM_PLATFORM === "dev") {
|
||||
uni_app_web_url: "", //
|
||||
uni_app_web_api_url: "http://localhost", // 请求接口的地址
|
||||
uni_app_web_source_url: "http://localhost:5199", // 资源地址
|
||||
uni_app_web_video_source_url: "http://localhost:5199", // 视频资源地址
|
||||
uni_app_web_local_api_url: "http://localhost", // 请求接口的地址
|
||||
}
|
||||
} else if (process.env.CUSTOM_PLATFORM === "test") {
|
||||
@ -118,6 +121,7 @@ if (process.env.CUSTOM_PLATFORM === "dev") {
|
||||
uni_app_web_url: "", //
|
||||
uni_app_web_api_url: "http://121.41.2.71", // 请求接口的地址
|
||||
uni_app_web_source_url: "http://121.41.2.71:5199", // 资源地址
|
||||
uni_app_web_video_source_url: "http://localhost:5199", // 视频资源地址
|
||||
uni_app_web_local_api_url: "http://121.41.2.71", // 请求接口的地址
|
||||
}
|
||||
} else
|
||||
@ -131,8 +135,10 @@ if (process.env.CUSTOM_PLATFORM === "dev") {
|
||||
uni_app_web_url: "",
|
||||
uni_app_web_api_url: APP_ENV === 'release' ? "http://124.117.209.78" : "http://121.41.2.71",
|
||||
uni_app_web_source_url: APP_ENV === 'release' ? "http://124.117.209.78:5199" : "http://121.41.2.71:5199",
|
||||
uni_app_web_video_source_url: APP_ENV === 'release' ? "http://124.117.209.78:5199" :
|
||||
"https://sps.cxtc.com:3199", // 视频资源地址
|
||||
uni_app_web_local_api_url: APP_ENV === 'release' ? "http://124.117.209.78" :
|
||||
"http://121.41.2.71" //打包测试： 121.41.2.71 开发可 localhost
|
||||
"http://localhost" //打包测试： 121.41.2.71 开发可 localhost
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -44,49 +44,35 @@
|
||||
<u--input v-model="score" disabled disabledColor="#fff" border="none"
|
||||
inputAlign="right"></u--input>
|
||||
</u-form-item>
|
||||
<view class="video" v-if="this.TaskID && this.TaskID.length > 0">
|
||||
<view class="video" v-if="this.isViedo&& this.isCourEdit&&this.filepath&&this.filepath.length>1">
|
||||
<uni-card margin="0" :is-shadow="true">
|
||||
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" ref="wForm"
|
||||
errorType="border-bottom">
|
||||
<video id="myVideo" @ended="onEnd()" @timeupdate="onTimeUpdate"
|
||||
src='https://sps.cxtc.com:3199/BT/VIDEO/20251226/251226100216835841.mp4'
|
||||
<video id="myVideo" @ended="onEnd()" @timeupdate="onTimeUpdate" :src='this.filepath'
|
||||
controls></video>
|
||||
</u--form>
|
||||
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" ref="wForm"
|
||||
errorType="border-bottom">
|
||||
<video id="myVideo" @ended="onEnd()" @timeupdate="onTimeUpdate"
|
||||
src='https://sps.cxtc.com:3199/BT/VIDEO/20251226/12345.mp4' controls></video>
|
||||
</u--form>
|
||||
</uni-card>
|
||||
</view>
|
||||
<u-form-item v-if="this.isViedo==false&& this.isCourEdit&&this.filepath&&this.filepath.length>1"
|
||||
label="课件附件：" borderBottom>
|
||||
<full-upload v-model="this.filepathf" :isShowBtn="false"></full-upload>
|
||||
</u-form-item>
|
||||
|
||||
</u--form>
|
||||
</uni-card>
|
||||
</view>
|
||||
<u-sticky offset-top="20">
|
||||
<u-sticky offset-top="20" v-if="isViedoEnd">
|
||||
<view class="sub-form">
|
||||
<view class="sub-form-wrap">
|
||||
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" errorType="border-bottom"
|
||||
ref="sForm">
|
||||
<uni-card style="margin-bottom: 16px;" margin="0" spacing="0" :is-shadow="false"
|
||||
v-for="(item, index) in papers">
|
||||
v-for="(item, index) in perPaper">
|
||||
<!-- papers -->
|
||||
<u-form-item>
|
||||
<view class="uni-flex uni-column">
|
||||
<view>{{(index+1)+'. '+ item.Nav_Test.NAME+getType(item.Nav_Test.TYPE)}}</view>
|
||||
<view>
|
||||
<!-- <u-radio-group v-if="item.Nav_Test.TYPE==0" v-model="item.ANSWER1"
|
||||
placement="column">
|
||||
<u-radio :customStyle="{marginBottom: '4px',marginTop: '4px'}"
|
||||
v-for="(item1, index1) in radiolist1" :key="index1" :label="item1.name"
|
||||
:name="item1.name" @change="doTrueOrFalse(index1,item)"
|
||||
:disabled="readonly" />
|
||||
</u-radio-group> -->
|
||||
<!-- <u-radio-group v-if="item.Nav_Test.TYPE==1" v-model="item.ANSWER2"
|
||||
placement="column">
|
||||
<u-radio :customStyle="{marginBottom: '4px',marginTop: '4px'}"
|
||||
v-for="(item2, index2) in radiolist2[item.ID]" :key="index2"
|
||||
:label="item2.name" :name="item2.name"
|
||||
@change="doOptionChange(index2,item)" :disabled="readonly" />
|
||||
</u-radio-group> -->
|
||||
<u-radio-group v-if="item.Nav_Test.TYPE==0" v-model="item.ANSWER"
|
||||
placement="column">
|
||||
<u-radio :customStyle="{marginBottom: '4px',marginTop: '4px'}"
|
||||
@ -119,7 +105,7 @@
|
||||
</view>
|
||||
</u-sticky>
|
||||
<view class="bottom-button">
|
||||
<button type="primary" v-if="tableKey==1" @click="submit">提交</button>
|
||||
<button type="primary" v-if="tableKey==1" @click="submit">{{this.btnText}}</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@ -138,7 +124,8 @@
|
||||
guid,
|
||||
initFilter,
|
||||
initFilterGroup,
|
||||
getSelectedOptions
|
||||
getSelectedOptions,
|
||||
getFileShow
|
||||
} from '../../../../utils/common'
|
||||
import {
|
||||
getRequest,
|
||||
@ -150,13 +137,13 @@
|
||||
model: {
|
||||
ORG_ID: "",
|
||||
},
|
||||
papers: [],
|
||||
papers: [], //wyw 引入课件后 变成 perPaper 的总和 20260306
|
||||
viewAll: false,
|
||||
record: null,
|
||||
notify: null,
|
||||
UserList: [],
|
||||
SelUsrID: null,
|
||||
config: null,
|
||||
configE: null,
|
||||
score: 0,
|
||||
END_TIME: null,
|
||||
readonly: true,
|
||||
@ -180,8 +167,19 @@
|
||||
EDIT_ID: '',
|
||||
SelUsrNAME: '',
|
||||
ORG_ID: uni.getStorageSync('orgId'),
|
||||
filepath: 'https://sps.cxtc.com:3199/BT/VIDEO/20251226/251226100216835841.mp4'
|
||||
isCourEdit: false, //是否 有课件的考试
|
||||
isViedo: false,
|
||||
isViedoEnd: true,
|
||||
filepath: '',
|
||||
filepathf: [],
|
||||
btnText: '提交', //'下一题'
|
||||
perPaper: [], //每次的答题 wyw 20260306
|
||||
listPath: [],
|
||||
indexCour: -1 //课件
|
||||
|
||||
}
|
||||
// https: //sps.cxtc.com:3199/BT/VIDEO/20251226/251226100216835841.mp4
|
||||
// https: //sps.cxtc.com:3199/BT/VIDEO/20251226/12345.mp4
|
||||
},
|
||||
onLoad(option) {
|
||||
this.TaskID = option.taskID ? option.taskID : '';
|
||||
@ -228,7 +226,7 @@
|
||||
if (!this.TaskID) {
|
||||
scort = 'TEXT_ID'
|
||||
}
|
||||
const json = initFilter(this.ORG_ID, "", scort, 1)
|
||||
const json = initFilter(this.ORG_ID, this.TaskID, scort, 1)
|
||||
if (this.TaskID) {
|
||||
extendRule(json, 'TEXT_ID', 1, this.model.ID);
|
||||
} else {
|
||||
@ -247,13 +245,20 @@
|
||||
extendInclude(json, 'Nav_User');
|
||||
getRequest(json, "/SE/SETrainRecord/GetUserPapers").then(res => {
|
||||
this.model = res
|
||||
|
||||
if (this.tableKey == '1' && res.listPath != null && res.listPath.length > 0) {
|
||||
this.isCourEdit = true //考试 有 课件
|
||||
this.listPath = res.listPath
|
||||
}
|
||||
if (res.listPath.length > 1) {
|
||||
this.btnText = '下一题'
|
||||
}
|
||||
|
||||
if (res && res.Nav_Papers && res.Nav_Papers.length > 0) {
|
||||
let papers = res.Nav_Papers.sort((a, b) => {
|
||||
return a.Nav_Test.TYPE - b.Nav_Test.TYPE
|
||||
});
|
||||
let config = res.Nav_Config;
|
||||
|
||||
let configE = res.Nav_Config;
|
||||
let record = res.Nav_Papers[0].Nav_Record;
|
||||
let notify = record ? record.Nav_Notify : null;
|
||||
let hasAnswered = false;
|
||||
@ -265,6 +270,7 @@
|
||||
this.papers = papers;
|
||||
this.papers.forEach(item => {
|
||||
if (item.Nav_Test.TYPE == 2) {
|
||||
//查看试卷时 多选的绑定答案做数据处理
|
||||
item.ANSWER3 = getSelectedOptions(item.ANSWER)
|
||||
}
|
||||
let test = {}
|
||||
@ -280,59 +286,46 @@
|
||||
name: item.Nav_Test.OPTION_C,
|
||||
value: 4
|
||||
}, )
|
||||
if (item.Nav_Test.OPTION_D != undefined && item.Nav_Test.OPTION_D != "") {
|
||||
if (item.Nav_Test.OPTION_D != undefined && item.Nav_Test.OPTION_D !=
|
||||
"") {
|
||||
this.radiolist2[item.ID].push({
|
||||
name: item.Nav_Test.OPTION_D,
|
||||
value: 8
|
||||
})
|
||||
}
|
||||
if (item.Nav_Test.OPTION_E != undefined && item.Nav_Test.OPTION_E != "") {
|
||||
if (item.Nav_Test.OPTION_E != undefined && item.Nav_Test.OPTION_E !=
|
||||
"") {
|
||||
this.radiolist2[item.ID].push({
|
||||
name: item.Nav_Test.OPTION_E,
|
||||
value: 16
|
||||
})
|
||||
}
|
||||
}
|
||||
// if (item.Nav_Test.TYPE == 0) {
|
||||
// if (item.ANSWER == 1) {
|
||||
// item.ANSWER = "正确";
|
||||
// } else if (item.ANSWER == 2) {
|
||||
// item.ANSWER = "错误";
|
||||
// }
|
||||
// if (item.Nav_Test.ANSWER == 1) {
|
||||
// item.Nav_Test.ANSWER = "正确";
|
||||
// } else if (item.ANSWER == 2) {
|
||||
// item.Nav_Test.ANSWER = "错误";
|
||||
// }
|
||||
// } else if (item.Nav_Test.TYPE == 1) {
|
||||
// switch (item.ANSWER) {
|
||||
// case 1:
|
||||
// item.ANSWER = item.Nav_Test.OPTION_A;
|
||||
// break;
|
||||
// case 2:
|
||||
// item.ANSWER = item.Nav_Test.OPTION_B;
|
||||
// break;
|
||||
// case 4:
|
||||
// item.ANSWER = item.Nav_Test.OPTION_C;
|
||||
// break;
|
||||
// case 8:
|
||||
// item.ANSWER = item.Nav_Test.OPTION_D;
|
||||
// break;
|
||||
// case 16:
|
||||
// item.ANSWER = item.Nav_Test.OPTION_E;
|
||||
// break;
|
||||
// }
|
||||
// } else if (item.Nav_Test.TYPE == 2) {
|
||||
// item.ANSWER = this.findSelectedOptions(item.ANSWER, item.Nav_Test.OPTION_A,
|
||||
// item.Nav_Test.OPTION_B, item.Nav_Test.OPTION_C, item.Nav_Test
|
||||
// .OPTION_D, item.Nav_Test.OPTION_E);
|
||||
// }
|
||||
})
|
||||
this.config = config;
|
||||
this.configE = configE;
|
||||
this.record = record;
|
||||
this.notify = notify;
|
||||
this.readonly = hasAnswered;
|
||||
this.score = this.papers[0].SCORE;
|
||||
if (this.isCourEdit) {
|
||||
this.submit()
|
||||
} else {
|
||||
this.perPaper = this.papers //提供显示
|
||||
}
|
||||
// this.filepath = res.listPath[0]
|
||||
// this.perPaper = this.papers.filter(e => e.FILE_PATH == this.filepath)
|
||||
// //如果是课件 对数据进行二次处理
|
||||
// if (this.isCourEdit) {
|
||||
// if (this.filepath.indexOf('/VIDEO/') > -1) {
|
||||
// this.isViedo = true
|
||||
// this.isViedoEnd = false
|
||||
// this.filepath = config.uni_app_web_video_source_url + this.filepath
|
||||
// this.filepathf = []
|
||||
// } else {
|
||||
// this.isViedo = false
|
||||
// this.filepathf = getFileShow(this.filepath)
|
||||
// }
|
||||
// }
|
||||
|
||||
} else {
|
||||
uni.$showMsgFunc('未能成功获取此用户的在线试卷，请稍后重试!', () => {}, 'error', 1000)
|
||||
@ -372,16 +365,16 @@
|
||||
},
|
||||
getType(type) {
|
||||
let ret = '';
|
||||
let config = this.config;
|
||||
let configE = this.configE;
|
||||
switch (type) {
|
||||
case 0:
|
||||
ret = `【是非题】(${config && config.C_TEST_SCORE || 1}分)`;
|
||||
ret = `【是非题】(${configE && configE.C_TEST_SCORE || 1}分)`;
|
||||
break;
|
||||
case 1:
|
||||
ret = `【单选题】(${config && config.S_TEST_SCORE || 1}分)`;
|
||||
ret = `【单选题】(${configE && configE.S_TEST_SCORE || 1}分)`;
|
||||
break;
|
||||
case 2:
|
||||
ret = `【多选题】(${config && config.M_TEST_SCORE || 1}分)`;
|
||||
ret = `【多选题】(${configE && configE.M_TEST_SCORE || 1}分)`;
|
||||
break;
|
||||
}
|
||||
return ret;
|
||||
@ -415,8 +408,8 @@
|
||||
item.ANSWER = 16;
|
||||
}
|
||||
},
|
||||
checkboxChange(arr, item,itemID) {
|
||||
let indexArr = this.findCommonElementsIndices(arr, this.radiolist2[itemID])//item.ID
|
||||
checkboxChange(arr, item, itemID) {
|
||||
let indexArr = this.findCommonElementsIndices(arr, this.radiolist2[itemID]) //item.ID
|
||||
item.ANSWER3 = arr;
|
||||
item.ANSWER = 0;
|
||||
indexArr.forEach(index => {
|
||||
@ -437,7 +430,7 @@
|
||||
const commonElements = [];
|
||||
for (let i = 0; i < arr1.length; i++) {
|
||||
for (let j = 0; j < arr2.length; j++) {
|
||||
if (arr1[i] === arr2[j].value) {//name
|
||||
if (arr1[i] === arr2[j].value) { //name
|
||||
commonElements.push(j);
|
||||
break
|
||||
}
|
||||
@ -446,32 +439,79 @@
|
||||
return commonElements;
|
||||
},
|
||||
submit() {
|
||||
let data = {
|
||||
Nav_Config: JSON.parse(JSON.stringify(this.config)),
|
||||
Nav_Papers: JSON.parse(JSON.stringify(this.papers)),
|
||||
TaskID: this.TaskID,
|
||||
ORG_ID: this.ORG_ID,
|
||||
TEXT_ID: this.EDIT_ID, //this.props.data.id
|
||||
}
|
||||
for (let i = 0; i < data.Nav_Papers.length; i++) {
|
||||
if (data.Nav_Papers[i].ANSWER == 0) {
|
||||
uni.$showMsgFunc(`第${i + 1}题尚未选择答题，请完成所有答题后再进行提交`, () => {}, 'error', 2000)
|
||||
return;
|
||||
}
|
||||
}
|
||||
getRequest(data, "/SE/SETrainRecord/SavePapers").then(res => {
|
||||
if (res && res.IsOperateSuccessful) {
|
||||
var icon = 'success'
|
||||
var duration = 1000
|
||||
if (!res.IsPass) {
|
||||
icon = 'error'
|
||||
duration = 2000
|
||||
if (this.indexCour > -1) { //首次加载不进来
|
||||
for (let i = 0; i < this.perPaper.length; i++) {
|
||||
if (this.perPaper[i].ANSWER == 0) {
|
||||
uni.$showMsgFunc(`第${i + 1}题尚未选择答题，请完成所有答题后再进行提交`, () => {}, 'error', 2000)
|
||||
return;
|
||||
} else if (this.perPaper[i].Nav_Test.TYPE == 2 && (this.perPaper[i].ANSWER == 1 || this.perPaper[i]
|
||||
.ANSWER == 2 || this.perPaper[i].ANSWER == 4 || this.perPaper[i].ANSWER == 8 || this
|
||||
.perPaper[
|
||||
i].ANSWER == 16)) {
|
||||
uni.$showMsgFunc(`第${i + 1}题为多选题，请完善答题后再进行提交`, () => {}, 'error', 2000)
|
||||
return;
|
||||
}
|
||||
uni.$showMsgFunc(res.Msg, () => {
|
||||
uni.navigateBack()
|
||||
}, icon, duration)
|
||||
}
|
||||
})
|
||||
var replaceModel = {}
|
||||
this.papers.forEach(e => {
|
||||
replaceModel = this.perPaper.filter(ep => e.ID == ep.ID)
|
||||
if (replaceModel != null) {
|
||||
e = replaceModel
|
||||
}
|
||||
})
|
||||
}
|
||||
if (this.btnText == '提交' && this.indexCour > -1) {
|
||||
//提交
|
||||
let data = {
|
||||
Nav_Config: JSON.parse(JSON.stringify(this.configE)),
|
||||
Nav_Papers: JSON.parse(JSON.stringify(this.papers)),
|
||||
TaskID: this.TaskID,
|
||||
ORG_ID: this.ORG_ID,
|
||||
TEXT_ID: this.EDIT_ID, //this.props.data.id
|
||||
}
|
||||
getRequest(data, "/SE/SETrainRecord/SavePapers").then(res => {
|
||||
if (res && res.IsOperateSuccessful) {
|
||||
var icon = 'success'
|
||||
var duration = 1000
|
||||
if (!res.IsPass) {
|
||||
icon = 'error'
|
||||
duration = 2000
|
||||
}
|
||||
uni.$showMsgFunc(res.Msg, () => {
|
||||
uni.navigateBack()
|
||||
}, icon, duration)
|
||||
}
|
||||
})
|
||||
} else {
|
||||
this.indexCour++
|
||||
//下一题
|
||||
if (this.indexCour == this.listPath.length - 1) {
|
||||
this.btnText = '提交' //最后一题
|
||||
} else {
|
||||
this.btnText = '下一题'
|
||||
}
|
||||
this.filepath = this.listPath[this.indexCour]
|
||||
this.perPaper = this.papers.filter(e => e.FILE_PATH == this.filepath)
|
||||
|
||||
if (this.filepath.indexOf('/VIDEO/') > -1) {
|
||||
this.isViedo = true
|
||||
this.isViedoEnd = false
|
||||
this.filepath = config.uni_app_web_video_source_url + this.filepath
|
||||
this.filepathf = []
|
||||
} else if (this.filepath.indexOf('.mp4') > -1 || this.filepath
|
||||
.indexOf('.avi') > -1) {
|
||||
//暂时不应该进来
|
||||
this.isViedo = true
|
||||
this.isViedoEnd = false
|
||||
this.filepath = config.uni_app_web_source_url + this.filepath
|
||||
this.filepathf = []
|
||||
} else {
|
||||
this.isViedo = false
|
||||
this.isViedoEnd = true
|
||||
this.filepath = this.filepath
|
||||
this.filepathf = getFileShow(this.filepath)
|
||||
}
|
||||
}
|
||||
},
|
||||
onTimeUpdate(e) {
|
||||
const currentTime = e.detail.currentTime;
|
||||
@ -485,7 +525,7 @@
|
||||
},
|
||||
//播放结束
|
||||
onEnd() {
|
||||
this.isVodeoEnd = true
|
||||
this.isViedoEnd = true
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
@ -2089,3 +2089,34 @@ export function getArryPropShow(arry, propPath, htmlPerAdd) {
|
||||
}
|
||||
return arryShow;
|
||||
}
|
||||
|
||||
//位掩码 获取选项
|
||||
export function getSelectedOptions(answer, maxOption = 32) {
|
||||
const selected = [];
|
||||
let value = 1; // 从 2^0 = 1 开始
|
||||
|
||||
// 遍历所有可能的选项（直到超过 answer 或达到上限）
|
||||
while (value <= answer && value <= maxOption) {
|
||||
if ((answer & value) !== 0) {
|
||||
selected.push(value);
|
||||
}
|
||||
value *= 2; // 下一个 2 的幂：1 → 2 → 4 → 8 ...
|
||||
}
|
||||
return selected;
|
||||
}
|
||||
//适应 组件 对附件的显示
|
||||
export function getFileShow(FILE_PATH, FILE_NAME) {
|
||||
const result = []
|
||||
if (!FILE_NAME) {
|
||||
var listPath = FILE_PATH.split('/')
|
||||
FILE_NAME = listPath[listPath.length - 1]
|
||||
}
|
||||
result.push({
|
||||
Nav_ImgFile: {
|
||||
FILE_PATH: FILE_PATH,
|
||||
FILE_NAME: FILE_NAME,
|
||||
}
|
||||
})
|
||||
return result;
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user