Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

dsk-operate-ui/src/assets/styles/project.scss

@@ -1223,4 +1223,14 @@
   .el-table__fixed-header-wrapper {
     z-index: 9;
   }
+
+  .el-table__fixed-header-wrapper{
+    position: sticky;
+    z-index: 9;
+    top: 56px;
+  }
+  .el-table__fixed{
+    overflow-x: clip;
+    overflow-y: clip;
+  }
 }

dsk-operate-ui/src/views/custom/customList/index.vue

@@ -26,7 +26,7 @@
             </div>
           </div>
           <skeleton v-if="isSkeleton"></skeleton>
-          <el-table id="tables" v-if="!isSkeleton&&tableData.total > 0" class="fixed-table"
+          <el-table v-if="!isSkeleton&&tableData.total > 0" class="fixed-table"
                     :data="tableData.rows"
             stripe border
             style="width: 100%">
@@ -317,26 +317,7 @@
     this.getDictType()
     this.prvinceTree()
   },
-    mounted() {
-      window.addEventListener("scroll",this.scrolling)
-    },
-    beforeDestroy() {
-      window.removeEventListener("scroll", this.scrolling);
-    },
   methods:{
-    scrolling() {
-      let e1 = document.getElementById("tables").offsetTop
-      let e2 = document.getElementsByClassName("navbar")[0].getBoundingClientRect().height
-      let mheight = e1+e2 +2
-      let el = document.getElementsByClassName("el-table__fixed-header-wrapper")[0]
-      let scrollTop = document.documentElement.scrollTop ||document.body.scrollTop;
-      if (scrollTop>mheight){
-        let top = scrollTop-mheight
-        el.style.top = top+'px'
-      }else{
-        el.style.top = 0
-      }
-    },
     sq1(item,sq){
       this.$nextTick(()=>{
         item.sq1 = sq

dsk-operate-ui/src/views/custom/historicalCustomers/index.vue

@@ -18,7 +18,7 @@
             </div>
           </div>
           <skeleton v-if="isSkeleton"></skeleton>
-          <el-table id="tables" v-if="!isSkeleton&&tableData.total > 0" class="fixed-table"
+          <el-table v-if="!isSkeleton&&tableData.total > 0" class="fixed-table"
             :data="tableData.rows"
             stripe border
             style="width: 100%">
@@ -246,26 +246,7 @@ export default {
     this.getCustomerList()
     this.getDictType()
   },
-  mounted() {
-    window.addEventListener("scroll",this.scrolling)
-  },
-  beforeDestroy() {
-    window.removeEventListener("scroll", this.scrolling);
-  },
   methods:{
-    scrolling() {
-      let e1 = document.getElementById("tables").offsetTop
-      let e2 = document.getElementsByClassName("navbar")[0].getBoundingClientRect().height
-      let mheight = e1+e2 +2
-      let el = document.getElementsByClassName("el-table__fixed-header-wrapper")[0]
-      let scrollTop = document.documentElement.scrollTop ||document.body.scrollTop;
-      if (scrollTop>mheight){
-        let top = scrollTop-mheight
-        el.style.top = top+'px'
-      }else{
-        el.style.top = 0
-      }
-    },
     sq1(item,sq){
       this.$nextTick(()=>{
         item.sq1 = sq

dsk-operate-ui/src/views/macro/economies/component/regionalEconomy.vue

@@ -7,7 +7,7 @@
           <div class="item-title"><i style="background: #4E8EFF;"></i>{{recentlyYear.year}}年GDP</div>
           <div class="item-count">
             <span>{{recentlyYear.gdp}}</span>亿
-            <img v-if="recentlyYear.gdpGrowth > 0" src="@/assets/images/economies/icon_up.png">
+            <img v-if="Number(getMoneyNum(recentlyYear.gdpGrowth)) > 0" src="@/assets/images/economies/icon_up.png">
             <img v-else src="@/assets/images/economies/icon_down.png">
           </div>
           <div id="echartsGDP" style="height: 75px;"></div>
@@ -18,7 +18,7 @@
           <div class="item-title"><i style="background: #718AFF;"></i>{{recentlyYear.year}}年GDP增速</div>
           <div class="item-count">
             <span>{{recentlyYear.gdpGrowth}}</span>%
-            <img v-if="(recentlyYear.gdpGrowth-nextYearMap.gdpGrowth) > 0" src="@/assets/images/economies/icon_up.png">
+            <img v-if="(Number(getMoneyNum(recentlyYear.gdpGrowth))-Number(getMoneyNum(nextYearMap.gdpGrowth))) > 0" src="@/assets/images/economies/icon_up.png">
             <img v-else src="@/assets/images/economies/icon_down.png">
           </div>
           <div id="echartsZS" style="height: 75px;"></div>
@@ -29,7 +29,7 @@
           <div class="item-title"><i style="background: #3AD0D1;"></i>{{recentlyYear.year}}年人口</div>
           <div class="item-count">
             <span>{{recentlyYear.population}}</span>万
-            <img v-if="recentlyYear.populationGrowthRate > 0" src="@/assets/images/economies/icon_up.png">
+            <img v-if="Number(getMoneyNum(recentlyYear.populationGrowthRate)) > 0" src="@/assets/images/economies/icon_up.png">
             <img v-else src="@/assets/images/economies/icon_down.png">
           </div>
           <div id="echartsRK" style="height: 75px;"></div>
@@ -40,7 +40,7 @@
           <div class="item-title"><i style="background: #FFBE5D;"></i>{{recentlyYear.year}}年一般公共预算收入</div>
           <div class="item-count">
             <span>{{recentlyYear.gbr}}</span>亿
-            <img v-if="recentlyYear.gbrGrowth > 0" src="@/assets/images/economies/icon_up.png">
+            <img v-if="Number(getMoneyNum(recentlyYear.gbrGrowth)) > 0" src="@/assets/images/economies/icon_up.png">
             <img v-else src="@/assets/images/economies/icon_down.png">
           </div>
           <div id="echartsSR" style="height: 75px;"></div>
@@ -51,7 +51,7 @@
           <div class="item-title"><i style="background: #FF8935;"></i>{{recentlyYear.year}}年地方政府债务余额</div>
           <div class="item-count">
             <span>{{recentlyYear.govDebtBalance}}</span>亿
-            <img v-if="recentlyYear.govDebtBalance > nextYearMap.govDebtBalance" src="@/assets/images/economies/icon_up.png">
+            <img v-if="Number(getMoneyNum(recentlyYear.govDebtBalance)) > Number(getMoneyNum(nextYearMap.govDebtBalance))" src="@/assets/images/economies/icon_up.png">
             <img v-else src="@/assets/images/economies/icon_down.png">
           </div>
           <div id="echartsYE" style="height: 75px;"></div>