diff --git a/src/components/pagination/index.vue b/src/components/pagination/index.vue index ce849e288..c3020523e 100644 --- a/src/components/pagination/index.vue +++ b/src/components/pagination/index.vue @@ -28,20 +28,24 @@ export default { this.$emit('pageChange', page) }, pageSizeChange (pageSize) { - if (this.getTypeFlag === 'CloudRepository') { - this.userInfo.configContent = pageSize - this.setUserInfo(JSON.stringify(JSON.parse(JSON.stringify(this.userInfo)))) - this.$emit('pageSizeChange', pageSize) - } else { - this.pageConfig(pageSize).then((res) => { - if (res.ok) { - this.userInfo.configContent = pageSize - this.setUserInfo(JSON.stringify(JSON.parse(JSON.stringify(this.userInfo)))) - this.$emit('pageSizeChange', pageSize) - } - }, e => { - }) - } + this.userInfo.configContent = pageSize + this.setUserInfo(JSON.stringify(JSON.parse(JSON.stringify(this.userInfo)))) + this.$emit('pageSizeChange', pageSize) + + // if (this.getTypeFlag === 'CloudRepository') { + // this.userInfo.configContent = pageSize + // this.setUserInfo(JSON.stringify(JSON.parse(JSON.stringify(this.userInfo)))) + // this.$emit('pageSizeChange', pageSize) + // } else { + // this.pageConfig(pageSize).then((res) => { + // if (res.ok) { + // this.userInfo.configContent = pageSize + // this.setUserInfo(JSON.stringify(JSON.parse(JSON.stringify(this.userInfo)))) + // this.$emit('pageSizeChange', pageSize) + // } + // }, e => { + // }) + // } }, /** * @description: 每页条数配置 diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index f2f82ff0f..a259242f2 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -4,6 +4,14 @@
+ + + - + + label="产品平台"> @@ -112,9 +120,25 @@ sortable > + + + + + @@ -123,31 +147,18 @@ + label="当前节点"> + label="项目级别"> - - - - - @@ -3772,6 +350,7 @@ export default { } } .contaiiner{ + height: calc(~'100% - 55px'); background: #fff; padding: 5px 10px; .el-card__body{ @@ -3900,6 +479,7 @@ export default { diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index b3dd00854..1ceed10c7 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -11,18 +11,18 @@

- {{ opinionList.standardNumber }} + {{ this.$route.query.item.categorg }}

- {{ opinionList.standardName || '-' }} + {{ this.$route.query.item.cname || '-' }}

- {{ opinionList.uploadTime || '-' }} + {{ this.$route.query.item.starttime || '-' }}

- {{ opinionList.opinionCycle || '-' }} + {{ this.$route.query.item.endtime || '-' }}

@@ -39,23 +39,33 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> + + + + @@ -106,59 +116,45 @@ export default { name: 'consultationDetails', data () { return { + spinShow: false, + total: 0, opiniontitle: '新增意见', isDialog: false, //新增抽屉状态 heightShow: true, isSubmit: false, - opinionList: { - standardNumber: 'GB 121-12', - standardName: '机动车安全运行条件', - uploadTime: '2002-11-23', - opinionCycle: '2001-02-21到 2012-02-02' - }, opinionContent: { number:'', content: '', }, - standinfoList: [{ - date: '1.1.2', - name: '文章内容不清晰', - }, { - date: '1.2.3.1', - name: '标准有错误', - }, { - date: '1.21.1', - name: '标准延时', - }, { - date: '1.21.1', - name: '实用性不高', - }, { - date: '1.2.31', - name: '不贴合国家标准', - }, ], - newModelPageConfig: { + standinfoList: [], + form: { + cid: this.$route.query.item.cid, page: 1, - total: 0 + size: this.$store.getters.userInfo.configContent } } }, methods: { - //分页数据改变 - handlePageChange(field, page) { - switch (field) { - case "newModel": - break; - case "": - break; - } + getList() { + this.spinShow = true + this.$http.get('sys/sar-public-idea-all/getallStand', this.form, { + _this: this + }, res => { + this.standinfoList = res.data.records + this.total = res.data.total + this.spinShow = false + }, e => { + }) }, - handlePageSizeChange(field, pageSize) { - switch (field) { - case "newModel": - break; - case "": - break; - } + //分页数据改变 + handlePageChange(page) { + this.form.page = page + this.getList() + }, + handlePageSizeChange(pageSize) { + this.$store.getters.userInfo.configContent = pageSize + this.form.size = pageSize + this.getList() }, back (){ this.$router.push({ @@ -214,7 +210,9 @@ export default { }, }, - mounted () {} + mounted () { + this.getList() + } } diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index aa1e74cb8..d38a94ea4 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,8 +6,8 @@ // 服务器地址 // const devIp = '192.168.10.211' // const devInterfacePORT = '8888' -const devIp = '39.98.140.126' -const devInterfacePORT = '10005' +const devIp = '192.168.10.145' +const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const simpleFilePath = 'att/attFile/upload'