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

Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

Browse Source
This commit is contained in:
songwc
2022-10-25 17:56:25 +08:00
parent 5d4d793969 9d688abc03
commit 0963a90fd5
12 changed files with 270 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@
@click="closeDrawer" @click="closeDrawer"
/> />
</div> </div>
<div class="main"> <div class="centermain">
<div class="titl"> <div class="titl">
<div class="endtime"> <div class="endtime">
起止时间：2022-07-21 14:00 ～ 2022-7-30 14:00 起止时间：2022-07-21 14:00 ～ 2022-7-30 14:00
@@ -137,12 +137,10 @@
/> />
</div> --> </div> -->
</div> </div>
</div> <div class="btnn">
<button class="btn1">取消</button>
<div class="botm"></div> <button class="btn2">确定</button>
<div class="btnn"> </div>
<button class="btn1">取消</button>
<button class="btn2">确定</button>
</div> </div>
</a-drawer> </a-drawer>
<!-- 批量签到弹窗 --> <!-- 批量签到弹窗 -->
@@ -710,6 +708,7 @@ export default {
// overflow-x: scroll; // overflow-x: scroll;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100%;
.header { .header {
height: 73px; height: 73px;
border-bottom: 1px solid #e8e8e8; border-bottom: 1px solid #e8e8e8;
@@ -727,12 +726,13 @@ export default {
// margin-left: 24px; // margin-left: 24px;
} }
} }
.main { .centermain {
width: 100%; // width: 100%;
height: 100%; // height: 100%;
background-color: #bfa; // background-color: #bfa;
flex: 1;
overflow-y: auto; overflow-y: auto;
margin-bottom: 75px;
.titl { .titl {
display: flex; display: flex;
.endtime { .endtime {
@@ -935,7 +935,7 @@ export default {
background: #f6f9fd; background: #f6f9fd;
} }
.opa { .opa {
background-color: #bfa; // background-color: #bfa;
} }
} }
// .tab { // .tab {
@@ -954,44 +954,45 @@ export default {
// } // }
// } // }
} }
} .btnn {
.botm { height: 72px;
width: 100%; width: 100%;
height: 90px; // position: absolute;
// background-color: red;
// flex-shrink: 1;
}
.btnn {
height: 72px;
width: 100%;
position: absolute;
background-color: #fff;
bottom: 0;
left: 0;
display: flex;
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 {
width: 100px;
height: 40px;
border: 1px solid #4ea6ff;
border-radius: 8px;
color: #4ea6ff;
background-color: #fff; background-color: #fff;
cursor: pointer; // bottom: 0;
} // left: 0;
.btn2 { display: flex;
cursor: pointer; // display: none;
width: 100px; align-items: center;
height: 40px; justify-content: center;
background: #4ea6ff; box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
border-radius: 8px; .btn1 {
border: 0; width: 100px;
margin-left: 15px; height: 40px;
color: #fff; border: 1px solid #4ea6ff;
border-radius: 8px;
color: #4ea6ff;
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;
height: 40px;
background: #4ea6ff;
border-radius: 8px;
border: 0;
margin-left: 15px;
color: #fff;
}
} }
} }
// .botm {
// width: 100%;
// height: 90px;
// // background-color: red;
// // flex-shrink: 1;
// }
} }
} }
} }

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

