před 2 roky · 44fd5698ba
--- a/src/HDrpManagement/customerData/components/pageTable.vue
+++ b/src/HDrpManagement/customerData/components/pageTable.vue
@@ -1,7 +1,7 @@
 
				 
			
 
				 <template>
			
 
				-  <div style="width:100%">
			
 
				-    <div>
			
 
				+  <div style="width:100%;height:100%">
			
 
				+    <div class="tablebox">
			
 
				       <tableLayout height="356px" :layout="tablecols" v-bind="$attrs" :data="list2" :opwidth="200"  :custom="true" :width="false" fixedName="operation" :customHeader="true">
			
 
				         <template v-slot:header="data">
			
 
				           <div v-if="data.data.label == '综合折扣'" style="display:flex;align-items:center">
			
@@ -35,7 +35,7 @@
 
				           @current-change="handleCurrentChange"
			
 
				           :current-page="param.content.pageNumber"
			
 
				           :page-sizes="[20, 50, 100, 200]"
			
 
				-          layout="total,sizes, prev, pager, next, jumper"
			
 
				+          :layout="fullScroll ? `total, prev, pager, next, jumper` : `total,sizes, prev, pager, next, jumper`"
			
 
				           :total="total">
			
 
				       </el-pagination>
			
 
				     </div>
			
