增加代理

Lvtianfang
杜函宇 2 years ago
parent d4867874a7
commit 96786804c3

@ -3,12 +3,8 @@ VUE_APP_TITLE = 产品档案管理系统
# 开发环境配置 # 开发环境配置
ENV = 'development' ENV = 'development'
# 开发环境
# 检查员管理系统/开发环境 VUE_APP_BASE_API = '/configApi'
VUE_APP_BASE_API = 'https://vue.ruoyi.vip/prod-api'
# 自己公司
VUE_APP_BASE_API2 = ''
VUE_APP_BASE_API3 = '/configApi/'
VUE_APP_PREFIX ='' VUE_APP_PREFIX =''
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true

@ -13,11 +13,25 @@ export default {
components: { ThemePicker }, components: { ThemePicker },
metaInfo() { metaInfo() {
return { return {
title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title, title:
titleTemplate: title => { this.$store.state.settings.dynamicTitle &&
return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE this.$store.state.settings.title,
} titleTemplate: (title) => {
} return title
? `${title} - ${process.env.VUE_APP_TITLE}`
: process.env.VUE_APP_TITLE;
},
};
},
mounted(){
setTimeout(async () => {
let Authentication = await this.$api.toLogin.frimLogin();
console.log(Authentication);
localStorage.setItem(
"Authentication",
Authentication.data.result.userToken
);
}, 1000);
} }
}; };
</script> </script>

@ -0,0 +1,11 @@
import request from "@/utils/request2";
export default {
//获取
getList(query) {
return request({
url: "/inspectorAssign",
method: "GET",
params: query,
});
}
}

@ -0,0 +1,21 @@
import request from "@/utils/request2";
export default {
// 登录
frimLogin() {
return request({
// baseURL: process.env.VUE_APP_USER_LOGIN,
url: "/pharmaceuticals/login",
headers: {
"Content-Type": "application/json",
isToken: true,
repeatSubmit: false,
},
method: "POST",
timeout: 60000,
data: {
pdma: "MTExMTEx",
urne: "2112042170015",
},
});
},
}

@ -1,16 +1,4 @@
import training from './myapi/training/index.js' import toLogin from "./archives/toLogin";
import work from './myapi/work/index.js'
import traits from './myapi/traits/index.js'
import screenLeft from './myapi/screenLeft/index.js'
import infoMsg from './myapi/infoMsg/index.js'
import jiangcheng from './myapi/jiangcheng/index.js'
import pinren from './myapi/pinren/index.js'
export default { export default {
training, toLogin
work,
traits,
screenLeft,
infoMsg,
jiangcheng,
pinren
}; };

@ -13,8 +13,8 @@ function kickOut() {
} }
NProgress.configure({ showSpinner: false }); NProgress.configure({ showSpinner: false });
const whiteList = [ const whiteList = [
"/login", // "/login",
"/register", // "/register",
"/index", "/index",
'/drugArchives', '/drugArchives',
'/cosmeticsArchives', '/cosmeticsArchives',
@ -35,9 +35,10 @@ router.beforeEach((to, from, next) => {
next(); next();
} }
} else { } else {
// 没有token
if (whiteList.indexOf(to.path) !== -1) {
next() next()
// 没有token
// if (whiteList.indexOf(to.path) !== -1) {
// next()
// let token = localStorage.getItem("MSSM-LIAONING__TOKEN"); // let token = localStorage.getItem("MSSM-LIAONING__TOKEN");
// if (token) { // if (token) {
// if (store.state.myselfPermission.routerList.length > 0) { // if (store.state.myselfPermission.routerList.length > 0) {
@ -70,10 +71,10 @@ router.beforeEach((to, from, next) => {
// Message.error("获取令牌失败!"); // Message.error("获取令牌失败!");
// kickOut(); // kickOut();
// } // }
} else { // } else {
// kickOut(); // // kickOut();
NProgress.done(); // NProgress.done();
} // }
} }
}); });

@ -15,7 +15,7 @@ axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
// 创建axios实例 // 创建axios实例
const service = axios.create({ const service = axios.create({
// axios中请求配置有baseURL选项表示请求URL公共部分 // axios中请求配置有baseURL选项表示请求URL公共部分
baseURL: location.origin + process.env.VUE_APP_BASE_API3, baseURL: location.origin + process.env.VUE_APP_BASE_API,
// 超时 // 超时
timeout: 15000, timeout: 15000,
}); });

