Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/customerData/index.vue

@@ -152,8 +152,8 @@
                 </div>
               </div>
               <div class="panel-content">
-                <div ref="customerTypeEl" style="width:450rem"></div>
-                <div class="panel-table" style="width:1151rem">
+                <div ref="customerTypeEl" style="width:30%"></div>
+                <div class="panel-table" style="width:70%">
                   <pageTable
                     ref="customerTypeTable"
                     :tablecols="tool.tabelCol($route.name).typeTable.tablecols"
@@ -223,8 +223,8 @@
                 </div>
               </div>
               <div class="panel-content">
-                <div ref="customerGradEl" style="width:430rem"></div>
-                <div class="panel-table" style="width:1151rem">
+                <div ref="customerGradEl" style="width:30%"></div>
+                <div class="panel-table" style="width:70%">
                   <pageTable
                     ref="customerGradTable"
                     :tablecols="tool.tabelCol($route.name).typeTable.tablecols"
@@ -291,8 +291,8 @@
                 </div>
               </div>
               <div class="panel-content">
-                <div ref="customerContactEl" style="width:430rem"></div>
-                <div class="panel-table" style="width:1151rem">
+                <div ref="customerContactEl" style="width:30%"></div>
+                <div class="panel-table" style="width:70%">
                   <pageTable
                     ref="customerContactTable"
                     :tablecols="tool.tabelCol($route.name).typeTable.tablecols"
@@ -358,8 +358,8 @@
                 </div>
               </div>
               <div class="panel-content">
-                <div ref="customerProjectEl" style="width:430rem"></div>
-                <div class="panel-table" style="width:1151rem">
+                <div ref="customerProjectEl" style="width:30%"></div>
+                <div class="panel-table" style="width:70%">
                   <pageTable
                     ref="customerProjectTable"
                     :tablecols="tool.tabelCol($route.name).typeTable.tablecols"
@@ -425,8 +425,8 @@
                 </div>
               </div>
               <div class="panel-content">
-                <div ref="customerFllowEl" style="width:430rem"></div>
-                <div class="panel-table" style="width:1151rem">
+                <div ref="customerFllowEl" style="width:30%"></div>
+                <div class="panel-table" style="width:70%">
                   <pageTable
                     ref="customerFllowTable"
                     :tablecols="tool.tabelCol($route.name).typeTable.tablecols"

src/store/index.js

@@ -27,7 +27,7 @@ export default new Vuex.Store({
     closeDrawerTemp:false,
     DrawerShow:false,
     historyRouter:null,
-    pageCache:['projectData'],
+    pageCache:[],
     svlistData:[]
   },
   getters: {