feat:项目列表部分数据接入

src/api/index.js

@@ -38,34 +38,10 @@ import http from "./config";
 // 接口-请求
 
 // 创建编辑单层项目
-export const createProject = (obj) => http.post('/admin/project/edit', {
+export const createProject = (obj) => http.post('/admin/project/edit', obj)
-	"attach": obj.attach,
-	"beginTime": obj.beginTime,
-	"boeFlag": obj.boeFlag,
-	"category": obj.category,
-	"courseSyncFlag": obj.courseSyncFlag,
-	"endTime": obj.endTime,
-	"level": obj.level,
-	"manager": obj.manager,
-	"managerId": obj.managerId,
-	"name": obj.name,
-	"notice": obj.notice,
-	"noticeFlag": obj.noticeFlag,
-	"picUrl": obj.picUrl,
-	"remark": obj.remark,
-	"sourceBelongId": obj.sourceBelongId,
-	"status": obj.status,
-	"systemId": obj.systemId,
-	"templateId": obj.templateId,
-	"type": obj.type
-})
 
 // 创建多层项目
-export const createStoreyProject = () => http.post('/admin/project/edit', {
+export const createStoreyProject = (obj) => http.post('/admin/project/edit', obj)
-
-})
 
 // 获取项目列表
-export const getProjectList = () => http.post('/admin/project/list', {
+export const getProjectList = (obj) => http.post('/admin/project/list', obj)
-
-})

src/views/projectcenter/ProjectAdd.vue

@@ -11,58 +11,34 @@
 			<div class="main">
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">项目名称</div>
 					</div>
 					<div class="in">
-            <a-input
+						<a-input v-model:value="projectName" placeholder="请输入项目名称" show-count :maxlength="30" />
-              v-model:value="projectName"
-              placeholder="请输入项目名称"
-              show-count
-              :maxlength="30"
-            />
 					</div>
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">分类</div>
 					</div>
 					<div class="in select">
-            <a-select
+						<a-select :getPopupContainer="
-              :getPopupContainer="
 							(triggerNode) => {
 								return triggerNode.parentNode || document.body;
 							}
-              "
+						" v-model:value="classifySelect" placeholder="四个养成" style="width: 100%" :options="classifyList"
-              v-model:value="classifySelect"
+							@change="classificationChange" allowClear showSearch>
-              placeholder="四个养成"
-              style="width: 100%"
-              :options="classifyList"
-              @change="classificationChange"
-              allowClear
-              showSearch
-            >
 						</a-select>
 					</div>
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">封面图</div>
 					</div>
-          <div
+					<div class="box" style="
-            class="box"
-            style="
               width: 100px;
               height: 100px;
               border: 1px solid rgba(78, 166, 255, 1);
@@ -70,29 +46,15 @@
               cursor: pointer;
               position: relative;
               overflow: hidden;
-            "
+            ">
-          >
+						<a-upload v-model:file-list="fileList" name="file" list-type="picture-card" class="avatar-uploader"
-            <a-upload
+							:show-upload-list="false" action="/api/file/upload" :before-upload="beforeUpload" @change="handleChange">
-              v-model:file-list="fileList"
+							<img style="
-              name="file"
-              list-type="picture-card"
-              class="avatar-uploader"
-              :show-upload-list="false"
-              action="/api/file/upload"
-              :before-upload="beforeUpload"
-              @change="handleChange"
-            >
-              <img
-                style="
                   width: 100px;
                   height: 100px;
                   margin-bottom: 4px;
                   margin-right: 4px;
-                "
+                " v-if="imageUrl" :src="imageUrl" alt="avatar" />
-                v-if="imageUrl"
-                :src="imageUrl"
-                alt="avatar"
-              />
 							<div v-else>
 								<!-- <loading-outlined v-if="loading"></loading-outlined> -->
 								<!-- <plus-outlined v-else></plus-outlined> -->
