diff --git a/src/App.vue b/src/App.vue
index f0aa259..63caa01 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -40,7 +40,7 @@ export default {
       	
         cd /usr/share/nginx/html/ggfw-dangan 移动到文件夹下
   
-            解压
+        unzip ggfw-dangan.zip 解压
    */
   },
 };
@@ -50,7 +50,6 @@ export default {
 #app .theme-picker {
   display: none;
 }
-
 .el-form-item--medium {
   margin-left: 40px;
   margin-bottom: 8px;
diff --git a/src/api/archives/cosmetics.js b/src/api/archives/cosmetics.js
index f428839..5a51982 100644
--- a/src/api/archives/cosmetics.js
+++ b/src/api/archives/cosmetics.js
@@ -91,6 +91,7 @@ export default {
 
         });
     },
+   
     getDicts(params) {
         return request({
             url: '/pharmaceuticals/groductsLabel/dict',
@@ -98,5 +99,12 @@ export default {
             params
         })
     },
+    hzpToothpaste(params) {
+        return request({
+            url: '/pharmaceuticals/hzpToothpaste',
+            method: 'get',
+            params
+        })
+    },
 
 }
diff --git a/src/api/archives/updata.js b/src/api/archives/updata.js
index 853b1de..6dc2a9f 100644
--- a/src/api/archives/updata.js
+++ b/src/api/archives/updata.js
@@ -47,7 +47,7 @@ export function dcylqx(query) {
     });
 }
 
