From ca66921d3e1d4ff6aa31fbe032ac94aa8c6454f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A4=8F=E6=99=96?= Date: Wed, 13 Oct 2021 19:33:16 +0800 Subject: [PATCH 1/4] Update index.js --- src/sysConfig/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 23dbde637..d7c2e68b8 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -12,9 +12,9 @@ const devInterfacePORT = '8033' // 配置 idm 认证 const ssoLogin = 'http://testsso1.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri=' // 配置 前端服务 -const devWebUrl = 'http://127.0.0.1:10088/#/' +const devWebUrl = 'http://62.234.136.153:8038/#/' // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录) -const webLoginType = 'dev' +const webLoginType = 'idm' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const simpleFilePath = 'att/attFile/upload' From 5ad327884a1babf9188d596b180a46bddcd53d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A4=8F=E6=99=96?= Date: Thu, 14 Oct 2021 09:07:16 +0800 Subject: [PATCH 2/4] Update index.js --- src/sysConfig/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index d7c2e68b8..4175716f1 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -14,7 +14,7 @@ const ssoLogin = 'http://testsso1.foton.com.cn/oauth2.0/authorize?client_id=app_ // 配置 前端服务 const devWebUrl = 'http://62.234.136.153:8038/#/' // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录) -const webLoginType = 'idm' +const webLoginType = 'dev' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const simpleFilePath = 'att/attFile/upload' From b0f07ed40e6f8bf9b0a86a7c0ee6c325cb953aab Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 22 Oct 2021 16:01:43 +0800 Subject: [PATCH 3/4] feat: There is no way the, TO optimize the query --- .../domesticStandardsAndRegulations/index.vue | 131 +++++++++--------- .../components/EnterpriseStandardDatabase.vue | 129 ++++++++--------- .../foreignStandardsAndRegulations/index.vue | 125 +++++++++-------- 3 files changed, 200 insertions(+), 185 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index fbdf3a6e4..9b9284961 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2757,69 +2757,74 @@ export default { window.open(routeUrl.href, '_blank') }, // 编辑标准属性 - selectStandardPro(item, state) { - this.id = item.id - this.collectId = item.collectId - this.addOrUPdateFlag = 2 - this.modalshowtitle = '编辑国内标准' - this.modalshowflag = true - this.resolveFormFieldList(item.isRelateAccess) - this.$nextTick(() => { - Promise.all([this.queryDisplayLocation()]).then((values) => { - const [displayLocation] = values - const formFieldList = this.formFieldList - this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) - if (this.sarStandardsInfoEO.standSystem) { - this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; - } - this.sarStandardsInfoEO.standSort = item.standSort - if (this.sarStandardsInfoEO.putTime != null && this.sarStandardsInfoEO.putTime !== '') { - this.sarStandardsInfoEO.putTime = this.sarStandardsInfoEO.putTime.replace(new RegExp(/-/gm), '/') - this.sarStandardsInfoEO.putTime = new Date(this.sarStandardsInfoEO.putTime) - } - Object.keys(item.attrInfoMap || {}).forEach((key) => { - if (item.attrInfoMap[key]) { - this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key] === '[]' ? '' : item.attrInfoMap[key]) - } - }) - const dynamicFormField = this.sarStandardsInfoEO - this.sarStandardsInfoEO.EOPSSRQ = this.$moment(this.sarStandardsInfoEO.EOPSSRQ).isValid() ? this.$moment(this.sarStandardsInfoEO.EOPSSRQ) : this.sarStandardsInfoEO.EOPSSRQ - this.sarStandardsInfoEO['id'] = item.id - this.standState = JSON.parse(JSON.stringify(this.sarStandardsInfoEO.standState)) - formFieldList.forEach((field) => { - displayLocation.forEach((location) => { - let value = this.sarStandardsInfoEO[field.attrField] - let valueName = '' - if (value && field.attrType === 'DATE_PICKER') { - value = this.$moment(value).format('YYYY-MM-DD') - } - if (field.attrField === 'CYCVPPSBM') { - this.defaultCheckedKeys1 = [value] - } - if (field.attrField === 'KCCVPPSBM') { - this.defaultCheckedKeys2 = [value] - } - if (field.attrField === 'DYBXH') { - this.defaultCheckedKeys3 = [value] - } - field['value'] = value - // 追加用户名称和部门名称和SVPPS名称 - // if (field.selVal === 'ROLELIST' || field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS' || field.attrField === 'XMPGJS') { - // let attrFieldName = field.attrField + 'Name' - // valueName = dynamicFormField[attrFieldName] - // } - // field['valueName'] = valueName - if (field.showRegionId === location.value) { - if (!location.child) { - location['child'] = [] - } - location['child'].push(field) - } - }) - }) - this.dynamicFormField = displayLocation - this.loading = false - }) + selectStandardPro(row, state) { + this.id = row.id + this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: row.id}, { + _this: this + }, res => { + const item = res.data || {} + this.collectId = item.collectId + this.addOrUPdateFlag = 2 + this.modalshowtitle = '编辑国内标准' + this.modalshowflag = true + this.resolveFormFieldList(item.isRelateAccess) + this.$nextTick(() => { + Promise.all([this.queryDisplayLocation()]).then((values) => { + const [displayLocation] = values + const formFieldList = this.formFieldList + this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) + if (this.sarStandardsInfoEO.standSystem) { + this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; + } + this.sarStandardsInfoEO.standSort = item.standSort + if (this.sarStandardsInfoEO.putTime != null && this.sarStandardsInfoEO.putTime !== '') { + this.sarStandardsInfoEO.putTime = this.sarStandardsInfoEO.putTime.replace(new RegExp(/-/gm), '/') + this.sarStandardsInfoEO.putTime = new Date(this.sarStandardsInfoEO.putTime) + } + Object.keys(item.attrInfoMap || {}).forEach((key) => { + if (item.attrInfoMap[key]) { + this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key] === '[]' ? '' : item.attrInfoMap[key]) + } + }) + const dynamicFormField = this.sarStandardsInfoEO + this.sarStandardsInfoEO.EOPSSRQ = this.$moment(this.sarStandardsInfoEO.EOPSSRQ).isValid() ? this.$moment(this.sarStandardsInfoEO.EOPSSRQ) : this.sarStandardsInfoEO.EOPSSRQ + this.sarStandardsInfoEO['id'] = item.id + this.standState = JSON.parse(JSON.stringify(this.sarStandardsInfoEO.standState)) + formFieldList.forEach((field) => { + displayLocation.forEach((location) => { + let value = this.sarStandardsInfoEO[field.attrField] + let valueName = '' + if (value && field.attrType === 'DATE_PICKER') { + value = this.$moment(value).format('YYYY-MM-DD') + } + if (field.attrField === 'CYCVPPSBM') { + this.defaultCheckedKeys1 = [value] + } + if (field.attrField === 'KCCVPPSBM') { + this.defaultCheckedKeys2 = [value] + } + if (field.attrField === 'DYBXH') { + this.defaultCheckedKeys3 = [value] + } + field['value'] = value + // 追加用户名称和部门名称和SVPPS名称 + // if (field.selVal === 'ROLELIST' || field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS' || field.attrField === 'XMPGJS') { + // let attrFieldName = field.attrField + 'Name' + // valueName = dynamicFormField[attrFieldName] + // } + // field['valueName'] = valueName + if (field.showRegionId === location.value) { + if (!location.child) { + location['child'] = [] + } + location['child'].push(field) + } + }) + }) + this.dynamicFormField = displayLocation + this.loading = false + }) + }) }) }, // 修改过程中，将resId 修改成 attid diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 97c75f62e..7f861eec9 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -2669,71 +2669,76 @@ export default { window.open(routeUrl.href, '_blank') }, // 编辑 - selectStandardPro (item, state) { - this.drawerTitle = '修改企业标准' - this.modalshowflag = true - this.resolveFormFieldList(true) - this.$nextTick(() => { - Promise.all([this.queryDisplayLocation()]).then((values) => { - const [displayLocation] = values - const dynamicFormField = this.sarBussionessStandEO - const formFieldList = this.formFieldList - formFieldList.forEach((field) => { - displayLocation.forEach((location) => { - let value = dynamicFormField[field.attrField] - let valueName = '' - if (value && typeof value === 'number') { - value = this.$dateFormat(value, 'yyyy-MM-dd') - } - field['value'] = value - // 追加用户名称和部门名称 - if (field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS') { - let attrFieldName = field.attrField + 'Name' - valueName = dynamicFormField[attrFieldName] - } - field['valueName'] = valueName - if (field.showRegionId === location.value) { - if (!location.child) { - location['child'] = [] + selectStandardPro (row, state) { + this.$http.get('lawss/sarBussionessStand/getStandInfoUpdateById', {id: row.id}, { + _this: this + }, res => { + const item = res.data || {} + this.drawerTitle = '修改企业标准' + this.modalshowflag = true + this.resolveFormFieldList(true) + this.$nextTick(() => { + Promise.all([this.queryDisplayLocation()]).then((values) => { + const [displayLocation] = values + const dynamicFormField = this.sarBussionessStandEO + const formFieldList = this.formFieldList + formFieldList.forEach((field) => { + displayLocation.forEach((location) => { + let value = dynamicFormField[field.attrField] + let valueName = '' + if (value && typeof value === 'number') { + value = this.$dateFormat(value, 'yyyy-MM-dd') + } + field['value'] = value + // 追加用户名称和部门名称 + if (field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS') { + let attrFieldName = field.attrField + 'Name' + valueName = dynamicFormField[attrFieldName] + } + field['valueName'] = valueName + if (field.showRegionId === location.value) { + if (!location.child) { + location['child'] = [] + } + location['child'].push(field) + } + }) + }) + this.dynamicFormField = displayLocation + this.loading = false + }) + this.sarBussionessStandEO = JSON.parse(JSON.stringify(item)) + this.sarBussionessStandEO["XCSJBUSS"] = this.dateFormatter() + this.standStatus = JSON.parse(JSON.stringify(this.sarBussionessStandEO.standStatus)) + let subClass = item.standSubclass + this.sarBussionessStandEO.standSubclass = subClass + if (this.sarBussionessStandEO.issueTime != null && this.sarBussionessStandEO.issueTime !== '') { + this.sarBussionessStandEO.issueTime = new Date(this.sarBussionessStandEO.issueTime) + } + if (this.sarBussionessStandEO.putTime != null && this.sarBussionessStandEO.putTime !== '') { + this.sarBussionessStandEO.putTime = new Date(this.sarBussionessStandEO.putTime) + } + Object.keys(item.attrInfoMap || {}).forEach((key) => { + if (item.attrInfoMap[key]) { + // this.sarStandardsInfoEO[key] = item.attrInfoMap[key] + this.$set(this.sarBussionessStandEO, key, item.attrInfoMap[key]) + } + }) + this.sarBussionessStandEO['id'] = item.id + if (state === 'show') { + this.formdisableflag = true + } else { + // this.standGeneraSelectChange() // 负责细类初始化 + // this.getOrgTreeSource() + this.addOrUPdateFlag = 2 + this.formdisableflag = false + this.saveOldNum = item.standCode // 记录修改之前的标准编号 + this.saveOldReplaceNum = item.replaceStandNum // 记录修改之前的代替标准编号 + // let selectNode = this.getTreeNameByid(this.sarBussionessStandEO.responsibleUnit) + this.sarBussionessStandEO.orgName = item.responsibleUnitShow } - location['child'].push(field) - } }) - }) - this.dynamicFormField = displayLocation - this.loading = false }) - this.sarBussionessStandEO = JSON.parse(JSON.stringify(item)) - this.sarBussionessStandEO["XCSJBUSS"] = this.dateFormatter() - this.standStatus = JSON.parse(JSON.stringify(this.sarBussionessStandEO.standStatus)) - let subClass = item.standSubclass - this.sarBussionessStandEO.standSubclass = subClass - if (this.sarBussionessStandEO.issueTime != null && this.sarBussionessStandEO.issueTime !== '') { - this.sarBussionessStandEO.issueTime = new Date(this.sarBussionessStandEO.issueTime) - } - if (this.sarBussionessStandEO.putTime != null && this.sarBussionessStandEO.putTime !== '') { - this.sarBussionessStandEO.putTime = new Date(this.sarBussionessStandEO.putTime) - } - Object.keys(item.attrInfoMap || {}).forEach((key) => { - if (item.attrInfoMap[key]) { - // this.sarStandardsInfoEO[key] = item.attrInfoMap[key] - this.$set(this.sarBussionessStandEO, key, item.attrInfoMap[key]) - } - }) - this.sarBussionessStandEO['id'] = item.id - if (state === 'show') { - this.formdisableflag = true - } else { - // this.standGeneraSelectChange() // 负责细类初始化 - // this.getOrgTreeSource() - this.addOrUPdateFlag = 2 - this.formdisableflag = false - this.saveOldNum = item.standCode // 记录修改之前的标准编号 - this.saveOldReplaceNum = item.replaceStandNum // 记录修改之前的代替标准编号 - // let selectNode = this.getTreeNameByid(this.sarBussionessStandEO.responsibleUnit) - this.sarBussionessStandEO.orgName = item.responsibleUnitShow - } - }) }, // 部门树结构，通过id，查出对应的树节点 getTreeNameByid (treeid) { diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 3d30c9147..659cb481f 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -2576,75 +2576,80 @@ export default { window.open(routeUrl.href, '_blank') }, // 编辑标准属性 - selectStandardPro(item, state) { + selectStandardPro(row, state) { // this.sarStandardsInfoEO.country=JSON.parse(item.country ); // console.log(this.sarStandardsInfoEO.country); - - this.addOrUPdateFlag = 2 - this.modalshowtitle = '编辑海外标准' - this.modalshowflag = true - this.resolveFormFieldList(item.isRelateAccess) - this.$nextTick(() => { - Promise.all([this.queryDisplayLocation()]).then((values) => { - const [displayLocation] = values - const formFieldList = this.formFieldList - this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) - this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; - if (item.country !== undefined && item.country !== null && item.country !== '') { - this.sarStandardsInfoEO.country = item.country.split(","); - } - this.sarStandardsInfoEO.standSort = item.standSort - if (this.sarStandardsInfoEO.putTime != null && this.sarStandardsInfoEO.putTime !== '') { - this.sarStandardsInfoEO.putTime = this.sarStandardsInfoEO.putTime.replace(new RegExp(/-/gm), '/') - this.sarStandardsInfoEO.putTime = new Date(this.sarStandardsInfoEO.putTime) - } - Object.keys(item.attrInfoMap || {}).forEach((key) => { - item.attrInfoMap[key] = item.attrInfoMap[key] === null ? '' : item.attrInfoMap[key] - if (item.attrInfoMap[key] || item.attrInfoMap[key] === '') { - this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key] === '[]' ? '' : item.attrInfoMap[key]) + this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: row.id}, { + _this: this + }, res => { + const item = res.data || {} + this.addOrUPdateFlag = 2 + this.modalshowtitle = '编辑海外标准' + this.modalshowflag = true + this.resolveFormFieldList(item.isRelateAccess) + this.$nextTick(() => { + Promise.all([this.queryDisplayLocation()]).then((values) => { + const [displayLocation] = values + const formFieldList = this.formFieldList + this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) + this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; + if (item.country !== undefined && item.country !== null && item.country !== '') { + this.sarStandardsInfoEO.country = item.country.split(","); } - }) - const dynamicFormField = this.sarStandardsInfoEO - - this.sarStandardsInfoEO.EOPSSRQ = this.sarStandardsInfoEO.EOPSSRQ !== 'N/A' && this.sarStandardsInfoEO.EOPSSRQ !== 'TBD' ? this.$moment(this.sarStandardsInfoEO.EOPSSRQ) : this.sarStandardsInfoEO.EOPSSRQ - this.sarStandardsInfoEO['id'] = item.id - this.standState = JSON.parse(JSON.stringify(this.sarStandardsInfoEO.standState)) - formFieldList.forEach((field) => { - displayLocation.forEach((location) => { - let value = dynamicFormField[field.attrField] - let valueName = '' - if (value && field.attrType === 'DATE_PICKER') { - value = this.$moment(value).format('YYYY-MM-DD') - } - if (field.attrField === 'CYCVPPSBM') { - this.defaultCheckedKeys1 = [value] - } - if (field.attrField === 'KCCVPPSBM') { - this.defaultCheckedKeys2 = [value] - } - if (field.attrField === 'DYBXH') { - this.defaultCheckedKeys3 = [value] - } - field['value'] = value - // 追加用户名称和部门名称 - if (field.selVal === 'ROLELIST' || field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS' || field.attrField === 'XMPGJS') { - let attrFieldName = field.attrField + 'Name' - valueName = dynamicFormField[attrFieldName] - } - field['valueName'] = valueName - if (field.showRegionId === location.value) { - if (!location.child) { - location['child'] = [] - } - location['child'].push(field) + this.sarStandardsInfoEO.standSort = item.standSort + if (this.sarStandardsInfoEO.putTime != null && this.sarStandardsInfoEO.putTime !== '') { + this.sarStandardsInfoEO.putTime = this.sarStandardsInfoEO.putTime.replace(new RegExp(/-/gm), '/') + this.sarStandardsInfoEO.putTime = new Date(this.sarStandardsInfoEO.putTime) + } + Object.keys(item.attrInfoMap || {}).forEach((key) => { + item.attrInfoMap[key] = item.attrInfoMap[key] === null ? '' : item.attrInfoMap[key] + if (item.attrInfoMap[key] || item.attrInfoMap[key] === '') { + this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key] === '[]' ? '' : item.attrInfoMap[key]) } }) + const dynamicFormField = this.sarStandardsInfoEO + + this.sarStandardsInfoEO.EOPSSRQ = this.sarStandardsInfoEO.EOPSSRQ !== 'N/A' && this.sarStandardsInfoEO.EOPSSRQ !== 'TBD' ? this.$moment(this.sarStandardsInfoEO.EOPSSRQ) : this.sarStandardsInfoEO.EOPSSRQ + this.sarStandardsInfoEO['id'] = item.id + this.standState = JSON.parse(JSON.stringify(this.sarStandardsInfoEO.standState)) + formFieldList.forEach((field) => { + displayLocation.forEach((location) => { + let value = dynamicFormField[field.attrField] + let valueName = '' + if (value && field.attrType === 'DATE_PICKER') { + value = this.$moment(value).format('YYYY-MM-DD') + } + if (field.attrField === 'CYCVPPSBM') { + this.defaultCheckedKeys1 = [value] + } + if (field.attrField === 'KCCVPPSBM') { + this.defaultCheckedKeys2 = [value] + } + if (field.attrField === 'DYBXH') { + this.defaultCheckedKeys3 = [value] + } + field['value'] = value + // 追加用户名称和部门名称 + if (field.selVal === 'ROLELIST' || field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS' || field.attrField === 'XMPGJS') { + let attrFieldName = field.attrField + 'Name' + valueName = dynamicFormField[attrFieldName] + } + field['valueName'] = valueName + if (field.showRegionId === location.value) { + if (!location.child) { + location['child'] = [] + } + location['child'].push(field) + } + }) + }) + this.dynamicFormField = displayLocation + this.loading = false }) - this.dynamicFormField = displayLocation - this.loading = false }) }) + }, // 查询二级菜单 selectChildMenu(row) { From 2dce246427a6f5242d1509c1d0e8457050a1f21a Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 22 Oct 2021 17:08:45 +0800 Subject: [PATCH 4/4] feat: There is no way the, TO optimize the query --- .../domesticStandardsAndRegulations/index.vue | 13 ++++--------- .../foreignStandardsAndRegulations/index.vue | 12 +++--------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 9b9284961..461fd431f 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3758,15 +3758,10 @@ export default { res.data.list[i].cancelCollectBtn = false } res.data.list[i].isSubmit = false - if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.XCXSSRQ) { - res.data.list[i].XCXSSRQ = res.data.list[i].attrInfoMap.XCXSSRQ - } - if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.ZCCSSRQ) { - res.data.list[i].ZCCSSRQ = res.data.list[i].attrInfoMap.ZCCSSRQ - } - if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.SSRQ) { - res.data.list[i].SSRQ = res.data.list[i].attrInfoMap.SSRQ - } + res.data.list[i].XCXSSRQ = res.data.list[i].xcxssrq + res.data.list[i].ZCCSSRQ = res.data.list[i].zccssrq + res.data.list[i].SSRQ = res.data.list[i].ssrq + } this.stahndinfoList = res.data.list this.total = res.data.count diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 659cb481f..c4793f3c6 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -3531,15 +3531,9 @@ export default { res.data.list[i].cancelCollectBtn = false } res.data.list[i].isSubmit = false - if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.XCXSSRQ) { - res.data.list[i].XCXSSRQ = res.data.list[i].attrInfoMap.XCXSSRQ.split(',')[0] - } - if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.ZCCSSRQ) { - res.data.list[i].ZCCSSRQ = res.data.list[i].attrInfoMap.ZCCSSRQ.split(',')[0] - } - if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.SSRQ) { - res.data.list[i].SSRQ = res.data.list[i].attrInfoMap.SSRQ - } + res.data.list[i].XCXSSRQ = res.data.list[i].xcxssrq + res.data.list[i].ZCCSSRQ = res.data.list[i].zccssrq + res.data.list[i].SSRQ = res.data.list[i].ssrq } this.stahndinfoList = res.data.list this.total = res.data.count