diff --git a/src/views/nobleman/GuildInfo.vue b/src/views/nobleman/GuildInfo.vue
index e4dc8bc..ec168cc 100644
--- a/src/views/nobleman/GuildInfo.vue
+++ b/src/views/nobleman/GuildInfo.vue
@@ -55,14 +55,16 @@
         </template>
       </el-table-column>
       <el-table-column prop="createTime" align="center" label="创建日期" />
-      <el-table-column prop="memberNum" align="center" label="成员数量" />
+      <!-- <el-table-column prop="memberNum" align="center" label="成员数量" /> -->
+      <el-table-column
+        align="center"
+        label="成员数量/上限"
+        ><template v-slot="scope"
+          >{{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}</template
+        ></el-table-column>
       <el-table-column prop="goldIncome" align="center" label="金币总收入" />
       <el-table-column prop="diamondRemain" align="center" label="钻石总收入" />
-      <el-table-column
-        prop="memberNumLimit"
-        align="center"
-        label="成员数量上限"
-      />
+      
       <el-table-column align="center" label="操作" width="300">
         <template v-slot="scope">
           <el-button
diff --git a/src/views/nobleman/GuildMemberInfo.vue b/src/views/nobleman/GuildMemberInfo.vue
index acdbf4a..ee4f06b 100644
--- a/src/views/nobleman/GuildMemberInfo.vue
+++ b/src/views/nobleman/GuildMemberInfo.vue
@@ -32,6 +32,10 @@
     <el-button class="primary" type="primary" @click="getData()"
       >查询</el-button
     >
+    <!-- 导出按钮 -->
+    <el-button class="primary" type="primary" @click="getData()"
+      >导出</el-button
+    >
 
     <!-- 表格 -->
     <el-table
@@ -40,6 +44,16 @@
       border
       style="width: 100%; margin-top: 25px"
     >
+      <el-table-column
+        prop="familyOwnerErbanNo"
+        align="center"
+        label="公会长ID"
+      />
+      <el-table-column
+        prop="familyOwnerNick"
+        align="center"
+        label="公会长昵称"
+      />
       <el-table-column prop="familyName" align="center" label="公会昵称" />
       <el-table-column prop="erbanNo" align="center" label="成员ID" />
       <el-table-column prop="nick" align="center" label="成员昵称" />
@@ -56,7 +70,116 @@
           scope.row.enable ? "有效" : "无效"
         }}</template>
       </el-table-column>
+      <el-table-column align="center" label="是否违规">
+        <template v-slot="scope">{{ scope.row.enable ? "是" : "否" }}</template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" width="300">
+        <template v-slot="scope">
+          <el-button
+            @click="warnClick(scope)"
+            class="primary"
+            type="primary"
+            size="default"
+            >违规警告</el-button
+          >
+          <el-button
+            @click="dialogTableVisible = true"
+            class="primary"
+            type="primary"
+            size="default"
+            >警告详情</el-button
+          >
+        </template>
+      </el-table-column>
     </el-table>
+
+    <!-- 详情设备信息弹窗 -->
+    <el-dialog v-model="dialogTableVisible" title="警告详情">
+      <el-table style="width: 100%" :data="tableData2">
+        <el-table-column property="x" label="成员ID" min-width="100px" />
+        <el-table-column property="x" label="成员昵称" min-width="100px" />
+        <el-table-column property="x" label="违规日期" min-width="100px" />
+        <el-table-column property="x" label="被警告日期" min-width="100px" />
+        <el-table-column property="x" label="违规类型" min-width="100px" />
+      </el-table>
+      <el-button
+        class="dialogTableVisibleBut"
+        type="primary"
+        @click="dialogTableVisible = false"
+      >
+        关闭
+      </el-button>
+    </el-dialog>
+
+    <!-- 违规弹窗 -->
+    <el-dialog v-model="violationDialog" title="新增" width="28%" center>
+      <div style="margin-bottom: 25px">
+        <span
+          style="display: inline-block; margin-right: 20px; width: 100px"
+          class="col-sm-2 control-label"
+          >成员ID</span
+        >
+        <el-input
+          v-model="violationObj.id"
+          style="width: 75%"
+          class="input"
+          disabled
+        ></el-input>
+      </div>
+
+      <div style="margin-bottom: 25px">
+        <span
+          style="display: inline-block; margin-right: 20px; width: 100px"
+          class="col-sm-2 control-label"
+          >成员昵称</span
+        >
+        <el-input
+          v-model="violationObj.nick"
+          style="width: 75%"
+          class="input"
+          disabled
+        ></el-input>
+      </div>
+
+      <div style="margin-bottom: 25px">
+        <span
+          style="display: inline-block; margin-right: 20px; width: 100px"
+          class="col-sm-2 control-label"
+          >违规日期</span
+        >
+        <el-date-picker
+          v-model="violationObj.time"
+          type="datetime"
+          placeholder="选择日期时间"
+        >
+        </el-date-picker>
+      </div>
+
+      <div style="margin-bottom: 25px">
+        <span
+          style="display: inline-block; margin-right: 20px; width: 100px"
+          class="col-sm-2 control-label"
+          >违规类型</span
+        >
+        <el-select v-model="violationObj.nowValue" placeholder="请选择">
+          <el-option
+            v-for="item in violationObj.options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="violationDialog = false">取消</el-button>
+          <el-button type="primary" @click="add()"> 确认 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+
     <!-- 分页 -->
     <el-pagination
       style="margin-top: 10px"
