diff --git a/src/common/axios/index.js b/src/common/axios/index.js index 7f9ac89d1..bd1faa601 100644 --- a/src/common/axios/index.js +++ b/src/common/axios/index.js @@ -211,6 +211,7 @@ export default { thenFun.call(this, res.data) } } else { + console.log(res.data) // 返回data数组 thenFun.call(this, res.data) } diff --git a/src/pages/home1/components/solicitopinions/index.vue b/src/pages/home1/components/solicitopinions/index.vue index 37a57b2b0..347efcbb6 100644 --- a/src/pages/home1/components/solicitopinions/index.vue +++ b/src/pages/home1/components/solicitopinions/index.vue @@ -3,8 +3,8 @@
@@ -34,16 +34,23 @@ export default { }, //获取数据 getAdvice() { - let obj = {} - obj.msgType = 'RESOURCE' - obj.rowLimit = 8 - this.$http.get('lawss/msgDynamicInfo/page', obj, { - _this: this - }, res => { - this.domesticDynamics = res.data.list - }, e => { - }) - } + this.$http.get('slrs/sar-public-idea/SelectAllPage', {}, { + _this: this + }, res => { + console.log('41',res) + this.domesticDynamics = res.data.records + }, e => { + + } ) + }, + standForComments (item) { + this.$router.push({ + name:'standardForComments', + params: { + id: item.id + } + },) + }, }, } diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 6058ed1af..07b8d55b1 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -5,8 +5,8 @@
- - + +
实施预警
@@ -293,105 +293,105 @@ @pageSizeChange="pageSize => handlePageSizeChange('oldStand', pageSize)">
-
- -
-
实施预警
-
-
- 新车型实施日期预警 -
- - - - - - - - - - - - - - -
- -
-
- 在产车实施日期预警 -
- - - - - - - - - - - - - - -
- -
-
-
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -468,6 +468,7 @@ export default { }, { _this: this },res => { + console.log(res.data); const result = res.data[0] for (const field in result) { this[field] = result[field].records @@ -565,16 +566,17 @@ export default { type: 'warning', roundButton: false }).then(() => { + console.log(569) this.$http.get('sys/EarlyWarning/ChangePermissions', { id: row.id, - }, res => { + }, {}, res => { this.pageConfig.newItemsPage = 1 this.pageConfig.oldItemsPage = 1 this.pageConfig.newStandPage = 1 this.pageConfig.oldStandPage = 1 this.pageConfig.newPolicyPage = 1 this.pageConfig.oldPolicyPage = 1 - this.activeName === 'STANDARD' ? this.getEarlyDate() : this.getPolicyDate() + this.getEarlyDate() } ) }).catch(() => { @@ -636,28 +638,6 @@ export default { }, e => { }); }, - // queryProductionVehicleByPage() { - // this.$http.get("sys/EarlyWarning/StandWarning", { - // sarPutType: "ZCCSSRQ", - // pageSize: 5 - // }, { - // _this: this - // }, res => { - // this.productionVehicleDatas = res.data.list; - // }, e => { - // }); - // }, - // queryNewTypeByPage() { - // this.$http.get("sys/EarlyWarning/StandWarning", { - // sarPutType: "XCXSSRQ", - // pageSize: 5 - // }, { - // _this: this - // }, res => { - // // this.newTypeDatas = res.data.list; - // }, e => { - // }); - // }, /** * @description: 日期转换 * @author: chenxiaoxi diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index a259242f2..7120ae3a5 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -79,8 +79,8 @@ style="width: 100%" border :height="tableHeight" - :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', - fontWeight: 'bold', height: '48px'}" + :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px', + fontWeight: 'normal', height: '48px'}" @selection-change="handleSelectionChange">