b s s m 3 years ago
parent
commit
ce066adf67

+ 53 - 0
ruoyi-ui/src/api/system/LzydNotice.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询荔枝app-公告记录列表
+export function listLzydNotice(query) {
+  return request({
+    url: '/system/LzydNotice/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询荔枝app-公告记录详细
+export function getLzydNotice(id) {
+  return request({
+    url: '/system/LzydNotice/' + id,
+    method: 'get'
+  })
+}
+
+// 新增荔枝app-公告记录
+export function addLzydNotice(data) {
+  return request({
+    url: '/system/LzydNotice',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改荔枝app-公告记录
+export function updateLzydNotice(data) {
+  return request({
+    url: '/system/LzydNotice',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除荔枝app-公告记录
+export function delLzydNotice(id) {
+  return request({
+    url: '/system/LzydNotice/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出荔枝app-公告记录
+export function exportLzydNotice(query) {
+  return request({
+    url: '/system/LzydNotice/export',
+    method: 'get',
+    params: query
+  })
+}

+ 53 - 0
ruoyi-ui/src/api/system/LzydNoticeGenre.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询荔枝app-公告类型记录列表
+export function listLzydNoticeGenre(query) {
+  return request({
+    url: '/system/LzydNoticeGenre/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询荔枝app-公告类型记录详细
+export function getLzydNoticeGenre(id) {
+  return request({
+    url: '/system/LzydNoticeGenre/' + id,
+    method: 'get'
+  })
+}
+
+// 新增荔枝app-公告类型记录
+export function addLzydNoticeGenre(data) {
+  return request({
+    url: '/system/LzydNoticeGenre',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改荔枝app-公告类型记录
+export function updateLzydNoticeGenre(data) {
+  return request({
+    url: '/system/LzydNoticeGenre',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除荔枝app-公告类型记录
+export function delLzydNoticeGenre(id) {
+  return request({
+    url: '/system/LzydNoticeGenre/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出荔枝app-公告类型记录
+export function exportLzydNoticeGenre(query) {
+  return request({
+    url: '/system/LzydNoticeGenre/export',
+    method: 'get',
+    params: query
+  })
+}

+ 53 - 0
ruoyi-ui/src/api/system/LzydNoticeUser.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询公告与用户关联记录用户是否已读公告列表
+export function listLzydNoticeUser(query) {
+  return request({
+    url: '/system/LzydNoticeUser/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询公告与用户关联记录用户是否已读公告详细
+export function getLzydNoticeUser(id) {
+  return request({
+    url: '/system/LzydNoticeUser/' + id,
+    method: 'get'
+  })
+}
+
+// 新增公告与用户关联记录用户是否已读公告
+export function addLzydNoticeUser(data) {
+  return request({
+    url: '/system/LzydNoticeUser',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改公告与用户关联记录用户是否已读公告
+export function updateLzydNoticeUser(data) {
+  return request({
+    url: '/system/LzydNoticeUser',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除公告与用户关联记录用户是否已读公告
+export function delLzydNoticeUser(id) {
+  return request({
+    url: '/system/LzydNoticeUser/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出公告与用户关联记录用户是否已读公告
+export function exportLzydNoticeUser(query) {
+  return request({
+    url: '/system/LzydNoticeUser/export',
+    method: 'get',
+    params: query
+  })
+}

+ 1 - 1
ruoyi-ui/src/views/index.vue

@@ -39,7 +39,7 @@
     </el-row>
     <el-row :gutter="20">
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>荔枝悦动后台管理框架</h2>
+        <h2>荔枝悦动后台管理系统</h2>
         <p>
          
         </p>

+ 3 - 2
ruoyi-ui/src/views/login.vue

@@ -48,7 +48,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2018-2021 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright © 2018-2021 lzyd.vip All Rights Reserved.</span>
     </div>
   </div>
 </template>
@@ -66,7 +66,8 @@ export default {
       cookiePassword: "",
       loginForm: {
         username: "admin",
-        password: "admin123",
+        password: "",
+        // admin123
         rememberMe: false,
         code: "",
         uuid: ""

+ 1 - 1
ruoyi-ui/src/views/system/LzydMarathon/index.vue

@@ -238,7 +238,7 @@
 
     <el-table v-loading="loading" :data="LzydMarathonList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="自增id" align="center" prop="id" /> -->
+      <el-table-column label="id" align="center" prop="id" />
       <!-- <el-table-column label="租户id" align="center" prop="appId" /> -->
       <el-table-column label="活动id" align="center" prop="marathonId" />
       <el-table-column label="活动名称" align="center" prop="name" />

+ 1 - 1
ruoyi-ui/src/views/system/LzydMarathonOrderDetail/index.vue

@@ -206,7 +206,7 @@
 
     <el-table v-loading="loading" :data="LzydMarathonOrderDetailList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="是否删除 1=删除" align="center" prop="id" /> -->
+      <el-table-column label="id" align="center" prop="id" />
       <el-table-column label="订单id" align="center" prop="dealSn" />
       <el-table-column label="马拉松id" align="center" prop="marathonId" />
       <el-table-column label="用户id" align="center" prop="userId" />

+ 1 - 1
ruoyi-ui/src/views/system/LzydMarathonOrderMaster/index.vue

@@ -251,7 +251,7 @@
 
     <el-table v-loading="loading" :data="LzydMarathonOrderMasterList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="自增id" align="center" prop="id" /> -->
+      <el-table-column label="id" align="center" prop="id" />
       <!-- <el-table-column label="租户id" align="center" prop="appId" /> -->
       <el-table-column label="订单号" align="center" prop="dealSn" />
       <el-table-column label="马拉松id" align="center" prop="marathonId" />

+ 1 - 1
ruoyi-ui/src/views/system/LzydMarathonUser/index.vue

@@ -198,7 +198,7 @@
     <el-table v-loading="loading" :data="LzydMarathonUserList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="自增id" align="center" prop="id" /> -->
-      <!-- <el-table-column label="租户id" align="center" prop="appId" /> -->
+      <el-table-column label="id" align="center" prop="appId" />
       <!-- <el-table-column label="马拉松id" align="center" prop="marathonId" /> -->
       <el-table-column label="号码布" align="center" prop="bibNumber" />
       <el-table-column label="用户id" align="center" prop="userId" />

+ 425 - 0
ruoyi-ui/src/views/system/LzydNotice/index.vue

@@ -0,0 +1,425 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <!-- <el-form-item label="公告跳转类型" prop="noticeId">
+        <el-input
+          v-model="queryParams.noticeId"
+          placeholder="请输入公告跳转类型"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="appid" prop="appId">
+        <el-input
+          v-model="queryParams.appId"
+          placeholder="请输入appid"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item label="title" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入公告标题"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="数据创建时间" prop="createAt">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.createAt"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择数据创建时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="数据更新时间" prop="updateAt">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.updateAt"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择数据更新时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="是否删除" prop="isDelete">
+        <el-input
+          v-model="queryParams.isDelete"
+          placeholder="请输入是否删除"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="跳转连接" prop="linkUrl">
+        <el-input
+          v-model="queryParams.linkUrl"
+          placeholder="请输入跳转连接"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="公告跳转类型" prop="noticeSkipType">
+        <el-select v-model="queryParams.noticeSkipType" placeholder="请选择公告跳转类型" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="公告跳转类型" prop="noticeTypeId">
+        <el-input
+          v-model="queryParams.noticeTypeId"
+          placeholder="请输入公告跳转类型"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:LzydNotice:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:LzydNotice:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:LzydNotice:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:LzydNotice:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="LzydNoticeList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="公告id" align="center" prop="noticeId" />
+      <el-table-column label="appid" align="center" prop="appId" />
+      <el-table-column label="标题" align="center" prop="title" />
+      <el-table-column label="内容" align="center" prop="content" />
+      <el-table-column label="公告跳转类型" align="center" prop="noticeSkipType" />
+      <el-table-column label="公告类型" align="center" prop="noticeTypeId" />
+      <el-table-column label="创建时间" align="center" prop="createAt" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createAt, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新时间" align="center" prop="updateAt" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateAt, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否删除" align="center" prop="isDelete" />
+      <el-table-column label="跳转连接" align="center" prop="linkUrl" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:LzydNotice:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:LzydNotice:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改荔枝app-公告记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="公告跳转类型" prop="noticeId">
+          <el-input v-model="form.noticeId" placeholder="请输入公告跳转类型" />
+        </el-form-item>
+        <el-form-item label="appid" prop="appId">
+          <el-input v-model="form.appId" placeholder="请输入appid" />
+        </el-form-item>
+        <el-form-item label="appid" prop="title">
+          <el-input v-model="form.title" placeholder="请输入appid" />
+        </el-form-item>
+        <el-form-item label="appid">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="数据创建时间" prop="createAt">
+          <el-date-picker clearable size="small"
+            v-model="form.createAt"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择数据创建时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="数据更新时间" prop="updateAt">
+          <el-date-picker clearable size="small"
+            v-model="form.updateAt"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择数据更新时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="是否删除" prop="isDelete">
+          <el-input v-model="form.isDelete" placeholder="请输入是否删除" />
+        </el-form-item>
+        <el-form-item label="跳转连接" prop="linkUrl">
+          <el-input v-model="form.linkUrl" placeholder="请输入跳转连接" />
+        </el-form-item>
+        <el-form-item label="公告跳转类型" prop="noticeSkipType">
+          <el-select v-model="form.noticeSkipType" placeholder="请选择公告跳转类型">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="公告跳转类型" prop="noticeTypeId">
+          <el-input v-model="form.noticeTypeId" placeholder="请输入公告跳转类型" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listLzydNotice, getLzydNotice, delLzydNotice, addLzydNotice, updateLzydNotice, exportLzydNotice } from "@/api/system/LzydNotice";
+import Editor from '@/components/Editor';
+
+export default {
+  name: "LzydNotice",
+  components: {
+    Editor,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 荔枝app-公告记录表格数据
+      LzydNoticeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        noticeId: null,
+        appId: null,
+        title: null,
+        content: null,
+        createAt: null,
+        updateAt: null,
+        isDelete: null,
+        linkUrl: null,
+        noticeSkipType: null,
+        noticeTypeId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        noticeId: [
+          { required: true, message: "公告跳转类型不能为空", trigger: "blur" }
+        ],
+        appId: [
+          { required: true, message: "appid不能为空", trigger: "blur" }
+        ],
+        title: [
+          { required: true, message: "appid不能为空", trigger: "blur" }
+        ],
+        content: [
+          { required: true, message: "appid不能为空", trigger: "blur" }
+        ],
+        isDelete: [
+          { required: true, message: "是否删除不能为空", trigger: "blur" }
+        ],
+        linkUrl: [
+          { required: true, message: "跳转连接不能为空", trigger: "blur" }
+        ],
+        noticeSkipType: [
+          { required: true, message: "公告跳转类型不能为空", trigger: "change" }
+        ],
+        noticeTypeId: [
+          { required: true, message: "公告跳转类型不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询荔枝app-公告记录列表 */
+    getList() {
+      this.loading = true;
+      listLzydNotice(this.queryParams).then(response => {
+        this.LzydNoticeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        noticeId: null,
+        appId: null,
+        title: null,
+        content: null,
+        createAt: null,
+        updateAt: null,
+        isDelete: null,
+        linkUrl: null,
+        noticeSkipType: null,
+        noticeTypeId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加荔枝app-公告记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getLzydNotice(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改荔枝app-公告记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateLzydNotice(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addLzydNotice(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除荔枝app-公告记录编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delLzydNotice(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有荔枝app-公告记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportLzydNotice(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    }
+  }
+};
+</script>

+ 385 - 0
ruoyi-ui/src/views/system/LzydNoticeGenre/index.vue

@@ -0,0 +1,385 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="公告类型id" prop="noticeTypeId">
+        <el-input
+          v-model="queryParams.noticeTypeId"
+          placeholder="请输入公告类型id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="appid" prop="appId">
+        <el-input
+          v-model="queryParams.appId"
+          placeholder="请输入appid"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="公告发布者昵称" prop="noticeName">
+        <el-input
+          v-model="queryParams.noticeName"
+          placeholder="请输入公告发布者昵称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="公告发布者头像" prop="noticeAvatar">
+        <el-input
+          v-model="queryParams.noticeAvatar"
+          placeholder="请输入公告发布者头像"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="数据创建时间" prop="createAt">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.createAt"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择数据创建时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="数据更新时间" prop="updateAt">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.updateAt"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择数据更新时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="删除时间" prop="deleteAt">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.deleteAt"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择删除时间">
+        </el-date-picker>
+      </el-form-item> -->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:LzydNoticeGenre:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:LzydNoticeGenre:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:LzydNoticeGenre:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:LzydNoticeGenre:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="LzydNoticeGenreList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="公告类型id" align="center" prop="noticeTypeId" />
+      <el-table-column label="appid" align="center" prop="appId" />
+      <el-table-column label="发布者昵称" align="center" prop="noticeName" />
+      <el-table-column label="发布者头像" align="center" prop="noticeAvatar" />
+      <el-table-column label="创建时间" align="center" prop="createAt" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createAt, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新时间" align="center" prop="updateAt" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateAt, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="删除时间" align="center" prop="deleteAt" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.deleteAt, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:LzydNoticeGenre:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:LzydNoticeGenre:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改荔枝app-公告类型记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="公告类型id" prop="noticeTypeId">
+          <el-input v-model="form.noticeTypeId" placeholder="请输入公告类型id" />
+        </el-form-item>
+        <el-form-item label="appid" prop="appId">
+          <el-input v-model="form.appId" placeholder="请输入appid" />
+        </el-form-item>
+        <el-form-item label="公告发布者昵称" prop="noticeName">
+          <el-input v-model="form.noticeName" placeholder="请输入公告发布者昵称" />
+        </el-form-item>
+        <el-form-item label="公告发布者头像" prop="noticeAvatar">
+          <el-input v-model="form.noticeAvatar" placeholder="请输入公告发布者头像" />
+        </el-form-item>
+        <el-form-item label="数据创建时间" prop="createAt">
+          <el-date-picker clearable size="small"
+            v-model="form.createAt"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择数据创建时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="数据更新时间" prop="updateAt">
+          <el-date-picker clearable size="small"
+            v-model="form.updateAt"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择数据更新时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="删除时间" prop="deleteAt">
+          <el-date-picker clearable size="small"
+            v-model="form.deleteAt"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择删除时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listLzydNoticeGenre, getLzydNoticeGenre, delLzydNoticeGenre, addLzydNoticeGenre, updateLzydNoticeGenre, exportLzydNoticeGenre } from "@/api/system/LzydNoticeGenre";
+
+export default {
+  name: "LzydNoticeGenre",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 荔枝app-公告类型记录表格数据
+      LzydNoticeGenreList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        noticeTypeId: null,
+        appId: null,
+        noticeName: null,
+        noticeAvatar: null,
+        createAt: null,
+        updateAt: null,
+        deleteAt: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        noticeTypeId: [
+          { required: true, message: "公告类型id不能为空", trigger: "blur" }
+        ],
+        appId: [
+          { required: true, message: "appid不能为空", trigger: "blur" }
+        ],
+        noticeName: [
+          { required: true, message: "公告发布者昵称不能为空", trigger: "blur" }
+        ],
+        noticeAvatar: [
+          { required: true, message: "公告发布者头像不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询荔枝app-公告类型记录列表 */
+    getList() {
+      this.loading = true;
+      listLzydNoticeGenre(this.queryParams).then(response => {
+        this.LzydNoticeGenreList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        noticeTypeId: null,
+        appId: null,
+        noticeName: null,
+        noticeAvatar: null,
+        createAt: null,
+        updateAt: null,
+        deleteAt: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加荔枝app-公告类型记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getLzydNoticeGenre(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改荔枝app-公告类型记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateLzydNoticeGenre(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addLzydNoticeGenre(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除荔枝app-公告类型记录编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delLzydNoticeGenre(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有荔枝app-公告类型记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportLzydNoticeGenre(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    }
+  }
+};
+</script>

+ 344 - 0
ruoyi-ui/src/views/system/LzydNoticeUser/index.vue

@@ -0,0 +1,344 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <!-- <el-form-item label="删除时间" prop="noticeId">
+        <el-input
+          v-model="queryParams.noticeId"
+          placeholder="请输入删除时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <!-- <el-form-item label="appid" prop="appId">
+        <el-input
+          v-model="queryParams.appId"
+          placeholder="请输入appid"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item label="userId" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="数据创建时间" prop="createAt">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.createAt"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择数据创建时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="删除时间" prop="deleteAt">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.deleteAt"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择删除时间">
+        </el-date-picker>
+      </el-form-item> -->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:LzydNoticeUser:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:LzydNoticeUser:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:LzydNoticeUser:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:LzydNoticeUser:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="LzydNoticeUserList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="公告id" align="center" prop="noticeId" />
+      <!-- <el-table-column label="appid" align="center" prop="appId" /> -->
+      <el-table-column label="用户id" align="center" prop="userId" />
+      <el-table-column label="创建时间" align="center" prop="createAt" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createAt, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="删除时间" align="center" prop="deleteAt" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.deleteAt, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:LzydNoticeUser:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:LzydNoticeUser:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改公告与用户关联记录用户是否已读公告对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="删除时间" prop="noticeId">
+          <el-input v-model="form.noticeId" placeholder="请输入删除时间" />
+        </el-form-item>
+        <el-form-item label="appid" prop="appId">
+          <el-input v-model="form.appId" placeholder="请输入appid" />
+        </el-form-item>
+        <el-form-item label="appid" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入appid" />
+        </el-form-item>
+        <el-form-item label="数据创建时间" prop="createAt">
+          <el-date-picker clearable size="small"
+            v-model="form.createAt"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择数据创建时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="删除时间" prop="deleteAt">
+          <el-date-picker clearable size="small"
+            v-model="form.deleteAt"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择删除时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listLzydNoticeUser, getLzydNoticeUser, delLzydNoticeUser, addLzydNoticeUser, updateLzydNoticeUser, exportLzydNoticeUser } from "@/api/system/LzydNoticeUser";
+
+export default {
+  name: "LzydNoticeUser",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 公告与用户关联记录用户是否已读公告表格数据
+      LzydNoticeUserList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        noticeId: null,
+        appId: null,
+        userId: null,
+        createAt: null,
+        deleteAt: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        noticeId: [
+          { required: true, message: "删除时间不能为空", trigger: "blur" }
+        ],
+        appId: [
+          { required: true, message: "appid不能为空", trigger: "blur" }
+        ],
+        userId: [
+          { required: true, message: "appid不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询公告与用户关联记录用户是否已读公告列表 */
+    getList() {
+      this.loading = true;
+      listLzydNoticeUser(this.queryParams).then(response => {
+        this.LzydNoticeUserList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        noticeId: null,
+        appId: null,
+        userId: null,
+        createAt: null,
+        deleteAt: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加公告与用户关联记录用户是否已读公告";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getLzydNoticeUser(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改公告与用户关联记录用户是否已读公告";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateLzydNoticeUser(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addLzydNoticeUser(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除公告与用户关联记录用户是否已读公告编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delLzydNoticeUser(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有公告与用户关联记录用户是否已读公告数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportLzydNoticeUser(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    }
+  }
+};
+</script>

+ 6 - 6
ruoyi-ui/src/views/system/LzydQualifying/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="appid" prop="appId">
+      <!-- <el-form-item label="appid" prop="appId">
         <el-input
           v-model="queryParams.appId"
           placeholder="请输入appid"
@@ -9,7 +9,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="活动id" prop="qualifyingId">
         <el-input
           v-model="queryParams.qualifyingId"
@@ -19,7 +19,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="发起人用户id" prop="sponsorId">
+      <el-form-item label="用户id" prop="sponsorId">
         <el-input
           v-model="queryParams.sponsorId"
           placeholder="请输入发起人用户id"
@@ -37,7 +37,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="活动里程" prop="mileage">
+      <!-- <el-form-item label="活动里程" prop="mileage">
         <el-input
           v-model="queryParams.mileage"
           placeholder="请输入活动里程"
@@ -151,7 +151,7 @@
           value-format="yyyy-MM-dd"
           placeholder="选择删除时间">
         </el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -206,7 +206,7 @@
 
     <el-table v-loading="loading" :data="LzydQualifyingList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="自增id" align="center" prop="id" />
+      <el-table-column label="id" align="center" prop="id" />
       <el-table-column label="appid" align="center" prop="appId" />
       <el-table-column label="活动id" align="center" prop="qualifyingId" />
       <el-table-column label="发起人用户id" align="center" prop="sponsorId" />

+ 3 - 3
ruoyi-ui/src/views/system/LzydQualifyingUser/index.vue

@@ -151,9 +151,9 @@
     </el-row>
 
     <el-table v-loading="loading" :data="LzydQualifyingUserList" @selection-change="handleSelectionChange">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <!-- <el-table-column label="自增id" align="center" prop="id" />
-      <el-table-column label="appid" align="center" prop="appId" /> -->
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="id" align="center" prop="id" />
+      <!-- <el-table-column label="appid" align="center" prop="appId" /> -->
       <el-table-column label="排位赛id" align="center" prop="qualifyingId" />
       <el-table-column label="用户id" align="center" prop="userId" />
       <el-table-column label="积分数" align="center" prop="getPoints" />

+ 2 - 2
ruoyi-ui/src/views/system/LzydSportLog/index.vue

@@ -148,8 +148,8 @@
     </el-row>
 
     <el-table v-loading="loading" :data="LzydSportLogList" @selection-change="handleSelectionChange">
-      <!-- <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" /> -->
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="id" align="center" prop="id" />
       <el-table-column label="用户id" align="center" prop="userId" />
       <el-table-column label="任务id" align="center" prop="taskId" />
       <el-table-column label="运动类型" align="center" prop="sportsType" />

+ 2 - 2
ruoyi-ui/src/views/system/LzydUser/index.vue

@@ -323,8 +323,8 @@
     </el-row>
 
     <el-table v-loading="loading" :data="LzydUserList" @selection-change="handleSelectionChange">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <!-- <el-table-column label="悦动id" align="center" prop="id" /> -->
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="id" align="center" prop="id" />
       <el-table-column label="悦动id" align="center" prop="yuedongId" />
       <el-table-column label="用户id" align="center" prop="userId" />
       <el-table-column label="账户类型" align="center" prop="role" />

+ 1 - 1
ruoyi-ui/src/views/system/LzydVideoAttention/index.vue

@@ -112,7 +112,7 @@
 
     <el-table v-loading="loading" :data="LzydVideoAttentionList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="是否互相关注" align="center" prop="id" /> -->
+      <el-table-column label="id" align="center" prop="id" />
       <!-- <el-table-column label="租户id" align="center" prop="appId" /> -->
       <el-table-column label="用户id" align="center" prop="userId" />
       <el-table-column label="关注的用户id" align="center" prop="attentionUserId" />

+ 2 - 2
ruoyi-ui/src/views/system/LzydVideoComment/index.vue

@@ -144,8 +144,8 @@
 
     <el-table v-loading="loading" :data="LzydVideoCommentList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="租户id" align="center" prop="appId" /> -->
+      <el-table-column label="id" align="center" prop="id" />
+      <!-- <el-table-column label="租户id" align="center" prop="appId" /> -->
       <el-table-column label="来源id" align="center" prop="resourceId" />
       <el-table-column label="评论id" align="center" prop="commentId" />
       <el-table-column label="用户id" align="center" prop="commentUserId" />

+ 1 - 1
ruoyi-ui/src/views/system/LzydVideoMaster/index.vue

@@ -212,7 +212,7 @@
 
     <el-table v-loading="loading" :data="LzydVideoMasterList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="id" align="center" prop="id" /> -->
+      <el-table-column label="id" align="center" prop="id" />
       <!-- <el-table-column label="租户id" align="center" prop="appId" /> -->
       <el-table-column label="视频id" align="center" prop="videoId" />
       <!-- <el-table-column label="视频上传upload_id" align="center" prop="uploadId" /> -->

+ 1 - 0
ruoyi-ui/vue.config.js

@@ -34,6 +34,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
+        // target: `http://192.168.0.105:4009`,
         target: `http://lzyd-backend-api.lizhiyuedong.com/`,
         changeOrigin: true,
         pathRewrite: {