@@ -105,55 +67,33 @@
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">项目时间</div>
 					</div>
 
 					<div class="in">
-            <a-range-picker
+						<a-range-picker separator="至" :placeholder="['      开始时间', '        结束时间']"
-              separator="至"
+							style="width: 100%; height: 40px; border-radius: 5px" show-time @change="onRangeChange" />
-              :placeholder="['      开始时间', '        结束时间']"
-              style="width: 100%; height: 40px; border-radius: 5px"
-              show-time
-              @change="onRangeChange"
-            />
 					</div>
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">项目经理</div>
 					</div>
 					<div class="in select">
-            <a-select
+						<a-select :getPopupContainer="
-              :getPopupContainer="
 							(triggerNode) => {
 								return triggerNode.parentNode || document.body;
 							}
-              "
+						" :value="classifySelect1" placeholder="请选择项目经理" style="width: 100%" :options="classifyList1"
-              :value="classifySelect1"
+							@change="classificationChange1" allowClear showSearch>
-              placeholder="请选择项目经理"
-              style="width: 100%"
-              :options="classifyList1"
-              @change="classificationChange1"
-              allowClear
-              showSearch
-            >
 						</a-select>
 					</div>
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">资源归属</div>
 					</div>
 
@@ -166,13 +106,7 @@
 						<div class="inname" style="margin-top: 13px">项目说明</div>
 					</div>
 					<div class="in">
-            <a-textarea
+						<a-textarea v-model:value="remark" style="height: 80px" placeholder="请输入说明" show-count :maxlength="200" />
-              v-model:value="remark"
-              style="height: 80px"
-              placeholder="请输入说明"
-              show-count
-              :maxlength="200"
-            />
 					</div>
 				</div>
 				<div class="name name2">
@@ -180,99 +114,57 @@
 						<div class="inname">同步学习记录</div>
 					</div>
 					<div class="in">
-            <a-radio @click="changeChecked" v-model:checked="checked"
+						<a-radio @click="changeChecked" v-model:checked="checked"><span style="
-              ><span
-                style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                "
+                ">同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span></a-radio>
-                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-              ></a-radio
-            >
 					</div>
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">项目级别</div>
 					</div>
 					<div class="in">
-            <a-input
+						<a-input v-model:value="valueE1" placeholder="集团级/组织级/现地级/部门级" />
-              v-model:value="valueE1"
-              placeholder="集团级/组织级/现地级/部门级"
-            />
 					</div>
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">培训体系</div>
 					</div>
 					<div class="in">
-            <a-input
+						<a-input v-model:value="valueE2" placeholder="集团级/组织级/现地级/部门级" />
-              v-model:value="valueE2"
-              placeholder="集团级/组织级/现地级/部门级"
-            />
 					</div>
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">是否BOEU实施</div>
 					</div>
 					<div class="in">
-            <a-radio @click="changeChecked1" v-model:checked="checked1"
+						<a-radio @click="changeChecked1" v-model:checked="checked1"><span style="
-              ><span
-                style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                "
+                ">BOEU实施</span></a-radio>
-                >BOEU实施</span
-              ></a-radio
-            >
 					</div>
 				</div>
 				<div class="name name2">
 					<div class="namebox" style="margin-top: 8px">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">附件</div>
 					</div>
 					<div class="filebox">
 						<div>
-              <img
+							<img v-if="fileList1.length < 6" class="fileimg" src="../../assets/images/projectadd/enclosure.png" />
-                v-if="fileList1.length < 6"
+							<a-upload :disabled="fileList1.length > 5" :before-upload="beforeUpload1" v-model:file-list="fileList1"
-                class="fileimg"
+								@remove="removeFile" name="file" action="/api/file/upload" :headers="headers" @change="handleChange1">
-                src="../../assets/images/projectadd/enclosure.png"
-              />
-              <a-upload
-                :disabled="fileList1.length > 5"
-                :before-upload="beforeUpload1"
-                v-model:file-list="fileList1"
-                @remove="removeFile"
-                name="file"
-                action="/api/file/upload"
-                :headers="headers"
-                @change="handleChange1"
-              >
 								<!-- <a-button> -->
 								<!-- <upload-outlined></upload-outlined> -->
