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

feat:合并

Browse Source
This commit is contained in:
lixg
2022-12-11 18:18:18 +08:00
parent c505e48231 354f41bfbe
commit 20377ad180
35 changed files with 174 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/OpenPages.vue
View File

@@ -115,16 +115,16 @@ export default {
}
.close {
width: 16px;
height: 16px;
border-radius: 8px;
width: 50px;
height: 50px;
position: absolute;
display: flex;
align-items: center;
justify-content: center;
top: 17px;
right: 27px;
top: 0px;
right: 0px;
}
.close:hover {

2
src/components/drawers/AddActive.vue
View File

@@ -52,7 +52,7 @@
<div class="btnbox">
<a-range-picker
show-time
format="YYYY-MM-DD hh:mm"
format="YYYY-MM-DD HH:mm:ss"
style="width: 400px; height: 40px; border-radius: 8px;"
v-model:value="time"
:placeholder="[' 开始时间', ' 结束时间']"

4
src/components/drawers/AddEval.vue
View File

@@ -51,7 +51,7 @@
<div class="btnbox">
<a-range-picker
show-time
style="width: 400px; height: 40px; border-radius: 8px;" v-model:value="time" format="YYYY-MM-DD HH:mm"
style="width: 400px; height: 40px; border-radius: 8px;" v-model:value="time" format="YYYY-MM-DD HH:mm:ss"
:placeholder="[' 开始时间', ' 结束时间']" />
</div>
</div>
@@ -75,7 +75,7 @@
<EvList v-model:EvalListVisible="EvalListVisible" v-model:evaluationTypeName="evaluationTypeName"
@getEvListData="checkFinish" />
<!-- <div class="aeLoading" :style="{display:addLoading?'flex':'none'}">
<a-spin :spinning="addLoading" tip="添加中..." />
<a-spin :spinning="addLoading" tip="" />
</div> -->
</a-drawer>
</template>

3
src/components/drawers/AddGroupMembers.vue
View File

@@ -67,6 +67,7 @@
onChange: onSelectChange,
}"
/>
<div class="tableBox">
<div class="pa">
<a-pagination
v-if="total > 10"
@@ -79,7 +80,7 @@
class="pagination"
@change="changePaginationStu"
/>
</div>
</div></div>
</div>
</div>
<div class="btnn">

6
src/components/drawers/AddHomework.vue
View File

@@ -109,7 +109,7 @@
</div>
<!-- 加载动画 -->
<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
<a-spin :spinning="addLoading" tip="添加中..." />
<a-spin :spinning="addLoading" tip="" />
</div>
</a-drawer>
</template>
@@ -328,8 +328,8 @@ export default {
// 新增任务
const updteHomeWork = () => {
let obj = {
submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD hh:mm:ss"),
submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD hh:mm:ss"),
submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD HH:mm:ss"),
submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD HH:mm:ss"),
workEnclosureAddress: state.workEnclosureAddress
? state.workEnclosureAddress
: "",

9
src/components/drawers/AddLevelAddStu.vue
View File

@@ -82,6 +82,7 @@
onChange: onSelectChange,
}"
/>
<div class="tableBox">
<div class="pa">
<a-pagination
:showSizeChanger="false"
@@ -92,7 +93,7 @@
:total="tableDataTotal"
class="pagination"
/>
</div>
</div></div>
</div>
</div>
</a-tab-pane>
@@ -151,7 +152,7 @@
<div class="wz">重置</div>
</div>
</div>
<div class="tabb" style="margin-top: 16px">
<div class="tableBox" style="margin-top: 16px">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tablecolumns1"
@@ -167,6 +168,7 @@
onChange: onSelectChange1,
}"
/>
<div class="pa">
<a-pagination
:showSizeChanger="false"
@@ -258,6 +260,7 @@
onChange: onSelectChange2,
}"
/>
<div class="tableBox">
<div class="pa">
<a-pagination
:showSizeChanger="false"
@@ -268,7 +271,7 @@
:total="tableDataTotal2"
class="pagination"
/>
</div>
</div></div>
</div>
</div>
</a-tab-pane>

