From a084e1d9796329fa74bc3cb5f0d84ff3a2c1c77f Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Sun, 13 Aug 2023 21:23:11 +0800
Subject: [PATCH 01/24] =?UTF-8?q?feat:=20=E2=9C=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/menu/modules/setting.ts                   |   2 +-
 src/menu/modules/tool.ts                      |   2 +-
 src/menu/modules/workplace.ts                 |  43 +++++
 src/pages/workplace/configuration.vue         |  17 ++
 .../workplace/manage/components/Apply.vue     | 130 +++++++++++++++
 src/pages/workplace/manage/index.vue          | 149 ++++++++++++++++++
 6 files changed, 341 insertions(+), 2 deletions(-)
 create mode 100644 src/menu/modules/workplace.ts
 create mode 100644 src/pages/workplace/configuration.vue
 create mode 100644 src/pages/workplace/manage/components/Apply.vue
 create mode 100644 src/pages/workplace/manage/index.vue

diff --git a/src/menu/modules/setting.ts b/src/menu/modules/setting.ts
index 2dfb78a..9faa330 100644
--- a/src/menu/modules/setting.ts
+++ b/src/menu/modules/setting.ts
@@ -9,7 +9,7 @@ const home: Menu.MenuOptions = {
     isHide: false,
     isKeepAlive: true,
     isLink: '',
-    index: 8,
+    index: 9,
     title: '设置'
   },
   children: [
diff --git a/src/menu/modules/tool.ts b/src/menu/modules/tool.ts
index 45c6385..807678c 100644
--- a/src/menu/modules/tool.ts
+++ b/src/menu/modules/tool.ts
@@ -9,7 +9,7 @@ const home: Menu.MenuOptions = {
     isHide: false,
     isKeepAlive: true,
     isLink: '',
-    index: 7,
+    index: 8,
     title: '工具'
   },
   children: [
diff --git a/src/menu/modules/workplace.ts b/src/menu/modules/workplace.ts
new file mode 100644
index 0000000..4e73eca
--- /dev/null
+++ b/src/menu/modules/workplace.ts
@@ -0,0 +1,43 @@
+const home: Menu.MenuOptions = {
+  name: 'tool',
+  path: '/workplace',
+  meta: {
+    icon: 'i-bd-all-application',
+    isAffix: false,
+    isFull: false,
+    isHide: false,
+    isKeepAlive: true,
+    isLink: '',
+    index: 7,
+    title: '工作台'
+  },
+  children: [
+    {
+      name: 'workplaceManage',
+      path: '/workplace/manage',
+      meta: {
+        icon: 'i-bd-application',
+        isAffix: false,
+        isFull: false,
+        isHide: false,
+        isKeepAlive: true,
+        isLink: '',
+        title: '应用管理'
+      }
+    },
+    {
+      name: 'workplaceConfiguration',
+      path: '/workplace/configuration',
+      meta: {
+        icon: 'i-bd-setting-config',
+        isAffix: false,
+        isFull: false,
+        isHide: false,
+        isKeepAlive: true,
+        isLink: '',
+        title: '工作台设置'
+      }
+    }
+  ]
+};
+export default home;
diff --git a/src/pages/workplace/configuration.vue b/src/pages/workplace/configuration.vue
new file mode 100644
index 0000000..cddf4b3
--- /dev/null
+++ b/src/pages/workplace/configuration.vue
@@ -0,0 +1,17 @@
+<template>
+  <bd-page class="flex-col">
+    <div class="flex-1 el-card border-none flex-col box-border overflow-hidden">
+      <div>工作台设置</div>
+    </div>
+  </bd-page>
+</template>
+
+<route lang="yaml">
+meta:
+  title: 工作台设置
+  isAffix: false
+</route>
+
+<script lang="tsx" setup>
+
+</script>
diff --git a/src/pages/workplace/manage/components/Apply.vue b/src/pages/workplace/manage/components/Apply.vue
new file mode 100644
index 0000000..b536061
--- /dev/null
+++ b/src/pages/workplace/manage/components/Apply.vue
@@ -0,0 +1,130 @@
+<template>
+  <el-dialog
+    :model-value="value"
+    :width="600"
+    :align-center="true"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    :draggable="true"
+    :z-index="99"
+    title="新增应用"
+    @close="onClose"
+  >
+    <el-form :model="formData" label-width="96px">
+      <el-form-item label="应用名称">
+        <el-input v-model="formData.app_version" placeholder="请输入应用名称" />
+      </el-form-item>
+      <el-form-item label="应用APP ID">
+        <el-input v-model="formData.app_version" placeholder="请输入应用APP ID" />
+      </el-form-item>
+      <el-form-item label="应用图标">
+        <el-upload
+          ref="upload"
+          class="bd-uplod"
+          action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
+          list-type="picture-card"
+          :limit="1"
+          :auto-upload="false"
+        >
+          <el-icon><Plus /></el-icon>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="PC端地址">
+        <el-input v-model="formData.app_version" placeholder="请输入PC端地址" />
+      </el-form-item>
+      <el-form-item label="移动端地址">
+        <el-input v-model="formData.app_version" placeholder="请输入移动端地址" />
+      </el-form-item>
+      <el-form-item label="应用状态">
+        <el-checkbox-group v-model="formData.type">
+          <el-checkbox label="pc">PC</el-checkbox>
+          <el-checkbox label="app">移动端</el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <el-form-item label="应用描述">
+        <el-input
+          v-model="formData.update_desc"
+          type="textarea"
+          :autosize="{ minRows: 6, maxRows: 8 }"
+          placeholder="请输入应用描述"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-space>
+        <el-button @click="onClose">取消</el-button>
+        <el-button type="primary" :loading="loaging" @click="onSend">发送</el-button>
+      </el-space>
+    </template>
+  </el-dialog>
+</template>
+
+<script lang="ts" name="Apply" setup>
+import { ref } from 'vue';
+import { ElMessage } from 'element-plus';
+import { Plus } from '@element-plus/icons-vue';
+// API 接口
+import { commonAppversionPost } from '@/api/tool';
+interface IProps {
+  value: boolean;
+}
+const props = withDefaults(defineProps<IProps>(), {
+  value: false
+});
+
+const content = ref('');
+const loaging = ref<boolean>(false);
+const formData = reactive({
+  app_version: '',
+  os: 'android',
+  is_force: 0,
+  update_desc: '',
+  download_url: '',
+  type: []
+});
+
+const emits = defineEmits<{
+  (e: 'update:value', item: boolean): void;
+  (e: 'ok', item: any): void;
+}>();
+
+watch(
+  () => props.value,
+  (n, _o) => {
+    props.value = n;
+  }
+);
+// 取消
+const onClose = () => {
+  emits('update:value', false);
+};
+// 发送
+const onSend = () => {
+  loaging.value = true;
+  commonAppversionPost(formData)
+    .then((res: any) => {
+      loaging.value = false;
+      if (res.status == 200) {
+        ElMessage.success('新增成功！');
+        content.value = '';
+        onClose();
+        emits('ok', true);
+      }
+    })
+    .catch(err => {
+      loaging.value = false;
+      if (err.status == 400) {
+        ElMessage.error(err.msg);
+      }
+    });
+};
+</script>
+
+<style lang="scss" scoped>
+.bd-uplod {
+  ::v-deep(.el-upload--picture-card) {
+    height: 78px;
+    width: 78px;
+  }
+}
+</style>
diff --git a/src/pages/workplace/manage/index.vue b/src/pages/workplace/manage/index.vue
new file mode 100644
index 0000000..35897cc
--- /dev/null
+++ b/src/pages/workplace/manage/index.vue
@@ -0,0 +1,149 @@
+<template>
+  <bd-page class="flex-col">
+    <div class="flex-1 el-card border-none flex-col box-border overflow-hidden">
+      <div class="h-50px pl-12px pr-12px box-border flex items-center justify-between bd-title">
+        <div class="bd-title-left">
+          <p class="m-0 font-600">应用管理</p>
+        </div>
+        <div class="flex items-center h-50px">
+          <el-form inline>
+            <el-form-item class="mb-0 !mr-16px">
+              <el-input v-model="queryFrom.keyword" placeholder="应用名称/APP ID" clearable />
+            </el-form-item>
+            <el-form-item class="mb-0 !mr-0">
+              <el-button type="primary" @click="onAppVersionAdd">新增应用</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+
+      <div class="flex-1 overflow-hidden p-12px">
+        <el-table v-loading="loadTable" :data="tableData" :border="true" style="width: 100%; height: 100%">
+          <el-table-column type="index" :width="42" :align="'center'" :fixed="'left'">
+            <template #header>
+              <i-bd-setting class="cursor-pointer" size="16" />
+            </template>
+          </el-table-column>
+          <el-table-column v-for="item in column" v-bind="item" :key="item.prop">
+            <template #default="scope">
+              <template v-if="item.render">
+                <component :is="item.render" :row="scope.row"> </component>
+              </template>
+              <template v-else-if="item.formatter">
+                <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
+              </template>
+              <template v-else>
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+              </template>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="bd-card-footer pl-12px pr-12px mb-12px flex items-center justify-between">
+        <div></div>
+        <el-pagination
+          v-model:current-page="queryFrom.page_index"
+          v-model:page-size="queryFrom.page_size"
+          :page-sizes="[15, 20, 30, 50, 100]"
+          :background="true"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+          @size-change="onSizeChange"
+          @current-change="onCurrentChange"
+        />
+      </div>
+    </div>
+  </bd-page>
+  <!-- 应用 -->
+  <Apply v-model:value="applyAddValue" />
+</template>
+
+<route lang="yaml">
+meta:
+  title: 应用管理
+  isAffix: false
+</route>
+
+<script lang="tsx" setup>
+import { ElButton, ElSpace } from 'element-plus';
+import Apply from './components/Apply.vue';
+/**
+ * 表格
+ */
+const column = reactive<Column.ColumnOptions[]>([
+  {
+    prop: 'icon',
+    label: '应用LOGO'
+  },
+  {
+    prop: 'name',
+    label: '应用名称'
+  },
+  {
+    prop: 'no',
+    label: '应用APP ID'
+  },
+  {
+    prop: 'status',
+    label: '应用状态',
+    formatter(row: any) {
+      return row.status === 1 ? '开启' : '关闭';
+    }
+  },
+  {
+    prop: 'des',
+    label: '应用描述'
+  },
+  {
+    prop: 'operation',
+    label: '操作',
+    align: 'center',
+    render: (_scope: any) => {
+      return (
+        <ElSpace>
+          <ElButton type="primary">配置</ElButton>
+        </ElSpace>
+      );
+    }
+  }
+]);
+const tableData = ref<any[]>([]);
+const loadTable = ref<boolean>(false);
+// 分页
+const total = ref(0);
+
+// 查询
+const queryFrom = reactive({
+  keyword: '',
+  page_size: 15,
+  page_index: 1
+});
+
+// 搜索
+const getTableList = () => {};
+
+// 分页page-size
+const onSizeChange = (size: number) => {
+  queryFrom.page_size = size;
+  getTableList();
+};
+
+// 分页page-size
+const onCurrentChange = (current: number) => {
+  queryFrom.page_index = current;
+  getTableList();
+};
+
+// 新增版本
+const applyAddValue = ref<boolean>(false);
+const onAppVersionAdd = () => {
+  applyAddValue.value = true;
+};
+</script>
+
+<style lang="scss" scoped>
+// 样式
+.bd-title {
+  border-bottom: 1px solid var(--el-card-border-color);
+}
+</style>

From 26cc7b3a37904120a972d9956b11eeaa97d5ec5d Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Sun, 13 Aug 2023 23:49:05 +0800
Subject: [PATCH 02/24] =?UTF-8?q?feat:=20=E2=9C=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workplace/configuration.vue         |  17 --
 .../configuration/components/Banner.vue       | 130 +++++++++++
 .../configuration/components/CustomGroup.vue  | 201 ++++++++++++++++++
 .../configuration/components/Recommend.vue    | 130 +++++++++++
 src/pages/workplace/configuration/index.vue   |  54 +++++
 src/styles/element.scss                       |  62 +++++-
 6 files changed, 575 insertions(+), 19 deletions(-)
 delete mode 100644 src/pages/workplace/configuration.vue
 create mode 100644 src/pages/workplace/configuration/components/Banner.vue
 create mode 100644 src/pages/workplace/configuration/components/CustomGroup.vue
 create mode 100644 src/pages/workplace/configuration/components/Recommend.vue
 create mode 100644 src/pages/workplace/configuration/index.vue

diff --git a/src/pages/workplace/configuration.vue b/src/pages/workplace/configuration.vue
deleted file mode 100644
index cddf4b3..0000000
--- a/src/pages/workplace/configuration.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-  <bd-page class="flex-col">
-    <div class="flex-1 el-card border-none flex-col box-border overflow-hidden">
-      <div>工作台设置</div>
-    </div>
-  </bd-page>
-</template>
-
-<route lang="yaml">
-meta:
-  title: 工作台设置
-  isAffix: false
-</route>
-
-<script lang="tsx" setup>
-
-</script>
diff --git a/src/pages/workplace/configuration/components/Banner.vue b/src/pages/workplace/configuration/components/Banner.vue
new file mode 100644
index 0000000..640a2d5
--- /dev/null
+++ b/src/pages/workplace/configuration/components/Banner.vue
@@ -0,0 +1,130 @@
+<template>
+  <bd-page class="flex-col !p-0">
+    <div class="flex-1 el-card border-none flex-col box-border overflow-hidden">
+      <div class="h-50px pl-12px pr-12px box-border flex items-center justify-between bd-title">
+        <div class="bd-title-left"></div>
+        <div class="flex items-center h-50px">
+          <el-form inline>
+            <el-form-item class="mb-0 !mr-16px">
+              <el-input v-model="queryFrom.keyword" placeholder="轮播名称" clearable />
+            </el-form-item>
+            <el-form-item class="mb-0 !mr-0">
+              <el-button type="primary">新增轮播</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+
+      <div class="flex-1 overflow-hidden p-12px">
+        <el-table v-loading="loadTable" :data="tableData" :border="true" style="width: 100%; height: 100%">
+          <el-table-column type="index" :width="42" :align="'center'" :fixed="'left'">
+            <template #header>
+              <i-bd-setting class="cursor-pointer" size="16" />
+            </template>
+          </el-table-column>
+          <el-table-column v-for="item in column" v-bind="item" :key="item.prop">
+            <template #default="scope">
+              <template v-if="item.render">
+                <component :is="item.render" :row="scope.row"> </component>
+              </template>
+              <template v-else-if="item.formatter">
+                <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
+              </template>
+              <template v-else>
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+              </template>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="bd-card-footer pl-12px pr-12px mb-12px flex items-center justify-between">
+        <div></div>
+        <el-pagination
+          v-model:current-page="queryFrom.page_index"
+          v-model:page-size="queryFrom.page_size"
+          :page-sizes="[15, 20, 30, 50, 100]"
+          :background="true"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+          @size-change="onSizeChange"
+          @current-change="onCurrentChange"
+        />
+      </div>
+    </div>
+  </bd-page>
+</template>
+
+<script lang="tsx" name="Banner" setup>
+import { ElButton, ElSpace } from 'element-plus';
+/**
+ * 表格
+ */
+const column = reactive<Column.ColumnOptions[]>([
+  {
+    prop: 'name',
+    label: '名称'
+  },
+  {
+    prop: 'no',
+    label: '编码'
+  },
+  {
+    prop: 'status',
+    label: '状态',
+    formatter(row: any) {
+      return row.status === 1 ? '开启' : '关闭';
+    }
+  },
+  {
+    prop: 'des',
+    label: '描述'
+  },
+  {
+    prop: 'operation',
+    label: '操作',
+    align: 'center',
+    render: (_scope: any) => {
+      return (
+        <ElSpace>
+          <ElButton type="primary">配置</ElButton>
+        </ElSpace>
+      );
+    }
+  }
+]);
+const tableData = ref<any[]>([]);
+const loadTable = ref<boolean>(false);
+// 分页
+const total = ref(0);
+
+// 查询
+const queryFrom = reactive({
+  keyword: '',
+  page_size: 15,
+  page_index: 1
+});
+
+// 搜索
+const getTableList = () => {};
+
+// 分页page-size
+const onSizeChange = (size: number) => {
+  queryFrom.page_size = size;
+  getTableList();
+};
+
+// 分页page-size
+const onCurrentChange = (current: number) => {
+  queryFrom.page_index = current;
+  getTableList();
+};
+
+// 新增版本
+</script>
+
+<style lang="scss" scoped>
+// 样式
+.bd-title {
+  border-bottom: 1px solid var(--el-card-border-color);
+}
+</style>
diff --git a/src/pages/workplace/configuration/components/CustomGroup.vue b/src/pages/workplace/configuration/components/CustomGroup.vue
new file mode 100644
index 0000000..c903d84
--- /dev/null
+++ b/src/pages/workplace/configuration/components/CustomGroup.vue
@@ -0,0 +1,201 @@
+<template>
+  <bd-page class="flex !p-0">
+    <!-- S 左侧分类 -->
+    <div class="bd-sort min-w-200px max-w-200px h-full box-border flex flex-col">
+      <div class="h-50px pl-12px pr-12px box-border flex items-center justify-between bd-title">
+        <div class="bd-title-left font-500 text-14px">分组</div>
+        <div class="flex items-center h-50px">
+          <i-bd-add :size="22" class="cursor-pointer" />
+        </div>
+      </div>
+      <div class="m-12px">
+        <el-input v-model="queryFrom.keyword" placeholder="搜索分类/按回车键搜索" clearable />
+      </div>
+      <div class="flex-1 overflow-hidden">
+        <el-scrollbar>
+          <el-tree :data="dataTree">
+            <template #default="{ node }">
+              <div class="bd-tree-node">
+                <div>{{ node.label }}</div>
+                <div class="pr-12px flex items-center bd-opt">
+                  <i-bd-editor :size="16" class="cursor-pointer pr-4px" />
+                  <i-bd-delete :size="16" class="cursor-pointer" />
+                </div>
+              </div>
+            </template>
+          </el-tree>
+        </el-scrollbar>
+      </div>
+    </div>
+    <!-- E 左侧分类 -->
+
+    <!-- S 右侧 表格 -->
+    <div class="flex-1 h-full flex flex-col">
+      <div class="h-50px pl-12px pr-12px box-border flex items-center justify-between bd-title">
+        <div class="bd-title-left"></div>
+        <div class="flex items-center h-50px">
+          <el-form inline>
+            <el-form-item class="mb-0 !mr-16px">
+              <el-input v-model="queryFrom.keyword" placeholder="名称" clearable />
+            </el-form-item>
+            <el-form-item class="mb-0 !mr-0">
+              <el-button type="primary">新增应用</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+      <!-- 表格 -->
+      <div class="flex-1 overflow-hidden p-12px">
+        <el-table v-loading="loadTable" :data="tableData" :border="true" style="width: 100%; height: 100%">
+          <el-table-column type="index" :width="42" :align="'center'" :fixed="'left'">
+            <template #header>
+              <i-bd-setting class="cursor-pointer" size="16" />
+            </template>
+          </el-table-column>
+          <el-table-column v-for="item in column" v-bind="item" :key="item.prop">
+            <template #default="scope">
+              <template v-if="item.render">
+                <component :is="item.render" :row="scope.row"> </component>
+              </template>
+              <template v-else-if="item.formatter">
+                <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
+              </template>
+              <template v-else>
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+              </template>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!-- 分页 -->
+      <div class="bd-card-footer pl-12px pr-12px mb-12px flex items-center justify-between">
+        <div></div>
+        <el-pagination
+          v-model:current-page="queryFrom.page_index"
+          v-model:page-size="queryFrom.page_size"
+          :page-sizes="[15, 20, 30, 50, 100]"
+          :background="true"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+          @size-change="onSizeChange"
+          @current-change="onCurrentChange"
+        />
+      </div>
+    </div>
+    <!-- E 右侧 表格 -->
+  </bd-page>
+</template>
+
+<script lang="tsx" name="CustomGroup" setup>
+import { ElButton, ElSpace } from 'element-plus';
+
+interface Tree {
+  id: number;
+  label: string;
+}
+/**
+ * 左侧分类
+ */
+const dataTree = ref<Tree[]>([
+  {
+    id: 1,
+    label: '项目管理'
+  },
+  {
+    id: 2,
+    label: '开发管理'
+  }
+]);
+
+/**
+ * 表格
+ */
+const column = reactive<Column.ColumnOptions[]>([
+  {
+    prop: 'name',
+    label: '名称'
+  },
+  {
+    prop: 'no',
+    label: '编码'
+  },
+  {
+    prop: 'status',
+    label: '状态',
+    formatter(row: any) {
+      return row.status === 1 ? '开启' : '关闭';
+    }
+  },
+  {
+    prop: 'des',
+    label: '描述'
+  },
+  {
+    prop: 'operation',
+    label: '操作',
+    align: 'center',
+    render: (_scope: any) => {
+      return (
+        <ElSpace>
+          <ElButton type="primary">配置</ElButton>
+        </ElSpace>
+      );
+    }
+  }
+]);
+const tableData = ref<any[]>([]);
+const loadTable = ref<boolean>(false);
+// 分页
+const total = ref(0);
+
+// 查询
+const queryFrom = reactive({
+  keyword: '',
+  page_size: 15,
+  page_index: 1
+});
+
+// 搜索
+const getTableList = () => {};
+
+// 分页page-size
+const onSizeChange = (size: number) => {
+  queryFrom.page_size = size;
+  getTableList();
+};
+
+// 分页page-size
+const onCurrentChange = (current: number) => {
+  queryFrom.page_index = current;
+  getTableList();
+};
+</script>
+
+<style lang="scss" scoped>
+// 分类
+.bd-sort {
+  border-right: 1px solid var(--el-card-border-color);
+}
+
+.bd-tree-node {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  flex: 1;
+  font-size: 14px;
+
+  .bd-opt {
+    display: none;
+  }
+
+  &:hover {
+    .bd-opt {
+      display: block;
+    }
+  }
+}
+
+.bd-title {
+  border-bottom: 1px solid var(--el-card-border-color);
+}
+</style>
diff --git a/src/pages/workplace/configuration/components/Recommend.vue b/src/pages/workplace/configuration/components/Recommend.vue
new file mode 100644
index 0000000..1d28bd7
--- /dev/null
+++ b/src/pages/workplace/configuration/components/Recommend.vue
@@ -0,0 +1,130 @@
+<template>
+  <bd-page class="flex-col !p-0">
+    <div class="flex-1 el-card border-none flex-col box-border overflow-hidden">
+      <div class="h-50px pl-12px pr-12px box-border flex items-center justify-between bd-title">
+        <div class="bd-title-left"></div>
+        <div class="flex items-center h-50px">
+          <el-form inline>
+            <el-form-item class="mb-0 !mr-16px">
+              <el-input v-model="queryFrom.keyword" placeholder="名称" clearable />
+            </el-form-item>
+            <el-form-item class="mb-0 !mr-0">
+              <el-button type="primary">新增推荐应用</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+
+      <div class="flex-1 overflow-hidden p-12px">
+        <el-table v-loading="loadTable" :data="tableData" :border="true" style="width: 100%; height: 100%">
+          <el-table-column type="index" :width="42" :align="'center'" :fixed="'left'">
+            <template #header>
+              <i-bd-setting class="cursor-pointer" size="16" />
+            </template>
+          </el-table-column>
+          <el-table-column v-for="item in column" v-bind="item" :key="item.prop">
+            <template #default="scope">
+              <template v-if="item.render">
+                <component :is="item.render" :row="scope.row"> </component>
+              </template>
+              <template v-else-if="item.formatter">
+                <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
+              </template>
+              <template v-else>
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+              </template>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="bd-card-footer pl-12px pr-12px mb-12px flex items-center justify-between">
+        <div></div>
+        <el-pagination
+          v-model:current-page="queryFrom.page_index"
+          v-model:page-size="queryFrom.page_size"
+          :page-sizes="[15, 20, 30, 50, 100]"
+          :background="true"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+          @size-change="onSizeChange"
+          @current-change="onCurrentChange"
+        />
+      </div>
+    </div>
+  </bd-page>
+</template>
+
+<script lang="tsx" name="Recommend" setup>
+import { ElButton, ElSpace } from 'element-plus';
+/**
+ * 表格
+ */
+const column = reactive<Column.ColumnOptions[]>([
+  {
+    prop: 'name',
+    label: '名称'
+  },
+  {
+    prop: 'no',
+    label: '编码'
+  },
+  {
+    prop: 'status',
+    label: '状态',
+    formatter(row: any) {
+      return row.status === 1 ? '开启' : '关闭';
+    }
+  },
+  {
+    prop: 'des',
+    label: '描述'
+  },
+  {
+    prop: 'operation',
+    label: '操作',
+    align: 'center',
+    render: (_scope: any) => {
+      return (
+        <ElSpace>
+          <ElButton type="primary">配置</ElButton>
+        </ElSpace>
+      );
+    }
+  }
+]);
+const tableData = ref<any[]>([]);
+const loadTable = ref<boolean>(false);
+// 分页
+const total = ref(0);
+
+// 查询
+const queryFrom = reactive({
+  keyword: '',
+  page_size: 15,
+  page_index: 1
+});
+
+// 搜索
+const getTableList = () => {};
+
+// 分页page-size
+const onSizeChange = (size: number) => {
+  queryFrom.page_size = size;
+  getTableList();
+};
+
+// 分页page-size
+const onCurrentChange = (current: number) => {
+  queryFrom.page_index = current;
+  getTableList();
+};
+
+// 新增版本
+</script>
+
+<style lang="scss" scoped>
+// 样式
+.bd-title {
+  border-bottom: 1px solid var(--el-card-border-color);
+}
+</style>
diff --git a/src/pages/workplace/configuration/index.vue b/src/pages/workplace/configuration/index.vue
new file mode 100644
index 0000000..4966209
--- /dev/null
+++ b/src/pages/workplace/configuration/index.vue
@@ -0,0 +1,54 @@
+<template>
+  <bd-page class="flex-col">
+    <div class="flex-1 el-card border-none flex-col box-border overflow-hidden">
+      <el-tabs v-model="activeName" class="bd-tabs" @tab-change="onTabChange">
+        <el-tab-pane v-for="item in tabsData" :key="item.name" :label="item.label" :name="item.name">
+          <component :is="item.render" />
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+  </bd-page>
+</template>
+
+<route lang="yaml">
+meta:
+  title: 工作台设置
+  isAffix: false
+</route>
+
+<script lang="tsx" setup>
+import type { TabPaneName } from 'element-plus';
+import Banner from './components/Banner.vue';
+import Recommend from './components/Recommend.vue';
+import CustomGroup from './components/CustomGroup.vue';
+
+const activeName = ref('banner');
+
+const tabsData = reactive([
+  {
+    name: 'banner',
+    label: '轮播',
+    render: () => {
+      return <Banner />;
+    }
+  },
+  {
+    name: 'recommend',
+    label: '管理员推荐',
+    render: () => {
+      return <Recommend />;
+    }
+  },
+  {
+    name: 'custom-group',
+    label: '自定义分组',
+    render: () => {
+      return <CustomGroup />;
+    }
+  }
+]);
+
+const onTabChange = (tab: TabPaneName) => {
+  console.log(tab);
+};
+</script>
diff --git a/src/styles/element.scss b/src/styles/element.scss
index f9173e0..ced6fdb 100755
--- a/src/styles/element.scss
+++ b/src/styles/element.scss
@@ -11,6 +11,7 @@
 
 /* 当前页面最大化 css */
 .main-maximize {
+
   .aside-split,
   .el-aside,
   .el-header,
@@ -40,6 +41,7 @@
     border-radius: 0;
     box-shadow: none;
   }
+
   .table-search {
     padding: 18px 0 0 !important;
     margin-bottom: 0 !important;
@@ -52,18 +54,22 @@
   flex-direction: column;
   align-items: center;
   height: 100%;
+
   .text {
     margin: 20px 0 30px;
     font-size: 23px;
     font-weight: bold;
     color: var(--el-text-color-regular);
   }
+
   .el-descriptions {
     width: 100%;
     padding: 40px 0 0;
+
     .el-descriptions__title {
       font-size: 18px;
     }
+
     .el-descriptions__label {
       width: 200px;
     }
@@ -75,6 +81,7 @@
   display: flex;
   width: 100%;
   height: 100%;
+
   .table-box {
     // 这里减去的是 treeFilter 组件宽度
     width: calc(100% - 230px);
@@ -94,8 +101,9 @@
   .table-search {
     padding: 18px 18px 0;
     margin-bottom: 10px;
+
     .el-form {
-      .el-form-item__content > * {
+      .el-form-item__content>* {
         width: 100%;
       }
 
@@ -104,6 +112,7 @@
         padding: 0 10px;
       }
     }
+
     .operation {
       display: flex;
       align-items: center;
@@ -117,9 +126,11 @@
     .header-button-lf {
       float: left;
     }
+
     .header-button-ri {
       float: right;
     }
+
     .el-button {
       margin-bottom: 15px;
     }
@@ -133,6 +144,7 @@
     table {
       width: 100%;
     }
+
     .el-table__header th {
       height: 45px;
       font-size: 15px;
@@ -140,16 +152,18 @@
       color: var(--el-text-color-primary);
       background: var(--el-fill-color-light);
     }
+
     .el-table__row {
       height: 45px;
       font-size: 14px;
+
       .el-table__placeholder {
         display: inline;
       }
     }
 
     // 设置 el-table 中 header 文字不换行，并省略
-    .el-table__header .el-table__cell > .cell {
+    .el-table__header .el-table__cell>.cell {
       white-space: nowrap;
     }
 
@@ -159,6 +173,7 @@
       top: 50%;
       left: 50%;
       transform: translate(-50%, -50%);
+
       .table-empty {
         line-height: 30px;
       }
@@ -186,16 +201,19 @@
     height: 40px !important;
     font-size: 14px !important;
   }
+
   .el-table__row {
     height: 40px !important;
     font-size: 13px !important;
   }
 }
+
 .el-table--large {
   .el-table__header th {
     height: 50px !important;
     font-size: 16px !important;
   }
+
   .el-table__row {
     height: 50px !important;
     font-size: 15px !important;
@@ -208,12 +226,14 @@
     padding: 16px 20px;
     margin-bottom: 0;
     border-bottom: 1px solid var(--el-border-color-lighter);
+
     span {
       font-size: 17px;
       line-height: 17px;
       color: var(--el-text-color-primary) !important;
     }
   }
+
   .el-drawer__footer {
     border-top: 1px solid var(--el-border-color-lighter);
   }
@@ -227,8 +247,10 @@
   .drawer-multiColumn-form {
     display: flex;
     flex-wrap: wrap;
+
     .el-form-item {
       width: 47%;
+
       &:nth-child(2n-1) {
         margin-right: 5%;
       }
@@ -242,6 +264,7 @@
     padding: 15px 20px;
     margin: 0;
     border-bottom: 1px solid var(--el-border-color-lighter);
+
     .el-dialog__title {
       font-size: 17px;
     }
@@ -258,12 +281,47 @@
     background: var(--el-fill-color-light);
   }
 }
+
 /* el-menu-item */
 .el-menu-item {
   height: 48px !important;
   line-height: 48px !important;
 }
+
 /* bu-button*/
 .bu-button:focus-visible {
   outline: 0;
 }
+
+/* bd-tabs */
+.bd-tabs {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+
+  .el-tabs__header {
+    margin: 0;
+  }
+
+  .el-tabs__nav-wrap {
+    padding: 0 24px;
+
+    &::after {
+      height: 1px;
+    }
+  }
+
+  .el-tabs__item {
+    padding: 0 12px;
+  }
+
+  .el-tabs__content {
+    flex: 1;
+    height: 100% !important;
+  }
+
+  .el-tab-pane {
+    flex: 1;
+    height: 100% !important;
+  }
+}

From 845436e54d3208e3288f7977e2053bc03d24d859 Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Wed, 6 Sep 2023 00:14:23 +0800
Subject: [PATCH 03/24] =?UTF-8?q?feat:=20=E2=9C=A8=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/file.ts                               |  10 ++
 src/api/workplace/banner.ts                   |  19 +++
 .../configuration/components/Banner.vue       |  39 +++--
 .../configuration/components/BannerDialog.vue | 160 ++++++++++++++++++
 src/pages/workplace/configuration/index.vue   |   9 +-
 src/pages/workplace/manage/index.vue          |   4 +-
 6 files changed, 222 insertions(+), 19 deletions(-)
 create mode 100644 src/api/file.ts
 create mode 100644 src/api/workplace/banner.ts
 create mode 100644 src/pages/workplace/configuration/components/BannerDialog.vue

diff --git a/src/api/file.ts b/src/api/file.ts
new file mode 100644
index 0000000..eb98769
--- /dev/null
+++ b/src/api/file.ts
@@ -0,0 +1,10 @@
+import request from '@/utils/axios';
+
+// 获取文件路径
+export function feileGet(params?: any) {
+  return request({
+    url: '/file/upload',
+    method: 'get',
+    params
+  });
+}
diff --git a/src/api/workplace/banner.ts b/src/api/workplace/banner.ts
new file mode 100644
index 0000000..544b2c0
--- /dev/null
+++ b/src/api/workplace/banner.ts
@@ -0,0 +1,19 @@
+import request from '@/utils/axios';
+
+// 获取轮播
+export function bannerGet(params?: any) {
+  return request({
+    url: '/workplace/banner',
+    method: 'get',
+    params
+  });
+}
+
+// 新增轮播
+export function bannerPost(data: any) {
+  return request({
+    url: '/manager/workplace/banner',
+    method: 'post',
+    data
+  });
+}
diff --git a/src/pages/workplace/configuration/components/Banner.vue b/src/pages/workplace/configuration/components/Banner.vue
index 640a2d5..84fbeac 100644
--- a/src/pages/workplace/configuration/components/Banner.vue
+++ b/src/pages/workplace/configuration/components/Banner.vue
@@ -9,7 +9,7 @@
               <el-input v-model="queryFrom.keyword" placeholder="轮播名称" clearable />
             </el-form-item>
             <el-form-item class="mb-0 !mr-0">
-              <el-button type="primary">新增轮播</el-button>
+              <el-button type="primary" @click="onBannerDialogValue">新增轮播</el-button>
             </el-form-item>
           </el-form>
         </div>
@@ -51,32 +51,38 @@
         />
       </div>
     </div>
+    <!-- 轮播 -->
+    <BannerDialog v-model:value="bannerDialogValue" />
   </bd-page>
 </template>
 
 <script lang="tsx" name="Banner" setup>
 import { ElButton, ElSpace } from 'element-plus';
+import BannerDialog from './BannerDialog.vue';
+
+// API接口
+import { bannerGet } from '@/api/workplace/banner';
 /**
  * 表格
  */
 const column = reactive<Column.ColumnOptions[]>([
   {
-    prop: 'name',
+    prop: 'title',
     label: '名称'
   },
   {
-    prop: 'no',
-    label: '编码'
+    prop: 'route',
+    label: '地址'
   },
   {
     prop: 'status',
-    label: '状态',
+    label: '打开方式',
     formatter(row: any) {
-      return row.status === 1 ? '开启' : '关闭';
+      return row.status === 0 ? '网页' : '原生';
     }
   },
   {
-    prop: 'des',
+    prop: 'description',
     label: '描述'
   },
   {
@@ -86,7 +92,8 @@ const column = reactive<Column.ColumnOptions[]>([
     render: (_scope: any) => {
       return (
         <ElSpace>
-          <ElButton type="primary">配置</ElButton>
+          <ElButton type="primary">编辑</ElButton>
+          <ElButton>删除</ElButton>
         </ElSpace>
       );
     }
@@ -105,7 +112,11 @@ const queryFrom = reactive({
 });
 
 // 搜索
-const getTableList = () => {};
+const getTableList = () => {
+  bannerGet(queryFrom).then((res: any) => {
+    tableData.value = res;
+  });
+};
 
 // 分页page-size
 const onSizeChange = (size: number) => {
@@ -119,7 +130,15 @@ const onCurrentChange = (current: number) => {
   getTableList();
 };
 
-// 新增版本
+// 新增轮播
+const bannerDialogValue = ref(false);
+const onBannerDialogValue = () => {
+  bannerDialogValue.value = true;
+};
+
+onMounted(() => {
+  getTableList();
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/workplace/configuration/components/BannerDialog.vue b/src/pages/workplace/configuration/components/BannerDialog.vue
new file mode 100644
index 0000000..5ab7f2f
--- /dev/null
+++ b/src/pages/workplace/configuration/components/BannerDialog.vue
@@ -0,0 +1,160 @@
+<template>
+  <el-dialog
+    :model-value="value"
+    :width="600"
+    :align-center="true"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    :draggable="true"
+    :z-index="99"
+    title="新增轮播"
+    @close="onClose"
+  >
+    <el-form :model="formData" label-width="96px">
+      <el-form-item label="标题">
+        <el-input v-model="formData.title" placeholder="请输入标题" />
+      </el-form-item>
+      <el-form-item label="图片">
+        <el-upload
+          ref="upload"
+          class="bd-uplod"
+          :action="actionURL"
+          list-type="picture-card"
+          :show-file-list="false"
+          :headers="headers"
+          :before-upload="beforeAvatarUpload"
+          :on-success="handleAvatarSuccess"
+        >
+          <img v-if="formData.cover" :src="`${BU_DOU_CONFIG.APP_URL}${formData.cover}`" class="avatar" />
+          <el-icon v-else><Plus /></el-icon>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="打开方式">
+        <el-radio-group v-model="formData.jump_type">
+          <el-radio :label="0">网页</el-radio>
+          <el-radio :label="1">APP</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="地址">
+        <el-input v-model="formData.route" placeholder="请输入地址" />
+      </el-form-item>
+      <el-form-item label="描述">
+        <el-input
+          v-model="formData.description"
+          type="textarea"
+          :autosize="{ minRows: 6, maxRows: 8 }"
+          placeholder="请输入描述"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-space>
+        <el-button @click="onClose">取消</el-button>
+        <el-button type="primary" :loading="loaging" @click="onSend">保存</el-button>
+      </el-space>
+    </template>
+  </el-dialog>
+</template>
+
+<script lang="ts" name="BannerDialog" setup>
+import { ref } from 'vue';
+import { ElMessage } from 'element-plus';
+import { Plus } from '@element-plus/icons-vue';
+import { useUserStore } from '@/stores/modules/user';
+// API 接口
+import { bannerPost } from '@/api/workplace/banner';
+import { feileGet } from '@/api/file';
+
+import { BU_DOU_CONFIG } from '@/config';
+
+interface IProps {
+  value: boolean;
+}
+
+const userStore = useUserStore();
+const props = withDefaults(defineProps<IProps>(), {
+  value: false
+});
+
+const content = ref('');
+const loaging = ref<boolean>(false);
+const formData = reactive({
+  cover: '',
+  title: '',
+  description: '',
+  route: '',
+  jump_type: 0
+});
+
+const emits = defineEmits<{
+  (e: 'update:value', item: boolean): void;
+  (e: 'ok', item: any): void;
+}>();
+
+watch(
+  () => props.value,
+  (n, _o) => {
+    props.value = n;
+  }
+);
+
+const headers = {
+  token: userStore.token
+};
+const actionURL = ref('');
+const beforeAvatarUpload = async (rawFile: any) => {
+  const fileData = {
+    path: `/${rawFile.uid}/${rawFile.name}`,
+    type: 'report'
+  };
+  const res = (await feileGet(fileData)) as any;
+  if (res.url) {
+    actionURL.value = res.url;
+    return true;
+  } else {
+    return false;
+  }
+};
+const handleAvatarSuccess = (response: any, _uploadFile: any) => {
+  console.log(response);
+  formData.cover = response.path;
+};
+// 取消
+const onClose = () => {
+  emits('update:value', false);
+};
+// 发送
+const onSend = () => {
+  loaging.value = true;
+  bannerPost(formData)
+    .then((res: any) => {
+      loaging.value = false;
+      if (res.status == 200) {
+        ElMessage.success('新增成功！');
+        content.value = '';
+        onClose();
+        emits('ok', true);
+      }
+    })
+    .catch(err => {
+      loaging.value = false;
+      if (err.status == 400) {
+        ElMessage.error(err.msg);
+      }
+    });
+};
+</script>
+
+<style lang="scss" scoped>
+.bd-uplod {
+  ::v-deep(.el-upload--picture-card) {
+    height: 78px;
+    width: 78px;
+  }
+
+  .avatar {
+    height: 78px;
+    width: 78px;
+  }
+}
+</style>
diff --git a/src/pages/workplace/configuration/index.vue b/src/pages/workplace/configuration/index.vue
index 4966209..55890f0 100644
--- a/src/pages/workplace/configuration/index.vue
+++ b/src/pages/workplace/configuration/index.vue
@@ -1,9 +1,9 @@
 <template>
   <bd-page class="flex-col">
     <div class="flex-1 el-card border-none flex-col box-border overflow-hidden">
-      <el-tabs v-model="activeName" class="bd-tabs" @tab-change="onTabChange">
+      <el-tabs v-model="activeName" class="bd-tabs">
         <el-tab-pane v-for="item in tabsData" :key="item.name" :label="item.label" :name="item.name">
-          <component :is="item.render" />
+          <component :is="item.render" v-if="item.name === activeName" />
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -17,7 +17,6 @@ meta:
 </route>
 
 <script lang="tsx" setup>
-import type { TabPaneName } from 'element-plus';
 import Banner from './components/Banner.vue';
 import Recommend from './components/Recommend.vue';
 import CustomGroup from './components/CustomGroup.vue';
@@ -47,8 +46,4 @@ const tabsData = reactive([
     }
   }
 ]);
-
-const onTabChange = (tab: TabPaneName) => {
-  console.log(tab);
-};
 </script>
diff --git a/src/pages/workplace/manage/index.vue b/src/pages/workplace/manage/index.vue
index 35897cc..60b09b3 100644
--- a/src/pages/workplace/manage/index.vue
+++ b/src/pages/workplace/manage/index.vue
@@ -53,9 +53,9 @@
         />
       </div>
     </div>
+    <!-- 应用 -->
+    <Apply v-model:value="applyAddValue" />
   </bd-page>
-  <!-- 应用 -->
-  <Apply v-model:value="applyAddValue" />
 </template>
 
 <route lang="yaml">

From 2930beb2650053fe361098120fc8fc8037f3a33c Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Fri, 8 Sep 2023 21:16:05 +0800
Subject: [PATCH 04/24] =?UTF-8?q?feat:=20=E2=9C=A8=E6=96=B0=E5=A2=9EAPP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workplace/app.ts                      |  19 ++++
 src/api/workplace/banner.ts                   |  20 +++-
 .../configuration/components/Banner.vue       |  59 +++++++++-
 .../configuration/components/BannerDialog.vue |   2 +-
 .../workplace/manage/components/Apply.vue     | 102 +++++++++++++-----
 src/pages/workplace/manage/index.vue          |  42 ++++++--
 6 files changed, 202 insertions(+), 42 deletions(-)
 create mode 100644 src/api/workplace/app.ts

diff --git a/src/api/workplace/app.ts b/src/api/workplace/app.ts
new file mode 100644
index 0000000..43cb7c0
--- /dev/null
+++ b/src/api/workplace/app.ts
@@ -0,0 +1,19 @@
+import request from '@/utils/axios';
+
+// 获取应用
+export function appGet(params?: any) {
+  return request({
+    url: '/manager/workplace/app',
+    method: 'get',
+    params
+  });
+}
+
+// 新增应用
+export function appPost(data: any) {
+  return request({
+    url: '/manager/workplace/app',
+    method: 'post',
+    data
+  });
+}
diff --git a/src/api/workplace/banner.ts b/src/api/workplace/banner.ts
index 544b2c0..9846b68 100644
--- a/src/api/workplace/banner.ts
+++ b/src/api/workplace/banner.ts
@@ -3,7 +3,7 @@ import request from '@/utils/axios';
 // 获取轮播
 export function bannerGet(params?: any) {
   return request({
-    url: '/workplace/banner',
+    url: '/manager/workplace/banner',
     method: 'get',
     params
   });
@@ -17,3 +17,21 @@ export function bannerPost(data: any) {
     data
   });
 }
+
+// 编辑轮播
+export function bannerPut(data: any) {
+  return request({
+    url: '/manager/workplace/banner',
+    method: 'post',
+    data
+  });
+}
+
+// 删除轮播
+export function bannerDelete(params: any) {
+  return request({
+    url: '/manager/workplace/banner',
+    method: 'delete',
+    params
+  });
+}
diff --git a/src/pages/workplace/configuration/components/Banner.vue b/src/pages/workplace/configuration/components/Banner.vue
index 84fbeac..753def6 100644
--- a/src/pages/workplace/configuration/components/Banner.vue
+++ b/src/pages/workplace/configuration/components/Banner.vue
@@ -57,11 +57,12 @@
 </template>
 
 <script lang="tsx" name="Banner" setup>
-import { ElButton, ElSpace } from 'element-plus';
+import { ElButton, ElSpace, ElImage, ElMessageBox, ElMessage } from 'element-plus';
 import BannerDialog from './BannerDialog.vue';
+import { BU_DOU_CONFIG } from '@/config';
 
 // API接口
-import { bannerGet } from '@/api/workplace/banner';
+import { bannerGet, bannerDelete } from '@/api/workplace/banner';
 /**
  * 表格
  */
@@ -70,6 +71,17 @@ const column = reactive<Column.ColumnOptions[]>([
     prop: 'title',
     label: '名称'
   },
+  {
+    prop: 'cover',
+    label: '图片',
+    render: (scope: any) => {
+      let img_url = '';
+      if (scope.row['cover']) {
+        img_url = `${BU_DOU_CONFIG.APP_URL}${scope.row.cover}`;
+      }
+      return <ElImage src={img_url} fit={'scale-down'} class={'w-120px h-60px'} />;
+    }
+  },
   {
     prop: 'route',
     label: '地址'
@@ -85,15 +97,20 @@ const column = reactive<Column.ColumnOptions[]>([
     prop: 'description',
     label: '描述'
   },
+  {
+    prop: 'created_at',
+    label: '创建时间',
+    width: 180
+  },
   {
     prop: 'operation',
     label: '操作',
     align: 'center',
-    render: (_scope: any) => {
+    render: (scope: any) => {
       return (
         <ElSpace>
           <ElButton type="primary">编辑</ElButton>
-          <ElButton>删除</ElButton>
+          <ElButton onClick={() => onDelBanner(scope.row)}>删除</ElButton>
         </ElSpace>
       );
     }
@@ -136,6 +153,40 @@ const onBannerDialogValue = () => {
   bannerDialogValue.value = true;
 };
 
+// 删除轮播
+const onDelBanner = (item: any) => {
+  ElMessageBox.confirm(`确定要对该轮播吗?`, `操作提示`, {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    closeOnClickModal: false,
+    type: 'warning'
+  })
+    .then(() => {
+      const fromLiftban = {
+        banner_no: item.banner_no
+      };
+      bannerDelete(fromLiftban)
+        .then((_res: any) => {
+          getTableList();
+          ElMessage({
+            type: 'success',
+            message: `轮播群组成功！`
+          });
+        })
+        .catch(err => {
+          if (err.status == 400) {
+            ElMessage.error(err.msg);
+          }
+        });
+    })
+    .catch(() => {
+      ElMessage({
+        type: 'info',
+        message: '取消成功！'
+      });
+    });
+};
+
 onMounted(() => {
   getTableList();
 });
diff --git a/src/pages/workplace/configuration/components/BannerDialog.vue b/src/pages/workplace/configuration/components/BannerDialog.vue
index 5ab7f2f..07f90b2 100644
--- a/src/pages/workplace/configuration/components/BannerDialog.vue
+++ b/src/pages/workplace/configuration/components/BannerDialog.vue
@@ -97,7 +97,7 @@ watch(
     props.value = n;
   }
 );
-
+// 上传图片
 const headers = {
   token: userStore.token
 };
diff --git a/src/pages/workplace/manage/components/Apply.vue b/src/pages/workplace/manage/components/Apply.vue
index b536061..0cc11c9 100644
--- a/src/pages/workplace/manage/components/Apply.vue
+++ b/src/pages/workplace/manage/components/Apply.vue
@@ -12,48 +12,60 @@
   >
     <el-form :model="formData" label-width="96px">
       <el-form-item label="应用名称">
-        <el-input v-model="formData.app_version" placeholder="请输入应用名称" />
-      </el-form-item>
-      <el-form-item label="应用APP ID">
-        <el-input v-model="formData.app_version" placeholder="请输入应用APP ID" />
+        <el-input v-model="formData.name" placeholder="请输入应用名称" maxlength="10" show-word-limit />
       </el-form-item>
       <el-form-item label="应用图标">
         <el-upload
           ref="upload"
           class="bd-uplod"
-          action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
+          :action="actionURL"
           list-type="picture-card"
-          :limit="1"
-          :auto-upload="false"
+          :show-file-list="false"
+          :headers="headers"
+          :before-upload="beforeAvatarUpload"
+          :on-success="handleAvatarSuccess"
         >
-          <el-icon><Plus /></el-icon>
+          <img v-if="formData.icon" :src="`${BU_DOU_CONFIG.APP_URL}${formData.icon}`" class="avatar" />
+          <el-icon v-else><Plus /></el-icon>
         </el-upload>
       </el-form-item>
-      <el-form-item label="PC端地址">
-        <el-input v-model="formData.app_version" placeholder="请输入PC端地址" />
+      <el-form-item label="打开方式">
+        <el-radio-group v-model="formData.jump_type">
+          <el-radio :label="0">网页</el-radio>
+          <el-radio :label="1">APP</el-radio>
+        </el-radio-group>
       </el-form-item>
-      <el-form-item label="移动端地址">
-        <el-input v-model="formData.app_version" placeholder="请输入移动端地址" />
-      </el-form-item>
-      <el-form-item label="应用状态">
-        <el-checkbox-group v-model="formData.type">
-          <el-checkbox label="pc">PC</el-checkbox>
-          <el-checkbox label="app">移动端</el-checkbox>
-        </el-checkbox-group>
+      <template v-if="formData.jump_type === 0">
+        <el-form-item label="网页地址">
+          <el-input v-model="formData.web_route" placeholder="请输入网页地址" />
+        </el-form-item>
+      </template>
+      <template v-if="formData.jump_type === 1">
+        <el-form-item label="APP地址">
+          <el-input v-model="formData.app_route" placeholder="请输入APP地址" />
+        </el-form-item>
+      </template>
+      <el-form-item label="付款">
+        <el-radio-group v-model="formData.is_paid_app">
+          <el-radio :label="0">免费</el-radio>
+          <el-radio :label="1">付费</el-radio>
+        </el-radio-group>
       </el-form-item>
       <el-form-item label="应用描述">
         <el-input
-          v-model="formData.update_desc"
+          v-model="formData.description"
           type="textarea"
           :autosize="{ minRows: 6, maxRows: 8 }"
           placeholder="请输入应用描述"
+          show-word-limit
+          maxlength="500"
         />
       </el-form-item>
     </el-form>
     <template #footer>
       <el-space>
         <el-button @click="onClose">取消</el-button>
-        <el-button type="primary" :loading="loaging" @click="onSend">发送</el-button>
+        <el-button type="primary" :loading="loaging" @click="onSend">保存</el-button>
       </el-space>
     </template>
   </el-dialog>
@@ -63,24 +75,31 @@
 import { ref } from 'vue';
 import { ElMessage } from 'element-plus';
 import { Plus } from '@element-plus/icons-vue';
+import { useUserStore } from '@/stores/modules/user';
 // API 接口
-import { commonAppversionPost } from '@/api/tool';
+import { appPost } from '@/api/workplace/app';
+import { feileGet } from '@/api/file';
+
+import { BU_DOU_CONFIG } from '@/config';
+
 interface IProps {
   value: boolean;
 }
 const props = withDefaults(defineProps<IProps>(), {
   value: false
 });
+const userStore = useUserStore();
 
 const content = ref('');
 const loaging = ref<boolean>(false);
 const formData = reactive({
-  app_version: '',
-  os: 'android',
-  is_force: 0,
-  update_desc: '',
-  download_url: '',
-  type: []
+  icon: '',
+  name: '',
+  jump_type: 0,
+  description: '',
+  app_route: '',
+  web_route: '',
+  is_paid_app: 0
 });
 
 const emits = defineEmits<{
@@ -94,6 +113,28 @@ watch(
     props.value = n;
   }
 );
+
+const headers = {
+  token: userStore.token
+};
+const actionURL = ref('');
+const beforeAvatarUpload = async (rawFile: any) => {
+  const fileData = {
+    path: `/${rawFile.uid}/${rawFile.name}`,
+    type: 'report'
+  };
+  const res = (await feileGet(fileData)) as any;
+  if (res.url) {
+    actionURL.value = res.url;
+    return true;
+  } else {
+    return false;
+  }
+};
+const handleAvatarSuccess = (response: any, _uploadFile: any) => {
+  formData.icon = response.path;
+};
+
 // 取消
 const onClose = () => {
   emits('update:value', false);
@@ -101,7 +142,7 @@ const onClose = () => {
 // 发送
 const onSend = () => {
   loaging.value = true;
-  commonAppversionPost(formData)
+  appPost(formData)
     .then((res: any) => {
       loaging.value = false;
       if (res.status == 200) {
@@ -126,5 +167,10 @@ const onSend = () => {
     height: 78px;
     width: 78px;
   }
+
+  .avatar {
+    height: 78px;
+    width: 78px;
+  }
 }
 </style>
diff --git a/src/pages/workplace/manage/index.vue b/src/pages/workplace/manage/index.vue
index 60b09b3..3269032 100644
--- a/src/pages/workplace/manage/index.vue
+++ b/src/pages/workplace/manage/index.vue
@@ -65,43 +65,61 @@ meta:
 </route>
 
 <script lang="tsx" setup>
-import { ElButton, ElSpace } from 'element-plus';
+import { ElButton, ElSpace, ElImage } from 'element-plus';
 import Apply from './components/Apply.vue';
+import { BU_DOU_CONFIG } from '@/config';
+
+// API接口
+import { appGet } from '@/api/workplace/app';
 /**
  * 表格
  */
 const column = reactive<Column.ColumnOptions[]>([
   {
     prop: 'icon',
-    label: '应用LOGO'
+    label: '应用LOGO',
+    align: 'center',
+    width: 100,
+    render: (scope: any) => {
+      let img_url = '';
+      if (scope.row['icon']) {
+        img_url = `${BU_DOU_CONFIG.APP_URL}${scope.row.icon}`;
+      }
+      return <ElImage src={img_url} fit={'scale-down'} class={'w-60px h-60px'} />;
+    }
   },
   {
     prop: 'name',
-    label: '应用名称'
+    label: '应用名称',
+    width: 160
   },
   {
-    prop: 'no',
-    label: '应用APP ID'
+    prop: 'app_id',
+    label: '应用APP ID',
+    width: 290
   },
   {
     prop: 'status',
     label: '应用状态',
+    width: 100,
     formatter(row: any) {
       return row.status === 1 ? '开启' : '关闭';
     }
   },
   {
-    prop: 'des',
+    prop: 'description',
     label: '应用描述'
   },
   {
     prop: 'operation',
     label: '操作',
+    width: 150,
     align: 'center',
     render: (_scope: any) => {
       return (
         <ElSpace>
-          <ElButton type="primary">配置</ElButton>
+          <ElButton type="primary">编辑</ElButton>
+          <ElButton>删除</ElButton>
         </ElSpace>
       );
     }
@@ -120,7 +138,11 @@ const queryFrom = reactive({
 });
 
 // 搜索
-const getTableList = () => {};
+const getTableList = () => {
+  appGet(queryFrom).then((res: any) => {
+    tableData.value = res;
+  });
+};
 
 // 分页page-size
 const onSizeChange = (size: number) => {
@@ -139,6 +161,10 @@ const applyAddValue = ref<boolean>(false);
 const onAppVersionAdd = () => {
   applyAddValue.value = true;
 };
+
+onMounted(() => {
+  getTableList();
+});
 </script>
 
 <style lang="scss" scoped>

From a31763cd2bc79fc785cbe354fede5402b2fbfc9d Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Sat, 9 Sep 2023 17:08:20 +0800
Subject: [PATCH 05/24] =?UTF-8?q?perf:=20=F0=9F=91=8C=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workplace/category.ts                 |  19 +++
 src/pages/group/groupblacklist.vue            |   4 +-
 src/pages/group/groupdisablelist.vue          |   4 +-
 src/pages/group/grouplist.vue                 |   2 +-
 src/pages/group/groupmembers.vue              |   4 +-
 src/pages/message/prohibitwords.vue           |   2 +-
 src/pages/message/record.vue                  |   2 +-
 src/pages/message/recordpersonal.vue          |   2 +-
 src/pages/message/sendmsglist.vue             |   2 +-
 src/pages/redpacket/list.vue                  |   4 +-
 src/pages/report/group.vue                    |   4 +-
 src/pages/report/user.vue                     |   4 +-
 src/pages/tool/appupdate.vue                  |   4 +-
 src/pages/tool/systemrobotmenu.vue            |   4 +-
 src/pages/user/disablelist.vue                |   4 +-
 src/pages/user/friends.vue                    |   4 +-
 src/pages/user/userblacklist.vue              |   4 +-
 src/pages/user/userlist.vue                   |   4 +-
 .../configuration/components/AppDialog.vue    | 131 ++++++++++++++++++
 .../components/CategoryDialog.vue             |  82 +++++++++++
 .../configuration/components/CustomGroup.vue  |  99 +++++++++----
 src/pages/workplace/manage/index.vue          |   4 +-
 src/types/global.d.ts                         |   4 +-
 23 files changed, 337 insertions(+), 60 deletions(-)
 create mode 100644 src/api/workplace/category.ts
 create mode 100644 src/pages/workplace/configuration/components/AppDialog.vue
 create mode 100644 src/pages/workplace/configuration/components/CategoryDialog.vue

diff --git a/src/api/workplace/category.ts b/src/api/workplace/category.ts
new file mode 100644
index 0000000..c9f3d19
--- /dev/null
+++ b/src/api/workplace/category.ts
@@ -0,0 +1,19 @@
+import request from '@/utils/axios';
+
+// 获取分类
+export function categoryGet(params?: any) {
+  return request({
+    url: '/manager/workplace/category',
+    method: 'get',
+    params
+  });
+}
+
+// 新增分类
+export function categoryPost(data: any) {
+  return request({
+    url: '/manager/workplace/category',
+    method: 'post',
+    data
+  });
+}
diff --git a/src/pages/group/groupblacklist.vue b/src/pages/group/groupblacklist.vue
index 3cadfc8..4688ff3 100644
--- a/src/pages/group/groupblacklist.vue
+++ b/src/pages/group/groupblacklist.vue
@@ -35,8 +35,8 @@
               <template v-else-if="item.formatter">
                 <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
               </template>
-              <template v-else>
-                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+              <template v-else-if="item.prop">
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop!] }}</slot>
               </template>
             </template>
           </el-table-column>
diff --git a/src/pages/group/groupdisablelist.vue b/src/pages/group/groupdisablelist.vue
index 8ec2c08..9c383df 100644
--- a/src/pages/group/groupdisablelist.vue
+++ b/src/pages/group/groupdisablelist.vue
@@ -32,8 +32,8 @@
               <template v-else-if="item.formatter">
                 <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
               </template>
-              <template v-else>
-                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+              <template v-else-if="item.prop">
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop!] }}</slot>
               </template>
             </template>
           </el-table-column>
diff --git a/src/pages/group/grouplist.vue b/src/pages/group/grouplist.vue
index 25a5658..5f426d8 100644
--- a/src/pages/group/grouplist.vue
+++ b/src/pages/group/grouplist.vue
@@ -33,7 +33,7 @@
                 <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
               </template>
               <template v-else>
-                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop!] }}</slot>
               </template>
             </template>
           </el-table-column>
diff --git a/src/pages/group/groupmembers.vue b/src/pages/group/groupmembers.vue
index 7fdd648..5f42ec2 100644
--- a/src/pages/group/groupmembers.vue
+++ b/src/pages/group/groupmembers.vue
@@ -35,8 +35,8 @@
               <template v-else-if="item.formatter">
                 <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
               </template>
-              <template v-else>
-                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+              <template v-else-if="item.prop">
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop!] }}</slot>
               </template>
             </template>
           </el-table-column>
diff --git a/src/pages/message/prohibitwords.vue b/src/pages/message/prohibitwords.vue
index fbba49c..18bda50 100644
--- a/src/pages/message/prohibitwords.vue
+++ b/src/pages/message/prohibitwords.vue
@@ -34,7 +34,7 @@
                 <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
               </template>
               <template v-else>
-                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop!] }}</slot>
               </template>
             </template>
           </el-table-column>
diff --git a/src/pages/message/record.vue b/src/pages/message/record.vue
index d113bc3..5a61aea 100644
--- a/src/pages/message/record.vue
+++ b/src/pages/message/record.vue
@@ -36,7 +36,7 @@
                 <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
               </template>
               <template v-else>
-                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop!] }}</slot>
               </template>
             </template>
           </el-table-column>
diff --git a/src/pages/message/recordpersonal.vue b/src/pages/message/recordpersonal.vue
index 082d0c0..b23705b 100644
--- a/src/pages/message/recordpersonal.vue
+++ b/src/pages/message/recordpersonal.vue
@@ -39,7 +39,7 @@
                 <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
               </template>
               <template v-else>
-                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop!] }}</slot>
               </template>
             </template>
           </el-table-column>
diff --git a/src/pages/message/sendmsglist.vue b/src/pages/message/sendmsglist.vue
index 3f5363f..00cdf6d 100644
--- a/src/pages/message/sendmsglist.vue
+++ b/src/pages/message/sendmsglist.vue
@@ -30,7 +30,7 @@
                 <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
               </template>
               <template v-else>
-                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop!] }}</slot>
               </template>
             </template>
           </el-table-column>
diff --git a/src/pages/redpacket/list.vue b/src/pages/redpacket/list.vue
index efcee25..84ce01d 100644
--- a/src/pages/redpacket/list.vue
+++ b/src/pages/redpacket/list.vue
@@ -32,8 +32,8 @@
               <template v-else-if="item.formatter">
                 <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
               </template>
-              <template v-else>
-                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+              <template v-else-if="item.prop">
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop!] }}</slot>
               </template>
             </template>
           </el-table-column>
