Merge branch 'master' of http://121.28.134.38:2039/yuhuitao/bjjxjy-ui into wxd

src/api/jianliyuan/index.js

@@ -7,4 +7,14 @@ export function getJxjy(){
 	return request({
 		url:"/jxjy/Training/personTrainingList"
 	})
+}
+
+
+
+//查询用户报名的继续教育课程列表
+export function getClassList(data){
+	return request({
+		url:"/system/Class/curriculumList",
+		params:data
+	})
 }

src/views/components/baoming/kaoshi.vue

@@ -180,7 +180,7 @@
 					<el-row :gutter="40" v-if="classForm.yjType == 1">
 						<el-col :span="14">
 							<el-form-item label="个人姓名">
-								<el-input v-model="classForm.renCai.Name" readonly type="text" auto-complete="off"></el-input>
+								<el-input v-model="classForm.kpGRName" readonly type="text" auto-complete="off"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="10">
@@ -211,6 +211,30 @@
 								<el-input v-model="classForm.qiye.nsrsbh" readonly type="text" auto-complete="off"></el-input>
 							</el-form-item>
 						</el-col>
+						<el-col :span="24" v-if="classForm.qiye.kplx == '增值税专用发票'">
+							<el-row :gutter="20">
+								<el-col :span="14">
+									<el-form-item label="注册地址" prop="qiye.kpzcdz" :rules="{required: true,message: '请联系企业负责人先完善发票信息，再进行报名',trigger: ['blur', 'change']}">
+										<el-input v-model="classForm.qiye.kpfs" readonly type="text" auto-complete="off"></el-input>
+									</el-form-item>
+								</el-col>
+								<el-col :span="10">
+									<el-form-item label="注册电话" prop="qiye.kpzcdh" :rules="{required: true,message: '请联系企业负责人先完善发票信息，再进行报名',trigger: ['blur', 'change']}">
+										<el-input v-model="classForm.qiye.kpfs" readonly type="text" auto-complete="off"></el-input>
+									</el-form-item>
+								</el-col>
+								<el-col :span="14">
+									<el-form-item label="开户银行:" prop="qiye.kpkhyh" :rules="{required: true,message: '请联系企业负责人先完善发票信息，再进行报名',trigger: ['blur', 'change']}">
+										<el-input v-model="classForm.qiye.kpfs" readonly type="text" auto-complete="off"></el-input>
+									</el-form-item>
+								</el-col>
+								<el-col :span="10">
+									<el-form-item label="银行账号:" prop="qiye.kpyhzh" :rules="{required: true,message: '请联系企业负责人先完善发票信息，再进行报名',trigger: ['blur', 'change']}">
+										<el-input v-model="classForm.qiye.kpfs" readonly type="text" auto-complete="off"></el-input>
+									</el-form-item>
+								</el-col>
+							</el-row>
+						</el-col>
 						<el-col :span="24">
 							<el-form-item label="电子发票邮箱" prop="qiye.dzfpyx" :rules="{required: true,message: '请联系企业负责人先完善发票信息，再进行报名',trigger: ['blur', 'change']}">
 								<el-input v-model="classForm.qiye.dzfpyx" readonly type="text" auto-complete="off"></el-input>
@@ -333,6 +357,7 @@
 					byyx:null,//毕业院校
 					zcpzdw:null,//职称批准单位
 					jianli:[],//已有的简历列表