4
src/components/drawers/AddLive.vue
View File

@@ -517,8 +517,8 @@ export default {
console.log("获取的数据", res);
state.inputV1 = res.data.data.liveName;
state.time = [
dayjs(res.data.data.liveStartTime, "YYYY-MM-DD HH:mm"),
dayjs(res.data.data.liveEndTime, "YYYY-MM-DD HH:mm"),
dayjs(res.data.data.liveStartTime, "YYYY-MM-DD HH:mm:ss"),
dayjs(res.data.data.liveEndTime, "YYYY-MM-DD HH:mm:ss"),
];
console.log(state.time);

4
src/components/drawers/AddOnline.vue
View File

@@ -227,6 +227,10 @@ export default {
type: Number,
default: null,
},
projectTemplateId: {
type: Number,
default: null,
},
},
setup(props, ctx) {
const state = reactive({

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

@@ -320,7 +320,7 @@
</div>
<!-- 加载动画 -->
<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
<a-spin :spinning="addLoading" tip="添加中..." />
<a-spin :spinning="addLoading" tip="" />
</div>
<!-- 选择考试抽屉 -->
@@ -483,8 +483,8 @@ export default {
state.test.scoringModel =Number(state.test.scoringModel);
state.test.questionArrangement =Number(state.test.questionArrangement);
state.test.chooseTime = [
dayjs(res.data.data.examinationStartTime, "YYYY-MM-DD HH:mm"),
dayjs(res.data.data.examinationEndTime, "YYYY-MM-DD HH:mm"),
dayjs(res.data.data.examinationStartTime, "YYYY-MM-DD HH:mm:ss"),
dayjs(res.data.data.examinationEndTime, "YYYY-MM-DD HH:mm:ss"),
];
state.paperName = state.test.examinationTestName;
// state.paperId=dayjs

1
src/components/drawers/CourseOwner.vue
View File

@@ -104,6 +104,7 @@
onChange: onSelectChange,
}"
/>
<div class="pa">
<a-pagination
:showSizeChanger="false"

3
src/components/drawers/CourseView.vue
View File

@@ -103,6 +103,7 @@
onChange: onSelectChange,
}"
/>
<div class="tableBox">
<div class="pa">
<a-pagination
:showSizeChanger="false"
@@ -116,7 +117,7 @@
v-if="tableDataTotal > 10"
@change="changePagination"
/>
</div>
</div></div>
</div>
</div>
</div>

1
src/components/drawers/FaceManage.vue
View File

@@ -100,6 +100,7 @@
onChange: onSelectChange,
}"
/>
<div class="pa">
<a-pagination
:showSizeChanger="false"

3
src/components/drawers/ManageRight.vue
View File

@@ -104,6 +104,7 @@
onChange: onSelectChange,
}"
/>
<div class="tableBox">
<div class="pa">
<a-pagination
:showSizeChanger="false"
@@ -117,7 +118,7 @@
v-if="tableDataTotal > 10"
@change="changePagination"
/>
</div>
</div></div>
</div>
</div>
</div>

1
src/components/drawers/MemberList.vue
View File

@@ -81,6 +81,7 @@
onChange: onSelectChange,
}"
/>
<div class="pa">
<a-pagination
v-if="total > 10"

1
src/components/drawers/OwnPower.vue
View File

@@ -104,6 +104,7 @@
type: 'radio',
}"
/>
<div class="pa">
<a-pagination
:showSizeChanger="false"

3
src/components/drawers/Ownership.vue
View File

@@ -105,6 +105,7 @@
type: 'radio',
}"
/>
<div class="tableBox">
<div class="pa">
<a-pagination
:showSizeChanger="false"
@@ -118,7 +119,7 @@
v-if="tableDataTotal > 10"
@change="changePagination"
/>
</div>
</div></div>
</div>
</div>
</div>

