From 51ea25ee09bc939f2328c26442aae76156feddfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=8A=B2=E9=BE=99?= <2860996570@qq.com>
Date: Thu, 28 Dec 2023 11:08:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=82=B9=E5=87=BB=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/apparatus/index.js                    |  32 ++
 src/assets/styles/leaflet.scss                |   7 +-
 src/layout/components/AppMain.vue             |   2 +-
 src/main.js                                   |   5 +-
 src/utils/mapJson/cityCenter copy.json        | 445 ++++++++++++++++++
 src/utils/mapJson/cityCenter.json             |  12 +-
 src/views/components/MapCars.vue              | 425 ++++++++---------
 .../components/downloadFileBox/index.vue      |   1 -
 .../components/cosmeticsArchives.vue          |  37 +-
 src/views/productsMsg/components/health.vue   | 154 +++++-
 .../productsMsg/components/productInfo.vue    |  34 +-
 src/views/productsMsg/index.vue               |  46 +-
 src/views/productsMsg/zyzj.vue                |  31 +-
 13 files changed, 893 insertions(+), 338 deletions(-)
 create mode 100644 src/utils/mapJson/cityCenter copy.json

diff --git a/src/api/apparatus/index.js b/src/api/apparatus/index.js
index c2aed2c..5a4a703 100644
--- a/src/api/apparatus/index.js
+++ b/src/api/apparatus/index.js
@@ -16,6 +16,7 @@ export default {
             params: query,
         });
     },
