update

src/api.js

@@ -147,6 +147,16 @@ export default {
 			params: params
 		})
 	},
+	uploadPaper: params => {
+		return axios.post(`${baseURL}/api/admin/paper/upload`, params);
+	},
+	//试卷
+	getVideoList: params => {
+		return axios.get(`${baseURL}/api/admin/video/list`, {
+			params: params
+		})
+	},
+	
 	
 	// 内容管理
 	// 栏目列表
@@ -157,15 +167,11 @@ export default {
 	},
 	// 新增栏目
 	addContent: params => {
-		return axios.post(`${baseURL}/api/admin/category`, {
-			params: params
-		})
+		return axios.post(`${baseURL}/api/admin/category`, params)
 	},
 	// 编辑栏目
 	editContent: params => {
-		return axios.put(`${baseURL}/api/admin/category`, {
-			params: params
-		})
+		return axios.put(`${baseURL}/api/admin/category`, params)
 	},
 	// 删除栏目
 	delContent: params => {
@@ -193,15 +199,11 @@ export default {
 	},
 	// 新增文章
 	addArticle: params => {
-		return axios.post(`${baseURL}/api/admin/article`, {
-			params: params
-		})
+		return axios.post(`${baseURL}/api/admin/article`, params)
 	},
 	// 编辑文章
 	editArticle: params => {
-		return axios.put(`${baseURL}/api/admin/article`, {
-			params: params
-		})
+		return axios.put(`${baseURL}/api/admin/article`,params)
 	},
 	// 删除文章
 	delArticle: params => {
@@ -225,15 +227,11 @@ export default {
 	},
 	//新增账号
 	addAccount: params => {
-		return axios.post(`${baseURL}/api/admin/account`, {
-			params: params
-		})
+		return axios.post(`${baseURL}/api/admin/account`, params)
 	},
 	//编辑账号
 	editAccount: params => {
-		return axios.put(`${baseURL}/api/admin/account`, {
-			params: params
-		})
+		return axios.put(`${baseURL}/api/admin/account`, params)
 	},
 	//删除账号
 	delAccount: params => {

src/components/Subject.vue

@@ -2,7 +2,7 @@
  @import '../style/style.scss';
     .sub{
         .el-input{
-            width: 500px !important;
+            width: 300px !important;
         }
     }
 </style>

src/style/home.scss

@@ -49,6 +49,9 @@ $height: 50px;
 			.iconfont{
 				color: $mainColor;
 			}	
+			&>.el-submenu__title{
+				color: #fff !important;
+			}
 			.is-active {
 				background-color: #1F315D !important;
 				position: relative;
@@ -59,6 +62,9 @@ $height: 50px;
 		}
 		.is-opened{
 			background-color: #fff !important;
+			&>.el-submenu__title{
+				color: #303133 !important;
+			}
 		}
 		.el-menu-item-group__title{
 			padding: 0;

src/views/apply/Change.vue

@@ -39,9 +39,12 @@
     <section class="apply">
         <p>报名信息  >  换证</p>
         <div class="filter">
-            <el-form label-width="80px" :inline="true">
+            <el-form label-width="75px" :inline="true" size="small">
                 <!-- <el-divider></el-divider> -->
-                <el-form-item label="姓名">
+                <el-form-item label="培训项目">
+                    <Subject @subChange='subChange'/>
+                </el-form-item>
+                <el-form-item label="姓名" label-width="40px">
                         <el-input placeholder="姓名" v-model="form.name"></el-input>
                 </el-form-item>
                 <el-form-item label="联系电话">
@@ -54,6 +57,7 @@
                     placeholder="选择日期">
                     </el-date-picker>
                 </el-form-item>
+                
                 <el-form-item label="发票类型">
                     <el-select v-model="form.bill_type" placeholder="请选择" clearable>
                         <el-option  label="不需要发票"  :value="0"></el-option>
@@ -62,13 +66,13 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="领证方式" clearable>
-                    <el-select v-model="form.a" placeholder="请选择">
+                    <el-select v-model="form.receive_card" placeholder="请选择">
                         <el-option  label="邮寄"  :value="1"></el-option>
                         <el-option  label="自取"  :value="0"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="考试设置">
-                    <el-select v-model="form.a" placeholder="请选择" clearable>
+                    <el-select v-model="form.set_exam_time" placeholder="请选择" clearable>
                         <el-option  label="已设置考试时间"  :value="1"></el-option>
                         <el-option  label="未设置考试时间"  :value="0"></el-option>
                     </el-select>
@@ -98,13 +102,10 @@
                     end-placeholder="结束日期">
                     </el-date-picker>
                 </el-form-item>
-                
                 <el-form-item>
-                <el-form-item label="类别">
-                    <Subject @subChange='subChange'/>
-                </el-form-item>
-                       <el-button @click="list=[],getData()" type="primary" icon="el-icon-search">搜索</el-button>
+                       <el-button  @click="list=[],getData()" type="primary" icon="el-icon-search">搜索</el-button>
                 </el-form-item>
+                
                 <el-divider></el-divider>
             </el-form>
             <el-tabs v-model="order_status" @tab-click="tabClick">
@@ -130,12 +131,14 @@
                 <el-divider  direction="vertical"></el-divider>
                 <el-button @click="download('exam')" size="small" type="warning" >导出考勤表与申报考试表</el-button>
                 <el-button @click="download('apply')"  size="small" type="warning" >导出学员申报资料</el-button>
+                <el-divider  direction="vertical"></el-divider>
+                <el-button @click="print" type="primary" size="mini" plain icon="el-icon-printer"></el-button>
         </div>
         <el-table
                 class="table"
-                :data="list"
+                :data="list" v-loading="loading"
                  @selection-change="handleSelectionChange"
-                border  v-loading="loading"
+                border 
                 style="width: 100%">
                 <el-table-column
                 type="selection" fixed="left"
@@ -195,9 +198,9 @@
                 </el-table-column>
         </el-table>
         <Page  ref="pageButton"  :total='total' @pageChange='gopage'/>
-
+        
         <el-dialog
-            :title="text"
+            :title="text" 
             :visible.sync="dialogVisible"
             width="30%">
             <el-date-picker
@@ -248,8 +251,8 @@ export default {
             this.getData()
         },
       getData(){
-          this.loading=true
           var parm=this.form;
+          this.loading=true;
           if(this.order_status != '-3'){parm.order_status=this.order_status}
           this.$api.getSignList(parm).then(res=>{
               this.list=res.data.data.list
@@ -360,6 +363,43 @@ export default {
                         
             })
       },
+      print(){
+        var newwindow = window.open("","");
+        var tr='';
+        for(let i=0;i<this.list.length;i++){
+            let item=this.list[i];
+            let status='';
+            // -2:审核未通过,-1:待提交资料，0：待审核，1：已审核立即支付，2：学习中，3：已完成
+            if(item.order_status == -2)status='审核未通过';
+            if(item.order_status == -1)status='待提交资料';
+            if(item.order_status == 0)status='待审核';
+            if(item.order_status == 1)status='已审核立即支付';
+            if(item.order_status == 2)status='学习中';
+            if(item.order_status == 3)status='已完成';
+            tr+=`
+                <tr>
+                    <td>${item.name}</td><td>${item.phone}</td><td>${status}</td>
+                    <td>${item.remark}</td><td>${item.subject_item0}</td>
+                    <td>${item.subject_item1}</td><td>${item.subject_item2}</td><td>${item.train_type}</td>
+                </tr>
+            `
+        }
+        var table=`
+            <style>
+                td{text-align:center;padding:10px 0;color:#666;}
+
+            </style>
+            <table style='border-collapse: collapse;border:none;border-color:#d9d9d9;padding:10px;' border='1' cellspacing='0' cellpadding='0' width='100%'>
+                <thead style="text-align:center;">
+                    <td>姓名</td><td>联系电话</td><td>状态</td><td>管理员备注</td><td>报名类型</td>
+                    <td>作业类别</td><td>准操类型</td><td>培训类型</td>
+                </thead>
+                ${tr}
+            </table>
+        `
+        newwindow.document.write(table);
+        newwindow.window.print();  
+      },
       download(type){
           var ids=[],val=this.ids;
           for(let i=0;i<val.length;i++){

src/views/apply/New.vue

@@ -39,9 +39,12 @@
     <section class="apply">
         <p>报名信息  >  新办</p>
         <div class="filter">
-            <el-form label-width="80px" :inline="true">
+            <el-form label-width="75px" :inline="true" size="small">
                 <!-- <el-divider></el-divider> -->
-                <el-form-item label="姓名">
+                <el-form-item label="培训项目">
+                    <Subject @subChange='subChange'/>
+                </el-form-item>
+                <el-form-item label="姓名" label-width="40px">
                         <el-input placeholder="姓名" v-model="form.name"></el-input>
                 </el-form-item>
                 <el-form-item label="联系电话">
@@ -54,6 +57,7 @@
                     placeholder="选择日期">
                     </el-date-picker>
                 </el-form-item>
+                
                 <el-form-item label="发票类型">
                     <el-select v-model="form.bill_type" placeholder="请选择" clearable>
                         <el-option  label="不需要发票"  :value="0"></el-option>
@@ -62,13 +66,13 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="领证方式" clearable>
-                    <el-select v-model="form.a" placeholder="请选择">
+                    <el-select v-model="form.receive_card" placeholder="请选择">
                         <el-option  label="邮寄"  :value="1"></el-option>
                         <el-option  label="自取"  :value="0"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="考试设置">
-                    <el-select v-model="form.a" placeholder="请选择" clearable>
+                    <el-select v-model="form.set_exam_time" placeholder="请选择" clearable>
                         <el-option  label="已设置考试时间"  :value="1"></el-option>
                         <el-option  label="未设置考试时间"  :value="0"></el-option>
                     </el-select>
@@ -98,13 +102,10 @@
                     end-placeholder="结束日期">
                     </el-date-picker>
                 </el-form-item>
-                
                 <el-form-item>
-                <el-form-item label="类别">
-                    <Subject @subChange='subChange'/>
-                </el-form-item>
-                       <el-button @click="list=[],getData()" type="primary" icon="el-icon-search">搜索</el-button>
+                       <el-button  @click="list=[],getData()" type="primary" icon="el-icon-search">搜索</el-button>
                 </el-form-item>
+                
                 <el-divider></el-divider>
             </el-form>
             <el-tabs v-model="order_status" @tab-click="tabClick">
@@ -131,7 +132,7 @@
                 <el-button @click="download('exam')" size="small" type="warning" >导出考勤表与申报考试表</el-button>
                 <el-button @click="download('apply')"  size="small" type="warning" >导出学员申报资料</el-button>
                 <el-divider  direction="vertical"></el-divider>
-                <el-button type="primary" size="mini" plain icon="el-icon-printer"></el-button>
+                <el-button @click="print" type="primary" size="mini" plain icon="el-icon-printer"></el-button>
         </div>
         <el-table
                 class="table"
@@ -197,7 +198,7 @@
                 </el-table-column>
         </el-table>
         <Page  ref="pageButton"  :total='total' @pageChange='gopage'/>
-
+        
         <el-dialog
             :title="text" 
             :visible.sync="dialogVisible"
@@ -362,6 +363,43 @@ export default {
                         
             })
       },
+      print(){
+        var newwindow = window.open("","");
+        var tr='';
+        for(let i=0;i<this.list.length;i++){
+            let item=this.list[i];
+            let status='';
+            // -2:审核未通过,-1:待提交资料，0：待审核，1：已审核立即支付，2：学习中，3：已完成
+            if(item.order_status == -2)status='审核未通过';
+            if(item.order_status == -1)status='待提交资料';
+            if(item.order_status == 0)status='待审核';
+            if(item.order_status == 1)status='已审核立即支付';
+            if(item.order_status == 2)status='学习中';
+            if(item.order_status == 3)status='已完成';
+            tr+=`
+                <tr>
+                    <td>${item.name}</td><td>${item.phone}</td><td>${status}</td>
+                    <td>${item.remark}</td><td>${item.subject_item0}</td>
+                    <td>${item.subject_item1}</td><td>${item.subject_item2}</td><td>${item.train_type}</td>
+                </tr>
+            `
+        }
+        var table=`
+            <style>
+                td{text-align:center;padding:10px 0;color:#666;}
+
+            </style>
+            <table style='border-collapse: collapse;border:none;border-color:#d9d9d9;padding:10px;' border='1' cellspacing='0' cellpadding='0' width='100%'>
+                <thead style="text-align:center;">
+                    <td>姓名</td><td>联系电话</td><td>状态</td><td>管理员备注</td><td>报名类型</td>
+                    <td>作业类别</td><td>准操类型</td><td>培训类型</td>
+                </thead>
+                ${tr}
+            </table>
+        `
+        newwindow.document.write(table);
+        newwindow.window.print();  
+      },
       download(type){
           var ids=[],val=this.ids;
           for(let i=0;i<val.length;i++){

src/views/apply/Update.vue

@@ -39,9 +39,12 @@
     <section class="apply">
         <p>报名信息  >  复审</p>
         <div class="filter">
-            <el-form label-width="80px" :inline="true">
+            <el-form label-width="75px" :inline="true" size="small">
                 <!-- <el-divider></el-divider> -->
-                <el-form-item label="姓名">
+                <el-form-item label="培训项目">
+                    <Subject @subChange='subChange'/>
+                </el-form-item>
+                <el-form-item label="姓名" label-width="40px">
                         <el-input placeholder="姓名" v-model="form.name"></el-input>
                 </el-form-item>
                 <el-form-item label="联系电话">
@@ -54,6 +57,7 @@
                     placeholder="选择日期">
                     </el-date-picker>
                 </el-form-item>
+                
                 <el-form-item label="发票类型">
                     <el-select v-model="form.bill_type" placeholder="请选择" clearable>
                         <el-option  label="不需要发票"  :value="0"></el-option>
@@ -62,13 +66,13 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="领证方式" clearable>
-                    <el-select v-model="form.a" placeholder="请选择">
+                    <el-select v-model="form.receive_card" placeholder="请选择">
                         <el-option  label="邮寄"  :value="1"></el-option>
                         <el-option  label="自取"  :value="0"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="考试设置">
-                    <el-select v-model="form.a" placeholder="请选择" clearable>
+                    <el-select v-model="form.set_exam_time" placeholder="请选择" clearable>
                         <el-option  label="已设置考试时间"  :value="1"></el-option>
                         <el-option  label="未设置考试时间"  :value="0"></el-option>
                     </el-select>
@@ -98,13 +102,10 @@
                     end-placeholder="结束日期">
                     </el-date-picker>
                 </el-form-item>
-                
                 <el-form-item>
-                <el-form-item label="类别">
-                    <Subject @subChange='subChange'/>
-                </el-form-item>
-                       <el-button @click="list=[],getData()" type="primary" icon="el-icon-search">搜索</el-button>
+                       <el-button  @click="list=[],getData()" type="primary" icon="el-icon-search">搜索</el-button>
                 </el-form-item>
+                
                 <el-divider></el-divider>
             </el-form>
             <el-tabs v-model="order_status" @tab-click="tabClick">
@@ -130,10 +131,12 @@
                 <el-divider  direction="vertical"></el-divider>
                 <el-button @click="download('exam')" size="small" type="warning" >导出考勤表与申报考试表</el-button>
                 <el-button @click="download('apply')"  size="small" type="warning" >导出学员申报资料</el-button>
+                <el-divider  direction="vertical"></el-divider>
+                <el-button @click="print" type="primary" size="mini" plain icon="el-icon-printer"></el-button>
         </div>
         <el-table
                 class="table"
-                :data="list"   v-loading="loading"
+                :data="list" v-loading="loading"
                  @selection-change="handleSelectionChange"
                 border 
                 style="width: 100%">
@@ -195,9 +198,9 @@
                 </el-table-column>
         </el-table>
         <Page  ref="pageButton"  :total='total' @pageChange='gopage'/>
-
+        
         <el-dialog
-            :title="text"
+            :title="text" 
             :visible.sync="dialogVisible"
             width="30%">
             <el-date-picker
@@ -360,6 +363,43 @@ export default {
                         
             })
       },
+      print(){
+        var newwindow = window.open("","");
+        var tr='';
+        for(let i=0;i<this.list.length;i++){
+            let item=this.list[i];
+            let status='';
+            // -2:审核未通过,-1:待提交资料，0：待审核，1：已审核立即支付，2：学习中，3：已完成
+            if(item.order_status == -2)status='审核未通过';
+            if(item.order_status == -1)status='待提交资料';
+            if(item.order_status == 0)status='待审核';
+            if(item.order_status == 1)status='已审核立即支付';
+            if(item.order_status == 2)status='学习中';
+            if(item.order_status == 3)status='已完成';
+            tr+=`
+                <tr>
+                    <td>${item.name}</td><td>${item.phone}</td><td>${status}</td>
+                    <td>${item.remark}</td><td>${item.subject_item0}</td>
+                    <td>${item.subject_item1}</td><td>${item.subject_item2}</td><td>${item.train_type}</td>
+                </tr>
+            `
+        }
+        var table=`
+            <style>
+                td{text-align:center;padding:10px 0;color:#666;}
+
+            </style>
+            <table style='border-collapse: collapse;border:none;border-color:#d9d9d9;padding:10px;' border='1' cellspacing='0' cellpadding='0' width='100%'>
+                <thead style="text-align:center;">
+                    <td>姓名</td><td>联系电话</td><td>状态</td><td>管理员备注</td><td>报名类型</td>
+                    <td>作业类别</td><td>准操类型</td><td>培训类型</td>
+                </thead>
+                ${tr}
+            </table>
+        `
+        newwindow.document.write(table);
+        newwindow.window.print();  
+      },
       download(type){
           var ids=[],val=this.ids;
           for(let i=0;i<val.length;i++){

src/views/content/Article.vue

@@ -28,16 +28,16 @@
     <div class="filter">
       <el-form label-width="80px" :inline="true" size="small">
         <el-form-item label="文章标题">
-          <el-input placeholder="请输入文章标题" v-model="form.name"></el-input>
+          <el-input placeholder="请输入文章标题" clearable v-model="form.title"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search">搜索</el-button>
+          <el-button @click="getData" type="primary" icon="el-icon-search">搜索</el-button>
           <el-button @click="$router.push({path:'/addArticle'})" type="primary">新增文章</el-button>
         </el-form-item>
       </el-form>
     </div>
-    <el-table class="table" :data="list" border style="width: 100%">
-      <el-table-column type="selection" fixed="left" width="55"></el-table-column>
+    <el-table class="table" :data="list" border style="width: 100%" v-loading='loading'>
+      <!-- <el-table-column type="selection" fixed="left" width="55"></el-table-column> -->
       <el-table-column prop="title" label="文章标题"></el-table-column>
       <el-table-column prop="ctime" label="创建时间"></el-table-column>
       <el-table-column prop="zip" width="400" label="操作">
@@ -64,15 +64,22 @@ export default {
   },
   data() {
     return {
-      form: { name: "" },
+      form: { title: "" ,page:1,},
       total: 1,
-      list: []
+      list: [],
+      loading:false,
     };
   },
   methods: {
-    gopage() {},
+    gopage(){
+            this.form.page=this.$refs.pageButton.page
+            this.getData()
+    },
     getData() {
-      this.$api.getArticleList().then(res => {
+      this.loading=true
+      let parm=this.form
+      this.$api.getArticleList(parm).then(res => {
+        this.loading=false
         if (res.status == 200) {
           this.list = res.data.data.list;
           this.total = res.data.data.total;

src/views/content/Index.vue

@@ -1,7 +1,9 @@
 <style lang="scss">
 .apply {
   .filter {
-    // height: 20px;
+    background: #fff;
+    padding: 10px;
+    margin: 10px 0;
   }
 }
 </style>
@@ -9,10 +11,10 @@
   <section class="apply">
     <p>内容管理 > 栏目管理</p>
     <div class="filter">
-      <el-button @click="$router.push({path:'/addContent'})" type="primary">新增栏目</el-button>
+      <el-button size="small" @click="$router.push({path:'/addContent'})" type="primary">新增栏目</el-button>
     </div>
-    <el-table class="table" :data="list" border style="width: 100%">
-      <el-table-column type="selection" width="55"></el-table-column>
+    <el-table class="table" :data="list" border style="width: 100%" v-loading='loading'>
+      <!-- <el-table-column type="selection" width="55"></el-table-column> -->
       <el-table-column prop="name" label="栏目名称"></el-table-column>
       <el-table-column prop="ctime" label="创建时间"></el-table-column>
       <el-table-column prop="operation" width="200" label="操作">
@@ -39,13 +41,20 @@ export default {
   data() {
     return {
       total: 1,
-      list: []
+      list: [],
+      loading:false,
+      page:1
     };
   },
   methods: {
-    gopage() {},
+    gopage(){
+            this.page=this.$refs.pageButton.page
+            this.getData()
+    },
     getData() {
-      this.$api.getContentList().then(res => {
+      this.loading=true
+      this.$api.getContentList({page:this.page}).then(res => {
+        this.loading=false
         if (res.status == 200) {
           this.list = res.data.data.list;
           this.total = res.data.data.total;

src/views/content/addArticle.vue

@@ -31,6 +31,32 @@
     height: 178px;
     display: block;
   }
+  .imgs{
+    li{
+      display: inline-block;
+      width: 150px;
+      height: 150px;
+      overflow: hidden;
+      margin: 0 10px;
+    }
+    .up_img{
+      border: 1px dashed #999;
+      border-radius: 4px;
+      font-size: 50px;
+      text-align: center;
+      line-height: 150px;
+      color:#999;
+      position: relative;
+      input{
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        left:0;
+        top: 0;
+        opacity: 0;
+      }
+    }
+  }
 }
 </style>
 <template>
@@ -42,29 +68,35 @@
           <el-input placeholder="标题" v-model="form.title"></el-input>
         </el-form-item>
         <el-form-item label="栏目">
-          <el-input type="name" placeholder="栏目" v-model="form.category_id"></el-input>
+           <el-select v-model="form.category_id" placeholder="请选择" clearable>
+                <el-option v-for="(item,index) in list" :key='index' :label="item.name"  :value="item.id"></el-option>
+            </el-select>
         </el-form-item>
         <el-form-item label="详情">
           <fuEditor v-model="form.content" :isClear="isClear" @change="change"></fuEditor>
         </el-form-item>
         <el-form-item label="多图上传">
-          <el-upload
-            class="avatar-uploader"
-            action="https://jsonplaceholder.typicode.com/posts/"
-            :show-file-list="false"
-            :on-success="handleAvatarSuccess"
-            :before-upload="beforeAvatarUpload"
-          >
-            <img v-if="imageUrl" :src="imageUrl" class="avatar" />
-            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-          </el-upload>
+          <ul class="imgs">
+            <li v-for="(item,index) in form.imgs" :key='index'>
+                <img width="100%" :src="item" alt="">
+            </li>
+            <li class="up_img">
+              <i class="el-icon-upload"></i>
+              <input type="file" id='upload_img' @change="upload('upload_img')">
+            </li>
+          </ul>
         </el-form-item>
-        <el-form-item label="百度地图定位">
-          <baidu-map class="bm-view" center="成都"></baidu-map>
+        <el-form-item label="设置定位">
+          <baidu-map class="map bm-view" :center="{lng: 116.404, lat: 39.915}" :zoom="15">
+            <bm-marker :position="{lng: 116.404, lat: 39.915}" :dragging="true" animation="BMAP_ANIMATION_BOUNCE">
+              <!-- <bm-label  :labelStyle="{color: 'red', fontSize : '24px'}" :offset="{width: -35, height: 30}"/> -->
+            </bm-marker>
+          </baidu-map>
+          <!-- <baidu-map class="bm-view" center="成都"></baidu-map> -->
         </el-form-item>
 
         <el-form-item label="联系方式">
-          <el-input placeholder="联系方式" v-model="form.title"></el-input>
+          <el-input placeholder="联系方式" v-model="form.phone"></el-input>
         </el-form-item>
         <el-form-item label=" ">
           <el-button type="primary" @click="save">保存</el-button>
@@ -82,9 +114,10 @@ export default {
   data() {
     return {
       test: "",
+      list:[],
       form: {
         title: "",
-        category_id: 1,
+        category_id: '',
         content: "",
         imgs: [],
         address: "",
@@ -99,14 +132,44 @@ export default {
         this.form = res.data.data;
       });
     },
+    getContent(){
+      this.$api.getContentList({page:this.page}).then(res => {
+        this.loading=false
+        if (res.status == 200) {
+          this.list = res.data.data.list;
+        } else {
+          this.$message({
+            message: res.message,
+            type: "error"
+          });
+        }
+      });
+    },
     gopage() {},
     change(val) {
       this.form.content = val;
     },
+    upload(type){
+          var file=document.getElementById(type).files;
+          var data=new FormData();
+            data.append("file",file[0])
+          this.$api.uploadFile(data).then(res=>{
+              if(res.data.code==0){
+                      let imgs=this.form.imgs||[];
+                      imgs.push(res.data.data.url)
+                      this.form.imgs=imgs
+                      // this.$set(form,type,res.data.data.url)
+                      this.$message({message: '上传成功！',type: 'success'});
+                  }else{
+                      this.$message.error(res.data.message);
+                  }
+          })
+      },
     save() {
       var parm = this.form;
+        console.log(parm)
       if (parm.id) {
-        debugger;
+        // debugger;
         this.$api.editArticle(parm).then(res => {
           if (res.data.code == 0) {
             this.$message({ message: "修改成功！", type: "success" });
@@ -128,6 +191,7 @@ export default {
     }
   },
   created() {
+    this.getContent()
     if (this.$route.query.id) {
       this.form.id = this.$route.query.id;
       this.id = this.$route.query.id;

src/views/paper/Index.vue

@@ -37,6 +37,7 @@
                 <el-form-item>
                        <el-button @click="getData" type="primary" icon="el-icon-search">搜索</el-button>
                        <el-button type="primary">新增</el-button>
+                       <el-button @click="dialogVisible=true" type="primary">导入</el-button>
                 </el-form-item>
             </el-form>
         </div>
@@ -78,6 +79,22 @@
                 </el-table-column>
         </el-table>
         <Page  ref="pageButton"  :total='total' @pageChange='gopage'/>
+
+        <el-dialog
+        title="导入试卷" center
+        :visible.sync="dialogVisible"
+        width="40%">
+        <p style="text-align:center;">请先下载模板，按模板格式填写好试题数据然后上传。
+            <a style="color:#409eff;" href="https://www.scxjc.club/paper.xlsx">点击下载模板</a> 
+            <br> <br>
+            <input style="width:160px" id='file' type="file">
+        </p>
+       
+        <span slot="footer" class="dialog-footer">
+            <el-button size="small" @click="dialogVisible = false">取 消</el-button>
+            <el-button size="small" type="primary" @click="upload('file')">确 定</el-button>
+        </span>
+        </el-dialog>
     </section>
 </template>
 <script>
@@ -93,7 +110,8 @@ export default {
       activeName:"1",
       total:1,
       list:[],
-      loading:false
+      loading:false,
+      dialogVisible:false
     }
   },
   methods:{
@@ -112,7 +130,21 @@ export default {
               this.total=res.data.data.total
               this.loading=false
           })
-      }
+      },
+      upload(type){
+          var file=document.getElementById(type).files;
+          var data=new FormData();
+            data.append("file",file[0])
+          this.$api.uploadPaper(data).then(res=>{
+              if(res.data.code==0){
+                      this.dialogVisible=false
+                      this.getData();
+                      this.$message({message: '上传成功！',type: 'success'});
+                  }else{
+                      this.$message.error(res.data.message);
+                  }
+          })
+      },
   },
   created(){
       this.getData()

src/views/system/AddAccount.vue

@@ -24,9 +24,9 @@
           <el-input placeholder="姓名" v-model="form.realname"></el-input>
         </el-form-item>
         <el-form-item label="手机">
-          <el-input placeholder="手机" v-model="form.tel"></el-input>
+          <el-input placeholder="手机" v-model="form.phone"></el-input>
         </el-form-item>
-        <el-form-item label="角色">
+        <!-- <el-form-item label="角色">
           <el-select v-model="form.permissions" placeholder="请选择">
             <el-option
               v-for="item in options"
@@ -35,7 +35,7 @@
               :value="item.value"
             ></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
 
         <el-form-item label="状态">
           <el-radio v-model="form.status" :label="1">激活</el-radio>
@@ -87,7 +87,7 @@ export default {
     save() {
       var parm = this.form;
       if (parm.id) {
-        debugger;
+        // debugger;
         this.$api.editAccount(parm).then(res => {
           if (res.data.code == 0) {
             this.$message({ message: "修改成功！", type: "success" });

src/views/system/Index.vue

@@ -40,7 +40,7 @@
       <el-table-column type="selection" fixed="left" width="55"></el-table-column>
       <el-table-column prop="name" label="账号"></el-table-column>
       <el-table-column prop="realname" label="姓名"></el-table-column>
-      <el-table-column prop="permissions" label="权限"></el-table-column>
+      <!-- <el-table-column prop="permissions" label="权限"></el-table-column> -->
       <el-table-column prop="ctime" label="创建时间"></el-table-column>
       <el-table-column prop="zip" width="300" label="操作">
         <template slot-scope="scope">

src/views/videos/Index.vue

@@ -36,7 +36,7 @@
              
                 <el-form-item>
                        <el-button @click="getData" type="primary" icon="el-icon-search">搜索</el-button>
-                       <el-button type="primary">新增</el-button>
+                       <el-button @click="$router.push({path:'/videos/add'})" type="primary">新增</el-button>
                 </el-form-item>
             </el-form>
         </div>
@@ -107,7 +107,7 @@ export default {
       getData(){
          var parm=this.form;
          this.loading=true
-          this.$api.getPaperList(parm).then(res=>{
+          this.$api.getVideoList(parm).then(res=>{
               this.list=res.data.data.list
               this.total=res.data.data.total
               this.loading=false