From 967d9e7efc9c4423a84277969c653b13902ccd74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com>
Date: Wed, 12 Jan 2022 11:22:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E6=96=B0=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/subPlatform/tenant.js                 |  29 ++
 src/api/website/innovate.js                   |  81 +++++
 src/main.js                                   |   2 +
 src/utils/parameter.js                        |  19 ++
 src/views/subPlatform/tenant/index.vue        | 123 +++++++-
 src/views/system/user/index.vue               | 103 -------
 .../website/innovate/navigation/index.vue     | 243 +++++++++++++++
 src/views/website/innovate/service/index.vue  | 285 ++++++++++++++++++
 src/views/website/solution/service/index.vue  |  51 ++--
 .../website/solution/serviceCase/index.vue    |  58 ++--
 10 files changed, 842 insertions(+), 152 deletions(-)
 create mode 100644 src/api/website/innovate.js
 create mode 100644 src/utils/parameter.js
 create mode 100644 src/views/website/innovate/navigation/index.vue
 create mode 100644 src/views/website/innovate/service/index.vue

diff --git a/src/api/subPlatform/tenant.js b/src/api/subPlatform/tenant.js
index 3c6d159..370aa0c 100644
--- a/src/api/subPlatform/tenant.js
+++ b/src/api/subPlatform/tenant.js
@@ -54,3 +54,32 @@ export function tenantMemberBind(data) {
 		data,
 	})
 }
+
+export function tenantMenuList(data) {
+	return request({
+		url: '/admin/v1/tenant/menu',
+		method: 'post',
+		data,
+	})
+}
+export function tenantMenuBind(data) {
+	return request({
+		url: '/admin/v1/tenant/menu/bind',
+		method: 'post',
+		data,
+	})
+}
+export function tenantAuthList(data) {
+	return request({
+		url: '/admin/v1/tenant/auth',
+		method: 'post',
+		data,
+	})
+}
+export function tenantAuthBind(data) {
+	return request({
+		url: '/admin/v1/tenant/auth/bind',
+		method: 'post',
+		data,
+	})
+}
diff --git a/src/api/website/innovate.js b/src/api/website/innovate.js
new file mode 100644
index 0000000..a05baec
--- /dev/null
+++ b/src/api/website/innovate.js
@@ -0,0 +1,81 @@
+import request from '@/utils/request'
+
+// 导航列表
+export function navigationList(data) {
+	return request({
+		url: '/admin/v1/service/innovate/kind',
+		method: 'post',
+		data,
+	})
+}
+// 导航列表-添加
+export function navigationAdd(data) {
+	return request({
+		url: '/admin/v1/service/innovate/kind/add',
+		method: 'post',
+		data,
+	})
+}
+// 导航列表-修改
+export function navigationEdit(data) {
+	return request({
+		url: '/admin/v1/service/innovate/kind/edit',
+		method: 'post',
+		data,
+	})
+}
+// 导航列表-删除
+export function navigationDelete(data) {
+	return request({
+		url: '/admin/v1/service/innovate/kind/delete',
+		method: 'post',
+		data,
+	})
+}
+// 导航-下拉
+export function navigationSelect() {
+	return request({
+		url: '/admin/v1/service/innovate/kind/select',
+	})
+}
+
+// 服务列表
+export function serviceList(data) {
+	return request({
+		url: '/admin/v1/service/innovate',
+		method: 'post',
+		data,
+	})
+}
+// 服务列表-添加
+export function serviceAdd(data) {
+	return request({
+		url: '/admin/v1/service/innovate/add',
+		method: 'post',
+		data,
+	})
+}
+// 服务列表-详情
+export function serviceDetail(data) {
+	return request({
+		url: '/admin/v1/service/innovate/detail',
+		method: 'post',
+		data,
+	})
+}
+// 服务列表-修改
+export function serviceEdit(data) {
+	return request({
+		url: '/admin/v1/service/innovate/edit',
+		method: 'post',
+		data,
+	})
+}
+// 服务列表-删除
+export function serviceDelete(data) {
+	return request({
+		url: '/admin/v1/service/innovate/delete',
+		method: 'post',
+		data,
+	})
+}
diff --git a/src/main.js b/src/main.js
index 29515bc..824dba3 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,6 +20,7 @@ import './permission' // permission control
 import { getDicts } from '@/api/system/dict/data'
 import { getConfigKey } from '@/api/system/config'
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from '@/utils/ruoyi'
+import { modeOptions } from '@/utils/parameter'
 // 分页组件
 import Pagination from '@/components/Pagination'
 // 自定义表格工具组件
