Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

 弹窗封装
 弹窗封装
-1.在main.js中引入 import Popup from './components/tanchuang/index'
-                  Vue.prototype.$popup = Popup.install
 2.用法以及参数：
 2.用法以及参数：
   this.$popup('提示','ywbl/dbx/aa',{
   this.$popup('提示','ywbl/dbx/aa',{
     formData:this.formData, //父组件传给子组件的参数  
     formData:this.formData, //父组件传给子组件的参数  
-    cancel: function () {}, //取消事件的回调
+    cancel: function () {}, //取消事件的回调 
     confirm: function () {}, //确认事件的回调
     confirm: function () {}, //确认事件的回调
-    iconClass:"",//标题前面icon图标名称
   })    
   })    
 3.子组件的方法名字必须统一为 childFn()
 3.子组件的方法名字必须统一为 childFn()
 4.子组件切记props接收 父组件传参formData  
 4.子组件切记props接收 父组件传参formData  

@@ -25,7 +25,7 @@ router.beforeEach(async (to, from, next) => {
         router.addRoutes([...accessRoutes, { path: '*', redirect: '/404', hidden: true }])
         router.addRoutes([...accessRoutes, { path: '*', redirect: '/404', hidden: true }])
         const routeTo = Cookies.get('routerTo')
         const routeTo = Cookies.get('routerTo')
         if (routeTo) {
         if (routeTo) {
-            next(routeTo)
+            next({ ...to, replace: true })
         } else {
         } else {
             next('/home')
             next('/home')
         }
         }

@@ -25,7 +25,7 @@
 
 
 							<!-- 循环幢单元下的层户 -->
 							<!-- 循环幢单元下的层户 -->
 							<!-- <div class="chTable-wrap"> -->
 							<!-- <div class="chTable-wrap"> -->
-							<table class="chTable psr" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length > 0">
+							<table class="chTable psr" border="0" cellspacing="0" cellpadding="0" v-show="zdys.cs.length > 0">
 								<tr v-for="(cs, csIndex) in zdys.cs" :key="csIndex">
 								<tr v-for="(cs, csIndex) in zdys.cs" :key="csIndex">
 									<!-- 显示层数 -->
 									<!-- 显示层数 -->
 									<td class="floor" ref="cBsm" @contextmenu.prevent="openMenu($event, cs, 'c')"
 									<td class="floor" ref="cBsm" @contextmenu.prevent="openMenu($event, cs, 'c')"
@@ -1136,6 +1136,7 @@ export default {
 
 
 		// 公共部分样式 start
 		// 公共部分样式 start
 		.chTable {
 		.chTable {
+			margin-left: -1px;
 
 
 			// position: relative;
 			// position: relative;
 			tr {
 			tr {
@@ -1150,6 +1151,7 @@ export default {
 					text-align: center;
 					text-align: center;
 					cursor: pointer;
 					cursor: pointer;
 					position: relative;
 					position: relative;
+					border: 1px solid #d5d6da;
 
 
 					.hqszt {
 					.hqszt {
 						display: inline-block;
 						display: inline-block;
@@ -1225,7 +1227,7 @@ export default {
 			p {
 			p {
 				width: calc(100% - 2px);
 				width: calc(100% - 2px);
 				height: 100%;
 				height: 100%;
-				border: 1px solid #E6E6E6;
+				// border: 1px solid #E6E6E6;
 			}
 			}
 		}
 		}