diff --git a/back/src/i18n/en-US.js b/back/src/i18n/en-US.js index 4bb6f13a..ac1a5b1f 100644 --- a/back/src/i18n/en-US.js +++ b/back/src/i18n/en-US.js @@ -25,6 +25,7 @@ t.choose = 'Please Choose' t.fileName = 'File Name' t.design = 'Online Design' t.preview = 'Preview' +t.reset='Reset' t.prompt = {} t.prompt.title = 'Prompt' diff --git a/back/src/i18n/zh-CN.js b/back/src/i18n/zh-CN.js index e78f7fd2..ac57932d 100644 --- a/back/src/i18n/zh-CN.js +++ b/back/src/i18n/zh-CN.js @@ -25,6 +25,7 @@ t.choose = '请选择' t.fileName = '文件名' t.design = '在线设计' t.preview = '预览' +t.reset='重置' t.prompt = {} t.prompt.title = '提示' @@ -548,14 +549,32 @@ t.notice.disconnectMessage = 'WebSocket连接已断开,请检查网络' t.projectList = {} t.projectList.projectName='项目名称' t.projectList.projectUnit='申请单位' -t.projectList.departm='责任处室' -t.projectList.date='申请日期' +t.projectList.department='责任处室' +t.projectList.applydate='申请日期' t.projectList.district='所属区市' t.projectList.contacts='业务联系人' t.projectList.contactstel='业务联系人电话' t.projectList.technology='技术联系人电话' t.projectList.technologytel='技术联系人电话' +t.dataresources={} +t.dataresources.componentType="组件类型" +t.dataresources.componentName="组件名称" +t.dataresources.putOnDate="上架时间" +t.dataresources.resourcesName="数据资源名称" +t.dataresources.resourcesCode="数据资源代码" +t.dataresources.resourcesProvide="数据资源提供方" +t.dataresources.resourcesAbstract="数据资源摘要" +t.dataresources.associatedApplication="关联应用" + +t.infrastructure={} +t.infrastructure.resourceCategory="资源类别" +t.infrastructure.resourceName="摄像头名称" +t.infrastructure.district="所在区市" +t.infrastructure.street="所在街道" +t.infrastructure.department="所属部门" +t.infrastructure.associatedApplication="关联应用" + diff --git a/back/src/i18n/zh-TW.js b/back/src/i18n/zh-TW.js index f4bcdec4..3e6f2cd5 100644 --- a/back/src/i18n/zh-TW.js +++ b/back/src/i18n/zh-TW.js @@ -25,6 +25,7 @@ t.choose = '請選擇' t.fileName = '文件名' t.design = '在線設計' t.preview = '預覽' +t.reset='重置' t.prompt = {} t.prompt.title = '提示' diff --git a/back/src/router/index.js b/back/src/router/index.js index de422fdd..b2f3777e 100644 --- a/back/src/router/index.js +++ b/back/src/router/index.js @@ -162,7 +162,7 @@ function fnAddDynamicMenuRoutes (menuList = [], routes = []) { route.meta.iframeURL = URL } else { const urlArr = URL.split('?') - debugger + // debugger URL = urlArr[0].replace(/^\//, '').replace(/_/g, '-') route.path = route.name = URL.replace(/\//g, '-') route.component = () => import(`@/views/modules/${URL}`) diff --git a/back/src/views/modules/ability/bsdataresources.vue b/back/src/views/modules/ability/bsdataresources.vue index 81ce44f8..b40ec90c 100644 --- a/back/src/views/modules/ability/bsdataresources.vue +++ b/back/src/views/modules/ability/bsdataresources.vue @@ -4,37 +4,30 @@
- + - + - + {{ $t('query') }} - {{ $t('add') }} + {{ $t('reset') }} - - - - - - - - - + + + + + @@ -78,9 +71,16 @@ export default { // AddOrUpdate }, methods: { - payHandle (orderId) { - window.open(`${window.SITE_CONFIG['apiURL']}/pay/alipay/webPay?orderId=` + orderId); - } + //重置 + resetDataList(){ + this.dataForm=this.noDataForm; + this.page=1; // 当前页码 + this.query(); + }, + //关联应用 + associatedApplication(){ + + } } } diff --git a/back/src/views/modules/ability/bsinfrastructure.vue b/back/src/views/modules/ability/bsinfrastructure.vue index cc64981f..6d3f4e4c 100644 --- a/back/src/views/modules/ability/bsinfrastructure.vue +++ b/back/src/views/modules/ability/bsinfrastructure.vue @@ -4,37 +4,26 @@
- + - - - - + {{ $t('query') }} - {{ $t('add') }} + {{ $t('reset') }} - - - - - - - - - + + + + @@ -78,9 +67,17 @@ export default { // AddOrUpdate }, methods: { - payHandle (orderId) { - window.open(`${window.SITE_CONFIG['apiURL']}/pay/alipay/webPay?orderId=` + orderId); - } + //重置 + resetDataList(){ + this.dataForm=this.noDataForm; + this.page=1; // 当前页码 + this.query(); + }, + //关联应用 + associatedApplication(){ + + } + } } diff --git a/back/src/views/modules/project/list.vue b/back/src/views/modules/project/list.vue index c144ba58..a3b62138 100644 --- a/back/src/views/modules/project/list.vue +++ b/back/src/views/modules/project/list.vue @@ -9,36 +9,28 @@ - + - + {{ $t('query') }} - {{ $t('add') }} + {{ $t('reset') }} - - - - - - - - - + + + + + +