@@ -50,6 +51,7 @@ Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
 Vue.prototype.md5 = md5
+Vue.prototype.modeOptions = modeOptions
 
 // 全局组件挂载
 Vue.component('DictTag', DictTag)
diff --git a/src/utils/parameter.js b/src/utils/parameter.js
new file mode 100644
index 0000000..116ef7c
--- /dev/null
+++ b/src/utils/parameter.js
@@ -0,0 +1,19 @@
+// 归属导航
+export const modeOptions = [
+	{
+		value: 101,
+		label: '中小企业服务',
+	},
+	{
+		value: 102,
+		label: '大型企业服务',
+	},
+	{
+		value: 103,
+		label: '政府企业服务',
+	},
+	{
+		value: 104,
+		label: '科研院所服务',
+	},
+]
diff --git a/src/views/subPlatform/tenant/index.vue b/src/views/subPlatform/tenant/index.vue
index cccc601..96e29ae 100644
--- a/src/views/subPlatform/tenant/index.vue
+++ b/src/views/subPlatform/tenant/index.vue
@@ -68,7 +68,7 @@
         align="center"
         class-name="small-padding fixed-width"
       >
-        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+        <template slot-scope="scope" v-if="scope.row.tenantId !== 1">
           <el-button
             size="mini"
             type="text"
@@ -91,13 +91,18 @@
               <i class="el-icon-d-arrow-right el-icon--right"></i>更多
             </span>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="handleAccountSet" icon="el-icon-user"
-                >账号设置</el-dropdown-item
-              >
               <el-dropdown-item
                 command="handleAccountSet"
+                icon="el-icon-setting"
+                >账号设置</el-dropdown-item
+              >
+              <el-dropdown-item command="handleAuthMenu" icon="el-icon-user"
+                >菜单权限</el-dropdown-item
+              >
+              <el-dropdown-item
+                command="handleDataScope"
                 icon="el-icon-circle-check"
-                >权限设置</el-dropdown-item
+                >基本权限</el-dropdown-item
               >
               <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
                 >重置密码</el-dropdown-item
@@ -173,6 +178,37 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 分配角色菜单权限对话框 -->
+    <el-dialog
+      :title="menuTitle"
+      :visible.sync="openMenuScope"
+      width="500px"
+      append-to-body
+    >
+      <el-form :model="menuForm" label-width="100px">
+        <el-form-item label="子系统名称">
+          <el-input v-model="menuForm.name" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="菜单权限">
+          <el-tree
+            class="tree-border"
+            :data="menuOptions"
+            show-checkbox
+            default-expand-all
+            ref="menu"
+            node-key="id"
+            empty-text="加载中，请稍候"
+            :props="defaultProps"
+          ></el-tree>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitMenuScope">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
     <!-- 账号设置 -->
     <el-dialog title="账号设置" :visible.sync="memberOpen" width="500px">
       <el-form
@@ -206,6 +242,10 @@ import {
   tenantDelete,
   tenantMember,
   tenantMemberBind,
+  tenantMenuList,
+  tenantMenuBind,
+  tenantAuthList,
+  tenantAuthBind,
 } from "@/api/subPlatform/tenant";
 import { areaList } from "@/api/config";
 import { resetUserPwd } from "@/api/system/user";
