Merge branch 'dev-prof-phrase1.0-0720' into release

* dev-prof-phrase1.0-0720:
  新建学科取消返回
  删除下一步弹窗
  支持搜索
  修改样式
  修改样式问题
  学科下架添加发布按钮
  修改文案
  对接cme职称考接口
  是否有试看限制
  对接学科列表
  添加学科页面和职称考页面
  添加试看的配置
  环境变量等
  新的职称考页面

# Conflicts:
#	src/views/layout/slidebar.vue

package.json

@@ -29,7 +29,6 @@
     "jsencrypt": "^3.0.0-rc.1",
     "jspdf": "^1.5.3",
     "node-sass": "^4.9.2",
-    "jspdf": "^1.5.3",
     "pdfh5": "^1.3.9",
     "qrcode": "^1.3.3",
     "showdown": "^1.6.4",

src/router/router.js

@@ -13,6 +13,9 @@ const editManager = r => require.ensure([], () => r(require('../views/education/
 const itemRole = r => require.ensure([], () => r(require('../views/system/item-role.vue')), 'item-role')
 const msgPush = r => require.ensure([], () => r(require('../views/msgpush/msg-push.vue')), 'msg-push')
 const editCme = r => require.ensure([], () => r(require('../views/education/edit-cme.vue')), 'edit-cme')
+const editProfessionalExam = r => require.ensure([], () => r(require('../views/education/edit-professional-exam.vue')), 'edit-professional-exam')
+const subjectManager = r => require.ensure([], () => r(require('../views/education/subject-manager.vue')), 'subject-manager')
+const editSubject = r => require.ensure([], () => r(require('../views/education/edit-subject.vue')), 'edit-subject')
 
 import patientsRouters from './patients'
 import followRouters from './follow'
@@ -91,6 +94,15 @@ export default [{
         },{
             path: '/edit-cme',
             component: editCme
+        },{
+          path: '/edit-professional-exam',
+          component: editProfessionalExam
+        },{
+          path: '/subject-manager',
+          component: subjectManager
+        },{
+          path: '/edit-subject',
+          component: editSubject
         },{
             path: '/item-component',
             component: itemComponent

src/utils-o/utils.js

@@ -305,7 +305,8 @@ const GetLocalIPAddress = () => {
     //     // check();
     // });
     // $.getScript('http://pv.sohu.com/cityjson?ie=utf-8', function () {
-    return returnCitySN["cip"];
+    // return returnCitySN["cip"];
+    return '';
     // });
     // return ip;
 };

src/utils/fetch.js

@@ -54,9 +54,9 @@ service.interceptors.request.use(config => {
     }
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境qgit
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
-      config.headers['token'] = '28731437A7EF482ABC5DF4D4DB13B3ED';
+      config.headers['token'] = 'B66468F48B5847DE8A5A5CFB0F79022A';
 
-      // config.headers['token'] = localStorage.getItem('storageToken')
+      config.headers['token'] = localStorage.getItem('storageToken')
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

src/utils/utils.js

@@ -307,7 +307,8 @@ const GetLocalIPAddress = () => {
     //     // check();
     // });
     // $.getScript('http://pv.sohu.com/cityjson?ie=utf-8', function () {
-    return returnCitySN["cip"];
+    // return returnCitySN["cip"];
+    return '';
     // });
     // return ip;
 };
@@ -803,3 +804,7 @@ export const setOptionLabel = (self,selfModel,selfEId,selfEName,list,listEId,lis
     }
     return;
 };
+
+export function deepCopy(obj) {
+  return obj ? JSON.parse(JSON.stringify(obj)) : obj;
+}

src/views/education/create-component.vue

@@ -265,7 +265,27 @@
                                                                     </el-select>
                                                                 </el-form-item>
                                                             </el-col>
+                                                            <el-col :span="10">
+                                                                <el-form-item label="是否有试看限制">
+                                                                    <el-radio-group v-model="item3.content5">
+                                                                        <el-radio label="1">是</el-radio>
+                                                                        <el-radio label="0">否</el-radio>
+                                                                    </el-radio-group>                                                           
+                                                                    <!-- <el-radio-group v-if="!item3.content5" v-model="item3.content5">
+                                                                        <el-radio label="1">是</el-radio>
+                                                                        <el-radio label=null>否1</el-radio>
+                                                                        <el-radio label=undefind>否1</el-radio>
+                                                                    </el-radio-group> -->
+                                                                </el-form-item>
+                                                            </el-col>
+                                                            <el-col :span="10" v-if="item3.content5 == 1">
+                                                                <el-form-item label="试看时长">
+                                                                    <el-input maxlength="8" type="input" rows="4" v-model="item3.content6" size="small" placeholder="请输入试看时长" style="width:300px"></el-input>
+                                                                    <span class="word-num">(秒)</span>
+                                                                </el-form-item>                                                                   
+                                                            </el-col>
                                                         </el-row>
+
                                                     </div>
                                                 </div>
                                             </div>
@@ -725,6 +745,10 @@ export default {
             vm.GET('portal/portalComponent/OnlineExamList').then((res) => {
                 if( res.code == '000000') {
                     vm.testIdSelect = res.data.onlineExamList;
+                    vm.testIdSelect.unshift({
+                        id: 0,
+                        onlineExamName: '无考试'
+                    })
                     for(let i=0; i<vm.testIdSelect.length; i++) {
                         let type = vm.testIdSelect[i].isNeedApproval;  // isNeedApproval: 0 全部考试 1 需审核考试
                         if( type && type == 1 ) {  
@@ -763,6 +787,10 @@ export default {
             vm.GET('portal/portalComponent/CourseList').then((res) => {
                 if( res.code == '000000') {
                     vm.courseIdSelect = res.data.courseList
+                    vm.courseIdSelect.unshift({
+                        id: 0,
+                        name: '无课程'
+                    })
                 }else {
 					vm.$message.info(res.message)
 				}
@@ -951,7 +979,9 @@ export default {
                             content1: '',
                             content2: '',
                             content3: '0',
-                            content4: ''
+                            content4: '',
+                            content5: 0,
+                            content6: 0,
                         }]
                     })
                 }else if(item.partConfigModelList[i].type == 2) {  // 课程
@@ -969,7 +999,11 @@ export default {
                             id: '',
                             seqNo: '',
                             content1: '',
-                            content2: ''
+                            content2: '',
+                            content3: '0',
+                            content4: '',
+                            content5: '0',
+                            content6: '',
                         }]
                     })
                 }

src/views/education/item-manager.vue

@@ -223,6 +223,7 @@
           <el-radio :label="1">普通项目</el-radio>
           <el-radio :label="2">CME项目</el-radio>
           <el-radio :label="3">开放模板</el-radio>
+          <el-radio :label="5">职称考试</el-radio>
         </el-radio-group>
         <span slot="footer" class="dialog-footer">
           <el-button @click="centerDialogVisible = false">取 消</el-button>
@@ -465,6 +466,9 @@ export default {
     toTemplatePage(isPreview = 0) {
       this.$router.push("template-open?projectType=3&isPreview=" + isPreview);
     },
+    toProfessionalExamPage(isPreview = 0) {
+      this.$router.push("edit-professional-exam?projectType=2&isPreview=" + isPreview);
+    },
     toEditCustomPage(isPreview = 0) {
       this.setKind(0);
       this.$router.push("edit-custom?projectType=4&isPreview=" + isPreview);
@@ -477,13 +481,15 @@ export default {
       this.newProjectType = 1;
     },
     handleCreateProject() {
+      // 1 普通项目 2 CME项目 5 职称考试（对应的projectType仍为2）
       if (this.newProjectType == 1) {
-        // 1 普通项目 2 CME项目
         this.toPage();
       } else if (this.newProjectType == 2) {
         this.toCmePage();
       } else if (this.newProjectType == 3) {
         this.toTemplatePage();
+      } else if (this.newProjectType == 5) {
+        this.toProfessionalExamPage();
       }
     },
 
@@ -693,6 +699,17 @@ export default {
               this.formInline.pageNo
           );
         } else if (row.projectType === 2) {
+          // cmeType：3为职称考，其他为原cme
+          if (row.cmeType === 3) {
+            this.$router.push(
+            "edit-professional-exam?projectType=2&projectId=" +
+            projectId +
+            "&level=" +
+            level +
+            "&pageNum=" +
+            this.formInline.pageNo
+          );
+          } else {
             this.$router.push(
               "edit-cme?projectType=2&projectId=" +
               projectId +
@@ -701,6 +718,7 @@ export default {
               "&pageNum=" +
               this.formInline.pageNo
             );
+          }
         } else if (row.projectType === 3) {
           this.$router.push(
             "template-open?projectType=3&projectId=" +

src/views/layout/slidebar.vue

@@ -412,6 +412,12 @@
           index: 'advert-simple-manage'
         };
 
+        const subjectManager = {
+          title: '学科管理',
+          icon: 'el-icon-setting',
+          index: 'subject-manager'
+        };
+
         const eduRole = {
           title: '角色权限',
           icon: 'el-icon-menu',
@@ -471,7 +477,7 @@
           ]
         };
 
-
+        vm.items[1].subs.push(subjectManager);
         vm.items[1].subs.push(itemComponent);
         vm.items[1].subs.push(templateManager);
         vm.items[1].subs.push(followSider);
@@ -519,6 +525,7 @@
     bottom: 0;
     width: 255px;
     background: #06232C;
+    overflow-y: scroll;
     .el-menu {
       background: #06232C;
       border-right: none;