家族-后台-增加分区描述

src/views/nobleman/GuildInfo.vue

@@ -3,126 +3,100 @@
     <!-- 查询 -->
     <div class="inquire">
       <span>ID</span>
-      <el-input
+      <el-input v-model="inquire.userId"
-        v-model="inquire.userId"
                 placeholder=""
-        class="input"
+                class="input"></el-input>
-      ></el-input>
     </div>
     <div class="inquire">
       <span>推荐人</span>
-      <el-input
+      <el-input v-model="inquire.referrer"
-        v-model="inquire.referrer"
                 placeholder=""
-        class="input"
+                class="input"></el-input>
-      ></el-input>
     </div>
     <!-- 时间选择器 -->
     <div class="inquire">
       <div class="block">
         <span class="demonstration">日期</span>
-        <el-date-picker
+        <el-date-picker v-model="inquire.time"
-          v-model="inquire.time"
                         type="datetimerange"
                         range-separator="至"
                         start-placeholder="开始日期"
-          end-placeholder="结束日期"
+                        end-placeholder="结束日期">
-        >
         </el-date-picker>
       </div>
     </div>
     <!-- 查询按钮 -->
-    <el-button class="primary" type="primary" @click="getData()"
+    <el-button class="primary"
-      >查询</el-button
+               type="primary"
-    >
+               @click="getData()">查询</el-button>
-    <el-button class="primary" type="primary" @click="addDialog = true"
+    <el-button class="primary"
-      >添加</el-button
+               type="primary"
-    >
+               @click="addDialog = true">添加</el-button>
 
     <!-- 表格 -->
-    <el-table
+    <el-table v-loading="loading"
-      v-loading="loading"
               :data="tableData"
               border
-      style="width: 100%; margin-top: 25px"
+              style="width: 100%; margin-top: 25px">
-    >
+      <el-table-column prop="referrer"
-      <el-table-column prop="referrer" align="center" label="推荐人" />
+                       align="center"
-      <el-table-column prop="ownerErbanNo" align="center" label="会长ID" />
+                       label="推荐人" />
-      <el-table-column prop="ownerNick" align="center" label="会长昵称" />
+      <el-table-column prop="ownerErbanNo"
-      <el-table-column prop="name" align="center" label="公会昵称" />
+                       align="center"
-      <el-table-column align="center" prop="giftInfo" label="公会背景图">
+                       label="会长ID" />
+      <el-table-column prop="ownerNick"
+                       align="center"
+                       label="会长昵称" />
+      <el-table-column prop="ownerPartitionName"
+                       align="center"
+                       label="会长分区" />
+      <el-table-column prop="name"
+                       align="center"
+                       label="公会昵称" />
+      <el-table-column align="center"
+                       prop="giftInfo"
+                       label="公会背景图">
         <template v-slot="scope">
-          <el-image
+          <el-image style="width: 100px; height: 100px"
-            style="width: 100px; height: 100px"
                     :src="scope.row.backgroundUrl"
                     :zoom-rate="1.1"
                     :preview-src-list="[scope.row.backgroundUrl]"
                     fit="cover"
                     preview-teleported="true"
-            hide-on-click-modal="true"
+                    hide-on-click-modal="true" />
-          />
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" align="center" label="创建日期" />
+      <el-table-column prop="createTime"
-      <!-- <el-table-column prop="memberNum" align="center" label="成员数量" /> -->
-      <el-table-column
                        align="center"
