update 岗位改部门，用户管理，流程启动添加“提交并结束”

src/business/platform/bpmn/form/action.js

@@ -91,7 +91,7 @@ export default {
                     this.instanceDetailVisible = true
                     break
                 case 'startFlow': // 启动流程
-                    if (this.actionTitle == '同意并结束') {
+                    if (this.actionTitle === '同意并结束' || this.actionTitle === '提交并结束') {
                         this.setData("1")
                     } else {
                         this.setData("已编制")

src/business/platform/org/employee/constants/index.js

@@ -8,7 +8,7 @@ export const partyTypeOptions = [
   },
   {
     value: 'position',
-    label: '岗位'
+    label: '部门'
   },
   {
     value: 'role',

src/locales/zh-CN.json

@@ -759,7 +759,7 @@
 				"constants": {
 					"type": {
 						"org": "机构",
-						"position": "岗位"
+						"position": "部门"
 					}
 				},
 				"prop": {

src/views/platform/bpmn/bpmAgent/constants/index.js

@@ -5,7 +5,7 @@ export const typeOptions = [
   },
   {
     value: 'position',
-    label: '岗位',
+    label: '部门',
     type: 'success'
   // },
   // {

src/views/platform/org/attr/constants/index.js

@@ -8,7 +8,7 @@ export const partyTypeOptions = [
   },
   {
     value: 'position',
-    label: '岗位'
+    label: '部门'
   },
   {
     value: 'employee',

src/views/platform/org/employee/edit/index.vue

@@ -22,7 +22,7 @@
                     ref="basicInfo"
                     :readonly="readonly"
                     :data="employee"
-                    :formType="formType"
+                    :form-type="formType"
                     @input="data => employee = data"
                 />
             </el-tab-pane>
@@ -60,7 +60,7 @@
                     @input="data => employee.posItemList = data"
                 />
             </el-tab-pane>
-            <el-tab-pane v-if="!infoIncludes('role-info')"  label="角色信息" name="role-info">
+            <el-tab-pane v-if="!infoIncludes('role-info')" label="角色信息" name="role-info">
                 <!-- <span slot="label">角色信息
                     <el-tooltip
                         v-if="!readonly"
@@ -99,310 +99,318 @@
 </template>
 
 <script>
-    import { create, update, load,upEmployee } from '@/api/platform/org/employee'
-    import ActionUtils from '@/utils/action'
-    import BasicInfo from './basic-info'
-    import ExtAttr from './ext-attr'
-    import OrgInfo from './org-info'
-    import PositionInfo from './position-info'
-    import RoleInfo from './role-info'
-    import GroupInfo from './group-info'
+import { create, update, load, upEmployee } from '@/api/platform/org/employee'
+import ActionUtils from '@/utils/action'
+import BasicInfo from './basic-info'
+import ExtAttr from './ext-attr'
+import OrgInfo from './org-info'
+import PositionInfo from './position-info'
+import RoleInfo from './role-info'
+import GroupInfo from './group-info'
 
-    export default {
-        components: {
-            BasicInfo,
-            ExtAttr,
-            OrgInfo,
-            PositionInfo,
-            RoleInfo,
-            GroupInfo
+export default {
+    components: {
+        BasicInfo,
+        ExtAttr,
+        OrgInfo,
+        PositionInfo,
+        RoleInfo,
+        GroupInfo
+    },
+    props: {
+        visible: Boolean,
+        id: String,
+        title: String,
+        readonly: {
+            type: Boolean,
+            default: false
         },
-        props: {
-            visible: Boolean,
-            id: String,
-            title: String,
-            readonly: {
-                type: Boolean,
-                default: false
-            },
-            formType: {
-                type: String,
-                default: 'add'
+        formType: {
+            type: String,
+            default: 'add'
+        },
+        ceroParams: {
+            type: Object,
+            default: () => {}
+        },
+        span: [Number, String]
+    },
+    data () {
+        return {
+            info: [],
+            orgId: '',
+            dialogLoading: false,
+            dialogVisible: false,
+            activeName: 'basic-info',
+            defaultEmployee: {
+                id: '',
+                account: '',
+                password: '',
+                isSuper: 'N',
+                name: '',
+                status: 'actived',
+                gender: 'male',
+                email: '',
+                photo: '',
+                mobile: '',
+                createTime: '',
+                attrItemList: [], // 扩展属性
+                groupID: '', // 组织ID
+                posItemList: [],
+                roleItemList: [],
+                userGroupItemList: [],
+                orgItem: {} // 组织全部信息
             },
-            ceroParams: {
-                type: Object,
-                default: () => {}
+            employee: {},
+            toolbars: [
+                {
+                    key: 'save',
+                    hidden: () => { return this.readonly && this.formType == 'detail' }
+                },
+                { key: 'cancel' }
+            ]
+        }
+    },
+    computed: {
+        formId () {
+            return this.id
+        }
+    },
+    watch: {
+        visible: {
+            handler (val, oldVal) {
+                this.dialogVisible = this.visible
             },
-            span: [Number, String]
+            immediate: true
         },
-        data() {
-            return {
-                info: [],
-                orgId: '',
-                dialogLoading: false,
-                dialogVisible: false,
-                activeName: 'basic-info',
-                defaultEmployee: {
-                    id: '',
-                    account: '',
-                    password: '',
-                    isSuper: 'N',
-                    name: '',
-                    status: 'actived',
-                    gender: 'male',
-                    email: '',
-                    photo: '',
-                    mobile: '',
-                    createTime: '',
-                    attrItemList: [], // 扩展属性
-                    groupID: '', // 组织ID
-                    posItemList: [],
-                    roleItemList: [],
-                    userGroupItemList: [],
-                    orgItem: {} // 组织全部信息
-                },
-                employee: {},
-                toolbars: [
-                    {
-                        key: 'save',
-                        hidden: () => { return this.readonly && this.formType == 'detail' }
-                    },
-                    { key: 'cancel' }
-                ]
-            }
+        ceroParams: {
+            handler (val, oldVal) {
+                if (val && val !== {}) {
+                    this.orgId = val.groundId
+                }
+            },
+            deep: true
+        }
+    },
+    methods: {
+        infoIncludes (params) {
+            const arr = this.ceroParams !== undefined ? this.ceroParams.unshow : []
+            return arr.includes(params)
         },
-        computed: {
-            formId() {
-                return this.id
+        handleActionEvent ({ key }) {
+            switch (key) {
+                case 'save':
+                    this.handleSave()
+                    break
+                case 'cancel':
+                    this.closeDialog()
+                    break
+                default:
+                    break
             }
         },
-        watch: {
-            visible: {
-                handler (val, oldVal) {
-                    this.dialogVisible = this.visible
-                },
-                immediate: true
-            },
-            ceroParams: {
-                handler (val, oldVal) {
-                    if (val && val !== {}) {
-                        this.orgId = val.groundId
+        handleSave () {
+            // 验证表单是否填写
+            this.$refs.basicInfo.validate((valid) => {
+                if (valid) {
+                    if (this.formId) {
+                        this.getUpEmployee()
+                    } else {
+                        this.saveData()
                     }
-                },
-                deep: true
+                } else {
+                    this.activeName = 'basic-info'
+                    ActionUtils.saveErrorMessage()
+                }
+            })
+        },
+        checkPhone (value) {
+            const reg = /^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\d{8}$/
+            if (!reg.test(value)) {
+                return false
             }
+            return true
         },
-        methods: {
-            infoIncludes(params) {
-                const arr = this.ceroParams !== undefined ? this.ceroParams.unshow : []
-                return arr.includes(params)
-            },
-            handleActionEvent({ key }) {
-                switch (key) {
-                    case 'save':
-                        this.handleSave()
-                        break
-                    case 'cancel':
-                        this.closeDialog()
-                        break
-                    default:
-                        break
-                }
-            },
-            handleSave() {
-                // 验证表单是否填写
-                this.$refs.basicInfo.validate((valid) => {
-                    if (valid) {
-                        if(this.formId){
-                            this.getUpEmployee()
-                        }else{
-                            this.saveData()
-                        }
+        getUpEmployee () {
+            const params = {
+                id: this.employee.id,
+                account: this.employee.account
+            }
+            upEmployee(params).then(res => {
+                if (res.state == 200) {
+                    const data = res.variables.data
+                    if (data == 'Y') {
+                        this.saveData()
                     } else {
-                        this.activeName = 'basic-info'
-                        ActionUtils.saveErrorMessage()
+                        ActionUtils.warning(res.message)
                     }
-                })
-            },
-            checkPhone(value) {
-                const reg = /^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\d{8}$/
-                if (!reg.test(value)) {
-                    return false
-                }
-                return true
-            },
-            getUpEmployee(){
-                let params = {
-                    id: this.employee.id,
-                    account: this.employee.account
                 }
-                upEmployee(params).then(res => {
-                    if(res.state == 200){
-                        const data = res.variables.data
-                        if(data == "Y"){
-                            this.saveData()
-                        }else{
-                            ActionUtils.warning(res.message)
+            })
+        },
+        saveData () {
+            const attrValidator = this.$refs['attrInfo'] ? this.$refs['attrInfo'].callback() : null
+            const vo = this.formatSubmitData()
+            if (!this.$utils.isEmpty(this.formId) && !this.ceroParams) {
+                delete vo.partyEmployeePo.password
+            }
+            this.dialogLoading = true
+            if (!attrValidator) {
+                ActionUtils.warning('请检查扩展属性是否填写正确')
+                this.dialogLoading = false
+                return
+            }
+            const { mobile = '' } = vo.user || {}
+            if (mobile && !this.checkPhone(mobile)) {
+                ActionUtils.warning('请输入正确的手机号')
+                this.dialogLoading = false
+                return
+            }
+            console.log(vo)
+            if (vo.roleVoList.length > 0) {
+                const list = []
+                vo.roleVoList.forEach(item => {
+                    list.push(item.id)
+                })
+                vo.user.job = list.join(',')
+            }
+            if (this.formId) {
+                update(vo).then(response => {
+                    this.dialogLoading = false
+                    this.$emit('dialog-callback', this)
+                    ActionUtils.saveSuccessMessage(response.message, r => {
+                        // if (this.$utils.isEmpty(this.formId)) {
+                        //     this.$refs[this.formName].resetFields()
+                        // }
+                        if (r) {
+                            this.closeDialog()
                         }
                     }
+                    )
+                }).catch(() => {
+                    this.dialogLoading = false
                 })
-            },
-            saveData() {
-                const attrValidator = this.$refs['attrInfo'] ? this.$refs['attrInfo'].callback() : null
-                const vo = this.formatSubmitData()
-                if (!this.$utils.isEmpty(this.formId) && !this.ceroParams) {
-                    delete vo.partyEmployeePo.password
-                }
-                this.dialogLoading = true
-                if (!attrValidator) {
-                    ActionUtils.warning('请检查扩展属性是否填写正确')
+            } else {
+                create(vo).then(response => {
                     this.dialogLoading = false
-                    return
-                }
-                const { mobile = '' } = vo.user || {}
-                if (mobile && !this.checkPhone(mobile)) {
-                    ActionUtils.warning('请输入正确的手机号')
+                    this.$emit('dialog-callback', this)
+                    ActionUtils.saveSuccessMessage(response.message, r => {
+                        if (r) {
+                            this.closeDialog()
+                        } else {
+                            this.init()
+                            this.$refs.attrInfo.clearData()
+                        }
+                    }
+                    )
+                }).catch(() => {
                     this.dialogLoading = false
-                    return
-                }
-                if (this.formId) {
-                    update(vo).then(response => {
-                        this.dialogLoading = false
-                        this.$emit('dialog-callback', this)
-                        ActionUtils.saveSuccessMessage(response.message, r => {
-                                // if (this.$utils.isEmpty(this.formId)) {
-                                //     this.$refs[this.formName].resetFields()
-                                // }
-                                if (r) {
-                                    this.closeDialog()
-                                }
-                            }
-                        )
-                    }).catch(() => {
-                        this.dialogLoading = false
-                    })
-                } else {
-                    create(vo).then(response => {
-                        this.dialogLoading = false
-                        this.$emit('dialog-callback', this)
-                        ActionUtils.saveSuccessMessage(response.message, r => {
-                                if (r) {
-                                    this.closeDialog()
-                                } else {
-                                    this.init()
-                                    this.$refs.attrInfo.clearData()
-                                }
-                            }
-                        )
-                    }).catch(() => {
-                        this.dialogLoading = false
-                    })
+                })
+            }
+        },
+        // 关闭当前窗口
+        closeDialog () {
+            this.$emit('close', false)
+        },
+        // 初始化页面，出现之前的数据
+        init () {
+            this.activeName = 'basic-info'
+            this.employee = this.$utils.newData(this.defaultEmployee)
+            this.$nextTick(() => {
+                // if (this.$refs.orgInfo) {
+                //     this.$refs.orgInfo.init()
+                // }
+                // this.$refs.positionInfo.init()
+                if (this.$refs.roleInfo) {
+                    this.$refs.roleInfo.init()
                 }
-            },
-            // 关闭当前窗口
-            closeDialog() {
-                this.$emit('close', false)
-            },
-            // 初始化页面，出现之前的数据
-            init() {
-                this.activeName = 'basic-info'
-                this.employee = this.$utils.newData(this.defaultEmployee)
+            })
+        },
+        getFormData () {
+            this.init()
+            this.$nextTick(() => {
+                this.$refs['basicInfo'].handleGetDefaultUserSecurity()
+            })
+            if (this.$utils.isEmpty(this.formId)) {
+                // 清空拓展属性数据
                 this.$nextTick(() => {
-                    // if (this.$refs.orgInfo) {
-                    //     this.$refs.orgInfo.init()
-                    // }
-                    // this.$refs.positionInfo.init()
-                    if (this.$refs.roleInfo) {
-                        this.$refs.roleInfo.init()
-                    }
+                    this.$refs.attrInfo.clearData()
                 })
-            },
-            getFormData() {
-                this.init()
+                return
+            }
+            this.dialogLoading = true
+            // 用户基本信息
+            load({ employeeId: this.formId }).then((response) => {
+                this.dialogLoading = false
+                this.employee = response.data
+                this.employee.orgItem = response.variables.partyOrg || {}
+                this.employee.attrItemList = response.variables.partyAttrs || []
+                this.employee.posItemList = response.variables.partyPositions || []
+                this.employee.roleItemList = response.variables.partyRoles || []
+                this.employee.userGroupItemList = response.variables.partyGroups || []
                 this.$nextTick(() => {
-                    this.$refs['basicInfo'].handleGetDefaultUserSecurity()
+                    this.$refs.attrInfo.loadAttrData()
                 })
-                if (this.$utils.isEmpty(this.formId)) {
-                    // 清空拓展属性数据
-                    this.$nextTick(() => {
-                        this.$refs.attrInfo.clearData()
-                    })
-                    return
-                }
-                this.dialogLoading = true
-                // 用户基本信息
-                load({ employeeId: this.formId }).then((response) => {
-                    this.dialogLoading = false
-                    this.employee = response.data
-                    this.employee.orgItem = response.variables.partyOrg || {}
-                    this.employee.attrItemList = response.variables.partyAttrs || []
-                    this.employee.posItemList = response.variables.partyPositions || []
-                    this.employee.roleItemList = response.variables.partyRoles || []
-                    this.employee.userGroupItemList = response.variables.partyGroups || []
-                    this.$nextTick(() => {
-                        this.$refs.attrInfo.loadAttrData()
-                    })
-                }).catch(() => {
-                    this.dialogLoading = false
+            }).catch(() => {
+                this.dialogLoading = false
+            })
+        },
+        formatSubmitData () {
+            const vo = {}
+            vo.partyEmployeePo = this.employee
+            vo.user = this.employee
+            vo.user.password = this.formId === '' || this.ceroParams ? this.employee.password : this.defaultEmployee.password
+            vo.partyEmployeePo.groupID = this.ceroParams !== {} && this.ceroParams ? this.ceroParams.groundId : this.formatOrgData()
+            vo.positionVoList = this.formatPositionData()
+            vo.roleVoList = this.formatRoleData()
+            vo.attrValueVoList = this.employee.attrItemList
+            vo.userGroupPoList = this.formatUserGroupData()
+            if (this.ceroParams !== {} && this.ceroParams) {
+                vo.partyEmployeePo.prem = this.ceroParams.prem
+            }
+            return vo
+        },
+        formatOrgData () {
+            return this.employee.orgItem.id || ''
+        },
+        formatPositionData () {
+            const result = []
+            const list = this.employee.posItemList
+            if (this.$utils.isEmpty(list)) return result
+            for (const variable of list) {
+                const tmp = { id: variable.id, name: variable.name }
+                tmp['isMainPost'] = variable.isMainPost === 'Y'
+                tmp['isPrincipal'] = variable.isPrincipal === 'Y'
+                result.push(tmp)
+            }
+            return result
+        },
+        formatRoleData () {
+            const result = []
+            const list = this.employee.roleItemList
+            if (this.$utils.isEmpty(list)) return result
+            for (const variable of list) {
+                const tmp = { id: variable.id, name: variable.name }
+                tmp['subSystemName'] = variable.subSystemName
+                tmp['source'] = this.employee.id ? variable.source : '自有'
+                tmp['canDelete'] = variable.source === '自有'
+                result.push(tmp)
+            }
+            return result
+        },
+        formatUserGroupData () {
+            const result = []
+            const list = this.employee.userGroupItemList
+            if (this.$utils.isEmpty(list)) return result
+            for (const variable of list) {
+                result.push({
+                    groupId: variable.id,
+                    groupName: variable.name
                 })
-            },
-            formatSubmitData() {
-                const vo = {}
-                vo.partyEmployeePo = this.employee
-                vo.user = this.employee
-                vo.user.password = this.formId === '' || this.ceroParams ? this.employee.password : this.defaultEmployee.password
-                vo.partyEmployeePo.groupID = this.ceroParams !== {} && this.ceroParams ? this.ceroParams.groundId : this.formatOrgData()
-                vo.positionVoList = this.formatPositionData()
-                vo.roleVoList = this.formatRoleData()
-                vo.attrValueVoList = this.employee.attrItemList
-                vo.userGroupPoList = this.formatUserGroupData()
-                if (this.ceroParams !== {} && this.ceroParams) {
-                    vo.partyEmployeePo.prem = this.ceroParams.prem
-                }
-                return vo
-            },
-            formatOrgData() {
-                return this.employee.orgItem.id || ''
-            },
-            formatPositionData() {
-                const result = []
-                const list = this.employee.posItemList
-                if (this.$utils.isEmpty(list)) return result
-                for (const variable of list) {
-                    const tmp = { id: variable.id, name: variable.name }
-                    tmp['isMainPost'] = variable.isMainPost === 'Y'
-                    tmp['isPrincipal'] = variable.isPrincipal === 'Y'
-                    result.push(tmp)
-                }
-                return result
-            },
-            formatRoleData() {
-                const result = []
-                const list = this.employee.roleItemList
-                if (this.$utils.isEmpty(list)) return result
-                for (const variable of list) {
-                    const tmp = { id: variable.id, name: variable.name }
-                    tmp['subSystemName'] = variable.subSystemName
-                    tmp['source'] = this.employee.id ? variable.source : '自有'
-                    tmp['canDelete'] = variable.source === '自有'
-                    result.push(tmp)
-                }
-                return result
-            },
-            formatUserGroupData() {
-                const result = []
-                const list = this.employee.userGroupItemList
-                if (this.$utils.isEmpty(list)) return result
-                for (const variable of list) {
-                    result.push({
-                        groupId: variable.id,
-                        groupName: variable.name
-                    })
-                }
-                return result
             }
+            return result
         }
     }
+}
 </script>
 <style lang="scss">
     .employee-dialog {

src/views/scientificPayoffs/index.vue

@@ -22,15 +22,15 @@
                 </div>
             </div>
             <dv-border-box-1 class="contentBorder">
-                <scientificBoxVue class="contentBorderBox" v-if="indexData == 1 && kyxmListShow && kyxmDataShow" :listShow="kyxmListShow" :dataShow="kyxmDataShow" :dataItem="kyxmData"></scientificBoxVue>
+                <scientificBoxVue v-if="indexData == 1 && kyxmListShow && kyxmDataShow" class="contentBorderBox" :list-show="kyxmListShow" :data-show="kyxmDataShow" :data-item="kyxmData" />
 
-                <scientificBoxVue class="contentBorderBox" :bottomBorder="false" v-if="indexData == 1 && SCIwztjbDataShow && SCIwztjbListShow" :listShow="SCIwztjbListShow" :dataShow="SCIwztjbDataShow" :dataItem="SCIwztjbData"></scientificBoxVue>
-                <scientificBoxVue class="contentBorderBox" v-if="indexData == 2 && zwlwListShow && zwlwDataShow" :listShow="zwlwListShow" :dataShow="zwlwDataShow" :dataItem="zwlwData"></scientificBoxVue>
-                <scientificBoxVue class="contentBorderBox" :bottomBorder="false" v-if="indexData == 2 && zhuZuoListShow && zhuZuoDataShow" :listShow="zhuZuoListShow" :dataShow="zhuZuoDataShow" :dataItem="zhuZuoData"></scientificBoxVue>
-                <scientificBoxVue class="contentBorderBox"  v-if="indexData == 3 && zhuanLiListShow && zhuanLiDataShow" :listShow="zhuanLiListShow" :dataShow="zhuanLiDataShow" :dataItem="zhuanLiData"></scientificBoxVue>
-                <scientificBoxVue class="contentBorderBox" :bottomBorder="false" v-if="indexData == 3 && jxjyxmxshdListShow && jxjyxmxshdDataShow" :listShow="jxjyxmxshdListShow" :dataShow="jxjyxmxshdDataShow" :dataItem="jxjyxmxshdData"></scientificBoxVue>
+                <scientificBoxVue v-if="indexData == 1 && SCIwztjbDataShow && SCIwztjbListShow" class="contentBorderBox" :bottom-border="false" :list-show="SCIwztjbListShow" :data-show="SCIwztjbDataShow" :data-item="SCIwztjbData" />
+                <scientificBoxVue v-if="indexData == 2 && zwlwListShow && zwlwDataShow" class="contentBorderBox" :list-show="zwlwListShow" :data-show="zwlwDataShow" :data-item="zwlwData" />
+                <scientificBoxVue v-if="indexData == 2 && zhuZuoListShow && zhuZuoDataShow" class="contentBorderBox" :bottom-border="false" :list-show="zhuZuoListShow" :data-show="zhuZuoDataShow" :data-item="zhuZuoData" />
+                <scientificBoxVue v-if="indexData == 3 && zhuanLiListShow && zhuanLiDataShow" class="contentBorderBox" :list-show="zhuanLiListShow" :data-show="zhuanLiDataShow" :data-item="zhuanLiData" />
+                <scientificBoxVue v-if="indexData == 3 && jxjyxmxshdListShow && jxjyxmxshdDataShow" class="contentBorderBox" :bottom-border="false" :list-show="jxjyxmxshdListShow" :data-show="jxjyxmxshdDataShow" :data-item="jxjyxmxshdData" />
 
-                <scientificBoxVue class="contentBorderBox" :bottomBorder="false" v-if="indexData == 4 && kjhjcgDataShow && kjhjcgListShow" :listShow="kjhjcgListShow" :dataShow="kjhjcgDataShow" :dataItem="kjhjcgData"></scientificBoxVue>
+                <scientificBoxVue v-if="indexData == 4 && kjhjcgDataShow && kjhjcgListShow" class="contentBorderBox" :bottom-border="false" :list-show="kjhjcgListShow" :data-show="kjhjcgDataShow" :data-item="kjhjcgData" />
             </dv-border-box-1>
         </dv-full-screen-container>
     </div>
@@ -44,14 +44,14 @@ import indexFile from './js/index.js'
 export default {
     name: 'index',
     components: { scientificBoxVue },
-    data() {
+    data () {
         return {
             titleName: '科研成果看板',
             month: '',
             timer: '',
             timer2: '',
             indexData: 1,
-            //科研项目
+            // 科研项目
             kyxmListShow: false,
             kyxmDataShow: false,
             kyxmData: {
@@ -63,7 +63,7 @@ export default {
                 }
             },
 
-            //科技获奖成果
+            // 科技获奖成果
             kjhjcgListShow: false,
             kjhjcgDataShow: false,
             kjhjcgData: {
@@ -75,7 +75,7 @@ export default {
                 }
             },
 
-            //SCI文章统计表
+            // SCI文章统计表
             SCIwztjbListShow: false,
             SCIwztjbDataShow: false,
             SCIwztjbData: {
@@ -83,12 +83,11 @@ export default {
                 dataCount: {},
                 config: {
                     header: '',
-                    data: [],
-
+                    data: []
                 }
             },
 
-            //中文论文
+            // 中文论文
             zwlwListShow: false,
             zwlwDataShow: false,
             zwlwData: {
@@ -100,7 +99,7 @@ export default {
                 }
             },
 
-            //著作
+            // 著作
             zhuZuoListShow: false,
             zhuZuoDataShow: false,
             zhuZuoData: {
@@ -112,7 +111,7 @@ export default {
                 }
             },
 
-            //专利
+            // 专利
             zhuanLiListShow: false,
             zhuanLiDataShow: false,
             zhuanLiData: {
@@ -124,7 +123,7 @@ export default {
                 }
             },
 
-            //继续教育项目/学术活动
+            // 继续教育项目/学术活动
             jxjyxmxshdListShow: false,
             jxjyxmxshdDataShow: false,
             jxjyxmxshdData: {
@@ -134,10 +133,10 @@ export default {
                     header: '',
                     data: []
                 }
-            },
+            }
         }
     },
-    created() {
+    created () {
         if (screenfull.isEnabled && !screenfull.isFullscreen) {
             this.allView()
         }
@@ -147,39 +146,37 @@ export default {
             this.getInit()
         }, 600000)
         this.getCreate()
-
     },
-    beforeDestroy() {
+    beforeDestroy () {
         if (screenfull.isFullscreen) {
             screenfull.toggle()
         }
         clearInterval(this.timer)
         clearInterval(this.timer2)
-
     },
     methods: {
-        //初始化数据
-        getInit() {
-            let nowDate = new Date(new Date().getTime() + 8 * 60 * 60 * 1000)
-            let month = nowDate.toJSON().split('T').join(' ').substr(0, 4)
+        // 初始化数据
+        getInit () {
+            const nowDate = new Date(new Date().getTime() + 8 * 60 * 60 * 1000)
+            const month = nowDate.toJSON().split('T').join(' ').substr(0, 4)
             this.month = month
             this.updateAll(month)
         },
-        getCreate(){
+        getCreate () {
             this.timer2 = setInterval(() => {
                 this.next()
-            }, 30000)  //180000
+            }, 30000) // 180000
         },
-        allView() {
+        allView () {
             // 默认显示全屏
             screenfull.request()
         },
-        //返回
-        goBack() {
+        // 返回
+        goBack () {
             this.$router.back(-1)
         },
-        //上一页
-        previou() {
+        // 上一页
+        previou () {
             if (this.indexData == 1) {
                 this.indexData = 4
             } else {
@@ -187,8 +184,8 @@ export default {
             }
             this.updateAll(this.month)
         },
-        //下一页
-        next() {
+        // 下一页
+        next () {
             if (this.indexData == 4) {
                 this.indexData = 1
             } else {
@@ -196,175 +193,172 @@ export default {
             }
             this.updateAll(this.month)
         },
-        //时间
-        updateAll(e) {
-            if(this.indexData == 1){
+        // 时间
+        updateAll (e) {
+            if (this.indexData == 1) {
                 this.getKyxmDataAndList(e)
                 this.getSCIwztjbDataAndList(e)
             }
-            if(this.indexData == 2){
+            if (this.indexData == 2) {
                 this.getZwlwDataAndList(e)
                 this.getZhuZuoDataAndList(e)
             }
-            if(this.indexData == 3){
+            if (this.indexData == 3) {
                 this.getZhuanLiDataAndList(e)
                 this.getJxjyxmxshdDataAndList(e)
             }
-            if(this.indexData == 4){
+            if (this.indexData == 4) {
                 this.getKjhjcgDataAndList(e)
-
             }
         },
 
-        //接口
-        //科研项目
-        getKyxmDataAndList(month) {
+        // 接口
+        // 科研项目
+        getKyxmDataAndList (month) {
             // let sql1 = `select tk.*,ie.NAME_,tk2.xiang_mu_bian_hao as xiangMuBianHao from t_kyxm tk  left join t_kyxm tk2 on tk.xiang_mu_bian_hao = tk2.id_ left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
-            let sql1 = `select * from t_kyxm where lei_xing_ = '统计' and create_time_ like '%${month}%' order by create_time_ desc`
-            let sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_kyxm tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
-            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1,res2]) => {
+            const sql1 = `select * from t_kyxm where lei_xing_ = '统计' and create_time_ like '%${month}%' order by create_time_ desc`
+            const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_kyxm tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
+            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
                 if (res1.state == 200) {
-                    let datas = res1.variables.data
-                    let config = indexFile.getKyxmList(datas)
+                    const datas = res1.variables.data
+                    const config = indexFile.getKyxmList(datas)
                     this.kyxmData.config = JSON.parse(JSON.stringify(config))
                     this.kyxmListShow = true
                 }
                 if (res2.state == 200) {
-                    let datas = res2.variables.data
-                    let config = indexFile.getKyxmData(datas)
+                    const datas = res2.variables.data
+                    const config = indexFile.getKyxmData(datas)
                     this.kyxmData.dataCount = JSON.parse(JSON.stringify(config))
                     this.kyxmDataShow = true
                 }
             })
         },
 
-        //科技获奖成果
-        getKjhjcgDataAndList(month) {
-            //let sql1 = `select tk.*,ie.NAME_,tk2.jiang_li_xiang_mu as jiangLiXiangMu  from t_kjhjcg tk left join t_kjhjcg tk2 on  tk.dan_wei_ = tk2.id_ left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
-            let sql1 = `select * from t_kjhjcg where lei_xing_ = '统计' and create_time_ like '%${month}%' order by create_time_ desc`
-            let sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_kjhjcg tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
-            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1,res2]) => {
+        // 科技获奖成果
+        getKjhjcgDataAndList (month) {
+            // let sql1 = `select tk.*,ie.NAME_,tk2.jiang_li_xiang_mu as jiangLiXiangMu  from t_kjhjcg tk left join t_kjhjcg tk2 on  tk.dan_wei_ = tk2.id_ left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
+            const sql1 = `select * from t_kjhjcg where lei_xing_ = '统计' and create_time_ like '%${month}%' order by create_time_ desc`
+            const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_kjhjcg tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
+            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
                 if (res1.state == 200) {
-                    let datas = res1.variables.data
-                    let config = indexFile.getkjhjcgList(datas)
+                    const datas = res1.variables.data
+                    const config = indexFile.getkjhjcgList(datas)
                     this.kjhjcgData.config = config
                     this.kjhjcgListShow = true
                 }
                 if (res2.state == 200) {
-                    let datas = res2.variables.data
-                    let config = indexFile.getKyxmData(datas)
+                    const datas = res2.variables.data
+                    const config = indexFile.getKyxmData(datas)
                     this.kjhjcgData.dataCount = JSON.parse(JSON.stringify(config))
                     this.kjhjcgDataShow = true
                 }
             })
         },
 
-
-        //SCI文章统计表
-        getSCIwztjbDataAndList(month) {
+        // SCI文章统计表
+        getSCIwztjbDataAndList (month) {
             // let sql1 = `select tk.*,ie.NAME_,tk2.lun_wen_ti_mu_ as lunWenTiMu from t_SCIwztjb tk  left join t_SCIwztjb tk2 on  tk.lun_wen_ti_mu_ = tk2.id_ left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
-            let sql1 = `select * from t_SCIwztjb where lei_xing_ = '统计' and create_time_ like '%${month}%' order by create_time_ desc`
-            let sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_SCIwztjb tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
-            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1,res2]) => {
+            const sql1 = `select * from t_SCIwztjb where lei_xing_ = '统计' and create_time_ like '%${month}%' order by create_time_ desc`
+            const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_SCIwztjb tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
+            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
                 if (res1.state == 200) {
-                    let datas = res1.variables.data
-                    let config = indexFile.getSCIwztjbList(datas)
+                    const datas = res1.variables.data
+                    const config = indexFile.getSCIwztjbList(datas)
                     this.SCIwztjbData.config = config
                     this.SCIwztjbListShow = true
                 }
                 if (res2.state == 200) {
-                    let datas = res2.variables.data
-                    let config = indexFile.getKyxmData(datas)
+                    const datas = res2.variables.data
+                    const config = indexFile.getKyxmData(datas)
                     this.SCIwztjbData.dataCount = JSON.parse(JSON.stringify(config))
                     this.SCIwztjbDataShow = true
                 }
             })
         },
 
-        //中文论文
-        getZwlwDataAndList(month) {
-            //let sql1 = `select tk.*,ie.NAME_,tk2.lun_wen_ti_mu_ as lunWenTiMu from t_zwlw tk left join t_zwlw tk2 on  tk.lun_wen_ti_mu_ = tk2.id_ left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
-            let sql1 = `select * from t_zwlw where lei_xing_ = '统计' and create_time_ like '%${month}%' order by create_time_ desc`
-            let sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_zwlw tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
-            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1,res2]) => {
+        // 中文论文
+        getZwlwDataAndList (month) {
+            // let sql1 = `select tk.*,ie.NAME_,tk2.lun_wen_ti_mu_ as lunWenTiMu from t_zwlw tk left join t_zwlw tk2 on  tk.lun_wen_ti_mu_ = tk2.id_ left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
+            const sql1 = `select * from t_zwlw where lei_xing_ = '统计' and create_time_ like '%${month}%' order by create_time_ desc`
+            const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_zwlw tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
+            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
                 if (res1.state == 200) {
-                    let datas = res1.variables.data
-                    let config = indexFile.getZwlwList(datas)
+                    const datas = res1.variables.data
+                    const config = indexFile.getZwlwList(datas)
                     this.zwlwData.config = config
                     this.zwlwListShow = true
                 }
                 if (res2.state == 200) {
-                    let datas = res2.variables.data
-                    let config = indexFile.getKyxmData(datas)
+                    const datas = res2.variables.data
+                    const config = indexFile.getKyxmData(datas)
                     this.zwlwData.dataCount = JSON.parse(JSON.stringify(config))
                     this.zwlwDataShow = true
                 }
             })
         },
 
-
-        //著作
-        getZhuZuoDataAndList(month) {
-            //let sql1 = `select tk.*,ie.NAME_,tk2.zhuan_zhuo_ming_c as zhuanZhuoMingCheng from t_zz tk left join t_zz tk2 on  tk.zhuan_zhuo_ming_c = tk2.id_ left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
-            let sql1 = `select * from t_zz where lei_xing_ = '统计' and create_time_ like '%${month}%' order by create_time_ desc`
-            let sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_zz tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
-            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1,res2]) => {
+        // 著作
+        getZhuZuoDataAndList (month) {
+            // let sql1 = `select tk.*,ie.NAME_,tk2.zhuan_zhuo_ming_c as zhuanZhuoMingCheng from t_zz tk left join t_zz tk2 on  tk.zhuan_zhuo_ming_c = tk2.id_ left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
+            const sql1 = `select * from t_zz where lei_xing_ = '统计' and create_time_ like '%${month}%' order by create_time_ desc`
+            const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_zz tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
+            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
                 if (res1.state == 200) {
-                    let datas = res1.variables.data
-                    let config = indexFile.getZhuZuoList(datas)
+                    const datas = res1.variables.data
+                    const config = indexFile.getZhuZuoList(datas)
                     this.zhuZuoData.config = config
                     this.zhuZuoListShow = true
                 }
                 if (res2.state == 200) {
-                    let datas = res2.variables.data
-                    let config = indexFile.getKyxmData(datas)
+                    const datas = res2.variables.data
+                    const config = indexFile.getKyxmData(datas)
                     this.zhuZuoData.dataCount = JSON.parse(JSON.stringify(config))
                     this.zhuZuoDataShow = true
                 }
             })
         },
 
-        //专利
-        getZhuanLiDataAndList(month) {
-            //let sql1 = `select tk.*,ie.NAME_,tk2.zhuan_li_ming_che as zhuanLiMingCheng from t_zl tk left join t_zl tk2 on  tk.zhuan_li_ming_che = tk2.id_ left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
-            let sql1 = `select * from t_zl where lei_xing_ = '统计' and create_time_ like '%${month}%' order by create_time_ desc`
-            let sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_zl tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
-            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1,res2]) => {
+        // 专利
+        getZhuanLiDataAndList (month) {
+            // let sql1 = `select tk.*,ie.NAME_,tk2.zhuan_li_ming_che as zhuanLiMingCheng from t_zl tk left join t_zl tk2 on  tk.zhuan_li_ming_che = tk2.id_ left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
+            const sql1 = `select * from t_zl where lei_xing_ = '统计' and create_time_ like '%${month}%' order by create_time_ desc`
+            const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_zl tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
+            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
                 if (res1.state == 200) {
-                    let datas = res1.variables.data
-                    let config = indexFile.getZhuanLiList(datas)
+                    const datas = res1.variables.data
+                    const config = indexFile.getZhuanLiList(datas)
                     this.zhuanLiData.config = config
                     this.zhuanLiListShow = true
                 }
                 if (res2.state == 200) {
-                    let datas = res2.variables.data
-                    let config = indexFile.getKyxmData(datas)
+                    const datas = res2.variables.data
+                    const config = indexFile.getKyxmData(datas)
                     this.zhuanLiData.dataCount = JSON.parse(JSON.stringify(config))
                     this.zhuanLiDataShow = true
                 }
             })
         },
 
-        //继续教育项目/学术活动
-        getJxjyxmxshdDataAndList(month) {
-            //let sql1 = `select tk.*,ie.NAME_,tk2.xiang_mu_bian_hao as xiangmMuBianHao from t_jxjyxmxshd tk left join t_jxjyxmxshd tk2 on  tk.xiang_mu_bian_hao = tk2.id_  left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
-            let sql1 = `select * from t_jxjyxmxshd where lei_xing_ = '统计' and create_time_ like '%${month}%' order by create_time_ desc`
-            let sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_jxjyxmxshd tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
-            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1,res2]) => {
+        // 继续教育项目/学术活动
+        getJxjyxmxshdDataAndList (month) {
+            // let sql1 = `select tk.*,ie.NAME_,tk2.xiang_mu_bian_hao as xiangmMuBianHao from t_jxjyxmxshd tk left join t_jxjyxmxshd tk2 on  tk.xiang_mu_bian_hao = tk2.id_  left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
+            const sql1 = `select * from t_jxjyxmxshd where lei_xing_ = '统计' and create_time_ like '%${month}%' order by create_time_ desc`
+            const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_jxjyxmxshd tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
+            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
                 if (res1.state == 200) {
-                    let datas = res1.variables.data
-                    let config = indexFile.getJxjyxmxshdList(datas)
+                    const datas = res1.variables.data
+                    const config = indexFile.getJxjyxmxshdList(datas)
                     this.jxjyxmxshdData.config = config
                     this.jxjyxmxshdListShow = true
                 }
                 if (res2.state == 200) {
-                    let datas = res2.variables.data
-                    let config = indexFile.getKyxmData(datas)
+                    const datas = res2.variables.data
+                    const config = indexFile.getKyxmData(datas)
                     this.jxjyxmxshdData.dataCount = JSON.parse(JSON.stringify(config))
                     this.jxjyxmxshdDataShow = true
                 }
             })
-        },
+        }
     }
 }
 </script>

src/views/scientificPayoffs/js/index.js

@@ -1,23 +1,23 @@
-import echarts from "echarts"
+import echarts from 'echarts'
 export default {
-    //轮播表数据封装
-    getDataList(data) {
-        let config = {
+    // 轮播表数据封装
+    getDataList (data) {
+        const config = {
             header: data.header,
             data: data.data,
             rowNum: 6,
-            headerHeight: 45,
+            headerHeight: 45
             // columnWidth: [100]
         }
         return config
     },
 
-    //科研项目
-    getKyxmList(datas) {
-        let header = ['全部参与人', '项目编号', '资助单位', '项目类型', '项目名称', '开始时间', '结束时间', '立项经费（万元）']
-        let data = []
+    // 科研项目
+    getKyxmList (datas) {
+        const header = ['全部参与人', '项目编号', '资助单位', '项目类型', '项目名称', '开始时间', '结束时间', '立项经费（万元）']
+        const data = []
         datas.forEach((item, index) => {
-            let list = []
+            const list = []
             list.push(item.quan_bu_can_yu_re || '')
             list.push(item.xiang_mu_bian_hao || '')
             list.push(item.zi_zhi_dan_wei_ || '')
@@ -27,38 +27,40 @@ export default {
             list.push(item.jie_shu_shi_jian_ || '')
             list.push(item.li_xiang_jing_fei || '')
             data.push(list)
-        });
-        let dataList = {
+        })
+        const dataList = {
             header: header,
             data: data
         }
-        let config = this.getDataList(dataList)
+        const config = this.getDataList(dataList)
         return config
     },
-    //科研获奖成果
-    getkjhjcgList(datas) {
-        let header = ['全部获奖者', '单位', '奖励类型']
-        let data = []
+    // 科研获奖成果
+    getkjhjcgList (datas) {
+        const header = ['全部获奖者', '奖励项目名称', '单位排名', '奖励类型', '获奖时间']
+        const data = []
         datas.forEach((item, index) => {
-            let list = []
+            const list = []
             list.push(item.quan_bu_huo_jiang || '')
-            list.push(item.dan_wei_ || '')
+            list.push(item.jiang_li_xiang_mu || '')
+            list.push(item.dan_wei_pai_ming_ || '')
             list.push(item.jiang_li_lei_xing || '')
+            list.push(item.huo_jiang_shi_jia || '')
             data.push(list)
-        });
-        let dataList = {
+        })
+        const dataList = {
             header: header,
             data: data
         }
-        let config = this.getDataList(dataList)
+        const config = this.getDataList(dataList)
         return config
     },
-    //SCI文章统计表
-    getSCIwztjbList(datas) {
-        let header = ['全部作者', '论文题目', '期刊名称', 'JCR分区', '发表时间', '影响因子IF', '作者排名', 'WOS号']
-        let data = []
+    // SCI文章统计表
+    getSCIwztjbList (datas) {
+        const header = ['全部作者', '论文题目', '期刊名称', 'JCR分区', '发表时间', '影响因子IF', '作者排名', 'WOS号']
+        const data = []
         datas.forEach((item, index) => {
-            let list = []
+            const list = []
             // list.push(item.NAME_ || '')
             list.push(item.quan_bu_zuo_zhe_ || '')
             list.push(item.lun_wen_ti_mu_ || '')
@@ -69,20 +71,20 @@ export default {
             list.push(item.zuo_zhe_pai_ming_ || '')
             list.push(item.wos_hao_ || '')
             data.push(list)
-        });
-        let dataList = {
+        })
+        const dataList = {
             header: header,
             data: data
         }
-        let config = this.getDataList(dataList)
+        const config = this.getDataList(dataList)
         return config
     },
-    //中文论文
-    getZwlwList(datas) {
-        let header = ['全部作者', '论文题目', '期刊名称', '期卷号', '发表时间', '期刊类别', '作者排名', 'ISSN号']
-        let data = []
+    // 中文论文
+    getZwlwList (datas) {
+        const header = ['全部作者', '论文题目', '期刊名称', '期卷号', '发表时间', '期刊类别', '作者排名', 'ISSN号']
+        const data = []
         datas.forEach((item, index) => {
-            let list = []
+            const list = []
             list.push(item.quan_bu_zuo_zhe_ || '')
             list.push(item.lun_wen_ti_mu_ || '')
             list.push(item.qi_kan_ming_cheng || '')
@@ -92,40 +94,40 @@ export default {
             list.push(item.zuo_zhe_pai_ming_ || '')
             list.push(item.issn_hao_ || '')
             data.push(list)
-        });
-        let dataList = {
+        })
+        const dataList = {
             header: header,
             data: data
         }
-        let config = this.getDataList(dataList)
+        const config = this.getDataList(dataList)
         return config
     },
-    //著作
-    getZhuZuoList(datas) {
-        let header = ['全部作者', '专著名称', '出版社', '出版时间', '编撰字数']
-        let data = []
+    // 著作
+    getZhuZuoList (datas) {
+        const header = ['全部作者', '专著名称', '出版社', '出版时间', '编撰字数']
+        const data = []
         datas.forEach((item, index) => {
-            let list = []
+            const list = []
             list.push(item.quan_bu_zuo_zhe_ || '')
             list.push(item.zhuan_zhuo_ming_c || '')
             list.push(item.chu_ban_she_ || '')
             list.push(item.chu_ban_shi_jian_ || '')
             list.push(item.bian_zhuan_zi_shu || '')
             data.push(list)
-        });
-        let dataList = {
+        })
+        const dataList = {
             header: header,
             data: data
         }
-        let config = this.getDataList(dataList)
+        const config = this.getDataList(dataList)
         return config
     },
-    //专利
-    getZhuanLiList(datas) {
-        let header = ['全部申请人', '专利名称', '专利权人', '类别', '申请时间', '授权时间', '作者排名']
-        let data = []
+    // 专利
+    getZhuanLiList (datas) {
+        const header = ['全部申请人', '专利名称', '专利权人', '类别', '申请时间', '授权时间', '作者排名']
+        const data = []
         datas.forEach((item, index) => {
-            let list = []
+            const list = []
             list.push(item.quan_bu_shen_qing || '')
             list.push(item.zhuan_li_ming_che || '')
             list.push(item.zhuan_li_quan_ren || '')
@@ -134,20 +136,20 @@ export default {
             list.push(item.shou_quan_shi_jia || '')
             list.push(item.zuo_zhe_pai_ming_ || '')
             data.push(list)
-        });
-        let dataList = {
+        })
+        const dataList = {
             header: header,
             data: data
         }
-        let config = this.getDataList(dataList)
+        const config = this.getDataList(dataList)
         return config
     },
-    //继续教育项目/学术活动
-    getJxjyxmxshdList(datas) {
-        let header = ['全部负责人', '项目编号', '会议名称', '项目级别', '学分', '举办时间', '举办地点', '合作单位']
-        let data = []
+    // 继续教育项目/学术活动
+    getJxjyxmxshdList (datas) {
+        const header = ['全部负责人', '项目编号', '会议名称', '项目级别', '学分', '举办时间', '举办地点', '合作单位']
+        const data = []
         datas.forEach((item, index) => {
-            let list = []
+            const list = []
             list.push(item.quan_bu_zuo_zhe_ || '')
             list.push(item.xiang_mu_bian_hao || '')
             list.push(item.hui_yi_ming_cheng || '')
@@ -157,39 +159,39 @@ export default {
             list.push(item.ju_ban_di_dian_ || '')
             list.push(item.he_zuo_dan_wei_ || '')
             data.push(list)
-        });
-        let dataList = {
+        })
+        const dataList = {
             header: header,
             data: data
         }
-        let config = this.getDataList(dataList)
+        const config = this.getDataList(dataList)
         return config
     },
-    //图标数据封装
-    getKyxmData(datas) {
-        let list = []
-        let listData = []
+    // 图标数据封装
+    getKyxmData (datas) {
+        const list = []
+        const listData = []
         datas.forEach(item => {
             item.NAME_ = this.linHeg(item.NAME_)
             list.push(item.NAME_)
-            let o = {
+            const o = {
                 name: item.NAME_,
                 value: item.count
             }
             listData.push(o)
         })
-        let config = {
+        const config = {
             xAxis: list,
             series: listData
         }
         return config
     },
-    linHeg(value) {
-        //rowMAx 控制一行多少字
-        let rowMAx = 1
+    linHeg (value) {
+        // rowMAx 控制一行多少字
+        const rowMAx = 1
         let overValue = ''
         for (let i = 0; i < value.length; i++) {
-            if ((i % rowMAx == 0) && (i != 0)) {
+            if ((i % rowMAx === 0) && (i !== 0)) {
                 overValue += '\n'
                 overValue += value[i]
             } else {
@@ -200,7 +202,6 @@ export default {
     }
 }
 
-
 export const barData = {
     title: {
         show: false,
@@ -253,17 +254,17 @@ export const barData = {
         barMaxWidth: '35px',
         itemStyle: {
             color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                { offset: 0, color: "#83bff6" },
-                { offset: 0.5, color: "#188df0" },
-                { offset: 1, color: "#188df0" },
+                { offset: 0, color: '#83bff6' },
+                { offset: 0.5, color: '#188df0' },
+                { offset: 1, color: '#188df0' }
             ])
         },
         emphasis: {
             itemStyle: {
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                    { offset: 0, color: "#2378f7" },
-                    { offset: 0.7, color: "#2378f7" },
-                    { offset: 1, color: "#83bff6" },
+                    { offset: 0, color: '#2378f7' },
+                    { offset: 0.7, color: '#2378f7' },
+                    { offset: 1, color: '#83bff6' }
                 ])
             }
         }