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

Merge branch 'dev_Ma_pre' into 'develop'

Browse Source 
提交

See merge request !87
This commit is contained in:
huangshengfa
2023-03-15 16:38:36 +08:00
parent 8c18ebebff 3f3438db7b
commit 14a0ec5294
2 changed files with 85 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/views/report/Employeelearning.vue
View File

@@ -2,7 +2,7 @@
<!-- 员工学习数据页面 --> <!-- 员工学习数据页面 -->
<div class="employeelearning"> <div class="employeelearning">
<!-- 以下为顶部搜索框 --> <!-- 以下为顶部搜索框 -->
<div class="filter"> <div class="filterShow">
<div class="select"> <div class="select">
<!-- <a-select <!-- <a-select
style="width: 100%" style="width: 100%"
@@ -56,29 +56,29 @@
</a-input> </a-input>
</div> </div>
<div style="display: flex; margin-bottom: 20px"> <div style="display: flex; margin-bottom: 20px">
<div class="btnn btn1" @click="getTableData"> <div class="btnzx btnzx1" @click="getTableData">
<div class="search"></div> <div class="search"></div>
<div class="btnText">搜索</div> <div class="btnzText">搜索</div>
</div> </div>
<div class="btn btn2" @click="reset"> <div class="btnz btnzx2" @click="reset">
<div class="search"></div> <div class="search"></div>
<div class="btnText">重置</div> <div class="btnzText">重置</div>
</div> </div>
</div> </div>
</div> </div>
<!-- 以下为导出按钮 --> <!-- 以下为导出按钮 -->
<div class="btns"> <div class="btnzs">
<div class="btn btn3" @click="exportAllBtn" style="margin-right: 20px"> <div class="btnz btnz3" @click="exportAllbtnz" style="margin-right: 20px">
<div> <div>
<img src="../../assets/images/coursewareManage/export1.png" alt="" /> <img src="../../assets/images/coursewareManage/export1.png" alt="" />
</div> </div>
<div class="btnText">导出全部</div> <div class="btnzText">导出全部</div>
</div> </div>
<div class="btn btn3" @click="exportBtn"> <div class="btnz btnz3" @click="exportbtnz">
<div> <div>
<img src="../../assets/images/coursewareManage/export1.png" alt="" /> <img src="../../assets/images/coursewareManage/export1.png" alt="" />
</div> </div>
<div class="btnText">导出</div> <div class="btnzText">导出</div>
</div> </div>
</div> </div>
<!-- 以下为table表格 --> <!-- 以下为table表格 -->
@@ -159,7 +159,7 @@ export default {
} }
}; };
//导出 //导出
const exportBtn = async () => { const exportbtnz = async () => {
if (!state.selectedRowKeys?.length) { if (!state.selectedRowKeys?.length) {
return message.warning("请至少选择一条数据进行导出"); return message.warning("请至少选择一条数据进行导出");
} else { } else {
@@ -350,7 +350,7 @@ export default {
}; };
// 导出全部按钮 // 导出全部按钮
const exportAllBtn = async () => { const exportAllbtnz = async () => {
axios({ axios({
method: "post", method: "post",
url: "/report/boeu/studyData/exportAll", url: "/report/boeu/studyData/exportAll",
@@ -373,9 +373,9 @@ export default {
state.tableLoading = true; state.tableLoading = true;
}); });
return { return {
exportAllBtn, exportAllbtnz,
onSelectChange, onSelectChange,
exportBtn, exportbtnz,
reset, reset,
getTableData, getTableData,
...toRefs(state), ...toRefs(state),
@@ -392,7 +392,7 @@ export default {
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.filter { .filterShow {
margin-left: 38px; margin-left: 38px;
margin-right: 20px; margin-right: 20px;
margin-top: 30px; margin-top: 30px;
@@ -404,7 +404,7 @@ export default {
width: calc((100% - 76px - 240px) / 4); width: calc((100% - 76px - 240px) / 4);
} }
.btn { .btnz {
padding: 0px 26px 0px 26px; padding: 0px 26px 0px 26px;
height: 38px; height: 38px;
background: rgba(64, 158, 255, 0); background: rgba(64, 158, 255, 0);
@@ -421,7 +421,7 @@ export default {
background-size: 100%; background-size: 100%;
} }
.btnText { .btnzText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: rgba(64, 158, 255, 1); color: rgba(64, 158, 255, 1);
@@ -430,7 +430,7 @@ export default {
} }
} }
.btnn { .btnzx {
padding: 0px 26px 0px 26px; padding: 0px 26px 0px 26px;
height: 38px; height: 38px;
background: #4ea6ff; background: #4ea6ff;
@@ -447,7 +447,7 @@ export default {
background-size: 100%; background-size: 100%;
} }
.btnText { .btnzText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #ffffff; color: #ffffff;
@@ -456,7 +456,7 @@ export default {
} }
} }
.btn1 { .btnzx1 {
.search { .search {
width: 15px; width: 15px;
height: 17px; height: 17px;
@@ -464,39 +464,39 @@ export default {
} }
} }
.btn2 { .btnzx2 {
background: #4ea6ff; background: #4ea6ff;
.search { .search {
width: 16px; width: 16px;
height: 18px; height: 18px;
background-image: url("../../assets/images/courseManage/reset0.png"); background-image: url("../../assets/images/courseManage/reset0.png");
} }
.btnText { .btnzText {
color: #ffffff; color: #ffffff;
} }
} }
.btn1:hover { .btnzx1:hover {
background: rgba(64, 158, 255, 0.76); background: rgba(64, 158, 255, 0.76);
.search { .search {
background-image: url("../../assets/images/courseManage/search0.png"); background-image: url("../../assets/images/courseManage/search0.png");
} }
.btnText { .btnzText {
color: #ffffff; color: #ffffff;
} }
} }
.btn1:active { .btnzx1:active {
background: #0982ff; background: #0982ff;
} }
.btn2:hover { .btnzx2:hover {
background: rgba(64, 158, 255, 0.76); background: rgba(64, 158, 255, 0.76);
} }
.btn2:active { .btnzx2:active {
background: #0982ff; background: #0982ff;
} }
} }
@@ -507,11 +507,11 @@ export default {
background-color: #eff4fc; background-color: #eff4fc;
} }
} }
.btns { .btnzs {
display: flex; display: flex;
margin-left: 38px; margin-left: 38px;
// flex-wrap: wrap; // flex-wrap: wrap;
.btn { .btnz {
padding: 0px 26px 0px 26px; padding: 0px 26px 0px 26px;
height: 38px; height: 38px;
background: white; background: white;
@@ -528,7 +528,7 @@ export default {
background-size: 100%; background-size: 100%;
} }
.btnText { .btnzText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #4ea6ff; color: #4ea6ff;
@@ -537,7 +537,7 @@ export default {
} }
} }
.btn3 { .btnz3 {
margin-right: 0px; margin-right: 0px;
background: #4ea6ff; background: #4ea6ff;
.search { .search {
@@ -545,17 +545,17 @@ export default {
height: 18px; height: 18px;
background-image: url("../../assets/images/courseManage/add0.png"); background-image: url("../../assets/images/courseManage/add0.png");
} }
.btnText { .btnzText {
color: #ffffff; color: #ffffff;
} }
} }
.btn3:hover { .btnz3:hover {
// background: rgba(64, 158, 255, 0.76); // background: rgba(64, 158, 255, 0.76);
background: rgba(64, 158, 255, 0.76); background: rgba(64, 158, 255, 0.76);
} }
.btn3:active { .btnz3:active {
background: #0982ff; background: #0982ff;
} }
} }

90
src/views/report/Overvoew.vue
View File

@@ -2,7 +2,7 @@
<!-- 概览! --> <!-- 概览! -->
<div class="overvoew"> <div class="overvoew">
<!-- 以下为顶部搜索框 --> <!-- 以下为顶部搜索框 -->
<div class="filter"> <div class="filterShow">
<div class="select"> <div class="select">
<!-- <a-select <!-- <a-select
style="width: 100%" style="width: 100%"
@@ -45,18 +45,18 @@
</a-input> </a-input>
</div> </div>
<div style="display: flex; margin-bottom: 20px"> <div style="display: flex; margin-bottom: 20px">
<div class="btnn btn1" @click="searchClick"> <div class="btnzx btnzx1" @click="searchClick">
<div class="search"></div> <div class="search"></div>
<div class="btnText">搜索</div> <div class="btnzText">搜索</div>
</div> </div>
<div class="btn btn2" @click="reset"> <div class="btnz btnzx2" @click="reset">
<div class="search"></div> <div class="search"></div>
<div class="btnText">重置</div> <div class="btnzText">重置</div>
</div> </div>
</div> </div>
</div> </div>
<!-- 以下为导出按钮 --> <!-- 以下为导出按钮 -->
<div class="tabBtn"> <div class="tabbtnz">
<div class="tab"> <div class="tab">
<div <div
v-for="(item, index) in tabData" v-for="(item, index) in tabData"
@@ -67,9 +67,9 @@
{{ item.text }} ({{ item.num }}) {{ item.text }} ({{ item.num }})
</div> </div>
</div> </div>
<div class="btns"> <div class="btnzs">
<div <div
class="btn btn3" class="btnz btnz3"
@click="exportClickAll" @click="exportClickAll"
style="margin-right: 15px" style="margin-right: 15px"
> >
@@ -79,16 +79,16 @@
alt="" alt=""
/> />
</div> </div>
<div class="btnText">全部导出</div> <div class="btnzText">全部导出</div>
</div> </div>
<div class="btn btn3" @click="exportClick"> <div class="btnz btnz3" @click="exportClick">
<div> <div>
<img <img
src="../../assets/images/coursewareManage/export1.png" src="../../assets/images/coursewareManage/export1.png"
alt="" alt=""
/> />
</div> </div>
<div class="btnText">导出</div> <div class="btnzText">导出</div>
</div> </div>
</div> </div>
</div> </div>
@@ -154,6 +154,8 @@
? "已发布" ? "已发布"
: record.status == "-1" : record.status == "-1"
? "已停用" ? "已停用"
: record.status == "2"
? "已撤回"
: "" : ""
}}</span> }}</span>
</template> </template>
@@ -426,7 +428,9 @@ export default {
url: "/report/boeu/case/exportAll", url: "/report/boeu/case/exportAll",
data: { data: {
name: state.name, name: state.name,
organizationId: state.orgId ? state.orgId[state.orgId.length - 1] : null, organizationId: state.orgId
? state.orgId[state.orgId.length - 1]
: null,
createName: state.creator, createName: state.creator,
}, },
responseType: "blob", responseType: "blob",
@@ -442,7 +446,9 @@ export default {
url: "/report/boeu/exam/exportAll", url: "/report/boeu/exam/exportAll",
data: { data: {
name: state.name, name: state.name,
organizationId: state.orgId ? state.orgId[state.orgId.length - 1] : null, organizationId: state.orgId
? state.orgId[state.orgId.length - 1]
: null,
createName: state.creator, createName: state.creator,
}, },
responseType: "blob", responseType: "blob",
@@ -458,7 +464,9 @@ export default {
url: "/report/boeu/course/exportAll", url: "/report/boeu/course/exportAll",
data: { data: {
name: state.name, name: state.name,
organizationId: state.orgId ? state.orgId[state.orgId.length - 1] : null, organizationId: state.orgId
? state.orgId[state.orgId.length - 1]
: null,
createName: state.creator, createName: state.creator,
}, },
responseType: "blob", responseType: "blob",
@@ -474,7 +482,9 @@ export default {
url: "/report/boeu/teaching/exportAll", url: "/report/boeu/teaching/exportAll",
data: { data: {
name: state.name, name: state.name,
organizationId: state.orgId ? state.orgId[state.orgId.length - 1] : null, organizationId: state.orgId
? state.orgId[state.orgId.length - 1]
: null,
createName: state.creator, createName: state.creator,
}, },
responseType: "blob", responseType: "blob",
@@ -490,7 +500,9 @@ export default {
url: "/report/boeu/router/exportAll", url: "/report/boeu/router/exportAll",
data: { data: {
name: state.name, name: state.name,
organizationId: state.orgId ? state.orgId[state.orgId.length - 1] : null, organizationId: state.orgId
? state.orgId[state.orgId.length - 1]
: null,
createName: state.creator, createName: state.creator,
}, },
responseType: "blob", responseType: "blob",
@@ -1370,7 +1382,7 @@ export default {
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.filter { .filterShow {
margin-left: 38px; margin-left: 38px;
margin-right: 20px; margin-right: 20px;
margin-top: 30px; margin-top: 30px;
@@ -1382,7 +1394,7 @@ export default {
width: calc((100% - 76px - 220px) / 3); width: calc((100% - 76px - 220px) / 3);
} }
.btn { .btnz {
padding: 0px 26px 0px 26px; padding: 0px 26px 0px 26px;
height: 38px; height: 38px;
background: rgba(64, 158, 255, 0); background: rgba(64, 158, 255, 0);
@@ -1399,7 +1411,7 @@ export default {
background-size: 100%; background-size: 100%;
} }
.btnText { .btnzText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: rgba(64, 158, 255, 1); color: rgba(64, 158, 255, 1);
@@ -1408,7 +1420,7 @@ export default {
} }
} }
.btnn { .btnzx {
padding: 0px 26px 0px 26px; padding: 0px 26px 0px 26px;
height: 38px; height: 38px;
background: #4ea6ff; background: #4ea6ff;
@@ -1425,7 +1437,7 @@ export default {
background-size: 100%; background-size: 100%;
} }
.btnText { .btnzText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #ffffff; color: #ffffff;
@@ -1434,7 +1446,7 @@ export default {
} }
} }
.btn1 { .btnzx1 {
.search { .search {
width: 15px; width: 15px;
height: 17px; height: 17px;
@@ -1442,7 +1454,7 @@ export default {
} }
} }
.btn2 { .btnzx2 {
margin-right: 0px !important; margin-right: 0px !important;
background: #4ea6ff; background: #4ea6ff;
.search { .search {
@@ -1451,47 +1463,47 @@ export default {
background-image: url("../../assets/images/courseManage/reset0.png"); background-image: url("../../assets/images/courseManage/reset0.png");
} }
.btnText { .btnzText {
color: white; color: white;
} }
} }
.btn1:hover { .btnzx1:hover {
background: rgba(64, 158, 255, 0.76); background: rgba(64, 158, 255, 0.76);
.search { .search {
background-image: url("../../assets/images/courseManage/search0.png"); background-image: url("../../assets/images/courseManage/search0.png");
} }
.btnText { .btnzText {
color: #ffffff; color: #ffffff;
} }
} }
.btn2:hover { .btnzx2:hover {
background: rgba(64, 158, 255, 0.76); background: rgba(64, 158, 255, 0.76);
.search { .search {
background-image: url("../../assets/images/courseManage/reset0.png"); background-image: url("../../assets/images/courseManage/reset0.png");
} }
.btnText { .btnzText {
color: #ffffff; color: #ffffff;
} }
} }
.btn1:active, .btnzx1:active,
.btn2:active { .btnzx2:active {
background: #0982ff; background: #0982ff;
} }
// .btn2:hover { // .btnzx2:hover {
// background: rgba(64, 158, 255, 0.1); // background: rgba(64, 158, 255, 0.1);
// } // }
// .btn2:active { // .btnzx2:active {
// background: rgba(64, 158, 255, 0.2); // background: rgba(64, 158, 255, 0.2);
// } // }
} }
.tabBtn { .tabbtnz {
width: 100%; width: 100%;
height: 40px; height: 40px;
display: flex; display: flex;
@@ -1517,11 +1529,11 @@ export default {
cursor: pointer; cursor: pointer;
} }
} }
.btns { .btnzs {
display: flex; display: flex;
margin-right: 38px; margin-right: 38px;
// flex-wrap: wrap; // flex-wrap: wrap;
.btn { .btnz {
padding: 0px 26px 0px 26px; padding: 0px 26px 0px 26px;
height: 38px; height: 38px;
background: white; background: white;
@@ -1538,7 +1550,7 @@ export default {
background-size: 100%; background-size: 100%;
} }
.btnText { .btnzText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #4ea6ff; color: #4ea6ff;
@@ -1547,7 +1559,7 @@ export default {
} }
} }
.btn3 { .btnz3 {
margin-right: 0px; margin-right: 0px;
background: #4ea6ff; background: #4ea6ff;
.search { .search {
@@ -1555,12 +1567,12 @@ export default {
height: 18px; height: 18px;
background-image: url("../../assets/images/courseManage/add0.png"); background-image: url("../../assets/images/courseManage/add0.png");
} }
.btnText { .btnzText {
color: #ffffff; color: #ffffff;
} }
} }
.btn3:hover { .btnz3:hover {
// background: rgba(64, 158, 255, 0.76); // background: rgba(64, 158, 255, 0.76);
background: rgba(64, 158, 255, 0.76); background: rgba(64, 158, 255, 0.76);
} }