diff --git a/src/pages/report/group.vue b/src/pages/report/group.vue
index 62819a5..5f3d057 100644
--- a/src/pages/report/group.vue
+++ b/src/pages/report/group.vue
@@ -23,8 +23,8 @@
               <template v-else-if="item.formatter">
                 <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
               </template>
-              <template v-else>
-                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+              <template v-else-if="item.prop">
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop!] }}</slot>
               </template>
             </template>
           </el-table-column>
diff --git a/src/pages/report/user.vue b/src/pages/report/user.vue
index 08492a0..1cf8ff9 100644
--- a/src/pages/report/user.vue
+++ b/src/pages/report/user.vue
@@ -23,8 +23,8 @@
               <template v-else-if="item.formatter">
                 <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
               </template>
-              <template v-else>
-                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+              <template v-else-if="item.prop">
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop!] }}</slot>
               </template>
             </template>
           </el-table-column>
diff --git a/src/pages/tool/appupdate.vue b/src/pages/tool/appupdate.vue
index 67a302c..b0a1db9 100644
--- a/src/pages/tool/appupdate.vue
+++ b/src/pages/tool/appupdate.vue
@@ -29,8 +29,8 @@
               <template v-else-if="item.formatter">
                 <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
               </template>
-              <template v-else>
-                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+              <template v-else-if="item.prop">
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop!] }}</slot>
               </template>
             </template>
           </el-table-column>
