zm/tougao_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/wjl2008_admin/tougao_web

Browse Source 
# Conflicts:
#	src/api/index.js
This commit is contained in:
xulu
2021-09-08 09:47:35 +08:00
parent 4e5ff549c2 1de065f8db
commit abe1ad2ab2
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/api/index.js
View File

@@ -7,8 +7,9 @@ import qs from 'qs'
// axios全局配置 // axios全局配置
axios.defaults.timeout = 10000 // 超时时间 axios.defaults.timeout = 10000 // 超时时间
axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8' // 配置请求头 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8' // 配置请求头
// axios.defaults.baseURL = 'http://www.tougao.com/'
axios.defaults.baseURL = '/' axios.defaults.baseURL = 'http://www.tougao.com/'
// axios.defaults.baseURL = '/'
// 添加响应拦截器，统一处理服务器响应和异常 // 添加响应拦截器，统一处理服务器响应和异常
axios.interceptors.response.use( axios.interceptors.response.use(

2
src/components/page/chiefeditor.vue
View File

@@ -307,7 +307,7 @@
this.$refs.old_Form.validate((valid) => { this.$refs.old_Form.validate((valid) => {
if (valid) { if (valid) {
this.$api this.$api
.post('api/Chief/addJournalBoardHas', this.oldForm) .post('api/Chief/addChiefHas', this.oldForm)
.then(res => { .then(res => {
if (res.code == 0) { if (res.code == 0) {
this.oldVisible = false; this.oldVisible = false;

20
src/components/page/reviewerAdd.vue
View File

@@ -62,11 +62,11 @@
</el-form-item> </el-form-item>
<el-form-item label="title" prop="title"> <el-form-item label="title" prop="title">
<el-select v-model="addForm.title" filterable placeholder="Please select a title" value-key="groupID" style="width: 300px;"> <el-select v-model="addForm.title" filterable placeholder="Please select a title" value-key="groupID" style="width: 300px;">
<el-option key="Prof." label="Prof." value="Prof."></el-option> <el-option key="Prof." label="Prof." value="Prof."></el-option>
<el-option key="Associate Prof." label="Associate Prof." value="Associate Prof."></el-option> <el-option key="Associate Prof." label="Associate Prof." value="Associate Prof."></el-option>
<el-option key="Assistant Prof." label="Assistant Prof." value="Assistant Prof."></el-option> <el-option key="Assistant Prof." label="Assistant Prof." value="Assistant Prof."></el-option>
<el-option key="Ph.D." label="Ph.D." value="Ph.D."></el-option> <el-option key="Ph.D." label="Ph.D." value="Ph.D."></el-option>
<el-option key="Others" label="Others" value="Others"></el-option> <el-option key="Others" label="Others" value="Others"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="country" prop="country"> <el-form-item label="country" prop="country">
@@ -118,11 +118,11 @@
</el-form-item> </el-form-item>
<el-form-item label="technical" prop="technical"> <el-form-item label="technical" prop="technical">
<el-select v-model="editForm.technical" filterable placeholder="Please select a title" value-key="groupID" style="width: 300px;"> <el-select v-model="editForm.technical" filterable placeholder="Please select a title" value-key="groupID" style="width: 300px;">
<el-option key="Prof." label="Prof." value="Prof."></el-option> <el-option key="Prof." label="Prof." value="Prof."></el-option>
<el-option key="Associate Prof." label="Associate Prof." value="Associate Prof."></el-option> <el-option key="Associate Prof." label="Associate Prof." value="Associate Prof."></el-option>
<el-option key="Assistant Prof." label="Assistant Prof." value="Assistant Prof."></el-option> <el-option key="Assistant Prof." label="Assistant Prof." value="Assistant Prof."></el-option>
<el-option key="Ph.D." label="Ph.D." value="Ph.D."></el-option> <el-option key="Ph.D." label="Ph.D." value="Ph.D."></el-option>
<el-option key="Others" label="Others" value="Others"></el-option> <el-option key="Others" label="Others" value="Others"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="country" prop="country"> <el-form-item label="country" prop="country">