@@ -231,6 +271,18 @@ export default {
       form: {},
       // 账号设置弹窗
       memberOpen: false,
+      // 是否显示弹出层（菜单权限）
+      openMenuScope: false,
+      menuTitle: "",
+      menuForm: {},
+      // 菜单列表
+      menuOptions: [],
+      // 是否为菜单权限弹窗和基本权限弹窗
+      tenantFlag: true,
+      defaultProps: {
+        children: "children",
+        label: "name",
+      },
       memberForm: {
         mobile: undefined,
         password: undefined,
@@ -291,6 +343,7 @@ export default {
     cancel() {
       this.open = false;
       this.memberOpen = false;
+      this.openMenuScope = false;
       this.reset();
     },
     // 表单重置
@@ -354,6 +407,14 @@ export default {
         case "handleAccountSet":
           this.handleAccountSet(row);
           break;
+        case "handleAuthMenu":
+          this.tenantFlag = true;
+          this.handleAuthMenu(row);
+          break;
+        case "handleDataScope":
+          this.tenantFlag = false;
+          this.handleAuthMenu(row);
+          break;
         case "handleResetPwd":
           this.handleResetPwd(row);
           break;
@@ -371,6 +432,58 @@ export default {
         }
       });
     },
+    /** 菜单权限操作 */
+    handleAuthMenu: function (row) {
+      this.menuForm = Object.assign({}, row);
+      this.openMenuScope = true;
+      if (this.tenantFlag) {
+        tenantMenuList({ tenant_id: row.id }).then((res) => {
+          this.menuOptions = res.data;
+          const checkedKeys = [];
+          this.filterSetChecked(res.data, "checked", checkedKeys);
+          this.$refs.menu.setCheckedKeys(checkedKeys);
+        });
+        this.menuTitle = "分配菜单权限";
+      } else {
+        tenantAuthList({ tenant_id: row.id }).then((res) => {
+          console.log(res);
+          this.menuOptions = res.data;
+          const checkedKeys = [];
+          this.filterSetChecked(res.data, "checked", checkedKeys);
+          this.$refs.menu.setCheckedKeys(checkedKeys);
+        });
+        this.menuTitle = "分配基本权限";
+      }
+    },
+    filterSetChecked(data, field, out) {
+      data.map((item) => {
+        if (item[field]) {
+          out.push(item.id);
+        }
+        if (item.children.length) {
+          this.filterSetChecked(item.children, field, out);
+        }
+      });
+    },
+    /** 提交按钮（菜单权限） */
+    submitMenuScope: function () {
+      if (this.menuForm.id) {
+        if (this.tenantFlag) {
+          tenantMenuBind({
+            tenant_id: this.menuForm.id,
+            menu_ids: this.$refs.menu.getCheckedKeys(),
+          }).then((response) => {
+            this.$modal.msgSuccess("修改成功");
+            this.openMenuScope = false;
+            this.getList();
+          });
+        } else {
+          // Todo...
+          // tenantAuthBind
+          console.log("提交基本权限");
+        }
+      }
+    },
     // 重置密码按钮操作
     handleResetPwd(row) {
       this.$prompt('请输入子系统名称为"' + row.name + '"的新密码', "提示", {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 5fb2574..0c86e01 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -100,48 +100,6 @@
               新增
             </el-button>
           </el-col>
-          <!-- <el-col :span="1.5">
-            <el-button
-              type="success"
-              plain
-              icon="el-icon-edit"
-              size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-              >删除</el-button
-            >
-          </el-col> -->
-          <!-- <el-col :span="1.5">
-            <el-button
-              type="info"
-              plain
-              icon="el-icon-upload2"
-              size="mini"
-              @click="handleImport"
-              >导入</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-              >导出</el-button
-            >
-          </el-col> -->
           <right-toolbar
             :showSearch.sync="showSearch"
             @queryTable="getList"
@@ -649,13 +607,6 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      // this.getTreeselect();
-      // getUser().then((response) => {
-      //   this.roleOptions = response.roles;
-      //   this.open = true;
-      //   this.title = "添加用户";
-      //   this.form.password = this.initPassword;
-      // });
       this.open = true;
       this.title = "添加用户";
       this.form.password = this.initPassword;
@@ -665,15 +616,6 @@ export default {
       this.reset();
       // this.getTreeselect();
       const userId = row.id || this.ids;
-      // getUser(userId).then((response) => {
-      //   this.form = response.data;
-      //   this.roleOptions = response.roles;
-      //   this.form.postIds = response.postIds;
-      //   this.form.roleIds = response.roleIds;
-      //   this.open = true;
-      //   this.title = "修改用户";
-      //   this.form.password = "";
-      // });
       this.form = Object.assign({}, row);
       this.form.department_id = row.department.id;
       this.open = true;
@@ -738,51 +680,6 @@ export default {
         })
         .catch(() => {});
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download(
-        "system/user/export",
-        {
-          ...this.queryParams,
-        },
-        `user_${new Date().getTime()}.xlsx`
-      );
-    },
-    /** 导入按钮操作 */
-    handleImport() {
-      this.upload.title = "用户导入";
-      this.upload.open = true;
-    },
-    /** 下载模板操作 */
-    importTemplate() {
-      this.download(
-        "system/user/importTemplate",
-        {},
-        `user_template_${new Date().getTime()}.xlsx`
-      );
-    },
-    // 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
-    },
-    // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
-      this.upload.open = false;
-      this.upload.isUploading = false;
-      this.$refs.upload.clearFiles();
-      this.$alert(
-        "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-          response.msg +
-          "</div>",
-        "导入结果",
-        { dangerouslyUseHTMLString: true }
-      );
-      this.getList();
-    },
-    // 提交上传文件
-    submitFileForm() {
-      this.$refs.upload.submit();
-    },
   },
 };
 </script>
