产品分化调整

src/layout/components/Title.vue

@@ -2,15 +2,18 @@
 <template>
     <div class="avatar-container" style="left:40px;" v-if="isShow">
         <div class="titleInner">长安玖琏</div>
-        <div class="titleInner" style="margin-left:40px;">城市轨道交通实训平台</div>
+        <img class="logo" :src="logoImg" />
+        <div class="titleInner" style="margin-left:80px;">城市轨道交通实训平台</div>
     </div>
 </template>
 <script>
 import { getSessionStorage } from '@/utils/auth';
+import logoImg from '@/assets/logo_changan.png';
 export default {
     data() {
 		return {
             isShow:false,
+            logoImg: logoImg
 		};
   },
   mounted(){
@@ -31,7 +34,15 @@ export default {
 //     right: 35px;
 // }
 .titleInner{
-display:inline-block;
+    display:inline-block;
-color: #fff;
+    color: #fff;
+    font-size:30px;
+    font-weight:bold;
+}
+.logo{
+    position: absolute;
+    width: 40px;
+    height: 40px;
+    top: 10px;
 }
 </style>

src/views/demonstration/detail/index.vue

@@ -2,8 +2,8 @@
   <el-card v-loading="loading">
     <div slot="header" style="text-align: center;">
       <span><b>{{ $t('demonstration.simulationName') + courseModel.name }}</b></span>
-    </div>
+    </div >
-        <div class="simulation-detail">
+        <div class="simulation-detail"  :style="{ height: height-120 +'px' }">
           <p class="list-item">
             <span class="list-label">{{ $t('demonstration.productDescription') }}</span>
             <span class="list-elem">{{ courseModel.remarks }}</span>
@@ -11,7 +11,7 @@
           <p class="list-item">
             <span class="list-label">{{ $t('global.permissionList') }}</span>
           </p>
-          <limit-list :ref="`limit_${this.prodId}`" :course-model="courseModel" />
+          <limit-list :ref="`limit`" :course-model="courseModel" />
         </div>
       <div class="btn-buy">
         <el-button type="success" @click="buy">{{ $t('global.buy') }}</el-button>
@@ -79,7 +79,6 @@ export default {
 			return this.courseModel.prdType === '03' && this.hasPermssion && !this.jointShow;
 		},
 		isInRoom() {
-            console.log(this.courseModel.prdType,this.hasPermssion,this.jointShow);
 			return this.courseModel.prdType === '03' && this.hasPermssion && this.jointShow;
 		},
 		mapId() {
@@ -249,13 +248,13 @@ export default {
 		transfer() {
 			this.buttonLoading = false;
 			if (this.$refs) {
-				this.$refs[`limit_${this.currentPrdCode}`][0].transfer(this.courseModel);
+				this.$refs[`limit`].transfer(this.courseModel);
 			}
 		},
 		distribute() {
 			this.buttonLoading = false;
 			if (this.$refs) {
-				this.$refs[`limit_${this.currentPrdCode}`][0].distribute(this.courseModel);
+				this.$refs[`limit`].distribute(this.courseModel);
 			}
 		}
 	}
@@ -294,7 +293,6 @@ export default {
         text-align: center;
         justify-content: center;
         transform: translateY(-20px);
-        margin-top: 30px;
     }
 
     .el-tabs--border-card>.el-tabs__header .el-tabs__item {

src/views/exam/detail/courseDetail.vue

@@ -12,12 +12,27 @@
       <el-tabs v-model="activeName">
         <el-tab-pane :label="this.$t('exam.itemList')" name="first">
           <div v-if="courseModel.detail.length != 0" :style="{ height: height - 230 +'px' }">
-            <el-scrollbar wrap-class="scrollbar-wrapper">
+            <!--<el-scrollbar wrap-class="scrollbar-wrapper">-->
-              <template v-for="item in courseModel.detail">
+              <!--<template v-for="item in courseModel.detail">-->
-                <ul :key="item.code" type="circle">
+                <!--<ul :key="item.code" type="circle">-->
-                  <li @click="toExamDetail(item)">{{ item.name }}</li>
+                  <!--<li @click="toExamDetail(item)">{{ item.name }}</li>-->
-                </ul>
+                <!--</ul>-->
-              </template>
+              <!--</template>-->
+                <el-tree
+                    ref="tree"
+                    :data="courseModel.detail"
+                    node-key="id"
+                    :props="defaultProps"
+                    :filter-node-method="filterNode"
+                    highlight-current
+                    :span="22"
+                    @node-click="clickEvent"
+                >
+                    <span slot-scope="{ node, data }">
+                    <span v-if="node.data.trial" class="el-icon-goods" :style="{color: 'green'}">&nbsp;{{ node.label +'（免费）'}}</span>
+                    <span v-else class="el-icon-sold-out">&nbsp;{{ node.label }}</span>
+                </span>
+                </el-tree>
             </el-scrollbar>
           </div>
           <div v-else class="noList">
@@ -64,7 +79,11 @@ export default {
 				pmsList: []
 			},
 			EffectiveTypeList: [],
-			activeName: 'first'
+			activeName: 'first',
+            defaultProps: {
+                children: 'examDefinitionVOList',
+                label: 'name'
+            },
 		};
 	},
 	computed: {
@@ -142,8 +161,12 @@ export default {
 				this.$refs.limitList.distribute(this.courseModel);
 			}
 		},
-        toExamDetail(item) {
+        clickEvent(obj, data, ele) {
-            this.$router.push(`${UrlConfig.trainingPlatform.examDetail}/${item.id}`);
+            this.$router.push(`${UrlConfig.trainingPlatform.examDetail}/${obj.id}`);
+        },
+        filterNode(value, data) {
+            if (!value) return true;
+            return data.name.indexOf(value) !== -1;
         }
 	}
 };

src/views/exam/detail/examDetail.vue

@@ -44,6 +44,7 @@
     </div>
     <div class="btn-start">
       <el-button :loading="loading" type="primary" @click="exmaStart">{{ $t('exam.startTheExam') }}</el-button>
+      <el-button @click="back" >{{ $t('global.back') }}</el-button>
     </div>
   </el-card>
 </template>
@@ -153,8 +154,8 @@ export default {
 			this.loading = true;
 			getPublishLessonDetail({ id: this.examDetails.lessonId }).then((res) => {
 				this.$router.push({
-					path: `${UrlConfig.exam.pay}/${this.examDetails.lessonId}`,
+					path: `${UrlConfig.trainingPlatform.pay}/${this.examDetails.lessonId}`,
-					query: { permissionType: PermissionType.EXAM, prdCode: res.data.prdCode, mapId: res.data.mapId }
+					query: { permissionType: PermissionType.EXAM,lessonId: this.examDetails.lessonId,prdCode: res.data.prdCode, mapId: res.data.mapId }
 				});
 			}).catch(() => {
 				this.$messageBox(this.$t('error.obtainCourseDetailsFailed'));
@@ -210,6 +211,9 @@ export default {
 			} else {
 				this.loading = false;
 			}
+		},
+        back() {
+            this.$router.back();
         }
 	}
 };

src/views/package/index.vue

@@ -2,6 +2,9 @@
   <div>
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     <select-role ref="selectRole" @reloadTable="reloadTable" />
+    <div class="btn-buy">
+        <el-button type="primary" @click="goBack">返回</el-button>
+    </div>
   </div>
 </template>
 
@@ -193,7 +196,20 @@ export default {
 			if (this.queryList && this.queryList.reload) {
 				this.queryList.reload();
 			}
+		},
+        goBack() {
+		    this.$router.push({ path: `${UrlConfig.trainingPlatform.trainingPlatformHome}` })
         }
 	}
 };
 </script>
