siteOptions

src/views/website/aboutUs/index.vue

@@ -8,7 +8,7 @@
       @submit.native.prevent
     >
       <el-form-item label="所属站点" prop="tenantId">
-        <SiteOptions v-model="queryParams.tenantId" />
+        <SiteOptions v-model="queryParams.tenantId" :site-list="siteList" />
         <!-- <el-select
           v-model="queryParams.tenantId"
           placeholder="请选择，支持搜索"
@@ -62,7 +62,7 @@
       <el-table-column prop="title" label="导航名称"></el-table-column>
       <el-table-column prop="area" label="站点" align="center">
         <template #default="{ row }">
-          {{ dataStore.getSiteName(row.tenantId) }}
+          {{ siteList.find((el) => el.id === row.tenantId)?.name ?? "无" }}
         </template>
       </el-table-column>
       <el-table-column label="更新时间" align="center">
@@ -112,20 +112,7 @@
     >
       <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="所属站点:" prop="tenantId">
-          <SiteOptions v-model="form.tenantId" />
-          <!-- <el-select
-            v-model="form.tenantId"
-            placeholder="请选择，支持搜索"
-            size="default"
-            filterable
-          >
-            <el-option
-              v-for="item in siteList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select> -->
+          <SiteOptions v-model="form.tenantId" :site-list="siteList" />
         </el-form-item>
         <el-form-item label="上级导航" prop="parentId">
           <TreeSelect
@@ -167,9 +154,7 @@ import { tenantSelect } from "@/api/subPlatform/tenant";
 import { ElMessage, ElMessageBox } from "element-plus";
 import WangEditor from "@/components/WangEditor/index.vue";
 import SiteOptions from "@/views/components/SiteOptions";
-import useDataStore from "@/store/modules/data";
-const dataStore = useDataStore();
-dataStore.setSiteList();
+
 const queryFormRef = ref(null);
 const dataList = ref([]);
 const loading = ref(true);
@@ -181,6 +166,7 @@ const title = ref("");
 const menuOptions = ref([]);
 const isExpandAll = ref(false);
 const refreshTable = ref(true);
+
 const data = reactive({
   // 查询参数
   queryParams: {
@@ -221,8 +207,8 @@ const getList = async () => {
 
 // 获取站点列表
 const getSiteList = async () => {
-  const resp = await tenantSelect();
-  siteList.value = resp.rows;
+  const { rows } = await tenantSelect();
+  siteList.value = rows;
 };
 
 /** 转换导航数据结构 */
@@ -236,6 +222,7 @@ const normalizer = (node) => {
     children: node.children,
   };
 };
+
 /** 查询导航下拉树结构 */
 const getTreeselect = (options) => {
   const arr = cloneDeep(options);
@@ -248,11 +235,13 @@ const getTreeselect = (options) => {
   menu.children = arr;
   menuOptions.value.push(menu);
 };
+
 // 取消按钮
 const cancel = () => {
   showEditDialog.value = false;
   reset();
 };
+
 // 表单重置
 const reset = () => {
   form.value = {
@@ -265,10 +254,12 @@ const reset = () => {
     formRef.value.resetFields();
   }
 };
+
 /** 搜索按钮操作 */
 const handleQuery = () => {
   getList();
 };
+
 /** 重置按钮操作 */
 const resetQuery = () => {
   if (queryFormRef.value) {
@@ -276,6 +267,7 @@ const resetQuery = () => {
   }
   handleQuery();
 };
+
 /** 新增按钮操作 */
 const handleAdd = (row) => {
   reset();
@@ -287,6 +279,7 @@ const handleAdd = (row) => {
   showEditDialog.value = true;
   title.value = "添加导航";
 };
+
 /** 修改按钮操作 */
 const handleUpdate = async (row) => {
   reset();
@@ -295,6 +288,7 @@ const handleUpdate = async (row) => {
   showEditDialog.value = true;
   title.value = "修改导航";
 };
+
 /** 提交按钮 */
 const submitForm = async () => {
   await formRef.value.validate();