Merge branch 'master' of http://git.cc-lotus.info/sckj/okc-vue

ruoyi-ui/src/components/PageHeader/index.vue

@@ -5,18 +5,27 @@
 </template>
 
 <script>
+  import { mapGetters } from 'vuex'
 export default {
 	name: 'PageHeader',
 	data() {
 		return {}
 	},
 	computed: {
+    ...mapGetters([
+      'isAdmin',
+    ]),
 		content() {
 			return this.$route.meta.title
 		}
 	},
 	methods: {
 		goBack() {
+		  console.log(this.$router.history.current.path,'this.$router.history.current.path');
+		  if(!this.isAdmin&&this.$router.history.current.path=='/editor')
+      {
+        return
+      }
 			if(this.$router.history.current.path !== '/index'){
 				this.$router.go(-1)
 			}

ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="sidebar-logo-container" :class="{'collapse':collapse}">
     <transition name="sidebarLogoFade">
-      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
+      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" :to=" {path: $route.fullPath}">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
         <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
       </router-link>
-      <router-link v-else key="expand" class="sidebar-logo-link" to="/">
+      <router-link v-else key="expand" class="sidebar-logo-link" :to=" {path: $route.fullPath}">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
         <h1 class="sidebar-title">{{ title }} </h1>
       </router-link>

ruoyi-ui/src/views/editor/courseEdit.vue

@@ -199,7 +199,7 @@
 					<tr>
 						<td colspan="2">
 							<el-form-item label="课程视频文件" prop="fileName">
-								<el-input class="video-ipt" type="text" v-model="videoForm.fileName"  placeholder="请导入ｍｐ４格式的视频文件" disabled />
+								<el-input class="video-ipt" type="text" v-model="videoForm.fileName"  placeholder="请导入ｍｐ４格式的视频文件" :disabled="isDisabled" />
 								<el-button
 									type="info"
 									plain
@@ -402,6 +402,7 @@ export default {
 			videoForm: {},
 			videoFile: null,
 			vLoading: false,
+      isDisabled:true,
 			videoIdForImport: null,
       classroomTypeOpt:[
         {value:'传统教室'},
@@ -481,7 +482,7 @@ export default {
       },
 			videoRules: {
 				region: [
-					{ required: true, message: '所在地区不能为空', trigger: 'blur' }
+					{ required: true, message: '所在地区不能为空', trigger: 'change' }
 				],
 				teacher: [
 					{ required: true, message: '主讲老师不能为空', trigger: 'blur' }
@@ -490,13 +491,13 @@ export default {
 					{ required: true, message: '所在学校不能为空', trigger: 'blur' }
 				],
 				teacherTitle: [
-					{ required: false, message: '教师职称不能为空', trigger: 'blur' }
+					{ required: false, message: '教师职称不能为空', trigger: 'change' }
 				],
 				branch: [
-					{ required: true, message: '学科不能为空', trigger: 'blur' }
+					{ required: true, message: '学科不能为空', trigger: 'change' }
 				],
 				session: [
-					{ required: true, message: '课程学年不能为空', trigger: 'blur' }
+					{ required: true, message: '课程学年不能为空', trigger: 'change' }
 				],
 				className: [
 					{ required: true, message: '课程名称及主题不能为空', trigger: 'blur' }
@@ -625,10 +626,14 @@ export default {
 		getVideo(e) {
 			let file = e.target.files[0],
 				types = ['video/mp4', 'video/ogm', 'video/wmv', 'video/mpg', 'video/webm', 'video/ogv', 'video/mov', 'video/asx', 'video/mpeg', 'video/m4v', 'video/avi']
-			if (types.indexOf(file.type) > -1) {
+      console.log(file.name,'<-------file');
+      if (types.indexOf(file.type) > -1) {
+        this.videoFile = file
+        this.isDisabled=false;
 				this.videoForm.fileName = file.name
-				this.videoFile = file
+        this.isDisabled=true;
 				this.videoForm.videoDur = file.size
+        console.log(this.videoForm,'<-------this.videoForm');
 				this.getDuration(file)
 			} else {
 				this.$modal.msgSuccess('所选文件格式不支持！')

ruoyi-ui/src/views/editor/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="container">
 		<!--<h3 class="project-name">项目名称：{{}}</h3>-->
-		<el-tabs v-model="activeName" @tab-click="handleTab">
+		<el-tabs v-model="activeName" @tab-click="handleTab" :before-leave="beforeLeave">
 			<el-tab-pane label="文档编辑" name="first" v-if="isAdmin">
 				<documentEdit></documentEdit>
 			</el-tab-pane>
@@ -12,10 +12,8 @@
 				<excelEdit></excelEdit>
 			</el-tab-pane>
       <el-tab-pane label="教师发展助手" name="five">
-
       </el-tab-pane>
       <el-tab-pane label="图谱分析平台" name="six">
-
       </el-tab-pane>
 		</el-tabs>
 	</div>
@@ -56,6 +54,11 @@ export default {
       }
 
 		},
+    beforeLeave(activeName, oldActiveName){
+       if(activeName=='five'||activeName=='six'){
+         return false
+       }
+    }
 	},
 }
 </script>

ruoyi-ui/src/views/videoAnalysis/index.vue

@@ -44,9 +44,9 @@
       <!--视频右边工具图标-->
       <div class="v-okc tool-wrap">
         <!--v-hasPermi="['okc:videoPro:remove']"-->
-        <el-button v-if="!disabled" class="tool-btn" plain circle icon="el-icon-plus"  @click="changeProject" />
-        <el-button class="tool-btn" plain circle icon="el-icon-edit"  @click="openDrawer('draw')" />
-        <el-button class="tool-btn" plain circle icon="el-icon-upload2"  @click="openDrawer('export')" />
+        <el-button v-if="!disabled" title="导入视频"  class="tool-btn" plain circle icon="el-icon-plus"  @click="changeProject" />
+        <el-button class="tool-btn" title="绘制图表"  plain circle icon="el-icon-edit"  @click="openDrawer('draw')" />
+        <el-button class="tool-btn" title="导出图表"  plain circle icon="el-icon-upload2"  @click="openDrawer('export')" />
       </div>
 
       <!--视频左边工具图标-->
@@ -693,8 +693,8 @@ export default {
 				if (response.code === 200) {
 					response.rows.forEach((item, index) => {
 						item.orderId = index + 1
-						item.startShowTime = this.timeTranslate(item.startTime)
-						item.endShowTime = this.timeTranslate(item.endTime)
+						item.startShowTime = this.formatTime(item.startTime)
+						item.endShowTime = this.formatTime(item.endTime)
 					})
 					this.history = response.rows
 				}
@@ -721,7 +721,7 @@ export default {
 			if (this.currentRecord) {
 				this.$refs.video.currentTime = Number(this.currentRecord.startTime)
 				this.startTime = Number(this.currentRecord.startTime)
-				this.endTime = 0
+				this.endTime = Number(this.currentRecord.endTime)
 				this.workForm = {
 					id: this.currentRecord.id,
 					behavior: this.currentRecord.behavior,
@@ -836,7 +836,7 @@ export default {
 						return item
 					})
 					this.chartsData.unshift(
-						['时间', 'B1', 'B2', 'B3', 'B4', 'B5', 'B6', 'B7', 'B8', 'B9', 'B10', 'B11', 'B12', 'B13', 'B14', 'B15', 'B16', 'IL', 'II', 'IC', 'IP', 'IA', 'IX', 'TL', 'TI', 'TP', 'ID', 'Verbal', 'Non_media', 'CK', 'PK', 'TK', 'PCK', 'TCK', 'TPK', 'TPACK']
+						['时间', 'B1', 'B2', 'B3', 'B4', 'B5', 'B6', 'B7', 'B8', 'B9', 'B10', 'B11', 'B12', 'B13', 'B14', 'B15', 'B16', 'M1', 'M2', 'M3', 'M4', 'M5', 'M6', 'M7', 'M8', 'M9', 'M10', 'M11', 'M12', 'CK', 'PK', 'TK', 'PCK', 'TCK', 'TPK', 'TPACK']
 					)
 				} else {
 					this.$modal.msgWarning('暂无RC数据！')