+<style>
+    .btn-buy {
+        position: relative;
+        text-align: center;
+        justify-content: center;
+        transform: translateY(-20px);
+        margin-top: 30px;
+        margin-bottom: 20px;
+    }
+</style>

src/views/teach/detail/index.vue

@@ -38,6 +38,10 @@
                     :span="22"
                     @node-click="clickEvent"
                 >
+                    <span slot-scope="{ node, data }">
+                    <span v-if="node.data.trial" class="el-icon-goods" :style="{color: 'green'}">&nbsp;{{ node.label +'（免费）'}}</span>
+                    <span v-else class="el-icon-sold-out">&nbsp;{{ node.label }}</span>
+                </span>
                 </el-tree>
             </el-scrollbar>
           </div>
@@ -155,7 +159,6 @@ export default {
 			}
 		},
         clickEvent(obj, data, ele) {
-		    console.log(obj, data, ele);
             if (obj.type){
                 this.$router.push({ path: `${UrlConfig.trainingPlatform.practical}/${obj.id}/${data.id}`});
             }

src/views/teach/practical/index.vue

@@ -21,6 +21,7 @@
     </div>
     <div class="btn-start">
       <el-button :loading="loading" type="primary" @click="start">{{ $t('teach.startTraining') }}</el-button>
+      <el-button @click="back" >{{ $t('global.back') }}</el-button>
     </div>
   </el-card>
 </template>
@@ -96,6 +97,9 @@ export default {
 				this.loading = false;
 				this.$messageBox(`${this.$t('tip.createSimulationFaild')} : ${error.message}`);
 			});
+		},
+        back() {
+		    this.$router.back();
         }
 	}
 };

src/views/trainingPlatform/demonList.vue

@@ -91,8 +91,8 @@
                 }
             },
             clickEvent(obj, data, ele) {
-                // this.$router.push({ path: `${UrlConfig.trainingPlatform.course}/16`});
+                this.$router.push({ path: `${UrlConfig.trainingPlatform.course}/16`});
-                // return;
+                return;
                 if (data.parent && data.parent.data){
                     this.mapId = data.parent.data.id;
                 }