Skip to content

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

合并分支 'fc' 到 'master'

Fc 查看合并请求 !26
上级 6860fd66 d025eb4d
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 545 行增加 和 275 行删除
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 = [ ...@@ -225,7 +225,7 @@ const routes = [
redirect: '/system/power/jurisdiction', redirect: '/system/power/jurisdiction',
beforeEnter: (to, from, next) => { beforeEnter: (to, from, next) => {
let sysRoles = sessionStorage.getItem('sysRoles') let sysRoles = sessionStorage.getItem('sysRoles')
console.log(sysRoles); // console.log(sysRoles);
switch (sysRoles) { switch (sysRoles) {
case 'ROLE_SUPERADMIN': case 'ROLE_SUPERADMIN':
next() next()
...@@ -277,7 +277,10 @@ const routes = [ ...@@ -277,7 +277,10 @@ const routes = [
path: '/', path: '/',
name: 'unitEmpower', name: 'unitEmpower',
component: () => component: () =>
import('../views/system/unitEmpower.vue') import('../views/system/unitEmpower.vue'),
meta: {
title: '',
},
}, },
{ {
path: 'unitLibrary', path: 'unitLibrary',
...@@ -292,7 +295,7 @@ const routes = [ ...@@ -292,7 +295,7 @@ const routes = [
], ],
beforeEnter: (to, from, next) => { beforeEnter: (to, from, next) => {
let sysRoles = sessionStorage.getItem('sysRoles') let sysRoles = sessionStorage.getItem('sysRoles')
console.log(sysRoles); // console.log(sysRoles);
switch (sysRoles) { switch (sysRoles) {
case 'ROLE_SUPERADMIN': case 'ROLE_SUPERADMIN':
next() next()
...@@ -434,17 +437,17 @@ const routes = [ ...@@ -434,17 +437,17 @@ const routes = [
}, },
}, },
{ // {
path: 'templateLibrary', // path: 'templateLibrary',
name: 'templateLibrary', // name: 'templateLibrary',
component: () => // component: () =>
import( // import(
'../views/system/templateLibrary.vue' // '../views/system/templateLibrary.vue'
), // ),
meta: { // meta: {
title: '模板库管理', // title: '模板库管理',
}, // },
}, // },
{ {
path: 'leaderLibrary', path: 'leaderLibrary',
name: 'leaderLibrary', name: 'leaderLibrary',
......
src/views/home.vue
浏览文件 @ 84906ed7
...@@ -2,31 +2,20 @@ ...@@ -2,31 +2,20 @@
<div class="home"> <div class="home">
<div class="home_btn" @click="hideGuide" v-show="$store.state.showImageFlag"></div> <div class="home_btn" @click="hideGuide" v-show="$store.state.showImageFlag"></div>
<div class="home_loadings" v-show="$store.state.showImageFlag"></div> <div class="home_loadings" v-show="$store.state.showImageFlag"></div>
<div <div class="app_header" :class="$route.meta.title === 'prepare' ||
class="app_header"
:class="
$route.meta.title === 'prepare' ||
$route.meta.title == '会议查看' || $route.meta.title == '会议查看' ||
$route.meta.title == '会议配置' || $route.meta.title == '会议配置' ||
$route.meta.title == 'chooseModule' $route.meta.title == 'chooseModule'
? 'app_header_shrink' ? 'app_header_shrink'
: 'app_header_normal' : 'app_header_normal'
" ">
>
<div class="app_header_left" @click="toHome"> <div class="app_header_left" @click="toHome">
<img src="../assets/img/header_img.png" alt /> <img src="../assets/img/header_img.png" alt />
<span>会议智能管理系统</span> <span>会议智能管理系统</span>
</div> </div>
<div class="header_router"> <div class="header_router">
<router-link <router-link class="router_div" active-class="active_link" tag="div" v-for="(i, index) in router_link"
class="router_div" :key="index" :to="i.path">
active-class="active_link"
tag="div"
v-for="(i, index) in router_link"
:key="index"
:to="i.path"
>
<span>{{ i.value }}</span> <span>{{ i.value }}</span>
<div class="bottom_border"></div> <div class="bottom_border"></div>
</router-link> </router-link>
...@@ -58,15 +47,12 @@ ...@@ -58,15 +47,12 @@
</div> </div>
</div> </div>
</div> </div>
<div <div :class="$route.meta.title === 'prepare' ||
:class="
$route.meta.title === 'prepare' ||
$route.meta.title === '会议配置' || $route.meta.title === '会议配置' ||
$route.meta.title == 'chooseModule' $route.meta.title == 'chooseModule'
? 'expend' ? 'expend'
: 'normal' : 'normal'
" ">
>
<router-view /> <router-view />
</div> </div>
</div> </div>
...@@ -167,12 +153,11 @@ export default { ...@@ -167,12 +153,11 @@ export default {
} }
console.log('sysRoles',this.router_link);
}, },
methods: { methods: {
toClick(val) { toClick(val) {
console.log(val,this.router_link); console.log(val, this.router_link);
}, },
hideGuide() { hideGuide() {
this.$store.commit('changeShowImage', false) this.$store.commit('changeShowImage', false)
...@@ -188,7 +173,7 @@ export default { ...@@ -188,7 +173,7 @@ export default {
sessionStorage.setItem('userNDirection2', 2) sessionStorage.setItem('userNDirection2', 2)
} }
}) })
.catch((err) => {}) .catch((err) => { })
}, },
toHome() { toHome() {
if (sessionStorage.getItem('sysRoles') != 'ROLE_HUIYISHIADMIN') { if (sessionStorage.getItem('sysRoles') != 'ROLE_HUIYISHIADMIN') {
...@@ -229,9 +214,11 @@ export default { ...@@ -229,9 +214,11 @@ export default {
cursor: pointer; cursor: pointer;
color: #d1d5da; color: #d1d5da;
} }
.el-icon-arrow-down { .el-icon-arrow-down {
font-size: 12px; font-size: 12px;
} }
.home_btn { .home_btn {
position: absolute; position: absolute;
width: 190px; width: 190px;
...@@ -241,6 +228,7 @@ export default { ...@@ -241,6 +228,7 @@ export default {
z-index: 120; z-index: 120;
cursor: pointer; cursor: pointer;
} }
.home_loadings { .home_loadings {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -250,6 +238,7 @@ export default { ...@@ -250,6 +238,7 @@ export default {
position: fixed; position: fixed;
z-index: 100; z-index: 100;
} }
.out_button { .out_button {
text-align: center; text-align: center;
width: 80px; width: 80px;
...@@ -266,34 +255,43 @@ export default { ...@@ -266,34 +255,43 @@ export default {
from { from {
height: calc(100% - 74px); height: calc(100% - 74px);
} }
to { to {
height: calc(100% - 10px); height: calc(100% - 10px);
} }
} }
@keyframes shrink { @keyframes shrink {
from { from {
height: 74px; height: 74px;
} }
to { to {
height: 10px; height: 10px;
} }
} }
to { to {
height: 10px; height: 10px;
} }
@keyframes opacity { @keyframes opacity {
from { from {
opacity: 1; opacity: 1;
} }
to { to {
opacity: 0; opacity: 0;
} }
} }
.home { .home {
height: 100%; height: 100%;
.app_header_shrink { .app_header_shrink {
animation: shrink 1s linear; animation: shrink 1s linear;
height: 10px; height: 10px;
.app_header_left, .app_header_left,
.app_header_right, .app_header_right,
.header_router { .header_router {
...@@ -301,9 +299,11 @@ to { ...@@ -301,9 +299,11 @@ to {
animation: opacity 1s linear; animation: opacity 1s linear;
} }
} }
.app_header_normal { .app_header_normal {
height: 74px; height: 74px;
} }
.app_header { .app_header {
background: #2348a3; background: #2348a3;
display: flex; display: flex;
...@@ -311,10 +311,12 @@ to { ...@@ -311,10 +311,12 @@ to {
align-items: center; align-items: center;
padding: 0px 20px; padding: 0px 20px;
position: relative; position: relative;
.header_router { .header_router {
position: absolute; position: absolute;
display: flex; display: flex;
left: 510px; left: 510px;
.router_div { .router_div {
// width: 152px; // width: 152px;
padding: 0px 35px; padding: 0px 35px;
...@@ -326,10 +328,12 @@ to { ...@@ -326,10 +328,12 @@ to {
line-height: 74px; line-height: 74px;
text-align: center; text-align: center;
} }
.router_div:hover, .router_div:hover,
.active_link { .active_link {
background: rgba(255, 255, 255, 0.1); background: rgba(255, 255, 255, 0.1);
position: relative; position: relative;
.bottom_border { .bottom_border {
position: absolute; position: absolute;
bottom: 2px; bottom: 2px;
...@@ -341,6 +345,7 @@ to { ...@@ -341,6 +345,7 @@ to {
} }
} }
} }
.app_header_left { .app_header_left {
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -351,6 +356,7 @@ to { ...@@ -351,6 +356,7 @@ to {
text-shadow: 2px 3px 0px rgba(255, 255, 255, 0.2); text-shadow: 2px 3px 0px rgba(255, 255, 255, 0.2);
cursor: pointer; cursor: pointer;
letter-spacing: 2px; letter-spacing: 2px;
img { img {
margin-left: 20px; margin-left: 20px;
width: 36px; width: 36px;
...@@ -358,10 +364,12 @@ to { ...@@ -358,10 +364,12 @@ to {
margin-right: 16px; margin-right: 16px;
} }
} }
.app_header_right { .app_header_right {
display: flex; display: flex;
height: 100%; height: 100%;
align-items: center; align-items: center;
.router_nav { .router_nav {
line-height: 40px; line-height: 40px;
display: inline-block; display: inline-block;
...@@ -373,6 +381,7 @@ to { ...@@ -373,6 +381,7 @@ to {
box-shadow: 0px 2px 6px 0px rgba(35, 53, 117, 0.3); box-shadow: 0px 2px 6px 0px rgba(35, 53, 117, 0.3);
border-radius: 6px; border-radius: 6px;
} }
.user_name { .user_name {
margin: 0px 20px; margin: 0px 20px;
margin-right: 10px; margin-right: 10px;
...@@ -381,11 +390,13 @@ to { ...@@ -381,11 +390,13 @@ to {
border-radius: 50%; border-radius: 50%;
overflow: hidden; overflow: hidden;
border: 1px solid #fff; border: 1px solid #fff;
img { img {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
.user_out { .user_out {
width: 90px; width: 90px;
white-space: nowrap; white-space: nowrap;
...@@ -396,12 +407,13 @@ to { ...@@ -396,12 +407,13 @@ to {
} }
} }
} }
.expend { .expend {
animation: expend 1s linear; animation: expend 1s linear;
height: calc(100% - 10px); height: calc(100% - 10px);
} }
.normal { .normal {
height: calc(100% - 74px); height: calc(100% - 74px);
} }
} }</style>
</style> \ No newline at end of file
\ No newline at end of file
src/views/meeting/componets/MeetingItem.vue
浏览文件 @ 84906ed7
...@@ -149,7 +149,7 @@ export default { ...@@ -149,7 +149,7 @@ export default {
}, },
startConf(item) { startConf(item) {
console.log(item) console.log(item)
this.$confirm(`会议主题：${item.processName} </br>确认”正式开始“？`, '提示', { this.$confirm(`${item.processName} "正式开始"？`, '提示', {
customClass: 'message_box', customClass: 'message_box',
dangerouslyUseHTMLString: true, dangerouslyUseHTMLString: true,
confirmButtonText: '确定', confirmButtonText: '确定',
...@@ -183,10 +183,10 @@ export default { ...@@ -183,10 +183,10 @@ export default {
}) })
}, },
closeConf(item) { closeConf(item) {
this.$confirm(`会议主题：${item.processName} </br>确认”结束“？`, '提示', { this.$confirm(`${item.processName} "确认结束"？`, '提示', {
customClass: 'message_box', customClass: 'message_box',
dangerouslyUseHTMLString: true, dangerouslyUseHTMLString: true,
confirmButtonText: '关闭', confirmButtonText: '确认',
cancelButtonText: '取消', cancelButtonText: '取消',
}) })
.then(() => { .then(() => {
...@@ -230,10 +230,10 @@ export default { ...@@ -230,10 +230,10 @@ export default {
}) })
}, },
endConf(item) { endConf(item) {
this.$confirm(`会议主题：${item.processName} </br>确认”关闭“？`, '提示', { this.$confirm(`${item.processName} "确认关闭"？`, '提示', {
customClass: 'message_box', customClass: 'message_box',
dangerouslyUseHTMLString: true, dangerouslyUseHTMLString: true,
confirmButtonText: '关闭', confirmButtonText: '确认',
cancelButtonText: '取消', cancelButtonText: '取消',
}) })
.then(() => { .then(() => {
......
src/views/meeting/componets/TimeCountDown.vue
浏览文件 @ 84906ed7
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<div style="text-align: center;"> <div style="text-align: center;">
<div>会议主题：{{ item.processName }} 预定时间已过期</div> <div>会议主题：{{ item.processName }} 预定时间已过期</div>
<div>确认“重新预定”</div> <div>确认“重新预定”</div>
<div class="tips">注：更换会议室需清空已排座数据；更换时间不清空已排座数据。</div> <!-- <div class="tips">注：更换会议室需清空已排座数据；更换时间不清空已排座数据。</div> -->
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
...@@ -98,7 +98,7 @@ export default { ...@@ -98,7 +98,7 @@ export default {
} }
}, },
mounted() { mounted() {
console.log('item', this.item)
this.countTime() this.countTime()
}, },
props: ['endTime', 'tagFlag', 'item'], props: ['endTime', 'tagFlag', 'item'],
...@@ -160,7 +160,7 @@ export default { ...@@ -160,7 +160,7 @@ export default {
if (d < 10) { if (d < 10) {
d = '0' + d d = '0' + d
} }
console.log(y + '-' + m + '-' + d)
return y + '-' + m + '-' + d return y + '-' + m + '-' + d
}, },
selectTime() { selectTime() {
......
src/views/meeting/operation/Administration/components/BatchAddDialog.vue
浏览文件 @ 84906ed7
<template> <template>
<div> <div>
<el-dialog <el-dialog width="86%" :before-close="handleClose" :modal-append-to-body="false"
width="86%" :title="changeFlags == 2 ? '新增参会单位授权' : changeFlags == 3 ? '关联参会人员' : '批量补录人员'" :visible.sync="visible"
:before-close="handleClose" :close-on-click-modal="false" @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="main">
<div class="tree"> <div class="tree">
<el-tree <el-tree ref="tree" :props="treeData" :load="loadNode" :highlight-current="highlightTreeNode" lazy
:props="treeData" @node-click="chooseRen"></el-tree>
:load="loadNode"
highlight-current
lazy
@node-click="chooseRen"
></el-tree>
</div> </div>
<div class="table_wrap"> <div class="table_wrap">
<div class="header_search"> <div class="header_search">
...@@ -25,14 +14,8 @@ ...@@ -25,14 +14,8 @@
<el-button size="medium" @click="searchPerson()">查询</el-button> <el-button size="medium" @click="searchPerson()">查询</el-button>
</div> </div>
<span class="select_but" v-if="!selectPerson" @click="selectAll()">全选本页</span> <span class="select_but" v-if="!selectPerson" @click="selectAll()">全选本页</span>
<el-table <el-table :data="tableData" stripe ref="table" class="template_table" @row-click="handleRowClick"
:data="tableData" v-loading="loading">
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 type="index" width="50"></el-table-column>
<el-table-column prop="employeeName" label="姓名" width="150"></el-table-column> <el-table-column prop="employeeName" label="姓名" width="150"></el-table-column>
<!-- <el-table-column label="手机号" width="200"> <!-- <el-table-column label="手机号" width="200">
...@@ -83,26 +66,15 @@ ...@@ -83,26 +66,15 @@
<div v-if="!selectPerson && chosenTags" class="title">已选人员：{{ chosenTags.length }}人</div> <div v-if="!selectPerson && chosenTags" class="title">已选人员：{{ chosenTags.length }}人</div>
<div v-if="selectPerson" class="title">已选人员</div> <div v-if="selectPerson" class="title">已选人员</div>
<div class="person"> <div class="person">
<el-tag <el-tag v-for="tag in chosenTags" :key="tag.employeeCode" @close="removeTag(tag)" closable
v-for="tag in chosenTags" :disable-transitions="changeFlags == 2">{{ tag.employeeName }}</el-tag>
:key="tag.employeeCode"
@close="removeTag(tag)"
closable
:disable-transitions="changeFlags == 2"
>{{ tag.employeeName }}</el-tag>
</div> </div>
</div> </div>
</div> </div>
<div class="ty_pagination"> <div class="ty_pagination">
<el-pagination <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :page-sizes="[10, 20, 30]"
@size-change="handleSizeChange" :current-page="form.pageNum" :page-size="form.pageSize" layout="total, sizes, prev, pager, next, jumper"
@current-change="handleCurrentChange" :total="count"></el-pagination>
: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>
<!-- <div class="search_wrap">--> <!-- <div class="search_wrap">-->
<!-- <el-input v-model="searchInfo"></el-input><el-button size="small" @click="search()">查询</el-button>--> <!-- <el-input v-model="searchInfo"></el-input><el-button size="small" @click="search()">查询</el-button>-->
...@@ -128,7 +100,7 @@ ...@@ -128,7 +100,7 @@
<!-- </el-table>--> <!-- </el-table>-->
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button plain v-if="!nextShow" @click="handleClose">取 消</el-button> <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> <el-button type="primary" v-if="nextShow" @click="Next()">下一步</el-button>
</span> </span>
</el-dialog> </el-dialog>
...@@ -166,6 +138,7 @@ export default { ...@@ -166,6 +138,7 @@ export default {
spinner: 'el-icon-loading', spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)', background: 'rgba(0, 0, 0, 0.7)',
}, },
highlightTreeNode: true,
} }
}, },
components: {}, components: {},
...@@ -290,9 +263,10 @@ export default { ...@@ -290,9 +263,10 @@ export default {
this.count = res.data.data.totalElements this.count = res.data.data.totalElements
} }
}) })
.catch((error) => {}) .catch((error) => { })
}, },
chooseRen(node) { chooseRen(node) {
this.highlightTreeNode = true
this.loading = true this.loading = true
this.form.organizationCode = node.organizationCode this.form.organizationCode = node.organizationCode
this.form.orgType = node.orgType this.form.orgType = node.orgType
...@@ -350,7 +324,7 @@ export default { ...@@ -350,7 +324,7 @@ export default {
}) })
} }
}) })
.catch((reject) => {}) .catch((reject) => { })
} else { } else {
let data = { let data = {
dingPersonShowVos: this.chosenTags, dingPersonShowVos: this.chosenTags,
...@@ -378,7 +352,7 @@ export default { ...@@ -378,7 +352,7 @@ export default {
}) })
} }
}) })
.catch((reject) => {}) .catch((reject) => { })
} }
} else { } else {
if (this.chosenTags[0]) { if (this.chosenTags[0]) {
...@@ -420,6 +394,9 @@ export default { ...@@ -420,6 +394,9 @@ export default {
this.chosenTags = [] this.chosenTags = []
this.$emit('update:batchAddFlag', false) this.$emit('update:batchAddFlag', false)
} }
console.log('tableData', this.tableData);
this.tableData = []
this.highlightTreeNode = false
}, },
}, },
watch: { watch: {
...@@ -446,27 +423,33 @@ export default { ...@@ -446,27 +423,33 @@ export default {
height: 880px; height: 880px;
box-sizing: border-box; box-sizing: border-box;
margin-top: 0 !important; margin-top: 0 !important;
.el-dialog__body { .el-dialog__body {
position: relative; position: relative;
height: calc(100% - 170px); height: calc(100% - 170px);
flex-direction: column; flex-direction: column;
align-items: self-start; align-items: self-start;
.header_search { .header_search {
width: 400px; width: 400px;
display: flex; display: flex;
.el-button { .el-button {
margin-left: 10px; margin-left: 10px;
} }
} }
.main { .main {
height: 100%; height: 100%;
width: 100%; width: 100%;
display: flex; display: flex;
margin-top: 10px; 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; background-color: #e5e5e5 !important;
font-weight: bold; // 字体加粗 font-weight: bold; // 字体加粗
} }
.tree { .tree {
background: #f5f6f6; background: #f5f6f6;
box-shadow: 0px 0px 16px 0px rgba(84, 116, 235, 0.12); box-shadow: 0px 0px 16px 0px rgba(84, 116, 235, 0.12);
...@@ -475,31 +458,38 @@ export default { ...@@ -475,31 +458,38 @@ export default {
width: 290px; width: 290px;
overflow: auto; overflow: auto;
padding: 10px; 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; background-color: #e5e5e5 !important;
font-weight: bold; // 字体加粗 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; background-color: #e5e5e5 !important;
font-weight: bold; // 字体加粗 font-weight: bold; // 字体加粗
} }
.el-tree { .el-tree {
background: #f5f6f6; background: #f5f6f6;
padding-right: 10px; padding-right: 10px;
.el-tree-node__label { .el-tree-node__label {
color: rgba(17, 17, 17); color: rgba(17, 17, 17);
} }
.el-tree-node__content:hover, .el-tree-node__content:hover,
> .el-upload-list__item:hover { >.el-upload-list__item:hover {
background-color: #e5e5e5; background-color: #e5e5e5;
} }
} }
} }
.table_wrap { .table_wrap {
width: calc(100% - 290px - 350px); width: calc(100% - 290px - 350px);
padding: 0 20px; padding: 0 20px;
text-align: left; text-align: left;
.select_but { .select_but {
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
...@@ -513,15 +503,18 @@ export default { ...@@ -513,15 +503,18 @@ export default {
font-size: 14px; font-size: 14px;
margin-top: 8px; margin-top: 8px;
} }
.el-table { .el-table {
width: 100%; width: 100%;
height: calc(100% - 80px); height: calc(100% - 80px);
overflow-y: auto; overflow-y: auto;
} }
} }
.person_wrap { .person_wrap {
width: 350px; width: 350px;
background: #f7f8fd; background: #f7f8fd;
.title { .title {
text-align: center; text-align: center;
height: 40px; height: 40px;
...@@ -529,10 +522,12 @@ export default { ...@@ -529,10 +522,12 @@ export default {
line-height: 40px; line-height: 40px;
padding-left: 10px; padding-left: 10px;
} }
.person { .person {
height: calc(100% - 40px); height: calc(100% - 40px);
overflow-y: auto; overflow-y: auto;
padding: 10px; padding: 10px;
.el-tag { .el-tag {
margin: 5px; margin: 5px;
background: #ffffff; background: #ffffff;
...@@ -540,6 +535,7 @@ export default { ...@@ -540,6 +535,7 @@ export default {
border-radius: 4px 4px 4px 4px; border-radius: 4px 4px 4px 4px;
color: rgba(1, 3, 3, 0.96); color: rgba(1, 3, 3, 0.96);
border: none; border: none;
.el-icon-close:hover { .el-icon-close:hover {
background-color: #f5f6f6; background-color: #f5f6f6;
} }
...@@ -547,15 +543,18 @@ export default { ...@@ -547,15 +543,18 @@ export default {
} }
} }
} }
.ty_pagination { .ty_pagination {
position: absolute; position: absolute;
right: 380px; right: 380px;
bottom: -10px; bottom: -10px;
} }
.search_wrap { .search_wrap {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 10px; margin-bottom: 10px;
.el-button { .el-button {
margin-left: 20px; margin-left: 20px;
} }
...@@ -563,6 +562,7 @@ export default { ...@@ -563,6 +562,7 @@ export default {
} }
} }
} }
/deep/ .el-dialog__footer { /deep/ .el-dialog__footer {
height: 110px; height: 110px;
box-sizing: border-box; box-sizing: border-box;
...@@ -570,6 +570,7 @@ export default { ...@@ -570,6 +570,7 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
.el-button { .el-button {
margin: 0 29px; margin: 0 29px;
} }
......
src/views/meeting/operation/Administration/components/PersonDialog.vue
浏览文件 @ 84906ed7
<template> <template>
<div> <div>
<el-dialog <el-dialog class="dialog" width="33%" append-to-body :before-close="dialogClose" :title="dialogTitle"
class="dialog" :visible.sync="visible" :close-on-click-modal="false" @close="$emit('update: personFlag', false)">
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"> <div v-if="dialogTitle === '核对人员'" class="tips_wrap">
通过手机号进行核对，（姓名、浙政钉）信息有错。 通过手机号进行核对，（姓名、浙政钉）信息有错。
<br />确认“修改”的，按浙政钉进行同步人员信息。 <br />确认“修改”的，按浙政钉进行同步人员信息。
<br />确认“不修改”的，原人员信息不变，且核对通过。 <br />确认“不修改”的，原人员信息不变，且核对通过。
</div> </div>
<el-form <el-form ref="form" :class="dialogTitle === '核对人员' ? 'checkForm' : ''"
ref="form" :disabled="person.unitId != 0 && dialogTitle === '编辑人员'" :model="person" :rules="rules" label-width="100px">
: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"> <el-form-item label="姓名：" class="name_item checkItem" prop="name">
<!--checkState：1,已核对，不允许修改--> <!--checkState：1,已核对，不允许修改-->
<!-- <el-autocomplete--> <!-- <el-autocomplete-->
...@@ -81,49 +67,24 @@ ...@@ -81,49 +67,24 @@
<!-- </el-select>--> <!-- </el-select>-->
<el-input v-model="person.unitName" placeholder="请输入" maxlength="50" show-word-limit></el-input> <el-input v-model="person.unitName" placeholder="请输入" maxlength="50" show-word-limit></el-input>
</el-form-item> </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> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="medium" plain @click="dialogClose()">取 消</el-button> <el-button size="medium" plain @click="dialogClose()">取 消</el-button>
<el-button <el-button size="medium" type="danger" v-if="dialogTitle === '编辑人员'" @click="removePerson()"
size="medium" class="shanchu">删除</el-button>
type="danger" <el-button class="qingjia" size="medium" type="warning"
v-if="dialogTitle === '编辑人员'" v-if="dialogTitle === '编辑人员' && $route.query.isProcess == 1" @click="askLeave(person.signStatus)">{{
@click="removePerson()" person.signStatus === 5 ? "取消请假" : "请假" }}</el-button>
class="shanchu" <el-button class="qveding" size="medium" type="primary" v-if="dialogTitle === '新增人员'" @click="newAddPerson()">确
>删除</el-button> 定</el-button>
<el-button <el-button size="medium" type="primary" v-if="dialogTitle === '核对人员'" @click="unModifyPerson()">不修改</el-button>
class="qingjia" <el-button size="medium" type="primary" v-if="dialogTitle === '核对人员'" @click="modifyPerson()">修 改</el-button>
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 <el-button size="medium" type="primary" v-if="dialogTitle === '编辑人员' || dialogTitle === '更新人员'"
size="medium" @click="updatePerson()">确 定</el-button>
type="primary"
v-if="dialogTitle === '编辑人员' || dialogTitle === '更新人员'"
@click="updatePerson()"
>确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
...@@ -278,6 +239,7 @@ export default { ...@@ -278,6 +239,7 @@ export default {
this.singlePerson.unitName = this.person.unitName this.singlePerson.unitName = this.person.unitName
this.singlePerson.unitId = this.person.unitId this.singlePerson.unitId = this.person.unitId
this.singlePerson.checkState = this.person.checkState this.singlePerson.checkState = this.person.checkState
this.singlePerson.phone = this.person.phone
this.dialogTitle = this.title this.dialogTitle = this.title
this.$axios.postUpdatePerson(this.$route.query.processId, this.singlePerson, this.$route.query.isProcess).then((res) => { this.$axios.postUpdatePerson(this.$route.query.processId, this.singlePerson, this.$route.query.isProcess).then((res) => {
console.log(res) console.log(res)
...@@ -500,28 +462,35 @@ export default { ...@@ -500,28 +462,35 @@ export default {
.dialog /deep/ .el-dialog__body { .dialog /deep/ .el-dialog__body {
flex-direction: column !important; flex-direction: column !important;
} }
.el-dialog__wrapper { .el-dialog__wrapper {
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
display: flex; display: flex;
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
/deep/ .el-dialog { /deep/ .el-dialog {
margin-top: 0 !important; margin-top: 0 !important;
} }
} }
.el-form { .el-form {
width: 76%; width: 76%;
margin-left: -40px; margin-left: -40px;
} }
/deep/ .el-form-item { /deep/ .el-form-item {
width: 100%; width: 100%;
} }
.modifyItem { .modifyItem {
display: none; display: none;
} }
.checkForm .checkItem { .checkForm .checkItem {
position: relative; position: relative;
.modifyItem { .modifyItem {
display: block; display: block;
position: absolute; position: absolute;
...@@ -536,18 +505,22 @@ export default { ...@@ -536,18 +505,22 @@ export default {
line-height: 40px; line-height: 40px;
padding-left: 10px; padding-left: 10px;
} }
.el-autocomplete, .el-autocomplete,
.el-input { .el-input {
width: 50%; width: 50%;
} }
} }
.el-select, .el-select,
.el-autocomplete, .el-autocomplete,
.el-input { .el-input {
width: 100%; width: 100%;
} }
.name_item { .name_item {
position: relative; position: relative;
.change_but { .change_but {
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
...@@ -564,6 +537,7 @@ export default { ...@@ -564,6 +537,7 @@ export default {
text-align: center; text-align: center;
} }
} }
/*/deep/ .el-autocomplete-suggestion{*/ /*/deep/ .el-autocomplete-suggestion{*/
/* li {*/ /* li {*/
/* line-height: normal;*/ /* line-height: normal;*/
...@@ -589,16 +563,20 @@ export default { ...@@ -589,16 +563,20 @@ export default {
.el-button { .el-button {
margin: 0 28px; margin: 0 28px;
} }
.shanchu { .shanchu {
box-shadow: 0px 2px 10px 0px rgba(226, 79, 81, 0.3) !important; box-shadow: 0px 2px 10px 0px rgba(226, 79, 81, 0.3) !important;
} }
.qingjia { .qingjia {
box-shadow: 0px 2px 10px 0px rgba(250, 178, 0, 0.3) !important; box-shadow: 0px 2px 10px 0px rgba(250, 178, 0, 0.3) !important;
} }
.qveding { .qveding {
box-shadow: 0px 2px 10px 0px rgba(84, 116, 235, 0.3); box-shadow: 0px 2px 10px 0px rgba(84, 116, 235, 0.3);
} }
} }
.tips_wrap { .tips_wrap {
width: 552px; width: 552px;
height: auto; height: auto;
......
src/views/meeting/operation/divideArea/index.vue
浏览文件 @ 84906ed7
...@@ -909,6 +909,8 @@ export default { ...@@ -909,6 +909,8 @@ export default {
}) })
// this.personData = this.allPersonData.slice(0,20) // this.personData = this.allPersonData.slice(0,20)
// console.log; // console.log;
console.log('val', this.chooseArea(this.confData.confPersonAreaVos[val], val));
// if(val)
this.chooseArea(this.confData.confPersonAreaVos[val], val) this.chooseArea(this.confData.confPersonAreaVos[val], val)
// if (val) { // if (val) {
// this.chooseArea(this.confData.confPersonAreaVos[val], val) // this.chooseArea(this.confData.confPersonAreaVos[val], val)
...@@ -1097,7 +1099,7 @@ export default { ...@@ -1097,7 +1099,7 @@ export default {
console.log(res) console.log(res)
if (res.data.code === 200) { if (res.data.code === 200) {
this.disableFlag = true this.disableFlag = true
this.init() this.init(0)
this.$store.commit('changeSaveFlag', true) this.$store.commit('changeSaveFlag', true)
if (JSON.stringify(this.confData) !== JSON.stringify(this.copyData)) { if (JSON.stringify(this.confData) !== JSON.stringify(this.copyData)) {
this.$store.commit('changeUpdateFlag', false) this.$store.commit('changeUpdateFlag', false)
...@@ -1193,7 +1195,9 @@ export default { ...@@ -1193,7 +1195,9 @@ export default {
message: '新增区域成功！', message: '新增区域成功！',
type: 'success', type: 'success',
}) })
this.init() console.log('active', this.activeIndex);
this.init(this.activeIndex)
let oDom = document.querySelector('.selection_right_but_wrap') let oDom = document.querySelector('.selection_right_but_wrap')
this.$nextTick(() => { this.$nextTick(() => {
oDom.scrollTop = oDom.scrollHeight oDom.scrollTop = oDom.scrollHeight
...@@ -1337,7 +1341,7 @@ export default { ...@@ -1337,7 +1341,7 @@ export default {
// this.dragReleaseAreaDiv.getElementsByClassName("area_text")[0] // this.dragReleaseAreaDiv.getElementsByClassName("area_text")[0]
// .firstChild.data; //分组名称 // .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) { if (this.activeIndex !== 0 && this.dragReleaseAreaDiv.id === this.confData.confPersonAreaVos[this.activeIndex].id) {
return false return false
} }
...@@ -1616,9 +1620,11 @@ export default { ...@@ -1616,9 +1620,11 @@ export default {
} }
}, },
chooseArea(item, index) { chooseArea(item, index) {
console.log(item, index) console.log(item, index)
this.allPersonFlag = false this.allPersonFlag = false
this.activeIndex = index this.activeIndex = index
this.info = '' this.info = ''
this.showPersonData = this.confData.confPersonAreaVos[index].personData this.showPersonData = this.confData.confPersonAreaVos[index].personData
this.chosenArea = item this.chosenArea = item
......
src/views/meeting/operation/noticeMeeting/addNoticeUnitDialog.vue
浏览文件 @ 84906ed7
<template> <template>
<div> <div>
<el-dialog title="增加通知单位" :visible.sync="visible" :before-close="dialogTableHandleClose" append-to-body <el-dialog title="增加通知单位" :visible.sync="visible" :close-on-click-modal="false" :before-close="dialogTableHandleClose"
class="table_dialog" width="1100px"> append-to-body class="table_dialog" width="1100px">
<div class="body"> <div class="body">
<div class="top"> <div class="top">
<el-form ref="form" :model="form" label-width="110px" :inline="true"> <el-form ref="form" :model="form" label-width="110px" :inline="true">
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<el-table :data="tableData" height="100%" stripe> <el-table :data="tableData" height="100%" stripe>
<el-table-column property="unitName" label="参会单位（权限专用）"></el-table-column> <el-table-column property="unitName" label="参会单位（权限专用）"></el-table-column>
<el-table-column property="personName" 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="unitTel" label="单位联系电话"></el-table-column>
<el-table-column property="address" label="操作" class="caozuo"> <el-table-column property="address" label="操作" class="caozuo">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -184,12 +184,28 @@ export default { ...@@ -184,12 +184,28 @@ export default {
</script> </script>
<style lang="less" scoped> <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 { .body {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.top { .top {
// width: 100%; // width: 100%;
......
src/views/meeting/operation/noticeMeeting/index.vue
浏览文件 @ 84906ed7
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
<div class="main_wrap"> <div class="main_wrap">
<!-------------------------新手引导----------------------------> <!-------------------------新手引导---------------------------->
<div class="new_help" @click="showDirection"></div> <div class="new_help" @click="showDirection"></div>
<div class="direction" :class=" <div class="direction" :class="dir === 1 ? 'direction1' : 'direction2'
dir === 1 ? 'direction1' : 'direction2'
" v-if="dir"> " v-if="dir">
<div class="but but1" @click="iKnow()"></div> <div class="but but1" @click="iKnow()"></div>
<div class="but but2" @click="next()"></div> <div class="but but2" @click="next()"></div>
...@@ -246,7 +245,7 @@ ...@@ -246,7 +245,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="partUnitName" label="参会单位" width="120"></el-table-column> <el-table-column prop="partUnitName" label="参会单位" width="120"></el-table-column>
<el-table-column prop="personName" label="单位联系人" width="120"></el-table-column> <el-table-column prop="personName" label="单位联系人" width="120"></el-table-column>
<el-table-column prop="dingId" label="联系人浙政钉" width="120"></el-table-column> <!-- <el-table-column prop="dingId" label="联系人浙政钉" width="120"></el-table-column> -->
<el-table-column prop="unitTel" label="单位电话" width="100"></el-table-column> <el-table-column prop="unitTel" label="单位电话" width="100"></el-table-column>
<el-table-column prop="isPart" label="是否参会" width="120"> <el-table-column prop="isPart" label="是否参会" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -328,19 +327,22 @@ ...@@ -328,19 +327,22 @@
</span> </span>
</el-dialog> </el-dialog>
<!-- 发送通知 --> <!-- 发送通知 -->
<el-dialog title="发送通知" :visible.sync="noticeVisile" class="noticeVisile" width="600px" height="800px" append-to-body <el-dialog title="发送通知" :visible.sync="noticeVisile" class="noticeVisile" width="700px" height="800px" append-to-body
:before-close="noticeHandleClose" v-loading="noticeVisileLoading"> :before-close="noticeHandleClose" v-loading="noticeVisileLoading">
<div class="noticeVisileForm"> <div class="noticeVisileForm">
<el-form ref="form" :model="sendNoticePartForm" label-width="80px"> <el-form ref="ruleForm" :model="sendNoticePartForm" label-width="90px" :rules="sendNoticePartFormRules">
<el-form-item label="已选单位:">{{ multipleSelection.length }}家</el-form-item> <el-form-item label="已选单位：">{{ multipleSelection.length }}家</el-form-item>
<el-form-item label="通知内容:" class="content"> <el-form-item label="通知标题：" prop="noticeTitle"><el-input v-model="sendNoticePartForm.noticeTitle" maxlength="50"
<quill-editor v-model="sendNoticePartForm.noticeContent" :options="quillOption" /> show-word-limit></el-input></el-form-item>
<el-form-item label="通知内容：" prop="noticeContent" class="content">
<quill-editor v-model="sendNoticePartForm.noticeContent" @change="noticeContentChange($event)"
:options="quillOption" />
<span class="size">{{ contentLength }}/200</span>
</el-form-item> </el-form-item>
<el-form-item label="附件:"> <el-form-item label="附件:">
<el-upload class="upload-demo" action :on-change="changeFile" :on-remove="removeFile" <el-upload class="upload-demo" action :on-change="changeFile" :on-remove="removeFile"
:file-list="sendNoticePartForm.fileList" :auto-upload="true" :http-request=" :file-list="sendNoticePartForm.fileList" :auto-upload="true" :http-request="(data) => {
(data) => {
upload(data); upload(data);
}"> }">
<el-button size="small" type="info">上传文件</el-button> <el-button size="small" type="info">上传文件</el-button>
...@@ -351,9 +353,10 @@ ...@@ -351,9 +353,10 @@
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="noticeHandleClose()">取 消</el-button> <el-button @click="noticeHandleClose('ruleForm')">取 消</el-button>
<el-button :disabled="saveDraftDisabled" @click="saveDraft()">保存草稿</el-button> <el-button :disabled="saveDraftDisabled" @click="saveDraft('ruleForm')">保存草稿</el-button>
<el-button type="primary" :disabled="auditStatus == 0 || auditStatus == 2" @click="sureTongzhi()">发送通知</el-button> <el-button type="primary" :disabled="auditStatus == 0 || auditStatus == 2"
@click="sureTongzhi('ruleForm')">发送通知</el-button>
</span> </span>
</el-dialog> </el-dialog>
...@@ -605,6 +608,12 @@ export default { ...@@ -605,6 +608,12 @@ export default {
noticeFileName: '', noticeFileName: '',
noticeFilePath: '', noticeFilePath: '',
processId: '', processId: '',
noticeTitle: '参会反馈通知',
fileList: [],
},
sendNoticePartFormRules: {
noticeTitle: [{ required: true, message: '请填写通知标题', trigger: 'blur' }],
noticeContent: [{ required: true, message: '请填写通知内容', trigger: 'change' }]
}, },
noticeVisileLoading: false, noticeVisileLoading: false,
saveDraftDisabled: false, saveDraftDisabled: false,
...@@ -622,6 +631,7 @@ export default { ...@@ -622,6 +631,7 @@ export default {
}, },
}, },
}, },
contentLength: 0,
//批量催阅 //批量催阅
batchReviewVisible: false, batchReviewVisible: false,
...@@ -728,6 +738,12 @@ export default { ...@@ -728,6 +738,12 @@ export default {
'sendNoticePartForm.noticeContent': { 'sendNoticePartForm.noticeContent': {
handler(newVal, oldVal) { handler(newVal, oldVal) {
this.saveDraftDisabled = false this.saveDraftDisabled = false
if (newVal.length > 200) {
// console.log(newVal.slice(0, 200));
// newVal.slice(0, 200)
// this.$set(this.sendNoticePartForm, 'noticeContent', newVal.slice(0, 200))
// this.sendNoticePartForm.noticeContent.slice(0, 200)
}
}, },
deep: true, deep: true,
}, },
...@@ -749,6 +765,27 @@ export default { ...@@ -749,6 +765,27 @@ export default {
// this.getArea() // this.getArea()
}, },
methods: { methods: {
noticeContentChange(event) {
console.log(event);
event.quill.deleteText(200, 4)
if (this.sendNoticePartForm.noticeContent === '') {
this.contentLength = 0
} else {
this.contentLength = event.quill.getLength() - 1
}
// console.log(event.length);
// if (val.length > 20) {
// // this.sendNoticePartForm.noticeContent = val.slice(0, 200)
// this.sendNoticePartForm.noticeContent = val.split('</p>')[0].slice(0, 20) + '</p>'
// console.log(val.split('</p>')[0].slice(0, 20));
// this.$forceUpdate(() => {
// this.$set(this.sendNoticePartForm, 'noticeContent', val.split('</p>')[0].slice(0, 20) + '</p>')
// })
// console.log(this.sendNoticePartForm.noticeContent);
// }
},
labelToTable(val) { labelToTable(val) {
console.log('index,', val) console.log('index,', val)
this.labelUnit = val this.labelUnit = val
...@@ -888,10 +925,11 @@ export default { ...@@ -888,10 +925,11 @@ export default {
this.batchReviewVisible = false this.batchReviewVisible = false
}, },
removeFile(file, fileList) { removeFile(file, fileList) {
// this.$nextTick(() => { console.log(321);
// item.fileList = [] this.sendNoticePartForm.noticeFileName = ''
// this.$refs[ref][0].clearFiles() this.sendNoticePartForm.noticeFilePath = ''
// }) this.sendNoticePartForm.fileList = []
console.log(this.sendNoticePartForm);
}, },
upload(data) { upload(data) {
console.log(data) console.log(data)
...@@ -908,6 +946,9 @@ export default { ...@@ -908,6 +946,9 @@ export default {
}, },
//通知，上传文件CHange //通知，上传文件CHange
changeFile(file, fileList) { changeFile(file, fileList) {
console.log(fileList);
this.sendNoticePartForm.fileList = fileList.slice(-1)
console.log(this.sendNoticePartForm);
// this.schedule[index].fileList = fileList.slice(-1) // this.schedule[index].fileList = fileList.slice(-1)
// this.$set(this.schedule, index, this.schedule[index]) // this.$set(this.schedule, index, this.schedule[index])
}, },
...@@ -919,25 +960,40 @@ export default { ...@@ -919,25 +960,40 @@ export default {
console.log(res) console.log(res)
if (res.data.code == 200 && res.data.data) { if (res.data.code == 200 && res.data.data) {
this.sendNoticePartForm = res.data.data this.sendNoticePartForm = res.data.data
if (res.data.data.noticeFileName) {
let data = {
name: res.data.data.noticeFileName,
uid: 123456
}
this.sendNoticePartForm.fileList = [data]
}
} }
}) })
}, },
noticeHandleClose() { noticeHandleClose() {
this.sendNoticePartForm = { this.sendNoticePartForm = {
id: '', id: '',
noticeContent: '', noticeContent: '',
noticeFileName: '', noticeFileName: '',
noticeFilePath: '', noticeFilePath: '',
processId: '', processId: '',
noticeTitle: '参会反馈通知',
fileList: [],
} }
this.$refs.ruleForm.resetFields();
this.noticeVisile = false this.noticeVisile = false
}, },
//保存草稿 //保存草稿
saveDraft() { saveDraft(formName) {
console.log(this.sendNoticePartForm);
this.$refs[formName].validate((valid) => {
if (valid) {
let list = this.multipleSelection.map((item) => { let list = this.multipleSelection.map((item) => {
return item.id return item.id
}) })
console.log('this.sendNoticePartForm,', this.sendNoticePartForm) // console.log('this.sendNoticePartForm,', this.sendNoticePartForm)
this.sendNoticePartForm.processId = this.$route.query.processId this.sendNoticePartForm.processId = this.$route.query.processId
// console.log('data', data) // console.log('data', data)
this.$axios.sendNoticeSaveDraft(this.sendNoticePartForm).then((res) => { this.$axios.sendNoticeSaveDraft(this.sendNoticePartForm).then((res) => {
...@@ -948,9 +1004,16 @@ export default { ...@@ -948,9 +1004,16 @@ export default {
this.$message.error(`${res.data.data}`) this.$message.error(`${res.data.data}`)
} }
}) })
} else {
this.$message.error('请填写完信息后再保存草稿')
}
})
}, },
//确定发送通知 //确定发送通知
sureTongzhi() { sureTongzhi(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
let list = this.multipleSelection.map((item) => { let list = this.multipleSelection.map((item) => {
return item.id return item.id
}) })
...@@ -973,6 +1036,12 @@ export default { ...@@ -973,6 +1036,12 @@ export default {
this.$message.error(`${res.data.data}`) this.$message.error(`${res.data.data}`)
} }
}) })
} else {
this.$message.error('请填写完表单后再发送通知')
return false;
}
});
}, },
getInit() { getInit() {
// console.log(123) // console.log(123)
...@@ -3064,12 +3133,27 @@ export default { ...@@ -3064,12 +3133,27 @@ export default {
.content { .content {
height: 250px; height: 250px;
position: relative;
.size {
position: absolute;
right: 4px;
bottom: 0px;
}
.el-form-item__content { .el-form-item__content {
height: 80%; height: 100%;
.quill-editor { .quill-editor {
height: 100%; height: 100%;
.ql-toolbar {
height: 60px;
}
.ql-container {
height: calc(100% - 60px);
}
} }
} }
} }
......
src/views/meeting/operation/noticeMeeting/lableTable.vue
浏览文件 @ 84906ed7
<template> <template>
<div> <div>
<el-dialog title="增加通知单位" :visible.sync="visible" :before-close="lableTableHandleClose" append-to-body <el-dialog title="增加通知单位" :visible.sync="visible" :close-on-click-modal="false" :before-close="lableTableHandleClose"
class="table_dialog" width="1000px"> append-to-body class="table_dialog" width="1000px">
<div class="body"> <div class="body">
<div class="left"> <div class="left">
<div class="tips">标签：{{ AllLabelObj.customOrgNum }}个</div> <div class="tips">标签：{{ AllLabelObj.customOrgNum }}个</div>
...@@ -226,7 +226,18 @@ export default { ...@@ -226,7 +226,18 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.el-dialog__wrapper {
width: 100vw;
// height: 100vh;
display: flex;
justify-content: center;
flex-direction: column;
margin-top: -7vh;
}
.el-dialog { .el-dialog {
// margin-top: 400vh !important;
.body { .body {
width: 100%; width: 100%;
display: flex; display: flex;
...@@ -234,6 +245,7 @@ export default { ...@@ -234,6 +245,7 @@ export default {
.left { .left {
width: 200px; width: 200px;
height: 100%;
.tips { .tips {
width: 100%; width: 100%;
...@@ -247,13 +259,14 @@ export default { ...@@ -247,13 +259,14 @@ export default {
.label_list { .label_list {
width: 100%; width: 100%;
height: 100%; // height: 100%;
height: 600px;
background: rgba(226, 226, 226, 0.24); background: rgba(226, 226, 226, 0.24);
// text-align: center // text-align: center
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
overflow: hidden; overflow: auto;
......
src/views/meeting/operation/overview/index.vue
浏览文件 @ 84906ed7
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</div> </div>
</div> </div>
<div class="overview_model_2_children"> <div class="overview_model_2_children">
<div class="tag tag3">定制日程（非必填）</div> <div class="tag tag3">会议详情</div>
<div class="mobile_wrap"> <div class="mobile_wrap">
<div class="warp_left"> <div class="warp_left">
<div class="img"> <div class="img">
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<el-button type="primary" class="yulan" @click="yulan()">预览</el-button> <el-button type="primary" class="yulan" @click="yulan()">预览</el-button>
</div> </div>
<div class="warp_right"> <div class="warp_right">
<div>日程地址（外挂）：</div> <div>链接地址（外挂）：</div>
<div class="area"> <div class="area">
<el-input type="textarea" :rows="4" placeholder="请输入内容" v-model="schedulePath"></el-input> <el-input type="textarea" :rows="4" placeholder="请输入内容" v-model="schedulePath"></el-input>
</div> </div>
...@@ -299,14 +299,27 @@ ...@@ -299,14 +299,27 @@
</el-dialog> </el-dialog>
<!-- 群发会议通知 --> <!-- 群发会议通知 -->
<el-dialog title="群发会议通知" :visible.sync="notification" width="40%" append-to-body <el-dialog title="群发会议通知" :visible.sync="notification" width="40%" append-to-body
:before-close="notificationHandleClosed" v-loading.fullscreen.lock="noteListDialogLoading"> :before-close="notificationHandleClosed" :close-on-click-modal="false"
v-loading.fullscreen.lock="noteListDialogLoading">
<el-form style="width:80%" :model="notificationForm" ref="notificationForm" label-width="100px" <el-form style="width:80%" :model="notificationForm" ref="notificationForm" label-width="100px"
:rules="notificationFormRules"> :rules="notificationFormRules">
<el-form-item label="接收人员：" prop="person"> <el-form-item label="接收人员：" prop="person">
<div>{{ notificationForm.person }}</div> <div>{{ notificationForm.person }}</div>
</el-form-item> </el-form-item>
<el-form-item label="通知标题：" prop="noticeTitle">
<el-input v-model="notificationForm.noticeTitle" maxlength="50" show-word-limit></el-input>
</el-form-item>
<el-form-item label="通知内容：" prop="content"> <el-form-item label="通知内容：" prop="content">
<el-input type="textarea" rows="9" v-model="notificationForm.content"></el-input> <el-input type="textarea" rows="9" v-model="notificationForm.content" maxlength="200"
show-word-limit></el-input>
</el-form-item>
<el-form-item label="上传附件：">
<el-upload class="upload-demo" action :on-change="changeFile" :on-remove="removeFile"
:file-list="notificationForm.fileList" :auto-upload="true" :http-request="(data) => {
upload(data);
}">
<el-button size="small" type="info">上传文件</el-button>
</el-upload>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="notificationHandleClosed('notificationForm')">取 消</el-button> <el-button @click="notificationHandleClosed('notificationForm')">取 消</el-button>
...@@ -344,7 +357,7 @@ ...@@ -344,7 +357,7 @@
<span slot="title" class="notifyResultsDialog_title"> <span slot="title" class="notifyResultsDialog_title">
<div>通知结果</div> <div>通知结果</div>
<el-button type="primary" @click="goBack()">返回</el-button>
</span> </span>
<div class="top"> <div class="top">
<div class="content"> <div class="content">
...@@ -372,7 +385,8 @@ ...@@ -372,7 +385,8 @@
</el-table> </el-table>
<!-- </div> --> <!-- </div> -->
<span slot="footer"> <span slot="footer">
<el-button type="primary" @click="notifyResultsDialogVisibleClose()">关闭</el-button> <el-button type="primary" @click="goBack()">返回</el-button>
<el-button type="danger" @click="notifyResultsDialogVisibleClose()">关闭</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
...@@ -435,10 +449,13 @@ export default { ...@@ -435,10 +449,13 @@ export default {
notificationForm: { notificationForm: {
person: '全部参会人员', person: '全部参会人员',
content: '', content: '',
noticeTitle: '',
fileList: []
}, },
notificationFormRules: { notificationFormRules: {
person: [{ required: true, message: '请填写通知内容', trigger: 'blur' }], person: [{ required: true, message: '请填写', trigger: 'blur' }],
content: [{ required: true, message: '请填写通知内容', trigger: 'blur' }], content: [{ required: true, message: '请填写通知内容', trigger: 'blur' }],
noticeTitle: [{ required: true, message: '请填写通知标题', trigger: 'blur' }],
}, },
noteListDialogVisible: false, noteListDialogVisible: false,
...@@ -483,6 +500,36 @@ export default { ...@@ -483,6 +500,36 @@ export default {
}, },
}, },
methods: { methods: {
//通知，上传文件CHange
changeFile(file, fileList) {
// console.log('changeFile', file, fileList);
// fileList.slice(-1)
this.notificationForm.fileList = fileList.slice(-1)
// this.schedule[index].fileList = fileList.slice(-1)
// this.$set(this.schedule, index, this.schedule[index])
},
removeFile(file, fileList) {
console.log('remove', file, fileList);
// this.$nextTick(() => {
// item.fileList = []
// this.$refs[ref][0].clearFiles()
// })
},
upload(data) {
console.log(data);
// this.notificationForm.fileList.push(data)
let uploadFile = new FormData()
uploadFile.append('file', data.file)
this.$axios.sendMassNoticeUpLoadFile(uploadFile).then(res => {
console.log(res);
if (res.data.code == 200) {
this.notificationForm.noticeFileName = res.data.data.fileName
this.notificationForm.noticeFilePath = res.data.data.filePath
} else {
this.$message.error(`${res.data.data}`)
}
})
},
goBack() { goBack() {
this.notifyResultsDialogVisibleClose() this.notifyResultsDialogVisibleClose()
this.notificationRecord() this.notificationRecord()
...@@ -495,11 +542,16 @@ export default { ...@@ -495,11 +542,16 @@ export default {
this.notification = true this.notification = true
}, },
sureNotification(formName) { sureNotification(formName) {
this.notificationForm
console.log(this.notificationForm);
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
let params = { let params = {
noticeTitle: this.notificationForm.noticeTitle,
noticeContent: this.notificationForm.content, noticeContent: this.notificationForm.content,
processId: this.$route.query.processId, processId: this.$route.query.processId,
noticeFileName: this.notificationForm.noticeFileName,
noticeFilePath: this.notificationForm.noticeFilePath
} }
this.noteListDialogLoading = true this.noteListDialogLoading = true
// setTimeout(() => { // setTimeout(() => {
...@@ -524,6 +576,11 @@ export default { ...@@ -524,6 +576,11 @@ export default {
notificationHandleClosed() { notificationHandleClosed() {
this.notification = false this.notification = false
this.notificationForm.content = '' this.notificationForm.content = ''
this.notificationForm.noticeTitle = ''
this.notificationForm.fileList = []
this.notificationForm.noticeFileName = ''
this.notificationForm.noticeFilePath = ''
this.$refs.notificationForm.resetFields()
}, },
//查看通知 //查看通知
notificationRecord() { notificationRecord() {
...@@ -597,8 +654,10 @@ export default { ...@@ -597,8 +654,10 @@ export default {
}, },
//查看大屏（ly） //查看大屏（ly）
checkScreen() { checkScreen() {
console.log(this.overviewData) let token = sessionStorage.getItem('ty_token')
window.open(this.overviewData.meetingTemplateList1[0].templateUrl, '_blank') let userName = sessionStorage.getItem("userName");
let sysRoles = sessionStorage.getItem("sysRoles");
window.open(`${this.overviewData.meetingTemplateList1[0].templateUrl}?ty_token=${token}&userName=${userName}&sysRoles=${sysRoles}`)
}, },
sureSend() { sureSend() {
this.$axios.sendToInkScreen(this.deleteItem).then((res) => { this.$axios.sendToInkScreen(this.deleteItem).then((res) => {
...@@ -1148,9 +1207,12 @@ export default { ...@@ -1148,9 +1207,12 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
// width: 180px;
// height: 364px;
.yulan { .yulan {
height: 36px; width: 80px;
height: 30px;
margin-top: 15px; margin-top: 15px;
} }
...@@ -1159,6 +1221,8 @@ export default { ...@@ -1159,6 +1221,8 @@ export default {
height: 364px; height: 364px;
img { img {
// width: 180px;
// height: 364px;
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
...@@ -1167,11 +1231,11 @@ export default { ...@@ -1167,11 +1231,11 @@ export default {
.warp_right { .warp_right {
// height: 70%; // height: 70%;
padding-top: 100px; padding-top: 40px;
position: relative; position: relative;
.area { .area {
height: 150px; height: 280px;
width: 230px; width: 230px;
margin-bottom: 10px; margin-bottom: 10px;
...@@ -1187,6 +1251,8 @@ export default { ...@@ -1187,6 +1251,8 @@ export default {
} }
.btn { .btn {
width: 80px;
height: 30px;
position: absolute; position: absolute;
right: 0; right: 0;
} }
...@@ -1698,7 +1764,7 @@ export default { ...@@ -1698,7 +1764,7 @@ export default {
width: 100%; width: 100%;
height: 85%; height: 85%;
display: flex; display: flex;
padding: 10px; padding: 10px 25px;
// box-shadow: inset; // box-shadow: inset;
flex-direction: column; flex-direction: column;
...@@ -1731,11 +1797,13 @@ export default { ...@@ -1731,11 +1797,13 @@ export default {
border: 1px solid #7690ed; border: 1px solid #7690ed;
background: #fff; background: #fff;
cursor: pointer; cursor: pointer;
color: #7690ed;
} }
.active { .active {
border: 1px solid gray; border: 1px solid gray;
background: #7690ed; background: #7690ed;
color: #fff;
} }
.button_div:first-child { .button_div:first-child {
......
src/views/meeting/state/beforeMeeting/index.vue
浏览文件 @ 84906ed7
...@@ -184,7 +184,7 @@ export default { ...@@ -184,7 +184,7 @@ export default {
let path = '' let path = ''
if (item.processStatus == 3) { if (item.processStatus == 3) {
window.open( 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' 'ty_token'
)}&username=${sessionStorage.getItem('userName')}`, )}&username=${sessionStorage.getItem('userName')}`,
'_blank' '_blank'
......
src/views/system/confenceLibrary.vue
浏览文件 @ 84906ed7
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</el-form-item>--> </el-form-item>-->
<el-form-item label="容纳人数:" prop="capacity"> <el-form-item label="容纳人数:" prop="capacity">
<el-input v-model.number.trim="forms.capacity" maxlength="4" show-word-limit <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>
<el-form-item label="规模:" prop="scale"> <el-form-item label="规模:" prop="scale">
<el-select v-model="forms.scale" clearable placeholder="请选择"> <el-select v-model="forms.scale" clearable placeholder="请选择">
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="会议室配置:" prop="des"> <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>
<!-- <el-form-item <!-- <el-form-item
label="专属会议室(选):" label="专属会议室(选):"
...@@ -215,12 +215,12 @@ export default { ...@@ -215,12 +215,12 @@ export default {
}, },
created() { created() {
this.sysRoles = sessionStorage.getItem('sysRoles') this.sysRoles = sessionStorage.getItem('sysRoles')
console.log('当前登录人权限', this.sysRoles); // console.log('当前登录人权限', this.sysRoles);
this.cnName = sessionStorage.getItem('cnName') this.cnName = sessionStorage.getItem('cnName')
console.log(sessionStorage.getItem('sysRoles')); // console.log(sessionStorage.getItem('sysRoles'));
if (this.cnName !== '超级管理员' && sessionStorage.getItem('sysRoles') !== 'ROLE_HUIYISHIADMIN') { if (this.cnName !== '超级管理员' && sessionStorage.getItem('sysRoles') !== 'ROLE_HUIYISHIADMIN') {
this.forms.unitId = sessionStorage.getItem('unitId') this.forms.unitId = sessionStorage.getItem('unitId')
console.log('false'); // console.log('false');
this.disFlag = true this.disFlag = true
this.forms.unitName = sessionStorage.getItem('unitName') this.forms.unitName = sessionStorage.getItem('unitName')
} else if (sessionStorage.getItem('sysRoles') == 'ROLE_HUIYISHIADMIN') { } else if (sessionStorage.getItem('sysRoles') == 'ROLE_HUIYISHIADMIN') {
...@@ -237,6 +237,17 @@ export default { ...@@ -237,6 +237,17 @@ export default {
} }
}, },
methods: { 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) { toggles(val) {
this.$router.push({ this.$router.push({
...@@ -256,7 +267,7 @@ export default { ...@@ -256,7 +267,7 @@ export default {
}) })
}, },
changName(val) { changName(val) {
console.log(val) // console.log(val)
}, },
//获取全部数据 //获取全部数据
getTaList() { getTaList() {
......
src/views/system/el-dialog/addUser.vue
浏览文件 @ 84906ed7
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
:before-close="cancel" width="40%" v-loading="loading" top="8vh"> :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 ref="addUser" :rules="rules" :model="addFrom" label-width="150px" class="demo-ruleForm">
<el-form-item label="选择权限专用单位:" prop="unitName" class="ty_from_item_position"> <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" <el-option v-for="(item, index) in authorityUnitArr" :key="index" :value="item"
:label="item.unitName"></el-option> :label="item.unitName"></el-option>
</el-select> </el-select>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</el-form-item> </el-form-item>
<el-form-item label="浙政钉:" prop="dingId"> <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>
<!-- <el-form-item label="CASID:"> <!-- <el-form-item label="CASID:">
<el-autocomplete <el-autocomplete
......
src/views/system/index.vue
浏览文件 @ 84906ed7
...@@ -144,11 +144,11 @@ export default { ...@@ -144,11 +144,11 @@ export default {
// path: "/system/bankMangager/range", // path: "/system/bankMangager/range",
// Rindex: 4 - 3, // Rindex: 4 - 3,
// }, // },
{ // {
name: '模板库管理', // name: '模板库管理',
path: '/system/bankMangager/templateLibrary', // path: '/system/bankMangager/templateLibrary',
Rindex: 4 - 4, // Rindex: 4 - 4,
}, // },
// { // {
// name: '单位库管理', // name: '单位库管理',
// path: '/system/bankMangager/unitLibrary', // path: '/system/bankMangager/unitLibrary',
...@@ -182,6 +182,7 @@ export default { ...@@ -182,6 +182,7 @@ export default {
this.path = this.path.filter((item, index) => item.meta.title !== '') this.path = this.path.filter((item, index) => item.meta.title !== '')
console.log(this.path) console.log(this.path)
let sysRoles = sessionStorage.getItem('sysRoles') let sysRoles = sessionStorage.getItem('sysRoles')
console.log('权限', sysRoles);
switch (sysRoles) { switch (sysRoles) {
case 'ROLE_SUPERADMIN': case 'ROLE_SUPERADMIN':
break break
...@@ -202,7 +203,14 @@ export default { ...@@ -202,7 +203,14 @@ export default {
path: '/system/bankMangager/confLibrary', path: '/system/bankMangager/confLibrary',
Rindex: 4 - 1, Rindex: 4 - 1,
}, },
// {
// name: '人员标签库',
// path: '/system/bankMangager/userLibrary/personLabel',
// Rindex: 4 - 2,
// },
] ]
this.path = this.path.slice(-2)
break
case 'ROLE_HUIYISHIADMIN': case 'ROLE_HUIYISHIADMIN':
this.linkList = [ this.linkList = [
{ {
...@@ -211,12 +219,14 @@ export default { ...@@ -211,12 +219,14 @@ export default {
Rindex: 4 - 1, Rindex: 4 - 1,
}, },
] ]
console.log(123);
break break
default: default:
this.$router.push({ path: '/login' }) this.$router.push({ path: '/login' })
} }
}, },
beforeRouteUpdate(to, from, next) { beforeRouteUpdate(to, from, next) {
console.log(to);
let sysRoles = sessionStorage.getItem('sysRoles') let sysRoles = sessionStorage.getItem('sysRoles')
/*****路由跳转时更新面包屑********/ /*****路由跳转时更新面包屑********/
this.path = to.matched this.path = to.matched
...@@ -234,6 +244,7 @@ export default { ...@@ -234,6 +244,7 @@ export default {
to.path == '/system/bankMangager/confLibrary/second' || to.path == '/system/bankMangager/confLibrary/second' ||
to.path == '/system/bankMangager/confLibrary/HallSeat' to.path == '/system/bankMangager/confLibrary/HallSeat'
) { ) {
next() next()
} else { } else {
next({ path: '/' }) next({ path: '/' })
...@@ -243,8 +254,10 @@ export default { ...@@ -243,8 +254,10 @@ export default {
if ( if (
to.path == '/system/bankMangager/confLibrary' || to.path == '/system/bankMangager/confLibrary' ||
to.path == '/system/bankMangager/confLibrary/second' || 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() next()
} else { } else {
next({ path: '/' }) next({ path: '/' })
...@@ -272,7 +285,7 @@ export default { ...@@ -272,7 +285,7 @@ export default {
//能否更新人员 //能否更新人员
getIsSync() { getIsSync() {
this.$axios.findIsSync().then(res => { this.$axios.findIsSync().then(res => {
console.log('能否更新人员', res); // console.log('能否更新人员', res);
if (res.data.code == 200) { if (res.data.code == 200) {
this.titleForm = res.data.data this.titleForm = res.data.data
} }
......
src/views/system/jurisdiction.vue
浏览文件 @ 84906ed7
...@@ -57,7 +57,8 @@ ...@@ -57,7 +57,8 @@
}} }}
</template> </template>
</el-table-column> </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 prop="casId" label="CAS"></el-table-column>
<el-table-column label="角色"> <el-table-column label="角色">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -109,9 +110,10 @@ ...@@ -109,9 +110,10 @@
<el-button type="primary" class="btn" @click="addAuthorityUnit()">新增专用单位管理</el-button> <el-button type="primary" class="btn" @click="addAuthorityUnit()">新增专用单位管理</el-button>
</div> </div>
<div v-if="authorityUnitArr.length > 0"> <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> <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>{{item.unitName}}</div> -->
<div class="del" @click="delUnit(item, index)"></div> <div class="del" @click="delUnit(item, index)"></div>
</div> </div>
...@@ -205,6 +207,7 @@ export default { ...@@ -205,6 +207,7 @@ export default {
this.getUserList() this.getUserList()
}, },
methods: { methods: {
getPerson(val) { getPerson(val) {
console.log(val) console.log(val)
this.batchAddFlag = false this.batchAddFlag = false
...@@ -214,23 +217,35 @@ export default { ...@@ -214,23 +217,35 @@ export default {
// this.upDataUser.cnName = val.employeeName // this.upDataUser.cnName = val.employeeName
// console.log(this.userFrom) // 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() { confirmDelUnit() {
if (this.delUnitObj.unitId) { if (this.delUnitObj.unitId) {
this.$axios.delUnitAuth(this.delUnitObj.unitId).then((res) => { this.$axios.delUnitAuth(this.delUnitObj.unitId).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
this.$message.success('删除成功!') this.$message.success('删除成功!')
this.authorityUnitArr.splice(this.delUnitObj.index, 1) // this.authorityUnitArr.splice(this.delUnitObj.index, 1)
console.log('this.authorityUnitArr', this.authorityUnitArr) this.authorityUnitArr[this.delUnitObj.index].updateStatus = 2
// console.log('this.authorityUnitArr', this.authorityUnitArr)
this.delHandleClose() this.delHandleClose()
} else { } else {
this.$message.error(`${res.data.data}`) this.$message.error(`${res.data.data}`)
this.delHandleClose()
} }
}) })
} else { } else {
console.log(this.delUnitObj) // console.log(this.delUnitObj)
this.authorityUnitArr.splice(this.delUnitObj?.index, 1) this.authorityUnitArr.splice(this.delUnitObj.index, 1)
console.log('INDEX', this.authorityUnitArr) // console.log('INDEX', this.authorityUnitArr)
this.$message.success('删除成功!') this.$message.success('删除成功!')
this.delHandleClose() this.delHandleClose()
...@@ -250,7 +265,7 @@ export default { ...@@ -250,7 +265,7 @@ export default {
addAuthorityUnit() { addAuthorityUnit() {
console.log('aadd', this.authorityUnitArr) console.log('aadd', this.authorityUnitArr)
this.authorityUnitArr.push({ unitId: '', unitName: '' }) this.authorityUnitArr.push({ unitId: '', unitName: '', updateStatus: 1 })
// this.$forceUpdate() // this.$forceUpdate()
}, },
...@@ -270,7 +285,7 @@ export default { ...@@ -270,7 +285,7 @@ export default {
this.dialogFormVisible = false this.dialogFormVisible = false
this.$message.success('保存成功！') this.$message.success('保存成功！')
} else { } else {
this.$message.error(`${res.msg}`) this.$message.error(`${res.data.data}`)
} }
}) })
} else { } else {
......
src/views/system/personLabel.vue
浏览文件 @ 84906ed7
...@@ -139,10 +139,11 @@ ...@@ -139,10 +139,11 @@
</div> </div>
<el-button type="primary" class="btn" @click="addLabel()">新增标签</el-button> <el-button type="primary" class="btn" @click="addLabel()">新增标签</el-button>
</div> </div>
<div v-if="labelList.length > 0"> <div v-if="dialogLabelList.length > 0">
<div class="unit" v-for="( item, index ) in labelList " :key="labelList.length + index"> <div class="unit" v-for="(item, index) in dialogLabelList" :key="dialogLabelList.length + index"
v-show="item.updateStatus !== 2">
<div class="tips_num">权限专用单位：</div> <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>{{item.unitName}}</div> -->
<div class="del" @click="delLabel(item, index)"></div> <div class="del" @click="delLabel(item, index)"></div>
</div> </div>
...@@ -308,6 +309,7 @@ export default { ...@@ -308,6 +309,7 @@ export default {
delLabelObj: {}, delLabelObj: {},
labelList: [], labelList: [],
dialogLabelList: [],
delLabelVisible: false, delLabelVisible: false,
overall: { overall: {
personNum: null, personNum: null,
...@@ -339,6 +341,14 @@ export default { ...@@ -339,6 +341,14 @@ export default {
} }
}, },
methods: { methods: {
customOrgNameInput(item) {
for (let i in this.dialogLabelList) {
if (this.dialogLabelList[i].id == item.id) {
this.dialogLabelList[i].updateStatus = 1
}
}
},
reset() { reset() {
this.formData = { this.formData = {
customOrgName: this.formData.customOrgName, //自定义人员所属分类名 customOrgName: this.formData.customOrgName, //自定义人员所属分类名
...@@ -527,19 +537,20 @@ export default { ...@@ -527,19 +537,20 @@ export default {
}, },
//新增标签 //新增标签
addLabel() { addLabel() {
console.log('aadd', this.labelList) console.log('aadd', this.dialogLabelList)
this.labelList.push({ this.dialogLabelList.push({
customOrgName: '', customOrgName: '',
id: '', id: '',
sysUnitId: '', sysUnitId: '',
sysUnitName: '', sysUnitName: '',
updateStatus: 1,
}) })
// this.$forceUpdate() // this.$forceUpdate()
}, },
//保存/修改标签 //保存/修改标签
submitForm() { submitForm() {
this.$axios.saveCustomOrgO(this.labelList).then((res) => { this.$axios.saveCustomOrgO(this.dialogLabelList).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
this.$message.success('保存成功！') this.$message.success('保存成功！')
this.dialogLabelHandleClose() this.dialogLabelHandleClose()
...@@ -563,17 +574,21 @@ export default { ...@@ -563,17 +574,21 @@ export default {
this.$axios.deleteCustomOrg(this.delLabelObj.id).then((res) => { this.$axios.deleteCustomOrg(this.delLabelObj.id).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
this.$message.success('删除成功!') 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() this.delLabelHandleClose()
} else { } else {
this.$message.error(`${res.data.data}`) this.$message.error(`${res.data.data}`)
this.delLabelHandleClose()
} }
}) })
} else { } else {
this.labelList.splice(this.delLabelObj?.index, 1) this.dialogLabelList.splice(this.delLabelObj.index, 1)
this.$message.success('删除成功!') this.$message.success('删除成功!')
this.delLabelHandleClose()
} }
console.log('删除后的数组', this.dialogLabelList);
}, },
//删除账号 关闭弹框 //删除账号 关闭弹框
...@@ -583,8 +598,9 @@ export default { ...@@ -583,8 +598,9 @@ export default {
}, },
//管理标签HandleClose //管理标签HandleClose
dialogLabelHandleClose() { dialogLabelHandleClose() {
console.log(this.labelList) console.log(this.dialogLabelList)
this.labelList = this.labelList.filter((item) => item.id) this.dialogLabelList = this.dialogLabelList.filter((item) => item.id)
// this.dialogLabelList = []
this.dialogLabelVisible = false this.dialogLabelVisible = false
}, },
back(val) { back(val) {
...@@ -660,8 +676,7 @@ export default { ...@@ -660,8 +676,7 @@ export default {
}, },
//管理标签 //管理标签
manageTags() { manageTags() {
console.log(123) this.dialogLabelList = JSON.parse(JSON.stringify(this.labelList))
this.dialogLabelVisible = true this.dialogLabelVisible = true
}, },
//导入 //导入
...@@ -688,7 +703,8 @@ export default { ...@@ -688,7 +703,8 @@ export default {
getLabelList() { getLabelList() {
return this.$axios.findAllCustomOrg().then((res) => { return this.$axios.findAllCustomOrg().then((res) => {
console.log(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.customOrgId = res.data.data[0].id
this.formData.customOrgName = res.data.data[0].customOrgName this.formData.customOrgName = res.data.data[0].customOrgName
return this.formData.customOrgId return this.formData.customOrgId
......
src/views/system/unitEmpower.vue
浏览文件 @ 84906ed7
...@@ -26,8 +26,9 @@ ...@@ -26,8 +26,9 @@
<div>{{ total }}家</div> <div>{{ total }}家</div>
</div> </div>
<div class="tableList"> <div class="tableList">
<el-table :data="tableData" style="width: 100%" height="100%" stripe :default-sort="{ order: 'sortNum' }"> <el-table :data="tableData" style="width: 100%" height="100%" stripe v-loading="tableLoading"
<el-table-column prop="sortNum" label="序号" width="180"></el-table-column> :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="unitName" label="参会单位（权限专用）" width="180"></el-table-column>
<el-table-column prop="personName" 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> <el-table-column prop="dingId" label="联系人浙政钉"></el-table-column>
...@@ -51,7 +52,7 @@ ...@@ -51,7 +52,7 @@
<!-- 新增/编辑参会单位授权 --> <!-- 新增/编辑参会单位授权 -->
<el-dialog title="新增|编辑参会单位授权" :visible.sync="dialogFormVisible" :close-on-click-modal="false" <el-dialog title="新增|编辑参会单位授权" :visible.sync="dialogFormVisible" :close-on-click-modal="false"
:before-close="handleClose" class="addUnit_dialog"> :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-form-item label="选择单位（平台）：" prop="unitId">
<el-select v-model="addForm.unitId" @change="unitNameChange(addForm.unitId)" placeholder="模糊输入（单位名称）" <el-select v-model="addForm.unitId" @change="unitNameChange(addForm.unitId)" placeholder="模糊输入（单位名称）"
filterable> filterable>
...@@ -70,6 +71,9 @@ ...@@ -70,6 +71,9 @@
<el-form-item label="单位联系电话：" filterable class="unitTel" prop="unitTel"> <el-form-item label="单位联系电话：" filterable class="unitTel" prop="unitTel">
<el-input v-model="addForm.unitTel" /> <el-input v-model="addForm.unitTel" />
</el-form-item> </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> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="handleClose()">取 消</el-button> <el-button @click="handleClose()">取 消</el-button>
...@@ -111,6 +115,10 @@ ...@@ -111,6 +115,10 @@
<div class="title">单位联系电话：</div> <div class="title">单位联系电话：</div>
<div>{{ checkUnitObj.unitTel }}</div> <div>{{ checkUnitObj.unitTel }}</div>
</div> </div>
<div class="row">
<div class="title">单位排序：</div>
<div>{{ checkUnitObj.sortNum }}</div>
</div>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="checkHandleClose()">关闭</el-button> <el-button @click="checkHandleClose()">关闭</el-button>
...@@ -123,6 +131,7 @@ ...@@ -123,6 +131,7 @@
</div> </div>
</template> </template>
<script> <script>
import BatchAddDialog from '../meeting/operation/Administration/components/BatchAddDialog' import BatchAddDialog from '../meeting/operation/Administration/components/BatchAddDialog'
export default { export default {
components: { components: {
...@@ -138,9 +147,9 @@ export default { ...@@ -138,9 +147,9 @@ export default {
this.formData.startDate = '' this.formData.startDate = ''
this.formData.endDate = '' this.formData.endDate = ''
} }
console.log(this.formData) // console.log(this.formData)
console.log(typeof this.formData.startDate) // console.log(typeof this.formData.startDate)
console.log(typeof this.formData.endDate) // console.log(typeof this.formData.endDate)
// this.getDataList(this.formData) // this.getDataList(this.formData)
}, },
}, },
...@@ -153,6 +162,13 @@ export default { ...@@ -153,6 +162,13 @@ export default {
callback('') callback('')
} }
} }
var sortNumRule = (rule, value, callback) => {
if (value <= 0) {
callback('请输入大于0的数')
} else {
callback()
}
}
return { return {
// loading:false, // loading:false,
timeData: '', timeData: '',
...@@ -176,11 +192,13 @@ export default { ...@@ -176,11 +192,13 @@ export default {
unitId: '', //参会单位ID unitId: '', //参会单位ID
unitName: '', //参会单位 unitName: '', //参会单位
unitTel: '', //单位联系电话 unitTel: '', //单位联系电话
sortNum: null,//单位排序
}, },
addFormRules: { addFormRules: {
unitId: [{ required: true, message: '请选择参会单位', trigger: 'change' }], unitId: [{ required: true, message: '请选择参会单位', trigger: 'change' }],
personName: [{ required: true, validator: checkPersonName, trigger: 'change' }], personName: [{ required: true, validator: checkPersonName, trigger: 'change' }],
unitTel: [{ required: true, message: '请输入单位联系电话', trigger: 'blur' }], unitTel: [{ required: true, message: '请输入单位联系电话', trigger: 'blur' }],
sortNum: [{ required: true, validator: sortNumRule, trigger: 'blur' }]
}, },
dialogFormVisible: false, dialogFormVisible: false,
unitList: [], unitList: [],
...@@ -203,6 +221,7 @@ export default { ...@@ -203,6 +221,7 @@ export default {
delDialog: false, delDialog: false,
checkDialog: false, checkDialog: false,
checkUnitObj: {}, checkUnitObj: {},
tableLoading: false
} }
}, },
...@@ -313,9 +332,6 @@ export default { ...@@ -313,9 +332,6 @@ export default {
// this.form.pageSize = 9999 // this.form.pageSize = 9999
this.$axios.findOrg().then((res) => { this.$axios.findOrg().then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
// this.loading = false
console.log(res)
this.unitList = res.data.data this.unitList = res.data.data
} }
}) })
...@@ -337,16 +353,18 @@ export default { ...@@ -337,16 +353,18 @@ export default {
console.log(this.formData) console.log(this.formData)
// } // }
console.log(this.timeData) console.log(this.timeData)
this.tableLoading = true
this.$axios.getUnitAuthPerson(data).then((res) => { this.$axios.getUnitAuthPerson(data).then((res) => {
// console.log(res) // console.log(res)
// if() // if()
if (res.data.code == 200) { if (res.data.code == 200) {
this.tableLoading = false
this.tableData = res.data.data.sysUnitAuthPersonList 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.total = res.data.data.count
// this.loading = false // this.loading = false
} else {
this.$message.error(`${res.data.data}`)
} }
}) })
}, },
...@@ -381,7 +399,9 @@ export default { ...@@ -381,7 +399,9 @@ export default {
unitId: '', //参会单位ID unitId: '', //参会单位ID
unitName: '', //参会单位 unitName: '', //参会单位
unitTel: '', //单位联系电话 unitTel: '', //单位联系电话
sortNum: '', //单位排序
} }
this.$refs.addForm.resetFields()
console.log(this.addForm) console.log(this.addForm)
}, },
}, },
...@@ -392,6 +412,17 @@ export default { ...@@ -392,6 +412,17 @@ export default {
</script> </script>
<style lang="less" scoped> <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 { .unitEmpower {
width: 100%; width: 100%;
height: calc(100% - 66px); height: calc(100% - 66px);
...@@ -520,6 +551,8 @@ export default { ...@@ -520,6 +551,8 @@ export default {
.title { .title {
width: 180px; width: 180px;
text-align: right; text-align: right;
// text-align: justify;
// text-align-last: justify;
} }
} }
} }
......
src/views/system/utils/MenuList.vue
浏览文件 @ 84906ed7
<template> <template>
<div class="sys_MenuList"> <div class="sys_MenuList">
<el-menu class="el-menu-vertical-demo"> <el-menu class="el-menu-vertical-demo">
<router-link <router-link v-for="(v, i) in list" :key="i" :index="v.Rindex + ''" :to="v.path" v-if="!v.children" tag="div"
v-for="(v, i) in list" class="router_nomal" active-class="menuItem">
: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"> <div class="router_nomal_item">
<!-- <img :src="v.pic" /> --> <!-- <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> <span>{{ v.name }}</span>
</div> </div>
</router-link> </router-link>
<el-submenu <el-submenu v-for="(v, i) in list" :key="i" :index="v.Rindex + ''"
v-for="(v, i) in list" :class="suFlag && pathWatch(v.path) ? 'submenu' : ''" v-if="v.children">
:key="i"
:index="v.Rindex + ''"
:class="suFlag && pathWatch(v.path)? 'submenu' : ''"
v-if="v.children"
>
<template slot="title"> <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" /> --> <!-- <img :src="v.pic" /> -->
<!-- {{v.pic}} --> <!-- {{v.pic}} -->
<span>{{ v.name }}</span> <span>{{ v.name }}</span>
</template> </template>
<el-menu-item <el-menu-item v-for="(value, index) in v.children" :key="index" :index="value.Rindex + '1'"
v-for="(value, index) in v.children" @click="toRouter(value.path)">
:key="index"
:index="value.Rindex + '1'"
@click="toRouter(value.path)"
>
<template slot="title"> <template slot="title">
<router-link :to="value.path" tag="div" active-class="routerLink" class="router"> <router-link :to="value.path" tag="div" active-class="routerLink" class="router">
<span class="item_boxder"></span> <span class="item_boxder"></span>
...@@ -76,6 +59,11 @@ export default { ...@@ -76,6 +59,11 @@ export default {
deep: true, deep: true,
immediate: true, immediate: true,
}, },
list: {
handler(newVal) {
console.log('newVal', newVal);
}
}
}, },
methods: { methods: {
toRouter(val) { toRouter(val) {
...@@ -107,12 +95,14 @@ export default { ...@@ -107,12 +95,14 @@ export default {
padding-bottom: 1px; padding-bottom: 1px;
vertical-align: middle; vertical-align: middle;
} }
.router_nomal { .router_nomal {
width: 180px; width: 180px;
height: 49px; height: 49px;
line-height: 49px; line-height: 49px;
margin-left: 10px; margin-left: 10px;
margin-top: 2px; margin-top: 2px;
// padding-left: 6px; // padding-left: 6px;
.el-icon-setting { .el-icon-setting {
margin: 0 3px; margin: 0 3px;
...@@ -120,6 +110,7 @@ export default { ...@@ -120,6 +110,7 @@ export default {
position: relative; position: relative;
top: 2px; top: 2px;
} }
.router_nomal_item { .router_nomal_item {
font-size: 14px; font-size: 14px;
box-sizing: border-box; box-sizing: border-box;
...@@ -129,16 +120,19 @@ export default { ...@@ -129,16 +120,19 @@ export default {
cursor: pointer; cursor: pointer;
} }
} }
.el-menu { .el-menu {
/deep/ .el-menu-item :hover { /deep/ .el-menu-item :hover {
background: none !important; background: none !important;
} }
/deep/.el-submenu__title { /deep/.el-submenu__title {
padding: 0 10px; padding: 0 10px;
width: 180px; width: 180px;
margin-left: 10px; margin-left: 10px;
color: #778ca2; color: #778ca2;
} }
.submenu /deep/.el-submenu__title { .submenu /deep/.el-submenu__title {
// border: 1px solid red; // border: 1px solid red;
padding: 0 10px; padding: 0 10px;
...@@ -148,9 +142,11 @@ export default { ...@@ -148,9 +142,11 @@ export default {
color: #fff; color: #fff;
box-shadow: 0px 2px 16px 0px rgba(35, 72, 163, 0.35); box-shadow: 0px 2px 16px 0px rgba(35, 72, 163, 0.35);
border-radius: 4px; border-radius: 4px;
i { i {
color: #fff; color: #fff;
} }
// } // }
} }
} }
...@@ -167,16 +163,20 @@ export default { ...@@ -167,16 +163,20 @@ export default {
background: #345ab6; background: #345ab6;
box-shadow: 0px 2px 16px 0px rgba(35, 72, 163, 0.35); box-shadow: 0px 2px 16px 0px rgba(35, 72, 163, 0.35);
border-radius: 4px; border-radius: 4px;
span { span {
color: #fff; color: #fff;
} }
i { i {
color: #fff !important; color: #fff !important;
} }
} }
.routerLink { .routerLink {
color: #000; color: #000;
} }
.item_boxder { .item_boxder {
width: 4px; width: 4px;
height: 14px; height: 14px;
...@@ -185,6 +185,7 @@ export default { ...@@ -185,6 +185,7 @@ export default {
border-radius: 2px; border-radius: 2px;
margin-right: 10px; margin-right: 10px;
} }
.el-menu-vertical-demo /deep/.el-menu-item { .el-menu-vertical-demo /deep/.el-menu-item {
color: #778ca2; color: #778ca2;
padding: 0; padding: 0;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论