diff --git a/src/App.vue b/src/App.vue index 277dfb1..95588aa 100644 --- a/src/App.vue +++ b/src/App.vue @@ -24,7 +24,7 @@ export default { }; }, mounted() { - /* + /* npm run build:prod sudo mv ggfw-dangan.zip /usr/share/nginx/html/ggfw-dangan 在 MSSM-Dev 文件夹下 移动压缩包到 ggfw文件夹下 cd /usr/share/nginx/html/ggfw-dangan 移动到文件夹下 diff --git a/src/api/archives/toLogin.js b/src/api/archives/toLogin.js index c74becf..5449c5d 100644 --- a/src/api/archives/toLogin.js +++ b/src/api/archives/toLogin.js @@ -3,8 +3,8 @@ export default { // 登录 frimLogin() { return request({ - baseURL: process.env.VUE_APP_USER_LOGIN, - // url: "/pharmaceuticals/login", + // baseURL: process.env.VUE_APP_USER_LOGIN, + url: "/pharmaceuticals/login", headers: { "Content-Type": "application/json", isToken: true, 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/assets/images/home/bg.png b/src/assets/images/home/bg.png new file mode 100644 index 0000000..86c9065 Binary files /dev/null and b/src/assets/images/home/bg.png differ diff --git a/src/assets/images/home/dangan1.png b/src/assets/images/home/dangan1.png new file mode 100644 index 0000000..b6d1611 Binary files /dev/null and b/src/assets/images/home/dangan1.png differ diff --git a/src/assets/images/home/dangan2.png b/src/assets/images/home/dangan2.png new file mode 100644 index 0000000..236aa0d Binary files /dev/null and b/src/assets/images/home/dangan2.png differ diff --git a/src/assets/images/home/dangan3.png b/src/assets/images/home/dangan3.png new file mode 100644 index 0000000..dab4c98 Binary files /dev/null and b/src/assets/images/home/dangan3.png differ diff --git a/src/assets/images/home/dangan4.png b/src/assets/images/home/dangan4.png new file mode 100644 index 0000000..3414555 Binary files /dev/null and b/src/assets/images/home/dangan4.png differ diff --git a/src/assets/images/home/danganbg.png b/src/assets/images/home/danganbg.png new file mode 100644 index 0000000..82a02a7 Binary files /dev/null and b/src/assets/images/home/danganbg.png differ diff --git a/src/assets/images/home/danganbg1.png b/src/assets/images/home/danganbg1.png new file mode 100644 index 0000000..c3aabca Binary files /dev/null and b/src/assets/images/home/danganbg1.png differ diff --git a/src/assets/images/home/danganbg2.png b/src/assets/images/home/danganbg2.png new file mode 100644 index 0000000..5232109 Binary files /dev/null and b/src/assets/images/home/danganbg2.png differ diff --git a/src/assets/images/home/danganbg3.png b/src/assets/images/home/danganbg3.png new file mode 100644 index 0000000..1b89d06 Binary files /dev/null and b/src/assets/images/home/danganbg3.png differ diff --git a/src/assets/images/home/danganbg4.png b/src/assets/images/home/danganbg4.png new file mode 100644 index 0000000..514e356 Binary files /dev/null and b/src/assets/images/home/danganbg4.png differ diff --git a/src/components/myHeader/index.vue b/src/components/myHeader/index.vue index c9b96b5..fa07d3c 100644 --- a/src/components/myHeader/index.vue +++ b/src/components/myHeader/index.vue @@ -5,10 +5,14 @@
产品档案管理系统
-
+
返回门户
+
+ + 返回首页 +
@@ -32,11 +36,16 @@ export default { ...mapGetters(["realName"]), }, methods: { - goBack() { - if (process.env.NODE_ENV === "production") { - // window.open(location.origin + "/sdsp/home", "_self"); - window.open(location.origin + "/ims/workbench/", "_self"); + goBack(type) { + if (type == 0) { + if (process.env.NODE_ENV === "production") { + // window.open(location.origin + "/sdsp/home", "_self"); + window.open(location.origin + "/ims/workbench/", "_self"); + } + } else { + this.$router.push({ name: "portal" }) } + }, toggleSideBar() { this.$store.dispatch("app/toggleSideBar"); @@ -56,9 +65,11 @@ export default { justify-content: space-between; padding: 0 15px; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04); + .header-logo { display: flex; align-items: center; + .logo-item { cursor: pointer; width: 44px; @@ -67,6 +78,7 @@ export default { background-size: cover; margin-right: 10px; } + .logo-name { font-size: 22px; font-family: Source Han Sans SC-Bold, Source Han Sans SC; @@ -76,10 +88,12 @@ export default { text-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04); } } + .header-user { display: flex; align-items: center; } + .btn-back { cursor: pointer; font-size: 13px; @@ -92,6 +106,7 @@ export default { border-radius: 24px 24px 24px 24px; display: flex; align-items: center; + .back-btn-icon { display: inline-block; width: 18px; @@ -101,6 +116,7 @@ export default { margin-right: 6px; } } + .separate-line { margin: 0 20px; height: 17px; @@ -108,16 +124,19 @@ export default { opacity: 0.6; background: #fff; } + .avatar-wrapper { cursor: pointer; display: flex; align-items: center; color: #fff; + .user-avatar { width: 34px; height: 34px; border-radius: 50%; } + .user-name { margin: 0 6px; font-size: 16px; diff --git a/src/permission.js b/src/permission.js index e1cbe4b..b5dec53 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,9 @@ import { getToken } from "@/utils/auth"; // 踢出系统 function kickOut() { if (process.env.NODE_ENV === "production") { - location.href = location.origin + "/login"; + setTimeout(() => { + location.href = location.origin + "/login"; + }, 1000); } } // const whiteList = [ diff --git a/src/router/index.js b/src/router/index.js index 9399836..f366f51 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -64,7 +64,7 @@ export const constantRoutes = [ { path: '', component: () => import("@/views/index"), - redirect: "drugArchives", + redirect: "portal", isDiy: true, children: [ { diff --git a/src/store/modules/myselfPermission.js b/src/store/modules/myselfPermission.js index 9e153c3..710b2b5 100644 --- a/src/store/modules/myselfPermission.js +++ b/src/store/modules/myselfPermission.js @@ -74,7 +74,7 @@ const selfPermission = { fileTreeOut[4].meta.affix = true commit("SET_ROUTER", fileTreeOut); - resolve(fileTreeOut.length > 0 ? fileTreeOut[0].path : []); + resolve(fileTreeOut.length > 0 ? fileTreeOut[4].path : []); }) .catch((error) => { reject(error); diff --git a/src/views/index.vue b/src/views/index.vue index ed8967c..a7bb994 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -45,6 +45,7 @@ export default { myRouter() { return this.$store.state.myselfPermission.routerList.slice(0,this.$store.state.myselfPermission.routerList.length-1); // return this.$store.state.myselfPermission.routerList; + //.slice(0,this.$store.state.myselfPermission.routerList.length-1) }, }, created() {}, diff --git a/src/views/portal/index.vue b/src/views/portal/index.vue index 812bbd9..4eb0923 100644 --- a/src/views/portal/index.vue +++ b/src/views/portal/index.vue @@ -1,23 +1,192 @@ diff --git a/src/views/productsMsg/components/cosmeticsArchives.vue b/src/views/productsMsg/components/cosmeticsArchives.vue index acf3be1..e280fc0 100644 --- a/src/views/productsMsg/components/cosmeticsArchives.vue +++ b/src/views/productsMsg/components/cosmeticsArchives.vue @@ -7,66 +7,110 @@
- - - - - - - - - - - - - - - - - - - - +
基本信息查询：
+ + + + - - - - - - -
- 重置 - 查询 -
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ 重置 + 查询 +
+ + + + + +
产品抽检信息查询：
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
不良反应信息查询：
+ + + + + + + + + + + + + + + + + +
+ 重置 + 查询 +
+ + - +
@@ -74,29 +118,13 @@
产品列表
- 导出 + 导出
- + - + - +
- +
@@ -189,6 +201,16 @@ export default { cpmc: "", name: "", scqy: "", + // 统一查询 + name: "", + cjxm: "", + jyslbh: "", + cybh: "", + cyjb: "", + cyrq: "", + blfybgbh: "", + blfylx: "", + fsnf: "", }, form: { size: 10, @@ -199,13 +221,34 @@ export default { loadA: null, showCK: false, src: "", + bthshow: true, + scoltitle: "展开" }; }, - mounted() {}, + mounted() { + console.log(this.$route.query.value, 88888); + this.form1.name = this.$route.query.value || ""; + if (this.form1.name) { + this.searchList(); + } else { + this.changeType("1"); + } + }, created() { - this.changeType("1"); }, methods: { + collapsechange(e) { + console.log(e); + if (e.length == 0) { + this.bthshow = true + this.scoltitle = "展开" + } else { + this.bthshow = false + this.scoltitle = "收起" + + } + console.log(this.bthshow); + }, openDC() { this.showCK = false; this.loadA = Loading.service({ @@ -258,13 +301,10 @@ export default { }); }, exportList() { - this.src = `确定导出${ - this.form1.cpmc ? `产品名称为${this.form1.cpmc}、` : "" - }${this.form1.babm ? `备案编号为${this.form1.babm}、` : ""}${ - this.form1.scqy ? `生产企业为${this.form1.scqy}、` : "" - }${ - this.form1.name ? `注册证编号为${this.form1.name}、` : "" - }${`化妆品类型为${this.filterTypes(this.types)}、`}数据吗?`; + this.src = `确定导出${this.form1.cpmc ? `产品名称为${this.form1.cpmc}、` : "" + }${this.form1.babm ? `备案编号为${this.form1.babm}、` : ""}${this.form1.scqy ? `生产企业为${this.form1.scqy}、` : "" + }${this.form1.name ? `注册证编号为${this.form1.name}、` : "" + }${`化妆品类型为${this.filterTypes(this.types)}、`}数据吗?`; this.showCK = true; }, filterTypes(e) { @@ -299,7 +339,7 @@ export default { data = e.zczh; } //利用type区分三种档案 - //利用flag区分四种化妆品详情 然后分别调用不同的详情接口 + //利用flag区分四种化妆品详情 然后分别调用不同的详情接口gt this.$router.push({ path: `/cosmeticsDetail`, query: { type: "1", flag: this.types, data }, @@ -408,12 +448,15 @@ export default { ::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; @@ -426,9 +469,11 @@ export default { color: #323233; font-size: 20px; font-weight: bold; + .searchP { position: relative; cursor: pointer; + &::before { content: ""; width: 78px; @@ -439,22 +484,27 @@ export default { } } } + .tabs { width: 100%; - height: 30%; + background: #fff; } } + //=================== ::v-deep .el-button--medium { padding: 8px; } + .footBox { width: 87.5%; text-align: right; } + .tabsBottom { padding-top: 10px; + .foot-main { height: 100%; // min-height: 600px; @@ -462,23 +512,52 @@ export default { background: white; } } + .exportBtn { padding: 10px 20px; } + .table-box { padding: 10px 20px; - .table-item { - } + + .table-item {} } + .pagination { display: flex; justify-content: space-between; padding: 15px 20px; } + ::v-deep.el-table--medium .el-table__cell { padding: 5.3px 0; } + ::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-bottom: 20px; +} + +::v-deep .el-collapse { + border: none; +} diff --git a/src/views/productsMsg/components/health.vue b/src/views/productsMsg/components/health.vue index 5603dc1..fa424c7 100644 --- a/src/views/productsMsg/components/health.vue +++ b/src/views/productsMsg/components/health.vue @@ -4,42 +4,144 @@
查询条件
- +
- - - - - - - - - - - - - - - - +
基本信息查询：
+ + + + - - -
- - +
+ + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ +
+ 重置 + 查询 +
+ + + + +
审评受理信息查询：
+ + + + + + + + + + + + + + + + + + +
注册检验、体系核查信息查询：
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
临床试验信息查询：
+ + + + + + + + + + + + + + + + + + + + + + +
+ 重置 + 查询
- -
- 重置 - 查询 -
- -
+ + + + + +
@@ -114,6 +216,21 @@ export default { zczh: "", size: 10, current: 1, + // 统一查询 + name: "", + cjxm: "", + jyslbh: "", + cybh: "", + cyjb: "", + cyrq: "", + blfybgbh: "", + blfylx: "", + fsnf: "", + lcsymc: "", + jcrq: "", + syrq: "", + syhcrq: "", + }, form: { size: 10, @@ -124,13 +241,34 @@ export default { loadA: null, showCK: false, src: "", + bthshow: true, + scoltitle:"展开" }; }, - mounted() { }, + mounted() { + console.log(this.$route.query.value, 88888); + this.form1.name = this.$route.query.value || ""; + if (this.form1.name) { + this.searchList(); + } else { + this.chinaCosmetics(1); + } + }, created() { - this.chinaCosmetics(); }, methods: { + collapsechange(e) { + console.log(e); + if (e.length == 0) { + this.bthshow = true + this.scoltitle = "展开" + } else { + this.bthshow = false + this.scoltitle = "收起" + + } + console.log(this.bthshow); + }, openDC() { this.showCK = false; this.loadA = Loading.service({ @@ -177,7 +315,7 @@ export default { this.jieliuShow = false; setTimeout(() => { this.jieliuShow = true; - }, 3000); + }, 500); } else { this.$message("点击过快"); } @@ -275,7 +413,6 @@ export default { .tabs { width: 100%; - height: 30%; background: #fff; } } @@ -331,4 +468,28 @@ export default { line-height: 25px; } } + +::v-deep .el-collapse { + border: none; +} + +::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-bottom: 20px; +} diff --git a/src/views/productsMsg/components/productInfo.vue b/src/views/productsMsg/components/productInfo.vue index 33f4967..ed19d29 100644 --- a/src/views/productsMsg/components/productInfo.vue +++ b/src/views/productsMsg/components/productInfo.vue @@ -14,12 +14,10 @@ export default { }, 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")}`, - // url: `http://localhost:81?type=${this.$route.query.type}&flag=${ - // this.$route.query.flagyppzwh - // }&data=${this.$route.query.data}&token=${localStorage.getItem( - // "MSSM-LIAONING__TOKEN" - // )}`, + }&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: {}, diff --git a/src/views/productsMsg/index.vue b/src/views/productsMsg/index.vue index c4e93c9..8a48ca0 100644 --- a/src/views/productsMsg/index.vue +++ b/src/views/productsMsg/index.vue @@ -7,26 +7,34 @@
- - - - - - - - - - - - - - - - + + +
+ + + + + + + + + + + + + + + + + + + + + @@ -39,7 +47,6 @@ -
重置 查询 @@ -95,7 +102,7 @@
+ :current-page.sync="form.current" :page-sizes="[10, 20, 50]"> @@ -130,6 +137,8 @@ export default { scqy: "", //药品分类 ypfl: "", + // 统一查询 + name: "" }, form: { size: 10, @@ -157,9 +166,17 @@ export default { src: "", }; }, - mounted() { }, + mounted() { + console.log(this.$route.query.value, 88888); + this.form1.name = this.$route.query.value || ""; + if (this.form1.name) { + this.searchList(); + } else { + this.chinaCosmetics(1); + } + }, created() { - this.chinaCosmetics(1); + }, methods: { openDC() { @@ -208,7 +225,7 @@ export default { this.jieliuShow = false; setTimeout(() => { this.jieliuShow = true; - }, 3000); + }, 500); } else { this.$message("点击过快"); } @@ -313,7 +330,6 @@ export default { .tabs { width: 100%; - height: 30%; background: #fff; } } diff --git a/src/views/productsMsg/zyzj.vue b/src/views/productsMsg/zyzj.vue index caa0f57..5a1f032 100644 --- a/src/views/productsMsg/zyzj.vue +++ b/src/views/productsMsg/zyzj.vue @@ -7,26 +7,33 @@
- - - - - - - - - - - - - - - - + + +
+ + + + + + + + + + + + + + + + + + + +
@@ -119,6 +126,8 @@ export default { scqy: "", //医疗机构名称 yljgmc: "", + // 统一查询 + name: "" }, form: { size: 10, @@ -146,9 +155,16 @@ export default { src: "", }; }, - mounted() { }, + mounted() { + console.log(this.$route.query.value, 88888); + this.form1.name = this.$route.query.value || ""; + if (this.form1.name) { + this.searchList(); + } else { + this.chinaCosmetics(1); + } + }, created() { - this.chinaCosmetics(1); }, methods: { openDC() { @@ -197,16 +213,17 @@ export default { this.jieliuShow = false; setTimeout(() => { this.jieliuShow = true; - }, 3000); + }, 500); } else { this.$message("点击过快"); } }, //去内嵌页面 toDetail(e) { + console.log(e); this.$router.push({ path: `/cosmeticsDetail`, - query: { type: "4", data: e.id }, + query: { type: "4", data: e.id, bah: e.bah }, }); }, @@ -303,7 +320,6 @@ export default { .tabs { width: 100%; - height: 30%; background: #fff; } }