hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-20 16:26:45 +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

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

@@ -1,44 +1,32 @@
<template>
<a-drawer
:visible="AAvisible"
class="largeDrawerStyle"
placement="right"
width="80%"
@after-visible-change="afterVisibleChange"
>
<a-drawer :visible="AAvisible" class="largeDrawerStyle" placement="right" width="80%"
@after-visible-change="afterVisibleChange">
<div class="drawerMain">
<div class="header">
<div class="headerTitle">【{{ datasource.type==6?"直播":"活动" }}】考勤</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
<div class="headerTitle">【{{ datasource.type == 6 ? "直播" : "活动" }}】考勤1</div>
<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
@click="closeDrawer" />
</div>
<div class="centermain">
<div class="titl">
<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 class="endtime" style="margin-left: 64px">签到时间：{{beginTime}}</div>
<div class="endtime" style="margin-left: 40px">签退时间：{{endTime}}</div>
<div class="endtime" style="margin-left: 64px">签到时间：{{ beginTime }}</div>
<div class="endtime" style="margin-left: 40px">签退时间：{{ endTime }}</div>
</div>
<div class="search">
<div class="leftchoose">
<div class="namecon" style="margin-right: 30px">
<div class="name">姓名：</div>
<a-input
v-model:value="name"
style="width: 270px; height: 40px; border-radius: 8px"
placeholder="请输入姓名"
maxlength="20"
/>
<a-input v-model:value="name" style="width: 270px; height: 40px; border-radius: 8px" placeholder="请输入姓名"
maxlength="20" />
</div>
<!-- <div class="namecon" style="margin-right: 30px">
<div class="name">考勤：</div>
@@ -57,14 +45,8 @@
<div class="namecon">
<div class="name">签到状态：</div>
<div class="select">
<a-select
v-model:value="projectName2"
style="width: 160px"
placeholder="请选择"
:options="projectNameList2"
@change="selectProjectName2"
allowClear
></a-select>
<a-select v-model:value="projectName2" style="width: 160px" placeholder="请选择" :options="projectNameList2"
@change="selectProjectName2" allowClear></a-select>
</div>
</div>
</div>
@@ -107,18 +89,11 @@
</div> -->
<div class="tableBox" style="margin-top: 30px">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tableDataFunc()"
:data-source="tableData"
:loading="tableDataTotalLoading"
:scroll="{ x: 1300 }"
:pagination="false"
:row-selection="{
<a-table style="border: 1px solid #f2f6fe" :columns="tableDataFunc()" :data-source="tableData"
:loading="tableDataTotalLoading" :scroll="{ x: 1300 }" :pagination="false" :row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
}"
/>
}" />
</div>
</div>
<div class="btnn">
@@ -128,13 +103,7 @@
</div>
</a-drawer>
<!-- 批量签到弹窗 -->
<a-modal
v-model:visible="qdModal"
:footer="null"
:closable="closeCopy"
wrapClassName="CopyModal"
centered="true"
>
<a-modal v-model:visible="qdModal" :footer="null" :closable="closeCopy" wrapClassName="CopyModal" centered="true">
<div class="delete">
<div class="del_header"></div>
<div class="del_main">
@@ -159,13 +128,7 @@
</a-modal>
<!-- 单独签到弹窗 -->
<a-modal
v-model:visible="singleqdModal"
:footer="null"
:closable="closeCopy"
wrapClassName="CopyModal"
centered="true"
>
<a-modal v-model:visible="singleqdModal" :footer="null" :closable="closeCopy" wrapClassName="CopyModal" centered="true">
<div class="delete">
<div class="del_header"></div>
<div class="del_main">
@@ -189,13 +152,7 @@
</div>
</a-modal>
<!-- 单独签退弹窗 -->
<a-modal
v-model:visible="singleqtModal"
:footer="null"
:closable="closeCopy"
wrapClassName="CopyModal"
centered="true"
>
<a-modal v-model:visible="singleqtModal" :footer="null" :closable="closeCopy" wrapClassName="CopyModal" centered="true">
<div class="delete">
<div class="del_header"></div>
<div class="del_main">
@@ -219,13 +176,7 @@
</div>
</a-modal>
<!-- 单独请假弹窗 -->
<a-modal
v-model:visible="singleqjModal"
:footer="null"
:closable="closeCopy"
wrapClassName="CopyModal"
centered="true"
>
<a-modal v-model:visible="singleqjModal" :footer="null" :closable="closeCopy" wrapClassName="CopyModal" centered="true">
<div class="delete">
<div class="del_header"></div>
<div class="del_main">
@@ -251,13 +202,9 @@
<!-- 二维码签到弹窗 -->
<SignQR v-model:signQRvisible="signQRvisible" />
<!-- 二维码弹窗 -->
<two-dimensional-code
v-model:codevisible="codevisible"
:codeInfo="codeInfo"
:index="codeIndex"
:type="codeType == 1 ? '课程二维码' : codeType == 2 ? '签到二维码' : ''"
/>
<!-- 二维码弹窗 -->
<two-dimensional-code v-model:codevisible="codevisible" :codeInfo="codeInfo" :index="codeIndex"
:type="codeType == 1 ? '课程二维码' : codeType == 2 ? '签到二维码' : ''" />
<!-- 二维码弹窗 -->
</template>
@@ -367,9 +314,9 @@ export default {
tableDataTotalLoading: true, // 表格loading加载配置
beginTime: null, //签到开始时间
endTime: null, //签到结束时间
selectedStudents:[],
projectName:undefined,
projectName2:undefined,
selectedStudents: [],
projectName: undefined,
projectName2: undefined,
codeType: null,
codeIndex: null,
codeInfo: null, //二维码内容
@@ -408,24 +355,24 @@ export default {
// 计算签到时间
const isSignClick = () => {
// debugger
console.log("计算签到时间", props.datasource);
let beginTime = new Date(props.datasource.startTime).getTime();
let endTime = !props.datasource.afterStart
? new Date(props.datasource.endTime).getTime()
: new Date(props.datasource.startTime).getTime();
console.log("计算签到时间", props.datasource.info);
let beginTime = new Date(props.datasource.info.liveStartTime).getTime();
let endTime = !props.datasource.info.afterSignIn
? new Date(props.datasource.info.liveEndTime).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;
endTime = endTime + props.datasource.afterStart * 60 * 1000;
beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000;
endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000;
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);
} 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);
}
@@ -437,6 +384,8 @@ export default {
const afterVisibleChange = (bol) => {
if (bol == true) {
console.log("当前是什么类型", props.datasource.type);
console.log("当前是什么类型", props.datasource);
state.tableDataTotalLoading = true;
getTableData();
isSignClick();
@@ -447,7 +396,7 @@ export default {
// debugger
console.log('当前是项目还是路径图 1 路径图 2 项目', props)
console.log('当前是项目还是路径图 1 路径图 2 项目', props.types)
if ( props.datasource.type == 6 && props.types==1 || props.datasource.type == 9 && props.types==1) {
if (props.datasource.type == 6 && props.types == 1 || props.datasource.type == 9 && props.types == 1) {
// 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可
console.log("我是传递的查询参数", {
pageNo: state.currentPage,
@@ -478,9 +427,9 @@ export default {
console.log(res);
if (res.status == 200) {
let keyarr = []
for(let i =0;i<res.data.data.records.length;i++){
for (let i = 0; i < res.data.data.records.length; i++) {
res.data.data.records[i].key = res.data.data.records[i].studentId
keyarr.push( res.data.data.records[i])
keyarr.push(res.data.data.records[i])
}
state.tableData = keyarr;
state.tableDataTotal = res.data.data.total;
@@ -492,7 +441,7 @@ export default {
state.tableDataTotalLoading = false;
state.tableData = [];
});
} else if ( props.datasource.type == 6 && props.types==2 || props.datasource.type == 9 && props.types==2) {
} else if (props.datasource.type == 6 && props.types == 2 || props.datasource.type == 9 && props.types == 2) {
// 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可
console.log("我是传递的查询参数", {
pageNo: state.currentPage,
@@ -523,9 +472,9 @@ export default {
console.log(res);
if (res.status == 200) {
let keyarr = []
for(let i =0;i<res.data.data.records.length;i++){
for (let i = 0; i < res.data.data.records.length; i++) {
res.data.data.records[i].key = res.data.data.records[i].studentId
keyarr.push( res.data.data.records[i])
keyarr.push(res.data.data.records[i])
}
state.tableData = keyarr;
state.tableDataTotal = res.data.data.total;
@@ -537,7 +486,7 @@ export default {
state.tableDataTotalLoading = false;
state.tableData = [];
});
} else{
} else {
state.tableDataTotalLoading = false;
state.tableData = [];
}
@@ -580,8 +529,8 @@ export default {
// state.tableData = arr;
};
//批量签到
const batchSign = () => {
//批量签到
const batchSign = () => {
let obj = {
courseId: Number(props.datasource.courseId),
routerId: Number(props.datasource.routerId),
@@ -623,7 +572,7 @@ export default {
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentUserNo?text.record.studentUserNo:"-"}</span>
<span> {text.record.studentUserNo ? text.record.studentUserNo : "-"}</span>
</div>
);
},
@@ -639,7 +588,7 @@ export default {
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentName?text.record.studentName:"-"}</span>
<span> {text.record.studentName ? text.record.studentName : "-"}</span>
</div>
);
},
@@ -655,7 +604,7 @@ export default {
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentDepartName?text.record.studentDepartName:"-"}</span>
<span> {text.record.studentDepartName ? text.record.studentDepartName : "-"}</span>
</div>
);
},
@@ -671,7 +620,7 @@ export default {
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentJobName?text.record.studentJobName:"-"}</span>
<span> {text.record.studentJobName ? text.record.studentJobName : "-"}</span>
</div>
);
},
@@ -686,7 +635,7 @@ export default {
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.signTime?text.record.signTime:"-"}</span>
<span> {text.record.signTime ? text.record.signTime : "-"}</span>
</div>
);
},
@@ -706,8 +655,8 @@ export default {
{text.record.signStatus
? "签到"
: text.record.leaveStatus
? "请假"
: "-"}
? "请假"
: "-"}
</span>
</div>
);
@@ -739,12 +688,12 @@ export default {
return (
<div class="opa" style='display:flex;justify-content:center;align-items:center;'>
<div
onClick={()=>{
{/* debugger */}
onClick={() => {
{/* debugger */ }
console.log("点击签到", value);
// 获取当前时间
{/* showsingleqdModal(); */}
{/* AttendanceSign */}
{/* showsingleqdModal(); */ }
{/* AttendanceSign */ }
let obj = {
courseId: Number(props.datasource.courseId),
@@ -765,31 +714,31 @@ export default {
};
console.log(obj, obj2)
state.tableDataTotalLoading = true;
api.AttendanceSign(props.types==1? obj : obj2).then(res=>{
console.log('res----签到是否成功',res)
api.AttendanceSign(props.types == 1 ? obj : obj2).then(res => {
console.log('res----签到是否成功', res)
message.destroy()
message.info('签到成功')
getTableData();
}).catch(err=>{
}).catch(err => {
state.tableDataTotalLoading = false;
console.log(err)
})
}}
style="display:flex;justify-content:center;align-items:center;margin-right:12px;cursor:pointer;">
{value.record.signStatus?
<div style='width:16px;height:16px;margin-right:6px;border-radius:16px;border:1px solid #ccc;display:flex;justify-content:center;align-items:center;'>
<div style='width:8px;height:8px;border-radius:8px;background:#4ea6ff;'></div>
</div>:
<div style='width:16px;height:16px;margin-right:6px;border-radius:16px;border:1px solid #ccc;'></div>
{value.record.signStatus ?
<div style='width:16px;height:16px;margin-right:6px;border-radius:16px;border:1px solid #ccc;display:flex;justify-content:center;align-items:center;'>
<div style='width:8px;height:8px;border-radius:8px;background:#4ea6ff;'></div>
</div> :
<div style='width:16px;height:16px;margin-right:6px;border-radius:16px;border:1px solid #ccc;'></div>
}
<div>签到</div>
</div>
<div
onClick={()=>{
onClick={() => {
console.log("点击请假", value);
{/* showsingleqjModal(); */}
{/* showsingleqjModal(); */ }
{/* AttendanceLeave */}
{/* AttendanceLeave */ }
let obj = {
courseId: Number(props.datasource.courseId),
routerId: Number(props.datasource.routerId),
@@ -808,22 +757,22 @@ export default {
};
console.log(obj, obj2)
state.tableDataTotalLoading = true;
api.AttendanceLeave(props.types==1? obj : obj2).then(res=>{
console.log('res----请假是否成功',res)
api.AttendanceLeave(props.types == 1 ? obj : obj2).then(res => {
console.log('res----请假是否成功', res)
message.destroy()
message.info('请假成功')
getTableData();
}).catch(err=>{
}).catch(err => {
state.tableDataTotalLoading = false;
console.log(err)
})
}}
style="display:flex;justify-content:center;align-items:center;cursor:pointer;">
{value.record.leaveStatus?
<div style='width:16px;height:16px;margin-right:6px;border-radius:16px;border:1px solid #ccc;display:flex;justify-content:center;align-items:center;'>
<div style='width:8px;height:8px;border-radius:8px;background:#4ea6ff;'></div>
</div>:
<div style='width:16px;height:16px;margin-right:6px;border-radius:16px;border:1px solid #ccc;'></div>
{value.record.leaveStatus ?
<div style='width:16px;height:16px;margin-right:6px;border-radius:16px;border:1px solid #ccc;display:flex;justify-content:center;align-items:center;'>
<div style='width:8px;height:8px;border-radius:8px;background:#4ea6ff;'></div>
</div> :
<div style='width:16px;height:16px;margin-right:6px;border-radius:16px;border:1px solid #ccc;'></div>
}
<div>请假</div>
</div>
@@ -840,7 +789,7 @@ export default {
state.selectedRowKeys = [];
};
const showqdModal = () => {
if(state.selectedStudents.length==0){
if (state.selectedStudents.length == 0) {
message.destroy()
message.error('请选择学员')
return
@@ -876,8 +825,7 @@ export default {
name: props.datasource?.name,
url:
process.env.VUE_APP_BASE_API +
`/admin/student/studentSign?taskId=${
props.datasource.routerTaskId
`/admin/student/studentSign?taskId=${props.datasource.routerTaskId
}&taskType=${props.datasource.type}&type=${2}`,
};
console.log("codeInfo", state.codeInfo);
@@ -906,23 +854,19 @@ export default {
// 导出数据
function exportTaskStu() {
{/* debugger */}
{/* debugger */ }
console.log("props.datasource此处的taskId 应该是router_task 表中主键", props.datasource);
console.log("props.datasource", props.datasource);
if(props.types==1){
if (props.types == 1) {
window.open(
`${
process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?currentStageId=${
props.datasource.chapterId
`${process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId
}&type=2&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}`
);
}else{
} else {
window.open(
`${
process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?currentStageId=${
props.datasource.stageId
`${process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId
}&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 {
display: none !important;
}
.ant-drawer-body {
padding: 0;
.drawerMain {
min-width: 600px;
margin: 0px 32px 0px 32px;
display: flex;
flex-direction: column;
height: 100%;
.header {
height: 73px;
border-bottom: 1px solid #e8e8e8;
@@ -1000,6 +947,7 @@ export default {
align-items: center;
margin-bottom: 20px;
flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;
@@ -1007,13 +955,16 @@ export default {
line-height: 25px;
}
}
.centermain {
flex: 1;
overflow-y: auto;
margin-bottom: 75px;
padding-right: 10px;
.titl {
display: flex;
.endtime {
font-size: 16px;
font-weight: 500;
@@ -1021,20 +972,24 @@ export default {
white-space: nowrap;
}
}
.search {
width: 100%;
display: flex;
flex-wrap: wrap;
margin-top: 20px;
justify-content: space-between;
.leftchoose {
display: flex;
margin-right: 20px;
flex-wrap: wrap;
.namecon {
display: flex;
flex-wrap: nowrap;
margin-bottom: 10px;
.name {
margin-top: 8px;
white-space: nowrap;
@@ -1054,6 +1009,7 @@ export default {
display: flex;
justify-content: center;
align-items: center;
.img1 {
width: 15px;
height: 17px;
@@ -1061,6 +1017,7 @@ export default {
background-size: 100% 100%;
margin-right: 7px;
}
.img2 {
width: 16px;
height: 18px;
@@ -1075,6 +1032,7 @@ export default {
color: #ffffff;
}
.btn2 {
background: #ffffff;
@@ -1083,6 +1041,7 @@ export default {
}
}
}
.btnss {
display: flex;
flex-wrap: nowrap;
@@ -1095,6 +1054,7 @@ export default {
display: flex;
justify-content: center;
align-items: center;
.img1 {
width: 15px;
height: 17px;
@@ -1102,6 +1062,7 @@ export default {
background-size: 100% 100%;
margin-right: 7px;
}
.img2 {
width: 17px;
height: 16px;
@@ -1116,6 +1077,7 @@ export default {
margin-right: 20px;
color: #ffffff;
}
.btn2 {
background: #ffffff;
margin-right: 20px;
@@ -1123,6 +1085,7 @@ export default {
border: 1px solid #4ea6ff;
}
}
.line {
width: 100%;
height: 40px;
@@ -1132,34 +1095,41 @@ export default {
align-items: center;
margin-top: 20px;
border: 1px solid #c3e6fc;
.inline {
width: 95%;
height: 100%;
display: flex;
justify-content: space-between;
.left {
height: 100%;
display: flex;
align-items: center;
.img {
width: 15px;
height: 15px;
background-image: url(../../assets/images/leveladd/gan.png);
background-size: 100% 100%;
}
.text {
color: #999ba3;
}
.text2 {
color: #4ea6ff;
margin-left: 5px;
margin-right: 5px;
}
.text3 {
color: #999ba3;
margin-left: 20px;
}
}
.right {
font-size: 14px;
font-weight: 400;
@@ -1171,31 +1141,35 @@ export default {
}
}
}
.tableBox {
.classify {
padding-left: 0px !important;
}
.ant-checkbox-wrapper {
align-items: center;
margin-top: -2px;
}
.ant-table-selection-column {
padding: 0px !important;
}
.ant-table-thead > tr > th {
.ant-table-thead>tr>th {
background-color: rgba(239, 244, 252, 1);
}
th.h {
background-color: #eff4fc !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
.ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td {
background: #f6f9fd;
}
}
}
.btnn {
height: 72px;
width: 100%;
@@ -1204,6 +1178,7 @@ export default {
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 {
width: 100px;
height: 40px;
@@ -1213,6 +1188,7 @@ export default {
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -14,56 +14,39 @@
<div class="tmplh_inp">
<div class="inpbox">
<div class="inpbox1">
<a-input
v-model:value="valueproj"
style="
width: 270px;
height: 40px;
border-radius: 8px;
margin-right: 14px;
"
placeholder="请输入项目名称/所属项目"
/>
<a-input v-model:value="valueproj" style="
width: 270px;
height: 40px;
border-radius: 8px;
margin-right: 14px;
" placeholder="请输入项目名称/所属项目" />
</div>
<div class="inpbox1">
<a-input
v-model:value="valuename"
style="
width: 270px;
height: 40px;
border-radius: 8px;
margin-right: 14px;
"
placeholder="请输入项目经理"
/>
<a-input v-model:value="valuename" style="
width: 270px;
height: 40px;
border-radius: 8px;
margin-right: 14px;
" placeholder="请输入项目经理" />
</div>
<div class="inpbox1">
<a-input
v-model:value="valuecreater"
style="
width: 270px;
height: 40px;
border-radius: 8px;
margin-right: 14px;
"
placeholder="请输入创建人"
/>
<a-input v-model:value="valuecreater" style="
width: 270px;
height: 40px;
border-radius: 8px;
margin-right: 14px;
" placeholder="请输入创建人" />
</div>
<div class="inpbox1">
<div class="select addTimeBox">
<div class="addTime">审核时间：</div>
<a-range-picker
v-model:value="valueDate"
style="width: 360px"
format="YYYY-MM-DD"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
/>
<div class="select addTimeBox">
<div class="addTime">审核时间：</div>
<a-range-picker v-model:value="valueDate" style="width: 360px" format="YYYY-MM-DD" separator="至"
:placeholder="[' 开始时间', ' 结束时间']" />
</div>
</div>
</div>
</div>
</div>
<div class="tmplh_btn" style="margin-top:50px;">
<div class="btn btn1" @click="getProjList">
@@ -78,40 +61,20 @@
</div>
<div class="tmpl_body">
<div class="tmpl_tabbox">
<a-table
:columns="columns1"
:data-source="tableData1"
:loading="loading"
expandRowByClick="true"
@expand="expandTable"
:scroll="{ x: 1300 }"
:pagination="false"
/>
<a-table :columns="columns1" :data-source="tableData1" :loading="loading" expandRowByClick="true"
@expand="expandTable" :scroll="{ x: 1300 }" :pagination="false" />
</div>
<div class="tableBox">
<div class="pa">
<a-pagination
v-if="total > 10"
:showSizeChanger="false"
show-quick-jumper
:pageSize="pageSize"
v-model:current="currentPage"
:total="total"
class="pagination"
@change="changePagination"
/>
<a-pagination v-if="total > 10" :showSizeChanger="false" show-quick-jumper :pageSize="pageSize"
v-model:current="currentPage" :total="total" class="pagination" @change="changePagination" />
</div>
</div>
</div>
</div>
<!-- 审核日志弹窗 -->
<a-modal
v-model:visible="projAuditModal"
:footer="null"
:closable="closeBack"
wrapClassName="projAuditModal"
centered="true"
>
<a-modal v-model:visible="projAuditModal" :footer="null" :closable="closeBack" wrapClassName="projAuditModal"
centered="true">
<div class="delete">
<div class="del_header"></div>
<div class="del_main">
@@ -121,16 +84,9 @@
<div class="close_exit" @click="closeProjAuditModal"></div>
</div>
<div class="body">
<a-table
style="width: 100%"
:columns="columnsAudit"
:data-source="tableDataAudit"
:loading="tableDataTotalAudit === -1 ? true : false"
expandRowByClick="true"
:scroll="{ y: 250 }"
@expand="expandTable"
:pagination="false"
/>
<a-table style="width: 100%" :columns="columnsAudit" :data-source="tableDataAudit"
:loading="tableDataTotalAudit === -1 ? true : false" expandRowByClick="true" :scroll="{ y: 250 }"
@expand="expandTable" :pagination="false" />
</div>
<div class="del_btnbox">
<div class="del_btn btn1" @click="closeProjAuditModal">
@@ -156,7 +112,7 @@ export default {
setup() {
const state = reactive({
loading:false,
loading: false,
optionsproj: [
{
value: "jack",
@@ -178,19 +134,19 @@ export default {
projAuditModal: false,
closeBack: false,
columns1: [
// {
// title: "序号",
// dataIndex: "number",
// key: "number",
// align: "center",
// },
// {
// title: "序号",
// dataIndex: "number",
// key: "number",
// align: "center",
// },
{
title: "项目名称",
dataIndex: "name",
key: "name",
align: "center",
ellipsis: true,
width:"20%",
width: "20%",
},
{
@@ -199,14 +155,15 @@ export default {
key: "topName",
align: "center",
ellipsis: true,
width:"20%",
width: "20%",
customRender: ({ record: { gaName, faName, name } }) => (
<div>
{faName
? gaName !== null
? gaName + "/" + faName
: faName
: name}
<div title={faName ? gaName !== null ? gaName + "/" + faName : faName : name}>
{
faName ? gaName !== null
? (gaName + "/" + faName).length > 16 ? (gaName + "/" + faName).slice(0, 16) + '...' : (gaName + "/" + faName)
: faName.length > 16 ? faName.slice(0, 16) + '...' : faName
: name.length > 16 ? name.slice(0, 16) + '...' : name
}
</div>
),
},
@@ -216,7 +173,7 @@ export default {
key: "manager",
align: "center",
ellipsis: true,
width:"10%",
width: "10%",
},
{
title: "审核状态",
@@ -224,7 +181,7 @@ export default {
key: "status",
align: "center",
ellipsis: true,
width:"10%",
width: "10%",
customRender: ({ record: { status } }) => (
<div>{{ '2': "审核通过", "-5": "未通过" }[status + ""] || '审核通过'}</div>
),
@@ -235,7 +192,7 @@ export default {
key: "createName",
align: "center",
ellipsis: true,
width:"10%",
width: "10%",
},
{
title: "审核时间",
@@ -243,7 +200,7 @@ export default {
key: "updateTime",
align: "center",
ellipsis: true,
width:"10%",
width: "10%",
},
{
title: "审核说明",
@@ -251,8 +208,8 @@ export default {
key: "description",
align: "center",
ellipsis: true,
width:"20%",
width: "20%",
customRender: ({ record: { auditList, description } }) => (
<div>
{auditList.length !== 0
@@ -260,8 +217,8 @@ export default {
? auditList[auditList.length - 1].description
: "-"
: description
? description
: "-"}
? description
: "-"}
</div>
),
},
@@ -271,14 +228,14 @@ export default {
dataIndex: "opt",
key: "opt",
align: "center",
width:"10%",
width: "10%",
customRender: (value) => {
return (
<div>
<span
onClick={() => {
showProjAuditModal(value.record.auditList.length!==0?value.record.auditList:[]);
showProjAuditModal(value.record.auditList.length !== 0 ? value.record.auditList : []);
}}
style="cursor:pointer;color:#387DF7"
>
@@ -328,7 +285,7 @@ export default {
tableData1: [],
});
const getProjList = () => {
state.loading=true
state.loading = true
let objn = {
beginTime: state.valueDate ? dayjs(state.valueDate[0]).format("YYYY-MM-DD") : "",
endTime: state.valueDate ? dayjs(state.valueDate[1]).format("YYYY-MM-DD") : "",
@@ -351,7 +308,7 @@ export default {
});
state.tableData1 = numdata;
state.loading=false
state.loading = false
});
};
const changePagination = (pagina) => {
@@ -383,10 +340,10 @@ export default {
item.status == 1
? "提交待审核"
: item.status == 2
? "通过"
: item.status == 3
? "拒绝"
: "-",
? "通过"
: item.status == 3
? "拒绝"
: "-",
time: item.createTime,
description: item.description,
};
@@ -435,6 +392,7 @@ export default {
background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
border-radius: 4px;
// position: absolute;
// left: 50%;
// top: 10%;
@@ -443,10 +401,8 @@ export default {
position: absolute;
width: calc(100%);
height: 68px;
background: linear-gradient(
rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%
);
background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%);
}
.del_main {
@@ -546,26 +502,28 @@ export default {
.projectviewed {
width: 100%;
.addTimeBox {
position: relative;
display: flex;
align-items: center;
position: relative;
display: flex;
align-items: center;
.addTime {
position: absolute;
z-index: 10;
margin-left: 10px;
color: rgba(0, 0, 0, 0.4);
.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;
}
}
.ant-picker {
padding-left: 85px;
}
.ant-picker-range .ant-picker-active-bar {
margin-left: 85px;
}
}
.tmpl {
width: 100%;

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

@@ -14,55 +14,38 @@
<div class="tmplh_inp">
<div class="inpbox">
<div class="inpbox1">
<a-input
v-model:value="valueproj"
style="
width: 270px;
height: 40px;
border-radius: 8px;
margin-right: 14px;
"
placeholder="请输入项目名称/所属项目"
/>
<a-input v-model:value="valueproj" style="
width: 270px;
height: 40px;
border-radius: 8px;
margin-right: 14px;
" placeholder="请输入项目名称/所属项目" />
</div>
<div class="inpbox1">
<a-input
v-model:value="valuename"
style="
width: 270px;
height: 40px;
border-radius: 8px;
margin-right: 14px;
"
placeholder="请输入项目经理"
/>
<a-input v-model:value="valuename" style="
width: 270px;
height: 40px;
border-radius: 8px;
margin-right: 14px;
" placeholder="请输入项目经理" />
</div>
<div class="inpbox1">
<a-input
v-model:value="valuecreater"
style="
width: 270px;
height: 40px;
border-radius: 8px;
margin-right: 14px;
"
placeholder="请输入创建人"
/>
<a-input v-model:value="valuecreater" style="
width: 270px;
height: 40px;
border-radius: 8px;
margin-right: 14px;
" placeholder="请输入创建人" />
</div>
<!-- <div class="inpbox1">-->
<!-- <a-range-picker v-model:value="valueDate" style="border-radius: 8px; height: 40px; margin-left: 5px"-->
<!-- :placeholder="[' 开始时间', ' 结束时间']" @change="rankTimeChange" />-->
<!-- </div>-->
<div class="select addTimeBox">
<div class="addTime">提交时间：</div>
<a-range-picker
v-model:value="searchParam"
style="width: 420px"
format="YYYY-MM-DD"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</div>
<div class="addTime">提交时间：</div>
<a-range-picker v-model:value="searchParam" style="width: 420px" format="YYYY-MM-DD" separator="至"
:placeholder="[' 开始时间', ' 结束时间']" />
</div>
</div>
</div>
<div class="tmplh_btn" style="margin-top:50px;">
@@ -78,40 +61,20 @@
</div>
<div class="tmpl_body">
<div class="tmpl_tabbox">
<a-table
:columns="columns1"
:data-source="tableData1"
:loading="loading"
expandRowByClick="true"
@expand="expandTable"
:pagination="false"
:scroll="{ x: 1300 }"
/>
<a-table :columns="columns1" :data-source="tableData1" :loading="loading" expandRowByClick="true"
@expand="expandTable" :pagination="false" :scroll="{ x: 1300 }" />
</div>
<div class="tableBox">
<div class="pa">
<a-pagination
v-if="total > 10"
:showSizeChanger="false"
show-quick-jumper
:pageSize="pageSize"
v-model:current="currentPage"
:total="total"
class="pagination"
@change="changePagination"
/>
<a-pagination v-if="total > 10" :showSizeChanger="false" show-quick-jumper :pageSize="pageSize"
v-model:current="currentPage" :total="total" class="pagination" @change="changePagination" />
</div>
</div>
</div>
</div>
<!-- 审核项目页面 -->
<project-audit
v-model:ProjAuditvisible="ProjAuditvisible"
v-model:chooseProject="chooseProject"
v-model:chooseCreateId="chooseCreateId"
v-model:chooseCreater="chooseCreater"
v-model:finishdFun="getProjList"
/>
<project-audit v-model:ProjAuditvisible="ProjAuditvisible" v-model:chooseProject="chooseProject"
v-model:chooseCreateId="chooseCreateId" v-model:chooseCreater="chooseCreater" v-model:finishdFun="getProjList" />
</div>
</template>
<script>
@@ -125,7 +88,7 @@ export default {
components: { ProjectAudit },
setup() {
const state = reactive({
loading:false,
loading: false,
optionsproj: [
{
value: "jack",
@@ -148,19 +111,19 @@ export default {
chooseCreateId: null,
chooseCreater: null,
columns1: [
// {
// {
// title: "序号",
// dataIndex: "number",
// key: "number",
// align: "center",
// },
// key: "number",
// align: "center",
// },
{
title: "项目名称",
dataIndex: "name",
key: "name",
align: "center",
ellipsis: true,
width:"20%",
width: "20%",
},
{
title: "所属项目",
@@ -168,15 +131,16 @@ export default {
key: "topName",
align: "center",
ellipsis: true,
width:"20%",
width: "20%",
customRender: ({ record: { gaName, faName, name } }) => (
<div>
{faName
? gaName !== null
? gaName + "/" + faName
: faName
: name}
</div>
<div title={faName ? gaName !== null ? gaName + "/" + faName : faName : name}>
{
faName ? gaName !== null
? (gaName + "/" + faName).length > 16 ? (gaName + "/" + faName).slice(0, 16) + '...' : (gaName + "/" + faName)
: faName.length > 16 ? faName.slice(0, 16) + '...' : faName
: name.length > 16 ? name.slice(0, 16) + '...' : name
}
</div>
),
},
{
@@ -185,7 +149,7 @@ export default {
key: "manager",
align: "center",
ellipsis: true,
width:"10%",
width: "10%",
},
{
title: "审核状态",
@@ -193,7 +157,7 @@ export default {
key: "status",
align: "center",
ellipsis: true,
width:"10%",
width: "10%",
customRender: () => <div>待审核</div>,
},
{
@@ -202,7 +166,7 @@ export default {
key: "createName",
align: "center",
ellipsis: true,
width:"10%",
width: "10%",
},
{
title: "提交时间",
@@ -210,7 +174,7 @@ export default {
key: "processTime",
align: "center",
ellipsis: true,
width:"10%",
width: "10%",
},
{
@@ -219,7 +183,7 @@ export default {
key: "opt",
align: "center",
ellipsis: true,
width:"20%",
width: "20%",
customRender: (value) => {
return (
<div>
@@ -241,7 +205,7 @@ export default {
},
],
tableData1: [],
searchParam:[]
searchParam: []
});
const showProjAudit = (id, createId, creater) => {
state.ProjAuditvisible = true;
@@ -250,10 +214,10 @@ export default {
state.chooseCreater = creater;
};
const getProjList = () => {
state.loading=true
state.loading = true
let objn = {
beginTime:state.searchParam.length!==0? dayjs(new Date(state.searchParam[0]).getTime()).format("YYYY-MM-DD"): "",
endTime:state.searchParam.length!==0? dayjs(new Date(state.searchParam[1]).getTime()).format("YYYY-MM-DD"): "",
beginTime: state.searchParam.length !== 0 ? dayjs(new Date(state.searchParam[0]).getTime()).format("YYYY-MM-DD") : "",
endTime: state.searchParam.length !== 0 ? dayjs(new Date(state.searchParam[1]).getTime()).format("YYYY-MM-DD") : "",
createName: state.valuecreater,
manager: state.valuename,
name: state.valueproj,
@@ -277,7 +241,7 @@ export default {
});
state.tableData1 = numdata;
state.loading=false
state.loading = false
// setProjList(result.rows);
})
.catch((err) => {
@@ -311,25 +275,25 @@ export default {
</script>
<style lang="scss">
.addTimeBox {
top: 4px;
position: relative;
display: flex;
align-items: center;
top: 4px;
position: relative;
display: flex;
align-items: center;
.addTime {
position: absolute;
z-index: 10;
margin-left: 10px;
color: rgba(0, 0, 0, 0.4);
}
.addTime {
position: absolute;
z-index: 10;
margin-left: 10px;
color: rgba(0, 0, 0, 0.4);
}
.ant-picker {
padding-left: 85px;
}
.ant-picker {
padding-left: 85px;
}
.ant-picker-range .ant-picker-active-bar {
margin-left: 85px;
}
.ant-picker-range .ant-picker-active-bar {
margin-left: 85px;
}
}
.projectviewedn {