-                <span v-if="fileList1.length > 5" class="filetext"
+								<span v-if="fileList1.length > 5" class="filetext">上传数量已经达到最大值</span>
-                  >上传数量已经达到最大值</span
-                >
 								<span v-else class="filetext">上传附件</span>
 								<!-- </a-button> -->
 							</a-upload>
@@ -287,13 +179,7 @@
 				<div class="name">
 					<div class="inname" style="width: 50px">模板</div>
 					<div class="in select" style="margin-left: 2px">
-            <a-select
+						<a-select v-model:value="value1" placeholder="请选择模板" :size="size" style="width: 100%" :options="options">
-              v-model:value="value1"
-              placeholder="请选择模板"
-              :size="size"
-              style="width: 100%"
-              :options="options"
-            >
 						</a-select>
 					</div>
 				</div>
@@ -301,9 +187,7 @@
 		</div>
 		<div class="footer">
 			<div class="btn">
-        <a-button v-on:click="createProject" type="primary" class="btn1"
+				<a-button v-on:click="createProject" type="primary" class="btn1">确定</a-button>
-          >确定</a-button
-        >
 				<a-button class="btn2">取消</a-button>
 			</div>
 		</div>
@@ -311,12 +195,14 @@
 </template>
 <script>
 import { reactive, toRefs, ref } from "vue";
