feat:合并

This commit is contained in:
lixg
2022-12-10 15:22:40 +08:00
12 changed files with 832 additions and 79 deletions

View File

@@ -52,15 +52,10 @@
<div class="select fitems">
<a-range-picker
v-model:value="projectTime"
:show-time="{
defaultValue: [
moment('00:00:00', 'HH:mm:ss'),
moment('23:59:59', 'HH:mm:ss'),
],
}"
style="width:420px;"
valueFormat="X"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
:placeholder="[' 开始时间(创建时间)', ' 结束时间(创建时间)']"
/>
</div>
</div>
@@ -741,6 +736,7 @@
"
>
<span
style="margin-right: 24px;"
:class="[
String(record.courseform) === '1'
? 'disabled table-operation'
@@ -839,6 +835,7 @@
"
>
<span
style="margin-right: 24px;"
:class="[
String(record.courseform) === '1'
? 'disabled table-operation'
@@ -929,6 +926,7 @@
"
>
<span
style="margin-right: 24px;"
:class="[
String(record.courseform) === '1'
? 'disabled table-operation'
@@ -1058,6 +1056,7 @@
"
>
<span
style="margin-right: 24px;"
:class="[
String(record.courseform) === '1'
? 'disabled table-operation'
@@ -1194,6 +1193,7 @@
"
>
<span
style="margin-right: 24px;"
:class="[
String(record.courseform) === '1'
? 'disabled table-operation'
@@ -2754,21 +2754,21 @@ import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
import { codeUrl, toDate } from "../../api/method";
//列表表格
const columns1 = [
{
title: "序号",
width: 100,
dataIndex: "num",
key: "num",
align: "center",
customRender: ({ index, record }) => {
const pageNum =
Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
return index + 1 + pageNum;
},
},
// {
// title: "序号",
// width: 100,
// dataIndex: "num",
// key: "num",
// align: "center",
// customRender: ({ index, record }) => {
// const pageNum =
// Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
// return index + 1 + pageNum;
// },
// },
{
title: "名称",
width: 200,
width: 400,
dataIndex: "name",
key: "name",
ellipsis: true,
@@ -5522,15 +5522,15 @@ export default defineComponent({
.btn {
padding: 0px 26px 0px 26px;
height: 38px;
background: rgba(64, 158, 255, 0);
background: #409eff;
border-radius: 8px;
border: 1px solid rgba(64, 158, 255, 1);
display: flex;
align-items: center;
cursor: pointer;
justify-content: center;
margin-right: 14px;
flex-shrink: 0;
cursor: pointer;
.search {
background-size: 100%;
@@ -5539,7 +5539,7 @@ export default defineComponent({
.btnText {
font-size: 14px;
font-weight: 400;
color: rgba(64, 158, 255, 1);
color: #ffffff;
line-height: 36px;
margin-left: 5px;
}
@@ -5549,7 +5549,7 @@ export default defineComponent({
.search {
width: 15px;
height: 17px;
background-image: url("../../assets/images/courseManage/search1.png");
background-image: url("../../assets/images/courseManage/search0.png");
}
}
@@ -5557,7 +5557,7 @@ export default defineComponent({
.search {
width: 16px;
height: 18px;
background-image: url("../../assets/images/courseManage/reset1.png");
background-image: url("../../assets/images/courseManage/reset0.png");
}
}
@@ -5565,7 +5565,7 @@ export default defineComponent({
.search {
width: 17px;
height: 18px;
background-image: url("../../assets/images/coursewareManage/export.png");
background-image: url("../../assets/images/coursewareManage/export1.png");
}
}
@@ -5575,12 +5575,12 @@ export default defineComponent({
.search {
width: 17px;
height: 18px;
background-image: url("../../assets/images/courseManage/add1.png");
background-image: url("../../assets/images/courseManage/add0.png");
}
}
.btn1:hover {
background: rgba(64, 158, 255, 1);
background: rgba(64, 158, 255, 0.76);
.search {
background-image: url("../../assets/images/courseManage/search0.png");
@@ -5592,7 +5592,7 @@ export default defineComponent({
}
.btn2:hover {
background: rgba(64, 158, 255, 1);
background: rgba(64, 158, 255, 0.76);
.search {
background-image: url("../../assets/images/courseManage/reset0.png");
@@ -5604,7 +5604,7 @@ export default defineComponent({
}
.btn3:hover {
background: rgba(64, 158, 255, 1);
background: rgba(64, 158, 255, 0.76);
.search {
background-image: url("../../assets/images/coursewareManage/export1.png");
@@ -5616,7 +5616,7 @@ export default defineComponent({
}
.btn4:hover {
background: rgba(64, 158, 255, 1);
background: rgba(64, 158, 255, 0.76);
.search {
background-image: url("../../assets/images/courseManage/add0.png");
@@ -5627,11 +5627,23 @@ export default defineComponent({
}
}
}
}
.tableBox {
margin: 20px 38px 30px;
th {
background-color: #eff4fc !important;
text-align: center !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
background: #f6f9fd;
}
.operation {
display: flex;
justify-content: center;
@@ -7389,7 +7401,12 @@ export default defineComponent({
}
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1);
font-size: 14px;
font-weight: 400;
color: #999ba3;
line-height: 36px;
padding: 5px 16px;
background-color: #eff4fc !important;
}
th.h {
@@ -7690,7 +7707,12 @@ export default defineComponent({
}
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1);
font-size: 14px;
font-weight: 400;
color: #999ba3;
line-height: 36px;
padding: 5px 16px;
background-color: #eff4fc !important;
}
th.h {