begmoon vor 2 Jahren
Ursprung
Commit
498a6b0c85

+ 12 - 1
src/views/baike/Index.vue

@@ -116,6 +116,16 @@
                 @clear="getData"
               ></el-input>
             </el-form-item>
+            <el-form-item label="作者">
+              <el-input
+                v-model="queryBaikeDetailParams.editor"
+                placeholder=""
+                width="200px"
+                size="mini"
+                clearable
+                @clear="getData"
+              ></el-input>
+            </el-form-item>
             <el-form-item label="状态">
               <el-select
                 v-model="queryBaikeDetailParams.status"
@@ -345,8 +355,9 @@ export default {
       });
       if (data && data.id) {
         this.queryBaikeDetailParams.category_id = data.id;
-        this.queryBaikeDetailParams.category_name = data.name;
+        // this.queryBaikeDetailParams.category_name = data.name;
       }
+
       this.$api.getBaikeDetailList(this.queryBaikeDetailParams).then((res) => {
         this.baikeList = res.data.data.list;
         this.total = res.data.data.total;

+ 5 - 4
src/views/comments/consult.vue

@@ -42,7 +42,7 @@ p {
     <el-divider></el-divider>
     <el-form label-width="80px" class="filter-form">
       <el-row>
-        <el-col :span="3">
+        <el-col :span="5">
           <el-form-item label="选手名字">
             <el-input
               clearable
@@ -53,7 +53,7 @@ p {
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="3">
+        <el-col :span="5">
           <el-form-item label="咨询内容">
             <el-input
               clearable
@@ -64,7 +64,7 @@ p {
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="3">
+        <el-col :span="5">
           <el-form-item label="回复状态">
             <el-select
               v-model="queryParams.reply_status"
@@ -83,7 +83,7 @@ p {
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col :span="7">
           <el-form-item style="margin-left: 10px" label-width="10">
             <el-button type="primary" @click="getData" size="mini"
               >筛选</el-button
@@ -536,6 +536,7 @@ export default {
     this.$api.getMatchList().then((res) => {
       this.matchList = res.data.data;
       this.queryParams.match_id = this.matchList[0].id;
+      this.queryParams.reply_status = 0;
       this.getData();
     });
     this.triggerClick();

+ 2 - 2
src/views/data/fundInOut.vue

@@ -15,7 +15,7 @@
     <el-divider></el-divider>
     <el-form label-width="80px" class="filter-form">
       <el-row>
-        <el-col :span="3">
+        <el-col :span="5">
           <el-form-item label="选手名字">
             <el-input
               clearable
@@ -26,7 +26,7 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="3">
+        <el-col :span="6">
           <el-form-item label="持股日期">
             <el-date-picker
               v-model="queryParams.stock_date"

+ 28 - 12
src/views/data/index.vue

@@ -15,19 +15,19 @@
         <el-divider></el-divider>
         <el-form label-width="80px" class="filter-form">
             <el-row>
-                <el-col :span="4">
+                <el-col :span="5">
                     <el-form-item label="比赛名称" prop="match_id">
                         <el-select v-model="queryParams.match_id" placeholder="请选择比赛" size="mini" @change="getData()">
                             <el-option v-for="item in matchList" :key='item.id' :label="item.name" :value="item.id"></el-option>
                         </el-select>
                     </el-form-item>
                 </el-col>
-                <el-col :span="3">
+                <el-col :span="5">
                     <el-form-item label="选手名字">
                         <el-input clearable @clear="getData()" v-model="queryParams.username" placeholder="请输入选手名字/代码" size="mini"></el-input>
                     </el-form-item>
                 </el-col>
-                <el-col :span="3">
+                <el-col :span="5">
                     <el-form-item label="持股日期">
                         <el-date-picker
                         v-model="queryParams.stock_date"
@@ -40,24 +40,32 @@
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
-                <el-col :span="3">
+                <el-col :span="5">
                     <el-form-item label="比赛分组">
                         <el-select clearable @clear="getData()" v-model="queryParams.groupId" placeholder="请选择比赛分组" size="mini" @change="getData()">
                             <el-option v-for="item in groupList" :key='item.id' :label="item.name" :value="item.id"></el-option>
                         </el-select>
                     </el-form-item>
                 </el-col>
-                <el-col :span="3">
+                <!-- <el-col :span="3">
                     <el-form-item label="是否请假">
                         <el-select clearable @clear="getData()" v-model="queryParams.auto_complete" placeholder="请选择" size="mini" @change="getData()">
                             <el-option v-for="item in missDayList" :key='item.id' :label="item.name" :value="item.id"></el-option>
                         </el-select>
                     </el-form-item>
-                </el-col>
+                </el-col> -->
                 <el-col :span="4">
                     <el-form-item style="margin-left:10px;" label-width="10">
                         <el-button type="primary" @click="getData" size="mini">筛选</el-button>
                         <el-button type="normal" @click="queryParams={},getData()" size="mini">重置</el-button>
+                
+                    </el-form-item>
+                </el-col>
+                
+            </el-row>
+            <el-row>
+                <el-col :span="3">
+                    <el-form-item style="margin-left:10px;" label-width="10">
                         <el-button
                         type="primary"
                         plain
@@ -67,29 +75,34 @@
                         >上传数据</el-button>
                     </el-form-item>
                 </el-col>
-                <el-col :span="2">
+                <el-col :span="3">
                     <el-form-item style="margin-left:10px;" label-width="10">
                         <el-button icon="el-icon-download" type="primary" @click="downloadExcel" size="mini">导出Excel</el-button>
                     </el-form-item>
                 </el-col>
-                <el-col :span="2">
+                <!-- <el-col :span="3">
                     <el-form-item style="margin-left:10px;" label-width="10">
                         <el-button icon="el-icon-plus" type="warning" @click="autoCompleteData" size="mini">补全数据</el-button>
                     </el-form-item>
-                </el-col>
-                <el-col :span="2">
+                </el-col> -->
+                <el-col :span="3">
                     <el-form-item style="margin-left:10px;" label-width="10">
                         <el-button icon="el-icon-refresh" type="danger" @click="updateRank" size="mini">刷新排名</el-button>
                     </el-form-item>
                 </el-col>
             </el-row>
-            <el-row :gutter="10">
+            <!-- <el-row :gutter="10">
                 <el-col :span="6"></el-col>
-            </el-row>
+            </el-row> -->
         </el-form>
         <el-table :data="list" height='55vh' style="width: 100%;margin-top:10px;" v-loading='loading'>
                 <el-table-column prop="group_rank" label="排名"/>
                 <el-table-column prop="username" label="选手"/>
+                <el-table-column prop="usercode" label="选手">
+                    <template slot-scope="scope">
+                        <div style="text-decoration:underline" @click="pushPlayer(scope.row.usercode)">{{scope.row.usercode}}</div>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="stock_date" label="持股日期" width="150"/>
                 <!-- <el-table-column prop="auto_complete" label="请假次数" width="100"/> -->
                 <el-table-column prop="init_fund" label="初始资产(万元)"/>
@@ -488,6 +501,9 @@ export default {
                 this.playerList = [];
             }
         },
+        pushPlayer(user_code){
+            this.$router.push({path:'/player',query:{usercode:user_code}})
+        },
 
         /** 提交按钮 */
         submitForm() {

+ 1 - 1
src/views/match/championSay.vue

@@ -16,7 +16,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="4">
-          <el-form-item label="标题">
+          <el-form-item label="分类">
             <el-select v-model="queryParams.category" placeholder="" size="mini" clearable @clear="getData" @change="getData">
               <el-option
                 v-for="item in categoryList"

+ 1 - 1
src/views/signup/index.vue

@@ -22,7 +22,7 @@
                         </el-select>
                     </el-form-item>
                 </el-col>
-                <el-col :span="3">
+                <el-col :span="5">
                     <el-form-item label="选手名字">
                         <el-input clearable @clear="getData()" v-model="queryParams.username" placeholder="选手名字/手机号" size="mini"></el-input>
                     </el-form-item>

+ 2 - 2
src/views/user/index.vue

@@ -178,13 +178,13 @@
           </el-upload>
           <span style="color:red;">尺寸要求100*100</span>
         </el-form-item>
-        <el-form-item label="手机号" prop="phone" v-if="form.player_type==2||form.player_type==3">
+        <!-- <el-form-item label="手机号" prop="phone" v-if="form.player_type==2||form.player_type==3">
           <el-input
             clearable
             v-model="form.phone"
             placeholder="请输入手机号"
           ></el-input>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="徽章">
           <el-select v-model="form.badge" placeholder="请选择徽章">
             <el-option v-for="(item,index) in badgeList" :key="index" :label="item" :value="item"></el-option>