diff --git a/src/store/modules/data.js b/src/store/modules/data.js index 1602551..9828ec1 100644 --- a/src/store/modules/data.js +++ b/src/store/modules/data.js @@ -12,7 +12,8 @@ const useDataStore = defineStore("data", { }, }, actions: { - async setSiteList(list) { + async setSiteList() { + console.log(this.siteList); if (this.siteList.length !== 0) { return; } diff --git a/src/views/components/SiteOptions/index.vue b/src/views/components/SiteOptions/index.vue index b013e00..dc63121 100644 --- a/src/views/components/SiteOptions/index.vue +++ b/src/views/components/SiteOptions/index.vue @@ -3,13 +3,13 @@ :model-value="modelValue" placeholder="请选择,支持搜索" size="default" - :loading="dataStore.siteList.length === 0" + :loading="siteList.length == 0" @change="valueChanged" filterable clearable > diff --git a/src/views/website/aboutUs/index.vue b/src/views/website/aboutUs/index.vue index a1a2581..151933b 100644 --- a/src/views/website/aboutUs/index.vue +++ b/src/views/website/aboutUs/index.vue @@ -8,7 +8,7 @@ @submit.native.prevent > - + + { // 获取站点列表 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(); diff --git a/src/views/website/activity/active/index.vue b/src/views/website/activity/active/index.vue index 1e4fd6f..42bf241 100644 --- a/src/views/website/activity/active/index.vue +++ b/src/views/website/activity/active/index.vue @@ -17,20 +17,7 @@ /> - - - + @@ -185,20 +172,7 @@ - - - + @@ -392,7 +366,6 @@ - @@ -430,7 +403,8 @@ import { reactive, toRefs } from "vue"; // import { constants } from "buffer"; import { ElMessage, ElMessageBox } from "element-plus"; import WangEditor from "@/components/WangEditor/index.vue"; -// import FieldOptions from "@/views/components/FieldOptions"; +import SiteOptions from "@/views/components/SiteOptions"; + const dataList = ref([]); const loading = ref(true); const total = ref(0); @@ -607,40 +581,6 @@ const cityChange = () => { districtSelectList.value = []; form.value.city && getAreaListByCityId(form.value.city); }; -// const getProvinceByParent = (id) => { -// return new Promise((resolve, reject) => { -// areaList({ code: id }) -// .then(({ code, msg, data }) => { -// if (code == 200) { -// resolve(data); -// } else { -// ElMessage.error(msg); -// reject({ msg, code }); -// } -// }) -// .catch((error) => { -// reject(error); -// }); -// }); -// }; -// const provinceCodeChange = async (id) => { -// delete form.value.city; -// delete form.value.district; -// if (!id) { -// citySelectList.value = []; -// districtSelectList.value = []; -// return false; -// } -// citySelectList.value = await getProvinceByParent(id); -// }; -// const cityCodeChange = async (id) => { -// delete form.value.district; -// if (!id) { -// districtSelectList.value = []; -// return false; -// } -// districtSelectList.value = await getProvinceByParent(id); -// }; const getFieldByParent = (id) => { return new Promise((resolve, reject) => { @@ -680,29 +620,7 @@ const field2Change = async (id) => { const handleUpdate = async (row) => { reset(); const resp = await activityDetail(row.id); - // resp.data.beginTime = resp.data.beginTime; - // resp.data.finishTime = resp.data.finishTime; - // resp.data.joinDeadline = resp.data.joinDeadline; const formData = resp.data; - - // provinceCodeChange(resp.data.province); - // cityCodeChange(resp.data.city); - // let arr = []; - // for (const key in identityList.value) { - // if (Object.hasOwnProperty.call(identityList.value, key)) { - // if (((key - 0) & formData.notifyCrowd) > 0) { - // arr.push(key); - // } - // } - // } - // formData.industrys = formData.industrys[0].split("-"); - // if (formData.industrys.length == 2) { - // field1Change(formData.industrys[0]); - // } else if (formData.industrys.length == 3) { - // field1Change(formData.industrys[0]); - // field2Change(formData.industrys[1]); - // } - // formData.notifyCrowd = arr; form.value = formData; showEditDialog.value = true; title.value = "修改"; diff --git a/src/views/website/innovate/navigation/index.vue b/src/views/website/innovate/navigation/index.vue index ec3274b..bdd482e 100644 --- a/src/views/website/innovate/navigation/index.vue +++ b/src/views/website/innovate/navigation/index.vue @@ -8,7 +8,7 @@ @submit.native.prevent > - + @@ -47,8 +47,7 @@ @@ -92,7 +91,7 @@ - + + @@ -114,20 +98,7 @@ > - - + @@ -171,14 +142,12 @@ import { serviceDelete, navigationList, } from "@/api/website/innovate"; - +import { tenantSelect } from "@/api/subPlatform/tenant"; import WangEditor from "@/components/WangEditor/index.vue"; import { ElMessage, ElMessageBox } from "element-plus"; import { reactive, ref } from "vue"; import SiteOptions from "@/views/components/SiteOptions"; -import useDataStore from "@/store/modules/data"; -const dataStore = useDataStore(); -dataStore.setSiteList(); + const loading = ref(true); // 是否正在加载 const showSearch = ref(true); // 是否显示搜索栏 const categoryList = ref([]); //导航列表 @@ -186,6 +155,7 @@ const queryFormRef = ref(null); const formRef = ref(null); const total = ref(0); const dataList = ref([]); +const siteList = ref([]); // 弹出层标题 const title = ref(""); @@ -198,6 +168,7 @@ const data = reactive({ pageNum: 1, pageSize: 10, }, + // 表单参数 form: {}, rules: { @@ -218,6 +189,7 @@ const data = reactive({ ], }, }); + const { queryParams, form, rules } = toRefs(data); const resetQuery = () => { @@ -254,6 +226,11 @@ const getcategoryList = async () => { categoryList.value = resp.rows; }; +// 获取站点列表 +const getSiteList = async () => { + const { rows } = await tenantSelect(); + siteList.value = rows; +}; // 取消按钮 const cancel = () => { showEditDialog.value = false; @@ -318,5 +295,6 @@ const handleDelete = (row) => { }; getList(); +getSiteList(); getcategoryList(); diff --git a/src/views/website/solution/service/index.vue b/src/views/website/solution/service/index.vue index dccca2a..3b38d06 100644 --- a/src/views/website/solution/service/index.vue +++ b/src/views/website/solution/service/index.vue @@ -36,20 +36,7 @@ - - + @@ -151,7 +138,7 @@ - + @@ -202,18 +189,16 @@ import { serviceEdit, serviceDelete, } from "@/api/website/solution"; -// import { tenantSelect } from "@/api/subPlatform/tenant"; +import { tenantSelect } from "@/api/subPlatform/tenant"; import { ElMessage, ElMessageBox } from "element-plus"; import { cloneDeep } from "lodash"; import SiteOptions from "@/views/components/SiteOptions"; -import useDataStore from "@/store/modules/data"; -const dataStore = useDataStore(); -dataStore.setSiteList(); + const dataList = ref([]); // TODO:isSuper // const is_super = this.$store.getters.is_super; const loading = ref(true); -// const siteList = ref([]); // 站点列表 +const siteList = ref([]); // 站点列表 const showSearch = ref(true); const showEditDialog = ref(false); // 是否显示新增、修改弹窗 const title = ref(""); // 弹窗标题 @@ -284,10 +269,12 @@ const resetQuery = () => { } handleQuery(); }; + const handleQuery = () => { queryParams.value.pageNum = 1; getList(); }; + // 获取服务列表 const getList = async () => { loading.value = true; @@ -297,11 +284,11 @@ const getList = async () => { loading.value = false; }; -// const getSiteList = async () => { -// const resp = await tenantSelect(); -// siteList.value = resp.rows; -// }; - +// 获取站点列表 +const getSiteList = async () => { + const { rows } = await tenantSelect(); + siteList.value = rows; +}; // 取消按钮 const cancel = () => { showEditDialog.value = false; @@ -327,13 +314,14 @@ const handleAdd = () => { showEditDialog.value = true; title.value = "新增"; }; + const handleUpdate = async (row) => { - // await getSiteList(); reset(); form.value = cloneDeep(row); showEditDialog.value = true; title.value = "修改"; }; + const submitForm = async () => { await formRef.value.validate(); if (form.value.id != undefined) { @@ -350,6 +338,7 @@ const submitForm = async () => { }); } }; + /** 删除按钮操作 */ const handleDelete = (row) => { ElMessageBox.confirm(`是否确认删除名为${row.title}的数据项?`) @@ -360,6 +349,7 @@ const handleDelete = (row) => { }) .catch(() => {}); }; + getList(); -// getSiteList(); +getSiteList(); diff --git a/src/views/website/solution/serviceCase/index.vue b/src/views/website/solution/serviceCase/index.vue index 610f580..6535b32 100644 --- a/src/views/website/solution/serviceCase/index.vue +++ b/src/views/website/solution/serviceCase/index.vue @@ -19,20 +19,7 @@ - - + - - + -