diff --git a/dist.tar b/dist.tar
new file mode 100644
index 0000000..74846c9
Binary files /dev/null and b/dist.tar differ
diff --git a/src/store/modules/data.js b/src/store/modules/data.js
new file mode 100644
index 0000000..0c6f86e
--- /dev/null
+++ b/src/store/modules/data.js
@@ -0,0 +1,20 @@
+import { defineStore } from "pinia";
+
+const useDataStore = defineStore("data", {
+ state: () => ({
+ siteList: [],
+ }),
+ getters: {
+ getSiteName: (state) => {
+ return (siteId) =>
+ state.siteList.find((el) => el.id === siteId)?.name || "无";
+ },
+ },
+ actions: {
+ setSiteList(list) {
+ this.siteList = list;
+ },
+ },
+});
+
+export default useDataStore;
diff --git a/src/utils/parameter.js b/src/utils/parameter.js
index 83a8e2f..ad331b0 100644
--- a/src/utils/parameter.js
+++ b/src/utils/parameter.js
@@ -29,9 +29,9 @@ export const educationOptions = [
];
// 企业类型
export const enterpriseOptions = [
- { key: 101, value: "上市企业" },
- { key: 102, value: "优质企业" },
- { key: 103, value: "普通企业" },
+ { key: "101", value: "上市企业" },
+ { key: "102", value: "优质企业" },
+ { key: "103", value: "普通企业" },
];
// 成果成熟度 技术
export const maturityOptions = [
diff --git a/src/views/components/FieldOptions/index.vue b/src/views/components/FieldOptions/index.vue
index ab01c92..45ff1d4 100644
--- a/src/views/components/FieldOptions/index.vue
+++ b/src/views/components/FieldOptions/index.vue
@@ -1,6 +1,6 @@
-
+
+
\ No newline at end of file
+
diff --git a/src/views/components/SiteOptions/index.vue b/src/views/components/SiteOptions/index.vue
new file mode 100644
index 0000000..031a95d
--- /dev/null
+++ b/src/views/components/SiteOptions/index.vue
@@ -0,0 +1,48 @@
+
+
+
+
+
+
diff --git a/src/views/platform/industry/index.vue b/src/views/platform/industry/index.vue
index 92f9c1c..cdce6ef 100644
--- a/src/views/platform/industry/index.vue
+++ b/src/views/platform/industry/index.vue
@@ -87,7 +87,7 @@ import {
sysIndustryEdit,
industryDelete,
} from "@/api/platform/industry.js";
-import { computed, reactive, ref, toRefs } from "vue";
+import { reactive, ref, toRefs } from "vue";
import TreeSelect from "@/components/TreeSelect";
import { ElMessage, ElMessageBox } from "element-plus";
import { cloneDeep } from "lodash";
diff --git a/src/views/website/solution/service/index.vue b/src/views/website/solution/service/index.vue
index a63c216..4a90ee4 100644
--- a/src/views/website/solution/service/index.vue
+++ b/src/views/website/solution/service/index.vue
@@ -12,14 +12,14 @@
v-model="queryParams.title"
placeholder="请输入关键字"
clearable
- size="small"
+ size="default"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
-
-
-
+ -->
+
搜索
- 重置
@@ -71,7 +71,7 @@
type="primary"
plain
icon="plus"
- size="small"
+ size="default"
@click="handleAdd"
>新增
@@ -98,7 +98,7 @@
- {{ siteList.find((el) => el.id === row.tenantId)?.name || "无" }}
+ {{ dataStore.getSiteName(row.tenantId) }}
@@ -151,7 +151,7 @@
-
+
@@ -202,15 +202,17 @@ 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 "@/components/SiteOptions";
+import SiteOptions from "@/views/components/SiteOptions";
+import useDataStore from "../../../../store/modules/data";
+const dataStore = useDataStore();
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(""); // 弹窗标题
@@ -294,16 +296,11 @@ const getList = async () => {
loading.value = false;
};
-const getSiteList = async () => {
- const resp = await tenantSelect();
- siteList.value = resp.rows;
-};
-// const getSiteName = (tenantId) => {
-// const item = siteList.value.find((el) => {
-// return el.id === tenantId;
-// });
-// return item ? item.name : "无";
+// const getSiteList = async () => {
+// const resp = await tenantSelect();
+// siteList.value = resp.rows;
// };
+
// 取消按钮
const cancel = () => {
showEditDialog.value = false;
@@ -363,5 +360,5 @@ 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 546d6f1..3386d02 100644
--- a/src/views/website/solution/serviceCase/index.vue
+++ b/src/views/website/solution/serviceCase/index.vue
@@ -12,14 +12,15 @@
v-model="queryParams.title"
placeholder="请输入关键字"
clearable
- size="small"
+ size="default"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
-
+
搜索
- 重置
@@ -53,7 +54,7 @@
type="primary"
plain
icon="plus"
- size="small"
+ size="default"
@click="handleAdd"
>新增
@@ -80,10 +81,11 @@
- {{
+
+ {{ dataStore.getSiteName(row.tenantId) }}
+
-
-
+
{
loading.value = false;
};
-const getSiteList = async () => {
- const resp = await tenantSelect();
- siteList.value = resp.rows;
-};
+// const getSiteList = async () => {
+// const resp = await tenantSelect();
+// siteList.value = resp.rows;
+// };
const getCaseKindList = async () => {
const resp = await serviceCaseKindSelect();
@@ -322,7 +328,6 @@ const handleAdd = () => {
const handleUpdate = async (row) => {
reset();
const resp = await serviceCaseDetail(row.id);
- console.log(resp);
form.value = resp.data;
showEditDialog.value = true;
title.value = "修改";
@@ -354,6 +359,6 @@ const handleDelete = (row) => {
};
getList();
-getSiteList();
+// getSiteList();
getCaseKindList();