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

feat:合并

Browse Source
This commit is contained in:
lixg
2022-12-03 08:30:43 +08:00
parent 20d58c0ee4
commit ce4cc38247
5 changed files with 57 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/config.js
View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com * @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 14:32:52 * @Date: 2022-11-21 14:32:52
* @LastEditors: lixg lixg@dongwu-inc.com * @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-02 17:12:37 * @LastEditTime: 2022-12-02 17:13:55
* @FilePath: /fe-manage/src/api/config.js * @FilePath: /fe-manage/src/api/config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
@@ -53,7 +53,7 @@ http.interceptors.response.use(
return response; return response;
} else { } else {
if (code === 1000) { if (code === 1000) {
window.open("https://u-pre.boe.com/web/", '_self'); // window.open("https://u-pre.boe.com/web/", '_self');
} }
console.log("api %o", msg); console.log("api %o", msg);
} }

7
src/components/NavTop.vue
View File

@@ -31,9 +31,10 @@
" "
:src="avatar" :src="avatar"
/> />
<div>{{ username }}</div> <div style="margin-right: 20px">{{ username }}</div>
</div> </div>
<div <!-- 2022-12-2注释 后面放开 增加username的margin-right:20 -->
<!-- <div
class="signOutMain" class="signOutMain"
style="margin: 0px 33px 0px 35px" style="margin: 0px 33px 0px 35px"
@click="showDrawer" @click="showDrawer"
@@ -43,7 +44,7 @@
src="../assets/images/navtop/download.png" src="../assets/images/navtop/download.png"
/> />
<span class="signOut">下载</span> <span class="signOut">下载</span>
</div> </div> -->
<div class="signOutMain" @click="logOut"> <div class="signOutMain" @click="logOut">
<img <img
style="width: 27px; height: 27px" style="width: 27px; height: 27px"

14
src/components/drawers/AddTest.vue
View File

