@@ -131,7 +140,24 @@ import { ElLoading } from 'element-plus';
const router = useRouter();
const projectClassify = [];
-const studyProgress = [];
+const studyProgress = [
+ {
+ value:0,
+ label:"未开始"
+ },
+ {
+ value:1,
+ label:"进行中"
+ },
+ {
+ value:2,
+ label:"已完成"
+ },
+ {
+ value:3,
+ label:"已结束"
+ },
+];
const projectList = ref([]); //项目列表
const pageSize = ref(60); //每页条数
const currentPage = ref(1); //当前页数
@@ -140,6 +166,7 @@ const projectname = ref(""); //项目名称
const searchTime = ref(""); //选择时间
const beginTime = ref(""); //结束时间
const endTime = ref(""); //开始时间
+const stateValue = ref(undefined)
const dialogVisible = ref(false)
const userInfo = computed(() => store.state.userInfo);
@@ -154,12 +181,21 @@ const getProject = () => {
text: 'Loading',
background: 'rgba(0, 0, 0, 0.7)'
})
+ console.log('我是搜索传递的参数',{
+ beginTime: beginTime.value,
+ endTime: endTime.value,
+ key: projectname.value,
+ pageNo: currentPage.value,
+ pageSize: pageSize.value,
+ status: stateValue.value
+ })
request(PROJECT_LIST, {
beginTime: beginTime.value,
endTime: endTime.value,
key: projectname.value,
pageNo: currentPage.value,
pageSize: pageSize.value,
+ status: stateValue.value
})
.then((res) => {
console.log("获取成功", res);
@@ -205,6 +241,7 @@ const resetClick = () => {
currentPage.value = 1;
beginTime.value = "";
endTime.value = "";
+ stateValue.value ="";
getProject();
console.log("点击重置");
};
@@ -220,15 +257,22 @@ const goProjectDetails = (value) => {
?
router.push({
path: "/projectdetails",
- query: { projectId: value.projectId },
+ query: { projectId: value.id },
})
:
window.open(
- `${import.meta.env.VITE_BOE_PATH_DETAIL_URL}/projectdetails¶ms=${encodeURIComponent(
- `projectId=${value.projectId}`
+ `${window.location.protocol + import.meta.env.VITE_BOE_PATH_DETAIL_URL}/projectdetails¶ms=${encodeURIComponent(
+ `projectId=${value.id}`
,'_top')}`
);
};
+
+// 项目状态
+const choiceStatus = (e) => {
+ console.log(e)
+ stateValue.value = e
+}
+
diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue
index 0b6edf5..a5bb3cc 100644
--- a/src/views/survey/SurveyDetail.vue
+++ b/src/views/survey/SurveyDetail.vue
@@ -10,22 +10,16 @@
/
评估详情