合并分支 'fc' 到 'master'

src/axios/services.js

@@ -112,40 +112,40 @@ const server = {
 		})
 	},
 	// 智能排座-查询可预定|更换的会议室(ly)
- findReservationConference(data){
-  return axios('/conferenceProcess/findReservationConference',{
-    method:'post',
+	findReservationConference(data) {
+		return axios('/conferenceProcess/findReservationConference', {
+			method: 'post',
 			data
 		})
 	},
 	//智能排座-预定会议室(ly)
-reservationConference(data){
-  return axios('/conferenceProcess/reservationConference',{
-    method:'post',
+	reservationConference(data) {
+		return axios('/conferenceProcess/reservationConference', {
+			method: 'post',
 			data
 		})
-},
-// 智能排座-查询可选会议室布局(ly)
-findConferenceLayOut(data){
-  return axios('/conferenceProcess/findConferenceLayOut',{
-    method:'post',
+	},
+	// 智能排座-查询可选会议室布局(ly)
+	findConferenceLayOut(data) {
+		return axios('/conferenceProcess/findConferenceLayOut', {
+			method: 'post',
 			data
 		})
-},
-// 智能排座-选择会议模板点确认(ly)
-chooseProcessTemp(data){
-  return axios('/conferenceProcess/chooseProcessTemp',{
-    method:'post',
+	},
+	// 智能排座-选择会议模板点确认(ly)
+	chooseProcessTemp(data) {
+		return axios('/conferenceProcess/chooseProcessTemp', {
+			method: 'post',
 			data
 		})
-},
-// 、会议配置-保存日程地址（外挂）
-saveScheduleAddress(data){
-  return axios('/conferenceProcess/saveScheduleAddress',{
-    method:'post',
+	},
+	// 、会议配置-保存日程地址（外挂）
+	saveScheduleAddress(data) {
+		return axios('/conferenceProcess/saveScheduleAddress', {
+			method: 'post',
 			data
 		})
-},
+	},
 	//复制布局
 	copyConfLayout(id) {
 		return axios('/confLayout/copyConfLayout?id=' + id, {
@@ -1269,17 +1269,17 @@ saveScheduleAddress(data){
 		})
 	},
 	// (新)人员库-导入自定义人员(ly)
-  importPerson(data,params){
-    return axios('/person/importCustomUser',{
-      method:'post',
+	importPerson(data, params) {
+		return axios('/person/importCustomUser', {
+			method: 'post',
 			params,
 			data
 		})
 	},
 	//(新)人员库-导出自定义人员(ly)
-  exportCustomUser(data){
-    return axios('/person/exportCustomUser?customOrgId='+data,{
-      method:'get',
+	exportCustomUser(data) {
+		return axios('/person/exportCustomUser?customOrgId=' + data, {
+			method: 'get',
 		})
 	},
 	/*********************人员库接口************************/
@@ -1429,272 +1429,279 @@ saveScheduleAddress(data){
 
 	//LY新增接口
 	//查询权限专用单位信息
-  getUnitAuth(){
-    return axios('/sysUnitAuth/findByUnitAuth',{
-      method:'get'
+	getUnitAuth() {
+		return axios('/sysUnitAuth/findByUnitAuth', {
+			method: 'get'
 		})
 	},
 	//新增修改权限专用单位
-  saveUnitAuth(data){
-    return axios('/sysUnitAuth/saveSysUnitAuth',{
-      method:'post',
+	saveUnitAuth(data) {
+		return axios('/sysUnitAuth/saveSysUnitAuth', {
+			method: 'post',
 			data
 		})
 	},
 	//删除权限专用单位
-  delUnitAuth(data){
-    return axios('/sysUnitAuth/deleteSysUnitAuth?unitId='+data,{
-      method:'get'
+	delUnitAuth(data) {
+		return axios('/sysUnitAuth/deleteSysUnitAuth?unitId=' + data, {
+			method: 'get'
 		})
 	},
 	//删除用户
-  delUser(data){
-    return axios('/sysUser/deleteUser?id='+data,{
-      method:'get'
+	delUser(data) {
+		return axios('/sysUser/deleteUser?id=' + data, {
+			method: 'get'
 		})
 	},
 	//查询参会单位授权信息-分页
-  getUnitAuthPerson(data){
-    return axios('/sysUnitAuthPerson/findByUnitAuthPerson',{
-      method:'post',
+	getUnitAuthPerson(data) {
+		return axios('/sysUnitAuthPerson/findByUnitAuthPerson', {
+			method: 'post',
 			data
 		})
 	},
 
 	//新增或修改参会单位授权
-  saveUnitAuthPerson(data){
-    return axios('/sysUnitAuthPerson/saveUnitAuthPerson',{
-      method:'post',
+	saveUnitAuthPerson(data) {
+		return axios('/sysUnitAuthPerson/saveUnitAuthPerson', {
+			method: 'post',
 			data
 		})
 	},
 	//删除参会单位授权
-  deleteUnitAuthPerson(data){
-    return axios('/sysUnitAuthPerson/deleteUnitAuthPerson?id='+data,{
-      method:'get'
+	deleteUnitAuthPerson(data) {
+		return axios('/sysUnitAuthPerson/deleteUnitAuthPerson?id=' + data, {
+			method: 'get'
 		})
 	},
 	// (新)人员库-查询所有自定义分类（ly）
-  findAllCustomOrg(){
-    return axios('/person/findAllCustomOrg',{
-      method:'get'
+	findAllCustomOrg() {
+		return axios('/person/findAllCustomOrg', {
+			method: 'get'
 		})
 	},
 	//(新)人员库-新增修改自定义分类（ly）
-  saveCustomOrgO(data){
-    return axios('/person/saveCustomOrg',{
-      method:'post',
+	saveCustomOrgO(data) {
+		return axios('/person/saveCustomOrg', {
+			method: 'post',
 			data
 		})
 	},
 	//(新)人员库-删除自定义分类（ly）
-  deleteCustomOrg(data){
-    return axios('/person/deleteCustomOrg?customOrgId='+data,{
-      method:'get',
+	deleteCustomOrg(data) {
+		return axios('/person/deleteCustomOrg?customOrgId=' + data, {
+			method: 'get',
 		})
 	},
 	// (新)人员库-根据自定义分类编号查询按参会人员展示自定义人员（ly）
-  baseCustomOrgIdPerson(data){
-    return axios('/person/findAllCustomUserByCustomOrgIdShowPerson',{
-      method:'post',
+	baseCustomOrgIdPerson(data) {
+		return axios('/person/findAllCustomUserByCustomOrgIdShowPerson', {
+			method: 'post',
 			data
 		})
 	},
 	// (新)人员库-根据自定义分类编号查询按参会单位展示自定义人员（ly）
-  baseCustomOrgIdUnit(data){
-    return axios('/person/findAllCustomUserByCustomOrgIdShowUnit',{
-      method:'post',
+	baseCustomOrgIdUnit(data) {
+		return axios('/person/findAllCustomUserByCustomOrgIdShowUnit', {
+			method: 'post',
 			data
 		})
 	},
 	// (新)人员库-批量关联参会人员以及参会单位（ly）
-  batchAssociationCustomUse(data){
-    return axios('/person/batchAssociationCustomUser',{
-      method:'post',
+	batchAssociationCustomUse(data) {
+		return axios('/person/batchAssociationCustomUser', {
+			method: 'post',
 			data
 		})
 	},
 	//(新)人员库-删除关联参会人员信息以及参会单位（ly）
-  deleteCustomUser(data){
-    return axios('/person/deleteCustomUser?id=' + data,{
-      method:'get'
+	deleteCustomUser(data) {
+		return axios('/person/deleteCustomUser?id=' + data, {
+			method: 'get'
 		})
 	},
 	// (新)人员库-上移或下移关联参会人员（ly）
-  moveUpOrDownCustomUser(data){
-    return axios('/person/MoveUpOrDownCustomUser',{
-      method:'post',
+	moveUpOrDownCustomUser(data) {
+		return axios('/person/MoveUpOrDownCustomUser', {
+			method: 'post',
 			data
 		})
 	},
 	// (新)人员库-按参会单位展示中查看详情(ly)
-  viewDetails(data){
-    return axios('/person/viewDetails',{
-      method:'post',
+	viewDetails(data) {
+		return axios('/person/viewDetails', {
+			method: 'post',
 			data
 		})
 	},
 	//查询会议室预定记录日期条
-  getConfenceDataBar(data){
-    return axios('/conferenceProcessReservationRecord/findDateBar',{
-      method:'post',
+	getConfenceDataBar(data) {
+		return axios('/conferenceProcessReservationRecord/findDateBar', {
+			method: 'post',
 			data
 		})
 	},
 
 	//查询可用会议室信息
-    getConference(){
-      return axios('/conferenceProcessReservationRecord/findConference',{
-        method:'get'
+	getConference() {
+		return axios('/conferenceProcessReservationRecord/findConference', {
+			method: 'get'
 		})
 	},
 	//查询会议室预定信息
-    getConfenceInformation(data){
-      return axios('/conferenceProcessReservationRecord/findConferenceProcessReservationRecord',{
-        method:'post',
+	getConfenceInformation(data) {
+		return axios('/conferenceProcessReservationRecord/findConferenceProcessReservationRecord', {
+			method: 'post',
 			data
 		})
 	},
 
 	// 通知参会-查询分区和通知参会信息
-    getAreaAndNoticePart(data){
-      return axios('/ConferenceProcessNoticePart/findAreaAndNoticePart',{
-        method:'post',
+	getAreaAndNoticePart(data) {
+		return axios('/ConferenceProcessNoticePart/findAreaAndNoticePart', {
+			method: 'post',
 			data
 		})
 	},
 
 	//通知参会-查询可以选择的参会单位授权
-    findSysUnitAuthPerson(data){
-      return axios('/ConferenceProcessNoticePart/findSysUnitAuthPerson',{
-        method:'post',
+	findSysUnitAuthPerson(data) {
+		return axios('/ConferenceProcessNoticePart/findSysUnitAuthPerson', {
+			method: 'post',
 			data
 		})
 	},
 	//通知参会-增加通知单位
-   addNoticeUnit(data){
-    return axios('/ConferenceProcessNoticePart/addNoticeUnit',{
-      method:'post',
+	addNoticeUnit(data) {
+		return axios('/ConferenceProcessNoticePart/addNoticeUnit', {
+			method: 'post',
 			data
 		})
 	},
 	//通知参会-批量分区
-   batchArea(data){
-    return axios('/ConferenceProcessNoticePart/batchArea',{
-      method:"post",
+	batchArea(data) {
+		return axios('/ConferenceProcessNoticePart/batchArea', {
+			method: "post",
 			data
 		})
 	},
 	//  通知参会-发送通知上传附件
-  sendNoticeUpLoadFile(data){
-    return axios('/ConferenceProcessNoticePart/sendNoticeUpLoadFile',{
-      method:'post',
+	sendNoticeUpLoadFile(data) {
+		return axios('/ConferenceProcessNoticePart/sendNoticeUpLoadFile', {
+			method: 'post',
 			data
 		})
 	},
 	//通知参会-发送通知
-  sendNotification(data){
-    return axios('/ConferenceProcessNoticePart/sendNotice',{
-      method:'post',
+	sendNotification(data) {
+		return axios('/ConferenceProcessNoticePart/sendNotice', {
+			method: 'post',
 			data
 		})
 	},
 	//通知参会-发送通知保存草稿
-  sendNoticeSaveDraft(data){
-    return axios('/ConferenceProcessNoticePart/sendNoticeSaveDraft',{
-      method:'post',
+	sendNoticeSaveDraft(data) {
+		return axios('/ConferenceProcessNoticePart/sendNoticeSaveDraft', {
+			method: 'post',
 			data
 		})
 	},
 	// 通知参会-批量催阅
-  batchUrgeRead(data){
-    return axios('/ConferenceProcessNoticePart/batchUrgeRead?	noticePartIdList='+data,{
-      method:'get',
+	batchUrgeRead(data) {
+		return axios('/ConferenceProcessNoticePart/batchUrgeRead?	noticePartIdList=' + data, {
+			method: 'get',
 
 		})
 	},
 	//通知参会-删除通知参会 
-  deleteNoticePart(data){
-    return axios('/ConferenceProcessNoticePart/deleteNoticePart?noticePartId='+data,{
-      method:'get'
+	deleteNoticePart(data) {
+		return axios('/ConferenceProcessNoticePart/deleteNoticePart?noticePartId=' + data, {
+			method: 'get'
 		})
 	},
 	// 通知参会-查看反馈
-  viewFeedback(data){
-    return axios('/ConferenceProcessNoticePart/viewFeedback?noticePartId='+data,{
-      method:'get'
+	viewFeedback(data) {
+		return axios('/ConferenceProcessNoticePart/viewFeedback?noticePartId=' + data, {
+			method: 'get'
 		})
 	},
 	//通知参会-通知开启或关闭
-  noticeOnOrClose(data){
-    return axios('/ConferenceProcessNoticePart/noticeOnOrClose',{
-      method:'post',
+	noticeOnOrClose(data) {
+		return axios('/ConferenceProcessNoticePart/noticeOnOrClose', {
+			method: 'post',
 			data
 		})
 	},
 	// 通知参会-查询可以选择的标签
-findCustomOrg(){
-  return axios('/ConferenceProcessNoticePart/findCustomOrg',{
-    method:'get'
+	findCustomOrg() {
+		return axios('/ConferenceProcessNoticePart/findCustomOrg', {
+			method: 'get'
 		})
-},
-//通知参会-根据标签id查询参会单位
-findUnitByCustomOrgId(data){
-  return axios('/ConferenceProcessNoticePart/findUnitByCustomOrgId?customOrgId='+data,{
-    method:'get'
+	},
+	//通知参会-根据标签id查询参会单位
+	findUnitByCustomOrgId(data) {
+		return axios('/ConferenceProcessNoticePart/findUnitByCustomOrgId?customOrgId=' + data, {
+			method: 'get'
 		})
-},
+	},
 	//人员管理-根据标签给单个区域的人员排序
-  personnelSortByCustomIdAndAreaId(data){
-    return axios('/conferenceProcess/personnelSortByCustomIdAndAreaId',{
-      method:'post',
+	personnelSortByCustomIdAndAreaId(data) {
+		return axios('/conferenceProcess/personnelSortByCustomIdAndAreaId', {
+			method: 'post',
 			data
 		})
 	},
 	// 通知参会-根据会议id查询发送通知草稿
-  findSendNoticePartByProcessId(data){
-    return axios('/ConferenceProcessNoticePart/findSendNoticePartByProcessId?processId=' + data,{
-      method:'get'
+	findSendNoticePartByProcessId(data) {
+		return axios('/ConferenceProcessNoticePart/findSendNoticePartByProcessId?processId=' + data, {
+			method: 'get'
 		})
 	},
 	//主页面-重新预定会议时间
-  rescheduleMeeting(data){
-    return axios('/conferenceProcess/rescheduleMeeting?processId='+data,{
-      method:'get',
+	rescheduleMeeting(data) {
+		return axios('/conferenceProcess/rescheduleMeeting?processId=' + data, {
+			method: 'get',
 		})
 	},
 	//会议配置-群发通知 
- massNotification(data){
-  return axios('/conferenceProcess/massNotification',{
-    method:'post',
+	massNotification(data) {
+		return axios('/conferenceProcess/massNotification', {
+			method: 'post',
 			data
 		})
 	},
 
 	//会议配置-查询群发通知记录 
- findMassNotification(data){
-  return axios('/conferenceProcess/findMassNotification?processId='+data,{
-    method:'get',
+	findMassNotification(data) {
+		return axios('/conferenceProcess/findMassNotification?processId=' + data, {
+			method: 'get',
 		})
 	},
-//  会议配置-查询通知结果
-  findNoticeResult(data){
-    return axios('/conferenceProcess/findNoticeResult?sendNoticeId=' + data,{
-     method:'get',
+	//  会议配置-查询通知结果
+	findNoticeResult(data) {
+		return axios('/conferenceProcess/findNoticeResult?sendNoticeId=' + data, {
+			method: 'get',
 		})
 	},
 	//人员库-是否可以同步（获取累计人数和同步时间）
- findIsSync(){
-  return axios('/ding/findIsSync',{
-    method:'get',
+	findIsSync() {
+		return axios('/ding/findIsSync', {
+			method: 'get',
 		})
 	},
 	//更新同步状态为正在同步人员
-updateStatus(){
-  return axios('/ding/updateStatus',{
-    method:'get'
+	updateStatus() {
+		return axios('/ding/updateStatus', {
+			method: 'get'
 		})
-}
+	},
+	//会议配置-群发通知
+	sendMassNoticeUpLoadFile(data) {
+		return axios('/conferenceProcess/sendMassNoticeUpLoadFile', {
+			method: 'post',
+			data
+		})
+	}
 }
 
 export default server

src/router/index.js

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

@@ -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'
-      "
-    >
+      ">
       <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'
-      "
-    >
+      ">
       <router-view />
     </div>
   </div>
@@ -167,12 +153,11 @@ export default {
 
     }
 
-    console.log('sysRoles',this.router_link);
 
   },
   methods: {
     toClick(val) {
-      console.log(val,this.router_link);
+      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

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

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

 <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

 <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

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

 <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/index.vue

@@ -2,8 +2,7 @@
   <div class="main_wrap">
     <!-------------------------新手引导---------------------------->
     <div class="new_help" @click="showDirection"></div>
-    <div class="direction" :class="
-      dir === 1 ? 'direction1' : 'direction2'
+    <div class="direction" :class="dir === 1 ? 'direction1' : 'direction2'
       " v-if="dir">
       <div class="but but1" @click="iKnow()"></div>
       <div class="but but2" @click="next()"></div>
@@ -246,7 +245,7 @@
                 </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="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="isPart" label="是否参会" width="120">
                   <template slot-scope="scope">
@@ -328,19 +327,22 @@
       </span>
     </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">
       <div class="noticeVisileForm">
-        <el-form ref="form" :model="sendNoticePartForm" label-width="80px">
-          <el-form-item label="已选单位:">{{ multipleSelection.length }}家</el-form-item>
-          <el-form-item label="通知内容:" class="content">
-            <quill-editor v-model="sendNoticePartForm.noticeContent" :options="quillOption" />
+        <el-form ref="ruleForm" :model="sendNoticePartForm" label-width="90px" :rules="sendNoticePartFormRules">
+          <el-form-item label="已选单位：">{{ multipleSelection.length }}家</el-form-item>
+          <el-form-item label="通知标题：" prop="noticeTitle"><el-input v-model="sendNoticePartForm.noticeTitle" maxlength="50"
+              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 label="附件:">
             <el-upload class="upload-demo" action :on-change="changeFile" :on-remove="removeFile"
-              :file-list="sendNoticePartForm.fileList" :auto-upload="true" :http-request="
-                (data) => {
+              :file-list="sendNoticePartForm.fileList" :auto-upload="true" :http-request="(data) => {
                 upload(data);
               }">
               <el-button size="small" type="info">上传文件</el-button>
@@ -351,9 +353,10 @@
       </div>
 
       <span slot="footer" class="dialog-footer">
-        <el-button @click="noticeHandleClose()">取 消</el-button>
-        <el-button :disabled="saveDraftDisabled" @click="saveDraft()">保存草稿</el-button>
-        <el-button type="primary" :disabled="auditStatus == 0 || auditStatus == 2" @click="sureTongzhi()">发送通知</el-button>
+        <el-button @click="noticeHandleClose('ruleForm')">取 消</el-button>
+        <el-button :disabled="saveDraftDisabled" @click="saveDraft('ruleForm')">保存草稿</el-button>
+        <el-button type="primary" :disabled="auditStatus == 0 || auditStatus == 2"
+          @click="sureTongzhi('ruleForm')">发送通知</el-button>
       </span>
     </el-dialog>
 
@@ -605,6 +608,12 @@ export default {
         noticeFileName: '',
         noticeFilePath: '',
         processId: '',
+        noticeTitle: '参会反馈通知',
+        fileList: [],
+      },
+      sendNoticePartFormRules: {
+        noticeTitle: [{ required: true, message: '请填写通知标题', trigger: 'blur' }],
+        noticeContent: [{ required: true, message: '请填写通知内容', trigger: 'change' }]
       },
       noticeVisileLoading: false,
       saveDraftDisabled: false,
@@ -622,6 +631,7 @@ export default {
           },
         },
       },
+      contentLength: 0,
       //批量催阅
       batchReviewVisible: false,
 
@@ -728,6 +738,12 @@ export default {
     'sendNoticePartForm.noticeContent': {
       handler(newVal, oldVal) {
         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,
     },
@@ -749,6 +765,27 @@ export default {
     // this.getArea()
   },
   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) {
       console.log('index,', val)
       this.labelUnit = val
@@ -888,10 +925,11 @@ export default {
       this.batchReviewVisible = false
     },
     removeFile(file, fileList) {
-      // this.$nextTick(() => {
-      //   item.fileList = []
-      //   this.$refs[ref][0].clearFiles()
-      // })
+      console.log(321);
+      this.sendNoticePartForm.noticeFileName = ''
+      this.sendNoticePartForm.noticeFilePath = ''
+      this.sendNoticePartForm.fileList = []
+      console.log(this.sendNoticePartForm);
     },
     upload(data) {
       console.log(data)
@@ -908,6 +946,9 @@ export default {
     },
     //通知，上传文件CHange
     changeFile(file, fileList) {
+      console.log(fileList);
+      this.sendNoticePartForm.fileList = fileList.slice(-1)
+      console.log(this.sendNoticePartForm);
       // this.schedule[index].fileList = fileList.slice(-1)
       // this.$set(this.schedule, index, this.schedule[index])
     },
@@ -919,25 +960,40 @@ export default {
         console.log(res)
         if (res.data.code == 200 && 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() {
       this.sendNoticePartForm = {
+
         id: '',
         noticeContent: '',
         noticeFileName: '',
         noticeFilePath: '',
         processId: '',
+        noticeTitle: '参会反馈通知',
+        fileList: [],
       }
+      this.$refs.ruleForm.resetFields();
       this.noticeVisile = false
     },
     //保存草稿
-    saveDraft() {
+    saveDraft(formName) {
+      console.log(this.sendNoticePartForm);
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
           let list = this.multipleSelection.map((item) => {
             return item.id
           })
-      console.log('this.sendNoticePartForm,', this.sendNoticePartForm)
+          // console.log('this.sendNoticePartForm,', this.sendNoticePartForm)
           this.sendNoticePartForm.processId = this.$route.query.processId
           // console.log('data', data)
           this.$axios.sendNoticeSaveDraft(this.sendNoticePartForm).then((res) => {
@@ -948,9 +1004,16 @@ export default {
               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) => {
             return item.id
           })
@@ -973,6 +1036,12 @@ export default {
               this.$message.error(`${res.data.data}`)
             }
           })
+        } else {
+          this.$message.error('请填写完表单后再发送通知')
+          return false;
+        }
+      });
+
     },
     getInit() {
       // console.log(123)
@@ -3064,12 +3133,27 @@ export default {
 
         .content {
           height: 250px;
+          position: relative;
+
+          .size {
+            position: absolute;
+            right: 4px;
+            bottom: 0px;
+          }
 
           .el-form-item__content {
-            height: 80%;
+            height: 100%;
 
             .quill-editor {
               height: 100%;
+
+              .ql-toolbar {
+                height: 60px;
+              }
+
+              .ql-container {
+                height: calc(100% - 60px);
+              }
             }
           }
         }

src/views/meeting/operation/noticeMeeting/lableTable.vue

 <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/operation/overview/index.vue

@@ -69,7 +69,7 @@
         </div>
       </div>
       <div class="overview_model_2_children">
-        <div class="tag tag3">定制日程（非必填）</div>
+        <div class="tag tag3">会议详情</div>
         <div class="mobile_wrap">
           <div class="warp_left">
             <div class="img">
@@ -78,7 +78,7 @@
             <el-button type="primary" class="yulan" @click="yulan()">预览</el-button>
           </div>
           <div class="warp_right">
-            <div>日程地址（外挂）：</div>
+            <div>链接地址（外挂）：</div>
             <div class="area">
               <el-input type="textarea" :rows="4" placeholder="请输入内容" v-model="schedulePath"></el-input>
             </div>
@@ -299,14 +299,27 @@
     </el-dialog>
     <!-- 群发会议通知 -->
     <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"
         :rules="notificationFormRules">
         <el-form-item label="接收人员：" prop="person">
           <div>{{ notificationForm.person }}</div>
         </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-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-button @click="notificationHandleClosed('notificationForm')">取 消</el-button>
@@ -344,7 +357,7 @@
 
       <span slot="title" class="notifyResultsDialog_title">
         <div>通知结果</div>
-        <el-button type="primary" @click="goBack()">返回</el-button>
+
       </span>
       <div class="top">
         <div class="content">
@@ -372,7 +385,8 @@
       </el-table>
       <!-- </div> -->
       <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>
     </el-dialog>
   </div>
@@ -435,10 +449,13 @@ export default {
       notificationForm: {
         person: '全部参会人员',
         content: '',
+        noticeTitle: '',
+        fileList: []
       },
       notificationFormRules: {
-        person: [{ required: true, message: '请填写通知内容', trigger: 'blur' }],
+        person: [{ required: true, message: '请填写', trigger: 'blur' }],
         content: [{ required: true, message: '请填写通知内容', trigger: 'blur' }],
+        noticeTitle: [{ required: true, message: '请填写通知标题', trigger: 'blur' }],
       },
 
       noteListDialogVisible: false,
@@ -483,6 +500,36 @@ export default {
     },
   },
   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() {
       this.notifyResultsDialogVisibleClose()
       this.notificationRecord()
@@ -495,11 +542,16 @@ export default {
       this.notification = true
     },
     sureNotification(formName) {
+      this.notificationForm
+      console.log(this.notificationForm);
       this.$refs[formName].validate((valid) => {
         if (valid) {
           let params = {
+            noticeTitle: this.notificationForm.noticeTitle,
             noticeContent: this.notificationForm.content,
             processId: this.$route.query.processId,
+            noticeFileName: this.notificationForm.noticeFileName,
+            noticeFilePath: this.notificationForm.noticeFilePath
           }
           this.noteListDialogLoading = true
           // setTimeout(() => {
@@ -524,6 +576,11 @@ export default {
     notificationHandleClosed() {
       this.notification = false
       this.notificationForm.content = ''
+      this.notificationForm.noticeTitle = ''
+      this.notificationForm.fileList = []
+      this.notificationForm.noticeFileName = ''
+      this.notificationForm.noticeFilePath = ''
+      this.$refs.notificationForm.resetFields()
     },
     //查看通知
     notificationRecord() {
@@ -597,8 +654,10 @@ export default {
     },
     //查看大屏（ly）
     checkScreen() {
-      console.log(this.overviewData)
-      window.open(this.overviewData.meetingTemplateList1[0].templateUrl, '_blank')
+      let token = sessionStorage.getItem('ty_token')
+      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() {
       this.$axios.sendToInkScreen(this.deleteItem).then((res) => {
@@ -1148,9 +1207,12 @@ export default {
           display: flex;
           flex-direction: column;
           align-items: center;
+          // width: 180px;
+          // height: 364px;
 
           .yulan {
-            height: 36px;
+            width: 80px;
+            height: 30px;
             margin-top: 15px;
           }
 
@@ -1159,6 +1221,8 @@ export default {
             height: 364px;
 
             img {
+              // width: 180px;
+              // height: 364px;
               width: 100%;
               height: 100%;
             }
@@ -1167,11 +1231,11 @@ export default {
 
         .warp_right {
           // height: 70%;
-          padding-top: 100px;
+          padding-top: 40px;
           position: relative;
 
           .area {
-            height: 150px;
+            height: 280px;
             width: 230px;
             margin-bottom: 10px;
 
@@ -1187,6 +1251,8 @@ export default {
           }
 
           .btn {
+            width: 80px;
+            height: 30px;
             position: absolute;
             right: 0;
           }
@@ -1698,7 +1764,7 @@ export default {
       width: 100%;
       height: 85%;
       display: flex;
-      padding: 10px;
+      padding: 10px 25px;
       // box-shadow: inset;
 
       flex-direction: column;
@@ -1731,11 +1797,13 @@ export default {
           border: 1px solid #7690ed;
           background: #fff;
           cursor: pointer;
+          color: #7690ed;
         }
 
         .active {
           border: 1px solid gray;
           background: #7690ed;
+          color: #fff;
         }
 
         .button_div:first-child {

src/views/meeting/state/beforeMeeting/index.vue

@@ -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/meetingPlace/pages/first/processList.vue

@@ -11,71 +11,38 @@
               <el-row :gutter="24">
                 <el-col :span="5">
                   <el-form-item label="会议主题:">
-                    <el-input
-                      v-model="form.processName"
-                      placeholder=" "
-                    ></el-input>
+                    <el-input v-model="form.processName" placeholder=" "></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="会议时间:">
-                    <el-date-picker
-                      v-model="form.startDate"
-                      type="date"
-                      value-format="yyyy-MM-dd"
-                      placeholder="请选择"
-                      class="date-picker"
-                    ></el-date-picker>
-                    <div
-                      style="
+                    <el-date-picker v-model="form.startDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择"
+                      class="date-picker"></el-date-picker>
+                    <div style="
                         display: inline-block;
                         position: relative;
                         left: -4px;
-                      "
-                    >
+                      ">
                       —
                     </div>
-                    <el-date-picker
-                      v-model="form.endDate"
-                      type="date"
-                      value-format="yyyy-MM-dd "
-                      placeholder="请选择"
-                      class="date-picker"
-                    ></el-date-picker>
+                    <el-date-picker v-model="form.endDate" type="date" value-format="yyyy-MM-dd " placeholder="请选择"
+                      class="date-picker"></el-date-picker>
                   </el-form-item>
                 </el-col>
                 <el-col :span="5" style="margin-left: -15px">
                   <el-form-item label="会议室:">
-                    <el-select
-                      v-model="form.conferenceName"
-                      placeholder="请选择会议室"
-                    >
-                      <el-option
-                        v-for="item in conferences"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.name"
-                      ></el-option>
+                    <el-select v-model="form.conferenceName" placeholder="请选择会议室">
+                      <el-option v-for="item in conferences" :key="item.id" :label="item.name"
+                        :value="item.name"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="2">
-                  <el-button
-                    type="primary"
-                    @click="resest"
-                    class="clean"
-                    style="margin-left: 175px"
-                    >清除</el-button
-                  >
+                  <el-button type="primary" @click="resest" class="clean" style="margin-left: 175px">清除</el-button>
                 </el-col>
                 <el-col :span="1">
-                  <el-button
-                    type="primary"
-                    @click="submit"
-                    style="margin-left: 172px"
-                    >查询</el-button
-                  >
+                  <el-button type="primary" @click="submit" style="margin-left: 172px">查询</el-button>
                 </el-col>
               </el-row>
             </el-form>
@@ -101,32 +68,14 @@
             </div>
 
             <div class="img" style="color: #5e74eb">
-              <span @click="toPhone(item, index)" style="margin-right: 20px"
-                >排位</span
-              >
-              <span
-                @click="fabu(item, index)"
-                :class="{ cancel: !item.conferenceId }"
-                style="margin-right: 20px"
-                >发布</span
-              >
-              <span
-                @click="endConf(item, index)"
-                :class="{ cancel: item.processStatus != 2 }"
-                style="margin-right: 20px"
-                >结束会议</span
-              >
-              <span
-                @click="getcodeUrl(item, index)"
-                :class="{ cancel: item.processStatus != 2 }"
-                style="margin-right: 20px"
-                >二维码</span
-              >
-              <span
-                @click="toScreen(item)"
-                :class="{ cancel: item.processStatus != 2 }"
-                >数据大屏</span
-              >
+              <span @click="toPhone(item, index)" style="margin-right: 20px">排位</span>
+              <span @click="fabu(item, index)" :class="{ cancel: !item.conferenceId }"
+                style="margin-right: 20px">发布</span>
+              <span @click="endConf(item, index)" :class="{ cancel: item.processStatus != 2 }"
+                style="margin-right: 20px">结束会议</span>
+              <span @click="getcodeUrl(item, index)" :class="{ cancel: item.processStatus != 2 }"
+                style="margin-right: 20px">二维码</span>
+              <span @click="toScreen(item)" :class="{ cancel: item.processStatus != 2 }">数据大屏</span>
 
               <!-- <span
                 @click="deletCO(item)"
@@ -140,21 +89,11 @@
       </div>
     </div>
     <div class="bottom">
-      <el-pagination
-        background
-        class="pagination"
-        layout="prev, pager, next"
-        :total="pagesize"
-        @current-change="current_change"
-      >
+      <el-pagination background class="pagination" layout="prev, pager, next" :total="pagesize"
+        @current-change="current_change">
       </el-pagination>
     </div>
-    <el-dialog
-      :visible.sync="dialogVisible"
-      width="27%"
-      append-to-body
-      :before-close="handleClose"
-    >
+    <el-dialog :visible.sync="dialogVisible" width="27%" append-to-body :before-close="handleClose">
       <div class="container">
         <!-- <h1>签到页面</h1> -->
         <!-- 签到二维码 -->
@@ -171,16 +110,8 @@
               <p class="time">时间:{{ MobileList.startDateString }}</p>
             </div>
             <div class="img">
-              <img
-                v-if="erweiFlag"
-                :src="imgUrls + '?timestamp=' + new Date().getTime()"
-                width="100%"
-              />
-              <img
-                v-if="!erweiFlag"
-                :src="imgRcUrls + '?timestamp=' + new Date().getTime()"
-                width="100%"
-              />
+              <img v-if="erweiFlag" :src="imgUrls + '?timestamp=' + new Date().getTime()" width="100%" />
+              <img v-if="!erweiFlag" :src="imgRcUrls + '?timestamp=' + new Date().getTime()" width="100%" />
             </div>
             <div class="urlAddress" v-if="erweiFlag">
               {{ imgUrls }}
@@ -315,7 +246,7 @@ export default {
               this.$message.error(res.data.data);
             }
           })
-          .catch((err) => {});
+          .catch((err) => { });
       }
     },
     qiehuan(val) {
@@ -465,7 +396,7 @@ export default {
             // }
           }
         })
-        .catch((err) => {});
+        .catch((err) => { });
 
       console.log("data", this.ConOption);
     },
@@ -477,8 +408,12 @@ export default {
     },
     toScreen(item) {
       if (item.processStatus == 2) {
+        // window.open(
+        //   `http://hypz.hzswb.cn/confphone/#/screen?processId=${item.id}`,
+        //   "_blank"
+        // );
         window.open(
-          `http://hypz.hzswb.cn/confphone/#/screen?processId=${item.id}`,
+          `https://lyfydp.longyou.gov.cn:9443/meeting/h5/#/screen?processId=${item.id}`,
           "_blank"
         );
       } else {
@@ -489,7 +424,7 @@ export default {
       // this.MobileList = item;
       if (item.processStatus == 2) {
         window.open(
-          `http://hypz.hzswb.cn/confphone/#/img?processId=${item.id}`,
+          `https://lyfydp.longyou.gov.cn:9443/meeting/h5/#/img?processId=${item.id}`,
           "_blank"
         );
         // this.prossId = item.id;
@@ -611,6 +546,7 @@ export default {
   // padding-bottom: 100px;
   overflow: hidden;
 }
+
 // .breadcrumb {
 //   margin-left: 35px;
 //   margin-top: 15px;
@@ -625,12 +561,14 @@ export default {
   border: #d45726;
   opacity: 0.8;
 }
+
 .clean:hover {
   // margin-right: 110px;
   // background: #d45726 !important;
   // border: #d45726;
   opacity: 1;
 }
+
 .container {
   width: 100%;
   height: 600px;
@@ -640,6 +578,7 @@ export default {
   // overflow: hidden;
   .info {
     margin-top: 0px;
+
     .mainDetail {
       width: 85%;
       height: 470px;
@@ -647,6 +586,7 @@ export default {
       background-repeat: no-repeat;
       background-size: 100% 100%;
       margin: 0 auto;
+
       .address {
         width: 95%;
         color: #151313;
@@ -656,6 +596,7 @@ export default {
         padding-top: 25px;
         margin-bottom: 16px;
       }
+
       .time {
         width: 95%;
         color: #151313;
@@ -664,15 +605,18 @@ export default {
         text-align: center;
       }
     }
+
     .zsImg {
       width: 87%;
       margin: 0 auto;
     }
+
     .zsImg img {
       width: 100%;
       margin-top: -18px;
       margin-bottom: 20px;
     }
+
     .name {
       font-size: 26px;
       width: 85%;
@@ -686,6 +630,7 @@ export default {
       text-overflow: ellipsis;
       -webkit-line-clamp: 1;
     }
+
     .img {
       display: flex;
       width: 85%;
@@ -693,16 +638,19 @@ export default {
       margin-top: 70px;
       justify-content: center;
     }
+
     img {
       width: 48%;
       height: 100%;
       padding-top: 20px;
       // margin-top: 200px;
     }
+
     .qiehuan {
       display: flex;
       justify-content: center;
       margin-top: 20px;
+
       .q1 {
         width: 36px;
         height: 6px;
@@ -712,6 +660,7 @@ export default {
         margin-right: 10px;
         cursor: pointer;
       }
+
       .q2 {
         width: 36px;
         height: 6px;
@@ -720,6 +669,7 @@ export default {
         opacity: 0.2;
         cursor: pointer;
       }
+
       .actives {
         width: 36px;
         height: 6px;
@@ -730,6 +680,7 @@ export default {
     }
   }
 }
+
 .addCof {
   width: 95%;
   height: 80px;
@@ -742,17 +693,20 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
+
   .addText {
     // display: flex;
     color: #5474e8;
     cursor: pointer;
     font-size: 28px;
+
     // padding-top: -1px;
     span {
       font-size: 35px;
     }
   }
 }
+
 .main {
   width: 95%;
   margin: auto auto;
@@ -765,19 +719,23 @@ export default {
   position: relative;
   padding-right: 10px;
 }
+
 .deleNor {
   margin-left: 15px;
   color: #b2b2b2;
 }
+
 .deleH {
   margin-left: 15px;
   color: #d45726;
 }
+
 .banner {
   width: 100%;
   background-color: #2348a3;
   display: flex;
   box-shadow: 0px 3px 5px rgba(84, 116, 235, 0.2);
+
   .title {
     margin-left: 40px;
     display: flex;
@@ -787,19 +745,22 @@ export default {
     font-weight: bold;
     flex: 1;
     margin-top: -15px;
+
     .content {
       margin-left: 35px;
     }
   }
+
   .manager {
     display: flex;
     align-items: center;
     color: #e8ebf9;
+
     .content {
       margin-right: 45px;
     }
-    img {
-    }
+
+    img {}
   }
 }
 
@@ -819,6 +780,7 @@ export default {
     width: 100%;
   }
 }
+
 .main .title {
   display: grid;
   background-color: #f2f2fb;
@@ -828,6 +790,7 @@ export default {
   /* justify-content: space-around; */
   width: 100%;
 }
+
 .main .title div {
   font-size: 18px;
   // text-align: center;
@@ -847,30 +810,35 @@ export default {
   /* justify-content: space-around; */
   line-height: 48px;
   border: 0.5px solid #e5ebfe;
+
   .itemName {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
   }
 }
+
 .main .tbody .tr:nth-child(2n) {
   box-sizing: border-box;
   background-color: #fafafd;
   border: 0.5px solid #e5ebfe;
 }
+
 .cancel {
   color: #aaa;
 }
+
 .type {
   display: inline-block;
   position: relative;
 
-  padding-left: 0 !important  ;
+  padding-left: 0 !important;
   width: 10px;
   height: 10px;
   border-radius: 50px;
   background: #9aabad;
 }
+
 .main .tbody .tr:hover {
   // border: 2px solid #409eff;
   // box-shadow: 5px 5px 5px #666;
@@ -883,16 +851,19 @@ export default {
   // text-overflow: ellipsis;
   // white-space: w;
 }
+
 .main .tbody .tr div {
   flex: 1;
   padding-left: 80px;
   font-size: 16px;
   color: #535767;
+
   .itemMin {
     margin-left: 10px;
     font-size: 16px;
     color: #778ca2;
   }
+
   /* padding-left: 10px; */
 }
 
@@ -903,19 +874,23 @@ export default {
   right: -90px;
   position: relative;
 }
+
 .bottom .pagination {
   position: absolute;
   right: 0;
 }
+
 .active {
   color: red;
 }
+
 .title-img {
   position: absolute;
   right: 70px;
 
   top: 40px;
 }
+
 .urlAddress {
   text-align: center;
   width: 80%;
@@ -923,6 +898,7 @@ export default {
   margin-top: 20px;
   font-size: 16px;
 }
+
 .img {
   color: #5e74eb;
   cursor: pointer;

src/views/system/confenceLibrary.vue

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

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

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

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

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

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

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