diff --git a/src/assets/font/font.css b/src/assets/font/font.css index 646a5cd..930bb61 100644 --- a/src/assets/font/font.css +++ b/src/assets/font/font.css @@ -17,4 +17,9 @@ @font-face { font-family: 'Regular'; src: url("./tell/Alibaba-PuHuiTi-Regular.otf"); +} + +@font-face { + font-family: 'Alibaba PuHuiTi'; + src: url("./tell/Alibaba-PuHuiTi-Regular.otf"); } \ No newline at end of file diff --git a/src/views/bigpage/bigcomponents/AdverseBox.vue b/src/views/bigpage/bigcomponents/AdverseBox.vue index fb3fbd2..5bcea7f 100644 --- a/src/views/bigpage/bigcomponents/AdverseBox.vue +++ b/src/views/bigpage/bigcomponents/AdverseBox.vue @@ -74,27 +74,41 @@ export default { }, methods: { getData() { - getDrugBL({ name: "国药准字B20020034" }).then((res) => { - this.$nextTick(() => { - let chartDom = this.$refs["bottom-box"]; - this.myChart1 = echarts.init(chartDom); - this.initEcharts(); + let newRouter = this.$route.query; + console.log(newRouter.type); + if (newRouter.type == 1) { + //药品 + getDrugBL({ name: newRouter.code }).then((res) => { + console.log(res); + this.$nextTick(() => { + let chartDom = this.$refs["bottom-box"]; + this.myChart1 = echarts.init(chartDom); + this.initEcharts(); + }); }); - }); - getCosmeticsBL({}).then(res=>{ - this.$nextTick(() => { - let chartDom = this.$refs["bottom-box"]; - this.myChart1 = echarts.init(chartDom); - this.initEcharts(); + } + if (newRouter.type != 1 && newRouter.type != 2) { + //化妆品 + getCosmeticsBL({ name: newRouter.code }).then((res) => { + console.log(res); + this.$nextTick(() => { + let chartDom = this.$refs["bottom-box"]; + this.myChart1 = echarts.init(chartDom); + this.initEcharts(); + }); }); - }) - getMedicalDevicesBL({}).then(res=>{ - this.$nextTick(() => { - let chartDom = this.$refs["bottom-box"]; - this.myChart1 = echarts.init(chartDom); - this.initEcharts(); + } + if (newRouter.type == 2) { + //医疗器械 + getMedicalDevicesBL({ name: newRouter.code }).then((res) => { + console.log(res); + this.$nextTick(() => { + let chartDom = this.$refs["bottom-box"]; + this.myChart1 = echarts.init(chartDom); + this.initEcharts(); + }); }); - }) + } }, initEcharts() { this.option1 = { @@ -451,7 +465,7 @@ export default { font-family: Alibaba PuHuiTi; font-weight: 400; color: #ffffff; - background: linear-gradient(0deg,#ffffff 0%, #d21b1b 100%); + background: linear-gradient(0deg, #ffffff 0%, #d21b1b 100%); -webkit-background-clip: text; -webkit-text-fill-color: transparent; margin-right: 5px; diff --git a/src/views/bigpage/bigcomponents/ChangeinformationList.vue b/src/views/bigpage/bigcomponents/ChangeinformationList.vue index 77707c2..7b90b67 100644 --- a/src/views/bigpage/bigcomponents/ChangeinformationList.vue +++ b/src/views/bigpage/bigcomponents/ChangeinformationList.vue @@ -7,6 +7,7 @@ element-loading-text="加载中..." element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" + height="208" stripe style="width: 100%; background-color: transparent" > @@ -67,7 +68,7 @@ export default { tableData: [], query: { current: 1, - size: 5, + size: 10, name: "", }, total: 0, @@ -80,6 +81,8 @@ export default { }, methods: { getList() { + let newRouter = this.$route.query; + this.query.name = newRouter.code; this.load1 = true; getDrugChange(this.query).then((res) => { this.tableData = res.data.records; diff --git a/src/views/bigpage/bigcomponents/informationBox.vue b/src/views/bigpage/bigcomponents/informationBox.vue index 26aba5b..3ef268a 100644 --- a/src/views/bigpage/bigcomponents/informationBox.vue +++ b/src/views/bigpage/bigcomponents/informationBox.vue @@ -41,7 +41,7 @@ + } +} + \ No newline at end of file diff --git a/src/views/components/Pagination.vue b/src/views/components/Pagination.vue index cdf6b2d..cf40b52 100644 --- a/src/views/components/Pagination.vue +++ b/src/views/components/Pagination.vue @@ -5,7 +5,7 @@ background :current-page.sync="currentPage" :page-size.sync="pageSize" - layout="->,prev, total,pager, next,jumper" + layout="prev, pager, next,jumper" :page-sizes="pageSizes" :pager-count="pagerCount" :total="total" @@ -104,6 +104,14 @@ export default { };