@@ -15,16 +15,16 @@
@click="closeDrawer" @click="closeDrawer"
/> />
</div> </div>
<!-- 2022-11-30注释 后面放开 修改div的padding-topL:32 -->
<div style="display: flex; flex-direction: row; padding-top: 32px"> <div style="display: flex; flex-direction: row; padding-top: 0px">
<button <!-- <button
style="width: 100px" style="width: 100px"
@click="changeOuter(1)" @click="changeOuter(1)"
:class="[isOuter == 1 ? 'outer' : 'notOuter']" :class="[isOuter == 1 ? 'outer' : 'notOuter']"
> >
系统考试 系统考试
</button> </button> -->
<!-- 2022-11-30注释 后面放开 -->
<!-- <button <!-- <button
style="width: 100px" style="width: 100px"
@click="changeOuter(2)" @click="changeOuter(2)"
@@ -727,7 +727,7 @@ export default {
if (props.edit) { if (props.edit) {
// 编辑任务 // 编辑任务
updateExamination(obj) updateExamination(obj)
.then(async(res) => { .then(async (res) => {
await updateTask(res); await updateTask(res);
closeDrawer(); closeDrawer();
}) })
@@ -737,7 +737,7 @@ export default {
} else { } else {
// 创建任务 // 创建任务
createExamination(obj) createExamination(obj)
.then(async(res) => { .then(async (res) => {
await updateTask(res); await updateTask(res);
closeDrawer(); closeDrawer();
}) })

14
src/components/drawers/ProjectOwn.vue
View File

@@ -90,6 +90,7 @@
title: 'name', title: 'name',
value: 'name', value: 'name',
}" }"
:disabled="isDisabled"
> >
<template #suffixIcon></template> <template #suffixIcon></template>
</a-tree> </a-tree>
@@ -148,14 +149,14 @@
</div> </div>
</div> </div>
</div> </div>
<div class="clbox"> <div class="clbox" @click="removeClick">
<span class="allclear">转移归属权</span> <span class="allclear">转移归属权</span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="btnn"> <div class="btnn">
<button class="btn1">取消</button> <button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="addAuth">确定</button> <button class="btn2" @click="addAuth">确定</button>
</div> </div>
</div> </div>
@@ -306,12 +307,15 @@ export default {
selectedRowKeys: [], //表格选中的key selectedRowKeys: [], //表格选中的key
selectPeopleArr: [], //表格选中的人 selectPeopleArr: [], //表格选中的人
//快速选人------------------------------------- //快速选人-------------------------------------
isDisabled: true, //是否可选择组织树及用户，默认为不可选
}); });
const closeDrawer = () => { const closeDrawer = () => {
state.activeKey = "1"; state.activeKey = "1";
ctx.emit("update:ProjOwnervisible", false); ctx.emit("update:ProjOwnervisible", false);
state.openKeys = []; state.openKeys = [];
state.isDisabled = true;
}; };
const afterVisibleChange = (bool) => { const afterVisibleChange = (bool) => {
@@ -373,6 +377,11 @@ export default {
const changePagination = () => { const changePagination = () => {
getPeoples(); getPeoples();
}; };
//点击转移归属权
const removeClick = () => {
state.isDisabled = false;
};
//获取授权 //获取授权
const optionAuthPerm = () => { const optionAuthPerm = () => {
let obj = { let obj = {
@@ -588,6 +597,7 @@ export default {
optionAuthPerm, optionAuthPerm,
changeOwnership, changeOwnership,
addAuth, addAuth,
removeClick,
}; };
}, },
}; };

51
src/views/learningpath/LevelAdd.vue
View File

@@ -93,7 +93,7 @@
<a-tab-pane key="1" tab="概览"> <a-tab-pane key="1" tab="概览">
<div class="split"></div> <div class="split"></div>
<!-- 概览（无数据） --> <!-- 概览（无数据） -->
<div :style="{ display: nodata ? 'block' : 'none' }"> <div :style="{ display: 'block' }">
<div class="onerow"> <div class="onerow">
<div class="taskmain">快速创建项目详情</div> <div class="taskmain">快速创建项目详情</div>
</div> </div>
@@ -137,7 +137,8 @@
</div> </div>
<div class="centermain">快速添加学员</div> <div class="centermain">快速添加学员</div>
</div> </div>
<div <!-- 2022-12-2注释 后面放开 -->
<!-- <div
class="taskbox" class="taskbox"
@click="showPub" @click="showPub"
style="background: linear-gradient(180deg, #e5f6ec, #eef9f3)" style="background: linear-gradient(180deg, #e5f6ec, #eef9f3)"
@@ -155,11 +156,11 @@
发布 发布
</div> </div>
<div class="centermain">快速发布项目</div> <div class="centermain">快速发布项目</div>
</div> </div> -->
</div> </div>
</div> </div>
<!-- 概览（有数据） --> <!-- 概览（有数据） -->
<div :style="{ display: nodata ? 'none' : 'block' }"> <div :style="{ display: 'none' }">
<div class="onerow"> <div class="onerow">
<div class="taskmain">关卡概览</div> <div class="taskmain">关卡概览</div>
</div> </div>
@@ -476,7 +477,7 @@
</div> </div>
</div> </div>
<div class="operations"> <div class="operations">
<div <!-- <div
class="operation" class="operation"
style="cursor: pointer" style="cursor: pointer"
:style="{ :style="{
@@ -485,8 +486,8 @@
@click="showFS" @click="showFS"
> >
学员 学员
</div> </div> -->
<div <!-- <div
class="operation" class="operation"
style="cursor: pointer" style="cursor: pointer"
@click="showAA(item.type, item.name)" @click="showAA(item.type, item.name)"
@@ -498,18 +499,10 @@
}" }"
> >
考勤 考勤
</div> </div> -->
<div <div
class="operation" class="operation"
style="cursor: pointer" style="cursor: pointer"
:style="{
display:
item.type === 6 ||
item.type === 9 ||
item.type === 2
? 'flex'
: 'none',
}"
@click=" @click="
item.type === 2 item.type === 2
? showCopyModal(item.type) ? showCopyModal(item.type)
@@ -522,7 +515,7 @@
> >
二维码 二维码
</div> </div>
<div <!-- <div
class="operation" class="operation"
style="cursor: pointer; margin-right: 35px" style="cursor: pointer; margin-right: 35px"
@click=" @click="
@@ -545,7 +538,7 @@
" "
> >
管理 管理
</div> </div> -->
</div> </div>
</div> </div>
</a-collapse-panel> </a-collapse-panel>
@@ -599,13 +592,30 @@
<!-- 2022-11-30注释 后面放开 --> <!-- 2022-11-30注释 后面放开 -->
<!-- <button class="addd" @click="showImpStu">导入学员</button> --> <!-- <button class="addd" @click="showImpStu">导入学员</button> -->
<div class="select"> <div class="select">
<a-select <a-button
style="
border: 1px solid rgba(64, 158, 255, 1);
background: none;
width: 130px;
height: 40px;
font-size: 14px;
font-weight: 400;
color: rgba(64, 158, 255, 1);
margin-left: 5px;
border-radius: 8px;
cursor: pointer;
"
class="btnText"
@click="deleteStu()"
>批量删除</a-button
>
<!-- <a-select
style="width: 130px" style="width: 130px"
value="更多操作" value="更多操作"
@change="handleStuChange" @change="handleStuChange"
:options="projectNameList" :options="projectNameList"
> >
</a-select> </a-select> -->
</div> </div>
</div> </div>
<div class="talk"> <div class="talk">
@@ -2150,6 +2160,7 @@ export default {
pageChange, pageChange,
setconfig, setconfig,
deFile, deFile,
deleteStu,
}; };
}, },
}; };