diff --git a/src/App.vue b/src/App.vue index 1148547..e5c8ca0 100644 --- a/src/App.vue +++ b/src/App.vue @@ -48,7 +48,8 @@ export default { }, }; - diff --git a/src/assets/images/sub-title.png b/src/assets/images/sub-title.png new file mode 100644 index 0000000..f7e53cc Binary files /dev/null and b/src/assets/images/sub-title.png differ diff --git a/src/assets/styles/font.css b/src/assets/styles/font.css index b9733ab..e704039 100644 --- a/src/assets/styles/font.css +++ b/src/assets/styles/font.css @@ -1,6 +1,6 @@ @font-face { font-family: "DIN-Medium"; - /* src: url("http://www.jichuanglanhai.com/demo/font-file/DIN-Medium.otf"); */ + src: url("./font/DIN-Medium.otf"); } @font-face { font-family: "DIN-Black"; diff --git a/src/router/index.js b/src/router/index.js index 4fad786..7a2958f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -86,7 +86,7 @@ export const constantRoutes = [ name: "yaopinstscpz", icon: require("@/assets/images/tree4.svg"), component: () => import("@/views/productsMsg/drugArchives/yaopinstscpz.vue"), - meta: { title: "外省委托品种", keepAlive: true }, + meta: { title: "本省受托品种", keepAlive: true ,topTitle:"本省受托生产药品品种"}, }, { path: "/drugArchives/yaopinyuanliao", @@ -170,15 +170,37 @@ export const constantRoutes = [ icon: require("@/assets/images/tree4.svg"), component: () => import("@/views/productsMsg/components/cosmeticsArchives.vue"), meta: { title: "化妆品档案", keepAlive: true }, - redirect: '/cosmeticsArchives/bapz', + redirect: '/cosmeticsArchives/GchzpPt', children: [ { - path: "/cosmeticsArchives/bapz", - name: "bapz", + path: "/cosmeticsArchives/GchzpPt", + name: "GchzpPt", icon: require("@/assets/images/tree4.svg"), - component: () => import("@/views/productsMsg/components/bapz.vue"), - meta: { title: "注册备案品种", keepAlive: true }, - }, { + component: () => import("@/views/productsMsg/components/hzpSon/GchzpPt.vue"), + meta: { title: "国产普通化妆品", keepAlive: true }, + }, + { + path: "/cosmeticsArchives/GchzpTs", + name: "GchzpTs", + icon: require("@/assets/images/tree4.svg"), + component: () => import("@/views/productsMsg/components/hzpSon/GchzpTs.vue"), + meta: { title: "国产特殊化妆品", keepAlive: true }, + }, + { + path: "/cosmeticsArchives/JkhzpPt", + name: "JkhzpPt", + icon: require("@/assets/images/tree4.svg"), + component: () => import("@/views/productsMsg/components/hzpSon/JkhzpPt.vue"), + meta: { title: "进口普通化妆品", keepAlive: true }, + }, + { + path: "/cosmeticsArchives/JkhzpTs", + name: "JkhzpTs", + icon: require("@/assets/images/tree4.svg"), + component: () => import("@/views/productsMsg/components/hzpSon/JkhzpTs.vue"), + meta: { title: "进口特殊化妆品", keepAlive: true }, + }, + { path: "/cosmeticsArchives/stscpz", name: "stscpz", icon: require("@/assets/images/tree4.svg"), diff --git a/src/views/components/AdvancedSearch/index.vue b/src/views/components/AdvancedSearch/index.vue new file mode 100644 index 0000000..4e1ef54 --- /dev/null +++ b/src/views/components/AdvancedSearch/index.vue @@ -0,0 +1,351 @@ + + + + + \ No newline at end of file diff --git a/src/views/components/MapCars.vue b/src/views/components/MapCars.vue index 5ba5f8b..80d00a7 100644 --- a/src/views/components/MapCars.vue +++ b/src/views/components/MapCars.vue @@ -1,20 +1,31 @@ @@ -76,6 +87,8 @@ export default { }, mylayer: null, myChart: null, + myChart2: null, + myChart3: null, mygeojson: null, mystort: null, mystortTow: null, @@ -93,8 +106,6 @@ export default { type: String, default: '档案' }, - - }, created() { }, @@ -104,6 +115,8 @@ export default { this.mystortTow = this.$store.getters.usersort this.$nextTick(() => { this.myChart = echarts.init(document.getElementById("echarts")); + this.myChart2 = echarts.init(document.getElementById("echarts2")); + this.myChart3 = echarts.init(document.getElementById("echarts3")); this.isEcharts() this.initMap() }); @@ -266,7 +279,7 @@ export default { }, }, }], - + yAxis: [{ type: 'value' }], @@ -283,6 +296,8 @@ export default { }; this.myChart.setOption(option, true); + this.myChart2.setOption(option, true); + this.myChart3.setOption(option, true); }, @@ -348,6 +363,8 @@ export default { let that = this; erd.listenTo(document.getElementById("echarts"), function (element) { that.myChart.resize(); + that.myChart2.resize(); + that.myChart3.resize(); that.globalMap.fitBounds(that.mygeojson.getBounds()); }) @@ -513,6 +530,14 @@ export default { width: 45vw; height: 60vh; } + .echarts2 { + width: 45vw; + height: 60vh; + } + .echarts3 { + width: 45vw; + height: 60vh; + } .box1 { width: 45vw; diff --git a/src/views/components/MapCarsLog.vue b/src/views/components/MapCarsLog.vue index 481285d..325bce3 100644 --- a/src/views/components/MapCarsLog.vue +++ b/src/views/components/MapCarsLog.vue @@ -97,6 +97,10 @@ export default { type: String, default: '' }, + Leixtypes: { + type: String, + default: '1' + }, }, created() { }, @@ -116,7 +120,10 @@ export default { async isEcharts() { this.chartDatatow = [] this.chartData = [] - if (this.echartstitle == "医疗器械" && this.mytype != "healtson") { + if (this.mytype == "healtson") { + return + } + if (this.echartstitle == "医疗器械") { let msg1 = await this.$api.apparatus.typecount({ area: this.mystortTow }); if (msg1.code == 200) { msg1.data.forEach(item => { @@ -202,6 +209,7 @@ export default { this.mycharts() }, async isLefleat(data = '1') { + console.log(data); this.cityData = { 沈阳市: 0, 大连市: 0, @@ -228,13 +236,19 @@ export default { jiekou("deasCorpTcmpFilingChangeHis") } else if (this.echartstitle == "化妆品/注册备案品种") { let msg2 = await this.$api.apparatus["gccpareacount"]({ area: data }) - if (msg2.code == 200) { msg2.data.forEach(item => { - this.cityData[item.area] = item.count + if (item.area == "自由贸易试验区沈阳片区") { + this.chartDatatow.unshift(item.count) + this.chartData.unshift(item.area) + }else{ + this.chartDatatow.push(item.count) + this.chartData.push(item.area) + } }) + this.mycharts() } this.initPoitCenter(this.cityData); @@ -353,7 +367,7 @@ export default { this.globalMap.on('click', () => { this.globalMap.fitBounds(this.mygeojson.getBounds()); }) - this.isLefleat('1') + this.isLefleat(this.Leixtypes) }, diff --git a/src/views/index.vue b/src/views/index.vue index 6b4fc2d..555f2fc 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -26,7 +26,7 @@ {{ - itemb.meta.title }} + itemb.meta.title }} @@ -40,13 +40,22 @@
+
{{ + $router.currentRoute.meta.topTitle || + $router.currentRoute.meta.title }}
+
+ +
+ 回到
顶部 +
+ @@ -123,12 +132,14 @@ export default { } .tree-menu { - overflow: hidden; + // overflow: hidden; + overflow-y: auto; background: #465970; width: 180px; box-sizing: border-box; padding: 14px 10px; + .mydiv { width: 200px; height: 40px; @@ -212,8 +223,8 @@ export default { } .is-active { - background: #1e80eb ; - border-radius: 5px ; + background: #1e80eb; + border-radius: 5px; } .el-menu-item { @@ -242,4 +253,65 @@ export default { } } } + +.tree-menu::-webkit-scrollbar { + width: 0; + height: 0; +} + +.view_box_title { + width: 100%; + height: 38px; + line-height: 38px; + text-align: center; + font-weight: 700; + font-size: 19px; + font-family: SourceHanSansCN; + border-radius: 5px; + color: #00356f; + margin: 0 0 10px 0; + background: url("../assets/images/sub-title.png"); + background-size: cover; + background-position: center; + background-repeat: no-repeat; + +} + +.view-box-top { + padding: 5px 0; + height: 100%; + width: 100%; + font-weight: 500; + font-size: 16px; + font-family: SourceHanSansCN; + color: #fff; + background: -webkit-linear-gradient(top, #1f80ea 0%, #005dc2 100%); + background: -webkit-gradient(linear, left top, left bottom, from(#1f80ea), to(#005dc2)); + background: linear-gradient(180deg, #1f80ea 0%, #005dc2 100%); + -webkit-box-shadow: 0px 3px 12px rgba(0, 0, 0, .26); + border-radius: 5px; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -webkit-flex-direction: column; + -ms-flex-direction: column; + flex-direction: column; + -webkit-box-align: center; + -webkit-align-items: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -webkit-justify-content: center; + -ms-flex-pack: center; + justify-content: center; + +} + +::v-deep .el-backtop { + height: 50px; + width: 50px; +} \ No newline at end of file diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue index 37c8fc1..8ed7cb1 100644 --- a/src/views/monitor/job/index.vue +++ b/src/views/monitor/job/index.vue @@ -76,7 +76,7 @@ size="mini" @click="handleExport" v-hasPermi="['monitor:job:export']" - >导出 + >导出excel 导出 + >导出excel 导出 + >导出excel diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue index 5e9fbc4..23ebd85 100644 --- a/src/views/monitor/operlog/index.vue +++ b/src/views/monitor/operlog/index.vue @@ -97,7 +97,7 @@ size="mini" @click="handleExport" v-hasPermi="['monitor:operlog:export']" - >导出 + >导出excel diff --git a/src/views/productsMsg/components/healthSon/QIxiehealthOne.vue b/src/views/productsMsg/components/healthSon/QIxiehealthOne.vue index b5a0965..ebb9ae2 100644 --- a/src/views/productsMsg/components/healthSon/QIxiehealthOne.vue +++ b/src/views/productsMsg/components/healthSon/QIxiehealthOne.vue @@ -156,10 +156,16 @@
重置 查询 - 展开 + 高级查询
-
+ + +
+
+
高级查询条件
+
审评受理信息查询：
@@ -333,34 +339,38 @@ v-for="(item, index) in optionsTowBtn" @click="xuanzelist(item)">{{ item.label }}
- 导出 + 导出excel
- + - + + + - + - - + @@ -403,10 +413,15 @@ import { download, dcylqx } from "../../../../api/archives/updata"; import { Notification, MessageBox, Message, Loading } from "element-ui"; import MapCars from "@/views/components/MapCarsLog.vue"; +import AdvancedSearch from "@/views/components/AdvancedSearch"; +import { mySortChange } from './mySortChange.js'; export default { - components: { MapCars }, - + components: { + MapCars, + AdvancedSearch + }, + mixins: [mySortChange], data() { return { options1: [ @@ -439,8 +454,9 @@ export default { }, ], optionsTowBtn: [ + { value: "", label: '全部' }, { value: 1, label: '有效' }, - { value: 2, label: '失效' } + { value: "无效", label: '失效' } ], optionsTow: [ { value: 1, label: '有效' }, @@ -506,7 +522,7 @@ export default { loadA: null, showCK: false, src: "", - bthshow: true, + bthshow: false, scoltitle: "展开", echartstlist: null, btnArrshow: "全部", @@ -660,6 +676,8 @@ export default { //重置 reset(type) { this.btnArrshow = '全部' + this.$refs.tableRef.clearSort(); // 清除排序 + this.form1 = { cpmc: "", zcsqr: "", @@ -736,6 +754,7 @@ export default { }, activated() { this.MapCarsshow = true + this.bthshow = false } }; @@ -866,7 +885,7 @@ export default { padding-left: 30px; font-size: 16px; font-weight: 600; - margin-bottom: 20px; + margin: 10px 0; color: #1349c5; } diff --git a/src/views/productsMsg/components/healthSon/QIxiehealthThree.vue b/src/views/productsMsg/components/healthSon/QIxiehealthThree.vue index f8937b2..a7e9147 100644 --- a/src/views/productsMsg/components/healthSon/QIxiehealthThree.vue +++ b/src/views/productsMsg/components/healthSon/QIxiehealthThree.vue @@ -156,10 +156,16 @@
重置 查询 - 展开 + 高级查询
-
+ + +
+
+
高级查询条件
+
审评受理信息查询：
@@ -333,34 +339,37 @@ v-for="(item, index) in optionsTowBtn" @click="xuanzelist(item)">{{ item.label }}
- 导出 + 导出excel
- + - + + + - - + - - + @@ -404,9 +413,15 @@ import { download, dcylqx } from "../../../../api/archives/updata"; import { Notification, MessageBox, Message, Loading } from "element-ui"; import MapCars from "@/views/components/MapCarsLog.vue"; -export default { - components: { MapCars }, +import AdvancedSearch from "@/views/components/AdvancedSearch"; +import { mySortChange } from './mySortChange.js'; +export default { + components: { + MapCars, + AdvancedSearch + }, + mixins: [mySortChange], data() { return { options1: [ @@ -439,8 +454,9 @@ export default { }, ], optionsTowBtn: [ + { value: "", label: '全部' }, { value: 1, label: '有效' }, - { value: 2, label: '失效' } + { value: "无效", label: '失效' } ], optionsTow: [ { value: 1, label: '有效' }, @@ -506,7 +522,7 @@ export default { loadA: null, showCK: false, src: "", - bthshow: true, + bthshow: false, scoltitle: "展开", echartstlist: null, btnArrshow: "全部", @@ -659,6 +675,8 @@ export default { }, //重置 reset(type) { + this.$refs.tableRef.clearSort(); // 清除排序 + this.btnArrshow = '全部' this.form1 = { cpmc: "", @@ -736,6 +754,7 @@ export default { }, activated() { this.MapCarsshow = true + this.bthshow = false } }; @@ -866,7 +885,7 @@ export default { padding-left: 30px; font-size: 16px; font-weight: 600; - margin-bottom: 20px; + margin: 10px 0; color: #1349c5; } diff --git a/src/views/productsMsg/components/healthSon/QixiehealthTow.vue b/src/views/productsMsg/components/healthSon/QixiehealthTow.vue index e7e7e62..2ee9b50 100644 --- a/src/views/productsMsg/components/healthSon/QixiehealthTow.vue +++ b/src/views/productsMsg/components/healthSon/QixiehealthTow.vue @@ -156,10 +156,16 @@
重置 查询 - 展开 + 高级查询
-
+ + +
+
+
高级查询条件
+
审评受理信息查询：
@@ -333,34 +339,38 @@ v-for="(item, index) in optionsTowBtn" @click="xuanzelist(item)">{{ item.label }}
- 导出 + 导出excel
- + - + + + - + - - + @@ -403,10 +413,15 @@ import { download, dcylqx } from "../../../../api/archives/updata"; import { Notification, MessageBox, Message, Loading } from "element-ui"; import MapCars from "@/views/components/MapCarsLog.vue"; +import AdvancedSearch from "@/views/components/AdvancedSearch"; +import { mySortChange } from './mySortChange.js'; export default { - components: { MapCars }, - + components: { + MapCars, + AdvancedSearch + }, + mixins: [mySortChange], data() { return { options1: [ @@ -439,8 +454,9 @@ export default { }, ], optionsTowBtn: [ + { value: "", label: '全部' }, { value: 1, label: '有效' }, - { value: 2, label: '失效' } + { value: "无效", label: '失效' } ], optionsTow: [ { value: 1, label: '有效' }, @@ -506,7 +522,7 @@ export default { loadA: null, showCK: false, src: "", - bthshow: true, + bthshow: false, scoltitle: "展开", echartstlist: null, btnArrshow: "全部", @@ -659,6 +675,8 @@ export default { }, //重置 reset(type) { + this.$refs.tableRef.clearSort(); // 清除排序 + this.btnArrshow = '全部' this.form1 = { cpmc: "", @@ -736,6 +754,7 @@ export default { }, activated() { this.MapCarsshow = true + this.bthshow = false } }; @@ -866,7 +885,7 @@ export default { padding-left: 30px; font-size: 16px; font-weight: 600; - margin-bottom: 20px; + margin: 10px 0; color: #1349c5; } diff --git a/src/views/productsMsg/components/healthSon/TiwaihealthOne.vue b/src/views/productsMsg/components/healthSon/TiwaihealthOne.vue index 159f59b..da8de5b 100644 --- a/src/views/productsMsg/components/healthSon/TiwaihealthOne.vue +++ b/src/views/productsMsg/components/healthSon/TiwaihealthOne.vue @@ -156,10 +156,16 @@
重置 查询 - 展开 + 高级查询
-
+ + +
+
+
高级查询条件
+
审评受理信息查询：
@@ -333,34 +339,38 @@ v-for="(item, index) in optionsTowBtn" @click="xuanzelist(item)">{{ item.label }}
- 导出 + 导出excel
- + - + + + - + - - + @@ -403,10 +413,11 @@ import { download, dcylqx } from "../../../../api/archives/updata"; import { Notification, MessageBox, Message, Loading } from "element-ui"; import MapCars from "@/views/components/MapCarsLog.vue"; - +import AdvancedSearch from "@/views/components/AdvancedSearch"; +import { mySortChange } from './mySortChange.js'; export default { - components: { MapCars }, - + components: { MapCars, AdvancedSearch }, + mixins: [mySortChange], data() { return { options1: [ @@ -439,8 +450,9 @@ export default { }, ], optionsTowBtn: [ + { value: "", label: '全部' }, { value: 1, label: '有效' }, - { value: 2, label: '失效' } + { value: "无效", label: '失效' } ], optionsTow: [ { value: 1, label: '有效' }, @@ -506,7 +518,7 @@ export default { loadA: null, showCK: false, src: "", - bthshow: true, + bthshow: false, scoltitle: "展开", echartstlist: null, btnArrshow: "全部", @@ -659,6 +671,8 @@ export default { }, //重置 reset(type) { + this.$refs.tableRef.clearSort(); // 清除排序 + this.btnArrshow = '全部' this.form1 = { cpmc: "", @@ -736,6 +750,7 @@ export default { }, activated() { this.MapCarsshow = true + this.bthshow = false } }; @@ -866,7 +881,7 @@ export default { padding-left: 30px; font-size: 16px; font-weight: 600; - margin-bottom: 20px; + margin: 10px 0; color: #1349c5; } diff --git a/src/views/productsMsg/components/healthSon/TiwaihealthThree.vue b/src/views/productsMsg/components/healthSon/TiwaihealthThree.vue index 9508cd0..e0893b6 100644 --- a/src/views/productsMsg/components/healthSon/TiwaihealthThree.vue +++ b/src/views/productsMsg/components/healthSon/TiwaihealthThree.vue @@ -156,10 +156,16 @@
重置 查询 - 展开 + 高级查询
-
+ + +
+
+
高级查询条件
+
审评受理信息查询：
@@ -333,34 +339,37 @@ v-for="(item, index) in optionsTowBtn" @click="xuanzelist(item)">{{ item.label }}
- 导出 + 导出excel
- + - + + + - - + - - + @@ -404,8 +413,15 @@ import { download, dcylqx } from "../../../../api/archives/updata"; import { Notification, MessageBox, Message, Loading } from "element-ui"; import MapCars from "@/views/components/MapCarsLog.vue"; +import AdvancedSearch from "@/views/components/AdvancedSearch"; +import { mySortChange } from './mySortChange.js'; + export default { - components: { MapCars }, + components: { + MapCars, + AdvancedSearch + }, + mixins: [mySortChange], data() { return { @@ -439,8 +455,9 @@ export default { }, ], optionsTowBtn: [ + { value: "", label: '全部' }, { value: 1, label: '有效' }, - { value: 2, label: '失效' } + { value: "无效", label: '失效' } ], optionsTow: [ { value: 1, label: '有效' }, @@ -506,7 +523,7 @@ export default { loadA: null, showCK: false, src: "", - bthshow: true, + bthshow: false, scoltitle: "展开", echartstlist: null, btnArrshow: "全部", @@ -659,6 +676,8 @@ export default { }, //重置 reset(type) { + this.$refs.tableRef.clearSort(); // 清除排序 + this.btnArrshow = '全部' this.form1 = { cpmc: "", @@ -691,6 +710,8 @@ export default { cplx: "体外诊断试剂",//产品类型 cplb: "第三类",//产品类别 area: this.$store.getters.usersort + /* + */ }; this.form = { size: 20, @@ -736,6 +757,7 @@ export default { }, activated() { this.MapCarsshow = true + this.bthshow = false } }; @@ -866,7 +888,7 @@ export default { padding-left: 30px; font-size: 16px; font-weight: 600; - margin-bottom: 20px; + margin: 10px 0; color: #1349c5; } diff --git a/src/views/productsMsg/components/healthSon/TiwaihealthTow.vue b/src/views/productsMsg/components/healthSon/TiwaihealthTow.vue index a13fa07..ea0b65f 100644 --- a/src/views/productsMsg/components/healthSon/TiwaihealthTow.vue +++ b/src/views/productsMsg/components/healthSon/TiwaihealthTow.vue @@ -156,10 +156,16 @@
重置 查询 - 展开 + 高级查询
-
+ + +
+
+
高级查询条件
+
审评受理信息查询：
@@ -333,34 +339,36 @@ v-for="(item, index) in optionsTowBtn" @click="xuanzelist(item)">{{ item.label }}
- 导出 + 导出excel
- + - - + + + - - + - - + @@ -403,9 +411,15 @@ import { download, dcylqx } from "../../../../api/archives/updata"; import { Notification, MessageBox, Message, Loading } from "element-ui"; import MapCars from "@/views/components/MapCarsLog.vue"; +import AdvancedSearch from "@/views/components/AdvancedSearch"; +import { mySortChange } from './mySortChange.js'; export default { - components: { MapCars }, + components: { + MapCars, + AdvancedSearch + }, + mixins: [mySortChange], data() { return { @@ -439,8 +453,9 @@ export default { }, ], optionsTowBtn: [ + { value: "", label: '全部' }, { value: 1, label: '有效' }, - { value: 2, label: '失效' } + { value: "无效", label: '失效' } ], optionsTow: [ { value: 1, label: '有效' }, @@ -506,7 +521,7 @@ export default { loadA: null, showCK: false, src: "", - bthshow: true, + bthshow: false, scoltitle: "展开", echartstlist: null, btnArrshow: "全部", @@ -659,6 +674,8 @@ export default { }, //重置 reset(type) { + this.$refs.tableRef.clearSort(); // 清除排序 + this.btnArrshow = '全部' this.form1 = { cpmc: "", @@ -736,6 +753,7 @@ export default { }, activated() { this.MapCarsshow = true + this.bthshow = false } }; @@ -866,7 +884,7 @@ export default { padding-left: 30px; font-size: 16px; font-weight: 600; - margin-bottom: 20px; + margin: 10px 0; color: #1349c5; } diff --git a/src/views/productsMsg/components/healthSon/health.vue b/src/views/productsMsg/components/healthSon/health.vue index 9a29ca6..523411f 100644 --- a/src/views/productsMsg/components/healthSon/health.vue +++ b/src/views/productsMsg/components/healthSon/health.vue @@ -2,7 +2,7 @@
-
123统计分析
+
统计分析
@@ -158,10 +158,17 @@
重置 查询 - 展开 + 高级查询
-
+ + + +
+
+
高级查询条件
+
审评受理信息查询：
@@ -305,7 +312,7 @@ - + @@ -332,30 +339,40 @@
{{ item.label + v-for="(item, index) in optionsTowBtn" @click="xuanzelist(item)">{{ item.label }}
- 导出 + 导出excel
- + - + + + - + + + + @@ -398,10 +415,14 @@ import { download, dcylqx } from "../../../../api/archives/updata"; import { Notification, MessageBox, Message, Loading } from "element-ui"; import MapCars from "@/views/components/MapCars.vue"; +import AdvancedSearch from "@/views/components/AdvancedSearch"; +import { mySortChange } from './mySortChange.js'; + -export default { - components: { MapCars }, +export default { + components: { MapCars, AdvancedSearch }, + mixins: [mySortChange], data() { return { options1: [ @@ -495,7 +516,7 @@ export default { loadA: null, showCK: false, src: "", - bthshow: true, + bthshow: false, scoltitle: "展开", echartstlist: null, btnArrshow: "全部", @@ -535,7 +556,12 @@ export default { iscss: "primary", value: '第三类', cplx: "体外诊断试剂" - }] + }], + optionsTowBtn: [ + { value: "", label: '全部' }, + { value: 1, label: '有效' }, + { value: "无效", label: '失效' } + ], }; }, async mounted() { @@ -550,6 +576,24 @@ export default { created() { }, methods: { + // mySortChange(e) { + // this.sortableshowDaty = e + // this.form1.pzrqSort = "" + // this.form1.pzyxqSort = "" + // this.form1.zcrszshiSort = "" + // console.log(e.order); + // let indextype = e.order == "ascending" ? 1 : e.order == "descending" ? 2 : "" + // if (e.column.label == "批准日期") { + // this.form1.pzrqSort = indextype + // } + // if (e.column.label == "批准有效期至") { + // this.form1.pzyxqSort = indextype + // } + // if (e.column.label == "所在地") { + // this.form1.zcrszshiSort = indextype + // } + // this.searchList() + // }, // 点击input上的x号 isclear() { this.searchList() @@ -557,8 +601,7 @@ export default { //全部、三类医疗器械、三类体外试剂、二类医疗器械、二类体体外试剂、一类医疗器械、一类体外试剂 xuanzelist(item) { this.btnArrshow = item.label - this.form1.cplb = item.value - this.form1.cplx = item.cplx + this.form1.ppztDm = item.value this.searchList() }, arealist(area) { @@ -647,6 +690,7 @@ export default { }, //重置 reset(type) { + this.$refs.tableRef.clearSort(); // 清除排序 this.btnArrshow = '全部' this.form1 = { cplb: "", @@ -723,6 +767,7 @@ export default { }, activated() { this.MapCarsshow = true + this.bthshow = false } }; @@ -853,7 +898,7 @@ export default { padding-left: 30px; font-size: 16px; font-weight: 600; - margin-bottom: 20px; + margin: 10px 0; color: #1349c5; } diff --git a/src/views/productsMsg/components/healthSon/mySortChange.js b/src/views/productsMsg/components/healthSon/mySortChange.js new file mode 100644 index 0000000..3fcbcfc --- /dev/null +++ b/src/views/productsMsg/components/healthSon/mySortChange.js @@ -0,0 +1,25 @@ +export const mySortChange = { + created() { + console.log('混入'); + }, + methods: { + mySortChange(e) { + this.sortableshowDaty = e + this.form1.pzrqSort = "" + this.form1.pzyxqSort = "" + this.form1.zcrszshiSort = "" + console.log(e.order); + let indextype = e.order == "ascending" ? 1 : e.order == "descending" ? 2 : "" + if (e.column.label == "批准日期") { + this.form1.pzrqSort = indextype + } + if (e.column.label == "批准有效期至") { + this.form1.pzyxqSort = indextype + } + if (e.column.label == "所在地") { + this.form1.zcrszshiSort = indextype + } + this.searchList() + }, + } + }; \ No newline at end of file diff --git a/src/views/productsMsg/components/bapz.vue b/src/views/productsMsg/components/hzpSon/GchzpPt.vue similarity index 90% rename from src/views/productsMsg/components/bapz.vue rename to src/views/productsMsg/components/hzpSon/GchzpPt.vue index 4e27ea4..976894d 100644 --- a/src/views/productsMsg/components/bapz.vue +++ b/src/views/productsMsg/components/hzpSon/GchzpPt.vue @@ -5,7 +5,8 @@
统计分析
- +
@@ -53,11 +54,18 @@ --> - + + + + + + + @@ -77,10 +85,10 @@ - - - - + + + + @@ -103,10 +111,16 @@
重置 查询 - 展开 + 高级查询
-
+ + +
+
+
高级查询条件
+
产品抽检信息查询：
@@ -187,18 +201,19 @@
产品列表
-
+ + 导出excel
- + @@ -209,48 +224,57 @@ + - + + + + + + + + + + + diff --git a/src/views/productsMsg/components/hzpSon/JkhzpPt.vue b/src/views/productsMsg/components/hzpSon/JkhzpPt.vue new file mode 100644 index 0000000..54a167f --- /dev/null +++ b/src/views/productsMsg/components/hzpSon/JkhzpPt.vue @@ -0,0 +1,869 @@ + + + + + diff --git a/src/views/productsMsg/components/hzpSon/JkhzpTs.vue b/src/views/productsMsg/components/hzpSon/JkhzpTs.vue new file mode 100644 index 0000000..c464255 --- /dev/null +++ b/src/views/productsMsg/components/hzpSon/JkhzpTs.vue @@ -0,0 +1,868 @@ + + + + + diff --git a/src/views/productsMsg/components/productInfo.vue b/src/views/productsMsg/components/productInfo.vue index b0d0047..06fa2ae 100644 --- a/src/views/productsMsg/components/productInfo.vue +++ b/src/views/productsMsg/components/productInfo.vue @@ -43,12 +43,12 @@ export default { }, activated() { this.$nextTick(() => { - this.Url = `${location.origin}/ggfw-iframe/#/productinformation?type=${this.$route.query.type - }&flag=${this.$route.query.flag}&data=${this.$route.query.data - }&token=${localStorage.getItem("MSSM-LIAONING__TOKEN")}&bah=${this.$route.query.bah}` - // this.Url = `http://localhost:81?type=${this.$route.query.type + // this.Url = `${location.origin}/ggfw-iframe/#/productinformation?type=${this.$route.query.type // }&flag=${this.$route.query.flag}&data=${this.$route.query.data // }&token=${localStorage.getItem("MSSM-LIAONING__TOKEN")}&bah=${this.$route.query.bah}` + this.Url = `http://localhost:82?type=${this.$route.query.type + }&flag=${this.$route.query.flag}&data=${this.$route.query.data + }&token=${localStorage.getItem("MSSM-LIAONING__TOKEN")}&bah=${this.$route.query.bah}` let dom = document.getElementsByClassName("ifram-view"); let height = dom[0].getBoundingClientRect(); // let windowWidth = window.innerWidth; diff --git a/src/views/productsMsg/components/stscpz.vue b/src/views/productsMsg/components/stscpz.vue index 9c7c0e9..f8219a6 100644 --- a/src/views/productsMsg/components/stscpz.vue +++ b/src/views/productsMsg/components/stscpz.vue @@ -149,11 +149,12 @@
产品列表
- 导出 + 导出excel
- + @@ -168,7 +169,7 @@ {{ scope.row.bah }} - + @@ -325,6 +326,16 @@ export default { created() { }, methods: { + mySortChange(e) { + this.sortableshowDaty = e + this.form1.sqsjSort = "" + let indextype = e.order == "ascending" ? 1 : e.order == "descending" ? 2 : "" + if (e.column.label == "注册/备案日期") { + this.form1.sqsjSort = indextype + } + + this.searchList() + }, // 点击input上的x号 isclear() { this.searchList() @@ -455,6 +466,7 @@ export default { }, //重置 reset(type) { + this.$refs.tableRef.clearSort(); // 清除排序 this.types = "1"; this.form1 = { babm: "", @@ -676,7 +688,7 @@ export default { padding-left: 30px; font-size: 16px; font-weight: 600; - margin-bottom: 20px; + margin: 10px 0; color: #1349c5; } diff --git a/src/views/productsMsg/drugArchives/yaopinbapz.vue b/src/views/productsMsg/drugArchives/yaopinbapz.vue index 8064ef9..ae42f61 100644 --- a/src/views/productsMsg/drugArchives/yaopinbapz.vue +++ b/src/views/productsMsg/drugArchives/yaopinbapz.vue @@ -51,7 +51,7 @@ - + @@ -59,15 +59,16 @@ - + + - + @@ -76,86 +77,30 @@ + + + + + + + + + + + +
重置 查询 - 展开 -
-
- -
产品抽检信息查询：
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
不良反应信息查询：
- - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - -
- 重置 - 查询 - 收起 -
+ 高级查询
+ + +
@@ -168,14 +113,15 @@
{{ - item.label - }}
+ item.label + }}
- 导出 + 导出excel
- + + + + + - + + - + + - + + - + + + + - + + @@ -248,18 +206,21 @@
- + - + - \ No newline at end of file + +::v-deep .el-date-editor--daterange.el-input, +.el-date-editor--daterange.el-input__inner, +.el-date-editor--timerange.el-input, +.el-date-editor--timerange.el-input__inner { + + + width: 100%; +} + +::v-deep.el-date-editor .el-range__close-icon { + color: #555555; + + &:hover { + font-size: 18px; + color: #000; + } +} + \ No newline at end of file diff --git a/src/views/productsMsg/drugArchives/yaopinstscpz.vue b/src/views/productsMsg/drugArchives/yaopinstscpz.vue index 3087a05..54a1708 100644 --- a/src/views/productsMsg/drugArchives/yaopinstscpz.vue +++ b/src/views/productsMsg/drugArchives/yaopinstscpz.vue @@ -26,7 +26,8 @@ - + @@ -39,7 +40,8 @@ - + @@ -51,107 +53,50 @@ - + - + - + + + + + + + + + + + +
重置 查询 - 展开 -
-
- -
产品抽检信息查询：
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
不良反应信息查询：
- - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - -
- 重置 - 查询 - 收起 -
+ 高级查询
+ + +
@@ -161,11 +106,12 @@
药品列表
- 导出 + 导出excel
- + + + + + - + + - + + - + + - + + + + - + + @@ -238,15 +196,18 @@
- + - + - \ No newline at end of file + +::v-deep .el-date-editor--daterange.el-input, +.el-date-editor--daterange.el-input__inner, +.el-date-editor--timerange.el-input, +.el-date-editor--timerange.el-input__inner { + + + width: 100%; +} + +::v-deep.el-date-editor .el-range__close-icon { + color: #555555; + + &:hover { + font-size: 18px; + color: #000; + } +} + \ No newline at end of file diff --git a/src/views/productsMsg/drugArchives/yaopinyuanliao.vue b/src/views/productsMsg/drugArchives/yaopinyuanliao.vue index 11d048e..633d98d 100644 --- a/src/views/productsMsg/drugArchives/yaopinyuanliao.vue +++ b/src/views/productsMsg/drugArchives/yaopinyuanliao.vue @@ -26,13 +26,15 @@ - + - + @@ -49,7 +51,8 @@ - + @@ -63,7 +66,8 @@
产品抽检信息查询：
- + @@ -74,19 +78,22 @@ - + - + - + @@ -94,7 +101,8 @@
不良反应信息查询：
- + @@ -116,7 +124,8 @@
重置 查询 - 收起 + 收起
@@ -128,7 +137,7 @@
药品列表
- 导出 + 导出excel
@@ -159,6 +168,11 @@ {{ scope.row.bzgg }} + + + - + - + - + - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/productsMsg/zyzj.vue b/src/views/productsMsg/zyzj.vue index 2c685cf..0cbaa7b 100644 --- a/src/views/productsMsg/zyzj.vue +++ b/src/views/productsMsg/zyzj.vue @@ -50,6 +50,14 @@
+ + + + + + + +
@@ -65,11 +73,11 @@
传统中药制剂列表
- 导出 + 导出excel
- + - + - + @@ -162,6 +170,7 @@ export default { yljgmc: "", // 统一查询 name: "", + status: "",//备案状态 area: this.$store.getters.usersort }, @@ -192,6 +201,7 @@ export default { loadA: null, showCK: false, src: "", + optionsSi: ["正常", "注销"] }; }, mounted() { diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue index 3ab81fc..525f799 100644 --- a/src/views/system/config/index.vue +++ b/src/views/system/config/index.vue @@ -87,7 +87,7 @@ size="mini" @click="handleExport" v-hasPermi="['system:config:export']" - >导出 + >导出excel 导出 + >导出excel 导出 + >导出excel 导出 + >导出excel diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index fb3b5ef..f571631 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -92,7 +92,7 @@ size="mini" @click="handleExport" v-hasPermi="['system:role:export']" - >导出 + >导出excel diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index ae87fe4..e19c2cb 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -131,7 +131,7 @@ size="mini" @click="handleExport" v-hasPermi="['system:user:export']" - >导出 + >导出excel diff --git a/vue.config.js b/vue.config.js index 31d2fda..4f708a4 100644 --- a/vue.config.js +++ b/vue.config.js @@ -42,9 +42,9 @@ module.exports = { open: true, proxy: { "/configApi": { - target: "https://dev-mssm-liaoning.lesdev.cn/ggfw-api", + // target: "https://dev-mssm-liaoning.lesdev.cn/ggfw-api", // target: "http://172.24.20.196/ggfw-api", - // target: "http://192.168.0.113:9023/ggfw-api", + target: "http://192.168.0.107:9023/ggfw-api", changeOrigin: true, pathRewrite: {