-    //分页条件查询受托生产企业数据
+//分页条件查询受托生产企业数据
 export function entrustedEnterexport(query) {
     return request({
         url: "/pharmaceuticals/entrustedEnter/export",
@@ -57,7 +57,7 @@ export function entrustedEnterexport(query) {
     });
 
 }
-    //条件导出原料药数据
+//条件导出原料药数据
 export function vRdgYpwhGxwzexportYly(query) {
     return request({
         url: "/pharmaceuticals/vRdgYpwhGxwz/exportYly",
@@ -66,4 +66,14 @@ export function vRdgYpwhGxwzexportYly(query) {
         responseType: 'blob'
     });
 
+}
+//分页条件查询受托生产企业数据
+export function hzpToothpasteexport(query) {
+    return request({
+        url: "/pharmaceuticals/hzpToothpaste/export",
+        method: "GET",
+        params: query,
+        responseType: 'blob'    //在请求中加上这一行，特别重要
+
+    });
 }
\ No newline at end of file
diff --git a/src/api/external/index.js b/src/api/external/index.js
index ba82bc3..527f619 100644
--- a/src/api/external/index.js
+++ b/src/api/external/index.js
@@ -3,7 +3,7 @@ import request from "@/utils/request";
 //获取用户信息
 export function getselfInfo() {
   return request({
-    // baseURL: location.origin,
+    baseURL: location.origin,
     url: "/api/admin/user/getSelfInfo",
     method: "GET",
   });
diff --git a/src/router/index.js b/src/router/index.js
index ea47ed1..26c97dd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -31,26 +31,26 @@ import Layout from "@/layout";
 // 公共路由
 //药品
 let yaopinzhuju = ["责任处室：药品注册管理处", "业务联系人：孙轶", "联系电话：024-31607090", "系统联系人：张鹏", "联系电话：024-31605497"]
-let yaopinshuju =  ["数据来源：药品注册管理处", "更新方式：手动更新",]
+let yaopinshuju = ["数据来源：药品注册管理处", "更新方式：手动更新",]
 //器械
-  //一类
+//一类
 let qixieyileizeren = ["责任处室：医疗器械监管处", "业务联系人：刘海洋", "联系电话：024-31607051", "系统联系人：苏超", "联系电话：024-31602090"]
-let qixieyileishuju =  ["数据来源：各地市市场监督管理局", "更新方式：手动更新","更新频次：每周更新，每季度校核一次"]
-let qixieyileiqita =  ["一类器械产品信息修改应告知所在地市场监督管理局，由其将信息提供至科技处",]
-  //二类
+let qixieyileishuju = ["数据来源：各地市市场监督管理局", "更新方式：手动更新", "更新频次：每周更新，每季度校核一次"]
+let qixieyileiqita = ["一类器械产品信息修改应告知所在地市场监督管理局，由其将信息提供至科技处",]
+//二类
 let Erqixieyileizeren = ["责任处室：医疗器械监管处", "业务联系人：孙小玲、任书乐", "联系电话：024-31607043、7105", "系统联系人：张鹏", "联系电话：024-31605497"]
-let Erqixieyileishuju =  ["数据来源：医疗器械监管处", "更新方式：手动更新","更新频次：注册信息变化发生5个工作日内更新，每季度校核一次"]
-  //三类
- let Sanqixieyileizeren = ["责任处室：医疗器械监管处", "业务联系人：孙小玲", "联系电话：024-31607043", "系统联系人：张鹏", "联系电话：024-31605497"]
- let Sanqixieyileishuju =  ["数据来源：国家药品监管数据共享平台", "更新方式：自动更新","更新频次：每日更新，每季度校核一次"]
+let Erqixieyileishuju = ["数据来源：医疗器械监管处", "更新方式：手动更新", "更新频次：注册信息变化发生5个工作日内更新，每季度校核一次"]
+//三类
+let Sanqixieyileizeren = ["责任处室：医疗器械监管处", "业务联系人：孙小玲", "联系电话：024-31607043", "系统联系人：张鹏", "联系电话：024-31605497"]
+let Sanqixieyileishuju = ["数据来源：国家药品监管数据共享平台", "更新方式：自动更新", "更新频次：每日更新，每季度校核一次"]
 //国产化妆品
- let huahzuangpzeren =  ["责任处室: 化妆品监管处", "业务联系人: 李想","联系电话: 024-31607030","系统联系人：张鹏","联系电话：024-31605497"]
- let huahzuangpshuju =  ["数据来源：国家药品监管数据共享平台、化妆品监管处", "更新方式：自动+手动更新","更新频次：每日更新产品名称、备案编号、备案人信息，其他信息每年更新"]
- //进口化妆品
- let Tshuahzuangpshuju =  ["数据来源：国家药品监管数据共享平台、化妆品监管处", "更新方式：自动+手动更新", "更新频次：每日更新产品名称、备案编号、备案人、境内责任人信息，其他信息每年更新"]
- //跨省受托
- let KShuahzuangpshuju =  ["数据来源：化妆品监管处", "更新方式：手动更新", "更新频次：每年更新"]
- 
+let huahzuangpzeren = ["责任处室: 化妆品监管处", "业务联系人: 李想", "联系电话: 024-31607030", "系统联系人：张鹏", "联系电话：024-31605497"]
+let huahzuangpshuju = ["数据来源：国家药品监管数据共享平台、化妆品监管处", "更新方式：自动+手动更新", "更新频次：每日更新产品名称、备案编号、备案人信息，其他信息每年更新"]
+//进口化妆品
+let Tshuahzuangpshuju = ["数据来源：国家药品监管数据共享平台、化妆品监管处", "更新方式：自动+手动更新", "更新频次：每日更新产品名称、备案编号、备案人、境内责任人信息，其他信息每年更新"]
+//跨省受托
+let KShuahzuangpshuju = ["数据来源：化妆品监管处", "更新方式：手动更新", "更新频次：每年更新"]
+
 export const constantRoutes = [
   {
     path: "/redirect",
@@ -102,65 +102,73 @@ export const constantRoutes = [
             name: "yaopinbapz",
             icon: require("@/assets/images/tree4.svg"),
             component: () => import("@/views/productsMsg/drugArchives/yaopinbapz.vue"),
-            meta: { title: "本省持有品种", keepAlive: true,topTitle:"本省持有药品信息档案", 
-            titlefootChilder: [{
-              name: "数据质量责任",
-              children: yaopinzhuju
+            meta: {
+              title: "本省持有品种", keepAlive: true, topTitle: "本省持有药品信息档案",
+              titlefootChilder: [{
+                name: "数据质量责任",
+                children: yaopinzhuju
+              },
+              {
+                name: "数据更新说明",
+                children: ["数据来源：国家药品监管数据共享平台", "更新方式：自动更新", "更新频次：每日更新，每季度校核一次"]
+              },],
             },
-            {
-              name: "数据更新说明",
-              children: ["数据来源：国家药品监管数据共享平台", "更新方式：自动更新", "更新频次：每日更新，每季度校核一次"]
-            },], },
           }, {
             path: "/drugArchives/yaopinstscpz",
             name: "yaopinstscpz",
             icon: require("@/assets/images/tree4.svg"),
             component: () => import("@/views/productsMsg/drugArchives/yaopinstscpz.vue"),
-            meta: { title: "本省受托品种", keepAlive: true ,topTitle:"本省跨省受托生产药品信息档案", 
-            titlefootChilder: [{
-              name: "数据质量责任",
-              children: yaopinzhuju
-            },
-            {
-              name: "数据更新说明",
-              children: [...yaopinshuju, "更新频次：每季度更新"]
-            }, {
-              name: "其他说明事项",
-              children: ["药品注册处负每季度将本省持有品种再注册中，涉及持有人变更为外省的信息提供至科技处"]
+            meta: {
+              title: "本省受托品种", keepAlive: true, topTitle: "本省跨省受托生产药品信息档案",
+              titlefootChilder: [{
+                name: "数据质量责任",
+                children: yaopinzhuju
+              },
+              {
+                name: "数据更新说明",
+                children: [...yaopinshuju, "更新频次：每季度更新"]
+              }, {
+                name: "其他说明事项",
+                children: ["药品注册处负每季度将本省持有品种再注册中，涉及持有人变更为外省的信息提供至科技处"]
+              },
+              ],
             },
-          ],},
           },
           {
             path: "/drugArchives/yaopinyuanliao",
             name: "yaopinyuanliao",
             icon: require("@/assets/images/tree4.svg"),
             component: () => import("@/views/productsMsg/drugArchives/yaopinyuanliao.vue"),
-            meta: { title: "原料药品种", keepAlive: true,topTitle:"本省登记原料药信息档案", 
-            titlefootChilder: [{
-              name: "数据质量责任",
-              children: yaopinzhuju
+            meta: {
+              title: "原料药品种", keepAlive: true, topTitle: "本省登记原料药信息档案",
+              titlefootChilder: [{
+                name: "数据质量责任",
+                children: yaopinzhuju
+              },
+              {
+                name: "数据更新说明",
+                children: [...yaopinshuju, "更新频次：每年更新"]
+              },],
             },
-            {
-              name: "数据更新说明",
-              children: [...yaopinshuju, "更新频次：每年更新"]
-            },], },
           },
           {
             path: "/zyzj",
             name: "zyzj",
             icon: require("@/assets/images/tree4.svg"),
             component: () => import("@/views/productsMsg/zyzj.vue"),
-            meta: { title: "中药制剂品种", 
-            keepAlive: true,
-            topTitle:"传统工艺配置中药制剂信息档案", 
-            titlefootChilder: [{
-              name: "数据质量责任",
-              children: ["责任处室：药品注册管理处", "业务联系人：王明东", "联系电话：024-31607903", "系统联系人：张鹏", "联系电话：024-31605497"]
+            meta: {
+              title: "中药制剂品种",
+              keepAlive: true,
+              topTitle: "传统工艺配置中药制剂信息档案",
+              titlefootChilder: [{
+                name: "数据质量责任",
+                children: ["责任处室：药品注册管理处", "业务联系人：王明东", "联系电话：024-31607903", "系统联系人：张鹏", "联系电话：024-31605497"]
+              },
+              {
+                name: "数据更新说明",
+                children: ["数据来源：药品注册管理处", "更新方式：自动更新", "更新频次：实时更新，每季度校核一次"]
+              },],
             },
-            {
-              name: "数据更新说明",
-              children: ["数据来源：药品注册管理处", "更新方式：自动更新", "更新频次：实时更新，每季度校核一次"]
-            },], },
           },
         ]
 
@@ -172,115 +180,126 @@ export const constantRoutes = [
         icon: require("@/assets/images/tree4.svg"),
         component: () => import("@/views/productsMsg/components/health.vue"),
         meta: { title: "医疗器械档案", keepAlive: true },
-        children:[
+        children: [
           {
             path: "/health/health",
             name: "health",
             icon: require("@/assets/images/tree4.svg"),
             component: () => import("@/views/productsMsg/components/healthSon/health.vue"),
-            meta: { title: "医疗器械综合查询", keepAlive: true,
-            titlefootChilder: [], },
+            meta: {
+              title: "医疗器械综合查询", keepAlive: true,
+              titlefootChilder: [],
+            },
           },
           {
             path: "/health/QIxiehealthOne",
             name: "QIxiehealthOne",
             icon: require("@/assets/images/tree4.svg"),
             component: () => import("@/views/productsMsg/components/healthSon/QIxiehealthOne.vue"),
-            meta: { title: "一类医疗器械", keepAlive: true,topTitle:"一类医疗器械信息档案", 
-            titlefootChilder: [{
-              name: "数据质量责任",
-              children: qixieyileizeren
-            },
-            {
-              name: "数据更新说明",
-              children: qixieyileishuju
+            meta: {
+              title: "一类医疗器械", keepAlive: true, topTitle: "一类医疗器械信息档案",
+              titlefootChilder: [{
+                name: "数据质量责任",
+                children: qixieyileizeren
+              },
+              {
+                name: "数据更新说明",
+                children: qixieyileishuju
+              },
+              {
+                name: "其他说明事项",
+                children: qixieyileiqita
+              },],
             },
-            {
-              name: "其他说明事项",
-              children: qixieyileiqita
-            },], 
-          },
           },
           {
             path: "/health/TiwaihealthOne",
             name: "TiwaihealthOne",
             icon: require("@/assets/images/tree4.svg"),
             component: () => import("@/views/productsMsg/components/healthSon/TiwaihealthOne.vue"),
-            meta: { title: "一类体外试剂", keepAlive: true, topTitle:"一类体外诊断试剂信息档案", 
-            titlefootChilder: [{
-              name: "数据质量责任",
-              children: qixieyileizeren
-            },
-            {
-              name: "数据更新说明",
-              children: qixieyileishuju
+            meta: {
+              title: "一类体外试剂", keepAlive: true, topTitle: "一类体外诊断试剂信息档案",
+              titlefootChilder: [{
+                name: "数据质量责任",
+                children: qixieyileizeren
+              },
+              {
+                name: "数据更新说明",
+                children: qixieyileishuju
+              },
+              {
+                name: "其他说明事项",
+                children: qixieyileiqita
+              },],
             },
-            {
-              name: "其他说明事项",
-              children: qixieyileiqita
-            },],
-          },
           },
           {
             path: "/health/QixiehealthTow",
             name: "QixiehealthTow",
             icon: require("@/assets/images/tree4.svg"),
             component: () => import("@/views/productsMsg/components/healthSon/QixiehealthTow.vue"),
-            meta: { title: "二类医疗器械", keepAlive: true, topTitle:"二类医疗器械信息档案", 
-            titlefootChilder: [{
-              name: "数据质量责任",
-              children: Erqixieyileizeren
+            meta: {
+              title: "二类医疗器械", keepAlive: true, topTitle: "二类医疗器械信息档案",
+              titlefootChilder: [{
+                name: "数据质量责任",
+                children: Erqixieyileizeren
+              },
+              {
+                name: "数据更新说明",
+                children: Erqixieyileishuju
+              },],
             },
-            {
-              name: "数据更新说明",
-              children:Erqixieyileishuju
-            },],},
           },
           {
             path: "/health/TiwaihealthTow",
             name: "TiwaihealthTow",
             icon: require("@/assets/images/tree4.svg"),
             component: () => import("@/views/productsMsg/components/healthSon/TiwaihealthTow.vue"),
-            meta: { title: "二类体外试剂", keepAlive: true, topTitle:"二类体外诊断试剂信息档案", 
-            titlefootChilder: [{
-              name: "数据质量责任",
-              children: Erqixieyileizeren
+            meta: {
+              title: "二类体外试剂", keepAlive: true, topTitle: "二类体外诊断试剂信息档案",
+              titlefootChilder: [{
+                name: "数据质量责任",
+                children: Erqixieyileizeren
+              },
+              {
+                name: "数据更新说明",
+                children: Erqixieyileishuju
+              },],
             },
-            {
-              name: "数据更新说明",
-              children:Erqixieyileishuju
-            },],
-          },
           },
           {
             path: "/health/QIxiehealthThree",
             name: "QIxiehealthThree",
             icon: require("@/assets/images/tree4.svg"),
             component: () => import("@/views/productsMsg/components/healthSon/QIxiehealthThree.vue"),
-            meta: { title: "三类医疗器械", keepAlive: true, topTitle:"三类医疗器械信息档案", 
-            titlefootChilder: [{
-              name: "数据质量责任",
-              children:Sanqixieyileizeren
+            meta: {
+              title: "三类医疗器械", keepAlive: true, topTitle: "三类医疗器械信息档案",
+              titlefootChilder: [{
+                name: "数据质量责任",
+                children: Sanqixieyileizeren
+              },
+              {
+                name: "数据更新说明",
+                children: Sanqixieyileishuju
+              },],
             },
-            {
-              name: "数据更新说明",
-              children: Sanqixieyileishuju
-            },],},
           },
           {
             path: "/health/TiwaihealthThree",
             name: "TiwaihealthThree",
             icon: require("@/assets/images/tree4.svg"),
             component: () => import("@/views/productsMsg/components/healthSon/TiwaihealthThree.vue"),
-            meta: { title: "三类体外试剂", keepAlive: true, topTitle:"三类体外诊断试剂信息档案", 
-            titlefootChilder: [{
-              name: "数据质量责任",
-              children:Sanqixieyileizeren
+            meta: {
+              title: "三类体外试剂", keepAlive: true, topTitle: "三类体外诊断试剂信息档案",
+              titlefootChilder: [{
+                name: "数据质量责任",
+                children: Sanqixieyileizeren
+              },
+              {
+                name: "数据更新说明",
+                children: Sanqixieyileishuju
+              },],
             },
-            {
-              name: "数据更新说明",
-              children: Sanqixieyileishuju
-            },],},
           },
         ]
       },
@@ -297,75 +316,96 @@ export const constantRoutes = [
             name: "GchzpPt",
             icon: require("@/assets/images/tree4.svg"),
             component: () => import("@/views/productsMsg/components/hzpSon/GchzpPt.vue"),
-            meta: { title: "国产普通化妆品", keepAlive: true,topTitle:"本省备案国产普通化妆品信息档案", 
-            titlefootChilder: [{
-              name: "数据质量责任",
-              children: huahzuangpzeren
+            meta: {
+              title: "国产普通化妆品", keepAlive: true, topTitle: "本省备案国产普通化妆品信息档案",
+              titlefootChilder: [{
+                name: "数据质量责任",
+                children: huahzuangpzeren
+              },
+              {
+                name: "数据更新说明",
+                children: huahzuangpshuju
+              },],
             },
-            {
-              name: "数据更新说明",
-              children: huahzuangpshuju
-            },], },
-          }, 
+          },
           {
             path: "/cosmeticsArchives/GchzpTs",
             name: "GchzpTs",
             icon: require("@/assets/images/tree4.svg"),
             component: () => import("@/views/productsMsg/components/hzpSon/GchzpTs.vue"),
-            meta: { title: "国产特殊化妆品", keepAlive: true,topTitle:"本省注册国产特殊化妆品信息档案", 
-            titlefootChilder: [{
-              name: "数据质量责任",
-              children: huahzuangpzeren
+            meta: {
+              title: "国产特殊化妆品", keepAlive: true, topTitle: "本省注册国产特殊化妆品信息档案",
+              titlefootChilder: [{
+                name: "数据质量责任",
+                children: huahzuangpzeren
+              },
+              {
+                name: "数据更新说明",
+                children: huahzuangpshuju
+              },],
             },
-            {
-              name: "数据更新说明",
-              children: huahzuangpshuju
-            },], },
-          }, 
+          },
           {
             path: "/cosmeticsArchives/JkhzpPt",
             name: "JkhzpPt",
             icon: require("@/assets/images/tree4.svg"),
             component: () => import("@/views/productsMsg/components/hzpSon/JkhzpPt.vue"),
-            meta: { title: "进口普通化妆品", keepAlive: true,topTitle:"本省备案进口普通化妆品信息档案", 
-            titlefootChilder: [{
-              name: "数据质量责任",
-              children: huahzuangpzeren
+            meta: {
+              title: "进口普通化妆品", keepAlive: true, topTitle: "本省备案进口普通化妆品信息档案",
+              titlefootChilder: [{
+                name: "数据质量责任",
+                children: huahzuangpzeren
+              },
+              {
+                name: "数据更新说明",
+                children: Tshuahzuangpshuju
+              },],
             },
-            {
-              name: "数据更新说明",
-              children: Tshuahzuangpshuju
-            },], },
-          }, 
+          },
           {
             path: "/cosmeticsArchives/JkhzpTs",
             name: "JkhzpTs",
             icon: require("@/assets/images/tree4.svg"),
             component: () => import("@/views/productsMsg/components/hzpSon/JkhzpTs.vue"),
-            meta: { title: "进口特殊化妆品", keepAlive: true,topTitle:"本省注册进口特殊化妆品信息档案", 
-            titlefootChilder: [{
-              name: "数据质量责任",
-              children: huahzuangpzeren
+            meta: {
+              title: "进口特殊化妆品", keepAlive: true, topTitle: "本省注册进口特殊化妆品信息档案",
+              titlefootChilder: [{
+                name: "数据质量责任",
+                children: huahzuangpzeren
+              },
+              {
+                name: "数据更新说明",
+                children: Tshuahzuangpshuju
+              },],
             },
-            {
-              name: "数据更新说明",
-              children: Tshuahzuangpshuju
-            },],},
-          }, 
+          },
           {
             path: "/cosmeticsArchives/stscpz",
             name: "stscpz",
             icon: require("@/assets/images/tree4.svg"),
             component: () => import("@/views/productsMsg/components/stscpz.vue"),
-            meta: { title: "本省受托生产化妆品", keepAlive: true,topTitle:"本省跨省受托生产化妆品信息档案", 
-            titlefootChilder: [{
-              name: "数据质量责任",
-              children: huahzuangpzeren
+            meta: {
+              title: "本省受托生产化妆品", keepAlive: true, topTitle: "本省跨省受托生产化妆品信息档案",
+              titlefootChilder: [{
+                name: "数据质量责任",
+                children: huahzuangpzeren
+              },
+              {
+                name: "数据更新说明",
+                children: KShuahzuangpshuju
+              },],
+            },
+          },
+          {
+            path: "/cosmeticsArchives/yagao",
+            name: "yagao",
+            icon: require("@/assets/images/tree4.svg"),
+            component: () => import("@/views/productsMsg/components/yagao.vue"),
+            meta: {
+              title: "牙膏", keepAlive: true, topTitle: "本省备案牙膏信息档案",
+              titlefootChilder: [
+              ],
             },
-            {
-              name: "数据更新说明",
-              children:KShuahzuangpshuju
-            },], },
           },
         ]
       },
@@ -374,16 +414,18 @@ export const constantRoutes = [
         name: "cosmeticsDetail",
         icon: require("@/assets/images/tree4.svg"),
         component: () => import("@/views/productsMsg/components/productInfo.vue"),
-        meta: { title: "详情", keepAlive: true, titlefootChilder: [{
-          name: "数据质量责任",
-          children: []
+        meta: {
+          title: "详情", keepAlive: true, titlefootChilder: [{
+            name: "数据质量责任",
+            children: []
+          },
+          {
+            name: "数据更新说明",
+            children: []
+          },],
         },
-        {
-          name: "数据更新说明",
-          children:[]
-        },], },
       },
-      
+
 
       // {
       //   path: "/portal",
diff --git a/src/views/index.vue b/src/views/index.vue
index 3769965..0bf66cf 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -99,6 +99,9 @@ export default {
     activeMenu() {
       // 返回当前激活的路由路径
       return this.$route.path;
+      /* 
+        
+      */
     },
   },
   created() { },
diff --git a/src/views/productsMsg/components/productInfo.vue b/src/views/productsMsg/components/productInfo.vue
index deff303..c321c91 100644
--- a/src/views/productsMsg/components/productInfo.vue
+++ b/src/views/productsMsg/components/productInfo.vue
@@ -47,7 +47,7 @@ export default {
         }&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
+      // 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}`
         
@@ -66,6 +66,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .ifram-view {
+overflow: hidden ;
   background-color: #fff;
 }
 </style>
diff --git a/src/views/productsMsg/components/yagao.vue b/src/views/productsMsg/components/yagao.vue
new file mode 100644
index 0000000..9bb5455
--- /dev/null
+++ b/src/views/productsMsg/components/yagao.vue
@@ -0,0 +1,626 @@
+<template>
+  <div class="container">
+    <div class="tabs" v-if="false">
+      <div class="headerText">
+        <div class="searchP">统计分析</div>
+      </div>
+      <div>
+        <MapCars leafletitle="化妆品" echartstitle="化妆品/委托生产品种" @arealist="arealist" ref="mapcars" v-if="MapCarsshow" />
+      </div>
+    </div>
+    <div class="tabs">
+      <div class="headerText">
+        <div class="searchP">查询条件</div>
+      </div>
+      <el-form ref="form1" :model="form1">
+        <div style="margin-top: 10px">
+          <!-- <el-row>
+            <div class="title-box">基本信息查询：</div>
+
+            <el-col :span="21">
+              <el-form-item label="查询条件">
+                <el-input v-model="form1.name" placeholder="支持模糊查询"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row> -->
+        </div>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="产品名称">
+              <el-input v-model="form1.cpmc" placeholder="支持模糊查询" clearable @clear="isclear"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="备案号">
+              <el-input v-model="form1.bah" placeholder="支持模糊查询" clearable @clear="isclear"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="备案人" placeholder="支持模糊查询">
+              <el-input v-model="form1.qymc" placeholder="支持模糊查询" clearable @clear="isclear"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="生产企业名称">
+              <el-input v-model="form1.scqymc" placeholder="支持模糊查询" clearable @clear="isclear"></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-circle-plus-outline" @click="collapsechange(0)">展开</el-button> -->
+          </div>
+        </el-row>
+      </el-form>
+
+    </div>
+    <div class="tabsBottom">
+      <div class="foot-main">
+        <div class="headerText">
+          <div class="searchP">产品列表</div>
+        </div>
+        <div class="exportBtn">
+          <div>
+            <div round class="mybuttom" :class="btnArrshow == item.label ? 'mybuttomshow' : ''"
+              v-for="(item, index) in optionsTowBtn" @click="xuanzelist(item)">{{ item.label
+              }}</div>
+          </div>
+          <el-button type="primary" icon="el-icon-edit-outline" @click="exportList()">导出excel</el-button>
+
+        </div>
+        <section class="table-box">
+          <div class="table-item">
+            <el-table v-loading="loading" :data="tableData" border height="500" @sort-change="mySortChange"
+              ref="tableRef">
+              <el-table-column type="selection" width="60" align="center">
+              </el-table-column>
+              <el-table-column type="index" label="序号" width="80" align="center" />
+              <el-table-column label="产品名称" min-width="180" align="center">
+                <template slot-scope="scope">
+                  {{ scope.row.cpmc }}
+                </template>
+              </el-table-column>
+              <!-- :label="A2" -->
+              <el-table-column label="注册/备案号" min-width="270" align="center">
+                <template slot-scope="scope">
+                  {{ scope.row.bah }}
+                </template>
+              </el-table-column>
+              <el-table-column label="生产企业名称" min-width="220" align="center">
+                <template slot-scope="scope">
+                  {{ scope.row.scqymc }}
+                </template>
+              </el-table-column>
+              <el-table-column label="注册/备案日期" min-width="190" align="center" sortable="custom">
+                <template slot-scope="scope">
+                  {{ scope.row.sqsj.split(" ")[0] }}
+                </template>
+              </el-table-column>
+
+
+              <el-table-column label="注册/备案人" min-width="230" align="center">
+                <template slot-scope="scope">
+                  {{ scope.row.qymc }}
+                </template>
+              </el-table-column>
+              <el-table-column label="注册/备案人统一社会信用代码" min-width="300" align="center">
+                <template slot-scope="scope">
+                  {{ scope.row.tyshxydm }}
+                </template>
+              </el-table-column>
+              <el-table-column label="生产企业地址" min-width="220" align="center">
+                <template slot-scope="scope">
+                  {{ scope.row.dzSc }}
+                </template>
+              </el-table-column>
+              <el-table-column label="生产企业统一社会信用代码" min-width="280" align="center">
+                <template slot-scope="scope">
+                  {{ scope.row.tyshxydmSc }}
+                </template>
+              </el-table-column>
+              <!-- <el-table-column label="生产状态" min-width="200" align="center">
+                <template slot-scope="scope">
+                  {{ scope.row.sczt }}
+                </template>
+              </el-table-column> -->
+              <el-table-column label="使用人群" min-width="130" align="center">
+                <template slot-scope="scope">
+                  {{ scope.row.syrq }}
+                </template>
+              </el-table-column>
+              <el-table-column label="注册/备案状态" min-width="160" align="center">
+                <template slot-scope="scope">
+                  {{ scope.row.status }}
+                </template>
+              </el-table-column>
+              <!-- class-name="small-padding fixed-width" -->
+              <el-table-column label="操作" 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> -->
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </section>
+        <pagination :total="total" :page="form.current" :limit="form.size" @pagination="getPagination"
+          :current-page.sync="form.current"></pagination>
+      </div>
+    </div>
+    <el-dialog title="提示" :visible.sync="showCK" width="30%">
+      <span>{{ src }}</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="closeDC()">取 消</el-button>
+        <el-button type="primary" @click="openDC()">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { download, hzpToothpasteexport } from "../../../api/archives/updata";
+import { Notification, MessageBox, Message, Loading } from "element-ui";
+// import logVue from '../../monitor/job/log.vue';
+import MapCars from "@/views/components/MapCars.vue";
+import cpbq from "@/views/components/AdvancedSearch/cpbq.vue";
+
+export default {
+  components: { MapCars, cpbq },
+  data() {
+    return {
+      MapCarsshow: true,
+      loading: false,
+      tableData: [],
+      A1: "产品名称",
+      A2: "备案编码",
+      A3: "生产企业",
+      types: "1",
+      total: 0,
+      optionsTowBtn: [
+        { value: "有效", label: '有效' },
+        { value: "无效", label: '失效' }
+      ],
+      options: [
+        {
+          value: "1",
+          label: "化妆品/受托生产品种",
+        },
+        {
+          value: "2",
+          label: "国产特殊化妆品",
+        },
+        {
+          value: "3",
+          label: "进口化妆品",
+        },
+        {
+          value: "4",
+          label: "进口特殊化妆品",
+        },
+      ],
+      form1: {
+        bah: "",
+        cpmc: "",
+        qymc: "",
+        scqymc: "",
+        status: ""
+      },
+      form: {
+        size: 20,
+        current: 1,
+      },
+      jieliuShow: true,
+      loadA: null,
+      showCK: false,
+      src: "",
+      bthshow: true,
+      scoltitle: "展开",
+      btnArrshow: "有效",
+    };
+  },
+  mounted() {
+
+    this.form1.name = this.$route.query.value || "";
+    if (this.form1.name) {
+      this.searchList();
+    } else {
+      this.changeType("1");
+    }
+  },
+  created() {
+  },
+  methods: {
+    xuanzelist(item) {
+      this.form1.status = item.value
+      this.btnArrshow = item.label
+      this.searchList();
+    },
+    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()
+    },
+    arealist(area) {
+      this.form.area = area
+      this.form1.area = area
+      this.getData(this.types);
+
+    },
+    collapsechange(e) {
+      if (e == 0) {
+        this.bthshow = false
+      } else {
+        this.bthshow = true
+      }
+    },
+    openDC() {
+      this.showCK = false;
+      this.loadA = Loading.service({
+        text: "正在下载数据，请稍候",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+      let query1 = {
+        //导出使用区分化妆品类型 1为国产化妆品 2为国产特殊化妆品 3为进口化妆品 4为进口特殊化妆品
+        // type: this.types,
+        //生产企业
+        scqy: this.form1.scqy,
+        //产品名称
+        cpmc: this.form1.cpmc,
+        //注册证编号
+        name: this.form1.name,
+        //备案编号
+        babm: this.form1.babm,
+      };
+      hzpToothpasteexport(this.form1)
+        .then((res) => {
+          const blob = new Blob([res], { type: res.type });
+          // blob.text().then((res11) => console.log(res11));
+          console.log(blob.stream());
+          const link = document.createElement("a");
+          link.href = window.URL.createObjectURL(blob);
+          link.style.display = "none";
+          //到时候判断是哪个化妆品数据
+          link.download = this.filterTypes(this.types) + ".xlsx";
+          link.click();
+          this.loadA.close();
+          this.$message({
+            type: "success",
+            message: "导出成功",
+          });
+        })
+        .catch((err) => {
+          this.$message({
+            type: "info",
+            message: "导出失败",
+          });
+          this.loadA.close();
+        });
+    },
+    closeDC() {
+      this.showCK = false;
+      this.$message({
+        type: "info",
+        message: "已取消导出",
+      });
+    },
+    exportList() {
+      this.src = `确定导出化妆品/牙膏的据吗?`;
+      this.showCK = true;
+    },
+    filterTypes(e) {
+      let arr = this.options.filter((value1) => {
+        return value1.value == e;
+      });
+      return arr[0].label;
+    },
+    jieliuFunc() {
+      if (this.jieliuShow) {
+        this.getData(this.types);
+        this.jieliuShow = false;
+        setTimeout(() => {
+          this.jieliuShow = true;
+        }, 500);
+      } else {
+        this.$message("点击过快");
+      }
+    },
+    //去内嵌页面
+    toDetail(e) {
+      console.log(e);
+      let data = "";
+      if (this.types == "1") {
+        data = e.bah;
+      } else if (this.types == "2") {
+        data = e.zczh;
+      } else if (this.types == "3") {
+        data = e.bah;
+      } else if (this.types == "4") {
+        data = e.zczh;
+      }
+      //利用 type 区分三种档案
+      //利用flag区分四种化妆品详情 然后分别调用不同的详情接口gt
+      this.$router.push({
+        path: `/cosmeticsDetail`,
+        query: { type: "yagao", flag: 5, data },
+      });
+    },
+    //搜索
+    searchList() {
+      this.form.current = 1;
+
+      for (let i in this.form1) {
+        this.form[i] = this.form1[i];
+      }
+      this.jieliuFunc();
+    },
+    getPagination(e) {
+      console.log(e);
+      this.form.current = e.page;
+      this.form.size = e.limit;
+      this.chinaCosmetics();
+    },
+    //重置
+    reset(type) {
+      this.$refs.tableRef.clearSort(); // 清除排序
+      this.types = "1";
+      this.form1 = {
+        bah: "",
+        cpmc: "",
+        qymc: "",
+        scqymc: "",
+        status: ""
+      };
+      this.form = {
+        size: 20,
+        current: 1,
+      };
+      if (type != 1) {
+        // this.$refs["mapcars"].showinitCityLayer()
+      }
+
+      this.jieliuFunc();
+    },
+    //国产化妆品
+    async chinaCosmetics() {
+      this.loading = true;
+      let msg1 = await this.$api.cosmetics.hzpToothpaste(this.form);
+      this.tableData = msg1.data.records;
+      this.total = msg1.data.total;
+      this.form.size = msg1.data.size;
+      this.form.current = msg1.data.current;
+      this.loading = false;
+    },
+    //国产特殊化妆品
+    async chinaSpecialCosmetics() {
+      this.loading = true;
+      let msg1 = await this.$api.cosmetics.specialList(this.form);
+      this.tableData = msg1.data.records;
+      this.total = msg1.data.total;
+      this.form.size = msg1.data.size;
+      this.form.current = msg1.data.current;
+      this.loading = false;
+    },
+    //进口化妆品
+    async importCosmetics() {
+      this.loading = true;
+      let msg1 = await this.$api.cosmetics.importList(this.form);
+      this.tableData = msg1.data.records;
+      this.total = msg1.data.total;
+      this.form.size = msg1.data.size;
+      this.form.current = msg1.data.current;
+      this.loading = false;
+    },
+    //进口特殊化妆品
+    async importSpecialCosmetics() {
+      this.loading = true;
+      let msg1 = await this.$api.cosmetics.importSpecialList(this.form);
+      this.tableData = msg1.data.records;
+      this.total = msg1.data.total;
+      this.form.size = msg1.data.size;
+      this.form.current = msg1.data.current;
+      this.loading = false;
+    },
+    async getData(e) {
+      if (e == "1") {
+        this.A2 = "备案编码";
+        this.A3 = "生产企业";
+        this.chinaCosmetics();
+      } else if (e == "2") {
+        this.A2 = "批准日期";
+        this.A3 = "省份";
+        this.chinaSpecialCosmetics();
+      } else if (e == "3") {
+        this.A2 = "备案编码";
+        this.A3 = "生产企业";
+        this.importCosmetics();
+      } else if (e == "4") {
+        this.A2 = "批准日期";
+        this.A3 = "省份";
+        this.importSpecialCosmetics();
+      }
+    },
+    async changeType(e) {
+      // this.reset();
+      // this.$refs["mapcars"].isLefleat(e)
+      this.getData(e);
+    },
+  },
+  beforeRouteLeave(to, from, next) {
+    if (to.path != '/cosmeticsDetail') {
+      this.reset(1)
+    }
+    this.MapCarsshow = false
+
+    next()
+  },
+  activated(to, from, next) {
+    this.MapCarsshow = true
+  },
+
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-dialog:not(.is-fullscreen) {
+  margin-top: 30vh !important;
+}
+
+::v-deep .el-dialog__body {
+  padding: 15px;
+}
+
+::v-deep .el-select {
+  width: 100% !important;
+}
+
+.container {
+  height: 100%;
+  // overflow: auto;
+  background: #f2f2f2;
+
+  .headerText {
+    width: 100%;
+    padding: 10px 20px;
+    border-bottom: 1px solid #f2f3f5;
+    color: #323233;
+    font-size: 20px;
+    font-weight: bold;
+
+    .searchP {
+      position: relative;
+      cursor: pointer;
+
+      &::before {
+        content: "";
+        width: 78px;
+        height: 3px;
+        background: #1349c5;
+        position: absolute;
+        bottom: -10px;
+      }
+    }
+  }
+
+  .tabs {
+    margin-bottom: 10px;
+    width: 100%;
+    background: #fff;
+  }
+}
+
+//===================
+::v-deep .el-button--medium {
+  padding: 8px;
+}
+
+.footBox {
+  width: 97.5%;
+  text-align: center;
+  padding-bottom: 10px;
+}
+
+.tabsBottom {
+
+  .foot-main {
+    height: 100%;
+    // min-height: 600px;
+    width: 100%;
+    background: white;
+  }
+}
+
+.exportBtn {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 10px 20px;
+}
+
+.table-box {
+  padding: 0px 20px;
+
+  .table-item {}
+}
+
+.pagination {
+  display: flex;
+  justify-content: space-between;
+  padding: 15px 20px;
+}
+
+
+::v-deep .el-table {
+  overflow: auto;
+
+}
+
+::v-deep .el-collapse-item__header {
+  padding-left: 80vw;
+  font-size: 20px;
+  font-weight: 600;
+
+  .el-collapse-item__arrow {
+    margin-left: 20px;
+  }
+
+
+}
+
+.title-box {
+  position: relative;
+  padding-left: 30px;
+  font-size: 16px;
+  font-weight: 600;
+  margin: 10px 0;
+  color: #1349c5;
+}
+
+::v-deep .el-collapse {
+  border: none;
+}
+
+::v-deep .logformitem {
+  .el-form-item__label {
+    line-height: 20px;
+  }
+}
+
+.mybuttom {
+  margin: 0 10px;
+  display: inline-block;
+  padding: 5px 20px;
+  background-color: rgba(30, 128, 235, 0.1);
+  border-radius: 8px;
+  border: 1px solid #1e80eb;
+  font-size: 14px;
+  color: #1e80eb;
+  font-family: Source Han Sans CN;
+  cursor: pointer;
+
+  &:hover {
+    background-color: #1e80eb;
+    color: #ffffff;
+    border: 1px solid #1e80eb;
+  }
+}
+
+.mybuttomshow {
+  background-color: #1e80eb;
+  color: #ffffff;
+  border: 1px solid #1e80eb;
+}
+</style>
diff --git a/src/views/productsMsg/drugArchives/yaopinyuanliao.vue b/src/views/productsMsg/drugArchives/yaopinyuanliao.vue
index 0c2b7db..dbb52ec 100644
--- a/src/views/productsMsg/drugArchives/yaopinyuanliao.vue
+++ b/src/views/productsMsg/drugArchives/yaopinyuanliao.vue
@@ -200,8 +200,6 @@
                                     {{ dataArr[scope.row.scxkzStatus] || "--" }}
                                 </template>
                             </el-table-column>
-
-
                             <el-table-column label="操作" width="100" fixed="right" align="center">
                                 <template slot-scope="scope">
                                     <el-button type="primary" @click="toDetail(scope.row)">详情</el-button>
diff --git a/vue.config.js b/vue.config.js
index 7399083..f2f5557 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -43,9 +43,8 @@ module.exports = {
     proxy: {
       "/configApi": {
         target: "https://dev-mssm-liaoning.lesdev.cn/ggfw-api",
-        // target: "http://192.168.0.109:9023/ggfw-api",
+        // target: "http://192.168.0.107:9023/ggfw-api",
         // target: "http://192.168.0.111:9023/ggfw-api",
-        
         changeOrigin: true,
         pathRewrite: {
           "^/configApi": "",