如果各项目符合法规情况相同,可同时勾选,第一个勾选项目合规排查结果,将代表所有勾选项目合规排查结果。
diff --git a/src/main.js b/src/main.js index 128868042..c7e1e4eea 100644 --- a/src/main.js +++ b/src/main.js @@ -212,7 +212,16 @@ router.beforeEach(function (to, from, next) { next() }else if (toName.slice(0,5) !== 'phone') { if(toName === 'LoginVerify'){ - next('/blankPage') + if(toName === 'phoneHome'){ + // 手机端 首页 首次进入系统 清除 缓存, 防止 跳转 oa 的页面, 问题追溯 #55852 + localStorage.removeItem('token') + token = localStorage.getItem("token") + window.sessionStorage.clear() + localStorage.setItem("routerName","phoneHome") + next('/loginVerifyPhone') + }else{ + next('/blankPage') + } }else { if(toName === 'blankPage' || toName === 'processedPage') { next() @@ -223,7 +232,16 @@ router.beforeEach(function (to, from, next) { }else { if(toName !== 'blankPage'){ if(to.matched.length === 0){ - next('/blankPage') + if(toName === 'phoneHome'){ + // 手机端 首页 首次进入系统 清除 缓存, 防止 跳转 oa 的页面, 问题追溯 #55852 + localStorage.removeItem('token') + token = localStorage.getItem("token") + window.sessionStorage.clear() + localStorage.setItem("routerName","phoneHome") + next('/loginVerifyPhone') + }else{ + next('/blankPage') + } }else { next() } diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index deddf29b2..7dc5e94ff 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -880,6 +880,9 @@ label="适用车型" width="90" > + + {{filterApplyArctic(scope.row)}} + @@ -2096,6 +2099,14 @@ export default { props: {}, watch: {}, methods: { + filterApplyArctic(row){ + console.log(row) + if(row.applyArctic){ + return row.applyArctic.replaceAll('\"', '').replaceAll('\[', '').replaceAll('\]', '') + }else { + return "" + } + }, handleChangeList(data){ this.handleList = data }, @@ -3139,28 +3150,19 @@ export default { }, // 分解单----查看标准条款相关 selectSarStandItems(id, flag) { + this.tableLoading = true this.standItemSearch.standId = this.sarStandardsInfoEO.id this.standItemSearch.fileType = this.fileType + console.log("---------------------------------------------") this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', { ...this.standItemSearch, pageSize: this.pageSize7, page: this.page7, order: this.order, orderBy: this.orderBy }, {}, res => { this.selectedItemList = [] - if (res.ok) { - res.data.list.forEach(item => { - let k = (item.applyArctic || "").split(',') - for (let i in this.applyArcticOptions.options) { - for (let m = 0; m < k.length; m++) { - if (this.applyArcticOptions.options[i].value === k[m]) { - k[m] = this.applyArcticOptions.options[i].label - } - item.applyArctic = k.join(',') - } - } - item.applyArctic = item.applyArctic.replaceAll('\"', '').replaceAll('\[', '').replaceAll('\]', '') - }) + if (res.data) { this.standItemList = res.data.list; this.total7 = res.data.count // 分页需要 + this.tableLoading = false } }, e => { }) diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index 34e2c6c0c..b1ff66376 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -1051,8 +1051,10 @@ export default { batchDelete () { if (this.selectedList.length === 0) { this.$message.error('请选择要删除的数据') + return } if(this.selectedList.length > 10){ this.$message.error('批量删除仅支持10条以内') + return } else { this.$confirm('确认删除选择数据?', '确认删除', { confirmButtonText: '确定', diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index e6ef68362..edf2f57ed 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -1506,13 +1506,15 @@ export default { }, { _this: this }, res => { - if (res.data) { - this.batchDeleteItem() - } else if(this.selectedList === null){ - this.$message.warning('请确认选择条款是否有子节点,若有,则此次删除将全部删除。') - } else { - this.deleteItemsModal = true - } + // 接口判断作甚? COPY SQ 逻辑 + this.batchDeleteItem() + // if (res.data) { + // this.batchDeleteItem() + // } else if(this.selectedList === null){ + // this.$message.warning('请确认选择条款是否有子节点,若有,则此次删除将全部删除。') + // } else { + // this.deleteItemsModal = true + // } }, e => { }) } else { diff --git a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue index 408da7b5c..2db8bdde9 100644 --- a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue +++ b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue @@ -12,7 +12,7 @@
如果各项目符合法规情况相同,可同时勾选,第一个勾选项目合规排查结果,将代表所有勾选项目合规排查结果。