@ -15,7 +15,7 @@ axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
// 创建axios实例 // 创建axios实例
const service = axios.create({ const service = axios.create({
// axios中请求配置有baseURL选项表示请求URL公共部分 // axios中请求配置有baseURL选项表示请求URL公共部分
baseURL: location.origin + process.env.VUE_APP_BASE_API2, baseURL: location.origin + process.env.VUE_APP_BASE_API,
// 超时 // 超时
timeout: 15000, timeout: 15000,
}); });

@ -398,14 +398,14 @@
import { Loading } from "element-ui"; import { Loading } from "element-ui";
var downloadLoadingInstance; var downloadLoadingInstance;
import userMsgPage from "../userMsgPage/index2.vue"; import userMsgPage from "../userMsgPage/index2.vue";
import { // import {
getList, // getList,
uploadFile, // uploadFile,
dictList, // dictList,
updataRow, // updataRow,
exportFile, // exportFile,
exportExcel, // exportExcel,
} from "@/api/jcy"; // } from "@/api/jcy";
import gridsTitle from "../components/gridsTitle"; import gridsTitle from "../components/gridsTitle";
export default { export default {

@ -0,0 +1,331 @@
<template>
<div class="container">
<div class="right-content">
<div class="tabs">
<el-tabs
v-model="activeName"
style="color: #edeef0"
>
<el-tab-pane label="查询条件" name="first">
<div class="screen">
<div class="task-name">
<span class="task-name-text">全文检索</span>
<div class="task-input">
<el-input
v-model="queryCondition.fullTextSearch"
placeholder="请输入内容"
></el-input>
</div>
</div>
<div class="task-name">
<span class="task-name-text">企业名称</span>
<div class="task-input">
<el-input
v-model="queryCondition.firmName"
placeholder="请输入内容"
></el-input>
</div>
</div>
<div class="task-name">
<span class="task-name-text">批准文号</span>
<div class="task-input">
<el-input
v-model="queryCondition.approvalNumber"
placeholder="请输入内容"
></el-input>
</div>
</div>
<div class="task-name">
<span class="task-name-text">处方内容</span>
<div class="task-input">
<el-input
v-model="queryCondition.PrescriptionContent"
placeholder="请输入内容"
></el-input>
</div>
</div>
<div class="task-name">
<span class="task-name-text">功能主治</span>
<div class="task-input">
<el-input
v-model="queryCondition.majorFunction"
placeholder="请输入内容"
></el-input>
</div>
</div>
<div class="task-name">
<span class="task-name-text">产品名称</span>
<div class="task-input">
<el-input
v-model="queryCondition.taskName"
placeholder="请输入内容"
></el-input>
</div>
</div>
<div class="time-interval">
<div class="interval-text">
批号有效期
</div>
<div class="interval-select">
<div class="star-time">
<el-date-picker
v-model="queryCondition.startTime"
type="datetime"
align="right"
:clearable="false"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择开始时间"
>
</el-date-picker>
<!-- <i class="el-icon-date data_icon"></i> -->
</div>
<!-- <i class="el-icon-sort-up"></i> -->
<div class="symbol">~</div>
<div class="end-time">
<el-date-picker
v-model="queryCondition.endTime"
type="datetime"
align="right"
:clearable="false"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择结束时间"
>
</el-date-picker>
<i class="el-icon-date data_icon"></i>
</div>
</div>
</div>
<div class="task-name">
<span class="task-name-text">产品标签</span>
<div class="task-checkbox">
<el-checkbox-group v-model="queryCondition.checkList">
<el-checkbox label="全部"></el-checkbox>
<el-checkbox label="百年产品"></el-checkbox>
<el-checkbox label="疗效显著"></el-checkbox>
<el-checkbox label="无刺激"></el-checkbox>
</el-checkbox-group>
</div>
</div>
<div class="task-name">
<span class="task-name-text">产品筛选</span>
<div class="task-checkbox">
<el-checkbox-group v-model="queryCondition.checkListTwo">
<el-checkbox label="全部"></el-checkbox>
<el-checkbox :label="'药品' + drugnum"></el-checkbox>
<el-checkbox label="医疗器械"></el-checkbox>
<el-checkbox label="化妆品"></el-checkbox>
</el-checkbox-group>
</div>
</div>
</div>
</el-tab-pane>
</el-tabs>
</div>
</div>
</div>
</template>
<script>
export default {
components: {
},
data() {
return {
drugnum:"(20)",
activeName: "first",
queryCondition:{
fullTextSearch:"", //
firmName:"", //
approvalNumber:"", //
taskName:"", //
PrescriptionContent:"", //
majorFunction:"", //
startTime:"", //
endTime:"", //
checkList:[],
checkListTwo:[],
},
};
},
mounted() {},
methods: {},
};
</script>
<style lang="scss" scoped>
.container {
height: 100%;
box-sizing: border-box;
display: flex;
align-items: center;
background: #f2f2f2;
padding: 10px;
& > div {
flex: 1;
height: 100%;
}
& > div:nth-child(2) {
flex: 2;
margin: 0 10px;
}
.middle {
height: 100%;
background: #ffff;
border-radius: 8px;
overflow: hidden;
}
.left,
.right {
display: flex;
flex-direction: column;
align-items: center;
& > div {
width: 100%;
border-radius: 8px;
flex: 1;
background: #ffffff;
}
}
.middle-box {
margin: 10px;
}
.main {
height: calc(100% - 40px);
}
.right-content {
background-color: #fff;
::v-deep .el-tabs__header{
margin: 0;
.el-tabs__nav-scroll {
padding-left: 15px;
padding-top: 3px;
}
.el-tabs__item {
font-size: 18px;
font-family: Source Han Sans SC-Bold, Source Han Sans SC;
font-weight: bold;
color: #323233;
}
.el-tabs__active-bar {
background-color: #1349C5;
height: 2px;
border-radius: 0px 0px 0px 0px;
}
}
.tabs {
background: rgba(255, 255, 255, 0.9);
box-shadow: 0px 0px 12px 0px rgba(194, 212, 226, 0.64);
border-radius: vw(10);
min-height: 90vh;
// padding-top: 3px;
// padding-left: 15px;
}
.screen {
padding: 15px 0 26px 28px;
display: flex;
flex-wrap: wrap;
align-items: center;
.task-name {
display: flex;
align-items: center;
margin-right: 30px;
.task-name-text {
font-size: 16px;
font-family: Source Han Sans CN;
font-weight: 400;
color: #6a6c6f;
line-height: 50px;
// margin-right: vw(10);
}
.task-input {
width: 251px;
height: 32px;
::v-deep .el-input {
width: 251px;
height: 32px;
}
::v-deep .el-input__inner {
width: 100%;
height: 100%;
font-size: 16px;
font-family: Source Han Sans CN;
font-weight: 400;
// color: #B1B6BF;
line-height: 50px;
padding-left: 15px;
}
}
}
.time-interval {
display: flex;
align-items: center;
margin-right: 20px;
.interval-text {
font-size: 16px;
font-family: Source Han Sans CN;
font-weight: 400;
color: #6a6c6f;
// line-height: 50px;
// margin-right: vw(10);
}
.interval-select {
display: flex;
align-items: center;
border: 1px solid #dbe0e8;
border-radius: 4px;
height: 32px;
.star-time,
.end-time {
position: relative;
.data_icon {
position: absolute;
top: 50%;
right: 17px;
z-index: 9;
color: #c0c4cc;
font-size: 14px;
transform: translateY(-50%);
}
::v-deep .el-input__prefix {
display: none;
}
::v-deep .el-input {
width: 243px;
height: 30px;
}
::v-deep .el-input__inner {
width: 100%;
height: 100%;
font-size: 16px;
font-family: Source Han Sans CN;
font-weight: 400;
// color: #B1B6BF;
line-height: 30px;
padding-left: 15px;
border: none;
cursor: pointer;
}
}
.symbol {
background: rgba(219, 224, 232, 0.5);
width: 40px;
height: 30px;
display: flex;
align-items: center;
justify-content: center;
font-size: 16px;
font-family: Source Han Sans CN;
font-weight: 400;
color: #292f38;
line-height: 28px;
}
}
}
}
}
}
</style>

@ -42,21 +42,12 @@ module.exports = {
open: true, open: true,
proxy: { proxy: {
"/configApi": { "/configApi": {
target: "https://dev-mssm-liaoning.imian.org.cn/api/admin", target: "https://dev-mssm-liaoning.imian.org.cn/ggfw-api",
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
"^/configApi": "", "^/configApi": "",
}, },
}, },
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API2]: {
target: `http://192.168.0.105:9026/inspector`,
// target: `https://dev-mssm-liaoning.imian.org.cn/api/inspector/inspector`,
changeOrigin: true,
pathRewrite: {
["^" + process.env.VUE_APP_BASE_API2]: "",
},
},
}, },
disableHostCheck: true, disableHostCheck: true,
}, },

Loading…
Cancel
Save