Merge branch 'master' of https://gitee.com/wjl2008_admin/tougao_web
# Conflicts: # src/api/index.js # vue.config.js
This commit is contained in:
wangjinlei
@@ -16,8 +16,12 @@ axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded
|
||||
//
|
||||
const service = axios.create({
|
||||
// baseURL: 'http://testtougao.tmrjournals.com/public/index.php/',
|
||||
// baseURL: 'http://www.tougao.com/public/index.php/',
|
||||
baseURL: '/',
|
||||
// baseURL: 'https://submission.tmrjournals.com/', //正式 记得切换
|
||||
// baseURL: 'http://www.tougao.com/', //测试本地 记得切换
|
||||
|
||||
|
||||
// baseURL: '/api', //本地
|
||||
baseURL: '/', //正式
|
||||
});
|
||||
|
||||
const service_new = axios.create({
|
||||
|
||||
@@ -2,13 +2,14 @@
|
||||
//记得切换
|
||||
|
||||
//正式
|
||||
const mediaUrl = '/public/';
|
||||
const baseUrl = '/';
|
||||
// const mediaUrl = '/public/';
|
||||
// const baseUrl = '/';
|
||||
|
||||
//本地(正式环境 )
|
||||
|
||||
// const mediaUrl = 'https://submission.tmrjournals.com/public/';
|
||||
// const baseUrl = '/api';
|
||||
const mediaUrl = 'http://192.168.110.110/tougao/public/index.php/';
|
||||
const baseUrl = '/api';
|
||||
|
||||
// const mediaUrl = 'http://www.tougao.com/';
|
||||
// const baseUrl = 'http://www.tougao.com/';
|
||||
|
||||
1412
src/components/page/components/reviewerList/add.vue
Normal file
1412
src/components/page/components/reviewerList/add.vue
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -34,7 +34,7 @@
|
||||
<el-button type="primary" icon="el-icon-search" @click="query.pageIndex = 1;getContent()">Search
|
||||
</el-button>
|
||||
</div>
|
||||
<el-table :data="tableData" border class="table" ref="multipleTable" header-cell-class-name="table-header"
|
||||
<el-table :data="tableData" class="table" ref="multipleTable" header-cell-class-name="table-header"
|
||||
empty-text="Messages (0)">
|
||||
<el-table-column label="Base Information" width="280px">
|
||||
<template slot-scope="scope">
|
||||
@@ -142,9 +142,9 @@
|
||||
:page-size="query.pageSize" :total="link_Total" @current-change="handlePageChange"></el-pagination>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<common-reviewer ref="commonReviewer" @fresh="getContent"></common-reviewer>
|
||||
<!-- 检测邮箱弹出框 -->
|
||||
<el-dialog title="Add User Check Email" :visible.sync="checkVisible" width="500px">
|
||||
<!-- <el-dialog title="Add User Check Email" :visible.sync="checkVisible" width="500px">
|
||||
<el-form ref="check_Form" :model="checkForm" :rules="rules" label-width="80px">
|
||||
<el-form-item label="Email :" prop="email">
|
||||
<el-input v-model="checkForm.email" style="width: 300px;margin-right: 10px;"></el-input>
|
||||
@@ -152,7 +152,7 @@
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div v-if="email_num==1" style="margin: 0 80px;color: orangered;word-break:break-word;">
|
||||
<!-- 验证失败 -->
|
||||
|
||||
{{checkForm.email}} already exists. <br>Do you want to continue adding a new identity or modify the
|
||||
mailbox for
|
||||
authentication.
|
||||
@@ -162,129 +162,13 @@
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="email_num==2" style="margin: 0 80px;color: #006699;">
|
||||
<!-- 验证成功 -->
|
||||
|
||||
Verification succeeded, continue to add information!
|
||||
</div>
|
||||
</el-dialog>
|
||||
</el-dialog> -->
|
||||
|
||||
<!-- 添加弹出框 -->
|
||||
<el-dialog title="Add User" :visible.sync="addVisible" width="700px">
|
||||
<el-form ref="add_Form" :model="addForm" :rules="rules" label-width="120px">
|
||||
<el-form-item label="Email :">
|
||||
{{addForm.email}}
|
||||
</el-form-item>
|
||||
<el-form-item label="Account :" prop="account">
|
||||
<span v-if="this.email_num==1">{{addForm.account}}</span>
|
||||
<el-input v-model="addForm.account" v-if="this.email_num==2" @blur='saerNa_U()'></el-input>
|
||||
<p v-if="btn_alert==true" style="color: orangered;">Account already exists, please rewrite it!</p>
|
||||
</el-form-item>
|
||||
<el-form-item label="Gender :" prop="gender">
|
||||
<el-radio-group v-model="addForm.gender">
|
||||
<el-radio :label="1">Male</el-radio>
|
||||
<el-radio :label="2">Female</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="Journal :" prop="journal_id">
|
||||
<el-select v-if="this.email_num==1" v-model="addForm.journal_id"
|
||||
placeholder="Please select a journal">
|
||||
<el-option v-for="item in df_jour_cun" :label="item.title" :key="item.journal_id"
|
||||
:value="item.journal_id"></el-option>
|
||||
</el-select>
|
||||
<el-select v-if="this.email_num==2" v-model="addForm.journal_id"
|
||||
placeholder="Please select a journal">
|
||||
<el-option v-for="item in df_jour" :label="item.title" :key="item.journal_id"
|
||||
:value="item.journal_id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<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-option v-for="item in df_technical" :key="item.label" :label="item.label"
|
||||
:value="item.label"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="Country :" prop="country">
|
||||
<el-select v-model="addForm.country" filterable placeholder="Please select a country"
|
||||
value-key="groupID" style="width: 300px;">
|
||||
<el-option v-for="item in df_country" :label="item.en_name" :key="item.en_name"
|
||||
:value="item.en_name"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="Realname :" prop="realname">
|
||||
<el-input v-model="addForm.realname"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="Class :">
|
||||
<el-select v-model="addForm.grade" placeholder="Please select a class">
|
||||
<el-option key="A" label="A" value="A"></el-option>
|
||||
<el-option key="B" label="B" value="B"></el-option>
|
||||
<el-option key="C" label="C" value="C"></el-option>
|
||||
<el-option key="D" label="D" value="D"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="Orcid :">
|
||||
<el-input v-model="addForm.orcid"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="Introduction :">
|
||||
<el-input v-model="addForm.introduction" type="textarea" :autosize="{minRows: 2}"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="Affiliation :">
|
||||
<el-input v-model="addForm.company"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="Major :" prop="major_a">
|
||||
<el-select v-model="addForm.major_a" placeholder="Please select" @change="majorChange(1)"
|
||||
style="width: 150px;margin: 0 10px 0 0;">
|
||||
<el-option v-for="item in majors_a" :key="item.major_id" :label="item.major_title"
|
||||
:value="item.major_id"></el-option>
|
||||
</el-select>
|
||||
<el-select v-model="addForm.major_b" placeholder="Please select" v-if="majors_b!=''"
|
||||
@change="majorChange(2)" style="width: 150px;margin:0 10px 0 0;">
|
||||
<el-option :key="0" label="None" :value="0"></el-option>
|
||||
<el-option v-for="item in majors_b" :key="item.major_id" :label="item.major_title"
|
||||
:value="item.major_id"></el-option>
|
||||
</el-select>
|
||||
<el-select v-model="addForm.major_c" placeholder="Please select" v-if="majors_c!=''"
|
||||
@change="majorChange(3)" style="width: 150px;">
|
||||
<el-option :key="0" label="None" :value="0"></el-option>
|
||||
<el-option v-for="item in majors_c" :key="item.major_id" :label="item.major_title"
|
||||
:value="item.major_id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="Field :" prop="field">
|
||||
<el-input v-model="addForm.field" type="textarea"></el-input>
|
||||
</el-form-item>
|
||||
<!-- 简历 -->
|
||||
<el-form-item label="CV. :" prop="qualifications">
|
||||
<div v-if="cvitaTable.length==0">
|
||||
<el-upload class="upload-demo" :action="baseUrl+'api/Reviewer/up_cv_file'"
|
||||
:on-success="handleFileSuccess2" name="reviewerCV" type="reviewerCV"
|
||||
:on-error="handleFileError" :on-preview="handlePreview" :on-remove="handleRemove"
|
||||
:before-remove="beforeRemove" :on-change="handleChange2" accept=".pdf"
|
||||
:on-exceed="handleExceed" :file-list="fileL_pdf2" ref="upload">
|
||||
<el-button type="text" style="font-weight: bolder;"><b class="el-icon-lx-top"
|
||||
style="font-weight: bolder;"></b>upload</el-button>
|
||||
</el-upload>
|
||||
<span style="font-size: 12px; color: #aaa;">Only pdf files can be uploaded(.pdf)</span>
|
||||
</div>
|
||||
|
||||
<div v-for="(item,index) in cvitaTable">
|
||||
{{index+1}}.
|
||||
<img src="../../assets/img/icon_0.png" alt="" class="icon_img"
|
||||
style="vertical-align: middle;margin-left: 10px;">
|
||||
<span style="margin-left: 20px;color: #888;font-size: 13px;">
|
||||
<i class="el-icon-paperclip"></i>
|
||||
{{formatDate(item.ctime)}}
|
||||
</span>
|
||||
<a :href="mediaUrl+'reviewer/'+item.cv" target="_blank" class="txt_pdf">
|
||||
<i class="el-icon-download"></i>
|
||||
</a>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="addVisible = false">Cancel</el-button>
|
||||
<el-button type="primary" @click="saveAdd(addForm)" :disabled="this.btn_alert">OK</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 编辑弹出框 -->
|
||||
<el-dialog title="Edit User Message" :visible.sync="editVisible" width="700px">
|
||||
@@ -427,7 +311,11 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import commonReviewer from "../page/components/reviewerList/add.vue";
|
||||
export default {
|
||||
components: {
|
||||
commonReviewer,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
tableData: [],
|
||||
@@ -722,12 +610,13 @@
|
||||
},
|
||||
// 添加操作
|
||||
add_Selection(index, row) {
|
||||
this.checkVisible = true;
|
||||
this.checkForm.email = '';
|
||||
this.email_num = 0;
|
||||
this.addForm = {};
|
||||
this.cvitaTable = []
|
||||
this.fileL_pdf2 = [];
|
||||
this.$refs.commonReviewer.init()
|
||||
// this.checkVisible = true;
|
||||
// this.checkForm.email = '';
|
||||
// this.email_num = 0;
|
||||
// this.addForm = {};
|
||||
// this.cvitaTable = []
|
||||
// this.fileL_pdf2 = [];
|
||||
},
|
||||
// 验证邮箱是否存在
|
||||
saveCheck(checkForm) {
|
||||
|
||||
Reference in New Issue
Block a user