update

src/views/baike/Index.vue

@@ -85,6 +85,10 @@
               <el-input v-model="queryBaikeDetailParams.name" placeholder="" width="200px" size="mini" clearable
                 @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" placeholder="" size="mini" @change="getData"
                 @clear="getData" clearable>
@@ -114,9 +118,11 @@
             <el-table-column prop="ctime" label="创建时间"></el-table-column>
             <el-table-column align="center" prop="date" label="操作" width="200">
               <template slot-scope="scope">
-                <el-button @click="topBaikeDetail(scope.row,'top')" size="mini" type="primary" v-if="scope.row.istop==0">置顶
+                <el-button @click="topBaikeDetail(scope.row,'top')" size="mini" type="primary"
+                  v-if="scope.row.istop==0">置顶
+                </el-button>
+                <el-button @click="topBaikeDetail(scope.row,'cancel')" size="mini" type="primary" v-else>取消置顶
                 </el-button>
-                <el-button @click="topBaikeDetail(scope.row,'cancel')" size="mini" type="primary" v-else>取消置顶</el-button>
                 <el-button @click="openBaikeDetailForm('edit',scope.row)" size="mini" type="warning">编辑</el-button>
                 <el-button @click="delBaikeDetail(scope.row)" size="mini" type="danger">删除</el-button>
               </template>
@@ -215,7 +221,8 @@
               label: "二级 3-2",
             },
           ],
-        }, ],
+        }],
+
         form: {
           parent_id: null,
           is_active: false
@@ -258,8 +265,9 @@
         });
         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;
@@ -273,232 +281,255 @@
           parent_name: data.name,
         };
       },