diff --git a/src/pages/tool/systemrobotmenu.vue b/src/pages/tool/systemrobotmenu.vue
index 7cde68f..eea19d6 100644
--- a/src/pages/tool/systemrobotmenu.vue
+++ b/src/pages/tool/systemrobotmenu.vue
@@ -23,8 +23,8 @@
               <template v-else-if="item.formatter">
                 <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
               </template>
-              <template v-else>
-                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+              <template v-else-if="item.prop">
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop!] }}</slot>
               </template>
             </template>
           </el-table-column>
diff --git a/src/pages/user/disablelist.vue b/src/pages/user/disablelist.vue
index 9185acd..2104c6d 100644
--- a/src/pages/user/disablelist.vue
+++ b/src/pages/user/disablelist.vue
@@ -32,8 +32,8 @@
               <template v-else-if="item.formatter">
                 <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
               </template>
-              <template v-else>
-                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+              <template v-else-if="item.prop">
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop!] }}</slot>
               </template>
             </template>
           </el-table-column>
diff --git a/src/pages/user/friends.vue b/src/pages/user/friends.vue
index a833386..4148a25 100644
--- a/src/pages/user/friends.vue
+++ b/src/pages/user/friends.vue
@@ -36,8 +36,8 @@
               <template v-else-if="item.formatter">
                 <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
               </template>
-              <template v-else>
-                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+              <template v-else-if="item.prop">
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop!] }}</slot>
               </template>
             </template>
           </el-table-column>
diff --git a/src/pages/user/userblacklist.vue b/src/pages/user/userblacklist.vue
index 53eaa06..11b2191 100644
--- a/src/pages/user/userblacklist.vue
+++ b/src/pages/user/userblacklist.vue
@@ -35,8 +35,8 @@
               <template v-else-if="item.formatter">
                 <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
               </template>
-              <template v-else>
-                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+              <template v-else-if="item.prop">
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop!] }}</slot>
               </template>
             </template>
           </el-table-column>
diff --git a/src/pages/user/userlist.vue b/src/pages/user/userlist.vue
index 621fd49..6bcda1f 100644
--- a/src/pages/user/userlist.vue
+++ b/src/pages/user/userlist.vue
@@ -33,8 +33,8 @@
               <template v-else-if="item.formatter">
                 <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
               </template>
-              <template v-else>
-                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+              <template v-else-if="item.prop">
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop!] }}</slot>
               </template>
             </template>
           </el-table-column>
diff --git a/src/pages/workplace/configuration/components/AppDialog.vue b/src/pages/workplace/configuration/components/AppDialog.vue
new file mode 100644
index 0000000..bd596e2
--- /dev/null
+++ b/src/pages/workplace/configuration/components/AppDialog.vue
@@ -0,0 +1,131 @@
+<template>
+  <el-dialog
+    :model-value="value"
+    :width="600"
+    :align-center="true"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    :draggable="true"
+    :z-index="99"
+    title="添加应用"
+    @close="onClose"
+  >
+    <div class="h-540px flex-col">
+      <el-input v-model="content" placeholder="请输入应用名称" />
+      <!-- 表格 -->
+      <div class="flex-1 overflow-hidden p-12px">
+        <el-table v-loading="loadTable" :data="tableData" :show-header="false" style="width: 100%; height: 100%">
+          <el-table-column v-for="(col, index) in column" v-bind="col" :key="index">
+            <template #default="{ row }">
+              <template v-if="col.render">
+                <component :is="col.render" :row="row"> </component>
+              </template>
+              <template v-else-if="col.formatter">
+                <slot :name="col.prop" :row="row">{{ col.formatter(row) }}</slot>
+              </template>
+              <template v-else-if="col.prop">
+                <slot :name="col.prop" :row="row">{{ row[col.prop] }}</slot>
+              </template>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <template #footer>
+      <el-space>
+        <el-button @click="onClose">取消</el-button>
+        <el-button type="primary" :loading="loaging" @click="onSend">确定</el-button>
+      </el-space>
+    </template>
+  </el-dialog>
+</template>
+
+<script lang="ts" name="AppDialog" setup>
+import { ref } from 'vue';
+import { ElMessage } from 'element-plus';
+// API 接口
+import { categoryPost } from '@/api/workplace/category';
+import { appGet } from '@/api/workplace/app';
+interface IProps {
+  value: boolean;
+}
+const props = withDefaults(defineProps<IProps>(), {
+  value: false
+});
+
+const content = ref('');
+const loaging = ref<boolean>(false);
+
+const emits = defineEmits<{
+  (e: 'update:value', item: boolean): void;
+  (e: 'ok', item: any): void;
+}>();
+
+watch(
+  () => props.value,
+  (n, _o) => {
+    props.value = n;
+    if (n) {
+      getTableList();
+    }
+  }
+);
+
+/**
+ * 表格
+ */
+const column = reactive<Column.ColumnOptions[]>([
+  {
+    prop: 'name',
+    label: '名称'
+  },
+  {
+    prop: 'description',
+    label: '描述'
+  },
+  {
+    type: 'selection'
+  }
+]);
+const tableData = ref<any[]>([]);
+const loadTable = ref<boolean>(false);
+const queryFrom = reactive({
+  keyword: '',
+  page_size: 15,
+  page_index: 1
+});
+const getTableList = () => {
+  appGet(queryFrom).then((res: any) => {
+    tableData.value = res;
+  });
+};
+const onClose = () => {
+  emits('update:value', false);
+};
+// 发送
+const onSend = () => {
+  if (!content.value) {
+    return ElMessage.info('请输入分类！');
+  }
+  const fromData = {
+    name: content.value
+  };
+  loaging.value = true;
+  categoryPost(fromData)
+    .then((res: any) => {
+      loaging.value = false;
+      if (res.status == 200) {
+        ElMessage.success('新增分类成功！');
+        content.value = '';
+        onClose();
+        emits('ok', true);
+      }
+    })
+    .catch(err => {
+      loaging.value = false;
+      if (err.status == 400) {
+        ElMessage.error(err.msg);
+      }
+    });
+};
+</script>
diff --git a/src/pages/workplace/configuration/components/CategoryDialog.vue b/src/pages/workplace/configuration/components/CategoryDialog.vue
new file mode 100644
index 0000000..a4c43fc
--- /dev/null
+++ b/src/pages/workplace/configuration/components/CategoryDialog.vue
@@ -0,0 +1,82 @@
+<template>
+  <el-dialog
+    :model-value="value"
+    :width="400"
+    :align-center="true"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    :draggable="true"
+    :z-index="99"
+    title="新增分类"
+    @close="onClose"
+  >
+    <div>
+      <el-input v-model="content" placeholder="请输入分类" />
+    </div>
+    <template #footer>
+      <el-space>
+        <el-button @click="onClose">取消</el-button>
+        <el-button type="primary" :loading="loaging" @click="onSend">保存</el-button>
+      </el-space>
+    </template>
+  </el-dialog>
+</template>
+
+<script lang="ts" name="CategoryDialog" setup>
+import { ref } from 'vue';
+import { ElMessage } from 'element-plus';
+// API 接口
+import { categoryPost } from '@/api/workplace/category';
+interface IProps {
+  value: boolean;
+}
+const props = withDefaults(defineProps<IProps>(), {
+  value: false
+});
+
+const content = ref('');
+const loaging = ref<boolean>(false);
+
+const emits = defineEmits<{
+  (e: 'update:value', item: boolean): void;
+  (e: 'ok', item: any): void;
+}>();
+
+watch(
+  () => props.value,
+  (n, _o) => {
+    console.log(props.value);
+    props.value = n;
+  }
+);
+// 取消
+const onClose = () => {
+  emits('update:value', false);
+};
+// 发送
+const onSend = () => {
+  if (!content.value) {
+    return ElMessage.info('请输入分类！');
+  }
+  const fromData = {
+    name: content.value
+  };
+  loaging.value = true;
+  categoryPost(fromData)
+    .then((res: any) => {
+      loaging.value = false;
+      if (res.status == 200) {
+        ElMessage.success('新增分类成功！');
+        content.value = '';
+        onClose();
+        emits('ok', true);
+      }
+    })
+    .catch(err => {
+      loaging.value = false;
+      if (err.status == 400) {
+        ElMessage.error(err.msg);
+      }
+    });
+};
+</script>
diff --git a/src/pages/workplace/configuration/components/CustomGroup.vue b/src/pages/workplace/configuration/components/CustomGroup.vue
index c903d84..884938c 100644
--- a/src/pages/workplace/configuration/components/CustomGroup.vue
+++ b/src/pages/workplace/configuration/components/CustomGroup.vue
@@ -5,7 +5,7 @@
       <div class="h-50px pl-12px pr-12px box-border flex items-center justify-between bd-title">
         <div class="bd-title-left font-500 text-14px">分组</div>
         <div class="flex items-center h-50px">
-          <i-bd-add :size="22" class="cursor-pointer" />
+          <i-bd-add :size="22" class="cursor-pointer" @click="categoryDialogValue = true" />
         </div>
       </div>
       <div class="m-12px">
@@ -13,17 +13,21 @@
       </div>
       <div class="flex-1 overflow-hidden">
         <el-scrollbar>
-          <el-tree :data="dataTree">
-            <template #default="{ node }">
-              <div class="bd-tree-node">
-                <div>{{ node.label }}</div>
-                <div class="pr-12px flex items-center bd-opt">
-                  <i-bd-editor :size="16" class="cursor-pointer pr-4px" />
-                  <i-bd-delete :size="16" class="cursor-pointer" />
-                </div>
+          <div class="tree-warp p-12px pt-0">
+            <div
+              v-for="item in dataTree"
+              :key="item.category_no"
+              class="bd-tree-item"
+              :class="{ 'bd-tree-activate': item.category_no === optTree }"
+              @click="onOptTreeClick(item.category_no)"
+            >
+              <div class="flex-1 text">{{ item.name }}</div>
+              <div class="bd-opt">
+                <i-bd-editor :size="16" class="cursor-pointer pr-4px" />
+                <i-bd-delete :size="16" class="cursor-pointer" />
               </div>
-            </template>
-          </el-tree>
+            </div>
+          </div>
         </el-scrollbar>
       </div>
     </div>
