Skip to content

C
conferenceLy
提交 84906ed7 authored 作者: FC's avatar FC
浏览文件
操作

合并分支 'fc' 到 'master'

Fc 查看合并请求 !26
上级 6860fd66 d025eb4d
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 378 行增加 和 260 行删除
src/assets/img/signA.png
查看替换文件 @ 6860fd66 浏览文件 @ 84906ed7
src/assets/img/signA.png

46.3 KB | W: | H:

src/assets/img/signA.png

22.8 KB | W: | H:

src/assets/img/signA.png
src/assets/img/signA.png
src/assets/img/signA.png
src/assets/img/signA.png
  • 2-up
  • Swipe
  • Onion skin
src/axios/services.js
浏览文件 @ 84906ed7
差异被折叠。
src/router/index.js
浏览文件 @ 84906ed7
......@@ -225,7 +225,7 @@ const routes = [
redirect: '/system/power/jurisdiction',
beforeEnter: (to, from, next) => {
let sysRoles = sessionStorage.getItem('sysRoles')
console.log(sysRoles);
// console.log(sysRoles);
switch (sysRoles) {
case 'ROLE_SUPERADMIN':
next()
......@@ -277,7 +277,10 @@ const routes = [
path: '/',
name: 'unitEmpower',
component: () =>
import('../views/system/unitEmpower.vue')
import('../views/system/unitEmpower.vue'),
meta: {
title: '',
},
},
{
path: 'unitLibrary',
......@@ -292,7 +295,7 @@ const routes = [
],
beforeEnter: (to, from, next) => {
let sysRoles = sessionStorage.getItem('sysRoles')
console.log(sysRoles);
// console.log(sysRoles);
switch (sysRoles) {
case 'ROLE_SUPERADMIN':
next()
......@@ -434,17 +437,17 @@ const routes = [
},
},
{
path: 'templateLibrary',
name: 'templateLibrary',
component: () =>
import(
'../views/system/templateLibrary.vue'
),
meta: {
title: '模板库管理',
},
},
// {
// path: 'templateLibrary',
// name: 'templateLibrary',
// component: () =>
// import(
// '../views/system/templateLibrary.vue'
// ),
// meta: {
// title: '模板库管理',
// },
// },
{
path: 'leaderLibrary',
name: 'leaderLibrary',
......
src/views/home.vue
浏览文件 @ 84906ed7
......@@ -2,31 +2,20 @@
<div class="home">
<div class="home_btn" @click="hideGuide" v-show="$store.state.showImageFlag"></div>
<div class="home_loadings" v-show="$store.state.showImageFlag"></div>
<div
class="app_header"
:class="
$route.meta.title === 'prepare' ||
<div class="app_header" :class="$route.meta.title === 'prepare' ||
$route.meta.title == '会议查看' ||
$route.meta.title == '会议配置' ||
$route.meta.title == 'chooseModule'
? 'app_header_shrink'
: 'app_header_normal'
"
>
? 'app_header_shrink'
: 'app_header_normal'
">
<div class="app_header_left" @click="toHome">
<img src="../assets/img/header_img.png" alt />
<span>会议智能管理系统</span>
</div>
<div class="header_router">
<router-link
class="router_div"
active-class="active_link"
tag="div"
v-for="(i, index) in router_link"
:key="index"
:to="i.path"
>
<router-link class="router_div" active-class="active_link" tag="div" v-for="(i, index) in router_link"
:key="index" :to="i.path">
<span>{{ i.value }}</span>
<div class="bottom_border"></div>
</router-link>
......@@ -58,15 +47,12 @@
</div>
</div>
</div>
<div
:class="
$route.meta.title === 'prepare' ||
<div :class="$route.meta.title === 'prepare' ||
$route.meta.title === '会议配置' ||
$route.meta.title == 'chooseModule'
? 'expend'
: 'normal'
"
>
? 'expend'
: 'normal'
">
<router-view />
</div>
</div>
......@@ -140,14 +126,14 @@ export default {
}
let sysRoles = sessionStorage.getItem('sysRoles')
switch (sysRoles) {
switch (sysRoles) {
case 'ROLE_SUPERADMIN':
break
case 'ROLE_XITONGADMIN':
break
break
case 'ROLE_HUIYIADMIN':
break
break
case 'ROLE_HUIYISHIADMIN':
this.router_link = [
{
......@@ -164,15 +150,14 @@ export default {
break
default:
this.$router.push({ path: '/login' })
}
console.log('sysRoles',this.router_link);
},
methods: {
toClick(val) {
console.log(val,this.router_link);
toClick(val) {
console.log(val, this.router_link);
},
hideGuide() {
this.$store.commit('changeShowImage', false)
......@@ -188,7 +173,7 @@ export default {
sessionStorage.setItem('userNDirection2', 2)
}
})
.catch((err) => {})
.catch((err) => { })
},
toHome() {
if (sessionStorage.getItem('sysRoles') != 'ROLE_HUIYISHIADMIN') {
......@@ -229,9 +214,11 @@ export default {
cursor: pointer;
color: #d1d5da;
}
.el-icon-arrow-down {
font-size: 12px;
}
.home_btn {
position: absolute;
width: 190px;
......@@ -241,6 +228,7 @@ export default {
z-index: 120;
cursor: pointer;
}
.home_loadings {
width: 100%;
height: 100%;
......@@ -250,6 +238,7 @@ export default {
position: fixed;
z-index: 100;
}
.out_button {
text-align: center;
width: 80px;
......@@ -266,34 +255,43 @@ export default {
from {
height: calc(100% - 74px);
}
to {
height: calc(100% - 10px);
}
}
@keyframes shrink {
from {
height: 74px;
}
to {
height: 10px;
}
}
to {
height: 10px;
}
@keyframes opacity {
from {
opacity: 1;
}
to {
opacity: 0;
}
}
.home {
height: 100%;
.app_header_shrink {
animation: shrink 1s linear;
height: 10px;
.app_header_left,
.app_header_right,
.header_router {
......@@ -301,9 +299,11 @@ to {
animation: opacity 1s linear;
}
}
.app_header_normal {
height: 74px;
}
.app_header {
background: #2348a3;
display: flex;
......@@ -311,10 +311,12 @@ to {
align-items: center;
padding: 0px 20px;
position: relative;
.header_router {
position: absolute;
display: flex;
left: 510px;
.router_div {
// width: 152px;
padding: 0px 35px;
......@@ -326,10 +328,12 @@ to {
line-height: 74px;
text-align: center;
}
.router_div:hover,
.active_link {
background: rgba(255, 255, 255, 0.1);
position: relative;
.bottom_border {
position: absolute;
bottom: 2px;
......@@ -341,6 +345,7 @@ to {
}
}
}
.app_header_left {
display: flex;
align-items: center;
......@@ -351,6 +356,7 @@ to {
text-shadow: 2px 3px 0px rgba(255, 255, 255, 0.2);
cursor: pointer;
letter-spacing: 2px;
img {
margin-left: 20px;
width: 36px;
......@@ -358,10 +364,12 @@ to {
margin-right: 16px;
}
}
.app_header_right {
display: flex;
height: 100%;
align-items: center;
.router_nav {
line-height: 40px;
display: inline-block;
......@@ -373,6 +381,7 @@ to {
box-shadow: 0px 2px 6px 0px rgba(35, 53, 117, 0.3);
border-radius: 6px;
}
.user_name {
margin: 0px 20px;
margin-right: 10px;
......@@ -381,11 +390,13 @@ to {
border-radius: 50%;
overflow: hidden;
border: 1px solid #fff;
img {
width: 100%;
height: 100%;
}
}
.user_out {
width: 90px;
white-space: nowrap;
......@@ -396,12 +407,13 @@ to {
}
}
}
.expend {
animation: expend 1s linear;
height: calc(100% - 10px);
}
.normal {
height: calc(100% - 74px);
}
}
</style>
\ No newline at end of file
}</style>
\ No newline at end of file
src/views/meeting/componets/MeetingItem.vue
浏览文件 @ 84906ed7
......@@ -8,10 +8,10 @@
</div>
</div>
<div class="meeting_item item" :class="[
{ green_item: item.processStatus === 1 },
{ orange_item: item.processStatus === 2 },
{ blue_item: item.processStatus === 3 },
]" v-for="(item, index) of meetingLists " :key="index" @click="enterConf(item)">
{ green_item: item.processStatus === 1 },
{ orange_item: item.processStatus === 2 },
{ blue_item: item.processStatus === 3 },
]" v-for="(item, index) of meetingLists " :key="index" @click="enterConf(item)">
<div class="meeting_item_part1">
<div class="meeting_item_text" v-if="flash">
<el-tooltip :content="item.processName" effect="light" placement="bottom"
......@@ -23,13 +23,13 @@
<time-record :startTime="item.processDate" :tagFlag="true"></time-record>
</div>
<div class="time_record" :class="new Date(item.processDate).getTime() - new Date().getTime() < 0
? 'overdue'
: ''
? 'overdue'
: ''
" @click.stop v-else>
<time-count-down :endTime="item.processDate" @modifyDate="modifyDate" :item="item" :tagFlag="new Date(item.processDate).getTime() - new Date().getTime() < 0
? false
: true
? false
: true
"></time-count-down>
</div>
</div>
......@@ -149,7 +149,7 @@ export default {
},
startConf(item) {
console.log(item)
this.$confirm(`会议主题：${item.processName} </br>确认”正式开始“？`, '提示', {
this.$confirm(`${item.processName} "正式开始"？`, '提示', {
customClass: 'message_box',
dangerouslyUseHTMLString: true,
confirmButtonText: '确定',
......@@ -183,10 +183,10 @@ export default {
})
},
closeConf(item) {
this.$confirm(`会议主题：${item.processName} </br>确认”结束“？`, '提示', {
this.$confirm(`${item.processName} "确认结束"？`, '提示', {
customClass: 'message_box',
dangerouslyUseHTMLString: true,
confirmButtonText: '关闭',
confirmButtonText: '确认',
cancelButtonText: '取消',
})
.then(() => {
......@@ -230,10 +230,10 @@ export default {
})
},
endConf(item) {
this.$confirm(`会议主题：${item.processName} </br>确认”关闭“？`, '提示', {
this.$confirm(`${item.processName} "确认关闭"？`, '提示', {
customClass: 'message_box',
dangerouslyUseHTMLString: true,
confirmButtonText: '关闭',
confirmButtonText: '确认',
cancelButtonText: '取消',
})
.then(() => {
......
src/views/meeting/componets/TimeCountDown.vue
浏览文件 @ 84906ed7
......@@ -55,7 +55,7 @@
<div style="text-align: center;">
<div>会议主题：{{ item.processName }} 预定时间已过期</div>
<div>确认“重新预定”</div>
<div class="tips">注：更换会议室需清空已排座数据；更换时间不清空已排座数据。</div>
<!-- <div class="tips">注：更换会议室需清空已排座数据；更换时间不清空已排座数据。</div> -->
</div>
<span slot="footer" class="dialog-footer">
......@@ -98,7 +98,7 @@ export default {
}
},
mounted() {
console.log('item', this.item)
this.countTime()
},
props: ['endTime', 'tagFlag', 'item'],
......@@ -160,7 +160,7 @@ export default {
if (d < 10) {
d = '0' + d
}
console.log(y + '-' + m + '-' + d)
return y + '-' + m + '-' + d
},
selectTime() {
......
src/views/meeting/operation/Administration/components/BatchAddDialog.vue
浏览文件 @ 84906ed7
<template>
<div>
<el-dialog
width="86%"
:before-close="handleClose"
:modal-append-to-body="false"
:title="changeFlags == 2 ? '新增参会单位授权' :changeFlags == 3?'关联参会人员': '批量补录人员'"
:visible.sync="visible"
:close-on-click-modal="false"
@close="handleClose"
>
<el-dialog width="86%" :before-close="handleClose" :modal-append-to-body="false"
:title="changeFlags == 2 ? '新增参会单位授权' : changeFlags == 3 ? '关联参会人员' : '批量补录人员'" :visible.sync="visible"
:close-on-click-modal="false" @close="handleClose">
<div class="main">
<div class="tree">
<el-tree
:props="treeData"
:load="loadNode"
highlight-current
lazy
@node-click="chooseRen"
></el-tree>
<el-tree ref="tree" :props="treeData" :load="loadNode" :highlight-current="highlightTreeNode" lazy
@node-click="chooseRen"></el-tree>
</div>
<div class="table_wrap">
<div class="header_search">
......@@ -25,14 +14,8 @@
<el-button size="medium" @click="searchPerson()">查询</el-button>
</div>
<span class="select_but" v-if="!selectPerson" @click="selectAll()">全选本页</span>
<el-table
:data="tableData"
stripe
ref="table"
class="template_table"
@row-click="handleRowClick"
v-loading="loading"
>
<el-table :data="tableData" stripe ref="table" class="template_table" @row-click="handleRowClick"
v-loading="loading">
<el-table-column type="index" width="50"></el-table-column>
<el-table-column prop="employeeName" label="姓名" width="150"></el-table-column>
<!-- <el-table-column label="手机号" width="200">
......@@ -83,26 +66,15 @@
<div v-if="!selectPerson && chosenTags" class="title">已选人员：{{ chosenTags.length }}人</div>
<div v-if="selectPerson" class="title">已选人员</div>
<div class="person">
<el-tag
v-for="tag in chosenTags"
:key="tag.employeeCode"
@close="removeTag(tag)"
closable
:disable-transitions="changeFlags == 2"
>{{ tag.employeeName }}</el-tag>
<el-tag v-for="tag in chosenTags" :key="tag.employeeCode" @close="removeTag(tag)" closable
:disable-transitions="changeFlags == 2">{{ tag.employeeName }}</el-tag>
</div>
</div>
</div>
<div class="ty_pagination">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:page-sizes="[10, 20, 30]"
:current-page="form.pageNum"
:page-size="form.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="count"
></el-pagination>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :page-sizes="[10, 20, 30]"
:current-page="form.pageNum" :page-size="form.pageSize" layout="total, sizes, prev, pager, next, jumper"
:total="count"></el-pagination>
</div>
<!-- <div class="search_wrap">-->
<!-- <el-input v-model="searchInfo"></el-input><el-button size="small" @click="search()">查询</el-button>-->
......@@ -128,7 +100,7 @@
<!-- </el-table>-->
<span slot="footer" class="dialog-footer">
<el-button plain v-if="!nextShow" @click="handleClose">取 消</el-button>
<el-button type="primary" v-if="!nextShow" @click="selectPerson?getPerson():confirm()">确 定</el-button>
<el-button type="primary" v-if="!nextShow" @click="selectPerson ? getPerson() : confirm()">确 定</el-button>
<el-button type="primary" v-if="nextShow" @click="Next()">下一步</el-button>
</span>
</el-dialog>
......@@ -166,6 +138,7 @@ export default {
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)',
},
highlightTreeNode: true,
}
},
components: {},
......@@ -290,9 +263,10 @@ export default {
this.count = res.data.data.totalElements
}
})
.catch((error) => {})
.catch((error) => { })
},
chooseRen(node) {
this.highlightTreeNode = true
this.loading = true
this.form.organizationCode = node.organizationCode
this.form.orgType = node.orgType
......@@ -350,7 +324,7 @@ export default {
})
}
})
.catch((reject) => {})
.catch((reject) => { })
} else {
let data = {
dingPersonShowVos: this.chosenTags,
......@@ -378,7 +352,7 @@ export default {
})
}
})
.catch((reject) => {})
.catch((reject) => { })
}
} else {
if (this.chosenTags[0]) {
......@@ -420,6 +394,9 @@ export default {
this.chosenTags = []
this.$emit('update:batchAddFlag', false)
}
console.log('tableData', this.tableData);
this.tableData = []
this.highlightTreeNode = false
},
},
watch: {
......@@ -446,27 +423,33 @@ export default {
height: 880px;
box-sizing: border-box;
margin-top: 0 !important;
.el-dialog__body {
position: relative;
height: calc(100% - 170px);
flex-direction: column;
align-items: self-start;
.header_search {
width: 400px;
display: flex;
.el-button {
margin-left: 10px;
}
}
.main {
height: 100%;
width: 100%;
display: flex;
margin-top: 10px;
/deep/ .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
/deep/ .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
background-color: #e5e5e5 !important;
font-weight: bold; // 字体加粗
}
.tree {
background: #f5f6f6;
box-shadow: 0px 0px 16px 0px rgba(84, 116, 235, 0.12);
......@@ -475,31 +458,38 @@ export default {
width: 290px;
overflow: auto;
padding: 10px;
.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
// 设置颜色
background-color: #e5e5e5 !important;
font-weight: bold; // 字体加粗
}
/deep/ .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
/deep/ .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
background-color: #e5e5e5 !important;
font-weight: bold; // 字体加粗
}
.el-tree {
background: #f5f6f6;
padding-right: 10px;
.el-tree-node__label {
color: rgba(17, 17, 17);
}
.el-tree-node__content:hover,
> .el-upload-list__item:hover {
>.el-upload-list__item:hover {
background-color: #e5e5e5;
}
}
}
.table_wrap {
width: calc(100% - 290px - 350px);
padding: 0 20px;
text-align: left;
.select_but {
cursor: pointer;
display: inline-block;
......@@ -513,15 +503,18 @@ export default {
font-size: 14px;
margin-top: 8px;
}
.el-table {
width: 100%;
height: calc(100% - 80px);
overflow-y: auto;
}
}
.person_wrap {
width: 350px;
background: #f7f8fd;
.title {
text-align: center;
height: 40px;
......@@ -529,10 +522,12 @@ export default {
line-height: 40px;
padding-left: 10px;
}
.person {
height: calc(100% - 40px);
overflow-y: auto;
padding: 10px;
.el-tag {
margin: 5px;
background: #ffffff;
......@@ -540,6 +535,7 @@ export default {
border-radius: 4px 4px 4px 4px;
color: rgba(1, 3, 3, 0.96);
border: none;
.el-icon-close:hover {
background-color: #f5f6f6;
}
......@@ -547,15 +543,18 @@ export default {
}
}
}
.ty_pagination {
position: absolute;
right: 380px;
bottom: -10px;
}
.search_wrap {
display: flex;
align-items: center;
margin-bottom: 10px;
.el-button {
margin-left: 20px;
}
......@@ -563,6 +562,7 @@ export default {
}
}
}
/deep/ .el-dialog__footer {
height: 110px;
box-sizing: border-box;
......@@ -570,6 +570,7 @@ export default {
display: flex;
align-items: center;
justify-content: center;
.el-button {
margin: 0 29px;
}
......
src/views/meeting/operation/Administration/components/PersonDialog.vue
浏览文件 @ 84906ed7
<template>
<div>
<el-dialog
class="dialog"
width="33%"
append-to-body
:before-close="dialogClose"
:title="dialogTitle"
:visible.sync="visible"
:close-on-click-modal="false"
@close="$emit('update: personFlag', false)"
>
<el-dialog class="dialog" width="33%" append-to-body :before-close="dialogClose" :title="dialogTitle"
:visible.sync="visible" :close-on-click-modal="false" @close="$emit('update: personFlag', false)">
<div v-if="dialogTitle === '核对人员'" class="tips_wrap">
通过手机号进行核对，（姓名、浙政钉）信息有错。
<br />确认“修改”的，按浙政钉进行同步人员信息。
<br />确认“不修改”的，原人员信息不变，且核对通过。
</div>
<el-form
ref="form"
:class="dialogTitle === '核对人员' ? 'checkForm' : ''"
:disabled="person.unitId != 0 && dialogTitle === '编辑人员'"
:model="person"
:rules="rules"
label-width="100px"
>
<el-form ref="form" :class="dialogTitle === '核对人员' ? 'checkForm' : ''"
:disabled="person.unitId != 0 && dialogTitle === '编辑人员'" :model="person" :rules="rules" label-width="100px">
<el-form-item label="姓名：" class="name_item checkItem" prop="name">
<!--checkState：1,已核对，不允许修改-->
<!-- <el-autocomplete-->
......@@ -81,49 +67,24 @@
<!-- </el-select>-->
<el-input v-model="person.unitName" placeholder="请输入" maxlength="50" show-word-limit></el-input>
</el-form-item>
<el-form-item label="联系电话：">
<el-input v-model="person.phone" maxlength="11" show-word-limit></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="medium" plain @click="dialogClose()">取 消</el-button>
<el-button
size="medium"
type="danger"
v-if="dialogTitle === '编辑人员'"
@click="removePerson()"
class="shanchu"
>删除</el-button>
<el-button
class="qingjia"
size="medium"
type="warning"
v-if="dialogTitle === '编辑人员' && $route.query.isProcess == 1"
@click="askLeave(person.signStatus)"
>{{ person.signStatus === 5 ? "取消请假" : "请假" }}</el-button>
<el-button
class="qveding"
size="medium"
type="primary"
v-if="dialogTitle === '新增人员'"
@click="newAddPerson()"
>确 定</el-button>
<el-button
size="medium"
type="primary"
v-if="dialogTitle === '核对人员'"
@click="unModifyPerson()"
>不修改</el-button>
<el-button
size="medium"
type="primary"
v-if="dialogTitle === '核对人员'"
@click="modifyPerson()"
>修 改</el-button>
<el-button size="medium" type="danger" v-if="dialogTitle === '编辑人员'" @click="removePerson()"
class="shanchu">删除</el-button>
<el-button class="qingjia" size="medium" type="warning"
v-if="dialogTitle === '编辑人员' && $route.query.isProcess == 1" @click="askLeave(person.signStatus)">{{
person.signStatus === 5 ? "取消请假" : "请假" }}</el-button>
<el-button class="qveding" size="medium" type="primary" v-if="dialogTitle === '新增人员'" @click="newAddPerson()">确
定</el-button>
<el-button size="medium" type="primary" v-if="dialogTitle === '核对人员'" @click="unModifyPerson()">不修改</el-button>
<el-button size="medium" type="primary" v-if="dialogTitle === '核对人员'" @click="modifyPerson()">修 改</el-button>
<!--编辑、更新人员的按钮-->
<el-button
size="medium"
type="primary"
v-if="dialogTitle === '编辑人员' || dialogTitle === '更新人员'"
@click="updatePerson()"
>确 定</el-button>
<el-button size="medium" type="primary" v-if="dialogTitle === '编辑人员' || dialogTitle === '更新人员'"
@click="updatePerson()">确 定</el-button>
</span>
</el-dialog>
</div>
......@@ -278,6 +239,7 @@ export default {
this.singlePerson.unitName = this.person.unitName
this.singlePerson.unitId = this.person.unitId
this.singlePerson.checkState = this.person.checkState
this.singlePerson.phone = this.person.phone
this.dialogTitle = this.title
this.$axios.postUpdatePerson(this.$route.query.processId, this.singlePerson, this.$route.query.isProcess).then((res) => {
console.log(res)
......@@ -500,28 +462,35 @@ export default {
.dialog /deep/ .el-dialog__body {
flex-direction: column !important;
}
.el-dialog__wrapper {
width: 100vw;
height: 100vh;
display: flex;
justify-content: center;
flex-direction: column;
/deep/ .el-dialog {
margin-top: 0 !important;
}
}
.el-form {
width: 76%;
margin-left: -40px;
}
/deep/ .el-form-item {
width: 100%;
}
.modifyItem {
display: none;
}
.checkForm .checkItem {
position: relative;
.modifyItem {
display: block;
position: absolute;
......@@ -536,18 +505,22 @@ export default {
line-height: 40px;
padding-left: 10px;
}
.el-autocomplete,
.el-input {
width: 50%;
}
}
.el-select,
.el-autocomplete,
.el-input {
width: 100%;
}
.name_item {
position: relative;
.change_but {
cursor: pointer;
position: absolute;
......@@ -564,6 +537,7 @@ export default {
text-align: center;
}
}
/*/deep/ .el-autocomplete-suggestion{*/
/* li {*/
/* line-height: normal;*/
......@@ -589,16 +563,20 @@ export default {
.el-button {
margin: 0 28px;
}
.shanchu {
box-shadow: 0px 2px 10px 0px rgba(226, 79, 81, 0.3) !important;
}
.qingjia {
box-shadow: 0px 2px 10px 0px rgba(250, 178, 0, 0.3) !important;
}
.qveding {
box-shadow: 0px 2px 10px 0px rgba(84, 116, 235, 0.3);
}
}
.tips_wrap {
width: 552px;
height: auto;
......
src/views/meeting/operation/divideArea/index.vue
浏览文件 @ 84906ed7
......@@ -39,7 +39,7 @@
{ outnumberArea: item.areaPersonnelExpectNum > item.seatNum },
]" :style="`backgroundColor:${activeIndex === index ? item.areaColour : '#fff'
};
--yf-border-color:${item.areaColour}`"
--yf-border-color:${item.areaColour}`"
v-for="(item, index) of confData.confPersonAreaVos" @click="chooseArea(item, index)" :id="item.id">
<!-- <div-->
<!-- class="outnumber"-->
......@@ -909,6 +909,8 @@ export default {
})
// this.personData = this.allPersonData.slice(0,20)
// console.log;
console.log('val', this.chooseArea(this.confData.confPersonAreaVos[val], val));
// if(val)
this.chooseArea(this.confData.confPersonAreaVos[val], val)
// if (val) {
// this.chooseArea(this.confData.confPersonAreaVos[val], val)
......@@ -1097,7 +1099,7 @@ export default {
console.log(res)
if (res.data.code === 200) {
this.disableFlag = true
this.init()
this.init(0)
this.$store.commit('changeSaveFlag', true)
if (JSON.stringify(this.confData) !== JSON.stringify(this.copyData)) {
this.$store.commit('changeUpdateFlag', false)
......@@ -1193,7 +1195,9 @@ export default {
message: '新增区域成功！',
type: 'success',
})
this.init()
console.log('active', this.activeIndex);
this.init(this.activeIndex)
let oDom = document.querySelector('.selection_right_but_wrap')
this.$nextTick(() => {
oDom.scrollTop = oDom.scrollHeight
......@@ -1337,7 +1341,7 @@ export default {
// this.dragReleaseAreaDiv.getElementsByClassName("area_text")[0]
// .firstChild.data; //分组名称
// }
console.log(this.dragReleaseAreaDiv.id)
console.log('active', this.activeIndex)
if (this.activeIndex !== 0 && this.dragReleaseAreaDiv.id === this.confData.confPersonAreaVos[this.activeIndex].id) {
return false
}
......@@ -1616,9 +1620,11 @@ export default {
}
},
chooseArea(item, index) {
console.log(item, index)
this.allPersonFlag = false
this.activeIndex = index
this.info = ''
this.showPersonData = this.confData.confPersonAreaVos[index].personData
this.chosenArea = item
......
src/views/meeting/operation/noticeMeeting/addNoticeUnitDialog.vue
浏览文件 @ 84906ed7
<template>
<div>
<el-dialog title="增加通知单位" :visible.sync="visible" :before-close="dialogTableHandleClose" append-to-body
class="table_dialog" width="1100px">
<el-dialog title="增加通知单位" :visible.sync="visible" :close-on-click-modal="false" :before-close="dialogTableHandleClose"
append-to-body class="table_dialog" width="1100px">
<div class="body">
<div class="top">
<el-form ref="form" :model="form" label-width="110px" :inline="true">
......@@ -24,7 +24,7 @@
<el-table :data="tableData" height="100%" stripe>
<el-table-column property="unitName" label="参会单位（权限专用）"></el-table-column>
<el-table-column property="personName" label="单位联系人"></el-table-column>
<el-table-column property="dingId" label="联系人浙政钉"></el-table-column>
<!-- <el-table-column property="dingId" label="联系人浙政钉"></el-table-column> -->
<el-table-column property="unitTel" label="单位联系电话"></el-table-column>
<el-table-column property="address" label="操作" class="caozuo">
<template slot-scope="scope">
......@@ -184,12 +184,28 @@ export default {
</script>
<style lang="less" scoped>
.el-dialog {
/deep/.el-dialog__wrapper {
// width: 100vw;
// height: 100vh;
// display: flex;
// justify-content: center;
// flex-direction: column;
}
/deep/.el-dialog {
.el-dialog__body {
// padding: 10px 10px !important;
}
.body {
width: 100%;
display: flex;
flex-direction: column;
.top {
// width: 100%;
......
src/views/meeting/operation/noticeMeeting/lableTable.vue
浏览文件 @ 84906ed7
<template>
<div>
<el-dialog title="增加通知单位" :visible.sync="visible" :before-close="lableTableHandleClose" append-to-body
class="table_dialog" width="1000px">
<el-dialog title="增加通知单位" :visible.sync="visible" :close-on-click-modal="false" :before-close="lableTableHandleClose"
append-to-body class="table_dialog" width="1000px">
<div class="body">
<div class="left">
<div class="tips">标签：{{ AllLabelObj.customOrgNum }}个</div>
......@@ -226,7 +226,18 @@ export default {
</script>
<style lang="less" scoped>
.el-dialog__wrapper {
width: 100vw;
// height: 100vh;
display: flex;
justify-content: center;
flex-direction: column;
margin-top: -7vh;
}
.el-dialog {
// margin-top: 400vh !important;
.body {
width: 100%;
display: flex;
......@@ -234,6 +245,7 @@ export default {
.left {
width: 200px;
height: 100%;
.tips {
width: 100%;
......@@ -247,13 +259,14 @@ export default {
.label_list {
width: 100%;
height: 100%;
// height: 100%;
height: 600px;
background: rgba(226, 226, 226, 0.24);
// text-align: center
display: flex;
flex-direction: column;
align-items: center;
overflow: hidden;
overflow: auto;
......
src/views/meeting/state/beforeMeeting/index.vue
浏览文件 @ 84906ed7
......@@ -184,7 +184,7 @@ export default {
let path = ''
if (item.processStatus == 3) {
window.open(
`http://hypz.hzswb.cn/confphone/pad/index.html#/list?token=${sessionStorage.getItem(
`https://lyfydp.longyou.gov.cn:9443/meeting/pad/#/list?token=${sessionStorage.getItem(
'ty_token'
)}&username=${sessionStorage.getItem('userName')}`,
'_blank'
......
src/views/system/confenceLibrary.vue
浏览文件 @ 84906ed7
......@@ -80,7 +80,7 @@
</el-form-item>-->
<el-form-item label="容纳人数:" prop="capacity">
<el-input v-model.number.trim="forms.capacity" maxlength="4" show-word-limit
onkeyup="this.value = this.value.replace(/[^\d.]/g,'');" placeholder="请输入"></el-input>
onkeyup="this.value = this.value.replace(/[^\d.]/g,'');" placeholder="请输入" @input="capacityChange"></el-input>
</el-form-item>
<el-form-item label="规模:" prop="scale">
<el-select v-model="forms.scale" clearable placeholder="请选择">
......@@ -88,7 +88,7 @@
</el-select>
</el-form-item>
<el-form-item label="会议室配置:" prop="des">
<el-input v-model.trim="forms.des" maxlength="20" show-word-limit placeholder="请输入"></el-input>
<el-input type="textarea" v-model.trim="forms.des" maxlength="50" show-word-limit placeholder="请输入"></el-input>
</el-form-item>
<!-- <el-form-item
label="专属会议室(选):"
......@@ -215,12 +215,12 @@ export default {
},
created() {
this.sysRoles = sessionStorage.getItem('sysRoles')
console.log('当前登录人权限', this.sysRoles);
// console.log('当前登录人权限', this.sysRoles);
this.cnName = sessionStorage.getItem('cnName')
console.log(sessionStorage.getItem('sysRoles'));
// console.log(sessionStorage.getItem('sysRoles'));
if (this.cnName !== '超级管理员' && sessionStorage.getItem('sysRoles') !== 'ROLE_HUIYISHIADMIN') {
this.forms.unitId = sessionStorage.getItem('unitId')
console.log('false');
// console.log('false');
this.disFlag = true
this.forms.unitName = sessionStorage.getItem('unitName')
} else if (sessionStorage.getItem('sysRoles') == 'ROLE_HUIYISHIADMIN') {
......@@ -237,6 +237,17 @@ export default {
}
},
methods: {
capacityChange(val) {
if (val > 0 && val <= 50) {
this.forms.scale = 1
} else if (val > 50 && val <= 200) {
this.forms.scale = 2
} else if (val > 200) {
this.forms.scale = 3
} else {
this.forms.scale = null
}
},
//编辑器页面
toggles(val) {
this.$router.push({
......@@ -256,7 +267,7 @@ export default {
})
},
changName(val) {
console.log(val)
// console.log(val)
},
//获取全部数据
getTaList() {
......
src/views/system/el-dialog/addUser.vue
浏览文件 @ 84906ed7
......@@ -4,7 +4,7 @@
:before-close="cancel" width="40%" v-loading="loading" top="8vh">
<el-form ref="addUser" :rules="rules" :model="addFrom" label-width="150px" class="demo-ruleForm">
<el-form-item label="选择权限专用单位:" prop="unitName" class="ty_from_item_position">
<el-select v-model="addFrom.unitName" filterable value-key="unitName" placeholder="全部" :disabled="isEdit">
<el-select v-model="addFrom.unitName" filterable value-key="unitName" placeholder="全部" >
<el-option v-for="(item, index) in authorityUnitArr" :key="index" :value="item"
:label="item.unitName"></el-option>
</el-select>
......@@ -38,7 +38,7 @@
</el-form-item>
<el-form-item label="浙政钉:" prop="dingId">
<el-input v-model="addFrom.dingId"></el-input>
<el-input v-model="addFrom.dingId" disabled></el-input>
</el-form-item>
<!-- <el-form-item label="CASID:">
<el-autocomplete
......
src/views/system/index.vue
浏览文件 @ 84906ed7
......@@ -144,11 +144,11 @@ export default {
// path: "/system/bankMangager/range",
// Rindex: 4 - 3,
// },
{
name: '模板库管理',
path: '/system/bankMangager/templateLibrary',
Rindex: 4 - 4,
},
// {
// name: '模板库管理',
// path: '/system/bankMangager/templateLibrary',
// Rindex: 4 - 4,
// },
// {
// name: '单位库管理',
// path: '/system/bankMangager/unitLibrary',
......@@ -182,6 +182,7 @@ export default {
this.path = this.path.filter((item, index) => item.meta.title !== '')
console.log(this.path)
let sysRoles = sessionStorage.getItem('sysRoles')
console.log('权限', sysRoles);
switch (sysRoles) {
case 'ROLE_SUPERADMIN':
break
......@@ -202,7 +203,14 @@ export default {
path: '/system/bankMangager/confLibrary',
Rindex: 4 - 1,
},
// {
// name: '人员标签库',
// path: '/system/bankMangager/userLibrary/personLabel',
// Rindex: 4 - 2,
// },
]
this.path = this.path.slice(-2)
break
case 'ROLE_HUIYISHIADMIN':
this.linkList = [
{
......@@ -211,12 +219,14 @@ export default {
Rindex: 4 - 1,
},
]
console.log(123);
break
default:
this.$router.push({ path: '/login' })
}
},
beforeRouteUpdate(to, from, next) {
console.log(to);
let sysRoles = sessionStorage.getItem('sysRoles')
/*****路由跳转时更新面包屑********/
this.path = to.matched
......@@ -234,6 +244,7 @@ export default {
to.path == '/system/bankMangager/confLibrary/second' ||
to.path == '/system/bankMangager/confLibrary/HallSeat'
) {
next()
} else {
next({ path: '/' })
......@@ -243,8 +254,10 @@ export default {
if (
to.path == '/system/bankMangager/confLibrary' ||
to.path == '/system/bankMangager/confLibrary/second' ||
to.path == '/system/bankMangager/confLibrary/HallSeat'
to.path == '/system/bankMangager/confLibrary/HallSeat' ||
to.path == '/system/bankMangager/userLibrary/personLabel'
) {
this.path = this.path.slice(-2)
next()
} else {
next({ path: '/' })
......@@ -272,7 +285,7 @@ export default {
//能否更新人员
getIsSync() {
this.$axios.findIsSync().then(res => {
console.log('能否更新人员', res);
// console.log('能否更新人员', res);
if (res.data.code == 200) {
this.titleForm = res.data.data
}
......
src/views/system/jurisdiction.vue
浏览文件 @ 84906ed7
......@@ -57,7 +57,8 @@
}}
</template>
</el-table-column>
<el-table-column prop="dingId" label="浙政钉"></el-table-column>
<!-- <el-table-column prop="dingId" label="浙政钉"></el-table-column> -->
<el-table-column prop="unitName" label="单位"></el-table-column>
<el-table-column prop="casId" label="CAS"></el-table-column>
<el-table-column label="角色">
<template slot-scope="scope">
......@@ -109,9 +110,10 @@
<el-button type="primary" class="btn" @click="addAuthorityUnit()">新增专用单位管理</el-button>
</div>
<div v-if="authorityUnitArr.length > 0">
<div class="unit" v-for="(item, index) in authorityUnitArr" :key="authorityUnitArr.length + index">
<div class="unit" v-for="(item, index) in authorityUnitArr" :key="authorityUnitArr.length + index"
v-show="item.updateStatus !== 2">
<div class="tips_num">权限专用单位：</div>
<el-input v-model="item.unitName" />
<el-input v-model="item.unitName" @input="unitNameInput(item)" />
<!-- <div>{{item.unitName}}</div> -->
<div class="del" @click="delUnit(item, index)"></div>
</div>
......@@ -205,6 +207,7 @@ export default {
this.getUserList()
},
methods: {
getPerson(val) {
console.log(val)
this.batchAddFlag = false
......@@ -214,23 +217,35 @@ export default {
// this.upDataUser.cnName = val.employeeName
// console.log(this.userFrom)
},
unitNameInput(item) {
console.log(item);
console.log(this.delUnitObj);
for (let i in this.authorityUnitArr) {
if (item.unitId == this.authorityUnitArr[i].unitId) {
this.$set(this.authorityUnitArr[i], 'updateStatus', 1)
}
}
console.log(this.authorityUnitArr);
},
//二次确认删除权限单位
confirmDelUnit() {
if (this.delUnitObj.unitId) {
this.$axios.delUnitAuth(this.delUnitObj.unitId).then((res) => {
if (res.data.code == 200) {
this.$message.success('删除成功!')
this.authorityUnitArr.splice(this.delUnitObj.index, 1)
console.log('this.authorityUnitArr', this.authorityUnitArr)
// this.authorityUnitArr.splice(this.delUnitObj.index, 1)
this.authorityUnitArr[this.delUnitObj.index].updateStatus = 2
// console.log('this.authorityUnitArr', this.authorityUnitArr)
this.delHandleClose()
} else {
this.$message.error(`${res.data.data}`)
this.delHandleClose()
}
})
} else {
console.log(this.delUnitObj)
this.authorityUnitArr.splice(this.delUnitObj?.index, 1)
console.log('INDEX', this.authorityUnitArr)
// console.log(this.delUnitObj)
this.authorityUnitArr.splice(this.delUnitObj.index, 1)
// console.log('INDEX', this.authorityUnitArr)
this.$message.success('删除成功!')
this.delHandleClose()
......@@ -250,7 +265,7 @@ export default {
addAuthorityUnit() {
console.log('aadd', this.authorityUnitArr)
this.authorityUnitArr.push({ unitId: '', unitName: '' })
this.authorityUnitArr.push({ unitId: '', unitName: '', updateStatus: 1 })
// this.$forceUpdate()
},
......@@ -270,7 +285,7 @@ export default {
this.dialogFormVisible = false
this.$message.success('保存成功！')
} else {
this.$message.error(`${res.msg}`)
this.$message.error(`${res.data.data}`)
}
})
} else {
......
src/views/system/personLabel.vue
浏览文件 @ 84906ed7
......@@ -139,10 +139,11 @@
</div>
<el-button type="primary" class="btn" @click="addLabel()">新增标签</el-button>
</div>
<div v-if="labelList.length > 0">
<div class="unit" v-for="( item, index ) in labelList " :key="labelList.length + index">
<div v-if="dialogLabelList.length > 0">
<div class="unit" v-for="(item, index) in dialogLabelList" :key="dialogLabelList.length + index"
v-show="item.updateStatus !== 2">
<div class="tips_num">权限专用单位：</div>
<el-input v-model="item.customOrgName" />
<el-input v-model="item.customOrgName" @input="customOrgNameInput(item)" />
<!-- <div>{{item.unitName}}</div> -->
<div class="del" @click="delLabel(item, index)"></div>
</div>
......@@ -308,6 +309,7 @@ export default {
delLabelObj: {},
labelList: [],
dialogLabelList: [],
delLabelVisible: false,
overall: {
personNum: null,
......@@ -339,6 +341,14 @@ export default {
}
},
methods: {
customOrgNameInput(item) {
for (let i in this.dialogLabelList) {
if (this.dialogLabelList[i].id == item.id) {
this.dialogLabelList[i].updateStatus = 1
}
}
},
reset() {
this.formData = {
customOrgName: this.formData.customOrgName, //自定义人员所属分类名
......@@ -527,19 +537,20 @@ export default {
},
//新增标签
addLabel() {
console.log('aadd', this.labelList)
this.labelList.push({
console.log('aadd', this.dialogLabelList)
this.dialogLabelList.push({
customOrgName: '',
id: '',
sysUnitId: '',
sysUnitName: '',
updateStatus: 1,
})
// this.$forceUpdate()
},
//保存/修改标签
submitForm() {
this.$axios.saveCustomOrgO(this.labelList).then((res) => {
this.$axios.saveCustomOrgO(this.dialogLabelList).then((res) => {
if (res.data.code == 200) {
this.$message.success('保存成功！')
this.dialogLabelHandleClose()
......@@ -563,17 +574,21 @@ export default {
this.$axios.deleteCustomOrg(this.delLabelObj.id).then((res) => {
if (res.data.code == 200) {
this.$message.success('删除成功!')
this.labelList.splice(this.delLabelObj.index, 1)
// this.dialogLabelList.splice(this.delLabelObj.index, 1)
console.log(this.delLabelObj);
this.dialogLabelList[this.delLabelObj.index].updateStatus = 2
this.delLabelHandleClose()
} else {
this.$message.error(`${res.data.data}`)
this.delLabelHandleClose()
}
})
} else {
this.labelList.splice(this.delLabelObj?.index, 1)
this.dialogLabelList.splice(this.delLabelObj.index, 1)
this.$message.success('删除成功!')
this.delLabelHandleClose()
}
console.log('删除后的数组', this.dialogLabelList);
},
//删除账号 关闭弹框
......@@ -583,8 +598,9 @@ export default {
},
//管理标签HandleClose
dialogLabelHandleClose() {
console.log(this.labelList)
this.labelList = this.labelList.filter((item) => item.id)
console.log(this.dialogLabelList)
this.dialogLabelList = this.dialogLabelList.filter((item) => item.id)
// this.dialogLabelList = []
this.dialogLabelVisible = false
},
back(val) {
......@@ -660,8 +676,7 @@ export default {
},
//管理标签
manageTags() {
console.log(123)
this.dialogLabelList = JSON.parse(JSON.stringify(this.labelList))
this.dialogLabelVisible = true
},
//导入
......@@ -688,7 +703,8 @@ export default {
getLabelList() {
return this.$axios.findAllCustomOrg().then((res) => {
console.log(res)
this.labelList = res.data.data
this.labelList = JSON.parse(JSON.stringify(res.data.data))
// this.dialogLabelList = JSON.parse(JSON.stringify(res.data.data))
this.formData.customOrgId = res.data.data[0].id
this.formData.customOrgName = res.data.data[0].customOrgName
return this.formData.customOrgId
......
src/views/system/unitEmpower.vue
浏览文件 @ 84906ed7
......@@ -26,8 +26,9 @@
<div>{{ total }}家</div>
</div>
<div class="tableList">
<el-table :data="tableData" style="width: 100%" height="100%" stripe :default-sort="{ order: 'sortNum' }">
<el-table-column prop="sortNum" label="序号" width="180"></el-table-column>
<el-table :data="tableData" style="width: 100%" height="100%" stripe v-loading="tableLoading"
:default-sort="{ prop: 'sortNum', order: 'ascending' }">
<el-table-column prop="sortNum" sortable label="序号" width="180"></el-table-column>
<el-table-column prop="unitName" label="参会单位（权限专用）" width="180"></el-table-column>
<el-table-column prop="personName" label="单位联系人" width="180"></el-table-column>
<el-table-column prop="dingId" label="联系人浙政钉"></el-table-column>
......@@ -51,7 +52,7 @@
<!-- 新增/编辑参会单位授权 -->
<el-dialog title="新增|编辑参会单位授权" :visible.sync="dialogFormVisible" :close-on-click-modal="false"
:before-close="handleClose" class="addUnit_dialog">
<el-form :model="addForm" label-width="350px" :rules="addFormRules" ref="addForm">
<el-form :model="addForm" label-width="250px" :rules="addFormRules" ref="addForm">
<el-form-item label="选择单位（平台）：" prop="unitId">
<el-select v-model="addForm.unitId" @change="unitNameChange(addForm.unitId)" placeholder="模糊输入（单位名称）"
filterable>
......@@ -70,6 +71,9 @@
<el-form-item label="单位联系电话：" filterable class="unitTel" prop="unitTel">
<el-input v-model="addForm.unitTel" />
</el-form-item>
<el-form-item label="排序：" filterable class="unitTel" prop="sortNum">
<el-input v-model="addForm.sortNum" type="number" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="handleClose()">取 消</el-button>
......@@ -111,6 +115,10 @@
<div class="title">单位联系电话：</div>
<div>{{ checkUnitObj.unitTel }}</div>
</div>
<div class="row">
<div class="title">单位排序：</div>
<div>{{ checkUnitObj.sortNum }}</div>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="checkHandleClose()">关闭</el-button>
......@@ -123,6 +131,7 @@
</div>
</template>
<script>
import BatchAddDialog from '../meeting/operation/Administration/components/BatchAddDialog'
export default {
components: {
......@@ -138,9 +147,9 @@ export default {
this.formData.startDate = ''
this.formData.endDate = ''
}
console.log(this.formData)
console.log(typeof this.formData.startDate)
console.log(typeof this.formData.endDate)
// console.log(this.formData)
// console.log(typeof this.formData.startDate)
// console.log(typeof this.formData.endDate)
// this.getDataList(this.formData)
},
},
......@@ -153,6 +162,13 @@ export default {
callback('')
}
}
var sortNumRule = (rule, value, callback) => {
if (value <= 0) {
callback('请输入大于0的数')
} else {
callback()
}
}
return {
// loading:false,
timeData: '',
......@@ -176,11 +192,13 @@ export default {
unitId: '', //参会单位ID
unitName: '', //参会单位
unitTel: '', //单位联系电话
sortNum: null,//单位排序
},
addFormRules: {
unitId: [{ required: true, message: '请选择参会单位', trigger: 'change' }],
personName: [{ required: true, validator: checkPersonName, trigger: 'change' }],
unitTel: [{ required: true, message: '请输入单位联系电话', trigger: 'blur' }],
sortNum: [{ required: true, validator: sortNumRule, trigger: 'blur' }]
},
dialogFormVisible: false,
unitList: [],
......@@ -203,6 +221,7 @@ export default {
delDialog: false,
checkDialog: false,
checkUnitObj: {},
tableLoading: false
}
},
......@@ -313,9 +332,6 @@ export default {
// this.form.pageSize = 9999
this.$axios.findOrg().then((res) => {
if (res.data.code == 200) {
// this.loading = false
console.log(res)
this.unitList = res.data.data
}
})
......@@ -337,16 +353,18 @@ export default {
console.log(this.formData)
// }
console.log(this.timeData)
this.tableLoading = true
this.$axios.getUnitAuthPerson(data).then((res) => {
// console.log(res)
// if()
if (res.data.code == 200) {
this.tableLoading = false
this.tableData = res.data.data.sysUnitAuthPersonList
for (let i in this.tableData) {
this.$set(this.tableData[i], 'sortNum', ++i)
}
this.total = res.data.data.count
// this.loading = false
} else {
this.$message.error(`${res.data.data}`)
}
})
},
......@@ -381,7 +399,9 @@ export default {
unitId: '', //参会单位ID
unitName: '', //参会单位
unitTel: '', //单位联系电话
sortNum: '', //单位排序
}
this.$refs.addForm.resetFields()
console.log(this.addForm)
},
},
......@@ -392,6 +412,17 @@ export default {
</script>
<style lang="less" scoped>
::v-deep input::-webkit-outer-spin-button,
::v-deep input::-webkit-inner-spin-button {
-webkit-appearance: none !important;
}
::v-deep input[type='number'] {
line-height: 1;
-moz-appearance: textfield !important;
}
.unitEmpower {
width: 100%;
height: calc(100% - 66px);
......@@ -520,6 +551,8 @@ export default {
.title {
width: 180px;
text-align: right;
// text-align: justify;
// text-align-last: justify;
}
}
}
......
src/views/system/utils/MenuList.vue
浏览文件 @ 84906ed7
<template>
<div class="sys_MenuList">
<el-menu class="el-menu-vertical-demo">
<router-link
v-for="(v, i) in list"
:key="i"
:index="v.Rindex + ''"
:to="v.path"
v-if="!v.children"
tag="div"
class="router_nomal"
active-class="menuItem"
>
<router-link v-for="(v, i) in list" :key="i" :index="v.Rindex + ''" :to="v.path" v-if="!v.children" tag="div"
class="router_nomal" active-class="menuItem">
<div class="router_nomal_item">
<!-- <img :src="v.pic" /> -->
<i :class="routerPaths==v.path?v.pic2:v.pic1"></i>
<i :class="routerPaths == v.path ? v.pic2 : v.pic1"></i>
<span>{{ v.name }}</span>
</div>
</router-link>
<el-submenu
v-for="(v, i) in list"
:key="i"
:index="v.Rindex + ''"
:class="suFlag && pathWatch(v.path)? 'submenu' : ''"
v-if="v.children"
>
<el-submenu v-for="(v, i) in list" :key="i" :index="v.Rindex + ''"
:class="suFlag && pathWatch(v.path) ? 'submenu' : ''" v-if="v.children">
<template slot="title">
<i :class="routerPaths >3 && pathWatch(v.path)?v.pic2:v.pic1"></i>
<i :class="routerPaths > 3 && pathWatch(v.path) ? v.pic2 : v.pic1"></i>
<!-- <img :src="v.pic" /> -->
<!-- {{v.pic}} -->
<span>{{ v.name }}</span>
</template>
<el-menu-item
v-for="(value, index) in v.children"
:key="index"
:index="value.Rindex + '1'"
@click="toRouter(value.path)"
>
<el-menu-item v-for="(value, index) in v.children" :key="index" :index="value.Rindex + '1'"
@click="toRouter(value.path)">
<template slot="title">
<router-link :to="value.path" tag="div" active-class="routerLink" class="router">
<span class="item_boxder"></span>
......@@ -76,6 +59,11 @@ export default {
deep: true,
immediate: true,
},
list: {
handler(newVal) {
console.log('newVal', newVal);
}
}
},
methods: {
toRouter(val) {
......@@ -107,12 +95,14 @@ export default {
padding-bottom: 1px;
vertical-align: middle;
}
.router_nomal {
width: 180px;
height: 49px;
line-height: 49px;
margin-left: 10px;
margin-top: 2px;
// padding-left: 6px;
.el-icon-setting {
margin: 0 3px;
......@@ -120,6 +110,7 @@ export default {
position: relative;
top: 2px;
}
.router_nomal_item {
font-size: 14px;
box-sizing: border-box;
......@@ -129,16 +120,19 @@ export default {
cursor: pointer;
}
}
.el-menu {
/deep/ .el-menu-item :hover {
background: none !important;
}
/deep/.el-submenu__title {
padding: 0 10px;
width: 180px;
margin-left: 10px;
color: #778ca2;
}
.submenu /deep/.el-submenu__title {
// border: 1px solid red;
padding: 0 10px;
......@@ -148,9 +142,11 @@ export default {
color: #fff;
box-shadow: 0px 2px 16px 0px rgba(35, 72, 163, 0.35);
border-radius: 4px;
i {
color: #fff;
}
// }
}
}
......@@ -167,16 +163,20 @@ export default {
background: #345ab6;
box-shadow: 0px 2px 16px 0px rgba(35, 72, 163, 0.35);
border-radius: 4px;
span {
color: #fff;
}
i {
color: #fff !important;
}
}
.routerLink {
color: #000;
}
.item_boxder {
width: 4px;
height: 14px;
......@@ -185,6 +185,7 @@ export default {
border-radius: 2px;
margin-right: 10px;
}
.el-menu-vertical-demo /deep/.el-menu-item {
color: #778ca2;
padding: 0;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论