diff --git a/.env.development b/.env.development index 7bca441..6f4fcc3 100644 --- a/.env.development +++ b/.env.development @@ -6,8 +6,9 @@ ENV = 'development' # 若依管理系统/开发环境 # VUE_APP_BASE_API = https://dev-mssm-liaoning.lesdev.cn/ggfw-api/ -VUE_APP_BASE_API = http://192.168.0.109:9023/ggfw-api -# VUE_APP_BASE_API = https://dev-mssm-liaoning.lesdev.cn/ggfw-api +# VUE_APP_BASE_API = http://192.168.0.107:9023/ggfw-api +VUE_APP_BASE_API = https://dev-mssm-liaoning.lesdev.cn/ggfw-api +# VUE_APP_BASE_API = http://172.24.21.7/api/ggfw/ggfw-api #单点登录 # 本地 diff --git a/src/App.vue b/src/App.vue index d2c0559..1cc59fb 100644 --- a/src/App.vue +++ b/src/App.vue @@ -45,7 +45,9 @@ export default { const data = params.get("data"); const token = params.get("token"); const leixing = params.get("leixing") || ""; - const bah = params.get("bah") || ""; + const bah = params.get("bah"); + + const qita = params.get("qita") || ""; let obj = { type, @@ -53,7 +55,8 @@ export default { data, token, leixing, - bah + bah, + qita } console.log(888, obj); if ( @@ -76,7 +79,7 @@ export default { localStorage.setItem("MSSM-LIAONING__TOKEN", obj.token); this.$store.commit("app/URLChange", obj); } - + // var obj = {}; // window.addEventListener("message", function (event) { // console.log(888, event); @@ -104,7 +107,7 @@ export default { cd /usr/share/nginx/html/ggfw-iframe 移动到文件夹下 unzip ggfw-iframe.zip -d . 解压 - + rm ./ggfw-iframe.zip 删除当前目录下的压缩包 弹出确定删除 打 y 并回车 @@ -150,4 +153,27 @@ export default { font-size: vb(16) !important; } -} +} + +.el-select-dropdown__item { + font-size: vb(16) !important; +} + +.el-tag--mini { + font-size: vb(14) !important; + padding: vh(20) vw(10); + color: #000 !important; +} + +.el-table--scrollable-y .el-table__body-wrapper { + overflow-y: auto; +} + +.el-table { + &::-webkit-scrollbar { + width: 4px !important; + height: 4px !important; + border-radius: 4px !important; + } +} + diff --git a/src/api/cosmetics/index.js b/src/api/cosmetics/index.js index 4fcd9a5..0c08396 100644 --- a/src/api/cosmetics/index.js +++ b/src/api/cosmetics/index.js @@ -56,5 +56,12 @@ export default { url: `/pharmaceuticals/entrustedEnter/${e}`, method: "get", }) + }, + //通过注册证编号查询牙膏 + hzpToothpaste(e) { + return request({ + url: `/pharmaceuticals/hzpToothpaste/${e}`, + method: "get", + }) } } \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index ca72300..752bfbd 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -18,10 +18,10 @@ axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8"; const service = axios.create({ // axios中请求配置有baseURL选项,表示请求URL公共部分 // !本地使用 - // baseURL: process.env.VUE_APP_BASE_API, + baseURL: process.env.VUE_APP_BASE_API, // !外地使用 - baseURL: location.origin + process.env.VUE_APP_URL, + // baseURL: location.origin + process.env.VUE_APP_URL, // 超时 timeout: 60000, }); diff --git a/src/views/firmContent/drugInfo/PZchouyang/PZchouyang.vue b/src/views/firmContent/drugInfo/PZchouyang/PZchouyang.vue index 77e96af..084f85e 100644 --- a/src/views/firmContent/drugInfo/PZchouyang/PZchouyang.vue +++ b/src/views/firmContent/drugInfo/PZchouyang/PZchouyang.vue @@ -31,7 +31,7 @@ -->
- + @@ -52,7 +52,6 @@ -