diff --git a/cas_web_03.zip b/cas_web_03.zip
deleted file mode 100644
index 46c88ca..0000000
Binary files a/cas_web_03.zip and /dev/null differ
diff --git a/package.json b/package.json
index c7fff4e..5fa7e88 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
"dependencies": {
"@element-plus/icons-vue": "1.1.4",
"@vueuse/core": "8.5.0",
- "@wangeditor/editor": "^5.1.14",
+ "@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12",
"axios": "0.26.1",
"echarts": "^5.4.0",
diff --git a/src/api/website/solution/index.js b/src/api/website/solution/index.js
index 231f352..3dfe2d0 100644
--- a/src/api/website/solution/index.js
+++ b/src/api/website/solution/index.js
@@ -16,3 +16,11 @@ export function getInfo(params) {
params,
});
}
+
+// 获取分类
+export function getCategory() {
+ return request({
+ url: "/app/solution/getCategory",
+ method: "get",
+ });
+}
diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png
index 584a79a..4e54855 100644
Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ
diff --git a/src/assets/logo/logo_small.png b/src/assets/logo/logo_small.png
new file mode 100644
index 0000000..584a79a
Binary files /dev/null and b/src/assets/logo/logo_small.png differ
diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index b65746d..8ac1f4d 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -1,5 +1,10 @@
-
+
@@ -20,16 +27,37 @@
+
diff --git a/src/components/WebsiteHeader/index.vue b/src/components/WebsiteHeader/index.vue
index 52bded0..98c1907 100644
--- a/src/components/WebsiteHeader/index.vue
+++ b/src/components/WebsiteHeader/index.vue
@@ -1,7 +1,7 @@
-
+
@@ -23,6 +23,19 @@
解决方案
-
-
+ -->
@@ -130,12 +174,20 @@ import { defineComponent, onMounted, reactive, watch } from "vue";
import { useRoute, useRouter } from "vue-router";
import useUserStore from "@/store/modules/user";
+import { getCategory } from "@/api/website/solution";
const userStore = useUserStore();
let state = reactive({});
let pagePath = ref("");
const route = useRoute();
const router = useRouter();
+
+const categoryList = ref([]);
+const loadCategoryList = async () => {
+ const { data } = await getCategory();
+ categoryList.value = data;
+};
+loadCategoryList();
watch(
() => route.path,
(newVal, oldVal) => {
@@ -161,7 +213,8 @@ function handlePage() {
function handlePath(path) {
pagePath.value = path;
- router.push(path);
+ // router.push(path);
+ window.open(path, "_blank");
}
function logout() {
ElMessageBox.confirm("确定注销并退出系统吗?", "提示", {
@@ -211,6 +264,7 @@ dt {
}
.menu {
display: flex;
+ // justify-content: space-between;
.solution {
position: relative;
.show_box {
@@ -221,8 +275,9 @@ dt {
text-align: center;
background-color: red;
div {
- height: 42px;
- line-height: 42px;
+ // height: 42px;
+ // line-height: 42px;
+ padding: 8px 0;
font-size: 14px;
color: #666666;
background-color: #f2f6ff;
@@ -259,13 +314,22 @@ dt {
border-bottom: 2.5px solid #000;
}
}
+ .profile-menu-group {
+ height: 71px;
+ flex: 2;
+ justify-content: space-between;
+ align-items: center;
+ // .avatar-wrapper {
+ // padding-top: 25px;
+ // }
+ }
}
}
diff --git a/src/views/admin/enterprise/demand/releaseService.vue b/src/views/admin/enterprise/demand/releaseService.vue
index 0e68400..1b21166 100644
--- a/src/views/admin/enterprise/demand/releaseService.vue
+++ b/src/views/admin/enterprise/demand/releaseService.vue
@@ -9,13 +9,13 @@
>
基本信息
-
+
@@ -52,16 +52,17 @@
v-model="form.description"
width="100%"
min-height="150px"
+ @blur="formRef.validateField(`description`)"
>
-
+ /> -->
@@ -81,7 +82,7 @@
-
+
- 取消
+ 取消
提交
@@ -110,14 +111,16 @@
diff --git a/src/views/admin/enterprise/demand/releaseTechnology.vue b/src/views/admin/enterprise/demand/releaseTechnology.vue
index 799f77c..c27a456 100644
--- a/src/views/admin/enterprise/demand/releaseTechnology.vue
+++ b/src/views/admin/enterprise/demand/releaseTechnology.vue
@@ -11,15 +11,15 @@
-
+
-
+
+ // 其他
-
+ -->
@@ -61,6 +63,11 @@
:labelWidth="labelWidth"
ref="fieldFormRef"
/>
+
@@ -145,10 +152,11 @@
@@ -194,7 +202,7 @@ const data = reactive({
rules: {
title: [{ required: true, message: "需求名称不能为空", trigger: "blur" }],
introduce: [
- { required: true, message: "需求描述不能为空", trigger: "blur" },
+ { required: true, message: "需求描述不能为空", trigger: "change" },
],
name: [{ required: true, message: "需求联系人不能为空", trigger: "blur" }],
mobile: [
@@ -247,6 +255,7 @@ const checkList = reactive([
const formRef = ref(null);
const fieldFormRef = ref(null);
const directionsFormRef = ref(null);
+const cityFormRef = ref(null);
const checkInput = ref("");
const submitForm = async (status) => {
let formValid;
@@ -258,7 +267,8 @@ const submitForm = async (status) => {
form.value.status = status;
const fieldFormValid = await fieldFormRef.value.validateForm();
const directionsFormValid = await directionsFormRef.value.validateForm();
- if (formValid && fieldFormValid && directionsFormValid) {
+ const cityFormValid = await cityFormRef.value.validateForm();
+ if (formValid && fieldFormValid && directionsFormValid && cityFormValid) {
if (route.query.id) {
await updateTechnologyDemand(form.value);
ElMessage.success("修改企业需求成功");
@@ -328,6 +338,20 @@ onMounted(() => {
form.value.wants = resp.data.want?.split(",") ?? [];
}
});
+ } else {
+ form.value = {
+ check: [],
+ };
+ if (formRef.value) {
+ formRef.value.resetFields();
+ }
}
});
+
diff --git a/src/views/admin/enterprise/demand/results.vue b/src/views/admin/enterprise/demand/results.vue
index c0d8932..d59d1f0 100644
--- a/src/views/admin/enterprise/demand/results.vue
+++ b/src/views/admin/enterprise/demand/results.vue
@@ -11,8 +11,8 @@
成果
专利
专家
- 服务需求
- 技术需求
+
+
@@ -35,14 +35,14 @@
:data="item"
v-else-if="queryParams.searchType == 5"
>
-
+ > -->
@@ -62,16 +62,18 @@
import { search } from "@/api/website/home/index";
import gainItem from "@/views/website/searchList/components/gainItem.vue";
import expertItem from "@/views/website/searchList/components/expertItem.vue";
-import serviceDemandItem from "@/views/website/searchList/components/serviceDemandItem.vue";
+// import serviceDemandItem from "@/views/website/searchList/components/serviceDemandItem.vue";
import enterpriseItem from "../../components/enterpriseItem.vue";
-import TechnologyDemandItem from "@/views/website/searchList/components/technologyDemandItem.vue";
+// import TechnologyDemandItem from "@/views/website/searchList/components/technologyDemandItem.vue";
import AchievementItem from "@/views/website/searchList/components/achievementItem.vue";
import { useRoute, useRouter } from "vue-router";
-import { watch } from "vue";
+
+// import { watch } from "vue";
const route = useRoute();
const router = useRouter();
+// console.log(userStore.userId);
const dataList = ref([]);
const loading = ref(true);
const total = ref(0);
@@ -85,11 +87,12 @@ const queryType = computed(() => {
return 2;
} else if (queryParams.value.searchType == 5) {
return 2;
- } else if (queryParams.value.searchType == 6) {
- return 1;
- } else if (queryParams.value.searchType == 7) {
- return 1;
}
+ // else if (queryParams.value.searchType == 6) {
+ // return 1;
+ // } else if (queryParams.value.searchType == 7) {
+ // return 1;
+ // }
});
// router.replace({
@@ -121,6 +124,7 @@ const { queryParams } = toRefs(data);
/** 查询列表 */
async function getList() {
const resp = await search(queryParams.value);
+ // if()
dataList.value = resp.list;
total.value = resp.total;
loading.value = false;
diff --git a/src/views/admin/enterprise/demand/serviceDemand.vue b/src/views/admin/enterprise/demand/serviceDemand.vue
index b087f35..5557d71 100644
--- a/src/views/admin/enterprise/demand/serviceDemand.vue
+++ b/src/views/admin/enterprise/demand/serviceDemand.vue
@@ -23,7 +23,7 @@
-
+
diff --git a/src/views/admin/enterprise/extension/results.vue b/src/views/admin/enterprise/extension/results.vue
index bbd67c9..86c9ef3 100644
--- a/src/views/admin/enterprise/extension/results.vue
+++ b/src/views/admin/enterprise/extension/results.vue
@@ -11,7 +11,7 @@
成果
专利
专家
- 服务需求
+
技术需求
@@ -104,13 +104,13 @@ import enterpriseItem from "../../components/enterpriseItem.vue";
import TechnologyDemandItem from "@/views/website/searchList/components/technologyDemandItem.vue";
import AchievementItem from "@/views/website/searchList/components/achievementItem.vue";
import { useRoute, useRouter } from "vue-router";
-
+import useUserStore from "@/store/modules/user";
const route = useRoute();
const router = useRouter();
const dataList = ref([]);
const loading = ref(true);
const total = ref(0);
-
+const userStore = useUserStore();
const queryType = computed(() => {
if (queryParams.value.searchType == 1) {
return 2;
@@ -155,7 +155,20 @@ watch(
/** 查询列表 */
async function getList() {
const resp = await search(queryParams.value);
+ // console.log(userStore.enterprise.id);
dataList.value = resp.list;
+ // 排除自己企业
+ if (queryParams.value.searchType === "1") {
+ dataList.value = dataList.value.filter(
+ (el) => el.id != userStore.enterprise?.id
+ );
+ }
+ // 成果排除专家自己
+ else if (queryParams.value.searchType === "2") {
+ dataList.value = dataList.value.filter(
+ (el) => el.expertId != userStore.userId
+ );
+ }
total.value = resp.total;
loading.value = false;
}
diff --git a/src/views/admin/enterprise/index.vue b/src/views/admin/enterprise/index.vue
index a8c901e..0c6e37d 100644
--- a/src/views/admin/enterprise/index.vue
+++ b/src/views/admin/enterprise/index.vue
@@ -3,26 +3,33 @@
会员banner图
-
-
+
-
- 会员到期时间:{{ vipData.expireTime }}
+
+ {{ vipData.vipType == 1 ? "VIP" : "SVIP" }}到期时间:{{
+ vipData.expireTime
+ }}
-
+
查看会员权益
- 开通VIP
+
+ 开通VIP
+
+
+
+
+
-
+ /> -->
+
-
+
-
+ -->
diff --git a/src/views/admin/expert/demand/release.vue b/src/views/admin/expert/demand/release.vue
index 82fe38e..0366b93 100644
--- a/src/views/admin/expert/demand/release.vue
+++ b/src/views/admin/expert/demand/release.vue
@@ -9,17 +9,17 @@
>
基本信息
-
+
-
+
-
+ /> -->
@@ -87,15 +89,15 @@
-
+
@@ -111,9 +113,21 @@
diff --git a/src/views/website/searchList/components/gainItem.vue b/src/views/website/searchList/components/gainItem.vue
index 0550fa6..a671923 100644
--- a/src/views/website/searchList/components/gainItem.vue
+++ b/src/views/website/searchList/components/gainItem.vue
@@ -84,7 +84,7 @@ function createdData(arr) {