diff --git a/babel.config.js b/babel.config.js
index 162a3ea..c1b783e 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,3 +1,3 @@
 module.exports = {
-  presets: ["@vue/cli-plugin-babel/preset"],
-};
+  presets: ['@vue/cli-plugin-babel/preset'],
+}
diff --git a/src/App.vue b/src/App.vue
index b809566..6dbb24c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -6,35 +6,35 @@
   </a-config-provider>
 </template>
 <script>
-import zhCN from "ant-design-vue/lib/locale-provider/zh_CN";
-import enquireScreen from "@/utils/device";
+import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN'
+import enquireScreen from '@/utils/device'
 
 export default {
   data() {
     return {
       locale: zhCN
-    };
+    }
   },
   created() {
-    let that = this;
+    let that = this
     enquireScreen(deviceType => {
       // tablet
       if (deviceType === 0) {
-        that.$store.commit("TOGGLE_DEVICE", "mobile");
-        that.$store.dispatch("setSidebar", false);
+        that.$store.commit('TOGGLE_DEVICE', 'mobile')
+        that.$store.dispatch('setSidebar', false)
       }
       // mobile
       else if (deviceType === 1) {
-        that.$store.commit("TOGGLE_DEVICE", "mobile");
-        that.$store.dispatch("setSidebar", false);
+        that.$store.commit('TOGGLE_DEVICE', 'mobile')
+        that.$store.dispatch('setSidebar', false)
       } else {
-        that.$store.commit("TOGGLE_DEVICE", "desktop");
-        that.$store.dispatch("setSidebar", true);
+        that.$store.commit('TOGGLE_DEVICE', 'desktop')
+        that.$store.dispatch('setSidebar', true)
       }
 
-    });
+    })
   }
-};
+}
 </script>
 <style>
 #app {
diff --git a/src/api/api.js b/src/api/api.js
index 26fefd1..72d4aea 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -1,100 +1,100 @@
 import { getAction, deleteAction, postAction, httpAction } from '@/api/manage'
 import Vue from 'vue'
-import {UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types"
+import {UI_CACHE_DB_DICT_DATA } from '@/store/mutation-types'
 
 //角色管理
-const addRole = (params)=>postAction("/sys/role/add",params);
-const editRole = (params)=>postAction("/sys/role/edit",params);
-const checkRoleCode = (params)=>getAction("/sys/role/checkRoleCode",params);
+const addRole = (params)=>postAction('/sys/role/add',params)
+const editRole = (params)=>postAction('/sys/role/edit',params)
+const checkRoleCode = (params)=>getAction('/sys/role/checkRoleCode',params)
 const queryallRoles = (params)=> getAction('sys/role/treeList',params)
-const queryall = (params)=>getAction("/sys/role/queryall",params);
+const queryall = (params)=>getAction('/sys/role/queryall',params)
 
 //用户管理
-const addUser = (params)=>postAction("/sys/user/add",params);
-const editUser = (params)=>postAction("/sys/user/edit",params);
-const queryUserRole = (params)=>getAction("/sys/user/queryUserRole",params);
-const getUserList = (params)=>getAction("/sys/user/page",params);
+const addUser = (params)=>postAction('/sys/user/add',params)
+const editUser = (params)=>postAction('/sys/user/edit',params)
+const queryUserRole = (params)=>getAction('/sys/user/queryUserRole',params)
+const getUserList = (params)=>getAction('/sys/user/page',params)
 // 获取全部用户列表
-const getAllUserList = (params) => getAction("/sys/user/list", params);
-const frozenBatch = (params)=>postAction("/sys/user/frozenBatch",params);
+const getAllUserList = (params) => getAction('/sys/user/list', params)
+const frozenBatch = (params)=>postAction('/sys/user/frozenBatch',params)
 //验证用户是否存在
-const checkOnlyUser = (params)=>getAction("/sys/user/checkOnlyUser",params);
+const checkOnlyUser = (params)=>getAction('/sys/user/checkOnlyUser',params)
 //改变密码
-const changePassword = (params)=>postAction("/sys/user/changePassword",params);
+const changePassword = (params)=>postAction('/sys/user/changePassword',params)
 // 重置密码
 const resetUserPassword = (params) => postAction('/sys/user/resetPassword',params)
 
 //权限管理
-const addPermission= (params)=>postAction("/sys/permission/add",params);
-const editPermission= (params)=>postAction("/sys/permission/edit",params);
-const getPermissionList = (params)=>getAction("/sys/permission/page",params);
-const getSystemMenuList = (params)=>getAction("/sys/permission/getSystemMenuList",params);
-const getSystemSubmenu = (params)=>getAction("/sys/permission/getSystemSubmenu",params);
+const addPermission= (params)=>postAction('/sys/permission/add',params)
+const editPermission= (params)=>postAction('/sys/permission/edit',params)
+const getPermissionList = (params)=>getAction('/sys/permission/page',params)
+const getSystemMenuList = (params)=>getAction('/sys/permission/getSystemMenuList',params)
+const getSystemSubmenu = (params)=>getAction('/sys/permission/getSystemSubmenu',params)
 const getSystemSubmenuBatch = (params) => getAction('/sys/permission/getSystemSubmenuBatch', params)
-const queryTreeList = (params)=>getAction("/sys/permission/queryTreeList",params);
-const queryTreeListForRole = (params)=>getAction("/sys/role/queryTreeList",params);
-const queryListAsync = (params)=>getAction("/sys/permission/queryListAsync",params);
-const queryRolePermission = (params)=>getAction("/sys/permission/queryRolePermission",params);
-const saveRolePermission = (params)=>postAction("/sys/permission/saveRolePermission",params);
-const queryPermissionsByUser = ()=>getAction("/sys/permission/getUserPermissionByToken");
-const loadAllRoleIds = (params)=>getAction("/sys/permission/loadAllRoleIds",params);
-const getPermissionRuleList = (params)=>getAction("/sys/permission/getPermRuleListByPermId",params);
-const queryPermissionRule = (params)=>getAction("/sys/permission/queryPermissionRule",params);
+const queryTreeList = (params)=>getAction('/sys/permission/queryTreeList',params)
+const queryTreeListForRole = (params)=>getAction('/sys/role/queryTreeList',params)
+const queryListAsync = (params)=>getAction('/sys/permission/queryListAsync',params)
+const queryRolePermission = (params)=>getAction('/sys/permission/queryRolePermission',params)
+const saveRolePermission = (params)=>postAction('/sys/permission/saveRolePermission',params)
+const queryPermissionsByUser = ()=>getAction('/sys/permission/getUserPermissionByToken')
+const loadAllRoleIds = (params)=>getAction('/sys/permission/loadAllRoleIds',params)
+const getPermissionRuleList = (params)=>getAction('/sys/permission/getPermRuleListByPermId',params)
+const queryPermissionRule = (params)=>getAction('/sys/permission/queryPermissionRule',params)
 
 // 部门管理
-const queryDepartTreeList = (params)=>getAction("/sys/sysDepart/queryTreeList",params);
-const queryIdTree = (params)=>getAction("/sys/sysDepart/queryIdTree",params);
-const queryParentName   = (params)=>getAction("/sys/sysDepart/queryParentName",params);
-const searchByKeywords   = (params)=>getAction("/sys/sysDepart/searchBy",params);
-const deleteByDepartId   = (params)=>deleteAction("/sys/sysDepart/delete",params);
+const queryDepartTreeList = (params)=>getAction('/sys/sysDepart/queryTreeList',params)
+const queryIdTree = (params)=>getAction('/sys/sysDepart/queryIdTree',params)
+const queryParentName   = (params)=>getAction('/sys/sysDepart/queryParentName',params)
+const searchByKeywords   = (params)=>getAction('/sys/sysDepart/searchBy',params)
+const deleteByDepartId   = (params)=>deleteAction('/sys/sysDepart/delete',params)
 
 //二级部门管理
-const queryDepartPermission = (params)=>getAction("/sys/permission/queryDepartPermission",params);
-const saveDepartPermission = (params)=>postAction("/sys/permission/saveDepartPermission",params);
-const queryTreeListForDeptRole = (params)=>getAction("/sys/sysDepartPermission/queryTreeListForDeptRole",params);
-const queryDeptRolePermission = (params)=>getAction("/sys/sysDepartPermission/queryDeptRolePermission",params);
-const saveDeptRolePermission = (params)=>postAction("/sys/sysDepartPermission/saveDeptRolePermission",params);
-const queryMyDepartTreeList = (params)=>getAction("/sys/sysDepart/queryMyDeptTreeList",params);
+const queryDepartPermission = (params)=>getAction('/sys/permission/queryDepartPermission',params)
+const saveDepartPermission = (params)=>postAction('/sys/permission/saveDepartPermission',params)
+const queryTreeListForDeptRole = (params)=>getAction('/sys/sysDepartPermission/queryTreeListForDeptRole',params)
+const queryDeptRolePermission = (params)=>getAction('/sys/sysDepartPermission/queryDeptRolePermission',params)
+const saveDeptRolePermission = (params)=>postAction('/sys/sysDepartPermission/saveDeptRolePermission',params)
+const queryMyDepartTreeList = (params)=>getAction('/sys/sysDepart/queryMyDeptTreeList',params)
 
 //日志管理
 //const getLogList = (params)=>getAction("/sys/log/page",params);
-const deleteLog = (params)=>deleteAction("/sys/log/delete",params);
-const deleteLogList = (params)=>deleteAction("/sys/log/deleteBatch",params);
+const deleteLog = (params)=>deleteAction('/sys/log/delete',params)
+const deleteLogList = (params)=>deleteAction('/sys/log/deleteBatch',params)
 
 //数据字典
-const addDict = (params)=>postAction("/sys/dict/add",params);
-const editDict = (params)=>postAction("/sys/dict/edit",params);
-const treeList = (params)=>getAction("/sys/dict/treeList",params);
-const addDictItem = (params)=>postAction("/sys/dictItem/add",params);
-const editDictItem = (params)=>postAction("/sys/dictItem/edit",params);
+const addDict = (params)=>postAction('/sys/dict/add',params)
+const editDict = (params)=>postAction('/sys/dict/edit',params)
+const treeList = (params)=>getAction('/sys/dict/treeList',params)
+const addDictItem = (params)=>postAction('/sys/dictItem/add',params)
+const editDictItem = (params)=>postAction('/sys/dictItem/edit',params)
 
 //字典标签专用（通过code获取字典数组）
-export const ajaxGetDictItems = (code, params)=>getAction(`/sys/dict/getDictItems/${code}`,params);
+export const ajaxGetDictItems = (code, params)=>getAction(`/sys/dict/getDictItems/${code}`,params)
 //从缓存中获取字典配置
 function getDictItemsFromCache(dictCode) {
   if (Vue.ls.get(UI_CACHE_DB_DICT_DATA) && Vue.ls.get(UI_CACHE_DB_DICT_DATA)[dictCode]) {
-    let dictItems = Vue.ls.get(UI_CACHE_DB_DICT_DATA)[dictCode];
-    return dictItems;
+    let dictItems = Vue.ls.get(UI_CACHE_DB_DICT_DATA)[dictCode]
+    return dictItems
   }
 }
 
 //系统通告
-const doReleaseData = (params)=>getAction("/sys/annountCement/doReleaseData",params);
-const doReovkeData = (params)=>getAction("/sys/annountCement/doReovkeData",params);
+const doReleaseData = (params)=>getAction('/sys/annountCement/doReleaseData',params)
+const doReovkeData = (params)=>getAction('/sys/annountCement/doReovkeData',params)
 //获取系统访问量
-const getLoginfo = (params)=>getAction("/sys/loginfo",params);
-const getVisitInfo = (params)=>getAction("/sys/visitInfo",params);
+const getLoginfo = (params)=>getAction('/sys/loginfo',params)
+const getVisitInfo = (params)=>getAction('/sys/visitInfo',params)
 
 // 根据部门主键查询用户信息
-const queryUserByDepId = (params)=>getAction("/sys/user/queryUserByDepId",params);
+const queryUserByDepId = (params)=>getAction('/sys/user/queryUserByDepId',params)
 
 // 重复校验
-const duplicateCheck = (params)=>getAction("/sys/duplicate/check",params);
+const duplicateCheck = (params)=>getAction('/sys/duplicate/check',params)
 // 加载分类字典
-const loadCategoryData = (params)=>getAction("/sys/category/loadAllData",params);
+const loadCategoryData = (params)=>getAction('/sys/category/loadAllData',params)
 const checkRuleByCode = (params) => getAction('/sys/checkRule/checkByCode', params)
 //加载我的通告信息
-const getUserNoticeInfo= (params)=>getAction("/sys/sysAnnouncementSend/getMyAnnouncementSend",params);
+const getUserNoticeInfo= (params)=>getAction('/sys/sysAnnouncementSend/getMyAnnouncementSend',params)
 const getTransitURL = url => `/sys/common/transitRESTful?url=${encodeURIComponent(url)}`
 
 // 通过文件的id获取文件的相应信息
diff --git a/src/api/inconmeMeetingApi.js b/src/api/inconmeMeetingApi.js
index b577a1c..2642aae 100644
--- a/src/api/inconmeMeetingApi.js
+++ b/src/api/inconmeMeetingApi.js
@@ -1,4 +1,4 @@
-import {getAction} from "@api/manage";
+import {getAction} from '@api/manage'
 
 // 通过用户id获取用户信息
 const getUserInfo = (params) => getAction('/sys/user/queryById',params)
diff --git a/src/api/manage.js b/src/api/manage.js
index f4e9604..ec6563f 100644
--- a/src/api/manage.js
+++ b/src/api/manage.js
@@ -169,13 +169,13 @@ export function getFileAccessHttpUrl(avatar,subStr) {
   if(!subStr) subStr = 'http'
   try {
     if(avatar && avatar.startsWith(subStr)){
-      return avatar;
+      return avatar
     }else{
       if(avatar &&　avatar.length>0 && avatar.indexOf('[')==-1){
-        return window._CONFIG['staticDomainURL'] + "/" + avatar;
+        return window._CONFIG['staticDomainURL'] + '/' + avatar
       }
     }
   }catch(err){
-    return;
+    return
   }
 }
diff --git a/src/assets/imgs/generial_project.png b/src/assets/imgs/generial_project.png
new file mode 100644
index 0000000..559aa87
Binary files /dev/null and b/src/assets/imgs/generial_project.png differ
diff --git a/src/assets/imgs/meeting_project.png b/src/assets/imgs/meeting_project.png
new file mode 100644
index 0000000..24631fd
Binary files /dev/null and b/src/assets/imgs/meeting_project.png differ
diff --git a/src/assets/imgs/member_project.png b/src/assets/imgs/member_project.png
new file mode 100644
index 0000000..8bf2774
Binary files /dev/null and b/src/assets/imgs/member_project.png differ
diff --git a/src/assets/imgs/working_group_project_selected.png b/src/assets/imgs/working_group_project_selected.png
new file mode 100644
index 0000000..3e22ba3
Binary files /dev/null and b/src/assets/imgs/working_group_project_selected.png differ
diff --git a/src/assets/less/common.less b/src/assets/less/common.less
index 28a7285..b7ebbd8 100644
--- a/src/assets/less/common.less
+++ b/src/assets/less/common.less
@@ -78,6 +78,7 @@
   font-weight: 700;
   text-align: left;
   color: #333333;
+  display: flex;
   position: relative;
 
   &-text {
@@ -93,5 +94,6 @@
     width: 10px;
     height: 10px;
     background: #069f99;
+    border-radius: 5px;
   }
 }
diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue
index ff81d40..c13cc22 100644
--- a/src/components/HelloWorld.vue
+++ b/src/components/HelloWorld.vue
@@ -104,11 +104,11 @@
 
 <script>
 export default {
-  name: "HelloWorld",
+  name: 'HelloWorld',
   props: {
     msg: String,
   },
-};
+}
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue
index 3882d54..163beb9 100644
--- a/src/components/ProjectDetailModal.vue
+++ b/src/components/ProjectDetailModal.vue
@@ -155,65 +155,65 @@ const logisticsInfoList = [
     postPerson: '李四',
     postTime: '2021年10月21',
     emsOrSF: 'EMS',
-    postNo: "123456"
+    postNo: '123456'
   }
 ]
 const columns = [
   {
     title: '开票人',
-    align: "center",
+    align: 'center',
     dataIndex: '',
   },
   {
     title: '日期',
-    align: "center",
+    align: 'center',
     dataIndex: '',
   },
   {
     title: '金额(元)',
-    align: "center",
+    align: 'center',
     dataIndex: '',
   },
   {
     title: '票号',
-    align: "center",
+    align: 'center',
     dataIndex: '',
   },
   {
     title: '项目',
-    align: "center",
+    align: 'center',
     dataIndex: '',
   },
   {
     title: '邮寄人',
-    align: "center",
+    align: 'center',
     dataIndex: '',
   },
   {
     title: '快递',
-    align: "center",
+    align: 'center',
     dataIndex: '',
   },
   {
     title: '快递单号',
-    align: "center",
+    align: 'center',
     dataIndex: 'piaoNo',
   },
   {
     title: '操作',
-    align: "center",
+    align: 'center',
     dataIndex: '',
     scopedSlots: {customRender: 'action'}
   },
 ]
 export default {
-  name: "ProjectDetailModal",
+  name: 'ProjectDetailModal',
   data() {
     return {
-      description: "项目详情模态框",
+      description: '项目详情模态框',
       width: 800,
       visible: false,
-      title: "项目信息",
+      title: '项目信息',
       // 当前项目id
       currentProjectId: '',
       // 基本信息
@@ -256,7 +256,7 @@ export default {
     *  查看物流
     * */
     lookLogistics() {
-      window.open("http://www.api.kuaidi100.com", "_blank")
+      window.open('http://www.api.kuaidi100.com', '_blank')
     }
   }
 }
diff --git a/src/components/company/BusinessSelect.vue b/src/components/company/BusinessSelect.vue
index da83a88..0b75d95 100644
--- a/src/components/company/BusinessSelect.vue
+++ b/src/components/company/BusinessSelect.vue
@@ -1,13 +1,13 @@
 <template>
   <j-modal
-      :title="title"
-      :width="width"
-      :visible="visible"
-      :confirmLoading="confirmLoading"
-      switchFullscreen
-      @ok="handleOk"
-      @cancel="handleCancel"
-      cancelText="关闭">
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row>
@@ -27,17 +27,17 @@
     </div>
     <div>
       <a-table
-          ref="table"
-          size="middle"
-          bordered
-          rowKey="id"
-          :columns="columns"
-          :dataSource="dataSource"
-          :pagination="ipagination"
-          :loading="loading"
-          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: 'radio'}"
-          @change="handleTableChange"
-          class="j-table-force-nowrap">
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: 'radio'}"
+        @change="handleTableChange"
+        class="j-table-force-nowrap">
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
@@ -51,7 +51,7 @@
           <j-ellipsis @click.native="uploadFile(record.chargeNoticeFileId)" style="color:#219AFF;cursor: pointer"
                       :value="text" :length="20"/>
         </template>
-        <template slot="text" slot-scope="text,record">
+        <template slot="text" slot-scope="text">
           <j-ellipsis :value="text" :length="30"></j-ellipsis>
         </template>
       </a-table>
@@ -72,7 +72,7 @@ export default {
       visible: false,
       confirmLoading: false,
       url: {
-        list: '/company/payCompanyManagement/list',
+        list: '/company/payCompanyManagement/list'
       },
       selectedCompany: {},
       selectedRowKeys: [],
diff --git a/src/components/company/SelectContacts.vue b/src/components/company/SelectContacts.vue
index 3f056ab..2414e65 100644
--- a/src/components/company/SelectContacts.vue
+++ b/src/components/company/SelectContacts.vue
@@ -20,7 +20,7 @@
     <contact-management-module ref="contactForm"
                                is-company-disabled
                                :selected-company="selectedCompany"
-                               v-on="$listeners">
+                               @ok="addContactsOk">
     </contact-management-module>
   </div>
 </template>
@@ -59,6 +59,7 @@ export default {
     return {
       contactsList: [], // 该企业下联系人列表
       isFirstOpen: true, // 编辑状态下是否为第一次打开
+      contactId: this.value
     }
   },
   created() {
@@ -114,11 +115,16 @@ export default {
       }
       this.$message.warn('请先选择来款企业再为该企业新建联系人')
     },
+    addContactsOk(id) {
+      this.getContactsList()
+      this.$emit('change', id)
+      this.$emit('ok')
+    },
     // 下拉框的搜索
     filterOption(input, option) {
       return (
           option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      );
+      )
     },
     handleDropdownOpen() {
       if (this.isFirstOpen && this.initContacts && this.initContacts.hasOwnProperty('id')) {
@@ -143,5 +149,6 @@ export default {
 .form-btn {
   padding-top: 1px;
   padding-left: 8px;
+  margin-bottom: -1px;
 }
 </style>
diff --git a/src/components/company/SelectPrincipal.vue b/src/components/company/SelectPrincipal.vue
index ea5f50d..0cb0a4f 100644
--- a/src/components/company/SelectPrincipal.vue
+++ b/src/components/company/SelectPrincipal.vue
@@ -43,7 +43,7 @@ export default {
     filterOption(input, option) {
       return (
           option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      );
+      )
     }
   },
   model: {
diff --git a/src/components/dict/JDictSelectTag.vue b/src/components/dict/JDictSelectTag.vue
index 6c01da3..379f1b2 100644
--- a/src/components/dict/JDictSelectTag.vue
+++ b/src/components/dict/JDictSelectTag.vue
@@ -21,7 +21,7 @@
   import {ajaxGetDictItems,getDictItemsFromCache} from '@/api/api'
 
   export default {
-    name: "JDictSelectTag",
+    name: 'JDictSelectTag',
     props: {
       dictCode: String,
       placeholder: String,
@@ -37,7 +37,7 @@
     data() {
       return {
         dictOptions: [],
-        tagType:""
+        tagType:''
       }
     },
     watch:{
@@ -50,8 +50,8 @@
     },
     created() {
       // console.log(this.dictCode);
-      if(!this.type || this.type==="list"){
-        this.tagType = "select"
+      if(!this.type || this.type==='list'){
+        this.tagType = 'select'
       }else{
         this.tagType = this.type
       }
@@ -62,7 +62,7 @@
       getValueSting(){
         // update-begin author:wangshuai date:20200601 for: 不显示placeholder的文字 ------
         // 当有null或“” placeholder不显示
-        return this.value != null ? this.value.toString() : undefined;
+        return this.value != null ? this.value.toString() : undefined
         // update-end author:wangshuai date:20200601 for: 不显示placeholder的文字 ------
       },
     },
@@ -70,7 +70,7 @@
       initDictData() {
         //优先从缓存中读取字典配置
         if(getDictItemsFromCache(this.dictCode)){
-          this.dictOptions = getDictItemsFromCache(this.dictCode);
+          this.dictOptions = getDictItemsFromCache(this.dictCode)
           return
         }
 
@@ -78,22 +78,22 @@
         ajaxGetDictItems(this.dictCode, null).then((res) => {
           if (res.success) {
 //                console.log(res.result);
-            this.dictOptions = res.result;
+            this.dictOptions = res.result
           }
         })
       },
       handleInput(e) {
-        let val;
-        if(this.tagType=="radio"){
+        let val
+        if(this.tagType=='radio'){
           val = e.target.value
         }else{
           val = e
         }
 
         if(this.triggerChange){
-          this.$emit('change', val);
+          this.$emit('change', val)
         }else{
-          this.$emit('input', val);
+          this.$emit('input', val)
         }
       },
       setCurrentDictOptions(dictOptions){
diff --git a/src/components/dict/JDictSelectUtil.js b/src/components/dict/JDictSelectUtil.js
index a735f3f..06ddb88 100644
--- a/src/components/dict/JDictSelectUtil.js
+++ b/src/components/dict/JDictSelectUtil.js
@@ -14,18 +14,18 @@ import {getAction} from '@/api/manage'
  */
 export async function initDictOptions(dictCode) {
   if (!dictCode) {
-    return '字典Code不能为空!';
+    return '字典Code不能为空!'
   }
   //优先从缓存中读取字典配置
   if(getDictItemsFromCache(dictCode)){
     let res = {}
-    res.result = getDictItemsFromCache(dictCode);
-    res.success = true;
-    return res;
+    res.result = getDictItemsFromCache(dictCode)
+    res.success = true
+    return res
   }
   //获取字典数组
-  let res = await ajaxGetDictItems(dictCode);
-  return res;
+  let res = await ajaxGetDictItems(dictCode)
+  return res
 }
 
 /**
@@ -80,25 +80,25 @@ export function filterMultiDictText(dictOptions, text) {
   }
 
   if(!text || text=='null' || !dictOptions || dictOptions.length==0){
-    return ""
+    return ''
   }
-  let re = "";
+  let re = ''
   text = text.toString()
-  let arr = text.split(",")
+  let arr = text.split(',')
   dictOptions.forEach(function (option) {
     if(option){
       for(let i=0;i<arr.length;i++){
         if (arr[i] === option.value) {
-          re += option.text+",";
-          break;
+          re += option.text+','
+          break
         }
       }
     }
-  });
-  if(re==""){
-    return text;
+  })
+  if(re==''){
+    return text
   }
-  return re.substring(0,re.length-1);
+  return re.substring(0,re.length-1)
 }
 
 /**
@@ -108,16 +108,16 @@ export function filterMultiDictText(dictOptions, text) {
  */
 export function filterDictTextByCache(dictCode, key) {
   if(key==null ||key.length==0){
-    return;
+    return
   }
   if (!dictCode) {
-    return '字典Code不能为空!';
+    return '字典Code不能为空!'
   }
    //优先从缓存中读取字典配置
   if(getDictItemsFromCache(dictCode)){
-    let item = getDictItemsFromCache(dictCode).filter(t => t["value"] == key)
+    let item = getDictItemsFromCache(dictCode).filter(t => t['value'] == key)
     if(item && item.length>0){
-      return item[0]["text"]
+      return item[0]['text']
     }
   }
 }
@@ -127,7 +127,7 @@ export async function getDictItems(dictCode, params) {
     //优先从缓存中读取字典配置
     if(getDictItemsFromCache(dictCode)){
       let desformDictItems = getDictItemsFromCache(dictCode).map(item => ({...item, label: item.text}))
-      return desformDictItems;
+      return desformDictItems
     }
 
     //缓存中没有，就请求后台
diff --git a/src/components/dict/JMultiSelectTag.vue b/src/components/dict/JMultiSelectTag.vue
index 66f9ba9..86c04c5 100644
--- a/src/components/dict/JMultiSelectTag.vue
+++ b/src/components/dict/JMultiSelectTag.vue
@@ -51,13 +51,13 @@
     data() {
       return {
         dictOptions: [],
-        tagType:"",
+        tagType:'',
         arrayValue:!this.value?[]:this.value.split(this.spliter)
       }
     },
     created() {
-      if(!this.type || this.type==="list_multi"){
-        this.tagType = "select"
+      if(!this.type || this.type==='list_multi'){
+        this.tagType = 'select'
       }else{
         this.tagType = this.type
       }
@@ -66,7 +66,7 @@
     },
     watch:{
       options: function(val){
-        this.setCurrentDictOptions(val);
+        this.setCurrentDictOptions(val)
       },
       dictCode:{
         immediate:true,
@@ -96,14 +96,14 @@
           //根据字典Code, 初始化字典数组
           ajaxGetDictItems(this.dictCode, null).then((res) => {
             if (res.success) {
-              this.dictOptions = res.result;
+              this.dictOptions = res.result
             }
           })
         }
 
       },
       onChange (selectedValue) {
-        this.$emit('change', selectedValue.join(this.spliter));
+        this.$emit('change', selectedValue.join(this.spliter))
       },
       setCurrentDictOptions(dictOptions){
         this.dictOptions = dictOptions
diff --git a/src/components/dict/JSearchSelectTag.vue b/src/components/dict/JSearchSelectTag.vue
index 077530b..82979c7 100644
--- a/src/components/dict/JSearchSelectTag.vue
+++ b/src/components/dict/JSearchSelectTag.vue
@@ -40,7 +40,7 @@
 
 <script>
   import { ajaxGetDictItems,getDictItemsFromCache } from '@/api/api'
-  import debounce from 'lodash/debounce';
+  import debounce from 'lodash/debounce'
   import { getAction } from '../../api/manage'
 
   export default {
@@ -53,7 +53,7 @@
       async: Boolean,
       placeholder:{
         type:String,
-        default:"请选择",
+        default:'请选择',
         required:false
       },
       popContainer:{
@@ -68,8 +68,8 @@
       }
     },
     data(){
-      this.loadData = debounce(this.loadData, 800);//消抖
-      this.lastLoad = 0;
+      this.loadData = debounce(this.loadData, 800)//消抖
+      this.lastLoad = 0
       return {
         loading:false,
         selectedValue:[],
@@ -78,10 +78,10 @@
       }
     },
     created(){
-      this.initDictData();
+      this.initDictData()
     },
     watch:{
-      "value":{
+      'value':{
         immediate:true,
         handler(val){
           if(!val){
@@ -96,7 +96,7 @@
           }
         }
       },
-      "dict":{
+      'dict':{
         handler(){
           this.initDictData()
         }
@@ -114,7 +114,7 @@
       initSelectValue(){
         if(this.async){
           if(!this.selectedAsyncValue || !this.selectedAsyncValue.key || this.selectedAsyncValue.key!=this.value){
-            console.log("这才请求后台")
+            console.log('这才请求后台')
             getAction(`/sys/dict/loadDictItem/${this.dict}`,{key:this.value}).then(res=>{
               if(res.success){
                 let obj = {
@@ -130,7 +130,7 @@
         }
       },
       loadData(value){
-        console.log("数据加载",value)
+        console.log('数据加载',value)
         this.lastLoad +=1
         const currentLoad = this.lastLoad
         this.options = []
@@ -143,7 +143,7 @@
               return
             }
             this.options = res.result
-            console.log("我是第一个",res)
+            console.log('我是第一个',res)
           }else{
             this.$message.warning(res.message)
           }
@@ -167,16 +167,16 @@
                 }else{
                   dictStr = this.dict
                 }
-                if (this.dict.indexOf(",") == -1) {
+                if (this.dict.indexOf(',') == -1) {
                   //优先从缓存中读取字典配置
                   if (getDictItemsFromCache(this.dictCode)) {
-                    this.options = getDictItemsFromCache(this.dictCode);
+                    this.options = getDictItemsFromCache(this.dictCode)
                     return
                   }
                 }
                 ajaxGetDictItems(dictStr, null).then((res) => {
                   if (res.success) {
-                    this.options = res.result;
+                    this.options = res.result
                   }
                 })
             }
@@ -198,7 +198,7 @@
         return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       },
       handleChange (selectedValue) {
-        console.log("selectedValue",selectedValue)
+        console.log('selectedValue',selectedValue)
         this.selectedValue = selectedValue
         this.callback()
       },
@@ -211,13 +211,13 @@
           this.selectedAsyncValue = null
           this.selectedValue = null
           this.options = null
-          this.loadData("")
+          this.loadData('')
         }
         this.callback()
         //update-end-author:scott date:20201222 for:【搜索】搜索查询组件，删除条件，默认下拉还是上次的缓存数据，不好 JT-191
       },
       callback(){
-        this.$emit('change', this.selectedValue);
+        this.$emit('change', this.selectedValue)
       },
       setCurrentDictOptions(dictOptions){
         this.options = dictOptions
diff --git a/src/components/dict/index.js b/src/components/dict/index.js
index 23400a7..dc08984 100644
--- a/src/components/dict/index.js
+++ b/src/components/dict/index.js
@@ -5,9 +5,9 @@ import { filterMultiDictText,filterDictText,initDictOptions,filterDictTextByCach
 
 export default {
   install: function (Vue) {
-    Vue.component('JDictSelectTag',JDictSelectTag);
-    Vue.component('JMultiSelectTag',JMultiSelectTag);
-    Vue.component('JSearchSelectTag',JSearchSelectTag);
+    Vue.component('JDictSelectTag',JDictSelectTag)
+    Vue.component('JMultiSelectTag',JMultiSelectTag)
+    Vue.component('JSearchSelectTag',JSearchSelectTag)
     Vue.prototype.$initDictOptions = (dictCode) => initDictOptions(dictCode)
     Vue.prototype.$filterMultiDictText = (dictOptions, text) => filterMultiDictText(dictOptions, text)
     Vue.prototype.$filterDictText = (dictOptions, text) => filterDictText(dictOptions, text)
diff --git a/src/components/form/InstallmentForm.vue b/src/components/form/InstallmentForm.vue
new file mode 100644
index 0000000..bcfe83d
--- /dev/null
+++ b/src/components/form/InstallmentForm.vue
@@ -0,0 +1,160 @@
+<template>
+  <div>
+    <a-form :form="form">
+      <a-row v-for="(item, index) in installmentList" :key="index">
+        <a-col :xxl="4" :xl="8" :sm="12">
+          <a-form-item :label="`${index + 1}阶段`" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-input placeholder="请输入名称"
+                     v-decorator="['installmentList['+index+'].phaseName',validatorRules.phaseName]"
+                     :maxLength='50'
+                     v-bind="$attrs"
+                     @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :xxl="4" :xl="8" :sm="12">
+          <a-form-item :label="`${index + 1}阶段应收`" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-input placeholder="请输入金额"
+                     v-decorator="['installmentList['+index+'].accountsReceivableAmount',validatorRules.accountsReceivableAmount]"
+                     :maxLength='50'
+                     v-bind="$attrs"
+                     @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :xxl="5" :xl="8" :sm="12">
+          <a-form-item :label="`${index + 1}阶段应收时间`" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <j-date placeholder="请选择应收时间"
+                    style="width: 100%;"
+                    v-decorator="['installmentList['+index+'].accountsReceivableTime']"
+                    :trigger-change="true"
+                    v-bind="$attrs"
+                    date-format="YYYY-MM-DD"/>
+          </a-form-item>
+        </a-col>
+        <a-col :xxl="4" :xl="8" :sm="12">
+          <a-form-item :label="`${index + 1}阶段实收`" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-input placeholder="请输入金额"
+                     v-decorator="['installmentList['+index+'].paidAmount',validatorRules.paidAmount]"
+                     :maxLength='50'
+                     v-bind="$attrs"
+                     @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :xxl="5" :xl="8" :sm="12">
+          <a-form-item :label="`${index + 1}阶段实收时间`" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <j-date placeholder="请选择实收时间"
+                    style="width: 100%;"
+                    v-decorator="['installmentList['+index+'].paidTime',validatorRules.paidTime]"
+                    :trigger-change="true"
+                    v-bind="$attrs"
+                    date-format="YYYY-MM-DD"/>
+          </a-form-item>
+        </a-col>
+        <a-col :xxl="2" :xl="8" :sm="12" class="operator-btn">
+          <a-button icon="plus" @click="addInstallmentItem" v-bind="$attrs"></a-button>
+          <a-button icon="minus" @click="deleteInstallmentItem(index)"
+                    v-bind="$attrs"
+                    :disabled="installmentList.length === 1">
+          </a-button>
+        </a-col>
+      </a-row>
+    </a-form>
+  </div>
+</template>
+
+<script>
+import JDate from '../tools/JDate'
+import pick from 'lodash.pick'
+
+export default {
+  name: 'InstallmentForm',
+  components: { JDate },
+  data() {
+    return {
+      form: this.$form.createForm(this),
+      model: {},
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 9 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 15 }
+      },
+      validatorRules: {
+        phaseName: {
+          rules: [{ required: true, message: '请输入名称'}],
+          validateTrigger: 'blur'
+        },
+        accountsReceivableAmount: {
+          rules: [{ required: true, message: '请输入金额'}],
+          validateTrigger: 'blur'
+        },
+        paidAmount: {
+          rules: [{ required: true, message: '请输入金额'}],
+          validateTrigger: 'blur'
+        },
+        paidTime: {
+          rules: [{ required: true, message: '请选择实收时间'}],
+          validateTrigger: 'blur'
+        }
+      },
+      index: 1,
+      installmentList: [],
+      defaultFormData: {
+        phaseName: null,
+        accountsReceivableAmount: null,
+        accountsReceivableTime: undefined,
+        paidAmount: null,
+        paidTime: undefined
+      }
+    }
+  },
+  methods: {
+    /**
+     * 初始化分期信息列表
+     * @param record
+     */
+    initInstallmentList(record) {
+      // 判断是否为编辑
+      if (record.installmentList && record.installmentList.length > 0) {
+        this.installmentList = record.installmentList
+      } else {
+        record.installmentList = [this.defaultFormData]
+      }
+      this.model = Object({}, record)
+      this.installmentList = record.installmentList
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(this.model, 'installmentList'))
+      })
+    },
+    /**
+     * 添加一个分期信息
+     */
+    addInstallmentItem() {
+      this.installmentList.push(this.defaultFormData)
+    },
+    deleteInstallmentItem(index) {
+      this.installmentList.splice(index, 1)
+    },
+    handleSave() {
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          this.$emit('ok', values)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.operator-btn {
+  height: 40px;
+  display: flex;
+  align-items: center;
+
+  .ant-btn {
+    margin-left: 10px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/jero/JCron.vue b/src/components/jero/JCron.vue
index 39c279e..3902b25 100644
--- a/src/components/jero/JCron.vue
+++ b/src/components/jero/JCron.vue
@@ -8,7 +8,7 @@
   </div>
 </template>
 <script>
-  import JCronModal from "./modal/JCronModal";
+  import JCronModal from './modal/JCronModal'
   export default {
     name: 'JCron',
     components: {
@@ -32,11 +32,11 @@
     },
     methods:{
       openModal(){
-        this.$refs.innerVueCron.show();
+        this.$refs.innerVueCron.show()
       },
       handleOK(val){
-        this.cron = val;
-        this.$emit("change", this.cron);
+        this.cron = val
+        this.$emit('change', this.cron)
         //this.$emit("change", Object.assign({},  this.cron));
       },
       handleEmpty(){
diff --git a/src/components/jero/JDate.vue b/src/components/jero/JDate.vue
index e1bb728..7e1be84 100644
--- a/src/components/jero/JDate.vue
+++ b/src/components/jero/JDate.vue
@@ -97,7 +97,7 @@
       }
     },
     data () {
-      let dateStr = this.value;
+      let dateStr = this.value
       return {
         yearShowOne:false, //控制年份模态框的显示与否
         year:'', // mode==“year” 专用
@@ -107,12 +107,12 @@
     computed: {
       //透传给下级组件的事件，需要排除本组件使用的change事件
       childListeners() {
-        const vm = this;
+        const vm = this
         let result = Object.assign({},
           this.$listeners,
         )
-        delete result.change;
-        return result;
+        delete result.change
+        return result
       }
     },
     watch: {
@@ -131,7 +131,7 @@
     methods: {
       moment,
       handleDateChange(mom,dateStr){
-        this.$emit('change', dateStr);
+        this.$emit('change', dateStr)
       },
       handleMonthChange(mom,dateStr){
         this.$emit('change',dateStr)
diff --git a/src/components/jero/JFormContainer.vue b/src/components/jero/JFormContainer.vue
index 4b2bafe..5a3ed80 100644
--- a/src/components/jero/JFormContainer.vue
+++ b/src/components/jero/JFormContainer.vue
@@ -30,7 +30,7 @@ export default {
     }
   },
   mounted() {
-    console.log("我是表单禁用专用组件,但是我并不支持表单中iframe的内容禁用")
+    console.log('我是表单禁用专用组件,但是我并不支持表单中iframe的内容禁用')
   }
 }
 </script>
diff --git a/src/components/jero/JImageUpload.vue b/src/components/jero/JImageUpload.vue
index e6e66a5..64a7571 100644
--- a/src/components/jero/JImageUpload.vue
+++ b/src/components/jero/JImageUpload.vue
@@ -31,36 +31,36 @@
 
 <script>
   import Vue from 'vue'
-  import { ACCESS_TOKEN } from "@/store/mutation-types"
+  import { ACCESS_TOKEN } from '@/store/mutation-types'
   import { getFileAccessHttpUrl } from '@/api/manage'
   const Base64 = require('js-base64').Base64
 
   const uidGenerator=()=>{
-    return '-'+parseInt(Math.random()*10000+1,10);
+    return '-'+parseInt(Math.random()*10000+1,10)
   }
   export default {
     name: 'JImageUpload',
     data(){
       return {
-        uploadAction:window._CONFIG['domianURL']+"/sys/common/upload",
+        uploadAction:window._CONFIG['domianURL']+'/sys/common/upload',
         uploadLoading:false,
         picUrl:false,
         headers:{},
         fileList: [],
-        previewImage:"",
+        previewImage:'',
       }
     },
     props:{
       text:{
         type:String,
         required:false,
-        default:"上传"
+        default:'上传'
       },
       /*这个属性用于控制文件上传的业务路径*/
       bizPath:{
         type:String,
         required:false,
-        default:"temp"
+        default:'temp'
       },
       value:{
         type:[String,Array],
@@ -87,12 +87,12 @@
     computed: {
       //透传给下级组件的事件，需要排除本组件使用的change事件
       childListeners() {
-        const vm = this;
+        const vm = this
         let result = Object.assign({},
           this.$listeners,
         )
-        delete result.change;
-        return result;
+        delete result.change
+        return result
       }
     },
     watch:{
@@ -104,7 +104,7 @@
             this.initFileList(val)
           }
           if(!val || val.length==0){
-            this.picUrl = false;
+            this.picUrl = false
           }
         },
         //立刻执行handler
@@ -112,17 +112,17 @@
       }
     },
     created(){
-      const token = Vue.ls.get(ACCESS_TOKEN);
-      this.headers = {"X-Access-Token":token}
+      const token = Vue.ls.get(ACCESS_TOKEN)
+      this.headers = {'X-Access-Token':token}
     },
     methods:{
       initFileList(paths){
         if(!paths || paths.length === 0){
-          this.fileList = [];
-          return;
+          this.fileList = []
+          return
         }
-        this.picUrl = true;
-        let arr = paths.split(",")
+        this.picUrl = true
+        let arr = paths.split(',')
         for(var a=0;a<arr.length;a++){
           this.fileList.forEach((item)=>{
             if (item.url === arr[a]){
@@ -133,33 +133,33 @@
         }
       },
       beforeUpload: function(file){
-        var fileType = file.type;
+        var fileType = file.type
         if(fileType.indexOf('image')<0){
-          this.$message.warning('请上传图片');
-          return false;
+          this.$message.warning('请上传图片')
+          return false
         }
       },
       handleChange(info) {
-        this.picUrl = false;
+        this.picUrl = false
         let fileList = info.fileList
         //update-begin-author:wangshuai date:20201022 for:LOWCOD-969 判断number是否大于0和是否多选，返回选定的元素。
         if(this.number>0 && this.isMultiple){
-          fileList = fileList.slice(-this.number);
+          fileList = fileList.slice(-this.number)
         }
         //update-end-author:wangshuai date:20201022 for:LOWCOD-969 判断number是否大于0和是否多选，返回选定的元素。
         if(info.file.status==='done'){
           if(info.file.response.success){
-            this.picUrl = true;
+            this.picUrl = true
             fileList = fileList.map((file) => {
               if (file.response) {
-                file.url = `${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.response.result.fileName}`;
+                file.url = `${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.response.result.fileName}`
               }
-              return file;
-            });
+              return file
+            })
           }
           //this.$message.success(`${info.file.name} 上传成功!`);
         }else if (info.file.status === 'error') {
-          this.$message.error(`${info.file.name} 上传失败.`);
+          this.$message.error(`${info.file.name} 上传失败.`)
         }else if(info.file.status === 'removed'){
           this.handleDelete(info.file)
         }
@@ -188,7 +188,7 @@
         if(!uploadFiles || uploadFiles.length==0){
           path = ''
         }
-        let arr = [];
+        let arr = []
         if(!this.isMultiple){
           arr.push(uploadFiles[uploadFiles.length-1].url)
         }else{
@@ -197,22 +197,22 @@
             if(uploadFiles[a].status === 'done' ) {
               arr.push(uploadFiles[a].url)
             }else{
-              return;
+              return
             }
             // update-end-author:taoyan date:20200819 for:【开源问题z】上传图片组件 LOWCOD-783
           }
         }
         if(arr.length>0){
-          path = arr.join(",")
+          path = arr.join(',')
         }
-        this.$emit('change', path);
+        this.$emit('change', path)
       },
       handleDelete(file){
         //如有需要新增 删除逻辑
       },
       handleCancel() {
-        this.close();
-        this.previewVisible = false;
+        this.close()
+        this.previewVisible = false
       },
       close () {
 
diff --git a/src/components/jero/JInput.vue b/src/components/jero/JInput.vue
index 8774ee8..709bf30 100644
--- a/src/components/jero/JInput.vue
+++ b/src/components/jero/JInput.vue
@@ -11,10 +11,10 @@
 
   import { Input } from 'ant-design-vue'
 
-  const JINPUT_QUERY_LIKE = 'like';
-  const JINPUT_QUERY_NE = 'ne';
-  const JINPUT_QUERY_GE = 'ge'; //大于等于
-  const JINPUT_QUERY_LE = 'le'; //小于等于
+  const JINPUT_QUERY_LIKE = 'like'
+  const JINPUT_QUERY_NE = 'ne'
+  const JINPUT_QUERY_GE = 'ge' //大于等于
+  const JINPUT_QUERY_LE = 'le' //小于等于
 
   export default {
     name: 'JInput',
@@ -48,19 +48,19 @@
     computed: {
       //透传给下级组件的事件，需要排除本组件使用的change事件
       childListeners() {
-        const vm = this;
+        const vm = this
         let result = Object.assign({},
           this.$listeners,
         )
-        delete result.change;
-        return result;
+        delete result.change
+        return result
       }
     },
     watch:{
       value:{
         immediate:true,
         handler:function(){
-          this.initVal();
+          this.initVal()
         }
       },
       // 当 type 变化的时候重新计算值
@@ -77,19 +77,19 @@
           switch (this.type) {
             case JINPUT_QUERY_LIKE:
               //修复路由传参的值传送到jinput框被前后各截取了一位 #1336
-              if(text.indexOf("*") != -1){
-                text = text.substring(1,text.length-1);
+              if(text.indexOf('*') != -1){
+                text = text.substring(1,text.length-1)
               }
-              break;
+              break
             case JINPUT_QUERY_NE:
-              text = text.substring(1);
-              break;
+              text = text.substring(1)
+              break
             case JINPUT_QUERY_GE:
-              text = text.substring(2);
-              break;
+              text = text.substring(2)
+              break
             case JINPUT_QUERY_LE:
-              text = text.substring(2);
-              break;
+              text = text.substring(2)
+              break
             default:
           }
           this.inputVal = text
@@ -102,20 +102,20 @@
         }
         switch (this.type) {
           case JINPUT_QUERY_LIKE:
-            text = "*"+text+"*";
-            break;
+            text = '*'+text+'*'
+            break
           case JINPUT_QUERY_NE:
-            text = "!"+text;
-            break;
+            text = '!'+text
+            break
           case JINPUT_QUERY_GE:
-            text = ">="+text;
-            break;
+            text = '>='+text
+            break
           case JINPUT_QUERY_LE:
-            text = "<="+text;
-            break;
+            text = '<='+text
+            break
           default:
         }
-        this.$emit('change', text);
+        this.$emit('change', text)
       }
     },
     model: {
diff --git a/src/components/jero/JTreeSelect.vue b/src/components/jero/JTreeSelect.vue
index f68a467..245ae17 100644
--- a/src/components/jero/JTreeSelect.vue
+++ b/src/components/jero/JTreeSelect.vue
@@ -107,11 +107,11 @@
       return {
         treeValue: null, // 选中的数据
         treeData:[],// 渲染树的数组
-        url:"/sys/dict/loadTreeData",
+        url:'/sys/dict/loadTreeData',
         view:'/sys/dict/loadDictItem/',
-        tableName:"",
-        text:"",
-        code:"",
+        tableName:'',
+        text:'',
+        code:'',
       }
     },
     watch: {
@@ -131,12 +131,12 @@
       },
       //透传给下级组件的事件，需要排除本组件使用的change事件
       childListeners() {
-        const vm = this;
+        const vm = this
         let result = Object.assign({},
           this.$listeners,
         )
-        delete result.change;
-        return result;
+        delete result.change
+        return result
       }
     },
     created(){
@@ -151,7 +151,7 @@
     },
     methods: {
       loadItemByCode(){
-        if( !this.value || this.value == "0" ){
+        if( !this.value || this.value == '0' ){
           this.treeValue = null
         }else{
           getAction(`${this.view}${this.dict}`,{key:this.value}).then(res=>{
@@ -160,7 +160,7 @@
               this.treeValue = values // v-model接收的是string || string[]
               //将节点名称显示在选择框上
               this.treeValue = res.result[0]
-              this.onLoadTriggleChange(res.result[0]);
+              this.onLoadTriggleChange(res.result[0])
             }
           })
         }
@@ -172,7 +172,7 @@
         }
       },
       initDictInfo(){ //取出父组件传过来的code，text，tableName
-        let arr = this.dict.split(",")
+        let arr = this.dict.split(',')
         this.tableName = arr[0]
         this.text = arr[1]
         this.code = arr[2]
@@ -253,7 +253,7 @@
               }
               this.treeData = [...res.result]
             }else{
-              console.log("数根节点查询结果-else",res)
+              console.log('数根节点查询结果-else',res)
             }
           })
         }else{
@@ -276,7 +276,7 @@
           /*
           * 使用$listeners向上暴露事件---和$emit一起使用出现的问题：change事件会执行两遍
           * 解决办法：改变选中时提交的事件名*/
-          this.$emit('change', '');
+          this.$emit('change', '')
           this.treeValue = null
         } else if (value instanceof Array) {
           //多选
@@ -295,18 +295,18 @@
         let myCondition = this.condition
         return new Promise((resolve,reject)=>{
           if(!myCondition){
-            resolve();
+            resolve()
           }else{
             try {
-              let test=JSON.parse(myCondition);
+              let test=JSON.parse(myCondition)
               if(typeof test == 'object' && test){
                 resolve()
               }else{
-                this.$message.error("组件JTreeSelect-condition传值有误，需要一个json字符串!")
+                this.$message.error('组件JTreeSelect-condition传值有误，需要一个json字符串!')
                 reject()
               }
             } catch(e) {
-              this.$message.error("组件JTreeSelect-condition传值有误，需要一个json字符串!")
+              this.$message.error('组件JTreeSelect-condition传值有误，需要一个json字符串!')
               reject()
             }
           }
diff --git a/src/components/jero/JUpload.vue b/src/components/jero/JUpload.vue
index 5d700ca..3f56e2f 100644
--- a/src/components/jero/JUpload.vue
+++ b/src/components/jero/JUpload.vue
@@ -31,22 +31,22 @@
 <script>
 
   import Vue from 'vue'
-  import { ACCESS_TOKEN } from "@/store/mutation-types"
-  import { getFileAccessHttpUrl } from '@/api/manage';
-  import { getFileInfo } from '@/api/api';
+  import { ACCESS_TOKEN } from '@/store/mutation-types'
+  import { getFileAccessHttpUrl } from '@/api/manage'
+  import { getFileInfo } from '@/api/api'
   const Base64 = require('js-base64').Base64
 
-  const FILE_TYPE_ALL = "all"
-  const FILE_TYPE_IMG = "image"
-  const FILE_TYPE_TXT = "file"
+  const FILE_TYPE_ALL = 'all'
+  const FILE_TYPE_IMG = 'image'
+  const FILE_TYPE_TXT = 'file'
   const uidGenerator=()=>{
-    return '-'+parseInt(Math.random()*10000+1,10);
+    return '-'+parseInt(Math.random()*10000+1,10)
   }
   export default {
     name: 'JUpload',
     data(){
       return {
-        uploadAction:window._CONFIG['domianURL']+"/sys/common/upload",
+        uploadAction:window._CONFIG['domianURL']+'/sys/common/upload',
         headers:{},
         fileList: [],
         newFileList: [],
@@ -57,7 +57,7 @@
       text: {
         type: String,
         required: false,
-        default: "点击上传"
+        default: '点击上传'
       },
       fileType: {
         type: String,
@@ -68,7 +68,7 @@
       bizPath: {
         type: String,
         required: false,
-        default: "temp"
+        default: 'temp'
       },
       value: {
         type: [String, Array],
@@ -127,7 +127,7 @@
             if(this.returnUrl){
               this.initFileList(val.join(','))
             }else{
-              this.initFileListArr(val);
+              this.initFileListArr(val)
             }
           } else {
             this.initFileList(val)
@@ -138,12 +138,12 @@
     computed:{
       //透传给下级组件的事件，需要排除本组件使用的change事件
       childListeners() {
-        const vm = this;
+        const vm = this
         let result = Object.assign({},
           this.$listeners,
         )
-        delete result.change;
-        return result;
+        delete result.change
+        return result
       },
       isImageComp(){
         return this.fileType === FILE_TYPE_IMG
@@ -153,17 +153,17 @@
       },
     },
     created(){
-      const token = Vue.ls.get(ACCESS_TOKEN);
+      const token = Vue.ls.get(ACCESS_TOKEN)
       //---------------------------- begin 图片左右换位置 -------------------------------------
-      this.headers = {"X-Access-Token":token};
-      this.containerId = 'container-ty-'+new Date().getTime();
+      this.headers = {'X-Access-Token':token}
+      this.containerId = 'container-ty-'+new Date().getTime()
       //---------------------------- end 图片左右换位置 -------------------------------------
     },
     methods:{
       initFileListArr(val){
         if(!val || val.length==0){
-          this.fileList = [];
-          return;
+          this.fileList = []
+          return
         }
         for(var a=0;a<val.length;a++){
           this.fileList.forEach((item)=>{
@@ -176,10 +176,10 @@
       },
       async initFileList(paths){
         if(!paths || paths.length === 0){
-          this.fileList = [];
-          return;
+          this.fileList = []
+          return
         }
-        let arr = paths.split(",")
+        let arr = paths.split(',')
         // 返回路径的时候,对路径进行操作,取出所属id
         if(!this.returnId && arr.length > 0) {
           const newArr = []
@@ -216,20 +216,20 @@
         if(!uploadFiles || uploadFiles.length==0){
           path = ''
         }
-        let arr = [];
+        let arr = []
         // 如果returnid为true 只返回id
         if(this.returnId){
           for(var a=0;a<uploadFiles.length;a++){
             if(uploadFiles[a].status === 'done' ) {
               arr.push(uploadFiles[a].response.result.id)
             }else{
-              return;
+              return
             }
           }
           if(arr.length>0){
-            fileIds = arr.join(",")
+            fileIds = arr.join(',')
           }
-          this.$emit('change', fileIds);
+          this.$emit('change', fileIds)
           return
         }
 
@@ -237,22 +237,22 @@
           if(uploadFiles[a].status === 'done' ) {
             arr.push(uploadFiles[a].url)
           }else{
-            return;
+            return
           }
         }
         if(arr.length>0){
-          path = arr.join(",")
+          path = arr.join(',')
         }
-        this.$emit('change', path);
+        this.$emit('change', path)
       },
       beforeUpload(file){
         this.uploadGoOn=true
-        var fileType = file.type;
+        var fileType = file.type
         if(this.fileType===FILE_TYPE_IMG){
           if(fileType.indexOf('image')<0){
-            this.$message.warning('请上传图片');
+            this.$message.warning('请上传图片')
             this.uploadGoOn=false
-            return false;
+            return false
           }
         }
         //TODO 扩展功能验证文件大小
@@ -260,25 +260,25 @@
       },
       handleChange(info) {
         if(!info.file.status && this.uploadGoOn === false){
-          info.fileList.pop();
+          info.fileList.pop()
         }
         let fileList = info.fileList
         if(info.file.status==='done'){
           if(this.number>0){
-            fileList = fileList.slice(-this.number);
+            fileList = fileList.slice(-this.number)
           }
           if(info.file.response.success){
             fileList = fileList.map((file) => {
               if (file.response) {
                 // let reUrl = `${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.response.result.fileName}`;
-                file.url = getFileAccessHttpUrl(file.response.result.id);
+                file.url = getFileAccessHttpUrl(file.response.result.id)
               }
-              return file;
-            });
+              return file
+            })
           }
           //this.$message.success(`${info.file.name} 上传成功!`);
         }else if (info.file.status === 'error') {
-          this.$message.error(`${info.file.name} 上传失败.`);
+          this.$message.error(`${info.file.name} 上传失败.`)
         }else if(info.file.status === 'removed'){
           this.handleDelete(info.file)
         }
@@ -289,7 +289,7 @@
             this.handlePathChange()
           }else{
             //returnUrl为false时返回文件名称、文件路径及文件大小
-            this.newFileList = [];
+            this.newFileList = []
             for(var a=0;a<fileList.length;a++){
               // update-begin-author:lvdandan date:20200603 for:【TESTA-514】【开源issue】多个文件同时上传时，控制台报错
               if(fileList[a].status === 'done' ) {
@@ -297,14 +297,14 @@
                   fileName:fileList[a].name,
                   filePath:fileList[a].url,
                   fileSize:fileList[a].size
-                };
-                this.newFileList.push(fileJson);
+                }
+                this.newFileList.push(fileJson)
               }else{
-                return;
+                return
               }
               // update-end-author:lvdandan date:20200603 for:【TESTA-514】【开源issue】多个文件同时上传时，控制台报错
             }
-            this.$emit('change', this.newFileList);
+            this.$emit('change', this.newFileList)
           }
         }
       },
diff --git a/src/components/jero/index.js b/src/components/jero/index.js
index 02f8f62..457d919 100644
--- a/src/components/jero/index.js
+++ b/src/components/jero/index.js
@@ -1,11 +1,11 @@
-import JModal from "./JModal";
-import JInput from "./JInput.vue";
+import JModal from './JModal'
+import JInput from './JInput.vue'
 import JEllipsis from './JEllipsis.vue'
 
 export default {
   install(Vue) {
-    Vue.component(JModal.name, JModal);
-    Vue.component("JInput", JInput);
+    Vue.component(JModal.name, JModal)
+    Vue.component('JInput', JInput)
     Vue.component('JEllipsis', JEllipsis)
   }
-};
+}
diff --git a/src/components/jero/minipop/JFilePop.vue b/src/components/jero/minipop/JFilePop.vue
index 0f5350f..5eba511 100644
--- a/src/components/jero/minipop/JFilePop.vue
+++ b/src/components/jero/minipop/JFilePop.vue
@@ -14,14 +14,14 @@
 </template>
 
 <script>
-  import { getFileAccessHttpUrl } from '@/api/manage';
+  import { getFileAccessHttpUrl } from '@/api/manage'
 
   const getFileName=(path)=>{
-    if(path.lastIndexOf("\\")>=0){
-      let reg=new RegExp("\\\\","g");
-      path = path.replace(reg,"/");
+    if(path.lastIndexOf('\\')>=0){
+      let reg=new RegExp('\\\\','g')
+      path = path.replace(reg,'/')
     }
-    return path.substring(path.lastIndexOf("/")+1);
+    return path.substring(path.lastIndexOf('/')+1)
   }
 
   export default {
@@ -76,11 +76,11 @@
     },
     methods:{
       handleChange(value){
-        this.filePath = value;
+        this.filePath = value
       },
       show(id,value,flag){
-        this.id = id;
-        this.filePath = value;
+        this.id = id
+        this.filePath = value
         this.visible=true
         if(flag === 'img'){
           this.fileType = 'image'
@@ -91,10 +91,10 @@
       },
       ok(){
         if(!this.filePath){
-          this.$message.error("未上传任何文件")
-          return false;
+          this.$message.error('未上传任何文件')
+          return false
         }
-        let arr = this.filePath.split(",")
+        let arr = this.filePath.split(',')
         let obj = {
           name:getFileName(arr[0]),
           url:getFileAccessHttpUrl(arr[0]),
diff --git a/src/components/jero/minipop/JInputPop.vue b/src/components/jero/minipop/JInputPop.vue
index 1f6a6d7..b3e96cc 100644
--- a/src/components/jero/minipop/JInputPop.vue
+++ b/src/components/jero/minipop/JInputPop.vue
@@ -68,7 +68,7 @@
         immediate:true,
         handler:function(){
           if(this.value && this.value.length>0){
-            this.inputContent = this.value;
+            this.inputContent = this.value
           }
         }
       },
diff --git a/src/components/jero/modal/JCronModal.vue b/src/components/jero/modal/JCronModal.vue
index c336189..b4adff9 100644
--- a/src/components/jero/modal/JCronModal.vue
+++ b/src/components/jero/modal/JCronModal.vue
@@ -335,184 +335,184 @@
     },
     computed: {
       modalWidth(){
-        return 608;
+        return 608
       },
       secondsText() {
-        let seconds = '';
-        let cronEvery=this.result.second.cronEvery||'';
+        let seconds = ''
+        let cronEvery=this.result.second.cronEvery||''
         switch (cronEvery.toString()){
           case '1':
-            seconds = '*';
-            break;
+            seconds = '*'
+            break
           case '2':
-            seconds = this.result.second.incrementStart+'/'+this.result.second.incrementIncrement;
-            break;
+            seconds = this.result.second.incrementStart+'/'+this.result.second.incrementIncrement
+            break
           case '3':
-            this.result.second.specificSpecific.map(val=> {seconds += val+','});
-            seconds = seconds.slice(0, -1);
-            break;
+            this.result.second.specificSpecific.map(val=> {seconds += val+','})
+            seconds = seconds.slice(0, -1)
+            break
           case '4':
-            seconds = this.result.second.rangeStart+'-'+this.result.second.rangeEnd;
-            break;
+            seconds = this.result.second.rangeStart+'-'+this.result.second.rangeEnd
+            break
         }
-        return seconds;
+        return seconds
       },
       minutesText() {
-        let minutes = '';
-        let cronEvery=this.result.minute.cronEvery||'';
+        let minutes = ''
+        let cronEvery=this.result.minute.cronEvery||''
         switch (cronEvery.toString()){
           case '1':
-            minutes = '*';
-            break;
+            minutes = '*'
+            break
           case '2':
-            minutes = this.result.minute.incrementStart+'/'+this.result.minute.incrementIncrement;
-            break;
+            minutes = this.result.minute.incrementStart+'/'+this.result.minute.incrementIncrement
+            break
           case '3':
             this.result.minute.specificSpecific.map(val=> {
               minutes += val+','
-            });
-            minutes = minutes.slice(0, -1);
-            break;
+            })
+            minutes = minutes.slice(0, -1)
+            break
           case '4':
-            minutes = this.result.minute.rangeStart+'-'+this.result.minute.rangeEnd;
-            break;
+            minutes = this.result.minute.rangeStart+'-'+this.result.minute.rangeEnd
+            break
         }
-        return minutes;
+        return minutes
       },
       hoursText() {
-        let hours = '';
-        let cronEvery=this.result.hour.cronEvery||'';
+        let hours = ''
+        let cronEvery=this.result.hour.cronEvery||''
         switch (cronEvery.toString()){
           case '1':
-            hours = '*';
-            break;
+            hours = '*'
+            break
           case '2':
-            hours = this.result.hour.incrementStart+'/'+this.result.hour.incrementIncrement;
-            break;
+            hours = this.result.hour.incrementStart+'/'+this.result.hour.incrementIncrement
+            break
           case '3':
             this.result.hour.specificSpecific.map(val=> {
               hours += val+','
-            });
-            hours = hours.slice(0, -1);
-            break;
+            })
+            hours = hours.slice(0, -1)
+            break
           case '4':
-            hours = this.result.hour.rangeStart+'-'+this.result.hour.rangeEnd;
-            break;
+            hours = this.result.hour.rangeStart+'-'+this.result.hour.rangeEnd
+            break
         }
-        return hours;
+        return hours
       },
       daysText() {
-        let days='';
-        let cronEvery=this.result.day.cronEvery||'';
+        let days=''
+        let cronEvery=this.result.day.cronEvery||''
         switch (cronEvery.toString()){
           case '1':
-            break;
+            break
           case '2':
           case '4':
           case '11':
-            days = '?';
-            break;
+            days = '?'
+            break
           case '3':
-            days = this.result.day.incrementStart+'/'+this.result.day.incrementIncrement;
-            break;
+            days = this.result.day.incrementStart+'/'+this.result.day.incrementIncrement
+            break
           case '5':
             this.result.day.specificSpecific.map(val=> {
               days += val+','
-            });
-            days = days.slice(0, -1);
-            break;
+            })
+            days = days.slice(0, -1)
+            break
           case '6':
-            days = "L";
-            break;
+            days = 'L'
+            break
           case '7':
-            days = "LW";
-            break;
+            days = 'LW'
+            break
           case '8':
-            days = this.result.day.cronLastSpecificDomDay + 'L';
-            break;
+            days = this.result.day.cronLastSpecificDomDay + 'L'
+            break
           case '9':
-            days = 'L-' + this.result.day.cronDaysBeforeEomMinus;
-            break;
+            days = 'L-' + this.result.day.cronDaysBeforeEomMinus
+            break
           case '10':
-            days = this.result.day.cronDaysNearestWeekday+"W";
+            days = this.result.day.cronDaysNearestWeekday+'W'
             break
         }
-        return days;
+        return days
       },
       weeksText() {
-        let weeks = '';
-        let cronEvery=this.result.day.cronEvery||'';
+        let weeks = ''
+        let cronEvery=this.result.day.cronEvery||''
         switch (cronEvery.toString()){
           case '1':
           case '3':
           case '5':
-            weeks = '?';
-            break;
+            weeks = '?'
+            break
           case '2':
-            weeks = this.result.week.incrementStart+'/'+this.result.week.incrementIncrement;
-            break;
+            weeks = this.result.week.incrementStart+'/'+this.result.week.incrementIncrement
+            break
           case '4':
             this.result.week.specificSpecific.map(val=> {
               weeks += val+','
-            });
-            weeks = weeks.slice(0, -1);
-            break;
+            })
+            weeks = weeks.slice(0, -1)
+            break
           case '6':
           case '7':
           case '8':
           case '9':
           case '10':
-            weeks = "?";
-            break;
+            weeks = '?'
+            break
           case '11':
-            weeks = this.result.week.cronNthDayDay+"#"+this.result.week.cronNthDayNth;
-            break;
+            weeks = this.result.week.cronNthDayDay+'#'+this.result.week.cronNthDayNth
+            break
         }
-        return weeks;
+        return weeks
       },
       monthsText() {
-        let months = '';
-        let cronEvery=this.result.month.cronEvery||'';
+        let months = ''
+        let cronEvery=this.result.month.cronEvery||''
         switch (cronEvery.toString()){
           case '1':
-            months = '*';
-            break;
+            months = '*'
+            break
           case '2':
-            months = this.result.month.incrementStart+'/'+this.result.month.incrementIncrement;
-            break;
+            months = this.result.month.incrementStart+'/'+this.result.month.incrementIncrement
+            break
           case '3':
             this.result.month.specificSpecific.map(val=> {
               months += val+','
-            });
-            months = months.slice(0, -1);
-            break;
+            })
+            months = months.slice(0, -1)
+            break
           case '4':
-            months = this.result.month.rangeStart+'-'+this.result.month.rangeEnd;
-            break;
+            months = this.result.month.rangeStart+'-'+this.result.month.rangeEnd
+            break
         }
-        return months;
+        return months
       },
       yearsText() {
-        let years = '';
-        let cronEvery=this.result.year.cronEvery||'';
+        let years = ''
+        let cronEvery=this.result.year.cronEvery||''
         switch (cronEvery.toString()){
           case '1':
-            years = '*';
-            break;
+            years = '*'
+            break
           case '2':
-            years = this.result.year.incrementStart+'/'+this.result.year.incrementIncrement;
-            break;
+            years = this.result.year.incrementStart+'/'+this.result.year.incrementIncrement
+            break
           case '3':
             this.result.year.specificSpecific.map(val=> {
               years += val+','
-            });
-            years = years.slice(0, -1);
-            break;
+            })
+            years = years.slice(0, -1)
+            break
           case '4':
-            years = this.result.year.rangeStart+'-'+this.result.year.rangeEnd;
-            break;
+            years = this.result.year.rangeStart+'-'+this.result.year.rangeEnd
+            break
         }
-        return years;
+        return years
       },
       cron(){
         return `${this.secondsText||'*'} ${this.minutesText||'*'} ${this.hoursText||'*'} ${this.daysText||'*'} ${this.monthsText||'*'} ${this.weeksText||'?'} ${this.yearsText||'*'}`
@@ -531,25 +531,25 @@
           //   //this.result = clone(this.defaultValue);
           //   this.result = JSON.parse(JSON.stringify(this.defaultValue));
           // }
-          let label = this.data;
+          let label = this.data
           if(label){
             this.secondsReverseExp(label)
-            this.minutesReverseExp(label);
-            this.hoursReverseExp(label);
-            this.daysReverseExp(label);
-            this.daysReverseExp(label);
-            this.monthsReverseExp(label);
-            this.yearReverseExp(label);
-            JSON.parse(JSON.stringify(label));
+            this.minutesReverseExp(label)
+            this.hoursReverseExp(label)
+            this.daysReverseExp(label)
+            this.daysReverseExp(label)
+            this.monthsReverseExp(label)
+            this.yearReverseExp(label)
+            JSON.parse(JSON.stringify(label))
           }else {
-            this.result = JSON.parse(JSON.stringify(this.defaultValue));
+            this.result = JSON.parse(JSON.stringify(this.defaultValue))
           }
         }
       }
     },
     methods: {
       show(){
-        this.visible = true;
+        this.visible = true
         // console.log('secondsReverseExp',this.secondsReverseExp(this.data));
         // console.log('minutesReverseExp',this.minutesReverseExp(this.data));
         // console.log('hoursReverseExp',this.hoursReverseExp(this.data));
@@ -559,15 +559,15 @@
 
       },
       handleSubmit(){
-        this.$emit('ok',this.cron);
-        this.close();
-        this.visible = false;
+        this.$emit('ok',this.cron)
+        this.close()
+        this.visible = false
       },
       close(){
-        this.visible = false;
+        this.visible = false
       },
       secondsReverseExp(seconds) {
-        let val =  seconds.split(" ")[0];
+        let val =  seconds.split(' ')[0]
         //alert(val);
         let second = {
           cronEvery:'',
@@ -576,32 +576,32 @@
           rangeStart:1,
           rangeEnd:0,
           specificSpecific:[]
-        };
+        }
         switch (true) {
           case val.includes('*'):
-            second.cronEvery = '1';
-            break;
+            second.cronEvery = '1'
+            break
           case val.includes('/'):
-            second.cronEvery = '2';
-            second.incrementStart = val.split('/')[0];
-            second.incrementIncrement = val.split('/')[1];
-            break;
+            second.cronEvery = '2'
+            second.incrementStart = val.split('/')[0]
+            second.incrementIncrement = val.split('/')[1]
+            break
           case val.includes(','):
-            second.cronEvery = '3';
-            second.specificSpecific = val.split(',').map(Number).sort();
-            break;
+            second.cronEvery = '3'
+            second.specificSpecific = val.split(',').map(Number).sort()
+            break
           case val.includes('-'):
-            second.cronEvery = '4';
-            second.rangeStart = val.split('-')[0];
-            second.rangeEnd = val.split('-')[1];
-            break;
+            second.cronEvery = '4'
+            second.rangeStart = val.split('-')[0]
+            second.rangeEnd = val.split('-')[1]
+            break
           default:
-            second.cronEvery = '1';
+            second.cronEvery = '1'
         }
-        this.result.second = second;
+        this.result.second = second
       },
       minutesReverseExp(minutes) {
-        let val =  minutes.split(" ")[1];
+        let val =  minutes.split(' ')[1]
         let minute = {
           cronEvery:'',
           incrementStart:3,
@@ -612,29 +612,29 @@
         }
         switch (true) {
           case val.includes('*'):
-            minute.cronEvery = '1';
-            break;
+            minute.cronEvery = '1'
+            break
           case val.includes('/'):
-            minute.cronEvery = '2';
-            minute.incrementStart = val.split('/')[0];
-            minute.incrementIncrement = val.split('/')[1];
-            break;
+            minute.cronEvery = '2'
+            minute.incrementStart = val.split('/')[0]
+            minute.incrementIncrement = val.split('/')[1]
+            break
           case val.includes(','):
-            minute.cronEvery = '3';
-            minute.specificSpecific = val.split(',').map(Number).sort();
-            break;
+            minute.cronEvery = '3'
+            minute.specificSpecific = val.split(',').map(Number).sort()
+            break
           case val.includes('-'):
-            minute.cronEvery = '4';
-            minute.rangeStart = val.split('-')[0];
-            minute.rangeEnd = val.split('-')[1];
-            break;
+            minute.cronEvery = '4'
+            minute.rangeStart = val.split('-')[0]
+            minute.rangeEnd = val.split('-')[1]
+            break
           default:
-            minute.cronEvery = '1';
+            minute.cronEvery = '1'
         }
-        this.result.minute = minute;
+        this.result.minute = minute
       },
       hoursReverseExp(hours) {
-        let val =  hours.split(" ")[2];
+        let val =  hours.split(' ')[2]
         let hour ={
             cronEvery:'',
             incrementStart:3,
@@ -642,33 +642,33 @@
             rangeStart:1,
             rangeEnd:'0',
             specificSpecific:[],
-          };
+          }
         switch (true) {
           case val.includes('*'):
-            hour.cronEvery = '1';
-            break;
+            hour.cronEvery = '1'
+            break
           case val.includes('/'):
-            hour.cronEvery = '2';
-            hour.incrementStart = val.split('/')[0];
-            hour.incrementIncrement = val.split('/')[1];
-            break;
+            hour.cronEvery = '2'
+            hour.incrementStart = val.split('/')[0]
+            hour.incrementIncrement = val.split('/')[1]
+            break
           case val.includes(','):
-            hour.cronEvery = '3';
-            hour.specificSpecific = val.split(',').map(Number).sort();
-            break;
+            hour.cronEvery = '3'
+            hour.specificSpecific = val.split(',').map(Number).sort()
+            break
           case val.includes('-'):
-            hour.cronEvery = '4';
-            hour.rangeStart = val.split('-')[0];
-            hour.rangeEnd = val.split('-')[1];
-            break;
+            hour.cronEvery = '4'
+            hour.rangeStart = val.split('-')[0]
+            hour.rangeEnd = val.split('-')[1]
+            break
           default:
-            hour.cronEvery = '1';
+            hour.cronEvery = '1'
           }
-        this.result.hour = hour;
+        this.result.hour = hour
       },
       daysReverseExp(cron) {
-        let days =  cron.split(" ")[3];
-        let weeks =  cron.split(" ")[5];
+        let days =  cron.split(' ')[3]
+        let weeks =  cron.split(' ')[5]
         let day ={
           cronEvery:'',
           incrementStart:1,
@@ -679,7 +679,7 @@
           cronLastSpecificDomDay:1,
           cronDaysBeforeEomMinus:1,
           cronDaysNearestWeekday:1,
-        };
+        }
         let week = {
             cronEvery:'',
             incrementStart:1,
@@ -687,80 +687,80 @@
             specificSpecific:[],
             cronNthDayDay:1,
             cronNthDayNth:'1',
-        };
+        }
         if (!days.includes('?')) {
           switch (true) {
             case days.includes('*'):
-              day.cronEvery = '1';
-              break;
+              day.cronEvery = '1'
+              break
             case days.includes('?'):
               // 2、4、11
-              break;
+              break
             case days.includes('/'):
-              day.cronEvery = '3';
-              day.incrementStart = days.split('/')[0];
-              day.incrementIncrement = days.split('/')[1];
-              break;
+              day.cronEvery = '3'
+              day.incrementStart = days.split('/')[0]
+              day.incrementIncrement = days.split('/')[1]
+              break
             case days.includes(','):
-              day.cronEvery = '5';
-              day.specificSpecific = days.split(',').map(Number).sort();
+              day.cronEvery = '5'
+              day.specificSpecific = days.split(',').map(Number).sort()
               // day.specificSpecific.forEach(function (value, index) {
               //   day.specificSpecific[index] = value -1;
               // });
-              break;
+              break
             case days.includes('LW'):
-              day.cronEvery = '7';
-              break;
+              day.cronEvery = '7'
+              break
             case days.includes('L-'):
-              day.cronEvery = '9';
-              day.cronDaysBeforeEomMinus = days.split('L-')[1];
-              break;
+              day.cronEvery = '9'
+              day.cronDaysBeforeEomMinus = days.split('L-')[1]
+              break
             case days.includes('L'):
 
               //alert(days);
               if(days.len == 1){
-                day.cronEvery = '6';
-                day.cronLastSpecificDomDay = '1';
+                day.cronEvery = '6'
+                day.cronLastSpecificDomDay = '1'
               }
               else
               {
-                day.cronEvery = '8';
-                day.cronLastSpecificDomDay = Number(days.split('L')[0]);
+                day.cronEvery = '8'
+                day.cronLastSpecificDomDay = Number(days.split('L')[0])
               }
-              break;
+              break
             case days.includes('W'):
-              day.cronEvery = '10';
-              day.cronDaysNearestWeekday = days.split('W')[0];
-              break;
+              day.cronEvery = '10'
+              day.cronDaysNearestWeekday = days.split('W')[0]
+              break
             default:
-              day.cronEvery = '1';
+              day.cronEvery = '1'
           }
         }else {
           switch (true){
             case weeks.includes('/'):
-              day.cronEvery = '2';
-              week.incrementStart = weeks.split("/")[0];
-              week.incrementIncrement = weeks.split("/")[1];
-              break;
+              day.cronEvery = '2'
+              week.incrementStart = weeks.split('/')[0]
+              week.incrementIncrement = weeks.split('/')[1]
+              break
             case weeks.includes(','):
-              day.cronEvery = '4';
-              week.specificSpecific = weeks.split(',').map(Number).sort();
-              break;
+              day.cronEvery = '4'
+              week.specificSpecific = weeks.split(',').map(Number).sort()
+              break
             case '#':
-              day.cronEvery = '11';
-              week.cronNthDayDay = weeks.split("#")[0];
-              week.cronNthDayNth = weeks.split("#")[1];
-              break;
+              day.cronEvery = '11'
+              week.cronNthDayDay = weeks.split('#')[0]
+              week.cronNthDayNth = weeks.split('#')[1]
+              break
             default:
-              day.cronEvery = '1';
-              week.cronEvery = '1';
+              day.cronEvery = '1'
+              week.cronEvery = '1'
           }
         }
-        this.result.day = day;
-        this.result.week = week;
+        this.result.day = day
+        this.result.week = week
       },
       monthsReverseExp(cron) {
-        let months = cron.split(" ")[4];
+        let months = cron.split(' ')[4]
         let month = {
           cronEvery:'',
             incrementStart:3,
@@ -768,32 +768,32 @@
             rangeStart:1,
             rangeEnd:1,
             specificSpecific:[],
-        };
+        }
         switch (true){
           case months.includes('*'):
-            month.cronEvery = '1';
-            break;
+            month.cronEvery = '1'
+            break
           case months.includes('/'):
-            month.cronEvery = '2';
-            month.incrementStart = months.split('/')[0];
-            month.incrementIncrement = months.split('/')[1];
-            break;
+            month.cronEvery = '2'
+            month.incrementStart = months.split('/')[0]
+            month.incrementIncrement = months.split('/')[1]
+            break
           case months.includes(','):
-            month.cronEvery = '3';
-            month.specificSpecific = months.split(',').map(Number).sort();
-            break;
+            month.cronEvery = '3'
+            month.specificSpecific = months.split(',').map(Number).sort()
+            break
           case months.includes('-'):
-            month.cronEvery = '4';
-            month.rangeStart = months.split('-')[0];
-            month.rangeEnd = months.split('-')[1];
-            break;
+            month.cronEvery = '4'
+            month.rangeStart = months.split('-')[0]
+            month.rangeEnd = months.split('-')[1]
+            break
           default:
-            month.cronEvery = '1';
+            month.cronEvery = '1'
         }
-        this.result.month = month;
+        this.result.month = month
       },
       yearReverseExp(cron) {
-        let years = cron.split(" ")[6];
+        let years = cron.split(' ')[6]
         let year = {
           cronEvery:'',
           incrementStart:3,
@@ -801,29 +801,29 @@
           rangeStart:2019,
           rangeEnd:2019,
           specificSpecific:[],
-        };
+        }
         switch (true){
           case years.includes('*'):
-            year.cronEvery = '1';
-            break;
+            year.cronEvery = '1'
+            break
           case years.includes('/'):
-            year.cronEvery = '2';
-            year.incrementStart = years.split('/')[0];
-            year.incrementIncrement = years.split('/')[1];
-            break;
+            year.cronEvery = '2'
+            year.incrementStart = years.split('/')[0]
+            year.incrementIncrement = years.split('/')[1]
+            break
           case years.includes(','):
-            year.cronEvery = '3';
-            year.specificSpecific = years.split(',').map(Number).sort();
-            break;
+            year.cronEvery = '3'
+            year.specificSpecific = years.split(',').map(Number).sort()
+            break
           case years.includes('-'):
-            year.cronEvery = '4';
-            year.rangeStart = years.split('-')[0];
-            year.rangeEnd = years.split('-')[1];
-            break;
+            year.cronEvery = '4'
+            year.rangeStart = years.split('-')[0]
+            year.rangeEnd = years.split('-')[1]
+            break
           default:
-            year.cronEvery = '1';
+            year.cronEvery = '1'
         }
-        this.result.year = year;
+        this.result.year = year
       }
     }
   }
diff --git a/src/components/layouts/BasicLayout.vue b/src/components/layouts/BasicLayout.vue
index 65b40cd..008690e 100644
--- a/src/components/layouts/BasicLayout.vue
+++ b/src/components/layouts/BasicLayout.vue
@@ -13,7 +13,7 @@
   import GlobalLayout from '@/components/page/GlobalLayout'
 
   export default {
-    name: "BasicLayout",
+    name: 'BasicLayout',
     components: {
       GlobalLayout
     },
diff --git a/src/components/layouts/IframePageView.vue b/src/components/layouts/IframePageView.vue
index 7bdf736..8e888c1 100644
--- a/src/components/layouts/IframePageView.vue
+++ b/src/components/layouts/IframePageView.vue
@@ -6,15 +6,15 @@
 
 <script>
   import Vue from 'vue'
-  import { ACCESS_TOKEN } from "@/store/mutation-types"
+  import { ACCESS_TOKEN } from '@/store/mutation-types'
 
   export default {
-    name: "IframePageContent",
+    name: 'IframePageContent',
     inject:['closeCurrent'],
     data () {
       return {
-        url: "",
-        id:""
+        url: '',
+        id:''
       }
     },
     created () {
@@ -25,7 +25,7 @@
     },
     watch: {
       $route(to, from) {
-        this.goUrl();
+        this.goUrl()
       }
     },
     methods: {
@@ -34,19 +34,19 @@
         let id = this.$route.path
         this.id = id
         //url = "http://www.baidu.com"
-        console.log("------url------"+url)
+        console.log('------url------'+url)
         if (url !== null && url !== undefined) {
-          this.url = url;
+          this.url = url
           /*update_begin author:wuxianquan date:20190908 for:判断打开方式，新窗口打开时this.$route.meta.internalOrExternal==true */
           if(this.$route.meta.internalOrExternal != undefined && this.$route.meta.internalOrExternal==true){
-            this.closeCurrent();
+            this.closeCurrent()
             //外部url加入token
-            let tokenStr = "${token}";
+            let tokenStr = '${token}'
             if(url.indexOf(tokenStr)!=-1){
-              let token = Vue.ls.get(ACCESS_TOKEN);
-               this.url = url.replace(tokenStr,token);
+              let token = Vue.ls.get(ACCESS_TOKEN)
+               this.url = url.replace(tokenStr,token)
             }
-            window.open(this.url);
+            window.open(this.url)
           }
           /*update_end author:wuxianquan date:20190908 for:判断打开方式，新窗口打开时this.$route.meta.internalOrExternal==true */
 
diff --git a/src/components/layouts/PageView.vue b/src/components/layouts/PageView.vue
index fc330a0..59e07c8 100644
--- a/src/components/layouts/PageView.vue
+++ b/src/components/layouts/PageView.vue
@@ -13,7 +13,7 @@
   import RouteView from './RouteView'
 
   export default {
-    name: "PageContent",
+    name: 'PageContent',
     components: {
       RouteView,
       PageLayout
diff --git a/src/components/layouts/RouteView.vue b/src/components/layouts/RouteView.vue
index 73237de..9257f30 100644
--- a/src/components/layouts/RouteView.vue
+++ b/src/components/layouts/RouteView.vue
@@ -9,10 +9,10 @@
 
 <script>
   import Vue from 'vue'
-  import { CACHE_INCLUDED_ROUTES } from "@/store/mutation-types"
+  import { CACHE_INCLUDED_ROUTES } from '@/store/mutation-types'
 
   export default {
-    name: "RouteView",
+    name: 'RouteView',
     computed: {
       //update-begin--Author:scott  Date:20201015 for：路由缓存问题，关闭了tab页时再打开就不刷新 #842
       includedComponents() {
@@ -24,10 +24,10 @@
             cacheRouterArray.push(this.$route.meta.componentName)
             // cacheRouterArray.push("OnlCgformHeadList")
             Vue.ls.set(CACHE_INCLUDED_ROUTES, cacheRouterArray)
-            return cacheRouterArray;
+            return cacheRouterArray
           }
         }
-        return includedRouters;
+        return includedRouters
       },
       //update-end--Author:scott  Date:20201015 for：路由缓存问题，关闭了tab页时再打开就不刷新 #842
       keepAlive () {
diff --git a/src/components/layouts/TabLayout.vue b/src/components/layouts/TabLayout.vue
index 3633157..bcdd4ca 100644
--- a/src/components/layouts/TabLayout.vue
+++ b/src/components/layouts/TabLayout.vue
@@ -38,7 +38,7 @@
   import { triggerWindowResizeEvent } from '@/utils/util'
   const indexKey = '/dashboard/analysis'
   import Vue from 'vue'
-  import { CACHE_INCLUDED_ROUTES } from "@/store/mutation-types"
+  import { CACHE_INCLUDED_ROUTES } from '@/store/mutation-types'
 
   export default {
     name: 'TabLayout',
@@ -171,7 +171,7 @@
 
       // update-begin-author:sunjianlei date:20200120 for: 动态更改页面标题
       changeTitle(title) {
-        let projectTitle = "Jero-Boot 企业级快速开发平台"
+        let projectTitle = 'Jero-Boot 企业级快速开发平台'
         // 首页特殊处理
         if (this.$route.path === indexKey) {
           document.title = projectTitle
@@ -206,7 +206,7 @@
           this.$message.warning('这是最后一页，不能再关闭了啦')
           return
         }
-        console.log("this.pageList ",this.pageList );
+        console.log('this.pageList ',this.pageList )
         let removeRoute = this.pageList.filter(item => item.fullPath == key)
         this.pageList = this.pageList.filter(item => item.fullPath !== key)
         let index = this.linkList.indexOf(key)
@@ -219,8 +219,8 @@
         let cacheRouterArray = Vue.ls.get(CACHE_INCLUDED_ROUTES) || []
         if (removeRoute && removeRoute[0]) {
           let componentName = removeRoute[0].meta.componentName
-          console.log("key: ", key);
-          console.log("componentName: ", componentName);
+          console.log('key: ', key)
+          console.log('componentName: ', componentName)
           if(cacheRouterArray.includes(componentName)){
             cacheRouterArray.splice(cacheRouterArray.findIndex(item => item === componentName), 1)
             Vue.ls.set(CACHE_INCLUDED_ROUTES, cacheRouterArray)
@@ -266,7 +266,7 @@
       },
       /* update_begin author:wuxianquan date:20190828 for: 关闭当前tab页，供子页面调用->望菜单能配置外链，直接弹出新页面而不是嵌入iframe #428 */
       closeCurrent(){
-        this.remove(this.activePage);
+        this.remove(this.activePage)
       },
       /* update_end author:wuxianquan date:20190828 for: 关闭当前tab页，供子页面调用->望菜单能配置外链，直接弹出新页面而不是嵌入iframe #428 */
       closeOthers(pageKey) {
@@ -324,7 +324,7 @@
       //update-begin-author:taoyan date:20191008 for:路由刷新
       routeReload(){
         this.reloadFlag = false
-        let ToggleMultipage = "ToggleMultipage"
+        let ToggleMultipage = 'ToggleMultipage'
         this.$store.dispatch(ToggleMultipage,false)
         this.$nextTick(()=>{
           this.$store.dispatch(ToggleMultipage,true)
diff --git a/src/components/layouts/UserLayout.vue b/src/components/layouts/UserLayout.vue
index cdb754a..0b9fd74 100644
--- a/src/components/layouts/UserLayout.vue
+++ b/src/components/layouts/UserLayout.vue
@@ -32,11 +32,11 @@
 </template>
 
 <script>
-  import RouteView from "@/components/layouts/RouteView"
+  import RouteView from '@/components/layouts/RouteView'
   import { mixinDevice } from '@/utils/mixin.js'
 
   export default {
-    name: "UserLayout",
+    name: 'UserLayout',
     components: { RouteView },
     mixins: [mixinDevice],
     data () {
@@ -53,27 +53,27 @@
   }
   // 判断当前设备
   function isMobile() {
-    var userAgentInfo = navigator.userAgent;
+    var userAgentInfo = navigator.userAgent
 
-    var mobileAgents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
+    var mobileAgents = ['Android', 'iPhone', 'SymbianOS', 'Windows Phone', 'iPad', 'iPod']
 
-    var mobile_flag = false;
+    var mobile_flag = false
 
     //根据userAgent判断是否是手机
     for (var v = 0; v < mobileAgents.length; v++) {
       if (userAgentInfo.indexOf(mobileAgents[v]) > 0) {
-        mobile_flag = true;
-        break;
+        mobile_flag = true
+        break
       }
     }
-    var screen_width = window.screen.width;
-    var screen_height = window.screen.height;
+    var screen_width = window.screen.width
+    var screen_height = window.screen.height
 
     //根据屏幕分辨率判断是否是手机
     if (screen_width < 500 && screen_height < 800) {
-      mobile_flag = true;
+      mobile_flag = true
     }
-    return mobile_flag;
+    return mobile_flag
   }
 </script>
 <style lang="less" >
diff --git a/src/components/menu/SideMenu.vue b/src/components/menu/SideMenu.vue
index acb8ad9..eb32cb5 100644
--- a/src/components/menu/SideMenu.vue
+++ b/src/components/menu/SideMenu.vue
@@ -19,13 +19,13 @@
 </template>
 
 <script>
-  import ALayoutSider from "ant-design-vue/es/layout/Sider"
+  import ALayoutSider from 'ant-design-vue/es/layout/Sider'
   import Logo from '../tools/Logo'
   import SMenu from './index'
   import { mixin, mixinDevice } from '@/utils/mixin.js'
 
   export default {
-    name: "SideMenu",
+    name: 'SideMenu',
     components: { ALayoutSider, Logo, SMenu },
     mixins: [mixin, mixinDevice],
     props: {
diff --git a/src/components/menu/index.js b/src/components/menu/index.js
index 2710d3b..6ad854a 100644
--- a/src/components/menu/index.js
+++ b/src/components/menu/index.js
@@ -89,7 +89,7 @@ export default {
         })
       }
       //update-begin-author:taoyan date:20190510 for:online表单菜单点击展开的一级目录不对
-      if(!this.selectedKeys || this.selectedKeys[0].indexOf(":")<0){
+      if(!this.selectedKeys || this.selectedKeys[0].indexOf(':')<0){
         this.collapsed ? (this.cachedOpenKeys = openKeys) : (this.openKeys = openKeys)
       }
       //update-end-author:taoyan date:20190510 for:online表单菜单点击展开的一级目录不对
diff --git a/src/components/page/GlobalFooter.vue b/src/components/page/GlobalFooter.vue
index d715bbf..b4724c8 100644
--- a/src/components/page/GlobalFooter.vue
+++ b/src/components/page/GlobalFooter.vue
@@ -15,7 +15,7 @@
 
 <script>
   export default {
-    name: "LayoutFooter"
+    name: 'LayoutFooter'
   }
 </script>
 
diff --git a/src/components/page/PageHeader.vue b/src/components/page/PageHeader.vue
index f7e86b5..6b5444a 100644
--- a/src/components/page/PageHeader.vue
+++ b/src/components/page/PageHeader.vue
@@ -44,9 +44,9 @@
   import Breadcrumb from '@/components/tools/Breadcrumb'
 
   export default {
-    name: "PageHeader",
+    name: 'PageHeader',
     components: {
-      "s-breadcrumb": Breadcrumb
+      's-breadcrumb': Breadcrumb
     },
     props: {
       title: {
diff --git a/src/components/page/PageLayout.vue b/src/components/page/PageLayout.vue
index 191fd8a..58cb813 100644
--- a/src/components/page/PageLayout.vue
+++ b/src/components/page/PageLayout.vue
@@ -40,7 +40,7 @@
   import PageHeader from './PageHeader'
 
   export default {
-    name: "LayoutContent",
+    name: 'LayoutContent',
     components: {
       PageHeader
     },
diff --git a/src/components/page/SHeaderNotice.vue b/src/components/page/SHeaderNotice.vue
index 5e874e8..9f47445 100644
--- a/src/components/page/SHeaderNotice.vue
+++ b/src/components/page/SHeaderNotice.vue
@@ -19,7 +19,7 @@
 
 <script>
   export default {
-    name: "HeaderNotice",
+    name: 'HeaderNotice',
     props: {
       tabs: {
         type: Array,
diff --git a/src/components/setting/SettingDrawer.vue b/src/components/setting/SettingDrawer.vue
index aeff6db..bef5ad4 100644
--- a/src/components/setting/SettingDrawer.vue
+++ b/src/components/setting/SettingDrawer.vue
@@ -169,12 +169,12 @@
 </template>
 
 <script>
-import DetailList from "@/components/tools/DetailList";
-import SettingItem from "@/components/setting/SettingItem";
-import config from "@/defaultSettings";
-import { updateTheme, updateColorWeak, colorList } from "@/components/tools/setting";
-import { mixin, mixinDevice } from "@/utils/mixin.js";
-import { triggerWindowResizeEvent } from "@/utils/util";
+import DetailList from '@/components/tools/DetailList'
+import SettingItem from '@/components/setting/SettingItem'
+import config from '@/defaultSettings'
+import { updateTheme, updateColorWeak, colorList } from '@/components/tools/setting'
+import { mixin, mixinDevice } from '@/utils/mixin.js'
+import { triggerWindowResizeEvent } from '@/utils/util'
 
 export default {
   components: {
@@ -187,71 +187,71 @@ export default {
       visible: false,
       colorList,
       dataFixSiderbar: false
-    };
+    }
   },
   mounted() {
     // 当主题色不是默认色时，才进行主题编译
     if (this.primaryColor !== config.primaryColor) {
-      updateTheme(this.primaryColor);
+      updateTheme(this.primaryColor)
     }
     if (this.colorWeak !== config.colorWeak) {
-      updateColorWeak(this.colorWeak);
+      updateColorWeak(this.colorWeak)
     }
     if (this.multipage !== config.multipage) {
-      this.$store.dispatch("ToggleMultipage", this.multipage);
+      this.$store.dispatch('ToggleMultipage', this.multipage)
     }
   },
   methods: {
     showDrawer() {
-      this.visible = true;
+      this.visible = true
     },
     onClose() {
-      this.visible = false;
+      this.visible = false
     },
     toggle() {
-      this.visible = !this.visible;
+      this.visible = !this.visible
     },
     onColorWeak(checked) {
-      this.$store.dispatch("ToggleWeak", checked);
-      updateColorWeak(checked);
+      this.$store.dispatch('ToggleWeak', checked)
+      updateColorWeak(checked)
     },
     onMultipageWeak(checked) {
-      this.$store.dispatch("ToggleMultipage", checked);
+      this.$store.dispatch('ToggleMultipage', checked)
     },
     handleMenuTheme(theme) {
-      this.$store.dispatch("ToggleTheme", theme);
+      this.$store.dispatch('ToggleTheme', theme)
     },
     handleLayout(mode) {
-      this.$store.dispatch("ToggleLayoutMode", mode);
+      this.$store.dispatch('ToggleLayoutMode', mode)
       // 因为顶部菜单不能固定左侧菜单栏，所以强制关闭
-      this.handleFixSiderbar(false);
+      this.handleFixSiderbar(false)
       // 触发窗口resize事件
-      triggerWindowResizeEvent();
+      triggerWindowResizeEvent()
     },
     handleContentWidthChange(type) {
-      this.$store.dispatch("ToggleContentWidth", type);
+      this.$store.dispatch('ToggleContentWidth', type)
     },
     changeColor(color) {
       if (this.primaryColor !== color) {
-        this.$store.dispatch("ToggleColor", color);
-        updateTheme(color);
+        this.$store.dispatch('ToggleColor', color)
+        updateTheme(color)
       }
     },
     handleFixedHeader(fixed) {
-      this.$store.dispatch("ToggleFixedHeader", fixed);
+      this.$store.dispatch('ToggleFixedHeader', fixed)
     },
     handleFixedHeaderHidden(autoHidden) {
-      this.$store.dispatch("ToggleFixedHeaderHidden", autoHidden);
+      this.$store.dispatch('ToggleFixedHeaderHidden', autoHidden)
     },
     handleFixSiderbar(fixed) {
-      if (this.layoutMode === "topmenu") {
-        fixed = false;
+      if (this.layoutMode === 'topmenu') {
+        fixed = false
       }
-      this.dataFixSiderbar = fixed;
-      this.$store.dispatch("ToggleFixSiderbar", fixed);
+      this.dataFixSiderbar = fixed
+      this.$store.dispatch('ToggleFixSiderbar', fixed)
     }
   }
-};
+}
 </script>
 
 <style lang="less" scoped>
diff --git a/src/components/setting/SettingItem.vue b/src/components/setting/SettingItem.vue
index 251a061..d7148f2 100644
--- a/src/components/setting/SettingItem.vue
+++ b/src/components/setting/SettingItem.vue
@@ -8,7 +8,7 @@
 
 <script>
   export default {
-    name: "SettingItem",
+    name: 'SettingItem',
     props: {
       title: {
         type: String,
diff --git a/src/components/tools/DepartSelect.vue b/src/components/tools/DepartSelect.vue
index 7a7e15a..66c3d11 100644
--- a/src/components/tools/DepartSelect.vue
+++ b/src/components/tools/DepartSelect.vue
@@ -43,14 +43,14 @@
   import { getAction,putAction } from '@/api/manage'
   import Vue from 'vue'
   import store from '@/store/'
-  import { USER_INFO } from "@/store/mutation-types"
+  import { USER_INFO } from '@/store/mutation-types'
 
   export default {
     name: 'DepartSelect',
     props:{
       title:{
         type:String,
-        default:"部门选择",
+        default:'部门选择',
         required:false
       },
       closable:{
@@ -60,7 +60,7 @@
       },
       username:{
         type:String,
-        default:"",
+        default:'',
         required:false
       }
     },
@@ -76,9 +76,9 @@
         currTitle:this.title,
         visible:false,
         departList:[],
-        departSelected:"",
-        validate_status:"",
-        currDepartName:"",
+        departSelected:'',
+        validate_status:'',
+        currDepartName:'',
       }
     },
     created(){
@@ -87,7 +87,7 @@
     methods:{
       loadDepartList(){
         return new Promise(resolve => {
-          let url = "/sys/user/getCurrentUserDeparts"
+          let url = '/sys/user/getCurrentUserDeparts'
           this.currDepartName=''
           getAction(url).then(res=>{
             if(res.success){
@@ -104,7 +104,7 @@
               this.departSelected = orgCode
               this.departList  = departs
               if(this.currDepartName){
-                this.currTitle ="部门切换（当前部门 : "+this.currDepartName+"）"
+                this.currTitle ='部门切换（当前部门 : '+this.currDepartName+'）'
               }
 
             }
@@ -124,11 +124,11 @@
           orgCode:this.departSelected,
           username:this.username
         }
-        putAction("/sys/selectDepart",obj).then(res=>{
+        putAction('/sys/selectDepart',obj).then(res=>{
           if(res.success){
-            const userInfo = res.result.userInfo;
-            Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000);
-            store.commit('SET_INFO', userInfo);
+            const userInfo = res.result.userInfo
+            Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
+            store.commit('SET_INFO', userInfo)
             //console.log("---切换组织机构---userInfo-------",store.getters.userInfo.orgCode);
             this.departClear()
           }
@@ -139,17 +139,17 @@
         this.loadDepartList().then(()=>{
           this.visible=true
           if(!this.departList || this.departList.length<=0){
-            this.$message.warning("您尚未设置部门信息!")
+            this.$message.warning('您尚未设置部门信息!')
             this.departClear()
           }
         })
       },
       departClear(){
         this.departList=[]
-        this.departSelected=""
+        this.departSelected=''
         this.visible=false
         this.validate_status=''
-        this.currDepartName=""
+        this.currDepartName=''
       },
     }
 
diff --git a/src/components/tools/DetailList.vue b/src/components/tools/DetailList.vue
index bd74971..d366e69 100644
--- a/src/components/tools/DetailList.vue
+++ b/src/components/tools/DetailList.vue
@@ -42,7 +42,7 @@
   }
 
   export default {
-    name: "DetailList",
+    name: 'DetailList',
     Item: Item,
     components: {
       Col
diff --git a/src/components/tools/HeaderNotice.vue b/src/components/tools/HeaderNotice.vue
index 6dacd9c..9f2b3a0 100644
--- a/src/components/tools/HeaderNotice.vue
+++ b/src/components/tools/HeaderNotice.vue
@@ -84,7 +84,7 @@
 
 
   export default {
-    name: "HeaderNotice",
+    name: 'HeaderNotice',
     components: {
       DynamicNotice,
       // ShowAnnouncement,
@@ -93,17 +93,17 @@
       return {
         loadding: false,
         url:{
-          listCementByUser:"/sys/annountCement/listByUser",
-          editCementSend:"/sys/sysAnnouncementSend/editByAnntIdAndUserId",
-          queryById:"/sys/annountCement/queryById",
+          listCementByUser:'/sys/annountCement/listByUser',
+          editCementSend:'/sys/sysAnnouncementSend/editByAnntIdAndUserId',
+          queryById:'/sys/annountCement/queryById',
         },
         hovered: false,
         announcement1:[],
         announcement2:[],
-        msg1Count:"0",
-        msg2Count:"0",
-        msg1Title:"通知(0)",
-        msg2Title:"",
+        msg1Count:'0',
+        msg2Count:'0',
+        msg1Title:'通知(0)',
+        msg2Title:'',
         stopTimer:false,
         websock: null,
         lockReconnect:false,
@@ -114,26 +114,26 @@
     },
     computed:{
       msgTotal () {
-        return parseInt(this.msg1Count)+parseInt(this.msg2Count);
+        return parseInt(this.msg1Count)+parseInt(this.msg2Count)
       }
     },
     mounted() {
-      this.loadData();
+      this.loadData()
       //this.timerFun();
-      this.initWebSocket();
+      this.initWebSocket()
      // this.heartCheckFun();
     },
     destroyed: function () { // 离开页面生命周期函数
-      this.websocketOnclose();
+      this.websocketOnclose()
     },
     methods: {
       timerFun() {
-        this.stopTimer = false;
+        this.stopTimer = false
         let myTimer = setInterval(()=>{
           // 停止定时器
           if (this.stopTimer == true) {
-            clearInterval(myTimer);
-            return;
+            clearInterval(myTimer)
+            return
           }
           this.loadData()
         },6000)
@@ -143,21 +143,21 @@
           // 获取系统消息
           getAction(this.url.listCementByUser).then((res) => {
             if (res.success) {
-              this.announcement1 = res.result.anntMsgList;
-              this.msg1Count = res.result.anntMsgTotal;
-              this.msg1Title = "通知(" + res.result.anntMsgTotal + ")";
-              this.announcement2 = res.result.sysMsgList;
-              this.msg2Count = res.result.sysMsgTotal;
-              this.msg2Title = "系统消息(" + res.result.sysMsgTotal + ")";
+              this.announcement1 = res.result.anntMsgList
+              this.msg1Count = res.result.anntMsgTotal
+              this.msg1Title = '通知(' + res.result.anntMsgTotal + ')'
+              this.announcement2 = res.result.sysMsgList
+              this.msg2Count = res.result.sysMsgTotal
+              this.msg2Title = '系统消息(' + res.result.sysMsgTotal + ')'
             }
           }).catch(error => {
-            console.log("系统消息通知异常",error);//这行打印permissionName is undefined
-            this.stopTimer = true;
-            console.log("清理timer");
-          });
+            console.log('系统消息通知异常',error)//这行打印permissionName is undefined
+            this.stopTimer = true
+            console.log('清理timer')
+          })
         } catch (err) {
-          this.stopTimer = true;
-          console.log("通知异常",err);
+          this.stopTimer = true
+          console.log('通知异常',err)
         }
       },
       fetchNotice () {
@@ -173,14 +173,14 @@
       showAnnouncement(record){
         putAction(this.url.editCementSend,{anntId:record.id}).then((res)=>{
           if(res.success){
-            this.loadData();
+            this.loadData()
           }
-        });
-        this.hovered = false;
+        })
+        this.hovered = false
         if(record.openType==='component'){
-          this.openPath = record.openPage;
-          this.formData = {id:record.busId};
-          this.$refs.showDynamNotice.detail(record.openPage);
+          this.openPath = record.openPage
+          this.formData = {id:record.busId}
+          this.$refs.showDynamNotice.detail(record.openPage)
         }else{
           // this.$refs.ShowAnnouncement.detail(record);
         }
@@ -188,65 +188,65 @@
       toMyAnnouncement(){
         this.$router.push({
           path: '/isps/userAnnouncement'
-        });
+        })
       },
       modalFormOk(){
       },
       handleHoverChange (visible) {
-        this.hovered = visible;
+        this.hovered = visible
       },
 
       initWebSocket: function () {
         // WebSocket与普通的请求所用协议有所不同，ws等同于http，wss等同于https
-        var userId = store.getters.userInfo.id;
-        var url = window._CONFIG['domianWebSocketURL'].replace("https://","wss://").replace("http://","ws://")+"/websocket/"+userId;
+        var userId = store.getters.userInfo.id
+        var url = window._CONFIG['domianWebSocketURL'].replace('https://','wss://').replace('http://','ws://')+'/websocket/'+userId
         //console.log(url);
-        this.websock = new WebSocket(url);
-        this.websock.onopen = this.websocketOnopen;
-        this.websock.onerror = this.websocketOnerror;
-        this.websock.onmessage = this.websocketOnmessage;
-        this.websock.onclose = this.websocketOnclose;
+        this.websock = new WebSocket(url)
+        this.websock.onopen = this.websocketOnopen
+        this.websock.onerror = this.websocketOnerror
+        this.websock.onmessage = this.websocketOnmessage
+        this.websock.onclose = this.websocketOnclose
       },
       websocketOnopen: function () {
-        console.log("WebSocket连接成功");
+        console.log('WebSocket连接成功')
         //心跳检测重置
         //this.heartCheck.reset().start();
       },
       websocketOnerror: function (e) {
-        console.log("WebSocket连接发生错误");
-        this.reconnect();
+        console.log('WebSocket连接发生错误')
+        this.reconnect()
       },
       websocketOnmessage: function (e) {
-        console.log("-----接收消息-------",e.data);
-        var data = eval("(" + e.data + ")"); //解析对象
-        if(data.cmd == "topic"){
+        console.log('-----接收消息-------',e.data)
+        var data = eval('(' + e.data + ')') //解析对象
+        if(data.cmd == 'topic'){
             //系统通知
-          this.loadData();
-        }else if(data.cmd == "user"){
+          this.loadData()
+        }else if(data.cmd == 'user'){
             //用户消息
-          this.loadData();
+          this.loadData()
         }
         //心跳检测重置
         //this.heartCheck.reset().start();
       },
       websocketOnclose: function (e) {
-        console.log("connection closed (" + e + ")");
+        console.log('connection closed (' + e + ')')
         if(e){
-          console.log("connection closed (" + e.code + ")");
+          console.log('connection closed (' + e.code + ')')
         }
-        this.reconnect();
+        this.reconnect()
       },
       websocketSend(text) { // 数据发送
         try {
-          this.websock.send(text);
+          this.websock.send(text)
         } catch (err) {
-          console.log("send failed (" + err.code + ")");
+          console.log('send failed (' + err.code + ')')
         }
       },
 
       openNotification (data) {
-        var text = data.msgTxt;
-        const key = `open${Date.now()}`;
+        var text = data.msgTxt
+        const key = `open${Date.now()}`
         this.$notification.open({
           message: '消息提醒',
           placement:'bottomRight',
@@ -263,39 +263,39 @@
               }
             }, '查看详情')
           },
-        });
+        })
       },
 
       reconnect() {
-        var that = this;
-        if(that.lockReconnect) return;
-        that.lockReconnect = true;
+        var that = this
+        if(that.lockReconnect) return
+        that.lockReconnect = true
         //没连接上会一直重连，设置延迟避免请求过多
         setTimeout(function () {
-          console.info("尝试重连...");
-          that.initWebSocket();
-          that.lockReconnect = false;
-        }, 5000);
+          console.info('尝试重连...')
+          that.initWebSocket()
+          that.lockReconnect = false
+        }, 5000)
       },
       heartCheckFun(){
-        var that = this;
+        var that = this
         //心跳检测,每20s心跳一次
         that.heartCheck = {
           timeout: 20000,
           timeoutObj: null,
           serverTimeoutObj: null,
           reset: function(){
-            clearTimeout(this.timeoutObj);
+            clearTimeout(this.timeoutObj)
             //clearTimeout(this.serverTimeoutObj);
-            return this;
+            return this
           },
           start: function(){
-            var self = this;
+            var self = this
             this.timeoutObj = setTimeout(function(){
               //这里发送一个心跳，后端收到后，返回一个心跳消息，
               //onmessage拿到返回的心跳就说明连接正常
-              that.websocketSend("HeartBeat");
-              console.info("客户端发送心跳");
+              that.websocketSend('HeartBeat')
+              console.info('客户端发送心跳')
               //self.serverTimeoutObj = setTimeout(function(){//如果超过一定时间还没重置，说明后端主动断开了
               //  that.websock.close();//如果onclose会执行reconnect，我们执行ws.close()就行了.如果直接执行reconnect 会触发onclose导致重连两次
               //}, self.timeout)
@@ -306,12 +306,12 @@
 
 
       showDetail(key,data){
-        this.$notification.close(key);
-        var id = data.msgId;
+        this.$notification.close(key)
+        var id = data.msgId
         getAction(this.url.queryById,{id:id}).then((res) => {
           if (res.success) {
-            var record = res.result;
-            this.showAnnouncement(record);
+            var record = res.result
+            this.showAnnouncement(record)
           }
         })
 
diff --git a/src/components/tools/ShowAnnouncement.vue b/src/components/tools/ShowAnnouncement.vue
index b2c6d88..bcfd3f6 100644
--- a/src/components/tools/ShowAnnouncement.vue
+++ b/src/components/tools/ShowAnnouncement.vue
@@ -24,12 +24,12 @@
 
 <script>
   export default {
-    name: "SysAnnouncementModal",
+    name: 'SysAnnouncementModal',
     components: {
     },
     data () {
       return {
-        title:"通知消息",
+        title:'通知消息',
         record: {},
         labelCol: {
           xs: { span: 24 },
@@ -43,9 +43,9 @@
         switchFullscreen: true,
         loading: false,
         bodyStyle:{
-          padding: "0",
-          height:(window.innerHeight*0.8)+"px",
-          "overflow-y":"auto",
+          padding: '0',
+          height:(window.innerHeight*0.8)+'px',
+          'overflow-y':'auto',
 
         },
         modelStyle:{
@@ -59,11 +59,11 @@
     },
     methods: {
       detail (record) {
-        this.visible = true;
-        this.record = record;
+        this.visible = true
+        this.record = record
       },
       handleCancel () {
-        this.visible = false;
+        this.visible = false
       },
       /** 切换全屏显示 */
       handleClickToggleFullScreen() {
@@ -79,7 +79,7 @@
       },
       toHandle(){
         if(this.record.openType==='url'){
-          this.visible = false;
+          this.visible = false
           //链接跳转
           this.$router.push({path: this.record.openPage})
         }
diff --git a/src/components/tools/StatusSlot.vue b/src/components/tools/StatusSlot.vue
index 9b4e5e1..8637823 100644
--- a/src/components/tools/StatusSlot.vue
+++ b/src/components/tools/StatusSlot.vue
@@ -11,7 +11,7 @@ import half from '../../assets/imgs/half.png'
 import error from '../../assets/imgs/error.png'
 
 export default {
-  name: "StatusSlot",
+  name: 'StatusSlot',
   props: {
     /*
     *  表格行对象
diff --git a/src/components/tools/UserMenu.vue b/src/components/tools/UserMenu.vue
index d6a91c4..3bef1c6 100644
--- a/src/components/tools/UserMenu.vue
+++ b/src/components/tools/UserMenu.vue
@@ -63,16 +63,16 @@
 <script>
   import HeaderNotice from './HeaderNotice'
   import UserPassword from './UserPassword'
-  import SettingDrawer from "@/components/setting/SettingDrawer";
+  import SettingDrawer from '@/components/setting/SettingDrawer'
   import DepartSelect from './DepartSelect'
   import { mapActions, mapGetters,mapState } from 'vuex'
   import { mixinDevice } from '@/utils/mixin.js'
-  import { getFileAccessHttpUrl,getAction } from "@/api/manage"
+  import { getFileAccessHttpUrl,getAction } from '@/api/manage'
   import Vue from 'vue'
-  import { UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types"
+  import { UI_CACHE_DB_DICT_DATA } from '@/store/mutation-types'
 
   export default {
-    name: "UserMenu",
+    name: 'UserMenu',
     mixins: [mixinDevice],
     data(){
       return{
@@ -139,8 +139,8 @@
         this.shows = false
       },
       /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-      ...mapActions(["Logout"]),
-      ...mapGetters(["nickname", "avatar","userInfo"]),
+      ...mapActions(['Logout']),
+      ...mapGetters(['nickname', 'avatar','userInfo']),
       getAvatar(){
         return getFileAccessHttpUrl(this.avatar())
       },
@@ -153,7 +153,7 @@
           onOk() {
             return that.Logout({}).then(() => {
               // update-begin author:wangshuai date:20200601 for: 退出登录跳转登录页面
-              that.$router.push({ path: '/user/login' });
+              that.$router.push({ path: '/user/login' })
               // update-end author:wangshuai date:20200601 for: 退出登录跳转登录页面
               //window.location.reload()
             }).catch(err => {
@@ -165,7 +165,7 @@
           },
           onCancel() {
           },
-        });
+        })
       },
       updatePassword(){
         let username = this.userInfo().username
@@ -180,7 +180,7 @@
       /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
       searchMenus(arr,menus){
         for(let i of menus){
-          if(!i.hidden && "layouts/RouteView"!==i.component){
+          if(!i.hidden && 'layouts/RouteView'!==i.component){
            arr.push(i)
           }
           if(i.children&& i.children.length>0){
@@ -205,20 +205,20 @@
       /*update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
       /*update_begin author:liushaoqian date:20200507 for: 刷新缓存*/
       clearCache(){
-        getAction("sys/dict/refleshCache").then((res) => {
+        getAction('sys/dict/refleshCache').then((res) => {
           if (res.success) {
             //重新加载缓存
-            getAction("sys/dict/queryAllDictItems").then((res) => {
+            getAction('sys/dict/queryAllDictItems').then((res) => {
               if (res.success) {
                 Vue.ls.remove(UI_CACHE_DB_DICT_DATA)
                 Vue.ls.set(UI_CACHE_DB_DICT_DATA, res.result, 7 * 24 * 60 * 60 * 1000)
               }
             })
-            this.$message.success("刷新缓存完成！");
+            this.$message.success('刷新缓存完成！')
           }
         }).catch(e=>{
-          this.$message.warn("刷新缓存失败！");
-          console.log("刷新失败",e)
+          this.$message.warn('刷新缓存失败！')
+          console.log('刷新失败',e)
         })
       }
       /*update_end author:liushaoqian date:20200507 for: 刷新缓存*/
diff --git a/src/components/tools/UserPassword.vue b/src/components/tools/UserPassword.vue
index ff2cc79..4bb0ea1 100644
--- a/src/components/tools/UserPassword.vue
+++ b/src/components/tools/UserPassword.vue
@@ -42,10 +42,10 @@
   import { putAction } from '@/api/manage'
 
   export default {
-    name: "UserPassword",
+    name: 'UserPassword',
     data () {
       return {
-        title:"修改密码",
+        title:'修改密码',
         modalWidth:800,
         visible: false,
         confirmLoading: false,
@@ -81,63 +81,63 @@
         },
 
         form:this.$form.createForm(this),
-        url: "sys/user/updatePassword",
-        username:"",
+        url: 'sys/user/updatePassword',
+        username:'',
       }
     },
     methods: {
       show(uname){
         if(!uname){
-          this.$message.warning("当前系统无登录用户!");
+          this.$message.warning('当前系统无登录用户!')
           return
         }else{
           this.username = uname
-          this.form.resetFields();
-          this.visible = true;
+          this.form.resetFields()
+          this.visible = true
         }
       },
       handleCancel () {
         this.close()
       },
       close () {
-        this.$emit('close');
-        this.visible = false;
-        this.disableSubmit = false;
-        this.selectedRole = [];
+        this.$emit('close')
+        this.visible = false
+        this.disableSubmit = false
+        this.selectedRole = []
       },
       handleOk () {
-        const that = this;
+        const that = this
         // 触发表单验证
         this.form.validateFields((err, values) => {
           if (!err) {
-            that.confirmLoading = true;
+            that.confirmLoading = true
             let params = Object.assign({username:this.username},values)
-            console.log("修改密码提交数据",params)
+            console.log('修改密码提交数据',params)
             putAction(this.url,params).then((res)=>{
               if(res.success){
                 console.log(res)
-                that.$message.success(res.message);
-                that.close();
+                that.$message.success(res.message)
+                that.close()
               }else{
-                that.$message.warning(res.message);
+                that.$message.warning(res.message)
               }
             }).finally(() => {
-              that.confirmLoading = false;
+              that.confirmLoading = false
             })
           }
         })
       },
       validateToNextPassword  (rule, value, callback) {
-        const form = this.form;
+        const form = this.form
         if (value && this.confirmDirty) {
           form.validateFields(['confirm'], { force: true })
         }
-        callback();
+        callback()
       },
       compareToFirstPassword  (rule, value, callback) {
-        const form = this.form;
+        const form = this.form
         if (value && value !== form.getFieldValue('password')) {
-          callback('两次输入的密码不一样！');
+          callback('两次输入的密码不一样！')
         } else {
           callback()
         }
diff --git a/src/components/tools/setting.js b/src/components/tools/setting.js
index fdfc396..1c2482b 100644
--- a/src/components/tools/setting.js
+++ b/src/components/tools/setting.js
@@ -1,7 +1,7 @@
-import { message } from 'ant-design-vue/es';
+import { message } from 'ant-design-vue/es'
 // import defaultSettings from '../defaultSettings';
 
-let lessNodesAppended;
+let lessNodesAppended
 
 const colorList = [
   {
@@ -28,7 +28,7 @@ const colorList = [
   {
     key: '酱紫', color: '#722ED1',
   },
-];
+]
 
 const updateTheme = primaryColor => {
   // Don't compile less in production!
@@ -37,33 +37,33 @@ const updateTheme = primaryColor => {
   } */
   // Determine if the component is remounted
   if (!primaryColor) {
-    return;
+    return
   }
-  const hideMessage = message.loading('正在编译主题！', 0);
+  const hideMessage = message.loading('正在编译主题！', 0)
   console.info(`正在编译主题!`)
   function buildIt() {
     // 正确的判定less是否已经加载less.modifyVars可用
     if (!window.less || !window.less.modifyVars) {
-      return;
+      return
     }
     // less.modifyVars可用
     window.less.modifyVars({
         '@primary-color': primaryColor,
       })
       .then(() => {
-        hideMessage();
+        hideMessage()
       })
       .catch(() => {
-        message.error('Failed to update theme');
-        hideMessage();
-      });
+        message.error('Failed to update theme')
+        hideMessage()
+      })
   }
   if (!lessNodesAppended) {
     // insert less.js and color.less
-    const lessStyleNode = document.createElement('link');
-    const lessConfigNode = document.createElement('script');
-    const lessScriptNode = document.createElement('script');
-    lessStyleNode.setAttribute('rel', 'stylesheet/less');
+    const lessStyleNode = document.createElement('link')
+    const lessConfigNode = document.createElement('script')
+    const lessScriptNode = document.createElement('script')
+    lessStyleNode.setAttribute('rel', 'stylesheet/less')
     lessStyleNode.setAttribute('href', __webpack_public_path__ + 'color.less')
     lessConfigNode.innerHTML = `
       window.less = {
@@ -71,25 +71,25 @@ const updateTheme = primaryColor => {
         env: 'production',
         javascriptEnabled: true
       };
-    `;
-    lessScriptNode.src = 'https://gw.alipayobjects.com/os/lib/less.js/3.8.1/less.min.js';
-    lessScriptNode.async = true;
+    `
+    lessScriptNode.src = 'https://gw.alipayobjects.com/os/lib/less.js/3.8.1/less.min.js'
+    lessScriptNode.async = true
     lessScriptNode.onload = () => {
-      buildIt();
-      lessScriptNode.onload = null;
-    };
-    document.body.appendChild(lessStyleNode);
-    document.body.appendChild(lessConfigNode);
-    document.body.appendChild(lessScriptNode);
-    lessNodesAppended = true;
+      buildIt()
+      lessScriptNode.onload = null
+    }
+    document.body.appendChild(lessStyleNode)
+    document.body.appendChild(lessConfigNode)
+    document.body.appendChild(lessScriptNode)
+    lessNodesAppended = true
   } else {
-    buildIt();
+    buildIt()
   }
-};
+}
 
 const updateColorWeak = colorWeak => {
   // document.body.className = colorWeak ? 'colorWeak' : '';
   colorWeak ? document.body.classList.add('colorWeak') : document.body.classList.remove('colorWeak')
-};
+}
 
 export { updateTheme, colorList, updateColorWeak }
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 0a8f6de..b0ea22b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,13 +1,13 @@
-import Vue from "vue";
-import App from "./App.vue";
-import router from "./router";
-import store from "./store";
-import "./config";
-import Storage from "vue-ls";
-import Antd from "ant-design-vue";
-import "ant-design-vue/dist/antd.less"; // or 'ant-design-vue/dist/antd.less'
-import "@/permission"; // permission control
-import hasPermission from "@/utils/hasPermission";
+import Vue from 'vue'
+import App from './App.vue'
+import router from './router'
+import store from './store'
+import './config'
+import Storage from 'vue-ls'
+import Antd from 'ant-design-vue'
+import 'ant-design-vue/dist/antd.less' // or 'ant-design-vue/dist/antd.less'
+import '@/permission' // permission control
+import hasPermission from '@/utils/hasPermission'
 import {
   ACCESS_TOKEN,
   DEFAULT_COLOR,
@@ -20,23 +20,23 @@ import {
   DEFAULT_FIXED_SIDEMENU,
   DEFAULT_CONTENT_WIDTH_TYPE,
   DEFAULT_MULTI_PAGE
-} from "@/store/mutation-types";
-import config from "@/defaultSettings";
-import JeroComponents from "@/components/jero/index";
-import JDictSelectTag from "./components/dict/index.js";
+} from '@/store/mutation-types'
+import config from '@/defaultSettings'
+import JeroComponents from '@/components/jero/index'
+import JDictSelectTag from './components/dict/index.js'
 import '@/utils/filter' // base filtermybatis-plus
-import vTrim from "@/utils/vTrim";
-import preventClick from "@/utils/preventClick";
+import vTrim from '@/utils/vTrim'
+import preventClick from '@/utils/preventClick'
 import '@/assets/less/JAreaLinkage.less'
 import VueAreaLinkage from 'vue-area-linkage'
 
-Vue.config.productionTip = false;
-Vue.use(Storage, config.storageOptions);
-Vue.use(Antd);
+Vue.config.productionTip = false
+Vue.use(Storage, config.storageOptions)
+Vue.use(Antd)
 Vue.use(hasPermission)
-Vue.use(router);
-Vue.use(JeroComponents);
-Vue.use(JDictSelectTag);
+Vue.use(router)
+Vue.use(JeroComponents)
+Vue.use(JDictSelectTag)
 Vue.use(vTrim)
 Vue.use(preventClick)
 Vue.use(VueAreaLinkage)
@@ -45,17 +45,17 @@ new Vue({
   router,
   store,
   mounted() {
-    store.commit("SET_SIDEBAR_TYPE", Vue.ls.get(SIDEBAR_TYPE, true));
-    store.commit("TOGGLE_THEME", Vue.ls.get(DEFAULT_THEME, config.navTheme));
-    store.commit("TOGGLE_LAYOUT_MODE", Vue.ls.get(DEFAULT_LAYOUT_MODE, config.layout));
-    store.commit("TOGGLE_FIXED_HEADER", Vue.ls.get(DEFAULT_FIXED_HEADER, config.fixedHeader));
-    store.commit("TOGGLE_FIXED_SIDERBAR", Vue.ls.get(DEFAULT_FIXED_SIDEMENU, config.fixSiderbar));
-    store.commit("TOGGLE_CONTENT_WIDTH", Vue.ls.get(DEFAULT_CONTENT_WIDTH_TYPE, config.contentWidth));
-    store.commit("TOGGLE_FIXED_HEADER_HIDDEN", Vue.ls.get(DEFAULT_FIXED_HEADER_HIDDEN, config.autoHideHeader));
-    store.commit("TOGGLE_WEAK", Vue.ls.get(DEFAULT_COLOR_WEAK, config.colorWeak));
-    store.commit("TOGGLE_COLOR", Vue.ls.get(DEFAULT_COLOR, config.primaryColor));
-    store.commit("SET_TOKEN", Vue.ls.get(ACCESS_TOKEN));
-    store.commit("SET_MULTI_PAGE", Vue.ls.get(DEFAULT_MULTI_PAGE, config.multipage));
+    store.commit('SET_SIDEBAR_TYPE', Vue.ls.get(SIDEBAR_TYPE, true))
+    store.commit('TOGGLE_THEME', Vue.ls.get(DEFAULT_THEME, config.navTheme))
+    store.commit('TOGGLE_LAYOUT_MODE', Vue.ls.get(DEFAULT_LAYOUT_MODE, config.layout))
+    store.commit('TOGGLE_FIXED_HEADER', Vue.ls.get(DEFAULT_FIXED_HEADER, config.fixedHeader))
+    store.commit('TOGGLE_FIXED_SIDERBAR', Vue.ls.get(DEFAULT_FIXED_SIDEMENU, config.fixSiderbar))
+    store.commit('TOGGLE_CONTENT_WIDTH', Vue.ls.get(DEFAULT_CONTENT_WIDTH_TYPE, config.contentWidth))
+    store.commit('TOGGLE_FIXED_HEADER_HIDDEN', Vue.ls.get(DEFAULT_FIXED_HEADER_HIDDEN, config.autoHideHeader))
+    store.commit('TOGGLE_WEAK', Vue.ls.get(DEFAULT_COLOR_WEAK, config.colorWeak))
+    store.commit('TOGGLE_COLOR', Vue.ls.get(DEFAULT_COLOR, config.primaryColor))
+    store.commit('SET_TOKEN', Vue.ls.get(ACCESS_TOKEN))
+    store.commit('SET_MULTI_PAGE', Vue.ls.get(DEFAULT_MULTI_PAGE, config.multipage))
   },
   render: (h) => h(App)
-}).$mount("#app");
+}).$mount('#app')
diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js
index 21c4c57..1c5f372 100644
--- a/src/mixins/JeroListMixin.js
+++ b/src/mixins/JeroListMixin.js
@@ -3,13 +3,13 @@
  * 高级查询按钮调用 superQuery方法  高级查询组件ref定义为superQueryModal
  * data中url定义 list为查询列表  delete为删除单条记录  deleteBatch为批量删除
  */
-import {filterObj} from '@/utils/util';
+import {filterObj} from '@/utils/util'
 import {deleteAction, getAction, downFile, getFileAccessHttpUrl} from '@/api/manage'
 import Vue from 'vue'
-import {ACCESS_TOKEN, TENANT_ID} from "@/store/mutation-types"
+import {ACCESS_TOKEN, TENANT_ID} from '@/store/mutation-types'
 import store from '@/store'
 import {Modal} from 'ant-design-vue'
-import {deleteByDepartId} from "@api/api";
+import {deleteByDepartId} from '@api/api'
 
 export const JeroListMixin = {
   data() {
@@ -26,7 +26,7 @@ export const JeroListMixin = {
         pageSize: 10,
         pageSizeOptions: ['10', '20', '30', '50'],
         showTotal: (total, range) => {
-          return range[0] + "-" + range[1] + " 共" + total + "条"
+          return range[0] + '-' + range[1] + ' 共' + total + '条'
         },
         showQuickJumper: true,
         showSizeChanger: true,
@@ -57,9 +57,9 @@ export const JeroListMixin = {
   },
   created() {
     if (!this.disableMixinCreated) {
-      this.loadData();
+      this.loadData()
       //初始化字典配置 在自己页面定义
-      this.initDictConfig();
+      this.initDictConfig()
     }
   },
   computed: {
@@ -70,38 +70,38 @@ export const JeroListMixin = {
       if (tenantid) {
         head['tenant_id'] = tenantid
       }
-      return head;
+      return head
     }
   },
   methods: {
     loadData(arg) {
       if (!this.url.list) {
-        this.$message.error("请设置url.list属性!")
+        this.$message.error('请设置url.list属性!')
         return
       }
       //加载数据 若传入参数1则加载第一页的内容
       if (arg === 1) {
-        this.ipagination.current = 1;
+        this.ipagination.current = 1
       }
-      var params = this.getQueryParams();//查询条件
-      this.loading = true;
+      var params = this.getQueryParams()//查询条件
+      this.loading = true
       getAction(this.url.list, params).then((res) => {
         if (res.success) {
           //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
-          this.dataSource = res.result.records || res.result;
+          this.dataSource = res.result.records || res.result
           if (res.result.total) {
-            this.ipagination.total = res.result.total;
+            this.ipagination.total = res.result.total
             //清空列表选中
             this.onClearSelected()
           } else {
-            this.ipagination.total = 0;
+            this.ipagination.total = 0
           }
           //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
         }
         if (res.code === 510) {
           this.$message.warning(res.message)
         }
-        this.loading = false;
+        this.loading = false
       }).finally(() => {
         this.loading = false
       })
@@ -129,128 +129,128 @@ export const JeroListMixin = {
         sqp['superQueryMatchType'] = this.superQueryMatchType
       }
       // var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters);
-      var param = Object.assign(sqp, this.lastQueryParam, this.isorter, this.filters);
-      param.field = this.getQueryField();
-      param.pageNo = this.ipagination.current;
-      param.pageSize = this.ipagination.pageSize;
-      return filterObj(param);
+      var param = Object.assign(sqp, this.lastQueryParam, this.isorter, this.filters)
+      param.field = this.getQueryField()
+      param.pageNo = this.ipagination.current
+      param.pageSize = this.ipagination.pageSize
+      return filterObj(param)
     },
     getQueryField() {
       //TODO 字段权限控制
-      var str = "id,";
+      var str = 'id,'
       this.columns.forEach(function (value) {
-        str += "," + value.dataIndex;
-      });
-      return str;
+        str += ',' + value.dataIndex
+      })
+      return str
     },
 
     onSelectChange(selectedRowKeys, selectionRows) {
-      this.selectedRowKeys = selectedRowKeys;
-      this.selectionRows = selectionRows;
+      this.selectedRowKeys = selectedRowKeys
+      this.selectionRows = selectionRows
     },
     onClearSelected() {
-      this.selectedRowKeys = [];
-      this.selectionRows = [];
+      this.selectedRowKeys = []
+      this.selectionRows = []
     },
     searchQuery() {
       this.lastQueryParam = {...this.queryParam}
-      this.loadData(1);
+      this.loadData(1)
     },
     superQuery() {
-      this.$refs.superQueryModal.show();
+      this.$refs.superQueryModal.show()
     },
     searchReset() {
       this.lastQueryParam = {}
       this.queryParam = {}
-      this.loadData(1);
+      this.loadData(1)
     },
     batchDel: function () {
       if (!this.url.deleteBatch) {
-        this.$message.error("请设置url.deleteBatch属性!")
+        this.$message.error('请设置url.deleteBatch属性!')
         return
       }
       if (this.selectedRowKeys.length <= 0) {
-        this.$message.warning('请选择一条记录！');
-        return;
+        this.$message.warning('请选择一条记录！')
+        return
       } else {
-        var ids = "";
+        var ids = ''
         for (var a = 0; a < this.selectedRowKeys.length; a++) {
-          ids += this.selectedRowKeys[a] + ",";
+          ids += this.selectedRowKeys[a] + ','
         }
-        var that = this;
+        var that = this
         this.$confirm({
-          title: "确认删除",
-          content: "是否删除选中数据?",
+          title: '确认删除',
+          content: '是否删除选中数据?',
           onOk: function () {
-            that.loading = true;
+            that.loading = true
             getAction(that.url.deleteBatch, {ids: ids}).then((res) => {
               if (res.success) {
-                that.$message.success(res.message);
+                that.$message.success(res.message)
                 // 判断当前删除的数据是否是最后一页的全部数据，如果是的话页码减一
                 if (that.ipagination.current > 1 && (that.ipagination.current === Math.ceil(that.ipagination.total / that.ipagination.pageSize)) &&
                     that.selectedRowKeys.length === that.dataSource.length
                 ) {
                   that.ipagination.current -= 1
                 }
-                that.loadData();
-                that.onClearSelected();
+                that.loadData()
+                that.onClearSelected()
               } else {
-                that.$message.warning(res.message);
+                that.$message.warning(res.message)
               }
             }).finally(() => {
-              that.loading = false;
-            });
+              that.loading = false
+            })
           }
-        });
+        })
       }
     },
     handleDelete: function (id) {
       if (!this.url.delete) {
-        this.$message.error("请设置url.delete属性!")
+        this.$message.error('请设置url.delete属性!')
         return
       }
-      var that = this;
+      var that = this
       this.$confirm({
-        title: "确认删除",
-        content: "确定要删除此条数据吗?",
+        title: '确认删除',
+        content: '确定要删除此条数据吗?',
         onOk: function () {
           getAction(that.url.delete, {id: id}).then((res) => {
             if (res.success) {
-              that.$message.success(res.message);
+              that.$message.success(res.message)
               // 判断当前删除的数据是否是最后一页的最后一条数据，如果是的话页码减一
               if (that.ipagination.current > 1 && ((that.ipagination.current - 1) * that.ipagination.pageSize) + 1 === that.ipagination.total) {
                 that.ipagination.current -= 1
               }
-              that.loadData();
+              that.loadData()
             } else {
-              that.$message.warning(res.message);
+              that.$message.warning(res.message)
             }
-          });
+          })
         }
-      });
+      })
     },
     handleEdit: function (record) {
-      this.$refs.modalForm.edit(record);
-      this.$refs.modalForm.title = "编辑";
-      this.$refs.modalForm.disableSubmit = false;
+      this.$refs.modalForm.edit(record)
+      this.$refs.modalForm.title = '编辑'
+      this.$refs.modalForm.disableSubmit = false
     },
     handleAdd: function () {
-      this.$refs.modalForm.add();
-      this.$refs.modalForm.title = "新增";
-      this.$refs.modalForm.disableSubmit = false;
+      this.$refs.modalForm.add()
+      this.$refs.modalForm.title = '新增'
+      this.$refs.modalForm.disableSubmit = false
     },
     handleTableChange(pagination, filters, sorter) {
       //分页、排序、筛选变化时触发
       //TODO 筛选
       if (Object.keys(sorter).length > 0) {
-        this.isorter.column = sorter.field;
-        this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
+        this.isorter.column = sorter.field
+        this.isorter.order = 'ascend' == sorter.order ? 'asc' : 'desc'
       }
-      this.ipagination = pagination;
-      this.loadData();
+      this.ipagination = pagination
+      this.loadData()
     },
     handleToggleSearch() {
-      this.toggleSearchStatus = !this.toggleSearchStatus;
+      this.toggleSearchStatus = !this.toggleSearchStatus
     },
     // 给popup查询使用(查询区域不支持回填多个字段，限制只返回一个字段)
     getPopupField(fields) {
@@ -258,33 +258,33 @@ export const JeroListMixin = {
     },
     modalFormOk() {
       // 新增/修改 成功时，重载列表
-      this.loadData();
+      this.loadData()
       //清空列表选中
       this.onClearSelected()
     },
     handleDetail: function (record) {
-      this.$refs.modalForm.edit(record);
-      this.$refs.modalForm.title = "详情";
-      this.$refs.modalForm.disableSubmit = true;
+      this.$refs.modalForm.edit(record)
+      this.$refs.modalForm.title = '详情'
+      this.$refs.modalForm.disableSubmit = true
     },
     /* 导出 */
     handleExportXls2() {
-      let paramsStr = encodeURI(JSON.stringify(this.getQueryParams()));
-      let url = `${window._CONFIG['domianURL']}/${this.url.exportXlsUrl}?paramsStr=${paramsStr}`;
-      window.location.href = url;
+      let paramsStr = encodeURI(JSON.stringify(this.getQueryParams()))
+      let url = `${window._CONFIG['domianURL']}/${this.url.exportXlsUrl}?paramsStr=${paramsStr}`
+      window.location.href = url
     },
     handleExportXls(fileName) {
-      if (!fileName || typeof fileName != "string") {
-        fileName = "导出文件"
+      if (!fileName || typeof fileName != 'string') {
+        fileName = '导出文件'
       }
-      let param = this.getQueryParams();
+      let param = this.getQueryParams()
       if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-        param['selections'] = this.selectedRowKeys.join(",")
+        param['selections'] = this.selectedRowKeys.join(',')
       }
-      console.log("导出参数", param)
+      console.log('导出参数', param)
       downFile(this.url.exportXlsUrl, param).then((data) => {
         if (!data) {
-          this.$message.warning("文件下载失败")
+          this.$message.warning('文件下载失败')
           return
         }
         if (typeof window.navigator.msSaveBlob !== 'undefined') {
@@ -297,8 +297,8 @@ export const JeroListMixin = {
           link.setAttribute('download', fileName + '.xls')
           document.body.appendChild(link)
           link.click()
-          document.body.removeChild(link); //下载完成移除元素
-          window.URL.revokeObjectURL(url); //释放掉blob对象
+          document.body.removeChild(link) //下载完成移除元素
+          window.URL.revokeObjectURL(url) //释放掉blob对象
         }
       })
     },
@@ -306,12 +306,12 @@ export const JeroListMixin = {
     *  下载模板
     * */
     downTemplate(fileName) {
-      if (!fileName || typeof fileName != "string") {
-        fileName = "模板文件"
+      if (!fileName || typeof fileName != 'string') {
+        fileName = '模板文件'
       }
       downFile(this.url.downTemplateUrl).then((data) => {
         if (!data) {
-          this.$message.warning("文件下载失败")
+          this.$message.warning('文件下载失败')
           return
         }
         if (typeof window.navigator.msSaveBlob !== 'undefined') {
@@ -324,15 +324,15 @@ export const JeroListMixin = {
           link.setAttribute('download', fileName + '.xls')
           document.body.appendChild(link)
           link.click()
-          document.body.removeChild(link); //下载完成移除元素
-          window.URL.revokeObjectURL(url); //释放掉blob对象
+          document.body.removeChild(link) //下载完成移除元素
+          window.URL.revokeObjectURL(url) //释放掉blob对象
         }
       })
     },
     /* 导入 */
     handleImportExcel(info) {
       if (info.file.status !== 'uploading') {
-        console.log(info.file, info.fileList);
+        console.log(info.file, info.fileList)
       }
       if (info.file.status === 'done') {
         if (info.file.response.success) {
@@ -375,7 +375,7 @@ export const JeroListMixin = {
         if (info.file.response.status === 500) {
           let data = info.file.response
           const token = Vue.ls.get(ACCESS_TOKEN)
-          if (token && data.message.includes("Token失效")) {
+          if (token && data.message.includes('Token失效')) {
             Modal.error({
               title: '登录已过期',
               content: '很抱歉，登录已过期，请重新登录',
@@ -384,13 +384,13 @@ export const JeroListMixin = {
               onOk: () => {
                 store.dispatch('Logout').then(() => {
                   Vue.ls.remove(ACCESS_TOKEN)
-                  window.location.reload();
+                  window.location.reload()
                 })
               }
             })
           }
         } else {
-          this.$message.error(`文件上传失败: ${info.file.msg} `);
+          this.$message.error(`文件上传失败: ${info.file.msg} `)
         }
       }
     },
@@ -402,8 +402,8 @@ export const JeroListMixin = {
     },
     /* 图片预览 */
     getImgView(text) {
-      if (text && text.indexOf(",") > 0) {
-        text = text.substring(0, text.indexOf(","))
+      if (text && text.indexOf(',') > 0) {
+        text = text.substring(0, text.indexOf(','))
       }
       return getFileAccessHttpUrl(text)
     },
@@ -411,14 +411,14 @@ export const JeroListMixin = {
     // update--autor:lvdandan-----date:20200630------for：修改下载文件方法名uploadFile改为downloadFile------
     downloadFile(text) {
       if (!text) {
-        this.$message.warning("未知的文件")
-        return;
+        this.$message.warning('未知的文件')
+        return
       }
-      if (text.indexOf(",") > 0) {
-        text = text.substring(0, text.indexOf(","))
+      if (text.indexOf(',') > 0) {
+        text = text.substring(0, text.indexOf(','))
       }
       let url = getFileAccessHttpUrl(text)
-      window.open(url);
+      window.open(url)
     },
   }
 
diff --git a/src/permission.js b/src/permission.js
index bdad1ae..572408a 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -1,72 +1,72 @@
-import Vue from "vue";
-import router from "./router";
-import store from "./store";
-import NProgress from "nprogress"; // progress bar
-import "nprogress/nprogress.css"; // progress bar style
+import Vue from 'vue'
+import router from './router'
+import store from './store'
+import NProgress from 'nprogress' // progress bar
+import 'nprogress/nprogress.css' // progress bar style
 // import notification from 'ant-design-vue/es/notification'
-import { ACCESS_TOKEN, INDEX_MAIN_PAGE_PATH } from "@/store/mutation-types";
-import { generateIndexRouter } from "@/utils/util";
+import { ACCESS_TOKEN, INDEX_MAIN_PAGE_PATH } from '@/store/mutation-types'
+import { generateIndexRouter } from '@/utils/util'
 
-NProgress.configure({ showSpinner: false }); // NProgress Configuration
+NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
-const whiteList = ["/user/login", "/user/register", "/user/register-result", "/user/alteration"]; // no redirect whitelist
+const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration'] // no redirect whitelist
 
 router.beforeEach((to, from, next) => {
-  NProgress.start(); // start progress bar
+  NProgress.start() // start progress bar
 
   if (Vue.ls.get(ACCESS_TOKEN)) {
     /* has token */
-    if (to.path === "/user/login") {
-      next({ path: INDEX_MAIN_PAGE_PATH });
-      NProgress.done();
+    if (to.path === '/user/login') {
+      next({ path: INDEX_MAIN_PAGE_PATH })
+      NProgress.done()
     } else {
       if (store.getters.permissionList.length === 0) {
-        store.dispatch("GetPermissionList").then(res => {
-          const menuData = res.result.menu;
-          if (menuData === null || menuData === "" || menuData === undefined) {
-            return;
+        store.dispatch('GetPermissionList').then(res => {
+          const menuData = res.result.menu
+          if (menuData === null || menuData === '' || menuData === undefined) {
+            return
           }
-          let constRoutes = [];
-          constRoutes = generateIndexRouter(menuData);
+          let constRoutes = []
+          constRoutes = generateIndexRouter(menuData)
           // 添加主界面路由
-          store.dispatch("UpdateAppRouter", { constRoutes }).then(() => {
+          store.dispatch('UpdateAppRouter', { constRoutes }).then(() => {
             // 根据roles权限生成可访问的路由表
             // 动态添加可访问路由表
-            router.addRoutes(store.getters.addRouters);
-            const redirect = decodeURIComponent(from.query.redirect || to.path);
+            router.addRoutes(store.getters.addRouters)
+            const redirect = decodeURIComponent(from.query.redirect || to.path)
             if (to.path === redirect) {
               // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
-              next({ ...to, replace: true });
+              next({ ...to, replace: true })
             } else {
               // 跳转到目的路由
-              next({ path: redirect });
+              next({ path: redirect })
             }
-          });
+          })
         })
           .catch(() => {
             /* notification.error({
                message: '系统提示',
                description: '请求用户信息失败，请重试！'
              })*/
-            store.dispatch("Logout").then(() => {
-              next({ path: "/user/login", query: { redirect: to.fullPath } });
-            });
-          });
+            store.dispatch('Logout').then(() => {
+              next({ path: '/user/login', query: { redirect: to.fullPath } })
+            })
+          })
       } else {
-        next();
+        next()
       }
     }
   } else {
     if (whiteList.indexOf(to.path) !== -1) {
       // 在免登录白名单，直接进入
-      next();
+      next()
     } else {
-      next({ path: "/user/login", query: { redirect: to.fullPath } });
-      NProgress.done(); // if current page is login will not trigger afterEach hook, so manually handle it
+      next({ path: '/user/login', query: { redirect: to.fullPath } })
+      NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it
     }
   }
-});
+})
 
 router.afterEach(() => {
-  NProgress.done(); // finish progress bar
-});
+  NProgress.done() // finish progress bar
+})
diff --git a/src/router/index.js b/src/router/index.js
index 1a8b35d..c4fcc57 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,18 +1,18 @@
-import Vue from "vue";
-import Router from "vue-router";
-import { constantRouterMap } from "@/config/router.config";
+import Vue from 'vue'
+import Router from 'vue-router'
+import { constantRouterMap } from '@/config/router.config'
 
-Vue.use(Router);
+Vue.use(Router)
 
-const originalPush = Router.prototype.push;
+const originalPush = Router.prototype.push
 Router.prototype.push = function push(location, onResolve, onReject) {
-  if (onResolve || onReject) return originalPush.call(this, location, onResolve, onReject);
-  return originalPush.call(this, location).catch(err => err);
-};
+  if (onResolve || onReject) return originalPush.call(this, location, onResolve, onReject)
+  return originalPush.call(this, location).catch(err => err)
+}
 
 export default new Router({
-  mode: "history",
+  mode: 'history',
   base: process.env.BASE_URL,
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRouterMap
-});
+})
diff --git a/src/store/getters.js b/src/store/getters.js
index 6e295d3..38b5baa 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import { USER_INFO, ENHANCE_PRE } from "@/store/mutation-types"
+import { USER_INFO, ENHANCE_PRE } from '@/store/mutation-types'
 const getters = {
   device: state => state.app.device,
   theme: state => state.app.theme,
@@ -14,7 +14,7 @@ const getters = {
   addRouters: state => state.permission.addRouters,
   onlAuthFields: state => {return state.online.authFields },
   enhanceJs:(state) => (code) => {
-    state.enhance.enhanceJs[code] = Vue.ls.get(ENHANCE_PRE+code);
+    state.enhance.enhanceJs[code] = Vue.ls.get(ENHANCE_PRE+code)
     return state.enhance.enhanceJs[code]
   }
 
diff --git a/src/store/index.js b/src/store/index.js
index eee9ba5..ab1b3ba 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,14 +1,14 @@
-import Vue from "vue";
-import Vuex from "vuex";
+import Vue from 'vue'
+import Vuex from 'vuex'
 
-import app from "./modules/app";
-import user from "./modules/user";
-import permission from "./modules/permission";
-import enhance from "./modules/enhance";
-import online from "./modules/online";
-import getters from "./getters";
+import app from './modules/app'
+import user from './modules/user'
+import permission from './modules/permission'
+import enhance from './modules/enhance'
+import online from './modules/online'
+import getters from './getters'
 
-Vue.use(Vuex);
+Vue.use(Vuex)
 
 export default new Vuex.Store({
   modules: {
@@ -23,10 +23,10 @@ export default new Vuex.Store({
     currentProjetcInfo:{}
   },
   mutations: {
-    "SET_CURRENTPROJECT":(state,info) =>{
+    'SET_CURRENTPROJECT':(state,info) =>{
       state.currentProjetcInfo = Object.assign({},info)
     }
   },
   actions: {},
   getters
-});
+})
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index d0f6655..eb5ccf4 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,4 +1,4 @@
-import Vue from "vue";
+import Vue from 'vue'
 import {
   SIDEBAR_TYPE,
   DEFAULT_THEME,
@@ -10,7 +10,7 @@ import {
   DEFAULT_FIXED_HEADER_HIDDEN,
   DEFAULT_CONTENT_WIDTH_TYPE,
   DEFAULT_MULTI_PAGE
-} from "@/store/mutation-types";
+} from '@/store/mutation-types'
 
 const app = {
   state: {
@@ -18,10 +18,10 @@ const app = {
       opened: true,
       withoutAnimation: false
     },
-    device: "desktop",
-    theme: "",
-    layout: "",
-    contentWidth: "",
+    device: 'desktop',
+    theme: '',
+    layout: '',
+    contentWidth: '',
     fixedHeader: false,
     fixSiderbar: false,
     autoHideHeader: false,
@@ -31,96 +31,96 @@ const app = {
   },
   mutations: {
     SET_SIDEBAR_TYPE: (state, type) => {
-      state.sidebar.opened = type;
-      Vue.ls.set(SIDEBAR_TYPE, type);
+      state.sidebar.opened = type
+      Vue.ls.set(SIDEBAR_TYPE, type)
     },
     CLOSE_SIDEBAR: (state, withoutAnimation) => {
-      Vue.ls.set(SIDEBAR_TYPE, true);
-      state.sidebar.opened = false;
-      state.sidebar.withoutAnimation = withoutAnimation;
+      Vue.ls.set(SIDEBAR_TYPE, true)
+      state.sidebar.opened = false
+      state.sidebar.withoutAnimation = withoutAnimation
     },
     TOGGLE_DEVICE: (state, device) => {
-      state.device = device;
+      state.device = device
     },
     TOGGLE_THEME: (state, theme) => {
       // setStore('_DEFAULT_THEME', theme)
-      Vue.ls.set(DEFAULT_THEME, theme);
-      state.theme = theme;
+      Vue.ls.set(DEFAULT_THEME, theme)
+      state.theme = theme
     },
     TOGGLE_LAYOUT_MODE: (state, layout) => {
-      Vue.ls.set(DEFAULT_LAYOUT_MODE, layout);
-      state.layout = layout;
+      Vue.ls.set(DEFAULT_LAYOUT_MODE, layout)
+      state.layout = layout
     },
     TOGGLE_FIXED_HEADER: (state, fixed) => {
-      Vue.ls.set(DEFAULT_FIXED_HEADER, fixed);
-      state.fixedHeader = fixed;
+      Vue.ls.set(DEFAULT_FIXED_HEADER, fixed)
+      state.fixedHeader = fixed
     },
     TOGGLE_FIXED_SIDERBAR: (state, fixed) => {
-      Vue.ls.set(DEFAULT_FIXED_SIDEMENU, fixed);
-      state.fixSiderbar = fixed;
+      Vue.ls.set(DEFAULT_FIXED_SIDEMENU, fixed)
+      state.fixSiderbar = fixed
     },
     TOGGLE_FIXED_HEADER_HIDDEN: (state, show) => {
-      Vue.ls.set(DEFAULT_FIXED_HEADER_HIDDEN, show);
-      state.autoHideHeader = show;
+      Vue.ls.set(DEFAULT_FIXED_HEADER_HIDDEN, show)
+      state.autoHideHeader = show
     },
     TOGGLE_CONTENT_WIDTH: (state, type) => {
-      Vue.ls.set(DEFAULT_CONTENT_WIDTH_TYPE, type);
-      state.contentWidth = type;
+      Vue.ls.set(DEFAULT_CONTENT_WIDTH_TYPE, type)
+      state.contentWidth = type
     },
     TOGGLE_COLOR: (state, color) => {
-      Vue.ls.set(DEFAULT_COLOR, color);
-      state.color = color;
+      Vue.ls.set(DEFAULT_COLOR, color)
+      state.color = color
     },
     TOGGLE_WEAK: (state, flag) => {
-      Vue.ls.set(DEFAULT_COLOR_WEAK, flag);
-      state.weak = flag;
+      Vue.ls.set(DEFAULT_COLOR_WEAK, flag)
+      state.weak = flag
     },
     SET_MULTI_PAGE(state, multipageFlag) {
-      Vue.ls.set(DEFAULT_MULTI_PAGE, multipageFlag);
-      state.multipage = multipageFlag;
+      Vue.ls.set(DEFAULT_MULTI_PAGE, multipageFlag)
+      state.multipage = multipageFlag
     }
   },
   actions: {
     setSidebar: ({ commit }, type) => {
-      commit("SET_SIDEBAR_TYPE", type);
+      commit('SET_SIDEBAR_TYPE', type)
     },
     CloseSidebar({ commit }, { withoutAnimation }) {
-      commit("CLOSE_SIDEBAR", withoutAnimation);
+      commit('CLOSE_SIDEBAR', withoutAnimation)
     },
     ToggleDevice({ commit }, device) {
-      commit("TOGGLE_DEVICE", device);
+      commit('TOGGLE_DEVICE', device)
     },
     ToggleTheme({ commit }, theme) {
-      commit("TOGGLE_THEME", theme);
+      commit('TOGGLE_THEME', theme)
     },
     ToggleLayoutMode({ commit }, mode) {
-      commit("TOGGLE_LAYOUT_MODE", mode);
+      commit('TOGGLE_LAYOUT_MODE', mode)
     },
     ToggleFixedHeader({ commit }, fixedHeader) {
       if (!fixedHeader) {
-        commit("TOGGLE_FIXED_HEADER_HIDDEN", false);
+        commit('TOGGLE_FIXED_HEADER_HIDDEN', false)
       }
-      commit("TOGGLE_FIXED_HEADER", fixedHeader);
+      commit('TOGGLE_FIXED_HEADER', fixedHeader)
     },
     ToggleFixSiderbar({ commit }, fixSiderbar) {
-      commit("TOGGLE_FIXED_SIDERBAR", fixSiderbar);
+      commit('TOGGLE_FIXED_SIDERBAR', fixSiderbar)
     },
     ToggleFixedHeaderHidden({ commit }, show) {
-      commit("TOGGLE_FIXED_HEADER_HIDDEN", show);
+      commit('TOGGLE_FIXED_HEADER_HIDDEN', show)
     },
     ToggleContentWidth({ commit }, type) {
-      commit("TOGGLE_CONTENT_WIDTH", type);
+      commit('TOGGLE_CONTENT_WIDTH', type)
     },
     ToggleColor({ commit }, color) {
-      commit("TOGGLE_COLOR", color);
+      commit('TOGGLE_COLOR', color)
     },
     ToggleWeak({ commit }, weakFlag) {
-      commit("TOGGLE_WEAK", weakFlag);
+      commit('TOGGLE_WEAK', weakFlag)
     },
     ToggleMultipage({ commit }, multipageFlag) {
-      commit("SET_MULTI_PAGE", multipageFlag);
+      commit('SET_MULTI_PAGE', multipageFlag)
     }
   }
-};
+}
 
-export default app;
+export default app
diff --git a/src/store/modules/online.js b/src/store/modules/online.js
index 4d1b280..dec1f06 100644
--- a/src/store/modules/online.js
+++ b/src/store/modules/online.js
@@ -1,4 +1,4 @@
-import Vue from "vue";
+import Vue from 'vue'
 
 const online = {
   state: {
@@ -7,8 +7,8 @@ const online = {
   },
   mutations: {
     SET_AUTHFIELDS: (state, fields) => {
-      console.log("fields", fields);
-      Vue.set(state, "authFields", fields);
+      console.log('fields', fields)
+      Vue.set(state, 'authFields', fields)
     }
   },
   actions: {
@@ -18,6 +18,6 @@ const online = {
     }
 
   }
-};
+}
 
-export default online;
+export default online
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 0f9d720..182e83c 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -1,4 +1,4 @@
-import { asyncRouterMap, constantRouterMap } from "@/config/router.config"
+import { asyncRouterMap, constantRouterMap } from '@/config/router.config'
 
 /**
  * 过滤账户是否拥有某一个权限，并将菜单从加载列表移除
@@ -76,7 +76,7 @@ const permission = {
     UpdateAppRouter({ commit }, routes) {
       return new Promise(resolve => {
         //const [ roles ] = routes.constRoutes
-        let routelist = routes.constRoutes;
+        let routelist = routes.constRoutes
         commit('SET_ROUTERS', routelist)
         resolve()
       })
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 7593389..b8ec066 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,7 +1,7 @@
 import Vue from 'vue'
-import { login, logout, phoneLogin, thirdLogin } from "@/api/login"
-import { ACCESS_TOKEN, USER_NAME,USER_INFO,USER_AUTH,SYS_BUTTON_AUTH,UI_CACHE_DB_DICT_DATA,TENANT_ID,CACHE_INCLUDED_ROUTES } from "@/store/mutation-types"
-import { welcome } from "@/utils/util"
+import { login, logout, phoneLogin, thirdLogin } from '@/api/login'
+import { ACCESS_TOKEN, USER_NAME,USER_INFO,USER_AUTH,SYS_BUTTON_AUTH,UI_CACHE_DB_DICT_DATA,TENANT_ID,CACHE_INCLUDED_ROUTES } from '@/store/mutation-types'
+import { welcome } from '@/utils/util'
 import { queryPermissionsByUser } from '@/api/api'
 import { getAction } from '@/api/manage'
 
@@ -44,8 +44,8 @@ const user = {
     // CAS验证登录
     ValidateLogin({ commit }, userInfo) {
       return new Promise((resolve, reject) => {
-        getAction("/sys/cas/client/validateLogin",userInfo).then(response => {
-          console.log("----cas 登录--------",response);
+        getAction('/sys/cas/client/validateLogin',userInfo).then(response => {
+          console.log('----cas 登录--------',response)
           if(response.success){
             const result = response.result
             const userInfo = result.userInfo
@@ -117,21 +117,21 @@ const user = {
     GetPermissionList({ commit }) {
       return new Promise((resolve, reject) => {
         queryPermissionsByUser().then(response => {
-          const menuData = response.result.menu;
-          const authData = response.result.auth;
-          const allAuthData = response.result.allAuth;
+          const menuData = response.result.menu
+          const authData = response.result.auth
+          const allAuthData = response.result.allAuth
           //Vue.ls.set(USER_AUTH,authData);
-          sessionStorage.setItem(USER_AUTH,JSON.stringify(authData));
-          sessionStorage.setItem(SYS_BUTTON_AUTH,JSON.stringify(allAuthData));
+          sessionStorage.setItem(USER_AUTH,JSON.stringify(authData))
+          sessionStorage.setItem(SYS_BUTTON_AUTH,JSON.stringify(allAuthData))
           if (menuData && menuData.length > 0) {
             //update--begin--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------
             menuData.forEach((item, index) => {
-              if (item["children"]) {
-                let hasChildrenMenu = item["children"].filter((i) => {
+              if (item['children']) {
+                let hasChildrenMenu = item['children'].filter((i) => {
                   return !i.hidden || i.hidden == false
                 })
                 if (hasChildrenMenu == null || hasChildrenMenu.length == 0) {
-                  item["hidden"] = true
+                  item['hidden'] = true
                 }
               }
             })
@@ -151,7 +151,7 @@ const user = {
     // 登出
     Logout({ commit, state }) {
       return new Promise((resolve) => {
-        let logoutToken = state.token;
+        let logoutToken = state.token
         commit('SET_TOKEN', '')
         commit('SET_PERMISSIONLIST', [])
         Vue.ls.remove(ACCESS_TOKEN)
diff --git a/src/utils/JEditableTableUtil.js b/src/utils/JEditableTableUtil.js
index d18d858..1eba7eb 100644
--- a/src/utils/JEditableTableUtil.js
+++ b/src/utils/JEditableTableUtil.js
@@ -12,10 +12,10 @@ const FormTypes = {
   file: 'file',
   image: 'image',
   popup:'popup',
-  list_multi:"list_multi",
-  sel_search:"sel_search",
+  list_multi:'list_multi',
+  sel_search:'sel_search',
   radio:'radio',
-  checkbox_meta:"checkbox_meta",
+  checkbox_meta:'checkbox_meta',
   input_pop:'input_pop',
   sel_depart: 'sel_depart',
   sel_user: 'sel_user',
@@ -90,7 +90,7 @@ export function validateTables(cases, deleteTempId) {
   }
   return new Promise((resolve, reject) => {
     let tables = []
-    let index = 0;
+    let index = 0
     if(!cases || cases.length === 0){
       resolve()
     }
@@ -108,7 +108,7 @@ export function validateTables(cases, deleteTempId) {
         // 出现未验证通过的表单，不再进行下一步校验，直接返回失败并跳转到该表格
         if (error === VALIDATE_NO_PASSED) {
           // 尝试获取tabKey，如果在ATab组件内即可获取
-          let paneKey;
+          let paneKey
           let tabPane = getVmParentByName(vm, 'ATabPane')
           if (tabPane) {
             paneKey = tabPane.$vnode.key
diff --git a/src/utils/authFilter.js b/src/utils/authFilter.js
index bfa36ac..0c732a7 100644
--- a/src/utils/authFilter.js
+++ b/src/utils/authFilter.js
@@ -1,20 +1,20 @@
-import { USER_AUTH,SYS_BUTTON_AUTH } from "@/store/mutation-types"
+import { USER_AUTH,SYS_BUTTON_AUTH } from '@/store/mutation-types'
 
 export function disabledAuthFilter(code,formData) {
   if(nodeDisabledAuth(code,formData)){
-    return true;
+    return true
   }else{
-    return globalDisabledAuth(code);
+    return globalDisabledAuth(code)
   }
 }
 
 function nodeDisabledAuth(code,formData){
   // console.log("页面权限禁用--NODE--开始");
-  let permissionList = [];
+  let permissionList = []
   try {
     // console.log("页面权限禁用--NODE--开始",formData);
     if (formData) {
-      let bpmList = formData.permissionList;
+      let bpmList = formData.permissionList
       permissionList = bpmList.filter(item=>item.type=='2')
       // for (let bpm of bpmList) {
       //   if(bpm.type == '2') {
@@ -22,102 +22,102 @@ function nodeDisabledAuth(code,formData){
       //   }
       // }
     }else{
-      return false;
+      return false
     }
   } catch (e) {
     //console.log("页面权限异常----", e);
   }
   if (permissionList.length ==  0) {
-    return false;
+    return false
   }
   //
   // console.log("流程节点页面权限禁用--NODE--开始");
-  let permissions = [];
+  let permissions = []
   for (let item of permissionList) {
     if(item.type == '2') {
-      permissions.push(item.action);
+      permissions.push(item.action)
     }
   }
   //console.log("页面权限----"+code);
   if (!permissions.includes(code)) {
-    return false;
+    return false
   }else{
     for (let item2 of permissionList) {
       if(code === item2.action){
         // console.log("流程节点页面权限禁用--NODE--生效");
-        return true;
+        return true
       }
     }
   }
-  return false;
+  return false
 }
 
 function globalDisabledAuth(code){
   // console.log("全局页面禁用权限--Global--开始");
 
-  let permissionList = [];
-  let allPermissionList = [];
+  let permissionList = []
+  let allPermissionList = []
 
   //let authList = Vue.ls.get(USER_AUTH);
-  let authList = JSON.parse(sessionStorage.getItem(USER_AUTH) || "[]");
+  let authList = JSON.parse(sessionStorage.getItem(USER_AUTH) || '[]')
   for (let auth of authList) {
     if(auth.type == '2') {
-      permissionList.push(auth);
+      permissionList.push(auth)
     }
   }
   //console.log("页面禁用权限--Global--",sessionStorage.getItem(SYS_BUTTON_AUTH));
-  let allAuthList = JSON.parse(sessionStorage.getItem(SYS_BUTTON_AUTH) || "[]");
+  let allAuthList = JSON.parse(sessionStorage.getItem(SYS_BUTTON_AUTH) || '[]')
   for (let gauth of allAuthList) {
     if(gauth.type == '2') {
-      allPermissionList.push(gauth);
+      allPermissionList.push(gauth)
     }
   }
   //设置全局配置是否有命中
-  let  gFlag = false;//禁用命中
-  let invalidFlag = false;//无效命中
-  if(allPermissionList != null && allPermissionList != "" && allPermissionList != undefined && allPermissionList.length > 0){
+  let  gFlag = false//禁用命中
+  let invalidFlag = false//无效命中
+  if(allPermissionList != null && allPermissionList != '' && allPermissionList != undefined && allPermissionList.length > 0){
     for (let itemG of allPermissionList) {
       if(code === itemG.action){
         if(itemG.status == '0'){
-          invalidFlag = true;
-          break;
+          invalidFlag = true
+          break
         }else{
-          gFlag = true;
-          break;
+          gFlag = true
+          break
         }
       }
     }
   }
   if(invalidFlag){
-    return false;
+    return false
   }
-  if (permissionList === null || permissionList === "" || permissionList === undefined||permissionList.length<=0) {
-    return gFlag;
+  if (permissionList === null || permissionList === '' || permissionList === undefined||permissionList.length<=0) {
+    return gFlag
   }
-  let permissions = [];
+  let permissions = []
   for (let item of permissionList) {
     if(item.type == '2') {
-      permissions.push(item.action);
+      permissions.push(item.action)
     }
   }
   //console.log("页面禁用权限----"+code);
   if (!permissions.includes(code)) {
-    return gFlag;
+    return gFlag
   }else{
     for (let item2 of permissionList) {
       if(code === item2.action){
         // console.log("全局页面权限解除禁用--Global--生效");
-        gFlag = false;
+        gFlag = false
       }
     }
-    return gFlag;
+    return gFlag
   }
 }
 
 
 
 export function colAuthFilter(columns,pre) {
-  let authList = getNoAuthCols(pre);
+  let authList = getNoAuthCols(pre)
   const cols = columns.filter(item => {
     if (hasColoum(item,authList)) {
       return true
@@ -136,11 +136,11 @@ export function colAuthFilter(columns,pre) {
  * @returns {*}
  */
 export function colAuthFilterJEditableTable(columns,pre) {
-  let authList = getAllShowAndDisabledAuthCols(pre);
+  let authList = getAllShowAndDisabledAuthCols(pre)
   const cols = columns.filter(item => {
     let oneAuth = authList.find(auth => {
-      return auth.action === pre + item.key;
-    });
+      return auth.action === pre + item.key
+    })
     if(!oneAuth){
       return true
     }
@@ -152,7 +152,7 @@ export function colAuthFilterJEditableTable(columns,pre) {
 
     //禁用逻辑
     if (oneAuth.type == '2' && !oneAuth.isAuth) {
-      item["disabled"] = true
+      item['disabled'] = true
       return true
     }
     //隐藏逻辑逻辑
@@ -178,39 +178,39 @@ export function getNoAuthCols(pre){
   if(!pre || pre.length==0){
     return []
   }
-  let permissionList = [];
-  let allPermissionList = [];
+  let permissionList = []
+  let allPermissionList = []
 
   //let authList = Vue.ls.get(USER_AUTH);
-  let authList = JSON.parse(sessionStorage.getItem(USER_AUTH) || "[]");
+  let authList = JSON.parse(sessionStorage.getItem(USER_AUTH) || '[]')
   for (let auth of authList) {
     //显示策略，有效状态
     if(auth.type == '1'&&startWith(auth.action,pre)) {
-      permissionList.push(substrPre(auth.action,pre));
+      permissionList.push(substrPre(auth.action,pre))
     }
   }
   //console.log("页面禁用权限--Global--",sessionStorage.getItem(SYS_BUTTON_AUTH));
-  let allAuthList = JSON.parse(sessionStorage.getItem(SYS_BUTTON_AUTH) || "[]");
+  let allAuthList = JSON.parse(sessionStorage.getItem(SYS_BUTTON_AUTH) || '[]')
   for (let gauth of allAuthList) {
     //显示策略，有效状态
     if(gauth.type == '1'&&gauth.status == '1'&&startWith(gauth.action,pre)) {
-      allPermissionList.push(substrPre(gauth.action,pre));
+      allPermissionList.push(substrPre(gauth.action,pre))
     }
   }
   const cols = allPermissionList.filter(item => {
     if (permissionList.includes(item)) {
-      return false;
+      return false
     }
-    return true;
+    return true
   })
-  return cols;
+  return cols
 }
 
 /**
  * 将Online的行编辑按钮权限，添加至本地存储
  */
 export function addOnlineBtAuth2Storage(pre, authList){
-  let allAuthList = JSON.parse(sessionStorage.getItem(SYS_BUTTON_AUTH) || "[]");
+  let allAuthList = JSON.parse(sessionStorage.getItem(SYS_BUTTON_AUTH) || '[]')
   let newAuthList = allAuthList.filter(item=>{
     if(!item.action){
       return true
@@ -225,7 +225,7 @@ export function addOnlineBtAuth2Storage(pre, authList){
         status:1
       })
     }
-    let temp = JSON.parse(sessionStorage.getItem(USER_AUTH) || "[]");
+    let temp = JSON.parse(sessionStorage.getItem(USER_AUTH) || '[]')
     let newArr = temp.filter(item=>{
       if(!item.action){
         return true
@@ -248,30 +248,30 @@ export function addOnlineBtAuth2Storage(pre, authList){
  */
 function getAllShowAndDisabledAuthCols(pre){
   //用户拥有的权限
-  let userAuthList = JSON.parse(sessionStorage.getItem(USER_AUTH) || "[]");
+  let userAuthList = JSON.parse(sessionStorage.getItem(USER_AUTH) || '[]')
   //全部权限配置
-  let allAuthList = JSON.parse(sessionStorage.getItem(SYS_BUTTON_AUTH) || "[]");
+  let allAuthList = JSON.parse(sessionStorage.getItem(SYS_BUTTON_AUTH) || '[]')
 
   let newAllAuthList = allAuthList.map(function (item, index) {
-    let hasAuthArray = userAuthList.filter(u => u.action===item.action );
+    let hasAuthArray = userAuthList.filter(u => u.action===item.action )
     if (hasAuthArray && hasAuthArray.length>0) {
-      item["isAuth"] = true
+      item['isAuth'] = true
     }
-    return item;
+    return item
   })
 
-  return newAllAuthList;
+  return newAllAuthList
 }
 
 function startWith(str,pre) {
-  if (pre == null || pre == "" || str==null|| str==""|| str.length == 0 || pre.length > str.length)
-    return false;
+  if (pre == null || pre == '' || str==null|| str==''|| str.length == 0 || pre.length > str.length)
+    return false
   if (str.substr(0, pre.length) == pre)
-    return true;
+    return true
   else
-    return false;
+    return false
 }
 
 function substrPre(str,pre) {
-  return str.substr(pre.length);
+  return str.substr(pre.length)
 }
diff --git a/src/utils/encryption/aesEncrypt.js b/src/utils/encryption/aesEncrypt.js
index 07638cf..789d06c 100644
--- a/src/utils/encryption/aesEncrypt.js
+++ b/src/utils/encryption/aesEncrypt.js
@@ -1,18 +1,18 @@
 import { getAction } from '@/api/manage'
-import { ENCRYPTED_STRING } from "@/store/mutation-types"
+import { ENCRYPTED_STRING } from '@/store/mutation-types'
 import Vue from 'vue'
 
 /**
  * 获取加密字符串，并对结果进行缓存
  */
 export function getEncryptedString() {
-  return getAction("/sys/getEncryptedString",{}).then((res)=>{
-    let encryptedString = {};
-    encryptedString.key = res.result.key;
-    encryptedString.iv = res.result.iv;
-    Vue.ls.set(ENCRYPTED_STRING, encryptedString, 7 * 24 * 60 * 60 * 1000);
-    return encryptedString;
-  });
+  return getAction('/sys/getEncryptedString',{}).then((res)=>{
+    let encryptedString = {}
+    encryptedString.key = res.result.key
+    encryptedString.iv = res.result.iv
+    Vue.ls.set(ENCRYPTED_STRING, encryptedString, 7 * 24 * 60 * 60 * 1000)
+    return encryptedString
+  })
 }
 
 /**
@@ -23,14 +23,14 @@ export function encryption(word, keyStr, ivStr) {
   let key = CryptoJS.enc.Utf8.parse(keyStr)
   let iv = CryptoJS.enc.Utf8.parse(ivStr)
 
-  let srcs = CryptoJS.enc.Utf8.parse(word);
+  let srcs = CryptoJS.enc.Utf8.parse(word)
   var encrypted = CryptoJS.AES.encrypt(srcs, key, {
     iv: iv,
     mode: CryptoJS.mode.CBC,
     padding: CryptoJS.pad.ZeroPadding
-  });
+  })
   // console.log("-=-=-=-", encrypted.ciphertext)
-  return CryptoJS.enc.Base64.stringify(encrypted.ciphertext);
+  return CryptoJS.enc.Base64.stringify(encrypted.ciphertext)
 
 }
 
@@ -40,30 +40,30 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
 	     * Local polyfil of Object.create
 	     */
   var create = Object.create || (function () {
-    function F() {};
+    function F() {}
 
     return function (obj) {
-      var subtype;
+      var subtype
 
-      F.prototype = obj;
+      F.prototype = obj
 
-      subtype = new F();
+      subtype = new F()
 
-      F.prototype = null;
+      F.prototype = null
 
-      return subtype;
-    };
+      return subtype
+    }
   }())
 
   /**
    * CryptoJS namespace.
    */
-  var C = {};
+  var C = {}
 
   /**
    * Library namespace.
    */
-  var C_lib = C.lib = {};
+  var C_lib = C.lib = {}
 
   /**
    * Base object for prototypal inheritance.
@@ -92,27 +92,27 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
        */
       extend: function (overrides) {
         // Spawn
-        var subtype = create(this);
+        var subtype = create(this)
 
         // Augment
         if (overrides) {
-          subtype.mixIn(overrides);
+          subtype.mixIn(overrides)
         }
 
         // Create default initializer
         if (!subtype.hasOwnProperty('init') || this.init === subtype.init) {
           subtype.init = function () {
-            subtype.$super.init.apply(this, arguments);
-          };
+            subtype.$super.init.apply(this, arguments)
+          }
         }
 
         // Initializer's prototype is the subtype object
-        subtype.init.prototype = subtype;
+        subtype.init.prototype = subtype
 
         // Reference supertype
-        subtype.$super = this;
+        subtype.$super = this
 
-        return subtype;
+        return subtype
       },
 
       /**
@@ -128,10 +128,10 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
        *     var instance = MyType.create();
        */
       create: function () {
-        var instance = this.extend();
-        instance.init.apply(instance, arguments);
+        var instance = this.extend()
+        instance.init.apply(instance, arguments)
 
-        return instance;
+        return instance
       },
 
       /**
@@ -163,13 +163,13 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
       mixIn: function (properties) {
         for (var propertyName in properties) {
           if (properties.hasOwnProperty(propertyName)) {
-            this[propertyName] = properties[propertyName];
+            this[propertyName] = properties[propertyName]
           }
         }
 
         // IE won't copy toString using the loop above
         if (properties.hasOwnProperty('toString')) {
-          this.toString = properties.toString;
+          this.toString = properties.toString
         }
       },
 
@@ -183,10 +183,10 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
        *     var clone = instance.clone();
        */
       clone: function () {
-        return this.init.prototype.extend(this);
+        return this.init.prototype.extend(this)
       }
-    };
-  }());
+    }
+  }())
 
   /**
    * An array of 32-bit words.
@@ -208,12 +208,12 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607], 6);
      */
     init: function (words, sigBytes) {
-      words = this.words = words || [];
+      words = this.words = words || []
 
       if (sigBytes != undefined) {
-        this.sigBytes = sigBytes;
+        this.sigBytes = sigBytes
       } else {
-        this.sigBytes = words.length * 4;
+        this.sigBytes = words.length * 4
       }
     },
 
@@ -231,7 +231,7 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      *     var string = wordArray.toString(CryptoJS.enc.Utf8);
      */
     toString: function (encoder) {
-      return (encoder || Hex).stringify(this);
+      return (encoder || Hex).stringify(this)
     },
 
     /**
@@ -247,31 +247,31 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     concat: function (wordArray) {
       // Shortcuts
-      var thisWords = this.words;
-      var thatWords = wordArray.words;
-      var thisSigBytes = this.sigBytes;
-      var thatSigBytes = wordArray.sigBytes;
+      var thisWords = this.words
+      var thatWords = wordArray.words
+      var thisSigBytes = this.sigBytes
+      var thatSigBytes = wordArray.sigBytes
 
       // Clamp excess bits
-      this.clamp();
+      this.clamp()
 
       // Concat
       if (thisSigBytes % 4) {
         // Copy one byte at a time
         for (var i = 0; i < thatSigBytes; i++) {
-          var thatByte = (thatWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
-          thisWords[(thisSigBytes + i) >>> 2] |= thatByte << (24 - ((thisSigBytes + i) % 4) * 8);
+          var thatByte = (thatWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff
+          thisWords[(thisSigBytes + i) >>> 2] |= thatByte << (24 - ((thisSigBytes + i) % 4) * 8)
         }
       } else {
         // Copy one word at a time
         for (var i = 0; i < thatSigBytes; i += 4) {
-          thisWords[(thisSigBytes + i) >>> 2] = thatWords[i >>> 2];
+          thisWords[(thisSigBytes + i) >>> 2] = thatWords[i >>> 2]
         }
       }
-      this.sigBytes += thatSigBytes;
+      this.sigBytes += thatSigBytes
 
       // Chainable
-      return this;
+      return this
     },
 
     /**
@@ -283,12 +283,12 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     clamp: function () {
       // Shortcuts
-      var words = this.words;
-      var sigBytes = this.sigBytes;
+      var words = this.words
+      var sigBytes = this.sigBytes
 
       // Clamp
-      words[sigBytes >>> 2] &= 0xffffffff << (32 - (sigBytes % 4) * 8);
-      words.length = Math.ceil(sigBytes / 4);
+      words[sigBytes >>> 2] &= 0xffffffff << (32 - (sigBytes % 4) * 8)
+      words.length = Math.ceil(sigBytes / 4)
     },
 
     /**
@@ -301,10 +301,10 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      *     var clone = wordArray.clone();
      */
     clone: function () {
-      var clone = Base.clone.call(this);
-      clone.words = this.words.slice(0);
+      var clone = Base.clone.call(this)
+      clone.words = this.words.slice(0)
 
-      return clone;
+      return clone
     },
 
     /**
@@ -321,38 +321,38 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      *     var wordArray = CryptoJS.lib.WordArray.random(16);
      */
     random: function (nBytes) {
-      var words = [];
+      var words = []
 
       var r = (function (m_w) {
-        var m_w = m_w;
-        var m_z = 0x3ade68b1;
-        var mask = 0xffffffff;
+        var m_w = m_w
+        var m_z = 0x3ade68b1
+        var mask = 0xffffffff
 
         return function () {
-          m_z = (0x9069 * (m_z & 0xFFFF) + (m_z >> 0x10)) & mask;
-          m_w = (0x4650 * (m_w & 0xFFFF) + (m_w >> 0x10)) & mask;
-          var result = ((m_z << 0x10) + m_w) & mask;
-          result /= 0x100000000;
-          result += 0.5;
-          return result * (Math.random() > .5 ? 1 : -1);
+          m_z = (0x9069 * (m_z & 0xFFFF) + (m_z >> 0x10)) & mask
+          m_w = (0x4650 * (m_w & 0xFFFF) + (m_w >> 0x10)) & mask
+          var result = ((m_z << 0x10) + m_w) & mask
+          result /= 0x100000000
+          result += 0.5
+          return result * (Math.random() > .5 ? 1 : -1)
         }
-      });
+      })
 
       for (var i = 0, rcache; i < nBytes; i += 4) {
-        var _r = r((rcache || Math.random()) * 0x100000000);
+        var _r = r((rcache || Math.random()) * 0x100000000)
 
-        rcache = _r() * 0x3ade67b7;
-        words.push((_r() * 0x100000000) | 0);
+        rcache = _r() * 0x3ade67b7
+        words.push((_r() * 0x100000000) | 0)
       }
 
-      return new WordArray.init(words, nBytes);
+      return new WordArray.init(words, nBytes)
     }
-  });
+  })
 
   /**
    * Encoder namespace.
    */
-  var C_enc = C.enc = {};
+  var C_enc = C.enc = {}
 
   /**
    * Hex encoding strategy.
@@ -373,18 +373,18 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     stringify: function (wordArray) {
       // Shortcuts
-      var words = wordArray.words;
-      var sigBytes = wordArray.sigBytes;
+      var words = wordArray.words
+      var sigBytes = wordArray.sigBytes
 
       // Convert
-      var hexChars = [];
+      var hexChars = []
       for (var i = 0; i < sigBytes; i++) {
-        var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
-        hexChars.push((bite >>> 4).toString(16));
-        hexChars.push((bite & 0x0f).toString(16));
+        var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff
+        hexChars.push((bite >>> 4).toString(16))
+        hexChars.push((bite & 0x0f).toString(16))
       }
 
-      return hexChars.join('');
+      return hexChars.join('')
     },
 
     /**
@@ -402,17 +402,17 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     parse: function (hexStr) {
       // Shortcut
-      var hexStrLength = hexStr.length;
+      var hexStrLength = hexStr.length
 
       // Convert
-      var words = [];
+      var words = []
       for (var i = 0; i < hexStrLength; i += 2) {
-        words[i >>> 3] |= parseInt(hexStr.substr(i, 2), 16) << (24 - (i % 8) * 4);
+        words[i >>> 3] |= parseInt(hexStr.substr(i, 2), 16) << (24 - (i % 8) * 4)
       }
 
-      return new WordArray.init(words, hexStrLength / 2);
+      return new WordArray.init(words, hexStrLength / 2)
     }
-  };
+  }
 
   /**
    * Latin1 encoding strategy.
@@ -433,17 +433,17 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     stringify: function (wordArray) {
       // Shortcuts
-      var words = wordArray.words;
-      var sigBytes = wordArray.sigBytes;
+      var words = wordArray.words
+      var sigBytes = wordArray.sigBytes
 
       // Convert
-      var latin1Chars = [];
+      var latin1Chars = []
       for (var i = 0; i < sigBytes; i++) {
-        var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
-        latin1Chars.push(String.fromCharCode(bite));
+        var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff
+        latin1Chars.push(String.fromCharCode(bite))
       }
 
-      return latin1Chars.join('');
+      return latin1Chars.join('')
     },
 
     /**
@@ -461,17 +461,17 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     parse: function (latin1Str) {
       // Shortcut
-      var latin1StrLength = latin1Str.length;
+      var latin1StrLength = latin1Str.length
 
       // Convert
-      var words = [];
+      var words = []
       for (var i = 0; i < latin1StrLength; i++) {
-        words[i >>> 2] |= (latin1Str.charCodeAt(i) & 0xff) << (24 - (i % 4) * 8);
+        words[i >>> 2] |= (latin1Str.charCodeAt(i) & 0xff) << (24 - (i % 4) * 8)
       }
 
-      return new WordArray.init(words, latin1StrLength);
+      return new WordArray.init(words, latin1StrLength)
     }
-  };
+  }
 
   /**
    * UTF-8 encoding strategy.
@@ -492,9 +492,9 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     stringify: function (wordArray) {
       try {
-        return decodeURIComponent(escape(Latin1.stringify(wordArray)));
+        return decodeURIComponent(escape(Latin1.stringify(wordArray)))
       } catch (e) {
-        throw new Error('Malformed UTF-8 data');
+        throw new Error('Malformed UTF-8 data')
       }
     },
 
@@ -512,9 +512,9 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      *     var wordArray = CryptoJS.enc.Utf8.parse(utf8String);
      */
     parse: function (utf8Str) {
-      return Latin1.parse(unescape(encodeURIComponent(utf8Str)));
+      return Latin1.parse(unescape(encodeURIComponent(utf8Str)))
     }
-  };
+  }
 
   /**
    * Abstract buffered block algorithm template.
@@ -533,8 +533,8 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     reset: function () {
       // Initial values
-      this._data = new WordArray.init();
-      this._nDataBytes = 0;
+      this._data = new WordArray.init()
+      this._nDataBytes = 0
     },
 
     /**
@@ -550,12 +550,12 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
     _append: function (data) {
       // Convert string to WordArray, else assume WordArray already
       if (typeof data == 'string') {
-        data = Utf8.parse(data);
+        data = Utf8.parse(data)
       }
 
       // Append
-      this._data.concat(data);
-      this._nDataBytes += data.sigBytes;
+      this._data.concat(data)
+      this._nDataBytes += data.sigBytes
     },
 
     /**
@@ -574,43 +574,43 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     _process: function (doFlush) {
       // Shortcuts
-      var data = this._data;
-      var dataWords = data.words;
-      var dataSigBytes = data.sigBytes;
-      var blockSize = this.blockSize;
-      var blockSizeBytes = blockSize * 4;
+      var data = this._data
+      var dataWords = data.words
+      var dataSigBytes = data.sigBytes
+      var blockSize = this.blockSize
+      var blockSizeBytes = blockSize * 4
 
       // Count blocks ready
-      var nBlocksReady = dataSigBytes / blockSizeBytes;
+      var nBlocksReady = dataSigBytes / blockSizeBytes
       if (doFlush) {
         // Round up to include partial blocks
-        nBlocksReady = Math.ceil(nBlocksReady);
+        nBlocksReady = Math.ceil(nBlocksReady)
       } else {
         // Round down to include only full blocks,
         // less the number of blocks that must remain in the buffer
-        nBlocksReady = Math.max((nBlocksReady | 0) - this._minBufferSize, 0);
+        nBlocksReady = Math.max((nBlocksReady | 0) - this._minBufferSize, 0)
       }
 
       // Count words ready
-      var nWordsReady = nBlocksReady * blockSize;
+      var nWordsReady = nBlocksReady * blockSize
 
       // Count bytes ready
-      var nBytesReady = Math.min(nWordsReady * 4, dataSigBytes);
+      var nBytesReady = Math.min(nWordsReady * 4, dataSigBytes)
 
       // Process blocks
       if (nWordsReady) {
         for (var offset = 0; offset < nWordsReady; offset += blockSize) {
           // Perform concrete-algorithm logic
-          this._doProcessBlock(dataWords, offset);
+          this._doProcessBlock(dataWords, offset)
         }
 
         // Remove processed words
-        var processedWords = dataWords.splice(0, nWordsReady);
-        data.sigBytes -= nBytesReady;
+        var processedWords = dataWords.splice(0, nWordsReady)
+        data.sigBytes -= nBytesReady
       }
 
       // Return processed words
-      return new WordArray.init(processedWords, nBytesReady);
+      return new WordArray.init(processedWords, nBytesReady)
     },
 
     /**
@@ -623,14 +623,14 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      *     var clone = bufferedBlockAlgorithm.clone();
      */
     clone: function () {
-      var clone = Base.clone.call(this);
-      clone._data = this._data.clone();
+      var clone = Base.clone.call(this)
+      clone._data = this._data.clone()
 
-      return clone;
+      return clone
     },
 
     _minBufferSize: 0
-  });
+  })
 
   /**
    * Abstract hasher template.
@@ -654,10 +654,10 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     init: function (cfg) {
       // Apply config defaults
-      this.cfg = this.cfg.extend(cfg);
+      this.cfg = this.cfg.extend(cfg)
 
       // Set initial values
-      this.reset();
+      this.reset()
     },
 
     /**
@@ -669,10 +669,10 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     reset: function () {
       // Reset data buffer
-      BufferedBlockAlgorithm.reset.call(this);
+      BufferedBlockAlgorithm.reset.call(this)
 
       // Perform concrete-hasher logic
-      this._doReset();
+      this._doReset()
     },
 
     /**
@@ -689,13 +689,13 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     update: function (messageUpdate) {
       // Append
-      this._append(messageUpdate);
+      this._append(messageUpdate)
 
       // Update the hash
-      this._process();
+      this._process()
 
       // Chainable
-      return this;
+      return this
     },
 
     /**
@@ -715,13 +715,13 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
     finalize: function (messageUpdate) {
       // Final message update
       if (messageUpdate) {
-        this._append(messageUpdate);
+        this._append(messageUpdate)
       }
 
       // Perform concrete-hasher logic
-      var hash = this._doFinalize();
+      var hash = this._doFinalize()
 
-      return hash;
+      return hash
     },
 
     blockSize: 512/32,
@@ -741,8 +741,8 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     _createHelper: function (hasher) {
       return function (message, cfg) {
-        return new hasher.init(cfg).finalize(message);
-      };
+        return new hasher.init(cfg).finalize(message)
+      }
     },
 
     /**
@@ -760,26 +760,26 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     _createHmacHelper: function (hasher) {
       return function (message, key) {
-        return new C_algo.HMAC.init(hasher, key).finalize(message);
-      };
+        return new C_algo.HMAC.init(hasher, key).finalize(message)
+      }
     }
-  });
+  })
 
   /**
    * Algorithm namespace.
    */
-  var C_algo = C.algo = {};
+  var C_algo = C.algo = {}
 
-  return C;
+  return C
 }(Math));
 
 
 (function () {
   // Shortcuts
-  var C = CryptoJS;
-  var C_lib = C.lib;
-  var WordArray = C_lib.WordArray;
-  var C_enc = C.enc;
+  var C = CryptoJS
+  var C_lib = C.lib
+  var WordArray = C_lib.WordArray
+  var C_enc = C.enc
 
   /**
    * Base64 encoding strategy.
@@ -800,36 +800,36 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     stringify: function (wordArray) {
       // Shortcuts
-      var words = wordArray.words;
-      var sigBytes = wordArray.sigBytes;
-      var map = this._map;
+      var words = wordArray.words
+      var sigBytes = wordArray.sigBytes
+      var map = this._map
 
       // Clamp excess bits
-      wordArray.clamp();
+      wordArray.clamp()
 
       // Convert
-      var base64Chars = [];
+      var base64Chars = []
       for (var i = 0; i < sigBytes; i += 3) {
-        var byte1 = (words[i >>> 2]       >>> (24 - (i % 4) * 8))       & 0xff;
-        var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;
-        var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;
+        var byte1 = (words[i >>> 2]       >>> (24 - (i % 4) * 8))       & 0xff
+        var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff
+        var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff
 
-        var triplet = (byte1 << 16) | (byte2 << 8) | byte3;
+        var triplet = (byte1 << 16) | (byte2 << 8) | byte3
 
         for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {
-          base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));
+          base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f))
         }
       }
 
       // Add padding
-      var paddingChar = map.charAt(64);
+      var paddingChar = map.charAt(64)
       if (paddingChar) {
         while (base64Chars.length % 4) {
-          base64Chars.push(paddingChar);
+          base64Chars.push(paddingChar)
         }
       }
 
-      return base64Chars.join('');
+      return base64Chars.join('')
     },
 
     /**
@@ -847,57 +847,57 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     parse: function (base64Str) {
       // Shortcuts
-      var base64StrLength = base64Str.length;
-      var map = this._map;
-      var reverseMap = this._reverseMap;
+      var base64StrLength = base64Str.length
+      var map = this._map
+      var reverseMap = this._reverseMap
 
       if (!reverseMap) {
-        reverseMap = this._reverseMap = [];
+        reverseMap = this._reverseMap = []
         for (var j = 0; j < map.length; j++) {
-          reverseMap[map.charCodeAt(j)] = j;
+          reverseMap[map.charCodeAt(j)] = j
         }
       }
 
       // Ignore padding
-      var paddingChar = map.charAt(64);
+      var paddingChar = map.charAt(64)
       if (paddingChar) {
-        var paddingIndex = base64Str.indexOf(paddingChar);
+        var paddingIndex = base64Str.indexOf(paddingChar)
         if (paddingIndex !== -1) {
-          base64StrLength = paddingIndex;
+          base64StrLength = paddingIndex
         }
       }
 
       // Convert
-      return parseLoop(base64Str, base64StrLength, reverseMap);
+      return parseLoop(base64Str, base64StrLength, reverseMap)
 
     },
 
     _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
-  };
+  }
 
   function parseLoop(base64Str, base64StrLength, reverseMap) {
-    var words = [];
-    var nBytes = 0;
+    var words = []
+    var nBytes = 0
     for (var i = 0; i < base64StrLength; i++) {
       if (i % 4) {
-        var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);
-        var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);
-        words[nBytes >>> 2] |= (bits1 | bits2) << (24 - (nBytes % 4) * 8);
-        nBytes++;
+        var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2)
+        var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2)
+        words[nBytes >>> 2] |= (bits1 | bits2) << (24 - (nBytes % 4) * 8)
+        nBytes++
       }
     }
-    return WordArray.create(words, nBytes);
+    return WordArray.create(words, nBytes)
   }
 }());
 
 
 (function (Math) {
   // Shortcuts
-  var C = CryptoJS;
-  var C_lib = C.lib;
-  var WordArray = C_lib.WordArray;
-  var Hasher = C_lib.Hasher;
-  var C_algo = C.algo;
+  var C = CryptoJS
+  var C_lib = C.lib
+  var WordArray = C_lib.WordArray
+  var Hasher = C_lib.Hasher
+  var C_algo = C.algo
 
   // Constants table
   var T = [];
@@ -905,9 +905,9 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
   // Compute constants
   (function () {
     for (var i = 0; i < 64; i++) {
-      T[i] = (Math.abs(Math.sin(i + 1)) * 0x100000000) | 0;
+      T[i] = (Math.abs(Math.sin(i + 1)) * 0x100000000) | 0
     }
-  }());
+  }())
 
   /**
    * MD5 hash algorithm.
@@ -917,194 +917,194 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
       this._hash = new WordArray.init([
         0x67452301, 0xefcdab89,
         0x98badcfe, 0x10325476
-      ]);
+      ])
     },
 
     _doProcessBlock: function (M, offset) {
       // Swap endian
       for (var i = 0; i < 16; i++) {
         // Shortcuts
-        var offset_i = offset + i;
-        var M_offset_i = M[offset_i];
+        var offset_i = offset + i
+        var M_offset_i = M[offset_i]
 
         M[offset_i] = (
           (((M_offset_i << 8)  | (M_offset_i >>> 24)) & 0x00ff00ff) |
           (((M_offset_i << 24) | (M_offset_i >>> 8))  & 0xff00ff00)
-        );
+        )
       }
 
       // Shortcuts
-      var H = this._hash.words;
+      var H = this._hash.words
 
-      var M_offset_0  = M[offset + 0];
-      var M_offset_1  = M[offset + 1];
-      var M_offset_2  = M[offset + 2];
-      var M_offset_3  = M[offset + 3];
-      var M_offset_4  = M[offset + 4];
-      var M_offset_5  = M[offset + 5];
-      var M_offset_6  = M[offset + 6];
-      var M_offset_7  = M[offset + 7];
-      var M_offset_8  = M[offset + 8];
-      var M_offset_9  = M[offset + 9];
-      var M_offset_10 = M[offset + 10];
-      var M_offset_11 = M[offset + 11];
-      var M_offset_12 = M[offset + 12];
-      var M_offset_13 = M[offset + 13];
-      var M_offset_14 = M[offset + 14];
-      var M_offset_15 = M[offset + 15];
+      var M_offset_0  = M[offset + 0]
+      var M_offset_1  = M[offset + 1]
+      var M_offset_2  = M[offset + 2]
+      var M_offset_3  = M[offset + 3]
+      var M_offset_4  = M[offset + 4]
+      var M_offset_5  = M[offset + 5]
+      var M_offset_6  = M[offset + 6]
+      var M_offset_7  = M[offset + 7]
+      var M_offset_8  = M[offset + 8]
+      var M_offset_9  = M[offset + 9]
+      var M_offset_10 = M[offset + 10]
+      var M_offset_11 = M[offset + 11]
+      var M_offset_12 = M[offset + 12]
+      var M_offset_13 = M[offset + 13]
+      var M_offset_14 = M[offset + 14]
+      var M_offset_15 = M[offset + 15]
 
       // Working varialbes
-      var a = H[0];
-      var b = H[1];
-      var c = H[2];
-      var d = H[3];
+      var a = H[0]
+      var b = H[1]
+      var c = H[2]
+      var d = H[3]
 
       // Computation
-      a = FF(a, b, c, d, M_offset_0,  7,  T[0]);
-      d = FF(d, a, b, c, M_offset_1,  12, T[1]);
-      c = FF(c, d, a, b, M_offset_2,  17, T[2]);
-      b = FF(b, c, d, a, M_offset_3,  22, T[3]);
-      a = FF(a, b, c, d, M_offset_4,  7,  T[4]);
-      d = FF(d, a, b, c, M_offset_5,  12, T[5]);
-      c = FF(c, d, a, b, M_offset_6,  17, T[6]);
-      b = FF(b, c, d, a, M_offset_7,  22, T[7]);
-      a = FF(a, b, c, d, M_offset_8,  7,  T[8]);
-      d = FF(d, a, b, c, M_offset_9,  12, T[9]);
-      c = FF(c, d, a, b, M_offset_10, 17, T[10]);
-      b = FF(b, c, d, a, M_offset_11, 22, T[11]);
-      a = FF(a, b, c, d, M_offset_12, 7,  T[12]);
-      d = FF(d, a, b, c, M_offset_13, 12, T[13]);
-      c = FF(c, d, a, b, M_offset_14, 17, T[14]);
-      b = FF(b, c, d, a, M_offset_15, 22, T[15]);
+      a = FF(a, b, c, d, M_offset_0,  7,  T[0])
+      d = FF(d, a, b, c, M_offset_1,  12, T[1])
+      c = FF(c, d, a, b, M_offset_2,  17, T[2])
+      b = FF(b, c, d, a, M_offset_3,  22, T[3])
+      a = FF(a, b, c, d, M_offset_4,  7,  T[4])
+      d = FF(d, a, b, c, M_offset_5,  12, T[5])
+      c = FF(c, d, a, b, M_offset_6,  17, T[6])
+      b = FF(b, c, d, a, M_offset_7,  22, T[7])
+      a = FF(a, b, c, d, M_offset_8,  7,  T[8])
+      d = FF(d, a, b, c, M_offset_9,  12, T[9])
+      c = FF(c, d, a, b, M_offset_10, 17, T[10])
+      b = FF(b, c, d, a, M_offset_11, 22, T[11])
+      a = FF(a, b, c, d, M_offset_12, 7,  T[12])
+      d = FF(d, a, b, c, M_offset_13, 12, T[13])
+      c = FF(c, d, a, b, M_offset_14, 17, T[14])
+      b = FF(b, c, d, a, M_offset_15, 22, T[15])
 
-      a = GG(a, b, c, d, M_offset_1,  5,  T[16]);
-      d = GG(d, a, b, c, M_offset_6,  9,  T[17]);
-      c = GG(c, d, a, b, M_offset_11, 14, T[18]);
-      b = GG(b, c, d, a, M_offset_0,  20, T[19]);
-      a = GG(a, b, c, d, M_offset_5,  5,  T[20]);
-      d = GG(d, a, b, c, M_offset_10, 9,  T[21]);
-      c = GG(c, d, a, b, M_offset_15, 14, T[22]);
-      b = GG(b, c, d, a, M_offset_4,  20, T[23]);
-      a = GG(a, b, c, d, M_offset_9,  5,  T[24]);
-      d = GG(d, a, b, c, M_offset_14, 9,  T[25]);
-      c = GG(c, d, a, b, M_offset_3,  14, T[26]);
-      b = GG(b, c, d, a, M_offset_8,  20, T[27]);
-      a = GG(a, b, c, d, M_offset_13, 5,  T[28]);
-      d = GG(d, a, b, c, M_offset_2,  9,  T[29]);
-      c = GG(c, d, a, b, M_offset_7,  14, T[30]);
-      b = GG(b, c, d, a, M_offset_12, 20, T[31]);
+      a = GG(a, b, c, d, M_offset_1,  5,  T[16])
+      d = GG(d, a, b, c, M_offset_6,  9,  T[17])
+      c = GG(c, d, a, b, M_offset_11, 14, T[18])
+      b = GG(b, c, d, a, M_offset_0,  20, T[19])
+      a = GG(a, b, c, d, M_offset_5,  5,  T[20])
+      d = GG(d, a, b, c, M_offset_10, 9,  T[21])
+      c = GG(c, d, a, b, M_offset_15, 14, T[22])
+      b = GG(b, c, d, a, M_offset_4,  20, T[23])
+      a = GG(a, b, c, d, M_offset_9,  5,  T[24])
+      d = GG(d, a, b, c, M_offset_14, 9,  T[25])
+      c = GG(c, d, a, b, M_offset_3,  14, T[26])
+      b = GG(b, c, d, a, M_offset_8,  20, T[27])
+      a = GG(a, b, c, d, M_offset_13, 5,  T[28])
+      d = GG(d, a, b, c, M_offset_2,  9,  T[29])
+      c = GG(c, d, a, b, M_offset_7,  14, T[30])
+      b = GG(b, c, d, a, M_offset_12, 20, T[31])
 
-      a = HH(a, b, c, d, M_offset_5,  4,  T[32]);
-      d = HH(d, a, b, c, M_offset_8,  11, T[33]);
-      c = HH(c, d, a, b, M_offset_11, 16, T[34]);
-      b = HH(b, c, d, a, M_offset_14, 23, T[35]);
-      a = HH(a, b, c, d, M_offset_1,  4,  T[36]);
-      d = HH(d, a, b, c, M_offset_4,  11, T[37]);
-      c = HH(c, d, a, b, M_offset_7,  16, T[38]);
-      b = HH(b, c, d, a, M_offset_10, 23, T[39]);
-      a = HH(a, b, c, d, M_offset_13, 4,  T[40]);
-      d = HH(d, a, b, c, M_offset_0,  11, T[41]);
-      c = HH(c, d, a, b, M_offset_3,  16, T[42]);
-      b = HH(b, c, d, a, M_offset_6,  23, T[43]);
-      a = HH(a, b, c, d, M_offset_9,  4,  T[44]);
-      d = HH(d, a, b, c, M_offset_12, 11, T[45]);
-      c = HH(c, d, a, b, M_offset_15, 16, T[46]);
-      b = HH(b, c, d, a, M_offset_2,  23, T[47]);
+      a = HH(a, b, c, d, M_offset_5,  4,  T[32])
+      d = HH(d, a, b, c, M_offset_8,  11, T[33])
+      c = HH(c, d, a, b, M_offset_11, 16, T[34])
+      b = HH(b, c, d, a, M_offset_14, 23, T[35])
+      a = HH(a, b, c, d, M_offset_1,  4,  T[36])
+      d = HH(d, a, b, c, M_offset_4,  11, T[37])
+      c = HH(c, d, a, b, M_offset_7,  16, T[38])
+      b = HH(b, c, d, a, M_offset_10, 23, T[39])
+      a = HH(a, b, c, d, M_offset_13, 4,  T[40])
+      d = HH(d, a, b, c, M_offset_0,  11, T[41])
+      c = HH(c, d, a, b, M_offset_3,  16, T[42])
+      b = HH(b, c, d, a, M_offset_6,  23, T[43])
+      a = HH(a, b, c, d, M_offset_9,  4,  T[44])
+      d = HH(d, a, b, c, M_offset_12, 11, T[45])
+      c = HH(c, d, a, b, M_offset_15, 16, T[46])
+      b = HH(b, c, d, a, M_offset_2,  23, T[47])
 
-      a = II(a, b, c, d, M_offset_0,  6,  T[48]);
-      d = II(d, a, b, c, M_offset_7,  10, T[49]);
-      c = II(c, d, a, b, M_offset_14, 15, T[50]);
-      b = II(b, c, d, a, M_offset_5,  21, T[51]);
-      a = II(a, b, c, d, M_offset_12, 6,  T[52]);
-      d = II(d, a, b, c, M_offset_3,  10, T[53]);
-      c = II(c, d, a, b, M_offset_10, 15, T[54]);
-      b = II(b, c, d, a, M_offset_1,  21, T[55]);
-      a = II(a, b, c, d, M_offset_8,  6,  T[56]);
-      d = II(d, a, b, c, M_offset_15, 10, T[57]);
-      c = II(c, d, a, b, M_offset_6,  15, T[58]);
-      b = II(b, c, d, a, M_offset_13, 21, T[59]);
-      a = II(a, b, c, d, M_offset_4,  6,  T[60]);
-      d = II(d, a, b, c, M_offset_11, 10, T[61]);
-      c = II(c, d, a, b, M_offset_2,  15, T[62]);
-      b = II(b, c, d, a, M_offset_9,  21, T[63]);
+      a = II(a, b, c, d, M_offset_0,  6,  T[48])
+      d = II(d, a, b, c, M_offset_7,  10, T[49])
+      c = II(c, d, a, b, M_offset_14, 15, T[50])
+      b = II(b, c, d, a, M_offset_5,  21, T[51])
+      a = II(a, b, c, d, M_offset_12, 6,  T[52])
+      d = II(d, a, b, c, M_offset_3,  10, T[53])
+      c = II(c, d, a, b, M_offset_10, 15, T[54])
+      b = II(b, c, d, a, M_offset_1,  21, T[55])
+      a = II(a, b, c, d, M_offset_8,  6,  T[56])
+      d = II(d, a, b, c, M_offset_15, 10, T[57])
+      c = II(c, d, a, b, M_offset_6,  15, T[58])
+      b = II(b, c, d, a, M_offset_13, 21, T[59])
+      a = II(a, b, c, d, M_offset_4,  6,  T[60])
+      d = II(d, a, b, c, M_offset_11, 10, T[61])
+      c = II(c, d, a, b, M_offset_2,  15, T[62])
+      b = II(b, c, d, a, M_offset_9,  21, T[63])
 
       // Intermediate hash value
-      H[0] = (H[0] + a) | 0;
-      H[1] = (H[1] + b) | 0;
-      H[2] = (H[2] + c) | 0;
-      H[3] = (H[3] + d) | 0;
+      H[0] = (H[0] + a) | 0
+      H[1] = (H[1] + b) | 0
+      H[2] = (H[2] + c) | 0
+      H[3] = (H[3] + d) | 0
     },
 
     _doFinalize: function () {
       // Shortcuts
-      var data = this._data;
-      var dataWords = data.words;
+      var data = this._data
+      var dataWords = data.words
 
-      var nBitsTotal = this._nDataBytes * 8;
-      var nBitsLeft = data.sigBytes * 8;
+      var nBitsTotal = this._nDataBytes * 8
+      var nBitsLeft = data.sigBytes * 8
 
       // Add padding
-      dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+      dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32)
 
-      var nBitsTotalH = Math.floor(nBitsTotal / 0x100000000);
-      var nBitsTotalL = nBitsTotal;
+      var nBitsTotalH = Math.floor(nBitsTotal / 0x100000000)
+      var nBitsTotalL = nBitsTotal
       dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = (
         (((nBitsTotalH << 8)  | (nBitsTotalH >>> 24)) & 0x00ff00ff) |
         (((nBitsTotalH << 24) | (nBitsTotalH >>> 8))  & 0xff00ff00)
-      );
+      )
       dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
         (((nBitsTotalL << 8)  | (nBitsTotalL >>> 24)) & 0x00ff00ff) |
         (((nBitsTotalL << 24) | (nBitsTotalL >>> 8))  & 0xff00ff00)
-      );
+      )
 
-      data.sigBytes = (dataWords.length + 1) * 4;
+      data.sigBytes = (dataWords.length + 1) * 4
 
       // Hash final blocks
-      this._process();
+      this._process()
 
       // Shortcuts
-      var hash = this._hash;
-      var H = hash.words;
+      var hash = this._hash
+      var H = hash.words
 
       // Swap endian
       for (var i = 0; i < 4; i++) {
         // Shortcut
-        var H_i = H[i];
+        var H_i = H[i]
 
         H[i] = (((H_i << 8)  | (H_i >>> 24)) & 0x00ff00ff) |
-          (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00);
+          (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00)
       }
 
       // Return final computed hash
-      return hash;
+      return hash
     },
 
     clone: function () {
-      var clone = Hasher.clone.call(this);
-      clone._hash = this._hash.clone();
+      var clone = Hasher.clone.call(this)
+      clone._hash = this._hash.clone()
 
-      return clone;
+      return clone
     }
-  });
+  })
 
   function FF(a, b, c, d, x, s, t) {
-    var n = a + ((b & c) | (~b & d)) + x + t;
-    return ((n << s) | (n >>> (32 - s))) + b;
+    var n = a + ((b & c) | (~b & d)) + x + t
+    return ((n << s) | (n >>> (32 - s))) + b
   }
 
   function GG(a, b, c, d, x, s, t) {
-    var n = a + ((b & d) | (c & ~d)) + x + t;
-    return ((n << s) | (n >>> (32 - s))) + b;
+    var n = a + ((b & d) | (c & ~d)) + x + t
+    return ((n << s) | (n >>> (32 - s))) + b
   }
 
   function HH(a, b, c, d, x, s, t) {
-    var n = a + (b ^ c ^ d) + x + t;
-    return ((n << s) | (n >>> (32 - s))) + b;
+    var n = a + (b ^ c ^ d) + x + t
+    return ((n << s) | (n >>> (32 - s))) + b
   }
 
   function II(a, b, c, d, x, s, t) {
-    var n = a + (c ^ (b | ~d)) + x + t;
-    return ((n << s) | (n >>> (32 - s))) + b;
+    var n = a + (c ^ (b | ~d)) + x + t
+    return ((n << s) | (n >>> (32 - s))) + b
   }
 
   /**
@@ -1121,7 +1121,7 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
    *     var hash = CryptoJS.MD5('message');
    *     var hash = CryptoJS.MD5(wordArray);
    */
-  C.MD5 = Hasher._createHelper(MD5);
+  C.MD5 = Hasher._createHelper(MD5)
 
   /**
    * Shortcut function to the HMAC's object interface.
@@ -1137,20 +1137,20 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
    *
    *     var hmac = CryptoJS.HmacMD5(message, key);
    */
-  C.HmacMD5 = Hasher._createHmacHelper(MD5);
+  C.HmacMD5 = Hasher._createHmacHelper(MD5)
 }(Math));
 
 
 (function () {
   // Shortcuts
-  var C = CryptoJS;
-  var C_lib = C.lib;
-  var WordArray = C_lib.WordArray;
-  var Hasher = C_lib.Hasher;
-  var C_algo = C.algo;
+  var C = CryptoJS
+  var C_lib = C.lib
+  var WordArray = C_lib.WordArray
+  var Hasher = C_lib.Hasher
+  var C_algo = C.algo
 
   // Reusable object
-  var W = [];
+  var W = []
 
   /**
    * SHA-1 hash algorithm.
@@ -1161,83 +1161,83 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
         0x67452301, 0xefcdab89,
         0x98badcfe, 0x10325476,
         0xc3d2e1f0
-      ]);
+      ])
     },
 
     _doProcessBlock: function (M, offset) {
       // Shortcut
-      var H = this._hash.words;
+      var H = this._hash.words
 
       // Working variables
-      var a = H[0];
-      var b = H[1];
-      var c = H[2];
-      var d = H[3];
-      var e = H[4];
+      var a = H[0]
+      var b = H[1]
+      var c = H[2]
+      var d = H[3]
+      var e = H[4]
 
       // Computation
       for (var i = 0; i < 80; i++) {
         if (i < 16) {
-          W[i] = M[offset + i] | 0;
+          W[i] = M[offset + i] | 0
         } else {
-          var n = W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16];
-          W[i] = (n << 1) | (n >>> 31);
+          var n = W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16]
+          W[i] = (n << 1) | (n >>> 31)
         }
 
-        var t = ((a << 5) | (a >>> 27)) + e + W[i];
+        var t = ((a << 5) | (a >>> 27)) + e + W[i]
         if (i < 20) {
-          t += ((b & c) | (~b & d)) + 0x5a827999;
+          t += ((b & c) | (~b & d)) + 0x5a827999
         } else if (i < 40) {
-          t += (b ^ c ^ d) + 0x6ed9eba1;
+          t += (b ^ c ^ d) + 0x6ed9eba1
         } else if (i < 60) {
-          t += ((b & c) | (b & d) | (c & d)) - 0x70e44324;
+          t += ((b & c) | (b & d) | (c & d)) - 0x70e44324
         } else /* if (i < 80) */ {
-          t += (b ^ c ^ d) - 0x359d3e2a;
+          t += (b ^ c ^ d) - 0x359d3e2a
         }
 
-        e = d;
-        d = c;
-        c = (b << 30) | (b >>> 2);
-        b = a;
-        a = t;
+        e = d
+        d = c
+        c = (b << 30) | (b >>> 2)
+        b = a
+        a = t
       }
 
       // Intermediate hash value
-      H[0] = (H[0] + a) | 0;
-      H[1] = (H[1] + b) | 0;
-      H[2] = (H[2] + c) | 0;
-      H[3] = (H[3] + d) | 0;
-      H[4] = (H[4] + e) | 0;
+      H[0] = (H[0] + a) | 0
+      H[1] = (H[1] + b) | 0
+      H[2] = (H[2] + c) | 0
+      H[3] = (H[3] + d) | 0
+      H[4] = (H[4] + e) | 0
     },
 
     _doFinalize: function () {
       // Shortcuts
-      var data = this._data;
-      var dataWords = data.words;
+      var data = this._data
+      var dataWords = data.words
 
-      var nBitsTotal = this._nDataBytes * 8;
-      var nBitsLeft = data.sigBytes * 8;
+      var nBitsTotal = this._nDataBytes * 8
+      var nBitsLeft = data.sigBytes * 8
 
       // Add padding
-      dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
-      dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
-      dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
-      data.sigBytes = dataWords.length * 4;
+      dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32)
+      dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000)
+      dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal
+      data.sigBytes = dataWords.length * 4
 
       // Hash final blocks
-      this._process();
+      this._process()
 
       // Return final computed hash
-      return this._hash;
+      return this._hash
     },
 
     clone: function () {
-      var clone = Hasher.clone.call(this);
-      clone._hash = this._hash.clone();
+      var clone = Hasher.clone.call(this)
+      clone._hash = this._hash.clone()
 
-      return clone;
+      return clone
     }
-  });
+  })
 
   /**
    * Shortcut function to the hasher's object interface.
@@ -1253,7 +1253,7 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
    *     var hash = CryptoJS.SHA1('message');
    *     var hash = CryptoJS.SHA1(wordArray);
    */
-  C.SHA1 = Hasher._createHelper(SHA1);
+  C.SHA1 = Hasher._createHelper(SHA1)
 
   /**
    * Shortcut function to the HMAC's object interface.
@@ -1269,156 +1269,156 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
    *
    *     var hmac = CryptoJS.HmacSHA1(message, key);
    */
-  C.HmacSHA1 = Hasher._createHmacHelper(SHA1);
+  C.HmacSHA1 = Hasher._createHmacHelper(SHA1)
 }());
 
 
 (function (Math) {
   // Shortcuts
-  var C = CryptoJS;
-  var C_lib = C.lib;
-  var WordArray = C_lib.WordArray;
-  var Hasher = C_lib.Hasher;
-  var C_algo = C.algo;
+  var C = CryptoJS
+  var C_lib = C.lib
+  var WordArray = C_lib.WordArray
+  var Hasher = C_lib.Hasher
+  var C_algo = C.algo
 
   // Initialization and round constants tables
-  var H = [];
+  var H = []
   var K = [];
 
   // Compute constants
   (function () {
     function isPrime(n) {
-      var sqrtN = Math.sqrt(n);
+      var sqrtN = Math.sqrt(n)
       for (var factor = 2; factor <= sqrtN; factor++) {
         if (!(n % factor)) {
-          return false;
+          return false
         }
       }
 
-      return true;
+      return true
     }
 
     function getFractionalBits(n) {
-      return ((n - (n | 0)) * 0x100000000) | 0;
+      return ((n - (n | 0)) * 0x100000000) | 0
     }
 
-    var n = 2;
-    var nPrime = 0;
+    var n = 2
+    var nPrime = 0
     while (nPrime < 64) {
       if (isPrime(n)) {
         if (nPrime < 8) {
-          H[nPrime] = getFractionalBits(Math.pow(n, 1 / 2));
+          H[nPrime] = getFractionalBits(Math.pow(n, 1 / 2))
         }
-        K[nPrime] = getFractionalBits(Math.pow(n, 1 / 3));
+        K[nPrime] = getFractionalBits(Math.pow(n, 1 / 3))
 
-        nPrime++;
+        nPrime++
       }
 
-      n++;
+      n++
     }
-  }());
+  }())
 
   // Reusable object
-  var W = [];
+  var W = []
 
   /**
    * SHA-256 hash algorithm.
    */
   var SHA256 = C_algo.SHA256 = Hasher.extend({
     _doReset: function () {
-      this._hash = new WordArray.init(H.slice(0));
+      this._hash = new WordArray.init(H.slice(0))
     },
 
     _doProcessBlock: function (M, offset) {
       // Shortcut
-      var H = this._hash.words;
+      var H = this._hash.words
 
       // Working variables
-      var a = H[0];
-      var b = H[1];
-      var c = H[2];
-      var d = H[3];
-      var e = H[4];
-      var f = H[5];
-      var g = H[6];
-      var h = H[7];
+      var a = H[0]
+      var b = H[1]
+      var c = H[2]
+      var d = H[3]
+      var e = H[4]
+      var f = H[5]
+      var g = H[6]
+      var h = H[7]
 
       // Computation
       for (var i = 0; i < 64; i++) {
         if (i < 16) {
-          W[i] = M[offset + i] | 0;
+          W[i] = M[offset + i] | 0
         } else {
-          var gamma0x = W[i - 15];
+          var gamma0x = W[i - 15]
           var gamma0  = ((gamma0x << 25) | (gamma0x >>> 7))  ^
             ((gamma0x << 14) | (gamma0x >>> 18)) ^
-            (gamma0x >>> 3);
+            (gamma0x >>> 3)
 
-          var gamma1x = W[i - 2];
+          var gamma1x = W[i - 2]
           var gamma1  = ((gamma1x << 15) | (gamma1x >>> 17)) ^
             ((gamma1x << 13) | (gamma1x >>> 19)) ^
-            (gamma1x >>> 10);
+            (gamma1x >>> 10)
 
-          W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16];
+          W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16]
         }
 
-        var ch  = (e & f) ^ (~e & g);
-        var maj = (a & b) ^ (a & c) ^ (b & c);
+        var ch  = (e & f) ^ (~e & g)
+        var maj = (a & b) ^ (a & c) ^ (b & c)
 
-        var sigma0 = ((a << 30) | (a >>> 2)) ^ ((a << 19) | (a >>> 13)) ^ ((a << 10) | (a >>> 22));
-        var sigma1 = ((e << 26) | (e >>> 6)) ^ ((e << 21) | (e >>> 11)) ^ ((e << 7)  | (e >>> 25));
+        var sigma0 = ((a << 30) | (a >>> 2)) ^ ((a << 19) | (a >>> 13)) ^ ((a << 10) | (a >>> 22))
+        var sigma1 = ((e << 26) | (e >>> 6)) ^ ((e << 21) | (e >>> 11)) ^ ((e << 7)  | (e >>> 25))
 
-        var t1 = h + sigma1 + ch + K[i] + W[i];
-        var t2 = sigma0 + maj;
+        var t1 = h + sigma1 + ch + K[i] + W[i]
+        var t2 = sigma0 + maj
 
-        h = g;
-        g = f;
-        f = e;
-        e = (d + t1) | 0;
-        d = c;
-        c = b;
-        b = a;
-        a = (t1 + t2) | 0;
+        h = g
+        g = f
+        f = e
+        e = (d + t1) | 0
+        d = c
+        c = b
+        b = a
+        a = (t1 + t2) | 0
       }
 
       // Intermediate hash value
-      H[0] = (H[0] + a) | 0;
-      H[1] = (H[1] + b) | 0;
-      H[2] = (H[2] + c) | 0;
-      H[3] = (H[3] + d) | 0;
-      H[4] = (H[4] + e) | 0;
-      H[5] = (H[5] + f) | 0;
-      H[6] = (H[6] + g) | 0;
-      H[7] = (H[7] + h) | 0;
+      H[0] = (H[0] + a) | 0
+      H[1] = (H[1] + b) | 0
+      H[2] = (H[2] + c) | 0
+      H[3] = (H[3] + d) | 0
+      H[4] = (H[4] + e) | 0
+      H[5] = (H[5] + f) | 0
+      H[6] = (H[6] + g) | 0
+      H[7] = (H[7] + h) | 0
     },
 
     _doFinalize: function () {
       // Shortcuts
-      var data = this._data;
-      var dataWords = data.words;
+      var data = this._data
+      var dataWords = data.words
 
-      var nBitsTotal = this._nDataBytes * 8;
-      var nBitsLeft = data.sigBytes * 8;
+      var nBitsTotal = this._nDataBytes * 8
+      var nBitsLeft = data.sigBytes * 8
 
       // Add padding
-      dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
-      dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
-      dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
-      data.sigBytes = dataWords.length * 4;
+      dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32)
+      dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000)
+      dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal
+      data.sigBytes = dataWords.length * 4
 
       // Hash final blocks
-      this._process();
+      this._process()
 
       // Return final computed hash
-      return this._hash;
+      return this._hash
     },
 
     clone: function () {
-      var clone = Hasher.clone.call(this);
-      clone._hash = this._hash.clone();
+      var clone = Hasher.clone.call(this)
+      clone._hash = this._hash.clone()
 
-      return clone;
+      return clone
     }
-  });
+  })
 
   /**
    * Shortcut function to the hasher's object interface.
@@ -1434,7 +1434,7 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
    *     var hash = CryptoJS.SHA256('message');
    *     var hash = CryptoJS.SHA256(wordArray);
    */
-  C.SHA256 = Hasher._createHelper(SHA256);
+  C.SHA256 = Hasher._createHelper(SHA256)
 
   /**
    * Shortcut function to the HMAC's object interface.
@@ -1450,16 +1450,16 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
    *
    *     var hmac = CryptoJS.HmacSHA256(message, key);
    */
-  C.HmacSHA256 = Hasher._createHmacHelper(SHA256);
+  C.HmacSHA256 = Hasher._createHmacHelper(SHA256)
 }(Math));
 
 
 (function () {
   // Shortcuts
-  var C = CryptoJS;
-  var C_lib = C.lib;
-  var WordArray = C_lib.WordArray;
-  var C_enc = C.enc;
+  var C = CryptoJS
+  var C_lib = C.lib
+  var WordArray = C_lib.WordArray
+  var C_enc = C.enc
 
   /**
    * UTF-16 BE encoding strategy.
@@ -1480,17 +1480,17 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     stringify: function (wordArray) {
       // Shortcuts
-      var words = wordArray.words;
-      var sigBytes = wordArray.sigBytes;
+      var words = wordArray.words
+      var sigBytes = wordArray.sigBytes
 
       // Convert
-      var utf16Chars = [];
+      var utf16Chars = []
       for (var i = 0; i < sigBytes; i += 2) {
-        var codePoint = (words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff;
-        utf16Chars.push(String.fromCharCode(codePoint));
+        var codePoint = (words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff
+        utf16Chars.push(String.fromCharCode(codePoint))
       }
 
-      return utf16Chars.join('');
+      return utf16Chars.join('')
     },
 
     /**
@@ -1508,17 +1508,17 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     parse: function (utf16Str) {
       // Shortcut
-      var utf16StrLength = utf16Str.length;
+      var utf16StrLength = utf16Str.length
 
       // Convert
-      var words = [];
+      var words = []
       for (var i = 0; i < utf16StrLength; i++) {
-        words[i >>> 1] |= utf16Str.charCodeAt(i) << (16 - (i % 2) * 16);
+        words[i >>> 1] |= utf16Str.charCodeAt(i) << (16 - (i % 2) * 16)
       }
 
-      return WordArray.create(words, utf16StrLength * 2);
+      return WordArray.create(words, utf16StrLength * 2)
     }
-  };
+  }
 
   /**
    * UTF-16 LE encoding strategy.
@@ -1539,17 +1539,17 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     stringify: function (wordArray) {
       // Shortcuts
-      var words = wordArray.words;
-      var sigBytes = wordArray.sigBytes;
+      var words = wordArray.words
+      var sigBytes = wordArray.sigBytes
 
       // Convert
-      var utf16Chars = [];
+      var utf16Chars = []
       for (var i = 0; i < sigBytes; i += 2) {
-        var codePoint = swapEndian((words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff);
-        utf16Chars.push(String.fromCharCode(codePoint));
+        var codePoint = swapEndian((words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff)
+        utf16Chars.push(String.fromCharCode(codePoint))
       }
 
-      return utf16Chars.join('');
+      return utf16Chars.join('')
     },
 
     /**
@@ -1567,20 +1567,20 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     parse: function (utf16Str) {
       // Shortcut
-      var utf16StrLength = utf16Str.length;
+      var utf16StrLength = utf16Str.length
 
       // Convert
-      var words = [];
+      var words = []
       for (var i = 0; i < utf16StrLength; i++) {
-        words[i >>> 1] |= swapEndian(utf16Str.charCodeAt(i) << (16 - (i % 2) * 16));
+        words[i >>> 1] |= swapEndian(utf16Str.charCodeAt(i) << (16 - (i % 2) * 16))
       }
 
-      return WordArray.create(words, utf16StrLength * 2);
+      return WordArray.create(words, utf16StrLength * 2)
     }
-  };
+  }
 
   function swapEndian(word) {
-    return ((word << 8) & 0xff00ff00) | ((word >>> 8) & 0x00ff00ff);
+    return ((word << 8) & 0xff00ff00) | ((word >>> 8) & 0x00ff00ff)
   }
 }());
 
@@ -1588,28 +1588,28 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
 (function () {
   // Check if typed arrays are supported
   if (typeof ArrayBuffer != 'function') {
-    return;
+    return
   }
 
   // Shortcuts
-  var C = CryptoJS;
-  var C_lib = C.lib;
-  var WordArray = C_lib.WordArray;
+  var C = CryptoJS
+  var C_lib = C.lib
+  var WordArray = C_lib.WordArray
 
   // Reference original init
-  var superInit = WordArray.init;
+  var superInit = WordArray.init
 
   // Augment WordArray.init to handle typed arrays
   var subInit = WordArray.init = function (typedArray) {
     // Convert buffers to uint8
     if (typedArray instanceof ArrayBuffer) {
-      typedArray = new Uint8Array(typedArray);
+      typedArray = new Uint8Array(typedArray)
     }
 
     // Convert other array views to uint8
     if (
       typedArray instanceof Int8Array ||
-      (typeof Uint8ClampedArray !== "undefined" && typedArray instanceof Uint8ClampedArray) ||
+      (typeof Uint8ClampedArray !== 'undefined' && typedArray instanceof Uint8ClampedArray) ||
       typedArray instanceof Int16Array ||
       typedArray instanceof Uint16Array ||
       typedArray instanceof Int32Array ||
@@ -1617,29 +1617,29 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
       typedArray instanceof Float32Array ||
       typedArray instanceof Float64Array
     ) {
-      typedArray = new Uint8Array(typedArray.buffer, typedArray.byteOffset, typedArray.byteLength);
+      typedArray = new Uint8Array(typedArray.buffer, typedArray.byteOffset, typedArray.byteLength)
     }
 
     // Handle Uint8Array
     if (typedArray instanceof Uint8Array) {
       // Shortcut
-      var typedArrayByteLength = typedArray.byteLength;
+      var typedArrayByteLength = typedArray.byteLength
 
       // Extract bytes
-      var words = [];
+      var words = []
       for (var i = 0; i < typedArrayByteLength; i++) {
-        words[i >>> 2] |= typedArray[i] << (24 - (i % 4) * 8);
+        words[i >>> 2] |= typedArray[i] << (24 - (i % 4) * 8)
       }
 
       // Initialize this word array
-      superInit.call(this, words, typedArrayByteLength);
+      superInit.call(this, words, typedArrayByteLength)
     } else {
       // Else call normal init
-      superInit.apply(this, arguments);
+      superInit.apply(this, arguments)
     }
-  };
+  }
 
-  subInit.prototype = WordArray;
+  subInit.prototype = WordArray
 }());
 
 
@@ -1656,11 +1656,11 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
 
 (function (Math) {
   // Shortcuts
-  var C = CryptoJS;
-  var C_lib = C.lib;
-  var WordArray = C_lib.WordArray;
-  var Hasher = C_lib.Hasher;
-  var C_algo = C.algo;
+  var C = CryptoJS
+  var C_lib = C.lib
+  var WordArray = C_lib.WordArray
+  var Hasher = C_lib.Hasher
+  var C_algo = C.algo
 
   // Constants table
   var _zl = WordArray.create([
@@ -1668,35 +1668,35 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
     7,  4, 13,  1, 10,  6, 15,  3, 12,  0,  9,  5,  2, 14, 11,  8,
     3, 10, 14,  4,  9, 15,  8,  1,  2,  7,  0,  6, 13, 11,  5, 12,
     1,  9, 11, 10,  0,  8, 12,  4, 13,  3,  7, 15, 14,  5,  6,  2,
-    4,  0,  5,  9,  7, 12,  2, 10, 14,  1,  3,  8, 11,  6, 15, 13]);
+    4,  0,  5,  9,  7, 12,  2, 10, 14,  1,  3,  8, 11,  6, 15, 13])
   var _zr = WordArray.create([
     5, 14,  7,  0,  9,  2, 11,  4, 13,  6, 15,  8,  1, 10,  3, 12,
     6, 11,  3,  7,  0, 13,  5, 10, 14, 15,  8, 12,  4,  9,  1,  2,
     15,  5,  1,  3,  7, 14,  6,  9, 11,  8, 12,  2, 10,  0,  4, 13,
     8,  6,  4,  1,  3, 11, 15,  0,  5, 12,  2, 13,  9,  7, 10, 14,
-    12, 15, 10,  4,  1,  5,  8,  7,  6,  2, 13, 14,  0,  3,  9, 11]);
+    12, 15, 10,  4,  1,  5,  8,  7,  6,  2, 13, 14,  0,  3,  9, 11])
   var _sl = WordArray.create([
     11, 14, 15, 12,  5,  8,  7,  9, 11, 13, 14, 15,  6,  7,  9,  8,
     7, 6,   8, 13, 11,  9,  7, 15,  7, 12, 15,  9, 11,  7, 13, 12,
     11, 13,  6,  7, 14,  9, 13, 15, 14,  8, 13,  6,  5, 12,  7,  5,
     11, 12, 14, 15, 14, 15,  9,  8,  9, 14,  5,  6,  8,  6,  5, 12,
-    9, 15,  5, 11,  6,  8, 13, 12,  5, 12, 13, 14, 11,  8,  5,  6 ]);
+    9, 15,  5, 11,  6,  8, 13, 12,  5, 12, 13, 14, 11,  8,  5,  6 ])
   var _sr = WordArray.create([
     8,  9,  9, 11, 13, 15, 15,  5,  7,  7,  8, 11, 14, 14, 12,  6,
     9, 13, 15,  7, 12,  8,  9, 11,  7,  7, 12,  7,  6, 15, 13, 11,
     9,  7, 15, 11,  8,  6,  6, 14, 12, 13,  5, 14, 13, 13,  7,  5,
     15,  5,  8, 11, 14, 14,  6, 14,  6,  9, 12,  9, 12,  5, 15,  8,
-    8,  5, 12,  9, 12,  5, 14,  6,  8, 13,  6,  5, 15, 13, 11, 11 ]);
+    8,  5, 12,  9, 12,  5, 14,  6,  8, 13,  6,  5, 15, 13, 11, 11 ])
 
-  var _hl =  WordArray.create([ 0x00000000, 0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xA953FD4E]);
-  var _hr =  WordArray.create([ 0x50A28BE6, 0x5C4DD124, 0x6D703EF3, 0x7A6D76E9, 0x00000000]);
+  var _hl =  WordArray.create([ 0x00000000, 0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xA953FD4E])
+  var _hr =  WordArray.create([ 0x50A28BE6, 0x5C4DD124, 0x6D703EF3, 0x7A6D76E9, 0x00000000])
 
   /**
    * RIPEMD160 hash algorithm.
    */
   var RIPEMD160 = C_algo.RIPEMD160 = Hasher.extend({
     _doReset: function () {
-      this._hash  = WordArray.create([0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0]);
+      this._hash  = WordArray.create([0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0])
     },
 
     _doProcessBlock: function (M, offset) {
@@ -1704,157 +1704,157 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
       // Swap endian
       for (var i = 0; i < 16; i++) {
         // Shortcuts
-        var offset_i = offset + i;
-        var M_offset_i = M[offset_i];
+        var offset_i = offset + i
+        var M_offset_i = M[offset_i]
 
         // Swap
         M[offset_i] = (
           (((M_offset_i << 8)  | (M_offset_i >>> 24)) & 0x00ff00ff) |
           (((M_offset_i << 24) | (M_offset_i >>> 8))  & 0xff00ff00)
-        );
+        )
       }
       // Shortcut
-      var H  = this._hash.words;
-      var hl = _hl.words;
-      var hr = _hr.words;
-      var zl = _zl.words;
-      var zr = _zr.words;
-      var sl = _sl.words;
-      var sr = _sr.words;
+      var H  = this._hash.words
+      var hl = _hl.words
+      var hr = _hr.words
+      var zl = _zl.words
+      var zr = _zr.words
+      var sl = _sl.words
+      var sr = _sr.words
 
       // Working variables
-      var al, bl, cl, dl, el;
-      var ar, br, cr, dr, er;
+      var al, bl, cl, dl, el
+      var ar, br, cr, dr, er
 
-      ar = al = H[0];
-      br = bl = H[1];
-      cr = cl = H[2];
-      dr = dl = H[3];
-      er = el = H[4];
+      ar = al = H[0]
+      br = bl = H[1]
+      cr = cl = H[2]
+      dr = dl = H[3]
+      er = el = H[4]
       // Computation
-      var t;
+      var t
       for (var i = 0; i < 80; i += 1) {
-        t = (al +  M[offset+zl[i]])|0;
+        t = (al +  M[offset+zl[i]])|0
         if (i<16){
-          t +=  f1(bl,cl,dl) + hl[0];
+          t +=  f1(bl,cl,dl) + hl[0]
         } else if (i<32) {
-          t +=  f2(bl,cl,dl) + hl[1];
+          t +=  f2(bl,cl,dl) + hl[1]
         } else if (i<48) {
-          t +=  f3(bl,cl,dl) + hl[2];
+          t +=  f3(bl,cl,dl) + hl[2]
         } else if (i<64) {
-          t +=  f4(bl,cl,dl) + hl[3];
+          t +=  f4(bl,cl,dl) + hl[3]
         } else {// if (i<80) {
-          t +=  f5(bl,cl,dl) + hl[4];
+          t +=  f5(bl,cl,dl) + hl[4]
         }
-        t = t|0;
-        t =  rotl(t,sl[i]);
-        t = (t+el)|0;
-        al = el;
-        el = dl;
-        dl = rotl(cl, 10);
-        cl = bl;
-        bl = t;
+        t = t|0
+        t =  rotl(t,sl[i])
+        t = (t+el)|0
+        al = el
+        el = dl
+        dl = rotl(cl, 10)
+        cl = bl
+        bl = t
 
-        t = (ar + M[offset+zr[i]])|0;
+        t = (ar + M[offset+zr[i]])|0
         if (i<16){
-          t +=  f5(br,cr,dr) + hr[0];
+          t +=  f5(br,cr,dr) + hr[0]
         } else if (i<32) {
-          t +=  f4(br,cr,dr) + hr[1];
+          t +=  f4(br,cr,dr) + hr[1]
         } else if (i<48) {
-          t +=  f3(br,cr,dr) + hr[2];
+          t +=  f3(br,cr,dr) + hr[2]
         } else if (i<64) {
-          t +=  f2(br,cr,dr) + hr[3];
+          t +=  f2(br,cr,dr) + hr[3]
         } else {// if (i<80) {
-          t +=  f1(br,cr,dr) + hr[4];
+          t +=  f1(br,cr,dr) + hr[4]
         }
-        t = t|0;
-        t =  rotl(t,sr[i]) ;
-        t = (t+er)|0;
-        ar = er;
-        er = dr;
-        dr = rotl(cr, 10);
-        cr = br;
-        br = t;
+        t = t|0
+        t =  rotl(t,sr[i]) 
+        t = (t+er)|0
+        ar = er
+        er = dr
+        dr = rotl(cr, 10)
+        cr = br
+        br = t
       }
       // Intermediate hash value
-      t    = (H[1] + cl + dr)|0;
-      H[1] = (H[2] + dl + er)|0;
-      H[2] = (H[3] + el + ar)|0;
-      H[3] = (H[4] + al + br)|0;
-      H[4] = (H[0] + bl + cr)|0;
-      H[0] =  t;
+      t    = (H[1] + cl + dr)|0
+      H[1] = (H[2] + dl + er)|0
+      H[2] = (H[3] + el + ar)|0
+      H[3] = (H[4] + al + br)|0
+      H[4] = (H[0] + bl + cr)|0
+      H[0] =  t
     },
 
     _doFinalize: function () {
       // Shortcuts
-      var data = this._data;
-      var dataWords = data.words;
+      var data = this._data
+      var dataWords = data.words
 
-      var nBitsTotal = this._nDataBytes * 8;
-      var nBitsLeft = data.sigBytes * 8;
+      var nBitsTotal = this._nDataBytes * 8
+      var nBitsLeft = data.sigBytes * 8
 
       // Add padding
-      dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+      dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32)
       dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
         (((nBitsTotal << 8)  | (nBitsTotal >>> 24)) & 0x00ff00ff) |
         (((nBitsTotal << 24) | (nBitsTotal >>> 8))  & 0xff00ff00)
-      );
-      data.sigBytes = (dataWords.length + 1) * 4;
+      )
+      data.sigBytes = (dataWords.length + 1) * 4
 
       // Hash final blocks
-      this._process();
+      this._process()
 
       // Shortcuts
-      var hash = this._hash;
-      var H = hash.words;
+      var hash = this._hash
+      var H = hash.words
 
       // Swap endian
       for (var i = 0; i < 5; i++) {
         // Shortcut
-        var H_i = H[i];
+        var H_i = H[i]
 
         // Swap
         H[i] = (((H_i << 8)  | (H_i >>> 24)) & 0x00ff00ff) |
-          (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00);
+          (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00)
       }
 
       // Return final computed hash
-      return hash;
+      return hash
     },
 
     clone: function () {
-      var clone = Hasher.clone.call(this);
-      clone._hash = this._hash.clone();
+      var clone = Hasher.clone.call(this)
+      clone._hash = this._hash.clone()
 
-      return clone;
+      return clone
     }
-  });
+  })
 
 
   function f1(x, y, z) {
-    return ((x) ^ (y) ^ (z));
+    return ((x) ^ (y) ^ (z))
 
   }
 
   function f2(x, y, z) {
-    return (((x)&(y)) | ((~x)&(z)));
+    return (((x)&(y)) | ((~x)&(z)))
   }
 
   function f3(x, y, z) {
-    return (((x) | (~(y))) ^ (z));
+    return (((x) | (~(y))) ^ (z))
   }
 
   function f4(x, y, z) {
-    return (((x) & (z)) | ((y)&(~(z))));
+    return (((x) & (z)) | ((y)&(~(z))))
   }
 
   function f5(x, y, z) {
-    return ((x) ^ ((y) |(~(z))));
+    return ((x) ^ ((y) |(~(z))))
 
   }
 
   function rotl(x,n) {
-    return (x<<n) | (x>>>(32-n));
+    return (x<<n) | (x>>>(32-n))
   }
 
 
@@ -1872,7 +1872,7 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
    *     var hash = CryptoJS.RIPEMD160('message');
    *     var hash = CryptoJS.RIPEMD160(wordArray);
    */
-  C.RIPEMD160 = Hasher._createHelper(RIPEMD160);
+  C.RIPEMD160 = Hasher._createHelper(RIPEMD160)
 
   /**
    * Shortcut function to the HMAC's object interface.
@@ -1888,18 +1888,18 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
    *
    *     var hmac = CryptoJS.HmacRIPEMD160(message, key);
    */
-  C.HmacRIPEMD160 = Hasher._createHmacHelper(RIPEMD160);
+  C.HmacRIPEMD160 = Hasher._createHmacHelper(RIPEMD160)
 }(Math));
 
 
 (function () {
   // Shortcuts
-  var C = CryptoJS;
-  var C_lib = C.lib;
-  var Base = C_lib.Base;
-  var C_enc = C.enc;
-  var Utf8 = C_enc.Utf8;
-  var C_algo = C.algo;
+  var C = CryptoJS
+  var C_lib = C.lib
+  var Base = C_lib.Base
+  var C_enc = C.enc
+  var Utf8 = C_enc.Utf8
+  var C_algo = C.algo
 
   /**
    * HMAC algorithm.
@@ -1917,42 +1917,42 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     init: function (hasher, key) {
       // Init hasher
-      hasher = this._hasher = new hasher.init();
+      hasher = this._hasher = new hasher.init()
 
       // Convert string to WordArray, else assume WordArray already
       if (typeof key == 'string') {
-        key = Utf8.parse(key);
+        key = Utf8.parse(key)
       }
 
       // Shortcuts
-      var hasherBlockSize = hasher.blockSize;
-      var hasherBlockSizeBytes = hasherBlockSize * 4;
+      var hasherBlockSize = hasher.blockSize
+      var hasherBlockSizeBytes = hasherBlockSize * 4
 
       // Allow arbitrary length keys
       if (key.sigBytes > hasherBlockSizeBytes) {
-        key = hasher.finalize(key);
+        key = hasher.finalize(key)
       }
 
       // Clamp excess bits
-      key.clamp();
+      key.clamp()
 
       // Clone key for inner and outer pads
-      var oKey = this._oKey = key.clone();
-      var iKey = this._iKey = key.clone();
+      var oKey = this._oKey = key.clone()
+      var iKey = this._iKey = key.clone()
 
       // Shortcuts
-      var oKeyWords = oKey.words;
-      var iKeyWords = iKey.words;
+      var oKeyWords = oKey.words
+      var iKeyWords = iKey.words
 
       // XOR keys with pad constants
       for (var i = 0; i < hasherBlockSize; i++) {
-        oKeyWords[i] ^= 0x5c5c5c5c;
-        iKeyWords[i] ^= 0x36363636;
+        oKeyWords[i] ^= 0x5c5c5c5c
+        iKeyWords[i] ^= 0x36363636
       }
-      oKey.sigBytes = iKey.sigBytes = hasherBlockSizeBytes;
+      oKey.sigBytes = iKey.sigBytes = hasherBlockSizeBytes
 
       // Set initial values
-      this.reset();
+      this.reset()
     },
 
     /**
@@ -1964,11 +1964,11 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     reset: function () {
       // Shortcut
-      var hasher = this._hasher;
+      var hasher = this._hasher
 
       // Reset
-      hasher.reset();
-      hasher.update(this._iKey);
+      hasher.reset()
+      hasher.update(this._iKey)
     },
 
     /**
@@ -1984,10 +1984,10 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      *     hmacHasher.update(wordArray);
      */
     update: function (messageUpdate) {
-      this._hasher.update(messageUpdate);
+      this._hasher.update(messageUpdate)
 
       // Chainable
-      return this;
+      return this
     },
 
     /**
@@ -2006,28 +2006,28 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     finalize: function (messageUpdate) {
       // Shortcut
-      var hasher = this._hasher;
+      var hasher = this._hasher
 
       // Compute HMAC
-      var innerHash = hasher.finalize(messageUpdate);
-      hasher.reset();
-      var hmac = hasher.finalize(this._oKey.clone().concat(innerHash));
+      var innerHash = hasher.finalize(messageUpdate)
+      hasher.reset()
+      var hmac = hasher.finalize(this._oKey.clone().concat(innerHash))
 
-      return hmac;
+      return hmac
     }
-  });
+  })
 }());
 
 
 (function () {
   // Shortcuts
-  var C = CryptoJS;
-  var C_lib = C.lib;
-  var Base = C_lib.Base;
-  var WordArray = C_lib.WordArray;
-  var C_algo = C.algo;
-  var SHA1 = C_algo.SHA1;
-  var HMAC = C_algo.HMAC;
+  var C = CryptoJS
+  var C_lib = C.lib
+  var Base = C_lib.Base
+  var WordArray = C_lib.WordArray
+  var C_algo = C.algo
+  var SHA1 = C_algo.SHA1
+  var HMAC = C_algo.HMAC
 
   /**
    * Password-Based Key Derivation Function 2 algorithm.
@@ -2058,7 +2058,7 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8, iterations: 1000 });
      */
     init: function (cfg) {
-      this.cfg = this.cfg.extend(cfg);
+      this.cfg = this.cfg.extend(cfg)
     },
 
     /**
@@ -2075,53 +2075,53 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     compute: function (password, salt) {
       // Shortcut
-      var cfg = this.cfg;
+      var cfg = this.cfg
 
       // Init HMAC
-      var hmac = HMAC.create(cfg.hasher, password);
+      var hmac = HMAC.create(cfg.hasher, password)
 
       // Initial values
-      var derivedKey = WordArray.create();
-      var blockIndex = WordArray.create([0x00000001]);
+      var derivedKey = WordArray.create()
+      var blockIndex = WordArray.create([0x00000001])
 
       // Shortcuts
-      var derivedKeyWords = derivedKey.words;
-      var blockIndexWords = blockIndex.words;
-      var keySize = cfg.keySize;
-      var iterations = cfg.iterations;
+      var derivedKeyWords = derivedKey.words
+      var blockIndexWords = blockIndex.words
+      var keySize = cfg.keySize
+      var iterations = cfg.iterations
 
       // Generate key
       while (derivedKeyWords.length < keySize) {
-        var block = hmac.update(salt).finalize(blockIndex);
-        hmac.reset();
+        var block = hmac.update(salt).finalize(blockIndex)
+        hmac.reset()
 
         // Shortcuts
-        var blockWords = block.words;
-        var blockWordsLength = blockWords.length;
+        var blockWords = block.words
+        var blockWordsLength = blockWords.length
 
         // Iterations
-        var intermediate = block;
+        var intermediate = block
         for (var i = 1; i < iterations; i++) {
-          intermediate = hmac.finalize(intermediate);
-          hmac.reset();
+          intermediate = hmac.finalize(intermediate)
+          hmac.reset()
 
           // Shortcut
-          var intermediateWords = intermediate.words;
+          var intermediateWords = intermediate.words
 
           // XOR intermediate with block
           for (var j = 0; j < blockWordsLength; j++) {
-            blockWords[j] ^= intermediateWords[j];
+            blockWords[j] ^= intermediateWords[j]
           }
         }
 
-        derivedKey.concat(block);
-        blockIndexWords[0]++;
+        derivedKey.concat(block)
+        blockIndexWords[0]++
       }
-      derivedKey.sigBytes = keySize * 4;
+      derivedKey.sigBytes = keySize * 4
 
-      return derivedKey;
+      return derivedKey
     }
-  });
+  })
 
   /**
    * Computes the Password-Based Key Derivation Function 2.
@@ -2141,19 +2141,19 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
    *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8, iterations: 1000 });
    */
   C.PBKDF2 = function (password, salt, cfg) {
-    return PBKDF2.create(cfg).compute(password, salt);
-  };
+    return PBKDF2.create(cfg).compute(password, salt)
+  }
 }());
 
 
 (function () {
   // Shortcuts
-  var C = CryptoJS;
-  var C_lib = C.lib;
-  var Base = C_lib.Base;
-  var WordArray = C_lib.WordArray;
-  var C_algo = C.algo;
-  var MD5 = C_algo.MD5;
+  var C = CryptoJS
+  var C_lib = C.lib
+  var Base = C_lib.Base
+  var WordArray = C_lib.WordArray
+  var C_algo = C.algo
+  var MD5 = C_algo.MD5
 
   /**
    * This key derivation function is meant to conform with EVP_BytesToKey.
@@ -2185,7 +2185,7 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8, iterations: 1000 });
      */
     init: function (cfg) {
-      this.cfg = this.cfg.extend(cfg);
+      this.cfg = this.cfg.extend(cfg)
     },
 
     /**
@@ -2202,40 +2202,40 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     compute: function (password, salt) {
       // Shortcut
-      var cfg = this.cfg;
+      var cfg = this.cfg
 
       // Init hasher
-      var hasher = cfg.hasher.create();
+      var hasher = cfg.hasher.create()
 
       // Initial values
-      var derivedKey = WordArray.create();
+      var derivedKey = WordArray.create()
 
       // Shortcuts
-      var derivedKeyWords = derivedKey.words;
-      var keySize = cfg.keySize;
-      var iterations = cfg.iterations;
+      var derivedKeyWords = derivedKey.words
+      var keySize = cfg.keySize
+      var iterations = cfg.iterations
 
       // Generate key
       while (derivedKeyWords.length < keySize) {
         if (block) {
-          hasher.update(block);
+          hasher.update(block)
         }
-        var block = hasher.update(password).finalize(salt);
-        hasher.reset();
+        var block = hasher.update(password).finalize(salt)
+        hasher.reset()
 
         // Iterations
         for (var i = 1; i < iterations; i++) {
-          block = hasher.finalize(block);
-          hasher.reset();
+          block = hasher.finalize(block)
+          hasher.reset()
         }
 
-        derivedKey.concat(block);
+        derivedKey.concat(block)
       }
-      derivedKey.sigBytes = keySize * 4;
+      derivedKey.sigBytes = keySize * 4
 
-      return derivedKey;
+      return derivedKey
     }
-  });
+  })
 
   /**
    * Derives a key from a password.
@@ -2255,18 +2255,18 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
    *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8, iterations: 1000 });
    */
   C.EvpKDF = function (password, salt, cfg) {
-    return EvpKDF.create(cfg).compute(password, salt);
-  };
+    return EvpKDF.create(cfg).compute(password, salt)
+  }
 }());
 
 
 (function () {
   // Shortcuts
-  var C = CryptoJS;
-  var C_lib = C.lib;
-  var WordArray = C_lib.WordArray;
-  var C_algo = C.algo;
-  var SHA256 = C_algo.SHA256;
+  var C = CryptoJS
+  var C_lib = C.lib
+  var WordArray = C_lib.WordArray
+  var C_algo = C.algo
+  var SHA256 = C_algo.SHA256
 
   /**
    * SHA-224 hash algorithm.
@@ -2276,17 +2276,17 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
       this._hash = new WordArray.init([
         0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939,
         0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4
-      ]);
+      ])
     },
 
     _doFinalize: function () {
-      var hash = SHA256._doFinalize.call(this);
+      var hash = SHA256._doFinalize.call(this)
 
-      hash.sigBytes -= 4;
+      hash.sigBytes -= 4
 
-      return hash;
+      return hash
     }
-  });
+  })
 
   /**
    * Shortcut function to the hasher's object interface.
@@ -2302,7 +2302,7 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
    *     var hash = CryptoJS.SHA224('message');
    *     var hash = CryptoJS.SHA224(wordArray);
    */
-  C.SHA224 = SHA256._createHelper(SHA224);
+  C.SHA224 = SHA256._createHelper(SHA224)
 
   /**
    * Shortcut function to the HMAC's object interface.
@@ -2318,21 +2318,21 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
    *
    *     var hmac = CryptoJS.HmacSHA224(message, key);
    */
-  C.HmacSHA224 = SHA256._createHmacHelper(SHA224);
+  C.HmacSHA224 = SHA256._createHmacHelper(SHA224)
 }());
 
 
 (function (undefined) {
   // Shortcuts
-  var C = CryptoJS;
-  var C_lib = C.lib;
-  var Base = C_lib.Base;
-  var X32WordArray = C_lib.WordArray;
+  var C = CryptoJS
+  var C_lib = C.lib
+  var Base = C_lib.Base
+  var X32WordArray = C_lib.WordArray
 
   /**
    * x64 namespace.
    */
-  var C_x64 = C.x64 = {};
+  var C_x64 = C.x64 = {}
 
   /**
    * A 64-bit word.
@@ -2349,8 +2349,8 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      *     var x64Word = CryptoJS.x64.Word.create(0x00010203, 0x04050607);
      */
     init: function (high, low) {
-      this.high = high;
-      this.low = low;
+      this.high = high
+      this.low = low
     }
 
     /**
@@ -2517,7 +2517,7 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
 
     // return X64Word.create(high, low);
     // }
-  });
+  })
 
   /**
    * An array of 64-bit words.
@@ -2547,12 +2547,12 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      *     ], 10);
      */
     init: function (words, sigBytes) {
-      words = this.words = words || [];
+      words = this.words = words || []
 
       if (sigBytes != undefined) {
-        this.sigBytes = sigBytes;
+        this.sigBytes = sigBytes
       } else {
-        this.sigBytes = words.length * 8;
+        this.sigBytes = words.length * 8
       }
     },
 
@@ -2567,18 +2567,18 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      */
     toX32: function () {
       // Shortcuts
-      var x64Words = this.words;
-      var x64WordsLength = x64Words.length;
+      var x64Words = this.words
+      var x64WordsLength = x64Words.length
 
       // Convert
-      var x32Words = [];
+      var x32Words = []
       for (var i = 0; i < x64WordsLength; i++) {
-        var x64Word = x64Words[i];
-        x32Words.push(x64Word.high);
-        x32Words.push(x64Word.low);
+        var x64Word = x64Words[i]
+        x32Words.push(x64Word.high)
+        x32Words.push(x64Word.low)
       }
 
-      return X32WordArray.create(x32Words, this.sigBytes);
+      return X32WordArray.create(x32Words, this.sigBytes)
     },
 
     /**
@@ -2591,94 +2591,94 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
      *     var clone = x64WordArray.clone();
      */
     clone: function () {
-      var clone = Base.clone.call(this);
+      var clone = Base.clone.call(this)
 
       // Clone "words" array
-      var words = clone.words = this.words.slice(0);
+      var words = clone.words = this.words.slice(0)
 
       // Clone each X64Word object
-      var wordsLength = words.length;
+      var wordsLength = words.length
       for (var i = 0; i < wordsLength; i++) {
-        words[i] = words[i].clone();
+        words[i] = words[i].clone()
       }
 
-      return clone;
+      return clone
     }
-  });
+  })
 }());
 
 
 (function (Math) {
   // Shortcuts
-  var C = CryptoJS;
-  var C_lib = C.lib;
-  var WordArray = C_lib.WordArray;
-  var Hasher = C_lib.Hasher;
-  var C_x64 = C.x64;
-  var X64Word = C_x64.Word;
-  var C_algo = C.algo;
+  var C = CryptoJS
+  var C_lib = C.lib
+  var WordArray = C_lib.WordArray
+  var Hasher = C_lib.Hasher
+  var C_x64 = C.x64
+  var X64Word = C_x64.Word
+  var C_algo = C.algo
 
   // Constants tables
-  var RHO_OFFSETS = [];
-  var PI_INDEXES  = [];
+  var RHO_OFFSETS = []
+  var PI_INDEXES  = []
   var ROUND_CONSTANTS = [];
 
   // Compute Constants
   (function () {
     // Compute rho offset constants
-    var x = 1, y = 0;
+    var x = 1, y = 0
     for (var t = 0; t < 24; t++) {
-      RHO_OFFSETS[x + 5 * y] = ((t + 1) * (t + 2) / 2) % 64;
+      RHO_OFFSETS[x + 5 * y] = ((t + 1) * (t + 2) / 2) % 64
 
-      var newX = y % 5;
-      var newY = (2 * x + 3 * y) % 5;
-      x = newX;
-      y = newY;
+      var newX = y % 5
+      var newY = (2 * x + 3 * y) % 5
+      x = newX
+      y = newY
     }
 
     // Compute pi index constants
     for (var x = 0; x < 5; x++) {
       for (var y = 0; y < 5; y++) {
-        PI_INDEXES[x + 5 * y] = y + ((2 * x + 3 * y) % 5) * 5;
+        PI_INDEXES[x + 5 * y] = y + ((2 * x + 3 * y) % 5) * 5
       }
     }
 
     // Compute round constants
-    var LFSR = 0x01;
+    var LFSR = 0x01
     for (var i = 0; i < 24; i++) {
-      var roundConstantMsw = 0;
-      var roundConstantLsw = 0;
+      var roundConstantMsw = 0
+      var roundConstantLsw = 0
 
       for (var j = 0; j < 7; j++) {
         if (LFSR & 0x01) {
-          var bitPosition = (1 << j) - 1;
+          var bitPosition = (1 << j) - 1
           if (bitPosition < 32) {
-            roundConstantLsw ^= 1 << bitPosition;
+            roundConstantLsw ^= 1 << bitPosition
           } else /* if (bitPosition >= 32) */ {
-            roundConstantMsw ^= 1 << (bitPosition - 32);
+            roundConstantMsw ^= 1 << (bitPosition - 32)
           }
         }
 
         // Compute next LFSR
         if (LFSR & 0x80) {
           // Primitive polynomial over GF(2): x^8 + x^6 + x^5 + x^4 + 1
-          LFSR = (LFSR << 1) ^ 0x71;
+          LFSR = (LFSR << 1) ^ 0x71
         } else {
-          LFSR <<= 1;
+          LFSR <<= 1
         }
       }
 
-      ROUND_CONSTANTS[i] = X64Word.create(roundConstantMsw, roundConstantLsw);
+      ROUND_CONSTANTS[i] = X64Word.create(roundConstantMsw, roundConstantLsw)
     }
-  }());
+  }())
 
   // Reusable objects for temporary values
   var T = [];
   (function () {
     for (var i = 0; i < 25; i++) {
-      T[i] = X64Word.create();
+      T[i] = X64Word.create()
     }
-  }());
+  }())
 
   /**
    * SHA-3 hash algorithm.
@@ -2699,37 +2699,37 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
     _doReset: function () {
       var state = this._state = []
       for (var i = 0; i < 25; i++) {
-        state[i] = new X64Word.init();
+        state[i] = new X64Word.init()
       }
 
-      this.blockSize = (1600 - 2 * this.cfg.outputLength) / 32;
+      this.blockSize = (1600 - 2 * this.cfg.outputLength) / 32
     },
 
     _doProcessBlock: function (M, offset) {
       // Shortcuts
-      var state = this._state;
-      var nBlockSizeLanes = this.blockSize / 2;
+      var state = this._state
+      var nBlockSizeLanes = this.blockSize / 2
 
       // Absorb
       for (var i = 0; i < nBlockSizeLanes; i++) {
         // Shortcuts
-        var M2i  = M[offset + 2 * i];
-        var M2i1 = M[offset + 2 * i + 1];
+        var M2i  = M[offset + 2 * i]
+        var M2i1 = M[offset + 2 * i + 1]
 
         // Swap endian
         M2i = (
           (((M2i << 8)  | (M2i >>> 24)) & 0x00ff00ff) |
           (((M2i << 24) | (M2i >>> 8))  & 0xff00ff00)
-        );
+        )
         M2i1 = (
           (((M2i1 << 8)  | (M2i1 >>> 24)) & 0x00ff00ff) |
           (((M2i1 << 24) | (M2i1 >>> 8))  & 0xff00ff00)
-        );
+        )
 
         // Absorb message into state
-        var lane = state[i];
-        lane.high ^= M2i1;
-        lane.low  ^= M2i;
+        var lane = state[i]
+        lane.high ^= M2i1
+        lane.low  ^= M2i
       }
 
       // Rounds
@@ -2737,147 +2737,147 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
         // Theta
         for (var x = 0; x < 5; x++) {
           // Mix column lanes
-          var tMsw = 0, tLsw = 0;
+          var tMsw = 0, tLsw = 0
           for (var y = 0; y < 5; y++) {
-            var lane = state[x + 5 * y];
-            tMsw ^= lane.high;
-            tLsw ^= lane.low;
+            var lane = state[x + 5 * y]
+            tMsw ^= lane.high
+            tLsw ^= lane.low
           }
 
           // Temporary values
-          var Tx = T[x];
-          Tx.high = tMsw;
-          Tx.low  = tLsw;
+          var Tx = T[x]
+          Tx.high = tMsw
+          Tx.low  = tLsw
         }
         for (var x = 0; x < 5; x++) {
           // Shortcuts
-          var Tx4 = T[(x + 4) % 5];
-          var Tx1 = T[(x + 1) % 5];
-          var Tx1Msw = Tx1.high;
-          var Tx1Lsw = Tx1.low;
+          var Tx4 = T[(x + 4) % 5]
+          var Tx1 = T[(x + 1) % 5]
+          var Tx1Msw = Tx1.high
+          var Tx1Lsw = Tx1.low
 
           // Mix surrounding columns
-          var tMsw = Tx4.high ^ ((Tx1Msw << 1) | (Tx1Lsw >>> 31));
-          var tLsw = Tx4.low  ^ ((Tx1Lsw << 1) | (Tx1Msw >>> 31));
+          var tMsw = Tx4.high ^ ((Tx1Msw << 1) | (Tx1Lsw >>> 31))
+          var tLsw = Tx4.low  ^ ((Tx1Lsw << 1) | (Tx1Msw >>> 31))
           for (var y = 0; y < 5; y++) {
-            var lane = state[x + 5 * y];
-            lane.high ^= tMsw;
-            lane.low  ^= tLsw;
+            var lane = state[x + 5 * y]
+            lane.high ^= tMsw
+            lane.low  ^= tLsw
           }
         }
 
         // Rho Pi
         for (var laneIndex = 1; laneIndex < 25; laneIndex++) {
           // Shortcuts
-          var lane = state[laneIndex];
-          var laneMsw = lane.high;
-          var laneLsw = lane.low;
-          var rhoOffset = RHO_OFFSETS[laneIndex];
+          var lane = state[laneIndex]
+          var laneMsw = lane.high
+          var laneLsw = lane.low
+          var rhoOffset = RHO_OFFSETS[laneIndex]
 
           // Rotate lanes
           if (rhoOffset < 32) {
-            var tMsw = (laneMsw << rhoOffset) | (laneLsw >>> (32 - rhoOffset));
-            var tLsw = (laneLsw << rhoOffset) | (laneMsw >>> (32 - rhoOffset));
+            var tMsw = (laneMsw << rhoOffset) | (laneLsw >>> (32 - rhoOffset))
+            var tLsw = (laneLsw << rhoOffset) | (laneMsw >>> (32 - rhoOffset))
           } else /* if (rhoOffset >= 32) */ {
-            var tMsw = (laneLsw << (rhoOffset - 32)) | (laneMsw >>> (64 - rhoOffset));
-            var tLsw = (laneMsw << (rhoOffset - 32)) | (laneLsw >>> (64 - rhoOffset));
+            var tMsw = (laneLsw << (rhoOffset - 32)) | (laneMsw >>> (64 - rhoOffset))
+            var tLsw = (laneMsw << (rhoOffset - 32)) | (laneLsw >>> (64 - rhoOffset))
           }
 
           // Transpose lanes
-          var TPiLane = T[PI_INDEXES[laneIndex]];
-          TPiLane.high = tMsw;
-          TPiLane.low  = tLsw;
+          var TPiLane = T[PI_INDEXES[laneIndex]]
+          TPiLane.high = tMsw
+          TPiLane.low  = tLsw
         }
 
         // Rho pi at x = y = 0
-        var T0 = T[0];
-        var state0 = state[0];
-        T0.high = state0.high;
-        T0.low  = state0.low;
+        var T0 = T[0]
+        var state0 = state[0]
+        T0.high = state0.high
+        T0.low  = state0.low
 
         // Chi
         for (var x = 0; x < 5; x++) {
           for (var y = 0; y < 5; y++) {
             // Shortcuts
-            var laneIndex = x + 5 * y;
-            var lane = state[laneIndex];
-            var TLane = T[laneIndex];
-            var Tx1Lane = T[((x + 1) % 5) + 5 * y];
-            var Tx2Lane = T[((x + 2) % 5) + 5 * y];
+            var laneIndex = x + 5 * y
+            var lane = state[laneIndex]
+            var TLane = T[laneIndex]
+            var Tx1Lane = T[((x + 1) % 5) + 5 * y]
+            var Tx2Lane = T[((x + 2) % 5) + 5 * y]
 
             // Mix rows
-            lane.high = TLane.high ^ (~Tx1Lane.high & Tx2Lane.high);
-            lane.low  = TLane.low  ^ (~Tx1Lane.low  & Tx2Lane.low);
+            lane.high = TLane.high ^ (~Tx1Lane.high & Tx2Lane.high)
+            lane.low  = TLane.low  ^ (~Tx1Lane.low  & Tx2Lane.low)
           }
         }
 
         // Iota
-        var lane = state[0];
-        var roundConstant = ROUND_CONSTANTS[round];
-        lane.high ^= roundConstant.high;
-        lane.low  ^= roundConstant.low;;
+        var lane = state[0]
+        var roundConstant = ROUND_CONSTANTS[round]
+        lane.high ^= roundConstant.high
+        lane.low  ^= roundConstant.low
       }
     },
 
     _doFinalize: function () {
       // Shortcuts
-      var data = this._data;
-      var dataWords = data.words;
-      var nBitsTotal = this._nDataBytes * 8;
-      var nBitsLeft = data.sigBytes * 8;
-      var blockSizeBits = this.blockSize * 32;
+      var data = this._data
+      var dataWords = data.words
+      var nBitsTotal = this._nDataBytes * 8
+      var nBitsLeft = data.sigBytes * 8
+      var blockSizeBits = this.blockSize * 32
 
       // Add padding
-      dataWords[nBitsLeft >>> 5] |= 0x1 << (24 - nBitsLeft % 32);
-      dataWords[((Math.ceil((nBitsLeft + 1) / blockSizeBits) * blockSizeBits) >>> 5) - 1] |= 0x80;
-      data.sigBytes = dataWords.length * 4;
+      dataWords[nBitsLeft >>> 5] |= 0x1 << (24 - nBitsLeft % 32)
+      dataWords[((Math.ceil((nBitsLeft + 1) / blockSizeBits) * blockSizeBits) >>> 5) - 1] |= 0x80
+      data.sigBytes = dataWords.length * 4
 
       // Hash final blocks
-      this._process();
+      this._process()
 
       // Shortcuts
-      var state = this._state;
-      var outputLengthBytes = this.cfg.outputLength / 8;
-      var outputLengthLanes = outputLengthBytes / 8;
+      var state = this._state
+      var outputLengthBytes = this.cfg.outputLength / 8
+      var outputLengthLanes = outputLengthBytes / 8
 
       // Squeeze
-      var hashWords = [];
+      var hashWords = []
       for (var i = 0; i < outputLengthLanes; i++) {
         // Shortcuts
-        var lane = state[i];
-        var laneMsw = lane.high;
-        var laneLsw = lane.low;
+        var lane = state[i]
+        var laneMsw = lane.high
+        var laneLsw = lane.low
 
         // Swap endian
         laneMsw = (
           (((laneMsw << 8)  | (laneMsw >>> 24)) & 0x00ff00ff) |
           (((laneMsw << 24) | (laneMsw >>> 8))  & 0xff00ff00)
-        );
+        )
         laneLsw = (
           (((laneLsw << 8)  | (laneLsw >>> 24)) & 0x00ff00ff) |
           (((laneLsw << 24) | (laneLsw >>> 8))  & 0xff00ff00)
-        );
+        )
 
         // Squeeze state to retrieve hash
-        hashWords.push(laneLsw);
-        hashWords.push(laneMsw);
+        hashWords.push(laneLsw)
+        hashWords.push(laneMsw)
       }
 
       // Return final computed hash
-      return new WordArray.init(hashWords, outputLengthBytes);
+      return new WordArray.init(hashWords, outputLengthBytes)
     },
 
     clone: function () {
-      var clone = Hasher.clone.call(this);
+      var clone = Hasher.clone.call(this)
 
-      var state = clone._state = this._state.slice(0);
+      var state = clone._state = this._state.slice(0)
       for (var i = 0; i < 25; i++) {
-        state[i] = state[i].clone();
+        state[i] = state[i].clone()
       }
 
-      return clone;
+      return clone
     }
-  });
+  })
 
   /**
    * Shortcut function to the hasher's object interface.
@@ -2893,7 +2893,7 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
    *     var hash = CryptoJS.SHA3('message');
    *     var hash = CryptoJS.SHA3(wordArray);
    */
-  C.SHA3 = Hasher._createHelper(SHA3);
+  C.SHA3 = Hasher._createHelper(SHA3)
 
   /**
    * Shortcut function to the HMAC's object interface.
@@ -2909,22 +2909,22 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
    *
    *     var hmac = CryptoJS.HmacSHA3(message, key);
    */
-  C.HmacSHA3 = Hasher._createHmacHelper(SHA3);
+  C.HmacSHA3 = Hasher._createHmacHelper(SHA3)
 }(Math));
 
 
 (function () {
   // Shortcuts
-  var C = CryptoJS;
-  var C_lib = C.lib;
-  var Hasher = C_lib.Hasher;
-  var C_x64 = C.x64;
-  var X64Word = C_x64.Word;
-  var X64WordArray = C_x64.WordArray;
-  var C_algo = C.algo;
+  var C = CryptoJS
+  var C_lib = C.lib
+  var Hasher = C_lib.Hasher
+  var C_x64 = C.x64
+  var X64Word = C_x64.Word
+  var X64WordArray = C_x64.WordArray
+  var C_algo = C.algo
 
   function X64Word_create() {
-    return X64Word.create.apply(X64Word, arguments);
+    return X64Word.create.apply(X64Word, arguments)
   }
 
   // Constants
@@ -2969,15 +2969,15 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
     X64Word_create(0x3c9ebe0a, 0x15c9bebc), X64Word_create(0x431d67c4, 0x9c100d4c),
     X64Word_create(0x4cc5d4be, 0xcb3e42b6), X64Word_create(0x597f299c, 0xfc657e2a),
     X64Word_create(0x5fcb6fab, 0x3ad6faec), X64Word_create(0x6c44198c, 0x4a475817)
-  ];
+  ]
 
   // Reusable objects
   var W = [];
   (function () {
     for (var i = 0; i < 80; i++) {
-      W[i] = X64Word_create();
+      W[i] = X64Word_create()
     }
-  }());
+  }())
 
   /**
    * SHA-512 hash algorithm.
@@ -2989,200 +2989,200 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
         new X64Word.init(0x3c6ef372, 0xfe94f82b), new X64Word.init(0xa54ff53a, 0x5f1d36f1),
         new X64Word.init(0x510e527f, 0xade682d1), new X64Word.init(0x9b05688c, 0x2b3e6c1f),
         new X64Word.init(0x1f83d9ab, 0xfb41bd6b), new X64Word.init(0x5be0cd19, 0x137e2179)
-      ]);
+      ])
     },
 
     _doProcessBlock: function (M, offset) {
       // Shortcuts
-      var H = this._hash.words;
+      var H = this._hash.words
 
-      var H0 = H[0];
-      var H1 = H[1];
-      var H2 = H[2];
-      var H3 = H[3];
-      var H4 = H[4];
-      var H5 = H[5];
-      var H6 = H[6];
-      var H7 = H[7];
+      var H0 = H[0]
+      var H1 = H[1]
+      var H2 = H[2]
+      var H3 = H[3]
+      var H4 = H[4]
+      var H5 = H[5]
+      var H6 = H[6]
+      var H7 = H[7]
 
-      var H0h = H0.high;
-      var H0l = H0.low;
-      var H1h = H1.high;
-      var H1l = H1.low;
-      var H2h = H2.high;
-      var H2l = H2.low;
-      var H3h = H3.high;
-      var H3l = H3.low;
-      var H4h = H4.high;
-      var H4l = H4.low;
-      var H5h = H5.high;
-      var H5l = H5.low;
-      var H6h = H6.high;
-      var H6l = H6.low;
-      var H7h = H7.high;
-      var H7l = H7.low;
+      var H0h = H0.high
+      var H0l = H0.low
+      var H1h = H1.high
+      var H1l = H1.low
+      var H2h = H2.high
+      var H2l = H2.low
+      var H3h = H3.high
+      var H3l = H3.low
+      var H4h = H4.high
+      var H4l = H4.low
+      var H5h = H5.high
+      var H5l = H5.low
+      var H6h = H6.high
+      var H6l = H6.low
+      var H7h = H7.high
+      var H7l = H7.low
 
       // Working variables
-      var ah = H0h;
-      var al = H0l;
-      var bh = H1h;
-      var bl = H1l;
-      var ch = H2h;
-      var cl = H2l;
-      var dh = H3h;
-      var dl = H3l;
-      var eh = H4h;
-      var el = H4l;
-      var fh = H5h;
-      var fl = H5l;
-      var gh = H6h;
-      var gl = H6l;
-      var hh = H7h;
-      var hl = H7l;
+      var ah = H0h
+      var al = H0l
+      var bh = H1h
+      var bl = H1l
+      var ch = H2h
+      var cl = H2l
+      var dh = H3h
+      var dl = H3l
+      var eh = H4h
+      var el = H4l
+      var fh = H5h
+      var fl = H5l
+      var gh = H6h
+      var gl = H6l
+      var hh = H7h
+      var hl = H7l
 
       // Rounds
       for (var i = 0; i < 80; i++) {
         // Shortcut
-        var Wi = W[i];
+        var Wi = W[i]
 
         // Extend message
         if (i < 16) {
-          var Wih = Wi.high = M[offset + i * 2]     | 0;
-          var Wil = Wi.low  = M[offset + i * 2 + 1] | 0;
+          var Wih = Wi.high = M[offset + i * 2]     | 0
+          var Wil = Wi.low  = M[offset + i * 2 + 1] | 0
         } else {
           // Gamma0
-          var gamma0x  = W[i - 15];
-          var gamma0xh = gamma0x.high;
-          var gamma0xl = gamma0x.low;
-          var gamma0h  = ((gamma0xh >>> 1) | (gamma0xl << 31)) ^ ((gamma0xh >>> 8) | (gamma0xl << 24)) ^ (gamma0xh >>> 7);
-          var gamma0l  = ((gamma0xl >>> 1) | (gamma0xh << 31)) ^ ((gamma0xl >>> 8) | (gamma0xh << 24)) ^ ((gamma0xl >>> 7) | (gamma0xh << 25));
+          var gamma0x  = W[i - 15]
+          var gamma0xh = gamma0x.high
+          var gamma0xl = gamma0x.low
+          var gamma0h  = ((gamma0xh >>> 1) | (gamma0xl << 31)) ^ ((gamma0xh >>> 8) | (gamma0xl << 24)) ^ (gamma0xh >>> 7)
+          var gamma0l  = ((gamma0xl >>> 1) | (gamma0xh << 31)) ^ ((gamma0xl >>> 8) | (gamma0xh << 24)) ^ ((gamma0xl >>> 7) | (gamma0xh << 25))
 
           // Gamma1
-          var gamma1x  = W[i - 2];
-          var gamma1xh = gamma1x.high;
-          var gamma1xl = gamma1x.low;
-          var gamma1h  = ((gamma1xh >>> 19) | (gamma1xl << 13)) ^ ((gamma1xh << 3) | (gamma1xl >>> 29)) ^ (gamma1xh >>> 6);
-          var gamma1l  = ((gamma1xl >>> 19) | (gamma1xh << 13)) ^ ((gamma1xl << 3) | (gamma1xh >>> 29)) ^ ((gamma1xl >>> 6) | (gamma1xh << 26));
+          var gamma1x  = W[i - 2]
+          var gamma1xh = gamma1x.high
+          var gamma1xl = gamma1x.low
+          var gamma1h  = ((gamma1xh >>> 19) | (gamma1xl << 13)) ^ ((gamma1xh << 3) | (gamma1xl >>> 29)) ^ (gamma1xh >>> 6)
+          var gamma1l  = ((gamma1xl >>> 19) | (gamma1xh << 13)) ^ ((gamma1xl << 3) | (gamma1xh >>> 29)) ^ ((gamma1xl >>> 6) | (gamma1xh << 26))
 
           // W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16]
-          var Wi7  = W[i - 7];
-          var Wi7h = Wi7.high;
-          var Wi7l = Wi7.low;
+          var Wi7  = W[i - 7]
+          var Wi7h = Wi7.high
+          var Wi7l = Wi7.low
 
-          var Wi16  = W[i - 16];
-          var Wi16h = Wi16.high;
-          var Wi16l = Wi16.low;
+          var Wi16  = W[i - 16]
+          var Wi16h = Wi16.high
+          var Wi16l = Wi16.low
 
-          var Wil = gamma0l + Wi7l;
-          var Wih = gamma0h + Wi7h + ((Wil >>> 0) < (gamma0l >>> 0) ? 1 : 0);
-          var Wil = Wil + gamma1l;
-          var Wih = Wih + gamma1h + ((Wil >>> 0) < (gamma1l >>> 0) ? 1 : 0);
-          var Wil = Wil + Wi16l;
-          var Wih = Wih + Wi16h + ((Wil >>> 0) < (Wi16l >>> 0) ? 1 : 0);
+          var Wil = gamma0l + Wi7l
+          var Wih = gamma0h + Wi7h + ((Wil >>> 0) < (gamma0l >>> 0) ? 1 : 0)
+          var Wil = Wil + gamma1l
+          var Wih = Wih + gamma1h + ((Wil >>> 0) < (gamma1l >>> 0) ? 1 : 0)
+          var Wil = Wil + Wi16l
+          var Wih = Wih + Wi16h + ((Wil >>> 0) < (Wi16l >>> 0) ? 1 : 0)
 
-          Wi.high = Wih;
-          Wi.low  = Wil;
+          Wi.high = Wih
+          Wi.low  = Wil
         }
 
-        var chh  = (eh & fh) ^ (~eh & gh);
-        var chl  = (el & fl) ^ (~el & gl);
-        var majh = (ah & bh) ^ (ah & ch) ^ (bh & ch);
-        var majl = (al & bl) ^ (al & cl) ^ (bl & cl);
+        var chh  = (eh & fh) ^ (~eh & gh)
+        var chl  = (el & fl) ^ (~el & gl)
+        var majh = (ah & bh) ^ (ah & ch) ^ (bh & ch)
+        var majl = (al & bl) ^ (al & cl) ^ (bl & cl)
 
-        var sigma0h = ((ah >>> 28) | (al << 4))  ^ ((ah << 30)  | (al >>> 2)) ^ ((ah << 25) | (al >>> 7));
-        var sigma0l = ((al >>> 28) | (ah << 4))  ^ ((al << 30)  | (ah >>> 2)) ^ ((al << 25) | (ah >>> 7));
-        var sigma1h = ((eh >>> 14) | (el << 18)) ^ ((eh >>> 18) | (el << 14)) ^ ((eh << 23) | (el >>> 9));
-        var sigma1l = ((el >>> 14) | (eh << 18)) ^ ((el >>> 18) | (eh << 14)) ^ ((el << 23) | (eh >>> 9));
+        var sigma0h = ((ah >>> 28) | (al << 4))  ^ ((ah << 30)  | (al >>> 2)) ^ ((ah << 25) | (al >>> 7))
+        var sigma0l = ((al >>> 28) | (ah << 4))  ^ ((al << 30)  | (ah >>> 2)) ^ ((al << 25) | (ah >>> 7))
+        var sigma1h = ((eh >>> 14) | (el << 18)) ^ ((eh >>> 18) | (el << 14)) ^ ((eh << 23) | (el >>> 9))
+        var sigma1l = ((el >>> 14) | (eh << 18)) ^ ((el >>> 18) | (eh << 14)) ^ ((el << 23) | (eh >>> 9))
 
         // t1 = h + sigma1 + ch + K[i] + W[i]
-        var Ki  = K[i];
-        var Kih = Ki.high;
-        var Kil = Ki.low;
+        var Ki  = K[i]
+        var Kih = Ki.high
+        var Kil = Ki.low
 
-        var t1l = hl + sigma1l;
-        var t1h = hh + sigma1h + ((t1l >>> 0) < (hl >>> 0) ? 1 : 0);
-        var t1l = t1l + chl;
-        var t1h = t1h + chh + ((t1l >>> 0) < (chl >>> 0) ? 1 : 0);
-        var t1l = t1l + Kil;
-        var t1h = t1h + Kih + ((t1l >>> 0) < (Kil >>> 0) ? 1 : 0);
-        var t1l = t1l + Wil;
-        var t1h = t1h + Wih + ((t1l >>> 0) < (Wil >>> 0) ? 1 : 0);
+        var t1l = hl + sigma1l
+        var t1h = hh + sigma1h + ((t1l >>> 0) < (hl >>> 0) ? 1 : 0)
+        var t1l = t1l + chl
+        var t1h = t1h + chh + ((t1l >>> 0) < (chl >>> 0) ? 1 : 0)
+        var t1l = t1l + Kil
+        var t1h = t1h + Kih + ((t1l >>> 0) < (Kil >>> 0) ? 1 : 0)
+        var t1l = t1l + Wil
+        var t1h = t1h + Wih + ((t1l >>> 0) < (Wil >>> 0) ? 1 : 0)
 
         // t2 = sigma0 + maj
-        var t2l = sigma0l + majl;
-        var t2h = sigma0h + majh + ((t2l >>> 0) < (sigma0l >>> 0) ? 1 : 0);
+        var t2l = sigma0l + majl
+        var t2h = sigma0h + majh + ((t2l >>> 0) < (sigma0l >>> 0) ? 1 : 0)
 
         // Update working variables
-        hh = gh;
-        hl = gl;
-        gh = fh;
-        gl = fl;
-        fh = eh;
-        fl = el;
-        el = (dl + t1l) | 0;
-        eh = (dh + t1h + ((el >>> 0) < (dl >>> 0) ? 1 : 0)) | 0;
-        dh = ch;
-        dl = cl;
-        ch = bh;
-        cl = bl;
-        bh = ah;
-        bl = al;
-        al = (t1l + t2l) | 0;
-        ah = (t1h + t2h + ((al >>> 0) < (t1l >>> 0) ? 1 : 0)) | 0;
+        hh = gh
+        hl = gl
+        gh = fh
+        gl = fl
+        fh = eh
+        fl = el
+        el = (dl + t1l) | 0
+        eh = (dh + t1h + ((el >>> 0) < (dl >>> 0) ? 1 : 0)) | 0
+        dh = ch
+        dl = cl
+        ch = bh
+        cl = bl
+        bh = ah
+        bl = al
+        al = (t1l + t2l) | 0
+        ah = (t1h + t2h + ((al >>> 0) < (t1l >>> 0) ? 1 : 0)) | 0
       }
 
       // Intermediate hash value
-      H0l = H0.low  = (H0l + al);
-      H0.high = (H0h + ah + ((H0l >>> 0) < (al >>> 0) ? 1 : 0));
-      H1l = H1.low  = (H1l + bl);
-      H1.high = (H1h + bh + ((H1l >>> 0) < (bl >>> 0) ? 1 : 0));
-      H2l = H2.low  = (H2l + cl);
-      H2.high = (H2h + ch + ((H2l >>> 0) < (cl >>> 0) ? 1 : 0));
-      H3l = H3.low  = (H3l + dl);
-      H3.high = (H3h + dh + ((H3l >>> 0) < (dl >>> 0) ? 1 : 0));
-      H4l = H4.low  = (H4l + el);
-      H4.high = (H4h + eh + ((H4l >>> 0) < (el >>> 0) ? 1 : 0));
-      H5l = H5.low  = (H5l + fl);
-      H5.high = (H5h + fh + ((H5l >>> 0) < (fl >>> 0) ? 1 : 0));
-      H6l = H6.low  = (H6l + gl);
-      H6.high = (H6h + gh + ((H6l >>> 0) < (gl >>> 0) ? 1 : 0));
-      H7l = H7.low  = (H7l + hl);
-      H7.high = (H7h + hh + ((H7l >>> 0) < (hl >>> 0) ? 1 : 0));
+      H0l = H0.low  = (H0l + al)
+      H0.high = (H0h + ah + ((H0l >>> 0) < (al >>> 0) ? 1 : 0))
+      H1l = H1.low  = (H1l + bl)
+      H1.high = (H1h + bh + ((H1l >>> 0) < (bl >>> 0) ? 1 : 0))
+      H2l = H2.low  = (H2l + cl)
+      H2.high = (H2h + ch + ((H2l >>> 0) < (cl >>> 0) ? 1 : 0))
+      H3l = H3.low  = (H3l + dl)
+      H3.high = (H3h + dh + ((H3l >>> 0) < (dl >>> 0) ? 1 : 0))
+      H4l = H4.low  = (H4l + el)
+      H4.high = (H4h + eh + ((H4l >>> 0) < (el >>> 0) ? 1 : 0))
+      H5l = H5.low  = (H5l + fl)
+      H5.high = (H5h + fh + ((H5l >>> 0) < (fl >>> 0) ? 1 : 0))
+      H6l = H6.low  = (H6l + gl)
+      H6.high = (H6h + gh + ((H6l >>> 0) < (gl >>> 0) ? 1 : 0))
+      H7l = H7.low  = (H7l + hl)
+      H7.high = (H7h + hh + ((H7l >>> 0) < (hl >>> 0) ? 1 : 0))
     },
 
     _doFinalize: function () {
       // Shortcuts
-      var data = this._data;
-      var dataWords = data.words;
+      var data = this._data
+      var dataWords = data.words
 
-      var nBitsTotal = this._nDataBytes * 8;
-      var nBitsLeft = data.sigBytes * 8;
+      var nBitsTotal = this._nDataBytes * 8
+      var nBitsLeft = data.sigBytes * 8
 
       // Add padding
-      dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
-      dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 30] = Math.floor(nBitsTotal / 0x100000000);
-      dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 31] = nBitsTotal;
-      data.sigBytes = dataWords.length * 4;
+      dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32)
+      dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 30] = Math.floor(nBitsTotal / 0x100000000)
+      dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 31] = nBitsTotal
+      data.sigBytes = dataWords.length * 4
 
       // Hash final blocks
-      this._process();
+      this._process()
 
       // Convert hash to 32-bit word array before returning
-      var hash = this._hash.toX32();
+      var hash = this._hash.toX32()
 
       // Return final computed hash
-      return hash;
+      return hash
     },
 
     clone: function () {
-      var clone = Hasher.clone.call(this);
-      clone._hash = this._hash.clone();
+      var clone = Hasher.clone.call(this)
+      clone._hash = this._hash.clone()
 
-      return clone;
+      return clone
     },
 
     blockSize: 1024/32
-  });
+  })
 
   /**
    * Shortcut function to the hasher's object interface.
@@ -3198,7 +3198,7 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
    *     var hash = CryptoJS.SHA512('message');
    *     var hash = CryptoJS.SHA512(wordArray);
    */
-  C.SHA512 = Hasher._createHelper(SHA512);
+  C.SHA512 = Hasher._createHelper(SHA512)
 
   /**
    * Shortcut function to the HMAC's object interface.
@@ -3214,18 +3214,18 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
    *
    *     var hmac = CryptoJS.HmacSHA512(message, key);
    */
-  C.HmacSHA512 = Hasher._createHmacHelper(SHA512);
+  C.HmacSHA512 = Hasher._createHmacHelper(SHA512)
 }());
 
 
 (function () {
   // Shortcuts
-  var C = CryptoJS;
-  var C_x64 = C.x64;
-  var X64Word = C_x64.Word;
-  var X64WordArray = C_x64.WordArray;
-  var C_algo = C.algo;
-  var SHA512 = C_algo.SHA512;
+  var C = CryptoJS
+  var C_x64 = C.x64
+  var X64Word = C_x64.Word
+  var X64WordArray = C_x64.WordArray
+  var C_algo = C.algo
+  var SHA512 = C_algo.SHA512
 
   /**
    * SHA-384 hash algorithm.
@@ -3237,17 +3237,17 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
         new X64Word.init(0x9159015a, 0x3070dd17), new X64Word.init(0x152fecd8, 0xf70e5939),
         new X64Word.init(0x67332667, 0xffc00b31), new X64Word.init(0x8eb44a87, 0x68581511),
         new X64Word.init(0xdb0c2e0d, 0x64f98fa7), new X64Word.init(0x47b5481d, 0xbefa4fa4)
-      ]);
+      ])
     },
 
     _doFinalize: function () {
-      var hash = SHA512._doFinalize.call(this);
+      var hash = SHA512._doFinalize.call(this)
 
-      hash.sigBytes -= 16;
+      hash.sigBytes -= 16
 
-      return hash;
+      return hash
     }
-  });
+  })
 
   /**
    * Shortcut function to the hasher's object interface.
@@ -3263,7 +3263,7 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
    *     var hash = CryptoJS.SHA384('message');
    *     var hash = CryptoJS.SHA384(wordArray);
    */
-  C.SHA384 = SHA512._createHelper(SHA384);
+  C.SHA384 = SHA512._createHelper(SHA384)
 
   /**
    * Shortcut function to the HMAC's object interface.
@@ -3279,8 +3279,8 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
    *
    *     var hmac = CryptoJS.HmacSHA384(message, key);
    */
-  C.HmacSHA384 = SHA512._createHmacHelper(SHA384);
-}());
+  C.HmacSHA384 = SHA512._createHmacHelper(SHA384)
+}())
 
 
 /**
@@ -3288,16 +3288,16 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
  */
 CryptoJS.lib.Cipher || (function (undefined) {
   // Shortcuts
-  var C = CryptoJS;
-  var C_lib = C.lib;
-  var Base = C_lib.Base;
-  var WordArray = C_lib.WordArray;
-  var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm;
-  var C_enc = C.enc;
-  var Utf8 = C_enc.Utf8;
-  var Base64 = C_enc.Base64;
-  var C_algo = C.algo;
-  var EvpKDF = C_algo.EvpKDF;
+  var C = CryptoJS
+  var C_lib = C.lib
+  var Base = C_lib.Base
+  var WordArray = C_lib.WordArray
+  var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm
+  var C_enc = C.enc
+  var Utf8 = C_enc.Utf8
+  var Base64 = C_enc.Base64
+  var C_algo = C.algo
+  var EvpKDF = C_algo.EvpKDF
 
   /**
    * Abstract base cipher template.
@@ -3330,7 +3330,7 @@ CryptoJS.lib.Cipher || (function (undefined) {
      *     var cipher = CryptoJS.algo.AES.createEncryptor(keyWordArray, { iv: ivWordArray });
      */
     createEncryptor: function (key, cfg) {
-      return this.create(this._ENC_XFORM_MODE, key, cfg);
+      return this.create(this._ENC_XFORM_MODE, key, cfg)
     },
 
     /**
@@ -3348,7 +3348,7 @@ CryptoJS.lib.Cipher || (function (undefined) {
      *     var cipher = CryptoJS.algo.AES.createDecryptor(keyWordArray, { iv: ivWordArray });
      */
     createDecryptor: function (key, cfg) {
-      return this.create(this._DEC_XFORM_MODE, key, cfg);
+      return this.create(this._DEC_XFORM_MODE, key, cfg)
     },
 
     /**
@@ -3364,14 +3364,14 @@ CryptoJS.lib.Cipher || (function (undefined) {
      */
     init: function (xformMode, key, cfg) {
       // Apply config defaults
-      this.cfg = this.cfg.extend(cfg);
+      this.cfg = this.cfg.extend(cfg)
 
       // Store transform mode and key
-      this._xformMode = xformMode;
-      this._key = key;
+      this._xformMode = xformMode
+      this._key = key
 
       // Set initial values
-      this.reset();
+      this.reset()
     },
 
     /**
@@ -3383,10 +3383,10 @@ CryptoJS.lib.Cipher || (function (undefined) {
      */
     reset: function () {
       // Reset data buffer
-      BufferedBlockAlgorithm.reset.call(this);
+      BufferedBlockAlgorithm.reset.call(this)
 
       // Perform concrete-cipher logic
-      this._doReset();
+      this._doReset()
     },
 
     /**
@@ -3403,10 +3403,10 @@ CryptoJS.lib.Cipher || (function (undefined) {
      */
     process: function (dataUpdate) {
       // Append
-      this._append(dataUpdate);
+      this._append(dataUpdate)
 
       // Process available blocks
-      return this._process();
+      return this._process()
     },
 
     /**
@@ -3426,13 +3426,13 @@ CryptoJS.lib.Cipher || (function (undefined) {
     finalize: function (dataUpdate) {
       // Final data update
       if (dataUpdate) {
-        this._append(dataUpdate);
+        this._append(dataUpdate)
       }
 
       // Perform concrete-cipher logic
-      var finalProcessedData = this._doFinalize();
+      var finalProcessedData = this._doFinalize()
 
-      return finalProcessedData;
+      return finalProcessedData
     },
 
     keySize: 128/32,
@@ -3459,25 +3459,25 @@ CryptoJS.lib.Cipher || (function (undefined) {
     _createHelper: (function () {
       function selectCipherStrategy(key) {
         if (typeof key == 'string') {
-          return PasswordBasedCipher;
+          return PasswordBasedCipher
         } else {
-          return SerializableCipher;
+          return SerializableCipher
         }
       }
 
       return function (cipher) {
         return {
           encrypt: function (message, key, cfg) {
-            return selectCipherStrategy(key).encrypt(cipher, message, key, cfg);
+            return selectCipherStrategy(key).encrypt(cipher, message, key, cfg)
           },
 
           decrypt: function (ciphertext, key, cfg) {
-            return selectCipherStrategy(key).decrypt(cipher, ciphertext, key, cfg);
+            return selectCipherStrategy(key).decrypt(cipher, ciphertext, key, cfg)
           }
-        };
-      };
+        }
+      }
     }())
-  });
+  })
 
   /**
    * Abstract base stream cipher template.
@@ -3487,18 +3487,18 @@ CryptoJS.lib.Cipher || (function (undefined) {
   var StreamCipher = C_lib.StreamCipher = Cipher.extend({
     _doFinalize: function () {
       // Process partial blocks
-      var finalProcessedBlocks = this._process(!!'flush');
+      var finalProcessedBlocks = this._process(!!'flush')
 
-      return finalProcessedBlocks;
+      return finalProcessedBlocks
     },
 
     blockSize: 1
-  });
+  })
 
   /**
    * Mode namespace.
    */
-  var C_mode = C.mode = {};
+  var C_mode = C.mode = {}
 
   /**
    * Abstract base block cipher mode template.
@@ -3517,7 +3517,7 @@ CryptoJS.lib.Cipher || (function (undefined) {
      *     var mode = CryptoJS.mode.CBC.createEncryptor(cipher, iv.words);
      */
     createEncryptor: function (cipher, iv) {
-      return this.Encryptor.create(cipher, iv);
+      return this.Encryptor.create(cipher, iv)
     },
 
     /**
@@ -3533,7 +3533,7 @@ CryptoJS.lib.Cipher || (function (undefined) {
      *     var mode = CryptoJS.mode.CBC.createDecryptor(cipher, iv.words);
      */
     createDecryptor: function (cipher, iv) {
-      return this.Decryptor.create(cipher, iv);
+      return this.Decryptor.create(cipher, iv)
     },
 
     /**
@@ -3547,10 +3547,10 @@ CryptoJS.lib.Cipher || (function (undefined) {
      *     var mode = CryptoJS.mode.CBC.Encryptor.create(cipher, iv.words);
      */
     init: function (cipher, iv) {
-      this._cipher = cipher;
-      this._iv = iv;
+      this._cipher = cipher
+      this._iv = iv
     }
-  });
+  })
 
   /**
    * Cipher Block Chaining mode.
@@ -3559,7 +3559,7 @@ CryptoJS.lib.Cipher || (function (undefined) {
     /**
      * Abstract base CBC mode.
      */
-    var CBC = BlockCipherMode.extend();
+    var CBC = BlockCipherMode.extend()
 
     /**
      * CBC encryptor.
@@ -3577,17 +3577,17 @@ CryptoJS.lib.Cipher || (function (undefined) {
        */
       processBlock: function (words, offset) {
         // Shortcuts
-        var cipher = this._cipher;
-        var blockSize = cipher.blockSize;
+        var cipher = this._cipher
+        var blockSize = cipher.blockSize
 
         // XOR and encrypt
-        xorBlock.call(this, words, offset, blockSize);
-        cipher.encryptBlock(words, offset);
+        xorBlock.call(this, words, offset, blockSize)
+        cipher.encryptBlock(words, offset)
 
         // Remember this block to use with next block
-        this._prevBlock = words.slice(offset, offset + blockSize);
+        this._prevBlock = words.slice(offset, offset + blockSize)
       }
-    });
+    })
 
     /**
      * CBC decryptor.
@@ -3605,48 +3605,48 @@ CryptoJS.lib.Cipher || (function (undefined) {
        */
       processBlock: function (words, offset) {
         // Shortcuts
-        var cipher = this._cipher;
-        var blockSize = cipher.blockSize;
+        var cipher = this._cipher
+        var blockSize = cipher.blockSize
 
         // Remember this block to use with next block
-        var thisBlock = words.slice(offset, offset + blockSize);
+        var thisBlock = words.slice(offset, offset + blockSize)
 
         // Decrypt and XOR
-        cipher.decryptBlock(words, offset);
-        xorBlock.call(this, words, offset, blockSize);
+        cipher.decryptBlock(words, offset)
+        xorBlock.call(this, words, offset, blockSize)
 
         // This block becomes the previous block
-        this._prevBlock = thisBlock;
+        this._prevBlock = thisBlock
       }
-    });
+    })
 
     function xorBlock(words, offset, blockSize) {
       // Shortcut
-      var iv = this._iv;
+      var iv = this._iv
 
       // Choose mixing block
       if (iv) {
-        var block = iv;
+        var block = iv
 
         // Remove IV for subsequent blocks
-        this._iv = undefined;
+        this._iv = undefined
       } else {
-        var block = this._prevBlock;
+        var block = this._prevBlock
       }
 
       // XOR blocks
       for (var i = 0; i < blockSize; i++) {
-        words[offset + i] ^= block[i];
+        words[offset + i] ^= block[i]
       }
     }
 
-    return CBC;
-  }());
+    return CBC
+  }())
 
   /**
    * Padding namespace.
    */
-  var C_pad = C.pad = {};
+  var C_pad = C.pad = {}
 
   /**
    * PKCS #5/7 padding strategy.
@@ -3666,23 +3666,23 @@ CryptoJS.lib.Cipher || (function (undefined) {
      */
     pad: function (data, blockSize) {
       // Shortcut
-      var blockSizeBytes = blockSize * 4;
+      var blockSizeBytes = blockSize * 4
 
       // Count padding bytes
-      var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;
+      var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes
 
       // Create padding word
-      var paddingWord = (nPaddingBytes << 24) | (nPaddingBytes << 16) | (nPaddingBytes << 8) | nPaddingBytes;
+      var paddingWord = (nPaddingBytes << 24) | (nPaddingBytes << 16) | (nPaddingBytes << 8) | nPaddingBytes
 
       // Create padding
-      var paddingWords = [];
+      var paddingWords = []
       for (var i = 0; i < nPaddingBytes; i += 4) {
-        paddingWords.push(paddingWord);
+        paddingWords.push(paddingWord)
       }
-      var padding = WordArray.create(paddingWords, nPaddingBytes);
+      var padding = WordArray.create(paddingWords, nPaddingBytes)
 
       // Add padding
-      data.concat(padding);
+      data.concat(padding)
     },
 
     /**
@@ -3698,12 +3698,12 @@ CryptoJS.lib.Cipher || (function (undefined) {
      */
     unpad: function (data) {
       // Get number of padding bytes from last byte
-      var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+      var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff
 
       // Remove padding
-      data.sigBytes -= nPaddingBytes;
+      data.sigBytes -= nPaddingBytes
     }
-  };
+  }
 
   /**
    * Abstract base block cipher template.
@@ -3724,58 +3724,58 @@ CryptoJS.lib.Cipher || (function (undefined) {
 
     reset: function () {
       // Reset cipher
-      Cipher.reset.call(this);
+      Cipher.reset.call(this)
 
       // Shortcuts
-      var cfg = this.cfg;
-      var iv = cfg.iv;
-      var mode = cfg.mode;
+      var cfg = this.cfg
+      var iv = cfg.iv
+      var mode = cfg.mode
 
       // Reset block mode
       if (this._xformMode == this._ENC_XFORM_MODE) {
-        var modeCreator = mode.createEncryptor;
+        var modeCreator = mode.createEncryptor
       } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {
-        var modeCreator = mode.createDecryptor;
+        var modeCreator = mode.createDecryptor
         // Keep at least one block in the buffer for unpadding
-        this._minBufferSize = 1;
+        this._minBufferSize = 1
       }
 
       if (this._mode && this._mode.__creator == modeCreator) {
-        this._mode.init(this, iv && iv.words);
+        this._mode.init(this, iv && iv.words)
       } else {
-        this._mode = modeCreator.call(mode, this, iv && iv.words);
-        this._mode.__creator = modeCreator;
+        this._mode = modeCreator.call(mode, this, iv && iv.words)
+        this._mode.__creator = modeCreator
       }
     },
 
     _doProcessBlock: function (words, offset) {
-      this._mode.processBlock(words, offset);
+      this._mode.processBlock(words, offset)
     },
 
     _doFinalize: function () {
       // Shortcut
-      var padding = this.cfg.padding;
+      var padding = this.cfg.padding
 
       // Finalize
       if (this._xformMode == this._ENC_XFORM_MODE) {
         // Pad data
-        padding.pad(this._data, this.blockSize);
+        padding.pad(this._data, this.blockSize)
 
         // Process final blocks
-        var finalProcessedBlocks = this._process(!!'flush');
+        var finalProcessedBlocks = this._process(!!'flush')
       } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {
         // Process final blocks
-        var finalProcessedBlocks = this._process(!!'flush');
+        var finalProcessedBlocks = this._process(!!'flush')
 
         // Unpad data
-        padding.unpad(finalProcessedBlocks);
+        padding.unpad(finalProcessedBlocks)
       }
 
-      return finalProcessedBlocks;
+      return finalProcessedBlocks
     },
 
     blockSize: 128/32
-  });
+  })
 
   /**
    * A collection of cipher parameters.
@@ -3811,7 +3811,7 @@ CryptoJS.lib.Cipher || (function (undefined) {
 	         *     });
      */
     init: function (cipherParams) {
-      this.mixIn(cipherParams);
+      this.mixIn(cipherParams)
     },
 
     /**
@@ -3830,14 +3830,14 @@ CryptoJS.lib.Cipher || (function (undefined) {
      *     var string = cipherParams.toString(CryptoJS.format.OpenSSL);
      */
     toString: function (formatter) {
-      return (formatter || this.formatter).stringify(this);
+      return (formatter || this.formatter).stringify(this)
     }
-  });
+  })
 
   /**
    * Format namespace.
    */
-  var C_format = C.format = {};
+  var C_format = C.format = {}
 
   /**
    * OpenSSL formatting strategy.
@@ -3858,17 +3858,17 @@ CryptoJS.lib.Cipher || (function (undefined) {
      */
     stringify: function (cipherParams) {
       // Shortcuts
-      var ciphertext = cipherParams.ciphertext;
-      var salt = cipherParams.salt;
+      var ciphertext = cipherParams.ciphertext
+      var salt = cipherParams.salt
 
       // Format
       if (salt) {
-        var wordArray = WordArray.create([0x53616c74, 0x65645f5f]).concat(salt).concat(ciphertext);
+        var wordArray = WordArray.create([0x53616c74, 0x65645f5f]).concat(salt).concat(ciphertext)
       } else {
-        var wordArray = ciphertext;
+        var wordArray = ciphertext
       }
 
-      return wordArray.toString(Base64);
+      return wordArray.toString(Base64)
     },
 
     /**
@@ -3886,24 +3886,24 @@ CryptoJS.lib.Cipher || (function (undefined) {
      */
     parse: function (openSSLStr) {
       // Parse base64
-      var ciphertext = Base64.parse(openSSLStr);
+      var ciphertext = Base64.parse(openSSLStr)
 
       // Shortcut
-      var ciphertextWords = ciphertext.words;
+      var ciphertextWords = ciphertext.words
 
       // Test for salt
       if (ciphertextWords[0] == 0x53616c74 && ciphertextWords[1] == 0x65645f5f) {
         // Extract salt
-        var salt = WordArray.create(ciphertextWords.slice(2, 4));
+        var salt = WordArray.create(ciphertextWords.slice(2, 4))
 
         // Remove salt from ciphertext
-        ciphertextWords.splice(0, 4);
-        ciphertext.sigBytes -= 16;
+        ciphertextWords.splice(0, 4)
+        ciphertext.sigBytes -= 16
       }
 
-      return CipherParams.create({ ciphertext: ciphertext, salt: salt });
+      return CipherParams.create({ ciphertext: ciphertext, salt: salt })
     }
-  };
+  }
 
   /**
    * A cipher wrapper that returns ciphertext as a serializable cipher params object.
@@ -3938,14 +3938,14 @@ CryptoJS.lib.Cipher || (function (undefined) {
      */
     encrypt: function (cipher, message, key, cfg) {
       // Apply config defaults
-      cfg = this.cfg.extend(cfg);
+      cfg = this.cfg.extend(cfg)
 
       // Encrypt
-      var encryptor = cipher.createEncryptor(key, cfg);
-      var ciphertext = encryptor.finalize(message);
+      var encryptor = cipher.createEncryptor(key, cfg)
+      var ciphertext = encryptor.finalize(message)
 
       // Shortcut
-      var cipherCfg = encryptor.cfg;
+      var cipherCfg = encryptor.cfg
 
       // Create and return serializable cipher params
       return CipherParams.create({
@@ -3957,7 +3957,7 @@ CryptoJS.lib.Cipher || (function (undefined) {
         padding: cipherCfg.padding,
         blockSize: cipher.blockSize,
         formatter: cfg.format
-      });
+      })
     },
 
     /**
@@ -3979,15 +3979,15 @@ CryptoJS.lib.Cipher || (function (undefined) {
      */
     decrypt: function (cipher, ciphertext, key, cfg) {
       // Apply config defaults
-      cfg = this.cfg.extend(cfg);
+      cfg = this.cfg.extend(cfg)
 
       // Convert string to CipherParams
-      ciphertext = this._parse(ciphertext, cfg.format);
+      ciphertext = this._parse(ciphertext, cfg.format)
 
       // Decrypt
-      var plaintext = cipher.createDecryptor(key, cfg).finalize(ciphertext.ciphertext);
+      var plaintext = cipher.createDecryptor(key, cfg).finalize(ciphertext.ciphertext)
 
-      return plaintext;
+      return plaintext
     },
 
     /**
@@ -4007,17 +4007,17 @@ CryptoJS.lib.Cipher || (function (undefined) {
      */
     _parse: function (ciphertext, format) {
       if (typeof ciphertext == 'string') {
-        return format.parse(ciphertext, this);
+        return format.parse(ciphertext, this)
       } else {
-        return ciphertext;
+        return ciphertext
       }
     }
-  });
+  })
 
   /**
    * Key derivation function namespace.
    */
-  var C_kdf = C.kdf = {};
+  var C_kdf = C.kdf = {}
 
   /**
    * OpenSSL key derivation function.
@@ -4043,20 +4043,20 @@ CryptoJS.lib.Cipher || (function (undefined) {
     execute: function (password, keySize, ivSize, salt) {
       // Generate random salt
       if (!salt) {
-        salt = WordArray.random(64/8);
+        salt = WordArray.random(64/8)
       }
 
       // Derive key and IV
-      var key = EvpKDF.create({ keySize: keySize + ivSize }).compute(password, salt);
+      var key = EvpKDF.create({ keySize: keySize + ivSize }).compute(password, salt)
 
       // Separate key and IV
-      var iv = WordArray.create(key.words.slice(keySize), ivSize * 4);
-      key.sigBytes = keySize * 4;
+      var iv = WordArray.create(key.words.slice(keySize), ivSize * 4)
+      key.sigBytes = keySize * 4
 
       // Return params
-      return CipherParams.create({ key: key, iv: iv, salt: salt });
+      return CipherParams.create({ key: key, iv: iv, salt: salt })
     }
-  };
+  }
 
   /**
    * A serializable cipher wrapper that derives the key from a password,
@@ -4091,21 +4091,21 @@ CryptoJS.lib.Cipher || (function (undefined) {
      */
     encrypt: function (cipher, message, password, cfg) {
       // Apply config defaults
-      cfg = this.cfg.extend(cfg);
+      cfg = this.cfg.extend(cfg)
 
       // Derive key and other params
-      var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize);
+      var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize)
 
       // Add IV to config
-      cfg.iv = derivedParams.iv;
+      cfg.iv = derivedParams.iv
 
       // Encrypt
-      var ciphertext = SerializableCipher.encrypt.call(this, cipher, message, derivedParams.key, cfg);
+      var ciphertext = SerializableCipher.encrypt.call(this, cipher, message, derivedParams.key, cfg)
 
       // Mix in derived params
-      ciphertext.mixIn(derivedParams);
+      ciphertext.mixIn(derivedParams)
 
-      return ciphertext;
+      return ciphertext
     },
 
     /**
@@ -4127,106 +4127,106 @@ CryptoJS.lib.Cipher || (function (undefined) {
      */
     decrypt: function (cipher, ciphertext, password, cfg) {
       // Apply config defaults
-      cfg = this.cfg.extend(cfg);
+      cfg = this.cfg.extend(cfg)
 
       // Convert string to CipherParams
-      ciphertext = this._parse(ciphertext, cfg.format);
+      ciphertext = this._parse(ciphertext, cfg.format)
 
       // Derive key and other params
-      var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, ciphertext.salt);
+      var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, ciphertext.salt)
 
       // Add IV to config
-      cfg.iv = derivedParams.iv;
+      cfg.iv = derivedParams.iv
 
       // Decrypt
-      var plaintext = SerializableCipher.decrypt.call(this, cipher, ciphertext, derivedParams.key, cfg);
+      var plaintext = SerializableCipher.decrypt.call(this, cipher, ciphertext, derivedParams.key, cfg)
 
-      return plaintext;
+      return plaintext
     }
-  });
-}());
+  })
+}())
 
 
 /**
  * Cipher Feedback block mode.
  */
 CryptoJS.mode.CFB = (function () {
-  var CFB = CryptoJS.lib.BlockCipherMode.extend();
+  var CFB = CryptoJS.lib.BlockCipherMode.extend()
 
   CFB.Encryptor = CFB.extend({
     processBlock: function (words, offset) {
       // Shortcuts
-      var cipher = this._cipher;
-      var blockSize = cipher.blockSize;
+      var cipher = this._cipher
+      var blockSize = cipher.blockSize
 
-      generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);
+      generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher)
 
       // Remember this block to use with next block
-      this._prevBlock = words.slice(offset, offset + blockSize);
+      this._prevBlock = words.slice(offset, offset + blockSize)
     }
-  });
+  })
 
   CFB.Decryptor = CFB.extend({
     processBlock: function (words, offset) {
       // Shortcuts
-      var cipher = this._cipher;
-      var blockSize = cipher.blockSize;
+      var cipher = this._cipher
+      var blockSize = cipher.blockSize
 
       // Remember this block to use with next block
-      var thisBlock = words.slice(offset, offset + blockSize);
+      var thisBlock = words.slice(offset, offset + blockSize)
 
-      generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);
+      generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher)
 
       // This block becomes the previous block
-      this._prevBlock = thisBlock;
+      this._prevBlock = thisBlock
     }
-  });
+  })
 
   function generateKeystreamAndEncrypt(words, offset, blockSize, cipher) {
     // Shortcut
-    var iv = this._iv;
+    var iv = this._iv
 
     // Generate keystream
     if (iv) {
-      var keystream = iv.slice(0);
+      var keystream = iv.slice(0)
 
       // Remove IV for subsequent blocks
-      this._iv = undefined;
+      this._iv = undefined
     } else {
-      var keystream = this._prevBlock;
+      var keystream = this._prevBlock
     }
-    cipher.encryptBlock(keystream, 0);
+    cipher.encryptBlock(keystream, 0)
 
     // Encrypt
     for (var i = 0; i < blockSize; i++) {
-      words[offset + i] ^= keystream[i];
+      words[offset + i] ^= keystream[i]
     }
   }
 
-  return CFB;
-}());
+  return CFB
+}())
 
 
 /**
  * Electronic Codebook block mode.
  */
 CryptoJS.mode.ECB = (function () {
-  var ECB = CryptoJS.lib.BlockCipherMode.extend();
+  var ECB = CryptoJS.lib.BlockCipherMode.extend()
 
   ECB.Encryptor = ECB.extend({
     processBlock: function (words, offset) {
-      this._cipher.encryptBlock(words, offset);
+      this._cipher.encryptBlock(words, offset)
     }
-  });
+  })
 
   ECB.Decryptor = ECB.extend({
     processBlock: function (words, offset) {
-      this._cipher.decryptBlock(words, offset);
+      this._cipher.decryptBlock(words, offset)
     }
-  });
+  })
 
-  return ECB;
-}());
+  return ECB
+}())
 
 
 /**
@@ -4235,29 +4235,29 @@ CryptoJS.mode.ECB = (function () {
 CryptoJS.pad.AnsiX923 = {
   pad: function (data, blockSize) {
     // Shortcuts
-    var dataSigBytes = data.sigBytes;
-    var blockSizeBytes = blockSize * 4;
+    var dataSigBytes = data.sigBytes
+    var blockSizeBytes = blockSize * 4
 
     // Count padding bytes
-    var nPaddingBytes = blockSizeBytes - dataSigBytes % blockSizeBytes;
+    var nPaddingBytes = blockSizeBytes - dataSigBytes % blockSizeBytes
 
     // Compute last byte position
-    var lastBytePos = dataSigBytes + nPaddingBytes - 1;
+    var lastBytePos = dataSigBytes + nPaddingBytes - 1
 
     // Pad
-    data.clamp();
-    data.words[lastBytePos >>> 2] |= nPaddingBytes << (24 - (lastBytePos % 4) * 8);
-    data.sigBytes += nPaddingBytes;
+    data.clamp()
+    data.words[lastBytePos >>> 2] |= nPaddingBytes << (24 - (lastBytePos % 4) * 8)
+    data.sigBytes += nPaddingBytes
   },
 
   unpad: function (data) {
     // Get number of padding bytes from last byte
-    var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+    var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff
 
     // Remove padding
-    data.sigBytes -= nPaddingBytes;
+    data.sigBytes -= nPaddingBytes
   }
-};
+}
 
 
 /**
@@ -4266,24 +4266,24 @@ CryptoJS.pad.AnsiX923 = {
 CryptoJS.pad.Iso10126 = {
   pad: function (data, blockSize) {
     // Shortcut
-    var blockSizeBytes = blockSize * 4;
+    var blockSizeBytes = blockSize * 4
 
     // Count padding bytes
-    var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;
+    var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes
 
     // Pad
     data.concat(CryptoJS.lib.WordArray.random(nPaddingBytes - 1)).
-    concat(CryptoJS.lib.WordArray.create([nPaddingBytes << 24], 1));
+    concat(CryptoJS.lib.WordArray.create([nPaddingBytes << 24], 1))
   },
 
   unpad: function (data) {
     // Get number of padding bytes from last byte
-    var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+    var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff
 
     // Remove padding
-    data.sigBytes -= nPaddingBytes;
+    data.sigBytes -= nPaddingBytes
   }
-};
+}
 
 
 /**
@@ -4292,56 +4292,56 @@ CryptoJS.pad.Iso10126 = {
 CryptoJS.pad.Iso97971 = {
   pad: function (data, blockSize) {
     // Add 0x80 byte
-    data.concat(CryptoJS.lib.WordArray.create([0x80000000], 1));
+    data.concat(CryptoJS.lib.WordArray.create([0x80000000], 1))
 
     // Zero pad the rest
-    CryptoJS.pad.ZeroPadding.pad(data, blockSize);
+    CryptoJS.pad.ZeroPadding.pad(data, blockSize)
   },
 
   unpad: function (data) {
     // Remove zero padding
-    CryptoJS.pad.ZeroPadding.unpad(data);
+    CryptoJS.pad.ZeroPadding.unpad(data)
 
     // Remove one more byte -- the 0x80 byte
-    data.sigBytes--;
+    data.sigBytes--
   }
-};
+}
 
 
 /**
  * Output Feedback block mode.
  */
 CryptoJS.mode.OFB = (function () {
-  var OFB = CryptoJS.lib.BlockCipherMode.extend();
+  var OFB = CryptoJS.lib.BlockCipherMode.extend()
 
   var Encryptor = OFB.Encryptor = OFB.extend({
     processBlock: function (words, offset) {
       // Shortcuts
       var cipher = this._cipher
-      var blockSize = cipher.blockSize;
-      var iv = this._iv;
-      var keystream = this._keystream;
+      var blockSize = cipher.blockSize
+      var iv = this._iv
+      var keystream = this._keystream
 
       // Generate keystream
       if (iv) {
-        keystream = this._keystream = iv.slice(0);
+        keystream = this._keystream = iv.slice(0)
 
         // Remove IV for subsequent blocks
-        this._iv = undefined;
+        this._iv = undefined
       }
-      cipher.encryptBlock(keystream, 0);
+      cipher.encryptBlock(keystream, 0)
 
       // Encrypt
       for (var i = 0; i < blockSize; i++) {
-        words[offset + i] ^= keystream[i];
+        words[offset + i] ^= keystream[i]
       }
     }
-  });
+  })
 
-  OFB.Decryptor = Encryptor;
+  OFB.Decryptor = Encryptor
 
-  return OFB;
-}());
+  return OFB
+}())
 
 
 /**
@@ -4358,12 +4358,12 @@ CryptoJS.pad.NoPadding = {
 
 (function (undefined) {
   // Shortcuts
-  var C = CryptoJS;
-  var C_lib = C.lib;
-  var CipherParams = C_lib.CipherParams;
-  var C_enc = C.enc;
-  var Hex = C_enc.Hex;
-  var C_format = C.format;
+  var C = CryptoJS
+  var C_lib = C.lib
+  var CipherParams = C_lib.CipherParams
+  var C_enc = C.enc
+  var Hex = C_enc.Hex
+  var C_format = C.format
 
   var HexFormatter = C_format.Hex = {
     /**
@@ -4380,7 +4380,7 @@ CryptoJS.pad.NoPadding = {
      *     var hexString = CryptoJS.format.Hex.stringify(cipherParams);
      */
     stringify: function (cipherParams) {
-      return cipherParams.ciphertext.toString(Hex);
+      return cipherParams.ciphertext.toString(Hex)
     },
 
     /**
@@ -4397,85 +4397,85 @@ CryptoJS.pad.NoPadding = {
      *     var cipherParams = CryptoJS.format.Hex.parse(hexString);
      */
     parse: function (input) {
-      var ciphertext = Hex.parse(input);
-      return CipherParams.create({ ciphertext: ciphertext });
+      var ciphertext = Hex.parse(input)
+      return CipherParams.create({ ciphertext: ciphertext })
     }
-  };
+  }
 }());
 
 
 (function () {
   // Shortcuts
-  var C = CryptoJS;
-  var C_lib = C.lib;
-  var BlockCipher = C_lib.BlockCipher;
-  var C_algo = C.algo;
+  var C = CryptoJS
+  var C_lib = C.lib
+  var BlockCipher = C_lib.BlockCipher
+  var C_algo = C.algo
 
   // Lookup tables
-  var SBOX = [];
-  var INV_SBOX = [];
-  var SUB_MIX_0 = [];
-  var SUB_MIX_1 = [];
-  var SUB_MIX_2 = [];
-  var SUB_MIX_3 = [];
-  var INV_SUB_MIX_0 = [];
-  var INV_SUB_MIX_1 = [];
-  var INV_SUB_MIX_2 = [];
+  var SBOX = []
+  var INV_SBOX = []
+  var SUB_MIX_0 = []
+  var SUB_MIX_1 = []
+  var SUB_MIX_2 = []
+  var SUB_MIX_3 = []
+  var INV_SUB_MIX_0 = []
+  var INV_SUB_MIX_1 = []
+  var INV_SUB_MIX_2 = []
   var INV_SUB_MIX_3 = [];
 
   // Compute lookup tables
   (function () {
     // Compute double table
-    var d = [];
+    var d = []
     for (var i = 0; i < 256; i++) {
       if (i < 128) {
-        d[i] = i << 1;
+        d[i] = i << 1
       } else {
-        d[i] = (i << 1) ^ 0x11b;
+        d[i] = (i << 1) ^ 0x11b
       }
     }
 
     // Walk GF(2^8)
-    var x = 0;
-    var xi = 0;
+    var x = 0
+    var xi = 0
     for (var i = 0; i < 256; i++) {
       // Compute sbox
-      var sx = xi ^ (xi << 1) ^ (xi << 2) ^ (xi << 3) ^ (xi << 4);
-      sx = (sx >>> 8) ^ (sx & 0xff) ^ 0x63;
-      SBOX[x] = sx;
-      INV_SBOX[sx] = x;
+      var sx = xi ^ (xi << 1) ^ (xi << 2) ^ (xi << 3) ^ (xi << 4)
+      sx = (sx >>> 8) ^ (sx & 0xff) ^ 0x63
+      SBOX[x] = sx
+      INV_SBOX[sx] = x
 
       // Compute multiplication
-      var x2 = d[x];
-      var x4 = d[x2];
-      var x8 = d[x4];
+      var x2 = d[x]
+      var x4 = d[x2]
+      var x8 = d[x4]
 
       // Compute sub bytes, mix columns tables
-      var t = (d[sx] * 0x101) ^ (sx * 0x1010100);
-      SUB_MIX_0[x] = (t << 24) | (t >>> 8);
-      SUB_MIX_1[x] = (t << 16) | (t >>> 16);
-      SUB_MIX_2[x] = (t << 8)  | (t >>> 24);
-      SUB_MIX_3[x] = t;
+      var t = (d[sx] * 0x101) ^ (sx * 0x1010100)
+      SUB_MIX_0[x] = (t << 24) | (t >>> 8)
+      SUB_MIX_1[x] = (t << 16) | (t >>> 16)
+      SUB_MIX_2[x] = (t << 8)  | (t >>> 24)
+      SUB_MIX_3[x] = t
 
       // Compute inv sub bytes, inv mix columns tables
-      var t = (x8 * 0x1010101) ^ (x4 * 0x10001) ^ (x2 * 0x101) ^ (x * 0x1010100);
-      INV_SUB_MIX_0[sx] = (t << 24) | (t >>> 8);
-      INV_SUB_MIX_1[sx] = (t << 16) | (t >>> 16);
-      INV_SUB_MIX_2[sx] = (t << 8)  | (t >>> 24);
-      INV_SUB_MIX_3[sx] = t;
+      var t = (x8 * 0x1010101) ^ (x4 * 0x10001) ^ (x2 * 0x101) ^ (x * 0x1010100)
+      INV_SUB_MIX_0[sx] = (t << 24) | (t >>> 8)
+      INV_SUB_MIX_1[sx] = (t << 16) | (t >>> 16)
+      INV_SUB_MIX_2[sx] = (t << 8)  | (t >>> 24)
+      INV_SUB_MIX_3[sx] = t
 
       // Compute next counter
       if (!x) {
-        x = xi = 1;
+        x = xi = 1
       } else {
-        x = x2 ^ d[d[d[x8 ^ x2]]];
-        xi ^= d[d[xi]];
+        x = x2 ^ d[d[d[x8 ^ x2]]]
+        xi ^= d[d[xi]]
       }
     }
-  }());
+  }())
 
   // Precomputed Rcon lookup
-  var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];
+  var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36]
 
   /**
    * AES block cipher algorithm.
@@ -4484,127 +4484,127 @@ CryptoJS.pad.NoPadding = {
     _doReset: function () {
       // Skip reset of nRounds has been set before and key did not change
       if (this._nRounds && this._keyPriorReset === this._key) {
-        return;
+        return
       }
 
       // Shortcuts
-      var key = this._keyPriorReset = this._key;
-      var keyWords = key.words;
-      var keySize = key.sigBytes / 4;
+      var key = this._keyPriorReset = this._key
+      var keyWords = key.words
+      var keySize = key.sigBytes / 4
 
       // Compute number of rounds
-      var nRounds = this._nRounds = keySize + 6;
+      var nRounds = this._nRounds = keySize + 6
 
       // Compute number of key schedule rows
-      var ksRows = (nRounds + 1) * 4;
+      var ksRows = (nRounds + 1) * 4
 
       // Compute key schedule
-      var keySchedule = this._keySchedule = [];
+      var keySchedule = this._keySchedule = []
       for (var ksRow = 0; ksRow < ksRows; ksRow++) {
         if (ksRow < keySize) {
-          keySchedule[ksRow] = keyWords[ksRow];
+          keySchedule[ksRow] = keyWords[ksRow]
         } else {
-          var t = keySchedule[ksRow - 1];
+          var t = keySchedule[ksRow - 1]
 
           if (!(ksRow % keySize)) {
             // Rot word
-            t = (t << 8) | (t >>> 24);
+            t = (t << 8) | (t >>> 24)
 
             // Sub word
-            t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
+            t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff]
 
             // Mix Rcon
-            t ^= RCON[(ksRow / keySize) | 0] << 24;
+            t ^= RCON[(ksRow / keySize) | 0] << 24
           } else if (keySize > 6 && ksRow % keySize == 4) {
             // Sub word
-            t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
+            t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff]
           }
 
-          keySchedule[ksRow] = keySchedule[ksRow - keySize] ^ t;
+          keySchedule[ksRow] = keySchedule[ksRow - keySize] ^ t
         }
       }
 
       // Compute inv key schedule
-      var invKeySchedule = this._invKeySchedule = [];
+      var invKeySchedule = this._invKeySchedule = []
       for (var invKsRow = 0; invKsRow < ksRows; invKsRow++) {
-        var ksRow = ksRows - invKsRow;
+        var ksRow = ksRows - invKsRow
 
         if (invKsRow % 4) {
-          var t = keySchedule[ksRow];
+          var t = keySchedule[ksRow]
         } else {
-          var t = keySchedule[ksRow - 4];
+          var t = keySchedule[ksRow - 4]
         }
 
         if (invKsRow < 4 || ksRow <= 4) {
-          invKeySchedule[invKsRow] = t;
+          invKeySchedule[invKsRow] = t
         } else {
           invKeySchedule[invKsRow] = INV_SUB_MIX_0[SBOX[t >>> 24]] ^ INV_SUB_MIX_1[SBOX[(t >>> 16) & 0xff]] ^
-            INV_SUB_MIX_2[SBOX[(t >>> 8) & 0xff]] ^ INV_SUB_MIX_3[SBOX[t & 0xff]];
+            INV_SUB_MIX_2[SBOX[(t >>> 8) & 0xff]] ^ INV_SUB_MIX_3[SBOX[t & 0xff]]
         }
       }
     },
 
     encryptBlock: function (M, offset) {
-      this._doCryptBlock(M, offset, this._keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX);
+      this._doCryptBlock(M, offset, this._keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX)
     },
 
     decryptBlock: function (M, offset) {
       // Swap 2nd and 4th rows
-      var t = M[offset + 1];
-      M[offset + 1] = M[offset + 3];
-      M[offset + 3] = t;
+      var t = M[offset + 1]
+      M[offset + 1] = M[offset + 3]
+      M[offset + 3] = t
 
-      this._doCryptBlock(M, offset, this._invKeySchedule, INV_SUB_MIX_0, INV_SUB_MIX_1, INV_SUB_MIX_2, INV_SUB_MIX_3, INV_SBOX);
+      this._doCryptBlock(M, offset, this._invKeySchedule, INV_SUB_MIX_0, INV_SUB_MIX_1, INV_SUB_MIX_2, INV_SUB_MIX_3, INV_SBOX)
 
       // Inv swap 2nd and 4th rows
-      var t = M[offset + 1];
-      M[offset + 1] = M[offset + 3];
-      M[offset + 3] = t;
+      var t = M[offset + 1]
+      M[offset + 1] = M[offset + 3]
+      M[offset + 3] = t
     },
 
     _doCryptBlock: function (M, offset, keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX) {
       // Shortcut
-      var nRounds = this._nRounds;
+      var nRounds = this._nRounds
 
       // Get input, add round key
-      var s0 = M[offset]     ^ keySchedule[0];
-      var s1 = M[offset + 1] ^ keySchedule[1];
-      var s2 = M[offset + 2] ^ keySchedule[2];
-      var s3 = M[offset + 3] ^ keySchedule[3];
+      var s0 = M[offset]     ^ keySchedule[0]
+      var s1 = M[offset + 1] ^ keySchedule[1]
+      var s2 = M[offset + 2] ^ keySchedule[2]
+      var s3 = M[offset + 3] ^ keySchedule[3]
 
       // Key schedule row counter
-      var ksRow = 4;
+      var ksRow = 4
 
       // Rounds
       for (var round = 1; round < nRounds; round++) {
         // Shift rows, sub bytes, mix columns, add round key
-        var t0 = SUB_MIX_0[s0 >>> 24] ^ SUB_MIX_1[(s1 >>> 16) & 0xff] ^ SUB_MIX_2[(s2 >>> 8) & 0xff] ^ SUB_MIX_3[s3 & 0xff] ^ keySchedule[ksRow++];
-        var t1 = SUB_MIX_0[s1 >>> 24] ^ SUB_MIX_1[(s2 >>> 16) & 0xff] ^ SUB_MIX_2[(s3 >>> 8) & 0xff] ^ SUB_MIX_3[s0 & 0xff] ^ keySchedule[ksRow++];
-        var t2 = SUB_MIX_0[s2 >>> 24] ^ SUB_MIX_1[(s3 >>> 16) & 0xff] ^ SUB_MIX_2[(s0 >>> 8) & 0xff] ^ SUB_MIX_3[s1 & 0xff] ^ keySchedule[ksRow++];
-        var t3 = SUB_MIX_0[s3 >>> 24] ^ SUB_MIX_1[(s0 >>> 16) & 0xff] ^ SUB_MIX_2[(s1 >>> 8) & 0xff] ^ SUB_MIX_3[s2 & 0xff] ^ keySchedule[ksRow++];
+        var t0 = SUB_MIX_0[s0 >>> 24] ^ SUB_MIX_1[(s1 >>> 16) & 0xff] ^ SUB_MIX_2[(s2 >>> 8) & 0xff] ^ SUB_MIX_3[s3 & 0xff] ^ keySchedule[ksRow++]
+        var t1 = SUB_MIX_0[s1 >>> 24] ^ SUB_MIX_1[(s2 >>> 16) & 0xff] ^ SUB_MIX_2[(s3 >>> 8) & 0xff] ^ SUB_MIX_3[s0 & 0xff] ^ keySchedule[ksRow++]
+        var t2 = SUB_MIX_0[s2 >>> 24] ^ SUB_MIX_1[(s3 >>> 16) & 0xff] ^ SUB_MIX_2[(s0 >>> 8) & 0xff] ^ SUB_MIX_3[s1 & 0xff] ^ keySchedule[ksRow++]
+        var t3 = SUB_MIX_0[s3 >>> 24] ^ SUB_MIX_1[(s0 >>> 16) & 0xff] ^ SUB_MIX_2[(s1 >>> 8) & 0xff] ^ SUB_MIX_3[s2 & 0xff] ^ keySchedule[ksRow++]
 
         // Update state
-        s0 = t0;
-        s1 = t1;
-        s2 = t2;
-        s3 = t3;
+        s0 = t0
+        s1 = t1
+        s2 = t2
+        s3 = t3
       }
 
       // Shift rows, sub bytes, add round key
-      var t0 = ((SBOX[s0 >>> 24] << 24) | (SBOX[(s1 >>> 16) & 0xff] << 16) | (SBOX[(s2 >>> 8) & 0xff] << 8) | SBOX[s3 & 0xff]) ^ keySchedule[ksRow++];
-      var t1 = ((SBOX[s1 >>> 24] << 24) | (SBOX[(s2 >>> 16) & 0xff] << 16) | (SBOX[(s3 >>> 8) & 0xff] << 8) | SBOX[s0 & 0xff]) ^ keySchedule[ksRow++];
-      var t2 = ((SBOX[s2 >>> 24] << 24) | (SBOX[(s3 >>> 16) & 0xff] << 16) | (SBOX[(s0 >>> 8) & 0xff] << 8) | SBOX[s1 & 0xff]) ^ keySchedule[ksRow++];
-      var t3 = ((SBOX[s3 >>> 24] << 24) | (SBOX[(s0 >>> 16) & 0xff] << 16) | (SBOX[(s1 >>> 8) & 0xff] << 8) | SBOX[s2 & 0xff]) ^ keySchedule[ksRow++];
+      var t0 = ((SBOX[s0 >>> 24] << 24) | (SBOX[(s1 >>> 16) & 0xff] << 16) | (SBOX[(s2 >>> 8) & 0xff] << 8) | SBOX[s3 & 0xff]) ^ keySchedule[ksRow++]
+      var t1 = ((SBOX[s1 >>> 24] << 24) | (SBOX[(s2 >>> 16) & 0xff] << 16) | (SBOX[(s3 >>> 8) & 0xff] << 8) | SBOX[s0 & 0xff]) ^ keySchedule[ksRow++]
+      var t2 = ((SBOX[s2 >>> 24] << 24) | (SBOX[(s3 >>> 16) & 0xff] << 16) | (SBOX[(s0 >>> 8) & 0xff] << 8) | SBOX[s1 & 0xff]) ^ keySchedule[ksRow++]
+      var t3 = ((SBOX[s3 >>> 24] << 24) | (SBOX[(s0 >>> 16) & 0xff] << 16) | (SBOX[(s1 >>> 8) & 0xff] << 8) | SBOX[s2 & 0xff]) ^ keySchedule[ksRow++]
 
       // Set output
-      M[offset]     = t0;
-      M[offset + 1] = t1;
-      M[offset + 2] = t2;
-      M[offset + 3] = t3;
+      M[offset]     = t0
+      M[offset + 1] = t1
+      M[offset + 2] = t2
+      M[offset + 3] = t3
     },
 
     keySize: 256/32
-  });
+  })
 
   /**
    * Shortcut functions to the cipher's object interface.
@@ -4614,17 +4614,17 @@ CryptoJS.pad.NoPadding = {
    *     var ciphertext = CryptoJS.AES.encrypt(message, key, cfg);
    *     var plaintext  = CryptoJS.AES.decrypt(ciphertext, key, cfg);
    */
-  C.AES = BlockCipher._createHelper(AES);
+  C.AES = BlockCipher._createHelper(AES)
 }());
 
 
 (function () {
   // Shortcuts
-  var C = CryptoJS;
-  var C_lib = C.lib;
-  var WordArray = C_lib.WordArray;
-  var BlockCipher = C_lib.BlockCipher;
-  var C_algo = C.algo;
+  var C = CryptoJS
+  var C_lib = C.lib
+  var WordArray = C_lib.WordArray
+  var BlockCipher = C_lib.BlockCipher
+  var C_algo = C.algo
 
   // Permuted Choice 1 constants
   var PC1 = [
@@ -4635,7 +4635,7 @@ CryptoJS.pad.NoPadding = {
     31, 23, 15, 7,  62, 54, 46, 38,
     30, 22, 14, 6,  61, 53, 45, 37,
     29, 21, 13, 5,  28, 20, 12, 4
-  ];
+  ]
 
   // Permuted Choice 2 constants
   var PC2 = [
@@ -4647,10 +4647,10 @@ CryptoJS.pad.NoPadding = {
     30, 40, 51, 45, 33, 48,
     44, 49, 39, 56, 34, 53,
     46, 42, 50, 36, 29, 32
-  ];
+  ]
 
   // Cumulative bit shift constants
-  var BIT_SHIFTS = [1,  2,  4,  6,  8,  10, 12, 14, 15, 17, 19, 21, 23, 25, 27, 28];
+  var BIT_SHIFTS = [1,  2,  4,  6,  8,  10, 12, 14, 15, 17, 19, 21, 23, 25, 27, 28]
 
   // SBOXes and round permutation constants
   var SBOX_P = [
@@ -5182,13 +5182,13 @@ CryptoJS.pad.NoPadding = {
       0x8000001e: 0x20020,
       0x8000001f: 0x8020800
     }
-  ];
+  ]
 
   // Masks that select the SBOX input
   var SBOX_MASK = [
     0xf8000001, 0x1f800000, 0x01f80000, 0x001f8000,
     0x0001f800, 0x00001f80, 0x000001f8, 0x8000001f
-  ];
+  ]
 
   /**
    * DES block cipher algorithm.
@@ -5196,102 +5196,102 @@ CryptoJS.pad.NoPadding = {
   var DES = C_algo.DES = BlockCipher.extend({
     _doReset: function () {
       // Shortcuts
-      var key = this._key;
-      var keyWords = key.words;
+      var key = this._key
+      var keyWords = key.words
 
       // Select 56 bits according to PC1
-      var keyBits = [];
+      var keyBits = []
       for (var i = 0; i < 56; i++) {
-        var keyBitPos = PC1[i] - 1;
-        keyBits[i] = (keyWords[keyBitPos >>> 5] >>> (31 - keyBitPos % 32)) & 1;
+        var keyBitPos = PC1[i] - 1
+        keyBits[i] = (keyWords[keyBitPos >>> 5] >>> (31 - keyBitPos % 32)) & 1
       }
 
       // Assemble 16 subkeys
-      var subKeys = this._subKeys = [];
+      var subKeys = this._subKeys = []
       for (var nSubKey = 0; nSubKey < 16; nSubKey++) {
         // Create subkey
-        var subKey = subKeys[nSubKey] = [];
+        var subKey = subKeys[nSubKey] = []
 
         // Shortcut
-        var bitShift = BIT_SHIFTS[nSubKey];
+        var bitShift = BIT_SHIFTS[nSubKey]
 
         // Select 48 bits according to PC2
         for (var i = 0; i < 24; i++) {
           // Select from the left 28 key bits
-          subKey[(i / 6) | 0] |= keyBits[((PC2[i] - 1) + bitShift) % 28] << (31 - i % 6);
+          subKey[(i / 6) | 0] |= keyBits[((PC2[i] - 1) + bitShift) % 28] << (31 - i % 6)
 
           // Select from the right 28 key bits
-          subKey[4 + ((i / 6) | 0)] |= keyBits[28 + (((PC2[i + 24] - 1) + bitShift) % 28)] << (31 - i % 6);
+          subKey[4 + ((i / 6) | 0)] |= keyBits[28 + (((PC2[i + 24] - 1) + bitShift) % 28)] << (31 - i % 6)
         }
 
         // Since each subkey is applied to an expanded 32-bit input,
         // the subkey can be broken into 8 values scaled to 32-bits,
         // which allows the key to be used without expansion
-        subKey[0] = (subKey[0] << 1) | (subKey[0] >>> 31);
+        subKey[0] = (subKey[0] << 1) | (subKey[0] >>> 31)
         for (var i = 1; i < 7; i++) {
-          subKey[i] = subKey[i] >>> ((i - 1) * 4 + 3);
+          subKey[i] = subKey[i] >>> ((i - 1) * 4 + 3)
         }
-        subKey[7] = (subKey[7] << 5) | (subKey[7] >>> 27);
+        subKey[7] = (subKey[7] << 5) | (subKey[7] >>> 27)
       }
 
       // Compute inverse subkeys
-      var invSubKeys = this._invSubKeys = [];
+      var invSubKeys = this._invSubKeys = []
       for (var i = 0; i < 16; i++) {
-        invSubKeys[i] = subKeys[15 - i];
+        invSubKeys[i] = subKeys[15 - i]
       }
     },
 
     encryptBlock: function (M, offset) {
-      this._doCryptBlock(M, offset, this._subKeys);
+      this._doCryptBlock(M, offset, this._subKeys)
     },
 
     decryptBlock: function (M, offset) {
-      this._doCryptBlock(M, offset, this._invSubKeys);
+      this._doCryptBlock(M, offset, this._invSubKeys)
     },
 
     _doCryptBlock: function (M, offset, subKeys) {
       // Get input
-      this._lBlock = M[offset];
-      this._rBlock = M[offset + 1];
+      this._lBlock = M[offset]
+      this._rBlock = M[offset + 1]
 
       // Initial permutation
-      exchangeLR.call(this, 4,  0x0f0f0f0f);
-      exchangeLR.call(this, 16, 0x0000ffff);
-      exchangeRL.call(this, 2,  0x33333333);
-      exchangeRL.call(this, 8,  0x00ff00ff);
-      exchangeLR.call(this, 1,  0x55555555);
+      exchangeLR.call(this, 4,  0x0f0f0f0f)
+      exchangeLR.call(this, 16, 0x0000ffff)
+      exchangeRL.call(this, 2,  0x33333333)
+      exchangeRL.call(this, 8,  0x00ff00ff)
+      exchangeLR.call(this, 1,  0x55555555)
 
       // Rounds
       for (var round = 0; round < 16; round++) {
         // Shortcuts
-        var subKey = subKeys[round];
-        var lBlock = this._lBlock;
-        var rBlock = this._rBlock;
+        var subKey = subKeys[round]
+        var lBlock = this._lBlock
+        var rBlock = this._rBlock
 
         // Feistel function
-        var f = 0;
+        var f = 0
         for (var i = 0; i < 8; i++) {
-          f |= SBOX_P[i][((rBlock ^ subKey[i]) & SBOX_MASK[i]) >>> 0];
+          f |= SBOX_P[i][((rBlock ^ subKey[i]) & SBOX_MASK[i]) >>> 0]
         }
-        this._lBlock = rBlock;
-        this._rBlock = lBlock ^ f;
+        this._lBlock = rBlock
+        this._rBlock = lBlock ^ f
       }
 
       // Undo swap from last round
-      var t = this._lBlock;
-      this._lBlock = this._rBlock;
-      this._rBlock = t;
+      var t = this._lBlock
+      this._lBlock = this._rBlock
+      this._rBlock = t
 
       // Final permutation
-      exchangeLR.call(this, 1,  0x55555555);
-      exchangeRL.call(this, 8,  0x00ff00ff);
-      exchangeRL.call(this, 2,  0x33333333);
-      exchangeLR.call(this, 16, 0x0000ffff);
-      exchangeLR.call(this, 4,  0x0f0f0f0f);
+      exchangeLR.call(this, 1,  0x55555555)
+      exchangeRL.call(this, 8,  0x00ff00ff)
+      exchangeRL.call(this, 2,  0x33333333)
+      exchangeLR.call(this, 16, 0x0000ffff)
+      exchangeLR.call(this, 4,  0x0f0f0f0f)
 
       // Set output
-      M[offset] = this._lBlock;
-      M[offset + 1] = this._rBlock;
+      M[offset] = this._lBlock
+      M[offset + 1] = this._rBlock
     },
 
     keySize: 64/32,
@@ -5299,19 +5299,19 @@ CryptoJS.pad.NoPadding = {
     ivSize: 64/32,
 
     blockSize: 64/32
-  });
+  })
 
   // Swap bits across the left and right words
   function exchangeLR(offset, mask) {
-    var t = ((this._lBlock >>> offset) ^ this._rBlock) & mask;
-    this._rBlock ^= t;
-    this._lBlock ^= t << offset;
+    var t = ((this._lBlock >>> offset) ^ this._rBlock) & mask
+    this._rBlock ^= t
+    this._lBlock ^= t << offset
   }
 
   function exchangeRL(offset, mask) {
-    var t = ((this._rBlock >>> offset) ^ this._lBlock) & mask;
-    this._lBlock ^= t;
-    this._rBlock ^= t << offset;
+    var t = ((this._rBlock >>> offset) ^ this._lBlock) & mask
+    this._lBlock ^= t
+    this._rBlock ^= t << offset
   }
 
   /**
@@ -5322,7 +5322,7 @@ CryptoJS.pad.NoPadding = {
    *     var ciphertext = CryptoJS.DES.encrypt(message, key, cfg);
    *     var plaintext  = CryptoJS.DES.decrypt(ciphertext, key, cfg);
    */
-  C.DES = BlockCipher._createHelper(DES);
+  C.DES = BlockCipher._createHelper(DES)
 
   /**
    * Triple-DES block cipher algorithm.
@@ -5330,25 +5330,25 @@ CryptoJS.pad.NoPadding = {
   var TripleDES = C_algo.TripleDES = BlockCipher.extend({
     _doReset: function () {
       // Shortcuts
-      var key = this._key;
-      var keyWords = key.words;
+      var key = this._key
+      var keyWords = key.words
 
       // Create DES instances
-      this._des1 = DES.createEncryptor(WordArray.create(keyWords.slice(0, 2)));
-      this._des2 = DES.createEncryptor(WordArray.create(keyWords.slice(2, 4)));
-      this._des3 = DES.createEncryptor(WordArray.create(keyWords.slice(4, 6)));
+      this._des1 = DES.createEncryptor(WordArray.create(keyWords.slice(0, 2)))
+      this._des2 = DES.createEncryptor(WordArray.create(keyWords.slice(2, 4)))
+      this._des3 = DES.createEncryptor(WordArray.create(keyWords.slice(4, 6)))
     },
 
     encryptBlock: function (M, offset) {
-      this._des1.encryptBlock(M, offset);
-      this._des2.decryptBlock(M, offset);
-      this._des3.encryptBlock(M, offset);
+      this._des1.encryptBlock(M, offset)
+      this._des2.decryptBlock(M, offset)
+      this._des3.encryptBlock(M, offset)
     },
 
     decryptBlock: function (M, offset) {
-      this._des3.decryptBlock(M, offset);
-      this._des2.encryptBlock(M, offset);
-      this._des1.decryptBlock(M, offset);
+      this._des3.decryptBlock(M, offset)
+      this._des2.encryptBlock(M, offset)
+      this._des1.decryptBlock(M, offset)
     },
 
     keySize: 192/32,
@@ -5356,7 +5356,7 @@ CryptoJS.pad.NoPadding = {
     ivSize: 64/32,
 
     blockSize: 64/32
-  });
+  })
 
   /**
    * Shortcut functions to the cipher's object interface.
@@ -5366,16 +5366,16 @@ CryptoJS.pad.NoPadding = {
    *     var ciphertext = CryptoJS.TripleDES.encrypt(message, key, cfg);
    *     var plaintext  = CryptoJS.TripleDES.decrypt(ciphertext, key, cfg);
    */
-  C.TripleDES = BlockCipher._createHelper(TripleDES);
+  C.TripleDES = BlockCipher._createHelper(TripleDES)
 }());
 
 
 (function () {
   // Shortcuts
-  var C = CryptoJS;
-  var C_lib = C.lib;
-  var StreamCipher = C_lib.StreamCipher;
-  var C_algo = C.algo;
+  var C = CryptoJS
+  var C_lib = C.lib
+  var StreamCipher = C_lib.StreamCipher
+  var C_algo = C.algo
 
   /**
    * RC4 stream cipher algorithm.
@@ -5383,67 +5383,67 @@ CryptoJS.pad.NoPadding = {
   var RC4 = C_algo.RC4 = StreamCipher.extend({
     _doReset: function () {
       // Shortcuts
-      var key = this._key;
-      var keyWords = key.words;
-      var keySigBytes = key.sigBytes;
+      var key = this._key
+      var keyWords = key.words
+      var keySigBytes = key.sigBytes
 
       // Init sbox
-      var S = this._S = [];
+      var S = this._S = []
       for (var i = 0; i < 256; i++) {
-        S[i] = i;
+        S[i] = i
       }
 
       // Key setup
       for (var i = 0, j = 0; i < 256; i++) {
-        var keyByteIndex = i % keySigBytes;
-        var keyByte = (keyWords[keyByteIndex >>> 2] >>> (24 - (keyByteIndex % 4) * 8)) & 0xff;
+        var keyByteIndex = i % keySigBytes
+        var keyByte = (keyWords[keyByteIndex >>> 2] >>> (24 - (keyByteIndex % 4) * 8)) & 0xff
 
-        j = (j + S[i] + keyByte) % 256;
+        j = (j + S[i] + keyByte) % 256
 
         // Swap
-        var t = S[i];
-        S[i] = S[j];
-        S[j] = t;
+        var t = S[i]
+        S[i] = S[j]
+        S[j] = t
       }
 
       // Counters
-      this._i = this._j = 0;
+      this._i = this._j = 0
     },
 
     _doProcessBlock: function (M, offset) {
-      M[offset] ^= generateKeystreamWord.call(this);
+      M[offset] ^= generateKeystreamWord.call(this)
     },
 
     keySize: 256/32,
 
     ivSize: 0
-  });
+  })
 
   function generateKeystreamWord() {
     // Shortcuts
-    var S = this._S;
-    var i = this._i;
-    var j = this._j;
+    var S = this._S
+    var i = this._i
+    var j = this._j
 
     // Generate keystream word
-    var keystreamWord = 0;
+    var keystreamWord = 0
     for (var n = 0; n < 4; n++) {
-      i = (i + 1) % 256;
-      j = (j + S[i]) % 256;
+      i = (i + 1) % 256
+      j = (j + S[i]) % 256
 
       // Swap
-      var t = S[i];
-      S[i] = S[j];
-      S[j] = t;
+      var t = S[i]
+      S[i] = S[j]
+      S[j] = t
 
-      keystreamWord |= S[(S[i] + S[j]) % 256] << (24 - n * 8);
+      keystreamWord |= S[(S[i] + S[j]) % 256] << (24 - n * 8)
     }
 
     // Update counters
-    this._i = i;
-    this._j = j;
+    this._i = i
+    this._j = j
 
-    return keystreamWord;
+    return keystreamWord
   }
 
   /**
@@ -5454,7 +5454,7 @@ CryptoJS.pad.NoPadding = {
    *     var ciphertext = CryptoJS.RC4.encrypt(message, key, cfg);
    *     var plaintext  = CryptoJS.RC4.decrypt(ciphertext, key, cfg);
    */
-  C.RC4 = StreamCipher._createHelper(RC4);
+  C.RC4 = StreamCipher._createHelper(RC4)
 
   /**
    * Modified RC4 stream cipher algorithm.
@@ -5470,14 +5470,14 @@ CryptoJS.pad.NoPadding = {
     }),
 
     _doReset: function () {
-      RC4._doReset.call(this);
+      RC4._doReset.call(this)
 
       // Drop
       for (var i = this.cfg.drop; i > 0; i--) {
-        generateKeystreamWord.call(this);
+        generateKeystreamWord.call(this)
       }
     }
-  });
+  })
 
   /**
    * Shortcut functions to the cipher's object interface.
@@ -5487,8 +5487,8 @@ CryptoJS.pad.NoPadding = {
    *     var ciphertext = CryptoJS.RC4Drop.encrypt(message, key, cfg);
    *     var plaintext  = CryptoJS.RC4Drop.decrypt(ciphertext, key, cfg);
    */
-  C.RC4Drop = StreamCipher._createHelper(RC4Drop);
-}());
+  C.RC4Drop = StreamCipher._createHelper(RC4Drop)
+}())
 
 
 /** @preserve
@@ -5497,50 +5497,50 @@ CryptoJS.pad.NoPadding = {
  * Jan Hruby jhruby.web@gmail.com
  */
 CryptoJS.mode.CTRGladman = (function () {
-  var CTRGladman = CryptoJS.lib.BlockCipherMode.extend();
+  var CTRGladman = CryptoJS.lib.BlockCipherMode.extend()
 
   function incWord(word)
   {
     if (((word >> 24) & 0xff) === 0xff) { //overflow
-      var b1 = (word >> 16)&0xff;
-      var b2 = (word >> 8)&0xff;
-      var b3 = word & 0xff;
+      var b1 = (word >> 16)&0xff
+      var b2 = (word >> 8)&0xff
+      var b3 = word & 0xff
 
       if (b1 === 0xff) // overflow b1
       {
-        b1 = 0;
+        b1 = 0
         if (b2 === 0xff)
         {
-          b2 = 0;
+          b2 = 0
           if (b3 === 0xff)
           {
-            b3 = 0;
+            b3 = 0
           }
           else
           {
-            ++b3;
+            ++b3
           }
         }
         else
         {
-          ++b2;
+          ++b2
         }
       }
       else
       {
-        ++b1;
+        ++b1
       }
 
-      word = 0;
-      word += (b1 << 16);
-      word += (b2 << 8);
-      word += b3;
+      word = 0
+      word += (b1 << 16)
+      word += (b2 << 8)
+      word += b3
     }
     else
     {
-      word += (0x01 << 24);
+      word += (0x01 << 24)
     }
-    return word;
+    return word
   }
 
   function incCounter(counter)
@@ -5548,42 +5548,42 @@ CryptoJS.mode.CTRGladman = (function () {
     if ((counter[0] = incWord(counter[0])) === 0)
     {
       // encr_data in fileenc.c from  Dr Brian Gladman's counts only with DWORD j < 8
-      counter[1] = incWord(counter[1]);
+      counter[1] = incWord(counter[1])
     }
-    return counter;
+    return counter
   }
 
   var Encryptor = CTRGladman.Encryptor = CTRGladman.extend({
     processBlock: function (words, offset) {
       // Shortcuts
       var cipher = this._cipher
-      var blockSize = cipher.blockSize;
-      var iv = this._iv;
-      var counter = this._counter;
+      var blockSize = cipher.blockSize
+      var iv = this._iv
+      var counter = this._counter
 
       // Generate keystream
       if (iv) {
-        counter = this._counter = iv.slice(0);
+        counter = this._counter = iv.slice(0)
 
         // Remove IV for subsequent blocks
-        this._iv = undefined;
+        this._iv = undefined
       }
 
-      incCounter(counter);
+      incCounter(counter)
 
-      var keystream = counter.slice(0);
-      cipher.encryptBlock(keystream, 0);
+      var keystream = counter.slice(0)
+      cipher.encryptBlock(keystream, 0)
 
       // Encrypt
       for (var i = 0; i < blockSize; i++) {
-        words[offset + i] ^= keystream[i];
+        words[offset + i] ^= keystream[i]
       }
     }
-  });
+  })
 
-  CTRGladman.Decryptor = Encryptor;
+  CTRGladman.Decryptor = Encryptor
 
-  return CTRGladman;
+  return CTRGladman
 }());
 
 
@@ -5591,15 +5591,15 @@ CryptoJS.mode.CTRGladman = (function () {
 
 (function () {
   // Shortcuts
-  var C = CryptoJS;
-  var C_lib = C.lib;
-  var StreamCipher = C_lib.StreamCipher;
-  var C_algo = C.algo;
+  var C = CryptoJS
+  var C_lib = C.lib
+  var StreamCipher = C_lib.StreamCipher
+  var C_algo = C.algo
 
   // Reusable objects
-  var S  = [];
-  var C_ = [];
-  var G  = [];
+  var S  = []
+  var C_ = []
+  var G  = []
 
   /**
    * Rabbit stream cipher algorithm
@@ -5607,13 +5607,13 @@ CryptoJS.mode.CTRGladman = (function () {
   var Rabbit = C_algo.Rabbit = StreamCipher.extend({
     _doReset: function () {
       // Shortcuts
-      var K = this._key.words;
-      var iv = this.cfg.iv;
+      var K = this._key.words
+      var iv = this.cfg.iv
 
       // Swap endian
       for (var i = 0; i < 4; i++) {
         K[i] = (((K[i] << 8)  | (K[i] >>> 24)) & 0x00ff00ff) |
-          (((K[i] << 24) | (K[i] >>> 8))  & 0xff00ff00);
+          (((K[i] << 24) | (K[i] >>> 8))  & 0xff00ff00)
       }
 
       // Generate initial state values
@@ -5622,7 +5622,7 @@ CryptoJS.mode.CTRGladman = (function () {
         K[1], (K[0] << 16) | (K[3] >>> 16),
         K[2], (K[1] << 16) | (K[0] >>> 16),
         K[3], (K[2] << 16) | (K[1] >>> 16)
-      ];
+      ]
 
       // Generate initial counter values
       var C = this._C = [
@@ -5630,125 +5630,125 @@ CryptoJS.mode.CTRGladman = (function () {
         (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),
         (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),
         (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)
-      ];
+      ]
 
       // Carry bit
-      this._b = 0;
+      this._b = 0
 
       // Iterate the system four times
       for (var i = 0; i < 4; i++) {
-        nextState.call(this);
+        nextState.call(this)
       }
 
       // Modify the counters
       for (var i = 0; i < 8; i++) {
-        C[i] ^= X[(i + 4) & 7];
+        C[i] ^= X[(i + 4) & 7]
       }
 
       // IV setup
       if (iv) {
         // Shortcuts
-        var IV = iv.words;
-        var IV_0 = IV[0];
-        var IV_1 = IV[1];
+        var IV = iv.words
+        var IV_0 = IV[0]
+        var IV_1 = IV[1]
 
         // Generate four subvectors
-        var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);
-        var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);
-        var i1 = (i0 >>> 16) | (i2 & 0xffff0000);
-        var i3 = (i2 << 16)  | (i0 & 0x0000ffff);
+        var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00)
+        var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00)
+        var i1 = (i0 >>> 16) | (i2 & 0xffff0000)
+        var i3 = (i2 << 16)  | (i0 & 0x0000ffff)
 
         // Modify counter values
-        C[0] ^= i0;
-        C[1] ^= i1;
-        C[2] ^= i2;
-        C[3] ^= i3;
-        C[4] ^= i0;
-        C[5] ^= i1;
-        C[6] ^= i2;
-        C[7] ^= i3;
+        C[0] ^= i0
+        C[1] ^= i1
+        C[2] ^= i2
+        C[3] ^= i3
+        C[4] ^= i0
+        C[5] ^= i1
+        C[6] ^= i2
+        C[7] ^= i3
 
         // Iterate the system four times
         for (var i = 0; i < 4; i++) {
-          nextState.call(this);
+          nextState.call(this)
         }
       }
     },
 
     _doProcessBlock: function (M, offset) {
       // Shortcut
-      var X = this._X;
+      var X = this._X
 
       // Iterate the system
-      nextState.call(this);
+      nextState.call(this)
 
       // Generate four keystream words
-      S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);
-      S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);
-      S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);
-      S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);
+      S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16)
+      S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16)
+      S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16)
+      S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16)
 
       for (var i = 0; i < 4; i++) {
         // Swap endian
         S[i] = (((S[i] << 8)  | (S[i] >>> 24)) & 0x00ff00ff) |
-          (((S[i] << 24) | (S[i] >>> 8))  & 0xff00ff00);
+          (((S[i] << 24) | (S[i] >>> 8))  & 0xff00ff00)
 
         // Encrypt
-        M[offset + i] ^= S[i];
+        M[offset + i] ^= S[i]
       }
     },
 
     blockSize: 128/32,
 
     ivSize: 64/32
-  });
+  })
 
   function nextState() {
     // Shortcuts
-    var X = this._X;
-    var C = this._C;
+    var X = this._X
+    var C = this._C
 
     // Save old counter values
     for (var i = 0; i < 8; i++) {
-      C_[i] = C[i];
+      C_[i] = C[i]
     }
 
     // Calculate new counter values
-    C[0] = (C[0] + 0x4d34d34d + this._b) | 0;
-    C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;
-    C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;
-    C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;
-    C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;
-    C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;
-    C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;
-    C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;
-    this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;
+    C[0] = (C[0] + 0x4d34d34d + this._b) | 0
+    C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0
+    C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0
+    C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0
+    C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0
+    C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0
+    C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0
+    C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0
+    this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0
 
     // Calculate the g-values
     for (var i = 0; i < 8; i++) {
-      var gx = X[i] + C[i];
+      var gx = X[i] + C[i]
 
       // Construct high and low argument for squaring
-      var ga = gx & 0xffff;
-      var gb = gx >>> 16;
+      var ga = gx & 0xffff
+      var gb = gx >>> 16
 
       // Calculate high and low result of squaring
-      var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;
-      var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);
+      var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb
+      var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0)
 
       // High XOR low
-      G[i] = gh ^ gl;
+      G[i] = gh ^ gl
     }
 
     // Calculate new state values
-    X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;
-    X[1] = (G[1] + ((G[0] << 8)  | (G[0] >>> 24)) + G[7]) | 0;
-    X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;
-    X[3] = (G[3] + ((G[2] << 8)  | (G[2] >>> 24)) + G[1]) | 0;
-    X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;
-    X[5] = (G[5] + ((G[4] << 8)  | (G[4] >>> 24)) + G[3]) | 0;
-    X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;
-    X[7] = (G[7] + ((G[6] << 8)  | (G[6] >>> 24)) + G[5]) | 0;
+    X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0
+    X[1] = (G[1] + ((G[0] << 8)  | (G[0] >>> 24)) + G[7]) | 0
+    X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0
+    X[3] = (G[3] + ((G[2] << 8)  | (G[2] >>> 24)) + G[1]) | 0
+    X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0
+    X[5] = (G[5] + ((G[4] << 8)  | (G[4] >>> 24)) + G[3]) | 0
+    X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0
+    X[7] = (G[7] + ((G[6] << 8)  | (G[6] >>> 24)) + G[5]) | 0
   }
 
   /**
@@ -5759,61 +5759,61 @@ CryptoJS.mode.CTRGladman = (function () {
    *     var ciphertext = CryptoJS.Rabbit.encrypt(message, key, cfg);
    *     var plaintext  = CryptoJS.Rabbit.decrypt(ciphertext, key, cfg);
    */
-  C.Rabbit = StreamCipher._createHelper(Rabbit);
-}());
+  C.Rabbit = StreamCipher._createHelper(Rabbit)
+}())
 
 
 /**
  * Counter block mode.
  */
 CryptoJS.mode.CTR = (function () {
-  var CTR = CryptoJS.lib.BlockCipherMode.extend();
+  var CTR = CryptoJS.lib.BlockCipherMode.extend()
 
   var Encryptor = CTR.Encryptor = CTR.extend({
     processBlock: function (words, offset) {
       // Shortcuts
       var cipher = this._cipher
-      var blockSize = cipher.blockSize;
-      var iv = this._iv;
-      var counter = this._counter;
+      var blockSize = cipher.blockSize
+      var iv = this._iv
+      var counter = this._counter
 
       // Generate keystream
       if (iv) {
-        counter = this._counter = iv.slice(0);
+        counter = this._counter = iv.slice(0)
 
         // Remove IV for subsequent blocks
-        this._iv = undefined;
+        this._iv = undefined
       }
-      var keystream = counter.slice(0);
-      cipher.encryptBlock(keystream, 0);
+      var keystream = counter.slice(0)
+      cipher.encryptBlock(keystream, 0)
 
       // Increment counter
       counter[blockSize - 1] = (counter[blockSize - 1] + 1) | 0
 
       // Encrypt
       for (var i = 0; i < blockSize; i++) {
-        words[offset + i] ^= keystream[i];
+        words[offset + i] ^= keystream[i]
       }
     }
-  });
+  })
 
-  CTR.Decryptor = Encryptor;
+  CTR.Decryptor = Encryptor
 
-  return CTR;
+  return CTR
 }());
 
 
 (function () {
   // Shortcuts
-  var C = CryptoJS;
-  var C_lib = C.lib;
-  var StreamCipher = C_lib.StreamCipher;
-  var C_algo = C.algo;
+  var C = CryptoJS
+  var C_lib = C.lib
+  var StreamCipher = C_lib.StreamCipher
+  var C_algo = C.algo
 
   // Reusable objects
-  var S  = [];
-  var C_ = [];
-  var G  = [];
+  var S  = []
+  var C_ = []
+  var G  = []
 
   /**
    * Rabbit stream cipher algorithm.
@@ -5825,8 +5825,8 @@ CryptoJS.mode.CTR = (function () {
   var RabbitLegacy = C_algo.RabbitLegacy = StreamCipher.extend({
     _doReset: function () {
       // Shortcuts
-      var K = this._key.words;
-      var iv = this.cfg.iv;
+      var K = this._key.words
+      var iv = this.cfg.iv
 
       // Generate initial state values
       var X = this._X = [
@@ -5834,7 +5834,7 @@ CryptoJS.mode.CTR = (function () {
         K[1], (K[0] << 16) | (K[3] >>> 16),
         K[2], (K[1] << 16) | (K[0] >>> 16),
         K[3], (K[2] << 16) | (K[1] >>> 16)
-      ];
+      ]
 
       // Generate initial counter values
       var C = this._C = [
@@ -5842,125 +5842,125 @@ CryptoJS.mode.CTR = (function () {
         (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),
         (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),
         (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)
-      ];
+      ]
 
       // Carry bit
-      this._b = 0;
+      this._b = 0
 
       // Iterate the system four times
       for (var i = 0; i < 4; i++) {
-        nextState.call(this);
+        nextState.call(this)
       }
 
       // Modify the counters
       for (var i = 0; i < 8; i++) {
-        C[i] ^= X[(i + 4) & 7];
+        C[i] ^= X[(i + 4) & 7]
       }
 
       // IV setup
       if (iv) {
         // Shortcuts
-        var IV = iv.words;
-        var IV_0 = IV[0];
-        var IV_1 = IV[1];
+        var IV = iv.words
+        var IV_0 = IV[0]
+        var IV_1 = IV[1]
 
         // Generate four subvectors
-        var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);
-        var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);
-        var i1 = (i0 >>> 16) | (i2 & 0xffff0000);
-        var i3 = (i2 << 16)  | (i0 & 0x0000ffff);
+        var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00)
+        var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00)
+        var i1 = (i0 >>> 16) | (i2 & 0xffff0000)
+        var i3 = (i2 << 16)  | (i0 & 0x0000ffff)
 
         // Modify counter values
-        C[0] ^= i0;
-        C[1] ^= i1;
-        C[2] ^= i2;
-        C[3] ^= i3;
-        C[4] ^= i0;
-        C[5] ^= i1;
-        C[6] ^= i2;
-        C[7] ^= i3;
+        C[0] ^= i0
+        C[1] ^= i1
+        C[2] ^= i2
+        C[3] ^= i3
+        C[4] ^= i0
+        C[5] ^= i1
+        C[6] ^= i2
+        C[7] ^= i3
 
         // Iterate the system four times
         for (var i = 0; i < 4; i++) {
-          nextState.call(this);
+          nextState.call(this)
         }
       }
     },
 
     _doProcessBlock: function (M, offset) {
       // Shortcut
-      var X = this._X;
+      var X = this._X
 
       // Iterate the system
-      nextState.call(this);
+      nextState.call(this)
 
       // Generate four keystream words
-      S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);
-      S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);
-      S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);
-      S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);
+      S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16)
+      S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16)
+      S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16)
+      S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16)
 
       for (var i = 0; i < 4; i++) {
         // Swap endian
         S[i] = (((S[i] << 8)  | (S[i] >>> 24)) & 0x00ff00ff) |
-          (((S[i] << 24) | (S[i] >>> 8))  & 0xff00ff00);
+          (((S[i] << 24) | (S[i] >>> 8))  & 0xff00ff00)
 
         // Encrypt
-        M[offset + i] ^= S[i];
+        M[offset + i] ^= S[i]
       }
     },
 
     blockSize: 128/32,
 
     ivSize: 64/32
-  });
+  })
 
   function nextState() {
     // Shortcuts
-    var X = this._X;
-    var C = this._C;
+    var X = this._X
+    var C = this._C
 
     // Save old counter values
     for (var i = 0; i < 8; i++) {
-      C_[i] = C[i];
+      C_[i] = C[i]
     }
 
     // Calculate new counter values
-    C[0] = (C[0] + 0x4d34d34d + this._b) | 0;
-    C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;
-    C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;
-    C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;
-    C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;
-    C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;
-    C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;
-    C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;
-    this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;
+    C[0] = (C[0] + 0x4d34d34d + this._b) | 0
+    C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0
+    C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0
+    C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0
+    C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0
+    C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0
+    C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0
+    C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0
+    this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0
 
     // Calculate the g-values
     for (var i = 0; i < 8; i++) {
-      var gx = X[i] + C[i];
+      var gx = X[i] + C[i]
 
       // Construct high and low argument for squaring
-      var ga = gx & 0xffff;
-      var gb = gx >>> 16;
+      var ga = gx & 0xffff
+      var gb = gx >>> 16
 
       // Calculate high and low result of squaring
-      var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;
-      var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);
+      var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb
+      var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0)
 
       // High XOR low
-      G[i] = gh ^ gl;
+      G[i] = gh ^ gl
     }
 
     // Calculate new state values
-    X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;
-    X[1] = (G[1] + ((G[0] << 8)  | (G[0] >>> 24)) + G[7]) | 0;
-    X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;
-    X[3] = (G[3] + ((G[2] << 8)  | (G[2] >>> 24)) + G[1]) | 0;
-    X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;
-    X[5] = (G[5] + ((G[4] << 8)  | (G[4] >>> 24)) + G[3]) | 0;
-    X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;
-    X[7] = (G[7] + ((G[6] << 8)  | (G[6] >>> 24)) + G[5]) | 0;
+    X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0
+    X[1] = (G[1] + ((G[0] << 8)  | (G[0] >>> 24)) + G[7]) | 0
+    X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0
+    X[3] = (G[3] + ((G[2] << 8)  | (G[2] >>> 24)) + G[1]) | 0
+    X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0
+    X[5] = (G[5] + ((G[4] << 8)  | (G[4] >>> 24)) + G[3]) | 0
+    X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0
+    X[7] = (G[7] + ((G[6] << 8)  | (G[6] >>> 24)) + G[5]) | 0
   }
 
   /**
@@ -5971,8 +5971,8 @@ CryptoJS.mode.CTR = (function () {
    *     var ciphertext = CryptoJS.RabbitLegacy.encrypt(message, key, cfg);
    *     var plaintext  = CryptoJS.RabbitLegacy.decrypt(ciphertext, key, cfg);
    */
-  C.RabbitLegacy = StreamCipher._createHelper(RabbitLegacy);
-}());
+  C.RabbitLegacy = StreamCipher._createHelper(RabbitLegacy)
+}())
 
 
 /**
@@ -5981,23 +5981,23 @@ CryptoJS.mode.CTR = (function () {
 CryptoJS.pad.ZeroPadding = {
   pad: function (data, blockSize) {
     // Shortcut
-    var blockSizeBytes = blockSize * 4;
+    var blockSizeBytes = blockSize * 4
 
     // Pad
-    data.clamp();
-    data.sigBytes += blockSizeBytes - ((data.sigBytes % blockSizeBytes) || blockSizeBytes);
+    data.clamp()
+    data.sigBytes += blockSizeBytes - ((data.sigBytes % blockSizeBytes) || blockSizeBytes)
   },
 
   unpad: function (data) {
     // Shortcut
-    var dataWords = data.words;
+    var dataWords = data.words
 
     // Unpad
-    var i = data.sigBytes - 1;
+    var i = data.sigBytes - 1
     while (!((dataWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff)) {
-      i--;
+      i--
     }
-    data.sigBytes = i + 1;
+    data.sigBytes = i + 1
   }
-};
+}
 
diff --git a/src/utils/filter.js b/src/utils/filter.js
index 7974e8b..50571ff 100644
--- a/src/utils/filter.js
+++ b/src/utils/filter.js
@@ -1,5 +1,5 @@
-import Vue from "vue";
-import * as dayjs from "dayjs";
+import Vue from 'vue'
+import * as dayjs from 'dayjs'
 
 Vue.filter('NumberFormat', function (value) {
   if (!value) {
@@ -20,7 +20,7 @@ Vue.filter('moment', function(dataStr, pattern = 'YYYY-MM-DD HH:mm:ss') {
 /** 字符串超长截取省略号显示 */
 Vue.filter('ellipsis', function (value, vlength = 25) {
   if(!value){
-    return "";
+    return ''
   }
   if (value.length > vlength) {
     return value.slice(0, vlength) + '...'
diff --git a/src/utils/hasPermission.js b/src/utils/hasPermission.js
index 8a492d9..d70591f 100644
--- a/src/utils/hasPermission.js
+++ b/src/utils/hasPermission.js
@@ -1,4 +1,4 @@
-import { USER_AUTH,SYS_BUTTON_AUTH } from "@/store/mutation-types"
+import { USER_AUTH,SYS_BUTTON_AUTH } from '@/store/mutation-types'
 
 const hasPermission = {
     install (Vue, options) {
@@ -8,126 +8,126 @@ const hasPermission = {
                 //console.time()
                 //节点权限处理，如果命中则不进行全局权限处理
                 if(!filterNodePermission(el, binding, vnode)){
-                  filterGlobalPermission(el, binding, vnode);
+                  filterGlobalPermission(el, binding, vnode)
                 }
             }
-          });
+          })
     }
-};
+}
 
 /**
  * 流程节点权限控制
  */
 export function filterNodePermission(el, binding, vnode) {
-  let permissionList = [];
+  let permissionList = []
   try {
-    let obj = vnode.context.$props.formData;
+    let obj = vnode.context.$props.formData
     if (obj) {
-      let bpmList = obj.permissionList;
+      let bpmList = obj.permissionList
       for (let bpm of bpmList) {
         if(bpm.type != '2') {
-          permissionList.push(bpm);
+          permissionList.push(bpm)
         }
       }
     }else{
-      return false;
+      return false
     }
   } catch (e) {
     //console.log("页面权限异常----", e);
   }
-  if (permissionList === null || permissionList === "" || permissionList === undefined||permissionList.length<=0) {
+  if (permissionList === null || permissionList === '' || permissionList === undefined||permissionList.length<=0) {
     //el.parentNode.removeChild(el)
-    return false;
+    return false
   }
 
-  console.log("流程节点页面权限--NODE--");
-  let permissions = [];
+  console.log('流程节点页面权限--NODE--')
+  let permissions = []
   for (let item of permissionList) {
     if(item.type != '2') {
-      permissions.push(item.action);
+      permissions.push(item.action)
     }
   }
   //console.log("页面权限----"+permissions);
   //console.log("页面权限----"+binding.value);
   if (!permissions.includes(binding.value)) {
     //el.parentNode.removeChild(el)
-    return false;
+    return false
   }else{
     for (let item2 of permissionList) {
       if(binding.value === item2.action){
-        return true;
+        return true
       }
     }
   }
-  return false;
+  return false
 }
 
 /**
  * 全局权限控制
  */
 export function filterGlobalPermission(el, binding, vnode) {
-  console.log("全局页面权限--Global--");
+  console.log('全局页面权限--Global--')
 
-  let permissionList = [];
-  let allPermissionList = [];
+  let permissionList = []
+  let allPermissionList = []
 
   //let authList = Vue.ls.get(USER_AUTH);
-  let authList = JSON.parse(sessionStorage.getItem(USER_AUTH) || "[]");
+  let authList = JSON.parse(sessionStorage.getItem(USER_AUTH) || '[]')
   for (let auth of authList) {
     if(auth.type != '2') {
-      permissionList.push(auth);
+      permissionList.push(auth)
     }
   }
   //console.log("页面权限--Global--",sessionStorage.getItem(SYS_BUTTON_AUTH));
-  let allAuthList = JSON.parse(sessionStorage.getItem(SYS_BUTTON_AUTH) || "[]");
+  let allAuthList = JSON.parse(sessionStorage.getItem(SYS_BUTTON_AUTH) || '[]')
   for (let gauth of allAuthList) {
     if(gauth.type != '2') {
-      allPermissionList.push(gauth);
+      allPermissionList.push(gauth)
     }
   }
   //设置全局配置是否有命中
-  let invalidFlag = false;//无效命中
-  if(allPermissionList != null && allPermissionList != "" && allPermissionList != undefined && allPermissionList.length > 0){
+  let invalidFlag = false//无效命中
+  if(allPermissionList != null && allPermissionList != '' && allPermissionList != undefined && allPermissionList.length > 0){
     for (let itemG of allPermissionList) {
       if(binding.value === itemG.action){
         if(itemG.status == '0'){
-          invalidFlag = true;
-          break;
+          invalidFlag = true
+          break
         }
       }
     }
   }
   if(invalidFlag){
-    return;
+    return
   }
-  if (permissionList === null || permissionList === "" || permissionList === undefined||permissionList.length<=0) {
-    el.parentNode.removeChild(el);
-    return;
+  if (permissionList === null || permissionList === '' || permissionList === undefined||permissionList.length<=0) {
+    el.parentNode.removeChild(el)
+    return
   }
-  let permissions = [];
+  let permissions = []
   for (let item of permissionList) {
     //权限策略1显示2禁用
     if(item.type != '2'){
       //update--begin--autor:wangshuai-----date:20200729------for：按钮权限，授权标识的提示信息是多个用逗号分隔逻辑处理 gitee#I1OUGU-------
       if(item.action){
-        if(item.action.includes(",")){
-          let split = item.action.split(",")
+        if(item.action.includes(',')){
+          let split = item.action.split(',')
             for (let i = 0; i <split.length ; i++) {
               if(!split[i] ||split[i].length==0){
-                continue;
+                continue
               }
-              permissions.push(split[i]);
+              permissions.push(split[i])
           }
         }else{
-          permissions.push(item.action);
+          permissions.push(item.action)
         }
       }
       //update--end--autor:wangshuai-----date:20200729------for：按钮权限，授权标识的提示信息是多个用逗号分隔逻辑处理 gitee#I1OUGU------
     }
   }
   if (!permissions.includes(binding.value)) {
-    el.parentNode.removeChild(el);
+    el.parentNode.removeChild(el)
   }
 }
 
-export default hasPermission;
+export default hasPermission
diff --git a/src/utils/mixin.js b/src/utils/mixin.js
index 8a6c89e..4aa8f1d 100644
--- a/src/utils/mixin.js
+++ b/src/utils/mixin.js
@@ -1,5 +1,5 @@
 // import Vue from 'vue'
-import { mapState } from "vuex";
+import { mapState } from 'vuex'
 
 // const mixinsComputed = Vue.config.optionMergeStrategies.computed
 // const mixinsMethods = Vue.config.optionMergeStrategies.methods
diff --git a/src/utils/request.js b/src/utils/request.js
index 513d805..dbf4e73 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -2,7 +2,7 @@ import Vue from 'vue'
 import axios from 'axios'
 import store from '@/store'
 import {Modal, notification} from 'ant-design-vue'
-import { ACCESS_TOKEN, TENANT_ID } from "@/store/mutation-types"
+import { ACCESS_TOKEN, TENANT_ID } from '@/store/mutation-types'
 
 /**
  * 【指定 axios的 baseURL】
@@ -10,7 +10,7 @@ import { ACCESS_TOKEN, TENANT_ID } from "@/store/mutation-types"
  * 则映射后端域名，通过 vue.config.js
  * @type {*|string}
  */
-let apiBaseUrl = window._CONFIG['domianURL'] || "/jero-boot";
+let apiBaseUrl = window._CONFIG['domianURL'] || '/jero-boot'
 //console.log("apiBaseUrl= ",apiBaseUrl)
 // 创建 axios 实例
 const service = axios.create({
@@ -23,23 +23,23 @@ const err = (error) => {
   if (error.response) {
     let data = error.response.data
     const token = Vue.ls.get(ACCESS_TOKEN)
-    console.log("------异常响应------",token)
-    console.log("------异常响应------",error.response.status)
+    console.log('------异常响应------',token)
+    console.log('------异常响应------',error.response.status)
     switch (error.response.status) {
       case 403:
         notification.error({ message: '系统提示', description: '拒绝访问',duration: 4})
         break
       case 500:
-        console.log("------error.response------",error.response)
+        console.log('------error.response------',error.response)
         // update-begin- --- author:liusq ------ date:20200910 ---- for:处理Blob情况----
-        let type=error.response.request.responseType;
+        let type=error.response.request.responseType
         if(type === 'blob'){
-          blobToJson(data);
-          break;
+          blobToJson(data)
+          break
         }
         // update-end- --- author:liusq ------ date:20200910 ---- for:处理Blob情况----
         //notification.error({ message: '系统提示', description:'Token失效，请重新登录!',duration: 4})
-        if(token && data.message.includes("Token失效")){
+        if(token && data.message.includes('Token失效')){
           // update-begin- --- author:scott ------ date:20190225 ---- for:Token失效采用弹框模式，不直接跳转----
           Modal.error({
             title: '登录已过期',
@@ -51,8 +51,8 @@ const err = (error) => {
                 Vue.ls.remove(ACCESS_TOKEN)
                 try {
                   let path = window.document.location.pathname
-                  console.log("location pathname -> "+path)
-                  if(path!="/" && path.indexOf('/user/login')==-1){
+                  console.log('location pathname -> '+path)
+                  if(path!='/' && path.indexOf('/user/login')==-1){
                     window.location.reload()
                   }
                 }catch (e) {
@@ -90,7 +90,7 @@ const err = (error) => {
     }
   }
   return Promise.reject(error)
-};
+}
 
 // request interceptor
 service.interceptors.request.use(config => {
@@ -101,12 +101,12 @@ service.interceptors.request.use(config => {
   //update-begin-author:taoyan date:2020707 for:多租户
   let tenantid = Vue.ls.get(TENANT_ID)
   if (!tenantid) {
-    tenantid = 0;
+    tenantid = 0
   }
   config.headers[ 'tenant_id' ] = tenantid
   //update-end-author:taoyan date:2020707 for:多租户
   if(config.method=='get'){
-    if(config.url.indexOf("sys/dict/getDictItems")<0){
+    if(config.url.indexOf('sys/dict/getDictItems')<0){
       config.params = {
         _t: Date.parse(new Date())/1000,
         ...config.params
@@ -128,15 +128,15 @@ service.interceptors.response.use((response) => {
  * @param data
  */
 function blobToJson(data) {
-  let fileReader = new FileReader();
-  let token = Vue.ls.get(ACCESS_TOKEN);
+  let fileReader = new FileReader()
+  let token = Vue.ls.get(ACCESS_TOKEN)
   fileReader.onload = function() {
     try {
-      let jsonData = JSON.parse(this.result);  // 说明是普通对象数据，后台转换失败
-      console.log("jsonData",jsonData)
+      let jsonData = JSON.parse(this.result)  // 说明是普通对象数据，后台转换失败
+      console.log('jsonData',jsonData)
       if (jsonData.status === 500) {
-        console.log("token----------》",token)
-        if(token && jsonData.message.includes("Token失效")){
+        console.log('token----------》',token)
+        if(token && jsonData.message.includes('Token失效')){
           Modal.error({
             title: '登录已过期',
             content: '很抱歉，登录已过期，请重新登录',
@@ -153,9 +153,9 @@ function blobToJson(data) {
       }
     } catch (err) {
       // 解析成对象失败，说明是正常的文件流
-      console.log("blob解析fileReader返回err",err)
+      console.log('blob解析fileReader返回err',err)
     }
-  };
+  }
   fileReader.readAsText(data)
 }
 
diff --git a/src/utils/util.js b/src/utils/util.js
index d524578..400dd1f 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -1,6 +1,6 @@
 import * as api from '@/api/api'
 import { isURL } from '@/utils/validate'
-import { JSEncrypt } from "jsencrypt";
+import { JSEncrypt } from 'jsencrypt'
 // import onlineCommons from '@/components/onlineForm/onlineForm'
 //
 export function timeFix() {
@@ -32,16 +32,16 @@ export function triggerWindowResizeEvent() {
  */
 export function filterObj(obj) {
   if (!(typeof obj == 'object')) {
-    return;
+    return
   }
 
   for ( let key in obj) {
     if (obj.hasOwnProperty(key)
       && (obj[key] == null || obj[key] == undefined || obj[key] === '')) {
-      delete obj[key];
+      delete obj[key]
     }
   }
-  return obj;
+  return obj
 }
 
 /**
@@ -51,10 +51,10 @@ export function filterObj(obj) {
  * @returns {*}
  */
 export function formatDate(value, fmt) {
-  let regPos = /^\d+(\.\d+)?$/;
+  let regPos = /^\d+(\.\d+)?$/
   if(regPos.test(value)){
     //如果是数字
-    let getDate = new Date(value);
+    let getDate = new Date(value)
     let o = {
       'M+': getDate.getMonth() + 1,
       'd+': getDate.getDate(),
@@ -63,7 +63,7 @@ export function formatDate(value, fmt) {
       's+': getDate.getSeconds(),
       'q+': Math.floor((getDate.getMonth() + 3) / 3),
       'S': getDate.getMilliseconds()
-    };
+    }
     if (/(y+)/.test(fmt)) {
       fmt = fmt.replace(RegExp.$1, (getDate.getFullYear() + '').substr(4 - RegExp.$1.length))
     }
@@ -72,11 +72,11 @@ export function formatDate(value, fmt) {
         fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
       }
     }
-    return fmt;
+    return fmt
   }else{
     //TODO
-    value = value.trim();
-    return value.substr(0,fmt.length);
+    value = value.trim()
+    return value.substr(0,fmt.length)
   }
 }
 
@@ -93,27 +93,27 @@ let indexRouter = [{
             ...generateChildRouters(data)
           ]
         },{
-          "path": "*", "redirect": "/404", "hidden": true
+          'path': '*', 'redirect': '/404', 'hidden': true
         }]
-  return indexRouter;
+  return indexRouter
 }
 
 // 生成嵌套路由（子路由）
 
 function  generateChildRouters (data) {
-  const routers = [];
+  const routers = []
   for (let item of data) {
-    let component = "";
-    if(item.component.indexOf("layouts")>=0){
-       component = "components/"+item.component;
+    let component = ''
+    if(item.component.indexOf('layouts')>=0){
+       component = 'components/'+item.component
     }else{
-       component = "views/"+item.component;
+       component = 'views/'+item.component
     }
 
     // eslint-disable-next-line
     let URL = (item.meta.url|| '').replace(/{{([^}}]+)?}}/g, (s1, s2) => eval(s2)) // URL支持{{ window.xxx }}占位符变量
     if (isURL(URL)) {
-      item.meta.url = URL;
+      item.meta.url = URL
     }
 
     let componentPath
@@ -160,11 +160,11 @@ function  generateChildRouters (data) {
       }
     }
     if(item.alwaysShow){
-      menu.alwaysShow = true;
-      menu.redirect = menu.path;
+      menu.alwaysShow = true
+      menu.redirect = menu.path
     }
     if (item.children && item.children.length > 0) {
-      menu.children = [...generateChildRouters( item.children)];
+      menu.children = [...generateChildRouters( item.children)]
     }
     //--update-begin----author:scott---date:20190320------for:根据后台菜单配置，判断是否路由菜单字段，动态选择是否生成路由（为了支持参数URL菜单）------
     //判断是否生成路由
@@ -172,7 +172,7 @@ function  generateChildRouters (data) {
       //console.log(' 不生成路由 item.route：  '+item.route);
       //console.log(' 不生成路由 item.path：  '+item.path);
     }else{
-      routers.push(menu);
+      routers.push(menu)
     }
     //--update-end----author:scott---date:20190320------for:根据后台菜单配置，判断是否路由菜单字段，动态选择是否生成路由（为了支持参数URL菜单）------
   }
@@ -249,8 +249,8 @@ export function randomUUID() {
  */
 export function underLine2CamelCase(string){
   return string.replace( /_([a-z])/g, function( all, letter ) {
-    return letter.toUpperCase();
-  });
+    return letter.toUpperCase()
+  })
 }
 
 /**
@@ -259,10 +259,10 @@ export function underLine2CamelCase(string){
  * @returns {*}
  */
 export function showDealBtn(bpmStatus){
-  if(bpmStatus!="1"&&bpmStatus!="3"&&bpmStatus!="4"){
-    return true;
+  if(bpmStatus!='1'&&bpmStatus!='3'&&bpmStatus!='4'){
+    return true
   }
-  return false;
+  return false
 }
 
 /**
@@ -272,7 +272,7 @@ export function showDealBtn(bpmStatus){
  */
 export function cssExpand(css, id) {
   let style = document.createElement('style')
-  style.type = "text/css"
+  style.type = 'text/css'
   style.innerHTML = `@charset "UTF-8"; ${css}`
   // 清除旧样式
   if (id) {
@@ -554,12 +554,12 @@ export function removeArrayElement(array, prod, value) {
   let index = -1
   for(let i = 0;i<array.length;i++){
     if(array[i][prod] == value){
-      index = i;
-      break;
+      index = i
+      break
     }
   }
   if(index>=0){
-    array.splice(index, 1);
+    array.splice(index, 1)
   }
 }
 /**
@@ -577,13 +577,13 @@ export function encrypt(publicKey, message) {
  * 校验数组是否有重复的元素
  * */
 export function isRepeat(arr) {
-  var hash = {};
+  var hash = {}
   for(var i in arr) {
     if(hash[arr[i]]) {
-      return true;
+      return true
     }
     // 不存在该元素，则赋值为true，可以赋任意值，相应的修改if判断条件即可
-    hash[arr[i]] = true;
+    hash[arr[i]] = true
   }
-  return false;
+  return false
 }
diff --git a/src/utils/vTrim.js b/src/utils/vTrim.js
index 834286d..fe24805 100644
--- a/src/utils/vTrim.js
+++ b/src/utils/vTrim.js
@@ -6,7 +6,7 @@ const vTrim = {
         input.oninput = (event) => {
           console.log(event.target.value)
           // event.target.value = event.target.value.replace(/(^\s*)|(\s*$)/g, "")
-          input.value = input.value.replace(/(^\s*)|(\s*$)/g, "")
+          input.value = input.value.replace(/(^\s*)|(\s*$)/g, '')
         }
         //   // 获取当前光标所在位置
         //   const inputSelection = input.selectionStart
@@ -23,8 +23,8 @@ const vTrim = {
         //   input.dispatchEvent(new Event(modifiers.lazy ? 'change' : 'input'))
         // }
       }
-    });
+    })
   }
-};
+}
 
 export default vTrim
diff --git a/src/utils/validateOnly.js b/src/utils/validateOnly.js
index 2463afc..2cb5d54 100644
--- a/src/utils/validateOnly.js
+++ b/src/utils/validateOnly.js
@@ -1,5 +1,5 @@
-import {duplicateCheck} from "@api/api";
-import {phoneReg, isEmail, passwordReg, isPhone,chineseReg} from "@/utils/validate";
+import {duplicateCheck} from '@api/api'
+import {phoneReg, isEmail, passwordReg, isPhone,chineseReg} from '@/utils/validate'
 
 // 手机校验的错误信息提示
 const phoneErrMsg = {
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 8f4339d..34342fe 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -7,12 +7,12 @@
 
 <script>
 // @ is an alias to /src
-import HelloWorld from "@/components/HelloWorld.vue";
+import HelloWorld from '@/components/HelloWorld.vue'
 
 export default {
-  name: "Home",
+  name: 'Home',
   components: {
     HelloWorld,
   },
-};
+}
 </script>
diff --git a/src/views/businessManagement/BusinessManagement.vue b/src/views/businessManagement/BusinessManagement.vue
index e5d596a..b23af6d 100644
--- a/src/views/businessManagement/BusinessManagement.vue
+++ b/src/views/businessManagement/BusinessManagement.vue
@@ -25,7 +25,8 @@
       <!--    操作按钮区域-->
       <div class="table-operator">
         <a-button type="primary" icon="plus" @click="handleAdd">新增</a-button>
-        <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
+                  @change="handleImportExcel">
           <a-button type="primary" icon="import">导入</a-button>
         </a-upload>
         <a-button type="primary" icon="export" @click="handleExportXls('企业管理')">导出</a-button>
@@ -37,20 +38,20 @@
       <!--    table表格区域-->
       <div>
         <a-table
-            ref="table"
-            size="middle"
-            bordered
-            rowKey="id"
-            :columns="columns"
-            :scroll="{x: 1500}"
-            :dataSource="dataSource"
-            :pagination="ipagination"
-            :loading="loading"
-            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-            @change="handleTableChange"
-            class="j-table-force-nowrap">
+          ref="table"
+          size="middle"
+          bordered
+          rowKey="id"
+          :columns="columns"
+          :scroll="{x: 1500}"
+          :dataSource="dataSource"
+          :pagination="ipagination"
+          :loading="loading"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+          @change="handleTableChange"
+          class="j-table-force-nowrap">
 
-          <template slot="text" slot-scope="text,record">
+          <template slot="text" slot-scope="text">
             <j-ellipsis :value="text" :length="18"></j-ellipsis>
           </template>
 
@@ -77,9 +78,9 @@ export default {
   components: { JEllipsis, BusinessManagementModule, PageHeaderTitle },
   mixins: [JeroListMixin],
   computed: {
-    importExcelUrl: function(){
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    },
+    importExcelUrl: function () {
+      return `${ window._CONFIG['domianURL'] }/${ this.url.importExcelUrl }`
+    }
   },
   data() {
     return {
diff --git a/src/views/businessManagement/ContactManagement.vue b/src/views/businessManagement/ContactManagement.vue
index ca16178..99c2eea 100644
--- a/src/views/businessManagement/ContactManagement.vue
+++ b/src/views/businessManagement/ContactManagement.vue
@@ -35,7 +35,8 @@
       <!--    操作按钮区域-->
       <div class="table-operator">
         <a-button type="primary" icon="plus" @click="handleAdd">新增</a-button>
-        <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
+                  @change="handleImportExcel">
           <a-button type="primary" icon="import">导入</a-button>
         </a-upload>
         <a-button type="primary" icon="export" @click="handleExportXls('联系人管理')">导出</a-button>
@@ -47,20 +48,20 @@
       <!--    table表格区域-->
       <div>
         <a-table
-            ref="table"
-            size="middle"
-            bordered
-            rowKey="id"
-            :columns="columns"
-            :scroll="{x: 1500}"
-            :dataSource="dataSource"
-            :pagination="ipagination"
-            :loading="loading"
-            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-            @change="handleTableChange"
-            class="j-table-force-nowrap">
+          ref="table"
+          size="middle"
+          bordered
+          rowKey="id"
+          :columns="columns"
+          :scroll="{x: 1500}"
+          :dataSource="dataSource"
+          :pagination="ipagination"
+          :loading="loading"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+          @change="handleTableChange"
+          class="j-table-force-nowrap">
 
-          <template slot="text" slot-scope="text,record">
+          <template slot="text" slot-scope="text">
             <j-ellipsis :value="text" :length="18"></j-ellipsis>
           </template>
 
@@ -86,9 +87,9 @@ export default {
   components: { ContactManagementModule, PageHeaderTitle },
   mixins: [JeroListMixin],
   computed: {
-    importExcelUrl: function(){
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    },
+    importExcelUrl: function () {
+      return `${ window._CONFIG['domianURL'] }/${ this.url.importExcelUrl }`
+    }
   },
   data() {
     return {
diff --git a/src/views/businessManagement/modules/BusinessManagementModule.vue b/src/views/businessManagement/modules/BusinessManagementModule.vue
index 5fe76f0..4198325 100644
--- a/src/views/businessManagement/modules/BusinessManagementModule.vue
+++ b/src/views/businessManagement/modules/BusinessManagementModule.vue
@@ -1,13 +1,13 @@
 <template>
   <j-modal
-      :title="title"
-      :width="width"
-      :visible="visible"
-      :confirmLoading="confirmLoading"
-      switchFullscreen
-      @ok="handleOk"
-      @cancel="handleCancel"
-      cancelText="关闭">
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-row>
@@ -87,11 +87,11 @@
           <a-col>
             <a-form-item label="备注" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
               <a-textarea
-                  placeholder="请输入备注"
-                  v-decorator="['remarks']"
-                  :auto-size="{ minRows: 3, maxRows: 6 }"
-                  :maxLength='200'
-                  @change="e => {e.target.value = (e.target.value + '').trim()}"/>
+                placeholder="请输入备注"
+                v-decorator="['remarks']"
+                :auto-size="{ minRows: 3, maxRows: 6 }"
+                :maxLength='200'
+                @change="e => {e.target.value = (e.target.value + '').trim()}"/>
             </a-form-item>
           </a-col>
         </a-row>
diff --git a/src/views/businessManagement/modules/ContactManagementModule.vue b/src/views/businessManagement/modules/ContactManagementModule.vue
index 0dec913..2667263 100644
--- a/src/views/businessManagement/modules/ContactManagementModule.vue
+++ b/src/views/businessManagement/modules/ContactManagementModule.vue
@@ -1,13 +1,13 @@
 <template>
   <j-modal
-      :title="title"
-      :width="width"
-      :visible="visible"
-      :confirmLoading="confirmLoading"
-      switchFullscreen
-      @ok="handleOk"
-      @cancel="handleCancel"
-      cancelText="关闭">
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
     <a-form :form="form">
       <a-row>
         <a-col :xl="12" :sm="24">
@@ -85,11 +85,11 @@
         <a-col>
           <a-form-item label="备注" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
             <a-textarea
-                placeholder="请输入备注"
-                :auto-size="{ minRows: 3, maxRows: 6 }"
-                v-decorator="['remarks']"
-                :maxLength='200'
-                @change="e => {e.target.value = (e.target.value + '').trim()}"/>
+              placeholder="请输入备注"
+              :auto-size="{ minRows: 3, maxRows: 6 }"
+              v-decorator="['remarks']"
+              :maxLength='200'
+              @change="e => {e.target.value = (e.target.value + '').trim()}"/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -244,7 +244,7 @@ export default {
           httpAction(httpurl, formData, method).then((res) => {
             if (res.success) {
               that.$message.success(res.message)
-              that.$emit('ok')
+              that.$emit('ok', res.result.id)
               that.close()
             } else {
               that.$message.warning(res.message)
diff --git a/src/views/contractManagement/revenueContract/RevenueContractList.vue b/src/views/contractManagement/revenueContract/RevenueContractList.vue
index 79141b2..90730fb 100644
--- a/src/views/contractManagement/revenueContract/RevenueContractList.vue
+++ b/src/views/contractManagement/revenueContract/RevenueContractList.vue
@@ -79,15 +79,15 @@
           <!--        项目名称 待审核状态为红色-->
           <template slot="projectName" slot-scope="text, record">
             <div class="primary-color" @click="toRevenueContractDetail(record.id)" v-if="record.status !== 1">{{ text }}</div>
-            <div @click="toRevenueContractDetail(record.id)" v-else>{{ text }}</div>
+            <div @click="toRevenueContractDetail(record.id, record.contractNum)" v-else>{{ text }}</div>
           </template>
 
-          <template slot="text" slot-scope="text,record">
+          <template slot="text" slot-scope="text">
             <j-ellipsis :value="text" :length="20"></j-ellipsis>
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
-            <a @click="handleEdit(record)">编辑</a>
+            <a @click="handleEdit(record.id, record.contractNum)">编辑</a>
             <a @click="handleDelete(record.id)">删除</a>
           </span>
         </a-table>
@@ -195,17 +195,19 @@ export default {
         {
           id: 1,
           status: 1,
+          contractNum: '1346',
           createTime: '2020-09-02 11:11:11'
         }
       ]
     }
   },
   methods: {
-    toRevenueContractDetail(id) {
+    toRevenueContractDetail(id, contractNum) {
       this.$router.push({
         path: '/contractManagement/RevenueContractDetail',
         query: {
-          revenueId: id
+          revenueId: id,
+          contractNum: contractNum
         }
       })
     },
@@ -214,6 +216,15 @@ export default {
         path: '/contractManagement/AddRevenueContract'
       })
     },
+    handleEdit(id, contractNum) {
+      this.$router.push({
+        path: '/contractManagement/AddRevenueContract',
+        query: {
+          revenueId: id,
+          contractNum: contractNum
+        }
+      })
+    },
     /**
      * 动态设置待审核状态的表格样式
      * @param record
diff --git a/src/views/contractManagement/revenueContract/modules/ProjectTypeSelection.vue b/src/views/contractManagement/revenueContract/modules/ProjectTypeSelection.vue
new file mode 100644
index 0000000..a16222a
--- /dev/null
+++ b/src/views/contractManagement/revenueContract/modules/ProjectTypeSelection.vue
@@ -0,0 +1,120 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <div class="project-type">
+      <div
+        class="project-type-item"
+        v-for="(item, index) in projectType"
+        :key="index"
+        @click="chooseProjectType(index, item.type)">
+        <img :src="choosedIndex === index ? item.selectedImg : item.img">
+        <div class="project-type-item-title">{{ item.title }}</div>
+      </div>
+    </div>
+  </j-modal>
+</template>
+
+<script>
+import GeneralProjectImg from '@/assets/imgs/generial_project.png'
+import GeneralProjectSelectImg from '@/assets/imgs/working_group_project_selected.png'
+import WorkingGroupProjectImg from '@/assets/imgs/working_group_project_selected.png'
+import WorkingGroupProjectSelectedImg from '@/assets/imgs/working_group_project_selected.png'
+import MeetingProjectImg from '@/assets/imgs/meeting_project.png'
+import MeetingProjectSelectedImg from '@/assets/imgs/working_group_project_selected.png'
+import MemberProjectImg from '@/assets/imgs/member_project.png'
+import MemberProjectSelectedImg from '@/assets/imgs/working_group_project_selected.png'
+
+export default {
+  name: 'ProjectTypeSelection',
+  data() {
+    return {
+      title: '关联项目',
+      width: 800,
+      visible: false,
+      confirmLoading: false,
+      choosedType: null,
+      choosedIndex: null,
+      projectType: [
+        {
+          img: GeneralProjectImg,
+          selectedImg: GeneralProjectSelectImg,
+          title: '普通项目',
+          type: 1
+        }, {
+          img: WorkingGroupProjectImg,
+          selectedImg: WorkingGroupProjectSelectedImg,
+          title: '工作组项目',
+          type: 2
+        }, {
+          img: MeetingProjectImg,
+          selectedImg: MeetingProjectSelectedImg,
+          title: '会议项目',
+          type: 3
+        }, {
+          img: MemberProjectImg,
+          selectedImg: MemberProjectSelectedImg,
+          title: '会员项目',
+          type: 4
+        }
+      ]
+    }
+  },
+  methods: {
+    open() {
+      this.visible = true
+    },
+    close() {
+      this.visible = false
+    },
+    chooseProjectType(index, type) {
+      this.choosedIndex = index
+      this.choosedType = type
+    },
+    handleOk() {
+      // 判断选择的项目类型，1--普通项目，2--工作组项目，3--会议项目，4--会员项目
+      if (this.choosedType && this.choosedType < 5) {
+        this.$emit('ok', this.choosedType)
+        this.close()
+        return
+      }
+      this.$message.warn('请选择一个项目类型')
+    },
+    handleCancel() {
+      this.close()
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.project-type {
+  display: flex;
+  justify-content: space-around;
+
+  &-item {
+    cursor: pointer;
+
+    &-title {
+      margin-top: 10px;
+      font-size: 14px;
+      font-family: NotoSansHans, NotoSansHans-DemiLight;
+      font-weight: 700;
+      text-align: center;
+      color: #333333;
+    }
+  }
+}
+
+//.project-type-item:hover {
+//  .project-type-item-title {
+//    color: #069F99;
+//  }
+//}
+</style>
\ No newline at end of file
diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue
index 32d0166..4c07ae5 100644
--- a/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue
+++ b/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue
@@ -1,16 +1,231 @@
 <template>
+  <div>
+    <page-header-title :is-level-one="false" :img-for-icon="IconImg" :level-two-title="contractNum"></page-header-title>
+    <a-card :bordered="false">
+      <!--        主体信息-->
+      <div>
+        <div class="part-title">
+          <div class="part-title-text">主体信息</div>
+        </div>
+        <a-row class="detail">
+          <template v-for="(item, index) in mainInfoList" :key="index">
+            <a-col :xxl="6" :xl="8" :sm="12" class="detail-item" v-if="detailData[item.fieldName] && detailData[item.fieldName] !== ''">
+              <a-row>
+                <a-col :sm="10" :xs="24">{{ item.title }}:</a-col>
+                <a-col :sm="14" :xs="24">{{ detailData[item.fieldName] }}</a-col>
+              </a-row>
+            </a-col>
+          </template>
+        </a-row>
+      </div>
+      <a-divider></a-divider>
 
+      <!--      日期节点-->
+      <div>
+        <div class="part-title">
+          <div class="part-title-text">日期节点</div>
+        </div>
+        <a-row class="detail">
+          <template v-for="item in mainInfoList">
+            <a-col :xxl="6" :xl="8" :sm="12" class="detail-item" v-if="detailData[item.fieldName] && detailData[item.fieldName] !== ''">
+              <a-row>
+                <a-col :sm="10" :xs="24">{{ item.title }}:</a-col>
+                <a-col :sm="14" :xs="24">{{ detailData[item.fieldName] }}</a-col>
+              </a-row>
+            </a-col>
+          </template>
+        </a-row>
+      </div>
+      <a-divider></a-divider>
+
+      <!--      账款信息-->
+      <div>
+        <div class="part-title">
+          <div class="part-title-text">账款信息</div>
+        </div>
+        <a-row class="detail">
+          <template v-for="item in mainInfoList">
+            <a-col :xxl="6" :xl="8" :sm="12" class="detail-item" v-if="detailData[item.fieldName] && detailData[item.fieldName] !== ''">
+              <a-row>
+                <a-col :sm="10" :xs="24">{{ item.title }}:</a-col>
+                <a-col :sm="14" :xs="24">{{ detailData[item.fieldName] }}</a-col>
+              </a-row>
+            </a-col>
+          </template>
+        </a-row>
+      </div>
+      <a-divider></a-divider>
+
+      <!--      其他信息-->
+      <div>
+        <div class="part-title">
+          <div class="part-title-text">其他信息</div>
+        </div>
+        <a-row class="detail">
+          <template v-for="(item, index) in mainInfoList">
+            <a-col :xxl="6" :xl="8" :sm="12" class="detail-item" v-if="detailData[item.fieldName] && detailData[item.fieldName] !== ''">
+              <a-row>
+                <a-col :sm="10" :xs="24">{{ item.title }}:</a-col>
+                <a-col :sm="14" :xs="24">{{ detailData[item.fieldName] }}</a-col>
+              </a-row>
+            </a-col>
+          </template>
+        </a-row>
+      </div>
+      <a-divider></a-divider>
+
+      <!--        分期信息-->
+      <div>
+        <div class="part-title">
+          <div class="part-title-text">分期信息</div>
+        </div>
+        <a-row class="detail">
+          <template v-for="(item, index) in mainInfoList">
+            <a-col :xxl="4" :xl="8" :sm="12" class="detail-item" v-if="detailData[item.fieldName] && detailData[item.fieldName] !== ''">
+              <a-row>
+                <a-col :sm="10" :xs="24">{{ item.title }}:</a-col>
+                <a-col :sm="14" :xs="24">{{ detailData[item.fieldName] }}</a-col>
+              </a-row>
+            </a-col>
+          </template>
+        </a-row>
+      </div>
+      <a-divider></a-divider>
+
+      <!--      关联项目-->
+      <div>
+        <div class="part-title">
+          <div class="part-title-text">关联项目</div>
+        </div>
+      </div>
+      <a-divider></a-divider>
+
+      <!--      存档信息-->
+      <div>
+        <div class="part-title">
+          <div class="part-title-text">存档信息</div>
+        </div>
+      </div>
+      <a-divider></a-divider>
+
+      <!--      审核记录-->
+      <div>
+        <div class="part-title">
+          <div class="part-title-text">审核记录</div>
+        </div>
+      </div>
+    </a-card>
+  </div>
 </template>
 
 <script>
+import IconImg from '@/assets/imgs/icon/icon_revenue_contract.png'
+import PageHeaderTitle from '../../../../components/layouts/PageHeaderTitle'
+
 export default {
   name: 'RevenueContractDetail',
+  components: { PageHeaderTitle },
+  data() {
+    return {
+      IconImg,
+      contractNum: '',
+      detailData: {},
+      // 主体信息
+      mainInfoList: [
+        {
+          fieldName: 'contractNum',
+          title: '合同编号'
+        }, {
+          fieldName: 'contractName',
+          title: '合同名称'
+        }, {
+          fieldName: 'signedCompanyTemporaryName',
+          title: '签订单位'
+        }, {
+          fieldName: 'signedContactsTemporaryName',
+          title: '签订联系人'
+        }, {
+          fieldName: 'opening_dictText',
+          title: '是否开口'
+        }, {
+          fieldName: 'principalName',
+          title: '负责人'
+        }, {
+          fieldName: 'departmentName',
+          title: '部门名称'
+        }, {
+          fieldName: 'contractAmount',
+          title: '签订合同总金额'
+        }, {
+          fieldName: 'rate',
+          title: '税率'
+        }, {
+          fieldName: 'noTaxAmount',
+          title: '未税金额'
+        }
+      ],
+      dateNodeList: [
+        {
+          fieldName: 'contractDate',
+          title: '合同签订日期'
+        }, {
+          fieldName: 'terminationDate',
+          title: '合同终止日期'
+        }, {
+          fieldName: 'contractTimePoints',
+          title: '合同约定主要时点'
+        }
+      ],
+      accountInfoList: [
+        {
+          fieldName: 'accountsReceivableAmount',
+          title: '应收金额'
+        }, {
+          fieldName: 'amountReceived',
+          title: '已收金额'
+        }, {
+          fieldName: 'amountReceived',
+          title: '未收金额'
+        }, {
+          fieldName: 'accountStatus',
+          title: '赊账状态'
+        }
+      ],
+      otherInfoList: [
+        {
+          fieldName: 'contractPaymentTimes',
+          title: '合同约定付款次数'
+        }, {
+          fieldName: 'package_dictText',
+          title: '是否打包'
+        }, {
+          fieldName: 'packageYear',
+          title: '打包年份'
+        }
+      ],
+      // 接口获取后处理加入title，fieldName字段
+      installmentList: []
+    }
+  },
   created() {
-    console.log(this.$route.query)
+    console.log(this.$route.query.revenueId)
+    this.contractNum = this.$route.query.contractNum
   }
 }
 </script>
 
-<style scoped>
+<style scoped lang="less">
+@import '~@assets/less/common.less';
 
+.detail {
+  padding: 0 20px;
+
+  &-item {
+    padding-top: 10px;
+  }
+}
+
+.ant-divider-horizontal {
+  margin: 20px 0;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
index 83661cb..b1f4d9a 100644
--- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
+++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
@@ -3,81 +3,569 @@
     <page-header-title :is-level-one="false" :img-for-icon="IconImg" level-two-title="新建收入合同"></page-header-title>
     <a-card :bordered="false">
       <a-form :form="form">
-        <div class="part-title">
-          <div class="part-title-text">主体信息</div>
-        </div>
+        <!--        主体信息-->
         <div>
+          <div class="part-title">
+            <div class="part-title-text">主体信息</div>
+          </div>
           <a-row>
-            <a-col :xl="6" :sm="12">
+            <a-col :xxl="6" :xl="8" :sm="12">
               <a-form-item label="合同编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-input placeholder="请输入合同编号"
                          v-decorator="['contractNum',validatorRules.contractNum]"
                          :maxLength='50'
+                         :disabled="isSaved"
                          @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :sm="12">
+            <a-col :xxl="6" :xl="8" :sm="12">
               <a-form-item label="合同名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-input placeholder="请输入合同名称"
                          v-decorator="['contractName',validatorRules.contractName]"
                          :maxLength='50'
+                         :disabled="isSaved"
                          @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :sm="12">
+            <a-col :xxl="6" :xl="8" :sm="12">
               <a-form-item label="签订单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <company-select placeholder="请选择签订单位"
-                                v-decorator="['signedCompany',validatorRules.signedCompany]"></company-select>
+                                :disabled="isSaved"
+                                v-decorator="['signedCompany',validatorRules.signedCompany]"
+                                @change="handleSignedCompanyChange"></company-select>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :sm="12">
+            <a-col :xxl="6" :xl="8" :sm="12">
               <a-form-item label="签订联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <select-contacts placeholder="请选择签订联系人"
+                                 :disabled="isSaved"
+                                 :selected-company="selectedCompany"
                                  v-decorator="['signedContactsId',validatorRules.signedContactsId]"></select-contacts>
               </a-form-item>
             </a-col>
-          </a-row>
-          <a-row>
-            <a-col :xl="6" :sm="12"></a-col>
+            <a-col :xxl="6" :xl="8" :sm="12">
+              <a-form-item label="是否开口" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-dict-select-tag v-decorator="['opening']"
+                                   :triggerChange="true"
+                                   :disabled="isSaved"
+                                   placeholder="请选择是否开口"
+                                   dictCode="revenue_contract_open"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xxl="6" :xl="8" :sm="12">
+              <a-form-item label="负责人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <select-principal placeholder="请选择负责人"
+                                  :disabled="isSaved"
+                                  v-decorator="['principalId',validatorRules.principalId]"></select-principal>
+              </a-form-item>
+            </a-col>
+            <a-col :xxl="6" :xl="8" :sm="12">
+              <a-form-item label="部门名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input placeholder="请输入部门名称"
+                         v-decorator="['departmentName']"
+                         :disabled="true"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xxl="6" :xl="8" :sm="12">
+              <a-form-item label="签订合同总金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input placeholder="请输入签订合同总金额"
+                         :disabled="isSaved"
+                         v-decorator="['contractAmount',validatorRules.contractAmount]"
+                         :maxLength='50'
+                         @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xxl="6" :xl="8" :sm="12">
+              <a-form-item label="税率" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input placeholder="请输入税率"
+                         :disabled="isSaved"
+                         v-decorator="['rate',validatorRules.rate]"
+                         :maxLength='50'
+                         @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xxl="6" :xl="8" :sm="12">
+              <a-form-item label="未税金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input placeholder="请输入未税金额"
+                         :disabled="isSaved"
+                         v-decorator="['noTaxAmount']"
+                         :maxLength='50'
+                         @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"></a-input>
+              </a-form-item>
+            </a-col>
           </a-row>
         </div>
+        <!--        /主体信息-->
+        <a-divider></a-divider>
+        <!--        日期节点-->
+        <div>
+          <div class="part-title">
+            <div class="part-title-text">日期节点</div>
+          </div>
+          <a-row :gutter="30">
+            <a-col :xxl="6" :xl="8" :sm="12">
+              <a-form-item label="合同签订日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-date placeholder="请选择合同签订日期"
+                        style="width: 100%;"
+                        :disabled="isSaved"
+                        v-decorator="['contractDate']"
+                        :trigger-change="true"
+                        date-format="YYYY-MM-DD"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xxl="6" :xl="8" :sm="12">
+              <a-form-item label="合同终止日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-date placeholder="请选择合同终止日期"
+                        style="width: 100%;"
+                        :disabled="isSaved"
+                        v-decorator="['terminationDate']"
+                        :trigger-change="true"
+                        date-format="YYYY-MM-DD"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xxl="6" :xl="8" :sm="12">
+              <a-form-item label="合同约定主要时点" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-date placeholder="请选择合同约定主要时点"
+                        style="width: 100%;"
+                        :disabled="isSaved"
+                        v-decorator="['contractTimePoints']"
+                        :trigger-change="true"
+                        date-format="YYYY-MM-DD"/>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </div>
+        <!--        /日期节点-->
+        <a-divider></a-divider>
+        <!--        账款信息-->
+        <div>
+          <div class="part-title">
+            <div class="part-title-text">账款信息</div>
+          </div>
+          <div>
+            <a-row :gutter="30">
+              <a-col :xxl="6" :xl="8" :sm="12">
+                <a-form-item label="应收金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input placeholder="请输入应收金额"
+                           v-decorator="['accountsReceivableAmount',validatorRules.accountsReceivableAmount]"
+                           :maxLength='50'
+                           :disabled="isSaved"
+                           @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :xxl="6" :xl="8" :sm="12">
+                <a-form-item label="已收金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input placeholder="请输入已收金额"
+                           v-decorator="['amountReceived',validatorRules.amountReceived]"
+                           :maxLength='50'
+                           :disabled="isSaved"
+                           @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :xxl="6" :xl="8" :sm="12">
+                <a-form-item label="未收金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input placeholder="请输入未收金额"
+                           :maxLength='50'
+                           v-decorator="['amountReceived',validatorRules.amountReceived]"
+                           :disabled="true"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :xxl="6" :xl="8" :sm="12">
+                <a-form-item label="赊账状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <j-dict-select-tag v-decorator="['accountStatus']"
+                                     :triggerChange="true"
+                                     placeholder="请选择赊账状态"
+                                     dictCode="revenue_contract_account_status"
+                                     :disabled="true"/>
+                </a-form-item>
+              </a-col>
+            </a-row>
+          </div>
+        </div>
+        <!--        /账款信息-->
+        <a-divider></a-divider>
+        <!--        其他-->
+        <div>
+          <div class="part-title">
+            <div class="part-title-text">其他信息</div>
+          </div>
+          <div>
+            <a-row :gutter="30">
+              <a-col :xxl="6" :xl="8" :sm="12">
+                <a-form-item label="合同约定付款次数" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input placeholder="请输入合同约定付款次数"
+                           v-decorator="['contractPaymentTimes']"
+                           :maxLength='50'
+                           :disabled="isSaved"
+                           @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :xxl="6" :xl="8" :sm="12">
+                <a-form-item label="是否打包" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <j-dict-select-tag v-decorator="['package', validatorRules.package]"
+                                     :triggerChange="true"
+                                     placeholder="请选择是否打包"
+                                     dictCode="yn"
+                                     :disabled="isSaved"/>
+                </a-form-item>
+              </a-col>
+              <a-col :xxl="6" :xl="8" :sm="12">
+                <a-form-item label="打包年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <j-year-date style="width:100%"
+                               :disabled="isSaved"
+                               placeholder="请选择打包年份"
+                               v-decorator="['packageYear',validatorRules.packageYear]"></j-year-date>
+                </a-form-item>
+              </a-col>
+            </a-row>
+          </div>
+        </div>
+        <!--        /其他-->
+        <a-divider></a-divider>
+        <!--        分期信息-->
+        <div>
+          <div class="part-title">
+            <div class="part-title-text">分期信息</div>
+          </div>
+          <installment-form ref="installmentForm" @ok="installmentFormOk" :disabled="isSaved"></installment-form>
+        </div>
+        <!--        /分期信息-->
+        <a-form-item class="table-operator">
+          <a-button type="primary" @click="handleSave">保存</a-button>
+          <a-button @click="handleCancle">取消</a-button>
+        </a-form-item>
       </a-form>
     </a-card>
+    <!--      关联项目-->
+    <a-card :bordered="false" v-if="isSaved" class="associated-project">
+      <div class="part-title">
+        <div class="part-title-text">关联项目</div>
+        <a-button type="link" @click="chooseProject">选择项目</a-button>
+      </div>
+    </a-card>
+
+    <project-type-selection ref="projectTypeSelection" @ok="selectProjectTypeOk"></project-type-selection>
+    <select-project-module ref="selectProjectModule"></select-project-module>
   </div>
 </template>
 
 <script>
 import IconImg from '@/assets/imgs/icon/icon_revenue_contract.png'
-import PageHeaderTitle from '../../../../components/layouts/PageHeaderTitle'
+import PageHeaderTitle from '@/components/layouts/PageHeaderTitle'
 import CompanySelect from '../../../../components/company/CompanySelect'
 import SelectContacts from '../../../../components/company/SelectContacts'
+import SelectPrincipal from '../../../../components/company/SelectPrincipal'
+import JDate from '../../../../components/tools/JDate'
+import JYearDate from '../../../../components/jero/JYearDate'
+import InstallmentForm from '../../../../components/form/InstallmentForm'
+import ProjectTypeSelection from './ProjectTypeSelection'
+import SelectProjectModule from './SelectProjectModule'
+import pick from 'lodash.pick'
+
+// 普通项目表头
+const generalProjectColumns = [
+  {
+    title: '序号',
+    dataIndex: '',
+    key: 'rowIndex',
+    width: 60,
+    align: 'center',
+    customRender: function (t, r, index) {
+      return parseInt(index) + 1
+    }
+  }, {
+    title: '来款项目',
+    align: 'center',
+    width: 200,
+    dataIndex: 'chargeProject',
+    scopedSlots: { customRender: 'projectName' }
+  }, {
+    title: '来款用途',
+    align: 'center',
+    width: 180,
+    dataIndex: 'chargeUse_dictText',
+    scopedSlots: { customRender: 'text' }
+  }, {
+    title: '来款单位',
+    align: 'center',
+    width: 200,
+    dataIndex: 'chargeCompanyTemporaryName',
+    scopedSlots: { customRender: 'text' }
+  }, {
+    title: '应收金额',
+    align: 'center',
+    width: 100,
+    dataIndex: 'receivableAmount'
+  }, {
+    title: '实收金额',
+    align: 'center',
+    width: 100,
+    dataIndex: 'paidAmount'
+  }, {
+    title: '负责人',
+    align: 'center',
+    width: 140,
+    dataIndex: 'principalName',
+    scopedSlots: { customRender: 'text' }
+  }, {
+    title: '企业联系人',
+    align: 'center',
+    width: 140,
+    dataIndex: 'contactsTemporaryName',
+    scopedSlots: { customRender: 'text' }
+  }, {
+    title: '打包',
+    align: 'center',
+    width: 80,
+    dataIndex: 'pack',
+    scopedSlots: { customRender: 'status-pack' }
+  }, {
+    title: '需要发票',
+    align: 'center',
+    width: 80,
+    dataIndex: 'needInvoice',
+    scopedSlots: { customRender: 'status-pack' }
+  }, {
+    title: '到账',
+    align: 'center',
+    width: 80,
+    dataIndex: 'inAccount',
+    scopedSlots: { customRender: 'status' }
+  }, {
+    title: '开票',
+    align: 'center',
+    width: 80,
+    dataIndex: 'makeInvoice',
+    scopedSlots: { customRender: 'status' }
+  }, {
+    title: '邮寄',
+    align: 'center',
+    width: 80,
+    dataIndex: 'mail',
+    scopedSlots: { customRender: 'status' }
+  }, {
+    title: '操作',
+    dataIndex: 'action',
+    align: 'center',
+    fixed: 'right',
+    width: 160,
+    scopedSlots: { customRender: 'action' }
+  }
+]
+// 工作组项目表头
+const workingProjectColumns = [
+  {
+    title: '序号',
+    dataIndex: '',
+    key: 'rowIndex',
+    width: 60,
+    align: 'center',
+    customRender: function (t, r, index) {
+      return parseInt(index) + 1
+    }
+  }, {
+    title: '工作组项目',
+    align: 'center',
+    dataIndex: 'workingGroupProject',
+    scopedSlots: { customRender: 'projectName' }
+  }, {
+    title: '负责人A',
+    align: 'center',
+    dataIndex: 'principalNameA'
+  }, {
+    title: '进度',
+    align: 'center',
+    dataIndex: 'obj',
+    width: 250,
+    scopedSlots: { customRender: 'rateOfProgress' }
+  }, {
+    title: '操作',
+    dataIndex: 'action',
+    align: 'center',
+    fixed: 'right',
+    width: 180,
+    scopedSlots: { customRender: 'action' }
+  }
+]
+// 会议项目表头
+const meetingProjectColumns = []
+// 会员项目表头
+const memberProjectColums = []
 
 export default {
   name: 'RevenueContractModule',
-  components: { PageHeaderTitle, CompanySelect, SelectContacts },
+  components: {
+    PageHeaderTitle,
+    CompanySelect,
+    SelectContacts,
+    SelectPrincipal,
+    JDate,
+    JYearDate,
+    InstallmentForm,
+    ProjectTypeSelection,
+    SelectProjectModule
+  },
   data() {
     return {
       IconImg,
       form: this.$form.createForm(this),
+      model: {},
       labelCol: {
         xs: { span: 24 },
-        sm: { span: 8 }
+        sm: { span: 10 }
       },
       wrapperCol: {
         xs: { span: 24 },
-        sm: { span: 16 }
+        sm: { span: 14 }
       },
       validatorRules: {
-
-      }
+        contractNum: {
+          rules: [{ required: true, validator: this.checkCompanyName }],
+          validateTrigger: 'blur'
+        },
+        contractName: {
+          rules: [{ required: true, validator: this.checkCompanyName }],
+          validateTrigger: 'blur'
+        },
+        signedCompany: {
+          rules: [{ required: true, message: '请选择签订单位' }],
+          validateTrigger: 'change'
+        },
+        signedContactsId: {
+          rules: [{ required: true, message: '请选择签订联系人' }],
+          validateTrigger: 'blur'
+        },
+        principalId: {
+          rules: [{ required: true, message: '请选择负责人' }],
+          validateTrigger: 'blur'
+        },
+        contractAmount: {
+          rules: [{ required: true, message: '请输入签订合同总金额' }],
+          validateTrigger: 'blur'
+        },
+        rate: {
+          rules: [{ required: true, message: '请输入税率' }],
+          validateTrigger: 'blur'
+        },
+        accountsReceivableAmount: {
+          rules: [{ required: true, message: '请输入应收金额' }],
+          validateTrigger: 'blur'
+        },
+        amountReceived: {
+          rules: [{ required: true, message: '请输入已收金额' }],
+          validateTrigger: 'blur'
+        },
+        package: {
+          rules: [{ required: true, message: '请选择是否打包' }],
+          validateTrigger: 'blur'
+        }
+      },
+      url: {
+        add: '',
+        edit: '',
+        generalProjectList: '/project/payCommonProject/list',
+        workingGroupProjectList: '/project/payWorkingGroup/list',
+        meetingProjectList: '',
+        memberProjectList: ''
+      },
+      selectedCompany: null, // 选中的企业
+      installmentList: [],
+      isSaved: false // 是否保存上方数据
     }
   },
-  created() {
-    console.log(this.$route)
+  mounted() {
+    if (this.$route.query.hasOwnProperty('revenueId')) {
+      this.edit(this.$route.query.revenueId)
+    } else {
+      this.add()
+    }
+  },
+  methods: {
+    add() {
+      this.$refs.installmentForm.initInstallmentList({})
+    },
+    edit(id) {
+      console.log(id)
+      let record
+      this.$refs.installmentForm.initInstallmentList(record.initInstallmentList)
+      this.model = Object.assign({}, record)
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompany', 'signedContactsId', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'amountReceived', 'accountStatus', 'contractPaymentTimes', 'package', 'packageYear'))
+      })
+    },
+    handleSave() {
+      // 验证分期信息
+      this.$refs.installmentForm.handleSave()
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          if (this.installmentList.length > 0) {
+            console.log(values, '---外层form表单保存')
+          }
+        }
+      })
+      // 保存上方表单信息，（应该在表单验证完全正确时置为true）
+      this.isSaved = true
+    },
+    handleCancle() {
+      this.model = {}
+    },
+    installmentFormOk(value) {
+      this.installmentList = value.installmentList
+    },
+    /**
+     * 选中企业变化
+     * @param value
+     */
+    handleSignedCompanyChange(value) {
+      this.selectedCompany = value
+      this.model.signedContactsId = undefined
+    },
+    /**
+     * 选择关联项目
+     */
+    chooseProject() {
+      this.$refs.projectTypeSelection.open()
+    },
+    selectProjectTypeOk(type) {
+      let title = ''
+      switch (type) {
+        case 1:
+          this.$refs.selectProjectModule.columns = generalProjectColumns
+          this.$refs.selectProjectModule.url.list = this.url.generalProjectList
+          title = '普通项目列表'
+          break
+        case 2:
+          this.$refs.selectProjectModule.columns = workingProjectColumns
+          this.$refs.selectProjectModule.url.list = this.url.workingGroupProjectList
+          title = '工作组项目列表'
+          break
+        case 3:
+          this.$refs.selectProjectModule.columns = meetingProjectColumns
+          this.$refs.selectProjectModule.url.list = this.url.meetingProjectList
+          title = '会议项目列表'
+          break
+        case 4:
+          this.$refs.selectProjectModule.columns = memberProjectColums
+          this.$refs.selectProjectModule.url.list = this.url.memberProjectList
+          title = '会员项目列表'
+          break
+      }
+      this.$refs.selectProjectModule.projectType = type
+      this.$refs.selectProjectModule.title = title
+      this.$refs.selectProjectModule.open()
+    }
   }
 }
 </script>
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
+
+.associated-project {
+  margin-top: 2px;
+}
+
+.ant-divider-horizontal {
+  margin: 20px 0;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue
new file mode 100644
index 0000000..2c9205c
--- /dev/null
+++ b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue
@@ -0,0 +1,151 @@
+<template>
+  <j-modal :title="title"
+           :width="width"
+           :visible="visible"
+           :confirmLoading="confirmLoading"
+           switchFullscreen
+           @ok="handleOk"
+           @cancel="handleCancel"
+           cancelText="关闭">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row>
+          <!--          普通项目管理查询-->
+          <template v-if="projectType === 1">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="科室" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input placeholder="请输入科室" v-model="queryParam.chargeCompanyTemporaryName"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="负责人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <select-principal placeholder="请选择负责人" v-model="queryParam.principalId"></select-principal>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="运行年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-year-date style="width:100%" placeholder="请选择运行年份" v-model="queryParam.year"></j-year-date>
+              </a-form-item>
+            </a-col>
+          </template>
+
+          <!--          工作组项目查询-->
+          <template v-if="projectType === 2">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="工作组项目" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input placeholder="请输入工作组项目" v-model="queryParam.workingGroupProject"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="运行年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-year-date style="width:100%" placeholder="请选择运行年份" v-model="queryParam.year"></j-year-date>
+              </a-form-item>
+            </a-col>
+          </template>
+
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" icon="search" @click="searchQuery">查询</a-button>
+              <a-button icon="reload" @click="searchReset">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+
+    <!--    操作按钮区域-->
+    <div class="table-operator">
+      <a-button type="primary" icon="plus" @click="handleAdd">新增</a-button>
+    </div>
+    <!--    操作按钮区域-end-->
+
+    <!--    表格区域-->
+    <div>
+      <a-table
+          ref="table"
+          size="middle"
+          bordered
+          rowKey="id"
+          :columns="columns"
+          :dataSource="dataSource"
+          :pagination="ipagination"
+          :loading="loading"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: 'radio'}"
+          @change="handleTableChange"
+          class="j-table-force-nowrap">
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt=""
+               style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <j-ellipsis @click.native="uploadFile(record.chargeNoticeFileId)" style="color:#219AFF;cursor: pointer"
+                      :value="text" :length="20"/>
+        </template>
+        <template slot="text" slot-scope="text">
+          <j-ellipsis :value="text" :length="30"></j-ellipsis>
+        </template>
+      </a-table>
+    </div>
+    <!--    /表格区域-->
+  </j-modal>
+</template>
+
+<script>
+import { JeroListMixin } from '../../../../mixins/JeroListMixin'
+import SelectPrincipal from '../../../../components/company/SelectPrincipal'
+import JYearDate from '../../../../components/jero/JYearDate'
+
+export default {
+  name: 'SelectProjectModule',
+  components: { SelectPrincipal, JYearDate },
+  mixins: [JeroListMixin],
+  data() {
+    return {
+      title: '操作',
+      width: 1200,
+      visible: false,
+      confirmLoading: false,
+      columns: [],
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 10 }
+      },
+      projectType: null,
+      url: {
+        list: ''
+      }
+    }
+  },
+  methods: {
+    open() {
+      this.visible = true
+      console.log(this.columns)
+    },
+    close() {
+      this.visible = false
+    },
+    handleOk() {
+
+    },
+    handleCancel() {
+      this.close()
+    },
+    handleAdd() {
+
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+@import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index f6dac86..ed47028 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -7,16 +7,16 @@
 
 
 export default {
-  name: "Analysis",
+  name: 'Analysis',
   components: {},
   data() {
     return {
       indexStyle: 1
-    };
+    }
   },
   created() {
 
   },
   methods: {}
-};
+}
 </script>
diff --git a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue
index 38a6daf..51864f6 100644
--- a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue
+++ b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue
@@ -192,9 +192,9 @@ export default {
       )
     },
     handleAdd() {
-      this.$refs.modalForm.add();
-      this.$refs.modalForm.title = "新增群组";
-      this.$refs.modalForm.disableSubmit = false;
+      this.$refs.modalForm.add()
+      this.$refs.modalForm.title = '新增群组'
+      this.$refs.modalForm.disableSubmit = false
     },
     /**
      * 新增成员
@@ -202,31 +202,31 @@ export default {
      */
     handleAddCommitteeMember(record) {
       record.committeeId = record.id
-      this.$refs.memberModalForm.add(record);
-      this.$refs.memberModalForm.title = "新增成员";
-      this.$refs.memberModalForm.disableSubmit = false;
+      this.$refs.memberModalForm.add(record)
+      this.$refs.memberModalForm.title = '新增成员'
+      this.$refs.memberModalForm.disableSubmit = false
     },
     handleDeleteMember(id) {
       console.log(id)
       if (!this.url.deleteMember) {
-        this.$message.error("请设置url.deleteMember属性!")
+        this.$message.error('请设置url.deleteMember属性!')
         return
       }
-      var that = this;
+      var that = this
       this.$confirm({
-        title: "确认删除",
-        content: "确定要删除此条数据吗?",
+        title: '确认删除',
+        content: '确定要删除此条数据吗?',
         onOk: function () {
           getAction(that.url.deleteMember, {id: id}).then((res) => {
             if (res.success) {
-              that.$message.success(res.message);
-              that.loadData();
+              that.$message.success(res.message)
+              that.loadData()
             } else {
-              that.$message.warning(res.message);
+              that.$message.warning(res.message)
             }
-          });
+          })
         }
-      });
+      })
     },
   }
 }
diff --git a/src/views/exception/ExceptionPage.vue b/src/views/exception/ExceptionPage.vue
index 0550d5e..455b15c 100644
--- a/src/views/exception/ExceptionPage.vue
+++ b/src/views/exception/ExceptionPage.vue
@@ -17,7 +17,7 @@
   import types from './type'
 
   export default {
-    name: "Exception",
+    name: 'Exception',
     props: {
       type: {
         type: String,
diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index 120cc6e..0e57a90 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -301,23 +301,23 @@
 </template>
 
 <script>
-import {getUserInfo, getMeetInfoById,getAllWorkProjects} from "@api/inconmeMeetingApi";
-import {isRepeat} from "@/utils/util";
-import {httpAction} from "@api/manage";
-import JDictSelectTag from "@comp/dict/JDictSelectTag";
-import JYearDate from "@comp/jero/JYearDate";
-import JUpload from "@comp/jero/JUpload";
+import {getUserInfo, getMeetInfoById,getAllWorkProjects} from '@api/inconmeMeetingApi'
+import {isRepeat} from '@/utils/util'
+import {httpAction} from '@api/manage'
+import JDictSelectTag from '@comp/dict/JDictSelectTag'
+import JYearDate from '@comp/jero/JYearDate'
+import JUpload from '@comp/jero/JUpload'
 // import JDate from "@comp/tools/JDate";
-import JDate from "@comp/jero/JDate";
-import SelectPrincipal from "@comp/company/SelectPrincipal";
-import JAreaLinkage from "@comp/jero/JAreaLinkagePca";
-import AreaPca from "@comp/_util/AreaPca";
+import JDate from '@comp/jero/JDate'
+import SelectPrincipal from '@comp/company/SelectPrincipal'
+import JAreaLinkage from '@comp/jero/JAreaLinkagePca'
+import AreaPca from '@comp/_util/AreaPca'
 import moment from 'moment'
-import pick from "lodash.pick";
-import meetingValidate from "@views/incomePayments/meetManage/meetingValidate";
+import pick from 'lodash.pick'
+import meetingValidate from '@views/incomePayments/meetManage/meetingValidate'
 
 export default {
-  name: "AddOrDetailMeet",
+  name: 'AddOrDetailMeet',
   components: {
     JDictSelectTag,
     JYearDate,
@@ -353,7 +353,7 @@ export default {
       // 详细地址
       address: '',
       // 会议类型 新增时默认为其他会议
-      meetingType: "4",
+      meetingType: '4',
       validatorRules: meetingValidate,
       validateInviteCode: {
         invitationCode: {
@@ -364,8 +364,8 @@ export default {
         }
       },
       url: {
-        add: "/meeting/payMeeting/add",
-        edit: "/meeting/payMeeting/edit",
+        add: '/meeting/payMeeting/add',
+        edit: '/meeting/payMeeting/edit',
       },
       // 召开时间
       newConvokeTime: '',
@@ -376,7 +376,7 @@ export default {
     }
   },
   created() {
-    this.pcaData = new AreaPca();
+    this.pcaData = new AreaPca()
     // 编辑获取会议信息
     if (this.$route.query.id) {
       getMeetInfoById({id: this.$route.query.id}).then(res => {
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index c4da9ce..9a12357 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -109,19 +109,19 @@
 </template>
 
 <script>
-import {JeroListMixin} from "@/mixins/JeroListMixin";
-import {mixinDevice} from "@/utils/mixin";
-import JYearDate from "@comp/jero/JYearDate";
-import JDictSelectTag from "@comp/dict/JDictSelectTag";
-import ImportParticipantModal from "@views/incomePayments/meetManage/modules/ImportParticipantModal";
-import BatchInvocieModal from "@views/incomePayments/meetManage/modules/BatchInvocieModal";
-import BatchSetDockerModal from "@views/incomePayments/meetManage/modules/BatchSetDockerModal";
-import ProjectDetailModal from "@comp/ProjectDetailModal";
-import AuditModal from "@views/incomePayments/meetManage/modules/AuditModal";
+import {JeroListMixin} from '@/mixins/JeroListMixin'
+import {mixinDevice} from '@/utils/mixin'
+import JYearDate from '@comp/jero/JYearDate'
+import JDictSelectTag from '@comp/dict/JDictSelectTag'
+import ImportParticipantModal from '@views/incomePayments/meetManage/modules/ImportParticipantModal'
+import BatchInvocieModal from '@views/incomePayments/meetManage/modules/BatchInvocieModal'
+import BatchSetDockerModal from '@views/incomePayments/meetManage/modules/BatchSetDockerModal'
+import ProjectDetailModal from '@comp/ProjectDetailModal'
+import AuditModal from '@views/incomePayments/meetManage/modules/AuditModal'
 
 
 export default {
-  name: "Attendance",
+  name: 'Attendance',
   mixins: [JeroListMixin, mixinDevice],
   components: {
     JYearDate,
@@ -141,84 +141,84 @@ export default {
           dataIndex: '',
           key: 'rowIndex',
           width: 60,
-          align: "center",
+          align: 'center',
           customRender: function (t, r, index) {
-            return parseInt(index) + 1;
+            return parseInt(index) + 1
           }
         },
         {
           title: '参会单位',
-          align: "center",
+          align: 'center',
           dataIndex: '',
           scopedSlots: {customRender: 'htmlSlot'}
         },
         {
           title: '参会人员',
-          align: "center",
+          align: 'center',
           dataIndex: '',
         },
         {
           title: '应收金额',
-          align: "center",
+          align: 'center',
           dataIndex: ''
         },
         {
           title: '实收金额',
-          align: "center",
+          align: 'center',
           dataIndex: ''
         },
         {
           title: '缴费方式',
-          align: "center",
+          align: 'center',
           dataIndex: ''
         },
         {
           title: '是否签到',
-          align: "center",
+          align: 'center',
           dataIndex: ''
         },
         {
           title: '打包',
-          align: "center",
+          align: 'center',
           dataIndex: ''
         },
         {
           title: '需要发票',
-          align: "center",
+          align: 'center',
           dataIndex: ''
         },
         {
           title: '到账',
-          align: "center",
+          align: 'center',
           dataIndex: ''
         },
         {
           title: '开票',
-          align: "center",
+          align: 'center',
           dataIndex: ''
         },
         {
           title: '邮寄',
-          align: "center",
+          align: 'center',
           dataIndex: ''
         },
         {
           title: '对接人',
-          align: "center",
+          align: 'center',
           dataIndex: ''
         },
         {
           title: '操作',
-          align: "center",
+          align: 'center',
           scopedSlots: {customRender: 'action'}
         },
       ],
       url: {
-        list: "/jero/memberProject/page",
-        delete: "/jero/memberProject/delete",
-        deleteBatch: "/jero/memberProject/deleteBatch",
-        exportXlsUrl: "/jero/memberProject/exportXls",
-        importExcelUrl: "jero/memberProject/importExcel",
+        list: '/jero/memberProject/page',
+        delete: '/jero/memberProject/delete',
+        deleteBatch: '/jero/memberProject/deleteBatch',
+        exportXlsUrl: '/jero/memberProject/exportXls',
+        importExcelUrl: 'jero/memberProject/importExcel',
       },
     }
   },
@@ -259,7 +259,7 @@ export default {
           // 打开模态框
           this.$refs.batchInvoiceModal.open()
         }else {
-          let initName = this.selectionRows[0].name;
+          let initName = this.selectionRows[0].name
           // 单位判重
           let flag = this.selectionRows.some(item => {
             return item.name !== initName
diff --git a/src/views/incomePayments/meetManage/MeetManageList.vue b/src/views/incomePayments/meetManage/MeetManageList.vue
index a976f88..ef3f4d3 100644
--- a/src/views/incomePayments/meetManage/MeetManageList.vue
+++ b/src/views/incomePayments/meetManage/MeetManageList.vue
@@ -98,14 +98,14 @@
 <script>
 import {mixinDevice} from '@/utils/mixin'
 import {JeroListMixin} from '@/mixins/JeroListMixin'
-import JYearDate from "@comp/jero/JYearDate";
-import UploadMeetFileModal from "@views/incomePayments/meetManage/modules/UploadMeetFileModal";
-import PageHeaderTitle from "@comp/layouts/PageHeaderTitle";
+import JYearDate from '@comp/jero/JYearDate'
+import UploadMeetFileModal from '@views/incomePayments/meetManage/modules/UploadMeetFileModal'
+import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import IconImg from '@/assets/imgs/icon/icon_company_management.png'
-import "@/assets/less/TableExpand.less";
+import '@/assets/less/TableExpand.less'
 
 export default {
-  name: "MeetManageList",
+  name: 'MeetManageList',
   mixins: [JeroListMixin, mixinDevice],
   components: {
     JYearDate,
@@ -122,33 +122,33 @@ export default {
           dataIndex: '',
           key: 'rowIndex',
           width: 60,
-          align: "center",
+          align: 'center',
           customRender: function (t, r, index) {
-            return parseInt(index) + 1;
+            return parseInt(index) + 1
           }
         },
         {
           title: '会议名称',
-          align: "center",
+          align: 'center',
           dataIndex: 'meetingName',
           scopedSlots: {customRender: 'htmlSlot'},
           width: 160,
         },
         {
           title: '会议类型',
-          align: "center",
+          align: 'center',
           dataIndex: 'meetingType_dictText',
           width: 100,
         },
         {
           title: '负责人',
-          align: "center",
+          align: 'center',
           dataIndex: 'directorName',
           width: 160,
         },
         {
           title: '召开时间',
-          align: "center",
+          align: 'center',
           dataIndex: 'startTime',
           width: 160,
           customRender:function (text,record) {
@@ -157,7 +157,7 @@ export default {
         },
         {
           title: '召开地点',
-          align: "center",
+          align: 'center',
           dataIndex: 'venue',
           width: 160,
           customRender:function (text,record){
@@ -166,35 +166,35 @@ export default {
         },
         {
           title: '年份',
-          align: "center",
+          align: 'center',
           dataIndex: 'particularYear',
           width: 100,
         },
         {
           title: '创建时间',
-          align: "center",
+          align: 'center',
           dataIndex: 'createTime',
         },
         {
           title: '操作',
-          align: "center",
+          align: 'center',
           fixed:'right',
           width: 160,
           scopedSlots: {customRender: 'action'}
         },
       ],
       url: {
-        list: "/meeting/payMeeting/page",
-        delete: "/meeting/payMeeting/delete",
-        deleteBatch: "/meeting/payMeeting/deleteBatch",
-        exportXlsUrl: "/meeting/payMeeting/exportXls",
-        importExcelUrl: "meeting/payMeeting/importExcel",
+        list: '/meeting/payMeeting/page',
+        delete: '/meeting/payMeeting/delete',
+        deleteBatch: '/meeting/payMeeting/deleteBatch',
+        exportXlsUrl: '/meeting/payMeeting/exportXls',
+        importExcelUrl: 'meeting/payMeeting/importExcel',
       },
     }
   },
   computed: {
     importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
     },
   },
   methods: {
@@ -238,7 +238,7 @@ export default {
     * */
     toAttendance(record){
       this.$router.push({
-        path:"/incomePayments/meetManage/Attendance",
+        path:'/incomePayments/meetManage/Attendance',
         query:{
           id:record.id
         }
diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
index 4f2cc6a..ce74a7e 100644
--- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
+++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
@@ -309,15 +309,15 @@
 </template>
 
 <script>
-import CompanySelect from "@comp/company/CompanySelect";
-import SelectContacts from "@comp/company/SelectContacts";
-import JDate from "@comp/jero/JDate";
-import JImageUpload from "@comp/jero/JImageUpload";
-import JDictSelectTag from "@comp/dict/JDictSelectTag";
-import JUpload from "@comp/jero/JUpload";
+import CompanySelect from '@comp/company/CompanySelect'
+import SelectContacts from '@comp/company/SelectContacts'
+import JDate from '@comp/jero/JDate'
+import JImageUpload from '@comp/jero/JImageUpload'
+import JDictSelectTag from '@comp/dict/JDictSelectTag'
+import JUpload from '@comp/jero/JUpload'
 
 export default {
-  name: "SignUpInfoEdit",
+  name: 'SignUpInfoEdit',
   components:{
     CompanySelect,
     SelectContacts,
@@ -360,7 +360,7 @@ export default {
     *  保存
     * */
     nextStep(){
-      console.log("保存")
+      console.log('保存')
     },
     /*
     *  确定
diff --git a/src/views/incomePayments/meetManage/SignUpInfoList.vue b/src/views/incomePayments/meetManage/SignUpInfoList.vue
index dd92506..5e2e857 100644
--- a/src/views/incomePayments/meetManage/SignUpInfoList.vue
+++ b/src/views/incomePayments/meetManage/SignUpInfoList.vue
@@ -94,12 +94,12 @@
 <script>
 import {mixinDevice} from '@/utils/mixin'
 import {JeroListMixin} from '@/mixins/JeroListMixin'
-import JDictSelectTag from "@comp/dict/JDictSelectTag";
-import PageHeaderTitle from "@comp/layouts/PageHeaderTitle";
+import JDictSelectTag from '@comp/dict/JDictSelectTag'
+import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import IconImg from '@/assets/imgs/icon/icon_company_management.png'
 
 export default {
-  name: "SignUpInfoList",
+  name: 'SignUpInfoList',
   mixins: [JeroListMixin, mixinDevice],
   components: {
     JDictSelectTag,
@@ -107,7 +107,7 @@ export default {
   },
   data() {
     return {
-      descripion: "报名信息页面",
+      descripion: '报名信息页面',
       IconImg,
       columns: [
         {
@@ -115,44 +115,44 @@ export default {
           dataIndex: '',
           key: 'rowIndex',
           width: 60,
-          align: "center",
+          align: 'center',
           customRender: function (t, r, index) {
-            return parseInt(index) + 1;
+            return parseInt(index) + 1
           }
         },
         {
           title: '企业名称',
-          align: "center",
+          align: 'center',
           dataIndex: '',
         },
         {
           title: '姓名',
-          align: "center",
+          align: 'center',
           dataIndex: '',
         },
         {
           title: '身份',
-          align: "center",
+          align: 'center',
           dataIndex: '',
         },
         {
           title: '手机号',
-          align: "center",
+          align: 'center',
           dataIndex: '',
         },
         {
           title: '职务',
-          align: "center",
+          align: 'center',
           dataIndex: '',
         },
         {
           title: '邮箱',
-          align: "center",
+          align: 'center',
           dataIndex: '',
         },
         {
           title: '操作',
-          align: "center",
+          align: 'center',
           dataIndex: '',
           scopedSlots: {customRender: 'action'}
         },
@@ -166,11 +166,11 @@ export default {
         sm: {span: 18}
       },
       url: {
-        list: "/jero/memberProject/page",
-        delete: "/jero/memberProject/delete",
-        deleteBatch: "/jero/memberProject/deleteBatch",
-        exportXlsUrl: "/jero/memberProject/exportXls",
-        importExcelUrl: "jero/memberProject/importExcel",
+        list: '/jero/memberProject/page',
+        delete: '/jero/memberProject/delete',
+        deleteBatch: '/jero/memberProject/deleteBatch',
+        exportXlsUrl: '/jero/memberProject/exportXls',
+        importExcelUrl: 'jero/memberProject/importExcel',
       },
     }
   },
diff --git a/src/views/incomePayments/meetManage/modules/AuditModal.vue b/src/views/incomePayments/meetManage/modules/AuditModal.vue
index af895a6..85572e3 100644
--- a/src/views/incomePayments/meetManage/modules/AuditModal.vue
+++ b/src/views/incomePayments/meetManage/modules/AuditModal.vue
@@ -90,10 +90,10 @@
 </template>
 
 <script>
-import JImageUpload from "@comp/jero/JImageUpload";
+import JImageUpload from '@comp/jero/JImageUpload'
 
 export default {
-  name: "AuditModal",
+  name: 'AuditModal',
   components: {
     JImageUpload
   },
@@ -136,8 +136,8 @@ export default {
         }
       },
       url: {
-        add: "/jero/memberProject/add",
-        edit: "/jero/memberProject/edit",
+        add: '/jero/memberProject/add',
+        edit: '/jero/memberProject/edit',
       }
     }
   },
diff --git a/src/views/incomePayments/meetManage/modules/BatchInvocieModal.vue b/src/views/incomePayments/meetManage/modules/BatchInvocieModal.vue
index b6df76b..c24b9ac 100644
--- a/src/views/incomePayments/meetManage/modules/BatchInvocieModal.vue
+++ b/src/views/incomePayments/meetManage/modules/BatchInvocieModal.vue
@@ -62,10 +62,10 @@
 </template>
 
 <script>
-import SelectContacts from "@comp/company/SelectContacts";
+import SelectContacts from '@comp/company/SelectContacts'
 
 export default {
-  name: "BatchInvocieModal",
+  name: 'BatchInvocieModal',
   components:{
     SelectContacts
   },
@@ -101,8 +101,8 @@ export default {
         }
       },
       url: {
-        add: "/jero/memberProject/add",
-        edit: "/jero/memberProject/edit",
+        add: '/jero/memberProject/add',
+        edit: '/jero/memberProject/edit',
       }
     }
   },
diff --git a/src/views/incomePayments/meetManage/modules/BatchSetDockerModal.vue b/src/views/incomePayments/meetManage/modules/BatchSetDockerModal.vue
index d08c034..07357d8 100644
--- a/src/views/incomePayments/meetManage/modules/BatchSetDockerModal.vue
+++ b/src/views/incomePayments/meetManage/modules/BatchSetDockerModal.vue
@@ -27,9 +27,9 @@
 </template>
 
 <script>
-import SelectPrincipal from "@comp/company/SelectPrincipal";
+import SelectPrincipal from '@comp/company/SelectPrincipal'
 export default {
-  name: "BatchSetDockerModal",
+  name: 'BatchSetDockerModal',
   components:{
     SelectPrincipal
   },
@@ -63,8 +63,8 @@ export default {
         }
       },
       url: {
-        add: "/jero/memberProject/add",
-        edit: "/jero/memberProject/edit",
+        add: '/jero/memberProject/add',
+        edit: '/jero/memberProject/edit',
       }
     }
   },
diff --git a/src/views/incomePayments/meetManage/modules/ImportParticipantModal.vue b/src/views/incomePayments/meetManage/modules/ImportParticipantModal.vue
index aab77c9..009902a 100644
--- a/src/views/incomePayments/meetManage/modules/ImportParticipantModal.vue
+++ b/src/views/incomePayments/meetManage/modules/ImportParticipantModal.vue
@@ -66,16 +66,16 @@
 </template>
 
 <script>
-import {JeroListMixin} from "@/mixins/JeroListMixin";
-import {mixinDevice} from "@/utils/mixin";
-import {postAction} from "@api/manage";
+import {JeroListMixin} from '@/mixins/JeroListMixin'
+import {mixinDevice} from '@/utils/mixin'
+import {postAction} from '@api/manage'
 
 export default {
-  name: "ImportParticipantModal",
+  name: 'ImportParticipantModal',
   mixins: [JeroListMixin, mixinDevice],
   data() {
     return {
-      description: "导入参会人模态框",
+      description: '导入参会人模态框',
       disableMixinCreated: true,
       title: '操作',
       width: 1000,
@@ -88,45 +88,45 @@ export default {
           dataIndex: '',
           key: 'rowIndex',
           width: 60,
-          align: "center",
+          align: 'center',
           customRender: function (t, r, index) {
-            return parseInt(index) + 1;
+            return parseInt(index) + 1
           }
         },
         {
           title: '企业名称',
-          align: "center",
+          align: 'center',
           dataIndex: '',
         },
         {
           title: '姓名',
-          align: "center",
+          align: 'center',
           dataIndex: '',
         },
         {
           title: '身份',
-          align: "center",
+          align: 'center',
           dataIndex: '',
         },
         {
           title: '手机号',
-          align: "center",
+          align: 'center',
           dataIndex: '',
         },
         {
           title: '职务',
-          align: "center",
+          align: 'center',
           dataIndex: '',
         },
         {
           title: '邮箱',
-          align: "center",
+          align: 'center',
           dataIndex: '',
         },
       ],
       model: {},
       url: {
-        list: "/jero/memberProject/page",
+        list: '/jero/memberProject/page',
         add: ''
       }
     }
@@ -141,7 +141,7 @@ export default {
       }
       if (this.selectionRows.length === 0) {
         this.$message.warn('请选择一条记录')
-        return;
+        return
       }
       if (this.selectionRows.length > 0) {
         this.flag = true
diff --git a/src/views/incomePayments/meetManage/modules/MeetModal.vue b/src/views/incomePayments/meetManage/modules/MeetModal.vue
index e2fac5e..e0a79d8 100644
--- a/src/views/incomePayments/meetManage/modules/MeetModal.vue
+++ b/src/views/incomePayments/meetManage/modules/MeetModal.vue
@@ -82,14 +82,14 @@
 </template>
 
 <script>
-import pick from "lodash.pick";
-import {httpAction} from "@api/manage";
-import JYearDate from "@comp/jero/JYearDate";
-import JUpload from "@comp/jero/JUpload";
-import SelectPrincipal from "@comp/company/SelectPrincipal";
+import pick from 'lodash.pick'
+import {httpAction} from '@api/manage'
+import JYearDate from '@comp/jero/JYearDate'
+import JUpload from '@comp/jero/JUpload'
+import SelectPrincipal from '@comp/company/SelectPrincipal'
 
 export default {
-  name: "MeetModal",
+  name: 'MeetModal',
   components: {
     JYearDate,
     JUpload,
@@ -136,8 +136,8 @@ export default {
         }
       },
       url: {
-        add: "/jero/memberProject/add",
-        edit: "/jero/memberProject/edit",
+        add: '/jero/memberProject/add',
+        edit: '/jero/memberProject/edit',
       }
     }
   },
diff --git a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
index 5e59bca..fb7318a 100644
--- a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
+++ b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
@@ -25,11 +25,11 @@
 </template>
 
 <script>
-import {httpAction} from "@api/manage";
-import JUpload from "@comp/jero/JUpload";
+import {httpAction} from '@api/manage'
+import JUpload from '@comp/jero/JUpload'
 
 export default {
-  name: "UploadMeetFileModal",
+  name: 'UploadMeetFileModal',
   components:{
     JUpload
   },
@@ -56,8 +56,8 @@ export default {
         }
       },
       url: {
-        add: "/jero/memberProject/add",
-        edit: "/jero/memberProject/edit",
+        add: '/jero/memberProject/add',
+        edit: '/jero/memberProject/edit',
       }
     }
   },
diff --git a/src/views/incomePayments/memberManage/MemberProjectList.vue b/src/views/incomePayments/memberManage/MemberProjectList.vue
index 5b8e69f..b34c8a1 100644
--- a/src/views/incomePayments/memberManage/MemberProjectList.vue
+++ b/src/views/incomePayments/memberManage/MemberProjectList.vue
@@ -78,14 +78,14 @@
 <script>
 import {mixinDevice} from '@/utils/mixin'
 import {JeroListMixin} from '@/mixins/JeroListMixin'
-import JYearDate from "@comp/jero/JYearDate";
-import MemberProjectModal from "@views/incomePayments/memberManage/modules/MemberProjectModal";
-import PageHeaderTitle from "@comp/layouts/PageHeaderTitle";
+import JYearDate from '@comp/jero/JYearDate'
+import MemberProjectModal from '@views/incomePayments/memberManage/modules/MemberProjectModal'
+import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import IconImg from '@/assets/imgs/icon/icon_company_management.png'
 
 export default {
   mixins: [JeroListMixin, mixinDevice],
-  name: "MemberProjectList",
+  name: 'MemberProjectList',
   components: {
     JYearDate,
     MemberProjectModal,
@@ -101,46 +101,46 @@ export default {
           dataIndex: '',
           key: 'rowIndex',
           width: 60,
-          align: "center",
+          align: 'center',
           customRender: function (t, r, index) {
-            return parseInt(index) + 1;
+            return parseInt(index) + 1
           }
         },
         {
           title: '会员项目',
-          align: "center",
+          align: 'center',
           dataIndex: 'projectName',
           scopedSlots: {customRender: 'htmlSlot'}
         },
         {
           title: '收费标准',
-          align: "center",
+          align: 'center',
           dataIndex: 'chargeStandard',
 
         },
         {
           title: '负责人',
-          align: "center",
+          align: 'center',
           dataIndex: 'directorName'
         },
         {
           title: '操作',
-          align: "center",
+          align: 'center',
           scopedSlots: {customRender: 'action'}
         },
       ],
       url: {
-        list: "/jero/memberProject/page",
-        delete: "/jero/memberProject/delete",
-        deleteBatch: "/jero/memberProject/deleteBatch",
-        exportXlsUrl: "/jero/memberProject/exportXls",
-        importExcelUrl: "jero/memberProject/importExcel",
+        list: '/jero/memberProject/page',
+        delete: '/jero/memberProject/delete',
+        deleteBatch: '/jero/memberProject/deleteBatch',
+        exportXlsUrl: '/jero/memberProject/exportXls',
+        importExcelUrl: 'jero/memberProject/importExcel',
       },
     }
   },
   computed: {
     importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
     },
   },
   methods: {
diff --git a/src/views/incomePayments/memberManage/SafeguardMemberList.vue b/src/views/incomePayments/memberManage/SafeguardMemberList.vue
index 2fb336d..8a6bd0f 100644
--- a/src/views/incomePayments/memberManage/SafeguardMemberList.vue
+++ b/src/views/incomePayments/memberManage/SafeguardMemberList.vue
@@ -116,18 +116,18 @@
 <script>
 import {mixinDevice} from '@/utils/mixin'
 import {JeroListMixin} from '@/mixins/JeroListMixin'
-import JYearDate from "@comp/jero/JYearDate";
-import SafeguardMemberModal from "@views/incomePayments/memberManage/modules/SafeguardMemberModal";
-import ProjectDetailModal from "@comp/ProjectDetailModal";
-import StatusSlot from "@comp/tools/StatusSlot";
-import PageHeaderTitle from "@comp/layouts/PageHeaderTitle";
+import JYearDate from '@comp/jero/JYearDate'
+import SafeguardMemberModal from '@views/incomePayments/memberManage/modules/SafeguardMemberModal'
+import ProjectDetailModal from '@comp/ProjectDetailModal'
+import StatusSlot from '@comp/tools/StatusSlot'
+import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import IconImg from '@/assets/imgs/icon/icon_company_management.png'
 
-import {getAction} from "@api/manage";
-import {getFileInfo} from "@api/api";
+import {getAction} from '@api/manage'
+import {getFileInfo} from '@api/api'
 
 export default {
-  name: "SafeguardMemberList",
+  name: 'SafeguardMemberList',
   mixins: [JeroListMixin, mixinDevice],
   components: {
     JYearDate,
@@ -146,65 +146,65 @@ export default {
           dataIndex: '',
           key: 'rowIndex',
           width: 60,
-          align: "center",
+          align: 'center',
           customRender: function (t, r, index) {
-            return parseInt(index) + 1;
+            return parseInt(index) + 1
           }
         },
         {
           title: '会员单位',
-          align: "center",
+          align: 'center',
           dataIndex: 'companyName',
           scopedSlots: {customRender: 'member'}
         },
         {
           title: '企业联系人',
-          align: "center",
+          align: 'center',
           dataIndex: 'companyContactName',
         },
         {
           title: '应收金额',
-          align: "center",
+          align: 'center',
           dataIndex: 'amountReceivable',
         },
         {
           title: '实收金额',
-          align: "center",
+          align: 'center',
           dataIndex: 'paidAmount',
         },
         {
           title: '打包',
-          align: "center",
+          align: 'center',
           dataIndex: 'pack',
           scopedSlots: {customRender: 'status-pack'}
         },
         {
           title: '需要发票',
-          align: "center",
+          align: 'center',
           dataIndex: 'needInvoice',
           scopedSlots: {customRender: 'status-pack'}
         },
         {
           title: '到账',
-          align: "center",
+          align: 'center',
           dataIndex: 'inAccount',
           scopedSlots: {customRender: 'status'}
         },
         {
           title: '开票',
-          align: "center",
+          align: 'center',
           dataIndex: 'makeInvoice',
           scopedSlots: {customRender: 'status'}
         },
         {
           title: '邮寄',
-          align: "center",
+          align: 'center',
           dataIndex: 'mail',
           scopedSlots: {customRender: 'status'}
         },
         {
           title: '操作',
-          align: "center",
+          align: 'center',
           dataIndex: '',
           scopedSlots: {customRender: 'action'}
         },
@@ -213,27 +213,27 @@ export default {
       // 当前项目基本信息
       currentInfo: {},
       url: {
-        list: "/jero/memberProjectSubitem/page",
-        delete: "/jero/memberProjectSubitem/delete",
-        deleteBatch: "/jero/memberProjectSubitem/deleteBatch",
-        exportXlsUrl: "/jero/memberProjectSubitem/exportXls",
-        importExcelUrl: "jero/memberProjectSubitem/importExcel",
-        downTemplateUrl: "jero/memberProjectSubitem/exportTemplate"
+        list: '/jero/memberProjectSubitem/page',
+        delete: '/jero/memberProjectSubitem/delete',
+        deleteBatch: '/jero/memberProjectSubitem/deleteBatch',
+        exportXlsUrl: '/jero/memberProjectSubitem/exportXls',
+        importExcelUrl: 'jero/memberProjectSubitem/importExcel',
+        downTemplateUrl: 'jero/memberProjectSubitem/exportTemplate'
       },
     }
   },
   computed: {
     importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
     },
   },
   created() {
     this.currentInfo = Object.assign({}, JSON.parse(this.$route.query.record))
-    console.log("=====", this.currentInfo)
+    console.log('=====', this.currentInfo)
     this.$store.commit('SET_CURRENTPROJECT', this.currentInfo)
-    this.loadData();
+    this.loadData()
     //初始化字典配置 在自己页面定义
-    this.initDictConfig();
+    this.initDictConfig()
     this.getChargeNoFile()
   },
   methods: {
@@ -251,34 +251,34 @@ export default {
     },
     loadData(arg) {
       if (!this.url.list) {
-        this.$message.error("请设置url.list属性!")
+        this.$message.error('请设置url.list属性!')
         return
       }
       //加载数据 若传入参数1则加载第一页的内容
       if (arg === 1) {
-        this.ipagination.current = 1;
+        this.ipagination.current = 1
       }
       //  传入项目id 查寻该项目下的成员
       this.filters.projectId = this.currentInfo.id
-      var params = this.getQueryParams();//查询条件
-      this.loading = true;
+      var params = this.getQueryParams()//查询条件
+      this.loading = true
       getAction(this.url.list, params).then((res) => {
         if (res.success) {
           //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
-          this.dataSource = res.result.records || res.result;
+          this.dataSource = res.result.records || res.result
           if (res.result.total) {
-            this.ipagination.total = res.result.total;
+            this.ipagination.total = res.result.total
             //清空列表选中
             this.onClearSelected()
           } else {
-            this.ipagination.total = 0;
+            this.ipagination.total = 0
           }
           //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
         }
         if (res.code === 510) {
           this.$message.warning(res.message)
         }
-        this.loading = false;
+        this.loading = false
       }).finally(() => {
         this.loading = false
       })
diff --git a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
index bea23ad..f3fab52 100644
--- a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
+++ b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
@@ -102,14 +102,14 @@
 </template>
 
 <script>
-import { mixinDevice } from "@/utils/mixin";
-import { JeroListMixin } from "@/mixins/JeroListMixin";
-import ProjectDetailModal from "@comp/ProjectDetailModal";
-import "@/assets/less/TableExpand.less";
-import StatusSlot from "@comp/tools/StatusSlot";
+import { mixinDevice } from '@/utils/mixin'
+import { JeroListMixin } from '@/mixins/JeroListMixin'
+import ProjectDetailModal from '@comp/ProjectDetailModal'
+import '@/assets/less/TableExpand.less'
+import StatusSlot from '@comp/tools/StatusSlot'
 
 export default {
-  name: "SafeguardStardsMemberList",
+  name: 'SafeguardStardsMemberList',
   mixins: [JeroListMixin, mixinDevice],
   components: {
     ProjectDetailModal,
@@ -119,100 +119,100 @@ export default {
     return {
       columns: [
         {
-          title: "序号",
-          dataIndex: "",
-          key: "rowIndex",
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
           width: 60,
-          align: "center",
+          align: 'center',
           customRender: function (t, r, index) {
-            return parseInt(index) + 1;
+            return parseInt(index) + 1
           },
         },
         {
-          title: "会员编号",
-          align: "center",
-          dataIndex: "memberNo",
+          title: '会员编号',
+          align: 'center',
+          dataIndex: 'memberNo',
         },
         {
-          title: "企业名称",
-          align: "center",
-          dataIndex: "companyName",
-          scopedSlots: { customRender: "detail" },
+          title: '企业名称',
+          align: 'center',
+          dataIndex: 'companyName',
+          scopedSlots: { customRender: 'detail' },
         },
         {
-          title: "会员类型",
-          align: "center",
-          dataIndex: "memberType_dictText",
+          title: '会员类型',
+          align: 'center',
+          dataIndex: 'memberType_dictText',
         },
         {
-          title: "联系人",
-          align: "center",
-          dataIndex: "liaisonMan",
+          title: '联系人',
+          align: 'center',
+          dataIndex: 'liaisonMan',
         },
         {
-          title: "邮箱",
-          align: "center",
-          dataIndex: "email",
+          title: '邮箱',
+          align: 'center',
+          dataIndex: 'email',
         },
         {
-          title: "手机",
-          align: "center",
-          dataIndex: "mobile",
+          title: '手机',
+          align: 'center',
+          dataIndex: 'mobile',
         },
         {
-          title: "会员状态",
-          align: "center",
-          dataIndex: "memberStatus_dictText",
+          title: '会员状态',
+          align: 'center',
+          dataIndex: 'memberStatus_dictText',
         },
         {
-          title: "注册时间",
-          align: "center",
-          dataIndex: "registerTime",
-          scopedSlots: { customRender: "htmlSlot" },
+          title: '注册时间',
+          align: 'center',
+          dataIndex: 'registerTime',
+          scopedSlots: { customRender: 'htmlSlot' },
         },
         {
-          title: "打包",
-          align: "center",
-          dataIndex: "pack",
-          scopedSlots: { customRender: "status-pack" },
+          title: '打包',
+          align: 'center',
+          dataIndex: 'pack',
+          scopedSlots: { customRender: 'status-pack' },
         },
         {
-          title: "需要发票",
-          align: "center",
-          dataIndex: "invoiceRequirements",
-          scopedSlots: { customRender: "status-pack" },
+          title: '需要发票',
+          align: 'center',
+          dataIndex: 'invoiceRequirements',
+          scopedSlots: { customRender: 'status-pack' },
         },
         {
-          title: "到账",
-          align: "center",
-          dataIndex: "inAccount",
-          scopedSlots: { customRender: "status" },
+          title: '到账',
+          align: 'center',
+          dataIndex: 'inAccount',
+          scopedSlots: { customRender: 'status' },
         },
         {
-          title: "开票",
-          align: "center",
-          dataIndex: "makeInvoice",
-          scopedSlots: { customRender: "status" },
+          title: '开票',
+          align: 'center',
+          dataIndex: 'makeInvoice',
+          scopedSlots: { customRender: 'status' },
         },
         {
-          title: "邮寄",
-          align: "center",
-          dataIndex: "mail",
-          scopedSlots: { customRender: "status" },
+          title: '邮寄',
+          align: 'center',
+          dataIndex: 'mail',
+          scopedSlots: { customRender: 'status' },
         },
       ],
       disableMixinCreated: true,
       url: {
-        list: "/member/tbMemberProjectSubitem/page",
-        exportXlsUrl: "/member/tbMemberProjectSubitem/exportXls",
+        list: '/member/tbMemberProjectSubitem/page',
+        exportXlsUrl: '/member/tbMemberProjectSubitem/exportXls',
       },
-    };
+    }
   },
   created() {
-    this.filters.projectId = this.$route.query.id;
-    this.loadData(1);
+    this.filters.projectId = this.$route.query.id
+    this.loadData(1)
   },
-};
+}
 </script>
 
 <style scoped>
diff --git a/src/views/incomePayments/memberManage/StardsMemberProjectList.vue b/src/views/incomePayments/memberManage/StardsMemberProjectList.vue
index e3a5683..b6b2b1d 100644
--- a/src/views/incomePayments/memberManage/StardsMemberProjectList.vue
+++ b/src/views/incomePayments/memberManage/StardsMemberProjectList.vue
@@ -71,11 +71,11 @@
 <script>
 import {mixinDevice} from '@/utils/mixin'
 import {JeroListMixin} from '@/mixins/JeroListMixin'
-import PageHeaderTitle from "@comp/layouts/PageHeaderTitle";
+import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import IconImg from '@/assets/imgs/icon/icon_company_management.png'
 
 export default {
-  name: "StardsMemberProject",
+  name: 'StardsMemberProject',
   mixins: [JeroListMixin, mixinDevice],
   components: {
     PageHeaderTitle
@@ -90,20 +90,20 @@ export default {
           dataIndex: '',
           key: 'rowIndex',
           width: 60,
-          align: "center",
+          align: 'center',
           customRender: function (t, r, index) {
-            return parseInt(index) + 1;
+            return parseInt(index) + 1
           }
         },
         {
           title: '标协会员项目名称',
-          align: "center",
+          align: 'center',
           dataIndex: 'projectName',
           scopedSlots: {customRender: 'htmlSlot'}
         }
       ],
       url: {
-        list: "/member/tbMemberProject/page",
+        list: '/member/tbMemberProject/page',
       },
     }
   },
diff --git a/src/views/incomePayments/memberManage/modules/MemberProjectModal.vue b/src/views/incomePayments/memberManage/modules/MemberProjectModal.vue
index ad8e477..5946d3b 100644
--- a/src/views/incomePayments/memberManage/modules/MemberProjectModal.vue
+++ b/src/views/incomePayments/memberManage/modules/MemberProjectModal.vue
@@ -79,14 +79,14 @@
 </template>
 
 <script>
-import pick from "lodash.pick";
-import {httpAction} from "@api/manage";
-import JYearDate from "@comp/jero/JYearDate";
-import JUpload from "@comp/jero/JUpload";
-import SelectPrincipal from "@comp/company/SelectPrincipal";
+import pick from 'lodash.pick'
+import {httpAction} from '@api/manage'
+import JYearDate from '@comp/jero/JYearDate'
+import JUpload from '@comp/jero/JUpload'
+import SelectPrincipal from '@comp/company/SelectPrincipal'
 
 export default {
-  name: "MemberProjectModal",
+  name: 'MemberProjectModal',
   components: {
     JYearDate,
     JUpload,
@@ -133,8 +133,8 @@ export default {
         }
       },
       url: {
-        add: "/jero/memberProject/add",
-        edit: "/jero/memberProject/edit",
+        add: '/jero/memberProject/add',
+        edit: '/jero/memberProject/edit',
       }
     }
   },
diff --git a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
index 063ad63..3b763a9 100644
--- a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
+++ b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
@@ -211,15 +211,15 @@
 </template>
 
 <script>
-import pick from "lodash.pick";
-import { httpAction } from "@api/manage";
-import JUpload from "@comp/jero/JUpload";
-import CompanySelect from "@comp/company/CompanySelect";
-import ContactManagementModule from "@views/businessManagement/modules/ContactManagementModule";
-import SelectContacts from "@comp/company/SelectContacts";
+import pick from 'lodash.pick'
+import { httpAction } from '@api/manage'
+import JUpload from '@comp/jero/JUpload'
+import CompanySelect from '@comp/company/CompanySelect'
+import ContactManagementModule from '@views/businessManagement/modules/ContactManagementModule'
+import SelectContacts from '@comp/company/SelectContacts'
 
 export default {
-  name: "SafeguardMemberModal",
+  name: 'SafeguardMemberModal',
   components: {
     JUpload,
     CompanySelect,
@@ -228,7 +228,7 @@ export default {
   },
   data() {
     return {
-      title: "操作",
+      title: '操作',
       width: 800,
       visible: false,
       confirmLoading: false,
@@ -252,37 +252,37 @@ export default {
       },
       validatorRules: {
         companyId: {
-          rules: [{ required: true, message: "请选择会员单位" }],
-          validateTrigger: "blur",
+          rules: [{ required: true, message: '请选择会员单位' }],
+          validateTrigger: 'blur',
         },
         contractNo: {
-          rules: [{ required: true, message: "请输入合同号" }],
-          validateTrigger: "blur",
+          rules: [{ required: true, message: '请输入合同号' }],
+          validateTrigger: 'blur',
         },
         companyContactId: {
-          rules: [{ required: true, message: "请选择企业联系人" }],
-          validateTrigger: "blur",
+          rules: [{ required: true, message: '请选择企业联系人' }],
+          validateTrigger: 'blur',
         },
         postContactId: {
-          rules: [{ required: true, message: "请选择邮寄联系人" }],
-          validateTrigger: "blur",
+          rules: [{ required: true, message: '请选择邮寄联系人' }],
+          validateTrigger: 'blur',
         },
         paymentMethod: {
-          rules: [{ required: true, message: "请选择来款方式" }],
-          validateTrigger: ["blur", "change"],
+          rules: [{ required: true, message: '请选择来款方式' }],
+          validateTrigger: ['blur', 'change'],
           initialValue: 3,
         },
         amountReceivable: {
-          rules: [{ required: true, message: "请输入应收金额" }],
-          validateTrigger: "blur",
+          rules: [{ required: true, message: '请输入应收金额' }],
+          validateTrigger: 'blur',
         },
         chargeNoticeNo: {
-          rules: [{ required: true, message: "请输入收费通知号" }],
-          validateTrigger: "blur",
+          rules: [{ required: true, message: '请输入收费通知号' }],
+          validateTrigger: 'blur',
         },
         needInvoice: {
-          rules: [{ required: true, message: "请选择发票类型" }],
-          validateTrigger: ["change", "blur"],
+          rules: [{ required: true, message: '请选择发票类型' }],
+          validateTrigger: ['change', 'blur'],
           initialValue: 0,
         },
       },
@@ -297,138 +297,138 @@ export default {
       timer: null,
       baseInfo: this.$store.state.currentProjetcInfo,
       url: {
-        add: "/jero/memberProjectSubitem/add",
-        edit: "/jero/memberProjectSubitem/edit",
+        add: '/jero/memberProjectSubitem/add',
+        edit: '/jero/memberProjectSubitem/edit',
       },
-    };
+    }
   },
   methods: {
     add() {
-      this.edit({});
+      this.edit({})
     },
     edit(record) {
       // 清除定时器
       if (this.timer) {
-        clearTimeout(this.timer);
+        clearTimeout(this.timer)
       }
-      this.form.resetFields();
+      this.form.resetFields()
 
       // 如果没有id 就是新增 新增需要将上级的项目收费通知与文件回显
-      let flag = Object.prototype.hasOwnProperty.call(record, "id");
+      let flag = Object.prototype.hasOwnProperty.call(record, 'id')
       if (flag) {
         // 加定时器是因为第一次赋值不成功
         this.timer = setTimeout(() => {
           this.form.setFieldsValue({
             chargeNoticeFileId: this.baseInfo.chargeNoticeFileId,
             chargeNoticeNo: this.baseInfo.chargeNoticeNo,
-          });
-        }, 100);
+          })
+        }, 100)
       }
-      this.model = Object.assign({}, record);
+      this.model = Object.assign({}, record)
       // 编辑状态下的企业与联系人的回显
       if (record.companyId) {
         this.model.companyId = {
           id: record.companyId,
           companyName: record.companyName,
-        };
-        this.selectedCompany = Object.assign({}, this.model.companyId);
+        }
+        this.selectedCompany = Object.assign({}, this.model.companyId)
         this.selectPerson = {
           id: this.model.companyContactTemporaryId,
           name: this.model.companyContactName,
-        };
+        }
         this.selectMailPerson = {
           id: this.model.postContactTemporaryId,
           name: this.model.postContactName,
-        };
+        }
         // 修改来款方式 控制dom对应显示隐藏
-        this.incomePaysType = record.paymentMethod;
+        this.incomePaysType = record.paymentMethod
       }
-      this.visible = true;
+      this.visible = true
       this.$nextTick(() => {
         this.form.setFieldsValue(
           pick(
             this.model,
-            "companyId",
-            "companyContactId",
-            "postContactId",
-            "amountReceivable",
-            "needInvoice",
-            "paymentMethod",
-            "contractNo",
-            "chargeNoticeNo",
-            "chargeNoticeFileId",
-            "remark"
+            'companyId',
+            'companyContactId',
+            'postContactId',
+            'amountReceivable',
+            'needInvoice',
+            'paymentMethod',
+            'contractNo',
+            'chargeNoticeNo',
+            'chargeNoticeFileId',
+            'remark'
           )
-        );
-      });
+        )
+      })
     },
     close() {
-      this.incomePaysType = 3;
-      this.$emit("close");
-      this.visible = false;
-      clearTimeout(this.timer);
+      this.incomePaysType = 3
+      this.$emit('close')
+      this.visible = false
+      clearTimeout(this.timer)
     },
     handleOk() {
-      const that = this;
+      const that = this
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
-          let httpurl = "";
+          let httpurl = ''
           if (!this.model.id) {
-            httpurl += this.url.add;
+            httpurl += this.url.add
           } else {
-            httpurl += this.url.edit;
+            httpurl += this.url.edit
           }
-          const formData = Object.assign(this.model, values);
-          formData.companyId = values.companyId.id;
-          formData.projectId = this.$store.state.currentProjetcInfo.id;
-          httpAction(httpurl, formData, "post")
+          const formData = Object.assign(this.model, values)
+          formData.companyId = values.companyId.id
+          formData.projectId = this.$store.state.currentProjetcInfo.id
+          httpAction(httpurl, formData, 'post')
             .then((res) => {
               if (res.success) {
-                that.$message.success(res.message);
-                that.$emit("ok");
-                that.close();
+                that.$message.success(res.message)
+                that.$emit('ok')
+                that.close()
               } else {
-                that.$message.warning(res.message);
+                that.$message.warning(res.message)
               }
             })
             .finally(() => {
-              that.confirmLoading = false;
-            });
+              that.confirmLoading = false
+            })
         }
-      });
+      })
     },
     /*
      *  来款方式
      * */
     changePaymentMethod(e) {
-      this.incomePaysType = e.target.value;
+      this.incomePaysType = e.target.value
     },
     /*
      *  选择会员单位
      * */
     companyChange(val) {
-      this.selectedCompany = Object.assign({}, val, { companyName: val.name });
+      this.selectedCompany = Object.assign({}, val, { companyName: val.name })
     },
     handleCancel() {
-      this.selectedCompany = {};
-      this.close();
+      this.selectedCompany = {}
+      this.close()
     },
     /*
      * 筛选
      * */
     filterOption(input, option) {
-      console.log("inp", option);
+      console.log('inp', option)
     },
     /*
      * 新增联系人后刷新下拉框数据
      * */
     addContactsOk() {
-      this.$refs.selectContacts.getContactsList();
-      this.$refs.selectMailContacts.getContactsList();
+      this.$refs.selectContacts.getContactsList()
+      this.$refs.selectMailContacts.getContactsList()
     },
   },
-};
+}
 </script>
 
 <style scoped>
diff --git a/src/views/projectManagement/ConferenceMaintenance.vue b/src/views/projectManagement/ConferenceMaintenance.vue
index cd88f6d..fbeb7b8 100644
--- a/src/views/projectManagement/ConferenceMaintenance.vue
+++ b/src/views/projectManagement/ConferenceMaintenance.vue
@@ -66,7 +66,7 @@
       <a-button type="primary" icon="plus" @click="handleAdd">新增</a-button>
       <a-button type="primary" icon="export" @click="handleExportXls('企业管理')">导出</a-button>
       <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
-      <a-button type="primary" @click="">发布-提醒</a-button>
+      <a-button type="primary" @click="publishRemind">发布-提醒</a-button>
     </div>
     <!--    /操作按钮区域-end-->
 
@@ -91,13 +91,13 @@
           <div class="project-name" @click="goMemberUnitMaintenance(record)">{{ text }}</div>
         </template>
 
-        <template slot="text" slot-scope="text,record">
+        <template slot="text" slot-scope="text">
           <j-ellipsis :value="text" :length="20"></j-ellipsis>
         </template>
 
         <span slot="action" class="action-span-cell" slot-scope="text, record">
-          <a @click="">上传文件</a>
-          <a @click="">报名信息</a>
+          <a @click="uploadFile">上传文件</a>
+          <a @click="applyMsg">报名信息</a>
           <a @click="handleEdit(record)">编辑</a>
           <a @click="handleDelete(record.id)">删除</a>
         </span>
@@ -200,7 +200,14 @@ export default {
       this.$router.push({
         path: '/projectManagement/WorkingGroupProjectManagement'
       })
-    }
+    },
+    publishRemind() {
+
+    },
+    uploadFile() {
+
+    },
+    applyMsg() {}
   }
 }
 </script>
diff --git a/src/views/projectManagement/GeneralProjectManagement.vue b/src/views/projectManagement/GeneralProjectManagement.vue
index 34f405f..f1eda57 100644
--- a/src/views/projectManagement/GeneralProjectManagement.vue
+++ b/src/views/projectManagement/GeneralProjectManagement.vue
@@ -81,7 +81,7 @@
           </template>
 
 
-          <template slot="text" slot-scope="text,record">
+          <template slot="text" slot-scope="text">
             <j-ellipsis :value="text" :length="18"></j-ellipsis>
           </template>
 
diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
index 947fe0f..cc73c8c 100644
--- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
+++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
@@ -9,8 +9,8 @@
       <a-spin :spinning="loading">
         <div class="work-group-detail">
           <div class="work-group-detail-item work-group-detail-item-small"
-               v-for="item in detailTitleList"
-               :key="item.title">
+               v-for="(item, index) in detailTitleList"
+               :key="index">
             <div class="work-group-detail-item-title">{{ item.title }}:</div>
             <div class="work-group-detail-item-content"
                  v-if="item.fieldName === 'chargeNoticeAId' || item.fieldName === 'chargeNoticeBId'">
@@ -101,7 +101,7 @@
             <status-slot :statu-obj="record" :status-no="text"></status-slot>
           </template>
 
-          <template slot="text" slot-scope="text,record">
+          <template slot="text" slot-scope="text">
             <j-ellipsis :value="text" :length="20"></j-ellipsis>
           </template>
 
@@ -232,7 +232,7 @@ export default {
           align: 'center',
           dataIndex: 'paidAmount',
           width: 180
-        }, , {
+        }, {
           title: '打包',
           align: 'center',
           width: 80,
diff --git a/src/views/projectManagement/WorkingGroupProjectManagement.vue b/src/views/projectManagement/WorkingGroupProjectManagement.vue
index 800727a..833d322 100644
--- a/src/views/projectManagement/WorkingGroupProjectManagement.vue
+++ b/src/views/projectManagement/WorkingGroupProjectManagement.vue
@@ -78,11 +78,11 @@
           </template>
 
           <!--        进度-->
-          <template slot="rateOfProgress" slot-scope="text, record">
+          <template slot="rateOfProgress" slot-scope="text">
             <progress-bar :data="text"></progress-bar>
           </template>
 
-          <template slot="text" slot-scope="text,record">
+          <template slot="text" slot-scope="text">
             <j-ellipsis :value="text" :length="20"></j-ellipsis>
           </template>
 
diff --git a/src/views/projectManagement/modules/GeneralProjectModule.vue b/src/views/projectManagement/modules/GeneralProjectModule.vue
index 5596f06..8962f41 100644
--- a/src/views/projectManagement/modules/GeneralProjectModule.vue
+++ b/src/views/projectManagement/modules/GeneralProjectModule.vue
@@ -12,7 +12,7 @@
       <a-row>
         <a-col>
           <a-form-item label="来款项目" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
-            <a-input placeholder="请输入项目名称"
+            <a-input placeholder="请输入来款项目"
                      v-decorator="['chargeProject',validatorRules.chargeProject]"
                      :maxLength='50'
                      @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
@@ -74,7 +74,7 @@
                              v-decorator="['mailContactsId',validatorRules.mailContactsId]"
                              :maxLength='50'
                              ref="selectMailContacts"
-                             @ok="addContactsOk"></select-contacts>
+                             @ok="addMailContactsOk"></select-contacts>
           </a-form-item>
         </a-col>
       </a-row>
@@ -86,7 +86,7 @@
                 <a-input placeholder="请输入应收金额"
                          v-decorator="['receivableAmount',validatorRules.receivableAmount]"
                          :maxLength='50'
-                         @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+                         @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"></a-input>
               </a-col>
               <a-col :span="1">元</a-col>
             </a-row>
@@ -164,13 +164,12 @@ import { httpAction } from '@api/manage'
 import JYearDate from '@comp/jero/JYearDate'
 import JUpload from '@comp/jero/JUpload'
 import CompanySelect from '@comp/company/CompanySelect'
-import ContactManagementModule from '@views/businessManagement/modules/ContactManagementModule'
 import SelectPrincipal from '@comp/company/SelectPrincipal'
 import SelectContacts from '@comp/company/SelectContacts'
 
 export default {
   name: 'GeneralProjectModule',
-  components: { JYearDate, JUpload, CompanySelect, ContactManagementModule, SelectPrincipal, SelectContacts },
+  components: { JYearDate, JUpload, CompanySelect, SelectPrincipal, SelectContacts },
   data() {
     return {
       title: '操作',
@@ -359,8 +358,10 @@ export default {
      * 在新增成功后重新获取联系人列表
      */
     addContactsOk() {
-      this.$refs.selectContacts.getContactsList()
       this.$refs.selectMailContacts.getContactsList()
+    },
+    addMailContactsOk() {
+      this.$refs.selectContacts.getContactsList()
     }
   }
 }
diff --git a/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue b/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue
index 01a9bc6..de6dd65 100644
--- a/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue
+++ b/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue
@@ -25,7 +25,7 @@
         <a-col :xl="12" :sm="24">
           <a-form-item label="收费通知A" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <j-upload file-type="pdf"
-                      file-type-error-message="请上传收费通知"
+                      file-type-error-message="请上传收费通知A"
                       :multiple="false"
                       :return-id="true"
                       bizPath="payment"
@@ -37,7 +37,7 @@
       <a-row v-if="selectedChargeNotice === 'B'">
         <a-col :xl="12" :sm="24">
           <a-form-item label="本年应收款B" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-input placeholder="请输入本年应收款A"
+            <a-input placeholder="请输入本年应收款B"
                      v-decorator="['receivableAmount']"
                      :maxLength='50'
                      @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
@@ -46,7 +46,7 @@
         <a-col :xl="12" :sm="24">
           <a-form-item label="收费通知B" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <j-upload file-type="pdf"
-                      file-type-error-message="请上传收费通知"
+                      file-type-error-message="请上传收费通知B"
                       :multiple="false"
                       :return-id="true"
                       bizPath="payment"
diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
index 3d88081..a25a13e 100644
--- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
+++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
@@ -1,13 +1,13 @@
 <template>
   <j-modal
-      :title="title"
-      :width="width"
-      :visible="visible"
-      :confirmLoading="confirmLoading"
-      switchFullscreen
-      @ok="handleOk"
-      @cancel="handleCancel"
-      cancelText="关闭">
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
     <a-form :form="form">
       <a-row>
         <a-col>
@@ -29,7 +29,7 @@
                              v-decorator="['contactsIdOne',validatorRules.contactsIdOne]"
                              :maxLength='50'
                              ref="selectContacts1"
-                             @ok="addContactsOk"></select-contacts>
+                             @ok="addContactsOneOk"></select-contacts>
           </a-form-item>
         </a-col>
         <a-col :xl="12" :sm="24">
@@ -40,7 +40,7 @@
                              v-decorator="['contactsIdTwo']"
                              :maxLength='50'
                              ref="selectContacts2"
-                             @ok="addContactsOk"></select-contacts>
+                             @ok="addContactsTwoOk"></select-contacts>
           </a-form-item>
         </a-col>
       </a-row>
@@ -53,7 +53,7 @@
                              v-decorator="['contactsIdThree']"
                              :maxLength='50'
                              ref="selectContacts3"
-                             @ok="addContactsOk"></select-contacts>
+                             @ok="addContactsThreeOk"></select-contacts>
           </a-form-item>
         </a-col>
         <a-col :xl="12" :sm="24">
@@ -64,7 +64,7 @@
                              v-decorator="['mailContactsId',validatorRules.mailContactsId]"
                              :maxLength='50'
                              ref="selectMailContacts"
-                             @ok="addContactsOk"></select-contacts>
+                             @ok="addMailContactsOk"></select-contacts>
           </a-form-item>
         </a-col>
       </a-row>
@@ -80,7 +80,8 @@
         </a-col>
         <a-col :xl="12" :sm="24" v-if="chargeWayType === 3">
           <a-form-item label="收费通知号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-radio-group v-decorator="['chargeNoticeNo',validatorRules.chargeNoticeNo]" @change="handleChargeNoticeChange" :options="chargeNoticeList">
+            <a-radio-group v-decorator="['chargeNoticeNo',validatorRules.chargeNoticeNo]"
+                           @change="handleChargeNoticeChange" :options="chargeNoticeList">
             </a-radio-group>
           </a-form-item>
         </a-col>
@@ -93,7 +94,7 @@
                 <a-input placeholder="请输入应收金额"
                          v-decorator="['receivableAmount',validatorRules.receivableAmount]"
                          :maxLength='50'
-                         @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+                         @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"></a-input>
               </a-col>
               <a-col :span="1">元</a-col>
             </a-row>
@@ -120,7 +121,7 @@
         <a-col :xl="12" :sm="24">
           <a-form-item label="收费通知A" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <j-upload file-type="pdf"
-                      file-type-error-message="请上传收费通知"
+                      file-type-error-message="请上传收费通知A"
                       :multiple="false"
                       :return-id="true"
                       bizPath="payment"
@@ -132,7 +133,7 @@
       <a-row v-if="chargeWayType === 3 && selectedChargeNotice === 'B'">
         <a-col :xl="12" :sm="24">
           <a-form-item label="本年应收款B" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-input placeholder="请输入本年应收款A"
+            <a-input placeholder="请输入本年应收款B"
                      v-decorator="['receivableAmount',validatorRules.receivableAmount]"
                      :maxLength='50'
                      @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
@@ -141,7 +142,7 @@
         <a-col :xl="12" :sm="24">
           <a-form-item label="收费通知B" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <j-upload file-type="pdf"
-                      file-type-error-message="请上传收费通知"
+                      file-type-error-message="请上传收费通知B"
                       :multiple="false"
                       :return-id="true"
                       bizPath="payment"
@@ -165,11 +166,11 @@
         <a-col>
           <a-form-item label="备注" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
             <a-textarea
-                placeholder="请输入备注"
-                :auto-size="{ minRows: 3, maxRows: 6 }"
-                v-decorator="['remarks']"
-                :maxLength='200'
-                @change="e => {e.target.value = (e.target.value + '').trim()}"/>
+              placeholder="请输入备注"
+              :auto-size="{ minRows: 3, maxRows: 6 }"
+              v-decorator="['remarks']"
+              :maxLength='200'
+              @change="e => {e.target.value = (e.target.value + '').trim()}"/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -180,16 +181,13 @@
 <script>
 import pick from 'lodash.pick'
 import { httpAction } from '@api/manage'
-import JYearDate from '@comp/jero/JYearDate'
 import JUpload from '@comp/jero/JUpload'
 import CompanySelect from '@comp/company/CompanySelect'
-import ContactManagementModule from '@views/businessManagement/modules/ContactManagementModule'
-import SelectPrincipal from '@comp/company/SelectPrincipal'
 import SelectContacts from '@comp/company/SelectContacts'
 
 export default {
   name: 'WorkingGroupMemberUnitModule',
-  components: { JYearDate, JUpload, CompanySelect, ContactManagementModule, SelectPrincipal, SelectContacts },
+  components: { JUpload, CompanySelect, SelectContacts },
   data() {
     return {
       title: '操作',
@@ -413,12 +411,26 @@ export default {
     /**
      * 在新增成功后重新获取联系人列表
      */
-    addContactsOk() {
-      this.$refs.selectContacts1.getContactsList()
+    addContactsOneOk(){
       this.$refs.selectContacts2.getContactsList()
       this.$refs.selectContacts3.getContactsList()
       this.$refs.selectMailContacts.getContactsList()
     },
+    addContactsTwoOk(){
+      this.$refs.selectContacts1.getContactsList()
+      this.$refs.selectContacts3.getContactsList()
+      this.$refs.selectMailContacts.getContactsList()
+    },
+    addContactsThreeOk(){
+      this.$refs.selectContacts1.getContactsList()
+      this.$refs.selectContacts2.getContactsList()
+      this.$refs.selectMailContacts.getContactsList()
+    },
+    addMailContactsOk(){
+      this.$refs.selectContacts1.getContactsList()
+      this.$refs.selectContacts2.getContactsList()
+      this.$refs.selectContacts3.getContactsList()
+    }
   }
 }
 </script>
diff --git a/src/views/projectManagement/modules/WorkingGroupProjectModule.vue b/src/views/projectManagement/modules/WorkingGroupProjectModule.vue
index d294467..6efd7e8 100644
--- a/src/views/projectManagement/modules/WorkingGroupProjectModule.vue
+++ b/src/views/projectManagement/modules/WorkingGroupProjectModule.vue
@@ -16,7 +16,7 @@
       <a-row>
         <a-col :span="24">
           <a-form-item label="工作组项目" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
-            <a-input placeholder="请输入项目名称"
+            <a-input placeholder="请输入工作组项目"
                      v-decorator="['workingGroupProject',validatorRules.workingGroupProject]"
                      :maxLength='50'
                      @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
@@ -70,10 +70,10 @@
           <a-form-item label="本年应收款A" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-row>
               <a-col :span="20">
-                <a-input placeholder="请输入金额"
+                <a-input placeholder="请输入本年应收款A"
                          v-decorator="['yearChargeA']"
                          :maxLength='50'
-                         @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+                         @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"></a-input>
               </a-col>
               <a-col :span="4">元/人</a-col>
             </a-row>
@@ -106,10 +106,10 @@
           <a-form-item label="本年应收款B" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-row>
               <a-col :span="20">
-                <a-input placeholder="请输入金额"
+                <a-input placeholder="请输入本年应收款B"
                          v-decorator="['yearChargeB']"
                          :maxLength='50'
-                         @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+                         @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"></a-input>
               </a-col>
               <a-col :span="4">元/人</a-col>
             </a-row>
diff --git a/src/views/result/Error.vue b/src/views/result/Error.vue
index 634c4b6..f579862 100644
--- a/src/views/result/Error.vue
+++ b/src/views/result/Error.vue
@@ -27,7 +27,7 @@
   import Result from './Result'
 
   export default {
-    name: "Error",
+    name: 'Error',
     components: {
       Result
     },
diff --git a/src/views/result/Result.vue b/src/views/result/Result.vue
index 09278d9..ebcbffe 100644
--- a/src/views/result/Result.vue
+++ b/src/views/result/Result.vue
@@ -16,7 +16,7 @@
 
 <script>
   export default {
-    name: "Result",
+    name: 'Result',
     // 'isSuccess', 'title', 'description'
     props: {
       isSuccess: {
diff --git a/src/views/result/Success.vue b/src/views/result/Success.vue
index b5061e3..6504b5a 100644
--- a/src/views/result/Success.vue
+++ b/src/views/result/Success.vue
@@ -69,7 +69,7 @@
   }
 
   export default {
-    name: "Success",
+    name: 'Success',
     components: {
       Result
     },
diff --git a/src/views/system/ConfusionList.vue b/src/views/system/ConfusionList.vue
index c09ac2b..ae931ab 100644
--- a/src/views/system/ConfusionList.vue
+++ b/src/views/system/ConfusionList.vue
@@ -107,7 +107,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeroListMixin } from '@/mixins/JeroListMixin'
   import SysConfusionModal from './modules/SysConfusionModal'
-  import JEllipsis from "@comp/jero/JEllipsis";
+  import JEllipsis from '@comp/jero/JEllipsis'
 
   export default {
     name: 'SysConfusionList',
@@ -126,44 +126,44 @@
             dataIndex: '',
             key:'rowIndex',
             width:60,
-            align:"center",
+            align:'center',
             customRender:function (t,r,index) {
-              return parseInt(index)+1;
+              return parseInt(index)+1
             }
           },
           {
             title:'表名',
-            align:"center",
+            align:'center',
             dataIndex: 'tableName',
             scopedSlots: { customRender: 'text' }
           },
           {
             title:'字段名',
-            align:"center",
+            align:'center',
             dataIndex: 'fieldName',
             scopedSlots: { customRender: 'text' }
           },
           {
             title:'混淆码',
-            align:"center",
+            align:'center',
             dataIndex: 'confusionCode',
             scopedSlots: { customRender: 'text' }
           },
           {
             title: '操作',
             dataIndex: 'action',
-            align:"center",
-            fixed:"right",
+            align:'center',
+            fixed:'right',
             width:147,
             scopedSlots: { customRender: 'action' }
           }
         ],
         url: {
-          list: "/sys/confusion/page",
-          delete: "/sys/confusion/delete",
-          deleteBatch: "/sys/confusion/deleteBatch",
-          exportXlsUrl: "/sys/confusion/exportXls",
-          importExcelUrl: "/sys/confusion/importExcel",
+          list: '/sys/confusion/page',
+          delete: '/sys/confusion/delete',
+          deleteBatch: '/sys/confusion/deleteBatch',
+          exportXlsUrl: '/sys/confusion/exportXls',
+          importExcelUrl: '/sys/confusion/importExcel',
 
         },
         dictOptions:{},
@@ -171,18 +171,18 @@
       }
     },
     created() {
-    this.getSuperFieldList();
+    this.getSuperFieldList()
     },
     computed: {
       importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
       },
     },
     methods: {
       initDictConfig(){
       },
       getSuperFieldList(){
-        let fieldList=[];
+        let fieldList=[]
         fieldList.push({type:'string',value:'confusionType',text:'混淆类型',dictCode:''})
         fieldList.push({type:'string',value:'confusionName',text:'表名或字段名',dictCode:''})
         this.superFieldList = fieldList
diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue
index 21d26c5..364cd61 100644
--- a/src/views/system/DepartList.vue
+++ b/src/views/system/DepartList.vue
@@ -173,7 +173,7 @@ import {queryDepartTreeList, searchByKeywords, deleteByDepartId} from '@/api/api
 import {httpAction, deleteAction} from '@/api/manage'
 import {JeroListMixin} from '@/mixins/JeroListMixin'
 import DepartAuthModal from './modules/DepartAuthModal'
-import {checkDepartName} from "@/utils/validateOnly";
+import {checkDepartName} from '@/utils/validateOnly'
 // 表头
 const columns = [
   {
@@ -251,7 +251,7 @@ export default {
       checkStrictly: true,
       form: this.$form.createForm(this),
       // 当前树选中的部门id
-      currentDepartSelectedId:"",
+      currentDepartSelectedId:'',
       labelCol: {
         xs: {span: 24},
         sm: {span: 5}
@@ -274,20 +274,20 @@ export default {
         delete: '/sys/sysDepart/delete',
         edit: '/sys/sysDepart/edit',
         deleteBatch: '/sys/sysDepart/deleteBatch',
-        exportXlsUrl: "sys/sysDepart/exportXls",
-        importExcelUrl: "sys/sysDepart/importExcel",
+        exportXlsUrl: 'sys/sysDepart/exportXls',
+        importExcelUrl: 'sys/sysDepart/importExcel',
       },
       orgCategoryDisabled:false,
     }
   },
   computed: {
     importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
     }
   },
   methods: {
     loadData() {
-      this.refresh();
+      this.refresh()
     },
     loadTree() {
       var that = this
@@ -296,13 +296,13 @@ export default {
       queryDepartTreeList().then((res) => {
         if (res.success) {
           //部门全选后，再添加部门，选中数量增多
-          this.allTreeKeys = [];
+          this.allTreeKeys = []
           for (let i = 0; i < res.result.length; i++) {
             let temp = res.result[i]
             that.treeData.push(temp)
             that.departTree.push(temp)
             that.setThisExpandedKeys(temp)
-            that.getAllKeys(temp);
+            that.getAllKeys(temp)
             // console.log(temp.id)
           }
           this.loading = false
@@ -412,7 +412,7 @@ export default {
       //this.checkedKeys = checkedKeys.checked
       // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
       if(this.checkStrictly){
-        this.checkedKeys = checkedKeys.checked;
+        this.checkedKeys = checkedKeys.checked
       }else{
         this.checkedKeys = checkedKeys
       }
@@ -451,9 +451,9 @@ export default {
       this.currentDepartSelectedId = record.id
 
       if(record.orgCategory == '1'){
-        this.orgCategoryDisabled = true;
+        this.orgCategoryDisabled = true
       }else{
-        this.orgCategoryDisabled = false;
+        this.orgCategoryDisabled = false
       }
       this.$nextTick(() => {
         this.form.getFieldDecorator('fax', {initialValue: ''})
@@ -549,11 +549,11 @@ export default {
           deleteByDepartId({id: that.rightClickSelectedKey}).then((resp) => {
             if (resp.success) {
               //删除成功后，去除已选中中的数据
-              that.checkedKeys.splice(that.checkedKeys.findIndex(key => key === that.rightClickSelectedKey), 1);
+              that.checkedKeys.splice(that.checkedKeys.findIndex(key => key === that.rightClickSelectedKey), 1)
               that.$message.success('删除成功!')
               that.loadTree()
               //删除后同步清空右侧基本信息内容
-              let orgCode=that.form.getFieldValue("orgCode");
+              let orgCode=that.form.getFieldValue('orgCode')
               if(orgCode && orgCode === that.rightClickSelectedOrgCode){
                 that.onClearSelected()
               }
diff --git a/src/views/system/DepartUserList.vue b/src/views/system/DepartUserList.vue
index 70a4266..fd55cfa 100644
--- a/src/views/system/DepartUserList.vue
+++ b/src/views/system/DepartUserList.vue
@@ -96,7 +96,7 @@
           nodes: [],
           edges: []
         },
-        userIdentity:"",
+        userIdentity:'',
       }
     },
     methods: {
@@ -104,14 +104,14 @@
         //console.log(key)
       },
       loadData() {
-        this.refresh();
+        this.refresh()
       },
       clearSelectedDepartKeys() {
-        this.checkedKeys = [];
-        this.selectedKeys = [];
-        this.currentDeptId = '';
-        this.$refs.DeptUserInfo.currentDeptId='';
-        this.$refs.DeptRoleInfo.currentDeptId='';
+        this.checkedKeys = []
+        this.selectedKeys = []
+        this.currentDeptId = ''
+        this.$refs.DeptUserInfo.currentDeptId=''
+        this.$refs.DeptRoleInfo.currentDeptId=''
       },
       loadTree() {
         var that = this
@@ -176,16 +176,16 @@
 
       },
       onCheck(checkedKeys, e) {
-        let record = e.node.dataRef;
+        let record = e.node.dataRef
         // console.log('onCheck', checkedKeys, e);
-        this.checkedKeys = [];
+        this.checkedKeys = []
         // if (e.checked === true) {
-        this.currentDeptId = record.id;
-        this.checkedKeys.push(record.id);
+        this.currentDeptId = record.id
+        this.checkedKeys.push(record.id)
 
-        this.$refs.DeptBaseInfo.open(record);
-        this.$refs.DeptUserInfo.open(record);
-        this.$refs.DeptRoleInfo.open(record);
+        this.$refs.DeptBaseInfo.open(record)
+        this.$refs.DeptUserInfo.open(record)
+        this.$refs.DeptRoleInfo.open(record)
         // }
         // else {
         //   this.checkedKeys = [];
@@ -193,20 +193,20 @@
         //   this.$refs.DeptUserInfo.clearList();
         // }
 
-        this.hiding = false;
+        this.hiding = false
         // this.checkedKeys = checkedKeys.checked
       },
       onSelect(selectedKeys, e) {
         if (this.selectedKeys[0] !== selectedKeys[0]) {
-          this.selectedKeys = [selectedKeys[0]];
+          this.selectedKeys = [selectedKeys[0]]
         }
-        let record = e.node.dataRef;
-        this.checkedKeys.push(record.id);
-        this.$refs.DeptBaseInfo.open(record);
-        this.$refs.DeptUserInfo.onClearSelected();
-        this.$refs.DeptUserInfo.open(record);
-        this.$refs.DeptRoleInfo.onClearSelected();
-        this.$refs.DeptRoleInfo.open(record);
+        let record = e.node.dataRef
+        this.checkedKeys.push(record.id)
+        this.$refs.DeptBaseInfo.open(record)
+        this.$refs.DeptUserInfo.onClearSelected()
+        this.$refs.DeptUserInfo.open(record)
+        this.$refs.DeptRoleInfo.onClearSelected()
+        this.$refs.DeptRoleInfo.open(record)
       },
     },
     created() {
diff --git a/src/views/system/DictDeleteList.vue b/src/views/system/DictDeleteList.vue
index 4d4c7c1..429bd85 100644
--- a/src/views/system/DictDeleteList.vue
+++ b/src/views/system/DictDeleteList.vue
@@ -35,9 +35,9 @@
 
 <script>
   import { getAction, putAction ,postAction} from '@api/manage'
-  import JEllipsis from "@comp/jero/JEllipsis";
+  import JEllipsis from '@comp/jero/JEllipsis'
   export default {
-    name: "DictDeleteList",
+    name: 'DictDeleteList',
     components:{
       JEllipsis
     },
@@ -55,33 +55,33 @@
             dataIndex: '',
             key: 'rowIndex',
             width: 120,
-            align: "center",
+            align: 'center',
             customRender: function (t, r, index) {
-              return parseInt(index) + 1;
+              return parseInt(index) + 1
             }
           },
           {
             title: '字典名称',
-            align: "left",
+            align: 'left',
             dataIndex: 'dictName',
             scopedSlots: { customRender: 'text' }
           },
           {
             title: '字典编号',
-            align: "left",
+            align: 'left',
             dataIndex: 'dictCode',
             scopedSlots: { customRender: 'text' }
           },
           {
             title: '描述',
-            align: "left",
+            align: 'left',
             dataIndex: 'description',
             scopedSlots: { customRender: 'text' }
           },
           {
             title: '操作',
             dataIndex: 'action',
-            align: "center",
+            align: 'center',
             scopedSlots: {customRender: 'action'}
           }
         ]
@@ -92,15 +92,15 @@
       handleCancel(){
         this.visible = false
         //回收站字典列表刷新
-        this.$emit("refresh")
+        this.$emit('refresh')
       },
       show(){
         this.visible = true
-        this.loadData();
+        this.loadData()
       },
       loadData(){
         this.loading = true
-        getAction("/sys/dict/deleteList").then(res=>{
+        getAction('/sys/dict/deleteList').then(res=>{
           this.loading = false
           if(res.success){
             this.dataSource = res.result
@@ -110,10 +110,10 @@
         })
       },
       handleBack(id){
-        postAction("/sys/dict/back/"+id).then(res=>{
+        postAction('/sys/dict/back/'+id).then(res=>{
           if(res.success){
             this.$message.success(res.message)
-            this.loadData();
+            this.loadData()
           }else{
             this.$message.warning(res.message)
           }
@@ -128,15 +128,15 @@
             </div>),
           centered: false,
           onOk: () => {
-          var that = this;
-         getAction("/sys/dict/deletePhysic/"+id).then((res) => {
+          var that = this
+         getAction('/sys/dict/deletePhysic/'+id).then((res) => {
             if (res.success) {
               this.$message.success(res.message)
-              this.loadData();
+              this.loadData()
             } else {
-              that.$message.warning(res.message);
+              that.$message.warning(res.message)
             }
-          });
+          })
         },
       })
       }
diff --git a/src/views/system/DictItemList.vue b/src/views/system/DictItemList.vue
index 69b31a6..2d91572 100644
--- a/src/views/system/DictItemList.vue
+++ b/src/views/system/DictItemList.vue
@@ -83,13 +83,13 @@
 
 <script>
   import pick from 'lodash.pick'
-  import {filterObj} from '@/utils/util';
+  import {filterObj} from '@/utils/util'
   import DictItemModal from './modules/DictItemModal'
   import {JeroListMixin} from '@/mixins/JeroListMixin'
-  import JEllipsis from "@comp/jero/JEllipsis";
+  import JEllipsis from '@comp/jero/JEllipsis'
 
   export default {
-    name: "DictItemList",
+    name: 'DictItemList',
     mixins: [JeroListMixin],
     components: {DictItemModal,JEllipsis},
     data() {
@@ -97,35 +97,35 @@
         columns: [
           {
             title: '名称',
-            align: "center",
+            align: 'center',
             dataIndex: 'itemText',
             scopedSlots: { customRender: 'text' }
           },
           {
             title: '数据值',
-            align: "center",
+            align: 'center',
             dataIndex: 'itemValue',
             scopedSlots: { customRender: 'text' }
           },
           {
             title: '操作',
             dataIndex: 'action',
-            align: "center",
+            align: 'center',
             scopedSlots: {customRender: 'action'},
           }
         ],
         queryParam: {
-          dictId: "",
-          dictName: "",
-          itemText: "",
-          delFlag: "1",
+          dictId: '',
+          dictName: '',
+          itemText: '',
+          delFlag: '1',
           status: [],
         },
-        title: "操作",
+        title: '操作',
         visible: false,
         screenWidth: 800,
         model: {},
-        dictId: "",
+        dictId: '',
         status: 1,
         labelCol: {
           xs: {span: 5},
@@ -141,81 +141,81 @@
           itemValue: {rules: [{required: true, message: '请输入数据值!'}]},
         },
         url: {
-          list: "/sys/dictItem/page",
-          delete: "/sys/dictItem/delete",
-          deleteBatch: "/sys/dictItem/deleteBatch",
+          list: '/sys/dictItem/page',
+          delete: '/sys/dictItem/delete',
+          deleteBatch: '/sys/dictItem/deleteBatch',
         },
       }
     },
     created() {
       // 当页面初始化时,根据屏幕大小来给抽屉设置宽度
-      this.resetScreenSize();
+      this.resetScreenSize()
     },
     methods: {
       add(dictId) {
-        this.dictId = dictId;
-        this.edit({});
+        this.dictId = dictId
+        this.edit({})
       },
       edit(record) {
         if (record.id) {
-          this.dictId = record.id;
+          this.dictId = record.id
         }
         this.queryParam = {}
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.model.dictId = this.dictId;
-        this.model.status = this.status;
-        this.visible = true;
+        this.form.resetFields()
+        this.model = Object.assign({}, record)
+        this.model.dictId = this.dictId
+        this.model.status = this.status
+        this.visible = true
         this.$nextTick(() => {
           this.form.setFieldsValue(pick(this.model, 'itemText', 'itemValue'))
-        });
+        })
         // 当其它模块调用该模块时,调用此方法加载字典数据
-        this.loadData();
+        this.loadData()
       },
 
       getQueryParams() {
         //update--begin--autor:wangshuai-----date:20191204------for：清空总条数 teambition JT-113------
-        this.ipagination.total=0;
+        this.ipagination.total=0
         //update--end--autor:wangshuai-----date:20191204------for：清空总条数 teambition JT-113------
-        var param = Object.assign({}, this.lastQueryParam);
-        param.dictId = this.dictId;
-        param.field = this.getQueryField();
-        param.pageNo = this.ipagination.current;
-        param.pageSize = this.ipagination.pageSize;
+        var param = Object.assign({}, this.lastQueryParam)
+        param.dictId = this.dictId
+        param.field = this.getQueryField()
+        param.pageNo = this.ipagination.current
+        param.pageSize = this.ipagination.pageSize
         if (this.superQueryParams) {
           param['superQueryParams'] = encodeURI(this.superQueryParams)
           param['superQueryMatchType'] = this.superQueryMatchType
         }
-        return filterObj(param);
+        return filterObj(param)
       },
 
       // 添加字典数据
       handleAdd() {
-        this.$refs.modalForm.add(this.dictId);
-        this.$refs.modalForm.title = "新增";
+        this.$refs.modalForm.add(this.dictId)
+        this.$refs.modalForm.title = '新增'
       },
       showDrawer() {
         this.visible = true
       },
       onClose() {
         this.visible = false
-        this.form.resetFields();
-        this.dataSource = [];
+        this.form.resetFields()
+        this.dataSource = []
       },
       // 抽屉的宽度随着屏幕大小来改变
       resetScreenSize() {
-        let screenWidth = document.body.clientWidth;
+        let screenWidth = document.body.clientWidth
         if (screenWidth < 600) {
-          this.screenWidth = screenWidth;
+          this.screenWidth = screenWidth
         } else {
-          this.screenWidth = 600;
+          this.screenWidth = 600
         }
       },
       //update--begin--autor:wangshuai-----date:20191204------for：系统管理 数据字典禁用和正常区别开，添加背景颜色 teambition JT-22------
       //增加样式方法返回值
       getRowClassname(record){
         if(record.status==0){
-          return "data-rule-invalid"
+          return 'data-rule-invalid'
         }
       }
       //update--end--autor:wangshuai-----date:20191204------for：系统管理 数据字典禁用和正常区别开，添加背景颜色 teambition JT-22------
diff --git a/src/views/system/DictList.vue b/src/views/system/DictList.vue
index 1378077..a305cfd 100644
--- a/src/views/system/DictList.vue
+++ b/src/views/system/DictList.vue
@@ -70,18 +70,18 @@
 </template>
 
 <script>
-  import { filterObj } from '@/utils/util';
+  import { filterObj } from '@/utils/util'
   import { JeroListMixin } from '@/mixins/JeroListMixin'
   import DictModal from './modules/DictModal'
   import DictItemList from './DictItemList'
   import DictDeleteList from './DictDeleteList'
   import { getAction } from '@api/manage'
-  import { UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types"
+  import { UI_CACHE_DB_DICT_DATA } from '@/store/mutation-types'
   import Vue from 'vue'
-  import JEllipsis from "@comp/jero/JEllipsis";
+  import JEllipsis from '@comp/jero/JEllipsis'
 
   export default {
-    name: "DictList",
+    name: 'DictList',
     mixins:[JeroListMixin],
     components: {DictModal, DictItemList,DictDeleteList,JEllipsis},
     data() {
@@ -90,8 +90,8 @@
         visible: false,
         // 查询条件
         queryParam: {
-          dictCode: "",
-          dictName: "",
+          dictCode: '',
+          dictName: '',
         },
         // 表头
         columns: [
@@ -100,37 +100,37 @@
             dataIndex: '',
             key: 'rowIndex',
             width: 120,
-            align: "center",
+            align: 'center',
             customRender: function (t, r, index) {
-              return parseInt(index) + 1;
+              return parseInt(index) + 1
             }
           },
           {
             title: '字典名称',
-            align: "left",
+            align: 'left',
             dataIndex: 'dictName',
             scopedSlots: { customRender: 'text' }
           },
           {
             title: '字典编号',
-            align: "left",
+            align: 'left',
             dataIndex: 'dictCode',
             scopedSlots: { customRender: 'text' }
           },
           {
             title: '描述',
-            align: "left",
+            align: 'left',
             dataIndex: 'description',
             scopedSlots: { customRender: 'text' }
           },
           {
             title: '操作',
             dataIndex: 'action',
-            align: "center",
+            align: 'center',
             scopedSlots: {customRender: 'action'},
           }
         ],
-        dict: "",
+        dict: '',
         labelCol: {
           xs: {span: 8},
           sm: {span: 5},
@@ -140,18 +140,18 @@
           sm: {span: 19},
         },
         url: {
-          list: "/sys/dict/page",
-          delete: "/sys/dict/delete",
-          exportXlsUrl: "sys/dict/exportXls",
-          importExcelUrl: "sys/dict/importExcel",
-          refleshCache: "sys/dict/refleshCache",
-          queryAllDictItems: "sys/dict/queryAllDictItems",
+          list: '/sys/dict/page',
+          delete: '/sys/dict/delete',
+          exportXlsUrl: 'sys/dict/exportXls',
+          importExcelUrl: 'sys/dict/importExcel',
+          refleshCache: 'sys/dict/refleshCache',
+          queryAllDictItems: 'sys/dict/queryAllDictItems',
         },
       }
     },
     computed: {
       importExcelUrl: function () {
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
       }
     },
     methods: {
@@ -168,13 +168,13 @@
       // },
       //取消选择
       cancelDict() {
-        this.dict = "";
-        this.visible = false;
-        this.loadData();
+        this.dict = ''
+        this.visible = false
+        this.loadData()
       },
       //编辑字典数据
       editDictItem(record) {
-        this.$refs.dictItemList.edit(record);
+        this.$refs.dictItemList.edit(record)
       },
       // 重置字典类型搜索框的内容
       // searchReset() {
@@ -196,11 +196,11 @@
                 Vue.ls.set(UI_CACHE_DB_DICT_DATA, res.result, 7 * 24 * 60 * 60 * 1000)
               }
             })
-            this.$message.success("刷新缓存完成！");
+            this.$message.success('刷新缓存完成！')
           }
         }).catch(e=>{
-          this.$message.warn("刷新缓存失败！");
-          console.log("刷新失败",e)
+          this.$message.warn('刷新缓存失败！')
+          console.log('刷新失败',e)
         })
       }
     },
diff --git a/src/views/system/LogList.vue b/src/views/system/LogList.vue
index 0530067..fd7439b 100644
--- a/src/views/system/LogList.vue
+++ b/src/views/system/LogList.vue
@@ -73,12 +73,12 @@
 </template>
 
 <script>
-  import { filterObj } from '@/utils/util';
+  import { filterObj } from '@/utils/util'
   import { JeroListMixin } from '@/mixins/JeroListMixin'
   import JEllipsis from '@/components/jero/JEllipsis'
 
   export default {
-    name: "LogList",
+    name: 'LogList',
     mixins:[JeroListMixin],
     components: {
       JEllipsis
@@ -93,21 +93,21 @@
           logType:'1',
           keyWord:'',
         },
-        tabKey: "1",
+        tabKey: '1',
         // 表头
         columns: [
           {
             title: '序号',
             dataIndex: '',
             key:'rowIndex',
-            align:"center",
+            align:'center',
             customRender:function (t,r,index) {
-              return parseInt(index)+1;
+              return parseInt(index)+1
             }
           },
           {
             title: '日志内容',
-            align:"left",
+            align:'left',
             dataIndex: 'logContent',
             scopedSlots: { customRender: 'logContent' },
             sorter: true
@@ -115,25 +115,25 @@
           {
             title: '操作人ID',
             dataIndex: 'userid',
-            align:"center",
+            align:'center',
             sorter: true
           },
           {
             title: '操作人名称',
             dataIndex: 'username',
-            align:"center",
+            align:'center',
             sorter: true
           },
           {
             title: 'IP',
             dataIndex: 'ip',
-            align:"center",
+            align:'center',
             sorter: true
           },
           {
             title: '耗时(毫秒)',
             dataIndex: 'costTime',
-            align:"center",
+            align:'center',
             sorter: true
           },
           {
@@ -148,12 +148,12 @@
                 return text;
               }
             },*/
-            align:"center",
+            align:'center',
           },
           {
             title: '创建时间',
             dataIndex: 'createTime',
-            align:"center",
+            align:'center',
             sorter: true
           }
         ],
@@ -161,7 +161,7 @@
         {
           title: '操作类型',
           dataIndex: 'operateType_dictText',
-          align:"center",
+          align:'center',
         },
         labelCol: {
           xs: { span: 1 },
@@ -172,59 +172,59 @@
           sm: { span: 16 },
         },
         url: {
-          list: "/sys/log/page",
+          list: '/sys/log/page',
         },
       }
     },
     methods: {
       getQueryParams(){
-        var param = Object.assign({}, this.lastQueryParam,this.isorter,{logType:this.tabKey});
-        param.field = this.getQueryField();
-        param.pageNo = this.ipagination.current;
-        param.pageSize = this.ipagination.pageSize;
-        delete param.createTimeRange; // 时间参数不传递后台
+        var param = Object.assign({}, this.lastQueryParam,this.isorter,{logType:this.tabKey})
+        param.field = this.getQueryField()
+        param.pageNo = this.ipagination.current
+        param.pageSize = this.ipagination.pageSize
+        delete param.createTimeRange // 时间参数不传递后台
         if (this.superQueryParams) {
           param['superQueryParams'] = encodeURI(this.superQueryParams)
           param['superQueryMatchType'] = this.superQueryMatchType
         }
-        return filterObj(param);
+        return filterObj(param)
       },
 
       // 重置
       searchReset(){
-        var that = this;
-        var logType = that.queryParam.logType;
-        that.queryParam = {}; //清空查询区域参数
-        that.queryParam.logType = logType;
+        var that = this
+        var logType = that.queryParam.logType
+        that.queryParam = {} //清空查询区域参数
+        that.queryParam.logType = logType
         that.lastQueryParam = Object.assign({},this.queryParam)
-        that.loadData(1);
+        that.loadData(1)
       },
       // 日志类型
       callback(key){
 
         // 动态添加操作类型列
         if (key == 2) {
-          this.tabKey = '2';
-          this.columns.splice(7, 0, this.operateColumn);
+          this.tabKey = '2'
+          this.columns.splice(7, 0, this.operateColumn)
         }else if(this.columns.length == 9)
         {
-          this.tabKey = '1';
-          this.columns.splice(7,1);
+          this.tabKey = '1'
+          this.columns.splice(7,1)
         }
 
-        let that=this;
+        let that=this
         that.queryParam = {}
-        that.queryParam.logType=key;
+        that.queryParam.logType=key
         that.lastQueryParam =Object.assign({},this.queryParam)
-        that.loadData();
+        that.loadData()
       },
       onDateChange: function (value, dateString) {
-        console.log(dateString[0],dateString[1]);
-        this.queryParam.createTime_begin=dateString[0];
-        this.queryParam.createTime_end=dateString[1];
+        console.log(dateString[0],dateString[1])
+        this.queryParam.createTime_begin=dateString[0]
+        this.queryParam.createTime_end=dateString[1]
       },
       onDateOk(value) {
-        console.log(value);
+        console.log(value)
       },
     }
   }
diff --git a/src/views/system/PermissionDataRuleList.vue b/src/views/system/PermissionDataRuleList.vue
index 5274e0f..e19bf5e 100644
--- a/src/views/system/PermissionDataRuleList.vue
+++ b/src/views/system/PermissionDataRuleList.vue
@@ -107,8 +107,8 @@
         form: this.$form.createForm(this),
         loading: false,
         url: {
-          list: "/sys/permission/getPermRuleListByPermId",
-          delete: "/sys/permission/deletePermissionRule",
+          list: '/sys/permission/getPermRuleListByPermId',
+          delete: '/sys/permission/deletePermissionRule',
         },
       }
     },
@@ -146,8 +146,8 @@
         this.$refs.modalForm.title = '新增'
       },
       searchQuery() {
-        var params = this.getQueryParams();
-        params.permissionId = this.permId;
+        var params = this.getQueryParams()
+        params.permissionId = this.permId
         queryPermissionRule(params).then((res) => {
           if (res.success) {
             this.dataSource = res.result
@@ -157,7 +157,7 @@
       searchReset() {
         this.queryParam = {}
         this.queryParam.permissionId = this.permId
-        this.loadData(1);
+        this.loadData(1)
       },
       onClose() {
         this.visible = false
@@ -173,7 +173,7 @@
       },
       getRowClassname(record){
         if(record.status!=1){
-          return "data-rule-invalid"
+          return 'data-rule-invalid'
         }
       }
     }
diff --git a/src/views/system/PermissionList.vue b/src/views/system/PermissionList.vue
index e1833ca..7499939 100644
--- a/src/views/system/PermissionList.vue
+++ b/src/views/system/PermissionList.vue
@@ -179,10 +179,10 @@
         this.$refs.PermissionDataRuleList.edit(record)
       },
       handleAddSub(record) {
-        this.$refs.modalForm.title = "添加子菜单";
-        this.$refs.modalForm.localMenuType = 1;
-        this.$refs.modalForm.disableSubmit = false;
-        this.$refs.modalForm.edit({status:'1',permsType:'1',route:true,'parentId':record.id});
+        this.$refs.modalForm.title = '添加子菜单'
+        this.$refs.modalForm.localMenuType = 1
+        this.$refs.modalForm.disableSubmit = false
+        this.$refs.modalForm.edit({status:'1',permsType:'1',route:true,'parentId':record.id})
       },
       handleExpandedRowsChange(expandedRows) {
         this.expandedRowKeys = expandedRows
diff --git a/src/views/system/QuartzJobList.vue b/src/views/system/QuartzJobList.vue
index 0e6eaa1..9ea31b0 100644
--- a/src/views/system/QuartzJobList.vue
+++ b/src/views/system/QuartzJobList.vue
@@ -120,10 +120,10 @@
 import QuartzJobModal from './modules/QuartzJobModal'
 import {getAction} from '@/api/manage'
 import {JeroListMixin} from '@/mixins/JeroListMixin'
-import JEllipsis from "@/components/jero/JEllipsis";
+import JEllipsis from '@/components/jero/JEllipsis'
 
 export default {
-  name: "QuartzJobList",
+  name: 'QuartzJobList',
   mixins: [JeroListMixin],
   components: {
     QuartzJobModal,
@@ -141,14 +141,14 @@ export default {
           dataIndex: '',
           key: 'rowIndex',
           width: 60,
-          align: "center",
+          align: 'center',
           customRender: function (t, r, index) {
-            return parseInt(index) + 1;
+            return parseInt(index) + 1
           }
         },
         {
           title: '任务类名',
-          align: "center",
+          align: 'center',
           dataIndex: 'jobClassName',
           sorter: true,
           /*            customRender:function (text) {
@@ -157,26 +157,26 @@ export default {
         },
         {
           title: 'cron表达式',
-          align: "center",
+          align: 'center',
           dataIndex: 'cronExpression'
         },
         {
           title: '参数',
-          align: "center",
+          align: 'center',
           width: 150,
           dataIndex: 'parameter',
           scopedSlots: {customRender: 'parameterRender'},
         },
         {
           title: '描述',
-          align: "center",
+          align: 'center',
           width: 250,
           dataIndex: 'description',
           scopedSlots: {customRender: 'description'},
         },
         {
           title: '状态',
-          align: "center",
+          align: 'center',
           dataIndex: 'status',
           scopedSlots: {customRender: 'customRenderStatus'},
           filterMultiple: false,
@@ -188,26 +188,26 @@ export default {
         {
           title: '操作',
           dataIndex: 'action',
-          align: "center",
+          align: 'center',
           width: 180,
           scopedSlots: {customRender: 'action'},
         }
       ],
       url: {
-        list: "/sys/quartzJob/page",
-        delete: "/sys/quartzJob/delete",
-        deleteBatch: "/sys/quartzJob/deleteBatch",
-        pause: "/sys/quartzJob/pause",
-        resume: "/sys/quartzJob/resume",
-        exportXlsUrl: "sys/quartzJob/exportXls",
-        importExcelUrl: "sys/quartzJob/importExcel",
-        execute: "sys/quartzJob/execute"
+        list: '/sys/quartzJob/page',
+        delete: '/sys/quartzJob/delete',
+        deleteBatch: '/sys/quartzJob/deleteBatch',
+        pause: '/sys/quartzJob/pause',
+        resume: '/sys/quartzJob/resume',
+        exportXlsUrl: 'sys/quartzJob/exportXls',
+        importExcelUrl: 'sys/quartzJob/importExcel',
+        execute: 'sys/quartzJob/execute'
       },
     }
   },
   computed: {
     importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
     }
   },
 
@@ -218,71 +218,71 @@ export default {
       //分页、排序、筛选变化时触发
       //TODO 筛选
       if (Object.keys(sorter).length > 0) {
-        this.isorter.column = sorter.field;
-        this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
+        this.isorter.column = sorter.field
+        this.isorter.order = 'ascend' == sorter.order ? 'asc' : 'desc'
       }
       //这种筛选方式只支持单选
-      this.filters.status = filters.status[0];
-      this.ipagination = pagination;
-      this.loadData();
+      this.filters.status = filters.status[0]
+      this.ipagination = pagination
+      this.loadData()
     },
     pauseJob: function (record) {
-      var that = this;
+      var that = this
       //暂停定时任务
       this.$confirm({
-        title: "确认暂停",
-        content: "是否暂停选中任务?",
+        title: '确认暂停',
+        content: '是否暂停选中任务?',
         onOk: function () {
           getAction(that.url.pause, {jobClassName: record.jobClassName}).then((res) => {
             if (res.success) {
-              that.$message.success(res.message);
-              that.loadData();
-              that.onClearSelected();
+              that.$message.success(res.message)
+              that.loadData()
+              that.onClearSelected()
             } else {
-              that.$message.warning(res.message);
+              that.$message.warning(res.message)
             }
-          });
+          })
         }
-      });
+      })
 
     },
     resumeJob: function (record) {
-      var that = this;
+      var that = this
       //恢复定时任务
       this.$confirm({
-        title: "确认启动",
-        content: "是否启动选中任务?",
+        title: '确认启动',
+        content: '是否启动选中任务?',
         onOk: function () {
           getAction(that.url.resume, {jobClassName: record.jobClassName}).then((res) => {
             if (res.success) {
-              that.$message.success(res.message);
-              that.loadData();
-              that.onClearSelected();
+              that.$message.success(res.message)
+              that.loadData()
+              that.onClearSelected()
             } else {
-              that.$message.warning(res.message);
+              that.$message.warning(res.message)
             }
-          });
+          })
         }
-      });
+      })
     },
     executeImmediately(record) {
-      var that = this;
+      var that = this
       //立即执行定时任务
       this.$confirm({
-        title: "确认提示",
-        content: "是否立即执行任务?",
+        title: '确认提示',
+        content: '是否立即执行任务?',
         onOk: function () {
           getAction(that.url.execute, {id: record.id}).then((res) => {
             if (res.success) {
-              that.$message.success(res.message);
-              that.loadData();
-              that.onClearSelected();
+              that.$message.success(res.message)
+              that.loadData()
+              that.onClearSelected()
             } else {
-              that.$message.warning(res.message);
+              that.$message.warning(res.message)
             }
-          });
+          })
         }
-      });
+      })
     }
   }
 }
diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue
index d82e390..edd9e5f 100644
--- a/src/views/system/RoleUserList.vue
+++ b/src/views/system/RoleUserList.vue
@@ -57,17 +57,17 @@
   </a-card>
 </template>
 <script>
-import {JeroListMixin} from "@/mixins/JeroListMixin";
-import {postAction, getAction} from "@/api/manage";
-import RoleModal from "./modules/RoleModal";
-import {filterObj} from "@/utils/util";
-import UserRoleModal from "./modules/UserRoleModal";
-import JEllipsis from "@comp/jero/JEllipsis";
-import moment from "moment";
+import {JeroListMixin} from '@/mixins/JeroListMixin'
+import {postAction, getAction} from '@/api/manage'
+import RoleModal from './modules/RoleModal'
+import {filterObj} from '@/utils/util'
+import UserRoleModal from './modules/UserRoleModal'
+import JEllipsis from '@comp/jero/JEllipsis'
+import moment from 'moment'
 
 
 export default {
-  name: "RoleUserList",
+  name: 'RoleUserList',
   mixins: [JeroListMixin],
   components: {
     UserRoleModal,
@@ -79,28 +79,28 @@ export default {
     return {
       model1: {},
       model2: {},
-      currentRoleId: "",
+      currentRoleId: '',
       selectedRowKeys: [],
       expandedRowKeys: [],
       columns:
           [
             {
-              title: "角色编码",
-              align: "center",
-              dataIndex: "roleCode",
+              title: '角色编码',
+              align: 'center',
+              dataIndex: 'roleCode',
               width: 160,
               scopedSlots: {customRender: 'text'}
             },
             {
-              title: "角色名称",
-              align: "center",
-              dataIndex: "roleName",
+              title: '角色名称',
+              align: 'center',
+              dataIndex: 'roleName',
               scopedSlots: {customRender: 'text'}
             },
             {
-              title: "上级角色",
-              align: "center",
-              dataIndex: "parentName",
+              title: '上级角色',
+              align: 'center',
+              dataIndex: 'parentName',
               customRender(text) {
                 if (text) {
                   return text
@@ -110,57 +110,57 @@ export default {
               }
             },
             {
-              title: "创建时间",
-              dataIndex: "createTime",
-              align: "center",
+              title: '创建时间',
+              dataIndex: 'createTime',
+              align: 'center',
               sorter: true,
               scopedSlots: {customRender: 'text'},
               customRender: (text) => {
-                return moment(text).format("YYYY-MM-DD HH:mm:ss");
+                return moment(text).format('YYYY-MM-DD HH:mm:ss')
               }
             },
             {
-              title: "操作",
-              dataIndex: "action",
-              align: "center",
-              scopedSlots: {customRender: "action"}
+              title: '操作',
+              dataIndex: 'action',
+              align: 'center',
+              scopedSlots: {customRender: 'action'}
             }
           ],
       url: {
-        list: "/sys/role/treeListPage",
-        delete: "/sys/role/delete",
-        deleteBatch: "/sys/role/deleteBatch",
-        list2: "/sys/user/userRoleList",
-        addUserRole: "/sys/user/addSysUserRole",
-        delete2: "/sys/user/deleteUserRole",
-        deleteBatch2: "/sys/user/deleteUserRoleBatch",
-        exportXlsUrl: "sys/role/exportXls",
-        importExcelUrl: "sys/role/importExcel"
+        list: '/sys/role/treeListPage',
+        delete: '/sys/role/delete',
+        deleteBatch: '/sys/role/deleteBatch',
+        list2: '/sys/user/userRoleList',
+        addUserRole: '/sys/user/addSysUserRole',
+        delete2: '/sys/user/deleteUserRole',
+        deleteBatch2: '/sys/user/deleteUserRoleBatch',
+        exportXlsUrl: 'sys/role/exportXls',
+        importExcelUrl: 'sys/role/importExcel'
       }
-    };
+    }
   },
   computed: {
     importExcelUrl: function () {
-      return `${window._CONFIG["domianURL"]}/${this.url.importExcelUrl}`;
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
     }
   },
   methods: {
     selectOK(data) {
-      let params = {};
-      params.roleId = this.currentRoleId;
-      params.userIdList = [];
+      let params = {}
+      params.roleId = this.currentRoleId
+      params.userIdList = []
       for (var a = 0; a < data.length; a++) {
-        params.userIdList.push(data[a]);
+        params.userIdList.push(data[a])
       }
-      console.log(params);
+      console.log(params)
       postAction(this.url.addUserRole, params).then((res) => {
         if (res.success) {
-          this.loadData2();
-          this.$message.success(res.message);
+          this.loadData2()
+          this.$message.success(res.message)
         } else {
-          this.$message.warning(res.message);
+          this.$message.warning(res.message)
         }
-      });
+      })
     },
     /*
     * 添加下级
@@ -175,42 +175,42 @@ export default {
         return
       }
       // 将这行的角色id作为新建角色的的父级id
-      this.$refs.modalForm.addLowerRole(this.selectedRowKeys[0]);
+      this.$refs.modalForm.addLowerRole(this.selectedRowKeys[0])
       this.$refs.modalForm.title = '添加下级'
     },
     handleAddUserRole() {
-      if (this.currentRoleId == "") {
-        this.$message.warn("请选择一个角色!");
+      if (this.currentRoleId == '') {
+        this.$message.warn('请选择一个角色!')
       } else {
-        this.$refs.selectUserModal.visible = true;
+        this.$refs.selectUserModal.visible = true
       }
     },
     handleOpen(record) {
-      this.rightcolval = 1;
-      this.selectedRowKeys1 = [record.id];
-      this.model1 = Object.assign({}, record);
-      this.currentRoleId = record.id;
-      this.onClearSelected2();
-      this.loadData2();
+      this.rightcolval = 1
+      this.selectedRowKeys1 = [record.id]
+      this.model1 = Object.assign({}, record)
+      this.currentRoleId = record.id
+      this.onClearSelected2()
+      this.loadData2()
     },
     searchQuery2() {
-      this.loadData2(1);
+      this.loadData2(1)
     },
     searchReset2() {
-      this.queryParam2 = {};
-      this.loadData2(1);
+      this.queryParam2 = {}
+      this.loadData2(1)
     },
     /*
     * 授权
     * */
     handlePerssion(roleId) {
-      this.$refs.modalUserRole.show(roleId);
+      this.$refs.modalUserRole.show(roleId)
     },
     handleExpandedRowsChange(expandedRows) {
       this.expandedRowKeys = expandedRows
     },
   }
-};
+}
 </script>
 <style scoped lang="less">
 @import '~@assets/less/common.less';
diff --git a/src/views/system/SysCategoryList.vue b/src/views/system/SysCategoryList.vue
index 157b2d0..63bfed5 100644
--- a/src/views/system/SysCategoryList.vue
+++ b/src/views/system/SysCategoryList.vue
@@ -61,7 +61,7 @@
   import { deleteAction } from '@/api/manage'
 
   export default {
-    name: "SysCategoryList",
+    name: 'SysCategoryList',
     mixins:[JeroListMixin],
     components: {
       SysCategoryModal
@@ -73,33 +73,33 @@
         columns: [
           {
             title:'分类名称',
-            align:"left",
+            align:'left',
             dataIndex: 'name'
           },
           {
             title:'分类编码',
-            align:"left",
+            align:'left',
             dataIndex: 'code'
           },
           {
             title: '操作',
             dataIndex: 'action',
-            align:"center",
+            align:'center',
             scopedSlots: { customRender: 'action' },
           }
         ],
         url: {
-          list: "/sys/category/rootList",
-          childList: "/sys/category/childList",
-          getChildListBatch: "/sys/category/getChildListBatch",
-          delete: "/sys/category/delete",
-          deleteBatch: "/sys/category/deleteBatch",
-          exportXlsUrl: "/sys/category/exportXls",
-          importExcelUrl: "sys/category/importExcel",
+          list: '/sys/category/rootList',
+          childList: '/sys/category/childList',
+          getChildListBatch: '/sys/category/getChildListBatch',
+          delete: '/sys/category/delete',
+          deleteBatch: '/sys/category/deleteBatch',
+          exportXlsUrl: '/sys/category/exportXls',
+          importExcelUrl: 'sys/category/importExcel',
         },
         expandedRowKeys:[],
-        hasChildrenField:"hasChild",
-        pidField:"pid",
+        hasChildrenField:'hasChild',
+        pidField:'pid',
         dictOptions:{
         },
         subExpandedKeys:[],
@@ -107,7 +107,7 @@
     },
     computed: {
       importExcelUrl(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
       },
       tableProps() {
         let _this = this
@@ -164,7 +164,7 @@
         if (expanded) {
           this.expandedRowKeys.push(record.id)
           if (record.children.length>0 && record.children[0].isLoading === true) {
-            let params = this.getQueryParams();//查询条件
+            let params = this.getQueryParams()//查询条件
             params[this.pidField] = record.id
             getAction(this.url.childList,params).then((res)=>{
               if(res.success){
@@ -183,7 +183,7 @@
         }else{
           let keyIndex = this.expandedRowKeys.indexOf(record.id)
           if(keyIndex>=0){
-            this.expandedRowKeys.splice(keyIndex, 1);
+            this.expandedRowKeys.splice(keyIndex, 1)
           }
         }
       },
@@ -214,7 +214,7 @@
           this.loadData()
         }else{
           this.expandedRowKeys=[]
-          console.log("22222",arr)
+          console.log('22222',arr)
           for(let i of arr){
             await this.expandTreeNode(i)
           }
@@ -225,10 +225,10 @@
           this.getFormDataById(nodeId,this.dataSource)
           let row = this.parentFormData
           this.expandedRowKeys.push(nodeId)
-          let params = this.getQueryParams();//查询条件
+          let params = this.getQueryParams()//查询条件
           params[this.pidField] = nodeId
           getAction(this.url.childList,params).then((res)=>{
-            console.log("11111",res)
+            console.log('11111',res)
             if(res.success){
               if(res.result && res.result.length>0){
                 row.children = this.getDataByResult(res.result)
@@ -257,24 +257,24 @@
         }
       },
       handleAddSub(record){
-        this.subExpandedKeys = [];
+        this.subExpandedKeys = []
         this.getExpandKeysByPid(record.id,this.dataSource,this.dataSource)
-        this.$refs.modalForm.subExpandedKeys = this.subExpandedKeys;
-        this.$refs.modalForm.title = "添加子分类";
-        this.$refs.modalForm.edit({'pid':record.id});
-        this.$refs.modalForm.disableSubmit = false;
+        this.$refs.modalForm.subExpandedKeys = this.subExpandedKeys
+        this.$refs.modalForm.title = '添加子分类'
+        this.$refs.modalForm.edit({'pid':record.id})
+        this.$refs.modalForm.disableSubmit = false
       },
       handleDelete: function (record) {
-        let that = this;
+        let that = this
         deleteAction(that.url.delete, {id: record.id}).then((res) => {
           if (res.success) {
             //update--begin--autor:lvdandan-----date:20201204------for：JT-31 删除成功后默认展开已展开信息
-            that.loadData();
+            that.loadData()
             //update--end--autor:lvdandan-----date:20201204------for：JT-31 删除成功后默认展开已展开信息
           } else {
-            that.$message.warning(res.message);
+            that.$message.warning(res.message)
           }
-        });
+        })
       },
       // 添加子分类时获取所有父级id
       getExpandKeysByPid(pid,arr,all){
@@ -296,19 +296,19 @@
             if (res.success && res.result.records.length>0) {
               //已展开的数据批量子节点
               let records = res.result.records
-              const listMap = new Map();
+              const listMap = new Map()
               for (let item of records) {
-                let pid = item[this.pidField];
+                let pid = item[this.pidField]
                 if (this.expandedRowKeys.join(',').includes(pid)) {
-                  let mapList = listMap.get(pid);
+                  let mapList = listMap.get(pid)
                   if (mapList == null) {
-                    mapList = [];
+                    mapList = []
                   }
-                  mapList.push(item);
-                  listMap.set(pid, mapList);
+                  mapList.push(item)
+                  listMap.set(pid, mapList)
                 }
               }
-              let childrenMap = listMap;
+              let childrenMap = listMap
               let fn = (list) => {
                 if(list) {
                   list.forEach(data => {
diff --git a/src/views/system/TenantList.vue b/src/views/system/TenantList.vue
index d1f0446..7ec22da 100644
--- a/src/views/system/TenantList.vue
+++ b/src/views/system/TenantList.vue
@@ -96,7 +96,7 @@
 
 
   export default {
-    name: "TenantList",
+    name: 'TenantList',
     mixins:[JeroListMixin, mixinDevice],
     components: {
       TenantModal
@@ -108,41 +108,41 @@
         columns: [
           {
             title:'租户名称',
-            align:"center",
+            align:'center',
             dataIndex: 'name'
           },{
             title:'租户编号',
-            align:"center",
+            align:'center',
             dataIndex: 'id'
           },
           {
             title:'开始时间',
-            align:"center",
+            align:'center',
             dataIndex: 'beginDate'
           },
           {
             title:'结束时间',
-            align:"center",
+            align:'center',
             dataIndex: 'endDate'
           },
           {
             title:'状态',
-            align:"center",
+            align:'center',
             dataIndex: 'status_dictText'
           },
           {
             title: '操作',
             dataIndex: 'action',
-            align:"center",
-            fixed:"right",
+            align:'center',
+            fixed:'right',
             width:147,
             scopedSlots: { customRender: 'action' }
           }
         ],
         url: {
-          list: "/sys/tenant/page",
-          delete: "/sys/tenant/delete",
-          deleteBatch: "/sys/tenant/deleteBatch"
+          list: '/sys/tenant/page',
+          delete: '/sys/tenant/delete',
+          deleteBatch: '/sys/tenant/deleteBatch'
         },
         dictOptions:{},
       }
@@ -151,7 +151,7 @@
     },
     computed: {
       importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
       },
     },
     methods: {
diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue
index 3b69913..96a1188 100644
--- a/src/views/system/UserAnnouncementList.vue
+++ b/src/views/system/UserAnnouncementList.vue
@@ -58,7 +58,7 @@
   import DynamicNotice from '../../components/tools/DynamicNotice'
 
   export default {
-    name: "UserAnnouncementList",
+    name: 'UserAnnouncementList',
     mixins: [JeroListMixin],
     components: {
       DynamicNotice,
@@ -70,67 +70,67 @@
         queryParam: {},
         columns: [{
           title: '标题',
-          align:"center",
+          align:'center',
           dataIndex: 'titile'
         },{
           title: '消息类型',
-          align: "center",
+          align: 'center',
           dataIndex: 'msgCategory',
           customRender: function (text) {
             if (text == '1') {
-              return "通知公告";
-            } else if (text == "2") {
-              return "系统消息";
+              return '通知公告'
+            } else if (text == '2') {
+              return '系统消息'
             } else {
-              return text;
+              return text
             }
           }
         },{
           title: '发布人',
-          align:"center",
+          align:'center',
           dataIndex: 'sender'
         },{
           title: '发布时间',
-          align:"center",
+          align:'center',
           dataIndex: 'sendTime'
         },{
           title: '优先级',
-          align:"center",
+          align:'center',
           dataIndex: 'priority',
           customRender:function (text) {
             if(text=='L'){
-              return "低";
-            }else if(text=="M"){
-              return "中";
-            }else if(text=="H"){
-              return "高";
+              return '低'
+            }else if(text=='M'){
+              return '中'
+            }else if(text=='H'){
+              return '高'
             } else {
-              return text;
+              return text
             }
           }
         },{
           title: '阅读状态',
-          align:"center",
+          align:'center',
           dataIndex: 'readFlag',
           customRender:function (text) {
             if(text=='0'){
-              return "未读";
-            }else if(text=="1"){
-              return "已读";
+              return '未读'
+            }else if(text=='1'){
+              return '已读'
             } else {
-              return text;
+              return text
             }
           }
         },{
           title: '操作',
           dataIndex: 'action',
-          align:"center",
+          align:'center',
           scopedSlots: { customRender: 'action' },
         }],
 		    url: {
-          list: "/sys/sysAnnouncementSend/getMyAnnouncementSend",
-          editCementSend:"sys/sysAnnouncementSend/editByAnntIdAndUserId",
-          readAllMsg:"sys/sysAnnouncementSend/readAll",
+          list: '/sys/sysAnnouncementSend/getMyAnnouncementSend',
+          editCementSend:'sys/sysAnnouncementSend/editByAnntIdAndUserId',
+          readAllMsg:'sys/sysAnnouncementSend/readAll',
         },
         loading:false,
         openPath:'',
@@ -139,42 +139,42 @@
     },
     methods: {
       handleDetail: function(record){
-        this.$refs.sysAnnouncementModal.detail(record);
-        this.$refs.sysAnnouncementModal.title="查看";
+        this.$refs.sysAnnouncementModal.detail(record)
+        this.$refs.sysAnnouncementModal.title='查看'
       },
       showAnnouncement(record){
         putAction(this.url.editCementSend,{anntId:record.anntId}).then((res)=>{
           if(res.success){
-            this.loadData();
+            this.loadData()
             this.syncHeadNotic(record.anntId)
           }
-        });
+        })
         if(record.openType==='component'){
-          this.openPath = record.openPage;
-          this.formData = {id:record.busId};
-          this.$refs.showDynamNotice.detail();
+          this.openPath = record.openPage
+          this.formData = {id:record.busId}
+          this.$refs.showDynamNotice.detail()
         }else{
-          this.$refs.ShowAnnouncement.detail(record);
+          this.$refs.ShowAnnouncement.detail(record)
         }
       },
       syncHeadNotic(anntId){
-        getAction("sys/annountCement/syncNotic",{anntId:anntId})
+        getAction('sys/annountCement/syncNotic',{anntId:anntId})
       },
       readAll(){
-        var that = this;
+        var that = this
         that.$confirm({
-          title:"确认操作",
-          content:"是否全部标注已读?",
+          title:'确认操作',
+          content:'是否全部标注已读?',
           onOk: function(){
             putAction(that.url.readAllMsg).then((res)=>{
               if(res.success){
-                that.$message.success(res.message);
-                that.loadData();
-                that.syncHeadNotic();
+                that.$message.success(res.message)
+                that.loadData()
+                that.syncHeadNotic()
               }
-            });
+            })
           }
-        });
+        })
       },
     }
   }
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index 02db00c..8fe1556 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -99,17 +99,17 @@
 </template>
 
 <script>
-import UserModal from "./modules/UserModal";
-import {getAction, getFileAccessHttpUrl} from "@/api/manage";
-import "@/assets/less/TableExpand.less";
-import { JeroListMixin } from "@/mixins/JeroListMixin";
-import JInput from "@/components/jero/JInput";
-import JEllipsis from "@comp/jero/JEllipsis";
-import {queryDepartTreeList, resetUserPassword} from "@api/api";
+import UserModal from './modules/UserModal'
+import {getAction, getFileAccessHttpUrl} from '@/api/manage'
+import '@/assets/less/TableExpand.less'
+import { JeroListMixin } from '@/mixins/JeroListMixin'
+import JInput from '@/components/jero/JInput'
+import JEllipsis from '@comp/jero/JEllipsis'
+import {queryDepartTreeList, resetUserPassword} from '@api/api'
 
 
 export default {
-  name: "UserList",
+  name: 'UserList',
   mixins: [JeroListMixin],
   components: {
     UserModal,
@@ -118,31 +118,31 @@ export default {
   },
   data() {
     return {
-      description: "这是用户管理页面",
+      description: '这是用户管理页面',
       columns: [
         {
-          title: "序号",
-          dataIndex: "",
-          key: "rowIndex",
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
           width: 60,
-          align: "center",
+          align: 'center',
           customRender: function(t, r, index) {
-            return parseInt(index) + 1;
+            return parseInt(index) + 1
           }
         },
         {
-          title: "用户账号",
-          align: "center",
-          dataIndex: "username",
+          title: '用户账号',
+          align: 'center',
+          dataIndex: 'username',
           width: 120,
-          scopedSlots: { customRender: "text" },
+          scopedSlots: { customRender: 'text' },
         },
         {
-          title: "用户姓名",
-          align: "center",
+          title: '用户姓名',
+          align: 'center',
           width: 100,
-          dataIndex: "realname",
-          scopedSlots: { customRender: "text" },
+          dataIndex: 'realname',
+          scopedSlots: { customRender: 'text' },
         },
         // {
         //   title: "性别",
@@ -152,25 +152,25 @@ export default {
         //   scopedSlots: { customRender: "text" },
         // },
         {
-          title: "手机号",
-          align: "center",
+          title: '手机号',
+          align: 'center',
           width: 100,
-          dataIndex: "phone",
-          scopedSlots: { customRender: "text" },
+          dataIndex: 'phone',
+          scopedSlots: { customRender: 'text' },
         },
         {
-          title: "角色",
-          align: "center",
+          title: '角色',
+          align: 'center',
           width: 100,
-          dataIndex: "roleName",
-          scopedSlots: { customRender: "text" },
+          dataIndex: 'roleName',
+          scopedSlots: { customRender: 'text' },
         },
         {
-          title: "组织机构",
-          align: "center",
+          title: '组织机构',
+          align: 'center',
           width: 180,
-          dataIndex: "departIds_dictText",
-          scopedSlots: { customRender: "text" },
+          dataIndex: 'departIds_dictText',
+          scopedSlots: { customRender: 'text' },
         },
         // {
         //   title: '生日',
@@ -185,16 +185,16 @@ export default {
         //   dataIndex: 'departIds_dictText'
         // },
         {
-          title: "创建时间",
-          dataIndex: "createTime",
-          align: "center",
+          title: '创建时间',
+          dataIndex: 'createTime',
+          align: 'center',
           width: 170
         },
         {
-          title: "操作",
-          dataIndex: "action",
-          scopedSlots: { customRender: "action" },
-          align: "center",
+          title: '操作',
+          dataIndex: 'action',
+          scopedSlots: { customRender: 'action' },
+          align: 'center',
           width: 170
         }
       ],
@@ -211,17 +211,17 @@ export default {
         sm: { span: 16 },
       },
       superQueryFieldList: [
-        { type: "input", value: "username", text: "用户账号" }
+        { type: 'input', value: 'username', text: '用户账号' }
       ],
       url: {
-        list: "/sys/user/pageRoleAndDepart",
-        delete: "/sys/user/delete",
-        deleteBatch: "/sys/user/deleteBatch",
-        exportXlsUrl: "/sys/user/exportXls",
-        importExcelUrl: "sys/user/importExcel",
+        list: '/sys/user/pageRoleAndDepart',
+        delete: '/sys/user/delete',
+        deleteBatch: '/sys/user/deleteBatch',
+        exportXlsUrl: '/sys/user/exportXls',
+        importExcelUrl: 'sys/user/importExcel',
         downTemplateUrl:'sys/user/exportTemplate'
       }
-    };
+    }
   },
   created() {
     this.loadDepartTreeData()
@@ -229,12 +229,12 @@ export default {
   },
   computed:{
     importExcelUrl(){
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
     }
   },
   methods: {
     getAvatarView: function(avatar) {
-      return getFileAccessHttpUrl(avatar);
+      return getFileAccessHttpUrl(avatar)
     },
     passwordModalOk() {
       //TODO 密码修改完成 不需要刷新页面，可以把datasource中的数据更新一下
@@ -246,12 +246,12 @@ export default {
       const that = this
       queryDepartTreeList().then((res) => {
         if(res.success){
-          that.treeDepartData = [];
+          that.treeDepartData = []
           let treeList = res.result
           for(let a=0;a<treeList.length;a++){
-            let temp = treeList[a];
-            temp.isLeaf = temp.leaf;
-            that.treeDepartData.push(temp);
+            let temp = treeList[a]
+            temp.isLeaf = temp.leaf
+            that.treeDepartData.push(temp)
           }
         }
       })
@@ -278,7 +278,7 @@ export default {
     }
   }
 
-};
+}
 </script>
 <style scoped lang="less">
 @import '~@assets/less/common.less';
diff --git a/src/views/system/modules/DepartAuthModal.vue b/src/views/system/modules/DepartAuthModal.vue
index 85b6678..ded6faa 100644
--- a/src/views/system/modules/DepartAuthModal.vue
+++ b/src/views/system/modules/DepartAuthModal.vue
@@ -60,7 +60,7 @@
     components: { DepartDataruleModal },
     data(){
       return {
-        departId:"",
+        departId:'',
         treeData: [],
         defaultCheckedKeys:[],
         checkedKeys:[],
@@ -69,7 +69,7 @@
         allTreeKeys:[],
         autoExpandParent: true,
         checkStrictly: false,
-        title:"部门权限配置",
+        title:'部门权限配置',
         visible: false,
         loading: false,
         selectedKeys:[]
@@ -89,15 +89,15 @@
       },
       show(departId){
         this.departId=departId
-        this.loadData();
+        this.loadData()
       },
       close () {
         this.reset()
-        this.$emit('close');
-        this.visible = false;
+        this.$emit('close')
+        this.visible = false
       },
       onExpand(expandedKeys){
-        this.expandedKeysss = expandedKeys;
+        this.expandedKeysss = expandedKeys
         this.autoExpandParent = false
       },
       reset () {
@@ -122,26 +122,26 @@
         this.close()
       },
       handleSubmit() {
-        let that = this;
+        let that = this
         if(!that.departId){
           this.$message.warning('请点击选择一个部门!')
         }
         let checkedKeys = [...that.checkedKeys, ...that.halfCheckedKeys]
-        const permissionIds = checkedKeys.join(",")
+        const permissionIds = checkedKeys.join(',')
         let params =  {
           departId:that.departId,
           permissionIds,
-          lastpermissionIds:that.defaultCheckedKeys.join(","),
-        };
-        that.loading = true;
+          lastpermissionIds:that.defaultCheckedKeys.join(','),
+        }
+        that.loading = true
         saveDepartPermission(params).then((res)=>{
           if(res.success){
-            that.$message.success(res.message);
-            that.loading = false;
-            that.loadData();
+            that.$message.success(res.message)
+            that.loading = false
+            that.loadData()
           }else {
-            that.$message.error(res.message);
-            that.loading = false;
+            that.$message.error(res.message)
+            that.loading = false
           }
         })
       },
@@ -152,13 +152,13 @@
             this.convertTreeListToKeyLeafPairs(children, keyLeafPair)
           }
         }
-        return keyLeafPair;
+        return keyLeafPair
       },
       emptyCurrForm() {
         this.form.resetFields()
       },
       loadData(){
-        this.loading = true;
+        this.loading = true
         queryTreeListForRole().then((res) => {
           this.treeData = res.result.treeList
           this.allTreeKeys = res.result.ids
@@ -175,11 +175,11 @@
               const keyLeafPair = keyLeafPairs.filter(item => item.key === key)[0]
               return keyLeafPair && !keyLeafPair.isLeaf
             })
-            this.checkedKeys = [...checkedKeys];
+            this.checkedKeys = [...checkedKeys]
             this.halfCheckedKeys = [...halfCheckedKeys]
-            this.defaultCheckedKeys = [...halfCheckedKeys, ...checkedKeys];
-            this.expandedKeysss = this.allTreeKeys;
-            this.loading = false;
+            this.defaultCheckedKeys = [...halfCheckedKeys, ...checkedKeys]
+            this.expandedKeysss = this.allTreeKeys
+            this.loading = false
           })
         })
       }
diff --git a/src/views/system/modules/DepartDataruleModal.vue b/src/views/system/modules/DepartDataruleModal.vue
index 77298ac..a474493 100644
--- a/src/views/system/modules/DepartDataruleModal.vue
+++ b/src/views/system/modules/DepartDataruleModal.vue
@@ -52,7 +52,7 @@
         }],
         activeTabKey: '1',
         url:{
-          datarule:"/sys/sysDepartPermission/datarule",
+          datarule:'/sys/sysDepartPermission/datarule',
         },
         dataruleList:[],
         dataruleChecked:[]
@@ -65,19 +65,19 @@
             this.dataruleList = res.result.datarule
             let drChecked = res.result.drChecked
             if(drChecked){
-              this.dataruleChecked = drChecked.split(",")
+              this.dataruleChecked = drChecked.split(',')
             }
           }
         })
       },
       saveDataruleForRole(){
         if(!this.dataruleChecked || this.dataruleChecked.length==0){
-          this.$message.warning("请注意，现未勾选任何数据权限!")
+          this.$message.warning('请注意，现未勾选任何数据权限!')
         }
         let params = {
           permissionId:this.functionId,
           departId:this.departId,
-          dataRuleIds:this.dataruleChecked.join(",")
+          dataRuleIds:this.dataruleChecked.join(',')
         }
         postAction(this.url.datarule,params).then(res=>{
           if(res.success){
diff --git a/src/views/system/modules/DepartModal.vue b/src/views/system/modules/DepartModal.vue
index 31b577f..07c0f9e 100644
--- a/src/views/system/modules/DepartModal.vue
+++ b/src/views/system/modules/DepartModal.vue
@@ -92,22 +92,22 @@
 </template>
 
 <script>
-import { httpAction } from "@/api/manage";
-import { queryIdTree } from "@/api/api";
-import pick from "lodash.pick";
-import ATextarea from "ant-design-vue/es/input/TextArea";
-import {checkDepartName} from "@/utils/validateOnly";
+import { httpAction } from '@/api/manage'
+import { queryIdTree } from '@/api/api'
+import pick from 'lodash.pick'
+import ATextarea from 'ant-design-vue/es/input/TextArea'
+import {checkDepartName} from '@/utils/validateOnly'
 
 export default {
-  name: "SysDepartModal",
+  name: 'SysDepartModal',
   components: { ATextarea },
   data() {
     return {
       departTree: [],
       orgTypeData: [],
-      phoneWarning: "",
-      departName: "",
-      title: "操作",
+      phoneWarning: '',
+      departName: '',
+      title: '操作',
       seen: false,
       visible: false,
       condition: true,
@@ -128,92 +128,92 @@ export default {
       form: this.$form.createForm(this),
       validatorRules: {
         departName: { rules: [{ required: true,validator:this.validateDepartName }],validateTrigger: 'blur'  },
-        orgCode: { rules: [{ required: true, message: "请输入机构编码!" }] ,validateTrigger: 'blur'  },
+        orgCode: { rules: [{ required: true, message: '请输入机构编码!' }] ,validateTrigger: 'blur'  },
         mobile: { rules: [{ validator: this.validateMobile }] ,validateTrigger: 'blur'
         }
       },
       url: {
-        add: "/sys/sysDepart/add"
+        add: '/sys/sysDepart/add'
       },
       dictDisabled: true
-    };
+    }
   },
   created() {
   },
   methods: {
     loadTreeData() {
-      var that = this;
+      var that = this
       queryIdTree().then((res) => {
         if (res.success) {
-          that.departTree = [];
+          that.departTree = []
           for (let i = 0; i < res.result.length; i++) {
-            let temp = res.result[i];
-            that.departTree.push(temp);
+            let temp = res.result[i]
+            that.departTree.push(temp)
           }
         }
 
-      });
+      })
     },
     add(depart) {
       if (depart) {
-        this.seen = false;
-        this.dictDisabled = false;
+        this.seen = false
+        this.dictDisabled = false
       } else {
-        this.seen = true;
-        this.dictDisabled = true;
+        this.seen = true
+        this.dictDisabled = true
       }
-      this.edit(depart);
+      this.edit(depart)
     },
     edit(record) {
-      this.form.resetFields();
-      this.model = Object.assign({}, record);
-      this.visible = true;
-      this.loadTreeData();
-      this.model.parentId = record != null ? record.toString() : null;
+      this.form.resetFields()
+      this.model = Object.assign({}, record)
+      this.visible = true
+      this.loadTreeData()
+      this.model.parentId = record != null ? record.toString() : null
       if (this.seen) {
-        this.model.orgCategory = "1";
+        this.model.orgCategory = '1'
       } else {
-        this.model.orgCategory = "2";
+        this.model.orgCategory = '2'
       }
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, "orgCategory", "departName", "departNameEn", "departNameAbbr", "departOrder", "description", "orgType", "orgCode", "mobile", "fax", "address", "memo", "status", "delFlag"));
-      });
+        this.form.setFieldsValue(pick(this.model, 'orgCategory', 'departName', 'departNameEn', 'departNameAbbr', 'departOrder', 'description', 'orgType', 'orgCode', 'mobile', 'fax', 'address', 'memo', 'status', 'delFlag'))
+      })
     },
     close() {
-      this.$emit("close");
-      this.disableSubmit = false;
-      this.visible = false;
+      this.$emit('close')
+      this.disableSubmit = false
+      this.visible = false
     },
     handleOk() {
-      const that = this;
-      that.confirmLoading = true;
+      const that = this
+      that.confirmLoading = true
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
-          let formData = Object.assign(this.model, values);
+          let formData = Object.assign(this.model, values)
           //时间格式化
-          console.log(formData);
-          httpAction(this.url.add, formData, "post").then((res) => {
+          console.log(formData)
+          httpAction(this.url.add, formData, 'post').then((res) => {
             if (res.success) {
-              that.$message.success(res.message);
-              that.loadTreeData();
-              that.$emit("ok");
-              that.close();
+              that.$message.success(res.message)
+              that.loadTreeData()
+              that.$emit('ok')
+              that.close()
             } else {
-              that.$message.warning(res.message);
+              that.$message.warning(res.message)
             }
           }).finally(() => {
-            that.confirmLoading = false;
+            that.confirmLoading = false
 
-          });
+          })
 
         }else {
-          that.confirmLoading = false;
+          that.confirmLoading = false
         }
-      });
+      })
     },
     handleCancel() {
-      this.close();
+      this.close()
     },
     validateDepartName(rule, value, callback){
       checkDepartName(value,this.model.id).then(res => {
@@ -226,14 +226,14 @@ export default {
     },
     validateMobile(rule, value, callback) {
       if (!value || new RegExp(/^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/).test(value)) {
-        callback();
+        callback()
       } else {
-        callback("您的手机号码格式不正确!");
+        callback('您的手机号码格式不正确!')
       }
 
     }
   }
-};
+}
 </script>
 
 <style scoped>
diff --git a/src/views/system/modules/DeptBaseInfo.vue b/src/views/system/modules/DeptBaseInfo.vue
index af1418f..45ea1fc 100644
--- a/src/views/system/modules/DeptBaseInfo.vue
+++ b/src/views/system/modules/DeptBaseInfo.vue
@@ -93,33 +93,33 @@
       }
     },
     created() {
-      this.loadTreeData();
+      this.loadTreeData()
     },
     methods: {
       loadTreeData() {
         queryIdTree().then((res) => {
           if (res.success) {
             for (let i = 0; i < res.result.length; i++) {
-              let temp = res.result[i];
-              this.treeData.push(temp);
+              let temp = res.result[i]
+              this.treeData.push(temp)
             }
           }
 
         })
       },
       open(record) {
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.visible = true;
-        console.log("record:");
-        console.log(record);
+        this.form.resetFields()
+        this.model = Object.assign({}, record)
+        this.visible = true
+        console.log('record:')
+        console.log(record)
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(record, 'orgCategory','departName', 'parentId', 'orgCode', 'departOrder', 'mobile', 'fax', 'address', 'memo'));
-        });
+          this.form.setFieldsValue(pick(record, 'orgCategory','departName', 'parentId', 'orgCode', 'departOrder', 'mobile', 'fax', 'address', 'memo'))
+        })
       },
       clearForm() {
-        this.form.resetFields();
-        this.treeData = [];
+        this.form.resetFields()
+        this.treeData = []
       },
     }
   }
diff --git a/src/views/system/modules/DeptRoleAuthModal.vue b/src/views/system/modules/DeptRoleAuthModal.vue
index d84845d..13be75b 100644
--- a/src/views/system/modules/DeptRoleAuthModal.vue
+++ b/src/views/system/modules/DeptRoleAuthModal.vue
@@ -61,15 +61,15 @@
   import DeptRoleDataruleModal from './DeptRoleDataruleModal'
 
   export default {
-    name: "DeptRoleAuthModal",
+    name: 'DeptRoleAuthModal',
     components:{
       DeptRoleDataruleModal,
       RoleDataruleModal
     },
     data(){
       return {
-        departId:"",
-        roleId:"",
+        departId:'',
+        roleId:'',
         treeData: [],
         defaultCheckedKeys:[],
         checkedKeys:[],
@@ -78,7 +78,7 @@
         allTreeKeys:[],
         autoExpandParent: true,
         checkStrictly: true,
-        title:"部门角色权限配置",
+        title:'部门角色权限配置',
         visible: false,
         loading: false,
         selectedKeys:[]
@@ -100,7 +100,7 @@
       },
       onCheck (o) {
         if(this.checkStrictly){
-          this.checkedKeys = o.checked;
+          this.checkedKeys = o.checked
         }else{
           this.checkedKeys = o
         }
@@ -108,15 +108,15 @@
       show(roleId,departId){
         this.departId = departId
         this.roleId=roleId
-        this.visible = true;
+        this.visible = true
       },
       close () {
         this.reset()
-        this.$emit('close');
-        this.visible = false;
+        this.$emit('close')
+        this.visible = false
       },
       onExpand(expandedKeys){
-        this.expandedKeysss = expandedKeys;
+        this.expandedKeysss = expandedKeys
         this.autoExpandParent = false
       },
       reset () {
@@ -141,29 +141,29 @@
         this.close()
       },
       handleSubmit(exit) {
-        let that = this;
+        let that = this
         let params =  {
           roleId:that.roleId,
-          permissionIds:that.checkedKeys.join(","),
-          lastpermissionIds:that.defaultCheckedKeys.join(","),
-        };
-        that.loading = true;
-        console.log("请求参数：",params);
+          permissionIds:that.checkedKeys.join(','),
+          lastpermissionIds:that.defaultCheckedKeys.join(','),
+        }
+        that.loading = true
+        console.log('请求参数：',params)
         saveDeptRolePermission(params).then((res)=>{
           if(res.success){
-            that.$message.success(res.message);
-            that.loading = false;
+            that.$message.success(res.message)
+            that.loading = false
             if (exit) {
               that.close()
             }
           }else {
-            that.$message.error(res.message);
-            that.loading = false;
+            that.$message.error(res.message)
+            that.loading = false
             if (exit) {
               that.close()
             }
           }
-          this.loadData();
+          this.loadData()
         })
       },
       convertTreeListToKeyLeafPairs(treeList, keyLeafPair = []) {
@@ -173,16 +173,16 @@
             this.convertTreeListToKeyLeafPairs(children, keyLeafPair)
           }
         }
-        return keyLeafPair;
+        return keyLeafPair
       },
       loadData(){
         queryTreeListForDeptRole({departId:this.departId}).then((res) => {
           this.treeData = res.result.treeList
           this.allTreeKeys = res.result.ids
           queryDeptRolePermission({roleId:this.roleId}).then((res)=>{
-            this.checkedKeys = [...res.result];
-            this.defaultCheckedKeys = [...res.result];
-            this.expandedKeysss = this.allTreeKeys;
+            this.checkedKeys = [...res.result]
+            this.defaultCheckedKeys = [...res.result]
+            this.expandedKeysss = this.allTreeKeys
           })
         })
       }
@@ -190,7 +190,7 @@
     watch: {
       visible () {
         if (this.visible ) {
-          this.loadData();
+          this.loadData()
         }
       }
     }
diff --git a/src/views/system/modules/DeptRoleDataruleModal.vue b/src/views/system/modules/DeptRoleDataruleModal.vue
index f3a1211..9fc46c4 100644
--- a/src/views/system/modules/DeptRoleDataruleModal.vue
+++ b/src/views/system/modules/DeptRoleDataruleModal.vue
@@ -55,7 +55,7 @@
         }],
         activeTabKey: '1',
         url:{
-          datarule:"/sys/sysDepartRole/datarule",
+          datarule:'/sys/sysDepartRole/datarule',
         },
         dataruleList:[],
         dataruleChecked:[]
@@ -69,21 +69,21 @@
             this.dataruleList = res.result.datarule
             let drChecked = res.result.drChecked
             if(drChecked){
-              this.dataruleChecked = drChecked.split(",")
+              this.dataruleChecked = drChecked.split(',')
             }
           }
         })
       },
       saveDataruleForRole(){
         if(!this.dataruleChecked || this.dataruleChecked.length==0){
-          this.$message.warning("请注意，现未勾选任何数据权限!")
+          this.$message.warning('请注意，现未勾选任何数据权限!')
         }
         let params = {
           permissionId:this.functionId,
           roleId:this.roleId,
-          dataRuleIds:this.dataruleChecked.join(",")
+          dataRuleIds:this.dataruleChecked.join(',')
         }
-        console.log("保存数据权限",params)
+        console.log('保存数据权限',params)
         postAction(this.url.datarule,params).then(res=>{
           if(res.success){
             this.$message.success(res.message)
diff --git a/src/views/system/modules/DeptRoleInfo.vue b/src/views/system/modules/DeptRoleInfo.vue
index d2cdeef..0c25f7e 100644
--- a/src/views/system/modules/DeptRoleInfo.vue
+++ b/src/views/system/modules/DeptRoleInfo.vue
@@ -92,35 +92,35 @@
         // 表头
         columns: [{
           title: '部门角色名称',
-          align: "center",
+          align: 'center',
           dataIndex: 'roleName'
         },
         {
           title: '部门角色编码',
-          align: "center",
+          align: 'center',
           dataIndex: 'roleCode'
         },
         {
           title: '部门',
-          align: "center",
+          align: 'center',
           dataIndex: 'departId_dictText'
         },
         {
           title: '备注',
-          align: "center",
+          align: 'center',
           dataIndex: 'description'
         },
         {
           title: '操作',
           dataIndex: 'action',
           scopedSlots: {customRender: 'action'},
-          align: "center",
+          align: 'center',
           width: 170
         }],
         url: {
-          list: "/sys/sysDepartRole/page",
-          delete: "/sys/sysDepartRole/delete",
-          deleteBatch: "/sys/sysDepartRole/deleteBatch",
+          list: '/sys/sysDepartRole/page',
+          delete: '/sys/sysDepartRole/delete',
+          deleteBatch: '/sys/sysDepartRole/deleteBatch',
         }
       }
     },
@@ -129,58 +129,58 @@
     methods: {
       searchReset() {
         this.queryParam = {}
-        this.loadData(1);
+        this.loadData(1)
       },
       loadData(arg) {
         if (!this.url.list) {
-          this.$message.error("请设置url.list属性!")
+          this.$message.error('请设置url.list属性!')
           return
         }
         //加载数据 若传入参数1则加载第一页的内容
         if (arg === 1) {
-          this.ipagination.current = 1;
+          this.ipagination.current = 1
         }
-        let params = this.getQueryParams();//查询条件
-        params.deptId = this.currentDeptId;
+        let params = this.getQueryParams()//查询条件
+        params.deptId = this.currentDeptId
         getAction(this.url.list, params).then((res) => {
           if (res.success && res.result) {
-            this.dataSource = res.result.records;
-            this.ipagination.total = res.result.total;
+            this.dataSource = res.result.records
+            this.ipagination.total = res.result.total
           }
         })
       },
       open(record) {
-        this.currentDeptId = record.id;
-        this.loadData(1);
+        this.currentDeptId = record.id
+        this.loadData(1)
       },
       clearList() {
-        this.currentDeptId = '';
-        this.dataSource = [];
+        this.currentDeptId = ''
+        this.dataSource = []
       },
       hasSelectDept() {
         if (this.currentDeptId == '') {
-          this.$message.warn("请选择一个部门!")
-          return false;
+          this.$message.warn('请选择一个部门!')
+          return false
         }
-        return true;
+        return true
       },
       handleEdit: function (record) {
-        this.$refs.modalForm.title = "编辑";
-        this.$refs.modalForm.departDisabled = true;
-        this.$refs.modalForm.disableSubmit = false;
-        this.$refs.modalForm.edit(record,record.departId);
+        this.$refs.modalForm.title = '编辑'
+        this.$refs.modalForm.departDisabled = true
+        this.$refs.modalForm.disableSubmit = false
+        this.$refs.modalForm.edit(record,record.departId)
       },
       handleAdd: function () {
         if (this.currentDeptId == '') {
-          this.$message.warn("请选择一个部门!")
+          this.$message.warn('请选择一个部门!')
         } else {
-          this.$refs.modalForm.departDisabled = true;
-          this.$refs.modalForm.add(this.currentDeptId);
-          this.$refs.modalForm.title = "新增";
+          this.$refs.modalForm.departDisabled = true
+          this.$refs.modalForm.add(this.currentDeptId)
+          this.$refs.modalForm.title = '新增'
         }
       },
       handlePerssion: function(record){
-        this.$refs.modalDeptRole.show(record.id,record.departId);
+        this.$refs.modalDeptRole.show(record.id,record.departId)
       },
     }
   }
diff --git a/src/views/system/modules/DeptRoleUserModal.vue b/src/views/system/modules/DeptRoleUserModal.vue
index 5c61dfe..2496166 100644
--- a/src/views/system/modules/DeptRoleUserModal.vue
+++ b/src/views/system/modules/DeptRoleUserModal.vue
@@ -60,8 +60,8 @@
     },
     data() {
       return {
-        currentDeptId:"",
-        title: "部门角色分配",
+        currentDeptId:'',
+        title: '部门角色分配',
         visible: false,
         model: {},
         labelCol: {
@@ -76,14 +76,14 @@
         form: this.$form.createForm(this),
         validatorRules: {},
         url: {
-          add: "/sys/sysDepartRole/deptRoleUserAdd",
-          getDeptRoleList:"/sys/sysDepartRole/getDeptRoleList",
-          getDeptRoleByUserId:"/sys/sysDepartRole/getDeptRoleByUserId"
+          add: '/sys/sysDepartRole/deptRoleUserAdd',
+          getDeptRoleList:'/sys/sysDepartRole/getDeptRoleList',
+          getDeptRoleByUserId:'/sys/sysDepartRole/getDeptRoleByUserId'
         },
         designNameOption: [],
-        userId: "",
-        newRoleId:"",
-        oldRoleId:"",
+        userId: '',
+        newRoleId:'',
+        oldRoleId:'',
         designNameValue:[],
         desformList: [],
       }
@@ -93,92 +93,92 @@
     },
     methods: {
       add(record,departId) {
-        this.userId = record.id;
-        this.currentDeptId = departId;
-        this.loadDesformList();
-        this.edit({});
+        this.userId = record.id
+        this.currentDeptId = departId
+        this.loadDesformList()
+        this.edit({})
       },
       edit(record) {
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.visible = true;
+        this.form.resetFields()
+        this.model = Object.assign({}, record)
+        this.visible = true
         getAction(this.url.getDeptRoleByUserId,{userId:this.userId,departId:this.currentDeptId}).then((res) => {
           if (res.success) {
-            var designName = [];
+            var designName = []
             for (let value of res.result) {
               designName.push(value.droleId)
             }
-            this.oldRoleId=designName.join(",");
-            this.designNameValue = designName;
-            this.newRoleId = designName.join(",");
+            this.oldRoleId=designName.join(',')
+            this.designNameValue = designName
+            this.newRoleId = designName.join(',')
           }
-        });
+        })
       },
       close() {
-        this.$emit('close');
-        this.visible = false;
+        this.$emit('close')
+        this.visible = false
       },
       handleSubmit() {
-        const that = this;
+        const that = this
         // 触发表单验证
-        that.confirmLoading = true;
-        let  httpurl = this.url.add;
-        let  method = 'post';
-        let formData = Object.assign(this.model, {});
+        that.confirmLoading = true
+        let  httpurl = this.url.add
+        let  method = 'post'
+        let formData = Object.assign(this.model, {})
         //时间格式化
-        formData.userId = this.userId;
-        formData.newRoleId=this.newRoleId;
-        formData.oldRoleId=this.oldRoleId;
+        formData.userId = this.userId
+        formData.newRoleId=this.newRoleId
+        formData.oldRoleId=this.oldRoleId
         httpAction(httpurl, formData, method).then((res) => {
           if (res.success) {
-            that.$message.success(res.message);
-            that.$emit('reload');
-            that.$emit('ok');
+            that.$message.success(res.message)
+            that.$emit('reload')
+            that.$emit('ok')
           } else {
-            that.$message.warning(res.message);
+            that.$message.warning(res.message)
           }
         }).finally(() => {
-          that.confirmLoading = false;
-          that.close();
+          that.confirmLoading = false
+          that.close()
         })
       },
       handleCancel() {
-        this.designNameOption=[];
-        this.designNameValue=[];
+        this.designNameOption=[]
+        this.designNameValue=[]
         this.close()
       },
       designNameChange(selectedValue) {
-        this.newRoleId=selectedValue.join(",");
+        this.newRoleId=selectedValue.join(',')
       },
       checkALL(){
-        var designName = [];
+        var designName = []
         for (let value of this.desformList) {
           designName.push(
             value.id
           )
         }
-        this.designNameValue = designName;
-        this.newRoleId=designName.join(",");
+        this.designNameValue = designName
+        this.newRoleId=designName.join(',')
       },
       cancelCheckALL(){
-        this.designNameValue=[];
-        this.newRoleId="";
+        this.designNameValue=[]
+        this.newRoleId=''
       },
       /** 加载desform */
       loadDesformList() {
         getAction(this.url.getDeptRoleList, { departId: this.currentDeptId, userId:this.userId }).then((res) => {
           if (res.success) {
             this.desformList = res.result
-            var designName = [];
+            var designName = []
             for (let value of this.desformList) {
               designName.push({
                 value: value.id,
                 text: value.roleName,
               })
             }
-            this.designNameOption = designName;
+            this.designNameOption = designName
           }
-        });
+        })
       },
     }
 
diff --git a/src/views/system/modules/DeptUserInfo.vue b/src/views/system/modules/DeptUserInfo.vue
index e42aed0..19ecab2 100644
--- a/src/views/system/modules/DeptUserInfo.vue
+++ b/src/views/system/modules/DeptUserInfo.vue
@@ -77,11 +77,11 @@ import {getAction, postAction,} from '@/api/manage'
 import SelectUserModal from './SelectUserModal'
 import UserModal from './UserModal'
 import DeptRoleUserModal from './DeptRoleUserModal'
-import JEllipsis from "@comp/jero/JEllipsis";
-import "@/assets/less/TableExpand.less";
+import JEllipsis from '@comp/jero/JEllipsis'
+import '@/assets/less/TableExpand.less'
 
 export default {
-  name: "DeptUserInfo",
+  name: 'DeptUserInfo',
   mixins: [JeroListMixin],
   components: {
     DeptRoleUserModal,
@@ -98,34 +98,34 @@ export default {
       columns: [
           {
         title: '用户账号',
-        align: "center",
+        align: 'center',
         width: 100,
         dataIndex: 'username',
         scopedSlots: {customRender: 'text_title'},
       },
         {
           title: '用户名称',
-          align: "center",
+          align: 'center',
           dataIndex: 'realname',
           width: 100,
           scopedSlots: {customRender: 'text_title'},
         },
         {
           title: '部门',
-          align: "center",
+          align: 'center',
           dataIndex: 'orgCode',
           width: 120,
           scopedSlots: {customRender: 'text_title'},
         },
         {
           title: '性别',
-          align: "center",
+          align: 'center',
           dataIndex: 'sex_dictText',
           width: 60,
         },
         {
           title: '电话',
-          align: "center",
+          align: 'center',
           dataIndex: 'phone',
           width: 120,
         },
@@ -134,13 +134,13 @@ export default {
           dataIndex: 'action',
           scopedSlots: {customRender: 'action'},
           fixed: 'right',
-          align: "center",
+          align: 'center',
         }],
       url: {
-        list: "/sys/user/departUserList",
-        edit: "/sys/user/editSysDepartWithUser",
-        delete: "/sys/user/deleteUserInDepart",
-        deleteBatch: "/sys/user/deleteUserInDepartBatch",
+        list: '/sys/user/departUserList',
+        edit: '/sys/user/editSysDepartWithUser',
+        delete: '/sys/user/deleteUserInDepart',
+        deleteBatch: '/sys/user/deleteUserInDepartBatch',
       }
     }
   },
@@ -151,94 +151,94 @@ export default {
     searchReset() {
       this.queryParam = {}
       this.lastQueryParam = {}
-      this.loadData(1);
+      this.loadData(1)
     },
     loadData(arg) {
       if (!this.url.list) {
-        this.$message.error("请设置url.list属性!")
+        this.$message.error('请设置url.list属性!')
         return
       }
       //加载数据 若传入参数1则加载第一页的内容
       if (arg === 1) {
-        this.ipagination.current = 1;
+        this.ipagination.current = 1
       }
       //if (this.currentDeptId === '') return;
-      let params = this.getQueryParams();//查询条件
-      params.depId = this.currentDeptId;
+      let params = this.getQueryParams()//查询条件
+      params.depId = this.currentDeptId
       getAction(this.url.list, params).then((res) => {
         if (res.success && res.result)  {
-          this.dataSource = res.result.records;
-          this.ipagination.total = res.result.total;
+          this.dataSource = res.result.records
+          this.ipagination.total = res.result.total
         }
       })
     },
     batchDel: function () {
 
       if (!this.url.deleteBatch) {
-        this.$message.warn("请设置url.deleteBatch属性!")
+        this.$message.warn('请设置url.deleteBatch属性!')
         return
       }
       if (!this.currentDeptId) {
-        this.$message.warn("未选中任何部门，无法取消部门与用户的关联!")
+        this.$message.warn('未选中任何部门，无法取消部门与用户的关联!')
         return
       }
 
       if (this.selectedRowKeys.length <= 0) {
-        this.$message.warning('请选择一条记录！');
-        return;
+        this.$message.warning('请选择一条记录！')
+        return
       } else {
-        var ids = "";
+        var ids = ''
         for (var a = 0; a < this.selectedRowKeys.length; a++) {
-          ids += this.selectedRowKeys[a] + ",";
+          ids += this.selectedRowKeys[a] + ','
         }
-        var that = this;
-        console.log(this.currentDeptId);
+        var that = this
+        console.log(this.currentDeptId)
         this.$confirm({
-          title: "确认取消",
-          content: "是否取消用户与选中部门的关联?",
+          title: '确认取消',
+          content: '是否取消用户与选中部门的关联?',
           onOk: function () {
             getAction(that.url.deleteBatch, {depId: that.currentDeptId, userIds: ids}).then((res) => {
               if (res.success) {
-                that.$message.success("删除用户与选中部门关系成功！");
+                that.$message.success('删除用户与选中部门关系成功！')
                 // 判断当前删除的数据是否是最后一页的全部数据，如果是的话页码减一
                 if (that.ipagination.current > 1 && (that.ipagination.current === Math.ceil(that.ipagination.total / that.ipagination.pageSize)) &&
                     that.selectedRowKeys.length === that.dataSource.length
                 ) {
                   that.ipagination.current -= 1
                 }
-                that.loadData();
-                that.onClearSelected();
+                that.loadData()
+                that.onClearSelected()
               } else {
-                that.$message.warning(res.message);
+                that.$message.warning(res.message)
               }
-            });
+            })
           }
-        });
+        })
       }
     },
     handleDelete: function (id) {
       if (!this.url.delete) {
-        this.$message.error("请设置url.delete属性!")
+        this.$message.error('请设置url.delete属性!')
         return
       }
       if (!this.currentDeptId) {
-        this.$message.error("未选中任何部门，无法取消部门与用户的关联!")
+        this.$message.error('未选中任何部门，无法取消部门与用户的关联!')
         return
       }
 
-      var that = this;
+      var that = this
       this.$confirm({
-        title: "确认取消",
-        content: "是否取消用户与选中部门的关联?",
+        title: '确认取消',
+        content: '是否取消用户与选中部门的关联?',
         onOk: function () {
           getAction(that.url.delete, {depId: that.currentDeptId, userId: id}).then((res) => {
             if (res.success) {
-              that.$message.success("删除用户与选中部门关系成功！");
+              that.$message.success('删除用户与选中部门关系成功！')
               if (that.selectedRowKeys.length > 0) {
                 for (let i = 0; i < that.selectedRowKeys.length; i++) {
                   if (that.selectedRowKeys[i] == id) {
-                    that.selectedRowKeys.splice(i, 1);
-                    break;
+                    that.selectedRowKeys.splice(i, 1)
+                    break
                   }
                 }
               }
@@ -247,89 +247,89 @@ export default {
               if (that.ipagination.current > 1 && ((that.ipagination.current - 1) * that.ipagination.pageSize) + 1 === that.ipagination.total) {
                 that.ipagination.current -= 1
               }
-              that.loadData();
+              that.loadData()
             } else {
-              that.$message.warning(res.message);
+              that.$message.warning(res.message)
             }
-          });
+          })
         }
       })
 
     },
     open(record) {
-      this.currentDeptId = record.id;
-      this.currentDept = record;
+      this.currentDeptId = record.id
+      this.currentDept = record
       // 获取当前选择部门的orgCode 用于筛选数据
       this.orgCode = record.orgCode
 
-      this.loadData(1);
+      this.loadData(1)
     },
     cancelSelect(){
       this.currentDeptId = ''
       this.loadData(1)
     },
     clearList() {
-      this.currentDeptId = '';
-      this.dataSource = [];
+      this.currentDeptId = ''
+      this.dataSource = []
     },
     hasSelectDept() {
       if (this.currentDeptId == '') {
-        this.$message.warn("请选择一个部门!")
-        return false;
+        this.$message.warn('请选择一个部门!')
+        return false
       }
-      return true;
+      return true
     },
     handleAddUserDepart() {
       if (this.currentDeptId == '') {
-        this.$message.warn("请选择一个部门!")
+        this.$message.warn('请选择一个部门!')
       } else {
         this.$refs.selectUserModal.add(this.currentDept)
       }
     },
     handleEdit: function (record) {
-      this.$refs.modalForm.title = "编辑";
-      this.$refs.modalForm.departDisabled = true;
-      this.$refs.modalForm.disableSubmit = false;
-      this.$refs.modalForm.edit(record);
+      this.$refs.modalForm.title = '编辑'
+      this.$refs.modalForm.departDisabled = true
+      this.$refs.modalForm.disableSubmit = false
+      this.$refs.modalForm.edit(record)
     },
     handleAdd: function () {
       if (this.currentDeptId == '') {
-        this.$message.warn("请选择一个部门!")
+        this.$message.warn('请选择一个部门!')
       } else {
-        this.$refs.modalForm.departDisabled = true;
+        this.$refs.modalForm.departDisabled = true
         //初始化负责部门
-        this.$refs.modalForm.userDepartModel.departIdList = [this.currentDeptId];  //传入一个部门id
-        this.$refs.modalForm.add();
+        this.$refs.modalForm.userDepartModel.departIdList = [this.currentDeptId]  //传入一个部门id
+        this.$refs.modalForm.add()
         //update-begin---author:liusq   Date:20210223  for：https://gitee.com/jeecg/jeecg-boot/issues/I2SDU1------------
         this.$refs.modalForm.resultDepartOptions = [{key: this.currentDept.key, title: this.currentDept.title,orgCode:this.orgCode}]
         //update-end---author:liusq   Date:20210223  for：https://gitee.com/jeecg/jeecg-boot/issues/I2SDU1------------
-        this.$refs.modalForm.title = "新增";
+        this.$refs.modalForm.title = '新增'
       }
     },
     selectOK(data) {
       if(data.length === 0) return
-      let params = {};
-      params.depId = this.currentDeptId;
-      params.userIdList = [];
+      let params = {}
+      params.depId = this.currentDeptId
+      params.userIdList = []
       for (var a = 0; a < data.length; a++) {
-        params.userIdList.push(data[a]);
+        params.userIdList.push(data[a])
       }
-      console.log(params);
+      console.log(params)
       postAction(this.url.edit, params).then((res) => {
         if (res.success) {
-          this.$message.success(res.message);
-          this.loadData();
+          this.$message.success(res.message)
+          this.loadData()
         } else {
-          this.$message.warning(res.message);
+          this.$message.warning(res.message)
         }
       })
     },
     handleDeptRole(record) {
       if (this.currentDeptId != '') {
-        this.$refs.deptRoleUser.add(record, this.currentDeptId);
-        this.$refs.deptRoleUser.title = "部门角色分配";
+        this.$refs.deptRoleUser.add(record, this.currentDeptId)
+        this.$refs.deptRoleUser.title = '部门角色分配'
       } else {
-        this.$message.warning("请先选择一个部门!");
+        this.$message.warning('请先选择一个部门!')
       }
     }
   }
diff --git a/src/views/system/modules/DictItemModal.vue b/src/views/system/modules/DictItemModal.vue
index b455846..5e73c07 100644
--- a/src/views/system/modules/DictItemModal.vue
+++ b/src/views/system/modules/DictItemModal.vue
@@ -59,14 +59,14 @@
   import { getAction } from '@api/manage'
 
   export default {
-    name: "DictItemModal",
+    name: 'DictItemModal',
     data() {
       return {
-        title: "操作",
+        title: '操作',
         visible: false,
         visibleCheck: true,
         model: {},
-        dictId: "",
+        dictId: '',
         status: 1,
         labelCol: {
           xs: {span: 24},
@@ -88,72 +88,72 @@
     },
     methods: {
       add(dictId) {
-        this.dictId = dictId;
-        this.edit({});
+        this.dictId = dictId
+        this.edit({})
       },
       edit(record) {
         if (record.id) {
-          this.dictId = record.dictId;
-          this.status = record.status;
-          this.visibleCheck = (record.status == 1) ? true : false;
+          this.dictId = record.dictId
+          this.status = record.status
+          this.visibleCheck = (record.status == 1) ? true : false
         }
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.model.dictId = this.dictId;
-        this.model.status = this.status;
-        this.visible = true;
+        this.form.resetFields()
+        this.model = Object.assign({}, record)
+        this.model.dictId = this.dictId
+        this.model.status = this.status
+        this.visible = true
         this.$nextTick(() => {
           this.form.setFieldsValue(pick(this.model, 'itemText', 'itemValue', 'description', 'sortOrder'))
-        });
+        })
       },
       onChose(checked) {
         if (checked) {
-          this.status = 1;
-          this.visibleCheck = true;
+          this.status = 1
+          this.visibleCheck = true
         } else {
-          this.status = 0;
-          this.visibleCheck = false;
+          this.status = 0
+          this.visibleCheck = false
         }
       },
       // 确定
       handleOk() {
-        const that = this;
+        const that = this
         // 触发表单验证
         this.form.validateFields((err, values) => {
           if (!err) {
-            that.confirmLoading = true;
+            that.confirmLoading = true
             values.itemText = (values.itemText || '').trim()
             values.itemValue = (values.itemValue || '').trim()
             values.description = (values.description || '').trim()
-            let formData = Object.assign(this.model, values);
-            formData.status = this.status;
-            let obj;
+            let formData = Object.assign(this.model, values)
+            formData.status = this.status
+            let obj
             if (!this.model.id) {
-              obj = addDictItem(formData);
+              obj = addDictItem(formData)
             } else {
-              obj = editDictItem(formData);
+              obj = editDictItem(formData)
             }
             obj.then((res) => {
               if (res.success) {
-                that.$message.success(res.message);
-                that.$emit('ok');
-                that.close();
+                that.$message.success(res.message)
+                that.$emit('ok')
+                that.close()
               } else {
-                that.$message.warning(res.message);
+                that.$message.warning(res.message)
               }
             }).finally(() => {
-              that.confirmLoading = false;
+              that.confirmLoading = false
             })
           }
         })
       },
       // 关闭
       handleCancel() {
-        this.close();
+        this.close()
       },
       close() {
-        this.$emit('close');
-        this.visible = false;
+        this.$emit('close')
+        this.visible = false
       },
       validateItemValue(rule, value, callback){
         let param = {
@@ -166,16 +166,16 @@
         if(value){
           let reg=new RegExp("[`_~!@#$^&*()=|{}'.<>《》/?！￥（）—【】‘；：”“。，、？]")
           if(reg.test(value)){
-            callback("数据值不能包含特殊字符！")
+            callback('数据值不能包含特殊字符！')
           }else{
             //update--begin--autor:lvdandan-----date:20201203------for：JT-27【数据字典】字典 - 数据值可重复
-            getAction("/sys/dictItem/dictItemCheck",param).then((res)=>{
+            getAction('/sys/dictItem/dictItemCheck',param).then((res)=>{
               if(res.success){
                 callback()
               }else{
-                callback(res.message);
+                callback(res.message)
               }
-            });
+            })
             //update--end--autor:lvdandan-----date:20201203------for：JT-27【数据字典】字典 - 数据值可重复
           }
         }else{
diff --git a/src/views/system/modules/DictModal.vue b/src/views/system/modules/DictModal.vue
index 8933ec1..db10a0c 100644
--- a/src/views/system/modules/DictModal.vue
+++ b/src/views/system/modules/DictModal.vue
@@ -40,8 +40,8 @@
 <script>
   import pick from 'lodash.pick'
   import { addDict, editDict, duplicateCheck } from '@api/api'
-  import {checkDictCode} from "@/utils/validateOnly";
-  import JDate from "@comp/jero/JDate";
+  import {checkDictCode} from '@/utils/validateOnly'
+  import JDate from '@comp/jero/JDate'
 
   export default {
     name: 'DictModal',
diff --git a/src/views/system/modules/PermissionModal.vue b/src/views/system/modules/PermissionModal.vue
index cd2fbf8..867c9ad 100644
--- a/src/views/system/modules/PermissionModal.vue
+++ b/src/views/system/modules/PermissionModal.vue
@@ -51,7 +51,7 @@
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="菜单路径">
-          <a-input @change="event => event.target.value = event.target.value.trim()" :maxLength="60" placeholder="请输入菜单路径" v-decorator="[ 'url',validatorRules.url]" :readOnly="disableSubmit"/>
+          <a-input @change="event => event.target.value = event.target.value.trim()" :maxLength="100" placeholder="请输入菜单路径" v-decorator="[ 'url',validatorRules.url]" :readOnly="disableSubmit"/>
         </a-form-item>
 
         <a-form-item
@@ -59,7 +59,7 @@
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="前端组件">
-          <a-input placeholder="请输入前端组件" @change="event => event.target.value = event.target.value.trim()" :maxLength="60" v-decorator="[ 'component',validatorRules.component]" :readOnly="disableSubmit"/>
+          <a-input placeholder="请输入前端组件" @change="event => event.target.value = event.target.value.trim()" :maxLength="120" v-decorator="[ 'component',validatorRules.component]" :readOnly="disableSubmit"/>
         </a-form-item>
 
         <a-form-item
@@ -180,14 +180,14 @@
   import pick from 'lodash.pick'
 
   export default {
-    name: "PermissionModal",
+    name: 'PermissionModal',
     components: {Icons},
     data () {
       return {
         drawerWidth:700,
         treeData:[],
         treeValue: '0-0-4',
-        title:"操作",
+        title:'操作',
         visible: false,
         disableSubmit:false,
         model: {},
@@ -215,7 +215,7 @@
         form: this.$form.createForm(this),
 
         iconChooseVisible: false,
-        validateStatus:""
+        validateStatus:''
       }
     },
     computed:{
@@ -230,118 +230,118 @@
       }
     },
     created () {
-      this.initDictConfig();
+      this.initDictConfig()
     },
     methods: {
       loadTree(){
-        var that = this;
+        var that = this
         queryTreeList().then((res)=>{
           if(res.success){
-            that.treeData = [];
+            that.treeData = []
             let treeList = res.result.treeList
             for(let a=0;a<treeList.length;a++){
-              let temp = treeList[a];
-              temp.isLeaf = temp.leaf;
-              that.treeData.push(temp);
+              let temp = treeList[a]
+              temp.isLeaf = temp.leaf
+              that.treeData.push(temp)
             }
             console.log(this.treeData)
           }
-        });
+        })
       },
       add () {
         // 默认值
-        this.edit({status:'1',permsType:'1',route:true});
+        this.edit({status:'1',permsType:'1',route:true})
       },
       edit (record) {
-        this.resetScreenSize(); // 调用此方法,根据屏幕宽度自适应调整抽屉的宽度
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
+        this.resetScreenSize() // 调用此方法,根据屏幕宽度自适应调整抽屉的宽度
+        this.form.resetFields()
+        this.model = Object.assign({}, record)
         //--------------------------------------------------------------------------------------------------
         //根据菜单类型，动态展示页面字段
-        this.alwaysShow = !record.alwaysShow?false:true;
-        this.menuHidden = !record.hidden?false:true;
+        this.alwaysShow = !record.alwaysShow?false:true
+        this.menuHidden = !record.hidden?false:true
 
         if(record.route!=null){
-          this.routeSwitch = record.route?true:false;
+          this.routeSwitch = record.route?true:false
         }
 
         if(record.keepAlive!=null){
-          this.isKeepalive = record.keepAlive?true:false;
+          this.isKeepalive = record.keepAlive?true:false
         }else{
-          this.isKeepalive = false; // 升级兼容 如果没有（后台没有传过来、或者是新建）默认为false
+          this.isKeepalive = false // 升级兼容 如果没有（后台没有传过来、或者是新建）默认为false
         }
 
         /*update_begin author:wuxianquan date:20190908 for:编辑初始化数据*/
         if(record.internalOrExternal!=null){
-          this.internalOrExternal = record.internalOrExternal?true:false;
+          this.internalOrExternal = record.internalOrExternal?true:false
         }else{
-          this.internalOrExternal = false;
+          this.internalOrExternal = false
         }
         /*update_end author:wuxianquan date:20190908 for:编辑初始化数据*/
 
 
-        this.show = record.menuType==2?false:true;
-        this.menuLabel = record.menuType==2?'按钮/权限':'菜单名称';
+        this.show = record.menuType==2?false:true
+        this.menuLabel = record.menuType==2?'按钮/权限':'菜单名称'
 
         if(this.model.parentId){
-          this.localMenuType = 1;
+          this.localMenuType = 1
         }else{
-          this.localMenuType = 0;
+          this.localMenuType = 0
         }
         //----------------------------------------------------------------------------------------------
 
-        this.visible = true;
-        this.loadTree();
-        let fieldsVal = pick(this.model,'name','perms','permsType','component','redirect','url','sortNo','menuType','status');
+        this.visible = true
+        this.loadTree()
+        let fieldsVal = pick(this.model,'name','perms','permsType','component','redirect','url','sortNo','menuType','status')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldsVal)
-        });
+        })
       },
       close () {
-        this.$emit('close');
-        this.disableSubmit = false;
-        this.visible = false;
+        this.$emit('close')
+        this.disableSubmit = false
+        this.visible = false
       },
       handleOk () {
-        const that = this;
+        const that = this
         this.confirmLoading = true
         // 触发表单验证
         this.form.validateFields((err, values) => {
           if (!err) {
-            this.model.alwaysShow = this.alwaysShow;
-            this.model.hidden = this.menuHidden;
-            this.model.route = this.routeSwitch;
-            this.model.keepAlive = this.isKeepalive;
+            this.model.alwaysShow = this.alwaysShow
+            this.model.hidden = this.menuHidden
+            this.model.route = this.routeSwitch
+            this.model.keepAlive = this.isKeepalive
             /*update_begin author:wuxianquan date:20190908 for:获取值*/
-            this.model.internalOrExternal = this.internalOrExternal;
+            this.model.internalOrExternal = this.internalOrExternal
             /*update_end author:wuxianquan date:20190908 for:获取值*/
 
-            let formData = Object.assign(this.model, values);
+            let formData = Object.assign(this.model, values)
             if ((formData.menuType == 1 || formData.menuType == 2) && !formData.parentId) {
-              that.validateStatus = 'error';
-              that.$message.warn("请检查你填的类型以及信息是否正确！");
-              that.confirmLoading = false;
-              return;
+              that.validateStatus = 'error'
+              that.$message.warn('请检查你填的类型以及信息是否正确！')
+              that.confirmLoading = false
+              return
             } else {
-              that.validateStatus = 'success';
+              that.validateStatus = 'success'
             }
-            let obj;
+            let obj
             if (!this.model.id) {
-              obj = addPermission(formData);
+              obj = addPermission(formData)
             } else {
-              obj = editPermission(formData);
+              obj = editPermission(formData)
             }
             obj.then((res) => {
               if (res.success) {
-                that.$message.success(res.message);
-                that.$emit('ok');
-                that.close();
+                that.$message.success(res.message)
+                that.$emit('ok')
+                that.close()
               } else {
-                that.$message.warning(res.message);
+                that.$message.warning(res.message)
               }
             }).finally(() => {
-              that.confirmLoading = false;
-            });
+              that.confirmLoading = false
+            })
           }else  {
             this.confirmLoading = false
           }
@@ -352,9 +352,9 @@
       },
       validateNumber(rule, value, callback){
         if(!value || new RegExp(/^[0-9]*[1-9][0-9]*$/).test(value)){
-          callback();
+          callback()
         }else{
-          callback("请输入正整数!");
+          callback('请输入正整数!')
         }
       },
       validatePerms(rule, value, callback){
@@ -365,12 +365,12 @@
             fieldName: 'perms',
             fieldVal: value,
             dataId: this.model.id
-          };
+          }
           duplicateCheck(params).then((res) => {
             if (res.success) {
               callback()
             } else {
-              callback("授权标识已存在!")
+              callback('授权标识已存在!')
             }
           })
         }else{
@@ -381,15 +381,15 @@
         this.form.resetFields()
         this.localMenuType=e.target.value
         if(e.target.value == 2){
-          this.show = false;
-          this.menuLabel = '按钮/权限';
+          this.show = false
+          this.menuLabel = '按钮/权限'
         }else{
-          this.show = true;
-          this.menuLabel = '菜单名称';
+          this.show = true
+          this.menuLabel = '菜单名称'
         }
         this.$nextTick(() => {
-          this.form.validateFields(['url','component'], { force: true });
-        });
+          this.form.validateFields(['url','component'], { force: true })
+        })
       },
       selectIcons(){
         this.iconChooseVisible = true
@@ -404,20 +404,20 @@
       },
       // 根据屏幕变化,设置抽屉尺寸
       resetScreenSize(){
-        let screenWidth = document.body.clientWidth;
+        let screenWidth = document.body.clientWidth
         if(screenWidth < 500){
-          this.drawerWidth = screenWidth;
+          this.drawerWidth = screenWidth
         }else{
-          this.drawerWidth = 700;
+          this.drawerWidth = 700
         }
       },
       initDictConfig() {
       },
       handleParentIdChange(value){
         if(!value){
-          this.validateStatus="error"
+          this.validateStatus='error'
         }else{
-          this.validateStatus="success"
+          this.validateStatus='success'
         }
       }
     }
diff --git a/src/views/system/modules/QuartzJobModal.vue b/src/views/system/modules/QuartzJobModal.vue
index 7184ce9..37f1caf 100644
--- a/src/views/system/modules/QuartzJobModal.vue
+++ b/src/views/system/modules/QuartzJobModal.vue
@@ -60,18 +60,18 @@
 
 <script>
   import { httpAction } from '@/api/manage'
-  import JCron from "@/components/jero/JCron";
+  import JCron from '@/components/jero/JCron'
   import pick from 'lodash.pick'
   // import moment from "moment"
 
   export default {
-    name: "QuartzJobModal",
+    name: 'QuartzJobModal',
     components: {
       JCron
     },
     data () {
       return {
-        title:"操作",
+        title:'操作',
         buttonStyle: 'solid',
         visible: false,
         model: {},
@@ -97,8 +97,8 @@
           }
         },
         url: {
-          add: "/sys/quartzJob/add",
-          edit: "/sys/quartzJob/edit",
+          add: '/sys/quartzJob/add',
+          edit: '/sys/quartzJob/edit',
         },
       }
     },
@@ -106,57 +106,57 @@
     },
     methods: {
       add () {
-        this.edit({});
+        this.edit({})
       },
       edit (record) {
-        let that = this;
-        that.form.resetFields();
-        this.model = Object.assign({},record);
+        let that = this
+        that.form.resetFields()
+        this.model = Object.assign({},record)
         console.log(this.model)
-        this.visible = true;
+        this.visible = true
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'jobClassName','cronExpression','parameter','description','status'));
-        });
+          this.form.setFieldsValue(pick(this.model,'jobClassName','cronExpression','parameter','description','status'))
+        })
 
       },
       close () {
-        this.$emit('close');
-        this.visible = false;
+        this.$emit('close')
+        this.visible = false
       },
       handleOk () {
-        const that = this;
-        that.confirmLoading = true;
+        const that = this
+        that.confirmLoading = true
         // 触发表单验证
         this.form.validateFields((err, values) => {
           console.log('values',values)
           if (!err) {
-            if (typeof values.cronExpression == "undefined" || Object.keys(values.cronExpression).length==0 ) {
-              this.$message.warning('请输入cron表达式!');
-              return false;
+            if (typeof values.cronExpression == 'undefined' || Object.keys(values.cronExpression).length==0 ) {
+              this.$message.warning('请输入cron表达式!')
+              return false
             }
-            let httpurl = '';
-            let method = '';
+            let httpurl = ''
+            let method = ''
             if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
+              httpurl+=this.url.add
+              method = 'post'
             }else{
-              httpurl+=this.url.edit;
-              method = 'put';
+              httpurl+=this.url.edit
+              method = 'put'
             }
-            let formData = Object.assign(this.model, values);
+            let formData = Object.assign(this.model, values)
             //时间格式化
 
             console.log('提交参数',formData)
             httpAction(httpurl,formData,method).then((res)=>{
               if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-                that.close();
+                that.$message.success(res.message)
+                that.$emit('ok')
+                that.close()
               }else{
-                that.$message.warning(res.message);
+                that.$message.warning(res.message)
               }
             }).finally(() => {
-              that.confirmLoading = false;
+              that.confirmLoading = false
             })
 
           }else {
@@ -168,21 +168,21 @@
         this.close()
       },
       setCorn(data){
-        console.log('data)',data);
+        console.log('data)',data)
         this.$nextTick(() => {
-          this.model.cronExpression = data;
+          this.model.cronExpression = data
         })
 
         // console.log(Object.keys(data).length==0);
         if (Object.keys(data).length==0) {
-          this.$message.warning('请输入cron表达式!');
+          this.$message.warning('请输入cron表达式!')
         }
       },
       validateCron(rule, value, callback){
         if(!value){
           callback()
         }else if (Object.keys(value).length==0) {
-          callback("请输入cron表达式!");
+          callback('请输入cron表达式!')
         }
       },
 
diff --git a/src/views/system/modules/RoleDataruleModal.vue b/src/views/system/modules/RoleDataruleModal.vue
index bb5b75b..ff0d02b 100644
--- a/src/views/system/modules/RoleDataruleModal.vue
+++ b/src/views/system/modules/RoleDataruleModal.vue
@@ -54,7 +54,7 @@
         }],
         activeTabKey: '1',
         url:{
-          datarule:"/sys/role/datarule",
+          datarule:'/sys/role/datarule',
         },
         dataruleList:[],
         dataruleChecked:[]
@@ -68,21 +68,21 @@
             this.dataruleList = res.result.datarule
             let drChecked = res.result.drChecked
             if(drChecked){
-              this.dataruleChecked = drChecked.split(",")
+              this.dataruleChecked = drChecked.split(',')
             }
           }
         })
       },
       saveDataruleForRole(){
         if(!this.dataruleChecked || this.dataruleChecked.length==0){
-          this.$message.warning("请注意，现未勾选任何数据权限!")
+          this.$message.warning('请注意，现未勾选任何数据权限!')
         }
         let params = {
           permissionId:this.functionId,
           roleId:this.roleId,
-          dataRuleIds:this.dataruleChecked.join(",")
+          dataRuleIds:this.dataruleChecked.join(',')
         }
-        console.log("保存数据权限",params)
+        console.log('保存数据权限',params)
         postAction(this.url.datarule,params).then(res=>{
           if(res.success){
             this.$message.success(res.message)
diff --git a/src/views/system/modules/RoleModal.vue b/src/views/system/modules/RoleModal.vue
index 8955791..018bf05 100644
--- a/src/views/system/modules/RoleModal.vue
+++ b/src/views/system/modules/RoleModal.vue
@@ -63,14 +63,14 @@
 <script>
 import pick from 'lodash.pick'
 import {addRole, editRole, duplicateCheck} from '@/api/api'
-import {checkRoleCode} from "@/utils/validateOnly";
-import {getAction} from "@api/manage";
+import {checkRoleCode} from '@/utils/validateOnly'
+import {getAction} from '@api/manage'
 
 export default {
-  name: "RoleModal",
+  name: 'RoleModal',
   data() {
     return {
-      title: "操作",
+      title: '操作',
       visible: false,
       roleDisabled: false,
       // 是否添加下级
@@ -115,23 +115,23 @@ export default {
   },
   methods: {
     add() {
-      this.edit({});
+      this.edit({})
     },
     edit(record) {
-      this.form.resetFields();
+      this.form.resetFields()
       this.initAllRole()
-      this.model = Object.assign({}, record);
-      this.visible = true;
+      this.model = Object.assign({}, record)
+      this.visible = true
 
       //编辑页面禁止修改角色编码
       if (this.model.id) {
-        this.roleDisabled = true;
+        this.roleDisabled = true
       } else {
-        this.roleDisabled = false;
+        this.roleDisabled = false
       }
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.model, 'roleName', 'description', 'roleCode', 'parentId'))
-      });
+      })
 
     },
     /*
@@ -139,10 +139,10 @@ export default {
     * */
     addLowerRole(parentId) {
       // 添加下级
-      this.isAddLower = true;
-      this.form.resetFields();
+      this.isAddLower = true
+      this.form.resetFields()
       this.initAllRole()
-      this.visible = true;
+      this.visible = true
       this.$nextTick(() => {
         this.form.setFieldsValue({parentId: parentId})
       })
@@ -156,37 +156,37 @@ export default {
       })
     },
     close() {
-      this.$emit('close');
+      this.$emit('close')
       this.isAddLower = false
-      this.visible = false;
+      this.visible = false
     },
     handleOk() {
       this.confirmLoading = true
-      const that = this;
+      const that = this
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
           values.roleName = (values.roleName || '').trim()
           values.roleCode = (values.roleCode || '').trim()
-          let formData = Object.assign(this.model, values);
-          let obj;
+          let formData = Object.assign(this.model, values)
+          let obj
           console.log(formData)
           if (!this.model.id) {
-            obj = addRole(formData);
+            obj = addRole(formData)
           } else {
-            obj = editRole(formData);
+            obj = editRole(formData)
           }
           obj.then((res) => {
             if (res.success) {
-              that.$message.success(res.message);
-              that.$emit('ok');
+              that.$message.success(res.message)
+              that.$emit('ok')
               this.$emit('clearSelect')
-              that.close();
+              that.close()
             } else {
-              that.$message.warning(res.message);
+              that.$message.warning(res.message)
             }
           }).finally(() => {
-            that.confirmLoading = false;
+            that.confirmLoading = false
           })
         } else {
           this.confirmLoading = false
diff --git a/src/views/system/modules/SelectUserModal.vue b/src/views/system/modules/SelectUserModal.vue
index d5074a0..e2f7b60 100644
--- a/src/views/system/modules/SelectUserModal.vue
+++ b/src/views/system/modules/SelectUserModal.vue
@@ -63,15 +63,15 @@
 <script>
   import {filterObj} from '@/utils/util'
   import {getAction} from '@/api/manage'
-  import JEllipsise from "@comp/jero/JEllipsis";
-  import "@/assets/less/TableExpand.less";
+  import JEllipsise from '@comp/jero/JEllipsis'
+  import '@/assets/less/TableExpand.less'
 
   export default {
-    name: "SelectUserModal",
+    name: 'SelectUserModal',
     components:{JEllipsise},
     data() {
       return {
-        title: "添加已有用户",
+        title: '添加已有用户',
         names: [],
         visible: false,
         placement: 'right',
@@ -90,42 +90,42 @@
             dataIndex: '',
             key: 'rowIndex',
             width: 50,
-            align: "center",
+            align: 'center',
             customRender: function (t, r, index) {
-              return parseInt(index) + 1;
+              return parseInt(index) + 1
             }
           },
           {
             title: '用户账号',
-            align: "center",
+            align: 'center',
             width: 120,
             dataIndex: 'username',
             scopedSlots:{customRender:'text'}
           },
           {
             title: '用户名称',
-            align: "center",
+            align: 'center',
             width: 120,
             dataIndex: 'realname',
             scopedSlots:{customRender:'text'}
           },
           {
             title: '性别',
-            align: "center",
+            align: 'center',
             width: 100,
             dataIndex: 'sex_dictText',
             scopedSlots:{customRender:'text'}
           },
           {
             title: '电话',
-            align: "center",
+            align: 'center',
             width: 100,
             dataIndex: 'phone',
             scopedSlots:{customRender:'text'}
           },
           {
             title: '部门',
-            align: "center",
+            align: 'center',
             width: 150,
             dataIndex: 'orgCode',
             scopedSlots:{customRender:'text'}
@@ -140,7 +140,7 @@
           pageSize: 10,
           pageSizeOptions: ['2','10', '20', '30'],
           showTotal: (total, range) => {
-            return range[0] + "-" + range[1] + " 共" + total + "条"
+            return range[0] + '-' + range[1] + ' 共' + total + '条'
           },
           showQuickJumper: true,
           showSizeChanger: true,
@@ -154,7 +154,7 @@
         selectedRowKeys: [],
         selectedRows: [],
         url: {
-          list: "/sys/user/pageRoleAndDepart",
+          list: '/sys/user/pageRoleAndDepart',
         }
       }
     },
@@ -163,26 +163,26 @@
     methods: {
       searchQuery() {
         this.lastQueryParam = { ...this.queryParam }
-        this.loadData(1);
+        this.loadData(1)
       },
       searchReset() {
-        this.queryParam = {};
+        this.queryParam = {}
         this.lastQueryParam = {}
-        this.loadData(1);
+        this.loadData(1)
       },
       handleCancel() {
-        this.visible = false;
+        this.visible = false
       },
       handleOk() {
         this.disabledStatus =true
-        this.dataSource2 = this.selectedRowKeys;
-        console.log("data:" + this.dataSource2);
-        this.$emit("selectFinished", this.dataSource2);
+        this.dataSource2 = this.selectedRowKeys
+        console.log('data:' + this.dataSource2)
+        this.$emit('selectFinished', this.dataSource2)
         this.disabledStatus =false
-        this.visible = false;
+        this.visible = false
       },
       add(record) {
-        this.visible = true;
+        this.visible = true
         // 保存当前的机构编码
         this.currentOrgCode = record.orgCode
         this.loadData(1)
@@ -192,23 +192,23 @@
       loadData(arg) {
         //加载数据 若传入参数1则加载第一页的内容
         if (arg === 1) {
-          this.ipagination.current = 1;
+          this.ipagination.current = 1
         }
-        var params = this.getQueryParams();//查询条件
+        var params = this.getQueryParams()//查询条件
         params.orgCode = this.currentOrgCode
         getAction(this.url.list, params).then((res) => {
           if (res.success) {
-            this.dataSource1 = res.result.records;
-            this.ipagination.total = res.result.total;
+            this.dataSource1 = res.result.records
+            this.ipagination.total = res.result.total
           }
         })
       },
       getQueryParams() {
-        var param = Object.assign({}, this.lastQueryParam, this.isorter);
-        param.field = this.getQueryField();
-        param.pageNo = this.ipagination.current;
-        param.pageSize = this.ipagination.pageSize;
-        return filterObj(param);
+        var param = Object.assign({}, this.lastQueryParam, this.isorter)
+        param.field = this.getQueryField()
+        param.pageNo = this.ipagination.current
+        param.pageSize = this.ipagination.pageSize
+        return filterObj(param)
       },
       getQueryField() {
         //TODO 字段权限控制
@@ -216,48 +216,48 @@
       onSelectAll(selected, selectedRows, changeRows) {
         if (selected === true) {
           for (var a = 0; a < changeRows.length; a++) {
-            this.dataSource2.push(changeRows[a]);
+            this.dataSource2.push(changeRows[a])
           }
         } else {
           for (var b = 0; b < changeRows.length; b++) {
-            this.dataSource2.splice(this.dataSource2.indexOf(changeRows[b]), 1);
+            this.dataSource2.splice(this.dataSource2.indexOf(changeRows[b]), 1)
           }
         }
         // console.log(selected, selectedRows, changeRows);
       },
       onSelect(record, selected) {
         if (selected === true) {
-          this.dataSource2.push(record);
+          this.dataSource2.push(record)
         } else {
-          var index = this.dataSource2.indexOf(record);
+          var index = this.dataSource2.indexOf(record)
           //console.log();
           if (index >= 0) {
-            this.dataSource2.splice(this.dataSource2.indexOf(record), 1);
+            this.dataSource2.splice(this.dataSource2.indexOf(record), 1)
           }
 
         }
       },
       onSelectChange(selectedRowKeys, selectedRows) {
-        this.selectedRowKeys = selectedRowKeys;
-        this.selectionRows = selectedRows;
+        this.selectedRowKeys = selectedRowKeys
+        this.selectionRows = selectedRows
       },
       onClearSelected() {
-        this.selectedRowKeys = [];
-        this.selectionRows = [];
+        this.selectedRowKeys = []
+        this.selectionRows = []
       },
       handleDelete: function (record) {
-        this.dataSource2.splice(this.dataSource2.indexOf(record), 1);
+        this.dataSource2.splice(this.dataSource2.indexOf(record), 1)
       },
       handleTableChange(pagination, filters, sorter) {
         //分页、排序、筛选变化时触发
-        console.log(sorter);
+        console.log(sorter)
         //TODO 筛选
         if (Object.keys(sorter).length > 0) {
-          this.isorter.column = sorter.field;
-          this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
+          this.isorter.column = sorter.field
+          this.isorter.order = 'ascend' == sorter.order ? 'asc' : 'desc'
         }
-        this.ipagination = pagination;
-        this.loadData();
+        this.ipagination = pagination
+        this.loadData()
       }
     }
   }
diff --git a/src/views/system/modules/SysCategoryModal.vue b/src/views/system/modules/SysCategoryModal.vue
index b007513..6284c33 100644
--- a/src/views/system/modules/SysCategoryModal.vue
+++ b/src/views/system/modules/SysCategoryModal.vue
@@ -38,14 +38,14 @@
   import JTreeSelect from '@/components/jero/JTreeSelect'
 
   export default {
-    name: "SysCategoryModal",
+    name: 'SysCategoryModal',
     components: {
       JTreeSelect
     },
     data () {
       return {
         form: this.$form.createForm(this),
-        title:"操作",
+        title:'操作',
         width:800,
         visible: false,
         model: {},
@@ -71,12 +71,12 @@
           name:{rules: [{ required: true, message: '请输入类型名称!' }]}
         },
         url: {
-          add: "/sys/category/add",
-          edit: "/sys/category/edit",
-          checkCode:"/sys/category/checkCode",
+          add: '/sys/category/add',
+          edit: '/sys/category/edit',
+          checkCode:'/sys/category/checkCode',
         },
         expandedRowKeys:[],
-        pidField:"pid",
+        pidField:'pid',
         subExpandedKeys:[]
 
       }
@@ -85,47 +85,47 @@
     },
     methods: {
       add () {
-        this.edit({});
+        this.edit({})
       },
       edit (record) {
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.visible = true;
+        this.form.resetFields()
+        this.model = Object.assign({}, record)
+        this.visible = true
         this.$nextTick(() => {
           this.form.setFieldsValue(pick(this.model,'pid','name','code'))
         })
       },
       close () {
-        this.$emit('close');
-        this.visible = false;
+        this.$emit('close')
+        this.visible = false
       },
       handleOk () {
-        const that = this;
+        const that = this
         // 触发表单验证
         this.form.validateFields((err, values) => {
           if (!err) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
+            that.confirmLoading = true
+            let httpurl = ''
+            let method = ''
             if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
+              httpurl+=this.url.add
+              method = 'post'
             }else{
-              httpurl+=this.url.edit;
-               method = 'put';
+              httpurl+=this.url.edit
+               method = 'put'
             }
-            let formData = Object.assign(this.model, values);
-            console.log("表单提交数据",formData)
+            let formData = Object.assign(this.model, values)
+            console.log('表单提交数据',formData)
             httpAction(httpurl,formData,method).then((res)=>{
               if(res.success){
-                that.$message.success(res.message);
+                that.$message.success(res.message)
                 that.submitSuccess(formData)
               }else{
-                that.$message.warning(res.message);
+                that.$message.warning(res.message)
               }
             }).finally(() => {
-              that.confirmLoading = false;
-              that.close();
+              that.confirmLoading = false
+              that.close()
             })
           }
 
@@ -143,11 +143,11 @@
           this.expandedRowKeys=[]
           this.getExpandKeysByPid(formData[this.pidField],treeData,treeData)
           if(formData.pid && this.expandedRowKeys.length==0){
-            this.expandedRowKeys = this.subExpandedKeys;
+            this.expandedRowKeys = this.subExpandedKeys
           }
-          this.$emit('ok',formData,this.expandedRowKeys.reverse());
+          this.$emit('ok',formData,this.expandedRowKeys.reverse())
         }else{
-          this.$emit('ok',formData);
+          this.$emit('ok',formData)
       }
       },
       getExpandKeysByPid(pid,arr,all){
diff --git a/src/views/system/modules/SysConfusionForm.vue b/src/views/system/modules/SysConfusionForm.vue
index dcfb88d..83c5036 100644
--- a/src/views/system/modules/SysConfusionForm.vue
+++ b/src/views/system/modules/SysConfusionForm.vue
@@ -37,7 +37,7 @@
 import {httpAction, getAction} from '@/api/manage'
 import pick from 'lodash.pick'
 import {validateDuplicateValue} from '@/utils/util'
-import JFormContainer from "@comp/jero/JFormContainer";
+import JFormContainer from '@comp/jero/JFormContainer'
 
 export default {
   name: 'SysConfusionForm',
@@ -112,9 +112,9 @@ export default {
         //  sex:{initialValue:((!this.model.sex)?"": (this.model.sex+""))}
       },
       url: {
-        add: "/sys/confusion/add",
-        edit: "/sys/confusion/edit",
-        queryById: "/sys/confusion/queryById"
+        add: '/sys/confusion/add',
+        edit: '/sys/confusion/edit',
+        queryById: '/sys/confusion/queryById'
       },
 
     }
@@ -140,16 +140,16 @@ export default {
   },
   created() {
     //如果是流程中表单，则需要加载流程表单data
-    this.showFlowData();
+    this.showFlowData()
   },
   methods: {
     add() {
-      this.edit({});
+      this.edit({})
     },
     edit(record) {
-      this.form.resetFields();
-      this.model = Object.assign({}, record);
-      this.visible = true;
+      this.form.resetFields()
+      this.model = Object.assign({}, record)
+      this.visible = true
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.model, 'confusionCode', 'tableName', 'fieldName'))
       })
@@ -157,41 +157,41 @@ export default {
     //渲染流程表单数据
     showFlowData() {
       if (this.formBpm === true) {
-        let params = {id: this.formData.dataId};
+        let params = {id: this.formData.dataId}
         getAction(this.url.queryById, params).then((res) => {
           if (res.success) {
-            this.edit(res.result);
+            this.edit(res.result)
           }
-        });
+        })
       }
     },
     submitForm() {
-      const that = this;
+      const that = this
       this.confirmLoading = true
       this.$emit('disableFalse',true)
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
-          let httpurl = '';
-          let method = '';
+          let httpurl = ''
+          let method = ''
           if (!this.model.id) {
-            httpurl += this.url.add;
-            method = 'post';
+            httpurl += this.url.add
+            method = 'post'
           } else {
-            httpurl += this.url.edit;
-            method = 'post';
+            httpurl += this.url.edit
+            method = 'post'
           }
-          let formData = Object.assign(this.model, values);
-          console.log("表单提交数据", formData)
+          let formData = Object.assign(this.model, values)
+          console.log('表单提交数据', formData)
           httpAction(httpurl, formData, method).then((res) => {
             if (res.success) {
-              that.$message.success(res.message);
-              that.$emit('ok');
+              that.$message.success(res.message)
+              that.$emit('ok')
             } else {
-              that.$message.warning(res.message);
+              that.$message.warning(res.message)
             }
           }).finally(() => {
-            that.confirmLoading = false;
+            that.confirmLoading = false
             this.$emit('disableFalse',false)
           })
         }else {
diff --git a/src/views/system/modules/SysConfusionModal.vue b/src/views/system/modules/SysConfusionModal.vue
index 4966f6c..53aeb55 100644
--- a/src/views/system/modules/SysConfusionModal.vue
+++ b/src/views/system/modules/SysConfusionModal.vue
@@ -38,25 +38,25 @@ export default {
     add() {
       this.visible = true
       this.$nextTick(() => {
-        this.$refs.realForm.add();
+        this.$refs.realForm.add()
       })
     },
     edit(record) {
       this.visible = true
       this.$nextTick(() => {
-        this.$refs.realForm.edit(record);
+        this.$refs.realForm.edit(record)
       })
     },
     close() {
-      this.$emit('close');
-      this.visible = false;
+      this.$emit('close')
+      this.visible = false
     },
     handleOk() {
-      this.$refs.realForm.submitForm();
+      this.$refs.realForm.submitForm()
     },
     submitCallback() {
-      this.$emit('ok');
-      this.visible = false;
+      this.$emit('ok')
+      this.visible = false
     },
     handleCancel() {
       this.close()
diff --git a/src/views/system/modules/SysDepartRoleModal.vue b/src/views/system/modules/SysDepartRoleModal.vue
index ac982f8..a086e4d 100644
--- a/src/views/system/modules/SysDepartRoleModal.vue
+++ b/src/views/system/modules/SysDepartRoleModal.vue
@@ -41,10 +41,10 @@
   import {duplicateCheck } from '@/api/api'
 
   export default {
-    name: "SysDepartRoleModal",
+    name: 'SysDepartRoleModal',
     data () {
       return {
-        title:"操作",
+        title:'操作',
         visible: false,
         model: {},
         labelCol: {
@@ -76,8 +76,8 @@
             ]}
         },
         url: {
-          add: "/sys/sysDepartRole/add",
-          edit: "/sys/sysDepartRole/edit",
+          add: '/sys/sysDepartRole/add',
+          edit: '/sys/sysDepartRole/edit',
         },
       }
     },
@@ -85,48 +85,48 @@
     },
     methods: {
       add (departId) {
-        this.edit({},departId);
+        this.edit({},departId)
       },
       edit (record,departId) {
-        this.departId = departId;
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.visible = true;
+        this.departId = departId
+        this.form.resetFields()
+        this.model = Object.assign({}, record)
+        this.visible = true
         this.$nextTick(() => {
           this.form.setFieldsValue(pick(this.model,'roleName','roleCode','description'))
-        });
+        })
       },
       close () {
-        this.$emit('close');
-        this.visible = false;
+        this.$emit('close')
+        this.visible = false
       },
       handleOk () {
-        const that = this;
+        const that = this
         // 触发表单验证
         this.form.validateFields((err, values) => {
           if (!err) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
+            that.confirmLoading = true
+            let httpurl = ''
+            let method = ''
             if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
+              httpurl+=this.url.add
+              method = 'post'
             }else{
-              httpurl+=this.url.edit;
-               method = 'put';
+              httpurl+=this.url.edit
+               method = 'put'
             }
-            let formData = Object.assign(this.model, values);
-            formData.departId = this.departId;
+            let formData = Object.assign(this.model, values)
+            formData.departId = this.departId
             httpAction(httpurl,formData,method).then((res)=>{
               if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
+                that.$message.success(res.message)
+                that.$emit('ok')
               }else{
-                that.$message.warning(res.message);
+                that.$message.warning(res.message)
               }
             }).finally(() => {
-              that.confirmLoading = false;
-              that.close();
+              that.confirmLoading = false
+              that.close()
             })
           }
         })
@@ -136,21 +136,21 @@
       },
       validateRoleCode(rule, value, callback){
         if(/[\u4E00-\u9FA5]/g.test(value)){
-          callback("部门角色编码不可输入汉字!");
+          callback('部门角色编码不可输入汉字!')
         }else{
           var params = {
-            tableName: "sys_depart_role",
-            fieldName: "role_code",
+            tableName: 'sys_depart_role',
+            fieldName: 'role_code',
             fieldVal: value,
             dataId: this.model.id,
-          };
+          }
           duplicateCheck(params).then((res)=>{
             if(res.success){
-              callback();
+              callback()
             }else{
-              callback(res.message);
+              callback(res.message)
             }
-          });
+          })
         }
       }
     }
diff --git a/src/views/system/modules/TenantForm.vue b/src/views/system/modules/TenantForm.vue
index 7cf0090..d7c071c 100644
--- a/src/views/system/modules/TenantForm.vue
+++ b/src/views/system/modules/TenantForm.vue
@@ -49,10 +49,10 @@
   import { validateDuplicateValue } from '@/utils/util'
   import JFormContainer from '@/components/jero/JFormContainer'
   import JDate from '@/components/jero/JDate'
-  import JDictSelectTag from "@/components/dict/JDictSelectTag"
+  import JDictSelectTag from '@/components/dict/JDictSelectTag'
 
   export default {
-    name: "TenantForm",
+    name: 'TenantForm',
     components: {
       JFormContainer,
       JDate,
@@ -91,9 +91,9 @@
         validatorRules: {
         },
         url: {
-          add: "/sys/tenant/add",
-          edit: "/sys/tenant/edit",
-          queryById: "/sys/tenant/queryById"
+          add: '/sys/tenant/add',
+          edit: '/sys/tenant/edit',
+          queryById: '/sys/tenant/queryById'
         }
       }
     },
@@ -121,59 +121,59 @@
       }
     },
     created () {
-      this.showFlowData();
+      this.showFlowData()
     },
     methods: {
       add () {
-        this.edit({});
+        this.edit({})
       },
       edit (record) {
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.visible = true;
+        this.form.resetFields()
+        this.model = Object.assign({}, record)
+        this.visible = true
         this.$nextTick(() => {
           this.form.setFieldsValue(pick(this.model,'id','name','beginDate','endDate','status'))
         })
       },
       showFlowData(){
         if(this.normal === false){
-          let params = {id:this.formData.dataId};
+          let params = {id:this.formData.dataId}
           getAction(this.url.queryById,params).then((res)=>{
             if(res.success){
-              this.edit (res.result);
+              this.edit (res.result)
             }
-          });
+          })
         }
       },
       submitForm () {
-        const that = this;
+        const that = this
         // 触发表单验证
         this.form.validateFields((err, values) => {
           if (!err) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
+            that.confirmLoading = true
+            let httpurl = ''
+            let method = ''
             if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
+              httpurl+=this.url.add
+              method = 'post'
             }else{
-              httpurl+=this.url.edit;
-               method = 'put';
+              httpurl+=this.url.edit
+               method = 'put'
             }
-            let formData = Object.assign(this.model, values);
-            console.log("表单提交数据",formData)
+            let formData = Object.assign(this.model, values)
+            console.log('表单提交数据',formData)
             httpAction(httpurl,formData,method).then((res)=>{
               if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
+                that.$message.success(res.message)
+                that.$emit('ok')
               }else{
-                if("该编号已存在!" == res.message){
-                  this.model.id=""
+                if('该编号已存在!' == res.message){
+                  this.model.id=''
                 }
-                that.$message.warning(res.message);
+                that.$message.warning(res.message)
               }
             }).finally(() => {
-              that.confirmLoading = false;
+              that.confirmLoading = false
             })
           }
 
diff --git a/src/views/system/modules/TenantModal.vue b/src/views/system/modules/TenantModal.vue
index 0fbe34d..c00ab8e 100644
--- a/src/views/system/modules/TenantModal.vue
+++ b/src/views/system/modules/TenantModal.vue
@@ -16,7 +16,7 @@
 
   import TenantForm from './TenantForm'
   export default {
-    name: "TenantModal",
+    name: 'TenantModal',
     components: {
       TenantForm
     },
@@ -32,25 +32,25 @@
       add () {
         this.visible=true
         this.$nextTick(()=>{
-          this.$refs.realForm.add();
+          this.$refs.realForm.add()
         })
       },
       edit (record) {
         this.visible=true
         this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
+          this.$refs.realForm.edit(record)
         })
       },
       close () {
-        this.$emit('close');
-        this.visible = false;
+        this.$emit('close')
+        this.visible = false
       },
       handleOk () {
-        this.$refs.realForm.submitForm();
+        this.$refs.realForm.submitForm()
       },
       submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
+        this.$emit('ok')
+        this.visible = false
       },
       handleCancel () {
         this.close()
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index 5102d88..2aac638 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -165,19 +165,19 @@
 import pick from 'lodash.pick'
 import moment from 'moment'
 import Vue from 'vue'
-import {ACCESS_TOKEN} from "@/store/mutation-types"
+import {ACCESS_TOKEN} from '@/store/mutation-types'
 import {getAction} from '@/api/manage'
 import {addUser, editUser, queryUserRole, queryall,queryallRoles, queryDepartTreeList} from '@/api/api'
-import {disabledAuthFilter} from "@/utils/authFilter"
+import {disabledAuthFilter} from '@/utils/authFilter'
 import {duplicateCheck} from '@/api/api'
-import { isEmail, passwordReg} from "@/utils/validate";
-import {checkPhone,checkEmail,checkUserName} from "@/utils/validateOnly";
-import { getRSAPublicKey } from "@/api/login.js";
-import {encrypt} from "@/utils/util";
+import { isEmail, passwordReg} from '@/utils/validate'
+import {checkPhone,checkEmail,checkUserName} from '@/utils/validateOnly'
+import { getRSAPublicKey } from '@/api/login.js'
+import {encrypt} from '@/utils/util'
 
 
 export default {
-  name: "UserModal",
+  name: 'UserModal',
   data() {
     return {
       departDisabled: false, //是否是我的部门调用该页面
@@ -193,12 +193,12 @@ export default {
       selectedDepartKeys: [], //保存用户选择部门id
       checkedDepartKeys: [],
       checkedDepartNames: [], // 保存部门的名称 =>title
-      checkedDepartNameString: "", // 保存部门的名称 =>title
+      checkedDepartNameString: '', // 保存部门的名称 =>title
       resultDepartOptions: [],
-      userId: "", //保存用户id
+      userId: '', //保存用户id
       disableSubmit: false,
       userDepartModel: {userId: '', departIdList: []}, // 保存SysUserDepart的用户部门中间表数据需要的对象
-      dateFormat: "YYYY-MM-DD",
+      dateFormat: 'YYYY-MM-DD',
       validatorRules: {
         username: {
           rules: [{
@@ -232,13 +232,13 @@ export default {
           },],
           validateTrigger: 'blur'
         },
-        selectedroles:{rules: [{required: true, message:"请选择角色类型"}], validateTrigger: ['blur','change']},
-        selecteddeparts:{rules: [{required: true, message:"请选择组织机构"}], validateTrigger: ['blur','change']}
+        selectedroles:{rules: [{required: true, message:'请选择角色类型'}], validateTrigger: ['blur','change']},
+        selecteddeparts:{rules: [{required: true, message:'请选择组织机构'}], validateTrigger: ['blur','change']}
         //  sex:{initialValue:((!this.model.sex)?"": (this.model.sex+""))}
       },
       departIdShow: false,
       departIds: [], //负责部门id
-      title: "操作",
+      title: '操作',
       visible: false,
       model: {},
       roleList: [],
@@ -255,36 +255,36 @@ export default {
       confirmLoading: false,
       headers: {},
       form: this.$form.createForm(this),
-      picUrl: "",
+      picUrl: '',
       url: {
-        fileUpload: window._CONFIG['domianURL'] + "/sys/common/upload",
-        userWithDepart: "/sys/user/userDepartList", // 引入为指定用户查看部门信息需要的url
-        userId: "/sys/user/generateUserId", // 引入生成添加用户情况下的url
-        syncUserByUserName: "/act/process/extActProcess/doSyncUserByUserName",//同步用户到工作流
+        fileUpload: window._CONFIG['domianURL'] + '/sys/common/upload',
+        userWithDepart: '/sys/user/userDepartList', // 引入为指定用户查看部门信息需要的url
+        userId: '/sys/user/generateUserId', // 引入生成添加用户情况下的url
+        syncUserByUserName: '/act/process/extActProcess/doSyncUserByUserName',//同步用户到工作流
         // queryTenantList: '/sys/tenant/queryList'
       },
-      identity: "1",
+      identity: '1',
       fileList: [],
       tenantList: [],
       currentTenant: [],
       // 公钥
-      rsaPublicKey:""
+      rsaPublicKey:''
     }
   },
   created() {
-    const token = Vue.ls.get(ACCESS_TOKEN);
-    this.headers = {"X-Access-Token": token}
+    const token = Vue.ls.get(ACCESS_TOKEN)
+    this.headers = {'X-Access-Token': token}
     // this.initTenantList()
 
   },
   computed: {
     uploadAction: function () {
-      return this.url.fileUpload;
+      return this.url.fileUpload
     }
   },
   methods: {
     isDisabledAuth(code) {
-      return disabledAuthFilter(code);
+      return disabledAuthFilter(code)
     },
     // initTenantList() {
     //   getAction(this.url.queryTenantList).then(res => {
@@ -296,20 +296,20 @@ export default {
     //窗口最大化切换
     toggleScreen() {
       if (this.modaltoggleFlag) {
-        this.modalWidth = window.innerWidth;
+        this.modalWidth = window.innerWidth
       } else {
-        this.modalWidth = 800;
+        this.modalWidth = 800
       }
-      this.modaltoggleFlag = !this.modaltoggleFlag;
+      this.modaltoggleFlag = !this.modaltoggleFlag
     },
     initialRoleList() {
       queryall().then((res) => {
         if (res.success) {
-          this.roleList = res.result;
+          this.roleList = res.result
         } else {
-          console.log(res.message);
+          console.log(res.message)
         }
-      });
+      })
     },
     loadUserRoles(userid) {
       return new Promise(resolve => {
@@ -317,74 +317,74 @@ export default {
           if (res.success) {
             resolve(res.result)
           } else {
-            console.log(res.message);
+            console.log(res.message)
           }
-        });
+        })
       })
     },
     refresh() {
-      this.selectedDepartKeys = [];
-      this.checkedDepartKeys = [];
-      this.checkedDepartNames = [];
-      this.checkedDepartNameString = "";
-      this.userId = ""
-      this.resultDepartOptions = [];
-      this.departId = [];
-      this.departIdShow = false;
+      this.selectedDepartKeys = []
+      this.checkedDepartKeys = []
+      this.checkedDepartNames = []
+      this.checkedDepartNameString = ''
+      this.userId = ''
+      this.resultDepartOptions = []
+      this.departId = []
+      this.departIdShow = false
       this.currentTenant = []
     },
     add() {
-      this.picUrl = "";
-      this.refresh();
-      this.edit({activitiSync: '1'});
+      this.picUrl = ''
+      this.refresh()
+      this.edit({activitiSync: '1'})
     },
     edit(record) {
 
-      this.resetScreenSize(); // 调用此方法,根据屏幕宽度自适应调整抽屉的宽度
+      this.resetScreenSize() // 调用此方法,根据屏幕宽度自适应调整抽屉的宽度
       // 加载组织机构数据
       this.loadDepartTreeData()
       // 加载角色数据
       this.loadRolesTreeData()
       // 获取公钥
       this.getPublicKey()
-      let that = this;
-      that.initialRoleList();
-      that.checkedDepartNameString = "";
-      that.form.resetFields();
-      if (record.hasOwnProperty("id")) {
+      let that = this
+      that.initialRoleList()
+      that.checkedDepartNameString = ''
+      that.form.resetFields()
+      if (record.hasOwnProperty('id')) {
         that.loadUserRoles(record.id).then(res => {
           that.form.setFieldsValue({selectedroles:res})
-        });
+        })
         setTimeout(() => {
-          this.fileList = record.avatar;
+          this.fileList = record.avatar
         }, 5)
       }
-      that.userId = record.id;
-      that.visible = true;
-      that.model = Object.assign({}, record);
+      that.userId = record.id
+      that.visible = true
+      that.model = Object.assign({}, record)
       if(record.departIds !== '' && record.id){
         that.model.selecteddeparts = record.departIds.split(',')
       }
       that.$nextTick(() => {
         that.form.setFieldsValue(pick(this.model, 'username', 'realname', 'email', 'phone', 'post','selecteddeparts'))
-      });
+      })
       //身份为上级显示负责部门，否则不显示
-      if (this.model.userIdentity == "2") {
-        this.identity = "2";
-        this.departIdShow = true;
+      if (this.model.userIdentity == '2') {
+        this.identity = '2'
+        this.departIdShow = true
       } else {
-        this.identity = "1";
-        this.departIdShow = false;
+        this.identity = '1'
+        this.departIdShow = false
       }
       // 调用查询用户对应的部门信息的方法
-      that.checkedDepartKeys = [];
-      that.loadCheckedDeparts();
+      that.checkedDepartKeys = []
+      that.loadCheckedDeparts()
 
       //update-begin-author:taoyan date:2020710 for:多租户配置
       if (!record.relTenantIds || record.relTenantIds.length == 0) {
         this.currentTenant = []
       } else {
-        this.currentTenant = record.relTenantIds.split(',').map(Number);
+        this.currentTenant = record.relTenantIds.split(',').map(Number)
       }
       //update-end-author:taoyan date:2020710 for:多租户配置
     },
@@ -393,12 +393,12 @@ export default {
       const that = this
       queryDepartTreeList().then((res) => {
         if(res.success){
-          that.treeDepartData = [];
+          that.treeDepartData = []
           let treeList = res.result
           for(let a=0;a<treeList.length;a++){
-            let temp = treeList[a];
-            temp.isLeaf = temp.leaf;
-            that.treeDepartData.push(temp);
+            let temp = treeList[a]
+            temp.isLeaf = temp.leaf
+            that.treeDepartData.push(temp)
           }
         }
       })
@@ -408,12 +408,12 @@ export default {
       const that = this
       queryallRoles().then((res) => {
         if(res.success){
-          that.treeRoleData = [];
+          that.treeRoleData = []
           let treeList = res.result
           for(let a=0;a<treeList.length;a++){
-            let temp = treeList[a];
-            temp.isLeaf = temp.leaf;
-            that.treeRoleData.push(temp);
+            let temp = treeList[a]
+            temp.isLeaf = temp.leaf
+            that.treeRoleData.push(temp)
           }
         }
       })
@@ -421,23 +421,23 @@ export default {
     getPublicKey() {
       // 获取公钥
       getRSAPublicKey().then(res => {
-        this.rsaPublicKey = res.result;
-      });
+        this.rsaPublicKey = res.result
+      })
     },
     loadCheckedDeparts() {
-      let that = this;
+      let that = this
       if (!that.userId) {
         return
       }
       getAction(that.url.userWithDepart, {userId: that.userId}).then((res) => {
-        that.checkedDepartNames = [];
+        that.checkedDepartNames = []
         if (res.success) {
-          var depart = [];
-          var departId = [];
+          var depart = []
+          var departId = []
           for (let i = 0; i < res.result.length; i++) {
-            that.checkedDepartNames.push(res.result[i].title);
-            this.checkedDepartNameString = this.checkedDepartNames.join(",");
-            that.checkedDepartKeys.push(res.result[i].key);
+            that.checkedDepartNames.push(res.result[i].title)
+            this.checkedDepartNameString = this.checkedDepartNames.join(',')
+            that.checkedDepartKeys.push(res.result[i].key)
             //新增负责部门选择下拉框
             depart.push({
               key: res.result[i].key,
@@ -445,48 +445,48 @@ export default {
             })
             departId.push(res.result[i].key)
           }
-          that.resultDepartOptions = depart;
+          that.resultDepartOptions = depart
           //判断部门id是否存在，不存在择直接默认当前所在部门
           if (this.model.departIds) {
-            this.departIds = this.model.departIds.split(",");
+            this.departIds = this.model.departIds.split(',')
           } else {
-            this.departIds = departId;
+            this.departIds = departId
           }
           that.userDepartModel.departIdList = that.checkedDepartKeys
         } else {
-          console.log(res.message);
+          console.log(res.message)
         }
       })
     },
     close() {
-      this.$emit('close');
-      this.visible = false;
-      this.disableSubmit = false;
-      this.selectedRole = [];
-      this.userDepartModel = {userId: '', departIdList: []};
-      this.checkedDepartNames = [];
-      this.checkedDepartNameString = '';
-      this.checkedDepartKeys = [];
-      this.selectedDepartKeys = [];
-      this.resultDepartOptions = [];
-      this.departIds = [];
-      this.departIdShow = false;
-      this.identity = "1";
-      this.fileList = [];
+      this.$emit('close')
+      this.visible = false
+      this.disableSubmit = false
+      this.selectedRole = []
+      this.userDepartModel = {userId: '', departIdList: []}
+      this.checkedDepartNames = []
+      this.checkedDepartNameString = ''
+      this.checkedDepartKeys = []
+      this.selectedDepartKeys = []
+      this.resultDepartOptions = []
+      this.departIds = []
+      this.departIdShow = false
+      this.identity = '1'
+      this.fileList = []
     },
     moment,
     handleSubmit() {
-      console.log("username",this.form.getFieldValue('username'))
-      const that = this;
-      that.confirmLoading = true;
+      console.log('username',this.form.getFieldValue('username'))
+      const that = this
+      that.confirmLoading = true
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
-          let formData = Object.assign(this.model, values);
+          let formData = Object.assign(this.model, values)
           if (that.fileList != '') {
-            formData.avatar = that.fileList;
+            formData.avatar = that.fileList
           } else {
-            formData.avatar = null;
+            formData.avatar = null
           }
           // 公钥参数
           formData.rsaPublicKey = that.rsaPublicKey
@@ -498,39 +498,39 @@ export default {
           //update-begin-author:taoyan date:2020710 for:多租户配置
           formData.relTenantIds = this.currentTenant.length > 0 ? this.currentTenant.join(',') : ''
           //update-end-author:taoyan date:2020710 for:多租户配置
-          formData.selectedroles = values.selectedroles.length > 0 ? values.selectedroles.join(",") : '';
-          formData.selecteddeparts = values.selecteddeparts.length > 0 ? values.selecteddeparts.join(",") : '';
-          formData.userIdentity = this.identity;
+          formData.selectedroles = values.selectedroles.length > 0 ? values.selectedroles.join(',') : ''
+          formData.selecteddeparts = values.selecteddeparts.length > 0 ? values.selecteddeparts.join(',') : ''
+          formData.userIdentity = this.identity
           //如果是上级择传入departIds,否则为空
-          if (this.identity === "2") {
-            formData.departIds = this.departIds.join(",");
+          if (this.identity === '2') {
+            formData.departIds = this.departIds.join(',')
           } else {
-            formData.departIds = "";
+            formData.departIds = ''
           }
           // that.addDepartsToUser(that,formData); // 调用根据当前用户添加部门信息的方法
-          let obj;
+          let obj
           if (!this.model.id) {
-            formData.id = this.userId;
-            obj = addUser(formData);
+            formData.id = this.userId
+            obj = addUser(formData)
           } else {
-            obj = editUser(formData);
+            obj = editUser(formData)
           }
           obj.then((res) => {
             if (res.success) {
-              that.$message.success(res.message);
-              that.$emit('ok');
-              that.close();
+              that.$message.success(res.message)
+              that.$emit('ok')
+              that.close()
             } else {
-              that.$message.warning(res.message);
+              that.$message.warning(res.message)
             }
           }).finally(() => {
-            that.confirmLoading = false;
-            that.checkedDepartNames = [];
-            that.userDepartModel.departIdList = {userId: '', departIdList: []};
+            that.confirmLoading = false
+            that.checkedDepartNames = []
+            that.userDepartModel.departIdList = {userId: '', departIdList: []}
           })
 
         }else {
-          that.confirmLoading = false;
+          that.confirmLoading = false
         }
       })
     },
@@ -538,7 +538,7 @@ export default {
       this.close()
     },
     validateToNextPassword(rule, value, callback) {
-      const form = this.form;
+      const form = this.form
       if (!value) {
         callback()
       }
@@ -548,12 +548,12 @@ export default {
       if (value && this.confirmDirty) {
         form.validateFields(['confirm'], {force: true})
       }
-      callback();
+      callback()
     },
     compareToFirstPassword(rule, value, callback) {
-      const form = this.form;
+      const form = this.form
       if (value && value !== form.getFieldValue('password')) {
-        callback('两次输入的密码不一样！');
+        callback('两次输入的密码不一样！')
       } else {
         callback()
       }
@@ -586,62 +586,62 @@ export default {
       })
     },
     handleConfirmBlur(e) {
-      const value = e.target.value;
+      const value = e.target.value
       this.confirmDirty = this.confirmDirty || !!value
     },
 
     normFile(e) {
-      console.log('Upload event:', e);
+      console.log('Upload event:', e)
       if (Array.isArray(e)) {
         return e
       }
       return e && e.fileList
     },
     beforeUpload: function (file) {
-      var fileType = file.type;
+      var fileType = file.type
       if (fileType.indexOf('image') < 0) {
-        this.$message.warning('请上传图片');
-        return false;
+        this.$message.warning('请上传图片')
+        return false
       }
       //TODO 验证文件大小
     },
     handleChange(info) {
-      this.picUrl = "";
+      this.picUrl = ''
       if (info.file.status === 'uploading') {
-        this.uploadLoading = true;
+        this.uploadLoading = true
         return
       }
       if (info.file.status === 'done') {
-        var response = info.file.response;
-        this.uploadLoading = false;
-        console.log(response);
+        var response = info.file.response
+        this.uploadLoading = false
+        console.log(response)
         if (response.success) {
-          this.model.avatar = response.message;
-          this.picUrl = "Has no pic url yet";
+          this.model.avatar = response.message
+          this.picUrl = 'Has no pic url yet'
         } else {
-          this.$message.warning(response.message);
+          this.$message.warning(response.message)
         }
       }
     },
     // 搜索用户对应的部门API
     onSearch() {
-      this.$refs.departWindow.add(this.checkedDepartKeys, this.userId);
+      this.$refs.departWindow.add(this.checkedDepartKeys, this.userId)
     },
 
     // 获取用户对应部门弹出框提交给返回的数据
     modalFormOk(formData) {
-      this.checkedDepartNames = [];
-      this.selectedDepartKeys = [];
-      this.checkedDepartNameString = '';
-      this.userId = formData.userId;
-      this.userDepartModel.userId = formData.userId;
-      this.departIds = [];
-      this.resultDepartOptions = [];
-      var depart = [];
+      this.checkedDepartNames = []
+      this.selectedDepartKeys = []
+      this.checkedDepartNameString = ''
+      this.userId = formData.userId
+      this.userDepartModel.userId = formData.userId
+      this.departIds = []
+      this.resultDepartOptions = []
+      var depart = []
       for (let i = 0; i < formData.departIdList.length; i++) {
-        this.selectedDepartKeys.push(formData.departIdList[i].key);
-        this.checkedDepartNames.push(formData.departIdList[i].title);
-        this.checkedDepartNameString = this.checkedDepartNames.join(",");
+        this.selectedDepartKeys.push(formData.departIdList[i].key)
+        this.checkedDepartNames.push(formData.departIdList[i].title)
+        this.checkedDepartNameString = this.checkedDepartNames.join(',')
         //新增部门选择，如果上面部门选择后不为空直接付给负责部门
         depart.push({
           key: formData.departIdList[i].key,
@@ -649,24 +649,24 @@ export default {
         })
         this.departIds.push(formData.departIdList[i].key)
       }
-      this.resultDepartOptions = depart;
-      this.userDepartModel.departIdList = this.selectedDepartKeys;
+      this.resultDepartOptions = depart
+      this.userDepartModel.departIdList = this.selectedDepartKeys
       this.checkedDepartKeys = this.selectedDepartKeys  //更新当前的选择keys
     },
     // 根据屏幕变化,设置抽屉尺寸
     resetScreenSize() {
-      let screenWidth = document.body.clientWidth;
+      let screenWidth = document.body.clientWidth
       if (screenWidth < 500) {
-        this.drawerWidth = screenWidth;
+        this.drawerWidth = screenWidth
       } else {
-        this.drawerWidth = 700;
+        this.drawerWidth = 700
       }
     },
     identityChange(e) {
-      if (e.target.value === "1") {
-        this.departIdShow = false;
+      if (e.target.value === '1') {
+        this.departIdShow = false
       } else {
-        this.departIdShow = true;
+        this.departIdShow = true
       }
     }
   }
diff --git a/src/views/system/modules/UserRoleModal.vue b/src/views/system/modules/UserRoleModal.vue
index 0e6b811..af4b6c0 100644
--- a/src/views/system/modules/UserRoleModal.vue
+++ b/src/views/system/modules/UserRoleModal.vue
@@ -60,13 +60,13 @@
   import RoleDataruleModal from './RoleDataruleModal.vue'
 
   export default {
-    name: "RoleModal",
+    name: 'RoleModal',
     components:{
       RoleDataruleModal
     },
     data(){
       return {
-        roleId:"",
+        roleId:'',
         treeData: [],
         defaultCheckedKeys:[],
         checkedKeys:[],
@@ -74,7 +74,7 @@
         allTreeKeys:[],
         autoExpandParent: true,
         checkStrictly: true,
-        title:"角色权限配置",
+        title:'角色权限配置',
         visible: false,
         loading: false,
         selectedKeys:[]
@@ -89,22 +89,22 @@
       },
       onCheck (o) {
         if(this.checkStrictly){
-          this.checkedKeys = o.checked;
+          this.checkedKeys = o.checked
         }else{
           this.checkedKeys = o
         }
       },
       show(roleId){
         this.roleId=roleId
-        this.visible = true;
+        this.visible = true
       },
       close () {
         this.reset()
-        this.$emit('close');
-        this.visible = false;
+        this.$emit('close')
+        this.visible = false
       },
       onExpand(expandedKeys){
-        this.expandedKeysss = expandedKeys;
+        this.expandedKeysss = expandedKeys
         this.autoExpandParent = false
       },
       reset () {
@@ -137,29 +137,29 @@
         this.close()
       },
       handleSubmit(exit) {
-        let that = this;
+        let that = this
         let params =  {
           roleId:that.roleId,
-          permissionIds:that.checkedKeys.join(","),
-          lastpermissionIds:that.defaultCheckedKeys.join(","),
-        };
-        that.loading = true;
-        console.log("请求参数：",params);
+          permissionIds:that.checkedKeys.join(','),
+          lastpermissionIds:that.defaultCheckedKeys.join(','),
+        }
+        that.loading = true
+        console.log('请求参数：',params)
         saveRolePermission(params).then((res)=>{
           if(res.success){
-            that.$message.success(res.message);
-            that.loading = false;
+            that.$message.success(res.message)
+            that.loading = false
             if (exit) {
               that.close()
             }
           }else {
-            that.$message.error(res.message);
-            that.loading = false;
+            that.$message.error(res.message)
+            that.loading = false
             if (exit) {
               that.close()
             }
           }
-          this.loadData();
+          this.loadData()
         })
       },
       loadData(){
@@ -167,9 +167,9 @@
           this.treeData = res.result.treeList
           this.allTreeKeys = res.result.ids
           queryRolePermission({roleId:this.roleId}).then((res)=>{
-              this.checkedKeys = [...res.result];
-              this.defaultCheckedKeys = [...res.result];
-              this.expandedKeysss = this.allTreeKeys;
+              this.checkedKeys = [...res.result]
+              this.defaultCheckedKeys = [...res.result]
+              this.expandedKeysss = this.allTreeKeys
               console.log(this.defaultCheckedKeys)
           })
         })
@@ -178,7 +178,7 @@
   watch: {
     visible () {
       if (this.visible) {
-        this.loadData();
+        this.loadData()
       }
     }
   }
diff --git a/src/views/test/TestPage.vue b/src/views/test/TestPage.vue
index f87a602..c62e452 100644
--- a/src/views/test/TestPage.vue
+++ b/src/views/test/TestPage.vue
@@ -4,8 +4,8 @@
 
 <script>
 export default {
-  name: "TestPage"
-};
+  name: 'TestPage'
+}
 </script>
 
 <style scoped>
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index dc13757..fb3728a 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -180,16 +180,16 @@
 </template>
 
 <script>
-import Vue from "vue";
-import { mapActions } from "vuex";
-import { timeFix } from "@/utils/util";
-import { ACCESS_TOKEN } from "@/store/mutation-types";
-import { postAction, getAction } from "@/api/manage";
-import { getRSAPublicKey } from "@/api/login.js";
-import { JSEncrypt } from "jsencrypt";
+import Vue from 'vue'
+import { mapActions } from 'vuex'
+import { timeFix } from '@/utils/util'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
+import { postAction, getAction } from '@/api/manage'
+import { getRSAPublicKey } from '@/api/login.js'
+import { JSEncrypt } from 'jsencrypt'
 
 export default {
-  name: "Login",
+  name: 'Login',
   data() {
     return {
       loginBtn: false,
@@ -203,213 +203,213 @@ export default {
         smsSendBtn: false
       },
       validatorRules: {
-        username: { rules: [{ required: true, message: "请输入用户名!" }, { validator: this.handleUsernameOrEmail }] },
-        password: { rules: [{ required: true, message: "请输入密码!", validator: "click" }] },
+        username: { rules: [{ required: true, message: '请输入用户名!' }, { validator: this.handleUsernameOrEmail }] },
+        password: { rules: [{ required: true, message: '请输入密码!', validator: 'click' }] },
         mobile: { rules: [{ validator: this.validateMobile }] },
-        captcha: { rule: [{ required: true, message: "请输入验证码!" }] },
-        inputCode: { rules: [{ required: true, message: "请输入验证码!" }] }
+        captcha: { rule: [{ required: true, message: '请输入验证码!' }] },
+        inputCode: { rules: [{ required: true, message: '请输入验证码!' }] }
       },
-      velorifiedCode: "",
-      inputCodeContent: "",
+      velorifiedCode: '',
+      inputCodeContent: '',
       inputCodeNull: true,
-      currentUsername: "",
-      currdatetime: "",
-      randCodeImage: "",
+      currentUsername: '',
+      currdatetime: '',
+      randCodeImage: '',
       requestCodeSuccess: false,
-      rsaPublicKey: ""
-    };
+      rsaPublicKey: ''
+    }
   },
   created() {
-    this.currdatetime = new Date().getTime();
-    Vue.ls.remove(ACCESS_TOKEN);
-    this.getRouterData();
-    this.handleChangeCheckCode();
+    this.currdatetime = new Date().getTime()
+    Vue.ls.remove(ACCESS_TOKEN)
+    this.getRouterData()
+    this.handleChangeCheckCode()
 
   },
   methods: {
-    ...mapActions(["Login", "Logout", "PhoneLogin"]),
+    ...mapActions(['Login', 'Logout', 'PhoneLogin']),
     handleUsernameOrEmail(rule, value, callback) {
-      const regex = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((\.[a-zA-Z0-9_-]{2,3}){1,2})$/;
+      const regex = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((\.[a-zA-Z0-9_-]{2,3}){1,2})$/
       if (regex.test(value)) {
-        this.loginType = 0;
+        this.loginType = 0
       } else {
-        this.loginType = 1;
+        this.loginType = 1
       }
-      callback();
+      callback()
     },
     handleSubmit() {
-      let that = this;
-      let loginParams = {};
-      that.loginBtn = true;
-      that.form.validateFields(["username", "password", "inputCode", "rememberMe"], { force: true }, (err, values) => {
+      let that = this
+      let loginParams = {}
+      that.loginBtn = true
+      that.form.validateFields(['username', 'password', 'inputCode', 'rememberMe'], { force: true }, (err, values) => {
         if (!err) {
 
-          loginParams.remember_me = values.rememberMe;
-          loginParams.captcha = that.inputCodeContent;
-          loginParams.checkKey = that.currdatetime;
-          loginParams.rsaPublicKey = that.rsaPublicKey;
+          loginParams.remember_me = values.rememberMe
+          loginParams.captcha = that.inputCodeContent
+          loginParams.checkKey = that.currdatetime
+          loginParams.rsaPublicKey = that.rsaPublicKey
           // 新建JSEncrypt对象
-          let encrypt = new JSEncrypt();
-          encrypt.setPublicKey(loginParams.rsaPublicKey);
+          let encrypt = new JSEncrypt()
+          encrypt.setPublicKey(loginParams.rsaPublicKey)
           // 公钥加密
-          loginParams.username = encrypt.encrypt(values.username);
-          loginParams.password = encrypt.encrypt(values.password);
+          loginParams.username = encrypt.encrypt(values.username)
+          loginParams.password = encrypt.encrypt(values.password)
           //登录
           that.Login(loginParams).then((res) => {
-            console.log(res);
-            this.loginSuccess();
+            console.log(res)
+            this.loginSuccess()
           }).catch((err) => {
             if (err.code === 500) {
               // 刷新验证码
-              this.handleChangeCheckCode();
+              this.handleChangeCheckCode()
             }
-            that.requestFailed(err);
-          });
+            that.requestFailed(err)
+          })
         } else {
-          that.loginBtn = false;
+          that.loginBtn = false
         }
-      });
+      })
     },
     getCaptcha(e) {
-      e.preventDefault();
-      let that = this;
-      this.form.validateFields(["mobile"], { force: true }, (err, values) => {
+      e.preventDefault()
+      let that = this
+      this.form.validateFields(['mobile'], { force: true }, (err, values) => {
           if (!values.mobile) {
-            that.cmsFailed("请输入手机号");
+            that.cmsFailed('请输入手机号')
           } else if (!err) {
-            this.state.smsSendBtn = true;
+            this.state.smsSendBtn = true
             let interval = window.setInterval(() => {
               if (that.state.time-- <= 0) {
-                that.state.time = 60;
-                that.state.smsSendBtn = false;
-                window.clearInterval(interval);
+                that.state.time = 60
+                that.state.smsSendBtn = false
+                window.clearInterval(interval)
               }
-            }, 1000);
+            }, 1000)
 
-            const hide = this.$message.loading("验证码发送中..", 0);
-            let smsParams = {};
-            smsParams.mobile = values.mobile;
-            smsParams.smsmode = "0";
-            postAction("/sys/sms", smsParams)
+            const hide = this.$message.loading('验证码发送中..', 0)
+            let smsParams = {}
+            smsParams.mobile = values.mobile
+            smsParams.smsmode = '0'
+            postAction('/sys/sms', smsParams)
               .then(res => {
                 if (!res.success) {
-                  setTimeout(hide, 0);
-                  this.cmsFailed(res.message);
+                  setTimeout(hide, 0)
+                  this.cmsFailed(res.message)
                 }
-                setTimeout(hide, 500);
+                setTimeout(hide, 500)
               })
               .catch(err => {
-                setTimeout(hide, 1);
-                clearInterval(interval);
-                that.state.time = 60;
-                that.state.smsSendBtn = false;
-                this.requestFailed(err);
-              });
+                setTimeout(hide, 1)
+                clearInterval(interval)
+                that.state.time = 60
+                that.state.smsSendBtn = false
+                this.requestFailed(err)
+              })
           }
         }
-      );
+      )
     },
     handleChangeCheckCode() {
-      this.currdatetime = new Date().getTime();
+      this.currdatetime = new Date().getTime()
       getAction(`/sys/randomImage/${this.currdatetime}`).then(res => {
         if (res.success) {
-          this.randCodeImage = res.result;
-          this.requestCodeSuccess = true;
+          this.randCodeImage = res.result
+          this.requestCodeSuccess = true
         } else {
-          this.$message.error(res.message);
-          this.requestCodeSuccess = false;
+          this.$message.error(res.message)
+          this.requestCodeSuccess = false
         }
       }).catch(() => {
-        this.requestCodeSuccess = false;
-      });
-      this.getPublicKey();
+        this.requestCodeSuccess = false
+      })
+      this.getPublicKey()
     },
     //获取RSA公钥
     getPublicKey() {
       // 获取公钥
       getRSAPublicKey().then(res => {
-        this.rsaPublicKey = res.result;
-      });
+        this.rsaPublicKey = res.result
+      })
     },
     loginSuccess() {
-      this.$router.push({ path: "/dashboard/analysis" }).catch((res) => {
-        console.log(res);
-      });
+      this.$router.push({ path: '/dashboard/analysis' }).catch((res) => {
+        console.log(res)
+      })
       this.$notification.success({
-        message: "欢迎",
+        message: '欢迎',
         description: `${timeFix()}，欢迎回来`
-      });
+      })
     },
     cmsFailed(err) {
-      this.$notification["error"]({
-        message: "登录失败",
+      this.$notification['error']({
+        message: '登录失败',
         description: err,
         duration: 4
-      });
+      })
     },
     requestFailed(err) {
-      this.$notification["error"]({
-        message: "登录失败",
-        description: ((err.response || {}).data || {}).message || err.message || "请求出现错误，请稍后再试",
+      this.$notification['error']({
+        message: '登录失败',
+        description: ((err.response || {}).data || {}).message || err.message || '请求出现错误，请稍后再试',
         duration: 4
-      });
-      this.loginBtn = false;
+      })
+      this.loginBtn = false
     },
     validateMobile(rule, value, callback) {
       if (!value || new RegExp(/^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/).test(value)) {
-        callback();
+        callback()
       } else {
-        callback("您的手机号码格式不正确!");
+        callback('您的手机号码格式不正确!')
       }
     },
     validateInputCode(rule, value, callback) {
       if (!value || this.verifiedCode == this.inputCodeContent) {
-        callback();
+        callback()
       } else {
-        callback("您输入的验证码不正确!");
+        callback('您输入的验证码不正确!')
       }
     },
     generateCode(value) {
-      this.verifiedCode = value.toLowerCase();
+      this.verifiedCode = value.toLowerCase()
     },
     inputCodeChange(e) {
-      this.inputCodeContent = e.target.value;
+      this.inputCodeContent = e.target.value
     },
     getRouterData() {
       this.$nextTick(() => {
         if (this.$route.params.username) {
           this.form.setFieldsValue({
-            "username": this.$route.params.username
-          });
+            'username': this.$route.params.username
+          })
         }
-      });
+      })
     }
   }
-};
+}
 
 // 判断当前设备
 function isMobile() {
-  var userAgentInfo = navigator.userAgent;
+  var userAgentInfo = navigator.userAgent
 
-  var mobileAgents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
+  var mobileAgents = ['Android', 'iPhone', 'SymbianOS', 'Windows Phone', 'iPad', 'iPod']
 
-  var mobile_flag = false;
+  var mobile_flag = false
 
   //根据userAgent判断是否是手机
   for (var v = 0; v < mobileAgents.length; v++) {
     if (userAgentInfo.indexOf(mobileAgents[v]) > 0) {
-      mobile_flag = true;
-      break;
+      mobile_flag = true
+      break
     }
   }
-  var screen_width = window.screen.width;
-  var screen_height = window.screen.height;
+  var screen_width = window.screen.width
+  var screen_height = window.screen.height
 
   //根据屏幕分辨率判断是否是手机
   if (screen_width < 500 && screen_height < 800) {
-    mobile_flag = true;
+    mobile_flag = true
   }
-  return mobile_flag;
+  return mobile_flag
 }
 </script>
 
diff --git a/src/views/user/alteration/Alteration.vue b/src/views/user/alteration/Alteration.vue
index d2b512c..7baf870 100644
--- a/src/views/user/alteration/Alteration.vue
+++ b/src/views/user/alteration/Alteration.vue
@@ -20,7 +20,7 @@
   import Step4 from './Step4'
 
   export default {
-    name: "Alteration",
+    name: 'Alteration',
     components: {
       Step1,
       Step2,
@@ -40,13 +40,13 @@
 
       // handler
       nextStep(data) {
-        this.userList = data;
+        this.userList = data
         if (this.currentTab < 4) {
           this.currentTab += 1
         }
       },
       prevStep(data) {
-        this.userList = data;
+        this.userList = data
         if (this.currentTab > 0) {
           this.currentTab -= 1
         }
diff --git a/src/views/user/alteration/Step1.vue b/src/views/user/alteration/Step1.vue
index 7cace12..22e89b0 100644
--- a/src/views/user/alteration/Step1.vue
+++ b/src/views/user/alteration/Step1.vue
@@ -45,13 +45,13 @@
   import { checkOnlyUser } from '@/api/api'
 
   export default {
-    name: "Step1",
+    name: 'Step1',
     data() {
       return {
         form: this.$form.createForm(this),
-        inputCodeContent: "",
+        inputCodeContent: '',
         inputCodeNull: true,
-        verifiedCode: "",
+        verifiedCode: '',
         validatorRules: {
           username: {rules: [{required: false}, {validator: this.validateInputUsername}]},
           inputCode: {rules: [{required: true, message: '请输入验证码!'}]},
@@ -63,11 +63,11 @@
       }
     },
     created(){
-      this.handleChangeCheckCode();
+      this.handleChangeCheckCode()
     },
     methods: {
       handleChangeCheckCode(){
-        this.currdatetime = new Date().getTime();
+        this.currdatetime = new Date().getTime()
         getAction(`/sys/randomImage/${this.currdatetime}`).then(res=>{
           if(res.success){
             this.randCodeImage = res.result
@@ -84,29 +84,29 @@
         let that = this
         this.form.validateFields((err, values) => {
           if (!err) {
-            let isPhone = false;
+            let isPhone = false
             var params = {}
-            var reg = /^[1-9]\d*$|^0$/;
-            var username = values.username;
+            var reg = /^[1-9]\d*$|^0$/
+            var username = values.username
             if (reg.test(username) == true) {
-              params.phone = username;
+              params.phone = username
               isPhone = true
             } else {
-              params.username = username;
+              params.username = username
             }
             that.validateInputCode().then(()=>{
-              getAction("/sys/user/querySysUser", params).then((res) => {
+              getAction('/sys/user/querySysUser', params).then((res) => {
                 if (res.success) {
                   var userList = {
                     username: res.result.username,
                     phone: res.result.phone,
                     isPhone: isPhone
-                  };
+                  }
                   setTimeout(function () {
                     that.$emit('nextStep', userList)
                   })
                 }
-              });
+              })
             })
           }
         })
@@ -114,21 +114,21 @@
       },
       validateInputCode() {
         return new Promise((resolve,reject)=>{
-          postAction("/sys/checkCaptcha",{
+          postAction('/sys/checkCaptcha',{
             captcha:this.inputCodeContent,
             checkKey:this.currdatetime
           }).then(res=>{
             if(res.success){
-              resolve();
+              resolve()
             }else{
               this.$message.error(res.message)
-              reject();
+              reject()
             }
-          });
+          })
         })
       },
       inputCodeChange(e) {
-        this.inputCodeContent = e.target.value;
+        this.inputCodeContent = e.target.value
         console.log(this.inputCodeContent)
         if (!e.target.value || 0 == e.target.value) {
           this.inputCodeNull = true
@@ -138,24 +138,24 @@
         }
       },
       generateCode(value) {
-        this.verifiedCode = value.toLowerCase();
-        console.log(this.verifiedCode);
+        this.verifiedCode = value.toLowerCase()
+        console.log(this.verifiedCode)
       },
       validateInputUsername(rule, value, callback) {
-        console.log(value);
-        var reg = /^[0-9]+.?[0-9]*/;
+        console.log(value)
+        var reg = /^[0-9]+.?[0-9]*/
         if (!value) {
-          callback("请输入用户名和手机号！");
+          callback('请输入用户名和手机号！')
         }
 
         //判断用户输入账号还是手机号码
         if (reg.test(value)) {
           var params = {
             phone: value,
-          };
+          }
           checkOnlyUser(params).then((res) => {
             if (res.success) {
-              callback("用户名不存在!")
+              callback('用户名不存在!')
             } else {
               callback()
             }
@@ -163,10 +163,10 @@
         } else {
           var params = {
             username: value,
-          };
+          }
           checkOnlyUser(params).then((res) => {
             if (res.success) {
-              callback("用户名不存在!")
+              callback('用户名不存在!')
             } else {
               callback()
             }
diff --git a/src/views/user/alteration/Step2.vue b/src/views/user/alteration/Step2.vue
index a8db118..8977b22 100644
--- a/src/views/user/alteration/Step2.vue
+++ b/src/views/user/alteration/Step2.vue
@@ -51,23 +51,23 @@
   import {postAction} from '@/api/manage'
 
   export default {
-    name: "Step2",
+    name: 'Step2',
     props: ['userList'],
     data() {
       return {
         form: this.$form.createForm(this),
         loading: false,
         // accountName: this.userList.username,
-        dropList: "0",
-        captcha: "",
+        dropList: '0',
+        captcha: '',
         show: true,
         state: {
           time: 60,
           smsSendBtn: false,
         },
         formLogin: {
-          captcha: "",
-          mobile: "",
+          captcha: '',
+          mobile: '',
         },
         validatorRules: {
           captcha: {rule: [{required: true, message: '请输入短信验证码!'}, {validator: this.validateCaptcha}]},
@@ -82,28 +82,28 @@
         let that = this
         that.loading = true
         this.form.validateFields((err, values) => {
-          console.log(values);
+          console.log(values)
           if (!err) {
-            if (that.dropList == "0") {
+            if (that.dropList == '0') {
               if (values.captcha == undefined) {
-                this.cmsFailed("请输入短信验证码!");
+                this.cmsFailed('请输入短信验证码!')
               } else {
                 var params = {}
-                params.phone = values.phone;
-                params.smscode = values.captcha;
-                postAction("/sys/user/phoneVerification", params).then((res) => {
+                params.phone = values.phone
+                params.smscode = values.captcha
+                postAction('/sys/user/phoneVerification', params).then((res) => {
                   if (res.success) {
-                    console.log(res);
+                    console.log(res)
                     var userList = {
                       username: res.result.username,
                       phone: values.phone,
                       smscode: res.result.smscode
-                    };
+                    }
                     setTimeout(function () {
                       that.$emit('nextStep', userList)
                     }, 0)
                   } else {
-                    this.cmsFailed(res.message);
+                    this.cmsFailed(res.message)
                   }
                 })
 
@@ -115,60 +115,60 @@
         })
       },
       getCaptcha(e) {
-        e.preventDefault();
-        let that = this;
-        let phone=that.form.getFieldValue("phone")
+        e.preventDefault()
+        let that = this
+        let phone=that.form.getFieldValue('phone')
         if(!phone){
-          this.cmsFailed("手机号不能为空!");
-          return;
+          this.cmsFailed('手机号不能为空!')
+          return
         }
-        this.state.smsSendBtn = true;
+        this.state.smsSendBtn = true
         let interval = window.setInterval(() => {
           if (that.state.time-- <= 0) {
-            that.state.time = 60;
-            that.state.smsSendBtn = false;
-            window.clearInterval(interval);
+            that.state.time = 60
+            that.state.smsSendBtn = false
+            window.clearInterval(interval)
           }
-        }, 1000);
+        }, 1000)
 
-        const hide = this.$message.loading('验证码发送中..', 0);
+        const hide = this.$message.loading('验证码发送中..', 0)
         let smsParams = {
           mobile: phone,
-          smsmode: "2"
-        };
-        postAction("/sys/sms", smsParams).then(res => {
+          smsmode: '2'
+        }
+        postAction('/sys/sms', smsParams).then(res => {
           if (!res.success) {
-            setTimeout(hide, 1);
-            this.cmsFailed(res.message);
+            setTimeout(hide, 1)
+            this.cmsFailed(res.message)
           }
-          setTimeout(hide, 500);
+          setTimeout(hide, 500)
         })
       },
       cmsFailed(err) {
         this.$notification['error']({
-          message: "验证错误",
+          message: '验证错误',
           description: err,
           duration: 4,
-        });
+        })
       },
       handleChangeSelect(value) {
-        var that = this;
-        console.log(value);
+        var that = this
+        console.log(value)
         if (value == 0) {
-          that.dropList = "0";
-          that.show = true;
+          that.dropList = '0'
+          that.show = true
         } else {
-          that.dropList = "1";
-          that.show = false;
+          that.dropList = '1'
+          that.show = false
         }
       },
       validatePhone(rule,value,callback){
           if(value){
-            var myreg=/^[1][3,4,5,7,8][0-9]{9}$/;
+            var myreg=/^[1][3,4,5,7,8][0-9]{9}$/
             if(!myreg.test(value)){
-              callback("请输入正确的手机号")
+              callback('请输入正确的手机号')
             }else{
-              callback();
+              callback()
             }
           }else{
             callback()
diff --git a/src/views/user/alteration/Step3.vue b/src/views/user/alteration/Step3.vue
index 57b614c..9206ab0 100644
--- a/src/views/user/alteration/Step3.vue
+++ b/src/views/user/alteration/Step3.vue
@@ -44,7 +44,7 @@
 <script>
   import { putAction,getAction } from '@/api/manage'
   export default {
-    name: "Step3",
+    name: 'Step3',
 //    components: {
 //      Result
 //    },
@@ -74,21 +74,21 @@
         this.form.validateFields((err, values) => {
           if ( !err ){
           var params={}
-          params.username=this.userList.username;
-          params.password=values.password;
-          params.smscode=this.userList.smscode;
-          params.phone= this.userList.phone;
-          getAction("/sys/user/passwordChange", params).then((res) => {
+          params.username=this.userList.username
+          params.password=values.password
+          params.smscode=this.userList.smscode
+          params.phone= this.userList.phone
+          getAction('/sys/user/passwordChange', params).then((res) => {
             if(res.success){
             var userList = {
               username: this.userList.username
             }
-            console.log(userList);
+            console.log(userList)
             setTimeout(function () {
               that.$emit('nextStep', userList)
             }, 1500)
           }else{
-            this.passwordFailed(res.message);
+            this.passwordFailed(res.message)
             that.loading = false
           }
         })
@@ -111,10 +111,10 @@
       },
       passwordFailed(err){
         this.$notification[ 'error' ]({
-          message: "更改密码失败",
+          message: '更改密码失败',
           description:err,
           duration: 4,
-        });
+        })
       },
     }
   }
diff --git a/src/views/user/alteration/Step4.vue b/src/views/user/alteration/Step4.vue
index 59999d7..48f6fe1 100644
--- a/src/views/user/alteration/Step4.vue
+++ b/src/views/user/alteration/Step4.vue
@@ -14,7 +14,7 @@
 <script>
   import Result from '@/views/result/Result'
   export default {
-    name: "Step4",
+    name: 'Step4',
     props:['userList'],
     components: {
       Result
@@ -27,21 +27,21 @@
     },
     methods: {
       countDown(){
-        let that = this;
-        that.time--;
+        let that = this
+        that.time--
       }
     },
     mounted(){
-      let that = this;
-      that.time = 5;
-      setInterval(that.countDown, 1000);
+      let that = this
+      that.time = 5
+      setInterval(that.countDown, 1000)
     },
     watch: {
       time: function (newVal,oldVal) {
         if (newVal == 0) {
           var params = {
             username: this.userList.username
-          };
+          }
           this.$router.push({name: 'login', params})
         }
       }
diff --git a/src/views/user/register/Register.vue b/src/views/user/register/Register.vue
index 5846423..6692253 100644
--- a/src/views/user/register/Register.vue
+++ b/src/views/user/register/Register.vue
@@ -115,7 +115,7 @@
     3: '#52c41a',
   }
   export default {
-    name: "Register",
+    name: 'Register',
     components: {},
     mixins: [mixinDevice],
     data() {
@@ -147,16 +147,16 @@
     methods: {
       checkUsername(rule, value, callback) {
         if(!value){
-          callback(new Error("请输入用户名"))
+          callback(new Error('请输入用户名'))
         }else{
         var params = {
           username: value,
-        };
+        }
         checkOnlyUser(params).then((res) => {
           if (res.success) {
             callback()
           } else {
-            callback("用户名已存在!")
+            callback('用户名已存在!')
           }
         })
       }
@@ -164,19 +164,19 @@
       handleEmailCheck(rule, value, callback) {
         var params = {
           email: value,
-        };
+        }
         checkOnlyUser(params).then((res) => {
           if (res.success) {
             callback()
           } else {
-            callback("邮箱已存在!")
+            callback('邮箱已存在!')
           }
         })
       },
       handlePasswordLevel(rule, value, callback) {
 
         let level = 0
-        let reg = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/;
+        let reg = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/
         if (!reg.test(value)) {
           callback(new Error('密码由8位数字、大小写字母和特殊符号组成!'))
         }
@@ -220,24 +220,24 @@
       },
       handleCaptchaCheck(rule, value, callback){
         if(!value){
-          callback(new Error("请输入验证码"))
+          callback(new Error('请输入验证码'))
         }else{
-          callback();
+          callback()
         }
       },
       handlePhoneCheck(rule, value, callback) {
         var reg=/^1[3456789]\d{9}$/
         if(!reg.test(value)){
-          callback(new Error("请输入正确手机号"))
+          callback(new Error('请输入正确手机号'))
         }else{
         var params = {
           phone: value,
-        };
+        }
         checkOnlyUser(params).then((res) => {
           if (res.success) {
             callback()
           } else {
-            callback("手机号已存在!")
+            callback('手机号已存在!')
           }
         })
       }
@@ -246,7 +246,7 @@
       handlePasswordInputClick() {
         if (!this.isMobile()) {
           this.state.passwordLevelChecked = true
-          return;
+          return
         }
         this.state.passwordLevelChecked = false
       },
@@ -259,8 +259,8 @@
               password: values.password,
               phone: values.mobile,
               smscode: values.captcha
-            };
-            postAction("/sys/user/register", register).then((res) => {
+            }
+            postAction('/sys/user/register', register).then((res) => {
               if (!res.success) {
                 this.registerFailed(res.message)
               } else {
@@ -276,51 +276,51 @@
         let that = this
         this.form.validateFields(['mobile'], {force: true}, (err, values) => {
             if (!err) {
-              this.state.smsSendBtn = true;
+              this.state.smsSendBtn = true
               let interval = window.setInterval(() => {
                 if (that.state.time-- <= 0) {
-                  that.state.time = 60;
-                  that.state.smsSendBtn = false;
-                  window.clearInterval(interval);
+                  that.state.time = 60
+                  that.state.smsSendBtn = false
+                  window.clearInterval(interval)
                 }
-              }, 1000);
-              const hide = this.$message.loading('验证码发送中..', 0);
+              }, 1000)
+              const hide = this.$message.loading('验证码发送中..', 0)
               const params = {
                 mobile: values.mobile,
-                smsmode: "1"
-              };
-              postAction("/sys/sms", params).then((res) => {
+                smsmode: '1'
+              }
+              postAction('/sys/sms', params).then((res) => {
                 if (!res.success) {
-                  this.registerFailed(res.message);
-                  setTimeout(hide, 0);
+                  this.registerFailed(res.message)
+                  setTimeout(hide, 0)
                 }
-                setTimeout(hide, 500);
+                setTimeout(hide, 500)
               }).catch(err => {
-                setTimeout(hide, 1);
-                clearInterval(interval);
-                that.state.time = 60;
-                that.state.smsSendBtn = false;
-                this.requestFailed(err);
-              });
+                setTimeout(hide, 1)
+                clearInterval(interval)
+                that.state.time = 60
+                that.state.smsSendBtn = false
+                this.requestFailed(err)
+              })
             }
           }
-        );
+        )
       },
       registerFailed(message) {
         this.$notification['error']({
-          message: "注册失败",
+          message: '注册失败',
           description: message,
           duration: 2,
-        });
+        })
 
       },
       requestFailed(err) {
         this.$notification['error']({
           message: '错误',
-          description: ((err.response || {}).data || {}).message || "请求出现错误，请稍后再试",
+          description: ((err.response || {}).data || {}).message || '请求出现错误，请稍后再试',
           duration: 4,
-        });
-        this.registerBtn = false;
+        })
+        this.registerBtn = false
       },
     },
     watch: {
diff --git a/src/views/user/register/RegisterResult.vue b/src/views/user/register/RegisterResult.vue
index 389e140..0ee8e4a 100644
--- a/src/views/user/register/RegisterResult.vue
+++ b/src/views/user/register/RegisterResult.vue
@@ -15,7 +15,7 @@
   import Result from '@/views/result/Result'
 
   export default {
-    name: "RegisterResult",
+    name: 'RegisterResult',
     components: {
       Result
     },
@@ -28,7 +28,7 @@
       email () {
         let v = this.form ? this.form.username || this.form.mobile : ' XXX '
         let title = `你的账户：${v} 注册成功`
-        this.username = v;
+        this.username = v
         return title
       }
     },
@@ -37,10 +37,10 @@
     },
     methods: {
       goHomeHandle () {
-        let params={};
-        params.username=this.form.username;
-        params.password=this.form.password;
-        console.log(params);
+        let params={}
+        params.username=this.form.username
+        params.password=this.form.password
+        console.log(params)
         this.$router.push({name:'login',params})
       },
     }
diff --git a/vue.config.js b/vue.config.js
index 2452067..939bd47 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,5 +1,5 @@
 const path = require('path')
-const CompressionPlugin = require("compression-webpack-plugin")
+const CompressionPlugin = require('compression-webpack-plugin')
 
 function resolve(dir) {
   return path.join(__dirname, dir)
@@ -16,7 +16,7 @@ module.exports = {
   productionSourceMap: false,
   //打包app时放开该配置
   //publicPath:'./',
-  configureWebpack: config => {
+  configureWebpack: (config) => {
     //生产环境取消 console.log
     if (process.env.NODE_ENV === 'production') {
       config.optimization.minimizer[0].options.terserOptions.compress.drop_console = true
@@ -32,11 +32,13 @@ module.exports = {
 
     //生产环境，开启js\css压缩
     if (process.env.NODE_ENV === 'production') {
-        config.plugin('compressionPlugin').use(new CompressionPlugin({
+      config.plugin('compressionPlugin').use(
+        new CompressionPlugin({
           test: /\.(js|css|less)$/, // 匹配文件名
           threshold: 10240, // 对超过10k的数据压缩
-          deleteOriginalAssets: false // 不删除源文件
-        }))
+          deleteOriginalAssets: false, // 不删除源文件
+        })
+      )
     }
 
     // 配置 webpack 识别 markdown 为普通的文件
@@ -51,14 +53,12 @@ module.exports = {
     config.module
       .rule('vxe')
       .test(/\.js$/)
-      .include
-        .add(resolve('node_modules/vxe-table'))
-        .add(resolve('node_modules/vxe-table-plugin-antd'))
-        .end()
+      .include.add(resolve('node_modules/vxe-table'))
+      .add(resolve('node_modules/vxe-table-plugin-antd'))
+      .end()
       .use()
       .loader('babel-loader')
       .end()
-
   },
 
   css: {
@@ -71,14 +71,14 @@ module.exports = {
           'border-radius-base': '4px',
         },
         javascriptEnabled: true,
-      }
-    }
+      },
+    },
   },
 
   devServer: {
     port: 3000,
     proxy: {
-     /* '/api': {
+      /* '/api': {
         target: 'https://mock.ihx.me/mock/5baf3052f7da7e07e04a5116/antd-pro', //mock API接口系统
         ws: false,
         changeOrigin: true,
@@ -90,10 +90,10 @@ module.exports = {
         // ''
         target: 'http://localhost:8080', //请求本地 jero-boot后台项目
         ws: false,
-        changeOrigin: true
+        changeOrigin: true,
       },
-    }
+    },
   },
 
-  lintOnSave: undefined
+  lintOnSave: true,
 }