feat:合并

This commit is contained in:
李晓鸽
2022-10-25 17:26:03 +08:00
11 changed files with 3344 additions and 238 deletions

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,

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
> >

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
> >

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: "",

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;

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -48,7 +48,7 @@
:loading="tableDataTotal === -1 ? true : false" :loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true" expandRowByClick="true"
@expand="expandTable" @expand="expandTable"
:scroll="{ x: 900, y: 400 }" :scroll="{ x: 900 }"
:pagination="false" :pagination="false"
:row-selection="{ :row-selection="{
columnWidth: 30, columnWidth: 30,
@@ -345,9 +345,9 @@ export default {
} }
} }
.drawerMain { .drawerMain {
min-width: 600px; min-width: 550px;
margin: 0px 32px 0px 32px; margin: 0px 32px 0px 32px;
overflow-x: scroll; // overflow-x: scroll;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.header { .header {
@@ -358,6 +358,7 @@ export default {
align-items: center; align-items: center;
// background-color: red; // background-color: red;
margin-bottom: 20px; margin-bottom: 20px;
flex-shrink: 0;
.headerTitle { .headerTitle {
font-size: 18px; font-size: 18px;
font-weight: 600; font-weight: 600;
@@ -370,7 +371,7 @@ export default {
width: 100%; width: 100%;
height: 100%; height: 100%;
// background-color: #bfa; // background-color: #bfa;
// overflow-y: auto; overflow-y: auto;
.search { .search {
width: 100%; width: 100%;
display: flex; display: flex;
@@ -487,6 +488,12 @@ export default {
justify-content: center; justify-content: center;
// position: absolute; // position: absolute;
// bottom: 20px; // bottom: 20px;
.ant-pagination-item,
.ant-pagination-prev,
.ant-pagination-next,
.ant-pagination-options {
margin-bottom: 10px;
}
} }
// .tab { // .tab {
// .ant-table-thead > tr > th { // .ant-table-thead > tr > th {

View File

@@ -1,3 +1,4 @@
<!-- 项目的归属权 -->
<template> <template>
<a-drawer <a-drawer
:visible="ProjOwnervisible" :visible="ProjOwnervisible"
@@ -48,7 +49,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="line"> <!-- <div class="line">
<div class="inline"> <div class="inline">
<div class="left1"> <div class="left1">
<div class="img"></div> <div class="img"></div>
@@ -60,7 +61,7 @@
</div> </div>
<div class="right1">清空</div> <div class="right1">清空</div>
</div> </div>
</div> </div> -->
<div class="tabb" style="margin-top: 16px"> <div class="tabb" style="margin-top: 16px">
<a-table <a-table
style="border: 1px solid #f2f6fe" style="border: 1px solid #f2f6fe"
@@ -68,7 +69,7 @@
:data-source="tabledata" :data-source="tabledata"
:loading="tableDataTotal === -1 ? true : false" :loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true" expandRowByClick="true"
:scroll="{ x: 100, y: 560 }" :scroll="{ x: 500, y: 560 }"
@expand="expandTable" @expand="expandTable"
:pagination="false" :pagination="false"
:row-selection="{ :row-selection="{
@@ -92,29 +93,36 @@
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="2" tab="添加组织" force-render> <a-tab-pane key="2" tab="添加组织" force-render>
<div class="tab2"> <div class="tab2">
<div class="organize">组织</div> <div class="t1">
<div class="organize">选择组织</div>
<div class="select"> <div class="select">
<a-cascader <a-tree-select
v-model:value="value" v-model:value="valueSelect"
style="width: 200px"
dropdownClassName="changetreedropdown"
:dropdown-style="{
maxHeight: '400px',
overflow: 'auto',
}"
placeholder="请输入组织名称" placeholder="请输入组织名称"
:options="organizeList" allow-clear
/> tree-default-expand-all
</div> :tree-data="treeData"
</div> >
</a-tab-pane> </a-tree-select>
<a-tab-pane key="3" tab="受众关联"> </div>
<div class="tab1"> </div>
<div class="nameinp"> <div class="t1">
<div class="namee">受众名称</div> <div class="organize">姓名</div>
<div class="select"> <a-input
<a-select v-model:value="nameadd"
v-model:value="choosevalue" style="width: 200px; height: 40px; border-radius: 8px"
style="width: 264px; border-radius: 8px" placeholder="请输入姓名"
placeholder="请输入组织名称"
:options="organizeList1"
/> />
</div> </div>
</div> </div>
<!-- 选完后出现下面 -->
<div class="searchdown">
<div class="btns"> <div class="btns">
<div class="btn1"> <div class="btn1">
<div class="img1"> <div class="img1">
@@ -133,8 +141,75 @@
<div class="wz">重置</div> <div class="wz">重置</div>
</div> </div>
</div> </div>
<div class="tabb" style="margin-top: 16px">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tablecolumns1"
:data-source="tabledata1"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
:scroll="{ x: 500, y: 560 }"
@expand="expandTable"
:pagination="false"
:row-selection="{
columnWidth: 30,
selectedRowKeys: selectedRowKeys1,
onChange: onSelectChange1,
}"
/>
<div class="pa">
<a-pagination
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize1"
:current="currentPage1"
:total="tableDataTotal1"
class="pagination"
/>
</div> </div>
<div class="line"> </div>
</div>
</a-tab-pane>
<a-tab-pane key="3" tab="受众关联">
<div class="tab1">
<div class="t1">
<div class="nameinp">
<div class="namee">选择受众</div>
<div class="select">
<a-select
v-model:value="choosevalue"
style="width: 200px; border-radius: 8px"
placeholder="请输入组织名称"
:options="organizeList1"
/>
</div>
</div>
</div>
<div class="t1" style="margin-top: 10px">
<div class="organize">姓名</div>
<a-input
v-model:value="nameaddd"
style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名"
/>
</div>
</div>
<div class="btns">
<div class="btn1">
<div class="img1">
<img src="../../assets/images/courseManage/search0.png" />
</div>
<div class="wz">搜索</div>
</div>
<div class="btn2">
<div class="img2">
<img src="../../assets/images/courseManage/reset1.png" />
</div>
<div class="wz">重置</div>
</div>
</div>
<!-- <div class="line">
<div class="inline"> <div class="inline">
<div class="left1"> <div class="left1">
<div class="img"></div> <div class="img"></div>
@@ -146,21 +221,21 @@
</div> </div>
<div class="right1">清空</div> <div class="right1">清空</div>
</div> </div>
</div> </div> -->
<div class="tabb" style="margin-top: 16px"> <div class="tabb" style="margin-top: 16px">
<a-table <a-table
style="border: 1px solid #f2f6fe" style="border: 1px solid #f2f6fe"
:columns="tablecolumns1" :columns="tablecolumns2"
:data-source="tabledata1" :data-source="tabledata2"
:loading="tableDataTotal === -1 ? true : false" :loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true" expandRowByClick="true"
:scroll="{ x: 700, y: 400 }" :scroll="{ x: 500, y: 560 }"
@expand="expandTable" @expand="expandTable"
:pagination="false" :pagination="false"
:row-selection="{ :row-selection="{
columnWidth: 30, columnWidth: 30,
selectedRowKeys: selectedRowKeys, selectedRowKeys: selectedRowKeys2,
onChange: onSelectChange, onChange: onSelectChange2,
}" }"
/> />
<div class="pa"> <div class="pa">
@@ -168,9 +243,9 @@
showSizeChanger="true" showSizeChanger="true"
showQuickJumper="true" showQuickJumper="true"
hideOnSinglePage="true" hideOnSinglePage="true"
:pageSize="pageSize" :pageSize="pageSize2"
:current="currentPage" :current="currentPage2"
:total="tableDataTotal" :total="tableDataTotal2"
class="pagination" class="pagination"
/> />
</div> </div>
@@ -181,7 +256,11 @@
</div> </div>
<div class="right"> <div class="right">
<div class="onerow"> <div class="onerow">
<div class="onleft">
<div class="already">已选</div> <div class="already">已选</div>
<div class="count">6</div>
<div class="peo"></div>
</div>
<div class="clbox"> <div class="clbox">
<div class="colose"></div> <div class="colose"></div>
<span class="allclear">全部清除</span> <span class="allclear">全部清除</span>
@@ -238,47 +317,116 @@ export default {
pageSize: 10, pageSize: 10,
currentPage: 1, currentPage: 1,
tableDataTotal: 50, tableDataTotal: 50,
pageSize1: 10,
currentPage1: 1,
tableDataTotal1: 50,
pageSize2: 10,
currentPage2: 1,
tableDataTotal2: 50,
selectedRowKeys: [],
selectedRowKeys1: [],
selectedRowKeys2: [],
activeKey: "1", activeKey: "1",
name: "", //输入名字搜索
value: [], //级联选择框 value: [], //级联选择框
choosevalue: null, //受众选择 choosevalue: null, //受众选择
organizeList: [ valueSelect: null, //树形选择
name: "",
nameadd: "",
nameaddd: "",
treeData: [
{ {
id: 1, title: "京东方",
value: "京东方", value: "京东方",
label: "京东方",
children: [ children: [
{ {
id: 2, title: "产研部",
value: "产研部", value: "产研部",
label: "产研部",
children: [ children: [
{ {
id: 4, title: "产品部",
value: "产品部", value: "产品部",
label: "产品部门",
}, },
{ {
id: 5, title: "研究部",
value: "研发部门", value: "研究部",
label: "研发部门",
}, },
], ],
}, },
{ {
id: 3, title: "二级标题",
value: "人力资源部", value: "二级标题",
label: "人力资源部",
children: [ children: [
{ {
id: 6, title: "三级标题",
value: "人事部", value: "三级标题",
label: "人事部", children: [
{
title: "四级标题",
value: "四级标题",
children: [
{
title: "五级标题",
value: "五级标题",
children: [
{
title: "六级标题",
value: "六级标题",
children: [
{
title: "七级标题",
value: "七级标题",
children: [
{
title: "八级标题",
value: "八级标题",
children: [
{
title: "九级标题",
value: "九级标题",
children: [
{
title: "十级标题",
value: "十级标题",
children: [
{
title: "十一级标题",
value: "十一级标题",
children: [
{
title: "十二级标题",
value: "十二级标题",
},
],
},
],
},
],
},
],
},
],
},
],
},
],
},
],
},
],
},
],
}, },
{ {
id: 7, title: "人力资源部",
value: "人力资源部",
children: [
{
title: "人事部",
value: "人事部",
},
{
title: "行政部",
value: "行政部", value: "行政部",
label: "行政部",
}, },
], ],
}, },
@@ -290,55 +438,64 @@ export default {
key: 1, key: 1,
name: "小李", name: "小李",
bum: "产研部", bum: "产研部",
gangw: "产品经理", numb: "000000",
guishu: "",
}, },
{ {
key: 2, key: 2,
name: "小刘", name: "小刘",
bum: "产研部", bum: "产研部",
gangw: "产品经理", numb: "000000",
guishu: "",
}, },
{ {
key: 3, key: 3,
name: "小李", name: "小李",
bum: "产研部", bum: "产研部",
gangw: "产品经理", numb: "000000",
guishu: "",
}, },
{ {
key: 4, key: 4,
name: "小李", name: "小李",
bum: "产研部", bum: "产研部",
gangw: "产品经理", numb: "000000",
guishu: "",
}, },
{ {
key: 5, key: 5,
name: "小李", name: "小李",
bum: "产研部", bum: "产研部",
gangw: "产品经理", numb: "000000",
guishu: "",
}, },
{ {
key: 6, key: 6,
name: "小李", name: "小李",
bum: "产研部", bum: "产研部",
gangw: "产品经理", numb: "000000",
guishu: "",
}, },
{ {
key: 7, key: 7,
name: "小李", name: "小李",
bum: "产研部", bum: "产研部",
gangw: "产品经理", numb: "000000",
guishu: "",
}, },
{ {
key: 8, key: 8,
name: "小李", name: "小李",
bum: "产研部", bum: "产研部",
gangw: "产品经理", numb: "000000",
guishu: "",
}, },
{ {
key: 9, key: 9,
name: "小李", name: "小李",
bum: "产研部", bum: "产研部",
gangw: "产品经理", numb: "000000",
guishu: "",
}, },
], ],
tablecolumns: [ tablecolumns: [
@@ -351,18 +508,26 @@ export default {
className: "h", className: "h",
}, },
{ {
title: "部门", title: "工号",
dataIndex: "bum", dataIndex: "numb",
key: "bum", key: "numb",
width: 45, width: 35,
align: "center", align: "center",
className: "h", className: "h",
}, },
{ {
title: "岗位", title: "归属组织",
dataIndex: "gangw", dataIndex: "guishu",
key: "gangw", key: "guishu",
width: 45, width: 30,
align: "center",
className: "h",
},
{
title: "部门",
dataIndex: "bum",
key: "bum",
width: 40,
align: "center", align: "center",
className: "h", className: "h",
}, },
@@ -370,56 +535,71 @@ export default {
tabledata1: [ tabledata1: [
{ {
key: 1, key: 1,
name: "学习受众", name: "小李",
time: "2022-10-31 23:12:00", bum: "产研部",
total: "1", numb: "000000",
state: "已发布", guishu: "",
type: "普通受众",
}, },
{ {
key: 2, key: 2,
name: "2", name: "小刘",
time: "2022-10-31 23:12:00", bum: "产研部",
total: "2", numb: "000000",
state: "已发布", guishu: "",
type: "普通受众",
}, },
{ {
key: 3, key: 3,
name: "mask", name: "小李",
time: "2022-10-31 23:12:00", bum: "产研部",
total: "1", numb: "000000",
state: "已发布", guishu: "",
type: "普通受众",
}, },
{ {
key: 4, key: 4,
name: "学习受众", name: "小李",
time: "2022-10-31 23:12:00", bum: "产研部",
total: "1", numb: "000000",
state: "已发布", guishu: "",
type: "普通受众",
}, },
{ {
key: 5, key: 5,
name: "学业受众", name: "小李",
time: "2022-10-31 23:12:00", bum: "产研部",
total: "2", numb: "000000",
state: "已发布", guishu: "",
type: "普通受众",
}, },
{ {
key: 6, key: 6,
name: "案例受众", name: "小李",
time: "2022-10-31 23:12:00", bum: "产研部",
total: "3", numb: "000000",
state: "已发布", guishu: "",
type: "普通受众", },
{
key: 7,
name: "小李",
bum: "产研部",
numb: "000000",
guishu: "",
},
{
key: 8,
name: "小李",
bum: "产研部",
numb: "000000",
guishu: "",
},
{
key: 9,
name: "小李",
bum: "产研部",
numb: "000000",
guishu: "",
}, },
], ],
tablecolumns1: [ tablecolumns1: [
{ {
title: "受众名称", title: "姓名",
dataIndex: "name", dataIndex: "name",
key: "name", key: "name",
width: 30, width: 30,
@@ -427,57 +607,168 @@ export default {
className: "h", className: "h",
}, },
{ {
title: "创建时间", title: "工号",
dataIndex: "time", dataIndex: "numb",
key: "time", key: "numb",
width: 35,
align: "center",
className: "h",
},
{
title: "归属组织",
dataIndex: "guishu",
key: "guishu",
width: 30,
align: "center",
className: "h",
},
{
title: "部门",
dataIndex: "bum",
key: "bum",
width: 40, width: 40,
align: "center", align: "center",
className: "h", className: "h",
}, },
],
tabledata2: [
{ {
title: "人数", key: 1,
dataIndex: "total", name: "小李",
key: "total", bum: "产研部",
width: 20, numb: "000000",
align: "center", guishu: "",
className: "h",
}, },
{ {
title: "状态", key: 2,
dataIndex: "state", name: "小刘",
key: "state", bum: "产研部",
width: 20, numb: "000000",
align: "center", guishu: "",
className: "h",
}, },
{ {
title: "类型", key: 3,
dataIndex: "type", name: "小李",
key: "type", bum: "产研部",
numb: "000000",
guishu: "",
},
{
key: 4,
name: "小李",
bum: "产研部",
numb: "000000",
guishu: "",
},
{
key: 5,
name: "小李",
bum: "产研部",
numb: "000000",
guishu: "",
},
{
key: 6,
name: "小李",
bum: "产研部",
numb: "000000",
guishu: "",
},
{
key: 7,
name: "小李",
bum: "产研部",
numb: "000000",
guishu: "",
},
{
key: 8,
name: "小李",
bum: "产研部",
numb: "000000",
guishu: "",
},
{
key: 9,
name: "小李",
bum: "产研部",
numb: "000000",
guishu: "",
},
],
tablecolumns2: [
{
title: "姓名",
dataIndex: "name",
key: "name",
width: 30, width: 30,
align: "left",
className: "h",
},
{
title: "工号",
dataIndex: "numb",
key: "numb",
width: 35,
align: "center",
className: "h",
},
{
title: "归属组织",
dataIndex: "guishu",
key: "guishu",
width: 30,
align: "center",
className: "h",
},
{
title: "部门",
dataIndex: "bum",
key: "bum",
width: 40,
align: "center", align: "center",
className: "h", className: "h",
}, },
], ],
organizeList1: [ organizeList1: [
{ {
value: "项目一", value: "产品受众群体",
label: "项目一", label: "产品受众群体",
},
{
value: "人力资源hrbp",
label: "人力资源hrbp",
}, },
], ],
}); });
const closeDrawer = () => { const closeDrawer = () => {
state.activeKey = "1";
ctx.emit("update:ProjOwnervisible", false); ctx.emit("update:ProjOwnervisible", false);
}; };
const afterVisibleChange = (bool) => { const afterVisibleChange = (bool) => {
console.log("state", bool); console.log("state", bool);
}; };
const onSelectChange = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys;
};
const onSelectChange1 = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys;
};
const onSelectChange2 = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys;
};
return { return {
...toRefs(state), ...toRefs(state),
afterVisibleChange, afterVisibleChange,
closeDrawer, closeDrawer,
onSelectChange,
onSelectChange1,
onSelectChange2,
// change, // change,
}; };
}, },
@@ -486,25 +777,18 @@ export default {
<style lang="scss"> <style lang="scss">
.ProjOwnership { .ProjOwnership {
// .ant-drawer-content-wrapper {
// // max-width: 1000px;
// .ant-drawer-header {
// display: none !important;
// }
// .ant-drawer-body {
// padding: 0;
// }
// }
.drawerMain { .drawerMain {
min-width: 600px; min-width: 550px;
margin: 0px 32px 0px 32px; margin: 0px 32px 0px 32px;
overflow-x: scroll; // overflow-y: scroll;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.header { .header {
height: 73px; height: 73px;
border-bottom: 1px solid #e8e8e8; border-bottom: 1px solid #e8e8e8;
display: flex; display: flex;
flex-shrink: 0;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
// background-color: red; // background-color: red;
@@ -519,11 +803,12 @@ export default {
} }
.main { .main {
display: flex; display: flex;
height: 80%; // height: 80%;
margin-bottom: 72px;
overflow-y: auto;
.left { .left {
// overflow-y: auto;
width: 65%; width: 65%;
height: 100%; // height: 100%;
border-right: 1px solid rgba(233, 233, 233, 1); border-right: 1px solid rgba(233, 233, 233, 1);
.tabs { .tabs {
margin-right: 33px; margin-right: 33px;
@@ -531,6 +816,12 @@ export default {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
align-items: center;
.t1 {
display: flex;
align-items: center;
margin-bottom: 5px;
}
.nameinp { .nameinp {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -578,6 +869,43 @@ export default {
} }
} }
} }
.btns {
display: flex;
margin-top: 10px;
.btn1 {
width: 100px;
height: 40px;
margin-right: 16px;
display: flex;
align-items: center;
justify-content: center;
color: #ffffff;
font-size: 14px;
background: #409eff;
border-radius: 8px;
border: 1px solid #409eff;
cursor: pointer;
.wz {
margin-left: 10px;
}
}
.btn2 {
width: 100px;
height: 40px;
display: flex;
align-items: center;
justify-content: center;
color: #409eff;
font-size: 14px;
background: #ffffff;
border-radius: 8px;
cursor: pointer;
border: 1px solid #409eff;
.wz {
margin-left: 10px;
}
}
}
.line { .line {
width: 100%; width: 100%;
height: 40px; height: 40px;
@@ -672,18 +1000,39 @@ export default {
justify-content: center; justify-content: center;
// position: absolute; // position: absolute;
// bottom: 20px; // bottom: 20px;
.ant-pagination-item,
.ant-pagination-prev,
.ant-pagination-next,
.ant-pagination-options {
margin-bottom: 10px;
} }
} }
}
.tab2 { .tab2 {
display: flex; display: flex;
align-items: center; align-items: center;
margin-top: 10px; margin-top: 10px;
flex-wrap: wrap;
justify-content: space-between;
.t1 {
display: flex;
align-items: center;
margin-bottom: 5px;
}
.organize { .organize {
color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
font-size: 14px; font-size: 14px;
white-space: nowrap;
}
.ant-select-dropdown {
min-width: 800px !important;
} }
.ant-select { .ant-select {
border-radius: 8px !important; border-radius: 8px !important;
// background-color: red;
} }
.ant-cascader { .ant-cascader {
width: 264px; width: 264px;
@@ -697,6 +1046,46 @@ export default {
} }
} }
} }
.searchdown {
.btns {
display: flex;
margin-top: 10px;
.btn1 {
width: 100px;
height: 40px;
margin-right: 16px;
display: flex;
align-items: center;
justify-content: center;
color: #ffffff;
font-size: 14px;
background: #409eff;
border-radius: 8px;
border: 1px solid #409eff;
cursor: pointer;
.wz {
margin-left: 10px;
}
}
.btn2 {
width: 100px;
height: 40px;
display: flex;
align-items: center;
justify-content: center;
color: #409eff;
font-size: 14px;
background: #ffffff;
border-radius: 8px;
cursor: pointer;
border: 1px solid #409eff;
.wz {
margin-left: 10px;
}
}
}
}
} }
} }
.right { .right {
@@ -707,6 +1096,9 @@ export default {
align-items: center; align-items: center;
margin-right: 40px; margin-right: 40px;
flex-wrap: wrap; flex-wrap: wrap;
.onleft {
display: flex;
text-align: center;
.already { .already {
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
font-size: 16px; font-size: 16px;
@@ -715,6 +1107,17 @@ export default {
white-space: nowrap; white-space: nowrap;
// margin-bottom: 20px; // margin-bottom: 20px;
} }
.count {
color: #388be1;
font-size: 16px;
margin: 0 6px;
}
.peo {
color: rgba(51, 51, 51, 1);
font-size: 16px;
font-weight: 500;
}
}
.clbox { .clbox {
margin-left: 30px; margin-left: 30px;
display: flex; display: flex;
@@ -765,7 +1168,6 @@ export default {
background-image: url(../../assets/images/basicinfo/ch.png); background-image: url(../../assets/images/basicinfo/ch.png);
right: -8px; right: -8px;
top: -8px; top: -8px;
cursor: pointer;
} }
} }
} }
@@ -775,6 +1177,7 @@ export default {
height: 72px; height: 72px;
width: 100%; width: 100%;
position: absolute; position: absolute;
background-color: #fff;
bottom: 0; bottom: 0;
left: 0; left: 0;
display: flex; display: flex;
@@ -803,4 +1206,14 @@ export default {
} }
} }
} }
.changetreedropdown {
width: 550px !important;
}
.ant-select-tree-list-scrollbar {
width: 5px !important;
.ant-select-tree-list-scrollbar-thumb {
background-color: #4ea6ff !important;
}
}
</style> </style>

View File

@@ -672,12 +672,18 @@
<proj-owner-ship v-model:ProjOwnervisible="ProjOwnervisible" /> <proj-owner-ship v-model:ProjOwnervisible="ProjOwnervisible" />
<!-- 授权名单抽屉 --> <!-- 授权名单抽屉 -->
<proj-power-list v-model:ProjPvisible="ProjPvisible" /> <proj-power-list v-model:ProjPvisible="ProjPvisible" />
<!-- 查看权抽屉 -->
<proj-check-ship v-model:ProjCheckvisible="ProjCheckvisible" />
<!-- 管理权抽屉 -->
<proj-manage-ship v-model:ProjManagevisible="ProjManagevisible" />
</div> </div>
</template> </template>
<script> <script>
import { reactive, toRefs, onMounted } from "vue"; import { reactive, toRefs, onMounted } from "vue";
import ProjOwnerShip from "../../components/drawers/ProjectOwn"; import ProjOwnerShip from "../../components/drawers/ProjectOwn";
import ProjPowerList from "../../components/drawers/ProjPowerList"; import ProjPowerList from "../../components/drawers/ProjPowerList";
import ProjCheckShip from "../../components/drawers/ProjCheckPower";
import ProjManageShip from "../../components/drawers/ProjManagePower";
const columns = [ const columns = [
{ {
title: "项目名称", title: "项目名称",
@@ -734,7 +740,7 @@ const columns = [
export default { export default {
name: "projectManage", name: "projectManage",
components: { ProjOwnerShip, ProjPowerList }, components: { ProjOwnerShip, ProjPowerList, ProjCheckShip, ProjManageShip },
setup() { setup() {
const state = reactive({ const state = reactive({
projectNameList: [ projectNameList: [
@@ -1027,6 +1033,8 @@ export default {
closeBack: false, //撤回弹窗关闭图标 closeBack: false, //撤回弹窗关闭图标
ProjOwnervisible: false, ProjOwnervisible: false,
ProjPvisible: false, ProjPvisible: false,
ProjCheckvisible: false,
ProjManagevisible: false,
}); });
onMounted(() => { onMounted(() => {
@@ -1076,10 +1084,23 @@ export default {
</div> </div>
</a-select-option> </a-select-option>
<a-select-option value="查看权" label="查看权"> <a-select-option value="查看权" label="查看权">
<div>查看权</div> <div
onClick={() => {
console.log("点击了111");
showProjCheck();
}}
>
查看权
</div>
</a-select-option> </a-select-option>
<a-select-option value="管理权" label="管理权"> <a-select-option value="管理权" label="管理权">
<div>管理权</div> <div
onClick={() => {
showProjManage();
}}
>
管理权
</div>
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
@@ -1144,10 +1165,23 @@ export default {
</div> </div>
</a-select-option> </a-select-option>
<a-select-option value="查看权" label="查看权"> <a-select-option value="查看权" label="查看权">
<div>查看权</div> <div
onClick={() => {
console.log("点击了111");
showProjCheck();
}}
>
查看权
</div>
</a-select-option> </a-select-option>
<a-select-option value="管理权" label="管理权"> <a-select-option value="管理权" label="管理权">
<div>管理权</div> <div
onClick={() => {
showProjManage();
}}
>
管理权
</div>
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
@@ -1191,10 +1225,23 @@ export default {
</div> </div>
</a-select-option> </a-select-option>
<a-select-option value="查看权" label="查看权"> <a-select-option value="查看权" label="查看权">
<div>查看权</div> <div
onClick={() => {
console.log("点击了111");
showProjCheck();
}}
>
查看权
</div>
</a-select-option> </a-select-option>
<a-select-option value="管理权" label="管理权"> <a-select-option value="管理权" label="管理权">
<div>管理权</div> <div
onClick={() => {
showProjManage();
}}
>
管理权
</div>
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
@@ -1253,10 +1300,23 @@ export default {
</div> </div>
</a-select-option> </a-select-option>
<a-select-option value="查看权" label="查看权"> <a-select-option value="查看权" label="查看权">
<div>查看权</div> <div
onClick={() => {
console.log("点击了111");
showProjCheck();
}}
>
查看权
</div>
</a-select-option> </a-select-option>
<a-select-option value="管理权" label="管理权"> <a-select-option value="管理权" label="管理权">
<div>管理权</div> <div
onClick={() => {
showProjManage();
}}
>
管理权
</div>
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
@@ -1321,10 +1381,23 @@ export default {
</div> </div>
</a-select-option> </a-select-option>
<a-select-option value="查看权" label="查看权"> <a-select-option value="查看权" label="查看权">
<div>查看权</div> <div
onClick={() => {
console.log("点击了111");
showProjCheck();
}}
>
查看权
</div>
</a-select-option> </a-select-option>
<a-select-option value="管理权" label="管理权"> <a-select-option value="管理权" label="管理权">
<div>管理权</div> <div
onClick={() => {
showProjManage();
}}
>
管理权
</div>
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
@@ -1371,10 +1444,23 @@ export default {
</div> </div>
</a-select-option> </a-select-option>
<a-select-option value="查看权" label="查看权"> <a-select-option value="查看权" label="查看权">
<div>查看权</div> <div
onClick={() => {
console.log("点击了111");
showProjCheck();
}}
>
查看权
</div>
</a-select-option> </a-select-option>
<a-select-option value="管理权" label="管理权"> <a-select-option value="管理权" label="管理权">
<div>管理权</div> <div
onClick={() => {
showProjManage();
}}
>
管理权
</div>
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
@@ -1432,10 +1518,23 @@ export default {
</div> </div>
</a-select-option> </a-select-option>
<a-select-option value="查看权" label="查看权"> <a-select-option value="查看权" label="查看权">
<div>查看权</div> <div
onClick={() => {
console.log("点击了111");
showProjCheck();
}}
>
查看权
</div>
</a-select-option> </a-select-option>
<a-select-option value="管理权" label="管理权"> <a-select-option value="管理权" label="管理权">
<div>管理权</div> <div
onClick={() => {
showProjManage();
}}
>
管理权
</div>
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
@@ -1510,10 +1609,23 @@ export default {
</div> </div>
</a-select-option> </a-select-option>
<a-select-option value="查看权" label="查看权"> <a-select-option value="查看权" label="查看权">
<div>查看权</div> <div
onClick={() => {
console.log("点击了111");
showProjCheck();
}}
>
查看权
</div>
</a-select-option> </a-select-option>
<a-select-option value="管理权" label="管理权"> <a-select-option value="管理权" label="管理权">
<div>管理权</div> <div
onClick={() => {
showProjManage();
}}
>
管理权
</div>
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
@@ -1595,10 +1707,23 @@ export default {
</div> </div>
</a-select-option> </a-select-option>
<a-select-option value="查看权" label="查看权"> <a-select-option value="查看权" label="查看权">
<div>查看权</div> <div
onClick={() => {
console.log("点击了111");
showProjCheck();
}}
>
查看权
</div>
</a-select-option> </a-select-option>
<a-select-option value="管理权" label="管理权"> <a-select-option value="管理权" label="管理权">
<div>管理权</div> <div
onClick={() => {
showProjManage();
}}
>
管理权
</div>
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
@@ -1679,10 +1804,23 @@ export default {
</div> </div>
</a-select-option> </a-select-option>
<a-select-option value="查看权" label="查看权"> <a-select-option value="查看权" label="查看权">
<div>查看权</div> <div
onClick={() => {
console.log("点击了111");
showProjCheck();
}}
>
查看权
</div>
</a-select-option> </a-select-option>
<a-select-option value="管理权" label="管理权"> <a-select-option value="管理权" label="管理权">
<div>管理权</div> <div
onClick={() => {
showProjManage();
}}
>
管理权
</div>
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
@@ -1771,10 +1909,23 @@ export default {
</div> </div>
</a-select-option> </a-select-option>
<a-select-option value="查看权" label="查看权"> <a-select-option value="查看权" label="查看权">
<div>查看权</div> <div
onClick={() => {
console.log("点击了111");
showProjCheck();
}}
>
查看权
</div>
</a-select-option> </a-select-option>
<a-select-option value="管理权" label="管理权"> <a-select-option value="管理权" label="管理权">
<div>管理权</div> <div
onClick={() => {
showProjManage();
}}
>
管理权
</div>
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
@@ -1849,10 +2000,23 @@ export default {
</div> </div>
</a-select-option> </a-select-option>
<a-select-option value="查看权" label="查看权"> <a-select-option value="查看权" label="查看权">
<div>查看权</div> <div
onClick={() => {
console.log("点击了111");
showProjCheck();
}}
>
查看权
</div>
</a-select-option> </a-select-option>
<a-select-option value="管理权" label="管理权"> <a-select-option value="管理权" label="管理权">
<div>管理权</div> <div
onClick={() => {
showProjManage();
}}
>
管理权
</div>
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
@@ -1934,10 +2098,23 @@ export default {
</div> </div>
</a-select-option> </a-select-option>
<a-select-option value="查看权" label="查看权"> <a-select-option value="查看权" label="查看权">
<div>查看权</div> <div
onClick={() => {
console.log("点击了111");
showProjCheck();
}}
>
查看权
</div>
</a-select-option> </a-select-option>
<a-select-option value="管理权" label="管理权"> <a-select-option value="管理权" label="管理权">
<div>管理权</div> <div
onClick={() => {
showProjManage();
}}
>
管理权
</div>
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
@@ -2019,10 +2196,23 @@ export default {
</div> </div>
</a-select-option> </a-select-option>
<a-select-option value="查看权" label="查看权"> <a-select-option value="查看权" label="查看权">
<div>查看权</div> <div
onClick={() => {
console.log("点击了111");
showProjCheck();
}}
>
查看权
</div>
</a-select-option> </a-select-option>
<a-select-option value="管理权" label="管理权"> <a-select-option value="管理权" label="管理权">
<div>管理权</div> <div
onClick={() => {
showProjManage();
}}
>
管理权
</div>
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
@@ -2115,10 +2305,23 @@ export default {
</div> </div>
</a-select-option> </a-select-option>
<a-select-option value="查看权" label="查看权"> <a-select-option value="查看权" label="查看权">
<div>查看权</div> <div
onClick={() => {
console.log("点击了111");
showProjCheck();
}}
>
查看权
</div>
</a-select-option> </a-select-option>
<a-select-option value="管理权" label="管理权"> <a-select-option value="管理权" label="管理权">
<div>管理权</div> <div
onClick={() => {
showProjManage();
}}
>
管理权
</div>
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
@@ -2319,6 +2522,12 @@ export default {
const showProjPrower = () => { const showProjPrower = () => {
state.ProjPvisible = true; state.ProjPvisible = true;
}; };
const showProjCheck = () => {
state.ProjCheckvisible = true;
};
const showProjManage = () => {
state.ProjManagevisible = true;
};
return { return {
...toRefs(state), ...toRefs(state),
columns, columns,
@@ -2345,6 +2554,8 @@ export default {
getTableDate, getTableDate,
showProjOwner, showProjOwner,
showProjPrower, showProjPrower,
showProjCheck,
showProjManage,
}; };
}, },
}; };

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;