@@ -88,15 +211,21 @@ export default {
         nick: "",
         time: "",
       },
-      //新增所需对象
-      resource: {
-        id: "",
-        nick: "",
-      },
       // 表格
       tableData: [],
+      // 内嵌表格
+      dialogTableVisible: false,
+      tableData2: [],
       //   新增弹窗
-      addDialog: false,
+      violationDialog: false,
+      // 违规对象
+      violationObj: {
+        id: "",
+        nick: "",
+        time: "",
+        nowValue: "",
+        options: [{ value: "选项1", label: "黄金糕" }],
+      },
       // 分页
       total: 10, //总页数
       currentPage: 1, //页码
@@ -132,6 +261,14 @@ export default {
         this.loading = false;
       });
     },
+    // 违规警告
+    warnClick(val) {
+      console.log(val.row);
+      var obj = val.row;
+      this.violationObj.id = val.row.erbanNo;
+      this.violationObj.nick = val.row.nick;
+      this.violationDialog = true;
+    },
     // 分页导航
     handleSizeChange() {
       this.getData();
diff --git a/src/views/nobleman/violationTypeSet.vue b/src/views/nobleman/violationTypeSet.vue
new file mode 100644
index 0000000..953a74b
--- /dev/null
+++ b/src/views/nobleman/violationTypeSet.vue
@@ -0,0 +1,202 @@
+<template>
+  <div class="box">
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="add()">添加</el-button>
+
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="x" align="center" label="违规类型" />
+      <el-table-column prop="x" align="center" label="警告内容" />
+      <el-table-column align="center" label="操作" >
+        <template v-slot="scope">
+          <el-button
+            @click="ediClick(scope)"
+            class="primary"
+            type="primary"
+            size="default"
+            >编辑</el-button
+          >
+          <el-button
+            @click="del(scope)"
+            class="danger"
+            type="danger"
+            size="default"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+
+    <!-- 编辑弹窗 -->
+    <el-dialog v-model="addDialog" :title="titleDialog" width="28%" center>
+      <!-- 违规类型 -->
+      <div style="margin-bottom: 25px; margin-top: 10px">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >违规类型</span
+        >
+        <el-input
+          v-model="addObj.violationType"
+          style="width: 75%"
+          class="input"
+          placeholder="请输入违规类型（仅限20字）"
+          maxlength="20"
+        ></el-input>
+      </div>
+      <!-- 警告内容 -->
+      <div style="margin-bottom: 25px; margin-top: 10px">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >警告内容</span
+        >
+        <el-input
+          v-model="addObj.violationContent"
+          style="width: 75%"
+          class="input"
+          placeholder="请输入警告内容（仅限200字）"
+          maxlength="200"
+          type="textarea"
+          :rows="3"
+        ></el-input>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="addDialog = false">取消</el-button>
+          <el-button type="primary" @click="addDialogClick()"> 确认 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+
+    <!-- 二次确认删除弹窗 -->
+    <el-dialog v-model="delDialog" title="提示" width="30%" center>
+      <span> 是否删除该违规类型?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="delDialog = false">取消</el-button>
+          <el-button type="primary" @click="delClick()"> 确认 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {} from "@/api/nobleman/nobleman";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "violationTypeSet",
+  data() {
+    return {
+      loading: false,
+      // 表格数据
+      tableData: [{ x: "" }],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+      // 删除
+      delDialog: false,
+      delDate: {},
+      // 新增&编辑
+      addDialog: false,
+      titleDialog: "新增违规类型",
+      addObj: {
+        violationType: "",
+        violationContent: "",
+      },
+    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      // this.loading = true;
+      // this.total = res.data.total;
+      // this.tableData = res.data.rows;
+      // this.loading = false;
+    },
+    // 删除按钮
+    del(val) {
+      this.delDate = val.row;
+      this.delDialog = true;
+    },
+    // 二次确认删除
+    delClick() {
+      this.delDialog = false;
+    },
+    // 新增
+    add() {
+      this.titleDialog = "新增违规类型";
+      this.addObj.violationType = "";
+      this.addObj.violationContent = "";
+      this.addDialog = true;
+    },
+    // 编辑
+    ediClick(val) {
+      this.titleDialog = "编辑违规类型";
+      this.addObj.violationType = "1";
+      this.addObj.violationContent = "1";
+      this.addDialog = true;
+    },
+    // 二次确认新增&编辑
+    addDialogClick() {
+      this.addDialog = false;
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+    span {
+      margin-right: 10px;
+    }
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+</style>