-        label="成员数量/上限"
+                       label="创建日期" />
-        ><template v-slot="scope"
+      <el-table-column prop="memberNum"
-          >{{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}</template
+                       align="center"
-        ></el-table-column>
+                       label="成员数量" />
-      <el-table-column prop="goldIncome" align="center" label="金币总收入" />
+      <el-table-column prop="goldIncome"
-      <el-table-column prop="diamondRemain" align="center" label="钻石总收入" />
+                       align="center"
-      
+                       label="金币总收入" />
-      <el-table-column align="center" label="操作" width="300">
+      <el-table-column prop="diamondRemain"
-        <template v-slot="scope">
+                       align="center"
-          <el-button
+                       label="钻石总收入" />
-            @click="ediClick(scope)"
-            class="primary"
-            type="primary"
-            size="default"
-            :disabled="!scope.row.enable"
-            >编辑</el-button
-          >
-          <el-button
-            @click="
-              delDialog = true;
-              delDialogData = scope.row;
-            "
-            :class="scope.row.enable ? 'danger' : 'info'"
-            :type="scope.row.enable ? 'danger' : 'info'"
-            size="default"
-            :disabled="!scope.row.enable"
-            >{{ scope.row.enable ? "移除" : "已解散" }}</el-button
-          >
-        </template>
-      </el-table-column>
     </el-table>
     <!-- 新增弹窗 -->
-    <el-dialog v-model="addDialog" title="新增" width="28%" center>
+    <el-dialog v-model="addDialog"
+               title="新增"
+               width="28%"
+               center>
       <div style="margin-bottom: 25px">
-        <span
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
-          style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">会长ID</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="resource.id"
-          >会长ID</span
-        >
-        <el-input
-          v-model="resource.id"
                   style="width: 75%"
-          class="input"
+                  class="input"></el-input>
-        ></el-input>
       </div>
       <div style="margin-bottom: 25px">
-        <span
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
-          style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">推荐人</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="resource.referrer"
-          >推荐人</span
-        >
-        <el-input
-          v-model="resource.referrer"
                   style="width: 75%"
-          class="input"
+                  class="input"></el-input>
-        ></el-input>
       </div>
       <!-- <div style="margin-bottom: 25px">
         <span
@@ -139,13 +113,13 @@
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="addDialog = false">取消</el-button>
-          <el-button type="primary" @click="add()"> 确认 </el-button>
+          <el-button type="primary"
+                     @click="add()"> 确认 </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 分页 -->
-    <el-pagination
+    <el-pagination style="margin-top: 10px"
-      style="margin-top: 10px"
                    class="paginationClass"
                    v-model:current-page="currentPage"
                    v-model:page-size="pageSize"
@@ -153,99 +127,20 @@
                    layout="sizes, prev, pager, next"
                    :total="total"
                    @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
+                   @current-change="handleCurrentChange" />
-    />
-    <!-- 编辑弹窗 -->
-    <el-dialog v-model="editDialog" title="编辑" width="28%" center>
-      <!-- 会长ID -->
-      <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >会长ID</span
-        >
-        <el-input
-          v-model="ediObj.leaderId"
-          style="width: 75%"
-          class="input"
-          disabled
-        ></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="ediObj.leaderNick"
-          style="width: 75%"
-          class="input"
-          disabled
-        ></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="ediObj.guildNick"
-          style="width: 75%"
-          class="input"
-          disabled
-        ></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="ediObj.guildNumber"
-          style="width: 75%"
-          class="input"
-        ></el-input>
-      </div>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="editDialog = false">取消</el-button>
-          <el-button type="primary" @click="editDialogClick()">
-            确认
-          </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 { pageFamily, create, update, dismiss } from "@/api/nobleman/nobleman";
+import { pageFamily, create } from "@/api/nobleman/nobleman";
 // @ts-ignore
 import { dateFormat } from "@/utils/system-helper";
 // @ts-ignore
 import { ElMessage } from "element-plus";
 export default {
   name: "GuildInfo",
-  data() {
+  data () {
     return {
       loading: false,
-      delDialog: false,
-      delDialogData: null,
       //查询所需条件对象
       inquire: {
         userId: "",
@@ -266,23 +161,14 @@ export default {
       total: 10, //总页数
       currentPage: 1, //页码
       pageSize: 10, //条数
-      // 编辑弹窗
-      editDialog: false,
-      ediObj: {
-        leaderId: "",
-        leaderNick: "",
-        guildNick: "",
-        guildNumber: "",
-        id: "",
-      },
     };
   },
-  created() {
+  created () {
     this.getData();
   },
   methods: {
     // 查询接口
-    getData() {
+    getData () {
       this.loading = true;
       let time = this.inquire.time;
       let startTime = "";
@@ -306,7 +192,7 @@ export default {
       });
     },
     // 添加
-    add() {
+    add () {
       this.addDialog = false;
       create({
         erbanNo: this.resource.id,
@@ -315,69 +201,11 @@ export default {
         this.getData();
       });
     },
-    // 编辑按钮
-    ediClick(res) {
-      var obj = res.row;
-      this.ediObj.leaderId = obj.ownerErbanNo;
-      this.ediObj.leaderNick = obj.ownerNick;
-      this.ediObj.guildNick = obj.name;
-      this.ediObj.guildNumber = obj.memberNumLimit;
-      this.ediObj.id = obj.id;
-      this.editDialog = true;
-    },
-    // 二次确认弹窗
-    editDialogClick() {
-      console.log(this.ediObj);
-      update({
-        id: this.ediObj.id,
-        memberNumLimit: this.ediObj.guildNumber,
-      }).then((res) => {
-        if (res.code == 200) {
-          ElMessage({
-            showClose: true,
-            message: res.message,
-            type: "success",
-          });
-          this.getData();
-          this.editDialog = false;
-        } else {
-          ElMessage({
-            showClose: true,
-            message: res.message,
-            type: "error",
-          });
-        }
-        this.delDialog = false;
-      });
-    },
-    // 解散按钮
-    delClick() {
-      console.log(this.delDialogData.id);
-      var familyId = this.delDialogData.id;
-      dismiss({ familyId }).then((res) => {
-        console.log();
-        if (res.code == 200) {
-          this.getData();
-          ElMessage({
-            showClose: true,
-            message: "解散成功",
-            type: "success",
-          });
-        } else {
-          ElMessage({
-            showClose: true,
-            message: res.message,
-            type: "error",
-          });
-        }
-        this.delDialog = false;
-      });
-    },
     // 分页导航
-    handleSizeChange() {
+    handleSizeChange () {
       this.getData();
     },
-    handleCurrentChange() {
+    handleCurrentChange () {
       this.getData();
     },
   },

src/views/nobleman/GuildMemberInfo.vue

@@ -3,172 +3,163 @@
     <!-- 查询 -->
     <div class="inquire">
       <span>ID</span>
-      <el-input
+      <el-input v-model="inquire.userId"
-        v-model="inquire.userId"
                 placeholder=""
-        class="input"
+                class="input"></el-input>
-      ></el-input>
     </div>
     <!-- 工会昵称 -->
     <div class="inquire">
       <span>工会名称</span>
-      <el-input v-model="inquire.nick" placeholder="" class="input"></el-input>
+      <el-input v-model="inquire.nick"
+                placeholder=""
+                class="input"></el-input>
     </div>
     <!-- 时间选择器 -->
     <div class="inquire">
       <div class="block">
         <span class="demonstration">日期</span>
-        <el-date-picker
+        <el-date-picker v-model="inquire.time"
-          v-model="inquire.time"
                         type="datetimerange"
                         range-separator="至"
                         start-placeholder="开始日期"
-          end-placeholder="结束日期"
+                        end-placeholder="结束日期">
-        >
         </el-date-picker>
       </div>
     </div>
     <!-- 查询按钮 -->
-    <el-button class="primary" type="primary" @click="getData()"
+    <el-button class="primary"
-      >查询</el-button
+               type="primary"
-    >
+               @click="getData()">查询</el-button>
     <!-- 导出按钮 -->
-    <el-button class="primary" type="primary" @click="exportFamilyMemberFun()"
+    <el-button class="primary"
-      >导出</el-button
+               type="primary"
-    >
+               @click="exportFamilyMemberFun()">导出</el-button>
 
     <!-- 表格 -->
-    <el-table
+    <el-table v-loading="loading"
-      v-loading="loading"
               :data="tableData"
               border
-      style="width: 100%; margin-top: 25px"
+              style="width: 100%; margin-top: 25px">
-    >
+      <el-table-column prop="familyName"
-      <el-table-column
-        prop="familyOwnerErbanNo"
                        align="center"
-        label="公会长ID"
+                       label="公会昵称" />
-      />
+      <el-table-column prop="erbanNo"
-      <el-table-column
-        prop="familyOwnerNick"
                        align="center"
-        label="公会长昵称"
+                       label="成员ID" />
-      />
+      <el-table-column prop="nick"
-      <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="成员昵称" />
-      <el-table-column prop="goldIncome" align="center" label="金币总收入" />
-      <el-table-column prop="diamondRemain" align="center" label="钻石总收入" />
-      <el-table-column prop="micRemainTime" align="center" label="开播时长" />
-      <el-table-column
-        prop="sendGiftUserNum"
                        align="center"
-        label="送礼用户数"
+                       label="成员昵称" />
-      />
+      <el-table-column prop="partitionName"
-      <el-table-column align="center" label="成员状态">
+                       align="center"
+                       label="成员分区" />
+      <el-table-column prop="goldIncome"
+                       align="center"
+                       label="金币总收入" />
+      <el-table-column prop="diamondRemain"
+                       align="center"
+                       label="钻石总收入" />
+      <el-table-column prop="micRemainTime"
+                       align="center"
+                       label="开播时长" />
+      <el-table-column prop="sendGiftUserNum"
+                       align="center"
+                       label="送礼用户数" />
+      <el-table-column align="center"
+                       label="成员状态">
         <template v-slot="scope">{{
           scope.row.enable ? "有效" : "无效"
         }}</template>
       </el-table-column>
-      <el-table-column align="center" label="是否违规">
+      <el-table-column align="center"
+                       label="是否违规">
         <template v-slot="scope">{{ scope.row.violationNum }}</template>
       </el-table-column>
-      <el-table-column align="center" label="操作" width="300">
+      <el-table-column align="center"
+                       label="操作"
+                       width="300">
         <template v-slot="scope">
-          <el-button
+          <el-button @click="warnClick(scope)"
-            @click="warnClick(scope)"
+                     class="primary"
+                     type="primary"
+                     size="default">违规警告</el-button>
+          <el-button @click="listRecordFun(scope.row)"
                      class="primary"
                      type="primary"
                      size="default"
-            >违规警告</el-button
+                     :disabled="scope.row.violationNum == 0 ? 'disabled' : ''">警告详情</el-button>
-          >
-          <el-button
-            @click="listRecordFun(scope.row)"
-            class="primary"
-            type="primary"
-            size="default"
-            :disabled="scope.row.violationNum == 0 ? 'disabled' : ''"
-            >警告详情</el-button
-          >
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 详情设备信息弹窗 -->
-    <el-dialog v-model="dialogTableVisible" title="警告详情">
+    <el-dialog v-model="dialogTableVisible"
-      <el-table style="width: 100%" :data="tableData2">
+               title="警告详情">
-        <el-table-column property="x" label="成员ID" min-width="100px" />
+      <el-table style="width: 100%"
-        <el-table-column property="x" label="成员昵称" min-width="100px" />
+                :data="tableData2">
-        <el-table-column property="x" label="违规日期" min-width="100px" />
+        <el-table-column property="x"
-        <el-table-column property="x" label="被警告日期" min-width="100px" />
+                         label="成员ID"
-        <el-table-column property="x" label="违规类型" min-width="100px" />
+                         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
+      <el-button class="dialogTableVisibleBut"
-        class="dialogTableVisibleBut"
                  type="primary"
-        @click="dialogTableVisible = false"
+                 @click="dialogTableVisible = false">
-      >
         关闭
       </el-button>
     </el-dialog>
 
     <!-- 违规弹窗 -->
-    <el-dialog v-model="violationDialog" title="新增" width="28%" center>
+    <el-dialog v-model="violationDialog"
+               title="新增"
+               width="28%"
+               center>
       <div style="margin-bottom: 25px">
-        <span
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
-          style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">成员ID</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="violationObj.id"
-          >成员ID</span
-        >
-        <el-input
-          v-model="violationObj.id"
                   style="width: 75%"
                   class="input"
-          disabled
+                  disabled></el-input>
-        ></el-input>
       </div>
 
       <div style="margin-bottom: 25px">
-        <span
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
-          style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">成员昵称</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="violationObj.nick"
-          >成员昵称</span
-        >
-        <el-input
-          v-model="violationObj.nick"
                   style="width: 75%"
                   class="input"
-          disabled
+                  disabled></el-input>
-        ></el-input>
       </div>
 
       <div style="margin-bottom: 25px">
-        <span
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
-          style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">违规日期</span>
-          class="col-sm-2 control-label"
+        <el-date-picker v-model="violationObj.time"
-          >违规日期</span
-        >
-        <el-date-picker
-          v-model="violationObj.time"
                         type="datetime"
-          placeholder="选择日期时间"
+                        placeholder="选择日期时间">
-        >
         </el-date-picker>
       </div>
 
       <div style="margin-bottom: 25px">
-        <span
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
-          style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">违规类型</span>
-          class="col-sm-2 control-label"
+        <el-select v-model="violationObj.nowValue"
-          >违规类型</span
+                   placeholder="请选择">
-        >
+          <el-option v-for="item in violationObj.options"
-        <el-select v-model="violationObj.nowValue" placeholder="请选择">
-          <el-option
-            v-for="item in violationObj.options"
                      :key="item.id"
                      :label="item.type"
-            :value="item.id"
+                     :value="item.id">
-          >
           </el-option>
         </el-select>
       </div>
@@ -176,7 +167,8 @@
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="violationDialog = false">取消</el-button>
-          <el-button type="primary" @click="add(violationObj)">
+          <el-button type="primary"
+                     @click="add(violationObj)">
             确认
           </el-button>
         </span>
@@ -184,8 +176,7 @@
     </el-dialog>
 
     <!-- 分页 -->
-    <el-pagination
+    <el-pagination style="margin-top: 10px"
-      style="margin-top: 10px"
                    class="paginationClass"
                    v-model:current-page="currentPage"
                    v-model:page-size="pageSize"
@@ -193,8 +184,7 @@
                    layout="sizes, prev, pager, next"
                    :total="total"
                    @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
+                   @current-change="handleCurrentChange" />
-    />
   </div>
 </template>
 <script>
@@ -211,7 +201,7 @@ import { dateFormat } from "@/utils/system-helper";
 import { ElMessage } from "element-plus";
 export default {
   name: "GuildMemberInfo",
-  data() {
+  data () {
     return {
       loading: false,
       //查询所需条件对象
@@ -220,15 +210,8 @@ export default {
         nick: "",
         time: "",
       },
-      // 表格
+      //新增所需对象
-      tableData: [],
+      resource: {
-      // 内嵌表格
-      dialogTableVisible: false,
-      tableData2: [],
-      //   新增弹窗
-      violationDialog: false,
-      // 违规对象
-      violationObj: {
         id: "",
         nick: "",
         time: "",
@@ -236,13 +219,17 @@ export default {
         options: [],
         familyMemberId: null,
       },
+      // 表格
+      tableData: [],
+      //   新增弹窗
+      addDialog: false,
       // 分页
       total: 10, //总页数
       currentPage: 1, //页码
       pageSize: 10, //条数
     };
   },
-  created() {
+  created () {
     this.getData();
     listFun().then((res) => {
       this.violationObj.options = res.data;
@@ -250,7 +237,7 @@ export default {
   },
   methods: {
     // 查询接口
-    getData() {
+    getData () {
       this.loading = true;
       let time = this.inquire.time;
       let startTime = "";
@@ -275,7 +262,7 @@ export default {
       });
     },
     // 导出
-    exportFamilyMemberFun() {
+    exportFamilyMemberFun () {
       this.loading = true;
       let time = this.inquire.time;
       let startTime = "";
@@ -295,7 +282,7 @@ export default {
       });
     },
     // 违规警告
-    warnClick(val) {
+    warnClick (val) {
       console.log(val.row);
       var obj = val.row;
       this.violationObj.id = val.row.erbanNo;
@@ -303,7 +290,7 @@ export default {
       this.violationObj.familyMemberId = val.row.familyMemberId;
       this.violationDialog = true;
     },
-    add(val) {
+    add (val) {
       var num = this.violationObj.options.map((item, i) => {
         return this.violationObj.nowValue == item.id ? i : null;
       });
@@ -331,7 +318,7 @@ export default {
         }
       });
     },
-    listRecordFun(val) {
+    listRecordFun (val) {
       let time = this.inquire.time;
       let startTime = "";
       let endTime = "";
@@ -361,10 +348,10 @@ export default {
       });
     },
     // 分页导航
-    handleSizeChange() {
+    handleSizeChange () {
       this.getData();
     },
-    handleCurrentChange() {
+    handleCurrentChange () {
       this.getData();
     },
   },