+    //器械地图
     ylqxJnyelcpareacount(query) {
         return request({
             url: "/pharmaceuticals/ylqxJnyelcp/areacount",
@@ -39,6 +40,37 @@ export default {
             params: query,
         });
     },
+    // 中药地图 
+    deasCorpTcmpFilingChangeHis(query) {
+        return request({
+            url: "/pharmaceuticals/deasCorpTcmpFiling/areacount",
+            method: "GET",
+            params: query,
+        });
+    },
+    //中药统计
+    deasCorpTcmpFilingtypecount(query) {
+        return request({
+            url: "/pharmaceuticals/deasCorpTcmpFiling/typecount",
+            method: "GET",
+            params: query,
+        });
+    },
+    //化妆品地图统计
+    gccpareacount(query) {
+        return request({
+            url: "/pharmaceuticals/gccp/areacount",
+            method: "GET",
+            params: query,
+        });
+    },
+    gccptypecount(query) {
+        return request({
+            url: "/pharmaceuticals/gccp/typecount",
+            method: "GET",
+            params: query,
+        });
+    },
     //通过注册证编号查询单条器械品种数据
     // apparatusGet(zczh) {
     //     return request({
diff --git a/src/assets/styles/leaflet.scss b/src/assets/styles/leaflet.scss
index d161351..82766fa 100644
--- a/src/assets/styles/leaflet.scss
+++ b/src/assets/styles/leaflet.scss
@@ -15,7 +15,7 @@
       text-align: center;
       font-size: 10px;
       font-weight: 400;
-      color: #313332;
+      color: #000000;
     }
     .circle {
       width: 7px;
@@ -23,15 +23,14 @@
       background: #ffffff;
       opacity: 1;
       border: 1px solid #00255a;
-      margin-top: 5px;
+      margin-top: 0px;
       border-radius: 50%;
     }
     .city-name {
       width: 70px;
       text-align: center;
       font-size: 10px;
-      font-weight: bold;
-      color: #000814;
+      color: #000000;
       font-family: "DIN-Medium";
       
     }
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 11a2039..029a412 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -62,7 +62,7 @@ export default {
 ::-webkit-scrollbar {
   margin: 0;
   width: 10px;
-  height: 6px;
+  height: 12px;
 }
 
 ::-webkit-scrollbar-track {
diff --git a/src/main.js b/src/main.js
index 392c074..9a93cb1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -21,10 +21,7 @@ Element.Table.props['row-class-name'] = {
   type: String,
 };
 // 带有边框
-// Element.Table.props.border = {
-//   default: true,
-//   type: Boolean,
-// };
+
 
 import dictList from "@/utils/dict.js"; //本地字典
 
diff --git a/src/utils/mapJson/cityCenter copy.json b/src/utils/mapJson/cityCenter copy.json
new file mode 100644
index 0000000..e550281
--- /dev/null
+++ b/src/utils/mapJson/cityCenter copy.json	
@@ -0,0 +1,445 @@
+{
+  "type": "FeatureCollection",
+  "name": "中心点",
+  "crs": {
+    "type": "name",
+    "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" }
+  },
+  "features": [
+    {
+      "type": "Feature",
+      "properties": {
+        "pkid": null,
+        "params": {},
+        "children": [],
+        "fCreator": null,
+        "fCreateTime": null,
+        "fOperator": null,
+        "fOperateTime": null,
+        "fCode": "2110",
+        "fPcode": null,
+        "fName": "辽阳市",
+        "fLevel": null,
+        "fTdtCode": null,
+        "fShequcun": null,
+        "orgId": null,
+        "subjectLicenseCount": 11206,
+        "licenseList": null,
+        "fLng": "123.24636193661814",
+        "fLat": "41.18083240970848",
+        "fkSubjectId": null,
+        "taskCount": "11206"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [123.24636193661814, 41.18083240970848]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "pkid": null,
+        "params": {},
+        "children": [],
+        "fCreator": null,
+        "fCreateTime": null,
+        "fOperator": null,
+        "fOperateTime": null,
+        "fCode": "2112",
+        "fPcode": null,
+        "fName": "铁岭市",
+        "fLevel": null,
+        "fTdtCode": null,
+        "fShequcun": null,
+        "orgId": null,
+        "subjectLicenseCount": 11864,
+        "licenseList": null,
+        "fLng": "124.1710025067986",
+        "fLat": "42.64382782764356",
+        "fkSubjectId": null,
+        "taskCount": "11864"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [124.17100250679860112, 42.643827827643563]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "pkid": null,
+        "params": {},
+        "children": [],
+        "fCreator": null,
+        "fCreateTime": null,
+        "fOperator": null,
+        "fOperateTime": null,
+        "fCode": "2114",
+        "fPcode": null,
+        "fName": "葫芦岛市",
+        "fLevel": null,
+        "fTdtCode": null,
+        "fShequcun": null,
+        "orgId": null,
+        "subjectLicenseCount": 15630,
+        "licenseList": null,
+        "fLng": "120.19481473183642",
+        "fLat": "40.62536167276387",
+        "fkSubjectId": null,
+        "taskCount": "15630"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [120.19481473183642, 40.62536167276387]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "pkid": null,
+        "params": {},
+        "children": [],
+        "fCreator": null,
+        "fCreateTime": null,
+        "fOperator": null,
+        "fOperateTime": null,
+        "fCode": "2109",
+        "fPcode": null,
+        "fName": "阜新市",
+        "fLevel": null,
+        "fTdtCode": null,
+        "fShequcun": null,
+        "orgId": null,
+        "subjectLicenseCount": 18427,
+        "licenseList": null,
+        "fLng": "121.95539780174146",
+        "fLat": "42.27905242291515",
+        "fkSubjectId": null,
+        "taskCount": "18420"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [121.955397801741455, 42.27905242291515]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "pkid": null,
+        "params": {},
+        "children": [],
+        "fCreator": null,
+        "fCreateTime": null,
+        "fOperator": null,
+        "fOperateTime": null,
+        "fCode": "2102",
+        "fPcode": null,
+        "fName": "大连市",
+        "fLevel": null,
+        "fTdtCode": null,
+        "fShequcun": null,
+        "orgId": null,
+        "subjectLicenseCount": 78028,
+        "licenseList": null,
+        "fLng": "122.19804736493907",
+        "fLat": "39.60708426644009",
+        "fkSubjectId": null,
+        "taskCount": "78028"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [122.03847623661963, 39.80082870031089]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "pkid": null,
+        "params": {},
+        "children": [],
+        "fCreator": null,
+        "fCreateTime": null,
+        "fOperator": null,
+        "fOperateTime": null,
+        "fCode": "2103",
+        "fPcode": null,
+        "fName": "鞍山市",
+        "fLevel": null,
+        "fTdtCode": null,
+        "fShequcun": null,
+        "orgId": null,
+        "subjectLicenseCount": 33784,
+        "licenseList": null,
+        "fLng": "123.01171778840865",
+        "fLat": "40.714211776885584",
+        "fkSubjectId": null,
+        "taskCount": "33784"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [123.011717788408646, 40.714211776885584]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "pkid": null,
+        "params": {},
+        "children": [],
+        "fCreator": null,
+        "fCreateTime": null,
+        "fOperator": null,
+        "fOperateTime": null,
+        "fCode": "2101",
+        "fPcode": null,
+        "fName": "沈阳市",
+        "fLevel": null,
+        "fTdtCode": null,
+        "fShequcun": null,
+        "orgId": null,
+        "subjectLicenseCount": 105042,
+        "licenseList": null,
+        "fLng": "123.13802698499136",
+        "fLat": "42.094442702466736",
+        "fkSubjectId": null,
+        "taskCount": "105040"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [123.138026984991356, 42.094442702466736]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "pkid": null,
+        "params": {},
+        "children": [],
+        "fCreator": null,
+        "fCreateTime": null,
+        "fOperator": null,
+        "fOperateTime": null,
+        "fCode": "2108",
+        "fPcode": null,
+        "fName": "营口市",
+        "fLevel": null,
+        "fTdtCode": null,
+        "fShequcun": null,
+        "orgId": null,
+        "subjectLicenseCount": 16048,
+        "licenseList": null,
+        "fLng": "122.46672515804659",
+        "fLat": "40.39119128233646",
+        "fkSubjectId": null,
+        "taskCount": "16048"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [122.46672515804659, 40.39119128233646]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "pkid": null,
+        "params": {},
+        "children": [],
+        "fCreator": null,
+        "fCreateTime": null,
+        "fOperator": null,
+        "fOperateTime": null,
+        "fCode": "2104",
+        "fPcode": null,
+        "fName": "抚顺市",
+        "fLevel": null,
+        "fTdtCode": null,
+        "fShequcun": null,
+        "orgId": null,
+        "subjectLicenseCount": 20095,
+        "licenseList": null,
+        "fLng": "124.65576582140092",
+        "fLat": "41.83369287083338",
+        "fkSubjectId": null,
+        "taskCount": "20095"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [124.65576582140092, 41.83369287083338]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "pkid": null,
+        "params": {},
+        "children": [],
+        "fCreator": null,
+        "fCreateTime": null,
+        "fOperator": null,
+        "fOperateTime": null,
+        "fCode": "2111",
+        "fPcode": null,
+        "fName": "盘锦市",
+        "fLevel": null,
+        "fTdtCode": null,
+        "fShequcun": null,
+        "orgId": null,
+        "subjectLicenseCount": 15274,
+        "licenseList": null,
+        "fLng": "121.93729109765806",
+        "fLat": "41.59399815182677",
+        "fkSubjectId": null,
+        "taskCount": "15274"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [121.99248299163709, 41.2267527372648]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "pkid": null,
+        "params": {},
+        "children": [],
+        "fCreator": null,
+        "fCreateTime": null,
+        "fOperator": null,
+        "fOperateTime": null,
+        "fCode": "2113",
+        "fPcode": null,
+        "fName": "朝阳市",
+        "fLevel": null,
+        "fTdtCode": null,
+        "fShequcun": null,
+        "orgId": null,
+        "subjectLicenseCount": 13670,
+        "licenseList": null,
+        "fLng": "120.01499494794146",
+        "fLat": "41.51094628842648",
+        "fkSubjectId": null,
+        "taskCount": "13670"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [120.01499494794146, 41.510946288426481]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "pkid": null,
+        "params": {},
+        "children": [],
+        "fCreator": null,
+        "fCreateTime": null,
+        "fOperator": null,
+        "fOperateTime": null,
+        "fCode": "2105",
+        "fPcode": null,
+        "fName": "本溪市",
+        "fLevel": null,
+        "fTdtCode": null,
+        "fShequcun": null,
+        "orgId": null,
+        "subjectLicenseCount": 7938,
+        "licenseList": null,
+        "fLng": "124.56947501595212",
+        "fLat": "41.228474542532545",
+        "fkSubjectId": null,
+        "taskCount": "7938"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [124.569475015952122, 41.228474542532545]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "pkid": null,
+        "params": {},
+        "children": [],
+        "fCreator": null,
+        "fCreateTime": null,
+        "fOperator": null,
+        "fOperateTime": null,
+        "fCode": "2106",
+        "fPcode": null,
+        "fName": "丹东市",
+        "fLevel": null,
+        "fTdtCode": null,
+        "fShequcun": null,
+        "orgId": null,
+        "subjectLicenseCount": 32168,
+        "licenseList": null,
+        "fLng": "124.39906947204074",
+        "fLat": "40.54422772015746",
+        "fkSubjectId": null,
+        "taskCount": "32168"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [124.39906947204074, 40.54422772015746]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "pkid": null,
+        "params": {},
+        "children": [],
+        "fCreator": null,
+        "fCreateTime": null,
+        "fOperator": null,
+        "fOperateTime": null,
+        "fCode": "2107",
+        "fPcode": null,
+        "fName": "锦州市",
+        "fLevel": null,
+        "fTdtCode": null,
+        "fShequcun": null,
+        "orgId": null,
+        "subjectLicenseCount": 64494,
+        "licenseList": null,
+        "fLng": "121.61856868689382",
+        "fLat": "41.47011750884197",
+        "fkSubjectId": null,
+        "taskCount": "64494"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [121.61856868689382, 41.47011750884197]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "pkid": null,
+        "params": {},
+        "children": [],
+        "fCreator": null,
+        "fCreateTime": null,
+        "fOperator": null,
+        "fOperateTime": null,
+        "fCode": "2191",
+        "fPcode": null,
+        "fName": "沈抚示范区",
+        "fLevel": null,
+        "fTdtCode": null,
+        "fShequcun": null,
+        "orgId": null,
+        "subjectLicenseCount": 3160,
+        "licenseList": null,
+        "fLng": "123.74446896876951",
+        "fLat": "41.7942248808908",
+        "fkSubjectId": null,
+        "taskCount": "3159"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [123.74446896876951, 41.7942248808908]
+      }
+    }
+  ]
+}
diff --git a/src/utils/mapJson/cityCenter.json b/src/utils/mapJson/cityCenter.json
index c7e4b55..f5568d1 100644
--- a/src/utils/mapJson/cityCenter.json
+++ b/src/utils/mapJson/cityCenter.json
@@ -32,7 +32,7 @@
       },
       "geometry": {
         "type": "Point",
-        "coordinates": [123.24636193661814, 41.18083240970848]
+        "coordinates": [123.24636193661814, 41.38083240970848]
       }
     },
     {
@@ -61,7 +61,7 @@
       },
       "geometry": {
         "type": "Point",
-        "coordinates": [124.171002506798601, 42.643827827643563]
+        "coordinates": [124.17100250679860112, 42.843827827643563]
       }
     },
     {
@@ -119,7 +119,7 @@
       },
       "geometry": {
         "type": "Point",
-        "coordinates": [121.955397801741455, 42.27905242291515]
+        "coordinates": [121.955397801741455, 42.47905242291515]
       }
     },
     {
@@ -177,7 +177,7 @@
       },
       "geometry": {
         "type": "Point",
-        "coordinates": [123.011717788408646, 40.714211776885584]
+        "coordinates": [123.391717788408646, 40.514211776885584]
       }
     },
     {
@@ -351,7 +351,7 @@
       },
       "geometry": {
         "type": "Point",
-        "coordinates": [124.569475015952122, 41.228474542532545]
+        "coordinates": [125.399475015952122, 41.428474542532545]
       }
     },
     {
@@ -409,7 +409,7 @@
       },
       "geometry": {
         "type": "Point",
-        "coordinates": [121.61856868689382, 41.47011750884197]
+        "coordinates": [121.31856868689382, 41.67011750884197]
       }
     },
     {
diff --git a/src/views/components/MapCars.vue b/src/views/components/MapCars.vue
index 96c5b88..d6e05a0 100644
--- a/src/views/components/MapCars.vue
+++ b/src/views/components/MapCars.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="box">
+    <div class="box" id="box">
         <div class="btna">
             <!--  -->
             <el-button type="primary" :icon="collapsechange ? 'el-icon-remove-outline' : 'el-icon-circle-plus-outline '"
@@ -8,12 +8,12 @@
             </el-button>
         </div>
 
-        <div class="box1" v-if="collapsechange">
-            <div class="titlestyle">{{ leafletitle }}分布</div>
+        <div class="box1" v-show="collapsechange">
+            <div class="titlestyle">生产地市统计</div>
             <div id="leafletMap" class="leafletMap"></div>
         </div>
-        <div class="box2" id="box2" v-if="collapsechange">
-            <div class="titlestyle">{{ echartstitle }}统计</div>
+        <div class="box2" id="box2" v-show="collapsechange">
+            <div class="titlestyle">{{ echartstitle }}类型统计</div>
             <div class="echarts" id="echarts"></div>
         </div>
     </div>
@@ -34,6 +34,7 @@ export default {
     data() {
         return {
             collapsechange: true,
+            mygeojson: null,
             cityData: {
                 沈阳市: 0,
                 大连市: 0,
@@ -67,7 +68,7 @@ export default {
             longitude: "122.80196410332945",
             zoom: 8,
             maxZoom: 18,
-            minZoom: 6,
+            minZoom: 7,
             layerObj: {
                 provinceLayer: null,
                 cityLayer: null,
@@ -79,9 +80,8 @@ export default {
             mystort: null,
             mystortTow: null,
             chartData: ["其他"],
-            chartDatatow: [
-                { value: 10, name: '其他' },
-            ]
+            chartDatatow: [10],
+            clickShow: true,
         };
     },
     props: {
@@ -94,6 +94,7 @@ export default {
             default: '档案'
         },
 
+
     },
     created() { },
 
@@ -101,50 +102,67 @@ export default {
         this.mystort = this.$store.getters.usersort
         this.mystortTow = this.$store.getters.usersort
         this.$nextTick(() => {
-            // this.mycharts();
-            // this.mycharts()
+            this.myChart = echarts.init(document.getElementById("echarts"));
             this.isEcharts()
-            this.isLefleat()
+            this.initMap()
         });
         // 监听窗口大小变化事件
     },
 
     methods: {
         async isEcharts() {
-            console.log(this.leafletitle);
             this.chartDatatow = []
             this.chartData = []
-            if (this.leafletitle == "医疗器械") {
-                console.log(777, this.mystortTow);
+            if (this.echartstitle == "医疗器械") {
                 let msg1 = await this.$api.apparatus.typecount({ area: this.mystortTow });
                 if (msg1.code == 200) {
-                    console.log(msg1.data);
+                    msg1.data.forEach(item => {
+                        this.chartDatatow.push(item.count)
+                        this.chartData.push(item.cplb)
+                    })
+                    this.clickShow = true
+                }
+            } else if (this.echartstitle == "药品") {
+                let msg1 = await this.$api.apparatus.vRdgYpwhGxwztypecount({ area: this.mystortTow });
+                if (msg1.code == 200) {
+                    msg1.data.forEach(item => {
+                        if (item.ypfl && item.ypfl != 'null') {
+                            this.chartDatatow.push(item.count)
+                            this.chartData.push(item.ypfl)
+                        }
+
+                    })
+                    this.clickShow = true
+
+                }
+
+            } else if (this.echartstitle == "化妆品") {
+                let msg1 = await this.$api.apparatus.gccptypecount({ area: this.mystortTow });
+                if (msg1.code == 200) {
+                    msg1.data.forEach(item => {
+                        if (item.type && item.type != 'null') {
+                            this.chartDatatow.push(item.count)
+                            this.chartData.push(item.type)
+                        }
+
+                    })
+                    this.clickShow = true
+
+                }
+            } else if (this.echartstitle == "传统中药") {
 
+                let msg1 = await this.$api.apparatus.deasCorpTcmpFilingtypecount({ area: this.mystortTow });
+                if (msg1.code == 200) {
                     msg1.data.forEach(item => {
-                        let obj = {
-                            value: item.count,
-                            name: item.cplb,
+                        if (item.jx && item.jx != 'null') {
+                            this.chartDatatow.push(item.count)
+                            this.chartData.push(item.jx)
                         }
-                        this.chartDatatow.push(obj)
-                        this.chartData.push(item.cplb)
+                        this.clickShow = true
+
                     })
                 }
-            } else if(this.leafletitle == "药品") {
-                this.chartData = ["中药",'生物制品','化学药品']
-                this.chartDatatow = [
-                    { value: 100, name: '中药' },
-                    { value: 120, name: '生物制品' },
-                    { value: 130, name: '化学药品' },
-                ]
-            }else if(this.leafletitle == "化妆品") {
-                this.chartData = ["国产化妆品",'国产特殊化妆品','进口化妆品','进口特殊化妆品']
-                this.chartDatatow = [
-                    { value: 100, name: '国产化妆品' },
-                    { value: 120, name: '国产特殊化妆品' },
-                    { value: 130, name: '进口化妆品' },
-                    { value: 140, name: '进口特殊化妆品' },
-                ]
-            }
+            } 
 
 
             // if (this.leafletitle == "药品") {
@@ -164,166 +182,113 @@ export default {
 
             // }
             this.mycharts()
-
         },
-        async isLefleat() {
-            if (this.leafletitle == "医疗器械") {
-                let msg2 = await this.$api.apparatus.ylqxJnyelcpareacount();
+        async isLefleat(data = '1') {
+            this.cityData = {
+                沈阳市: 0,
+                大连市: 0,
+                鞍山市: 0,
+                抚顺市: 0,
+                本溪市: 0,
+                丹东市: 0,
+                锦州市: 0,
+                营口市: 0,
+                阜新市: 0,
+                辽阳市: 0,
+                盘锦市: 0,
+                铁岭市: 0,
+                朝阳市: 0,
+                葫芦岛市: 0,
+                沈抚示范区: 0,
+            }
+            let _this = this
+            if (this.echartstitle == "医疗器械") {
+                jiekou("ylqxJnyelcpareacount")
+            } else if (this.echartstitle == "药品") {
+                jiekou("vRdgYpwhGxwztareacount")
+            } else if (this.echartstitle == "传统中药") {
+                jiekou("deasCorpTcmpFilingChangeHis")
+            } else if (this.echartstitle == "化妆品") {
+                let msg2 = await this.$api.apparatus["gccpareacount"]({ area: data })
+
                 if (msg2.code == 200) {
-                    console.log(msg2.data);
                     msg2.data.forEach(item => {
+
                         this.cityData[item.area] = item.count
                     })
                 }
-                console.log(this.cityData);
-                this.initMap()
-            } else if (this.leafletitle == "药品") {
-                let msg2 = await this.$api.apparatus.vRdgYpwhGxwztareacount()
+
+                this.initPoitCenter(this.cityData);
+            }
+            async function jiekou(data) {
+                let msg2 = await _this.$api.apparatus[data]()
                 if (msg2.code == 200) {
-                    console.log(msg2.data);
                     msg2.data.forEach(item => {
-                        this.cityData[item.area] = item.count
+                        _this.cityData[item.area] = item.count
                     })
                 }
-                console.log(this.cityData);
-                this.initMap()
-            } else {
-                this.initMap()
+                _this.initPoitCenter(_this.cityData);
+
             }
+
         },
         mycharts() {
-            this.myChart = echarts.init(document.getElementById("echarts"));
+
             let option = {
-                // title: {
-                //     text: '天气情况统计',
-                //     subtext: '虚构数据',
-                //     left: 'center'
-                // },
                 tooltip: {
-                    trigger: 'item',
-                    formatter: "{b} : {c}  ({d}%)"
-                },
-                legend: {
-                    icon: `path://M881.387 297.813c38.08 65.387 57.28 136.747 57.28 214.187s-19.094 148.8-57.28 214.187c-38.187 65.28-89.92 117.12-155.2 155.2S589.44 938.667 512 938.667s-148.8-19.094-214.187-57.28c-65.28-38.08-117.013-89.814-155.306-155.307C104.427 660.8 85.333 589.44 85.333 512c0-77.333 19.094-148.693 57.28-214.187 38.08-65.28 89.814-117.013 155.307-155.306C363.2 104.533 434.56 85.333 512 85.333c77.333 0 148.693 19.094 214.187 57.28 65.28 38.187 117.013 89.92 155.2 155.2z m-217.707-47.36C617.387 223.467 566.827 209.92 512 209.92s-105.387 13.547-151.68 40.533-82.987 63.68-109.973 109.974c-26.987 46.293-40.534 96.853-40.534 151.68s13.547 105.386 40.534 151.68c26.986 46.293 63.68 82.986 109.973 109.973 46.293 26.987 96.853 40.533 151.68 40.533s105.387-13.546 151.68-40.533c46.293-26.987 82.987-63.68 109.973-109.973 26.987-46.294 40.534-96.854 40.534-151.68s-13.547-105.387-40.534-151.68c-27.093-46.294-63.786-82.987-109.973-109.974z`,
-                    type: 'scroll', // 设置图例分页滚动显示
-                    orient: 'vertical', // 设置图例垂直排列
-                    right: '20', // 将图例放到左侧
-                    top: 'center',
-                    itemWidth: 20, // 设置图例标记的宽度
-                    itemHeight: 20, // 设置图例标记的高度
-                    itemGap: 10,
-                    textStyle: {
-                        fontSize: '14px'
+                    trigger: 'axis',
+                    axisPointer: {
+                        type: 'shadow'
                     },
-                    formatter: function (name) {
-                        // 获取数据
-                        let chartData = option.series[0].data;
-                        let total = 0;
-                        for (let i = 0; i < chartData.length; i++) {
-                            total += chartData[i].value; // 计算总数
+                    formatter: function (params) {
+                        if (params && params.length > 0) {
+                            return params[0].name + ' : ' + params[0].value;
                         }
-                        let value = 0;
-                        for (let i = 0; i < chartData.length; i++) {
-                            if (chartData[i].name === name) {
-                                value = chartData[i].value; // 获取当前图例项对应的值
-                                break;
-                            }
-                        }
-                        let percent = ((value / total) * 100).toFixed(2) + '%'; // 计算百分比
-                        // 返回格式化的内容
-                        return `${name}  ${value}   ${percent}`;
-                    },
-
-                    data: this.chartData,
-
-
+                        return '';
+                    }
                 },
-
-
-                series: [
-                    {
-                        type: 'pie',
-                        radius: ['25%', '70%'],
-                        center: ['35%', '50%'],
-                        selectedMode: 'single',
-                        roseType: 'radius',
-                        avoidLabelOverlap: false,
-                        label: {
-                            show: false,
-                            position: 'outside',
-                            formatter: '{b}: {d}%'
-                        },
-                        labelLine: {
-                            show: false,
-                            normal: {
-                                length: 15,
-                                length2: 10,
-                                lineStyle: {
-                                    color: '#333'
-                                }
-                            }
-                        },
-                        data: this.chartDatatow,
-
-                        itemStyle: {
-                            emphasis: {
-                                shadowBlur: 10,
-                                shadowOffsetX: 0,
-                                shadowColor: 'rgba(0, 0, 0, 0.5)'
-                            },
-                            normal: {
-                                color: function (params) {
-                                    // 颜色变浅
-                                    var colorList = ['#C1232B', '#B5C334', '#FCCE10', '#E87C25', '#27727B'];
-                                    return colorList[params.dataIndex % colorList.length];
-                                }
-                            }
-
-                        }
-                    },
-                    // 添加内圆
-                    {
-                        type: 'pie',
-                        radius: ['0%', '20%'],
-                        avoidLabelOverlap: false,
-                        hoverAnimation: false, // 禁用鼠标悬停动画
-                        label: {
-                            show: false
-                        },
-                        labelLine: {
-                            show: false
-                        },
-                        data: [
-                            [{ value: 2702, name: '总量' }]
-                        ],
-                        itemStyle: {
-                            color: 'transparent',
-                            borderColor: '#ccc',
-                            borderWidth: 1
-                        }
+                grid: {
+                    left: '5%',
+                    right: '5%',
+                    bottom: '3%',
+                    containLabel: true
+                },
+                xAxis: [{
+                    type: 'category',
+                    data: this.chartData,
+                    axisTick: {
+                        alignWithLabel: true
                     }
-                ]
+                }],
+                yAxis: [{
+                    type: 'value'
+                }],
+                series: [{
+                    name: 'Direct',
+                    type: 'bar',
+                    barWidth: '20%', // 调整柱子宽度为 20%
+                    data: this.chartDatatow
+                }]
             };
 
             this.myChart.setOption(option, true);
-            let erd = elementResizeDetectorMaker();
-            let that = this;
-            erd.listenTo(document.getElementById("echarts"), function (element) {
-                that.myChart.resize();
-            })
+
+
         },
         initMap() {
             this.globalMap = L.map("leafletMap", {
                 center: [this.latitude, this.longitude], // 地图中心[纬度，经度]
-                zoom: this.zoom,
-                maxZoom: this.maxZoom,
-                minZoom: this.minZoom,
-                zoomControl: true, // 放大缩小按钮
+                // zoom: this.zoom,
+                // maxZoom: this.maxZoom,
+                // minZoom: this.minZoom,
+                zoomControl: false, // 放大缩小按钮
+                zoomSnap: 0,
                 attributionControl: false, // 右下角leaflet图标
+                scrollWheelZoom: false,
                 dragging: false,
                 doubleClickZoom: false,
                 scrollWheelZoom: false,
-                dragging: true,
+                dragging: false,
             });
             // 省
             this.globalMap.createPane("provinceLayer");
@@ -345,10 +310,17 @@ export default {
             this.initCityLayer(this.cityData);
             this.initPoitCenter(this.cityData);
 
+            this.globalMap.on('click', () => {
+                this.globalMap.fitBounds(this.mygeojson.getBounds());
+
+            })
+            this.isLefleat('1')
+
+
         },
         //省级图层
         provinceLayer() {
-            let mygeojson = L.geoJSON(province, {
+            this.mygeojson = L.geoJSON(province, {
                 style: function () {
                     return {
                         weight: 2,
@@ -358,7 +330,16 @@ export default {
                     };
                 },
             }).addTo(this.layerObj.provinceLayer);
-            this.globalMap.fitBounds(mygeojson.getBounds());
+            this.globalMap.fitBounds(this.mygeojson.getBounds());
+
+
+            let erd = elementResizeDetectorMaker();
+            let that = this;
+            erd.listenTo(document.getElementById("echarts"), function (element) {
+                that.myChart.resize();
+                that.globalMap.fitBounds(that.mygeojson.getBounds());
+
+            })
         },
         showinitCityLayer() {
             this.initCityLayer(this.cityData)
@@ -368,57 +349,19 @@ export default {
         },
         // 市级图层
         initCityLayer(data) {
-            console.log(798, data);
             let _this = this;
             let geojson = L.geoJSON(cityJson, {
                 onEachFeature: function onEachFeature(feature, layer) {
-                    if (this.mystort) {
-                        layer.on({
-                            // mouseover: thit.highlightFeature,
-                            // mouseout: function resetHighlight(e) {
-                            //   geojson.resetStyle(e.target);
-                            // },
-                            click: function zoomToFeature(e) {
-                                _this.highlightFeature(e, geojson)
-                                console.log(feature);
-                                _this.$emit('arealist', feature.properties.name)
+                    layer.on({
+                        click: function zoomToFeature(e) {
+                            if (!_this.mystort && _this.clickShow) {
                                 _this.mystortTow = feature.properties.name
-                                _this.isEcharts()
-                                // thit.globalMap.fitBounds(geojson.getBounds());
-                            },
-                        });
-                        return
-                    } else {
-                        layer.on({
-                            // mouseover: thit.highlightFeature,
-                            // mouseout: function resetHighlight(e) {
-                            //   geojson.resetStyle(e.target);
-                            // },
-                            click: function zoomToFeature(e) {
                                 _this.highlightFeature(e, geojson)
-                                console.log(feature);
-                                _this.$emit('arealist', feature.properties.name)
-                                _this.mystortTow = feature.properties.name
-                                _this.isEcharts()
-                                // thit.globalMap.fitBounds(geojson.getBounds());
-                            },
-                        });
-                    }
-
-                    // if (feature.properties.name == this.mystort) {
-                    //     layer.on({
-                    //         // mouseover: thit.highlightFeature,
-                    //         // mouseout: function resetHighlight(e) {
-                    //         //   geojson.resetStyle(e.target);
-                    //         // },
-                    //         click: function zoomToFeature(e) {
-                    //             _this.highlightFeature(e, geojson)
-                    //             console.log(feature);
-                    //             // thit.globalMap.fitBounds(geojson.getBounds());
-                    //         },
-                    //     });
-                    // }
+                                _this.clickShow = false
+                            }
 
+                        },
+                    });
                 },
                 style: (geoJsonFeature) => {
                     let num = data[geoJsonFeature.properties.name];
@@ -431,23 +374,12 @@ export default {
                     if (geoJsonFeature.properties.name == this.mystort) {
                         style.fillColor = "#FFFF00";
                     }
-                    // if (num == 0) {
-                    //     style.fillColor = "#C5F0FF";
-                    // } else if (num >= 1 && num <= 99) {
-                    //     style.fillColor = "#9BD3F5";
-                    // } else if (num >= 100 && num <= 199) {
-                    //     style.fillColor = "#59BBEC";
-                    // } else if (num >= 200 && num <= 399) {
-                    //     style.fillColor = "#4499CE";
-                    // } else if (num >= 400 && num <= 599) {
-                    //     style.fillColor = "#3477B2";
-                    // } else {
-                    //     style.fillColor = "#28599C";
-                    // }
                     return style;
                 },
             }).addTo(this.layerObj.cityLayer);
 
+            // this.globalMap.fitBounds(geojson.getBounds());
+
             //   市中心点
         },
 
@@ -468,7 +400,9 @@ export default {
                 "盘锦市": "稽查十三处",
                 "葫芦岛市": "稽查十四处"
             }
-            L.geoJSON(cityCenter, {
+
+            // <div class="circle"></div>
+            let geoJSON = L.geoJSON(cityCenter, {
                 pointToLayer: (feature, latlng) => {
                     if (!this.mystort && feature.properties.fName != '沈抚示范区') {
                         return L.marker(latlng, {
@@ -478,7 +412,6 @@ export default {
                         <div class="data-box">
                             ${data[feature.properties.fName]}
                         </div>
-                        <div class="circle"></div>
                         <div class="city-name">${ismyobj[feature.properties.fName]}</div>
                         <div class="city-name">（${feature.properties.fName}）</div>
                     </div>`,
@@ -492,7 +425,6 @@ export default {
                         <div class="data-box">
                             ${data[feature.properties.fName]}
                         </div>
-                        <div class="circle"></div>
                         <div class="city-name">${ismyobj[feature.properties.fName]}</div>
                         <div class="city-name">（${feature.properties.fName}）</div>
                     </div>`,
@@ -504,7 +436,6 @@ export default {
                                 className: "city-marker",
                                 html: `<div class="marker-data">
                        
-                        <div class="circle"></div>
                         <div class="city-name">${feature.properties.fName}</div>
                     </div>`,
                             }),
@@ -513,11 +444,33 @@ export default {
 
                 },
             }).addTo(this.layerObj.textLayer1);
+
+            // this.globalMap.fitBounds(geoJSON.getBounds());
         },
         highlightFeature(e, geojson) {
+            console.log();
             if (this.mylayer) {
-                geojson.resetStyle(this.mylayer);
+                if (this.mylayer.feature.properties.name == e.target.feature.properties.name) {
+
+
+                    this.mylayer.setStyle({
+                        weight: 0.5,
+                        color: "#fff",
+                        fillColor: "#87CEEB",
+                        fillOpacity: 1,
+                    });
+
+                    this.mylayer = null;
+                    this.$emit('arealist', "")
+                    this.mystortTow = null
+                    this.isEcharts()
+                    return
+                } else {
+                    geojson.resetStyle(this.mylayer);
+
+                }
             }
+
             this.mylayer = e.target;
             this.mylayer.setStyle({
                 weight: 0.3,
@@ -526,7 +479,8 @@ export default {
                 fillOpacity: 1,
                 fillColor: "#FFFF00"
             });
-
+            this.$emit('arealist', this.mylayer.feature.properties.name)
+            this.isEcharts()
             this.mylayer.bringToFront();
 
         },
@@ -548,15 +502,14 @@ export default {
 
     .echarts {
         width: 45vw;
-        height: 50vh;
+        height: 60vh;
     }
 
     .box1 {
         width: 45vw;
-        height: 50vh;
+        height: 60vh;
 
         .leafletMap {
-            margin: 0 auto;
             /* 水平居中 */
             background-color: #fff;
             min-width: 100%;
diff --git a/src/views/components/downloadFileBox/index.vue b/src/views/components/downloadFileBox/index.vue
index 524ab07..d703cc3 100644
--- a/src/views/components/downloadFileBox/index.vue
+++ b/src/views/components/downloadFileBox/index.vue
@@ -45,7 +45,6 @@ export default {
     getImg(){
       let res = this.fileName.split('.')
       let msg =res[res.length-1]
-      console.log(msg);
       if(msg == 'doc' || msg == 'docx'){
          return this.imageDate[2].url
       }else if(msg == 'xlsx' || msg == 'xls'){
diff --git a/src/views/productsMsg/components/cosmeticsArchives.vue b/src/views/productsMsg/components/cosmeticsArchives.vue
index 5158bb8..32a93a6 100644
--- a/src/views/productsMsg/components/cosmeticsArchives.vue
+++ b/src/views/productsMsg/components/cosmeticsArchives.vue
@@ -53,13 +53,15 @@
                 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select> </el-form-item></el-col>
+       
+        </el-row>
+        <el-row>
           <div class="footBox" v-show="bthshow">
             <el-button icon="el-icon-refresh-left" @click="reset">重置</el-button>
             <el-button type="primary" icon="el-icon-search" @click="searchList">查询</el-button>
             <el-button type="success" icon="el-icon-circle-plus-outline" @click="collapsechange(0)">展开</el-button>
           </div>
         </el-row>
-
         <div v-show="!bthshow">
           <el-row>
             <div class="title-box">产品抽检信息查询：</div>
@@ -132,36 +134,36 @@
         <section class="table-box">
           <div class="table-item">
             <el-table v-loading="loading" :data="tableData" border>
-              <el-table-column type="selection" width="50">
+              <el-table-column type="selection" width="50" align="center">
               </el-table-column>
-              <el-table-column type="index" label="序号" width="50" />
-              <el-table-column label="产品名称" width="380">
+              <el-table-column type="index" label="序号" width="80" align="center"/>
+              <el-table-column label="产品名称" width="380" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.cpmc }}
                 </template>
               </el-table-column>
               <!-- :label="A2" -->
-              <el-table-column label="注册/备案号" width="230">
+              <el-table-column label="注册/备案号" width="230" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.bah || scope.row.zczh }}
                 </template>
               </el-table-column>
-              <el-table-column label="注册/备案日期" width="240">
+              <el-table-column label="注册/备案日期" width="240" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.sj || scope.row.pzrq }}
                 </template>
               </el-table-column>
-              <el-table-column label="注册/备案人" width="240">
+              <el-table-column label="注册/备案人" width="240" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.lxr || scope.row.zcr }}
                 </template>
               </el-table-column>
-              <el-table-column label="生产企业/境内责任人" width="240">
+              <el-table-column label="生产企业/境内责任人" width="280" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.qymc || scope.row.zcr || scope.row.jnzrr }}
                 </template>
               </el-table-column>
-              <el-table-column label="操作" class-name="small-padding fixed-width" width="100" fixed="right">
+              <el-table-column label="操作" class-name="small-padding fixed-width" width="100" fixed="right" align="center">
                 <template slot-scope="scope">
                   <el-button type="primary" @click="toDetail(scope.row)">详情</el-button>
                   <!-- <el-button size="mini" plain type="warning">编辑</el-button> -->
@@ -267,6 +269,7 @@ export default {
       this.form.area = area
       this.form1.area = area
       this.getData(this.types);
+
     },
     collapsechange(e) {
       if (e == 0) {
@@ -296,7 +299,6 @@ export default {
       };
       dchzpsj(query1)
         .then((res) => {
-          console.log(res);
           const blob = new Blob([res], { type: res.type });
           // blob.text().then((res11) => console.log(res11));
           console.log(blob.stream());
@@ -337,7 +339,6 @@ export default {
       let arr = this.options.filter((value1) => {
         return value1.value == e;
       });
-      console.log(arr);
       return arr[0].label;
     },
     jieliuFunc() {
@@ -477,6 +478,8 @@ export default {
     },
     async changeType(e) {
       // this.reset();
+      this.$refs["mapcars"].isLefleat(e)
+
       this.getData(e);
     },
   },
@@ -537,9 +540,7 @@ export default {
 
   .tabs {
     margin-bottom: 10px;
-
     width: 100%;
-
     background: #fff;
   }
 }
@@ -550,8 +551,9 @@ export default {
 }
 
 .footBox {
-  width: 87.5%;
-  text-align: right;
+  width:97.5%;
+  text-align: center;
+  padding-bottom: 10px;
 }
 
 .tabsBottom {
@@ -569,7 +571,7 @@ export default {
 }
 
 .table-box {
-  padding: 10px 20px;
+  padding: 0px 20px;
 
   .table-item {}
 }
@@ -604,6 +606,7 @@ export default {
   font-size: 16px;
   font-weight: 600;
   margin-bottom: 20px;
+  color: #1349c5;
 }
 
 ::v-deep .el-collapse {
@@ -612,7 +615,7 @@ export default {
 
 ::v-deep .logformitem {
   .el-form-item__label {
-    line-height: 25px;
+    line-height: 20px;
   }
 }
 </style>
diff --git a/src/views/productsMsg/components/health.vue b/src/views/productsMsg/components/health.vue
index 6319154..2442007 100644
--- a/src/views/productsMsg/components/health.vue
+++ b/src/views/productsMsg/components/health.vue
@@ -56,14 +56,96 @@
           <el-col :span="8">
             <div class="logformitem">
               <el-form-item label="注册证状态/备案凭证状态">
-                <el-select v-model="form1.zczt" placeholder="请选择">
+                <el-select v-model="form1.ppztDm" placeholder="请选择注册证/备案凭证状态">
                   <el-option v-for="item in optionsTow" :key="item.value" :label="item.label" :value="item.value">
                   </el-option>
                 </el-select>
               </el-form-item>
             </div>
+          </el-col>
+          <el-col :span="8">
+            <div>
+              <el-form-item label="结构特征">
+                <el-select v-model="form1.ylqxjgtz" placeholder="请选择结构特征" :disabled="form1.cplb == '第三类'">
+                  <el-option v-for="item in optionsSan" :key="item.value" :label="item.label" :value="item.label">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </div>
+          </el-col>
+
+          <!-- <div class="footBox" v-show="bthshow">
+            <el-button icon="el-icon-refresh-left" @click="reset">重置</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="searchList">查询</el-button>
+            <el-button type="success" icon="el-icon-circle-plus-outline" @click="collapsechange(0)">展开</el-button>
+          </div> -->
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <div class="logformitem">
+              <el-form-item label="是否为优先注册产品">
+                <el-select v-model="form1.sfYxz" placeholder="请选择是否为优先注册产品" :disabled="form1.cplb == '第三类'">
+                  <el-option v-for="item in optionsSi" :key="item.value" :label="item.label" :value="item.label">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div>
+              <el-form-item label="是否为创新产品">
+                <el-select v-model="form1.sfCxcp" placeholder="请选择是否为创新产品" :disabled="form1.cplb == '第一类'||form1.cplb == '第三类'">
+                  <el-option v-for="item in optionsSi" :key="item.value" :label="item.label" :value="item.label">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="logformitem">
+              <el-form-item label="是否为应急注册产品">
+                <el-select v-model="form1.sfyjzccp" placeholder="请选择是否为应急注册产品" :disabled="form1.cplb == '第三类'">
+                  <el-option v-for="item in optionsSi" :key="item.value" :label="item.label" :value="item.label">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="logformitem">
+              <el-form-item label="是否为附条件审批产品">
+                <el-select v-model="form1.sfFjtjspcp" placeholder="请选择是否为附条件审批产品" :disabled="form1.cplb == '第三类'">
+                  <el-option v-for="item in optionsSi" :key="item.value" :label="item.label" :value="item.label">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div>
+              <el-form-item label="分类编码">
+
+                <el-input v-model="form1.ylqxflbm" placeholder="请输入分类编码" :disabled="form1.cplb == '第三类'"></el-input>
+
+              </el-form-item>
+
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="logformitem">
+              <el-form-item label="结构及组成或主要组成部分">
+
+                <el-input v-model="form1.jgjzccf" placeholder="请输入结构及组成或主要组成部分"></el-input>
 
+              </el-form-item>
+
+            </div>
           </el-col>
+        </el-row>
+        <el-row>
           <div class="footBox" v-show="bthshow">
             <el-button icon="el-icon-refresh-left" @click="reset">重置</el-button>
             <el-button type="primary" icon="el-icon-search" @click="searchList">查询</el-button>
@@ -116,10 +198,8 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="核查结论" placeholder="请输入核查结论">
-                <el-select v-model="form1.cyrq" placeholder="请选择核查结论">
-                  <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-                  </el-option>
-                </el-select> </el-form-item></el-col>
+                <el-input v-model="form1.cyrq" placeholder="请输入核查受理号"></el-input>
+              </el-form-item></el-col>
             <el-col :span="8">
               <el-form-item label="核查日期">
                 <el-input v-model="form1.jcrq" placeholder="请输入核查日期"></el-input>
@@ -144,7 +224,6 @@
                 <el-input v-model="form1.lcsybah" placeholder="请输入临床试验备案号"></el-input>
               </el-form-item>
             </el-col>
-
           </el-row>
           <el-row>
             <el-col :span="8">
@@ -152,12 +231,12 @@
                 <el-input v-model="form1.syhcrq" placeholder="请输入试验核查日期"></el-input>
               </el-form-item>
             </el-col>
-
+          </el-row>
+          <el-row>
             <div class="footBox" v-show="!bthshow">
               <el-button icon="el-icon-refresh-left" @click="reset">重置</el-button>
               <el-button type="primary" icon="el-icon-search" @click="searchList">查询</el-button>
               <el-button type="success" icon="el-icon-remove-outline" @click="collapsechange(1)">收起</el-button>
-
             </div>
           </el-row>
 
@@ -178,33 +257,33 @@
         <section class="table-box">
           <div class="table-item">
             <el-table v-loading="loading" :data="tableData" border>
-              <el-table-column type="selection" width="50" />
-              <el-table-column type="index" label="序号" width="50" />
-              <el-table-column label="产品名称" prop="cpmc" width="180">
+              <el-table-column type="selection" width="50" align="center" />
+              <el-table-column type="index" label="序号" width="80" align="center" />
+              <el-table-column label="产品名称" prop="cpmc" width="180" align="center">
               </el-table-column>
-              <el-table-column label="产品类型" prop="cplx" width="100"></el-table-column>
-              <el-table-column label="生产企业" prop="zcsqr" width="280"></el-table-column>
-              <el-table-column label="产品管理类别" prop="cplb" width="150"></el-table-column>
-              <el-table-column label="注册证编号/备案编号" prop="zczh" width="230">
+              <el-table-column label="产品类型" prop="cplx" width="180" align="center"></el-table-column>
+              <el-table-column label="生产企业" prop="zcsqr" width="280" align="center"></el-table-column>
+              <el-table-column label="产品管理类别" prop="cplb" width="180" align="center"></el-table-column>
+              <el-table-column label="注册证编号/备案编号" prop="zczh" width="280" align="center">
               </el-table-column>
-              <el-table-column label="统一社会信用代码" prop="shxydm" width="230">
+              <el-table-column label="统一社会信用代码" prop="shxydm" width="280" align="center">
               </el-table-column>
-              <el-table-column label="批准日期" prop="pzrq" width="200">
+              <el-table-column label="批准日期" prop="pzrq" width="200" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.pzrq.split(" ")[0] }}
                 </template>
               </el-table-column>
-              <el-table-column label="注册厂家" prop="zcsqr" width="280">
+              <el-table-column label="注册厂家" prop="zcsqr" width="280" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.zcsqr }}
                 </template>
               </el-table-column>
-              <el-table-column label=" 注册证状态/备案凭证状态" prop="ppztDm" width="280">
+              <el-table-column label=" 注册证状态/备案凭证状态" prop="ppztDm" width="280" align="center">
                 <template slot-scope="scope">
                   {{ zczt(scope.row.ppztDm) }}
                 </template>
               </el-table-column>
-              <el-table-column label="操作" class-name="small-padding fixed-width" width="100" fixed="right">
+              <el-table-column label="操作" class-name="small-padding fixed-width" width="100" fixed="right" align="center">
                 <template slot-scope="scope">
                   <el-button type="primary" @click="toDetail(scope.row)">详情</el-button>
                   <!-- <el-button size="mini" plain type="warning">编辑</el-button> -->
@@ -267,6 +346,14 @@ export default {
         { value: 7, label: '注销' },
         { value: 8, label: '取消备案' }
       ],
+      optionsSan: [
+        { value: 1, label: '有源' },
+        { value: 2, label: '无源' },
+      ],
+      optionsSi: [
+        { value: 1, label: '是' },
+        { value: 2, label: '否' },
+      ],
       form1: {
         cplb: "",
         cpmc: "",
@@ -288,8 +375,15 @@ export default {
         jcrq: "",
         syrq: "",
         syhcrq: "",
-        // 注册证状态/备案凭证状态
-        zczt: "",
+
+        ppztDm: "",// 注册证状态/备案凭证状态
+        ylqxjgtz: '', //结构特征 1有源 2 无源
+        sfCxcp: '',// 是否为创新产品 1是 2 否
+        sfYxz: "",// 是否为优先注册产品 1是 2 否
+        sfyjzccp: "",//是否为应急注册产品 1是 2 否
+        sfFjtjspcp: "",//是否为附加条件审批产品 1是 2 否
+        ylqxflbm: "",//输入分类编码
+        jgjzccf: "",//结构及组成或主要组成部
         area: this.$store.getters.usersort
 
       },
@@ -428,7 +522,13 @@ export default {
         syrq: "",
         syhcrq: "",
         // 注册证状态/备案凭证状态
-        zczt: "",
+        ppztDm: "",
+        ylqxjgtz: '', //结构特征 1有源 2 无源
+        sfCxcp: '',// 是否为创新产品 1是 2 否
+        sfYxz: "",// 是否为优先注册产品 1是 2 否
+        sfyjzccp: "",//是否为应急注册产品 1是 2 否
+        ylqxflbm: "",//输入分类编码
+        jgjzccf: "",//结构及组成或主要组成部
         area: this.$store.getters.usersort
       };
       this.form = {
@@ -534,8 +634,9 @@ export default {
 }
 
 .footBox {
-  width: 87.5%;
-  text-align: right;
+  width: 97.5%;
+  text-align: center;
+  padding-bottom: 10px;
 }
 
 .tabsBottom {
@@ -573,7 +674,7 @@ export default {
 
 ::v-deep .logformitem {
   .el-form-item__label {
-    line-height: 25px;
+    line-height: 20px;
   }
 }
 
@@ -603,5 +704,6 @@ export default {
   font-size: 16px;
   font-weight: 600;
   margin-bottom: 20px;
+  color: #1349c5;
 }
 </style>
diff --git a/src/views/productsMsg/components/productInfo.vue b/src/views/productsMsg/components/productInfo.vue
index af85cfc..cbd87ca 100644
--- a/src/views/productsMsg/components/productInfo.vue
+++ b/src/views/productsMsg/components/productInfo.vue
@@ -11,13 +11,14 @@ export default {
     return {
       iframViewStyle: {
         height: "",
+        show: true
       },
-      // 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}`,
-      Url: `http://localhost:81?type=${this.$route.query.type
+      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}`,
+      // Url: `http://localhost:81?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}`,
     };
   },
   methods: {},
@@ -26,16 +27,39 @@ export default {
   },
   methods: {},
   mounted() {
+    // this.$nextTick(() => {
+    //   let dom = document.getElementsByClassName("ifram-view");
+    //   let height = dom[0].getBoundingClientRect();
+    //   // let windowWidth = window.innerWidth;
+    //   let windowHeight = window.innerHeight;
+    //   let relativeHeight = windowHeight - height.top;
+    //   this.iframViewStyle.height = relativeHeight + "px";
+    // });
+  },
+  deactivated() {
+    // 当离开了缓存的页面时被调用
+    this.Url = ''
+    // 可以在这里做一些清理操作
+  },
+  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
+        }&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;
       let windowHeight = window.innerHeight;
       let relativeHeight = windowHeight - height.top;
       this.iframViewStyle.height = relativeHeight + "px";
+
       console.log(this.Url);
     });
-  },
+
+  }
 };
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/productsMsg/index.vue b/src/views/productsMsg/index.vue
index e63f000..19dfc8f 100644
--- a/src/views/productsMsg/index.vue
+++ b/src/views/productsMsg/index.vue
@@ -72,11 +72,12 @@
               </el-select> </el-form-item>
           </el-col>
 
-          <div class="footBox">
-            <el-button icon="el-icon-refresh-left" @click="reset">重置</el-button>
-            <el-button type="primary" icon="el-icon-search" @click="searchList">查询</el-button>
-          </div>
+
         </el-row>
+        <div class="footBox">
+          <el-button icon="el-icon-refresh-left" @click="reset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="searchList">查询</el-button>
+        </div>
 
       </el-form>
 
@@ -92,58 +93,58 @@
         <section class="table-box">
           <div class="table-item">
             <el-table v-loading="loading" :data="tableData" border>
-              <el-table-column type="index" label="序号" width="50" />
-              <el-table-column label="产品名称" width="230">
+              <el-table-column type="index" label="序号" width="80" align="center" />
+              <el-table-column label="产品名称" width="230" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.yptymc }}
                 </template>
               </el-table-column>
-              <el-table-column label="批准文号" width="170">
+              <el-table-column label="批准文号" width="280" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.yppzwh }}
                 </template>
               </el-table-column>
-              <el-table-column label="药品分类" width="120">
+              <el-table-column label="药品分类" width="120" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.ypfl }}
                 </template>
               </el-table-column>
-              <el-table-column label="剂型" width="120">
+              <el-table-column label="剂型" width="120" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.jx }}
                 </template>
               </el-table-column>
-              <el-table-column label="规格" width="120">
+              <el-table-column label="规格" width="120" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.ypgg }}
                 </template>
               </el-table-column>
-              <el-table-column label="批准日期" min-width="180">
+              <el-table-column label="批准日期" min-width="180" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.pzrq }}
                 </template>
               </el-table-column>
-              <el-table-column label="批准文号有限期" min-width="180">
+              <el-table-column label="批准文号有限期" min-width="200" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.yppzwhyxq }}
                 </template>
               </el-table-column>
-              <el-table-column label="生产单位" min-width="230">
+              <el-table-column label="生产单位" min-width="230" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.ypscqymc }}
                 </template>
               </el-table-column>
-              <el-table-column label="生产地址" min-width="230">
+              <el-table-column label="生产地址" min-width="230" align="center">
                 <template slot-scope="scope">
                   <div class="norepet">{{ scope.row.scdz }}</div>
                 </template>
               </el-table-column>
-              <el-table-column label="生产企业" min-width="230">
+              <el-table-column label="生产企业" min-width="230" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.ypscqymc }}
                 </template>
               </el-table-column>
-              <el-table-column label="操作" class-name="small-padding fixed-width" width="100" fixed="right">
+              <el-table-column label="操作" class-name="small-padding fixed-width" width="100" fixed="right" align="center">
                 <template slot-scope="scope">
                   <el-button type="primary" @click="toDetail(scope.row)">查看</el-button>
                 </template>
@@ -152,7 +153,7 @@
           </div>
         </section>
         <pagination :total="total" :page="form.current" :limit="form.size" @pagination="getPagination"
-          :current-page.sync="form.current" :page-sizes="[10, 20, 50]"></pagination>
+          :current-page.sync="form.current" :page-sizes="[5, 10, 20]"></pagination>
       </div>
     </div>
     <el-dialog title="提示" :visible.sync="showCK" width="30%">
@@ -312,11 +313,9 @@ export default {
       for (let i in this.form1) {
         this.form[i] = this.form1[i];
       }
-      console.log(this.form);
       this.jieliuFunc();
     },
     getPagination(e) {
-      console.log(e);
       this.form.current = e.page;
       this.form.size = e.limit;
       this.chinaCosmetics(1);
@@ -365,7 +364,6 @@ export default {
     },
   },
   beforeRouteLeave(to, from, next) {
-    console.log(111);
     if (to.path != '/cosmeticsDetail') {
       this.reset(1)
       this.MapCarsshow = false
@@ -373,9 +371,8 @@ export default {
     next()
   },
   activated(to, from, next) {
-    console.log('进入');
     this.MapCarsshow = true
-   
+
   }
 
 };
@@ -437,8 +434,9 @@ export default {
 }
 
 .footBox {
-  width: 87.5%;
-  text-align: right;
+  width: 97.5%;
+  text-align: center;
+  padding-bottom: 10px;
 }
 
 .tabsBottom {
diff --git a/src/views/productsMsg/zyzj.vue b/src/views/productsMsg/zyzj.vue
index d716cf5..c3cdd1e 100644
--- a/src/views/productsMsg/zyzj.vue
+++ b/src/views/productsMsg/zyzj.vue
@@ -50,11 +50,12 @@
               </el-form-item>
             </div>
           </el-col>
-          <div class="footBox">
+         
+        </el-row>
+        <div class="footBox">
             <el-button icon="el-icon-refresh-left" @click="reset">重置</el-button>
             <el-button type="primary" icon="el-icon-search" @click="searchList">查询</el-button>
           </div>
-        </el-row>
       </el-form>
 
     </div>
@@ -69,49 +70,49 @@
         <section class="table-box">
           <div class="table-item">
             <el-table v-loading="loading" :data="tableData" border>
-              <el-table-column type="index" label="序号" width="50" />
-              <el-table-column label="通用名称" width="180">
+              <el-table-column type="index" label="序号" width="80" align="center"/>
+              <el-table-column label="通用名称" width="180" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.tymc }}
                 </template>
               </el-table-column>
-              <el-table-column label="备案号" width="280">
+              <el-table-column label="备案号" width="280" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.bah }}
                 </template>
               </el-table-column>
-              <el-table-column label="统一社会信用代码" width="280">
+              <el-table-column label="统一社会信用代码" width="280" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.uniscid }}
                 </template>
               </el-table-column>
-              <el-table-column label="剂型" width="180">
+              <el-table-column label="剂型" width="180" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.jx }}
                 </template>
               </el-table-column>
-              <el-table-column label="规格" width="180">
+              <el-table-column label="规格" width="180" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.gg }}
                 </template>
               </el-table-column>
-              <el-table-column label="备案状态" width="180">
+              <el-table-column label="备案状态" width="180" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.status }}
                 </template>
               </el-table-column>
-              <el-table-column label="医疗机构名称" width="280">
+              <el-table-column label="医疗机构名称" width="280" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.yljgmc }}
                 </template>
               </el-table-column>
 
-              <el-table-column label="医疗机构制剂许可证编号" width="280">
+              <el-table-column label="医疗机构制剂许可证编号" width="300" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.zjxkzbh }}
                 </template>
               </el-table-column>
-              <el-table-column label="操作" class-name="small-padding fixed-width" width="100" fixed="right">
+              <el-table-column label="操作" class-name="small-padding fixed-width" width="100" fixed="right" align="center">
                 <template slot-scope="scope">
                   <el-button type="primary" @click="toDetail(scope.row)">查看</el-button>
                 </template>
@@ -389,8 +390,10 @@ export default {
 }
 
 .footBox {
-  width: 87.5%;
-  text-align: right;
+  width:97.5%;
+
+  text-align: center;
+  padding-bottom: 10px;
 }
 
 .tabsBottom {