Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/zky-admin

src/api.js

@@ -289,5 +289,14 @@ export default {
 	// 期刊管理相关
 	getJournalList: params => {
 		return axios.get(`${baseURL}/api/admin/journal/list`, { params: params });
+	},
+	getJournal: params => {
+		return axios.get(`${baseURL}/api/admin/journal`, { params: params });
+	},
+	searchSubjectList: params => {
+		return axios.get(`${baseURL}/api/admin/subject/search`, { params: params });
+	},
+	searchOrganizerList: params => {
+		return axios.get(`${baseURL}/api/admin/organizer/search`, { params: params });
 	}
 }

src/views/Home.vue

@@ -10,8 +10,8 @@
 	<el-container>
 		<el-header>
 			<div class="header">
-				<!-- <img class="logo" src="../assets/logo.png" alt=""> -->
-				<!-- <div class="siteTitle">中科院期刊微信公众号集中管理平台</div> -->
+				<img class="logo" src="../assets/logo.png" alt="">
+				<div class="siteTitle">中科院期刊微信公众号集中管理平台</div>
 			</div>	
 			<div class="nav">
 				<!-- <router-link :class="act?'active':''" to="/index/index" @click.native='active(1)'>首页</router-link>

src/views/Login.vue

@@ -89,7 +89,7 @@
         <h1>期刊微信公众号管理系统</h1>
         <form>
             <div class="input_div">
-              <label>手机号</label>
+              <label>账号</label>
               <input type="text" v-model="logindata.username" placeholder="请输入用户名">
             </div>
             <div class="input_div">
@@ -104,7 +104,7 @@
             <el-button @click="login" @keyup.enter="login" class="login-btn" type="primary">登  录</el-button>
         </form>
       </div>
-      <p class="footer">Copyright © 2020 中科院 版权所有</p>
+      <p class="footer">Copyright © {{copyrightdate}} 中国科学院 版权所有</p>
   </div>
 </template>
 
