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

This commit is contained in:
dongwug
2022-10-12 11:44:22 +08:00
10 changed files with 263 additions and 119 deletions

View File

@@ -6,36 +6,65 @@ body {
// overflow-y: auto;
}
//隐藏滚动条----------------------------------------------------------------
div::-webkit-scrollbar {
display: none !important;
width: 0 !important;
height: 0 !important;
}
div::-moz-scrollbar {
display: none !important;
width: 0 !important;
height: 0 !important;
}
div::-o-scrollbar {
display: none !important;
width: 0 !important;
height: 0 !important;
}
body::-webkit-scrollbar {
display: none !important;;
width: 0 !important;
height: 0 !important;
}
body::-moz-scrollbar {
display: none !important;
width: 0 !important;
height: 0 !important;
}
body::-o-scrollbar {
display: none !important;
width: 0 !important;
height: 0 !important;
}
// div::-webkit-scrollbar {
// display: none !important;
// width: 0 !important;
// height: 0 !important;
// }
// div::-moz-scrollbar {
// display: none !important;
// width: 0 !important;
// height: 0 !important;
// }
// div::-o-scrollbar {
// display: none !important;
// width: 0 !important;
// height: 0 !important;
// }
// body::-webkit-scrollbar {
// display: none !important;;
// width: 0 !important;
// height: 0 !important;
// }
// body::-moz-scrollbar {
// display: none !important;
// width: 0 !important;
// height: 0 !important;
// }
// body::-o-scrollbar {
// display: none !important;
// width: 0 !important;
// height: 0 !important;
// }
::-webkit-scrollbar {
width: 6px; /*对垂直流动条有效*/
height: 6px; /*对水平流动条有效*/
}
/*定义滚动条的轨道颜色、内阴影及圆角*/
::-webkit-scrollbar-track{
background-color: rgba(239, 244, 252, 1);
border-radius: 6px;
}
/*定义滑块颜色、内阴影及圆角*/
::-webkit-scrollbar-thumb{
border-radius: 3px;
background-color: rgba(78, 166, 255, 1);
}
/*定义两端按钮的样式*/
::-webkit-scrollbar-button {
background-color:cyan;
display: none;
}
/*定义右下角汇合处的样式*/
::-webkit-scrollbar-corner {
background:rgba(239, 244, 252, 1);;
}
//隐藏滚动条----------------------------------------------------------------
//禁止选中----------------------------------------------------------

View File

