flx：修复安全评分的bug 课程视频的兼容
This commit is contained in:
parent
b59482262f
commit
22a6670a69
@ -1,57 +1,57 @@
|
||||
const newLocal = '总投资额(万元)';
|
||||
export default {
|
||||
projectExtension:'项目扩展信息表',
|
||||
contractSigning:'合同签订',
|
||||
contractProjectTime:'合同工期',
|
||||
actualConstructionTime:'实际工期',
|
||||
toryBurchOnSale:'中标单位',
|
||||
architect:'设计单位',
|
||||
ownersUnit:'业主单位',
|
||||
projectProfile:'工程概况',
|
||||
constructionUnit:'建设单位',
|
||||
supervisingUnit:'监理单位',
|
||||
optionDate:'选择日期',
|
||||
to:'至',
|
||||
startDate:'开始日期',
|
||||
endingDate:'结束日期',
|
||||
pleaseEnter:'请输入',
|
||||
editProjectInfo:'编辑项目扩展信息',
|
||||
projectExtension: '项目扩展信息表',
|
||||
contractSigning: '合同签订',
|
||||
contractProjectTime: '合同工期',
|
||||
actualConstructionTime: '实际工期',
|
||||
toryBurchOnSale: '中标单位',
|
||||
architect: '设计单位',
|
||||
ownersUnit: '业主单位',
|
||||
projectProfile: '工程概况',
|
||||
constructionUnit: '建设单位',
|
||||
supervisingUnit: '监理单位',
|
||||
optionDate: '选择日期',
|
||||
to: '至',
|
||||
startDate: '开始日期',
|
||||
endingDate: '结束日期',
|
||||
pleaseEnter: '请输入',
|
||||
editProjectInfo: '编辑项目扩展信息',
|
||||
editProjectFormRules: {
|
||||
contractPrice: [
|
||||
{ required: true, message: "请输入合同额", trigger: "change" },
|
||||
],
|
||||
investmentPrice: [
|
||||
{ required: true, message: "请输入投资额", trigger: "change" },
|
||||
],
|
||||
contractPrice: [
|
||||
{ required: true, message: "请输入合同额", trigger: "change" },
|
||||
],
|
||||
investmentPrice: [
|
||||
{ required: true, message: "请输入投资额", trigger: "change" },
|
||||
],
|
||||
contractSignTime: [
|
||||
{ required: true, message: "请选择合同签订日期", trigger: "change" },
|
||||
{ required: true, message: "请选择合同签订日期", trigger: "change" },
|
||||
],
|
||||
contractPeriodEndTime: [
|
||||
{ required: true, message: "请选择合同工期", trigger: "change" },
|
||||
{ required: true, message: "请选择合同工期", trigger: "change" },
|
||||
],
|
||||
realPeriodStartTime: [
|
||||
{ required: true, message: "请选择实际工期", trigger: "change" },
|
||||
{ required: true, message: "请选择实际工期", trigger: "change" },
|
||||
],
|
||||
bidWinner: [
|
||||
{ required: true, message: "请输入中标单位", trigger: "blur" },
|
||||
{ required: true, message: "请输入中标单位", trigger: "blur" },
|
||||
],
|
||||
constructionUnit: [
|
||||
{ required: true, message: "请输入建设单位", trigger: "blur" },
|
||||
{ required: true, message: "请输入建设单位", trigger: "blur" },
|
||||
],
|
||||
designUnit: [
|
||||
{ required: true, message: "请输入设计单位", trigger: "blur" },
|
||||
{ required: true, message: "请输入设计单位", trigger: "blur" },
|
||||
],
|
||||
ownerUnit: [
|
||||
{ required: true, message: "请输入业主单位", trigger: "blur" },
|
||||
{ required: true, message: "请输入业主单位", trigger: "blur" },
|
||||
],
|
||||
supervisorUnit: [
|
||||
{ required: true, message: "请输入监理单位", trigger: "blur" },
|
||||
{ required: true, message: "请输入监理单位", trigger: "blur" },
|
||||
],
|
||||
educationId: [
|
||||
{ required: true, message: "请选择安全教育培训", trigger: "change" },
|
||||
],
|
||||
},
|
||||
modifySuccessfully:"修改成功",
|
||||
contractPrice:'施工合同额(万元)',
|
||||
investmentPrice:'总投资额(万元)'
|
||||
// educationId: [
|
||||
// { required: true, message: "请选择安全教育培训", trigger: "change" },
|
||||
// ],
|
||||
},
|
||||
modifySuccessfully: "修改成功",
|
||||
contractPrice: '施工合同额(万元)',
|
||||
investmentPrice: '总投资额(万元)'
|
||||
}
|
||||
@ -174,7 +174,7 @@ if (process.env.NODE_ENV == "development") {
|
||||
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
|
||||
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
|
||||
// axios.defaults.baseURL = 'http://192.168.34.221:28890/' //郭圣雄本地
|
||||
// axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
|
||||
axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
|
||||
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
|
||||
// axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程
|
||||
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
|
||||
@ -187,11 +187,11 @@ if (process.env.NODE_ENV == "development") {
|
||||
// axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
|
||||
// axios.defaults.baseURL = 'http://42.180.188.17:9809/' //鞍钢正式地址
|
||||
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
|
||||
axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
|
||||
// axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
|
||||
// axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址
|
||||
// axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址
|
||||
// axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址
|
||||
// axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
|
||||
// axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
|
||||
// axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址
|
||||
// axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址
|
||||
// axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址
|
||||
} else if (process.env.NODE_ENV == "debug") {
|
||||
axios.defaults.baseURL = "https://www.ceshi.com";
|
||||
} else if (process.env.NODE_ENV == "production") {
|
||||
|
||||
@ -259,7 +259,12 @@ export default {
|
||||
if (newVal.path == "/project/labor/personManage") {
|
||||
this.showQrCode = true;
|
||||
// this.bindQRCode();
|
||||
this.getEduIdFn();
|
||||
if(this.company == 'agjt'){
|
||||
this.getEduIdFn();
|
||||
} else {
|
||||
this.bindQRCode();
|
||||
}
|
||||
|
||||
} else {
|
||||
this.showQrCode = false;
|
||||
}
|
||||
|
||||
@ -56,15 +56,15 @@ export default new Vuex.Store({
|
||||
// FILEURL:'http://182.90.224.237:51234/image/',
|
||||
// UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
|
||||
// FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
|
||||
// UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
|
||||
// FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
|
||||
UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
|
||||
FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
|
||||
// WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
|
||||
// WORKFLOWURL: "http://192.168.34.129:89/#/workspace/forms", //罗峰工作流地址(本地)
|
||||
CONTRACTORURL: process.env.NODE_ENV == "development" ? "http://192.168.34.175:5173/#/contractorApply" : `${window.location.protocol}//${host}/contractorApply/index.html#/contractorApply`, //罗峰承包商入场地址(本地)
|
||||
WORKFLOWURL: "http://192.168.34.175:88/#/workspace/forms", //罗峰工作流地址(本地)
|
||||
CONTRACTORURL: process.env.NODE_ENV == "development" ? "http://192.168.34.175:5173/#/contractorApply" : `${window.location.protocol}//${window.location.host}/contractorApply/index.html#/contractorApply`, //罗峰承包商入场地址(本地)
|
||||
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
|
||||
// FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
|
||||
UPLOADURL: 'http://42.180.188.17:11211/upload/image', //测试
|
||||
FILEURL: 'http://42.180.188.17:11211/image/', //测试
|
||||
// UPLOADURL: 'http://42.180.188.17:11211/upload/image', //测试
|
||||
// FILEURL: 'http://42.180.188.17:11211/image/', //测试
|
||||
// BASEURL: baseUrl ?
|
||||
// baseUrl : window.location.protocol + "//" + window.location.host + "/", //正式环境
|
||||
// UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
|
||||
@ -72,7 +72,7 @@ export default new Vuex.Store({
|
||||
// // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
|
||||
// // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
|
||||
// WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms', //鞍钢平台工作流地址
|
||||
WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
|
||||
// WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
|
||||
//---------------------------------------------------------------------------------------------
|
||||
// BASEURL: baseUrl
|
||||
// ? baseUrl
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
<el-table-column prop="courseName" align="center" width="180" label="课程名称"></el-table-column>
|
||||
<el-table-column align="center" label="课程资料">
|
||||
<template slot-scope="scope">
|
||||
<span class="value videoNamePre" v-if="scope.row.fileUrl && JSON.parse(scope.row.fileUrl).length > 0"
|
||||
<!-- <span class="value videoNamePre" v-if="scope.row.fileUrl && JSON.parse(scope.row.fileUrl).length > 0"
|
||||
style="display: flex;justify-content:center;word-wrap: break-word;white-space: normal; flex-wrap: wrap">
|
||||
<div v-for="(item, index) in JSON.parse(scope.row.fileUrl)" :key="index" class="videoBox"
|
||||
@click="playerVideo(item.url)">
|
||||
@ -35,7 +35,10 @@
|
||||
style="margin-right: 120px; cursor: pointer;" class="" />
|
||||
</el-tooltip>
|
||||
</div>
|
||||
</span>
|
||||
</span> -->
|
||||
<div v-if="scope.row.fileUrl && JSON.parse(scope.row.fileUrl).length > 0">
|
||||
<a v-for="(item, index) in JSON.parse(scope.row.fileUrl)" :href="item.url" target="_blank">{{ item.name }}</a>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column prop="subjectName" align="center" width="180" label="课程封面">
|
||||
@ -98,13 +101,13 @@
|
||||
<!-- 课程视频 -->
|
||||
<!-- accept=".mp4,.pdf,.doc,.docx,.ppt,.png,.jpg,.rar,.zip" -->
|
||||
<el-form-item label="课程资料" prop="fileUrl" :rules="[{ required: true, message: ' ', trigger: ['blur', 'change'] }]">
|
||||
<div>单个文件不超过100M，最多可上传1个附件</div>
|
||||
<!-- <div>单个文件不超过100M，最多可上传1个附件</div> -->
|
||||
<!-- :limit="1"-->
|
||||
<el-upload class="upload-demo" :limit="1" drag multiple name="files" :action="$store.state.UPLOADURL"
|
||||
accept=".mp4"
|
||||
<el-upload class="upload-demo" drag multiple name="files" :action="$store.state.UPLOADURL"
|
||||
accept=".mp4,.pdf,.doc,.docx,.ppt,.png,.jpg,.rar,.zip"
|
||||
:on-remove="(file, fileList) => materialHandleRemove(file, fileList)"
|
||||
:on-success="(res, file) => materialHandleSuccess(res, file)" :file-list="materialFileList"
|
||||
:on-exceed="(file, fileList) => materialExceedFn(file, fileList)" :before-upload=" handleBeforeUpload">
|
||||
:on-exceed="(file, fileList) => materialExceedFn(file, fileList)" :before-upload="handleBeforeUpload">
|
||||
<!-- <div class="el-upload__tip" slot="tip">单个文件不超过100M,最多可上传</div> -->
|
||||
<div class="el-upload__text">
|
||||
<div>
|
||||
@ -419,15 +422,15 @@ export default {
|
||||
this.$message.warning('已经上传了1个封面啦！');
|
||||
},
|
||||
handleBeforeUpload(file) {
|
||||
let maxSize = 100 * 1024 * 1024; // 100MB，设置最大文件大小
|
||||
if (file.size > maxSize) {
|
||||
this.$message.warning('文件太大啦~')
|
||||
// ElMessage({
|
||||
// message: `文件大小超过了${maxSize / (1024 * 1024)}MB的限制`,
|
||||
// type: 'warning'
|
||||
// });
|
||||
return false;
|
||||
}
|
||||
// let maxSize = 100 * 1024 * 1024; // 100MB，设置最大文件大小
|
||||
// if (file.size > maxSize) {
|
||||
// this.$message.warning('文件太大啦~')
|
||||
// // ElMessage({
|
||||
// // message: `文件大小超过了${maxSize / (1024 * 1024)}MB的限制`,
|
||||
// // type: 'warning'
|
||||
// // });
|
||||
// return false;
|
||||
// }
|
||||
|
||||
if(file.type == "video/mp4"){
|
||||
const videoTypeList = ["mp4"];
|
||||
@ -518,6 +521,13 @@ export default {
|
||||
}
|
||||
</script>
|
||||
<style lang="less" scoped>
|
||||
a {
|
||||
text-decoration:none !important;
|
||||
-moz-outline: none;
|
||||
outline: none;
|
||||
cursor:pointer;
|
||||
display: block;
|
||||
}
|
||||
.videoBox {
|
||||
width: 50px;
|
||||
display: flex;
|
||||
|
||||
@ -115,15 +115,15 @@
|
||||
<div>当前分数</div>
|
||||
</div>
|
||||
<div class="box-between1">
|
||||
<div>人员扣分记录</div>
|
||||
<div>人员加/扣分记录</div>
|
||||
</div>
|
||||
<div class="dialog-main">
|
||||
<div class="dialog-box2" v-for="item in deductScoreInfo.deductScoreList" :key="item.id">
|
||||
<div>
|
||||
<div>{{ deductScoreInfo.workerName }}</div>
|
||||
<div>扣分分数: {{ item.deductScore }}</div>
|
||||
<div>加/扣分分数: {{ item.deductScore }}</div>
|
||||
</div>
|
||||
<div>扣分原因：{{ item.deductReason }}</div>
|
||||
<div>{{ item.deductScore >= 0 ? '加分原因' : '扣分原因' }}：{{ item.deductReason }}</div>
|
||||
</div>
|
||||
<div style="position: relative;height: 100%;" v-if="deductScoreInfo.deductScoreList.length == 0">
|
||||
<div class="placeholderBox">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user