mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-11 11:56:46 +08:00
时间统一为时分秒
This commit is contained in:
@@ -115,16 +115,16 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.close {
|
.close {
|
||||||
width: 16px;
|
width: 50px;
|
||||||
height: 16px;
|
height: 50px;
|
||||||
border-radius: 8px;
|
|
||||||
|
|
||||||
position: absolute;
|
position: absolute;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
top: 17px;
|
top: 0px;
|
||||||
right: 27px;
|
right: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.close:hover {
|
.close:hover {
|
||||||
|
|||||||
@@ -52,7 +52,7 @@
|
|||||||
<div class="btnbox">
|
<div class="btnbox">
|
||||||
<a-range-picker
|
<a-range-picker
|
||||||
show-time
|
show-time
|
||||||
format="YYYY-MM-DD hh:mm"
|
format="YYYY-MM-DD HH:mm:ss"
|
||||||
style="width: 400px; height: 40px; border-radius: 8px;"
|
style="width: 400px; height: 40px; border-radius: 8px;"
|
||||||
v-model:value="time"
|
v-model:value="time"
|
||||||
:placeholder="[' 开始时间', ' 结束时间']"
|
:placeholder="[' 开始时间', ' 结束时间']"
|
||||||
|
|||||||
@@ -51,7 +51,7 @@
|
|||||||
<div class="btnbox">
|
<div class="btnbox">
|
||||||
<a-range-picker
|
<a-range-picker
|
||||||
show-time
|
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="[' 开始时间', ' 结束时间']" />
|
:placeholder="[' 开始时间', ' 结束时间']" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -75,7 +75,7 @@
|
|||||||
<EvList v-model:EvalListVisible="EvalListVisible" v-model:evaluationTypeName="evaluationTypeName"
|
<EvList v-model:EvalListVisible="EvalListVisible" v-model:evaluationTypeName="evaluationTypeName"
|
||||||
@getEvListData="checkFinish" />
|
@getEvListData="checkFinish" />
|
||||||
<!-- <div class="aeLoading" :style="{display:addLoading?'flex':'none'}">
|
<!-- <div class="aeLoading" :style="{display:addLoading?'flex':'none'}">
|
||||||
<a-spin :spinning="addLoading" tip="添加中..." />
|
<a-spin :spinning="addLoading" tip="" />
|
||||||
</div> -->
|
</div> -->
|
||||||
</a-drawer>
|
</a-drawer>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -109,7 +109,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<!-- 加载动画 -->
|
<!-- 加载动画 -->
|
||||||
<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
|
<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
|
||||||
<a-spin :spinning="addLoading" tip="添加中..." />
|
<a-spin :spinning="addLoading" tip="" />
|
||||||
</div>
|
</div>
|
||||||
</a-drawer>
|
</a-drawer>
|
||||||
</template>
|
</template>
|
||||||
@@ -328,8 +328,8 @@ export default {
|
|||||||
// 新增任务
|
// 新增任务
|
||||||
const updteHomeWork = () => {
|
const updteHomeWork = () => {
|
||||||
let obj = {
|
let obj = {
|
||||||
submitEndTime: dayjs(formState.choosedTime[1]).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"),
|
submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD HH:mm:ss"),
|
||||||
workEnclosureAddress: state.workEnclosureAddress
|
workEnclosureAddress: state.workEnclosureAddress
|
||||||
? state.workEnclosureAddress
|
? state.workEnclosureAddress
|
||||||
: "",
|
: "",
|
||||||
|
|||||||
@@ -517,8 +517,8 @@ export default {
|
|||||||
console.log("获取的数据", res);
|
console.log("获取的数据", res);
|
||||||
state.inputV1 = res.data.data.liveName;
|
state.inputV1 = res.data.data.liveName;
|
||||||
state.time = [
|
state.time = [
|
||||||
dayjs(res.data.data.liveStartTime, "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"),
|
dayjs(res.data.data.liveEndTime, "YYYY-MM-DD HH:mm:ss"),
|
||||||
];
|
];
|
||||||
console.log(state.time);
|
console.log(state.time);
|
||||||
|
|
||||||
|
|||||||
@@ -227,6 +227,10 @@ export default {
|
|||||||
type: Number,
|
type: Number,
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
|
projectTemplateId: {
|
||||||
|
type: Number,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
setup(props, ctx) {
|
setup(props, ctx) {
|
||||||
const state = reactive({
|
const state = reactive({
|
||||||
|
|||||||
@@ -320,7 +320,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<!-- 加载动画 -->
|
<!-- 加载动画 -->
|
||||||
<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
|
<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
|
||||||
<a-spin :spinning="addLoading" tip="添加中..." />
|
<a-spin :spinning="addLoading" tip="" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 选择考试抽屉 -->
|
<!-- 选择考试抽屉 -->
|
||||||
@@ -483,8 +483,8 @@ export default {
|
|||||||
state.test.scoringModel =Number(state.test.scoringModel);
|
state.test.scoringModel =Number(state.test.scoringModel);
|
||||||
state.test.questionArrangement =Number(state.test.questionArrangement);
|
state.test.questionArrangement =Number(state.test.questionArrangement);
|
||||||
state.test.chooseTime = [
|
state.test.chooseTime = [
|
||||||
dayjs(res.data.data.examinationStartTime, "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"),
|
dayjs(res.data.data.examinationEndTime, "YYYY-MM-DD HH:mm:ss"),
|
||||||
];
|
];
|
||||||
state.paperName = state.test.examinationTestName;
|
state.paperName = state.test.examinationTestName;
|
||||||
// state.paperId=dayjs
|
// state.paperId=dayjs
|
||||||
|
|||||||
@@ -1900,7 +1900,7 @@
|
|||||||
<a-range-picker
|
<a-range-picker
|
||||||
style="width: 440px; height: 40px; border-radius: 8px"
|
style="width: 440px; height: 40px; border-radius: 8px"
|
||||||
:show-time="{ format: 'HH:mm' }"
|
:show-time="{ format: 'HH:mm' }"
|
||||||
format="YYYY-MM-DD HH:mm"
|
format="YYYY-MM-DD HH:mm:ss"
|
||||||
v-model:value="xjkkinputV3"
|
v-model:value="xjkkinputV3"
|
||||||
separator="至"
|
separator="至"
|
||||||
:placeholder="[' 开始时间', ' 结束时间']"
|
:placeholder="[' 开始时间', ' 结束时间']"
|
||||||
|
|||||||
@@ -2242,7 +2242,7 @@
|
|||||||
<a-range-picker
|
<a-range-picker
|
||||||
style="width: 440px; height: 40px; border-radius: 8px"
|
style="width: 440px; height: 40px; border-radius: 8px"
|
||||||
:show-time="{ format: 'HH:mm' }"
|
:show-time="{ format: 'HH:mm' }"
|
||||||
format="YYYY-MM-DD HH:mm"
|
format="YYYY-MM-DD HH:mm:ss"
|
||||||
v-model:value="xjkkinputV3"
|
v-model:value="xjkkinputV3"
|
||||||
separator="至"
|
separator="至"
|
||||||
:placeholder="[' 开始时间', ' 结束时间']"
|
:placeholder="[' 开始时间', ' 结束时间']"
|
||||||
|
|||||||
@@ -237,7 +237,7 @@
|
|||||||
class="aeLoading"
|
class="aeLoading"
|
||||||
:style="{ display: lpLoading ? 'flex' : 'none' }"
|
:style="{ display: lpLoading ? 'flex' : 'none' }"
|
||||||
>
|
>
|
||||||
<a-spin :spinning="lpLoading" tip="添加中..."/>
|
<a-spin :spinning="lpLoading" tip=""/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="line"></div>
|
<div class="line"></div>
|
||||||
<router-link to="/learningpath"
|
<router-link to="/learningpath"
|
||||||
><div style="display: flex">
|
><div style="display: flex; ">
|
||||||
<img class="img2" src="../../assets/images/leveladd/back.png" />
|
<img class="img2" src="../../assets/images/leveladd/back.png" />
|
||||||
<div class="return">返回</div>
|
<div class="return">返回</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -441,7 +441,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="operations">
|
<div class="operations">
|
||||||
<!-- 2022-12-2注释 后面放开 -->
|
|
||||||
<!-- <div
|
<!-- <div
|
||||||
class="operation"
|
class="operation"
|
||||||
style="cursor: pointer"
|
style="cursor: pointer"
|
||||||
@@ -575,6 +574,8 @@
|
|||||||
</a-select> -->
|
</a-select> -->
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- 2022-12-11注释 后面放开 -->
|
||||||
|
<!--
|
||||||
<div class="talk">
|
<div class="talk">
|
||||||
<img class="im" src="../../assets/images/leveladd/gan.png" />
|
<img class="im" src="../../assets/images/leveladd/gan.png" />
|
||||||
<div class="xu">
|
<div class="xu">
|
||||||
@@ -588,12 +589,12 @@
|
|||||||
<span class="yi"> 条</span>
|
<span class="yi"> 条</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="clear" @click="clearChooseStu">清空</div>
|
<div class="clear" @click="clearChooseStu">清空</div>
|
||||||
</div>
|
</div>-->
|
||||||
<div class="tableBox" style="margin-top: 30px">
|
<div class="tableBox" style="margin-top: 30px">
|
||||||
<a-table
|
<a-table
|
||||||
style="border: 1px solid #f2f6fe"
|
style="border: 1px solid #f2f6fe"
|
||||||
:columns="tableDataFunc()"
|
:columns="tableDataFunc()"
|
||||||
:scroll="{ x: 1500, y: 235 }"
|
:scroll="{ x: 1500, y: 160 }"
|
||||||
:data-source="tableData"
|
:data-source="tableData"
|
||||||
:loading="tableDataTotal === -1 ? true : false"
|
:loading="tableDataTotal === -1 ? true : false"
|
||||||
expandRowByClick="true"
|
expandRowByClick="true"
|
||||||
|
|||||||
@@ -174,7 +174,7 @@
|
|||||||
>
|
>
|
||||||
<a-spin
|
<a-spin
|
||||||
:spinning="addLoading"
|
:spinning="addLoading"
|
||||||
:tip="updateChapterID ? '修改中...' : '添加中...'"
|
:tip="updateChapterID ? '修改中...' : ''"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</a-modal>
|
</a-modal>
|
||||||
@@ -206,7 +206,7 @@
|
|||||||
<router-link to="/leveladd">
|
<router-link to="/leveladd">
|
||||||
<div style="display: flex">
|
<div style="display: flex">
|
||||||
<img
|
<img
|
||||||
class="img2"
|
class="img2" style="margin-right:22px;"
|
||||||
src="../../assets/images/leveladd/back.png"
|
src="../../assets/images/leveladd/back.png"
|
||||||
/>
|
/>
|
||||||
<div class="return">返回</div>
|
<div class="return">返回</div>
|
||||||
|
|||||||
@@ -828,7 +828,7 @@
|
|||||||
>
|
>
|
||||||
<a-spin
|
<a-spin
|
||||||
:spinning="addLoading"
|
:spinning="addLoading"
|
||||||
:tip="updateStageID ? '修改中...' : '添加中...'"
|
:tip="updateStageID ? '修改中...' : ''"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</a-modal>
|
</a-modal>
|
||||||
|
|||||||
@@ -798,6 +798,8 @@
|
|||||||
<span class="btn2text">批量删除</span>
|
<span class="btn2text">批量删除</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- 2022-12-11注释 后面放开 -->
|
||||||
|
<!--
|
||||||
<div class="talk">
|
<div class="talk">
|
||||||
<img class="im" src="../../assets/images/leveladd/gan.png" />
|
<img class="im" src="../../assets/images/leveladd/gan.png" />
|
||||||
<div class="xu">
|
<div class="xu">
|
||||||
@@ -811,7 +813,7 @@
|
|||||||
<span class="yi">条</span>
|
<span class="yi">条</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="clear" @click="clearChooseStu">清空</div>
|
<div class="clear" @click="clearChooseStu">清空</div>
|
||||||
</div>
|
</div>-->
|
||||||
<div class="tab" style="margin: 20px 32px 30px 32px">
|
<div class="tab" style="margin: 20px 32px 30px 32px">
|
||||||
<a-table
|
<a-table
|
||||||
style="border: 1px solid #f2f6fe"
|
style="border: 1px solid #f2f6fe"
|
||||||
|
|||||||
@@ -851,7 +851,7 @@
|
|||||||
>
|
>
|
||||||
<a-spin
|
<a-spin
|
||||||
:spinning="addLoading"
|
:spinning="addLoading"
|
||||||
:tip="updateStageID ? '修改中...' : '添加中...'"
|
:tip="updateStageID ? '修改中...' : ''"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</a-modal>
|
</a-modal>
|
||||||
|
|||||||
Reference in New Issue
Block a user