-      edit(data) {
-        this.dialogVisible = true;
-        this.$api.getBaikeCategoryDetail({
-          id: data.id
-        }).then((res) => {
-          this.catform = res.data.data;
-        });
-      },
-      editDetail(data) {
-        this.show = 1;
-        this.$api.getBaikeDetail({
-          id: data.id
-        }).then((res) => {
-          this.form = res.data.data;
-          this.form.is_active = Boolean(this.form.is_active);
-        });
-      },
-      remove(data) {
-        this.$confirm("确定删除“" + data.name + "”分类？", "提示", {
-          type: "warning",
-        }).then(() => {
-          this.$api.delBaikeCategory({
+      methods: {
+        getData(data) {
+          this.$api.getBaikeCategoryList().then((res) => {
+            this.data = res.data.data;
+          });
+          if (data && data.id) {
+            this.queryBaikeDetailParams.category_id = data.id;
+            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;
+            this.loading = false;
+          });
+        },
+        append(data) {
+          this.dialogVisible = true;
+          this.catform = {
+            parent_id: data.id,
+            parent_name: data.name,
+          };
+        },
+        edit(data) {
+          this.dialogVisible = true;
+          this.$api.getBaikeCategoryDetail({
             id: data.id
           }).then((res) => {
-            this.$message({
-              message: "删除成功！",
-              type: "success"
-            });
-            this.getData();
+            this.catform = res.data.data;
           });
-        });
-      },
-      delBaikeDetail(data) {
-        this.$confirm("确定删除“" + data.name + "”分类？", "提示", {
-          type: "warning",
-        }).then(() => {
-          this.$api.delBaikeDetail({
+        },
+        editDetail(data) {
+          this.show = 1;
+          this.$api.getBaikeDetail({
             id: data.id
           }).then((res) => {
-            this.$message({
-              message: "删除成功！",
-              type: "success"
-            });
-            this.getData();
+            this.form = res.data.data;
+            this.form.is_active = Boolean(this.form.is_active);
           });
-        });
-      },
-      save() {
-        var parm = this.catform;
-        if (parm.password != parm.repassword) {
-          this.$message.error("两次输入的密码不一致，请检查！");
-          return;
-        }
-        if (parm.id) {
-          this.$api.editBaikeCategory(parm).then((res) => {
-            if (res.data.code == 0) {
+        },
+        remove(data) {
+          this.$confirm("确定删除“" + data.name + "”分类？", "提示", {
+            type: "warning",
+          }).then(() => {
+            this.$api.delBaikeCategory({
+              id: data.id
+            }).then((res) => {
               this.$message({
-                message: "修改成功！",
+                message: "删除成功！",
                 type: "success"
               });
               this.getData();
-              this.form = {
-                parent_id: null,
-                is_active: false,
-              };
-            } else {
-              this.$message.error(res.data.message);
-            }
+            });
           });
-        } else {
-          this.$api.addBaikeCategory(parm).then((res) => {
-            if (res.data.code == 0) {
+        },
+        delBaikeDetail(data) {
+          this.$confirm("确定删除“" + data.name + "”分类？", "提示", {
+            type: "warning",
+          }).then(() => {
+            this.$api.delBaikeDetail({
+              id: data.id
+            }).then((res) => {
               this.$message({
-                message: "添加成功！",
+                message: "删除成功！",
                 type: "success"
               });
               this.getData();
-              this.form = {
-                parent_id: null,
-                is_active: false,
-              };
-            } else {
-              this.$message.error(res.data.message);
-            }
-          });
-        }
-        this.dialogVisible = false;
-      },
-      //下属企业
-      add() {
-        let parm = this.enterprise;
-        parm.goverment_id = this.form.id;
-        if (!parm.enterprise_id) {
-          this.$message.error("请选择企业");
-        }
-        this.$api.saveSubent(parm).then((res) => {
-          if (res.data.code == 0) {
-            this.$message({
-              message: "添加成功！",
-              type: "success"
             });
-            this.dialogFormVisible = false;
-            this.edit({
-              id: parm.goverment_id
+          });
+        },
+        save() {
+          var parm = this.catform;
+          if (parm.password != parm.repassword) {
+            this.$message.error("两次输入的密码不一致，请检查！");
+            return;
+          }
+          if (parm.id) {
+            this.$api.editBaikeCategory(parm).then((res) => {
+              if (res.data.code == 0) {
+                this.$message({
+                  message: "修改成功！",
+                  type: "success"
+                });
+                this.getData();
+                this.form = {
+                  parent_id: null,
+                  is_active: false,
+                };
+              } else {
+                this.$message.error(res.data.message);
+              }
             });
           } else {
-            this.$message.error(res.data.message);
+            this.$api.addBaikeCategory(parm).then((res) => {
+              if (res.data.code == 0) {
+                this.$message({
+                  message: "添加成功！",
+                  type: "success"
+                });
+                this.getData();
+                this.form = {
+                  parent_id: null,
+                  is_active: false,
+                };
+              } else {
+                this.$message.error(res.data.message);
+              }
+            });
           }
-        });
-      },
-      del(id) {
-        this.$confirm("确定删除该企业?", "提示", {
-          type: "warning",
-        }).then(() => {
-          this.$api
-            .deleteSubent({
-              enterprise_id: id,
-              goverment_id: this.form.id
-            })
-            .then((res) => {
+          this.dialogVisible = false;
+        },
+        //下属企业
+        add() {
+          let parm = this.enterprise;
+          parm.goverment_id = this.form.id;
+          if (!parm.enterprise_id) {
+            this.$message.error("请选择企业");
+          }
+          this.$api.saveSubent(parm).then((res) => {
+            if (res.data.code == 0) {
               this.$message({
-                message: "删除成功！",
+                message: "添加成功！",
                 type: "success"
               });
+              this.dialogFormVisible = false;
               this.edit({
-                id: this.form.id
-              });
-            });
-        });
-      },
-      getBaikeDetailList() {
-        this.$api.getBaikeDetailList(this.queryBaikeDetailParams).then((res) => {
-          this.baikeList = res.data.data.list;
-        });
-      },
-      saveBaikeDetail(action) {
-        var parm = this.baikeDetailForm;
-        parm.action = action;
-        if (parm.id) {
-          this.$api.editBaikeDetail(parm).then((res) => {
-            if (res.data.code == 0) {
-              this.$message({
-                message: "修改成功！",
-                type: "success"
+                id: parm.goverment_id
               });
-              this.getData();
             } else {
               this.$message.error(res.data.message);
             }
           });
-        } else {
-          this.$api.addBaikeDetail(parm).then((res) => {
-            if (res.data.code == 0) {
-              this.$message({
-                message: "添加成功！",
-                type: "success"
+        },
+        del(id) {
+          this.$confirm("确定删除该企业?", "提示", {
+            type: "warning",
+          }).then(() => {
+            this.$api
+              .deleteSubent({
+                enterprise_id: id,
+                goverment_id: this.form.id
+              })
+              .then((res) => {
+                this.$message({
+                  message: "删除成功！",
+                  type: "success"
+                });
+                this.edit({
+                  id: this.form.id
+                });
               });
-              this.getData();
+          });
+        },
+        getBaikeDetailList() {
+          this.$api.getBaikeDetailList(this.queryBaikeDetailParams).then((res) => {
+            this.baikeList = res.data.data.list;
+          });
+        },
+        saveBaikeDetail(action) {
+          var parm = this.baikeDetailForm;
+          parm.action = action;
+          if (parm.id) {
+            this.$api.editBaikeDetail(parm).then((res) => {
+              if (res.data.code == 0) {
+                this.$message({
+                  message: "修改成功！",
+                  type: "success"
+                });
+                this.getData();
+              } else {
+                this.$message.error(res.data.message);
+              }
+            });
+          } else {
+            this.$api.addBaikeDetail(parm).then((res) => {
+              if (res.data.code == 0) {
+                this.$message({
+                  message: "添加成功！",
+                  type: "success"
+                });
+                this.getData();
+              } else {
+                this.$message.error(res.data.message);
+              }
+            });
+          }
+          this.dialogFormVisible = false;
+        },
+        openBaikeDetailForm(action, row) {
+          if (action == "add") {
+            if (!this.queryBaikeDetailParams.category_id) {
+              this.$message.error("请选择词条分类!");
             } else {
-              this.$message.error(res.data.message);
+              this.baikeDetailForm.category_id = this.queryBaikeDetailParams.category_id;
+              this.baikeDetailForm.category_name = this.queryBaikeDetailParams.category_name;
+              this.dialogFormVisible = true;
             }
-          });
-        }
-        this.dialogFormVisible = false;
-      },
-      openBaikeDetailForm(action, row) {
-        if (action == "add") {
-          if (!this.queryBaikeDetailParams.category_id) {
-            this.$message.error("请选择词条分类!");
           } else {
-            this.baikeDetailForm.category_id = this.queryBaikeDetailParams.category_id;
-            this.baikeDetailForm.category_name = this.queryBaikeDetailParams.category_name;
-            this.dialogFormVisible = true;
+            this.$api.getBaikeDetail({
+              id: row.id
+            }).then((res) => {
+              this.baikeDetailForm = res.data.data;
+              this.dialogFormVisible = true;
+            })
           }
-        } else {
-          this.$api.getBaikeDetail({
-            id: row.id
-          }).then((res) => {
-            this.baikeDetailForm = res.data.data;
-            this.dialogFormVisible = true;
+        },
+        setSelected(nodes, keys) {
+          this.baikeDetailForm.category_id = nodes.id;
+          this.baikeDetailForm.category_name = nodes.name;
+        },
+        gopage(size) {
+          if (size) {
+            this.queryParams.page_size = size;
+          }
+          this.queryParams.page = this.$refs.pageButton.page;
+          this.getData();
+        },
+        handleAvatarSuccess(res, file) {
+          this.baikeDetailForm.img = res.data.url;
+          console.log(this.baikeDetailForm.img)
+        },
+        beforeAvatarUpload(file) {
+          return;
+          const isJPG = file.type === "image/jpeg";
+          const isLt2M = file.size / 1024 / 1024 < 2;
+
+          if (!isJPG) {
+            this.$message.error("上传头像图片只能是 JPG 格式!");
+          }
+          if (!isLt2M) {
+            this.$message.error("上传头像图片大小不能超过 2MB!");
+          }
+          return isJPG && isLt2M;
+        },
+        topBaikeDetail(row, action) {
+          let params = {
+            id: row.id,
+            action: action
+          }
+          this.$api.baikeDetailTop(params).then(res => {
+            if (res.data.code == 0) {
+              this.$message.success("成功")
+              this.getData()
+            }
           })
         }
       },
-      setSelected(nodes, keys) {
-        this.baikeDetailForm.category_id = nodes.id;
-        this.baikeDetailForm.category_name = nodes.name;
-      },
-      gopage(size) {
-        if (size) {
-          this.queryParams.page_size = size;
-        }
-        this.queryParams.page = this.$refs.pageButton.page;
+      created() {
         this.getData();
       },
-      handleAvatarSuccess(res, file) {
-        this.baikeDetailForm.img = res.data.url;
-        console.log(this.baikeDetailForm.img)
-      },
-      beforeAvatarUpload(file) {
-        return;
-        const isJPG = file.type === "image/jpeg";
-        const isLt2M = file.size / 1024 / 1024 < 2;
-
-        if (!isJPG) {
-          this.$message.error("上传头像图片只能是 JPG 格式!");
-        }
-        if (!isLt2M) {
-          this.$message.error("上传头像图片大小不能超过 2MB!");
-        }
-        return isJPG && isLt2M;
-      },
-      topBaikeDetail(row,action){
-        let params = {
-          id:row.id,
-          action:action
-        }
-        this.$api.baikeDetailTop(params).then(res=>{
-          if(res.data.code==0){
-            this.$message.success("成功")
-            this.getData()
-          }
-        })
-      }
-    },
-    created() {
-      this.getData();
-    },
-  };
+    }
+    };
 </script>

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
@@ -132,9 +132,17 @@ p {
       >
         <template slot-scope="scope">
           <el-badge v-if="!scope.row.view_status" is-dot class="item">
-            <p>{{ scope.row.content }}</p>
+            <p v-if="scope.row.content && scope.row.content.indexOf('http')>-1">
+              <el-image :src="scope.row.content" :preview-src-list="[scope.row.content]"></el-image>
+            </p>
+            <p v-else>{{ scope.row.content }}</p>
           </el-badge>
-          <p v-else>{{ scope.row.content }}</p>
+          <div v-else>
+            <p v-if="scope.row.content && scope.row.content.indexOf('http')>-1">
+              <el-image :src="scope.row.content" :preview-src-list="[scope.row.content]"></el-image>
+            </p>
+            <p v-else>{{ scope.row.content }}</p>
+          </div>
         </template>
       </el-table-column>
       <el-table-column
@@ -144,7 +152,10 @@ p {
         label="回复内容"
       >
         <template slot-scope="scope">
-          <p>{{ scope.row.reply_content }}</p>
+          <p v-if="scope.row.reply_content && scope.row.reply_content.indexOf('http')>-1">
+              <el-image :src="scope.row.reply_content" :preview-src-list="[scope.row.reply_content]"></el-image>
+            </p>
+            <p v-else>{{ scope.row.reply_content }}</p>
         </template>
       </el-table-column>
       <el-table-column
@@ -184,7 +195,7 @@ p {
     <el-dialog
       :title="title"
       :visible.sync="open"
-      width="500px"
+      width="800px"
       append-to-body
       class="replyDiag"
     >
@@ -204,12 +215,14 @@ p {
             />
           </el-col>
           <el-col :span="20" v-if="item.user_id > 0">
-            <p style="padding-left: 5px; font-size: 18px">{{ item.content }}</p>
+            <p style="padding-left: 5px; font-size: 18px" v-if="item.content.indexOf('http')==-1">{{ item.content }}</p>
+            <el-image v-else :src="item.content" :preview-src-list="[item.content]"></el-image>
           </el-col>
           <el-col :span="20" v-if="item.user_id == 0">
-            <p style="padding-right: 10px; text-align: right; font-size: 18px">
+            <p style="padding-right: 10px; text-align: right; font-size: 18px" v-if="item.reply_content.indexOf('http')==-1">
               {{ item.reply_content }}
             </p>
+            <el-image v-else :src="item.reply_content" :preview-src-list="[item.reply_content]"></el-image>
           </el-col>
           <el-col :span="3" v-if="item.user_id == 0">
             <img
@@ -536,6 +549,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();

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"

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>
                     <template slot-scope="scope">
@@ -501,6 +514,9 @@ export default {
                 this.playerList = [];
             }
         },
+        pushPlayer(user_code){
+            this.$router.push({path:'/player',query:{usercode:user_code}})
+        },
 
         /** 提交按钮 */
         submitForm() {

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"

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>

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>