+					kpGRName:"个人"
 				},
 				classRules: {
 					'renCai.ShenFenZheng': {
@@ -546,7 +571,7 @@
 						jxjyBm(this.classForm).then(res=>{
 							this.$message({
 								type:"success",
-								message:res.messagea 
+								message:res.msg
 							})
 							this.reset()
 							this.$emit('submitSuccess',false)

src/views/components/xuexi/index.vue

@@ -1,16 +1,16 @@
 <template>
 	<div style="height: calc(100vh - 120px);">
 		<el-row style="height: 100%;">
-			<el-col :span="5" style="height: 100%;border-right: 2px solid #55ffff;">
+			<el-col :span="5" style="height: 100%;border-right: 2px solid #55ffff;overflow-y: auto;" class="classTree">
 				<el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
 			</el-col>
 			<el-col :span="19" style="height: 100%;">
-				<div style="width: 100%;height: 100%;position: relative;">
+				<div style="width: 100%;height: 100%;position: relative;" v-if="videoPath == null">
 					<img src="../../../assets/images/hysy.jpg" style="width: 40%;margin-top: 60px;position: absolute;left: 50%;transform: translateX(-50%);" alt="" />
 				</div>
-				<!-- <div style="width: 100%;height: 100%;" >
-					<play-video :lastTime="2"></play-video>
-				</div> -->
+				<div style="width: 100%;height: 100%;" v-else>
+					<play-video :path="videoPath"></play-video>
+				</div>
 			</el-col>
 		</el-row>
 	</div>
@@ -18,63 +18,54 @@
 
 <script>
 	import playVideo from "./video.vue"
+	import { getClassList } from "@/api/jianliyuan/index"
 	export default {
 		name: "Xuexi",
-
+		props:{
+			classData:{
+				type:Object,
+				default:null
+			}
+		},
+		components:{
+			playVideo
+		},
 		data() {
 			return {
-				data: [{
-					label: '一级 1',
-					children: [{
-						label: '二级 1-1',
-						children: [{
-							label: '三级 1-1-1'
-						}]
-					}]
-				}, {
-					label: '一级 2',
-					children: [{
-						label: '二级 2-1',
-						children: [{
-							label: '三级 2-1-1'
-						}]
-					}, {
-						label: '二级 2-2',
-						children: [{
-							label: '三级 2-2-1'
-						}]
-					}]
-				}, {
-					label: '一级 3',
-					children: [{
-						label: '二级 3-1',
-						children: [{
-							label: '三级 3-1-1'
-						}]
-					}, {
-						label: '二级 3-2',
-						children: [{
-							label: '三级 3-2-1'
-						}]
-					}]
-				}],
+				data: [],
 				defaultProps: {
 					children: 'children',
-					label: 'label'
-				}
+					label: 'VName'
+				},
+				videoPath:null,
+				baseUrl:process.env.VUE_APP_BASE_API
 			}
 		},
 		created() {
-
+			this.getList(this.classData)
 		},
 		methods: {
 			handleNodeClick(data) {
-			    console.log(data);
+			    console.log(data)
+				this.videoPath = this.baseUrl+data.VPath
+				console.log(this.videoPath)
+			},
+			//查询已报名继续教育课程列表
+			getList(v){
+				getClassList({classIdList:v.classIdList,personId:v.personid}).then(res=>{
+					for(let i in res.data){
+						let obj = {
+							VName:i,
+							children:res.data[i]
+						}
+						this.data.push(obj)
+					}
+				})
 			}
 		}
 	}
 </script>
 
-<style>
-
+<style scoped lang="scss">
+	
 </style>

src/views/components/xuexi/video.vue

@@ -44,13 +44,14 @@
 					fluid: true, // 当true时，Video.js player将拥有流体大小，换句话说，它将按比例缩放以适应其容器
 					sources: [{
 						type: "video/mp4", // 类型
-						src: require("@/assets/images/sp.mp4"), // url地址，在使用本地的资源时，需要用require()引入，否则控制台会报错
+						src: this.path, // url地址，在使用本地的资源时，需要用require()引入，否则控制台会报错
 					}, ],
 					// poster: "./gcy-logo-200.png", // 设置封面地址
 					notSupportedMessage: "此视频暂无法播放，请稍后再试", // 允许覆盖Video.js无法播放媒体源时显示的默认信息
 					controlBar: {
 						currentTimeDisplay: true,
-						progressControl: true, // 是否显示进度条
+						progressControl: this.isFinish, // 是否显示进度条
+						// progressControl: true, // 是否显示进度条
 						playbackRateMenuButton: true, // 是否显示调整播放倍速按钮
 						timeDivider: true, // 当前时间和持续时间的分隔符
 						durationDisplay: true, // 显示持续时间
@@ -61,66 +62,76 @@
 			};
 		},
 		computed: {},
+		watch: {  
+		    path(newVal, oldVal) {  
+		      // 这里不需要做任何操作，因为 Vue 的响应式系统会自动更新 DOM  
+		      // 如果需要手动控制加载，可以在这里调用 loadNewVideo 方法 
+			   this.playOptions.sources[0].src = newVal
+		    },
+			wancheng(newVal,oldVal){
+				this.playOptions.controlBar.progressControl = newVal
+			}
+		},  
 		mounted() {
 			// this.getData()  // 调用获取地址的接口，然后修改播放器配置中的src属性
 		},
 		methods: {
 			// 准备好了
 			onPlayerReady() {
-				console.log("准备好了");
+				// console.log("准备好了");
 			},
 			// 视频播放
 			onPlayerPlay(player) {
-				console.log('播放了');
-				console.log(player);
-				let playTime = 0;
-				if (
-					Number(Math.floor(this.playedTime)) ===
-					Number(Math.floor(player.duration()))
-				) {
-					this.playedTime = 0;
-					playTime = 0;
-				} else if (
-					Number(Math.floor(player.currentTime())) !==
-					Number(Math.floor(this.playedTime))
-				) {
-					playTime = this.playedTime;
-					player.currentTime(playTime)
-				}
+				// console.log('播放了');
+				// console.log(player);
+				// let playTime = 0;
+				// if(this.wancheng === false){
+				// 	if ( Number(Math.floor(this.playedTime)) === Number(Math.floor(player.duration())) ) {
+				// 		this.playedTime = 0;
+				// 		playTime = 0;
+				// 	} else if ( Number(Math.floor(player.currentTime())) !== Number(Math.floor(this.playedTime)) ) {
+				// 		playTime = this.playedTime;
+				// 		player.currentTime(playTime)
+				// 	}
+				// }else{ 
+					
+				// }
+				
+			
 			},
 			// 视频暂停的
 			onPlayerPause(player) {
-				console.log('暂停中');
-				console.log(player);
+				// console.log('暂停中');
+				// console.log(player);
 				this.playedTime = player.currentTime();
 			},
 			// 视频播放完
 			onPlayerEnd(player) {
-				console.log('播放结束了');
-				console.log(player);
+				// console.log('播放结束了');
+				// console.log(player);
 				this.maxTime = player.duration()
 				this.wancheng = true
 			},
 			// DOM元素上的readyState更改导致播放停止
 			onPlayerWaiting(player) {
-				console.log("播放停止中");
-				console.log(player);
+				// console.log("播放停止中");
+				// console.log(player);
 			},
 			// 视频已开始播放
 			onPlayerPlaying(player) {
-				console.log("开始播放了");
-				console.log(player);
+				// console.log("开始播放了");
+				// console.log(player);
 			},
 			// 当播放器在当前播放位置下载数据时触发
 			onPlayerLoadeddata(player) {
-				console.log("开始下载数据");
-				console.log(player);
+				// console.log("开始下载数据");
+				// console.log(player);
 			},
 			// 当前播放位置发生变化时触发
 			onPlayerTimeupdate(player) {
 				console.log("播放位置变化了");
 				console.log(player);
-				let timeDisplay = player.currentTime();
+				let timeDisplay = player.currentTime()
 				if(this.wancheng == false){
 					if (timeDisplay - this.currentTime > 1) {
 						player.currentTime(this.currentTime > this.maxTime ? this.currentTime : this.maxTime);
@@ -128,14 +139,14 @@
 					this.currentTime = player.currentTime();
 					this.maxTime = this.currentTime > this.maxTime ? this.currentTime : this.maxTime;
 				}else{
-					this.currentTime = player.currentTime();
+					this.currentTime = timeDisplay
 				}
 				
 			},
 			//播放状态改变
 			playerStateChanged(playerCurrentState) {
-				console.log("播放状态变化了");
-				console.log(playerCurrentState);
+				// console.log("播放状态变化了");
+				// console.log(playerCurrentState);
 			},
 			// 手动暂停视频的播放
 			pause() {

src/views/jianlirenyuan/chengji/index.vue

@@ -61,7 +61,7 @@
 					qici:"",
 					type:""
 				},
-				loading:false
+				loading:false,
 			}
 		},
 		created() {

src/views/jianlirenyuan/peixunList/index.vue

@@ -32,8 +32,8 @@
 			<el-table-column prop="address" label="状态" align="center">
 				<template slot-scope="scope">
 					<el-button size="mini" type="text" icon="el-icon-coin" style="color:#F56C6C ;" @click="studyShow = true" v-if="scope.row.feeflg == 0">缴费</el-button>
-					<el-button size="mini" type="text" icon="el-icon-reading" @click="studyShow = true" v-else-if="scope.row.feeflg == 1 && scope.row.wanchengflg == 0 ">开始学习</el-button>
-					<el-button size="mini" type="text" icon="el-icon-edit" style="color:#E6A23C;" @click="studyShow = true" v-else-if="scope.row.feeflg == 1 && scope.row.wanchengflg == 1">开始考试</el-button>
+					<el-button size="mini" type="text" icon="el-icon-reading" @click="ksxx(scope.row)" v-else-if="scope.row.feeflg == 1 && scope.row.wanchengflg == 0 ">开始学习</el-button>
+					<el-button size="mini" type="text" icon="el-icon-edit" style="color:#E6A23C;" @click="ksxx(scope.row)" v-else-if="scope.row.feeflg == 1 && scope.row.wanchengflg == 1">开始考试</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -70,8 +70,8 @@
 			</div>
 
 		</div>
-		<el-dialog title="继续教育学习" :visible.sync="studyShow" fullscreen>
-			<xuexi></xuexi>
+		<el-dialog title="继续教育学习" :visible.sync="studyShow" fullscreen destroy-on-close :before-close="studyOver">
+			<xuexi :classData="classData"></xuexi>
 		</el-dialog>
 	</div>
 </template>
@@ -89,7 +89,8 @@
 		data() {
 			return {
 				tableData: [],
-				studyShow: false
+				studyShow: false,
+				classData:null,
 			}
 		},
 		created() {
@@ -100,6 +101,14 @@
 				getJxjy().then(res=>{
 					this.tableData = res.data
 				})
+			},
+			ksxx(row){
+				console.log(row)
+				this.classData = row
+				this.studyShow = true
+			},
+			studyOver(){
+				this.studyShow = false
 			}
 		}
 	}

src/views/qiye/qiyeInfo/index.vue

@@ -0,0 +1,149 @@
+<template>
+	<div class="app-container">
+		<el-form :model="form" ref="form" label-width="0px">
+			<el-row >
+				<el-col :span="24" class="m-b-20">
+					<el-descriptions class="margin-top" title="基本信息" :column="2" border>
+						<el-descriptions-item label="企业名称">
+							<el-form-item prop="UserName">
+								<el-input v-model="form.UserName" placeholder="请输入企业名称" />
+							</el-form-item>
+						</el-descriptions-item>
+						<el-descriptions-item label="用 户 名">
+							<el-form-item prop="UserName">
+								<el-input v-model="form.UserName" placeholder="请输入企业名称" />
+							</el-form-item>
+						</el-descriptions-item>
+						<el-descriptions-item label="负责人姓名">
+							<el-form-item prop="UserName">
+								<el-input v-model="form.UserName" placeholder="请输入企业名称" />
+							</el-form-item>
+						</el-descriptions-item>
+						<el-descriptions-item label="手机号码 ">
+							<el-form-item prop="UserName">
+								<el-input v-model="form.UserName" placeholder="请输入企业名称" />
+							</el-form-item>
+						</el-descriptions-item>
+						<el-descriptions-item label="电子邮箱">
+							<el-form-item prop="UserName">
+								<el-input v-model="form.UserName" placeholder="请输入企业名称" />
+							</el-form-item>
+						</el-descriptions-item>
+						<el-descriptions-item label="邮政编码">
+							<el-form-item prop="UserName">
+								<el-input v-model="form.UserName" placeholder="请输入企业名称" />
+							</el-form-item>
+						</el-descriptions-item>
+						<el-descriptions-item label="通讯地址">
+							<el-form-item prop="UserName">
+								<el-input v-model="form.UserName" placeholder="请输入企业名称" />
+							</el-form-item>
+						</el-descriptions-item>
+						<el-descriptions-item label="营业执照">
+							<el-form-item prop="UserName">
+								<el-input v-model="form.UserName" placeholder="请输入企业名称" />
+							</el-form-item>
+						</el-descriptions-item>
+					</el-descriptions>
+				</el-col>
+				<el-col :span="24" class="m-b-20">
+					<el-descriptions class="margin-top" title="开票信息" :column="2" border>
+						<el-descriptions-item label="注" :span="2">
+							开票类型选择“增值税普通发票”，可只填写开票单位、纳税人识别号与邮箱，“增值税专用发票”需完整填写下列除邮箱外全部信息
+						</el-descriptions-item>
+						<el-descriptions-item label="开票类型">
+							<el-form-item prop="UserName">
+								<el-input v-model="form.UserName" placeholder="请输入企业名称" />
+							</el-form-item>
+						</el-descriptions-item>
+						<el-descriptions-item label="开票方式">
+							<el-form-item prop="UserName">
+								<el-input v-model="form.UserName" placeholder="请输入企业名称" />
+							</el-form-item>
+						</el-descriptions-item>
+						<el-descriptions-item label="开票单位">
+							<el-form-item prop="UserName">
+								<el-input v-model="form.UserName" placeholder="请输入企业名称" />
+							</el-form-item>
+						</el-descriptions-item>
+						<el-descriptions-item label="纳税人识别号">
+							<el-form-item prop="UserName">
+								<el-input v-model="form.UserName" placeholder="请输入企业名称" />
+							</el-form-item>
+						</el-descriptions-item>
+						<el-descriptions-item label="注册地址">
+							<el-form-item prop="UserName">
+								<el-input v-model="form.UserName" placeholder="请输入企业名称" />
+							</el-form-item>
+						</el-descriptions-item>
+						<el-descriptions-item label="注册电话">
+							<el-form-item prop="UserName">
+								<el-input v-model="form.UserName" placeholder="请输入企业名称" />
+							</el-form-item>
+						</el-descriptions-item>
+						<el-descriptions-item label="开户银行">
+							<el-form-item prop="UserName">
+								<el-input v-model="form.UserName" placeholder="请输入企业名称" />
+							</el-form-item>
+						</el-descriptions-item>
+						<el-descriptions-item label="银行账号">
+							<el-form-item prop="UserName">
+								<el-input v-model="form.UserName" placeholder="请输入企业名称" />
+							</el-form-item>
+						</el-descriptions-item>
+					</el-descriptions>
+				</el-col>
+				<el-col :span="24">
+					<el-descriptions class="margin-top" title="邮寄信息" :column="2" border>
+						<el-descriptions-item label="收件人姓名">
+							<el-form-item prop="UserName">
+								<el-input v-model="form.UserName" placeholder="请输入企业名称" />
+							</el-form-item>
+						</el-descriptions-item>
+						<el-descriptions-item label="收件人手机">
+							<el-form-item prop="UserName">
+								<el-input v-model="form.UserName" placeholder="请输入企业名称" />
+							</el-form-item>
+						</el-descriptions-item>
+						<el-descriptions-item label="邮寄地址">
+							<el-form-item prop="UserName">
+								<el-input v-model="form.UserName" placeholder="请输入企业名称" />
+							</el-form-item>
+						</el-descriptions-item>
+						<el-descriptions-item label="邮政编码">
+							<el-form-item prop="UserName">
+								<el-input v-model="form.UserName" placeholder="请输入企业名称" />
+							</el-form-item>
+						</el-descriptions-item>
+					</el-descriptions>
+				</el-col>
+				<el-col :span="24">
+					<div class="flex-jc">
+						
+					</div>
+				</el-col>
+			</el-row>
+		</el-form>
+	</div>
+</template>
+
+<script>
+	export default {
+		name: "QiyeInfo",
+		data() {
+			return {
+				form: {}
+			}
+		},
+		created() {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>

src/views/xiehui/jxjy/RubricInfo/index.vue

@@ -64,34 +64,6 @@
 					<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-			<!-- <el-table-column label="培训类别" align="center" prop="SubjectID">
-				<template slot-scope="scope">
-					<dict-tag :options="dict.type.jxjy_zhuanye" :value="scope.row.SubjectID" />
-				</template>
-			</el-table-column>
-			
-			
-			<el-table-column label="试题难度" align="center" prop="TestDiff" />
-			<el-table-column label="选项数目" align="center" prop="OptionNum" />
-			<el-table-column label="试题分数" align="center" prop="TestMark" />
-			<el-table-column label="${comment}" align="center" prop="TestFileName" />
-			<el-table-column label="${comment}" align="center" prop="TestFile" />
-			<el-table-column label="试题选项" align="center" prop="OptionContent" />
-			<el-table-column label="正确选项" align="center" prop="StandardAnswer" />
-			<el-table-column label="试题解析" align="center" prop="TestParse" />
-			<el-table-column label="${comment}" align="center" prop="CreateUserID" />
-			<el-table-column label="${comment}" align="center" prop="CreateDate" width="180">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.CreateDate, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
-			
-			<el-table-column label="更新者" align="center" prop="updateBy" />
-			<el-table-column label="更新时间" align="center" prop="updateTime" width="180">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column> -->
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot-scope="scope">
 					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -470,8 +442,6 @@
 			},
 			//多选答案选择
 			chooseDa(i,e){
-				console.log(i)
-				console.log(e)
 				if(e==true){
 					this.form.daAn.push(this.abc[i-1])
 					this.form.checks[i-1] = true 
@@ -480,8 +450,6 @@
 					let index = this.form.daAn.findIndex(obj=> obj == this.abc[i-1]  )
 					this.form.daAn.splice(index,1)
 				}
-				console.log(this.form.daAn)
-				console.log(this.form.checks)
 				this.$forceUpdate()
 				this.$refs["form"].validateField("daAn")
 			},