tanyanfei 5 лет назад
Родитель
Сommit
d31c19fc28

+ 49 - 3
src/api.js

@@ -53,8 +53,11 @@ export default {
 	logout: params => {
 		return axios.post(`${baseURL}/api/account/logout`, params);
 	},
+	getInfo: params => {
+		return axios.get(`${baseURL}/api/account/info`)
+	},
 	uploadFile: params => {
-		return axios.post(`${baseURL}/api/account/uploadfile`, params);
+		return axios.post(`${baseURL}/api/admin/uploadfile`, params);
 	},
 	//获取验证码
 	getCode: params => {
@@ -93,13 +96,56 @@ export default {
 	deleteSign: params => {
 		return axios.delete(`${baseURL}/api/admin/signup/upstate`, {params:params});
 	},
+	downloadzip: params => {
+		return axios.get(`${baseURL}/api/admin/signup/downloadzip`, {
+			params: params
+		})
+	},
+	
 	//班级
 	getClass: params => {
-		return axios.get(`${baseURL}/api/admin/class/list `, {
+		return axios.get(`${baseURL}/api/admin/class/list`, {
+			params: params
+		})
+	},
+	getaClass: params => {
+		return axios.get(`${baseURL}/api/admin/class`, {
+			params: params
+		})
+	},
+	saveClass: params => {
+		return axios.post(`${baseURL}/api/admin/class`, params);
+	},
+	putClass: params => {
+		return axios.put(`${baseURL}/api/admin/class`, params);
+	},
+	deleteClass: params => {
+		return axios.delete(`${baseURL}/api/admin/class`, {
+			params: params
+		})
+	},
+	//用户管理
+	getUserList: params => {
+		return axios.get(`${baseURL}/api/admin/user/list`, {
+			params: params
+		})
+	},
+	getUser: params => {
+		return axios.get(`${baseURL}/api/admin/user`, {
+			params: params
+		})
+	},
+	//试卷
+	getPaperList: params => {
+		return axios.get(`${baseURL}/api/admin/paper/list`, {
+			params: params
+		})
+	},
+	getPaper: params => {
+		return axios.get(`${baseURL}/api/admin/paper`, {
 			params: params
 		})
 	},
-	
 	
 	// 内容管理
 	// 栏目列表

+ 1 - 1
src/components/Page.vue

@@ -14,7 +14,7 @@
 <template>
     <el-pagination
     @current-change="getData"
-    background :page-size='10'
+    background :page-size='20'
     layout="total,prev, pager, next"
     :total="total">
     </el-pagination>

+ 24 - 5
src/components/Subject.vue

@@ -7,7 +7,11 @@
     }
 </style>
 <template>
-    <el-cascader  class="sub" :props='props' clearable
+    <el-cascader v-if='value' class="sub" :props='props' clearable
+    placeholder="请选择培训科目 / 作业类别 / 准操项目"
+    v-model="value1" @change="handleChange"
+    :options="data"></el-cascader>
+    <el-cascader v-else class="sub" :props='props1' clearable
     placeholder="请选择培训科目 / 作业类别 / 准操项目"
     v-model="value1" @change="handleChange"
     :options="data"></el-cascader>
@@ -19,6 +23,11 @@ export default {
             data:[],
             value1:[],
             props:{
+                label:'name',
+                checkStrictly:true,
+                value:'id'
+            },
+            props1:{
                 label:'name',
                 checkStrictly:true,
                 value:'name'
@@ -27,6 +36,7 @@ export default {
     },
     props: {
         value:'',
+        subvalue:''
     },
     methods:{
         getData(type){
@@ -35,16 +45,25 @@ export default {
           })
         },
         handleChange(value) {
-            console.log(value);
-            this.$emit('subChange',value)
+            var id='';
+            if(value.length>=3){
+                var item1=this.data.filter(item=>item.name==value[0]),
+                    item2=item1[0].children.filter(item=>item.name==value[1]),
+                    item3=item2[0].children.filter(item=>item.name==value[2])
+                    id=item3[0].id
+            }
+            this.$emit('subChange',value,id)
         }
     },
     created(){
         this.getData()
         if(this.value){
-            this.value1=this.value.split('|')
-            console.log(this.value1)
+            this.value1=this.value   
+        }
+        if(this.subvalue){
+            this.value1=this.subvalue.split('|')
         }
+        console.log(this.value1)
     }
 }
 </script>

+ 11 - 0
src/router.js

@@ -84,6 +84,12 @@ export default new Router({
           component: () => import('./views/paper/Index.vue'),
           name: '试卷管理'
         },
+        {
+          path: '/papers/detail',
+          hide:1,
+          component: () => import('./views/paper/Detail.vue'),
+          name: '试卷详情'
+        },
         {
           path: '/videos',
           component: () => import('./views/videos/Index.vue'),
@@ -108,6 +114,11 @@ export default new Router({
         path: '/user',
         component: () => import('./views/user/Index.vue'),
         name: '用户列表'
+      }, {
+        path: '/user/detail',
+        hide:1,
+        component: () => import('./views/user/Detail.vue'),
+        name: '新增用户'
       }, ]
     },
     {

+ 7 - 1
src/views/Home.vue

@@ -17,7 +17,7 @@
 			<div class="settings">
 				<span>
 					<!-- <img width="16" src="../images/msg.png" alt="">  -->
-					</span>
+					{{info.name}}</span>
         <span @click="logout">退出登录</span>
 			</div>
 		</el-header>
@@ -72,11 +72,17 @@ export default {
 			this.$api.logout().then(res=>{
 				this.$router.push({path:'/login'})
 			})
+		},
+		getData(){
+			this.$api.getInfo().then(res=>{
+				this.info=res.data.data
+			})
 		}
 	},
 	$route(to){
     },
 	created(){
+		this.getData()
 		// if(this.$route.path.indexOf('add')>=0){
 		// 	this.path=this.$route.path.split('/add')[0]
 		// }else if(this.$route.path.indexOf('edit')>=0){

+ 93 - 22
src/views/apply/Change.vue

@@ -40,10 +40,6 @@
         <p>报名信息  >  换证</p>
         <div class="filter">
             <el-form label-width="80px" :inline="true">
-                <el-form-item label="类别">
-                    <Subject @subChange='subChange'/>
-                </el-form-item>
-                <br>
                 <!-- <el-divider></el-divider> -->
                 <el-form-item label="姓名">
                         <el-input placeholder="姓名" v-model="form.name"></el-input>
@@ -54,7 +50,7 @@
                 <el-form-item label="报名时间">
                     <el-date-picker clearable
                     v-model="form.signup_time"
-                    type="date"
+                    type="date" value-format="yyyy-MM-dd"
                     placeholder="选择日期">
                     </el-date-picker>
                 </el-form-item>
@@ -79,7 +75,7 @@
                 </el-form-item>
                 <el-form-item label="考试时间" >
                     <el-date-picker clearable
-                    v-model="form.exam_time"
+                    v-model="form.exam_time" value-format="yyyy-MM-dd"
                     type="date"
                     placeholder="选择日期">
                     </el-date-picker>
@@ -90,17 +86,23 @@
                         <el-option  label="纸质发票"  :value="0"></el-option>
                     </el-select>
                 </el-form-item> -->
+                <el-form-item label="公司名称">
+                        <el-input placeholder="公司名称" v-model="form.company"></el-input>
+                </el-form-item>
                 <el-form-item label="培训时间">
                     <el-date-picker clearable
                     v-model="form.train_time"
-                    type="date"
-                    placeholder="选择日期">
+                    type="daterange" value-format="yyyy-MM-dd"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期">
                     </el-date-picker>
                 </el-form-item>
-                <!-- <el-form-item label="公司名称">
-                        <el-input placeholder="公司名称" v-model="form.name"></el-input>
-                </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-form-item>
                 <el-divider></el-divider>
@@ -123,13 +125,12 @@
                 <el-button @click="setStatus(2,'已付款')" size="small" type="primary" >已付款</el-button>
                 <el-button @click="setStatus(3,'已培训')"  size="small" type="danger" >已培训</el-button>
                 <el-button @click="setStatus(4,'考试完成')" size="small" type="success" >考试完成</el-button>
-                <el-button size="small" type="primary" >设置培训时间</el-button>
-                <el-button size="small" type="primary" >设置考试时间</el-button>
+                <el-button @click="setTime(1)" size="small" type="primary" >设置培训时间</el-button>
+                <el-button @click="setTime(2)" size="small" type="primary" >设置考试时间</el-button>
                 <el-divider  direction="vertical"></el-divider>
-                <el-button size="small" type="warning" >导出考勤表与申报考试表</el-button>
-                <el-button size="small" type="warning" >导出学员申报资料</el-button>
+                <el-button @click="download('exam')" size="small" type="warning" >导出考勤表与申报考试表</el-button>
+                <el-button @click="download('apply')"  size="small" type="warning" >导出学员申报资料</el-button>
         </div>
-
         <el-table
                 class="table"
                 :data="list"
@@ -194,6 +195,27 @@
                 </el-table-column>
         </el-table>
         <Page  ref="pageButton"  :total='total' @pageChange='gopage'/>
+
+        <el-dialog
+            :title="text"
+            :visible.sync="dialogVisible"
+            width="30%">
+            <el-date-picker
+            v-model="time" v-if='date_type == 1'
+            type="daterange" value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+            </el-date-picker>
+            <el-date-picker
+            v-model="time" v-else
+            type="date" value-format="yyyy-MM-dd">
+            </el-date-picker>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="save">确 定</el-button>
+            </span>
+        </el-dialog>
     </section>
 </template>
 <script>
@@ -206,20 +228,27 @@ export default {
     },
   data(){
     return{
-      form:{train_type:'换证',subject_item:'',order_status:''},
+      text:'批量设置培训时间',
+      date_type:1,
+      time:'',
+      form:{train_type:'换证',subject_item:'',order_status:'',page:1},
       activeName:"1",
       total:1,
       list:[],
       order_status:'-3',
-      ids:[]
+      ids:[],
+      dialogVisible:false,
+      url:''
     }
   },
   methods:{
-      gopage(){},
+      gopage(){
+            this.form.page=this.$refs.pageButton.page
+            this.getData()
+        },
       getData(){
           var parm=this.form;
           if(this.order_status != '-3'){parm.order_status=this.order_status}
-          console.log(parm)
           this.$api.getSignList(parm).then(res=>{
               this.list=res.data.data.list
               this.total=res.data.data.total
@@ -288,17 +317,59 @@ export default {
             this.$message.error('请选择数据');
         }
       },
-      setTime(text){
+      setTime(type){
           var ids=[],val=this.ids;
           for(let i=0;i<val.length;i++){
               ids.push(val[i].id)
           }
           var id = ids.join(',');
+          this.select_ids=id;
         if(val.length>0){
-            
+            this.date_type=type
+            if(type == 1){
+                this.text='批量设置培训时间'
+            }else{
+                this.text='批量设置考试时间'
+            }
+            this.dialogVisible=true;
         }else{
             this.$message.error('请选择数据');
         }
+      },
+      save(){
+          var parm={id:this.select_ids}
+          if(this.date_type == 1){
+              parm.train_time=this.time.join(',')
+          }else{
+              parm.exam_time=this.time
+          }
+           this.$api.updateSign(parm).then((res)=>{
+                    if(res.data.code == 0){
+                        this.$message({
+                            message: '修改成功',
+                            type: 'success'
+                        })
+                        this.dialogVisible=false
+                        this.getData()
+                    }else{
+                        this.$message.error(res.data.message);
+                    }
+                        
+            })
+      },
+      download(type){
+          var ids=[],val=this.ids;
+          for(let i=0;i<val.length;i++){
+              ids.push(val[i].id)
+          }
+          var id = ids.join(',');
+          var parm={
+              id:id,
+              type:type
+          }
+          this.$api.downloadzip(parm).then(res=>{
+              console.log(res.data)          
+          })
       }
   },
   created(){

+ 10 - 5
src/views/apply/Detail.vue

@@ -32,6 +32,9 @@
             }
             .title{
                 font-weight: 600;
+                span{
+                    color:#fff;
+                }
             }
         }
         div{
@@ -56,7 +59,7 @@
         <p>报名信息  >  报名详情 </p>
         <div class="detail" v-if='form.id'>   
            <ul>
-               <li class="title">报名信息</li>
+               <li class="title">报名信息 <el-tag size="mini" effect="dark">报</el-tag></li>
                <li class="status">
                    报名状态  
                     <el-tag v-if='form.order_status == -2' type="info">审核未通过</el-tag>
@@ -106,7 +109,7 @@
            </ul>
            <div>
                 <ul style="height:390px">
-                    <li class="title">证件信息</li>
+                    <li class="title">证件信息 <el-tag size="mini" type="warning" effect="dark">证</el-tag></li>
                     <li>
                         领证时间  <span>{{form.get_card_time}}</span>
                     </li>
@@ -124,15 +127,17 @@
                     </li>
                 </ul>
                 <ul style="height:390px">
-                    <li class="title">订单详情</li>
+                    <li class="title">订单详情 <el-tag size="mini" type="success" effect="dark">订</el-tag></li>
                     <li>
                         订单编号  <span>{{form.order_no}}</span>
                     </li>
                     <li>
                         下单时间  <span>{{form.order_time}}</span>
                     </li>
-                    <li>
-                        支付状态  <span>{{form.pay_status}}</span>
+                    <li class="status">
+                        支付状态 
+                        <el-tag v-if='form.pay_status' type="success">已支付</el-tag>
+                        <el-tag v-else type="danger">未支付</el-tag>
                     </li>
                     <li>
                         订单总额  <span>{{form.price}}</span>

+ 42 - 5
src/views/apply/Edit.vue

@@ -1,5 +1,8 @@
 <style lang="scss">
     .edit{
+        button{
+            position: relative;
+        }
         .el-input{
             width: 300px;
             position: relative;
@@ -15,6 +18,14 @@
             font-weight: 600;
             padding-right: 40px;
         }
+        input[type='file']{
+            position: absolute;
+            width: 100%;
+            height: 100%;
+            left: 0;
+            top: 0;
+            opacity: 0;
+        }
     }
 </style>
 <template>
@@ -24,7 +35,7 @@
             <el-form label-width="110px">
                 <el-form-item label="报名身份" v-if="form.subject_item">
                     <span v-show="form.subject_item" class="gou">✓</span>
-                    <Subject :value='form.subject_item' @subChange='subChange'/>
+                    <Subject :value='form.subject_ids' @subChange='subChange'/>
                 </el-form-item>
                 <el-form-item label="姓名">
                          <span v-show="form.name" class="gou">✓</span>
@@ -84,16 +95,28 @@
                 </el-form-item>
                 
                 <el-form-item label="正面照">
-                        <el-button type="warning">上传</el-button>
+                        <template  v-if="form.idnoimg_face" >
+                            <img width="150" :src="form.idnoimg_face" alt=""> <br>
+                        </template>
+                        <el-button type="warning">上传 <input @change="upload('idnoimg_face')" id='idnoimg_face' type="file"> </el-button>
                 </el-form-item>
                 <el-form-item label="反面照">
-                        <el-button type="warning">上传</el-button>
+                    <template  v-if="form.idnoimg_back" >
+                        <img width="150" :src="form.idnoimg_back" alt=""> <br>
+                    </template>
+                        <el-button type="warning">上传 <input @change="upload('idnoimg_back')" id='idnoimg_back' type="file"> </el-button>
                 </el-form-item>
                 <el-form-item label="上半身照">
-                        <el-button type="warning">上传</el-button>
+                        <template  v-if="form.halfbody_img" >
+                            <img width="150" :src="form.halfbody_img" alt=""> <br>
+                        </template>
+                        <el-button type="warning">上传 <input @change="upload('halfbody_img')" id='halfbody_img' type="file"> </el-button>
                 </el-form-item>
                 <el-form-item label="学历照">
-                        <el-button type="warning">上传</el-button>
+                        <template  v-if="form.education_img" >
+                            <img width="150" :src="form.education_img" alt=""> <br>
+                        </template>
+                        <el-button type="warning">上传 <input @change="upload('education_img')" id='education_img' type="file"> </el-button>
                 </el-form-item>
                 <el-form-item label=" " >
                         <el-button @click="save" style="width:300px" type="primary">保存</el-button>
@@ -124,6 +147,20 @@ export default {
       subChange(data){
           this.form.subject_item=data.join('|')
       },
+      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 form=this.form;
+                      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
           this.$api.updateSign(parm).then(res=>{

+ 93 - 22
src/views/apply/New.vue

@@ -40,10 +40,6 @@
         <p>报名信息  >  新办</p>
         <div class="filter">
             <el-form label-width="80px" :inline="true">
-                <el-form-item label="类别">
-                    <Subject @subChange='subChange'/>
-                </el-form-item>
-                <br>
                 <!-- <el-divider></el-divider> -->
                 <el-form-item label="姓名">
                         <el-input placeholder="姓名" v-model="form.name"></el-input>
@@ -54,7 +50,7 @@
                 <el-form-item label="报名时间">
                     <el-date-picker clearable
                     v-model="form.signup_time"
-                    type="date"
+                    type="date" value-format="yyyy-MM-dd"
                     placeholder="选择日期">
                     </el-date-picker>
                 </el-form-item>
@@ -79,7 +75,7 @@
                 </el-form-item>
                 <el-form-item label="考试时间" >
                     <el-date-picker clearable
-                    v-model="form.exam_time"
+                    v-model="form.exam_time" value-format="yyyy-MM-dd"
                     type="date"
                     placeholder="选择日期">
                     </el-date-picker>
@@ -90,17 +86,23 @@
                         <el-option  label="纸质发票"  :value="0"></el-option>
                     </el-select>
                 </el-form-item> -->
+                <el-form-item label="公司名称">
+                        <el-input placeholder="公司名称" v-model="form.company"></el-input>
+                </el-form-item>
                 <el-form-item label="培训时间">
                     <el-date-picker clearable
                     v-model="form.train_time"
-                    type="date"
-                    placeholder="选择日期">
+                    type="daterange" value-format="yyyy-MM-dd"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期">
                     </el-date-picker>
                 </el-form-item>
-                <!-- <el-form-item label="公司名称">
-                        <el-input placeholder="公司名称" v-model="form.name"></el-input>
-                </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-form-item>
                 <el-divider></el-divider>
@@ -123,13 +125,12 @@
                 <el-button @click="setStatus(2,'已付款')" size="small" type="primary" >已付款</el-button>
                 <el-button @click="setStatus(3,'已培训')"  size="small" type="danger" >已培训</el-button>
                 <el-button @click="setStatus(4,'考试完成')" size="small" type="success" >考试完成</el-button>
-                <el-button size="small" type="primary" >设置培训时间</el-button>
-                <el-button size="small" type="primary" >设置考试时间</el-button>
+                <el-button @click="setTime(1)" size="small" type="primary" >设置培训时间</el-button>
+                <el-button @click="setTime(2)" size="small" type="primary" >设置考试时间</el-button>
                 <el-divider  direction="vertical"></el-divider>
-                <el-button size="small" type="warning" >导出考勤表与申报考试表</el-button>
-                <el-button size="small" type="warning" >导出学员申报资料</el-button>
+                <el-button @click="download('exam')" size="small" type="warning" >导出考勤表与申报考试表</el-button>
+                <el-button @click="download('apply')"  size="small" type="warning" >导出学员申报资料</el-button>
         </div>
-
         <el-table
                 class="table"
                 :data="list"
@@ -194,6 +195,27 @@
                 </el-table-column>
         </el-table>
         <Page  ref="pageButton"  :total='total' @pageChange='gopage'/>
+
+        <el-dialog
+            :title="text"
+            :visible.sync="dialogVisible"
+            width="30%">
+            <el-date-picker
+            v-model="time" v-if='date_type == 1'
+            type="daterange" value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+            </el-date-picker>
+            <el-date-picker
+            v-model="time" v-else
+            type="date" value-format="yyyy-MM-dd">
+            </el-date-picker>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="save">确 定</el-button>
+            </span>
+        </el-dialog>
     </section>
 </template>
 <script>
@@ -206,20 +228,27 @@ export default {
     },
   data(){
     return{
-      form:{train_type:'新办',subject_item:'',order_status:''},
+      text:'批量设置培训时间',
+      date_type:1,
+      time:'',
+      form:{train_type:'新办',subject_item:'',order_status:'',page:1},
       activeName:"1",
       total:1,
       list:[],
       order_status:'-3',
-      ids:[]
+      ids:[],
+      dialogVisible:false,
+      url:''
     }
   },
   methods:{
-      gopage(){},
+      gopage(){
+            this.form.page=this.$refs.pageButton.page
+            this.getData()
+        },
       getData(){
           var parm=this.form;
           if(this.order_status != '-3'){parm.order_status=this.order_status}
-          console.log(parm)
           this.$api.getSignList(parm).then(res=>{
               this.list=res.data.data.list
               this.total=res.data.data.total
@@ -288,17 +317,59 @@ export default {
             this.$message.error('请选择数据');
         }
       },
-      setTime(text){
+      setTime(type){
           var ids=[],val=this.ids;
           for(let i=0;i<val.length;i++){
               ids.push(val[i].id)
           }
           var id = ids.join(',');
+          this.select_ids=id;
         if(val.length>0){
-            
+            this.date_type=type
+            if(type == 1){
+                this.text='批量设置培训时间'
+            }else{
+                this.text='批量设置考试时间'
+            }
+            this.dialogVisible=true;
         }else{
             this.$message.error('请选择数据');
         }
+      },
+      save(){
+          var parm={id:this.select_ids}
+          if(this.date_type == 1){
+              parm.train_time=this.time.join(',')
+          }else{
+              parm.exam_time=this.time
+          }
+           this.$api.updateSign(parm).then((res)=>{
+                    if(res.data.code == 0){
+                        this.$message({
+                            message: '修改成功',
+                            type: 'success'
+                        })
+                        this.dialogVisible=false
+                        this.getData()
+                    }else{
+                        this.$message.error(res.data.message);
+                    }
+                        
+            })
+      },
+      download(type){
+          var ids=[],val=this.ids;
+          for(let i=0;i<val.length;i++){
+              ids.push(val[i].id)
+          }
+          var id = ids.join(',');
+          var parm={
+              id:id,
+              type:type
+          }
+          this.$api.downloadzip(parm).then(res=>{
+              console.log(res.data)          
+          })
       }
   },
   created(){

+ 93 - 22
src/views/apply/Update.vue

@@ -40,10 +40,6 @@
         <p>报名信息  >  复审</p>
         <div class="filter">
             <el-form label-width="80px" :inline="true">
-                <el-form-item label="类别">
-                    <Subject @subChange='subChange'/>
-                </el-form-item>
-                <br>
                 <!-- <el-divider></el-divider> -->
                 <el-form-item label="姓名">
                         <el-input placeholder="姓名" v-model="form.name"></el-input>
@@ -54,7 +50,7 @@
                 <el-form-item label="报名时间">
                     <el-date-picker clearable
                     v-model="form.signup_time"
-                    type="date"
+                    type="date" value-format="yyyy-MM-dd"
                     placeholder="选择日期">
                     </el-date-picker>
                 </el-form-item>
@@ -79,7 +75,7 @@
                 </el-form-item>
                 <el-form-item label="考试时间" >
                     <el-date-picker clearable
-                    v-model="form.exam_time"
+                    v-model="form.exam_time" value-format="yyyy-MM-dd"
                     type="date"
                     placeholder="选择日期">
                     </el-date-picker>
@@ -90,17 +86,23 @@
                         <el-option  label="纸质发票"  :value="0"></el-option>
                     </el-select>
                 </el-form-item> -->
+                <el-form-item label="公司名称">
+                        <el-input placeholder="公司名称" v-model="form.company"></el-input>
+                </el-form-item>
                 <el-form-item label="培训时间">
                     <el-date-picker clearable
                     v-model="form.train_time"
-                    type="date"
-                    placeholder="选择日期">
+                    type="daterange" value-format="yyyy-MM-dd"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期">
                     </el-date-picker>
                 </el-form-item>
-                <!-- <el-form-item label="公司名称">
-                        <el-input placeholder="公司名称" v-model="form.name"></el-input>
-                </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-form-item>
                 <el-divider></el-divider>
@@ -123,13 +125,12 @@
                 <el-button @click="setStatus(2,'已付款')" size="small" type="primary" >已付款</el-button>
                 <el-button @click="setStatus(3,'已培训')"  size="small" type="danger" >已培训</el-button>
                 <el-button @click="setStatus(4,'考试完成')" size="small" type="success" >考试完成</el-button>
-                <el-button size="small" type="primary" >设置培训时间</el-button>
-                <el-button size="small" type="primary" >设置考试时间</el-button>
+                <el-button @click="setTime(1)" size="small" type="primary" >设置培训时间</el-button>
+                <el-button @click="setTime(2)" size="small" type="primary" >设置考试时间</el-button>
                 <el-divider  direction="vertical"></el-divider>
-                <el-button size="small" type="warning" >导出考勤表与申报考试表</el-button>
-                <el-button size="small" type="warning" >导出学员申报资料</el-button>
+                <el-button @click="download('exam')" size="small" type="warning" >导出考勤表与申报考试表</el-button>
+                <el-button @click="download('apply')"  size="small" type="warning" >导出学员申报资料</el-button>
         </div>
-
         <el-table
                 class="table"
                 :data="list"
@@ -194,6 +195,27 @@
                 </el-table-column>
         </el-table>
         <Page  ref="pageButton"  :total='total' @pageChange='gopage'/>
+
+        <el-dialog
+            :title="text"
+            :visible.sync="dialogVisible"
+            width="30%">
+            <el-date-picker
+            v-model="time" v-if='date_type == 1'
+            type="daterange" value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+            </el-date-picker>
+            <el-date-picker
+            v-model="time" v-else
+            type="date" value-format="yyyy-MM-dd">
+            </el-date-picker>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="save">确 定</el-button>
+            </span>
+        </el-dialog>
     </section>
 </template>
 <script>
@@ -206,20 +228,27 @@ export default {
     },
   data(){
     return{
-      form:{train_type:'复审',subject_item:'',order_status:''},
+      text:'批量设置培训时间',
+      date_type:1,
+      time:'',
+      form:{train_type:'复审',subject_item:'',order_status:'',page:1},
       activeName:"1",
       total:1,
       list:[],
       order_status:'-3',
-      ids:[]
+      ids:[],
+      dialogVisible:false,
+      url:''
     }
   },
   methods:{
-      gopage(){},
+      gopage(){
+            this.form.page=this.$refs.pageButton.page
+            this.getData()
+        },
       getData(){
           var parm=this.form;
           if(this.order_status != '-3'){parm.order_status=this.order_status}
-          console.log(parm)
           this.$api.getSignList(parm).then(res=>{
               this.list=res.data.data.list
               this.total=res.data.data.total
@@ -288,17 +317,59 @@ export default {
             this.$message.error('请选择数据');
         }
       },
-      setTime(text){
+      setTime(type){
           var ids=[],val=this.ids;
           for(let i=0;i<val.length;i++){
               ids.push(val[i].id)
           }
           var id = ids.join(',');
+          this.select_ids=id;
         if(val.length>0){
-            
+            this.date_type=type
+            if(type == 1){
+                this.text='批量设置培训时间'
+            }else{
+                this.text='批量设置考试时间'
+            }
+            this.dialogVisible=true;
         }else{
             this.$message.error('请选择数据');
         }
+      },
+      save(){
+          var parm={id:this.select_ids}
+          if(this.date_type == 1){
+              parm.train_time=this.time.join(',')
+          }else{
+              parm.exam_time=this.time
+          }
+           this.$api.updateSign(parm).then((res)=>{
+                    if(res.data.code == 0){
+                        this.$message({
+                            message: '修改成功',
+                            type: 'success'
+                        })
+                        this.dialogVisible=false
+                        this.getData()
+                    }else{
+                        this.$message.error(res.data.message);
+                    }
+                        
+            })
+      },
+      download(type){
+          var ids=[],val=this.ids;
+          for(let i=0;i<val.length;i++){
+              ids.push(val[i].id)
+          }
+          var id = ids.join(',');
+          var parm={
+              id:id,
+              type:type
+          }
+          this.$api.downloadzip(parm).then(res=>{
+              console.log(res.data)          
+          })
       }
   },
   created(){

+ 51 - 27
src/views/classes/Add.vue

@@ -1,63 +1,87 @@
 <style lang="scss">
-    .add{
+    .addclass{
         .el-input,button{
-            width: 300px;
+            width: 500px;
         }
     }
 </style>
 <template>
-    <section class="add">
+    <section class="addclass">
         <p>培训计划  >  班级管理  >  新增班级</p>
         <div class="content">
             <el-form label-width="80px">
-                <el-form-item label="培训项目">
-                    <el-select v-model="form.a" placeholder="请选择">
-                        <el-option  label="不需要发票"  :value="0"></el-option>
-                        <el-option  label="纸质发票"  :value="0"></el-option>
-                    </el-select>
+                <el-form-item label="培训项目" v-if="id">
+                    <Subject v-if='form.signup_limit' :subvalue='form.subject_item' @subChange='subChange'/>
                 </el-form-item>
-                <el-form-item label="作业类别">
-                    <el-select v-model="form.a" placeholder="请选择">
-                        <el-option  label="不需要发票"  :value="0"></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="请选择">
-                        <el-option  label="不需要发票"  :value="0"></el-option>
-                        <el-option  label="纸质发票"  :value="0"></el-option>
-                    </el-select>
+                <el-form-item label="培训项目" v-else>
+                    <Subject @subChange='subChange'/>
                 </el-form-item>
                 <el-form-item label="班级名称">
                         <el-input placeholder="班级名称" v-model="form.name"></el-input>
                 </el-form-item>
                 <el-form-item label="计划人数">
-                        <el-input placeholder="计划人数" v-model="form.name"></el-input>
+                        <el-input placeholder="计划人数" v-model="form.signup_limit"></el-input>
                 </el-form-item>
                 <el-form-item label="备注">
-                        <el-input placeholder="备注" v-model="form.name"></el-input>
+                        <el-input placeholder="备注" v-model="form.remark"></el-input>
                 </el-form-item>
                 <el-form-item label=" ">
-                        <el-button type="primary">保存</el-button>
+                        <el-button @click="save" type="primary">保存</el-button>
                 </el-form-item>
             </el-form>
         </div>
     </section>
 </template>
 <script>
-
+import Subject from '../../components/Subject';
 export default {
-
+    components:{
+        Subject
+    },
   data(){
     return{
-      form:{name:1,a:''}
+      form:{name:''}
     }
   },
   methods:{
-      gopage(){}
+      getData(){
+          this.$api.getaClass({id:this.form.id}).then(res=>{
+              this.form=res.data.data
+          })
+      },
+      subChange(data,id){
+          this.form.subject_id=id
+          this.form.subject_item=data.join('|')
+      },
+      save(){
+          var parm=this.form;
+          if(parm.id){
+              this.$api.putClass(parm).then(res=>{
+                  if(res.data.code==0){
+                      this.$message({message: '修改成功!',type: 'success'});
+                      this.$router.push({path:'/classes'})
+                  }else{
+                      this.$message.error(res.data.message);
+                  }
+              })
+          }else{
+              this.$api.saveClass(parm).then(res=>{
+                  if(res.data.code==0){
+                      this.$message({message: '添加成功!',type: 'success'});
+                      this.$router.push({path:'/classes'})
+                  }else{
+                      this.$message.error(res.data.message);
+                  }
+              })
+          }
+      }
   },
   created(){
-  
+      if(this.$route.query.id){
+            this.form.id=this.$route.query.id
+            this.id=this.$route.query.id
+            this.getData()
+        }
   }
 }
 </script>

+ 43 - 37
src/views/classes/Index.vue

@@ -28,30 +28,15 @@
         <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 clearable placeholder="班级名称" v-model="form.name"></el-input>
                 </el-form-item>
-                <el-form-item label="培训项目">
-                    <el-select v-model="form.a" placeholder="请选择">
-                        <el-option  label="不需要发票"  :value="0"></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="请选择">
-                        <el-option  label="邮寄"  :value="0"></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="请选择">
-                        <el-option  label="不需要发票"  :value="0"></el-option>
-                        <el-option  label="纸质发票"  :value="0"></el-option>
-                    </el-select>
+                <el-form-item label="类别">
+                    <Subject @subChange='subChange'/>
                 </el-form-item>
              
                 <el-form-item>
-                       <el-button type="primary" icon="el-icon-search">搜索</el-button>
-                       <el-button type="primary">新增</el-button>
+                       <el-button @click="form.page=1,getData()" type="primary" icon="el-icon-search">搜索</el-button>
+                       <el-button @click="$router.push({path:'/classes/add'})"  type="primary">新增</el-button>
                 </el-form-item>
             </el-form>
         </div>
@@ -62,40 +47,40 @@
                 :data="list"
                 border 
                 style="width: 100%">
-                <el-table-column
+                <!-- <el-table-column
                 type="selection" fixed="left"
                 width="55">
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column
                 prop="name"
                 label="班级名称">
                 </el-table-column>
                 <el-table-column
-                prop="province"
+                prop="subject_item"
                 label="培训项目">
                 </el-table-column>
                 <el-table-column
-                prop="city"
+                prop="signup_limit"
                 label="计划人数">
                 </el-table-column>
                 <el-table-column
-                prop="zip"
+                prop="signuped_count"
                 label="已报名人数">
                 </el-table-column>
                 <el-table-column
-                prop="zip"
+                prop="remark"
                 label="备注">
                 </el-table-column>
                 <el-table-column
-                prop="zip"
+                prop="ctime"  width="200"
                 label="创建时间">
                 </el-table-column>
                 <el-table-column
                 prop="zip"  width="200"
                 label="操作">
-                <template>
-                    <el-button size="mini" type="warning">编辑</el-button>
-                    <el-button size="mini"  type="danger">删除</el-button>
+                <template slot-scope="scope">
+                    <el-button @click="$router.push({path:'/classes/add',query:{id:scope.row.id}})" size="mini" type="warning">编辑</el-button>
+                    <el-button @click="del(scope.row.id)" size="mini"  type="danger">删除</el-button>
                 </template>
                 </el-table-column>
         </el-table>
@@ -104,26 +89,47 @@
 </template>
 <script>
 import Page from '../../components/Page';
-// import { Base64 } from 'js-base64';
+import Subject from '../../components/Subject';
 export default {
   components:{
-        Page
+        Page,Subject
     },
   data(){
     return{
-      form:{name:1,a:''},
+      form:{name:'',page:1},
       activeName:"1",
       total:1,
       list:[]
     }
   },
   methods:{
-      gopage(){},
+      gopage(){
+            this.form.page=this.$refs.pageButton.page
+            this.getData()
+      },
       getData(){
-          this.$api.getClass().then(res=>{
-
+          var parm=this.form;
+          this.$api.getClass(parm).then(res=>{
+              this.list=res.data.data.list
+              this.total=res.data.data.total
           })
-      }
+      },
+      subChange(data){
+          this.form.subject_item=data.join('|')
+      },
+      del(id){
+            this.$confirm('确定删除吗', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                   this.$api.deleteClass({id:id}).then((res)=>{
+                        this.$message({
+                            message: '删除成功',
+                            type: 'success'
+                        })
+                        this.getData()
+                })
+            })
+      },
   },
   created(){
       this.getData()

+ 76 - 0
src/views/paper/Detail.vue

@@ -0,0 +1,76 @@
+<style lang="scss">
+    .paper{
+        h1{
+            text-align: center;
+            font-size: 24px;
+        }
+        .info{
+            text-align: center;
+            padding: 15px;
+            border-bottom: 1px solid #d9d9d9;
+        }
+        .ques{
+            margin: 30px 0;
+            color:#333;
+            h2{
+                font-size: 20px;
+            }
+            p{
+                font-size: 18px;
+                padding: 15px 0;
+            }
+            span{
+                font-size: 16px;
+                display: block;
+            }
+        }
+    }
+</style>
+<template>
+    <section class="paper">
+        <p>在线培训  >  试卷管理 > 试卷详情</p>
+        <div class="content">
+            <h1>{{form.title}}</h1>
+            <p class="info">满分:{{form.total_score}}分   考试时间{{form.total_time}}</p>
+            <div class="ques" v-for="(item,index) in form.questions" :key='index'>
+                <h2>{{item.title}}</h2>
+                <div v-for="(ques,idx) in item.questions" :key='idx+"_"+index'>
+                    <p>{{idx+1}}、{{ques.title}}</p>
+                    <span>
+                        {{ques.options}}
+                    </span>
+                </div>
+            </div>
+        </div>
+    </section>
+</template>
+<script>
+export default {
+  data(){
+    return{
+      form:{}
+    }
+  },
+  methods:{
+      getData(){
+          this.$api.getPaper({id:this.form.id}).then(res=>{
+              this.form=res.data.data
+          })
+      },
+ 
+  
+  },
+  created(){
+      if(this.$route.query.id){
+            this.form.id=this.$route.query.id
+            this.id=this.$route.query.id
+            this.getData()
+        }
+  }
+}
+</script>
+
+
+
+
+

+ 30 - 64
src/views/paper/Index.vue

@@ -28,29 +28,14 @@
         <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="试卷名称" v-model="form.title"></el-input>
                 </el-form-item>
-                <el-form-item label="培训项目">
-                    <el-select v-model="form.a" placeholder="请选择">
-                        <el-option  label="不需要发票"  :value="0"></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="请选择">
-                        <el-option  label="邮寄"  :value="0"></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="请选择">
-                        <el-option  label="不需要发票"  :value="0"></el-option>
-                        <el-option  label="纸质发票"  :value="0"></el-option>
-                    </el-select>
+                <el-form-item label="类别">
+                    <Subject @subChange='subChange'/>
                 </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 type="primary">新增</el-button>
                 </el-form-item>
             </el-form>
@@ -63,38 +48,30 @@
                 border 
                 style="width: 100%">
                 <el-table-column
-                type="selection" fixed="left"
-                width="55">
-                </el-table-column>
-                <el-table-column
-                prop="name"
+                prop="title"
                 label="试卷名称">
                 </el-table-column>
                 <el-table-column
-                prop="province"
+                prop="subject_item"
                 label="培训项目">
                 </el-table-column>
                 <el-table-column
-                prop="city"
-                label="试题">
-                </el-table-column>
-                <el-table-column
-                prop="zip"
+                prop="exam_time"
                 label="考试时间">
                 </el-table-column>
                 <el-table-column
-                prop="zip"
+                prop="total_score"
                 label="满分">
                 </el-table-column>
                 <el-table-column
-                prop="zip"
+                prop="ctime"
                 label="创建时间">
                 </el-table-column>
                 <el-table-column
                 prop="zip" width="250"
                 label="操作">
-                <template>
-                    <el-button size="mini" type="success">查看</el-button>
+                <template slot-scope="scope">
+                    <el-button @click="$router.push({path:'/papers/detail',query:{id:scope.row.id}})"  size="mini" type="success">查看</el-button>
                     <el-button size="mini" type="warning">编辑</el-button>
                     <el-button size="mini"  type="danger">删除</el-button>
                 </template>
@@ -105,48 +82,37 @@
 </template>
 <script>
 import Page from '../../components/Page';
-// import { Base64 } from 'js-base64';
+import Subject from '../../components/Subject';
 export default {
   components:{
-        Page
+        Page,Subject
     },
   data(){
     return{
-      form:{name:1,a:''},
+      form:{name:'',page:1},
       activeName:"1",
       total:1,
-      list:[
-          {
-          date: '2016-05-02',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        },
-        {
-          date: '2016-05-02',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        },{
-          date: '2016-05-02',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }
-      ]
+      list:[]
     }
   },
   methods:{
-      gopage(){}
+      gopage(){
+          this.form.page=this.$refs.pageButton.page
+          this.getData()
+      },
+      subChange(data){
+          this.form.subject_item=data.join('|')
+      },
+      getData(){
+         var parm=this.form;
+          this.$api.getPaperList(parm).then(res=>{
+              this.list=res.data.data.list
+              this.total=res.data.data.total
+          })
+      }
   },
   created(){
-  
+      this.getData()
   }
 }
 </script>

+ 137 - 0
src/views/user/Detail.vue

@@ -0,0 +1,137 @@
+<style lang="scss">
+    .detail{
+        display: flex;
+        justify-content: space-between;
+        margin-top: 20px;
+        
+        ul{
+            width: 32%;
+            background: #fff;
+            padding: 15px;
+            box-shadow:0px 4px 12px 0px rgba(0,0,0,0.12);
+            li{
+                list-style: none;
+                color: #666;
+                margin: 10px 0;
+                font-size: 14px;
+                border-bottom: 1px solid #d9d9d9;
+                padding: 15px 0;
+                &:last-child{
+                    border:none;
+                }
+                span{
+                    float: right;
+                    color: #222;
+                }
+            }
+            .status{
+                span{
+                    position: relative;
+                    top: -10px;
+                }
+            }
+            .title{
+                font-weight: 600;
+                span{
+                    color:#fff;
+                }
+            }
+        }
+        div{
+            width: 67%;
+            display: flex;
+            justify-content: space-between;
+            flex-wrap: wrap;
+            ul{
+                width: 49%;
+                height: 300px;
+                margin-bottom: 15px;
+                overflow: hidden;
+                img{
+                    max-height: 200px;
+                }
+            }
+        }
+    }
+</style>
+<template>
+    <section class="edit">
+        <p>实名认证列表  >  认证详情 </p>
+        <div class="detail" v-if='form.id'>   
+           <ul>
+               <li class="title">认证信息 <el-tag size="mini" effect="dark">证</el-tag></li>   
+               <li>
+                   姓名  <span>{{form.realname}}</span>
+               </li>
+               <li>
+                   性别  <span>{{form.sex}}</span>
+               </li>
+               <li>
+                   身份证号  <span>{{form.idno}}</span>
+               </li>
+               <li>
+                   手机号  <span>{{form.phone}}</span>
+               </li>
+               <li>
+                   学历  <span>{{form.education}}</span>
+               </li>
+               <li>
+                   单位名称  <span>{{form.company}}</span>
+               </li>
+               <li class="status">
+                   状态  <el-tag   type="success">已通过</el-tag>
+               </li>
+           </ul>
+           <div>
+                <ul>
+                    <li class="title">身份证正面照</li>
+                    <img width="100%" :src="form.idnoimg_face" alt="">
+                </ul>
+                <ul>
+                    <li class="title">身份证反面照</li>
+                    <img width="100%" :src="form.idnoimg_back" alt="">
+                </ul>
+                <ul>
+                    <li class="title">半身照</li>
+                    <img width="100%" :src="form.halfbody_img" alt="">
+                </ul>
+                <ul>
+                    <li class="title">学历照</li>
+                    <img width="100%" :src="form.education_img" alt="">
+                </ul>
+           </div>
+        </div>
+    </section>
+</template>
+<script>
+export default {
+
+  data(){
+    return{
+      form:{},
+      radios:1,
+      id:'',
+      edu:["小学", "初中", "高中", "大专", "本科","硕士","博士"]
+    }
+  },
+  methods:{
+      getData(){
+          this.$api.getUser({id:this.id}).then(res=>{
+              this.form=res.data.data
+          })
+      },
+    
+  },
+  created(){
+      if(this.$route.query.id){
+            this.id=this.$route.query.id
+            this.getData()
+        }
+  }
+}
+</script>
+
+
+
+
+

+ 36 - 45
src/views/user/Index.vue

@@ -26,22 +26,22 @@
     <section class="apply">
         <p>用户管理  >  用户列表</p>
         <div class="filter">
-            <el-form label-width="80px" :inline="true" size="small">
+            <el-form label-width="60px" :inline="true" size="small">
                 <el-form-item label="昵称">
-                        <el-input placeholder="昵称" v-model="form.name"></el-input>
+                        <el-input placeholder="昵称" v-model="form.nickname"></el-input>
                 </el-form-item>
                 <el-form-item label="姓名">
-                        <el-input placeholder="姓名" v-model="form.name"></el-input>
+                        <el-input placeholder="姓名" v-model="form.realname"></el-input>
                 </el-form-item>
                 <el-form-item label="手机号">
-                        <el-input placeholder="手机号" v-model="form.name"></el-input>
+                        <el-input placeholder="手机号" v-model="form.phone"></el-input>
+                </el-form-item>
+                <el-form-item label="身份证">
+                        <el-input placeholder="身份证" v-model="form.idno"></el-input>
                 </el-form-item>
-                <!-- <el-form-item label="身份证">
-                        <el-input placeholder="身份证" v-model="form.name"></el-input>
-                </el-form-item> -->
                 <el-form-item>
-                       <el-button type="primary" icon="el-icon-search">搜索</el-button>
-                       <el-button type="primary">新增</el-button>
+                       <el-button  @click="getData" type="primary" icon="el-icon-search">搜索</el-button>
+                       <!-- <el-button type="primary">新增</el-button> -->
                 </el-form-item>
             </el-form>
         </div>
@@ -53,23 +53,28 @@
                 border 
                 style="width: 100%">
                 <el-table-column
-                type="selection"  
-                width="55">
-                </el-table-column>
-                <el-table-column
-                prop="name"
+                prop="nickname"
                 label="昵称">
                 </el-table-column>
                 <el-table-column
-                prop="province"
+                prop="avatar"
                 label="头像">
+                <template slot-scope="scope">
+                  <img width="50" :src="scope.row.avatar" alt="">
+                </template>
                 </el-table-column>
                 <el-table-column
-                prop="city"
+                prop="verify"
                 label="实名认证">
+                <template slot-scope="scope">
+                  <el-tag size="mini" v-if='scope.verify' type="success">已认证</el-tag>
+                  <el-tag size="mini" v-else type="info">未认证</el-tag>
+                  &nbsp;&nbsp;
+                  <el-tag @click="$router.push({path:'/user/detail',query:{id:scope.row.id}})"  size="mini" effect="dark" v-if='scope.verify'>查看</el-tag>
+                </template>
                 </el-table-column>
                 <el-table-column
-                prop="zip"
+                prop="ctime"
                 label="注册时间">
                 </el-table-column>
         </el-table>
@@ -85,41 +90,27 @@ export default {
     },
   data(){
     return{
-      form:{name:1,a:''},
+      form:{name:'',page:1},
       activeName:"1",
       total:1,
-      list:[
-          {
-          date: '2016-05-02',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        },
-        {
-          date: '2016-05-02',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        },{
-          date: '2016-05-02',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }
-      ]
+      list:[]
     }
   },
   methods:{
-      gopage(){}
+      gopage(){
+        this.form.page=this.$refs.pageButton.page
+        this.getData()
+      },
+      getData(){
+         var parm=this.form;
+          this.$api.getUserList(parm).then(res=>{
+              this.list=res.data.data.list
+              this.total=res.data.data.total
+          })
+      }
   },
   created(){
-  
+    this.getData()
   }
 }
 </script>

+ 13 - 27
src/views/videos/Index.vue

@@ -110,38 +110,24 @@ export default {
     },
   data(){
     return{
-      form:{name:1,a1:''},
+      form:{name:'',page:1},
       activeName:"1",
       total:1,
-      list:[
-          {
-          date: '2016-05-02',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        },
-        {
-          date: '2016-05-02',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        },{
-          date: '2016-05-02',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }
-      ]
+      list:[]
     }
   },
   methods:{
-      gopage(){}
+      gopage(){
+          this.form.page=this.$refs.pageButton.page
+          this.getData()
+      },
+      getData(){
+         var parm=this.form;
+          this.$api.getPaperList(parm).then(res=>{
+              this.list=res.data.data.list
+              this.total=res.data.data.total
+          })
+      }
   },
   created(){