@@ -116,12 +116,13 @@ export default {
       tp:'xt',
       code:'',
       logindata:{
-        username:'root',
-        password:'123456',
+        username:'',
+        password:'',
         imgcode_id:'',
         imgcode:'',
         utype:2
-      }
+      },
+      copyrightdate:new Date().getFullYear()
     }
   },
   methods:{
@@ -135,20 +136,21 @@ export default {
       },
       login(){
           let parms=this.logindata;
+            console.log(parms)
             this.$api.login(parms).then((res)=>{
                 let data=res.data
                   if(res.data.code == 0){
                       // window.location.hash='/index/index';
                       window.location.hash='/message/message';
                   }else{
-                      this.$message.error("账号或者密码有误");
+                      this.$message.error(res.data.message);
                   } 
             })
       },
       getCode(){
         this.$api.getCode().then(res=>{
           this.code=res.data.data.imgcode
-          this.logindata.imgcode_id=res.data.data.captcha_id
+          this.logindata.imgcode_id=res.data.data.imgcode_id
         })
       }
 

src/views/journalQun/AddJournal.vue

@@ -96,7 +96,7 @@
 </style>
 <template>
   <section>
-    <p><span>会议管理></span>新增文章</p>
+    <p><span>刊群导览></span>新增期刊</p>
     <div class="content">
       <!-- <div class="title">新增会议</div> -->
       <el-form
@@ -107,23 +107,52 @@
         :model="form"
         :rules="rules"
       >
-        <el-form-item label="文章名称：" prop="name">
-          <el-input
-            placeholder="请输入文章名称"
-            v-model="form.name"
-            clearable
-          ></el-input>
-        </el-form-item>
         <el-row>
-          <el-col :span="5">
-            <el-form-item label="文章来源：" prop="journal_id">
+          <el-col :span="24">
+              <el-form-item label="期刊名称：" prop="name">
+                <el-input
+                  placeholder="请输入期刊名称"
+                  v-model="form.name"
+                  clearable
+                ></el-input>
+              </el-form-item>
+          </el-col>
+          <el-col :span="6">
+              <el-form-item label="微信号：" prop="wxcode">
+                <el-input
+                  placeholder="请输入微信号"
+                  v-model="form.wxcode"
+                  clearable
+                ></el-input>
+              </el-form-item>
+          </el-col>
+          <el-col :span="6">
+              <el-form-item label="中文名称：" prop="cname">
+                <el-input
+                  placeholder="请输入中文名称"
+                  v-model="form.cname"
+                  clearable
+                ></el-input>
+              </el-form-item>
+          </el-col>
+          <el-col :span="6">
+              <el-form-item label="外文名称：" prop="ename">
+                <el-input
+                  placeholder="请输入外文名称"
+                  v-model="form.ename"
+                  clearable
+                ></el-input>
+              </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="主办单位：" prop="organizer_id">
               <el-select
                 placeholder="请选择"
-                v-model="form.journal_id"
+                v-model="form.organizer_id"
                 filterable
               >
                 <el-option
-                  v-for="(item, index) in journalList"
+                  v-for="(item, index) in organizerList"
                   :key="index"
                   :label="item.name"
                   :value="item.id"
@@ -131,23 +160,114 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
-            <el-form-item label="作者：" prop="author">
-              <el-input v-model="form.author" placeholder=""> </el-input>
+          <el-col :span="6">
+            <el-form-item label="学科：" prop="subject_id">
+              <el-select
+                placeholder="请选择"
+                v-model="form.subject_id"
+                filterable
+              >
+                <el-option
+                  v-for="(item, index) in subjectList"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12" :offset="2">
-            <el-form-item label="出版时间：" prop="publish_time">
-              <el-date-picker
-                v-model="form.publish_time"
-                type="date"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              >
+          <el-col :span="6">
+            <el-form-item label="语种：" prop="languages">
+              <el-input v-model="form.languages" placeholder=""> </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出版时间：" prop="publishingTime">
+              <el-input v-model="form.publishingTime" placeholder=""> </el-input>
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+              <el-form-item label="主编：" prop="editor">
+                <el-input
+                  placeholder="请输入期刊名称"
+                  v-model="form.editor"
+                  clearable
+                ></el-input>
+              </el-form-item>
+          </el-col>
+          <el-col :span="6">
+              <el-form-item label="主管单位：" prop="corganizers">
+                <el-input
+                  placeholder="请输入主管单位"
+                  v-model="form.corganizers"
+                  clearable
+                ></el-input>
+              </el-form-item>
+          </el-col>
+          <el-col :span="6">
+              <el-form-item label="办刊单位：" prop="publishingUnit">
+                <el-input
+                  placeholder="请输入期刊名称"
+                  v-model="form.publishingUnit"
+                  clearable
+                ></el-input>
+              </el-form-item>
+          </el-col>
+          <el-col :span="6">
+              <el-form-item label="创刊时间：" prop="">
+                <el-input
+                  placeholder="请输入期刊名称"
+                  v-model="form.publishingTime"
+                  clearable
+                ></el-input>
+              </el-form-item>
+          </el-col>
+          <el-col :span="6">
+              <el-form-item label="出版周期：" prop="publishingCycle">
+                <el-input
+                  placeholder="请输入出版周期"
+                  v-model="form.publishingCycle"
+                  clearable
+                ></el-input>
+              </el-form-item>
+          </el-col>
+          <el-col :span="6">
+              <el-form-item label="国内刊号：" prop="domestic">
+                <el-input
+                  placeholder="请输入国内刊号"
+                  v-model="form.domestic"
+                  clearable
+                ></el-input>
+              </el-form-item>
+          </el-col>
+          <el-col :span="6">
+              <el-form-item label="国际刊号：" prop="issn">
+                <el-input
+                  placeholder="请输入国际刊号"
+                  v-model="form.issn"
+                  clearable
+                ></el-input>
+              </el-form-item>
+          </el-col>
+          <el-col :span="6">
+              <el-form-item label="期刊官网：" prop="website">
+                <el-input
+                  placeholder="请输入期刊官网"
+                  v-model="form.website"
+                  clearable
+                ></el-input>
+              </el-form-item>
+          </el-col>
+          <el-col :span="24">
+              <el-form-item label="编辑部地址：" prop="editorialAddress">
+                <el-input
+                  placeholder="请输入编辑部地址"
+                  v-model="form.editorialAddress"
+                  clearable
+                ></el-input>
+              </el-form-item>
+          </el-col>
         </el-row>
         <el-form-item label="文章简介：">
           <el-input
@@ -171,9 +291,6 @@
             >建议图片尺寸为：210*160</span
           >
         </el-form-item>
-        <el-form-item label="文章详情：">
-          <fuEditor :value="form.content"></fuEditor>
-        </el-form-item>
         <el-form-item style="position: fixed; bottom: 20px; right: 60px">
           <el-button type="primary">预览</el-button>
           <el-button type="success">发布</el-button>
@@ -193,7 +310,8 @@ export default {
   data() {
     return {
       form: {},
-      journalList: [],
+      subjectList: [],
+      organizerList:[],
       imageUrl: "",
       rules: {
         name: [{ required: true, message: "请输入标题", trigger: "blur" }],
@@ -235,12 +353,16 @@ export default {
     },
     getData() {
       this.loading = true;
-      this.$api.searchJournalList().then((res) => {
-        this.journalList = res.data.data;
+      this.$api.searchSubjectList().then((res) => {
+        this.subjectList = res.data.data;
+      });
+      this.$api.searchOrganizerList().then((res) => {
+        this.organizerList = res.data.data;
       });
+      // 期刊详情
       let id = this.$route.query.id;
       if (id) {
-        this.$api.getArticle({ id: id }).then((res) => {
+        this.$api.getJournal({ id: id }).then((res) => {
           this.form = res.data.data;
         });
       }

src/views/journalQun/Journal.vue

@@ -102,10 +102,10 @@
                     </el-table-column>
                     <el-table-column  
                     prop="zip"  width="150"
-                    label="操作">
-                    <template slot-scope="">
-                        <el-button type="text" @click="dialogVisible=true,edit=1">查看</el-button>
-                        <el-button class="edit" type="text" @click="dialogVisible=true,edit=0">编辑</el-button>
+                    label="操作" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button type="text" @click="dialogVisible=true">查看</el-button>
+                        <el-button class="edit" type="text" @click="edit(scope.row)">编辑</el-button>
                         <el-button class="del" @click="del" type="text">删除</el-button>
                     </template>
                     </el-table-column>
@@ -162,7 +162,7 @@ export default {
   },
   data(){
     return{
-      edit:0,
+    //   edit:0,
       form:{name:'',page:1,page_size:20},
       total:1,
       list:[{name:'2333'}],
@@ -178,6 +178,9 @@ export default {
             this.form.page=this.$refs.pageButton.page
             this.getData()
         },
+        edit(row){
+            this.$router.push({path:"/journal/journal/add",query:{id:row.id}})
+        },
         add(){
             this.$router.push({path:'/journal/journal/add'})
         },

src/views/message/InnerSurvey.vue

@@ -561,7 +561,7 @@ export default {
       form1: {},
       form2: {},
       total: 1,
-      list: [{ name: "2333" }],
+      list: [],
       loading: false,
       input: "",
       dialogVisible: false,

src/views/message/Notice.vue

@@ -343,7 +343,7 @@ export default {
       form1: {},
       form2: {},
       total: 1,
-      list: [{ name: "2333" }],
+      list: [],
       loading: false,
       input: "",
       dialogVisible: false,

src/views/message/OutSurvey.vue

@@ -526,7 +526,7 @@ export default {
       form1: {},
       form2: {},
       total: 1,
-      list: [{ name: "2333" }],
+      list: [],
       loading: false,
       input: "",
       dialogVisible: false,

src/views/message/templateList.vue

@@ -154,7 +154,7 @@ export default {
       form: { name: "", page: 1, page_size: 20 },
       form1: {copyid:null,name:""},
       total: 1,
-      list: [{ name: "2333" }],
+      list: [],
       loading: false,
       input: "",
       dialogVisible: false,

vue.config.js

@@ -3,7 +3,8 @@ module.exports={
         proxy:{
             '/api':{
                 // target:'http://39.107.246.59:81',
-                target:'https://test.scxjc.club',
+                // target:'https://test.scxjc.club',
+                target:'http://caos.tederen.com',
                 changeOrigin: true,
             }
         }