Merge branch 'deploy' of http://git.quantgroup.cn/ui/recruiting-management into ckeditor

Conflicts:
	src/components/home.vue
	src/page/resume/allResume.vue
	src/page/resume/channel.vue

index.html

@@ -10,7 +10,7 @@
     <div id="app"></div>
     <!-- built files will be auto injected -->
   </body>
-  <script src="static/ckeditor/ckeditor.js" type="text/javascript" charset="utf-8"></script>
+  <script src="/static/ckeditor/ckeditor.js" type="text/javascript" charset="utf-8"></script>
    <script>
    // window.CKEDITOR_BASEPATH = 'http://example.com/static/';
   </script>

src/api/resume.server.js

@@ -116,7 +116,7 @@ export function uploadimage() {
 // 发送邮件
 export function sendEmail(parmars) {
     return axios.post(`${sapi}/api/sendMail/sendEmailTemplate`,parmars,{headers: {
-        // 'Content-Type':'multipart/form-data',
+        'Content-Type':'multipart/form-data',
         // 'Content-Disposition':'multipart/form-data'
         // 'Content-Type':'application/json'
     }})

src/components/ckeditor.vue

 <template>
     <div>
-        <textarea id="editor" rows="10" cols="80" v-model="editorValue"></textarea>
+      <textarea id="editor" rows="10" cols="80"></textarea>
     </div>
 </template>
 <script type="text/ecmascript-6">
@@ -31,21 +31,23 @@
     },
     data() {
       return {
-        editorValue : this.value
+        isInit: false
       };
     },
+    watch: {
+      value:{
+        deep: true,
+        immediate:true,
+        handler(value) {
+          this.isInit&&this.editor.setData(value.value)
+        }
+      }
+    },
     mounted() {
       this.init()
-      console.log(3, this.value)
     },
     beforeDestroy() {
     },
-    computed: {},
-    watch: {
-      value:function (value) {
-         this.editor.setData()
-      }
-    },
     methods: {
       init () {
         CKEDITOR.replace('editor', {
@@ -57,15 +59,12 @@
           filebrowserUploadMethod: 'form'
           });
           this.editor = CKEDITOR.instances.editor;
-        this.editor.on( 'change', ( evt ) =>{
-            // getData() returns CKEditor's HTML content.
-          this.$emit('getValue', evt.editor.getData())
-        });
-      },
+          setTimeout(()=> {
+            this.isInit = true
+          }, 1000)
       },
-    watch:{
-      value: function(value) {
-        this.editor.setData(value)
+      getValue(){
+        return this.editor.getData()
       }
     },
     components: {}

src/components/home.vue

@@ -9,7 +9,7 @@
             <Icon :type="menu.icon" style="font-size:20px;font-weight:bold"/>
             {{menu.item}}
           </template>
-          <MenuItem v-for="child in menu.child" :key="child.name" :name="child.name" @click="go" :active-name="levelThreeName">{{child.item}}</MenuItem>
+          <MenuItem v-for="(child,index) in menu.child" :key="index" :name="child.name" @click="go" :active-name="levelThreeName">{{child.item}}</MenuItem>
         </Submenu>
         </template>
       </Menu>
@@ -54,7 +54,7 @@ import localstorage from '../service/localstorage.service.js'
         xiabiao:'',
         itemSelect:'',
         type:'',
-        levelOneName: '',
+        levelOneName: '1',
         levelTwoName: ['1-1', '2-1', '3-1', '4-1'],
         levelThreeName: '1-1-1',
         menuList: [
@@ -164,15 +164,15 @@ import localstorage from '../service/localstorage.service.js'
       selectMenu(name, refesh) {
         // // refesh是否为刷新页面
         this.levelOneName = name
-        const menus = this.menuList.filter(v => name === v.name)[0]
-        this.childMenu = menus&&menus.child ? menus.child : this.menuList[0].child
+        const menus = this.menuList.filter(v => name === v.name)
+        this.childMenu = menus.length >0? menus[0].child : this.menuList[0].child
         if (!refesh) { // 点击菜单默认展示第一个菜单
           this.levelTwoName = []
-          let initName = this.getInitName(name, menus)
+          let initName = this.getInitName(name, menus[0])
           this.levelTwoName.push(initName.levelTwoName)
           this.levelThreeName = initName.levelThreeName
         }
-        if (menus&&menus.loadMenu) { // 简历管理模块需要加载渠道简历
+        if (menus[0].loadMenu) { // 简历管理模块需要加载渠道简历
           this.getChannelMenu()
         }
         if (refesh&&this.$route.path.indexOf('channel') > -1) {

src/page/login/login.vue

@@ -14,12 +14,12 @@
                   <div class="login_content">
                         <Form ref="formInline" :model="formInline" :rules="ruleInline" style="height:161px">
                             <FormItem prop="user" style="height:60px">
-                                <Input type="text" v-model="formInline.user" placeholder="请输入11位默认手机号" class="wordStyle" size="large">
+                                <Input type="text" v-model="formInline.user" placeholder="请输入账号" class="wordStyle" size="large">
                                     <Icon type="ios-person-outline" slot="prepend" ></Icon>
                                 </Input>
                             </FormItem>
                             <FormItem prop="password">
-                                <Input type="password" v-model="formInline.password" placeholder="请输入默认密码" class="wordStyle" @keyup.enter.native='login' size="large">
+                                <Input type="password" v-model="formInline.password" placeholder="请输入密码" class="wordStyle" @keyup.enter.native='login' size="large">
                                     <Icon type="ios-lock-outline" slot="prepend"></Icon>
                                 </Input>
                                 <span style="color:red;margin-top;5px" v-show="noteconTime==true">{{notecontent}}</span>

src/page/resume/resumeDetail.vue

@@ -137,11 +137,14 @@ export default {
       reList:[],
       downresume:'',
       detialID:'',
+      showBtn:'',
     }
   },
    methods: {
         getDETAIL(){
           this.detialID=this.$route.query.id
+          // this.showBtn=this.$router.query.noShowBtn
+          // console.log(this.showBtn)
           let parmars={
             resumeId:this.$route.query.id
           }

src/service/util.js

+export function _debounce (fn, delay) {
+  let timer = null
+  delay = delay || 200
+
+  return function () {
+    let args = arguments
+
+    if (timer) {
+      clearTimeout(timer)
+    }
+
+    timer = setTimeout(function () {
+      timer = null
+      fn.apply(this, args)
+    }.bind(this), delay)
+  }
+}
+
+export function _throttle (fn, interval) {
+  let last = null
+  let timer = null
+  interval = interval || 200
+
+  return function () {
+    let self = this
+    let args = arguments
+    let now = +new Date()
+    if (last && now - last < interval) {
+      clearTimeout(timer)
+      timer = setTimeout(function () {
+        last = now
+        fn.apply(self, args)
+      }, interval)
+    } else {
+      last = now
+      fn.apply(self, args)
+    }
+  }
+}
\ No newline at end of file

static/ckeditor/config.js

@@ -10,7 +10,6 @@ CKEDITOR.editorConfig = function( config ) {
     config.toolbarGroups = [
 		{ name: 'clipboard', groups: [ 'clipboard', 'undo' ] },
 		{ name: 'styles', groups: [ 'styles' ] },
-		{ name: 'document', groups: [ 'mode', 'document', 'doctools' ] },
 		{ name: 'forms', groups: [ 'forms' ] },
 		{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
 		{ name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi', 'paragraph' ] },
@@ -20,11 +19,12 @@ CKEDITOR.editorConfig = function( config ) {
 		{ name: 'tools', groups: [ 'tools' ] },
 		{ name: 'editing', groups: [ 'find', 'selection', 'spellchecker', 'editing' ] },
 		{ name: 'others', groups: [ 'others' ] },
-		{ name: 'about', groups: [ 'about' ] }
+		{ name: 'about', groups: [ 'about' ] },
+		{ name: 'document', groups: [ 'mode', 'document', 'doctools' ] },
 	];
 
-	config.removeButtons = 'Cut,Copy,Paste,PasteText,PasteFromWord,Source,Save,Templates,NewPage,Preview,Print,About,ShowBlocks,Flash,PageBreak,Iframe,Anchor,SelectAll,BidiLtr,BidiRtl,Language,CreateDiv,Superscript,Subscript,Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField,Find,Replace;Smiley,Smiley,Replace';
-    config.removeDialogTabs = 'image:advanced;link:advanced';
+	config.removeButtons = 'Cut,Copy,Paste,PasteText,PasteFromWord,Save,Templates,NewPage,Preview,Print,About,ShowBlocks,Flash,PageBreak,Iframe,Anchor,SelectAll,BidiLtr,BidiRtl,Language,CreateDiv,Superscript,Subscript,Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField,Find,Replace;Smiley,Smiley,Replace';
+    config.removeDialogTabs = 'image:advanced;link:advanced;flash:advanced;editdiv:advanced; creatediv:advanced;';
     config.removePlugins = 'elementspath,resize'; // 移除编辑器底部状态栏显示的元素路径和调整编辑器大小的按钮
     config.image_previewText = ' '; // 图片信息面板预览区内容的文字内容，默认显示CKEditor自带的内容
     config.removeDialogTabs = 'image:advanced;image:Link'; // 移除图片上传页面的'高级','链接'页签
@@ -32,3 +32,4 @@ CKEDITOR.editorConfig = function( config ) {
     config.removePlugins = 'image,elementspath,resize';// 移除编辑器底部状态栏显示的元素路径和调整编辑器大小的按钮,基础图片插件
 
 };
+// creatediv:advanced;
\ No newline at end of file