1
src/components/drawers/ProjCheckPower.vue
View File

@@ -118,6 +118,7 @@
preserveSelectedRowKeys: true,
}"
/>
<div class="pa">
<a-pagination
:showSizeChanger="false"

3
src/components/drawers/ProjManagePower.vue
View File

@@ -104,6 +104,7 @@
onChange: onSelectChange,
}"
/>
<div class="tableBox">
<div class="pa">
<a-pagination
:showSizeChanger="false"
@@ -117,7 +118,7 @@
v-if="tableDataTotal > 10"
@change="changePagination"
/>
</div>
</div></div>
</div>
</div>
</div>

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

@@ -111,6 +111,7 @@
type: 'radio',
}"
/>
<div class="tableBox">
<div class="pa">
<a-pagination
:showSizeChanger="false"
@@ -124,7 +125,7 @@
v-if="tableDataTotal > 10"
@change="changePagination"
/>
</div>
</div></div>
</div>
</div>
</div>

3
src/components/drawers/ProjectScore.vue
View File

@@ -34,6 +34,7 @@
@expand="expandTable"
:pagination="false"
/>
<div class="pa">
<a-pagination
v-if="tableDataTotal > 10"
@@ -771,7 +772,7 @@ export default {
}
.group {
display: flex;
justify-content: space-between;
.groupleft {
display: flex;
align-items: center;

1
src/components/drawers/QueryRight.vue
View File

@@ -104,6 +104,7 @@
onChange: onSelectChange,
}"
/>
<div class="pa">
<a-pagination
:showSizeChanger="false"

3
src/components/drawers/StuAdd.vue
View File

@@ -112,6 +112,7 @@
onChange: onSelectChange,
}"
/>
<div class="tableBox">
<div class="pa">
<a-pagination
:showSizeChanger="false"
@@ -125,7 +126,7 @@
v-if="tableDataTotal > 10"
@change="changePagination"
/>
</div>
</div></div>
</div>
</div>
</div>

1
src/components/drawers/StuScoreDetail.vue
View File

@@ -26,6 +26,7 @@
@expand="expandTable"
:pagination="false"
/>
<div class="pa">
<a-pagination
v-if="tableDataTotal > 10"

3
src/components/drawers/pathStuAdd.vue
View File

@@ -103,6 +103,7 @@
onChange: onSelectChange,
}"
/>
<div class="tableBox">
<div class="pa">
<a-pagination
:showSizeChanger="false"
@@ -116,7 +117,7 @@
v-if="tableDataTotal > 10"
@change="changePagination"
/>
</div>
</div></div>
</div>
</div>
</div>

2
src/views/courselibrary/CoursewareManage.vue
View File

@@ -1924,7 +1924,7 @@
<a-range-picker
style="width: 440px; height: 40px; border-radius: 8px"
:show-time="{ format: 'HH:mm' }"
format="YYYY-MM-DD HH:mm"
format="YYYY-MM-DD HH:mm:ss"
v-model:value="xjkkinputV3"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"

2
src/views/courselibrary/CoursewareManage_Old.vue
View File

@@ -2247,7 +2247,7 @@
<a-range-picker
style="width: 440px; height: 40px; border-radius: 8px"
:show-time="{ format: 'HH:mm' }"
format="YYYY-MM-DD HH:mm"
format="YYYY-MM-DD HH:mm:ss"
v-model:value="xjkkinputV3"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"

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