@@ -43,6 +43,7 @@
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				+import {mapGetters} from 'vuex'
			
 
				 export default {
			
 
				   props:["tablecols",'param','custom'],
			
 
				   data () {
			
@@ -54,6 +55,11 @@ export default {
 
				       ],
			
 
				     }
			
 
				   },
			
 
				+  computed:{
			
 
				+    ...mapGetters({
			
 
				+      fullScroll:'fullScroll'
			
 
				+    })
			
 
				+  },
			
 
				   methods:{
			
 
				     async listData(init){
			
 
				       if(init) this.$emit('handleParam',this.param)
			
@@ -85,6 +91,12 @@ export default {
 
				 
			
 
				 </script>
			
 
				 <style scoped>
			
 
				+.tablebox {
			
 
				+  height: calc(100% - 44px);
			
 
				+}
			
 
				+.tablebox > div {
			
 
				+  height: 100%;
			
 
				+}
			
 
				 /deep/.el-table {
			
 
				   min-height: 100% !important;
			
 
				   max-height: 100% !important;
			
--- a/src/HDrpManagement/customerData/index.vue
+++ b/src/HDrpManagement/customerData/index.vue
--- a/src/HDrpManagement/projectData/components/pageTable.vue
+++ b/src/HDrpManagement/projectData/components/pageTable.vue
@@ -1,7 +1,7 @@
 
				 
			
 
				 <template>
			
 
				-  <div style="width:100%">
			
 
				-    <div>
			
 
				+  <div style="width:100%;height:100%">
			
 
				+    <div class="tablebox">
			
 
				       <tableLayout height="356px" :layout="tablecols" v-bind="$attrs" :data="list2" :opwidth="200"  :custom="true" :width="false" fixedName="operation" :customHeader="true">
			
 
				         <template v-slot:header="data">
			
 
				           <div v-if="data.data.label == '综合折扣'" style="display:flex;align-items:center">
			
@@ -35,7 +35,7 @@
 
				           @current-change="handleCurrentChange"
			
 
				           :current-page="param.content.pageNumber"
			
 
				           :page-sizes="[20, 50, 100, 200]"
			
 
				-          layout="total,sizes, prev, pager, next, jumper"
			
 
				+          :layout="fullScroll ? `total, prev, pager, next, jumper` : `total,sizes, prev, pager, next, jumper`"
			
 
				           :total="total">
			
 
				       </el-pagination>
			
 
				     </div>
			
@@ -43,6 +43,7 @@
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				+import {mapGetters} from 'vuex'
			
 
				 export default {
			
 
				   props:["tablecols",'param','custom'],
			
 
				   data () {
			
@@ -54,6 +55,11 @@ export default {
 
				       ],
			
 
				     }
			
 
				   },
			
 
				+  computed:{
			
 
				+    ...mapGetters({
			
 
				+      fullScroll:'fullScroll'
			
 
				+    })
			
 
				+  },
			
 
				   methods:{
			
 
				     async listData(init){
			
 
				       if(init) this.$emit('handleParam',this.param)
			
@@ -85,6 +91,12 @@ export default {
 
				 
			
 
				 </script>
			
 
				 <style scoped>
			
 
				+.tablebox {
			
 
				+  height: calc(100% - 44px);
			
 
				+}
			
 
				+.tablebox > div {
			
 
				+  height: 100%;
			
 
				+}
			
 
				 /deep/.el-table {
			
 
				   min-height: 100% !important;
			
 
				   max-height: 100% !important;
			
--- a/src/HDrpManagement/projectData/index.vue
+++ b/src/HDrpManagement/projectData/index.vue
--- a/src/components/fullScroll/index.vue
+++ b/src/components/fullScroll/index.vue
@@ -5,14 +5,19 @@
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				+import {mapGetters} from 'vuex'
			
 
				 export default {
			
 
				   name:'fullScroll',
			
 
				   data() {
			
 
				     return {
			
 
				-      fullscreen:false
			
 
				     }
			
 
				   },
			
 
				   props:['domId'],
			
 
				+  computed:{
			
 
				+    ...mapGetters({
			
 
				+      fullScroll:'fullScroll'
			
 
				+    })
			
 
				+  },
			
 
				   methods: {
			
 
				     enterFullscreen () {
			
 
				       if (this.fullscreen) {
			
@@ -25,7 +30,7 @@ export default {
 
				         } else if (document.msExitFullscreen) {
			
 
				             document.msExitFullscreen();
			
 
				         }
			
 
				-        this.fullscreen = false
			
 
				+        this.$store.commit('setFullScroll',false)
			
 
				       } else {
			
 
				         /* 获取(<html>)元素以全屏显示页面 */
			
 
				         const full = document.getElementById(this.domId)
			
@@ -41,7 +46,7 @@ export default {
 
				         } else if (full.msRequestFullscreen) {
			
 
				             full.msRequestFullscreen()
			
 
				         }
			
 
				-        this.fullscreen = true
			
 
				+        this.$store.commit('setFullScroll',true)
			
 
				       }
			
 
				       
			
 
				     },
			
@@ -52,9 +57,11 @@ export default {
 
				       if (document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement) {
			
 
				         // 全屏模式激活
			
 
				         console.log('全屏模式已激活');
			
 
				+        this.$store.commit('setFullScroll',true)
			
 
				         this.fullscreen = true
			
 
				       } else {
			
 
				         // 全屏模式退出
			
 
				+        this.$store.commit('setFullScroll',false)
			
 
				         this.fullscreen = false
			
 
				         console.log('全屏模式已退出');
			
 
				       }
			
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -28,7 +28,8 @@ export default new Vuex.Store({
 
				     DrawerShow:false,
			
 
				     historyRouter:null,
			
 
				     pageCache:[],
			
 
				-    svlistData:[]
			
 
				+    svlistData:[],
			
 
				+    fullScroll:false
			
 
				   },
			
 
				   getters: {
			
 
				     siteinfo:state => state.siteinfo,
			
@@ -51,6 +52,7 @@ export default new Vuex.Store({
 
				     isRouterAlive:state => state.isRouterAlive,
			
 
				     pageCache: state => state.pageCache,
			
 
				     svlistData:state => state.svlistData,
			
 
				+    fullScroll:state => state.fullScroll
			
 
				 
			
 
				   },
			
 
				   mutations: {
			
@@ -127,6 +129,9 @@ export default new Vuex.Store({
 
				     },
			
 
				     saveListData (state,data) {
			
 
				       state.svlistData = data
			
 
				+    },
			
 
				+    setFullScroll (state,data) {
			
 
				+      state.fullScroll = data
			
 
				     }
			
 
				   },
			
 
				   actions: {