添加学科页面和职称考页面

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

@@ -5,7 +5,7 @@ export const containObject = function(...obj1) {
     return obj
 }
 // 获取页面自适应高度
-export function resizeHeight(cMinusHeight = 152, iMinuxHeight = 210, refHeightId = 'slidebar-container', 
+export function resizeHeight(cMinusHeight = 152, iMinuxHeight = 210, refHeightId = 'slidebar-container',
     containerHeightId = 'screenSet'){
     let containerHeight = p_getElm(refHeightId).getBoundingClientRect().height - 15
     p_getElm(containerHeightId).style.height = containerHeight - cMinusHeight + 'px'
@@ -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'] = '28731437A7EF482ABC5DF4D4DB13B3ED';
 
-      // config.headers['token'] = localStorage.getItem('storageToken')
+      config.headers['token'] = localStorage.getItem('storageToken')
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

src/utils/utils.js

@@ -7,7 +7,7 @@ import axios from 'axios';
 // }
 
 // 获取页面自适应高度
-export function resizeHeight(cMinusHeight = 152, iMinuxHeight = 210, refHeightId = 'slidebar-container', 
+export function resizeHeight(cMinusHeight = 152, iMinuxHeight = 210, refHeightId = 'slidebar-container',
     containerHeightId = 'screenSet'){
     let containerHeight = p_getElm(refHeightId).getBoundingClientRect().height - 15
     p_getElm(containerHeightId).style.height = containerHeight - cMinusHeight + 'px'
@@ -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/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=5&isPreview=" + isPreview);
+    },
     toEditCustomPage(isPreview = 0) {
       this.setKind(0);
       this.$router.push("edit-custom?projectType=4&isPreview=" + isPreview);
@@ -478,12 +482,14 @@ export default {
     },
     handleCreateProject() {
       if (this.newProjectType == 1) {
-        // 1 普通项目 2 CME项目
+        // 1 普通项目 2 CME项目 5 职称考试
         this.toPage();
       } else if (this.newProjectType == 2) {
         this.toCmePage();
       } else if (this.newProjectType == 3) {
         this.toTemplatePage();
+      } else if (this.newProjectType == 5) {
+        this.toProfessionalExamPage();
       }
     },
 
@@ -716,6 +722,15 @@ export default {
               projectId + "&level=" + level + "&pageNum=" + this.formInline.pageNo +
               "&projectStatus=" + row.projectStatus
           );
+        } else if (row.projectType === 5) {
+          this.$router.push(
+            "edit-professional-exam?projectType=5&projectId=" +
+              projectId +
+              "&level=" +
+              level +
+              "&pageNum=" +
+              this.formInline.pageNo
+          );
         }
       } else if (type === 7) {
         //提醒审核

src/views/layout/slidebar.vue

@@ -191,7 +191,7 @@
           //       index: 'credit-send-manage'
           //     },
           //   ]
-          // },         
+          // },
         ],
         outsideItems: [  // 外部用户 路由
           {
@@ -361,7 +361,7 @@
             }
           ]
         }
-        
+
         const message = {
           title: '消息推送',
           icon: 'el-icon-message',
@@ -410,6 +410,12 @@
           index: 'advert-simple-manage'
         };
 
+        const subjectManager = {
+          title: '学科管理',
+          icon: 'el-icon-setting',
+          index: 'subject-manager'
+        };
+
         const eduRole = {
           title: '角色权限',
           icon: 'el-icon-menu',
@@ -441,7 +447,7 @@
               title: '学分发放管理',
               icon: 'el-icon-document',
               index: 'credit-send-manage'
-            },            
+            },
             // {
             //   title: '外部资源管理',
             //   icon: 'el-icon-document',
@@ -469,7 +475,8 @@
           ]
         };
 
-        
+
+        vm.items[1].subs.push(subjectManager);
         vm.items[1].subs.push(itemComponent);
         vm.items[1].subs.push(templateManager);
         vm.items[1].subs.push(followSider);