@@ -243,7 +243,7 @@
class="aeLoading"
:style="{ display: lpLoading ? 'flex' : 'none' }"
>
<a-spin :spinning="lpLoading" tip="添加中..." />
<a-spin :spinning="lpLoading" tip=""/>
</div>
</div>
</div>
@@ -1177,7 +1177,7 @@ export default {
key: "opacation",
width: "20%",
align: "center",
fixed: "right",
// fixed: "right",
scopedSlots: { customRender: "action" }, //引入的插槽
customRender: (text) => {
// console.log(text);

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

@@ -29,7 +29,7 @@
</div>
<div class="line"></div>
<router-link to="/learningpath"
><div style="display: flex">
><div style="display: flex; ">
<img class="img2" src="../../assets/images/leveladd/back.png" />
<div class="return">返回</div>
</div>
@@ -441,7 +441,6 @@
</div>
</div>
<div class="operations">
<!-- 2022-12-2注释 后面放开 -->
<!-- <div
class="operation"
style="cursor: pointer"
@@ -575,6 +574,8 @@
</a-select> -->
</div>
</div>
<!-- 2022-12-11注释 后面放开 -->
<!--
<div class="talk">
<img class="im" src="../../assets/images/leveladd/gan.png" />
<div class="xu">
@@ -588,12 +589,12 @@
<span class="yi"> 条</span>
</div>
<div class="clear" @click="clearChooseStu">清空</div>
</div>
</div>-->
<div class="tableBox" style="margin-top: 30px">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tableDataFunc()"
:scroll="{ x: 1500, y: 235 }"
:scroll="{ x: 1400 }"
:data-source="tableData"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
@@ -605,9 +606,10 @@
onChange: onSelectChange,
}"
/>
<div class="pa">
<a-pagination
v-if="tableDataTotal > 10"
:showSizeChanger="false"
showQuickJumper="true"
hideOnSinglePage="true"
@@ -617,7 +619,7 @@
@change="pageChange"
class="pagination"
style="display: block"
v-if="tableDataTotal > 10"
/>
</div>
</div>
@@ -625,10 +627,13 @@
<div class="pad"></div>
</div>
</a-tab-pane>
<!--1211注释 待开放
<a-tab-pane key="4" tab="设置">
<div class="split"></div>
<a-tabs>
<a-tab-pane key="1" tab="基本信息">
<div class="sametab">
<div class="Gcon">
@@ -652,13 +657,7 @@
:disabled="number"
v-model:checked="previewSelect"
></a-checkbox>
<!-- <input
type="checkbox"
name="cb1"
v-model: ="previewSelect"
class="in"
:disabled="number"
/> -->
<span class="yulan">预览其他关卡</span><br />
<div style="width: 10px; height: 4px"></div>
<div style="display: flex; align-items: center">
@@ -695,13 +694,7 @@
:disabled="number"
v-model:checked="studySelect"
></a-checkbox>
<!-- <input
type="checkbox"
name="cb1"
v-model:value="studySelect"
class="in"
:disabled="number"
/> -->
<span class="yulan">学习其他关卡</span><br />
<div style="width: 10px; height: 4px"></div>
<div style="display: flex; align-items: center">
@@ -738,6 +731,7 @@
</div>
</div>
</a-tab-pane>
<a-tab-pane key="2" tab="共享文档">
<div class="sametab">
@@ -781,28 +775,8 @@
<span style="color: #999999">
支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
</span>
</div>
<!-- <div
v-for="item in fileList"
:key="item.src"
style="margin-top: 20px"
class="docListStyle"
>
<img
src="@/assets/images/doc.png"
style="
cursor: pointer;
width: 30px;
height: 25px;
margin-right: 10px;
"
alt=""
/>
<span style="font: oblique bolder 16px 宋体">{{
item.name
}}</span>
<span style="color: #4ea6ff; float: right">删除</span>
</div> -->
</div>
<div
v-for="item in fileList"
:key="item.uid"
@@ -848,7 +822,10 @@
</a-tab-pane>
</a-tabs>
</a-tab-pane>
-->
</a-tabs>
<a-modal
style="padding: 0"
:closable="sh"

6
src/views/learningpath/LevelAddDetail.vue
View File

@@ -174,7 +174,7 @@
>
<a-spin
:spinning="addLoading"
:tip="updateChapterID ? '修改中...' : '添加中...'"
:tip="updateChapterID ? '修改中...' : ''"
/>
</div>
</a-modal>
@@ -206,7 +206,7 @@
<router-link to="/leveladd">
<div style="display: flex">
<img
class="img2"
class="img2" style="margin-right:22px;"
src="../../assets/images/leveladd/back.png"
/>
<div class="return">返回</div>
@@ -2362,6 +2362,7 @@ export default {
}
.leveladddetail {
width: 100%;
min-height: 800px;
display: flex;
flex-direction: column;
min-width: 933px;
@@ -2648,6 +2649,7 @@ export default {
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
display: flex;
justify-content: center;
min-height:512px;
.boomcen {
width: 95%;
// height: 100%;

3
src/views/projectcenter/LibraryAdd.vue
View File

@@ -579,6 +579,7 @@
</div>
</div>
</a-tab-pane>
<!--
<a-tab-pane key="13" tab="共享文档">
<div class="sametab">
<div class="Gcon">
@@ -651,6 +652,8 @@
</div>
</div>
</a-tab-pane>
-->
</a-tabs>
</a-tab-pane>
</a-tabs>

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

@@ -43,7 +43,8 @@
allowClear
></a-select>
</div>
<div class="select">
<div class="select addTimeBox">
<div class="addTime">创建时间：</div>
<a-range-picker
v-model:value="searchParam.valueDate"
:show-time="{
@@ -1405,8 +1406,8 @@ export default {
dataIndex: "operation",
key: "operation",
width: 300,
align: "right",
fixed: "right",
align: "center",
// fixed: "right",
customRender: (value) => {
// console.log("value", value.record.type, value.record.status);
return (
@@ -1895,7 +1896,26 @@ export default {
margin-right: 20px;
margin-bottom: 20px;
}
.addTimeBox {
position: relative;
display: flex;
align-items: center;
.addTime {
position: absolute;
z-index: 10;
margin-left: 10px;
color: rgba(0, 0, 0, 0.4);
}
.ant-picker {
padding-left: 85px;
}
.ant-picker-range .ant-picker-active-bar {
margin-left: 85px;
}
}
.btn {
padding: 0px 26px 0px 26px;
height: 38px;
@@ -2042,11 +2062,7 @@ export default {
margin: 20px 38px 30px;
.ant-table-thead > tr > th {
font-size: 14px;
font-weight: 400;
color: #999ba3;
line-height: 36px;
padding: 5px 16px;
background-color: #eff4fc;
}
}
@@ -2073,6 +2089,8 @@ export default {
font-size: 14px;
font-weight: 400;
color: #4ea6ff;
margin-right: -45px;
// line-height: 36px;
.operation1 {
margin-left: 21px;

2
src/views/projectcenter/TaskAdd.vue
View File

@@ -828,7 +828,7 @@
>
<a-spin
:spinning="addLoading"
:tip="updateStageID ? '修改中...' : '添加中...'"
:tip="updateStageID ? '修改中...' : ''"
/>
</div>
</a-modal>

53
src/views/projectcenter/TaskPage.vue
View File

@@ -16,7 +16,7 @@
class="img1"
src="../../assets/images/leveladd/ma.png"
@click="showCodeModel2()"
/> -->
/>
<div
class="line"
v-if="
@@ -26,7 +26,7 @@
action == 3 ||
action == -2
"
></div>
></div>-->
<!-- 显示发布图标 -->
<img
v-if="action == 2"
@@ -124,13 +124,13 @@
<!-- 已结束的显示 -->
<!-- <div class="pub" style="width: 28px" v-if="action == -1">
{{ act }}
</div> -->
</div>
<div class="line"></div>
<img
style="margin-right: 15px"
class="img2"
src="../../assets/images/leveladd/more.png"
/>
/>-->
<!-- <div class="more">
<span style="color: #7096e3; cursor: pointer">更多</span>
<div class="moreArrow"></div>
@@ -139,17 +139,16 @@
<div class="sammo">复制</div>
</div>
</div> -->
<!-- 草稿/未发布的显示 -->
<!-- 草稿/未发布的显示
<div class="more" v-if="action == 0">
<span style="color: #7096e3; cursor: pointer">更多</span>
<div class="moreArrow"></div>
<div class="moreItems">
<!-- <div class="sammo">撤回</div> -->
<div class="sammo">复制</div>
<div class="sammo" @click="showStartModal">存为模板</div>
</div>
</div>
<!-- 已发布的显示 -->
</div>-->
<!-- 已发布的显示
<div class="more" v-if="action == 1">
<span style="color: #7096e3; cursor: pointer">更多</span>
<div class="moreArrow"></div>
@@ -158,17 +157,17 @@
<div class="sammo">复制</div>
<div class="sammo" @click="showStartModal">存为模板</div>
</div>
</div>
<!-- 已结束的显示 -->
</div>-->
<!-- 已结束的显示
<div class="more" v-if="action == -1">
<span style="color: #7096e3; cursor: pointer">更多</span>
<div class="moreArrow"></div>
<div class="moreItems">
<!-- <div class="sammo">结束</div> -->
<div class="moreItems">-->
<!-- <div class="sammo">结束</div>
<div class="sammo">复制</div>
<div class="sammo" @click="showStartModal">存为模板</div>
</div>
</div>
</div> -->
<div class="line"></div>
<router-link to="/projectmanage">
<div style="display: flex">
@@ -798,6 +797,8 @@
<span class="btn2text">批量删除</span>
</div>
</div>
<!-- 2022-12-11注释 后面放开 -->
<!--
<div class="talk">
<img class="im" src="../../assets/images/leveladd/gan.png" />
<div class="xu">
@@ -811,7 +812,7 @@
<span class="yi">条</span>
</div>
<div class="clear" @click="clearChooseStu">清空</div>
</div>
</div>-->
<div class="tab" style="margin: 20px 32px 30px 32px">
<a-table
style="border: 1px solid #f2f6fe"
@@ -836,6 +837,7 @@
<div class="nostu" style="display: none">
<div class="nostuimg"></div>
</div>
<div class="tableBox">
<div class="pa">
<a-pagination
v-if="total > 10"
@@ -848,9 +850,10 @@
class="pagination"
@change="changePaginationStu"
/>
</div>
</div></div>
</div>
</a-tab-pane>
<!--
<a-tab-pane key="9" tab="小组管理" force-render>
<div class="group">
<div class="groupleft">
@@ -875,14 +878,14 @@
<div class="btn1" @click="showModal2(1, null)">
<img src="../../assets/images/courseManage/add0.png" />
<span class="btn1text">创建小组</span>
</div>
</div>-->
<!-- 2022-12-2注释 后面放开 -->
<!-- <div class="btn2" @click="showSubset">
<img src="../../assets/images/courseManage/reset2.png" />
<span class="btn2text">随机分组</span>
</div> -->
</div>
<!-- 小组列表 -->
</div>
</div>-->
<!-- 小组列表
<div class="groupmain">
<div
class="groupbox"
@@ -919,7 +922,7 @@
class="grofooter"
@click="showMemberList(item.projectGroupId)"
>
<div class="ftext">组员名单 ></div>
<div class="ftext">组员名单 ></div>-->
<!-- <div class="peoples">
<div class="people1">
<img
@@ -941,12 +944,16 @@
src="../../assets/images/taskpage/people4.png"
/>
</div>
</div> -->
</div>
</div>
</div>
</div>
</div>
</a-tab-pane>
-->
</a-tabs>
</div>
</a-tab-pane>
@@ -1192,6 +1199,7 @@
</div>
</div>
</a-tab-pane>
<!--
<a-tab-pane key="13" tab="共享文档">
<div class="sametab">
<div class="Gcon">
@@ -1278,6 +1286,7 @@
</div>
</div>
</a-tab-pane>
-->
</a-tabs>
</a-tab-pane>
</a-tabs>
@@ -5848,7 +5857,7 @@ export default {
.group {
display: flex;
justify-content: space-between;
.groupleft {
display: flex;

56
src/views/projectcenter/TemplateLibrary.vue
View File

@@ -36,10 +36,11 @@
</div>
</div>
<div class="tmpl_body">
<div class="tmpl_tabbox">
<div class="tableBox">
<a-table :columns="columns1" :data-source="tableData1"
expandRowByClick="true" @expand="expandTable" :pagination="false"/>
<div class="tableBox" style="display:flex;justify-content:center;padding:20px;">
<div class="pa">
<a-pagination
v-if="tableDataTotal > 10"
@@ -68,7 +69,7 @@ import * as api from "@/api/indexTemplate"
const columns1 = [
{
title: "模版名称",
width: "20%",
width: "30%",
dataIndex: "name",
key: "name",
ellipsis: true,
@@ -83,21 +84,28 @@ const columns1 = [
},
{
title: "创建人",
width: "18%",
width: "15%",
dataIndex: "creator",
key: "creator",
align: "center",
},
// {
// title: "最近学习时间",
// width: "25%",
// dataIndex: "stutime",
// key: "stutime",
// align: "center",
{
title: "创建时间",
width: "20%",
dataIndex: "createTime",
key: "createTime",
align: "center",
},
//{
// title: "发布时间",
// width: "15%",
// dataIndex: "publishTime",
// key: "publishTime",
// align: "center",
// },
{
title: "操作",
width: "22%",
width: "20%",
className: "h",
dataIndex: "operation",
key: "operation",
@@ -114,17 +122,11 @@ export default defineComponent({
time:null,
currentPage: 1,
pageSize: 10,
total:50,
total:0,
tableDataTotal:0,
tableData1: [
{
key: "1",
name: "测试模板1",
status: "已发布",
creator: "李部长",
stutime: "2022-10-31 23:12:00",
operation: "operation",
projectTemplateId: 1,
}
],
});
@@ -134,7 +136,7 @@ export default defineComponent({
{
//单层项目
value.operation = (
<div class="operation" style="justify-content: flex-end;">
<div class="operation" style="justify-content: flex-end; margin-right:65px;">
<div class="nSelect">
{value.status === "已发布" ? (
<div class="nselect">
@@ -217,7 +219,8 @@ export default defineComponent({
state.tableData1 = []
state.tableDataTotal = res.data.data.total;
console.log(res);
let resData = res.data.data.rows
let resData = res.data.data.rows;
state.total =res.data.data.total;
if (resData.length) {
for (let i in resData) {
state.tableData1.push({
@@ -226,7 +229,8 @@ export default defineComponent({
status:resData[i].status ? "已发布" : "未发布",
name:resData[i].name,
creator:resData[i].createName,
stutime:resData[i].publishTime,
publishTime:resData[i].publishTime,
createTime:resData[i].createTime,
operation:"operation"
})
}
@@ -402,7 +406,7 @@ export default defineComponent({
.tmpl_body {
padding: 0px 30px;
.tmpl_tabbox {
.tableBox {
.operation {
display: flex;
justify-content: center;
@@ -423,6 +427,14 @@ export default defineComponent({
}
}
}
.tableBox {
margin: 20px 38px 30px;
.ant-table-thead > tr > th {
background-color: #eff4fc;
}
}
}
}
</style>

2
src/views/projectcenter/temTask.vue
View File

@@ -851,7 +851,7 @@
>
<a-spin
:spinning="addLoading"
:tip="updateStageID ? '修改中...' : '添加中...'"
:tip="updateStageID ? '修改中...' : ''"
/>
</div>
</a-modal>