@@ -61,6 +61,7 @@ export default {
},
{
name: "关卡",
href: "/leveladd",
},
{
name: "创建关卡",
@@ -91,7 +92,17 @@ export default {
},
];
}
if (n === "/taskpage" || n === "/TaskPage") {
state.list = [
{
name: "项目",
href: "",
},
{
name: "基础信息",
},
];
}
if (n === "/templatelibrary" || n === "/TemplateLibrary") {
state.list = [
{
@@ -134,7 +145,7 @@ export default {
},
];
}
if (n === "/researchmanage" || n === "/ResearchManage") {
if (n === "/managepage" || n === "/ManagePage") {
state.list = [
{
name: "调研管理",
@@ -143,7 +154,6 @@ export default {
},
{
name: "管理",
href: "",
},
];
}

View File

@@ -72,7 +72,7 @@ export default {
<style scoped lang="scss">
.openPages {
width: 100%;
height: 50px;
// height: 50px;
display: flex;
background-color: rgba(255, 255, 255, 1);
box-shadow: 0px 8px 8px 0px rgba(118, 136, 166, 0.1);

View File

@@ -71,13 +71,11 @@
:data-source="tableData"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
:scroll="{ x: 1600, y: 800 }"
:scroll="{ x: 1600 }"
@expand="expandTable"
:pagination="false"
/>
<!-- :pagination= showSizeChanger: true, showQuickJumper: true,
hideOnSinglePage: true, pageSizeOptions: [], pageSize: pageSize, current:
currentPage, total: tableDataTotal, -->
<div class="pa">
<a-pagination
showSizeChanger="true"
@@ -244,6 +242,76 @@ export default {
cretime: "2022-07-20 14:00:03",
haspub: true,
},
{
key: 4,
number: 4,
manager: "ui成长之路",
state: "草稿",
creater: "管理员",
pubtime: "2022-07-20 14:00:03",
cretime: "2022-07-20 14:00:03",
haspub: true,
},
{
key: 4,
number: 4,
manager: "ui成长之路",
state: "草稿",
creater: "管理员",
pubtime: "2022-07-20 14:00:03",
cretime: "2022-07-20 14:00:03",
haspub: true,
},
{
key: 4,
number: 4,
manager: "ui成长之路",
state: "草稿",
creater: "管理员",
pubtime: "2022-07-20 14:00:03",
cretime: "2022-07-20 14:00:03",
haspub: true,
},
{
key: 4,
number: 4,
manager: "ui成长之路",
state: "草稿",
creater: "管理员",
pubtime: "2022-07-20 14:00:03",
cretime: "2022-07-20 14:00:03",
haspub: true,
},
{
key: 4,
number: 4,
manager: "ui成长之路",
state: "草稿",
creater: "管理员",
pubtime: "2022-07-20 14:00:03",
cretime: "2022-07-20 14:00:03",
haspub: true,
},
{
key: 4,
number: 4,
manager: "ui成长之路",
state: "草稿",
creater: "管理员",
pubtime: "2022-07-20 14:00:03",
cretime: "2022-07-20 14:00:03",
haspub: true,
},
{
key: 4,
number: 4,
manager: "ui成长之路",
state: "草稿",
creater: "管理员",
pubtime: "2022-07-20 14:00:03",
cretime: "2022-07-20 14:00:03",
haspub: true,
},
],
imgData: [
{

View File

@@ -793,6 +793,8 @@ export default {
height: 100%;
background-color: #f1f4f8;
display: flex;
// min-width: 1200px;
overflow-x: hidden;
.left {
margin-right: 20px;
width: 208px;
@@ -1033,16 +1035,17 @@ export default {
.mid {
width: 100%;
height: 130px;
// height: 130px;
margin-top: 20px;
margin-bottom: 20px;
background-color: #fff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
display: flex;
align-items: center;
flex-wrap: wrap;
.item {
height: 100%;
width: 7.7%;
height: 115px;
// width: 7.7%;
display: flex;
align-items: center;
.itcon {
@@ -1052,6 +1055,8 @@ export default {
justify-content: center;
height: 100%;
width: 100%;
margin-left: 46px;
margin-right: 46px;
.img {
cursor: pointer;
}

View File

@@ -504,7 +504,7 @@ export default {
dropdownClassName="tabledropdown"
>
<a-select-option value="基础信息" label="基础信息">
<div>基础信息</div>
<router-link to="/taskpage">基础信息</router-link>
</a-select-option>
<a-select-option value="存为模板" label="存为模板">
<div>存为模板</div>
@@ -755,7 +755,7 @@ export default {
<div>存为模板</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<div>基础信息</div>
<router-link to="/taskpage">基础信息</router-link>
</a-select-option>
</a-select>
</div>
@@ -808,7 +808,7 @@ export default {
<div>存为模板</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<div>基础信息</div>
<router-link to="/taskpage">基础信息</router-link>
</a-select-option>
</a-select>
</div>
@@ -859,7 +859,7 @@ export default {
<div>存为模板</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<div>基础信息</div>
<router-link to="/taskpage">基础信息</router-link>
</a-select-option>
</a-select>
</div>
@@ -912,7 +912,7 @@ export default {
<div>存为模板</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<div>基础信息</div>
<router-link to="/taskpage">基础信息</router-link>
</a-select-option>
</a-select>
</div>
@@ -972,7 +972,7 @@ export default {
<div>存为模板</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<div>基础信息</div>
<router-link to="/taskpage">基础信息</router-link>
</a-select-option>
</a-select>
</div>
@@ -1025,7 +1025,7 @@ export default {
<div>存为模板</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<div>基础信息</div>
<router-link to="/taskpage">基础信息</router-link>
</a-select-option>
</a-select>
</div>
@@ -1078,7 +1078,7 @@ export default {
<div>存为模板</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<div>基础信息</div>
<router-link to="/taskpage">基础信息</router-link>
</a-select-option>
</a-select>
</div>
@@ -1131,7 +1131,7 @@ export default {
<div>存为模板</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<div>基础信息</div>
<router-link to="/taskpage">基础信息</router-link>
</a-select-option>
</a-select>
</div>
@@ -1203,7 +1203,7 @@ export default {
<div>存为模板</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<div>基础信息</div>
<router-link to="/taskpage">基础信息</router-link>
</a-select-option>
</a-select>
) : value.state === "进行中" ? (
@@ -1229,7 +1229,7 @@ export default {
<div>撤回</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<div>基础信息</div>
<router-link to="/taskpage">基础信息</router-link>
</a-select-option>
</a-select>
) : value.state === "已结束" || value.state === "未开始" ? (
@@ -1252,7 +1252,7 @@ export default {
</div>
</a-select-option>
<a-select-option value="基础信息" label="基础信息">
<div>基础信息</div>
<router-link to="/taskpage">基础信息</router-link>
</a-select-option>
</a-select>
) : (

View File

@@ -53,8 +53,9 @@
v-model:activeKey="activeKey"
size="large"
:tabBarStyle="{ marginLeft: '10px' }">
<a-tab-pane key="1" tab="概览">Content of Tab Pane 1</a-tab-pane>
<a-tab-pane key="2" tab="任务" force-render>
<a-tab-pane key="2" tab="概览">Content of Tab Pane 1</a-tab-pane>
<a-tab-pane key="1" tab="任务" force-render>
<div class="onerow">
<div class="taskmain">任务大纲</div>
<button class="btn">批量面授报名</button>

View File

@@ -8,7 +8,7 @@
<img src="../../assets/images/research/export.png"/>
<span style="color: #4EA6FF;font-size: 14px;margin-left:3px">导出信息</span>
</div>
<div class="goback"><span class="return"></span><router-link class="returntext" to="/researchmanage">返回</router-link></div>
<router-link to="/researchmanage" class="goback"><span class="return"></span><router-link class="returntext" to="/researchmanage">返回</router-link></router-link>
</div>
<div class="text">路径管理</div>
</div>

View File

@@ -1,8 +1,9 @@
<!-- 调研管理-基础信息页面 -->
<template>
<div class="researchadd">
<div class="header">
<span class="title">创建调研</span>
<div class="goback"><span class="return"></span><router-link class="returntext" to="/researchmanage">返回</router-link></div>
<router-link to="/researchmanage" class="goback"><span class="return"></span><router-link class="returntext" to="/researchmanage">返回</router-link></router-link>
</div>
<div class="content">
<div class="name">
@@ -24,12 +25,12 @@
<div class="inname">提干</div>
</div>
<div class="in">
<a-input v-model:value="valueE" placeholder="请输入项目名称" />
<a-input v-model:value="valueE" placeholder="请输入项目名称" show-count :maxlength="20" style="border-radius: 8px"/>
</div>
</div>
<div class="name">
<div class="in" style="margin-left: 133px">
<a-button type="primary" style="width: 100px;height: 40px;border-radius: 8px">添加选项</a-button>
<a-button type="primary" style="width: 100px;height: 40px;border-radius: 8px;background-color: #409EFF">添加选项</a-button>
</div>
</div>
<div class="options">
@@ -38,7 +39,7 @@
<div class="inname">选项1</div>
</div>
<div class="in">
<a-input v-model:value="valueE" />
<a-input v-model:value="valueE" show-count :maxlength="20" style="border-radius: 8px" />
</div>
</div>
<div class="delete">删除</div>
@@ -54,7 +55,7 @@
<div class="inname">选项1</div>
</div>
<div class="in">
<a-input v-model:value="valueE" />
<a-input v-model:value="valueE" show-count :maxlength="20" style="border-radius: 8px"/>
</div>
</div>
<div class="delete">删除</div>
@@ -116,7 +117,7 @@
</div>
<div class="footer">
<div class="btn">
<a-button type="primary" style="width: 100px;height: 40px;border-radius: 8px">保存</a-button>
<a-button type="primary" style="width: 100px;height: 40px;border-radius: 8px;background-color: #409EFF">保存</a-button>
<a-button type="primary" ghost style="width: 100px;height: 40px;margin-left: 14px;border-radius: 8px">取消</a-button>
</div>
</div>
@@ -261,7 +262,7 @@
border-radius: 5px;
// height: 120%;
width: 100%;
height: 40px;
height: 35px;
}
.ant-select-selector {
border-radius: 5px;

View File

@@ -69,6 +69,17 @@
@expand="expandTable"
:pagination="false"
/>
<div class="pa">
<a-pagination
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
/>
</div>
</div>
<!-- 表格 -->
<div :class="out ? 'out' : 'unout'">
@@ -92,7 +103,7 @@
</div>
<div class="inname">调研名称</div>
<div class="in">
<a-input v-model:value="valueE" />
<a-input v-model:value="valueE" show-count :maxlength="15" style="border-radius: 8px"/>
</div>
</div>
<div class="btn">
@@ -251,27 +262,58 @@ export default {
key: "opacation",
width: 200,
align: "center",
scopedSlots: { customRender: "action" }, //引入的插槽
customRender: (text) => {
console.log(text);
return (
<div class="opa">
<div class="opacation">
<router-link to="/researchadd" class={text.record.haspub ? "activecls" : "errorCls"}>
基础信息
</router-link>
<router-link to="/managepage" style={{ "margin-left": "25px" }}>管理</router-link>
<span style={{ "margin-left": "25px" }}>复制</span>
<span style={{ "margin-left": "25px" }} >撤回</span>
<span style={{ "margin-left": "21px", "margin-right": "30px" }} >结束</span>
</div>
</div>
);
},
},
];
return columns;
};
const getTableDate = () => {
let data = state.tableData;
data.map((value) => {
{
//单层项目
value.opacation = (
<div class="operation">
{value.state === "已发布" ? (
<div class="fb">
<router-link to="/managepage" class="jc">管理</router-link>
<div class="jc">复制</div>
<div class="jc">撤回</div>
<div class="jc">结束</div>
</div>
) : (
<div></div>
)}
{value.state === "待发布" ? (
<div class="fb">
<router-link to="/researchadd" class="jc">基础信息</router-link>
<router-link to="/managepage" class="jc">管理</router-link>
<div class="jc">复制</div>
<div class="jc">编辑</div>
<div class="jc">删除</div>
</div>
) : (
<div></div>
)}
{value.state === "已结束" ? (
<div class="fb">
<div class="jc">复制</div>
<div class="jc">删除</div>
</div>
) : (
<div></div>
)}
</div>
);
}
});
state.tableData = data;
};
getTableDate();
onMounted(() => {
// console.log("执行");
});
@@ -295,6 +337,7 @@ export default {
handleOut,
tableDataFunc,
chooseImg,
getTableDate,
};
},
};
@@ -407,6 +450,10 @@ export default {
}
.tableBox {
margin: 20px 38px 30px ;
display: flex;
//position: relative;
flex-direction: column;
th.h {
background-color: #eff4fc !important;
}
@@ -416,6 +463,16 @@ export default {
> td {
background: #f6f9fd;
}
.pa {
left: 0;
width: 100%;
// height: 20px;
// background-color: red;
display: flex;
justify-content: center;
//position: absolute;
//bottom: 20px;
}
}
.out {
display: block;
@@ -497,7 +554,7 @@ export default {
width: 100px;
height: 40px;
font-size: 14px;
border: 1px solid #4ea6ff;
border: 1px solid #409EFF;
border-radius: 8px;
cursor: pointer;
}
@@ -507,7 +564,7 @@ export default {
}
.btn2 {
margin-left: 10px;
background-color: #4ea6ff;
background-color: #409EFF;
color: #fff;
}
}
@@ -517,46 +574,19 @@ export default {
display: none;
}
.opa {
.operation {
display: flex;
justify-content: right;
.opacation {
font-size: 14px;
font-weight: 400;
color: #4ea6ff;
// line-height: 36px;
.activecls {
display: inline-block;
}
.errorCls {
display: none;
}
.more {
position: relative;
.moreArrow {
width: 13px;
height: 7px;
display: inline-block;
background-image: url("../../assets/images/navtop/down.png");
background-size: 100%;
margin: 2px;
margin-left: 7px;
}
.moreItems {
width: 80px;
height: 70px;
display: none;
background: #ffffff;
box-shadow: 2px 3px 9px 3px rgba(0, 0, 0, 0.05);
border-radius: 3px;
border: 0px solid #dcdcdc;
position: absolute;
left: 0px;
top: 18px;
z-index: 100;
.fb {
display: flex;
margin-right: 20px;
.jc {
color: #4ea6ff;
font-size: 14px;
margin-left: 20px;
}
}
}
}
}
</style>