diff --git a/src/common/axios/index.js b/src/common/axios/index.js index e7ad9e22d..9034bc7c2 100644 --- a/src/common/axios/index.js +++ b/src/common/axios/index.js @@ -211,7 +211,6 @@ export default { thenFun.call(this, res.data) } } else { - console.log(res.data) // 返回data数组 thenFun.call(this, res.data) } diff --git a/src/common/btnPermission/index.js b/src/common/btnPermission/index.js index 00ca11601..ff9ad7ad3 100644 --- a/src/common/btnPermission/index.js +++ b/src/common/btnPermission/index.js @@ -23,9 +23,7 @@ const tableBtnPermission = Vue.directive('tableBtnPermission', { bind (el, binding, vnode) { // 获取按钮权限 let btnPermission = binding.value - console.log(el, binding, vnode) function handler(event) { - console.log(event) event.stopImmediatePropagation() return false } diff --git a/src/components/CustomFormComponents/Example.vue b/src/components/CustomFormComponents/Example.vue index 2570aa838..e1ce944a9 100644 --- a/src/components/CustomFormComponents/Example.vue +++ b/src/components/CustomFormComponents/Example.vue @@ -117,7 +117,6 @@ export default { }, mounted () { this.resolveFormFieldListRules() - console.log(this.$dateFormat(1602518400000, 'yyyy-MM-dd hh:mm:ss')) }, methods: { /** @@ -155,7 +154,6 @@ export default { }, jiaoyan () { this.$refs['sarStandardsInfoForm'].validate((valid) => { - console.log(valid) }) } } diff --git a/src/components/CustomFormComponents/Input.vue b/src/components/CustomFormComponents/Input.vue index 9a4b12bab..38f2728e5 100644 --- a/src/components/CustomFormComponents/Input.vue +++ b/src/components/CustomFormComponents/Input.vue @@ -57,7 +57,6 @@ export default { handleChange (event) { // const value = event.target.value const value = event - console.log(value) this.$emit('input', value) } } diff --git a/src/components/CustomFormComponents/InputForAllStandards.vue b/src/components/CustomFormComponents/InputForAllStandards.vue index dbaac0224..9921e957f 100644 --- a/src/components/CustomFormComponents/InputForAllStandards.vue +++ b/src/components/CustomFormComponents/InputForAllStandards.vue @@ -204,7 +204,6 @@ export default { handleChange (event) { // const value = event.target.value const value = event - console.log(value) this.$emit('input', value) }, selectLaws () { @@ -303,7 +302,6 @@ export default { }, // 点击查看 handlePreview (item) { - console.log('看看看看看看看看item', item) let routeUrl = this.$router.resolve({ name: 'OtherBussStandardDetails', params: { diff --git a/src/components/CustomFormComponents/InputForPolicy.vue b/src/components/CustomFormComponents/InputForPolicy.vue index dfe48690c..47a274330 100644 --- a/src/components/CustomFormComponents/InputForPolicy.vue +++ b/src/components/CustomFormComponents/InputForPolicy.vue @@ -207,7 +207,6 @@ export default { handleChange (event) { // const value = event.target.value const value = event - console.log(value) this.$emit('input', value) if (value.length==1000){ return this.$message({ diff --git a/src/components/CustomFormComponents/InputForStandAndForeign.vue b/src/components/CustomFormComponents/InputForStandAndForeign.vue index 7df2bcefa..25cd1b5f2 100644 --- a/src/components/CustomFormComponents/InputForStandAndForeign.vue +++ b/src/components/CustomFormComponents/InputForStandAndForeign.vue @@ -211,7 +211,6 @@ export default { }, methods: { dataSourceChange (val) { - console.log(val) }, handleChange (event) { // const value = event.target.value diff --git a/src/components/CustomFormComponents/SearchSelect.vue b/src/components/CustomFormComponents/SearchSelect.vue index d2ea00ff2..fce2c16a1 100644 --- a/src/components/CustomFormComponents/SearchSelect.vue +++ b/src/components/CustomFormComponents/SearchSelect.vue @@ -93,7 +93,6 @@ export default { // 匹配项来源 if (this.searchKey === '') { this.filterOptions = this.options - console.log(this.options) } else { let result = [] // 用原始数据进行匹配 diff --git a/src/components/CustomFormComponents/TreePopover.vue b/src/components/CustomFormComponents/TreePopover.vue index cf3f0dba1..d61cb933d 100644 --- a/src/components/CustomFormComponents/TreePopover.vue +++ b/src/components/CustomFormComponents/TreePopover.vue @@ -89,7 +89,6 @@ export default { this.treeCheckNode = treeCheckNode }, handleTreeDblClick (event, treeId, treeNode) { - console.log('event, treeId, treeNode', event, treeId, treeNode) this.$emit('input', treeNode.id) } } diff --git a/src/components/CustomFormComponents/TreePopoverForPersonal.vue b/src/components/CustomFormComponents/TreePopoverForPersonal.vue index a06473ab5..6181feb10 100644 --- a/src/components/CustomFormComponents/TreePopoverForPersonal.vue +++ b/src/components/CustomFormComponents/TreePopoverForPersonal.vue @@ -91,7 +91,6 @@ export default { this.treeCheckNode = treeCheckNode }, handleTreeDblClick (treeId, treeNode) { - console.log('event, treeId, treeNode', event, treeId, treeNode) this.$emit('input', treeNode.id) } } diff --git a/src/components/CustomFormComponents/department.vue b/src/components/CustomFormComponents/department.vue index df3f1fffc..a352e2cc3 100644 --- a/src/components/CustomFormComponents/department.vue +++ b/src/components/CustomFormComponents/department.vue @@ -112,7 +112,6 @@ export default { }, methods: { handleTreeDblClick (treeId, treeNode) { - console.log(treeNode.id) this.checkedName = treeNode.name this.$emit('input', treeNode.id) this.visible = false @@ -130,8 +129,6 @@ export default { return name }, handleTreeDrawerConfirm () { - console.log(this.config.selVal) - console.log(this.treeCheckNode) if (this.config.selVal === 'USERLIST') { const checkedList = [] const checkedNameList = [] @@ -141,9 +138,7 @@ export default { checkedNameList.push(item.name) } }) - console.log(checkedNameList) this.checkedName = checkedNameList.join(',') - console.log(this.checkedName) this.$emit('input', checkedList.join(',')) } else { const checkedList = [] @@ -157,7 +152,6 @@ export default { } }) this.checkedName = checkedNameList.join(',') - console.log(this.checkedName) this.$emit('input', checkedList.join(',')) } this.visible = false @@ -179,11 +173,9 @@ export default { }, watch: { value (newVal) { - console.log(newVal) this.checkedName = newVal || '' }, checkedName (val) { - console.log(val) this.$emit('update:value', val) } }, diff --git a/src/components/ProjectRelatedPersonnel/index.vue b/src/components/ProjectRelatedPersonnel/index.vue index d355f5076..73bc43439 100644 --- a/src/components/ProjectRelatedPersonnel/index.vue +++ b/src/components/ProjectRelatedPersonnel/index.vue @@ -120,13 +120,11 @@ export default { }, watch:{ value(newValue, oldValue) { - console.log(newValue) this.resolveValueToResultNodes(newValue) } }, methods: { handleSelectTreeClick(treeId, treeNode) { - console.log(treeId, treeNode) this.selectNode = { ...treeNode } }, @@ -186,7 +184,6 @@ export default { handleResultTreeEdit(treeId, treeNode) { const wxId = treeNode.wxId const findNode = this.resultNodes.find(item => item.wxId === wxId) - console.log(findNode) if (findNode && findNode.type === 'user') { this.editNode = findNode this.editNodeForForm = { ...findNode } @@ -223,7 +220,6 @@ export default { userName: item.type === 'user' && item.nativeName || null } }) - console.log(result) this.$emit('input', result) }, diff --git a/src/components/ProjectRelatedPersonnel/view.vue b/src/components/ProjectRelatedPersonnel/view.vue index 39cad76ed..f54f4f829 100644 --- a/src/components/ProjectRelatedPersonnel/view.vue +++ b/src/components/ProjectRelatedPersonnel/view.vue @@ -63,7 +63,6 @@ export default { }, watch:{ value(newValue, oldValue) { - console.log(newValue) this.resolveValueToResultNodes(newValue) } }, diff --git a/src/components/PutQuestionButton/index.vue b/src/components/PutQuestionButton/index.vue index 3dc145f0d..040f76794 100644 --- a/src/components/PutQuestionButton/index.vue +++ b/src/components/PutQuestionButton/index.vue @@ -141,7 +141,6 @@ export default { submitLoading: 'loading' }, res => { if (res.ok) { - console.log('success', res) this.newDialogVisible = false this.submitLoading = false this.$message({ diff --git a/src/components/lawsTree/index.vue b/src/components/lawsTree/index.vue index 4d528bfab..570670560 100644 --- a/src/components/lawsTree/index.vue +++ b/src/components/lawsTree/index.vue @@ -1449,7 +1449,6 @@ export default { this.destroyZTree() $(this.dragBind).unbind('mousedown') $('#' + this.searchId).unbind('input propertychange') - // console.log('beforeDestroy') } } diff --git a/src/components/lawsTree/index2.vue b/src/components/lawsTree/index2.vue index 5d8b4983a..5b5b9168c 100644 --- a/src/components/lawsTree/index2.vue +++ b/src/components/lawsTree/index2.vue @@ -141,7 +141,6 @@ export default { * @date: 2018/10/23 10:19:24 */ rightRemove () { - console.log('rightRemove') $(`#${this.treeDivId}rMenu`).css({'visibility': 'hidden'}) this.setOpenNodes() this.$emit('treeRemove', this.treeId, this.treeNode) @@ -153,7 +152,6 @@ export default { * @date: 2020/2/6 10:19:24 */ rightCopy () { - console.log('rightCopy') $(`#${this.treeDivId}rMenu`).css({'visibility': 'hidden'}) this.setOpenNodes() this.$emit('treeCopy', this.treeId, this.treeNode) @@ -1284,7 +1282,6 @@ export default { } function showRMenu (type, x, y, treeId, treeNode) { - console.log('showRMenu') // 右键隐藏菜单的节点 if (treeNode.pId !== null && _this.showRMenu && !_this.disabled && _this.editable) { _this.isRoot = false @@ -1322,7 +1319,6 @@ export default { } /* eslint-disable */ function hideRMenu () { - console.log('hideRMenu') if (rMenu) rMenu.css({'visibility': 'hidden'}) $('body').unbind('mousedown', onBodyMouseDown) } diff --git a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue index cce7e6a1d..69a6e9f69 100644 --- a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue +++ b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue @@ -228,7 +228,6 @@ export default { }, methods: { handlePreview (item) { - console.log('item1111111', item) // let routeUrl = this.$router.resolve({ // name: 'OtherStandardDetails', // params: { @@ -252,12 +251,10 @@ export default { } }) window.open(routeUrl.href, '_blank') - console.log('res.data', res) }, e => { }) }, handleLaws (item) { - console.log('item1111111', item) // let routeUrl = this.$router.resolve({ // name: 'OtherLawsDetails', // params: { @@ -283,7 +280,6 @@ export default { } }) window.open(routeUrl.href, '_blank') - console.log('res.data', res) }, e => { }) }, @@ -369,7 +365,6 @@ export default { }, res => { this.isSubmit = false this.msgDetails.collectId = res.data.id - console.log('msgDetails.collectId', this.msgDetails.collectId) }, e => { this.isSubmit = false }) diff --git a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue index 5575dfee2..1a97d9e98 100644 --- a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue +++ b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue @@ -301,7 +301,6 @@ export default { }, res => { this.isSubmit = false this.msgDetails.collectId = res.data.id - console.log('msgDetails.collectId', this.msgDetails.collectId) }, e => { this.isSubmit = false }) @@ -329,7 +328,6 @@ export default { obj.content = this.relateList[i].content this.relateNowList.push(obj) } - console.log('relateNowList', this.relateNowList) }, e => { }) @@ -419,7 +417,6 @@ export default { this.$message.warning('暂无相关标准') } else { let row = item.releventStandIds.split('/') - console.log(row) let routeUrl = this.$router.resolve({ name: 'OtherStandardDetails', params: { @@ -436,7 +433,6 @@ export default { this.$message.warning('暂无相关政策') } else { let row = item.releventLawsIds.split('/') - console.log(row) let routeUrl = this.$router.resolve({ name: 'OtherLawsDetails', params: { diff --git a/src/pages/config/pages/enterpriseStandardNumberManagement/index.vue b/src/pages/config/pages/enterpriseStandardNumberManagement/index.vue index fa7ac340b..a8d5af65c 100644 --- a/src/pages/config/pages/enterpriseStandardNumberManagement/index.vue +++ b/src/pages/config/pages/enterpriseStandardNumberManagement/index.vue @@ -264,7 +264,6 @@ }, // 批量删除 batchMSGDel (type, row) { - console.log(row); if (type === 2) { this.$confirm('是否删除此数据?', '提示', { confirmButtonText: '确定', @@ -355,7 +354,6 @@ // 查看 // 如果为自定义类型,可再当前结构树中手动维护,添加删除编辑等, // 如果为基础体系库则是查看基础库中的数据。不可编辑删除操作。 - console.log(row) this.$store.commit('setDetailMap', this.$route.path) this.$router.push({ name: 'managementTree', diff --git a/src/pages/config/pages/enterpriseStandardNumberManagement/managementTree.vue b/src/pages/config/pages/enterpriseStandardNumberManagement/managementTree.vue index d2bcb6b4d..409cb692e 100644 --- a/src/pages/config/pages/enterpriseStandardNumberManagement/managementTree.vue +++ b/src/pages/config/pages/enterpriseStandardNumberManagement/managementTree.vue @@ -302,22 +302,18 @@ }, treeClickThree (treeNode) { this.selectTree = treeNode // 记录当前选中的二级菜单 - console.log('选择的树', this.selectTree) }, treeRightClickThree (treeNode) { this.selectTree = treeNode // 记录当前选中的二级菜单 if (treeNode.selfFlag === '2'){ this.operationAuthority = true - console.log('ok'); } else { this.operationAuthority = false } - console.log('右击选择的树', this.selectTree) }, // 二级菜单新建,编辑,删除 clickDropMenu (name, treeNode) { this.selectSarMenu = JSON.parse(JSON.stringify(treeNode)) - console.log('点击',this.selectSarMenu); if (undefined !== this.selectSarMenu.id) { // 当前有选中节点 if (name === 'newMenu') { this.menuModalTitle = '新增目录' @@ -332,7 +328,6 @@ rootNum:this.baseDataId } } else if (name === 'editMenu') { - console.log('treeNode',treeNode); this.menuModalTitle = '编辑目录' this.menuModalFlag = true this.menuAddOrUpdateFlag = 2 @@ -421,7 +416,6 @@ // 体系基础数据库-新建,编辑,删除 clickDropMenuThree (name, treeNode) { this.selectSarMenu = JSON.parse(JSON.stringify(treeNode)) - console.log('点击',this.selectSarMenu); if (undefined !== this.selectSarMenu.id) { // 当前有选中节点 if (name === 'newMenu') { this.modalTitle = '新增目录' @@ -435,7 +429,6 @@ selfSort: '' } } else if (name === 'editMenu') { - console.log('treeNode',treeNode); this.modalTitle = '编辑目录' this.modalFlag = true this.threeFlag = 2 @@ -444,7 +437,6 @@ this.dataListThree.map((item, index) => { if (this.addMenu.id === item.id) { selectNode.push(item) - console.log('编辑的selectNode', selectNode) this.addMenu.pid = selectNode[0].pid this.addMenu.selfCode = selectNode[0].svppsCode this.addMenu.selfName = selectNode[0].svppsCnName @@ -582,7 +574,6 @@ if (valid) { if (this.menuAddOrUpdateFlag === 1) { this.sarMenu.pid = this.selectSarMenu.id - console.log(this.selectSarMenu.id) // if (this.selectSarMenu.parentIds != null) { // this.sarMenu.parentIds = this.selectSarMenu.parentIds + ',' + this.selectSarMenu.id // } else { @@ -650,11 +641,9 @@ }, watch: { operationAuthority(newValue) { - console.log('newValue',newValue) // this.operationAuthority = newValue this.$nextTick(() => { this.operationAuthority = newValue - console.log('this.operationAuthority',this.operationAuthority) this.$forceUpdate() }) } @@ -662,8 +651,6 @@ computed: { }, mounted () { - console.log('this.$route.params.qbDataType',this.$route.query.qbDataType) - console.log('this.$route.params.qbBaseId',this.$route.query.qbBaseId) this.baseDataId =this.$route.query.qbBaseId switch (this.$route.query.qbDataType) { case '1': diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index c433a7cad..bcb997b6d 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -623,7 +623,6 @@ export default { loading: 'treeModalLoading' }, res => { if (res.ok) { - console.log('dataaaaaa', res.data) let backData = res.data // 新增一个接口 this.$http.postData('lawss/sarSubMenu/insertSarSubMenuall', backData, { diff --git a/src/pages/config/pages/processManage/components/EditProcess.vue b/src/pages/config/pages/processManage/components/EditProcess.vue index d21877775..70e51b5b5 100644 --- a/src/pages/config/pages/processManage/components/EditProcess.vue +++ b/src/pages/config/pages/processManage/components/EditProcess.vue @@ -108,7 +108,6 @@ export default { _this: this }, res => { if (res.success) { - console.log('新增/编辑成功') this.$emit('success') this.$emit('close') } diff --git a/src/pages/config/pages/processManage/components/EditProcessClassification.vue b/src/pages/config/pages/processManage/components/EditProcessClassification.vue index 4bc819df0..f8dda5e1e 100644 --- a/src/pages/config/pages/processManage/components/EditProcessClassification.vue +++ b/src/pages/config/pages/processManage/components/EditProcessClassification.vue @@ -84,7 +84,6 @@ export default { _this: this }, res => { if (res.success) { - console.log('新增/编辑成功') this.$emit('success') this.$emit('close') } diff --git a/src/pages/config/pages/processManage/process.vue b/src/pages/config/pages/processManage/process.vue index 12fe2128f..bf0846b6a 100644 --- a/src/pages/config/pages/processManage/process.vue +++ b/src/pages/config/pages/processManage/process.vue @@ -178,7 +178,6 @@ export default { // 点击查看 handlePreview (item) { - console.log('item', item) let routeUrl = this.$router.resolve({ name: 'OtherStandardDetails', params: { @@ -216,7 +215,6 @@ export default { }, { _this: this }, res => { - console.log('删除成功') this.$message.warning(res.message) this.queryTablePage() }, e => { diff --git a/src/pages/config/pages/processManage/processClassification.vue b/src/pages/config/pages/processManage/processClassification.vue index 7556573bf..610e9040f 100644 --- a/src/pages/config/pages/processManage/processClassification.vue +++ b/src/pages/config/pages/processManage/processClassification.vue @@ -170,7 +170,6 @@ export default { // 点击查看 handlePreview (item) { - console.log('item', item) let routeUrl = this.$router.resolve({ name: 'OtherStandardDetails', params: { diff --git a/src/pages/config/pages/standLawsAttrManage/index.vue b/src/pages/config/pages/standLawsAttrManage/index.vue index 2c6ab49c7..373237277 100644 --- a/src/pages/config/pages/standLawsAttrManage/index.vue +++ b/src/pages/config/pages/standLawsAttrManage/index.vue @@ -380,7 +380,6 @@ export default { } }, goNuwPage (item) { - console.log('item', item) this.$store.commit('setDetailMap', this.$route.path) this.$router.push({ name: 'StandLawsAttrDetails', @@ -598,7 +597,6 @@ export default { let listId = this.selectedList[i] listIds.push(listId) } - console.log(listIds) let listIdsStr = listIds.join(',') this.$confirm('确定删除这些数据?', '提示', { confirmButtonText: '确定', diff --git a/src/pages/config/pages/userManage/index.vue b/src/pages/config/pages/userManage/index.vue index 358cf1557..4e9c8d756 100644 --- a/src/pages/config/pages/userManage/index.vue +++ b/src/pages/config/pages/userManage/index.vue @@ -690,7 +690,6 @@ export default { }, // 打开新增用户模态框 openAddUserModal () { - console.log('userVO',this.userVO) this.userTitle = '新增用户' this.userVO.roleIdList = '' this.showPWD = true diff --git a/src/pages/details/process/ruku/index.vue b/src/pages/details/process/ruku/index.vue index c4fb4875e..e85d0f6c5 100644 --- a/src/pages/details/process/ruku/index.vue +++ b/src/pages/details/process/ruku/index.vue @@ -2557,7 +2557,6 @@ export default { ...mapGetters(['rukuBaseInfo']) }, async mounted () { - console.log(this.rukuBaseInfo) // this.sarStandardsInfoEO.id = this.$route.params.id // // await this.selectStandMessage() // this.standItemEO.standId = this.$route.params.id diff --git a/src/pages/knowledgeGraph/components/knowledgeGraph.vue b/src/pages/knowledgeGraph/components/knowledgeGraph.vue index b6e6e2518..2607a5163 100644 --- a/src/pages/knowledgeGraph/components/knowledgeGraph.vue +++ b/src/pages/knowledgeGraph/components/knowledgeGraph.vue @@ -219,7 +219,6 @@ export default { }); let graphData = this.graphData G6.Util.traverseTree(graphData, function(item) { - // console.log(item) const data = item.data || {} item.id = item.nodeId; item.name = item.nodeName @@ -273,7 +272,6 @@ export default { graph.setItemState(ce, 'click', false); }); const edgeItem = e.item; // 获取被点击的边元素对象 - console.log('EdgeClick', edgeItem) graph.setItemState(edgeItem, 'click', true); // 设置当前边的 click 状态为 true this.$emit('edgeClick', edgeItem) }); diff --git a/src/pages/localTool/applicationStandardNumber/index.vue b/src/pages/localTool/applicationStandardNumber/index.vue index e3e00f8db..e6b1d745b 100644 --- a/src/pages/localTool/applicationStandardNumber/index.vue +++ b/src/pages/localTool/applicationStandardNumber/index.vue @@ -513,7 +513,6 @@ export default { month = month.toString().padStart(2, '0') date = date.toString().padStart(2, '0') var defaultDate = `${year}-${month}-${date}` - console.log('defaultDate', defaultDate) // this.$set(this.searchFormField, 'date', defaultDate) this.userVO.receiveTime = defaultDate }, @@ -607,7 +606,6 @@ export default { for (let key in item) { if (key === 'dicCodeName') { treeItem.name = item[key] - console.log('dicTypeName', item['dicTypeName']) } else { treeItem[key] = item[key] } @@ -645,7 +643,6 @@ export default { // alert(1) this.standNum.busStandClass = treeNode.name this.busStandClassCode = this.standNum.busStandClass - console.log('TTTTTTTTTTT', this.busStandClassCode) $('#deptBtn1').click() }, treeDblClick2 (treeId, treeNode) { @@ -733,7 +730,6 @@ export default { }, // 编辑 selectStandardPro (item, state) { - console.log('item11111111111', item) this.numTitle = '修改标准编号' this.showNumModal = true this.$nextTick(() => { @@ -766,7 +762,6 @@ export default { this.getOrgTreeSource() this.getOrgTreeSource2() this.numType = 2 - console.log(' item.busStandClassShow', item.busStandClassShow) // 赋值 this.sarBussionessStandEO.busStandClass = item.busStandClass this.sarBussionessStandEO.employerShow = item.employerShow @@ -912,7 +907,6 @@ export default { // let userEOStr = JSON.stringify(this.userVO) // let userEOStr = JSON.parse(JSON.stringify(this.userVO)) // 验证标准--新增、编辑都先验证 - console.log('JSON.stringify(this.userVO.busStandClass)', JSON.stringify(this.userVO.busStandClass)) this.$http.post('lawss/sarStandReceivr/validateStandNumber', { // userStr: userEOStr busStandClass: JSON.stringify(this.userVO.busStandClass), @@ -925,7 +919,6 @@ export default { res => { if (res.ok) { // 更新 - console.log('this.numType', this.numType) if (this.numType !== 1) { // alert('编辑') this.drawerLoading = true @@ -942,7 +935,6 @@ export default { // 新增 // alert('新增') // this.userVO.employerShow = this.userVO.employer - console.log('新增', this.userVO) this.loading = true this.$http.postData('lawss/sarStandReceivr/create', this.userVO, {_this: this}, diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index 3a716a366..9dc7f2281 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -1254,7 +1254,6 @@ export default { var index2 = filename.length var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 - console.log(this.defaultFileList) if (this.defaultFileList.length > 0) { this.$message.warning('一次仅能拆分一个文件') return false @@ -1270,7 +1269,6 @@ export default { return true }, beforeSplitResultImport(file) { - console.log(file) var filename = file.name var index1 = filename.lastIndexOf('.') var index2 = filename.length @@ -1393,7 +1391,6 @@ export default { break case '收藏': let personCollect = {} - console.log(command[0]) personCollect.collectResId = command[0].id // id personCollect.collectType = 'STAND_SPLIT' // 类型 if (command[0].standId) { diff --git a/src/pages/localTool/standContrast/index.vue b/src/pages/localTool/standContrast/index.vue index 15d49d176..eed9456a1 100644 --- a/src/pages/localTool/standContrast/index.vue +++ b/src/pages/localTool/standContrast/index.vue @@ -427,7 +427,6 @@ export default { this.spinShow = false item.isSubmit = false item.collectBtn = !item.collectBtn - console.log(item.collectBtn, '点击收藏后') item.collectId = res.data.id this.cancelCollect = !this.cancelCollect }, e => { diff --git a/src/pages/personal/pages/my-collection/collectionDetail/CollectionBussStandardDetail.vue b/src/pages/personal/pages/my-collection/collectionDetail/CollectionBussStandardDetail.vue index d60353141..1f875e64b 100644 --- a/src/pages/personal/pages/my-collection/collectionDetail/CollectionBussStandardDetail.vue +++ b/src/pages/personal/pages/my-collection/collectionDetail/CollectionBussStandardDetail.vue @@ -844,7 +844,6 @@ export default { this.$http.get('activiti/busProcess/selectProcessByStandId', obj, { _this: this }, res => { - console.log(res) if (res.ok) { this.opinionsProcessList = res.data.opinionsProcessList this.notifiProcessList = res.data.notifiProcessList diff --git a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue index 57f18d034..6d4ef806f 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue @@ -168,8 +168,6 @@ export default { return date != null ? date.substring(0, date.indexOf(' ')) : '' }, cancleCollectBatch () { - console.log(this.selectedList); - return if (this.selectedList.length === 0) { this.$confirm('请先选择数据进行取消收藏', '提示', { showCancelButton: false, diff --git a/src/pages/personal/pages/questionsAndAnswers/components/AnswerItem.vue b/src/pages/personal/pages/questionsAndAnswers/components/AnswerItem.vue index bc31fc5b9..8594f54a0 100644 --- a/src/pages/personal/pages/questionsAndAnswers/components/AnswerItem.vue +++ b/src/pages/personal/pages/questionsAndAnswers/components/AnswerItem.vue @@ -156,7 +156,6 @@ export default { _this: this },res => { if (res.ok) { - console.log('success', res) // this.newDialogVisible = false this.$message({ message: res.data, @@ -173,7 +172,6 @@ export default { } else { - console.log('error submit!!'); return false; } }); diff --git a/src/pages/personal/pages/questionsAndAnswers_old2/components/AnswerItem.vue b/src/pages/personal/pages/questionsAndAnswers_old2/components/AnswerItem.vue index 79ab88a65..71cc8f5f1 100644 --- a/src/pages/personal/pages/questionsAndAnswers_old2/components/AnswerItem.vue +++ b/src/pages/personal/pages/questionsAndAnswers_old2/components/AnswerItem.vue @@ -113,7 +113,6 @@ export default { _this: this },res => { if (res.ok) { - console.log('success', res) // this.newDialogVisible = false this.$message({ message: res.data, @@ -130,7 +129,6 @@ export default { } else { - console.log('error submit!!'); return false; } }); diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 95a5dce6e..be0c0448a 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -216,8 +216,6 @@ export default { dealWith (row) { // 办理 this.setHandleInfo(JSON.stringify(row)) const prcType = row.prcType - console.log(prcType) - console.log(row.taskInfo) switch(prcType) { case '1': if (row.taskInfo === '标准法规业务经理审批') { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue index 8f3fbecb8..fed96b5c0 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue @@ -54,6 +54,25 @@ export default { watch: {}, mounted() { + }, + beforeRouteLeave(to, from, next) { + const toName = ['ListOfStandardsAndRegulationsDetails', 'Details', 'ProjectAddEit', 'OtherAddEit'] + // 离开此页面之前,记录tabName以便返回使用,如果将要访问的页面不是这两个,则清空tabName + if (toName.includes(to.name)) { + this.$store.commit('SET_ACCESS_STANDARD_REG_TABS', this.tabValue) + } else { + this.$store.commit('SET_ACCESS_STANDARD_REG_TABS') + } + setTimeout(() => { + next() + }, 100) + }, + beforeRouteEnter(to, from, next) { + next(vm => { + if (vm.$store.state.accessStandRegTabName !== '') { + vm.tabValue = vm.$store.state.accessStandRegTabName + } + }) } }; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index 134daab78..48e9227cb 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -105,12 +105,12 @@ @@ -130,7 +130,7 @@ sortable align="center"> { - console.log(res.data.records); this.sarAccessListDatas = res.data.records; this.sarAccessListTotal = res.data.total }, e => { @@ -338,7 +337,7 @@ export default { }, // 点击 table编辑按钮 事件 editTable(item) { - sessionStorage.setItem("accessRow", JSON.stringify(item)); + this.$store.commit('SET_ACCESS_STAND_REG_ROW', item) this.$router.push({ name: "ListOfStandardsAndRegulationsDetails", query: { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue index 70d2e47be..11be7d7e0 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue @@ -96,12 +96,12 @@ @@ -121,7 +121,7 @@ sortable align="center"> @@ -121,7 +121,7 @@ sortable align="center"> - + @@ -268,7 +268,7 @@ align="center"> @@ -451,6 +451,7 @@ import CustomSVPPS from '@/components/CustomFormComponents/SVPPS' import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPolicy' import CustomRoleTree from '@/components/CustomFormComponents/roleTree' import stand from "../../../config/pages/attributeCustom/components/stand"; +import { mapGetters } from 'vuex' export default { name: 'ListOfStandardsAndRegulationsDetails', components: { @@ -552,7 +553,6 @@ export default { askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 accessSarType: 'SKILL', // 清单类型 - accessContent: '', // 清单名称 page: 1, pageSize: this.$store.getters.userInfo.configContent, validFlag: 0, @@ -700,6 +700,7 @@ export default { } ], depNode: [], // 部门树 + isNext: false, depFONode: [], depRoleNode: [], standNatureOptions: [], // 新增 标准性质 @@ -922,7 +923,7 @@ export default { this.sarAccessInfoSearch.keywords = '' // 关键字 this.sarAccessInfoSearch.accessSarType = 'SKILL' // 清单类型 this.sarAccessInfoSearch.askType = '' // 监管类型 - this.sarAccessInfoSearch.accessContent = '' // 清单名称 + this.sarAccessInfoSearch.detailedListName = '' // 清单名称 this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源 this.isListType = false this.selectLawsStands() @@ -1454,7 +1455,6 @@ export default { sarAccessEO.inforlist = JSON.stringify(rowlist) sarAccessEO.adminInfoList = JSON.stringify(rowList2) sarAccessEO.countryArea = sarAccessEO.countryArea.join(',') - sarAccessEO.detailedListName = sarAccessEO.detailedListName.join(',') // 判断是否有附件 if (this.fileInfoList.length > 0) { let relateFile = [] @@ -1472,7 +1472,7 @@ export default { loading: 'loadData' }, res => { if (res.ok) { - console.log('页面跳转 '); + this.isNext = true this.$router.push({ name: 'AccessStandardsAndRegulations' }) @@ -1481,11 +1481,12 @@ export default { }) } else { // 编辑 - this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, { + this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, { _this: this, loading: 'loadData' }, res => { if (res.ok) { + this.isNext = true this.$router.push({ name: 'AccessStandardsAndRegulations' }) @@ -1669,6 +1670,23 @@ export default { this.selectLawsStands() } }, + beforeRouteLeave(to, from, next) { + if (to.name === 'Login' || this.isNext) { + next() + } else { + this.$confirm('是否放弃编辑', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + confirmButtonClass: 'common-button-primary', + roundButton: true, + type: 'warning' + }).then(() => { + next() + }).catch(() => { + // alert("router") + }) + } + }, // 点击清单条目 新增按钮 事件 addEntry () { this.editAddType = 1 @@ -2183,6 +2201,9 @@ export default { this.accessSarTypeList = [] } }, + computed: { + ...mapGetters(['getAccessStandardRegRow']), + }, mounted () { this.getDept() // 从数据库中查询各下拉框数据 @@ -2207,7 +2228,7 @@ export default { this.getOrgTreeSource() // 判断是否是编辑 if (this.$route.query.id) { - let accessRow = JSON.parse(sessionStorage.getItem('accessRow')) + const accessRow = this.getAccessStandardRegRow this.$nextTick(() => { this.sarAccessEO.type = accessRow.type this.sarAccessEO.countryArea = accessRow.countryArea.split(',') @@ -2226,6 +2247,13 @@ export default { this.$refs['sarAccessForm'].resetFields() }) } + }, + beforeRouteLeave(to, from, next) { + next() + setTimeout(() => { + // 清空详情 + this.$store.commit('SET_ACCESS_STAND_REG_ROW') + }, 100) } } diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 23db0dbe8..f684c471d 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -306,7 +306,6 @@ export default { }, // 根据准入id查询标准法规详情 selectInfobyAccid() { - console.log('309',this.pageId); this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { ...this.standardForm, id: this.pageId, diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 1e84af4eb..1b2a3d7c1 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -116,9 +116,9 @@ - + @@ -253,7 +253,7 @@ align="center"> @@ -436,6 +436,7 @@ import CustomSVPPS from '@/components/CustomFormComponents/SVPPS' import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPolicy' import CustomRoleTree from '@/components/CustomFormComponents/roleTree' import stand from "../../../config/pages/attributeCustom/components/stand"; +import { mapGetters } from "vuex"; export default { name: 'OtherAddEit', components: { @@ -536,7 +537,7 @@ export default { askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 accessSarType: 'SKILL', // 清单类型 - accessContent: '', // 清单名称 + detailedListName: '', // 清单名称 page: 1, pageSize: this.$store.getters.userInfo.configContent, validFlag: 0, @@ -911,7 +912,7 @@ export default { this.sarAccessInfoSearch.keywords = '' // 关键字 this.sarAccessInfoSearch.accessSarType = 'SKILL' // 清单类型 this.sarAccessInfoSearch.askType = '' // 监管类型 - this.sarAccessInfoSearch.accessContent = '' // 清单名称 + this.sarAccessInfoSearch.detailedListName = '' // 清单名称 this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源 this.isListType = false this.selectLawsStands() @@ -1457,7 +1458,6 @@ export default { loading: 'loadData' }, res => { if (res.ok) { - console.log('页面跳转 '); this.$router.push({ name: 'AccessStandardsAndRegulations' }) @@ -1466,7 +1466,7 @@ export default { }) } else { // 编辑 - this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, { + this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, { _this: this, loading: 'loadData' }, res => { @@ -1885,7 +1885,7 @@ export default { res.data.ADMIN.map((item, index) => { item.uuid = this.number item.GXHBQ = item.gxhbq - item.eopPutTime = item.eopPutTextTime + item.eopPutTime = item.eopPutTextTime //实施日期 item.newPutTime = item.newPutTextTime item.prodPutTime = item.prodPutTextTime this.number++ @@ -2169,6 +2169,9 @@ export default { this.accessSarTypeList = [] } }, + computed: { + ...mapGetters(['getAccessStandardRegRow']), + }, mounted () { this.getDept() // 从数据库中查询各下拉框数据 @@ -2193,7 +2196,7 @@ export default { this.getOrgTreeSource() // 判断是否是编辑 if (this.$route.query.id) { - let accessRow = JSON.parse(sessionStorage.getItem('accessRow')) + const accessRow = this.getAccessStandardRegRow this.$nextTick(() => { this.sarAccessEO.type = accessRow.type // this.sarAccessEO.countryArea = accessRow.countryArea.split(',') diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 388d47b85..2b1f5c2f5 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -116,9 +116,9 @@ - + @@ -253,7 +253,7 @@ align="center"> @@ -436,6 +436,7 @@ import CustomSVPPS from '@/components/CustomFormComponents/SVPPS' import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPolicy' import CustomRoleTree from '@/components/CustomFormComponents/roleTree' import stand from "../../../config/pages/attributeCustom/components/stand"; +import { mapGetters } from "vuex"; export default { name: 'ProjectAddEit', components: { @@ -536,7 +537,7 @@ export default { askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 accessSarType: 'SKILL', // 清单类型 - accessContent: '', // 清单名称 + detailedListName: '', // 清单名称 page: 1, pageSize: this.$store.getters.userInfo.configContent, validFlag: 0, @@ -911,7 +912,7 @@ export default { this.sarAccessInfoSearch.keywords = '' // 关键字 this.sarAccessInfoSearch.accessSarType = 'SKILL' // 清单类型 this.sarAccessInfoSearch.askType = '' // 监管类型 - this.sarAccessInfoSearch.accessContent = '' // 清单名称 + this.sarAccessInfoSearch.detailedListName = '' // 清单名称 this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源 this.isListType = false this.selectLawsStands() @@ -1459,7 +1460,6 @@ export default { loading: 'loadData' }, res => { if (res.ok) { - console.log('页面跳转 '); this.$router.push({ name: 'AccessStandardsAndRegulations' }) @@ -1468,7 +1468,7 @@ export default { }) } else { // 编辑 - this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, { + this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, { _this: this, loading: 'loadData' }, res => { @@ -2170,6 +2170,9 @@ export default { this.accessSarTypeList = [] } }, + computed: { + ...mapGetters(['getAccessStandardRegRow']), + }, mounted () { this.getDept() // 从数据库中查询各下拉框数据 @@ -2194,7 +2197,7 @@ export default { this.getOrgTreeSource() // 判断是否是编辑 if (this.$route.query.id) { - let accessRow = JSON.parse(sessionStorage.getItem('accessRow')) + const accessRow = this.getAccessStandardRegRow this.$nextTick(() => { this.sarAccessEO.type = accessRow.type // this.sarAccessEO.countryArea = accessRow.countryArea.split(',') diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 6273aa70e..a46b47eeb 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2091,9 +2091,7 @@ export default { this.$message.success('导出信息成功') } } else if (this.saveExportType === 'all') { - console.log('全部导出') let exportEOStr = JSON.stringify(this.SarExportSearchEo) - console.log(exportEOStr) exportEOStr = exportEOStr.replace(/""/g, null) window.open(interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' + 'exportType' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index da5ba1405..c5e4fd9f2 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -1601,7 +1601,6 @@ export default { }, // 授权-查询权限 givePower (item) { - console.log('item',item) this.standId = item.id this.visibleOrgTable = true }, @@ -1613,8 +1612,6 @@ export default { idList.push(item.userId) nameList.push(item.userName) }) - console.log('idList', idList); - console.log('idListJoin', idList.join(',')); this.$http.post('lawss/sarBussionessStand/insertPerson', { qbid: this.standId, userIds: idList.join(',') @@ -1842,7 +1839,6 @@ export default { }, // 点击查看 handlePreview (item) { - console.log(item); const mj = item.attrInfoMap.QBMJ if (mj === 'GXNX7D6H59') { // C1所有人都可查看 @@ -1889,7 +1885,6 @@ export default { const userInfo = this.userInfo const currentId = userInfo.userId // 当前用户的id // 如果当前用户的部门和科室不在全部部门里 就不允许查看 - console.log(qcr.indexOf(currentId)) if (!(qcr.indexOf(currentId) > -1)) { // this.$message.warning('当前用户无权限查看此详情') this.$http.get('lawss/sarBussionessStand/selectPerson', { diff --git a/src/pages/regulatoryRepository/information/index.vue b/src/pages/regulatoryRepository/information/index.vue index ce0b9b041..7177775d0 100644 --- a/src/pages/regulatoryRepository/information/index.vue +++ b/src/pages/regulatoryRepository/information/index.vue @@ -184,7 +184,6 @@ export default { json.text = arr[a].name newArr.push(json) } - console.log(newArr); } }, computed: { diff --git a/src/pages/regulatoryRepository/information/index2.vue b/src/pages/regulatoryRepository/information/index2.vue index be98873dd..d160517a3 100644 --- a/src/pages/regulatoryRepository/information/index2.vue +++ b/src/pages/regulatoryRepository/information/index2.vue @@ -203,7 +203,6 @@ export default { }, methods: { contentClick (link) { - console.log(this.$route) this.$store.commit('setDetailMap', this.$route.fullPath) this.$router.push(link) }, @@ -324,7 +323,6 @@ export default { // this.msgDetails.collectId = res.data.id this.msgDetails.collectId = this.$route.params.id this.collection = 1 - // console.log('msgDetails.collectId', this.msgDetails.collectId) }, e => { this.isSubmit = false }) @@ -352,7 +350,6 @@ export default { obj.content = this.relateList[i].content this.relateNowList.push(obj) } - console.log('relateNowList', this.relateNowList) }, e => { }) @@ -387,7 +384,6 @@ export default { this.msgDetails = res.data this.collection = res.data.collection - console.log('this.msgDetails000000000', this.msgDetails) this.addPersonCookie() }, e => { }) diff --git a/src/pages/regulatoryRepository/nonConfomity/index.vue b/src/pages/regulatoryRepository/nonConfomity/index.vue index ceb38c6f1..63cc3c8dd 100644 --- a/src/pages/regulatoryRepository/nonConfomity/index.vue +++ b/src/pages/regulatoryRepository/nonConfomity/index.vue @@ -29,7 +29,6 @@ export default { }, methods: { handleClick(tab, event) { - console.log(tab, event); } }, watch: {}, diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index e3994f291..8de49527b 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -54,30 +54,38 @@ - - + + + {{ opt.label }} + - - + + + @@ -85,14 +93,14 @@ - @@ -100,59 +108,176 @@ - - - + + + - - + + + + + + - - + + + - - + + + - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -164,279 +289,191 @@ - - + - - + - - - - - + + - - - {{ opt1.label }} - - - - - - - - - - {{ opt.label }} - - - - - - - + - - + - - - {{ item.label }} - - - - - - - - - - - - - - - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ item.label }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - -
- - -
-
+ + + +
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -449,303 +486,176 @@ - - + - + - - - {{ opt1.label }} - - - - - - - - {{ opt.label }} - - - - - - - - - + - - + - - - - - - - - - - - - - - - - - - -
- - -
-
-
-
- - - - {{ item.label }} - - - - -
- - - - - {{ item.label }} - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + - - - - - + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index 4279432d5..f846902eb 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -1894,7 +1894,6 @@ export default { let pagetype = '' pagetype = item.typeShow if (item.typeShow === 'INLAND_STAND') { - console.log('guonei权限') routername = 'OtherStandardDetails' // if (this.$hasPermission('CFEZ3VP7EA95CTRBH3JB')) { // routername = 'OtherStandardDetails' @@ -2137,7 +2136,6 @@ export default { type: 'warning' }) } else { - console.log(this.selectNowObjResult); let pagetype = '' if (this.selectNowObjResult.type === 'stand') { if (this.selectNowObjResult.standType === 'INLAND') { @@ -2258,7 +2256,6 @@ export default { if (item.type === 'stand') { if (this.$hasPermission('SSA6WR4HV8') && this.$hasPermission('HK36LHK9444NPN8X634W')){ routername = 'OtherStandardDetails' - console.log('guoneiQUANXIAN') if (item.standType === 'INLAND') { pagetype = 'INLAND_STAND' } else { diff --git a/src/pages/skillReq/SkillReqAdd/searchForm.vue b/src/pages/skillReq/SkillReqAdd/searchForm.vue index 406aa120b..3d0b8ee76 100644 --- a/src/pages/skillReq/SkillReqAdd/searchForm.vue +++ b/src/pages/skillReq/SkillReqAdd/searchForm.vue @@ -530,7 +530,6 @@ export default { }, methods: { searchAll () { - console.log('this.searchOption: ', this.searchOption) let searchData = {} Object.keys(this.searchOption).forEach(key => { if (!(this.searchOption[key] === '' || this.searchOption[key] === [])) { @@ -545,7 +544,6 @@ export default { searchData[key] = this.searchOption[key] } }) - console.log('searchData: ', searchData) searchData['effectiveDate1'] = this.searchOption.startDate[0] searchData['effectiveDate2'] = this.searchOption.startDate[1] @@ -570,7 +568,6 @@ export default { */ getOptionData () { this.$http.get('sys/org/getTree', {}, {_this: this}, res => { - console.log('res: ', res) this.departmentList = res.data.map(item => { return { label: item.orgName, @@ -579,7 +576,6 @@ export default { }) }) this.$http.get('sys/dictype/getDicTypeListCode', {}, {_this: this}, res => { - console.log('res: ', res) Object.keys(res.data).forEach(item => { switch (item) { case 'REGION' : diff --git a/src/pages/skillReq/SkillReqSee/searchForm.vue b/src/pages/skillReq/SkillReqSee/searchForm.vue index 3f204fb32..9a24e805d 100644 --- a/src/pages/skillReq/SkillReqSee/searchForm.vue +++ b/src/pages/skillReq/SkillReqSee/searchForm.vue @@ -150,13 +150,7 @@ export default { } }, created () { - console.log('Object.keys(searchOption): ', Object.keys(this.searchOption)) this.getOptionData() - // setTimeout(() => { - // this.searchOption[6].data = Array(45).fill('test') - // this.searchOption[6].data = Array(45).fill('test') - // this.ifHaveEnoughData() - // }, 5000) }, methods: { /* @@ -167,7 +161,6 @@ export default { */ getOptionData () { this.$http.get('sys/org/getTree', {}, {_this: this}, res => { - console.log('res: ', res) this.searchOption[7].data = res.data.map(item => { return { label: item.orgName, @@ -177,7 +170,6 @@ export default { this.searchOption[7].data.unshift(all) }) this.$http.get('sys/dictype/getDicTypeListCode', {}, {_this: this}, res => { - console.log('res: ', res) Object.keys(res.data).forEach(item => { switch (item) { case 'REGION' : @@ -253,7 +245,6 @@ export default { *@date: 2020-09-27 13:50:21 */ handleOptionClick (value, index) { - console.log('value: ', value) // 区域 if (index === 0 || index === 5 || index === 7 || index === 8) { this.loading = true @@ -271,7 +262,6 @@ export default { // 全部 if (value[0] === 'all') { this.$http.get('sys/dictype/getDicTypeListCode', {}, {_this: this}, res => { - console.log('res: ', res) this.searchOption[index + 1].data = index === 0 ? res.data['COUNTRY'] : res.data['SUBAREA'] this.searchOption[index + 1].data.unshift(all) this.ifHaveEnoughData() @@ -301,7 +291,6 @@ export default { */ reloadTable () { let searchdata = this.searchOption.map(item => item.selectValue) - console.log('searchdata: ', searchdata) let data = {} const keys = ['regionList', 'countryList', 'sourceTypeList', 'carTypeList', 'carCategoryList', 'areaList', 'subAreaList', 'departmentList'] keys.forEach((key, index) => { @@ -310,10 +299,8 @@ export default { } }) data['allSubjects'] = this.subject ? this.subject : null - console.log('this.startDate: ', this.startDate) data['effectiveDate1'] = this.startDate[0] ? this.startDate[0] : null data['effectiveDate2'] = this.startDate[1] ? this.startDate[1] : null - console.log('data: ', data) this.$emit('searchData', data) }, /* diff --git a/src/pages/standardComparisonLibrary/components/StandardSelect.vue b/src/pages/standardComparisonLibrary/components/StandardSelect.vue index 8a5615d42..6a75d1999 100644 --- a/src/pages/standardComparisonLibrary/components/StandardSelect.vue +++ b/src/pages/standardComparisonLibrary/components/StandardSelect.vue @@ -160,7 +160,6 @@ export default { // 点击查看 handlePreview (item) { - console.log('item', item) let routeUrl = this.$router.resolve({ name: 'OtherStandardDetails', params: { diff --git a/src/pages/standardComparisonLibrary/components/StandardView.vue b/src/pages/standardComparisonLibrary/components/StandardView.vue index d379999f3..9bab9ecec 100644 --- a/src/pages/standardComparisonLibrary/components/StandardView.vue +++ b/src/pages/standardComparisonLibrary/components/StandardView.vue @@ -171,7 +171,6 @@ export default { list: list } return new Promise((resolve, reject) => { - console.log(179) this.$http.postData('lawss/SarStandCompareList/save', formData, { _this: this }, res => { diff --git a/src/store/getters/index.js b/src/store/getters/index.js index a48367ecf..1d90d8ad3 100644 --- a/src/store/getters/index.js +++ b/src/store/getters/index.js @@ -172,5 +172,12 @@ export default { } else { return JSON.parse(state.rukuBaseInfo) } + }, + getAccessStandardRegRow: state => { + if (state.accessStandRegRows === '') { + return null + } else { + return JSON.parse(state.accessStandRegRows) + } } } diff --git a/src/store/mutations/index.js b/src/store/mutations/index.js index 208df4ce5..e326e7cee 100644 --- a/src/store/mutations/index.js +++ b/src/store/mutations/index.js @@ -272,5 +272,29 @@ export default { sessionStorage.removeItem('rukuBaseInfo') } catch (e) {} } + }, + // 标准法规清单记录当前编辑条目 + SET_ACCESS_STAND_REG_ROW(state, row) { + if (row) { + state.accessStandRegRows = JSON.stringify(row) + try { + sessionStorage.setItem('accessStandRegRows', JSON.stringify(row)) + } catch (e) {} + } else { + state.accessStandRegRows = '' + sessionStorage.removeItem('accessStandRegRows') + } + }, + //标准法规清单记录当前tab + SET_ACCESS_STANDARD_REG_TABS(state, tabName) { + if (tabName) { + state.accessStandRegTabName = tabName + try { + sessionStorage.setItem('accessStandRegTabName', tabName) + } catch (e) {} + } else { + state.accessStandRegTabName = '' + sessionStorage.removeItem('accessStandRegTabName') + } } } diff --git a/src/store/state/index.js b/src/store/state/index.js index 671dae9b8..3b3f7571f 100644 --- a/src/store/state/index.js +++ b/src/store/state/index.js @@ -31,6 +31,8 @@ let handleInfo = '' // 流程办理传递数据 let myBussStandardPlan = '' let proLastDetail = '' // 流程结果详情 let rukuBaseInfo = '' // 入库流程基础表单信息(后几步展示用) +let accessStandRegRows = '' // 标准法规清单编辑 +let accessStandRegTabName = '' // 标准法规清单页面当前页签 try { if (localStorage.theme) { defaultTheme = localStorage.theme } if (localStorage.token) { defaultToken = localStorage.token } @@ -61,6 +63,8 @@ try { if (sessionStorage.myBussStandardPlan) { myBussStandardPlan = sessionStorage.myBussStandardPlan } if (sessionStorage.proLastDetail) { proLastDetail = sessionStorage.proLastDetail } if (sessionStorage.rukuBaseInfo) { rukuBaseInfo = sessionStorage.rukuBaseInfo } + if (sessionStorage.accessStandRegRows) { accessStandRegRows = sessionStorage.accessStandRegRows } + if (sessionStorage.accessStandRegTabName) { accessStandRegTabName = sessionStorage.accessStandRegTabName } } catch (e) {} export default { theme: defaultTheme, // 主题 @@ -94,4 +98,6 @@ export default { myBussStandardPlan, proLastDetail, rukuBaseInfo, + accessStandRegRows, + accessStandRegTabName } diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index eb8f863a6..6b01d87aa 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -7,7 +7,7 @@ // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' const devIp = '192.168.10.178' -const devInterfacePORT = '9999' +const devInterfacePORT = '9998' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const simpleFilePath = 'att/attFile/upload'