@@ -90,9 +90,16 @@
<span style="margin-right: 3px">活动时长：</span> <span style="margin-right: 3px">活动时长：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input <a-input-number
:min="0"
:precision="0"
style="
width: 388px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
v-model:value="inputV2" v-model:value="inputV2"
style="width: 388px; height: 32px"
/> />
<span style="margin-left: 5px">分钟</span> <span style="margin-left: 5px">分钟</span>
</div> </div>
@@ -126,18 +133,34 @@
<div class="setbox"> <div class="setbox">
<div class="timerbox"> <div class="timerbox">
<span>开始前：</span> <span>开始前：</span>
<a-input <a-input-number
style="width: 88px; height: 32px" :min="0"
:max="30"
:precision="0"
style="
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
:v-model:value="inputV4" :v-model:value="inputV4"
></a-input> />
<span style="color: #999999; margin-left: 8px">分钟</span> <span style="color: #999999; margin-left: 8px">分钟</span>
</div> </div>
<div class="timerbox"> <div class="timerbox">
<span>开始后：</span> <span>开始后：</span>
<a-input <a-input-number
style="width: 88px; height: 32px" :min="0"
:max="30"
:precision="0"
style="
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
:v-model:value="inputV5" :v-model:value="inputV5"
></a-input> />
<span style="color: #999999; margin-left: 8px">分钟</span> <span style="color: #999999; margin-left: 8px">分钟</span>
</div> </div>
</div> </div>
@@ -147,10 +170,18 @@
<div class="setbox"> <div class="setbox">
<div class="timerbox"> <div class="timerbox">
<span>结束前：</span> <span>结束前：</span>
<a-input <a-input-number
style="width: 88px; height: 32px" :min="0"
:max="30"
:precision="0"
style="
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
:v-model:value="inputV6" :v-model:value="inputV6"
></a-input> />
<span style="color: #999999; margin-left: 8px" <span style="color: #999999; margin-left: 8px"
>分钟（提前签退则记为早退）</span >分钟（提前签退则记为早退）</span
> >
@@ -164,7 +195,9 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-radio-group v-model:value="radioV1"> <a-radio-group v-model:value="radioV1">
<a-radio v-model:checked="checked" :value="1" @click="cloradio1">仅签到</a-radio> <a-radio v-model:checked="checked" :value="1" @click="cloradio1"
>仅签到</a-radio
>
<a-radio v-model:checked="checked" :value="2" @click="cloradio1" <a-radio v-model:checked="checked" :value="2" @click="cloradio1"
>签到、签退全部完成</a-radio >签到、签退全部完成</a-radio
> >
@@ -231,7 +264,7 @@ export default {
if (value != "") { if (value != "") {
state.radioV1 = ""; state.radioV1 = "";
} }
} };
return { return {
...toRefs(state), ...toRefs(state),
afterVisibleChange, afterVisibleChange,

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

@@ -151,18 +151,20 @@
<div class="setbox"> <div class="setbox">
<div class="timerbox"> <div class="timerbox">
<span>开始前：</span> <span>开始前：</span>
<a-input <a-input-number
style="width: 88px; height: 32px" :min="0" :max="30" :precision="0"
style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
:v-model:value="inputV5" :v-model:value="inputV5"
></a-input> ></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span> <span style="color: #999999; margin-left: 8px">分钟</span>
</div> </div>
<div class="timerbox"> <div class="timerbox">
<span>开始后：</span> <span>开始后：</span>
<a-input <a-input-number
style="width: 88px; height: 32px" :min="0" :max="30" :precision="0"
style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
:v-model:value="inputV6" :v-model:value="inputV6"
></a-input> ></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span> <span style="color: #999999; margin-left: 8px">分钟</span>
</div> </div>
</div> </div>
@@ -172,10 +174,11 @@
<div class="setbox"> <div class="setbox">
<div class="timerbox"> <div class="timerbox">
<span>结束前：</span> <span>结束前：</span>
<a-input <a-input-number
style="width: 88px; height: 32px" :min="0" :max="30" :precision="0"
style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
:v-model:value="inputV7" :v-model:value="inputV7"
></a-input> ></a-input-number>
<span style="color: #999999; margin-left: 8px" <span style="color: #999999; margin-left: 8px"
>分钟（提前签退则记为早退）</span >分钟（提前签退则记为早退）</span
> >

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

@@ -194,18 +194,20 @@
<div class="setbox"> <div class="setbox">
<div class="timerbox"> <div class="timerbox">
<span>开始前：</span> <span>开始前：</span>
<a-input <a-input-number
style="width: 88px; height: 32px" :min="0" :max="30" :precision="0"
style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
:v-model:value="inputV6" :v-model:value="inputV6"
></a-input> ></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span> <span style="color: #999999; margin-left: 8px">分钟</span>
</div> </div>
<div class="timerbox"> <div class="timerbox">
<span>开始后：</span> <span>开始后：</span>
<a-input <a-input-number
style="width: 88px; height: 32px" :min="0" :max="30" :precision="0"
style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
:v-model:value="inputV7" :v-model:value="inputV7"
></a-input> ></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span> <span style="color: #999999; margin-left: 8px">分钟</span>
</div> </div>
</div> </div>
@@ -215,10 +217,11 @@
<div class="setbox"> <div class="setbox">
<div class="timerbox"> <div class="timerbox">
<span>结束前：</span> <span>结束前：</span>
<a-input <a-input-number
style="width: 88px; height: 32px" :min="0" :max="30" :precision="0"
style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
:v-model:value="inputV8" :v-model:value="inputV8"
></a-input> ></a-input-number>
<span style="color: #999999; margin-left: 8px" <span style="color: #999999; margin-left: 8px"
>分钟（提前签退则记为早退）</span >分钟（提前签退则记为早退）</span
> >

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

@@ -118,9 +118,10 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<span style="margin-right: 8px">允许重复考试</span> <span style="margin-right: 8px">允许重复考试</span>
<a-input <a-input-number
:min="-1" :precision="0"
v-model:value="inputV3" v-model:value="inputV3"
style="width: 88px; height: 32px" style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
/> />
<span style="margin-left: 8px">次</span> <span style="margin-left: 8px">次</span>
<span style="margin-left: 24px; color: #999999" <span style="margin-left: 24px; color: #999999"
@@ -177,7 +178,7 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input <a-input
v-model:value="value2" v-model:value="inputV4"
style="width: 88px; height: 32px" style="width: 88px; height: 32px"
/> />
<span style="margin-left: 8px">分</span> <span style="margin-left: 8px">分</span>
@@ -237,6 +238,7 @@ export default {
inputV1: "", inputV1: "",
inputV2: "", inputV2: "",
inputV3: "", inputV3: "",
inputV4: "60",
testV1: "", testV1: "",
radioV1: "", radioV1: "",
radioV2: "", radioV2: "",

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

@@ -221,10 +221,12 @@
color: #333333; color: #333333;
line-height: 25px; line-height: 25px;
margin-left: 24px; margin-left: 24px;
background-color: #ffffff;
} }
} }
.contentMain { .contentMain {
margin-top: 32px; margin-top: 32px;
padding-right: 20px;
.main_items { .main_items {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;

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

@@ -1053,7 +1053,7 @@
<!-- 无数据样式 --> <!-- 无数据样式 -->
<div <div
class="notable" class="notable"
:style="{ display: stm_hs ? 'block' :'none' }" :style="{ display: stm_hs ? 'block' : 'none' }"
> >
<div class="notablebox"> <div class="notablebox">
<div class="boxbody"> <div class="boxbody">
@@ -1692,12 +1692,27 @@
style="margin-top: 400px" style="margin-top: 400px"
@cancel="delete_exit" @cancel="delete_exit"
> >
<div class="delete" :style="{ display: delete_hs || copy_hs || nouse_hs ? 'block' : 'none' }"> <div
class="delete"
:style="{
display: delete_hs || copy_hs || nouse_hs ? 'block' : 'none',
}"
>
<div class="del_header"></div> <div class="del_header"></div>
<div class="del_main"> <div class="del_main">
<div class="header"> <div class="header">
<div class="del-icon" :style="{ display: del_hs ? 'block' : 'none' }"><img src="@/assets/images/coursewareManage/notice.png" alt=""></div> <div
<div class="del-icon" :style="{ display: copy_hs || nouse_hs ? 'block' : 'none' }"><img src="@/assets/images/coursewareManage/QR.png" alt=""></div> class="del-icon"
:style="{ display: del_hs ? 'block' : 'none' }"
>
<img src="@/assets/images/coursewareManage/notice.png" alt="" />
</div>
<div
class="del-icon"
:style="{ display: copy_hs || nouse_hs ? 'block' : 'none' }"
>
<img src="@/assets/images/coursewareManage/QR.png" alt="" />
</div>
<span>提示</span> <span>提示</span>
<div class="close_exit" @click="delete_exit"></div> <div class="close_exit" @click="delete_exit"></div>
</div> </div>
@@ -2407,7 +2422,7 @@ export default defineComponent({
agreestudy_hs: false, agreestudy_hs: false,
rejectstudy_hs: false, rejectstudy_hs: false,
delete_hs: false, delete_hs: false,
del_hs:false, del_hs: false,
copy_hs: false, copy_hs: false,
nouse_hs: false, nouse_hs: false,
// 二维码标题状态 // 二维码标题状态
@@ -2920,7 +2935,7 @@ export default defineComponent({
<div <div
onClick={() => { onClick={() => {
state.delete_hs = true; state.delete_hs = true;
state.del_hs = true; state.del_hs = true;
}} }}
> >
删除 删除
@@ -2998,11 +3013,15 @@ export default defineComponent({
{value.status === "已拒绝" ? ( {value.status === "已拒绝" ? (
<div class="nselect"> <div class="nselect">
<div class="ops2"> <div class="ops2">
<div class="jc" <div
onClick={() => { class="jc"
onClick={() => {
state.delete_hs = true; state.delete_hs = true;
state.del_hs = true; state.del_hs = true;
}}>删除</div> }}
>
删除
</div>
</div> </div>
</div> </div>
) : ( ) : (
@@ -3414,7 +3433,7 @@ export default defineComponent({
} }
} }
.tableSelect { .tableSelect {
margin-right: 10px; // margin-right: 10px;
margin-left: -5px; margin-left: -5px;
display: flex; display: flex;
align-items: center; align-items: center;
@@ -4759,7 +4778,7 @@ export default defineComponent({
display: flex; display: flex;
justify-content: center; justify-content: center;
text-align: center; text-align: center;
margin:77px auto 109px auto; margin: 77px auto 109px auto;
cursor: pointer; cursor: pointer;
position: relative; position: relative;
.smallleft { .smallleft {
@@ -4835,7 +4854,7 @@ export default defineComponent({
} }
} }
.tableSelect { .tableSelect {
margin-right: 10px; // margin-right: 10px;
margin-left: -5px; margin-left: -5px;
display: flex; display: flex;
align-items: center; align-items: center;
@@ -5197,16 +5216,16 @@ export default defineComponent({
padding-left: 26px; padding-left: 26px;
font-size: 16px; font-size: 16px;
.del-icon { .del-icon {
width: 16px; width: 16px;
height: 16px; height: 16px;
position: relative; position: relative;
margin-right: 10px; margin-right: 10px;
img{ img {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: absolute; position: absolute;
top:0px; top: 0px;
left:0px; left: 0px;
background-size: 100% 100%; background-size: 100% 100%;
} }
} }

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

@@ -1,5 +1,5 @@
<template> <template>
<div class="allCon"> <div class="leveladddetail">
<div class="left clearfix"> <div class="left clearfix">
<div class="leftmain"> <div class="leftmain">
<div class="tit" style="margin-left: 18px">关卡</div> <div class="tit" style="margin-left: 18px">关卡</div>
@@ -319,7 +319,7 @@
</div> </div>
<div class="drawerbox"> <div class="drawerbox">
<a-table <a-table
:columns="drawercolumns" :columns="drawertableColumns()"
:data-source="drawertableData" :data-source="drawertableData"
:loading="tableDataTotal === -1 ? true : false" :loading="tableDataTotal === -1 ? true : false"
:scroll="{ x: 700 }" :scroll="{ x: 700 }"
@@ -374,9 +374,11 @@
<button class="addx" @click="showAddStu">添加学员</button> <button class="addx" @click="showAddStu">添加学员</button>
<!-- 点击抽屉组件在LevelAdd，此处没添加showAddStu、showImpStu --> <!-- 点击抽屉组件在LevelAdd，此处没添加showAddStu、showImpStu -->
<button class="addd" @click="showImpStu">导入学员</button> <button class="addd" @click="showImpStu">导入学员</button>
<button class="addd" @click="showDeleteALLModal">批量删除</button> <button class="addd" @click="showDeleteALLModal">
批量删除
</button>
</div> </div>
<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">
<span class="yi">已选择</span> <span class="yi">已选择</span>
@@ -388,12 +390,11 @@
<span class="yi">5</span> <span class="yi">5</span>
<span class="yi">条</span> <span class="yi">条</span>
</div> </div>
</div> </div> -->
<div class="tableBox" style="margin-top: 30px"> <div class="tableBox" style="margin-top: 20px">
<a-table <a-table
style="border: 1px solid #f2f6fe" style="border: 1px solid #f2f6fe"
:columns="tableDataFunc2()" :columns="tableDataFunc2()"
:scroll="{ y: 235 }"
:data-source="tableData2" :data-source="tableData2"
:loading="tableDataTotal === -1 ? true : false" :loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true" expandRowByClick="true"
@@ -405,7 +406,7 @@
onChange: onSelectChange, onChange: onSelectChange,
}" }"
/> />
<div class="pa"> <!-- <div class="pa">
<a-pagination <a-pagination
showSizeChanger="true" showSizeChanger="true"
showQuickJumper="true" showQuickJumper="true"
@@ -415,7 +416,7 @@
:total="tableDataTotal" :total="tableDataTotal"
class="pagination" class="pagination"
/> />
</div> </div> -->
<!-- 无数据样式 --> <!-- 无数据样式 -->
<div <div
class="notable" class="notable"
@@ -496,44 +497,6 @@
import { reactive, toRefs, onMounted, onUnmounted } from "vue"; import { reactive, toRefs, onMounted, onUnmounted } from "vue";
import AddStu from "../../components/drawers/AddLevelAddStu"; import AddStu from "../../components/drawers/AddLevelAddStu";
import ImpStu from "../../components/drawers/AddLevelImportStu"; import ImpStu from "../../components/drawers/AddLevelImportStu";
const drawercolumns = [
{
title: "项目名称",
dataIndex: "projectName",
key: "projectName",
width: 200,
// align: "center",
ellipsis: true,
// scopedSlots: { customRender: "action" }, //引入的插槽
// customRender: (text, record) => {
// console.log(text, record);
// return <span>{text.text}</span>;
// },
},
{
title: "项目经理",
dataIndex: "manager",
key: "manager",
width: 100,
align: "center",
},
{
title: "创建人",
dataIndex: "creater",
// width: "30%",
key: "creater",
width: 100,
align: "center",
},
{
title: "创建时间",
dataIndex: "time",
key: "time",
width: 180,
align: "center",
},
];
export default { export default {
name: "LevelAddDetail", name: "LevelAddDetail",
components: { components: {
@@ -737,7 +700,6 @@ export default {
key: "1-1", key: "1-1",
projectName: "管理者进阶-腾飞班", projectName: "管理者进阶-腾飞班",
manager: "黄华 刘俊", manager: "黄华 刘俊",
creater: "毛继禹", creater: "毛继禹",
time: "2022-07-20 14:00:03", time: "2022-07-20 14:00:03",
children: [ children: [
@@ -836,6 +798,8 @@ export default {
selectedRowKeys: [], selectedRowKeys: [],
isActive: false, isActive: false,
gqxy_hs: true, gqxy_hs: true,
projectChecked: null, //项目单选框
}); });
const showDrawer = () => { const showDrawer = () => {
state.visible = true; state.visible = true;
@@ -1067,6 +1031,82 @@ export default {
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys = selectedRowKeys;
}; };
const drawertableColumns = () => {
// let arr = state.drawertableData;
// function traverse(arr) {
// for (var a in arr) {
// // console.log(arr[a]);
// if (arr[a].children) {
// traverse(arr[a].children); //递归遍历
// } else {
// console.log(arr[a].children); //如果是值就显示
// }
// }
// }
// traverse(arr);
const drawercolumns = [
{
title: "项目名称",
dataIndex: "projectName",
key: "projectName",
width: 200,
// align: "center",
ellipsis: true,
// scopedSlots: { customRender: "action" }, //引入的插槽
customRender: (text) => {
// console.log(text.record.key);
if (!text.record.children) {
return (
<div style={{ display: "flex" }}>
<a-checkbox
checked={
state.projectChecked === text.record.key ? true : false
}
value={text.record.key}
onChange={() => {
// console.log("改变了", text.record.key);
if (state.projectChecked === text.record.key) {
state.projectChecked = null;
} else {
state.projectChecked = text.record.key;
}
}}
></a-checkbox>
<span style="margin-left: 5px">{text.text}</span>
</div>
);
} else {
return <span>{text.text}</span>;
}
},
},
{
title: "项目经理",
dataIndex: "manager",
key: "manager",
width: 100,
align: "center",
},
{
title: "创建人",
dataIndex: "creater",
// width: "30%",
key: "creater",
width: 100,
align: "center",
},
{
title: "创建时间",
dataIndex: "time",
key: "time",
width: 180,
align: "center",
},
];
return drawercolumns;
};
// const getClientHeight = () => { // const getClientHeight = () => {
// state.rightheight = // state.rightheight =
// document.getElementsByClassName("addhead")[0].offsetHeight + // document.getElementsByClassName("addhead")[0].offsetHeight +
@@ -1096,8 +1136,8 @@ export default {
state.deleteAll = true; state.deleteAll = true;
}; };
const delete_exit = () => { const delete_exit = () => {
state.deleteAll = false state.deleteAll = false;
} };
return { return {
...toRefs(state), ...toRefs(state),
tableDataFunc, tableDataFunc,
@@ -1109,12 +1149,13 @@ export default {
afterVisibleChange, afterVisibleChange,
showAddStu, showAddStu,
showImpStu, showImpStu,
drawercolumns, // drawercolumns,
onSelectChange, onSelectChange,
changebgc, changebgc,
gqxy_hShow, gqxy_hShow,
showDeleteALLModal, showDeleteALLModal,
delete_exit, delete_exit,
drawertableColumns,
}; };
}, },
}; };
@@ -1342,7 +1383,7 @@ export default {
} }
} }
} }
.allCon { .leveladddetail {
width: 100%; width: 100%;
display: flex; display: flex;
min-width: 933px; min-width: 933px;
@@ -1681,7 +1722,7 @@ export default {
} }
.tableBox { .tableBox {
margin-top: 21px; margin-top: 21px;
margin-bottom: 80px; margin-bottom: 20px;
.classify { .classify {
margin-left: 10px !important; margin-left: 10px !important;
padding-left: 9px !important; padding-left: 9px !important;
@@ -1786,8 +1827,7 @@ export default {
} }
} }
.tableBox { .tableBox {
margin-bottom: 80px; margin-block-end: 20px;
.classify { .classify {
margin-left: 11px !important; margin-left: 11px !important;
padding-left: 9px !important; padding-left: 9px !important;

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

@@ -253,7 +253,7 @@
</div> </div>
</div> </div>
<!-- 无数据样式 --> <!-- 无数据样式 -->
<div class="notable" style="display:none;"> <div class="notable" style="display: none">
<div class="notablebox"> <div class="notablebox">
<div class="boxbody"> <div class="boxbody">
<div class="boximg"></div> <div class="boximg"></div>
@@ -269,7 +269,7 @@
</div> </div>
</div> </div>
<div class="rwbox"> <div class="rwbox">
<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">
<span class="yi">已选择</span> <span class="yi">已选择</span>
@@ -281,7 +281,7 @@
<span class="yi">5</span> <span class="yi">5</span>
<span class="yi">条</span> <span class="yi">条</span>
</div> </div>
</div> </div> -->
<div class="tableBox"> <div class="tableBox">
<a-table <a-table
style="border: 1px solid #f2f6fe" style="border: 1px solid #f2f6fe"
@@ -298,7 +298,7 @@
}" }"
/> />
<div class="pa"> <!-- <div class="pa">
<a-pagination <a-pagination
showSizeChanger="true" showSizeChanger="true"
showQuickJumper="true" showQuickJumper="true"
@@ -308,7 +308,7 @@
:total="tableDataTotal" :total="tableDataTotal"
class="pagination" class="pagination"
/> />
</div> </div> -->
</div> </div>
</div> </div>
@@ -1860,7 +1860,8 @@ export default {
} }
} }
.tableBox { .tableBox {
padding-bottom: 80px; padding-bottom: 20px;
margin-top: 20px;
.classify { .classify {
margin-left: 10px !important; margin-left: 10px !important;
padding-left: 9px !important; padding-left: 9px !important;

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

@@ -3771,7 +3771,7 @@ export default {
} }
} }
.tableSelect { .tableSelect {
margin-right: 10px; // margin-right: 10px;
margin-left: -5px; margin-left: -5px;
display: flex; display: flex;
align-items: center; align-items: center;

2
src/views/research/ResearchAdd.vue
View File

@@ -144,7 +144,7 @@
@change="minChange" @change="minChange"
/> />
</div> </div>
<div class="namebox" style="margin-left: -180px"> <div class="namebox">
<div class="inname">最高分</div> <div class="inname">最高分</div>
</div> </div>
<div class="in numberInp"> <div class="in numberInp">

8
src/views/research/ResearchManage.vue
View File

@@ -87,6 +87,7 @@
:footer="null" :footer="null"
:closable="false" :closable="false"
style="margin-top: 250px" style="margin-top: 250px"
:centered="center"
> >
<div class="out"> <div class="out">
<div class="top"> <div class="top">
@@ -101,12 +102,6 @@
</div> </div>
<div class="mid clearfix"> <div class="mid clearfix">
<div class="name"> <div class="name">
<div class="d" style="margin-top: -4px">
<img
style="width: 10px; height: 10px"
src="../../assets/images/basicinfo/asterisk.png"
/>
</div>
<div class="inname">调研名称</div> <div class="inname">调研名称</div>
<div class="in"> <div class="in">
<a-input <a-input
@@ -477,7 +472,6 @@ export default {
//display: flex; //display: flex;
display: block; display: block;
position: absolute; position: absolute;
top: 120px;
width: 680px; width: 680px;
// height: 525px; // height: 525px;
background-color: #fff; background-color: #fff;