hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-12 12:26:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat:合并

Browse Source
This commit is contained in:
李晓鸽
2022-10-24 16:13:11 +08:00
parent 54f7e478f1
commit 7ed5222366
4 changed files with 422 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
src/components/drawers/ChangeGroup.vue
View File

@@ -16,15 +16,15 @@
/>
</div>
<div class="main">
<div class="onerow">将此学员移动到</div>
<div class="secondrow">
<a-select
v-model:value="value"
style="width: 264px;border-radius: 8px"
placeholder="好好学习"
:options="stugroupList"
/>
</div>
<div class="onerow">将此学员移动到</div>
<div class="secondrow">
<a-select
v-model:value="value"
style="width: 264px; border-radius: 8px"
placeholder="好好学习"
:options="stugroupList"
/>
</div>
</div>
<div class="btnn">
<button class="btn1">取消</button>
@@ -32,7 +32,6 @@
</div>
</div>
</a-drawer>
</template>
<script>
@@ -47,23 +46,23 @@ export default {
},
setup(props, ctx) {
const state = reactive({
stugroupList: [
{
id: "1",
value: "好好学习",
label: "好好学习",
},
{
id: "2",
value: "天天向上",
label: "天天向上",
},
{
id: "3",
value: "好好学习",
label: "好好学习",
},
],
stugroupList: [
{
id: "1",
value: "好好学习",
label: "好好学习",
},
{
id: "2",
value: "天天向上",
label: "天天向上",
},
{
id: "3",
value: "好好学习",
label: "好好学习",
},
],
});
const closeDrawer = () => {
ctx.emit("update:Changevisible", false);
@@ -83,9 +82,8 @@ export default {
};
</script>
<style scoped lang="scss" >
<style scoped lang="scss">
.changegroup {
.drawerMain {
min-width: 600px;
margin: 0px 32px 0px 32px;
@@ -109,25 +107,24 @@ export default {
}
}
.main {
.onerow {
margin: 32px 0 32px 24px;
color: rgba(51, 51, 51, 1);
font-size: 16px;
.onerow {
margin: 32px 0 32px 24px;
color: rgba(51, 51, 51, 1);
font-size: 16px;
}
.secondrow {
margin-left: 24px;
.ant-select {
height: 40px;
}
.secondrow {
margin-left: 24px;
.ant-select {
height: 40px;
}
.ant-select-selector {
height: 100%;
border-radius: 8px;
}
.ant-select-selection-search-input {
height: 40px;
}
.ant-select-selector {
height: 100%;
border-radius: 8px;
}
.ant-select-selection-search-input {
height: 40px;
}
}
}
.btnn {
height: 72px;
@@ -161,4 +158,4 @@ export default {
}
}
}
</style>
</style>

2
src/router/index.js
View File

@@ -6,7 +6,7 @@ const routes = [
{
path: '/',
name: '首页',
redirect: routesConfig[0].path
redirect: '/learningpath'
},
...routesConfig
]

26
src/views/learningpath/LearningPath.vue
View File

@@ -408,7 +408,7 @@
import { reactive, toRefs, onMounted } from "vue";
import OwnerShip from "../../components/drawers/Ownership";
import PowerList from "../../components/drawers/PowerList";
import axios from "axios";
export default {
name: "learningPath",
components: { OwnerShip, PowerList },
@@ -656,8 +656,32 @@ export default {
];
return columns;
};
//获取学习路径列表
const getLearnPath = () => {
let obj = {
beginTime: 0,
endTime: 0,
name: "",
pageNo: 0,
pageSize: 0,
status: 0,
};
axios
.post("https://111.231.196.214:30001/admin/router/list", obj, {
headers: {
"Content-Type": "application/json;charset=UTF-8",
},
})
.then((res) => {
console.log("获取成功", res);
})
.catch((err) => {
console.log("获取失败", err);
});
};
onMounted(() => {
// console.log("执行");
getLearnPath();
});
const selectProjectName = (value, index) => {
console.log("value", value, index);

515
src/views/projectcenter/ProjectManage.vue
View File

@@ -80,13 +80,6 @@
total: tableDataTotal,
onChange: (page, pageSize) => {
currentPage = page;
// console.log('page', page)
// 加翻页查找代码
// this.setState({
// currentPage: page,
// }, () => {
// this.getMilitaryDeployment()
// })
},
}"
>
@@ -110,24 +103,24 @@
<!-- 无项目 -->
<div class="tableBox" style="display: none">
<div
class="taskbox"
@click="showModal1"
style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
>
<div class="leftt">
<img src="../../assets/images/taskpage/left2.png" />
</div>
<div class="photo">
<img src="../../assets/images/projectadd/nopro.png" />
</div>
<div class="rightt">
<img src="../../assets/images/taskpage/right2.png" />
</div>
<div class="centerbox" style="color: rgba(78, 166, 255, 1)">
创建项目
</div>
<div class="centermain">点击创建项目任务</div>
</div>
class="taskbox"
@click="showModal1"
style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
>
<div class="leftt">
<img src="../../assets/images/taskpage/left2.png" />
</div>
<div class="photo">
<img src="../../assets/images/projectadd/nopro.png" />
</div>
<div class="rightt">
<img src="../../assets/images/taskpage/right2.png" />
</div>
<div class="centerbox" style="color: rgba(78, 166, 255, 1)">
创建项目
</div>
<div class="centermain">点击创建项目任务</div>
</div>
</div>
<!-- 创建子项目弹窗 -->
<div>
@@ -589,7 +582,9 @@
</div>
<div class="body">
<span>是否结束项目</span>
<div class="back">（项目结束后学员将无法继续学习，此操作不可逆）</div>
<div class="back">
（项目结束后学员将无法继续学习，此操作不可逆）
</div>
</div>
<div class="del_btnbox">
<div class="del_btn btn1">
@@ -1070,7 +1065,6 @@ export default {
data.map((value) => {
if (value.children) {
//多层项目
console.log("11");
value.operation =
value.state === "草稿" ? (
<div class="operation">
@@ -1129,9 +1123,13 @@ export default {
<router-link to="/taskpage">基础信息</router-link>
</a-select-option>
<a-select-option value="存为模板" label="存为模板">
<div onClick={() => {
showStartModal();
}}>存为模板</div>
<div
onClick={() => {
showStartModal();
}}
>
存为模板
</div>
</a-select-option>
</a-select>
</div>
@@ -1173,9 +1171,14 @@ export default {
</a-select-option>
</a-select>
</div>
<span class="operation3" onClick={() => {
showCopyModal();
}}>复制</span>
<span
class="operation3"
onClick={() => {
showCopyModal();
}}
>
复制
</span>
<span class="more"></span>
</div>
) : value.state === "已结束" ? (
@@ -1215,12 +1218,22 @@ export default {
</a-select-option>
</a-select>
</div>
<span class="operation3" onClick={() => {
showCopyModal();
}}>复制</span>
<span class="more" onClick={() => {
showDeleteModal();
}}>删除</span>
<span
class="operation3"
onClick={() => {
showCopyModal();
}}
>
复制
</span>
<span
class="more"
onClick={() => {
showDeleteModal();
}}
>
删除
</span>
</div>
) : (
<div></div>
@@ -1278,14 +1291,22 @@ export default {
dropdownClassName="tabledropdown"
>
<a-select-option value="复制" label="复制">
<div onClick={() => {
showCopyModal();
}}>复制</div>
<div
onClick={() => {
showCopyModal();
}}
>
复制
</div>
</a-select-option>
<a-select-option value="删除" label="删除">
<div onClick={() => {
showDeleteModal();
}}>删除</div>
<div
onClick={() => {
showDeleteModal();
}}
>
删除
</div>
</a-select-option>
</a-select>
</div>
@@ -1331,9 +1352,14 @@ export default {
<router-link to="/classadd" class="operation3">
创建班级
</router-link>
<span class="more" onClick={() => {
<span
class="more"
onClick={() => {
showCopyModal();
}}>复制</span>
}}
>
复制
</span>
</div>
) : item.state === "已结束" ? (
<div class="operation">
@@ -1372,12 +1398,22 @@ export default {
</a-select-option>
</a-select>
</div>
<span class="operation3" onClick={() => {
<span
class="operation3"
onClick={() => {
showCopyModal();
}}>复制</span>
<span class="more" onClick={() => {
showDeleteModal();
}}>删除</span>
}}
>
复制
</span>
<span
class="more"
onClick={() => {
showDeleteModal();
}}
>
删除
</span>
</div>
) : (
<div></div>
@@ -1432,19 +1468,31 @@ export default {
dropdownClassName="tabledropdown"
>
<a-select-option value="复制" label="复制">
<div onClick={() => {
showCopyModal();
}}>复制</div>
<div
onClick={() => {
showCopyModal();
}}
>
复制
</div>
</a-select-option>
<a-select-option value="删除" label="删除">
<div onClick={() => {
showDeleteModal();
}}>删除</div>
<div
onClick={() => {
showDeleteModal();
}}
>
删除
</div>
</a-select-option>
<a-select-option value="存为模板" label="存为模板">
<div onClick={() => {
showStartModal();
}}>存为模板</div>
<div
onClick={() => {
showStartModal();
}}
>
存为模板
</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<router-link to="/taskpage">基础信息</router-link>
@@ -1489,9 +1537,14 @@ export default {
</a-select-option>
</a-select>
</div>
<span class="operation3" onClick={() => {
showCopyModal();
}}>复制</span>
<span
class="operation3"
onClick={() => {
showCopyModal();
}}
>
复制
</span>
<div class="tableSelect">
<a-select
style="width: 50px"
@@ -1500,19 +1553,31 @@ export default {
dropdownClassName="tabledropdown"
>
<a-select-option value="撤回" label="撤回">
<div onClick={() => {
showBackModal();
}}>撤回</div>
<div
onClick={() => {
showBackModal();
}}
>
撤回
</div>
</a-select-option>
<a-select-option value="结束" label="结束">
<div onClick={() => {
showStopModal();
}}>结束</div>
<div
onClick={() => {
showStopModal();
}}
>
结束
</div>
</a-select-option>
<a-select-option value="存为模板" label="存为模板">
<div onClick={() => {
showStartModal();
}}>存为模板</div>
<div
onClick={() => {
showStartModal();
}}
>
存为模板
</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<router-link to="/taskpage">基础信息</router-link>
@@ -1557,12 +1622,22 @@ export default {
</a-select-option>
</a-select>
</div>
<span class="operation3" onClick={() => {
showCopyModal();
}}>复制</span>
<span class="operation3" onClick={() => {
showCopyModal();
}}>复制</span>
<span
class="operation3"
onClick={() => {
showCopyModal();
}}
>
复制
</span>
<span
class="operation3"
onClick={() => {
showCopyModal();
}}
>
复制
</span>
<div class="tableSelect">
<a-select
style="width: 50px"
@@ -1571,14 +1646,22 @@ export default {
dropdownClassName="tabledropdown"
>
<a-select-option value="删除" label="删除">
<div onClick={() => {
showDeleteModal();
}}>删除</div>
<div
onClick={() => {
showDeleteModal();
}}
>
删除
</div>
</a-select-option>
<a-select-option value="存为模板" label="存为模板">
<div onClick={() => {
showStartModal();
}}>存为模板</div>
<div
onClick={() => {
showStartModal();
}}
>
存为模板
</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<router-link to="/taskpage">基础信息</router-link>
@@ -1623,9 +1706,14 @@ export default {
</a-select-option>
</a-select>
</div>
<span class="operation3" onClick={() => {
showCopyModal();
}}>复制</span>
<span
class="operation3"
onClick={() => {
showCopyModal();
}}
>
复制
</span>
<div class="tableSelect">
<a-select
style="width: 50px"
@@ -1634,19 +1722,31 @@ export default {
dropdownClassName="tabledropdown"
>
<a-select-option value="结束" label="结束">
<div onClick={() => {
showStopModal();
}}>结束</div>
<div
onClick={() => {
showStopModal();
}}
>
结束
</div>
</a-select-option>
<a-select-option value="撤回" label="撤回">
<div onClick={() => {
showBackModal();
}}>撤回</div>
<div
onClick={() => {
showBackModal();
}}
>
撤回
</div>
</a-select-option>
<a-select-option value="存为模板" label="存为模板">
<div onClick={() => {
showStartModal();
}}>存为模板</div>
<div
onClick={() => {
showStartModal();
}}
>
存为模板
</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<router-link to="/taskpage">基础信息</router-link>
@@ -1707,19 +1807,31 @@ export default {
dropdownClassName="tabledropdown"
>
<a-select-option value="复制" label="复制">
<div onClick={() => {
showCopyModal();
}}>复制</div>
<div
onClick={() => {
showCopyModal();
}}
>
复制
</div>
</a-select-option>
<a-select-option value="删除" label="删除">
<div onClick={() => {
showDeleteModal();
}}>删除</div>
<div
onClick={() => {
showDeleteModal();
}}
>
删除
</div>
</a-select-option>
<a-select-option value="存为模板" label="存为模板">
<div onClick={() => {
showStartModal();
}}>存为模板</div>
<div
onClick={() => {
showStartModal();
}}
>
存为模板
</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<router-link to="/taskpage">基础信息</router-link>
@@ -1764,9 +1876,14 @@ export default {
</a-select-option>
</a-select>
</div>
<span class="operation3" onClick={() => {
<span
class="operation3"
onClick={() => {
showCopyModal();
}}>复制</span>
}}
>
复制
</span>
<div class="tableSelect">
<a-select
style="width: 50px"
@@ -1775,19 +1892,31 @@ export default {
dropdownClassName="tabledropdown"
>
<a-select-option value="撤回" label="撤回">
<div onClick={() => {
showBackModal();
}}>撤回</div>
<div
onClick={() => {
showBackModal();
}}
>
撤回
</div>
</a-select-option>
<a-select-option value="结束" label="结束">
<div onClick={() => {
showStopModal();
}}>结束</div>
<div
onClick={() => {
showStopModal();
}}
>
结束
</div>
</a-select-option>
<a-select-option value="存为模板" label="存为模板">
<div onClick={() => {
showStartModal();
}}>存为模板</div>
<div
onClick={() => {
showStartModal();
}}
>
存为模板
</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<router-link to="/taskpage">基础信息</router-link>
@@ -1832,9 +1961,14 @@ export default {
</a-select-option>
</a-select>
</div>
<span class="operation3" onClick={() => {
<span
class="operation3"
onClick={() => {
showCopyModal();
}}>复制</span>
}}
>
复制
</span>
<div class="tableSelect">
<a-select
style="width: 50px"
@@ -1843,19 +1977,31 @@ export default {
dropdownClassName="tabledropdown"
>
<a-select-option value="删除" label="删除">
<div onClick={() => {
showDeleteModal();
}}>删除</div>
<div
onClick={() => {
showDeleteModal();
}}
>
删除
</div>
</a-select-option>
<a-select-option value="结束" label="结束">
<div onClick={() => {
showStopModal();
}}>结束</div>
<div
onClick={() => {
showStopModal();
}}
>
结束
</div>
</a-select-option>
<a-select-option value="存为模板" label="存为模板">
<div onClick={() => {
showStartModal();
}}>存为模板</div>
<div
onClick={() => {
showStartModal();
}}
>
存为模板
</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<router-link to="/taskpage">基础信息</router-link>
@@ -1900,9 +2046,14 @@ export default {
</a-select-option>
</a-select>
</div>
<span class="operation3" onClick={() => {
<span
class="operation3"
onClick={() => {
showCopyModal();
}}>复制</span>
}}
>
复制
</span>
<div class="tableSelect">
<a-select
style="width: 50px"
@@ -1911,19 +2062,31 @@ export default {
dropdownClassName="tabledropdown"
>
<a-select-option value="撤回" label="撤回">
<div onClick={() => {
showBackModal();
}}>撤回</div>
<div
onClick={() => {
showBackModal();
}}
>
撤回
</div>
</a-select-option>
<a-select-option value="结束" label="结束">
<div onClick={() => {
showStopModal();
}}>结束</div>
<div
onClick={() => {
showStopModal();
}}
>
结束
</div>
</a-select-option>
<a-select-option value="存为模板" label="存为模板">
<div onClick={() => {
showStartModal();
}}>存为模板</div>
<div
onClick={() => {
showStartModal();
}}
>
存为模板
</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<router-link to="/taskpage">基础信息</router-link>
@@ -1983,9 +2146,14 @@ export default {
{value.state === "草稿" ? (
<span class="operation3">发布</span>
) : (
<span class="operation3" onClick={() => {
showCopyModal();
}}>复制</span>
<span
class="operation3"
onClick={() => {
showCopyModal();
}}
>
复制
</span>
)}
<div class="tableSelect">
{value.state === "草稿" ? (
@@ -1996,23 +2164,31 @@ export default {
dropdownClassName="tabledropdown"
>
<a-select-option value="复制" label="复制">
<div onClick={() => {
showCopyModal();
}}>复制</div>
<div
onClick={() => {
showCopyModal();
}}
>
复制
</div>
</a-select-option>
<a-select-option value="删除" label="删除">
<div
onClick={() => {
showDeleteModal();
}}
showDeleteModal();
}}
>
删除
</div>
</a-select-option>
<a-select-option value="存为模板" label="存为模板">
<div onClick={() => {
showStartModal();
}}>存为模板</div>
<div
onClick={() => {
showStartModal();
}}
>
存为模板
</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<router-link to="/taskpage">基础信息</router-link>
@@ -2026,23 +2202,31 @@ export default {
dropdownClassName="tabledropdown"
>
<a-select-option value="存为模板" label="存为模板">
<div onClick={() => {
showStartModal();
}}>存为模板</div>
<div
onClick={() => {
showStartModal();
}}
>
存为模板
</div>
</a-select-option>
<a-select-option value="结束" label="结束">
<div
onClick={() => {
showStopModal();
}}
showStopModal();
}}
>
结束
</div>
</a-select-option>
<a-select-option value="撤回" label="撤回">
<div onClick={() => {
showBackModal();
}}>撤回</div>
<div
onClick={() => {
showBackModal();
}}
>
撤回
</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<router-link to="/taskpage">基础信息</router-link>
@@ -2056,15 +2240,19 @@ export default {
dropdownClassName="tabledropdown"
>
<a-select-option value="存为模板" label="存为模板">
<div onClick={() => {
showStartModal();
}}>存为模板</div>
<div
onClick={() => {
showStartModal();
}}
>
存为模板
</div>
</a-select-option>
<a-select-option value="删除" label="删除">
<div
onClick={() => {
showDeleteModal();
}}
showDeleteModal();
}}
>
删除
</div>
@@ -2082,6 +2270,7 @@ export default {
}
});
state.tableData = data;
console.log("tableData", state.tableData);
};
getTableDate();