-import { message } from "ant-design-vue";
+import { message } from 'ant-design-vue';
+import { useRouter } from "vue-router";
 import * as api from "../../api/index";
 
 export default {
 	name: "projectAdd",
 	setup() {
+		const router = useRouter();
 		const state = reactive({
 			classifySelect: null,
 			classifySelectId: null,
@@ -324,15 +210,15 @@ export default {
 			checked1: false,
 			valueE: null,
 			valueE1: null,
-      valueE2: null,
+			valueE2: null
 		});
 
-    const projectName = ref("");
+		const projectName = ref('');
 
 		const classifyList = ref([
-      { value: 1, label: "管理者" },
+			{ value: 1, label: '管理者' },
-      { value: 2, label: "领军者" },
+			{ value: 2, label: '领军者' },
-      { value: 3, label: "产业人" },
+			{ value: 3, label: '产业人' },
 		]);
 
 		let projectType = "";
@@ -344,23 +230,23 @@ export default {
 
 		function getBase64(img, callback) {
 			const reader = new FileReader();
-      reader.addEventListener("load", () => callback(reader.result));
+			reader.addEventListener('load', () => callback(reader.result));
 			reader.readAsDataURL(img);
 		}
 
 		const fileList = ref([]);
 		const fileList1 = ref([]);
 		const loading = ref(false);
-    const imageUrl = ref("");
+		const imageUrl = ref('');
-    let picUrl = "";
+		let picUrl = '';
 
 		const handleChange = (info) => {
-      if (info.file.status === "uploading") {
+			if (info.file.status === 'uploading') {
 				loading.value = true;
 				return;
 			}
-      if (info.file.status === "done") {
+			if (info.file.status === 'done') {
-        console.log("上传图片返回的信息 %o", info);
+				console.log('上传图片返回的信息 %o', info)
 				picUrl = info.file.response.data;
 				// Get this url from response in real world.
 				getBase64(info.file.originFileObj, (base64Url) => {
@@ -368,9 +254,9 @@ export default {
 					loading.value = false;
 				});
 			}
-      if (info.file.status === "error") {
+			if (info.file.status === 'error') {
 				loading.value = false;
-        message.error("upload error");
+				message.error('upload error');
 			}
 		};
 
@@ -379,17 +265,12 @@ export default {
 		let attach = "";
 		let attachData = "";
 		const handleChange1 = (info) => {
-      if (info.file.status === "uploading") {
+			if (info.file.status === 'uploading') {
 				loading.value = true;
 				return;
 			}
-      if (info.file.status === "done") {
+			if (info.file.status === 'done') {
-        console.log(
+				console.log('上传附件返回的信息 %o', info, info.fileList.length, uplodaFileCount)
-          "上传附件返回的信息 %o",
-          info,
-          info.fileList.length,
-          uplodaFileCount
-        );
 
 				let attachStr = "";
 				attachData = info.fileList;
@@ -397,10 +278,10 @@ export default {
 					if (attachData.length - 1 == i) {
 						attachStr += attachData[i].response.data;
 					} else {
-            attachStr += attachData[i].response.data + ",";
+						attachStr += attachData[i].response.data + ',';
 					}
 				}
-        console.log(attachStr);
+				console.log(attachStr)
 				attach = attachStr;
 
 				if (info.fileList.length > 5) {
@@ -409,21 +290,20 @@ export default {
 					uplodaFileCount = false;
 				}
 			}
-      if (info.file.status === "error") {
+			if (info.file.status === 'error') {
 				loading.value = false;
-        message.error("upload error");
+				message.error('upload error');
 			}
 		};
 
 		const beforeUpload = (file) => {
-      const isJpgOrPng =
+			const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
-        file.type === "image/jpeg" || file.type === "image/png";
 			if (!isJpgOrPng) {
-        message.error("You can only upload JPG file!");
+				message.error('You can only upload JPG file!');
 			}
 			const isLt2M = file.size / 1024 / 1024 < 1;
 			if (!isLt2M) {
-        message.error("Image must smaller than 1MB!");
+				message.error('Image must smaller than 1MB!');
 			}
 			return isJpgOrPng && isLt2M;
 		};
@@ -431,61 +311,59 @@ export default {
 		const beforeUpload1 = () => {
 			return new Promise((resovle, reject) => {
 				if (uplodaFileCount) {
-          message.info("上传文件数量已达最大数量");
+					message.info("上传文件数量已达最大数量")
 					return reject(false);
 				}
 				return resovle(true);
-      });
+			})
 		};
 
 		let beginTime = "";
 		let endTime = "";
 		const onRangeChange = (value, dateString) => {
-      console.log("Selected Time: ", value);
+			console.log('Selected Time: ', value);
 			// 项目时间选择函数
-      console.log("Formatted Selected Time: ", dateString);
+			console.log('Formatted Selected Time: ', dateString);
-      console.log(
+			console.log('Formatted Selected TimeStamp', new Date(dateString[0]).getTime())
-        "Formatted Selected TimeStamp",
+			beginTime = new Date(dateString[0]).getTime() / 1000;
-        new Date(dateString[0]).getTime()
+			endTime = new Date(dateString[1]).getTime() / 1000;
-      );
-      beginTime = new Date(dateString[0]).getTime();
-      endTime = new Date(dateString[1]).getTime();
 		};
 
+
 		// 项目经理 后续接口调用
 		const classifyList1 = ref([
-      { value: 1, label: "李俊国" },
+			{ value: 1, label: '李俊国' },
-      { value: 2, label: "将小米" },
+			{ value: 2, label: '将小米' },
-      { value: 3, label: "刘孟君" },
+			{ value: 3, label: '刘孟君' },
 		]);
 
 		let manager = "";
 		let managerId = "";
 		const classificationChange1 = (key) => {
 			console.log(`selected ${key}`);
-      console.log(classifyList1.value[key - 1].label);
+			console.log(classifyList1.value[key - 1].label)
-      manager = String(classifyList1.value[key - 1].label);
+			manager = String(classifyList1.value[key - 1].label)
-      managerId = String(key);
+			managerId = String(key)
 		};
 
 		// 资源归属 sourceBelongId 后续给接口
 
 		// 项目说明
-    const remark = ref("");
+		const remark = ref('');
 
 		let courseSyncFlag = 0;
 		const changeChecked = () => {
-      console.log(state.checked);
+			console.log(state.checked)
-      state.checked ? (state.checked = false) : (state.checked = true);
+			state.checked ? state.checked = false : state.checked = true;
 			courseSyncFlag = state.checked ? 1 : 0;
-    };
+		}
 
 		let boeFlag = 0;
 		const changeChecked1 = () => {
-      console.log(state.checked1);
+			console.log(state.checked1)
-      state.checked1 ? (state.checked1 = false) : (state.checked1 = true);
+			state.checked1 ? state.checked1 = false : state.checked1 = true;
 			boeFlag = state.checked1 ? 1 : 0;
-    };
+		}
 
 		const removeFile = (file) => {
 			const index = fileList1.value.indexOf(file);
@@ -498,72 +376,81 @@ export default {
 				attachStr = "";
 			}
 			for (let i = 0; i < fileList1["value"].length; i++) {
-        console.log(fileList1["value"][i].response.data);
+				console.log(fileList1["value"][i].response.data)
 				if (fileList1["value"].length - 1 == i) {
 					attachStr += fileList1["value"][i].response.data;
 				} else {
-          attachStr += fileList1["value"][i].response.data + ",";
+					attachStr += fileList1["value"][i].response.data + ',';
 				}
 			}
 			attach = attachStr;
-    };
+		}
+
 
 		const errorMsgs = {
-      name: "请输入项目名称",
+			"name": "请输入项目名称",
-      type: "请选择项目分类",
+			"type": "请选择项目分类",
-      picUrl: "请上传项目封面图",
+			"picUrl": "请上传项目封面图",
-      beginTime: "请选择项目开始时间",
+			"beginTime": "请选择项目开始时间",
-      endTime: "请选择项目结束时间",
+			"endTime": "请选择项目结束时间",
-      manager: "请选择项目经理",
+			"manager": "请选择项目经理",
-      managerId: "请选择项目经理",
+			"managerId": "请选择项目经理",
-      sourceBelongId: "请选择资源归属",
+			"sourceBelongId": "请选择资源归属",
-      level: "请填写项目级别",
+			"level": "请填写项目级别",
-      systemId: "请填写项目培训体系",
+			"systemId": "请填写项目培训体系",
-      boeFlag: "请选择是否BOE实施",
+			"boeFlag": "请选择是否BOE实施",
-      attach: "请上传附件",
+			"attach": "请上传附件"
-    };
+		}
 
 		const createProject = () => {
 			let obj = {
-        name: projectName["value"],
+				"name": projectName["value"],
-        type: projectType,
+				"type": projectType,
-        picUrl: picUrl,
+				"picUrl": picUrl,
-        beginTime: beginTime,
+				"beginTime": beginTime,
-        endTime: endTime,
+				"endTime": endTime,
-        manager: manager,
+				"manager": manager,
-        managerId: managerId,
+				"managerId": managerId,
-        sourceBelongId: 11,
+				"sourceBelongId": 11,
-        remark: remark["value"],
+				"remark": remark["value"],
-        courseSyncFlag: courseSyncFlag,
+				"courseSyncFlag": courseSyncFlag,
-        level: 3,
+				"level": 3,
-        systemId: 4,
+				"systemId": 4,
-        boeFlag: boeFlag,
+				"boeFlag": boeFlag,
-        attach: attach,
+				"attach": attach,
-        templateId: 10,
+				"templateId": 10,
-
+				"parentId": 0,
-        category: 0,
+				"category": 0,
-        notice: "",
+				"notice": "",
-        noticeFlag: 0,
+				"noticeFlag": 0,
-        status: 0,
+				"status": 0
-      };
+			}
-      console.log("提交的数据格式 %o", obj);
+			console.log('提交的数据格式 %o', obj)
 			for (let i in errorMsgs) {
-        console.log(obj[i]);
+				console.log(obj[i])
 				if (obj[i] === "") {
-          message.destroy();
+					message.destroy()
-          message.warning(errorMsgs[i]);
+					message.warning(errorMsgs[i])
-          return;
+					return
 				}
 			}
 
-      api
+			api.createProject(obj).then(res => {
-        .createProject(obj)
+				console.log(res)
-        .then((res) => {
+				if (res.status == 200 && res.data.code == 200) {
-          console.log(res);
+					router.push({
-        })
+						path: '/taskpage',
-        .catch((err) => {
+						query: { id: res.data.data.projectId }
-          console.log(err);
 					});
+				} else {
+					message.destroy();
+					message.error("创建失败，请检查当前网络状态。")
+				}
+			}).catch(err => {
+				console.log(err)
+				message.destroy();
+				message.error("创建失败，请检查当前网络状态。")
+			})
 		};
 
 		return {
@@ -587,9 +474,9 @@ export default {
 			changeChecked1,
 			uplodaFileCount,
 			createProject,
-      removeFile,
+			removeFile
 		};
-  },
+	}
 };
 </script>
 <style lang="scss">

src/views/projectcenter/ProjectManage.vue

@@ -486,59 +486,7 @@ import ProjOwnerShip from "../../components/drawers/ProjectOwn";
 import ProjPowerList from "../../components/drawers/ProjPowerList";
 import ProjCheckShip from "../../components/drawers/ProjCheckPower";
 import ProjManageShip from "../../components/drawers/ProjManagePower";
-const columns = [
+import * as api from '../../api/index'
-	{
-		title: "项目名称",
-		dataIndex: "projectName",
-		key: "projectName",
-		width: 280,
-		// align: "center",
-		ellipsis: true,
-		// scopedSlots: { customRender: "action" }, //引入的插槽
-		// customRender: (text, record) => {
-		//   console.log(text, record);
-		//   return <span>{text.text}</span>;
-		// },
-	},
-	{
-		title: "项目经理",
-		dataIndex: "manager",
-		key: "manager",
-		width: 100,
-		align: "center",
-	},
-	{
-		title: "状态",
-		dataIndex: "state",
-		// width: "30%",
-		key: "state",
-		width: 100,
-		align: "center",
-	},
-	{
-		title: "创建人",
-		dataIndex: "creater",
-		// width: "30%",
-		key: "creater",
-		width: 100,
-		align: "center",
-	},
-	{
-		title: "创建时间",
-		dataIndex: "time",
-		key: "time",
-		width: 180,
-		align: "center",
-	},
-	{
-		title: "操作",
-		dataIndex: "operation",
-		key: "operation",
-		width: 300,
-		align: "center",
-		fixed: "right",
-	},
-];
 
 export default {
 	name: "projectManage",
@@ -572,256 +520,6 @@ export default {
 			],
 			projectName: null,
 			selectTime: null,
-
-			tableData: [
-				{
-					key: 1,
-					projectName:
-						"管理者进阶1管理者进阶1管理者进阶1管理者进阶1管理者进阶1管理者进阶1管理者进阶1",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-					children: [
-						{
-							key: "1-1",
-							projectName: "管理者进阶5",
-							manager: "黄华  刘俊",
-							state: "草稿",
-							creater: "毛继禹",
-							time: "2022-07-20 14:00:03",
-							children: [
-								{
-									key: "1-1-1",
-									projectName:
-										"管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7",
-									manager: "黄华  刘俊",
-									state: "草稿",
-									creater: "毛继禹",
-									time: "2022-07-20 14:00:03",
-								},
-							],
-						},
-					],
-				},
-				{
-					key: 2,
-					projectName: "管理者进阶2",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-					hasChildren: true,
-				},
-				{
-					key: 3,
-					projectName: "管理者进阶3",
-					manager: "黄华  刘俊",
-					state: "进行中",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-					hasChildren: true,
-					children: [
-						{
-							key: "3-1",
-							projectName: "管理者进阶35",
-							manager: "黄华  刘俊",
-							state: "已结束",
-							creater: "毛继禹",
-							time: "2022-07-20 14:00:03",
-						},
-						{
-							key: "3-2",
-							projectName: "管理者进阶36",
-							manager: "黄华  刘俊",
-							state: "草稿",
-							creater: "毛继禹",
-							time: "2022-07-20 14:00:03",
-						},
-					],
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶4",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶5",
-					manager: "黄华  刘俊",
-					state: "已结束",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-					children: [
-						{
-							key: "4-1",
-							projectName: "管理者进阶5",
-							manager: "黄华  刘俊",
-							state: "进行中",
-							creater: "毛继禹",
-							time: "2022-07-20 14:00:03",
-							children: [
-								{
-									key: "4-1-1",
-									projectName:
-										"管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7",
-									manager: "黄华  刘俊",
-									state: "草稿",
-									creater: "毛继禹",
-									time: "2022-07-20 14:00:03",
-								},
-							],
-						},
-					],
-				},
-				{
-					key: 5,
-					projectName: "管理者进阶5",
-					manager: "黄华  刘俊",
-					state: "已结束",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-					children: [
-						{
-							key: "5-1",
-							projectName: "管理者进阶5",
-							manager: "黄华  刘俊",
-							state: "已结束",
-							creater: "毛继禹",
-							time: "2022-07-20 14:00:03",
-							children: [
-								{
-									key: "5-1-1",
-									projectName:
-										"管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7",
-									manager: "黄华  刘俊",
-									state: "进行中",
-									creater: "毛继禹",
-									time: "2022-07-20 14:00:03",
-								},
-							],
-						},
-					],
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-			],
-			currentPage: 1,
-			tableDataTotal: 20,
-			pageSize: 10,
 			sonproject: false,
 			estabish: false,
 			doublepro: false,
@@ -842,6 +540,7 @@ export default {
 			ProjManagevisible: false,
 		});
 		// 数据接入 - start - 
+
 		// 项目分类
 		const classifyList = ref([
 			{ value: 1, label: '管理者' },
@@ -910,13 +609,93 @@ export default {
 			console.log("e", e, a);
 		};
 
+		// 获取项目列表信息
+		let tableData = ref([]);
+		let currentPage = ref(1); 
+		let tableDataTotal = ref(1);
+		let pageSize = ref(10);
+
+		const columns = ref([
+			{
+				title: "项目名称",
+				dataIndex: "name",
+				key: "name",
+				width: 280,
+				// align: "center",
+				ellipsis: true,
+				// scopedSlots: { customRender: "action" }, //引入的插槽
+				// customRender: (text, record) => {
+				//   console.log(text, record);
+				//   return <span>{text.text}</span>;
+				// },
+			},
+			{
+				title: "项目经理",
+				dataIndex: "manager",
+				key: "manager",
+				width: 100,
+				align: "center",
+			},
+			{
+				title: "状态",
+				dataIndex: "status",
+				// width: "30%",
+				key: "status",
+				width: 100,
+				align: "center",
+			},
+			{
+				title: "创建人",
+				dataIndex: "createName",
+				// width: "30%",
+				key: "createName",
+				width: 100,
+				align: "center",
+			},
+			{
+				title: "创建时间",
+				dataIndex: "createTime",
+				key: "createTime",
+				width: 180,
+				align: "center",
+			},
+			{
+				title: "操作",
+				dataIndex: "operation",
+				key: "operation",
+				width: 300,
+				align: "center",
+				fixed: "right",
+				customRender: () => {
+					return (
+						<div class="operation">
+							<div class="nSelect">
+								
+							</div>
+						</div>
+					)
+				}
+			},
+
+		]);
+
 		const getTableDate = () => {
-			let data = state.tableData;
+			let obj = {
+				pageNo: 1,
+				pageSize: 10
+			}
+			api.getProjectList(obj).then(res => {
+				console.log(res)
+				if (res.status == 200 && res.data.code == 200) {
+					tableDataTotal = Math.ceil(Number(res.data.data.total) / 10)
+					let data = res.data.data.rows;
+					console.log('1266',data)
 					data.map((value) => {
-				if (value.children) {
+						console.log('map-value',value)
+						if (value.subList.length!==0) {
 							//多层项目
 							value.operation =
-						value.state === "草稿" ? (
+								value.status === "草稿" ? (
 									<div class="operation">
 										<span class="operation1">编辑</span>
 										<div class="tableSelect">
@@ -997,7 +776,7 @@ export default {
 											</a-select>
 										</div>
 									</div>
-						) : value.state === "进行中" ? (
+								) : value.status === "进行中" ? (
 									<div class="operation">
 										<span class="operation1">查看</span>
 										<div class="tableSelect">
@@ -1057,7 +836,7 @@ export default {
 										</span>
 										<span class="more"></span>
 									</div>
-						) : value.state === "已结束" ? (
+								) : value.status === "已结束" ? (
 									<div class="operation">
 										<span class="operation1">查看</span>
 										<div class="tableSelect">
@@ -1127,8 +906,7 @@ export default {
 								) : (
 									<div></div>
 								);
-
+							value.subList.map((item) => {
-					value.children.map((item) => {
 								if (item.children) {
 									//多层子项目
 									item.operation =
@@ -2135,7 +1913,7 @@ export default {
 							//单层项目
 							value.operation = (
 								<div class="operation">
-							{value.state === "草稿" ? (
+									{value.status === "草稿" ? (
 										<span class="operation1">编辑</span>
 									) : (
 										<span class="operation1"></span>
@@ -2188,7 +1966,7 @@ export default {
 										</a-select>
 									</div>
 
-							{value.state === "草稿" ? (
+									{value.status === "草稿" ? (
 										<span class="operation3">发布</span>
 									) : (
 										<span
@@ -2201,7 +1979,7 @@ export default {
 										</span>
 									)}
 									<div class="tableSelect">
-								{value.state === "草稿" ? (
+										{value.status === "草稿" ? (
 											<a-select
 												style="width: 50px"
 												value="更多"
@@ -2239,7 +2017,7 @@ export default {
 													<router-link to="/taskpage">基础信息</router-link>
 												</a-select-option>
 											</a-select>
-								) : value.state === "进行中" ? (
+										) : value.status === "进行中" ? (
 											<a-select
 												style="width: 50px"
 												value="更多"
@@ -2277,7 +2055,7 @@ export default {
 													<router-link to="/taskpage">基础信息</router-link>
 												</a-select-option>
 											</a-select>
-								) : value.state === "已结束" || value.state === "未开始" ? (
+										) : value.status === "已结束" || value.status === "未开始" ? (
 											<a-select
 												style="width: 50px"
 												value="更多"
@@ -2314,8 +2092,13 @@ export default {
 							);
 						}
 					});
-			state.tableData = data;
+					tableData.value = data;
-			console.log("tableData", state.tableData);
+					console.log("tableData", tableData);
+				}
+			}).catch(err => {
+				console.log(err)
+			})
+
 		};
 		getTableDate();
 
@@ -2392,7 +2175,6 @@ export default {
 		};
 		return {
 			...toRefs(state),
-			columns,
 			selectProjectName,
 			expandTable,
 			showModal,
@@ -2419,6 +2201,11 @@ export default {
 			showProjCheck,
 			showProjManage,
 
+			tableData,
+			currentPage,
+			tableDataTotal,
+			pageSize,
+			columns,
 			createStoreyProject,
 			classifyList,
 			classifyList1,
@@ -2429,6 +2216,8 @@ export default {
 			value3,
 			value4,
 			value5,
+
+
 		};
 	},
 };