@@ -39,7 +43,7 @@
               <el-input v-model="queryFrom.keyword" placeholder="名称" clearable />
             </el-form-item>
             <el-form-item class="mb-0 !mr-0">
-              <el-button type="primary">新增应用</el-button>
+              <el-button type="primary" @click="appDialogValue = true">新增应用</el-button>
             </el-form-item>
           </el-form>
         </div>
@@ -61,7 +65,7 @@
                 <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
               </template>
               <template v-else>
-                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop!] }}</slot>
               </template>
             </template>
           </el-table-column>
@@ -83,29 +87,53 @@
       </div>
     </div>
     <!-- E 右侧 表格 -->
+
+    <!-- 新增分类 -->
+    <CategoryDialog v-model:value="categoryDialogValue" />
+
+    <!-- 添加应用 -->
+    <AppDialog v-model:value="appDialogValue" />
   </bd-page>
 </template>
 
 <script lang="tsx" name="CustomGroup" setup>
 import { ElButton, ElSpace } from 'element-plus';
+import CategoryDialog from './CategoryDialog.vue';
+import AppDialog from './AppDialog.vue';
+
+// API接口
+import { categoryGet } from '@/api/workplace/category';
 
 interface Tree {
-  id: number;
-  label: string;
+  category_no: string;
+  name: string;
+  sort_num: number;
 }
 /**
  * 左侧分类
  */
-const dataTree = ref<Tree[]>([
-  {
-    id: 1,
-    label: '项目管理'
-  },
-  {
-    id: 2,
-    label: '开发管理'
-  }
-]);
+const categoryDialogValue = ref<boolean>(false);
+const dataTree = ref<Tree[]>([]);
+const optTree = ref('');
+// 获取
+const getCategoryData = () => {
+  categoryGet().then((res: any) => {
+    if (res.length > 0) {
+      dataTree.value = res;
+      optTree.value = res[0].category_no;
+    }
+  });
+};
+
+// 选中
+const onOptTreeClick = (no: string) => {
+  optTree.value = no;
+};
+
+/**
+ * 添加应用
+ */
+const appDialogValue = ref(false);
 
 /**
  * 表格
@@ -169,6 +197,10 @@ const onCurrentChange = (current: number) => {
   queryFrom.page_index = current;
   getTableList();
 };
+
+onMounted(() => {
+  getCategoryData();
+});
 </script>
 
 <style lang="scss" scoped>
@@ -177,24 +209,37 @@ const onCurrentChange = (current: number) => {
   border-right: 1px solid var(--el-card-border-color);
 }
 
-.bd-tree-node {
+.bd-tree-item {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  flex: 1;
   font-size: 14px;
+  height: 26px;
+  padding: 0 4px;
+  cursor: pointer;
+  border-radius: 4px;
+  margin-bottom: 4px;
 
   .bd-opt {
     display: none;
   }
 
   &:hover {
+    background-color: var(--el-menu-active-bg-color);
+    color: var(--el-menu-active-color);
     .bd-opt {
       display: block;
     }
   }
 }
 
+.bd-tree-activate {
+  background-color: var(--el-menu-active-bg-color);
+  .text {
+    color: var(--el-menu-active-color);
+  }
+}
+
 .bd-title {
   border-bottom: 1px solid var(--el-card-border-color);
 }
diff --git a/src/pages/workplace/manage/index.vue b/src/pages/workplace/manage/index.vue
index 3269032..57eca2a 100644
--- a/src/pages/workplace/manage/index.vue
+++ b/src/pages/workplace/manage/index.vue
@@ -32,8 +32,8 @@
               <template v-else-if="item.formatter">
                 <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
               </template>
-              <template v-else>
-                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+              <template v-else-if="item.prop">
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop!] }}</slot>
               </template>
             </template>
           </el-table-column>
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 5b5e842..80cd52a 100755
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -80,8 +80,8 @@ type ObjToKeyValArray<T> = {
 }[keyof T];
 declare namespace Column {
   interface ColumnOptions {
-    prop: string;
-    label: string;
+    prop?: string;
+    label?: string;
     type?: 'selection' | 'index' | 'expand';
     fixed?: true | 'left' | 'right';
     width?: string | number;

From dddc30c718a292a6e22e743a874285459b0aa061 Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Sat, 9 Sep 2023 22:46:46 +0800
Subject: [PATCH 06/24] =?UTF-8?q?feat:=20=E2=9C=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workplace/app.ts                      |  18 +++
 src/api/workplace/category.ts                 |  18 +++
 .../configuration/components/AppDialog.vue    |  46 +++++--
 .../configuration/components/CustomGroup.vue  | 122 +++++++++---------
 .../workplace/manage/components/Apply.vue     |  70 ++++++++--
 src/pages/workplace/manage/index.vue          |  41 ++++--
 6 files changed, 224 insertions(+), 91 deletions(-)

diff --git a/src/api/workplace/app.ts b/src/api/workplace/app.ts
index 43cb7c0..c753fc7 100644
--- a/src/api/workplace/app.ts
+++ b/src/api/workplace/app.ts
@@ -17,3 +17,21 @@ export function appPost(data: any) {
     data
   });
 }
+
+// 编辑应用
+export function appPut(data: any) {
+  return request({
+    url: '/manager/workplace/app',
+    method: 'put',
+    data
+  });
+}
+
+// 删除应用
+export function appDelete(params: any) {
+  return request({
+    url: '/manager/workplace/app',
+    method: 'delete',
+    params
+  });
+}
diff --git a/src/api/workplace/category.ts b/src/api/workplace/category.ts
index c9f3d19..e243b69 100644
--- a/src/api/workplace/category.ts
+++ b/src/api/workplace/category.ts
@@ -17,3 +17,21 @@ export function categoryPost(data: any) {
     data
   });
 }
+
+// 分类获取应用
+export function categoryAppGet(params: any) {
+  return request({
+    url: '/manager/workplace/category/app',
+    method: 'get',
+    params
+  });
+}
+
+// 分类新增应用
+export function categoryAppPost(data: any) {
+  return request({
+    url: '/manager/workplace/category/app',
+    method: 'post',
+    data
+  });
+}
diff --git a/src/pages/workplace/configuration/components/AppDialog.vue b/src/pages/workplace/configuration/components/AppDialog.vue
index bd596e2..871e8ae 100644
--- a/src/pages/workplace/configuration/components/AppDialog.vue
+++ b/src/pages/workplace/configuration/components/AppDialog.vue
@@ -11,10 +11,17 @@
     @close="onClose"
   >
     <div class="h-540px flex-col">
-      <el-input v-model="content" placeholder="请输入应用名称" />
+      <el-input v-model="content" class="mb-12px" placeholder="请输入应用名称" maxlength="10" show-word-limit />
       <!-- 表格 -->
-      <div class="flex-1 overflow-hidden p-12px">
-        <el-table v-loading="loadTable" :data="tableData" :show-header="false" style="width: 100%; height: 100%">
+      <div class="flex-1 overflow-hidden">
+        <el-table
+          v-loading="loadTable"
+          :data="tableData"
+          row-key="app_id"
+          :show-header="false"
+          style="width: 100%; height: 100%"
+          @selection-change="onSelectionChange"
+        >
           <el-table-column v-for="(col, index) in column" v-bind="col" :key="index">
             <template #default="{ row }">
               <template v-if="col.render">
@@ -34,7 +41,7 @@
     <template #footer>
       <el-space>
         <el-button @click="onClose">取消</el-button>
-        <el-button type="primary" :loading="loaging" @click="onSend">确定</el-button>
+        <el-button type="primary" :loading="loaging" @click="onConfirm">确定</el-button>
       </el-space>
     </template>
   </el-dialog>
@@ -44,10 +51,14 @@
 import { ref } from 'vue';
 import { ElMessage } from 'element-plus';
 // API 接口
-import { categoryPost } from '@/api/workplace/category';
+import { categoryAppPost } from '@/api/workplace/category';
 import { appGet } from '@/api/workplace/app';
+
 interface IProps {
   value: boolean;
+  data: {
+    category_no: string;
+  };
 }
 const props = withDefaults(defineProps<IProps>(), {
   value: false
@@ -89,34 +100,45 @@ const column = reactive<Column.ColumnOptions[]>([
 ]);
 const tableData = ref<any[]>([]);
 const loadTable = ref<boolean>(false);
+const selectionData = ref<string[]>([]);
 const queryFrom = reactive({
   keyword: '',
   page_size: 15,
   page_index: 1
 });
+// 获取表格数据
 const getTableList = () => {
   appGet(queryFrom).then((res: any) => {
     tableData.value = res;
   });
 };
+
+const onSelectionChange = (val: any[]) => {
+  const opt: string[] = [];
+  val.map(item => {
+    opt.push(item.app_id);
+  });
+  selectionData.value = opt;
+};
+
 const onClose = () => {
   emits('update:value', false);
 };
-// 发送
-const onSend = () => {
-  if (!content.value) {
+// 保存
+const onConfirm = () => {
+  if (selectionData.value.length === 0) {
     return ElMessage.info('请输入分类！');
   }
   const fromData = {
-    name: content.value
+    category_no: props.data.category_no,
+    app_ids: selectionData.value
   };
   loaging.value = true;
-  categoryPost(fromData)
+  categoryAppPost(fromData)
     .then((res: any) => {
       loaging.value = false;
       if (res.status == 200) {
-        ElMessage.success('新增分类成功！');
-        content.value = '';
+        ElMessage.success('新增应用成功！');
         onClose();
         emits('ok', true);
       }
diff --git a/src/pages/workplace/configuration/components/CustomGroup.vue b/src/pages/workplace/configuration/components/CustomGroup.vue
index 884938c..e07da52 100644
--- a/src/pages/workplace/configuration/components/CustomGroup.vue
+++ b/src/pages/workplace/configuration/components/CustomGroup.vue
@@ -9,7 +9,7 @@
         </div>
       </div>
       <div class="m-12px">
-        <el-input v-model="queryFrom.keyword" placeholder="搜索分类/按回车键搜索" clearable />
+        <el-input v-model="keyword" placeholder="搜索分类/按回车键搜索" clearable />
       </div>
       <div class="flex-1 overflow-hidden">
         <el-scrollbar>
@@ -39,9 +39,6 @@
         <div class="bd-title-left"></div>
         <div class="flex items-center h-50px">
           <el-form inline>
-            <el-form-item class="mb-0 !mr-16px">
-              <el-input v-model="queryFrom.keyword" placeholder="名称" clearable />
-            </el-form-item>
             <el-form-item class="mb-0 !mr-0">
               <el-button type="primary" @click="appDialogValue = true">新增应用</el-button>
             </el-form-item>
@@ -51,11 +48,6 @@
       <!-- 表格 -->
       <div class="flex-1 overflow-hidden p-12px">
         <el-table v-loading="loadTable" :data="tableData" :border="true" style="width: 100%; height: 100%">
-          <el-table-column type="index" :width="42" :align="'center'" :fixed="'left'">
-            <template #header>
-              <i-bd-setting class="cursor-pointer" size="16" />
-            </template>
-          </el-table-column>
           <el-table-column v-for="item in column" v-bind="item" :key="item.prop">
             <template #default="scope">
               <template v-if="item.render">
@@ -71,38 +63,25 @@
           </el-table-column>
         </el-table>
       </div>
-      <!-- 分页 -->
-      <div class="bd-card-footer pl-12px pr-12px mb-12px flex items-center justify-between">
-        <div></div>
-        <el-pagination
-          v-model:current-page="queryFrom.page_index"
-          v-model:page-size="queryFrom.page_size"
-          :page-sizes="[15, 20, 30, 50, 100]"
-          :background="true"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total"
-          @size-change="onSizeChange"
-          @current-change="onCurrentChange"
-        />
-      </div>
     </div>
     <!-- E 右侧 表格 -->
 
     <!-- 新增分类 -->
-    <CategoryDialog v-model:value="categoryDialogValue" />
+    <CategoryDialog v-model:value="categoryDialogValue" @ok="onCategoryOk" />
 
     <!-- 添加应用 -->
-    <AppDialog v-model:value="appDialogValue" />
+    <AppDialog v-model:value="appDialogValue" :data="appDialogData" @ok="onAppDialogOk" />
   </bd-page>
 </template>
 
 <script lang="tsx" name="CustomGroup" setup>
-import { ElButton, ElSpace } from 'element-plus';
+import { ElButton, ElSpace, ElImage } from 'element-plus';
 import CategoryDialog from './CategoryDialog.vue';
 import AppDialog from './AppDialog.vue';
+import { BU_DOU_CONFIG } from '@/config';
 
 // API接口
-import { categoryGet } from '@/api/workplace/category';
+import { categoryGet, categoryAppGet } from '@/api/workplace/category';
 
 interface Tree {
   category_no: string;
@@ -115,12 +94,15 @@ interface Tree {
 const categoryDialogValue = ref<boolean>(false);
 const dataTree = ref<Tree[]>([]);
 const optTree = ref('');
-// 获取
+const keyword = ref('');
+// 获取分类
 const getCategoryData = () => {
   categoryGet().then((res: any) => {
     if (res.length > 0) {
       dataTree.value = res;
-      optTree.value = res[0].category_no;
+      if (!optTree.value) {
+        optTree.value = res[0].category_no;
+      }
     }
   });
 };
@@ -130,42 +112,72 @@ const onOptTreeClick = (no: string) => {
   optTree.value = no;
 };
 
+// 确定添加应用
+const onCategoryOk = () => {
+  getCategoryData();
+};
+
 /**
  * 添加应用
  */
 const appDialogValue = ref(false);
