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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yuping
2023-02-23 18:33:11 +08:00
parent ee6b50cf87 1ffb33c36c
commit a599e5bd06
11 changed files with 304 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
src/components/drawers/ActiveAttendance.vue
View File

@@ -1,28 +1,20 @@
<template> <template>
<a-drawer <a-drawer :visible="AAvisible" class="largeDrawerStyle" placement="right" width="80%"
:visible="AAvisible" @after-visible-change="afterVisibleChange">
class="largeDrawerStyle"
placement="right"
width="80%"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain"> <div class="drawerMain">
<div class="header"> <div class="header">
<div class="headerTitle">【{{ datasource.type==6?"直播":"活动" }}】考勤</div> <div class="headerTitle">【{{ datasource.type == 6 ? "直播" : "活动" }}】考勤1</div>
<img <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
style="width: 29px; height: 29px; cursor: pointer" @click="closeDrawer" />
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div> </div>
<div class="centermain"> <div class="centermain">
<div class="titl"> <div class="titl">
<div class="endtime"> <div class="endtime">
起止时间：{{ 起止时间：{{
datasource && datasource.startTime ? datasource.startTime : "-" datasource.info && datasource.info.liveStartTime ? datasource.info.liveStartTime : "-"
}} }}
～ ～
{{ datasource && datasource.endTime ? datasource.endTime : "-" }} {{ datasource.info && datasource.info.liveEndTime ? datasource.info.liveEndTime : "-" }}
</div> </div>
<div class="endtime" style="margin-left: 64px">签到时间：{{ beginTime }}</div> <div class="endtime" style="margin-left: 64px">签到时间：{{ beginTime }}</div>
@@ -33,12 +25,8 @@
<div class="leftchoose"> <div class="leftchoose">
<div class="namecon" style="margin-right: 30px"> <div class="namecon" style="margin-right: 30px">
<div class="name">姓名：</div> <div class="name">姓名：</div>
<a-input <a-input v-model:value="name" style="width: 270px; height: 40px; border-radius: 8px" placeholder="请输入姓名"
v-model:value="name" maxlength="20" />
style="width: 270px; height: 40px; border-radius: 8px"
placeholder="请输入姓名"
maxlength="20"
/>
</div> </div>
<!-- <div class="namecon" style="margin-right: 30px"> <!-- <div class="namecon" style="margin-right: 30px">
<div class="name">考勤：</div> <div class="name">考勤：</div>
@@ -57,14 +45,8 @@
<div class="namecon"> <div class="namecon">
<div class="name">签到状态：</div> <div class="name">签到状态：</div>
<div class="select"> <div class="select">
<a-select <a-select v-model:value="projectName2" style="width: 160px" placeholder="请选择" :options="projectNameList2"
v-model:value="projectName2" @change="selectProjectName2" allowClear></a-select>
style="width: 160px"
placeholder="请选择"
:options="projectNameList2"
@change="selectProjectName2"
allowClear
></a-select>
</div> </div>
</div> </div>
</div> </div>
@@ -107,18 +89,11 @@
</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" :columns="tableDataFunc()" :data-source="tableData"
style="border: 1px solid #f2f6fe" :loading="tableDataTotalLoading" :scroll="{ x: 1300 }" :pagination="false" :row-selection="{
:columns="tableDataFunc()"
:data-source="tableData"
:loading="tableDataTotalLoading"
:scroll="{ x: 1300 }"
:pagination="false"
:row-selection="{
selectedRowKeys: selectedRowKeys, selectedRowKeys: selectedRowKeys,
onChange: onSelectChange, onChange: onSelectChange,
}" }" />
/>
</div> </div>
</div> </div>
<div class="btnn"> <div class="btnn">
@@ -128,13 +103,7 @@
</div> </div>
</a-drawer> </a-drawer>
<!-- 批量签到弹窗 --> <!-- 批量签到弹窗 -->
<a-modal <a-modal v-model:visible="qdModal" :footer="null" :closable="closeCopy" wrapClassName="CopyModal" centered="true">
v-model:visible="qdModal"
:footer="null"
:closable="closeCopy"
wrapClassName="CopyModal"
centered="true"
>
<div class="delete"> <div class="delete">
<div class="del_header"></div> <div class="del_header"></div>
<div class="del_main"> <div class="del_main">
@@ -159,13 +128,7 @@
</a-modal> </a-modal>
<!-- 单独签到弹窗 --> <!-- 单独签到弹窗 -->
<a-modal <a-modal v-model:visible="singleqdModal" :footer="null" :closable="closeCopy" wrapClassName="CopyModal" centered="true">
v-model:visible="singleqdModal"
:footer="null"
:closable="closeCopy"
wrapClassName="CopyModal"
centered="true"
>
<div class="delete"> <div class="delete">
<div class="del_header"></div> <div class="del_header"></div>
<div class="del_main"> <div class="del_main">
@@ -189,13 +152,7 @@
</div> </div>
</a-modal> </a-modal>
<!-- 单独签退弹窗 --> <!-- 单独签退弹窗 -->
<a-modal <a-modal v-model:visible="singleqtModal" :footer="null" :closable="closeCopy" wrapClassName="CopyModal" centered="true">
v-model:visible="singleqtModal"
:footer="null"
:closable="closeCopy"
wrapClassName="CopyModal"
centered="true"
>
<div class="delete"> <div class="delete">
<div class="del_header"></div> <div class="del_header"></div>
<div class="del_main"> <div class="del_main">
@@ -219,13 +176,7 @@
</div> </div>
</a-modal> </a-modal>
<!-- 单独请假弹窗 --> <!-- 单独请假弹窗 -->
<a-modal <a-modal v-model:visible="singleqjModal" :footer="null" :closable="closeCopy" wrapClassName="CopyModal" centered="true">
v-model:visible="singleqjModal"
:footer="null"
:closable="closeCopy"
wrapClassName="CopyModal"
centered="true"
>
<div class="delete"> <div class="delete">
<div class="del_header"></div> <div class="del_header"></div>
<div class="del_main"> <div class="del_main">
@@ -252,12 +203,8 @@
<SignQR v-model:signQRvisible="signQRvisible" /> <SignQR v-model:signQRvisible="signQRvisible" />
<!-- 二维码弹窗 --> <!-- 二维码弹窗 -->
<two-dimensional-code <two-dimensional-code v-model:codevisible="codevisible" :codeInfo="codeInfo" :index="codeIndex"
v-model:codevisible="codevisible" :type="codeType == 1 ? '课程二维码' : codeType == 2 ? '签到二维码' : ''" />
:codeInfo="codeInfo"
:index="codeIndex"
:type="codeType == 1 ? '课程二维码' : codeType == 2 ? '签到二维码' : ''"
/>
<!-- 二维码弹窗 --> <!-- 二维码弹窗 -->
</template> </template>
@@ -408,24 +355,24 @@ export default {
// 计算签到时间 // 计算签到时间
const isSignClick = () => { const isSignClick = () => {
// debugger // debugger
console.log("计算签到时间", props.datasource); console.log("计算签到时间", props.datasource.info);
let beginTime = new Date(props.datasource.startTime).getTime(); let beginTime = new Date(props.datasource.info.liveStartTime).getTime();
let endTime = !props.datasource.afterStart let endTime = !props.datasource.info.afterSignIn
? new Date(props.datasource.endTime).getTime() ? new Date(props.datasource.info.liveEndTime).getTime()
: new Date(props.datasource.startTime).getTime(); : new Date(props.datasource.info.liveStartTime).getTime();
if (props.datasource.beforeStart && props.datasource.afterStart) { if (props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) {
//有开始前有开始后 //有开始前有开始后
beginTime = beginTime - props.datasource.beforeStart * 60 * 1000; beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000;
endTime = endTime + props.datasource.afterStart * 60 * 1000; endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000;
console.log("1111", beginTime, endTime); console.log("1111", beginTime, endTime);
} else if (props.datasource.beforeStart && !props.datasource.afterStart) { } else if (props.datasource.info.beforeSignIn && !props.datasource.info.afterSignIn) {
//只有开始前无开始后 //只有开始前无开始后
beginTime = beginTime - props.datasource.beforeStart * 60 * 1000; beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000;
console.log("11112222", beginTime); console.log("11112222", beginTime);
} else if (!props.datasource.beforeStart && props.datasource.afterStart) { } else if (!props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) {
//无开始前有开始后 //无开始前有开始后
endTime = endTime + props.datasource.afterStart * 60 * 1000; endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000;
console.log("1111333", endTime); console.log("1111333", endTime);
} }
@@ -437,6 +384,8 @@ export default {
const afterVisibleChange = (bol) => { const afterVisibleChange = (bol) => {
if (bol == true) { if (bol == true) {
console.log("当前是什么类型", props.datasource.type); console.log("当前是什么类型", props.datasource.type);
console.log("当前是什么类型", props.datasource);
state.tableDataTotalLoading = true; state.tableDataTotalLoading = true;
getTableData(); getTableData();
isSignClick(); isSignClick();
@@ -876,8 +825,7 @@ export default {
name: props.datasource?.name, name: props.datasource?.name,
url: url:
process.env.VUE_APP_BASE_API + process.env.VUE_APP_BASE_API +
`/admin/student/studentSign?taskId=${ `/admin/student/studentSign?taskId=${props.datasource.routerTaskId
props.datasource.routerTaskId
}&taskType=${props.datasource.type}&type=${2}`, }&taskType=${props.datasource.type}&type=${2}`,
}; };
console.log("codeInfo", state.codeInfo); console.log("codeInfo", state.codeInfo);
@@ -911,18 +859,14 @@ export default {
console.log("props.datasource", props.datasource); console.log("props.datasource", props.datasource);
if (props.types == 1) { if (props.types == 1) {
window.open( window.open(
`${ `${process.env.VUE_APP_BASE_API
process.env.VUE_APP_BASE_API }/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId
}/admin/student/exportTaskStudent?currentStageId=${
props.datasource.chapterId
}&type=2&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}` }&type=2&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}`
); );
} else { } else {
window.open( window.open(
`${ `${process.env.VUE_APP_BASE_API
process.env.VUE_APP_BASE_API }/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId
}/admin/student/exportTaskStudent?currentStageId=${
props.datasource.stageId
}&type=1&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}` }&type=1&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}`
); );
} }
@@ -984,14 +928,17 @@ export default {
.ant-drawer-header { .ant-drawer-header {
display: none !important; display: none !important;
} }
.ant-drawer-body { .ant-drawer-body {
padding: 0; padding: 0;
.drawerMain { .drawerMain {
min-width: 600px; min-width: 600px;
margin: 0px 32px 0px 32px; margin: 0px 32px 0px 32px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100%; height: 100%;
.header { .header {
height: 73px; height: 73px;
border-bottom: 1px solid #e8e8e8; border-bottom: 1px solid #e8e8e8;
@@ -1000,6 +947,7 @@ export default {
align-items: center; align-items: center;
margin-bottom: 20px; margin-bottom: 20px;
flex-shrink: 0; flex-shrink: 0;
.headerTitle { .headerTitle {
font-size: 18px; font-size: 18px;
font-weight: 600; font-weight: 600;
@@ -1007,13 +955,16 @@ export default {
line-height: 25px; line-height: 25px;
} }
} }
.centermain { .centermain {
flex: 1; flex: 1;
overflow-y: auto; overflow-y: auto;
margin-bottom: 75px; margin-bottom: 75px;
padding-right: 10px; padding-right: 10px;
.titl { .titl {
display: flex; display: flex;
.endtime { .endtime {
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
@@ -1021,20 +972,24 @@ export default {
white-space: nowrap; white-space: nowrap;
} }
} }
.search { .search {
width: 100%; width: 100%;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-top: 20px; margin-top: 20px;
justify-content: space-between; justify-content: space-between;
.leftchoose { .leftchoose {
display: flex; display: flex;
margin-right: 20px; margin-right: 20px;
flex-wrap: wrap; flex-wrap: wrap;
.namecon { .namecon {
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
margin-bottom: 10px; margin-bottom: 10px;
.name { .name {
margin-top: 8px; margin-top: 8px;
white-space: nowrap; white-space: nowrap;
@@ -1054,6 +1009,7 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.img1 { .img1 {
width: 15px; width: 15px;
height: 17px; height: 17px;
@@ -1061,6 +1017,7 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
margin-right: 7px; margin-right: 7px;
} }
.img2 { .img2 {
width: 16px; width: 16px;
height: 18px; height: 18px;
@@ -1075,6 +1032,7 @@ export default {
color: #ffffff; color: #ffffff;
} }
.btn2 { .btn2 {
background: #ffffff; background: #ffffff;
@@ -1083,6 +1041,7 @@ export default {
} }
} }
} }
.btnss { .btnss {
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
@@ -1095,6 +1054,7 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.img1 { .img1 {
width: 15px; width: 15px;
height: 17px; height: 17px;
@@ -1102,6 +1062,7 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
margin-right: 7px; margin-right: 7px;
} }
.img2 { .img2 {
width: 17px; width: 17px;
height: 16px; height: 16px;
@@ -1116,6 +1077,7 @@ export default {
margin-right: 20px; margin-right: 20px;
color: #ffffff; color: #ffffff;
} }
.btn2 { .btn2 {
background: #ffffff; background: #ffffff;
margin-right: 20px; margin-right: 20px;
@@ -1123,6 +1085,7 @@ export default {
border: 1px solid #4ea6ff; border: 1px solid #4ea6ff;
} }
} }
.line { .line {
width: 100%; width: 100%;
height: 40px; height: 40px;
@@ -1132,34 +1095,41 @@ export default {
align-items: center; align-items: center;
margin-top: 20px; margin-top: 20px;
border: 1px solid #c3e6fc; border: 1px solid #c3e6fc;
.inline { .inline {
width: 95%; width: 95%;
height: 100%; height: 100%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.left { .left {
height: 100%; height: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
.img { .img {
width: 15px; width: 15px;
height: 15px; height: 15px;
background-image: url(../../assets/images/leveladd/gan.png); background-image: url(../../assets/images/leveladd/gan.png);
background-size: 100% 100%; background-size: 100% 100%;
} }
.text { .text {
color: #999ba3; color: #999ba3;
} }
.text2 { .text2 {
color: #4ea6ff; color: #4ea6ff;
margin-left: 5px; margin-left: 5px;
margin-right: 5px; margin-right: 5px;
} }
.text3 { .text3 {
color: #999ba3; color: #999ba3;
margin-left: 20px; margin-left: 20px;
} }
} }
.right { .right {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
@@ -1171,31 +1141,35 @@ export default {
} }
} }
} }
.tableBox { .tableBox {
.classify { .classify {
padding-left: 0px !important; padding-left: 0px !important;
} }
.ant-checkbox-wrapper { .ant-checkbox-wrapper {
align-items: center; align-items: center;
margin-top: -2px; margin-top: -2px;
} }
.ant-table-selection-column { .ant-table-selection-column {
padding: 0px !important; padding: 0px !important;
} }
.ant-table-thead>tr>th { .ant-table-thead>tr>th {
background-color: rgba(239, 244, 252, 1); background-color: rgba(239, 244, 252, 1);
} }
th.h { th.h {
background-color: #eff4fc !important; background-color: #eff4fc !important;
} }
.ant-table-tbody .ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td {
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
background: #f6f9fd; background: #f6f9fd;
} }
} }
} }
.btnn { .btnn {
height: 72px; height: 72px;
width: 100%; width: 100%;
@@ -1204,6 +1178,7 @@ export default {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16); box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 { .btn1 {
width: 100px; width: 100px;
height: 40px; height: 40px;
@@ -1213,6 +1188,7 @@ export default {
background-color: #fff; background-color: #fff;
cursor: pointer; cursor: pointer;
} }
.btn2 { .btn2 {
cursor: pointer; cursor: pointer;
width: 100px; width: 100px;

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

@@ -53,7 +53,7 @@
<div class="btnbox"> <div class="btnbox">
<a-range-picker <a-range-picker
:disabled-date="disabledDate" :disabled-date="disabledDate"
:disabled-time="disabledRangeTime"
:show-time="{ format: 'HH:mm' }" :show-time="{ format: 'HH:mm' }"
format="YYYY-MM-DD HH:mm" format="YYYY-MM-DD HH:mm"
style="width: 400px; height: 40px; border-radius: 8px" style="width: 400px; height: 40px; border-radius: 8px"
@@ -274,14 +274,14 @@ const closeDrawer = () => {
dateTime.value = [] dateTime.value = []
resetFields() resetFields()
}; };
/**
const range = (start, end) => { const range = (start, end) => {
const result = []; const result = [];
for (let i = start; i < end; i++) { for (let i = start; i < end; i++) {
result.push(i); result.push(i);
} }
return result; return result;
}; };*/
function timeChange(time, timeStr) { function timeChange(time, timeStr) {
formData.value.activityStartTime = timeStr[0] formData.value.activityStartTime = timeStr[0]
@@ -291,14 +291,14 @@ function timeChange(time, timeStr) {
const disabledDate = (current) => { const disabledDate = (current) => {
return current && current < dayjs().startOf('day'); return current && current < dayjs().startOf('day');
}; };
/**
const disabledRangeTime = () => ({ const disabledRangeTime = () => ({
// disabledHours: () => range(0, 24).splice(4, 20), // disabledHours: () => range(0, 24).splice(4, 20),
disabledMinutes: () => range(30, 60), disabledMinutes: () => range(30, 60),
disabledSeconds: () => [55, 56], disabledSeconds: () => [55, 56],
}); });
*/
async function confirm() { async function confirm() {
// debugger // debugger
await validate().catch(({errorFields}) => { await validate().catch(({errorFields}) => {

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

@@ -175,6 +175,7 @@ function reset() {
selectsData.value = []; selectsData.value = [];
params.value.pageIndex = 1 params.value.pageIndex = 1
params.value.keyWord = '' params.value.keyWord = ''
params.value.authorName = ''
fetch() fetch()
} }

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

@@ -105,7 +105,8 @@
<div class="select"> <div class="select">
<a-range-picker style="width: 400px;" <a-range-picker style="width: 400px;"
:show-time="{ format: 'HH:mm' }" :show-time="{ format: 'HH:mm' }"
:disabled-date="disabledDate" :disabled-time="disabledRangeTime" :disabled-date="disabledDate"
format="YYYY/MM/DD HH:mm" format="YYYY/MM/DD HH:mm"
v-model:value="chooseTime" v-model:value="chooseTime"
:placeholder="[' 开始时间', ' 结束时间']" :placeholder="[' 开始时间', ' 结束时间']"

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

@@ -44,7 +44,7 @@
style="width: 400px; height: 40px; border-radius: 8px" style="width: 400px; height: 40px; border-radius: 8px"
:show-time="{ format: 'hh:mm' }" :show-time="{ format: 'hh:mm' }"
:disabled-date="disabledDate" :disabled-date="disabledDate"
:disabled-time="disabledRangeTime"
v-model:value="dateTime" v-model:value="dateTime"
format="YYYY-MM-DD HH:mm" format="YYYY-MM-DD HH:mm"
@change="timeChange" @change="timeChange"
@@ -107,7 +107,7 @@ const closeDrawer = () => {
formData.value = {} formData.value = {}
dateTime.value = [] dateTime.value = []
}; };
/**
const range = (start, end) => { const range = (start, end) => {
const result = []; const result = [];
for (let i = start; i < end; i++) { for (let i = start; i < end; i++) {
@@ -115,7 +115,7 @@ const range = (start, end) => {
} }
return result; return result;
}; };
*/
function timeChange(time, timeStr) { function timeChange(time, timeStr) {
formData.value.submitStartTime = timeStr[0] formData.value.submitStartTime = timeStr[0]
formData.value.submitEndTime = timeStr[1] formData.value.submitEndTime = timeStr[1]
@@ -124,13 +124,13 @@ function timeChange(time, timeStr) {
const disabledDate = (current) => { const disabledDate = (current) => {
return current && current < dayjs().startOf('day'); return current && current < dayjs().startOf('day');
}; };
/**
const disabledRangeTime = () => ({ const disabledRangeTime = () => ({
disabledHours: () => range(0, 24).splice(4, 20), disabledHours: () => range(0, 24).splice(4, 20),
disabledMinutes: () => range(30, 60), disabledMinutes: () => range(30, 60),
disabledSeconds: () => [55, 56], disabledSeconds: () => [55, 56],
}); });
*/
function confirm() { function confirm() {
if (taskIndex.value === -1) { if (taskIndex.value === -1) {
const list = props.taskList const list = props.taskList

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

@@ -76,7 +76,7 @@
<a-range-picker <a-range-picker
:show-time="{ format: 'HH:mm' }" :show-time="{ format: 'HH:mm' }"
:disabled-date="disabledDate" :disabled-date="disabledDate"
:disabled-time="disabledRangeTime"
style="width: 400px; height: 40px; border-radius: 8px" style="width: 400px; height: 40px; border-radius: 8px"
v-model:value="dateTime" v-model:value="dateTime"
format="YYYY-MM-DD HH:mm" format="YYYY-MM-DD HH:mm"
@@ -433,7 +433,7 @@ const closeDrawer = () => {
dateTime.value = []; dateTime.value = [];
resetFields(); resetFields();
}; };
/**
const range = (start, end) => { const range = (start, end) => {
const result = []; const result = [];
for (let i = start; i < end; i++) { for (let i = start; i < end; i++) {
@@ -441,7 +441,7 @@ const range = (start, end) => {
} }
return result; return result;
}; };
*/
function timeChange(time, timeStr) { function timeChange(time, timeStr) {
formData.value.liveStartTime = timeStr[0]; formData.value.liveStartTime = timeStr[0];
formData.value.liveEndTime = timeStr[1]; formData.value.liveEndTime = timeStr[1];
@@ -450,13 +450,13 @@ function timeChange(time, timeStr) {
const disabledDate = (current) => { const disabledDate = (current) => {
return current && current < dayjs().startOf("day"); return current && current < dayjs().startOf("day");
}; };
/**
const disabledRangeTime = () => ({ const disabledRangeTime = () => ({
// disabledHours: () => range(0, 24).splice(4, 20), // disabledHours: () => range(0, 24).splice(4, 20),
disabledMinutes: () => range(30, 60), disabledMinutes: () => range(30, 60),
disabledSeconds: () => [55, 56], disabledSeconds: () => [55, 56],
}); });
*/
async function confirm() { async function confirm() {
// debugger; // debugger;
console.log("确定按钮:"); console.log("确定按钮:");

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

@@ -291,6 +291,9 @@ function reset() {
selectsData.value = []; selectsData.value = [];
params.value.pageNo = 1 params.value.pageNo = 1
params.value.keyWord = '' params.value.keyWord = ''
params.value.createName = ''
params.value.manager = ''
params.value.name = ''
fetch() fetch()
} }

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

@@ -180,6 +180,7 @@ function reset() {
selectsData.value = []; selectsData.value = [];
params.value.pageIndex = 1; params.value.pageIndex = 1;
params.value.keyWord = ""; params.value.keyWord = "";
params.value.assessmentName ="";
fetch(); fetch();
} }
@@ -231,6 +232,8 @@ const goResearchmanage = () => {
.main_item { .main_item {
display: flex; display: flex;
align-items: center; align-items: center;
margin-top: 20px;
margin-bottom: 20px;
.fi_input { .fi_input {
margin-right: 20px; margin-right: 20px;

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

@@ -360,7 +360,7 @@ export default {
className: "h", className: "h",
}, },
{ {
title: "证书", title: "已获得积分",
dataIndex: "diploma", dataIndex: "diploma",
key: "diploma", key: "diploma",
width: 40, width: 40,

100
src/views/examine/ProjectReviewed.vue
View File

@@ -14,53 +14,36 @@
<div class="tmplh_inp"> <div class="tmplh_inp">
<div class="inpbox"> <div class="inpbox">
<div class="inpbox1"> <div class="inpbox1">
<a-input <a-input v-model:value="valueproj" style="
v-model:value="valueproj"
style="
width: 270px; width: 270px;
height: 40px; height: 40px;
border-radius: 8px; border-radius: 8px;
margin-right: 14px; margin-right: 14px;
" " placeholder="请输入项目名称/所属项目" />
placeholder="请输入项目名称/所属项目"
/>
</div> </div>
<div class="inpbox1"> <div class="inpbox1">
<a-input <a-input v-model:value="valuename" style="
v-model:value="valuename"
style="
width: 270px; width: 270px;
height: 40px; height: 40px;
border-radius: 8px; border-radius: 8px;
margin-right: 14px; margin-right: 14px;
" " placeholder="请输入项目经理" />
placeholder="请输入项目经理"
/>
</div> </div>
<div class="inpbox1"> <div class="inpbox1">
<a-input <a-input v-model:value="valuecreater" style="
v-model:value="valuecreater"
style="
width: 270px; width: 270px;
height: 40px; height: 40px;
border-radius: 8px; border-radius: 8px;
margin-right: 14px; margin-right: 14px;
" " placeholder="请输入创建人" />
placeholder="请输入创建人"
/>
</div> </div>
<div class="inpbox1"> <div class="inpbox1">
<div class="select addTimeBox"> <div class="select addTimeBox">
<div class="addTime">审核时间：</div> <div class="addTime">审核时间：</div>
<a-range-picker <a-range-picker v-model:value="valueDate" style="width: 360px" format="YYYY-MM-DD" separator="至"
v-model:value="valueDate" :placeholder="[' 开始时间', ' 结束时间']" />
style="width: 360px"
format="YYYY-MM-DD"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</div> </div>
</div> </div>
</div> </div>
@@ -78,40 +61,20 @@
</div> </div>
<div class="tmpl_body"> <div class="tmpl_body">
<div class="tmpl_tabbox"> <div class="tmpl_tabbox">
<a-table <a-table :columns="columns1" :data-source="tableData1" :loading="loading" expandRowByClick="true"
:columns="columns1" @expand="expandTable" :scroll="{ x: 1300 }" :pagination="false" />
:data-source="tableData1"
:loading="loading"
expandRowByClick="true"
@expand="expandTable"
:scroll="{ x: 1300 }"
:pagination="false"
/>
</div> </div>
<div class="tableBox"> <div class="tableBox">
<div class="pa"> <div class="pa">
<a-pagination <a-pagination v-if="total > 10" :showSizeChanger="false" show-quick-jumper :pageSize="pageSize"
v-if="total > 10" v-model:current="currentPage" :total="total" class="pagination" @change="changePagination" />
:showSizeChanger="false"
show-quick-jumper
:pageSize="pageSize"
v-model:current="currentPage"
:total="total"
class="pagination"
@change="changePagination"
/>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- 审核日志弹窗 --> <!-- 审核日志弹窗 -->
<a-modal <a-modal v-model:visible="projAuditModal" :footer="null" :closable="closeBack" wrapClassName="projAuditModal"
v-model:visible="projAuditModal" centered="true">
:footer="null"
:closable="closeBack"
wrapClassName="projAuditModal"
centered="true"
>
<div class="delete"> <div class="delete">
<div class="del_header"></div> <div class="del_header"></div>
<div class="del_main"> <div class="del_main">
@@ -121,16 +84,9 @@
<div class="close_exit" @click="closeProjAuditModal"></div> <div class="close_exit" @click="closeProjAuditModal"></div>
</div> </div>
<div class="body"> <div class="body">
<a-table <a-table style="width: 100%" :columns="columnsAudit" :data-source="tableDataAudit"
style="width: 100%" :loading="tableDataTotalAudit === -1 ? true : false" expandRowByClick="true" :scroll="{ y: 250 }"
:columns="columnsAudit" @expand="expandTable" :pagination="false" />
:data-source="tableDataAudit"
:loading="tableDataTotalAudit === -1 ? true : false"
expandRowByClick="true"
:scroll="{ y: 250 }"
@expand="expandTable"
:pagination="false"
/>
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn1" @click="closeProjAuditModal"> <div class="del_btn btn1" @click="closeProjAuditModal">
@@ -201,12 +157,13 @@ export default {
ellipsis: true, ellipsis: true,
width: "20%", width: "20%",
customRender: ({ record: { gaName, faName, name } }) => ( customRender: ({ record: { gaName, faName, name } }) => (
<div> <div title={faName ? gaName !== null ? gaName + "/" + faName : faName : name}>
{faName {
? gaName !== null faName ? gaName !== null
? gaName + "/" + faName ? (gaName + "/" + faName).length > 16 ? (gaName + "/" + faName).slice(0, 16) + '...' : (gaName + "/" + faName)
: faName : faName.length > 16 ? faName.slice(0, 16) + '...' : faName
: name} : name.length > 16 ? name.slice(0, 16) + '...' : name
}
</div> </div>
), ),
}, },
@@ -435,6 +392,7 @@ export default {
background: #ffffff; background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
border-radius: 4px; border-radius: 4px;
// position: absolute; // position: absolute;
// left: 50%; // left: 50%;
// top: 10%; // top: 10%;
@@ -443,10 +401,8 @@ export default {
position: absolute; position: absolute;
width: calc(100%); width: calc(100%);
height: 68px; height: 68px;
background: linear-gradient( background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0.2) 0%, rgba(78, 166, 255, 0) 100%);
rgba(78, 166, 255, 0) 100%
);
} }
.del_main { .del_main {
@@ -546,6 +502,7 @@ export default {
.projectviewed { .projectviewed {
width: 100%; width: 100%;
.addTimeBox { .addTimeBox {
position: relative; position: relative;
display: flex; display: flex;
@@ -566,6 +523,7 @@ export default {
margin-left: 85px; margin-left: 85px;
} }
} }
.tmpl { .tmpl {
width: 100%; width: 100%;

78
src/views/examine/ProjectReviewedN.vue
View File

@@ -14,40 +14,28 @@
<div class="tmplh_inp"> <div class="tmplh_inp">
<div class="inpbox"> <div class="inpbox">
<div class="inpbox1"> <div class="inpbox1">
<a-input <a-input v-model:value="valueproj" style="
v-model:value="valueproj"
style="
width: 270px; width: 270px;
height: 40px; height: 40px;
border-radius: 8px; border-radius: 8px;
margin-right: 14px; margin-right: 14px;
" " placeholder="请输入项目名称/所属项目" />
placeholder="请输入项目名称/所属项目"
/>
</div> </div>
<div class="inpbox1"> <div class="inpbox1">
<a-input <a-input v-model:value="valuename" style="
v-model:value="valuename"
style="
width: 270px; width: 270px;
height: 40px; height: 40px;
border-radius: 8px; border-radius: 8px;
margin-right: 14px; margin-right: 14px;
" " placeholder="请输入项目经理" />
placeholder="请输入项目经理"
/>
</div> </div>
<div class="inpbox1"> <div class="inpbox1">
<a-input <a-input v-model:value="valuecreater" style="
v-model:value="valuecreater"
style="
width: 270px; width: 270px;
height: 40px; height: 40px;
border-radius: 8px; border-radius: 8px;
margin-right: 14px; margin-right: 14px;
" " placeholder="请输入创建人" />
placeholder="请输入创建人"
/>
</div> </div>
<!-- <div class="inpbox1">--> <!-- <div class="inpbox1">-->
<!-- <a-range-picker v-model:value="valueDate" style="border-radius: 8px; height: 40px; margin-left: 5px"--> <!-- <a-range-picker v-model:value="valueDate" style="border-radius: 8px; height: 40px; margin-left: 5px"-->
@@ -55,13 +43,8 @@
<!-- </div>--> <!-- </div>-->
<div class="select addTimeBox"> <div class="select addTimeBox">
<div class="addTime">提交时间：</div> <div class="addTime">提交时间：</div>
<a-range-picker <a-range-picker v-model:value="searchParam" style="width: 420px" format="YYYY-MM-DD" separator="至"
v-model:value="searchParam" :placeholder="[' 开始时间', ' 结束时间']" />
style="width: 420px"
format="YYYY-MM-DD"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</div> </div>
</div> </div>
</div> </div>
@@ -78,40 +61,20 @@
</div> </div>
<div class="tmpl_body"> <div class="tmpl_body">
<div class="tmpl_tabbox"> <div class="tmpl_tabbox">
<a-table <a-table :columns="columns1" :data-source="tableData1" :loading="loading" expandRowByClick="true"
:columns="columns1" @expand="expandTable" :pagination="false" :scroll="{ x: 1300 }" />
:data-source="tableData1"
:loading="loading"
expandRowByClick="true"
@expand="expandTable"
:pagination="false"
:scroll="{ x: 1300 }"
/>
</div> </div>
<div class="tableBox"> <div class="tableBox">
<div class="pa"> <div class="pa">
<a-pagination <a-pagination v-if="total > 10" :showSizeChanger="false" show-quick-jumper :pageSize="pageSize"
v-if="total > 10" v-model:current="currentPage" :total="total" class="pagination" @change="changePagination" />
:showSizeChanger="false"
show-quick-jumper
:pageSize="pageSize"
v-model:current="currentPage"
:total="total"
class="pagination"
@change="changePagination"
/>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- 审核项目页面 --> <!-- 审核项目页面 -->
<project-audit <project-audit v-model:ProjAuditvisible="ProjAuditvisible" v-model:chooseProject="chooseProject"
v-model:ProjAuditvisible="ProjAuditvisible" v-model:chooseCreateId="chooseCreateId" v-model:chooseCreater="chooseCreater" v-model:finishdFun="getProjList" />
v-model:chooseProject="chooseProject"
v-model:chooseCreateId="chooseCreateId"
v-model:chooseCreater="chooseCreater"
v-model:finishdFun="getProjList"
/>
</div> </div>
</template> </template>
<script> <script>
@@ -170,12 +133,13 @@ export default {
ellipsis: true, ellipsis: true,
width: "20%", width: "20%",
customRender: ({ record: { gaName, faName, name } }) => ( customRender: ({ record: { gaName, faName, name } }) => (
<div> <div title={faName ? gaName !== null ? gaName + "/" + faName : faName : name}>
{faName {
? gaName !== null faName ? gaName !== null
? gaName + "/" + faName ? (gaName + "/" + faName).length > 16 ? (gaName + "/" + faName).slice(0, 16) + '...' : (gaName + "/" + faName)
: faName : faName.length > 16 ? faName.slice(0, 16) + '...' : faName
: name} : name.length > 16 ? name.slice(0, 16) + '...' : name
}
</div> </div>
), ),
}, },