diff --git a/src/js/request.js b/src/js/request.js index a81b94c..ae36083 100644 --- a/src/js/request.js +++ b/src/js/request.js @@ -506,7 +506,7 @@ const infoEditSettingHeaderImage = (showType, token) => { */ const projectGet =(token,url) => { return axios({ - url:api+ "/project/get", + url:api+ "/project/get"+url, method: "get", headers:{ 'Authorization':'Bearer '+token, @@ -625,7 +625,7 @@ const projectWorkGet = (data,token) =>{ const queryTags = `tags=${encodedTags.join('&tags=')}`; const queryIsFinish = `isFinish=${encodedIsFinish.join('&isFinish=')}`; return axios({ - url:`${api}/project/work/get?${queryTags}&${queryIsFinish}&is=1`, + url:`${api}/project/work/get?${queryTags}&${queryIsFinish}`, method: "get", headers:{ 'content-type': 'application/json;charset=utf-8', @@ -675,24 +675,18 @@ const moduleGetByProjectId = (projectId, token) => { } -/** - * 根据子系统id获取子模块信息 - * @param sysId - * @param token - */ -const moduleGetBySysId = (sysId, token) => { - return axios({ - url: api + "/module/get/min?sysId=" + sysId, - method:"get", - headers: { +/*const moduleGetByProjectId = (projectId, token) => { + return axios ({ + url:api + "/module/get", + methods:"get", + params:projectId, + headers:{ 'Authorization':'Bearer '+token, - 'Content-Type': 'application/json;charset=utf-8', + 'content-type': 'application/json;charset=utf-8', 'Timestamp': getCurrentTimestamp() } }) -} - - +}*/ export default { login, @@ -736,7 +730,7 @@ export default { projectWorkGet, moduleGetByProjectId, - moduleGetBySysId, + messageGet, diff --git a/src/views/ProjectPage/ProjectList.vue b/src/views/ProjectPage/ProjectList.vue index 8c832c9..3ef610c 100644 --- a/src/views/ProjectPage/ProjectList.vue +++ b/src/views/ProjectPage/ProjectList.vue @@ -114,8 +114,8 @@ @@ -145,7 +145,10 @@ import { const color = ['pink','red','green','orange','cyan','blue','purple'] const showButton = reactive([]); -const projects = ref([]); +const projects = ref([ + +]); + const id =ref(1) const data = reactive({ id:'', @@ -168,6 +171,7 @@ function getAllProject(){ request.projectGetCustom(data).then((res)=>{ projects.value = res.data.data; console.log('查询到的所有项目',projects.value) + }) // loading.value = true; // console.log('zmhuisss',loading.value) diff --git a/src/views/WorkLoadPage/I_Manage_ChildSystem.vue b/src/views/WorkLoadPage/I_Manage_ChildSystem.vue index fdc773f..d4a41b7 100644 --- a/src/views/WorkLoadPage/I_Manage_ChildSystem.vue +++ b/src/views/WorkLoadPage/I_Manage_ChildSystem.vue @@ -8,9 +8,9 @@ -
+
-

项目名称:梁溪区纪委大数据管理平台{{ ChildSystems.name }}

+

项目名称:梁溪区纪委大数据管理平台{{ChildSystems.name}}

项目周期:3个月

项目开始时间:

项目完成时间:

@@ -21,22 +21,16 @@
- +

01

-

{{ ChildSystem.name }}

+

{{ChildSystem.name}}

-
@@ -47,13 +41,10 @@
- +
- - - +
- - - - - - + +
- - - - - + + +
-
+
\ No newline at end of file