diff --git a/src/assets/languages/cn.js b/src/assets/languages/cn.js index 5e38c6dea..ce849b0be 100644 --- a/src/assets/languages/cn.js +++ b/src/assets/languages/cn.js @@ -63,7 +63,7 @@ export const m = { issueTime: '发布日期', putTime: '实施日期', standNatureShow: '标准性质', - standStateShow: '标准状态', + standStateShow: '文本状态', action: '操作', see: '查看', stand: '标准/文件性质', diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index a88f1d77d..1e9df0481 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -5,9 +5,6 @@
{{sarStandardsInfoEO.standSortShow || ''}} {{sarStandardsInfoEO.standNumber}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 标准详情
-
- 9.5分 -
@@ -34,12 +31,12 @@ - {{ sarStandardsInfoEO.standStateShow || '-' }} + {{ sarStandardsInfoEO.textStatus || '-' }}

{{ sarStandardsInfoEO.issueTime || '-' }}

-

{{ sarStandardsInfoEO.synopsis || '-' }}

-

{{ sarStandardsInfoEO.isRelateAccess === '1' ? 'A' : 'B'}}

-

{{ sarStandardsInfoEO.accessCountry || '-' }}

+ + +
{ location.isShowImp = '0' if (dynamicFormField) { @@ -2801,17 +2802,6 @@ export default { width: 100%; } } - .details-fraction{ - float: right; - width:270px; - height:80px; - line-height: 80px; - text-align: center; - font-size: 30px; - font-weight: bold; - color: #e88218; - margin-top: -80px; - } /deep/.details-content{ /*padding: 0 67px;*/ .details-content-modular{ diff --git a/src/pages/home1/components/empennage/index.vue b/src/pages/home1/components/empennage/index.vue index ed62d26ff..61bc7037d 100644 --- a/src/pages/home1/components/empennage/index.vue +++ b/src/pages/home1/components/empennage/index.vue @@ -2,14 +2,9 @@ @@ -20,12 +15,54 @@ export default { components: {}, mixins: [], data() { - return {} + return { + linkList: [ + { + newWebSite: 'http://www.sac.gov.cn/', + webName: '国家标准化管理委员会' + }, + { + newWebSite: 'http://std.samr.gov.cn/', + webName: '全国标准公共服务平台' + }, + { + newWebSite: 'http://www.catarc.org.cn/', + webName: '全国汽车标准化技术委员会' + }, + { + newWebSite: 'http://jtst.mot.gov.cn/news/', + webName: '交通运输标准化信息平台' + }, + { + newWebSite: 'http://www.miit-eidc.org.cn/', + webName: '工信部装备工业发展中心' + }, + { + newWebSite: 'http://www.mee.gov.cn/', + webName: '中华人民共和国生态环境部' + }, + { + newWebSite: '', + webName: '更多链接>' + } + ] + } }, computed: {}, watch: {}, mounted() {}, - methods: {}, + methods: { + // 跳转链接 + openLinkUrl (linkUri) { + let getHttp = linkUri.substring(0, 7) + let getHttps = linkUri.substring(0, 8) + if (getHttp === 'http://' || getHttps === 'https://') { + window.open(linkUri) + } else { + window.open('https://' + linkUri) + } + }, + }, } diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index bda33b3c6..4a3275424 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -164,7 +164,7 @@ @@ -173,7 +173,7 @@ @@ -183,13 +183,13 @@ + label="文本状态"> @@ -304,9 +304,9 @@ - - 文本状态 + @@ -758,8 +758,8 @@ @@ -840,7 +840,8 @@ 确认
- +
@@ -862,39 +863,35 @@ :options="standSortOptions" clearable/> - + - {{ opt.label}} - - + + {{ opt.label}} + - + + {{ opt.label}} + - {{ opt.label}} @@ -1012,7 +1009,7 @@ export default { standSortOptions: [], // 标准类别下拉框 standSortConfigOptions: [], // 标准类别下拉框 applyArcticOptions: [], // 适用车型下拉框 - standStateOptions: [], // 标准状态下拉框 + standStateOptions: [], // 文本状态下拉框 standNatureOptions: [], // 标准性质下拉框 adoptExtentOptions: [], // 采标程度下拉框 emergyKindOptions: [], // 能源种类下拉框 @@ -1517,7 +1514,7 @@ export default { this.threeOptions = this.countryOptions } else if (val === 'stand_sort') { this.threeOptions = this.standSortOptions - } else if (val === 'stand_state') { + } else if (val === 'stand_state_show') { this.threeOptions = this.standStateOptions } else if (val === 'stand_nature') { this.threeOptions = this.standNatureOptions @@ -1633,7 +1630,6 @@ export default { this.modalshowtitle = '编辑国内标准' this.modalshowflag = true this.resolveFormFieldList(item.isRelateAccess) - this.$nextTick(() => { Promise.all([this.queryDisplayLocation()]).then((values) => { const [displayLocation] = values @@ -1799,13 +1795,19 @@ export default { this.getDomesticStandardTable(item) }, // 搜索 - getDomesticStandardTableBtn (advancedSearch) { - let item = {} - item.page = 1 - item.advanceSearchStr = '' - item.advanceSearchVOStr = JSON.stringify(advancedSearch) || '' - this.getDomesticStandardTable(item) + getDomesticStandardTableBtn (item) { + this.tableFlag = item + item.page = 1 + item.sarStandardsSearch = '' + this.getDomesticStandardTable(item) }, + // getDomesticStandardTableBtn (advancedSearch) { + // let item = {} + // item.page = 1 + // item.advanceSearchStr = '' + // item.advanceSearchVOStr = JSON.stringify(advancedSearch) || '' + // this.getDomesticStandardTable(item) + // }, // 清空搜索框 clearAllSearch (flag) { if (flag === 'sarStandardsSearch') { @@ -1849,9 +1851,8 @@ export default { }, // 高级检索 selectMoreBtn () { - console.log('检索窗口') this.isAdvancedSearch = true - this.threeOptions = [] + this.sarStandardsSearch = [] }, treeCollapse () { this.sideClose = !this.sideClose @@ -2389,7 +2390,7 @@ export default { sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField] }) nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'") - this.$http.postData(this.addOrUPdateFlag === 1 ? 'lawss/sarStandardsInfo/addarStandardsInfo' : 'lawss/sarStandardsInfo/updateSarStandardsInfo', nowstandinfo, { + this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'lawss/sarStandardsInfo/updateSarStandardsInfo', nowstandinfo, { _this: this }, res => { this.isSubmit = false @@ -2508,7 +2509,7 @@ export default { this.sarConfigStandSearch.page = this.configPage // this.sarConfigStandSearch.pageSize = this.configRows this.sarConfigStandSearch.pageSize = this.$store.getters.userInfo.configContent - this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.sarConfigStandSearch, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarConfigStandSearch, { _this: this, loading: 'loading' }, res => { @@ -2675,7 +2676,7 @@ export default { // this.replaceStandNumForm.quoteIdList = this.sarStandardsInfoEO.replaceStandNumId.toString() // (this.replaceStandNumForm.quoteIdList) // } - this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.replaceStandNumForm, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceStandNumForm, { _this: this // loading: 'lawsExplainQuoteFormLoading' }, res => { @@ -2907,7 +2908,7 @@ export default { if (this.sarStandardsInfoEO.lawsExplainQuote !== null && this.sarStandardsInfoEO.lawsExplainQuote !== '') { this.lawsExplainQuoteForm.quoteIdList = this.sarStandardsInfoEO.lawsExplainQuote.toString() } - this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.lawsExplainQuoteForm, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.lawsExplainQuoteForm, { _this: this, loading: 'lawsExplainQuoteFormLoading' }, res => { @@ -3208,8 +3209,8 @@ export default { disabled: false }, { - label: '标准状态', - value: 'stand_state', + label: '文本状态', + value: 'stand_state_show', type: 'SEL_OPTION', disabled: false }, @@ -3283,7 +3284,7 @@ export default { */ queryDisplayLocation () { return new Promise((resolve, reject) => { - this.$http.get('sarStandardsInfo/sar-standards-info/addarStandardsInfo', { + this.$http.get('lawssBase/utArea/getAreaList', { sarType: this.sarType }, { _this: this @@ -3342,7 +3343,7 @@ export default { } // isEdit 为0 标准状态不是必填 if (isEdit === '0') { - rules.standState = [{required: false, message: '标准状态不能为空', trigger: 'change'}] + rules.standState = [{required: false, message: '文本状态不能为空', trigger: 'change'}] rules.issueTime = [{required: false, message: '发布日期不能为空', trigger: 'change'}] } if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') {