\ No newline at end of file
diff --git a/src/views/website/innovate/navigation/index.vue b/src/views/website/innovate/navigation/index.vue
new file mode 100644
index 0000000..171a912
--- /dev/null
+++ b/src/views/website/innovate/navigation/index.vue
@@ -0,0 +1,243 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      v-show="showSearch"
+      :inline="true"
+      @submit.native.prevent
+    >
+      <el-form-item label="所属站点" prop="tenant_id" v-if="is_super">
+        <el-cascader
+          v-model="queryParams.tenant_id"
+          clearable
+          separator="-"
+          placeholder="请选择，支持搜索"
+          :options="tenantOptions"
+          filterable
+          :props="{ emitPath: false, value: 'id', label: 'name' }"
+        ></el-cascader>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          >新增</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="dataList">
+      <el-table-column label="数据编号" prop="id" width="120" />
+      <el-table-column label="导航名称" prop="title" width="120" />
+      <el-table-column label="所属站点" prop="area" align="center" />
+      <el-table-column label="创建时间" prop="created_at" align="center">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.created_at) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            >编辑</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.page_num"
+      :limit.sync="queryParams.page_size"
+      @pagination="getList"
+    />
+    <!-- 添加或修改对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="所属站点" prop="tenant_id">
+          <el-cascader
+            v-model="form.tenant_id"
+            clearable
+            separator="-"
+            placeholder="请选择，支持搜索"
+            :options="tenantOptions"
+            filterable
+            :props="{ emitPath: false, value: 'id', label: 'name' }"
+          ></el-cascader>
+        </el-form-item>
+        <el-form-item label="导航名称:" prop="title">
+          <el-input v-model="form.title" placeholder="请输入导航名称" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  navigationList,
+  navigationAdd,
+  navigationEdit,
+  navigationDelete,
+} from "@/api/website/innovate";
+import { tenantSelect } from "@/api/subPlatform/tenant";
+export default {
+  data() {
+    return {
+      is_super: this.$store.getters.is_super,
+      loading: true,
+      showSearch: true,
+      tenantOptions: [],
+      queryParams: {
+        title: undefined,
+        tenant_id: undefined,
+        page_num: 1,
+        page_size: 10,
+      },
+      total: 0,
+      dataList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 表单参数
+      form: {},
+      rules: {
+        title: [
+          { required: true, message: "导航名称不能为空", trigger: "blur" },
+        ],
+        tenant_id: [
+          { required: true, message: "所属站点不能为空", trigger: "change" },
+        ],
+      },
+    };
+  },
+  methods: {
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleQuery() {
+      this.queryParams.page_num = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      navigationList(this.queryParams).then((res) => {
+        this.dataList = res.data.data;
+        this.total = res.data.count;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.memberOpen = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        tenant_id: undefined,
+        title: undefined,
+      };
+      this.resetForm("form");
+    },
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "新增";
+    },
+    handleUpdate(row) {
+      this.reset();
+      this.form = Object.assign({}, row);
+      this.open = true;
+      this.title = "修改";
+    },
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != undefined) {
+            navigationEdit(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            navigationAdd(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal
+        .confirm('是否确认删除名为"' + row.title + '"的数据项？')
+        .then(function () {
+          return navigationDelete({ id: row.id });
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+  },
+  created() {
+    this.getList();
+    tenantSelect().then((res) => {
+      for (const key in res.data) {
+        if (Object.hasOwnProperty.call(res.data, key)) {
+          const item = res.data[key];
+          this.tenantOptions.push(item);
+        }
+      }
+    });
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/website/innovate/service/index.vue b/src/views/website/innovate/service/index.vue
new file mode 100644
index 0000000..e47f42e
--- /dev/null
+++ b/src/views/website/innovate/service/index.vue
@@ -0,0 +1,285 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      v-show="showSearch"
+      :inline="true"
+      @submit.native.prevent
+    >
+      <el-form-item label="导航名称:" prop="kind_id">
+        <el-select v-model="queryParams.kind_id" placeholder="请选择" clearable>
+          <el-option
+            v-for="item in kindOptions"
+            :key="item.id"
+            :label="item.title"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          >新增</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="dataList">
+      <el-table-column label="数据编号" prop="id" width="120" />
+      <el-table-column label="服务标题" prop="title" width="120" />
+      <el-table-column label="导航名称" prop="kind_title" align="center" />
+      <el-table-column label="所属站点" prop="area" align="center" />
+      <el-table-column label="创建时间" prop="created_at" align="center">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.created_at) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            >编辑</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.page_num"
+      :limit.sync="queryParams.page_size"
+      @pagination="getList"
+    />
+    <!-- 添加或修改对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="40%">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="所属站点" prop="tenant_id">
+          <el-cascader
+            v-model="form.tenant_id"
+            clearable
+            separator="-"
+            placeholder="请选择，支持搜索"
+            :options="tenantOptions"
+            filterable
+            :props="{ emitPath: false, value: 'id', label: 'name' }"
+          ></el-cascader>
+        </el-form-item>
+        <el-form-item label="归属导航:" prop="kind_id">
+          <el-select v-model="form.kind_id" placeholder="请选择">
+            <el-option
+              v-for="item in kindOptions"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="服务标题:" prop="title">
+          <el-input v-model="form.title" placeholder="请输入服务标题" />
+        </el-form-item>
+        <el-form-item label="服务简述:" prop="description">
+          <el-input
+            v-model="form.description"
+            placeholder="请输入服务简述"
+            maxlength="20"
+          />
+        </el-form-item>
+        <el-form-item label="服务描述:" prop="content">
+          <Editor v-model="form.content" :minHeight="150" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  serviceList,
+  serviceAdd,
+  serviceDetail,
+  serviceEdit,
+  serviceDelete,
+  navigationSelect,
+} from "@/api/website/innovate";
+import { tenantSelect } from "@/api/subPlatform/tenant";
+export default {
+  data() {
+    return {
+      is_super: this.$store.getters.is_super,
+      loading: true,
+      showSearch: true,
+      kindOptions: [],
+      tenantOptions: [],
+      queryParams: {
+        kind_id: undefined,
+        page_num: 1,
+        page_size: 10,
+      },
+      total: 0,
+      dataList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 表单参数
+      form: {},
+      rules: {
+        title: [
+          { required: true, message: "数据名称不能为空", trigger: "blur" },
+        ],
+        description: [
+          { required: true, message: "服务简述不能为空", trigger: "blur" },
+        ],
+        content: [
+          { required: true, message: "服务描述不能为空", trigger: "blur" },
+        ],
+        tenant_id: [
+          { required: true, message: "归属导航不能为空", trigger: "change" },
+        ],
+        kind_id: [
+          { required: true, message: "所属站点不能为空", trigger: "change" },
+        ],
+      },
+    };
+  },
+  methods: {
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleQuery() {
+      this.queryParams.page_num = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      serviceList(this.queryParams).then((res) => {
+        this.dataList = res.data.data;
+        this.total = res.data.count;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.memberOpen = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        tenant_id: undefined,
+        kind_id: undefined,
+        title: undefined,
+        description: undefined,
+        content: undefined,
+        tags: undefined,
+      };
+      this.resetForm("form");
+    },
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "新增";
+    },
+    handleUpdate(row) {
+      this.reset();
+      serviceDetail({ id: row.id }).then((res) => {
+        this.form = res.data;
+        this.open = true;
+        this.title = "修改";
+      });
+    },
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != undefined) {
+            serviceEdit(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            serviceAdd(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal
+        .confirm('是否确认删除名为"' + row.title + '"的数据项？')
+        .then(function () {
+          return serviceDelete({ id: row.id });
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+  },
+  created() {
+    this.getList();
+    navigationSelect().then((res) => {
+      this.kindOptions = res.data;
+    });
+    tenantSelect().then((res) => {
+      for (const key in res.data) {
+        if (Object.hasOwnProperty.call(res.data, key)) {
+          const item = res.data[key];
+          this.tenantOptions.push(item);
+        }
+      }
+    });
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/website/solution/service/index.vue b/src/views/website/solution/service/index.vue
index 78d6a7c..6583b9d 100644
--- a/src/views/website/solution/service/index.vue
+++ b/src/views/website/solution/service/index.vue
@@ -17,7 +17,23 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="归属导航" prop="tenant_id" v-if="is_super">
+      <el-form-item label="归属导航:" prop="mode">
+        <el-select
+          v-model="queryParams.mode"
+          placeholder="请选择"
+          clearable
+          @clear="delete queryParams.mode"
+        >
+          <el-option
+            v-for="item in modeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="所属站点" prop="tenant_id" v-if="is_super">
         <el-cascader
           v-model="queryParams.tenant_id"
           clearable
@@ -73,8 +89,8 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="归属导航" prop="area" align="center" />
-      <el-table-column label="模式" prop="mode" align="center">
+      <el-table-column label="所属站点" prop="area" align="center" />
+      <el-table-column label="归属导航" prop="mode" align="center">
         <template slot-scope="scope">
           {{ modeOptions.find((item) => item.value == scope.row.mode).label }}
         </template>
@@ -120,7 +136,7 @@
         <el-form-item label="数据名称:" prop="title">
           <el-input v-model="form.title" placeholder="请输入数据名称" />
         </el-form-item>
-        <el-form-item label="归属导航:" prop="tenant_id" v-if="is_super">
+        <el-form-item label="所属站点:" prop="tenant_id" v-if="is_super">
           <el-cascader
             v-model="form.tenant_id"
             clearable
@@ -131,10 +147,7 @@
             :props="{ emitPath: false, value: 'id', label: 'name' }"
           ></el-cascader>
         </el-form-item>
-        <el-form-item label="图片:" prop="image">
-          <ImageUpload v-model="form.image" :isShowTip="false" :limit="1" />
-        </el-form-item>
-        <el-form-item label="模式:" prop="mode">
+        <el-form-item label="归属导航:" prop="mode">
           <el-select v-model="form.mode" placeholder="请选择">
             <el-option
               v-for="item in modeOptions"
@@ -145,6 +158,9 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="图片:" prop="image">
+          <ImageUpload v-model="form.image" :isShowTip="false" :limit="1" />
+        </el-form-item>
         <!-- <el-form-item label="关联案例:" prop="name">
           <el-cascader
             v-model="form.tenant_id"
@@ -179,26 +195,9 @@ export default {
       loading: true,
       showSearch: true,
       tenantOptions: [],
-      modeOptions: [
-        {
-          value: 101,
-          label: "中小企业服务",
-        },
-        {
-          value: 102,
-          label: "大型企业服务",
-        },
-        {
-          value: 103,
-          label: "政府企业服务",
-        },
-        {
-          value: 104,
-          label: "科研院所服务",
-        },
-      ],
       queryParams: {
         title: undefined,
+        mode: undefined,
         tenant_id: undefined,
         page_num: 1,
         page_size: 10,
diff --git a/src/views/website/solution/serviceCase/index.vue b/src/views/website/solution/serviceCase/index.vue
index 1c7c638..64228af 100644
--- a/src/views/website/solution/serviceCase/index.vue
+++ b/src/views/website/solution/serviceCase/index.vue
@@ -17,6 +17,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="所属站点" prop="tenant_id" v-if="is_super">
+        <el-cascader
+          v-model="queryParams.tenant_id"
+          clearable
+          separator="-"
+          placeholder="请选择，支持搜索"
+          :options="tenantOptions"
+          filterable
+          :props="{ emitPath: false, value: 'id', label: 'name' }"
+        ></el-cascader>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -62,6 +73,7 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column label="所属站点" prop="area" align="center" />
       <el-table-column
         label="描述"
         prop="description"
@@ -119,6 +131,17 @@
         <el-form-item label="图片:" prop="image">
           <ImageUpload v-model="form.image" :isShowTip="false" :limit="1" />
         </el-form-item>
+        <el-form-item label="所属站点:" prop="tenant_id" v-if="is_super">
+          <el-cascader
+            v-model="form.tenant_id"
+            clearable
+            separator="-"
+            placeholder="请选择，支持搜索"
+            :options="tenantOptions"
+            filterable
+            :props="{ emitPath: false, value: 'id', label: 'name' }"
+          ></el-cascader>
+        </el-form-item>
         <el-form-item label="案例类型:" prop="kind_id">
           <el-cascader
             v-model="form.kind_id"
@@ -158,24 +181,7 @@ export default {
       loading: true,
       showSearch: true,
       caseOptions: [],
-      modeOptions: [
-        {
-          value: 101,
-          label: "中小企业服务",
-        },
-        {
-          value: 102,
-          label: "大型企业服务",
-        },
-        {
-          value: 103,
-          label: "政府企业服务",
-        },
-        {
-          value: 104,
-          label: "科研院所服务",
-        },
-      ],
+      tenantOptions: [],
       queryParams: {
         title: undefined,
         tenant_id: undefined,
@@ -204,6 +210,13 @@ export default {
             trigger: ["blur", "change"],
           },
         ],
+        tenant_id: [
+          {
+            required: true,
+            message: "所属站点不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
         kind_id: [
           {
             required: true,
@@ -249,6 +262,7 @@ export default {
       this.form = {
         id: undefined,
         tenant_id: undefined,
+        kind_id: undefined,
         title: undefined,
         image: undefined,
         description: undefined,
@@ -312,6 +326,14 @@ export default {
         }
       }
     });
+    tenantSelect().then((res) => {
+      for (const key in res.data) {
+        if (Object.hasOwnProperty.call(res.data, key)) {
+          const item = res.data[key];
+          this.tenantOptions.push(item);
+        }
+      }
+    });
   },
 };
 </script>
\ No newline at end of file