-
+const appDialogData = ref({
+  category_no: ''
+});
+watch(
+  () => optTree.value,
+  () => {
+    appDialogData.value = {
+      category_no: optTree.value
+    };
+    queryFrom.category_no = optTree.value;
+    getTableList();
+  }
+);
+// 确定添加应用
+const onAppDialogOk = () => {
+  getTableList();
+};
 /**
  * 表格
  */
 const column = reactive<Column.ColumnOptions[]>([
   {
-    prop: 'name',
-    label: '名称'
-  },
-  {
-    prop: 'no',
-    label: '编码'
-  },
-  {
-    prop: 'status',
-    label: '状态',
-    formatter(row: any) {
-      return row.status === 1 ? '开启' : '关闭';
+    prop: 'icon',
+    label: '应用LOGO',
+    align: 'center',
+    width: 100,
+    render: (scope: any) => {
+      let img_url = '';
+      if (scope.row['icon']) {
+        img_url = `${BU_DOU_CONFIG.APP_URL}${scope.row.icon}`;
+      }
+      return <ElImage src={img_url} fit={'scale-down'} class={'w-60px h-60px'} />;
     }
   },
   {
-    prop: 'des',
+    prop: 'name',
+    label: '应用名称',
+    width: 160
+  },
+  {
+    prop: 'app_id',
+    label: '应用APP ID',
+    width: 290
+  },
+  {
+    prop: 'description',
     label: '描述'
   },
   {
     prop: 'operation',
     label: '操作',
     align: 'center',
+    width: 120,
     render: (_scope: any) => {
       return (
         <ElSpace>
-          <ElButton type="primary">配置</ElButton>
+          <ElButton type="primary">删除</ElButton>
         </ElSpace>
       );
     }
@@ -173,29 +185,17 @@ const column = reactive<Column.ColumnOptions[]>([
 ]);
 const tableData = ref<any[]>([]);
 const loadTable = ref<boolean>(false);
-// 分页
-const total = ref(0);
 
 // 查询
 const queryFrom = reactive({
-  keyword: '',
-  page_size: 15,
-  page_index: 1
+  category_no: ''
 });
 
 // 搜索
-const getTableList = () => {};
-
-// 分页page-size
-const onSizeChange = (size: number) => {
-  queryFrom.page_size = size;
-  getTableList();
-};
-
-// 分页page-size
-const onCurrentChange = (current: number) => {
-  queryFrom.page_index = current;
-  getTableList();
+const getTableList = () => {
+  categoryAppGet(queryFrom).then((res: any) => {
+    tableData.value = res;
+  });
 };
 
 onMounted(() => {
diff --git a/src/pages/workplace/manage/components/Apply.vue b/src/pages/workplace/manage/components/Apply.vue
index 0cc11c9..96ff63a 100644
--- a/src/pages/workplace/manage/components/Apply.vue
+++ b/src/pages/workplace/manage/components/Apply.vue
@@ -7,7 +7,7 @@
     :close-on-press-escape="false"
     :draggable="true"
     :z-index="99"
-    title="新增应用"
+    :title="title"
     @close="onClose"
   >
     <el-form :model="formData" label-width="96px">
@@ -65,7 +65,7 @@
     <template #footer>
       <el-space>
         <el-button @click="onClose">取消</el-button>
-        <el-button type="primary" :loading="loaging" @click="onSend">保存</el-button>
+        <el-button type="primary" :loading="loaging" @click="onConfirm">保存</el-button>
       </el-space>
     </template>
   </el-dialog>
@@ -77,22 +77,27 @@ import { ElMessage } from 'element-plus';
 import { Plus } from '@element-plus/icons-vue';
 import { useUserStore } from '@/stores/modules/user';
 // API 接口
-import { appPost } from '@/api/workplace/app';
+import { appPost, appPut } from '@/api/workplace/app';
 import { feileGet } from '@/api/file';
 
 import { BU_DOU_CONFIG } from '@/config';
 
 interface IProps {
   value: boolean;
+  title: string;
+  type: 'add' | 'edit';
+  data: object;
 }
 const props = withDefaults(defineProps<IProps>(), {
-  value: false
+  value: false,
+  title: '新增应用',
+  type: 'add'
 });
 const userStore = useUserStore();
 
 const content = ref('');
 const loaging = ref<boolean>(false);
-const formData = reactive({
+const formData = ref({
   icon: '',
   name: '',
   jump_type: 0,
@@ -111,6 +116,20 @@ watch(
   () => props.value,
   (n, _o) => {
     props.value = n;
+    if (n && props.type == 'edit') {
+      formData.value = props.data as any;
+    }
+    if (!n) {
+      formData.value = {
+        icon: '',
+        name: '',
+        jump_type: 0,
+        description: '',
+        app_route: '',
+        web_route: '',
+        is_paid_app: 0
+      };
+    }
   }
 );
 
@@ -132,17 +151,18 @@ const beforeAvatarUpload = async (rawFile: any) => {
   }
 };
 const handleAvatarSuccess = (response: any, _uploadFile: any) => {
-  formData.icon = response.path;
+  formData.value.icon = response.path;
 };
 
 // 取消
 const onClose = () => {
   emits('update:value', false);
 };
-// 发送
-const onSend = () => {
+
+// 新增应用
+const addApp = () => {
   loaging.value = true;
-  appPost(formData)
+  appPost(formData.value)
     .then((res: any) => {
       loaging.value = false;
       if (res.status == 200) {
@@ -159,6 +179,38 @@ const onSend = () => {
       }
     });
 };
+
+// 编辑
+const editApp = () => {
+  loaging.value = true;
+  appPut(formData.value)
+    .then((res: any) => {
+      loaging.value = false;
+      if (res.status == 200) {
+        ElMessage.success('新增成功！');
+        content.value = '';
+        onClose();
+        emits('ok', true);
+      }
+    })
+    .catch(err => {
+      loaging.value = false;
+      if (err.status == 400) {
+        ElMessage.error(err.msg);
+      }
+    });
+};
+// 发送
+const onConfirm = () => {
+  // 新增
+  if (props.type === 'add') {
+    addApp();
+  }
+  // 编辑
+  if (props.type === 'edit') {
+    editApp();
+  }
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/workplace/manage/index.vue b/src/pages/workplace/manage/index.vue
index 57eca2a..bdbaaa2 100644
--- a/src/pages/workplace/manage/index.vue
+++ b/src/pages/workplace/manage/index.vue
@@ -54,7 +54,7 @@
       </div>
     </div>
     <!-- 应用 -->
-    <Apply v-model:value="applyAddValue" />
+    <Apply v-model:value="applyAddValue" :type="applyType" :title="applyTitle" :data="applyData" @ok="onApplyClick" />
   </bd-page>
 </template>
 
@@ -71,6 +71,24 @@ import { BU_DOU_CONFIG } from '@/config';
 
 // API接口
 import { appGet } from '@/api/workplace/app';
+/**
+ * 新增应用
+ */
+// 新增版本
+const applyAddValue = ref<boolean>(false);
+const applyTitle = ref('新增应用');
+const applyType = ref<'add' | 'edit'>('add');
+const onAppVersionAdd = () => {
+  applyAddValue.value = true;
+  applyTitle.value = '新增应用';
+  applyType.value = 'add';
+};
+
+// 确定应用
+const onApplyClick = () => {
+  getTableList();
+};
+
 /**
  * 表格
  */
@@ -115,10 +133,12 @@ const column = reactive<Column.ColumnOptions[]>([
     label: '操作',
     width: 150,
     align: 'center',
-    render: (_scope: any) => {
+    render: (scope: any) => {
       return (
         <ElSpace>
-          <ElButton type="primary">编辑</ElButton>
+          <ElButton type="primary" onClick={() => oApplyEidt(scope.row)}>
+            编辑
+          </ElButton>
           <ElButton>删除</ElButton>
         </ElSpace>
       );
@@ -144,6 +164,15 @@ const getTableList = () => {
   });
 };
 
+// 编辑
+const applyData = ref({});
+const oApplyEidt = (item: any) => {
+  applyTitle.value = `编辑${item.name}`;
+  applyData.value = item;
+  applyType.value = 'edit';
+  applyAddValue.value = true;
+};
+
 // 分页page-size
 const onSizeChange = (size: number) => {
   queryFrom.page_size = size;
@@ -156,12 +185,6 @@ const onCurrentChange = (current: number) => {
   getTableList();
 };
 
-// 新增版本
-const applyAddValue = ref<boolean>(false);
-const onAppVersionAdd = () => {
-  applyAddValue.value = true;
-};
-
 onMounted(() => {
   getTableList();
 });

From d857c1a953d9258ae65a3e6311b517a4cede3493 Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Sat, 9 Sep 2023 23:21:08 +0800
Subject: [PATCH 07/24] =?UTF-8?q?feat:=20=E2=9C=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/components/Banner.vue       | 67 +++++++++---------
 .../configuration/components/BannerDialog.vue | 68 ++++++++++++++++---
 .../workplace/manage/components/Apply.vue     |  2 +-
 src/pages/workplace/manage/index.vue          | 45 +++++++++++-
 4 files changed, 131 insertions(+), 51 deletions(-)

diff --git a/src/pages/workplace/configuration/components/Banner.vue b/src/pages/workplace/configuration/components/Banner.vue
index 753def6..724c960 100644
--- a/src/pages/workplace/configuration/components/Banner.vue
+++ b/src/pages/workplace/configuration/components/Banner.vue
@@ -5,9 +5,6 @@
         <div class="bd-title-left"></div>
         <div class="flex items-center h-50px">
           <el-form inline>
-            <el-form-item class="mb-0 !mr-16px">
-              <el-input v-model="queryFrom.keyword" placeholder="轮播名称" clearable />
-            </el-form-item>
             <el-form-item class="mb-0 !mr-0">
               <el-button type="primary" @click="onBannerDialogValue">新增轮播</el-button>
             </el-form-item>
@@ -30,29 +27,21 @@
               <template v-else-if="item.formatter">
                 <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
               </template>
-              <template v-else>
-                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+              <template v-else-if="item.prop">
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop!] }}</slot>
               </template>
             </template>
           </el-table-column>
         </el-table>
       </div>
-      <div class="bd-card-footer pl-12px pr-12px mb-12px flex items-center justify-between">
-        <div></div>
-        <el-pagination
-          v-model:current-page="queryFrom.page_index"
-          v-model:page-size="queryFrom.page_size"
-          :page-sizes="[15, 20, 30, 50, 100]"
-          :background="true"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total"
-          @size-change="onSizeChange"
-          @current-change="onCurrentChange"
-        />
-      </div>
     </div>
     <!-- 轮播 -->
-    <BannerDialog v-model:value="bannerDialogValue" />
+    <BannerDialog
+      v-model:value="bannerDialogValue"
+      :title="bannerDialogTitle"
+      :type="bannerDialogType"
+      :data="bannerDialogData"
+    />
   </bd-page>
 </template>
 
@@ -63,6 +52,7 @@ import { BU_DOU_CONFIG } from '@/config';
 
 // API接口
 import { bannerGet, bannerDelete } from '@/api/workplace/banner';
+
 /**
  * 表格
  */
@@ -105,12 +95,17 @@ const column = reactive<Column.ColumnOptions[]>([
   {
     prop: 'operation',
     label: '操作',
+    width: 150,
     align: 'center',
     render: (scope: any) => {
       return (
         <ElSpace>
-          <ElButton type="primary">编辑</ElButton>
-          <ElButton onClick={() => onDelBanner(scope.row)}>删除</ElButton>
+          <ElButton type="primary" onClick={() => onBannerEidt(scope.row)}>
+            编辑
+          </ElButton>
+          <ElButton type="danger" onClick={() => onDelBanner(scope.row)}>
+            删除
+          </ElButton>
         </ElSpace>
       );
     }
@@ -118,8 +113,6 @@ const column = reactive<Column.ColumnOptions[]>([
 ]);
 const tableData = ref<any[]>([]);
 const loadTable = ref<boolean>(false);
-// 分页
-const total = ref(0);
 
 // 查询
 const queryFrom = reactive({
@@ -135,21 +128,23 @@ const getTableList = () => {
   });
 };
 
-// 分页page-size
-const onSizeChange = (size: number) => {
-  queryFrom.page_size = size;
-  getTableList();
-};
-
-// 分页page-size
-const onCurrentChange = (current: number) => {
-  queryFrom.page_index = current;
-  getTableList();
-};
-
 // 新增轮播
 const bannerDialogValue = ref(false);
+const bannerDialogTitle = ref('新增轮播');
+const bannerDialogType = ref<'add' | 'edit'>('add');
 const onBannerDialogValue = () => {
+  bannerDialogTitle.value = `新增轮播`;
+  bannerDialogType.value = 'add';
+  bannerDialogValue.value = true;
+};
+
+// 编辑轮播
+
+const bannerDialogData = ref({});
+const onBannerEidt = (item: any) => {
+  bannerDialogTitle.value = `编辑${item.title}`;
+  bannerDialogData.value = item;
+  bannerDialogType.value = 'edit';
   bannerDialogValue.value = true;
 };
 
@@ -170,7 +165,7 @@ const onDelBanner = (item: any) => {
           getTableList();
           ElMessage({
             type: 'success',
-            message: `轮播群组成功！`
+            message: `轮播删除成功！`
           });
         })
         .catch(err => {
diff --git a/src/pages/workplace/configuration/components/BannerDialog.vue b/src/pages/workplace/configuration/components/BannerDialog.vue
index 07f90b2..7c85a9e 100644
--- a/src/pages/workplace/configuration/components/BannerDialog.vue
+++ b/src/pages/workplace/configuration/components/BannerDialog.vue
@@ -7,7 +7,7 @@
     :close-on-press-escape="false"
     :draggable="true"
     :z-index="99"
-    title="新增轮播"
+    :title="title"
     @close="onClose"
   >
     <el-form :model="formData" label-width="96px">
@@ -50,7 +50,7 @@
     <template #footer>
       <el-space>
         <el-button @click="onClose">取消</el-button>
-        <el-button type="primary" :loading="loaging" @click="onSend">保存</el-button>
+        <el-button type="primary" :loading="loaging" @click="onConfirm">保存</el-button>
       </el-space>
     </template>
   </el-dialog>
@@ -62,23 +62,28 @@ import { ElMessage } from 'element-plus';
 import { Plus } from '@element-plus/icons-vue';
 import { useUserStore } from '@/stores/modules/user';
 // API 接口
-import { bannerPost } from '@/api/workplace/banner';
+import { bannerPost, bannerPut } from '@/api/workplace/banner';
 import { feileGet } from '@/api/file';
 
 import { BU_DOU_CONFIG } from '@/config';
 
 interface IProps {
   value: boolean;
+  title: string;
+  type: 'add' | 'edit';
+  data: object;
 }
 
 const userStore = useUserStore();
 const props = withDefaults(defineProps<IProps>(), {
-  value: false
+  value: false,
+  title: '新增轮播',
+  type: 'add'
 });
 
 const content = ref('');
 const loaging = ref<boolean>(false);
-const formData = reactive({
+const formData = ref({
   cover: '',
   title: '',
   description: '',
@@ -94,7 +99,18 @@ const emits = defineEmits<{
 watch(
   () => props.value,
   (n, _o) => {
-    props.value = n;
+    if (n && props.type === 'edit') {
+      formData.value = props.data as any;
+    }
+    if (!n) {
+      formData.value = {
+        cover: '',
+        title: '',
+        description: '',
+        route: '',
+        jump_type: 0
+      };
+    }
   }
 );
 // 上传图片
@@ -116,17 +132,17 @@ const beforeAvatarUpload = async (rawFile: any) => {
   }
 };
 const handleAvatarSuccess = (response: any, _uploadFile: any) => {
-  console.log(response);
-  formData.cover = response.path;
+  formData.value.cover = response.path;
 };
 // 取消
 const onClose = () => {
   emits('update:value', false);
 };
-// 发送
-const onSend = () => {
+
+// 新增轮播
+const addBanner = () => {
   loaging.value = true;
-  bannerPost(formData)
+  bannerPost(formData.value)
     .then((res: any) => {
       loaging.value = false;
       if (res.status == 200) {
@@ -143,6 +159,36 @@ const onSend = () => {
       }
     });
 };
+
+// 编辑轮播
+const editBanner = () => {
+  loaging.value = true;
+  bannerPut(formData.value)
+    .then((res: any) => {
+      loaging.value = false;
+      if (res.status == 200) {
+        ElMessage.success('编辑成功！');
+        content.value = '';
+        onClose();
+        emits('ok', true);
+      }
+    })
+    .catch(err => {
+      loaging.value = false;
+      if (err.status == 400) {
+        ElMessage.error(err.msg);
+      }
+    });
+};
+// 发送
+const onConfirm = () => {
+  if (props.type === 'add') {
+    addBanner();
+  }
+  if (props.type === 'edit') {
+    editBanner();
+  }
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/workplace/manage/components/Apply.vue b/src/pages/workplace/manage/components/Apply.vue
index 96ff63a..13d9df7 100644
--- a/src/pages/workplace/manage/components/Apply.vue
+++ b/src/pages/workplace/manage/components/Apply.vue
@@ -187,7 +187,7 @@ const editApp = () => {
     .then((res: any) => {
       loaging.value = false;
       if (res.status == 200) {
-        ElMessage.success('新增成功！');
+        ElMessage.success('编辑成功！');
         content.value = '';
         onClose();
         emits('ok', true);
diff --git a/src/pages/workplace/manage/index.vue b/src/pages/workplace/manage/index.vue
index bdbaaa2..9a95052 100644
--- a/src/pages/workplace/manage/index.vue
+++ b/src/pages/workplace/manage/index.vue
@@ -10,6 +10,9 @@
             <el-form-item class="mb-0 !mr-16px">
               <el-input v-model="queryFrom.keyword" placeholder="应用名称/APP ID" clearable />
             </el-form-item>
+            <el-form-item class="mb-0 !mr-16px">
+              <el-button type="primary" @click="getTableList">查询</el-button>
+            </el-form-item>
             <el-form-item class="mb-0 !mr-0">
               <el-button type="primary" @click="onAppVersionAdd">新增应用</el-button>
             </el-form-item>
@@ -65,12 +68,12 @@ meta:
 </route>
 
 <script lang="tsx" setup>
-import { ElButton, ElSpace, ElImage } from 'element-plus';
+import { ElButton, ElMessageBox, ElMessage, ElSpace, ElImage } from 'element-plus';
 import Apply from './components/Apply.vue';
 import { BU_DOU_CONFIG } from '@/config';
 
 // API接口
-import { appGet } from '@/api/workplace/app';
+import { appGet, appDelete } from '@/api/workplace/app';
 /**
  * 新增应用
  */
@@ -139,7 +142,9 @@ const column = reactive<Column.ColumnOptions[]>([
           <ElButton type="primary" onClick={() => oApplyEidt(scope.row)}>
             编辑
           </ElButton>
-          <ElButton>删除</ElButton>
+          <ElButton type="danger" onClick={() => onDelApply(scope.row)}>
+            删除
+          </ElButton>
         </ElSpace>
       );
     }
@@ -173,6 +178,40 @@ const oApplyEidt = (item: any) => {
   applyAddValue.value = true;
 };
 
+// 删除应用
+const onDelApply = (item: any) => {
+  ElMessageBox.confirm(`确定要对该应用吗?`, `操作提示`, {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    closeOnClickModal: false,
+    type: 'warning'
+  })
+    .then(() => {
+      const fromLiftban = {
+        banner_no: item.banner_no
+      };
+      appDelete(fromLiftban)
+        .then((_res: any) => {
+          getTableList();
+          ElMessage({
+            type: 'success',
+            message: `应用删除成功！`
+          });
+        })
+        .catch(err => {
+          if (err.status == 400) {
+            ElMessage.error(err.msg);
+          }
+        });
+    })
+    .catch(() => {
+      ElMessage({
+        type: 'info',
+        message: '取消成功！'
+      });
+    });
+};
+
 // 分页page-size
 const onSizeChange = (size: number) => {
   queryFrom.page_size = size;

From ae7a72e1c135bf81ee932c67df59c420567f9dd2 Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Sun, 10 Sep 2023 00:19:26 +0800
Subject: [PATCH 08/24] =?UTF-8?q?feat:=20=E2=9C=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workplace/category.ts                 |  9 +++
 .../configuration/components/Banner.vue       | 12 +++-
 .../configuration/components/CustomGroup.vue  | 59 ++++++++++++++++---
 src/pages/workplace/manage/index.vue          | 14 +++--
 4 files changed, 79 insertions(+), 15 deletions(-)

diff --git a/src/api/workplace/category.ts b/src/api/workplace/category.ts
index e243b69..ec1d00b 100644
--- a/src/api/workplace/category.ts
+++ b/src/api/workplace/category.ts
@@ -35,3 +35,12 @@ export function categoryAppPost(data: any) {
     data
   });
 }
+
+// 分类删除应用
+export function categoryAppDelete(params: any) {
+  return request({
+    url: '/manager/workplace/category/app',
+    method: 'delete',
+    params
+  });
+}
diff --git a/src/pages/workplace/configuration/components/Banner.vue b/src/pages/workplace/configuration/components/Banner.vue
index 724c960..a38f57a 100644
--- a/src/pages/workplace/configuration/components/Banner.vue
+++ b/src/pages/workplace/configuration/components/Banner.vue
@@ -123,9 +123,15 @@ const queryFrom = reactive({
 
 // 搜索
 const getTableList = () => {
-  bannerGet(queryFrom).then((res: any) => {
-    tableData.value = res;
-  });
+  loadTable.value = true;
+  bannerGet(queryFrom)
+    .then((res: any) => {
+      loadTable.value = false;
+      tableData.value = res;
+    })
+    .catch(() => {
+      loadTable.value = false;
+    });
 };
 
 // 新增轮播
diff --git a/src/pages/workplace/configuration/components/CustomGroup.vue b/src/pages/workplace/configuration/components/CustomGroup.vue
index e07da52..a34f03b 100644
--- a/src/pages/workplace/configuration/components/CustomGroup.vue
+++ b/src/pages/workplace/configuration/components/CustomGroup.vue
@@ -75,13 +75,13 @@
 </template>
 
 <script lang="tsx" name="CustomGroup" setup>
-import { ElButton, ElSpace, ElImage } from 'element-plus';
+import { ElButton, ElSpace, ElImage, ElMessageBox, ElMessage } from 'element-plus';
 import CategoryDialog from './CategoryDialog.vue';
 import AppDialog from './AppDialog.vue';
 import { BU_DOU_CONFIG } from '@/config';
 
 // API接口
-import { categoryGet, categoryAppGet } from '@/api/workplace/category';
+import { categoryGet, categoryAppGet, categoryAppDelete } from '@/api/workplace/category';
 
 interface Tree {
   category_no: string;
@@ -173,11 +173,13 @@ const column = reactive<Column.ColumnOptions[]>([
     prop: 'operation',
     label: '操作',
     align: 'center',
-    width: 120,
-    render: (_scope: any) => {
+    width: 84,
+    render: (scope: any) => {
       return (
         <ElSpace>
-          <ElButton type="primary">删除</ElButton>
+          <ElButton type="danger" onClick={() => onDelApply(scope.row)}>
+            删除
+          </ElButton>
         </ElSpace>
       );
     }
@@ -193,9 +195,50 @@ const queryFrom = reactive({
 
 // 搜索
 const getTableList = () => {
-  categoryAppGet(queryFrom).then((res: any) => {
-    tableData.value = res;
-  });
+  loadTable.value = true;
+  categoryAppGet(queryFrom)
+    .then((res: any) => {
+      loadTable.value = false;
+      tableData.value = res;
+    })
+    .catch(() => {
+      loadTable.value = false;
+    });
+};
+
+// 移除应用
+const onDelApply = (item: any) => {
+  ElMessageBox.confirm(`确定要对该应用移除吗?`, `操作提示`, {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    closeOnClickModal: false,
+    type: 'warning'
+  })
+    .then(() => {
+      const fromLiftban = {
+        category_no: optTree.value,
+        app_id: item.app_id
+      };
+      categoryAppDelete(fromLiftban)
+        .then((_res: any) => {
+          getTableList();
+          ElMessage({
+            type: 'success',
+            message: `应用移除成功！`
+          });
+        })
+        .catch(err => {
+          if (err.status == 400) {
+            ElMessage.error(err.msg);
+          }
+        });
+    })
+    .catch(() => {
+      ElMessage({
+        type: 'info',
+        message: '取消成功！'
+      });
+    });
 };
 
 onMounted(() => {
diff --git a/src/pages/workplace/manage/index.vue b/src/pages/workplace/manage/index.vue
index 9a95052..29d309e 100644
--- a/src/pages/workplace/manage/index.vue
+++ b/src/pages/workplace/manage/index.vue
@@ -164,9 +164,15 @@ const queryFrom = reactive({
 
 // 搜索
 const getTableList = () => {
-  appGet(queryFrom).then((res: any) => {
-    tableData.value = res;
-  });
+  loadTable.value = true;
+  appGet(queryFrom)
+    .then((res: any) => {
+      loadTable.value = false;
+      tableData.value = res;
+    })
+    .catch(() => {
+      loadTable.value = false;
+    });
 };
 
 // 编辑
@@ -180,7 +186,7 @@ const oApplyEidt = (item: any) => {
 
 // 删除应用
 const onDelApply = (item: any) => {
-  ElMessageBox.confirm(`确定要对该应用吗?`, `操作提示`, {
+  ElMessageBox.confirm(`确定要对该应用删除吗?`, `操作提示`, {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     closeOnClickModal: false,

From 59af780bc11de8ec3c28c1ec455caf1fd71495f1 Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Sun, 10 Sep 2023 22:54:08 +0800
Subject: [PATCH 09/24] =?UTF-8?q?feat:=20=E2=9C=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=8B=96=E6=8B=BD=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workplace/category.ts                 |  9 +++
 src/layouts/components/Tabs.vue               | 19 ------
 .../configuration/components/Banner.vue       | 21 +++++-
 .../configuration/components/CustomGroup.vue  | 54 ++++++++++++++-
 .../configuration/components/Recommend.vue    | 65 ++++++++++++++-----
 5 files changed, 130 insertions(+), 38 deletions(-)

diff --git a/src/api/workplace/category.ts b/src/api/workplace/category.ts
index ec1d00b..70e2a5e 100644
--- a/src/api/workplace/category.ts
+++ b/src/api/workplace/category.ts
@@ -18,6 +18,15 @@ export function categoryPost(data: any) {
   });
 }
 
+// 分类排序
+export function categoryPut(data: any) {
+  return request({
+    url: '/manager/workplace/category/reorder',
+    method: 'put',
+    data
+  });
+}
+
 // 分类获取应用
 export function categoryAppGet(params: any) {
   return request({
diff --git a/src/layouts/components/Tabs.vue b/src/layouts/components/Tabs.vue
index 7810bcc..322a617 100755
--- a/src/layouts/components/Tabs.vue
+++ b/src/layouts/components/Tabs.vue
@@ -10,25 +10,6 @@
             :class="tabsMenuValue === item.path ? 'chrome-tab_active' : ''"
             @click.stop="tabClick(item)"
           >
-            <!-- <div class="chrome-tab__bg">
-              <svg style="width: 100%; height: 100%">
-                <defs>
-                  <symbol id="geometry-left" viewBox="0 0 214 36">
-                    <path d="M17 0h197v36H0v-2c4.5 0 9-3.5 9-8V8c0-4.5 3.5-8 8-8z"></path>
-                  </symbol>
-                  <symbol id="geometry-right" viewBox="0 0 214 36"><use xlink:href="#geometry-left"></use></symbol>
-                  <clipPath><rect width="100%" height="100%" x="0"></rect></clipPath>
-                </defs>
-                <svg width="51%" height="100%">
-                  <use xlink:href="#geometry-left" width="214" height="36" fill="currentColor"></use>
-                </svg>
-                <g transform="scale(-1, 1)">
-                  <svg width="51%" height="100%" x="-100%" y="0">
-                    <use xlink:href="#geometry-right" width="214" height="36" fill="currentColor"></use>
-                  </svg>
-                </g>
-              </svg>
-            </div> -->
             <div v-if="item.icon && tabsIcon">
               <component :is="'i-bd-add-text'" theme="outline" size="16" class="cursor-pointer" />
             </div>
diff --git a/src/pages/workplace/configuration/components/Banner.vue b/src/pages/workplace/configuration/components/Banner.vue
index a38f57a..589b81c 100644
--- a/src/pages/workplace/configuration/components/Banner.vue
+++ b/src/pages/workplace/configuration/components/Banner.vue
@@ -16,7 +16,10 @@
         <el-table v-loading="loadTable" :data="tableData" :border="true" style="width: 100%; height: 100%">
           <el-table-column type="index" :width="42" :align="'center'" :fixed="'left'">
             <template #header>
-              <i-bd-setting class="cursor-pointer" size="16" />
+              <i-bd-drag class="cursor-pointer" size="16" />
+            </template>
+            <template #default>
+              <i-bd-drag class="bd-drag cursor-pointer" size="16" />
             </template>
           </el-table-column>
           <el-table-column v-for="item in column" v-bind="item" :key="item.prop">
@@ -47,6 +50,7 @@
 
 <script lang="tsx" name="Banner" setup>
 import { ElButton, ElSpace, ElImage, ElMessageBox, ElMessage } from 'element-plus';
+import Sortable from 'sortablejs';
 import BannerDialog from './BannerDialog.vue';
 import { BU_DOU_CONFIG } from '@/config';
 
@@ -188,8 +192,23 @@ const onDelBanner = (item: any) => {
     });
 };
 
+// tree 拖拽排序
+const tableDrop = () => {
+  Sortable.create(document.querySelector('.el-table__body-wrapper tbody') as HTMLElement, {
+    // draggable: '.bd-drag',
+    animation: 300,
+    onEnd({ newIndex, oldIndex }: any) {
+      const tablesList = [...tableData.value];
+      const currRow = tablesList.splice(oldIndex as number, 1)[0];
+      tablesList.splice(newIndex as number, 0, currRow);
+      tableData.value = tablesList;
+    }
+  });
+};
+
 onMounted(() => {
   getTableList();
+  tableDrop();
 });
 </script>
 
diff --git a/src/pages/workplace/configuration/components/CustomGroup.vue b/src/pages/workplace/configuration/components/CustomGroup.vue
index a34f03b..4274dd8 100644
--- a/src/pages/workplace/configuration/components/CustomGroup.vue
+++ b/src/pages/workplace/configuration/components/CustomGroup.vue
@@ -21,6 +21,9 @@
               :class="{ 'bd-tree-activate': item.category_no === optTree }"
               @click="onOptTreeClick(item.category_no)"
             >
+              <div class="mr-4px">
+                <i-bd-drag class="bd-drag cursor-pointer" size="14" />
+              </div>
               <div class="flex-1 text">{{ item.name }}</div>
               <div class="bd-opt">
                 <i-bd-editor :size="16" class="cursor-pointer pr-4px" />
@@ -48,6 +51,14 @@
       <!-- 表格 -->
       <div class="flex-1 overflow-hidden p-12px">
         <el-table v-loading="loadTable" :data="tableData" :border="true" style="width: 100%; height: 100%">
+          <el-table-column type="index" :width="42" :align="'center'" :fixed="'left'">
+            <template #header>
+              <i-bd-drag class="cursor-pointer" size="16" />
+            </template>
+            <template #default>
+              <i-bd-drag class="bd-drag cursor-pointer" size="16" />
+            </template>
+          </el-table-column>
           <el-table-column v-for="item in column" v-bind="item" :key="item.prop">
             <template #default="scope">
               <template v-if="item.render">
@@ -76,12 +87,13 @@
 
 <script lang="tsx" name="CustomGroup" setup>
 import { ElButton, ElSpace, ElImage, ElMessageBox, ElMessage } from 'element-plus';
+import Sortable from 'sortablejs';
 import CategoryDialog from './CategoryDialog.vue';
 import AppDialog from './AppDialog.vue';
 import { BU_DOU_CONFIG } from '@/config';
 
 // API接口
-import { categoryGet, categoryAppGet, categoryAppDelete } from '@/api/workplace/category';
+import { categoryGet, categoryPut, categoryAppGet, categoryAppDelete } from '@/api/workplace/category';
 
 interface Tree {
   category_no: string;
@@ -117,6 +129,30 @@ const onCategoryOk = () => {
   getCategoryData();
 };
 
+const categoryReorder = (newIndex: string, oldIndex: string) => {
+  const fromData = {
+    category_nos: [newIndex, oldIndex]
+  };
+  categoryPut(fromData).then(res => {
+    console.log(res);
+  });
+};
+
+// tree 拖拽排序
+const treesDrop = () => {
+  Sortable.create(document.querySelector('.tree-warp') as HTMLElement, {
+    draggable: '.bd-tree-item',
+    animation: 300,
+    onEnd({ newIndex, oldIndex }: any) {
+      categoryReorder(dataTree.value[newIndex].category_no, dataTree.value[oldIndex].category_no);
+      const treesList = [...dataTree.value];
+      const currRow = treesList.splice(oldIndex as number, 1)[0];
+      treesList.splice(newIndex as number, 0, currRow);
+      dataTree.value = treesList;
+    }
+  });
+};
+
 /**
  * 添加应用
  */
@@ -241,8 +277,24 @@ const onDelApply = (item: any) => {
     });
 };
 
+// table 拖拽排序
+const tableDrop = () => {
+  Sortable.create(document.querySelector('.el-table__body-wrapper tbody') as HTMLElement, {
+    // draggable: '.bd-drag',
+    animation: 300,
+    onEnd({ newIndex, oldIndex }: any) {
+      const tablesList = [...tableData.value];
+      const currRow = tablesList.splice(oldIndex as number, 1)[0];
+      tablesList.splice(newIndex as number, 0, currRow);
+      tableData.value = tablesList;
+    }
+  });
+};
+
 onMounted(() => {
   getCategoryData();
+  treesDrop();
+  tableDrop();
 });
 </script>
 
diff --git a/src/pages/workplace/configuration/components/Recommend.vue b/src/pages/workplace/configuration/components/Recommend.vue
index 1d28bd7..61dcb71 100644
--- a/src/pages/workplace/configuration/components/Recommend.vue
+++ b/src/pages/workplace/configuration/components/Recommend.vue
@@ -19,7 +19,10 @@
         <el-table v-loading="loadTable" :data="tableData" :border="true" style="width: 100%; height: 100%">
           <el-table-column type="index" :width="42" :align="'center'" :fixed="'left'">
             <template #header>
-              <i-bd-setting class="cursor-pointer" size="16" />
+              <i-bd-drag class="cursor-pointer" size="16" />
+            </template>
+            <template #default>
+              <i-bd-drag class="bd-drag cursor-pointer" size="16" />
             </template>
           </el-table-column>
           <el-table-column v-for="item in column" v-bind="item" :key="item.prop">
@@ -30,8 +33,8 @@
               <template v-else-if="item.formatter">
                 <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
               </template>
-              <template v-else>
-                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop] }}</slot>
+              <template v-else-if="item.prop">
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop!] }}</slot>
               </template>
             </template>
           </el-table-column>
@@ -55,28 +58,38 @@
 </template>
 
 <script lang="tsx" name="Recommend" setup>
-import { ElButton, ElSpace } from 'element-plus';
+import { ElButton, ElSpace, ElImage } from 'element-plus';
+import Sortable from 'sortablejs';
+import { BU_DOU_CONFIG } from '@/config';
 /**
  * 表格
  */
 const column = reactive<Column.ColumnOptions[]>([
   {
-    prop: 'name',
-    label: '名称'
-  },
-  {
-    prop: 'no',
-    label: '编码'
-  },
-  {
-    prop: 'status',
-    label: '状态',
-    formatter(row: any) {
-      return row.status === 1 ? '开启' : '关闭';
+    prop: 'icon',
+    label: '应用LOGO',
+    align: 'center',
+    width: 100,
+    render: (scope: any) => {
+      let img_url = '';
+      if (scope.row['icon']) {
+        img_url = `${BU_DOU_CONFIG.APP_URL}${scope.row.icon}`;
+      }
+      return <ElImage src={img_url} fit={'scale-down'} class={'w-60px h-60px'} />;
     }
   },
   {
-    prop: 'des',
+    prop: 'name',
+    label: '应用名称',
+    width: 160
+  },
+  {
+    prop: 'app_id',
+    label: '应用APP ID',
+    width: 290
+  },
+  {
+    prop: 'description',
     label: '描述'
   },
   {
@@ -120,6 +133,24 @@ const onCurrentChange = (current: number) => {
 };
 
 // 新增版本
+
+// table 拖拽排序
+const tableDrop = () => {
+  Sortable.create(document.querySelector('.el-table__body-wrapper tbody') as HTMLElement, {
+    // draggable: '.bd-drag',
+    animation: 300,
+    onEnd({ newIndex, oldIndex }: any) {
+      const tablesList = [...tableData.value];
+      const currRow = tablesList.splice(oldIndex as number, 1)[0];
+      tablesList.splice(newIndex as number, 0, currRow);
+      tableData.value = tablesList;
+    }
+  });
+};
+
+onMounted(() => {
+  tableDrop();
+});
 </script>
 
 <style lang="scss" scoped>

From e90eb8ed041dd4b856259fdf8b4572e1907410fa Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Sun, 10 Sep 2023 23:33:40 +0800
Subject: [PATCH 10/24] =?UTF-8?q?feat:=20=E2=9C=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=94=BE=E5=A4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  1 +
 pnpm-lock.yaml                                | 26 +++++++++++++++++--
 src/main.ts                                   |  1 +
 .../configuration/components/Banner.vue       | 20 ++++++++++++--
 src/pages/workplace/manage/index.vue          | 19 ++++++++++++--
 5 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 6ca4f93..e108efa 100755
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.1.0",
+    "@fancyapps/ui": "^5.0.22",
     "@icon-park/vue-next": "^1.4.2",
     "@lottiefiles/lottie-player": "^2.0.2",
     "@vueuse/core": "^10.1.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 382e913..36473e2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -8,6 +8,9 @@ dependencies:
   '@element-plus/icons-vue':
     specifier: ^2.1.0
     version: 2.1.0(vue@3.3.4)
+  '@fancyapps/ui':
+    specifier: ^5.0.22
+    version: 5.0.22
   '@icon-park/vue-next':
     specifier: ^1.4.2
     version: 1.4.2(vue@3.3.4)
@@ -1033,6 +1036,10 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
+  /@fancyapps/ui@5.0.22:
+    resolution: {integrity: sha512-44A5/Hm59mn53FqZRyM4HO/R7UWE79UxgNyHmaudSe+HuU5Kl1g6lxR4Ol1QFaqNS97Pbdytlu4SxYsOX1BTxw==}
+    dev: false
+
   /@floating-ui/core@1.3.1:
     resolution: {integrity: sha512-Bu+AMaXNjrpjh41znzHqaz3r2Nr8hHuHZT6V2LBKMhyMl0FgKA62PNYbqnfgmzOhoWZj70Zecisbo4H1rotP5g==}
     dev: false
@@ -3988,7 +3995,7 @@ packages:
       lodash-es: 4.17.21
       vanilla-jsoneditor: 0.17.8
       vue: 3.3.4
-      vue-demi: 0.14.5(vue@3.3.4)
+      vue-demi: 0.14.6(vue@3.3.4)
       vue-global-config: 0.4.0(vue@3.3.4)
     dev: true
 
@@ -5750,6 +5757,21 @@ packages:
     dependencies:
       vue: 3.3.4
 
+  /vue-demi@0.14.6(vue@3.3.4):
+    resolution: {integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==}
+    engines: {node: '>=12'}
+    hasBin: true
+    requiresBuild: true
+    peerDependencies:
+      '@vue/composition-api': ^1.0.0-rc.1
+      vue: ^3.0.0-0 || ^2.6.0
+    peerDependenciesMeta:
+      '@vue/composition-api':
+        optional: true
+    dependencies:
+      vue: 3.3.4
+    dev: true
+
   /vue-eslint-parser@9.3.1(eslint@8.40.0):
     resolution: {integrity: sha512-Clr85iD2XFZ3lJ52/ppmUDG/spxQu6+MAeHXjjyI4I1NUYZ9xmenQp4N0oaHJhrA8OOxltCVxMRfANGa70vU0g==}
     engines: {node: ^14.17.0 || >=16.0.0}
@@ -5772,7 +5794,7 @@ packages:
     resolution: {integrity: sha512-283vpYOhVHJCpMkjNVEwZdgaAb+Y93zFaXGAWTI378MLoNuwQydjD/BAy1e81QYEmyA+JbxqcmMZVWcM9rbriw==}
     dependencies:
       eslint-config-vue-global-api: 0.4.1
-      vue-demi: 0.14.5(vue@3.3.4)
+      vue-demi: 0.14.6(vue@3.3.4)
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
diff --git a/src/main.ts b/src/main.ts
index b160f98..3fcd5d0 100755
--- a/src/main.ts
+++ b/src/main.ts
@@ -19,6 +19,7 @@ import 'vue-global-api';
 import 'element-plus/dist/index.css';
 import 'element-plus/theme-chalk/dark/css-vars.css';
 import '@icon-park/vue-next/styles/index.css';
+import '@fancyapps/ui/dist/fancybox/fancybox.css';
 import '@/styles/index.scss';
 import 'uno.css';
 
diff --git a/src/pages/workplace/configuration/components/Banner.vue b/src/pages/workplace/configuration/components/Banner.vue
index 589b81c..f3d7638 100644
--- a/src/pages/workplace/configuration/components/Banner.vue
+++ b/src/pages/workplace/configuration/components/Banner.vue
@@ -49,7 +49,8 @@
 </template>
 
 <script lang="tsx" name="Banner" setup>
-import { ElButton, ElSpace, ElImage, ElMessageBox, ElMessage } from 'element-plus';
+import { ElButton, ElSpace, ElMessageBox, ElMessage } from 'element-plus';
+import { Fancybox } from '@fancyapps/ui';
 import Sortable from 'sortablejs';
 import BannerDialog from './BannerDialog.vue';
 import { BU_DOU_CONFIG } from '@/config';
@@ -60,6 +61,20 @@ import { bannerGet, bannerDelete } from '@/api/workplace/banner';
 /**
  * 表格
  */
+// 图片预览
+const previewPicture = (url: string) => {
+  const imgList = [];
+  imgList.push({ src: url });
+  Fancybox.show(imgList, {
+    Toolbar: {
+      display: {
+        left: ['infobar'],
+        middle: ['zoomIn', 'zoomOut', 'toggle1to1', 'rotateCCW', 'rotateCW', 'flipX', 'flipY'],
+        right: ['slideshow', 'thumbs', 'close']
+      }
+    }
+  });
+};
 const column = reactive<Column.ColumnOptions[]>([
   {
     prop: 'title',
@@ -68,12 +83,13 @@ const column = reactive<Column.ColumnOptions[]>([
   {
     prop: 'cover',
     label: '图片',
+    width: 146,
     render: (scope: any) => {
       let img_url = '';
       if (scope.row['cover']) {
         img_url = `${BU_DOU_CONFIG.APP_URL}${scope.row.cover}`;
       }
-      return <ElImage src={img_url} fit={'scale-down'} class={'w-120px h-60px'} />;
+      return <img src={img_url} class={'w-120px h-60px cursor-pointer'} onClick={() => previewPicture(img_url)} />;
     }
   },
   {
diff --git a/src/pages/workplace/manage/index.vue b/src/pages/workplace/manage/index.vue
index 29d309e..56ea553 100644
--- a/src/pages/workplace/manage/index.vue
+++ b/src/pages/workplace/manage/index.vue
@@ -68,7 +68,8 @@ meta:
 </route>
 
 <script lang="tsx" setup>
-import { ElButton, ElMessageBox, ElMessage, ElSpace, ElImage } from 'element-plus';
+import { ElButton, ElMessageBox, ElMessage, ElSpace } from 'element-plus';
+import { Fancybox } from '@fancyapps/ui';
 import Apply from './components/Apply.vue';
 import { BU_DOU_CONFIG } from '@/config';
 
@@ -92,6 +93,20 @@ const onApplyClick = () => {
   getTableList();
 };
 
+const previewPicture = (url: string) => {
+  const imgList = [];
+  imgList.push({ src: url });
+  Fancybox.show(imgList, {
+    Toolbar: {
+      display: {
+        left: ['infobar'],
+        middle: ['zoomIn', 'zoomOut', 'toggle1to1', 'rotateCCW', 'rotateCW', 'flipX', 'flipY'],
+        right: ['slideshow', 'thumbs', 'close']
+      }
+    }
+  });
+};
+
 /**
  * 表格
  */
@@ -106,7 +121,7 @@ const column = reactive<Column.ColumnOptions[]>([
       if (scope.row['icon']) {
         img_url = `${BU_DOU_CONFIG.APP_URL}${scope.row.icon}`;
       }
-      return <ElImage src={img_url} fit={'scale-down'} class={'w-60px h-60px'} />;
+      return <img src={img_url} class={'w-60px h-60px cursor-pointer'} onClick={() => previewPicture(img_url)} />;
     }
   },
   {

From 5ec2b5c95d442f0e9114ae487aa632a8cef3dcb9 Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Mon, 11 Sep 2023 22:06:04 +0800
Subject: [PATCH 11/24] =?UTF-8?q?feat:=20=E2=9C=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8F=A3=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/menu/modules/tool.ts   |  14 ++++
 src/pages/tool/command.vue | 154 +++++++++++++++++++++++++++++++++++++
 2 files changed, 168 insertions(+)
 create mode 100644 src/pages/tool/command.vue

diff --git a/src/menu/modules/tool.ts b/src/menu/modules/tool.ts
index 807678c..414d1c4 100644
--- a/src/menu/modules/tool.ts
+++ b/src/menu/modules/tool.ts
@@ -27,6 +27,20 @@ const home: Menu.MenuOptions = {
         title: 'APP升级'
       }
     },
+    {
+      component: '/tool/command',
+      name: 'toolCommand',
+      path: '/tool/command',
+      meta: {
+        icon: 'i-bd-command',
+        isAffix: false,
+        isFull: false,
+        isHide: false,
+        isKeepAlive: true,
+        isLink: '',
+        title: '口令管理'
+      }
+    },
     {
       component: '/tool/systemrobotmenu',
       name: 'toolSystemrobotmenu',
diff --git a/src/pages/tool/command.vue b/src/pages/tool/command.vue
new file mode 100644
index 0000000..861f2bf
--- /dev/null
+++ b/src/pages/tool/command.vue
@@ -0,0 +1,154 @@
+<template>
+  <bd-page class="flex-col">
+    <div class="flex-1 el-card border-none flex-col box-border overflow-hidden">
+      <div class="h-50px pl-12px pr-12px box-border flex items-center justify-between bd-title">
+        <div class="bd-title-left">
+          <p class="m-0 font-600">口令管理</p>
+        </div>
+        <div class="flex items-center h-50px">
+          <el-form inline>
+            <el-form-item class="mb-0 !mr-16px">
+              <el-input v-model="queryFrom.keyword" placeholder="名称" clearable />
+            </el-form-item>
+            <el-form-item class="mb-0 !mr-0">
+              <el-button type="primary">新增口令</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+
+      <div class="flex-1 overflow-hidden p-12px">
+        <el-table v-loading="loadTable" :data="tableData" :border="true" style="width: 100%; height: 100%">
+          <el-table-column type="index" :width="42" :align="'center'" :fixed="'left'">
+            <template #header>
+              <i-bd-drag class="cursor-pointer" size="16" />
+            </template>
+            <template #default>
+              <i-bd-drag class="bd-drag cursor-pointer" size="16" />
+            </template>
+          </el-table-column>
+          <el-table-column v-for="item in column" v-bind="item" :key="item.prop">
+            <template #default="scope">
+              <template v-if="item.render">
+                <component :is="item.render" :row="scope.row"> </component>
+              </template>
+              <template v-else-if="item.formatter">
+                <slot :name="item.prop" :row="scope.row">{{ item.formatter(scope.row) }}</slot>
+              </template>
+              <template v-else-if="item.prop">
+                <slot :name="item.prop" :row="scope.row">{{ scope.row[item.prop!] }}</slot>
+              </template>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="bd-card-footer pl-12px pr-12px mb-12px flex items-center justify-between">
+        <div></div>
+        <el-pagination
+          v-model:current-page="queryFrom.page_index"
+          v-model:page-size="queryFrom.page_size"
+          :page-sizes="[15, 20, 30, 50, 100]"
+          :background="true"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+          @size-change="onSizeChange"
+          @current-change="onCurrentChange"
+        />
+      </div>
+    </div>
+  </bd-page>
+</template>
+
+<route lang="yaml">
+meta:
+  title: 口令管理
+  isAffix: false
+</route>
+
+<script lang="tsx" name="command" setup>
+import { ElButton, ElSpace } from 'element-plus';
+import Sortable from 'sortablejs';
+/**
+ * 表格
+ */
+const column = reactive<Column.ColumnOptions[]>([
+  {
+    prop: 'name',
+    label: '口令名称'
+  },
+  {
+    prop: 'app_id',
+    label: '地址'
+  },
+  {
+    prop: 'description',
+    label: '描述'
+  },
+  {
+    prop: 'operation',
+    label: '操作',
+    align: 'center',
+    render: (_scope: any) => {
+      return (
+        <ElSpace>
+          <ElButton type="primary">编辑</ElButton>
+          <ElButton type="danger">删除</ElButton>
+        </ElSpace>
+      );
+    }
+  }
+]);
+const tableData = ref<any[]>([]);
+const loadTable = ref<boolean>(false);
+// 分页
+const total = ref(0);
+
+// 查询
+const queryFrom = reactive({
+  keyword: '',
+  page_size: 15,
+  page_index: 1
+});
+
+// 搜索
+const getTableList = () => {};
+
+// 分页page-size
+const onSizeChange = (size: number) => {
+  queryFrom.page_size = size;
+  getTableList();
+};
+
+// 分页page-size
+const onCurrentChange = (current: number) => {
+  queryFrom.page_index = current;
+  getTableList();
+};
+
+// 新增版本
+
+// table 拖拽排序
+const tableDrop = () => {
+  Sortable.create(document.querySelector('.el-table__body-wrapper tbody') as HTMLElement, {
+    // draggable: '.bd-drag',
+    animation: 300,
+    onEnd({ newIndex, oldIndex }: any) {
+      const tablesList = [...tableData.value];
+      const currRow = tablesList.splice(oldIndex as number, 1)[0];
+      tablesList.splice(newIndex as number, 0, currRow);
+      tableData.value = tablesList;
+    }
+  });
+};
+
+onMounted(() => {
+  tableDrop();
+});
+</script>
+
+<style lang="scss" scoped>
+// 样式
+.bd-title {
+  border-bottom: 1px solid var(--el-card-border-color);
+}
+</style>

From 503240e5dc8d7eb11ff2ad9b6e4ec26241ca7ec3 Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Mon, 11 Sep 2023 23:07:58 +0800
Subject: [PATCH 12/24] =?UTF-8?q?feat:=20=E2=9C=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=A7=86=E9=A2=91=EF=BC=8C=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BdMsg/index.vue | 58 ++++++++++++++++++++++++++++++++--
 1 file changed, 55 insertions(+), 3 deletions(-)

diff --git a/src/components/BdMsg/index.vue b/src/components/BdMsg/index.vue
index 462cdfa..87b8e87 100644
--- a/src/components/BdMsg/index.vue
+++ b/src/components/BdMsg/index.vue
@@ -5,13 +5,31 @@
       {{ msg['content'] }}
     </span>
     <!-- 图片 -->
-    <img v-else-if="msg.type == 2" class="w-120px" :src="`${url}${msg['url']}`" />
+    <img
+      v-else-if="msg.type == 2"
+      class="w-120px cursor-pointer"
+      :src="`${url}${msg['url']}`"
+      @click="previewPicture(`${url}${msg['url']}`, 'image')"
+    />
     <!-- GIF -->
-    <img v-else-if="msg.type == 3" class="w-120px" :src="`${url}${msg['url']}`" />
+    <img
+      v-else-if="msg.type == 3"
+      class="w-120px cursor-pointer"
+      :src="`${url}${msg['url']}`"
+      @click="previewPicture(`${url}${msg['url']}`, 'image')"
+    />
     <!-- 语音 -->
     <audio v-else-if="msg.type == 4" :src="`${url}${msg['url']}`"></audio>
     <!-- 视频 -->
-    <video v-else-if="msg.type == 5" controls :src="`${url}${msg['url']}`" class="w-220px h-100px"></video>
+    <video
+      v-else-if="msg.type == 5"
+      controls
+      controlsList="nofullscreen nodownload noplaybackrate noremote footbar"
+      disablePictureInPicture
+      :src="`${url}${msg['url']}`"
+      class="w-220px h-100px cursor-pointer"
+      @click="previewPicture(`${url}${msg['url']}`, 'image')"
+    ></video>
     <!-- 位置 -->
     <div v-else-if="msg.type == 6">
       <div>位置标题：{{ msg['title'] }}</div>
@@ -73,6 +91,7 @@
 </template>
 
 <script lang="tsx" name="BdMsg" setup>
+import { Fancybox } from '@fancyapps/ui';
 import '@lottiefiles/lottie-player/dist/tgs-player';
 import { BU_DOU_CONFIG } from '@/config';
 interface IProps {
@@ -80,4 +99,37 @@ interface IProps {
 }
 defineProps<IProps>();
 const url = BU_DOU_CONFIG.APP_URL;
+
+// 图片预览
+const previewPicture = (url: string, type: string) => {
+  const imgList = [];
+  imgList.push({ src: url, defaultType: type });
+  Fancybox.show(imgList, {
+    Toolbar: {
+      display: {
+        left: ['infobar'],
+        middle: ['zoomIn', 'zoomOut', 'toggle1to1', 'rotateCCW', 'rotateCW', 'flipX', 'flipY'],
+        right: ['slideshow', 'thumbs', 'close']
+      }
+    }
+  });
+};
 </script>
+
+<style scoped>
+video::-webkit-media-controls-timeline {
+  display: none;
+}
+video::-webkit-media-controls-mute-button {
+  display: none;
+}
+video::-webkit-media-controls-toggle-closed-captions-button {
+  display: none;
+}
+video::-webkit-media-controls-volume-slider {
+  display: none;
+}
+video::-webkit-media-controls-fullscreen-button {
+  display: none;
+}
+</style>

From 3ab9cfc6b80f4dde647b6b0e442d66ae61a234b0 Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Sun, 17 Sep 2023 18:58:57 +0800
Subject: [PATCH 13/24] =?UTF-8?q?feat:=20=E2=9C=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8F=A3=E4=BB=A4=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/command.ts                            |  36 +++++
 .../tool/command/components/CommandDialog.vue | 146 ++++++++++++++++++
 .../tool/{command.vue => command/index.vue}   | 122 +++++++++++----
 .../configuration/components/Banner.vue       |   7 +-
 4 files changed, 282 insertions(+), 29 deletions(-)
 create mode 100644 src/api/command.ts
 create mode 100644 src/pages/tool/command/components/CommandDialog.vue
 rename src/pages/tool/{command.vue => command/index.vue} (55%)

diff --git a/src/api/command.ts b/src/api/command.ts
new file mode 100644
index 0000000..c5c340f
--- /dev/null
+++ b/src/api/command.ts
@@ -0,0 +1,36 @@
+import request from '@/utils/axios';
+
+// 获取口令列表
+export function commandGet(params?: any) {
+  return request({
+    url: '/manager/web3/laboratory',
+    method: 'get',
+    params
+  });
+}
+
+// 新增口令
+export function commandPost(data: any) {
+  return request({
+    url: '/manager/web3/laboratory',
+    method: 'post',
+    data
+  });
+}
+
+// 编辑口令
+export function commandPut(data: any, id: string) {
+  return request({
+    url: `/manager/web3/laboratory/${id}`,
+    method: 'put',
+    data
+  });
+}
+
+// 删除口令
+export function commandDelete(id: string) {
+  return request({
+    url: `/manager/web3/laboratory/${id}`,
+    method: 'delete'
+  });
+}
diff --git a/src/pages/tool/command/components/CommandDialog.vue b/src/pages/tool/command/components/CommandDialog.vue
new file mode 100644
index 0000000..c544171
--- /dev/null
+++ b/src/pages/tool/command/components/CommandDialog.vue
@@ -0,0 +1,146 @@
+<template>
+  <el-dialog
+    :model-value="value"
+    :width="600"
+    :align-center="true"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    :draggable="true"
+    :z-index="99"
+    :title="title"
+    @close="onClose"
+  >
+    <el-form :model="formData" label-width="96px">
+      <el-form-item label="口令">
+        <el-input v-model="formData.short_url" placeholder="请输入口令" />
+      </el-form-item>
+
+      <el-form-item label="地址">
+        <el-input v-model="formData.url" placeholder="请输入地址" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-space>
+        <el-button @click="onClose">取消</el-button>
+        <el-button type="primary" :loading="loaging" @click="onConfirm">保存</el-button>
+      </el-space>
+    </template>
+  </el-dialog>
+</template>
+
+<script lang="ts" name="CommandDialog" setup>
+import { ref } from 'vue';
+import { ElMessage } from 'element-plus';
+// API 接口
+import { commandPost, commandPut } from '@/api/command';
+
+interface IProps {
+  value: boolean;
+  title: string;
+  type: 'add' | 'edit';
+  data: object;
+}
+
+const props = withDefaults(defineProps<IProps>(), {
+  value: false,
+  title: '新增口令',
+  type: 'add'
+});
+
+const content = ref('');
+const loaging = ref<boolean>(false);
+const formData = ref({
+  short_url: '',
+  url: ''
+});
+
+const emits = defineEmits<{
+  (e: 'update:value', item: boolean): void;
+  (e: 'ok', item: any): void;
+}>();
+
+watch(
+  () => props.value,
+  (n, _o) => {
+    if (n && props.type === 'edit') {
+      formData.value = props.data as any;
+    }
+    if (!n) {
+      formData.value = {
+        short_url: '',
+        url: ''
+      };
+    }
+  }
+);
+
+// 取消
+const onClose = () => {
+  emits('update:value', false);
+};
+
+// 新增口令
+const addBanner = () => {
+  loaging.value = true;
+  commandPost(formData.value)
+    .then((res: any) => {
+      loaging.value = false;
+      if (res.status == 200) {
+        ElMessage.success('新增成功！');
+        content.value = '';
+        onClose();
+        emits('ok', true);
+      }
+    })
+    .catch(err => {
+      loaging.value = false;
+      if (err.status == 400) {
+        ElMessage.error(err.msg);
+      }
+    });
+};
+
+// 编辑口令
+const editBanner = () => {
+  loaging.value = true;
+  commandPut(formData.value, (props.data as any).id)
+    .then((res: any) => {
+      loaging.value = false;
+      if (res.status == 200) {
+        ElMessage.success('编辑成功！');
+        content.value = '';
+        onClose();
+        emits('ok', true);
+      }
+    })
+    .catch(err => {
+      loaging.value = false;
+      if (err.status == 400) {
+        ElMessage.error(err.msg);
+      }
+    });
+};
+// 保存
+const onConfirm = () => {
+  if (props.type === 'add') {
+    addBanner();
+  }
+  if (props.type === 'edit') {
+    editBanner();
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.bd-uplod {
+  ::v-deep(.el-upload--picture-card) {
+    height: 78px;
+    width: 78px;
+  }
+
+  .avatar {
+    height: 78px;
+    width: 78px;
+  }
+}
+</style>
diff --git a/src/pages/tool/command.vue b/src/pages/tool/command/index.vue
similarity index 55%
rename from src/pages/tool/command.vue
rename to src/pages/tool/command/index.vue
index 861f2bf..7726f8e 100644
--- a/src/pages/tool/command.vue
+++ b/src/pages/tool/command/index.vue
@@ -10,8 +10,11 @@
             <el-form-item class="mb-0 !mr-16px">
               <el-input v-model="queryFrom.keyword" placeholder="名称" clearable />
             </el-form-item>
+            <el-form-item class="mb-0 !mr-16px">
+              <el-button type="primary" @click="getTableList">查询</el-button>
+            </el-form-item>
             <el-form-item class="mb-0 !mr-0">
-              <el-button type="primary">新增口令</el-button>
+              <el-button type="primary" @click="onCommandAddClick">新增口令</el-button>
             </el-form-item>
           </el-form>
         </div>
@@ -23,9 +26,6 @@
             <template #header>
               <i-bd-drag class="cursor-pointer" size="16" />
             </template>
-            <template #default>
-              <i-bd-drag class="bd-drag cursor-pointer" size="16" />
-            </template>
           </el-table-column>
           <el-table-column v-for="item in column" v-bind="item" :key="item.prop">
             <template #default="scope">
@@ -56,6 +56,14 @@
         />
       </div>
     </div>
+    <!-- 口令操作 -->
+    <CommandDialog
+      v-model:value="commandDialogValue"
+      :title="commandDialogTitle"
+      :type="commandDialogType"
+      :data="commandDialogData"
+      @ok="onCommandOk"
+    />
   </bd-page>
 </template>
 
@@ -66,33 +74,41 @@ meta:
 </route>
 
 <script lang="tsx" name="command" setup>
-import { ElButton, ElSpace } from 'element-plus';
-import Sortable from 'sortablejs';
+import { ElButton, ElSpace, ElMessage, ElMessageBox } from 'element-plus';
+import CommandDialog from './components/CommandDialog.vue';
+
+// API接口
+import { commandGet, commandDelete } from '@/api/command';
 /**
  * 表格
  */
 const column = reactive<Column.ColumnOptions[]>([
   {
-    prop: 'name',
+    prop: 'short_url',
     label: '口令名称'
   },
   {
-    prop: 'app_id',
+    prop: 'url',
     label: '地址'
   },
   {
-    prop: 'description',
-    label: '描述'
+    prop: 'create_at',
+    label: '创建时间'
   },
   {
     prop: 'operation',
     label: '操作',
+    width: 150,
     align: 'center',
-    render: (_scope: any) => {
+    render: (scope: any) => {
       return (
         <ElSpace>
-          <ElButton type="primary">编辑</ElButton>
-          <ElButton type="danger">删除</ElButton>
+          <ElButton type="primary" onClick={() => onCommandEidt(scope.row)}>
+            编辑
+          </ElButton>
+          <ElButton type="danger" onClick={() => onCommandDel(scope.row)}>
+            删除
+          </ElButton>
         </ElSpace>
       );
     }
@@ -111,7 +127,18 @@ const queryFrom = reactive({
 });
 
 // 搜索
-const getTableList = () => {};
+const getTableList = () => {
+  loadTable.value = true;
+  commandGet(queryFrom)
+    .then((res: any) => {
+      loadTable.value = false;
+      tableData.value = res.list;
+      total.value = res.count;
+    })
+    .catch(() => {
+      loadTable.value = false;
+    });
+};
 
 // 分页page-size
 const onSizeChange = (size: number) => {
@@ -125,24 +152,63 @@ const onCurrentChange = (current: number) => {
   getTableList();
 };
 
-// 新增版本
+// 新增口令
+const commandDialogValue = ref(false);
+const commandDialogTitle = ref('新增口令');
+const commandDialogType = ref<'add' | 'edit'>('add');
+const onCommandAddClick = () => {
+  commandDialogTitle.value = '新增口令';
+  commandDialogType.value = 'add';
+  commandDialogValue.value = true;
+};
 
-// table 拖拽排序
-const tableDrop = () => {
-  Sortable.create(document.querySelector('.el-table__body-wrapper tbody') as HTMLElement, {
-    // draggable: '.bd-drag',
-    animation: 300,
-    onEnd({ newIndex, oldIndex }: any) {
-      const tablesList = [...tableData.value];
-      const currRow = tablesList.splice(oldIndex as number, 1)[0];
-      tablesList.splice(newIndex as number, 0, currRow);
-      tableData.value = tablesList;
-    }
-  });
+// 编辑口令
+const commandDialogData = ref({});
+const onCommandEidt = (item: any) => {
+  commandDialogTitle.value = `编辑${item.short_url}`;
+  commandDialogData.value = item;
+  commandDialogType.value = 'edit';
+  commandDialogValue.value = true;
+};
+
+// 保存口令
+const onCommandOk = () => {
+  getTableList();
+};
+
+// 删除口令
+const onCommandDel = (item: any) => {
+  ElMessageBox.confirm(`确定要对该口令吗?`, `操作提示`, {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    closeOnClickModal: false,
+    type: 'warning'
+  })
+    .then(() => {
+      commandDelete(item.id)
+        .then((_res: any) => {
+          getTableList();
+          ElMessage({
+            type: 'success',
+            message: `口令删除成功！`
+          });
+        })
+        .catch(err => {
+          if (err.status == 400) {
+            ElMessage.error(err.msg);
+          }
+        });
+    })
+    .catch(() => {
+      ElMessage({
+        type: 'info',
+        message: '取消成功！'
+      });
+    });
 };
 
 onMounted(() => {
-  tableDrop();
+  getTableList();
 });
 </script>
 
diff --git a/src/pages/workplace/configuration/components/Banner.vue b/src/pages/workplace/configuration/components/Banner.vue
index f3d7638..579192d 100644
--- a/src/pages/workplace/configuration/components/Banner.vue
+++ b/src/pages/workplace/configuration/components/Banner.vue
@@ -44,6 +44,7 @@
       :title="bannerDialogTitle"
       :type="bannerDialogType"
       :data="bannerDialogData"
+      @ok="onBannerOk"
     />
   </bd-page>
 </template>
@@ -165,7 +166,6 @@ const onBannerDialogValue = () => {
 };
 
 // 编辑轮播
-
 const bannerDialogData = ref({});
 const onBannerEidt = (item: any) => {
   bannerDialogTitle.value = `编辑${item.title}`;
@@ -174,6 +174,11 @@ const onBannerEidt = (item: any) => {
   bannerDialogValue.value = true;
 };
 
+// 保存轮播
+const onBannerOk = () => {
+  getTableList();
+};
+
 // 删除轮播
 const onDelBanner = (item: any) => {
   ElMessageBox.confirm(`确定要对该轮播吗?`, `操作提示`, {

From 57a7bd1399c173810c5318e77a79058a831962b2 Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Wed, 20 Sep 2023 23:08:26 +0800
Subject: [PATCH 14/24] =?UTF-8?q?feat:=20=E2=9C=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/user/userlist.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/user/userlist.vue b/src/pages/user/userlist.vue
index 6bcda1f..41e27bf 100644
--- a/src/pages/user/userlist.vue
+++ b/src/pages/user/userlist.vue
@@ -81,7 +81,7 @@ const userStore = useUserStore();
 const column = reactive<Column.ColumnOptions[]>([
   {
     prop: 'name',
-    label: '用户名',
+    label: '昵称',
     fixed: 'left',
     width: 140
   },
@@ -91,6 +91,11 @@ const column = reactive<Column.ColumnOptions[]>([
     fixed: 'left',
     width: 120
   },
+  {
+    prop: 'username',
+    label: '用户',
+    width: 120
+  },
   {
     prop: 'avatar',
     label: '头像',

From 6b229eed6d1d28dee72010242d1bec20435ae6aa Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Wed, 20 Sep 2023 23:13:58 +0800
Subject: [PATCH 15/24] =?UTF-8?q?feat:=20=E2=9C=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workplace/configuration/components/BannerDialog.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/workplace/configuration/components/BannerDialog.vue b/src/pages/workplace/configuration/components/BannerDialog.vue
index 7c85a9e..5dd2d0d 100644
--- a/src/pages/workplace/configuration/components/BannerDialog.vue
+++ b/src/pages/workplace/configuration/components/BannerDialog.vue
@@ -118,6 +118,7 @@ const headers = {
   token: userStore.token
 };
 const actionURL = ref('');
+// 图片上传前获取上传地址
 const beforeAvatarUpload = async (rawFile: any) => {
   const fileData = {
     path: `/${rawFile.uid}/${rawFile.name}`,
@@ -131,6 +132,7 @@ const beforeAvatarUpload = async (rawFile: any) => {
     return false;
   }
 };
+// 图片上传成功获取地址
 const handleAvatarSuccess = (response: any, _uploadFile: any) => {
   formData.value.cover = response.path;
 };

From d17c1fba40dd0a17be36c8872ca2f8d455607749 Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Wed, 20 Sep 2023 23:17:44 +0800
Subject: [PATCH 16/24] =?UTF-8?q?fix:=20=F0=9F=90=9B=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workplace/configuration/components/BannerDialog.vue | 4 ++--
 src/pages/workplace/manage/components/Apply.vue               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/workplace/configuration/components/BannerDialog.vue b/src/pages/workplace/configuration/components/BannerDialog.vue
index 5dd2d0d..a8c10f2 100644
--- a/src/pages/workplace/configuration/components/BannerDialog.vue
+++ b/src/pages/workplace/configuration/components/BannerDialog.vue
@@ -17,7 +17,7 @@
       <el-form-item label="图片">
         <el-upload
           ref="upload"
-          class="bd-uplod"
+          class="bd-upload"
           :action="actionURL"
           list-type="picture-card"
           :show-file-list="false"
@@ -194,7 +194,7 @@ const onConfirm = () => {
 </script>
 
 <style lang="scss" scoped>
-.bd-uplod {
+.bd-upload {
   ::v-deep(.el-upload--picture-card) {
     height: 78px;
     width: 78px;
diff --git a/src/pages/workplace/manage/components/Apply.vue b/src/pages/workplace/manage/components/Apply.vue
index 13d9df7..c154324 100644
--- a/src/pages/workplace/manage/components/Apply.vue
+++ b/src/pages/workplace/manage/components/Apply.vue
@@ -17,7 +17,7 @@
       <el-form-item label="应用图标">
         <el-upload
           ref="upload"
-          class="bd-uplod"
+          class="bd-upload"
           :action="actionURL"
           list-type="picture-card"
           :show-file-list="false"
@@ -214,7 +214,7 @@ const onConfirm = () => {
 </script>
 
 <style lang="scss" scoped>
-.bd-uplod {
+.bd-upload {
   ::v-deep(.el-upload--picture-card) {
     height: 78px;
     width: 78px;

From 99179834ba6961a4eb9018a2c86423a7f82c7d1c Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Thu, 21 Sep 2023 09:12:41 +0800
Subject: [PATCH 17/24] =?UTF-8?q?perf:=20=F0=9F=91=8C=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/components/BannerDialog.vue       | 13 ++++++++-----
 src/pages/workplace/manage/components/Apply.vue     | 13 +++++++++----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/pages/workplace/configuration/components/BannerDialog.vue b/src/pages/workplace/configuration/components/BannerDialog.vue
index a8c10f2..f84367c 100644
--- a/src/pages/workplace/configuration/components/BannerDialog.vue
+++ b/src/pages/workplace/configuration/components/BannerDialog.vue
@@ -22,8 +22,8 @@
           list-type="picture-card"
           :show-file-list="false"
           :headers="headers"
-          :before-upload="beforeAvatarUpload"
-          :on-success="handleAvatarSuccess"
+          :before-upload="beforeUploadFile"
+          :on-success="onFileSuccess"
         >
           <img v-if="formData.cover" :src="`${BU_DOU_CONFIG.APP_URL}${formData.cover}`" class="avatar" />
           <el-icon v-else><Plus /></el-icon>
@@ -113,13 +113,16 @@ watch(
     }
   }
 );
-// 上传图片
+
+/**
+ * 上传图片
+ */
 const headers = {
   token: userStore.token
 };
 const actionURL = ref('');
 // 图片上传前获取上传地址
-const beforeAvatarUpload = async (rawFile: any) => {
+const beforeUploadFile = async (rawFile: any) => {
   const fileData = {
     path: `/${rawFile.uid}/${rawFile.name}`,
     type: 'report'
@@ -133,7 +136,7 @@ const beforeAvatarUpload = async (rawFile: any) => {
   }
 };
 // 图片上传成功获取地址
-const handleAvatarSuccess = (response: any, _uploadFile: any) => {
+const onFileSuccess = (response: any, _uploadFile: any) => {
   formData.value.cover = response.path;
 };
 // 取消
diff --git a/src/pages/workplace/manage/components/Apply.vue b/src/pages/workplace/manage/components/Apply.vue
index c154324..503980c 100644
--- a/src/pages/workplace/manage/components/Apply.vue
+++ b/src/pages/workplace/manage/components/Apply.vue
@@ -22,8 +22,8 @@
           list-type="picture-card"
           :show-file-list="false"
           :headers="headers"
-          :before-upload="beforeAvatarUpload"
-          :on-success="handleAvatarSuccess"
+          :before-upload="beforeUploadFile"
+          :on-success="onFileSuccess"
         >
           <img v-if="formData.icon" :src="`${BU_DOU_CONFIG.APP_URL}${formData.icon}`" class="avatar" />
           <el-icon v-else><Plus /></el-icon>
@@ -133,11 +133,15 @@ watch(
   }
 );
 
+/**
+ * 上传图片
+ */
 const headers = {
   token: userStore.token
 };
 const actionURL = ref('');
-const beforeAvatarUpload = async (rawFile: any) => {
+// 图片上传前获取上传地址
+const beforeUploadFile = async (rawFile: any) => {
   const fileData = {
     path: `/${rawFile.uid}/${rawFile.name}`,
     type: 'report'
@@ -150,7 +154,8 @@ const beforeAvatarUpload = async (rawFile: any) => {
     return false;
   }
 };
-const handleAvatarSuccess = (response: any, _uploadFile: any) => {
+// 图片上传成功获取地址
+const onFileSuccess = (response: any, _uploadFile: any) => {
   formData.value.icon = response.path;
 };
 

From f9b4c3045e0cfd253b3e07478134e8254da819ee Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Sun, 17 Dec 2023 22:11:11 +0800
Subject: [PATCH 18/24] =?UTF-8?q?feat:=20=E5=8D=95=E8=81=8A=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=88=A0=E9=99=A4=E6=B7=BB=E5=8A=A0from=5Fuid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/message/recordpersonal.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/message/recordpersonal.vue b/src/pages/message/recordpersonal.vue
index b23705b..ac83a14 100644
--- a/src/pages/message/recordpersonal.vue
+++ b/src/pages/message/recordpersonal.vue
@@ -225,6 +225,7 @@ const msgDel = (data: any) => {
   const formData = {
     channel_id: route.query.uid,
     channel_type: 1,
+    from_uid: route.query.touid,
     list
   };
   messageDelete(formData).then((res: any) => {

From d561679f433f8eb88f9251d354d2872ea5a7b335 Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Sat, 13 Jan 2024 14:54:19 +0800
Subject: [PATCH 19/24] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E3=80=81=E8=BD=AE=E6=92=ADAPI=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workplace/app.ts                      | 11 +++++------
 src/api/workplace/banner.ts                   | 13 ++++++-------
 src/pages/message/recordpersonal.vue          |  4 ++--
 .../configuration/components/Banner.vue       |  5 +----
 .../configuration/components/BannerDialog.vue |  3 ++-
 .../workplace/manage/components/Apply.vue     | 19 ++++++++-----------
 src/pages/workplace/manage/index.vue          |  5 +----
 7 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/src/api/workplace/app.ts b/src/api/workplace/app.ts
index c753fc7..e32856c 100644
--- a/src/api/workplace/app.ts
+++ b/src/api/workplace/app.ts
@@ -19,19 +19,18 @@ export function appPost(data: any) {
 }
 
 // 编辑应用
-export function appPut(data: any) {
+export function appPut(data: any, app_id: string) {
   return request({
-    url: '/manager/workplace/app',
+    url: `/manager/workplace/apps/${app_id}`,
     method: 'put',
     data
   });
 }
 
 // 删除应用
-export function appDelete(params: any) {
+export function appDelete(app_id: string) {
   return request({
-    url: '/manager/workplace/app',
-    method: 'delete',
-    params
+    url: `/manager/workplace/apps/${app_id}`,
+    method: 'delete'
   });
 }
diff --git a/src/api/workplace/banner.ts b/src/api/workplace/banner.ts
index 9846b68..8c240b3 100644
--- a/src/api/workplace/banner.ts
+++ b/src/api/workplace/banner.ts
@@ -19,19 +19,18 @@ export function bannerPost(data: any) {
 }
 
 // 编辑轮播
-export function bannerPut(data: any) {
+export function bannerPut(data: any, banner_no: string) {
   return request({
-    url: '/manager/workplace/banner',
-    method: 'post',
+    url: `/manager/workplace/banners/${banner_no}`,
+    method: 'put',
     data
   });
 }
 
 // 删除轮播
-export function bannerDelete(params: any) {
+export function bannerDelete(banner_no: string) {
   return request({
-    url: '/manager/workplace/banner',
-    method: 'delete',
-    params
+    url: `/manager/workplace/banners/${banner_no}`,
+    method: 'delete'
   });
 }
diff --git a/src/pages/message/recordpersonal.vue b/src/pages/message/recordpersonal.vue
index ac83a14..e427016 100644
--- a/src/pages/message/recordpersonal.vue
+++ b/src/pages/message/recordpersonal.vue
@@ -198,8 +198,8 @@ const getUserList = () => {
   loadTable.value = true;
   messageRecordpersonalGet(queryFrom).then((res: any) => {
     loadTable.value = false;
-    tableData.value = res.list;
-    total.value = res.count;
+    tableData.value = res?.list ? res?.list : [];
+    total.value = res?.count ? res?.count : 0;
   });
 };
 
diff --git a/src/pages/workplace/configuration/components/Banner.vue b/src/pages/workplace/configuration/components/Banner.vue
index 579192d..8c56f99 100644
--- a/src/pages/workplace/configuration/components/Banner.vue
+++ b/src/pages/workplace/configuration/components/Banner.vue
@@ -188,10 +188,7 @@ const onDelBanner = (item: any) => {
     type: 'warning'
   })
     .then(() => {
-      const fromLiftban = {
-        banner_no: item.banner_no
-      };
-      bannerDelete(fromLiftban)
+      bannerDelete(item.banner_no)
         .then((_res: any) => {
           getTableList();
           ElMessage({
diff --git a/src/pages/workplace/configuration/components/BannerDialog.vue b/src/pages/workplace/configuration/components/BannerDialog.vue
index f84367c..9147692 100644
--- a/src/pages/workplace/configuration/components/BannerDialog.vue
+++ b/src/pages/workplace/configuration/components/BannerDialog.vue
@@ -168,7 +168,8 @@ const addBanner = () => {
 // 编辑轮播
 const editBanner = () => {
   loaging.value = true;
-  bannerPut(formData.value)
+  const banner_no = (props.data as any).banner_no;
+  bannerPut(formData.value, banner_no)
     .then((res: any) => {
       loaging.value = false;
       if (res.status == 200) {
diff --git a/src/pages/workplace/manage/components/Apply.vue b/src/pages/workplace/manage/components/Apply.vue
index 503980c..31756c5 100644
--- a/src/pages/workplace/manage/components/Apply.vue
+++ b/src/pages/workplace/manage/components/Apply.vue
@@ -35,16 +35,12 @@
           <el-radio :label="1">APP</el-radio>
         </el-radio-group>
       </el-form-item>
-      <template v-if="formData.jump_type === 0">
-        <el-form-item label="网页地址">
-          <el-input v-model="formData.web_route" placeholder="请输入网页地址" />
-        </el-form-item>
-      </template>
-      <template v-if="formData.jump_type === 1">
-        <el-form-item label="APP地址">
-          <el-input v-model="formData.app_route" placeholder="请输入APP地址" />
-        </el-form-item>
-      </template>
+      <el-form-item label="网页地址">
+        <el-input v-model="formData.web_route" placeholder="请输入网页地址" />
+      </el-form-item>
+      <el-form-item label="APP地址">
+        <el-input v-model="formData.app_route" placeholder="请输入APP地址" />
+      </el-form-item>
       <el-form-item label="付款">
         <el-radio-group v-model="formData.is_paid_app">
           <el-radio :label="0">免费</el-radio>
@@ -188,7 +184,8 @@ const addApp = () => {
 // 编辑
 const editApp = () => {
   loaging.value = true;
-  appPut(formData.value)
+  const app_id = (props.data as any).app_id;
+  appPut(formData.value, app_id)
     .then((res: any) => {
       loaging.value = false;
       if (res.status == 200) {
diff --git a/src/pages/workplace/manage/index.vue b/src/pages/workplace/manage/index.vue
index 56ea553..36384ea 100644
--- a/src/pages/workplace/manage/index.vue
+++ b/src/pages/workplace/manage/index.vue
@@ -208,10 +208,7 @@ const onDelApply = (item: any) => {
     type: 'warning'
   })
     .then(() => {
-      const fromLiftban = {
-        banner_no: item.banner_no
-      };
-      appDelete(fromLiftban)
+      appDelete(item.app_id)
         .then((_res: any) => {
           getTableList();
           ElMessage({

From c36831a211260f5465d66c1ea95ad977a663ad3c Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Sat, 13 Jan 2024 16:32:49 +0800
Subject: [PATCH 20/24] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=BA=94=E7=94=A8=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workplace/category.ts                 | 27 +++++----
 .../configuration/components/AppDialog.vue    |  3 +-
 .../configuration/components/CustomGroup.vue  | 55 ++++++++++++++-----
 3 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/src/api/workplace/category.ts b/src/api/workplace/category.ts
index 70e2a5e..af268f5 100644
--- a/src/api/workplace/category.ts
+++ b/src/api/workplace/category.ts
@@ -28,28 +28,35 @@ export function categoryPut(data: any) {
 }
 
 // 分类获取应用
-export function categoryAppGet(params: any) {
+export function categoryAppGet(category_no: string) {
   return request({
-    url: '/manager/workplace/category/app',
-    method: 'get',
-    params
+    url: `/manager/workplace/categorys/${category_no}/app`,
+    method: 'get'
   });
 }
 
 // 分类新增应用
-export function categoryAppPost(data: any) {
+export function categoryAppPost(data: any, category_no: string) {
   return request({
-    url: '/manager/workplace/category/app',
+    url: `/manager/workplace/categorys/${category_no}/app`,
     method: 'post',
     data
   });
 }
 
 // 分类删除应用
-export function categoryAppDelete(params: any) {
+export function categoryAppDelete(category_no: string, app_id: string) {
   return request({
-    url: '/manager/workplace/category/app',
-    method: 'delete',
-    params
+    url: `/manager/workplace/categorys/${category_no}/apps/${app_id}`,
+    method: 'delete'
+  });
+}
+
+// 分类应用排序
+export function categorysAppsReorderPut(data: any, category_no: string) {
+  return request({
+    url: `/manager/workplace/categorys/${category_no}/app/reorder`,
+    method: 'put',
+    data
   });
 }
diff --git a/src/pages/workplace/configuration/components/AppDialog.vue b/src/pages/workplace/configuration/components/AppDialog.vue
index 871e8ae..c9e142e 100644
--- a/src/pages/workplace/configuration/components/AppDialog.vue
+++ b/src/pages/workplace/configuration/components/AppDialog.vue
@@ -130,11 +130,10 @@ const onConfirm = () => {
     return ElMessage.info('请输入分类！');
   }
   const fromData = {
-    category_no: props.data.category_no,
     app_ids: selectionData.value
   };
   loaging.value = true;
-  categoryAppPost(fromData)
+  categoryAppPost(fromData, props.data.category_no)
     .then((res: any) => {
       loaging.value = false;
       if (res.status == 200) {
diff --git a/src/pages/workplace/configuration/components/CustomGroup.vue b/src/pages/workplace/configuration/components/CustomGroup.vue
index 4274dd8..ec56f17 100644
--- a/src/pages/workplace/configuration/components/CustomGroup.vue
+++ b/src/pages/workplace/configuration/components/CustomGroup.vue
@@ -93,7 +93,7 @@ import AppDialog from './AppDialog.vue';
 import { BU_DOU_CONFIG } from '@/config';
 
 // API接口
-import { categoryGet, categoryPut, categoryAppGet, categoryAppDelete } from '@/api/workplace/category';
+import { categoryGet, categoryPut, categoryAppGet, categoryAppDelete, categorysAppsReorderPut } from '@/api/workplace/category';
 
 interface Tree {
   category_no: string;
@@ -134,21 +134,31 @@ const categoryReorder = (newIndex: string, oldIndex: string) => {
     category_nos: [newIndex, oldIndex]
   };
   categoryPut(fromData).then(res => {
-    console.log(res);
+    if (res.status == 200) {
+      getCategoryData();
+      ElMessage({
+        type: 'success',
+        message: `分类排序成功`
+      });
+    } else {
+      ElMessage({
+        type: 'info',
+        message: '分类排序失败!'
+      });
+    }
   });
 };
 
-// tree 拖拽排序
+// 分类拖拽排序
 const treesDrop = () => {
   Sortable.create(document.querySelector('.tree-warp') as HTMLElement, {
     draggable: '.bd-tree-item',
     animation: 300,
     onEnd({ newIndex, oldIndex }: any) {
-      categoryReorder(dataTree.value[newIndex].category_no, dataTree.value[oldIndex].category_no);
       const treesList = [...dataTree.value];
       const currRow = treesList.splice(oldIndex as number, 1)[0];
       treesList.splice(newIndex as number, 0, currRow);
-      dataTree.value = treesList;
+      categoryReorder(treesList[newIndex].category_no, treesList[oldIndex].category_no);
     }
   });
 };
@@ -209,7 +219,7 @@ const column = reactive<Column.ColumnOptions[]>([
     prop: 'operation',
     label: '操作',
     align: 'center',
-    width: 84,
+    width: 80,
     render: (scope: any) => {
       return (
         <ElSpace>
@@ -232,7 +242,7 @@ const queryFrom = reactive({
 // 搜索
 const getTableList = () => {
   loadTable.value = true;
-  categoryAppGet(queryFrom)
+  categoryAppGet(queryFrom.category_no)
     .then((res: any) => {
       loadTable.value = false;
       tableData.value = res;
@@ -251,11 +261,7 @@ const onDelApply = (item: any) => {
     type: 'warning'
   })
     .then(() => {
-      const fromLiftban = {
-        category_no: optTree.value,
-        app_id: item.app_id
-      };
-      categoryAppDelete(fromLiftban)
+      categoryAppDelete(optTree.value, item.app_id)
         .then((_res: any) => {
           getTableList();
           ElMessage({
@@ -277,6 +283,26 @@ const onDelApply = (item: any) => {
     });
 };
 
+const categorysAppsReorder = (new_app_id: string, old_app_id: string) => {
+  const fromData = {
+    app_ids: [new_app_id, old_app_id]
+  };
+  categorysAppsReorderPut(fromData, queryFrom.category_no).then(res => {
+    if (res.status == 200) {
+      getTableList();
+      ElMessage({
+        type: 'success',
+        message: `应用排序成功`
+      });
+    } else {
+      ElMessage({
+        type: 'info',
+        message: '应用排序失败!'
+      });
+    }
+  });
+};
+
 // table 拖拽排序
 const tableDrop = () => {
   Sortable.create(document.querySelector('.el-table__body-wrapper tbody') as HTMLElement, {
@@ -287,10 +313,13 @@ const tableDrop = () => {
       const currRow = tablesList.splice(oldIndex as number, 1)[0];
       tablesList.splice(newIndex as number, 0, currRow);
       tableData.value = tablesList;
+      categorysAppsReorder(tablesList[newIndex].app_id, tablesList[oldIndex].app_id);
     }
   });
 };
-
+/**
+ * 初始化数据
+ */
 onMounted(() => {
   getCategoryData();
   treesDrop();

From d354ce6b73c5dd4fc825d7fb234ce8a2e335bade Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Sat, 13 Jan 2024 18:58:40 +0800
Subject: [PATCH 21/24] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E5=88=86=E7=B1=BB=E7=BC=96=E8=BE=91=E3=80=81?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workplace/category.ts                 | 19 ++++-
 .../components/CategoryDialog.vue             | 67 +++++++++++++--
 .../configuration/components/CustomGroup.vue  | 81 +++++++++++++++++--
 src/pages/workplace/configuration/index.vue   |  8 --
 4 files changed, 150 insertions(+), 25 deletions(-)

diff --git a/src/api/workplace/category.ts b/src/api/workplace/category.ts
index af268f5..d1067fe 100644
--- a/src/api/workplace/category.ts
+++ b/src/api/workplace/category.ts
@@ -18,8 +18,25 @@ export function categoryPost(data: any) {
   });
 }
 
+// 分类编辑
+export function categoryPut(data: any, category_no: string) {
+  return request({
+    url: `/manager/workplace/categorys/${category_no}`,
+    method: 'put',
+    data
+  });
+}
+
+// 删除分类
+export function categoryDelete(category_no: string) {
+  return request({
+    url: `/manager/workplace/categorys/${category_no}`,
+    method: 'delete'
+  });
+}
+
 // 分类排序
-export function categoryPut(data: any) {
+export function categoryReorderPut(data: any) {
   return request({
     url: '/manager/workplace/category/reorder',
     method: 'put',
diff --git a/src/pages/workplace/configuration/components/CategoryDialog.vue b/src/pages/workplace/configuration/components/CategoryDialog.vue
index a4c43fc..fa025d1 100644
--- a/src/pages/workplace/configuration/components/CategoryDialog.vue
+++ b/src/pages/workplace/configuration/components/CategoryDialog.vue
@@ -26,12 +26,20 @@
 import { ref } from 'vue';
 import { ElMessage } from 'element-plus';
 // API 接口
-import { categoryPost } from '@/api/workplace/category';
+import { categoryPost, categoryPut } from '@/api/workplace/category';
 interface IProps {
   value: boolean;
+  type: 'add' | 'edit';
+  data: {
+    category_no?: string;
+    name?: string;
+    sort_num?: number;
+  };
 }
 const props = withDefaults(defineProps<IProps>(), {
-  value: false
+  value: false,
+  title: '新增分类',
+  type: 'add'
 });
 
 const content = ref('');
@@ -47,17 +55,21 @@ watch(
   (n, _o) => {
     console.log(props.value);
     props.value = n;
+    if (n && props.type == 'edit') {
+      content.value = props.data?.name || '';
+    }
+    if (!n) {
+      content.value = '';
+    }
   }
 );
 // 取消
 const onClose = () => {
   emits('update:value', false);
 };
-// 发送
-const onSend = () => {
-  if (!content.value) {
-    return ElMessage.info('请输入分类！');
-  }
+
+// 新增分类
+const addCategor = () => {
   const fromData = {
     name: content.value
   };
@@ -66,7 +78,7 @@ const onSend = () => {
     .then((res: any) => {
       loaging.value = false;
       if (res.status == 200) {
-        ElMessage.success('新增分类成功！');
+        ElMessage.success('编辑分类成功！');
         content.value = '';
         onClose();
         emits('ok', true);
@@ -79,4 +91,43 @@ const onSend = () => {
       }
     });
 };
+// 编辑分类
+const editCategor = () => {
+  const fromData = {
+    name: content.value
+  };
+  loaging.value = true;
+  const category_no = (props.data as any).category_no;
+  categoryPut(fromData, category_no)
+    .then((res: any) => {
+      loaging.value = false;
+      if (res.status == 200) {
+        ElMessage.success('编辑分类成功！');
+        content.value = '';
+        onClose();
+        emits('ok', true);
+      }
+    })
+    .catch(err => {
+      loaging.value = false;
+      if (err.status == 400) {
+        ElMessage.error(err.msg);
+      }
+    });
+};
+
+// 保存
+const onSend = () => {
+  if (!content.value) {
+    return ElMessage.info('请输入分类！');
+  }
+  // 新增
+  if (props.type === 'add') {
+    addCategor();
+  }
+  // 编辑
+  if (props.type === 'edit') {
+    editCategor();
+  }
+};
 </script>
diff --git a/src/pages/workplace/configuration/components/CustomGroup.vue b/src/pages/workplace/configuration/components/CustomGroup.vue
index ec56f17..e8ffb29 100644
--- a/src/pages/workplace/configuration/components/CustomGroup.vue
+++ b/src/pages/workplace/configuration/components/CustomGroup.vue
@@ -5,7 +5,7 @@
       <div class="h-50px pl-12px pr-12px box-border flex items-center justify-between bd-title">
         <div class="bd-title-left font-500 text-14px">分组</div>
         <div class="flex items-center h-50px">
-          <i-bd-add :size="22" class="cursor-pointer" @click="categoryDialogValue = true" />
+          <i-bd-add :size="22" class="cursor-pointer" @click="onCategoryAdd" />
         </div>
       </div>
       <div class="m-12px">
@@ -26,8 +26,8 @@
               </div>
               <div class="flex-1 text">{{ item.name }}</div>
               <div class="bd-opt">
-                <i-bd-editor :size="16" class="cursor-pointer pr-4px" />
-                <i-bd-delete :size="16" class="cursor-pointer" />
+                <i-bd-editor :size="16" class="cursor-pointer pr-4px" @click.stop="onCategoryEdit(item)" />
+                <i-bd-delete :size="16" class="cursor-pointer" @click.stop="onCategoryDelete(item)" />
               </div>
             </div>
           </div>
@@ -78,7 +78,13 @@
     <!-- E 右侧 表格 -->
 
     <!-- 新增分类 -->
-    <CategoryDialog v-model:value="categoryDialogValue" @ok="onCategoryOk" />
+    <CategoryDialog
+      v-model:value="categoryValue"
+      :type="categoryType"
+      :title="categoryTitle"
+      :data="categoryData"
+      @ok="onCategoryOk"
+    />
 
     <!-- 添加应用 -->
     <AppDialog v-model:value="appDialogValue" :data="appDialogData" @ok="onAppDialogOk" />
@@ -93,7 +99,14 @@ import AppDialog from './AppDialog.vue';
 import { BU_DOU_CONFIG } from '@/config';
 
 // API接口
-import { categoryGet, categoryPut, categoryAppGet, categoryAppDelete, categorysAppsReorderPut } from '@/api/workplace/category';
+import {
+  categoryGet,
+  categoryDelete,
+  categoryReorderPut,
+  categoryAppGet,
+  categoryAppDelete,
+  categorysAppsReorderPut
+} from '@/api/workplace/category';
 
 interface Tree {
   category_no: string;
@@ -103,7 +116,6 @@ interface Tree {
 /**
  * 左侧分类
  */
-const categoryDialogValue = ref<boolean>(false);
 const dataTree = ref<Tree[]>([]);
 const optTree = ref('');
 const keyword = ref('');
@@ -128,12 +140,12 @@ const onOptTreeClick = (no: string) => {
 const onCategoryOk = () => {
   getCategoryData();
 };
-
+// 分类排序
 const categoryReorder = (newIndex: string, oldIndex: string) => {
   const fromData = {
     category_nos: [newIndex, oldIndex]
   };
-  categoryPut(fromData).then(res => {
+  categoryReorderPut(fromData).then(res => {
     if (res.status == 200) {
       getCategoryData();
       ElMessage({
@@ -163,6 +175,59 @@ const treesDrop = () => {
   });
 };
 
+const categoryValue = ref(false);
+const categoryTitle = ref('新增分类');
+const categoryType = ref<'add' | 'edit'>('add');
+const categoryData = ref({});
+
+// 分类新增
+const onCategoryAdd = () => {
+  categoryValue.value = true;
+  categoryTitle.value = '新增分类';
+  categoryType.value = 'add';
+  categoryData.value = {};
+};
+
+// 分类编辑
+const onCategoryEdit = (item: any) => {
+  console.log(item);
+  categoryValue.value = true;
+  categoryTitle.value = '编辑分类';
+  categoryType.value = 'edit';
+  categoryData.value = { ...item };
+};
+
+// 分类删除
+const onCategoryDelete = (item: any) => {
+  ElMessageBox.confirm(`确定要对该分类吗?`, `操作提示`, {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    closeOnClickModal: false,
+    type: 'warning'
+  })
+    .then(() => {
+      categoryDelete(item.category_no)
+        .then((_res: any) => {
+          getCategoryData();
+          ElMessage({
+            type: 'success',
+            message: `轮播删除成功！`
+          });
+        })
+        .catch(err => {
+          if (err.status == 400) {
+            ElMessage.error(err.msg);
+          }
+        });
+    })
+    .catch(() => {
+      ElMessage({
+        type: 'info',
+        message: '取消成功！'
+      });
+    });
+};
+
 /**
  * 添加应用
  */
diff --git a/src/pages/workplace/configuration/index.vue b/src/pages/workplace/configuration/index.vue
index 55890f0..8a6696e 100644
--- a/src/pages/workplace/configuration/index.vue
+++ b/src/pages/workplace/configuration/index.vue
@@ -18,7 +18,6 @@ meta:
 
 <script lang="tsx" setup>
 import Banner from './components/Banner.vue';
-import Recommend from './components/Recommend.vue';
 import CustomGroup from './components/CustomGroup.vue';
 
 const activeName = ref('banner');
@@ -31,13 +30,6 @@ const tabsData = reactive([
       return <Banner />;
     }
   },
-  {
-    name: 'recommend',
-    label: '管理员推荐',
-    render: () => {
-      return <Recommend />;
-    }
-  },
   {
     name: 'custom-group',
     label: '自定义分组',

From ce95ff4547a90cae47046f9e22f8de55ace5ce8b Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Sat, 13 Jan 2024 20:16:30 +0800
Subject: [PATCH 22/24] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E8=BD=AE?=
 =?UTF-8?q?=E6=92=AD=E8=A1=A8=E6=A0=BC=E6=8B=96=E6=8B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workplace/banner.ts                   |  9 ++++++
 .../configuration/components/Banner.vue       | 28 ++++++++++++++++---
 .../configuration/components/CustomGroup.vue  |  6 ++--
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/api/workplace/banner.ts b/src/api/workplace/banner.ts
index 8c240b3..364c348 100644
--- a/src/api/workplace/banner.ts
+++ b/src/api/workplace/banner.ts
@@ -34,3 +34,12 @@ export function bannerDelete(banner_no: string) {
     method: 'delete'
   });
 }
+
+// 轮播排序
+export function bannerReorderPut(data: any) {
+  return request({
+    url: `/manager/workplace/banner/reorder`,
+    method: 'put',
+    data
+  });
+}
diff --git a/src/pages/workplace/configuration/components/Banner.vue b/src/pages/workplace/configuration/components/Banner.vue
index 8c56f99..7eb4695 100644
--- a/src/pages/workplace/configuration/components/Banner.vue
+++ b/src/pages/workplace/configuration/components/Banner.vue
@@ -13,7 +13,7 @@
       </div>
 
       <div class="flex-1 overflow-hidden p-12px">
-        <el-table v-loading="loadTable" :data="tableData" :border="true" style="width: 100%; height: 100%">
+        <el-table v-loading="loadTable" :data="tableData" row-key="banner_no" :border="true" style="width: 100%; height: 100%">
           <el-table-column type="index" :width="42" :align="'center'" :fixed="'left'">
             <template #header>
               <i-bd-drag class="cursor-pointer" size="16" />
@@ -57,7 +57,7 @@ import BannerDialog from './BannerDialog.vue';
 import { BU_DOU_CONFIG } from '@/config';
 
 // API接口
-import { bannerGet, bannerDelete } from '@/api/workplace/banner';
+import { bannerGet, bannerDelete, bannerReorderPut } from '@/api/workplace/banner';
 
 /**
  * 表格
@@ -210,16 +210,36 @@ const onDelBanner = (item: any) => {
     });
 };
 
+const bannerReorder = (newIndex: string, oldIndex: string) => {
+  const fromData = {
+    banner_nos: [newIndex, oldIndex]
+  };
+  bannerReorderPut(fromData).then(res => {
+    if (res.status == 200) {
+      getTableList();
+      ElMessage({
+        type: 'success',
+        message: `轮播排序成功`
+      });
+    } else {
+      ElMessage({
+        type: 'info',
+        message: '轮播排序失败!'
+      });
+    }
+  });
+};
+
 // tree 拖拽排序
 const tableDrop = () => {
   Sortable.create(document.querySelector('.el-table__body-wrapper tbody') as HTMLElement, {
-    // draggable: '.bd-drag',
+    handle: '.bd-drag',
     animation: 300,
     onEnd({ newIndex, oldIndex }: any) {
       const tablesList = [...tableData.value];
       const currRow = tablesList.splice(oldIndex as number, 1)[0];
       tablesList.splice(newIndex as number, 0, currRow);
-      tableData.value = tablesList;
+      bannerReorder(tablesList[newIndex].banner_no, tablesList[oldIndex].banner_no);
     }
   });
 };
diff --git a/src/pages/workplace/configuration/components/CustomGroup.vue b/src/pages/workplace/configuration/components/CustomGroup.vue
index e8ffb29..96a170b 100644
--- a/src/pages/workplace/configuration/components/CustomGroup.vue
+++ b/src/pages/workplace/configuration/components/CustomGroup.vue
@@ -50,7 +50,7 @@
       </div>
       <!-- 表格 -->
       <div class="flex-1 overflow-hidden p-12px">
-        <el-table v-loading="loadTable" :data="tableData" :border="true" style="width: 100%; height: 100%">
+        <el-table v-loading="loadTable" :data="tableData" row-key="app_id" :border="true" style="width: 100%; height: 100%">
           <el-table-column type="index" :width="42" :align="'center'" :fixed="'left'">
             <template #header>
               <i-bd-drag class="cursor-pointer" size="16" />
@@ -164,7 +164,7 @@ const categoryReorder = (newIndex: string, oldIndex: string) => {
 // 分类拖拽排序
 const treesDrop = () => {
   Sortable.create(document.querySelector('.tree-warp') as HTMLElement, {
-    draggable: '.bd-tree-item',
+    handle: '.bd-drag',
     animation: 300,
     onEnd({ newIndex, oldIndex }: any) {
       const treesList = [...dataTree.value];
@@ -371,7 +371,7 @@ const categorysAppsReorder = (new_app_id: string, old_app_id: string) => {
 // table 拖拽排序
 const tableDrop = () => {
   Sortable.create(document.querySelector('.el-table__body-wrapper tbody') as HTMLElement, {
-    // draggable: '.bd-drag',
+    handle: '.bd-drag',
     animation: 300,
     onEnd({ newIndex, oldIndex }: any) {
       const tablesList = [...tableData.value];

From 12cb42c0c5d6c1a9dc17e923dad2338fd6ba6d55 Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Sun, 14 Jan 2024 15:37:48 +0800
Subject: [PATCH 23/24] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=88=86=E7=BB=84=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/components/Banner.vue          | 11 +++++++++--
 .../configuration/components/CustomGroup.vue     | 16 ++++++++++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/pages/workplace/configuration/components/Banner.vue b/src/pages/workplace/configuration/components/Banner.vue
index 7eb4695..0c11773 100644
--- a/src/pages/workplace/configuration/components/Banner.vue
+++ b/src/pages/workplace/configuration/components/Banner.vue
@@ -235,11 +235,18 @@ const tableDrop = () => {
   Sortable.create(document.querySelector('.el-table__body-wrapper tbody') as HTMLElement, {
     handle: '.bd-drag',
     animation: 300,
-    onEnd({ newIndex, oldIndex }: any) {
+    onEnd(evt: any) {
+      const { newIndex, oldIndex } = evt;
       const tablesList = [...tableData.value];
       const currRow = tablesList.splice(oldIndex as number, 1)[0];
       tablesList.splice(newIndex as number, 0, currRow);
-      bannerReorder(tablesList[newIndex].banner_no, tablesList[oldIndex].banner_no);
+      if (oldIndex > newIndex) {
+        // 向上排序
+        bannerReorder(tablesList[newIndex].banner_no, tablesList[oldIndex].banner_no);
+      } else {
+        // 向下排序
+        bannerReorder(tablesList[oldIndex].banner_no, tablesList[newIndex].banner_no);
+      }
     }
   });
 };
diff --git a/src/pages/workplace/configuration/components/CustomGroup.vue b/src/pages/workplace/configuration/components/CustomGroup.vue
index 96a170b..8539a6b 100644
--- a/src/pages/workplace/configuration/components/CustomGroup.vue
+++ b/src/pages/workplace/configuration/components/CustomGroup.vue
@@ -170,7 +170,13 @@ const treesDrop = () => {
       const treesList = [...dataTree.value];
       const currRow = treesList.splice(oldIndex as number, 1)[0];
       treesList.splice(newIndex as number, 0, currRow);
-      categoryReorder(treesList[newIndex].category_no, treesList[oldIndex].category_no);
+      if (oldIndex > newIndex) {
+        // 向上排序
+        categoryReorder(treesList[newIndex].category_no, treesList[oldIndex].category_no);
+      } else {
+        // 向下排序
+        categoryReorder(treesList[oldIndex].category_no, treesList[newIndex].category_no);
+      }
     }
   });
 };
@@ -378,7 +384,13 @@ const tableDrop = () => {
       const currRow = tablesList.splice(oldIndex as number, 1)[0];
       tablesList.splice(newIndex as number, 0, currRow);
       tableData.value = tablesList;
-      categorysAppsReorder(tablesList[newIndex].app_id, tablesList[oldIndex].app_id);
+      if (oldIndex > newIndex) {
+        // 向上排序
+        categorysAppsReorder(tablesList[newIndex].app_id, tablesList[oldIndex].app_id);
+      } else {
+        // 向下排序
+        categorysAppsReorder(tablesList[oldIndex].app_id, tablesList[newIndex].app_id);
+      }
     }
   });
 };

From 8fd0ebe7a9ad2de9ca449d1aa082454349aed9da Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Sun, 14 Jan 2024 16:10:24 +0800
Subject: [PATCH 24/24] =?UTF-8?q?feat:=20=E5=BA=94=E7=94=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/components/AppDialog.vue    | 52 ++++++++++++++++---
 src/pages/workplace/manage/index.vue          |  5 +-
 2 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/src/pages/workplace/configuration/components/AppDialog.vue b/src/pages/workplace/configuration/components/AppDialog.vue
index c9e142e..d419403 100644
--- a/src/pages/workplace/configuration/components/AppDialog.vue
+++ b/src/pages/workplace/configuration/components/AppDialog.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :model-value="value"
-    :width="600"
+    :width="780"
     :align-center="true"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
@@ -11,7 +11,7 @@
     @close="onClose"
   >
     <div class="h-540px flex-col">
-      <el-input v-model="content" class="mb-12px" placeholder="请输入应用名称" maxlength="10" show-word-limit />
+      <el-input v-model="queryFrom.keyword" class="mb-12px" placeholder="请输入应用名称" clearable @keyup.enter="onSearch" />
       <!-- 表格 -->
       <div class="flex-1 overflow-hidden">
         <el-table
@@ -37,6 +37,20 @@
           </el-table-column>
         </el-table>
       </div>
+      <!-- 分页 -->
+      <div class="bd-card-footer mt-12px flex items-center justify-between">
+        <div></div>
+        <el-pagination
+          v-model:current-page="queryFrom.page_index"
+          v-model:page-size="queryFrom.page_size"
+          :page-sizes="[15, 20, 30, 50, 100]"
+          :background="true"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+          @size-change="onSizeChange"
+          @current-change="onCurrentChange"
+        />
+      </div>
     </div>
     <template #footer>
       <el-space>
@@ -64,7 +78,6 @@ const props = withDefaults(defineProps<IProps>(), {
   value: false
 });
 
-const content = ref('');
 const loaging = ref<boolean>(false);
 
 const emits = defineEmits<{
@@ -106,11 +119,26 @@ const queryFrom = reactive({
   page_size: 15,
   page_index: 1
 });
+const total = ref(0);
 // 获取表格数据
 const getTableList = () => {
-  appGet(queryFrom).then((res: any) => {
-    tableData.value = res;
-  });
+  loadTable.value = true;
+  appGet(queryFrom)
+    .then((res: any) => {
+      loadTable.value = false;
+      tableData.value = res.list || [];
+      total.value = res.count || 0;
+    })
+    .catch(() => {
+      loadTable.value = false;
+    });
+};
+
+// 搜索
+const onSearch = () => {
+  queryFrom.page_index = 1;
+  queryFrom.page_size = 15;
+  getTableList();
 };
 
 const onSelectionChange = (val: any[]) => {
@@ -121,6 +149,18 @@ const onSelectionChange = (val: any[]) => {
   selectionData.value = opt;
 };
 
+// 分页page-size
+const onSizeChange = (size: number) => {
+  queryFrom.page_size = size;
+  getTableList();
+};
+
+// 分页page-size
+const onCurrentChange = (current: number) => {
+  queryFrom.page_index = current;
+  getTableList();
+};
+
 const onClose = () => {
   emits('update:value', false);
 };
diff --git a/src/pages/workplace/manage/index.vue b/src/pages/workplace/manage/index.vue
index 36384ea..000a22d 100644
--- a/src/pages/workplace/manage/index.vue
+++ b/src/pages/workplace/manage/index.vue
@@ -8,7 +8,7 @@
         <div class="flex items-center h-50px">
           <el-form inline>
             <el-form-item class="mb-0 !mr-16px">
-              <el-input v-model="queryFrom.keyword" placeholder="应用名称/APP ID" clearable />
+              <el-input v-model="queryFrom.keyword" placeholder="应用名称" clearable />
             </el-form-item>
             <el-form-item class="mb-0 !mr-16px">
               <el-button type="primary" @click="getTableList">查询</el-button>
@@ -183,7 +183,8 @@ const getTableList = () => {
   appGet(queryFrom)
     .then((res: any) => {
       loadTable.value = false;
-      tableData.value = res;
+      tableData.value = res.list || [];
+      total.value = res.count || 0;
     })
     .catch(() => {
       loadTable.value = false;