Merge branch 'dev-mvp-20200331' of...

Merge branch 'dev-mvp-20200331' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-mvp-20200331

* 'dev-mvp-20200331' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin:
  修改项目结束时间提示
  增加编辑页面的导航跳转

src/components/education/template/templateList.vue

@@ -333,7 +333,7 @@ export default {
   .dialog-list-wrap {
     .el-dialog {
       width: 800px;
-      max-height: 1000px;
+      max-height: 80%;
       overflow: scroll;
     }
     .dialog-line {

src/components/education/template/templateMessage.vue

@@ -76,7 +76,7 @@
                 placeholder="请选择结束时间"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 :picker-options="pickerOptions1"
-                default-time="23:59:59"
+                default-time="00:00:00"
                 style="width: 100%;"
                 :disabled="isPreview==1"
               ></el-date-picker>
@@ -611,6 +611,12 @@ export default {
     },
     // 新增或者更新基本信息
     insertOrupdate(status) {
+
+      if(new Date(vm.formData.projectEndtime).getTime() > new Date(vm.formData.projectBegintime).getTime() + 1000 * 60 * 60 * 24 * vm.formData.expireDay) {
+        vm.$message.warning('项目结束时间应在有效期内');
+        return;
+      }
+     
       if (status) {
         vm.formData.projectStatus = status;
       }

src/utils/fetch.js

@@ -55,7 +55,7 @@ service.interceptors.request.use(config => {
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
       // config.headers['token'] = '29D71EAAB92E4580AFB16A8011BE7206';
-      config.headers['token'] = '5C743005596845EFA33D8BA3117E1CB1';
+      config.headers['token'] = '20A318FC22CA4539BBBF73D50B8ECC45';
       // config.headers['token'] = localStorage.getItem('storageToken')
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')

src/views/education/template-editor.vue

 <template>
   <div class="template-editor-wrap">
-      <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond" :curmbThird="curmbThird"></bread-crumb>
+      <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond" :curmbThird="curmbThird" :jumPathThird="jumPathThird"></bread-crumb>
       
       <div class="add-content screenSet" id="screenSet" v-if="editor">
         <div class="top-lin"></div>
@@ -71,6 +71,7 @@ export default {
     return {
       curmbFirst: "教培项目",
       curmbSecond: "模板管理",
+      jumPathThird: 'template-manager',
       curmbThird: '新建项目模板',
       active: 0,
       fished: false,  // 是到到最后一步

src/views/education/template-open.vue

 <template>
   <div class="template-open-wrap">
-      <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond" :curmbThird="curmbThird"></bread-crumb>
+      <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond" :curmbThird="curmbThird" :jumPathThird="jumPathThird"></bread-crumb>
     
       <div class="add-content screenSet" id="screenSet">
         <div class="top-lin"></div>
@@ -74,6 +74,7 @@ export default {
     return {
       curmbFirst: "教培项目",
       curmbSecond: "项目管理",
+      jumPathThird: 'item-manager',
       curmbThird: '发起项目',
       active: 0,
       formTemplate: {