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

dsk-operate-ui/src/layout/components/AppMain.vue

@@ -51,6 +51,11 @@ export default {
     padding-top: 84px;
   }
 }
+.EnterpriseData{
+  .app-main {
+    overflow: initial;
+  }
+}
 </style>
 
 <style lang="scss">

dsk-operate-ui/src/layout/index.vue

@@ -2,7 +2,7 @@
   <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
     <sidebar v-if="!sidebar.hide" class="sidebar-container" @handleBar="handleSideBar" id="sidebar"/>
-    <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
+    <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide,EnterpriseData:$route.name=='EnterpriseData'}" class="main-container">
       <div :class="{'fixed-header':fixedHeader}">
         <navbar :offsetWidth="offsetWidth"/>
       </div>

dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue

@@ -153,7 +153,7 @@
 </template>
 
 <script>
-import { changePath } from '@/assets/js/common'
+import { changePath,encodeStr } from '@/assets/js/common'
 var Swiper = require('@/assets/lib/swiper/swiper-bundle.min.js')
 import "@/assets/lib/swiper/swiper-bundle.css"
 import { claim } from "@/api/common"
@@ -163,8 +163,10 @@ export default {
   props: ['companyId', 'companyInfo', 'statistic'],
   data() {
     return {
+      encodeStr,
       newStatic: null,
       labelList: [], //企业标签
+      customerId:'',
       claimLoading: false,
       ifClaim: 0, //是否认领
       showMore: false,
@@ -213,7 +215,8 @@ export default {
         this.claimLoading = false
         if(res.code==200){
           this.dialogVisible=true
-          this.ifClaim = 1
+          this.companyInfo.claimStatus = 1
+          this.customerId = res.data.customerId
         }
       }else{
         this.$message.warning('对不起，当前不能认领')
@@ -325,7 +328,15 @@ export default {
     },
     renlin(){
       this.dialogVisible=false;
-      // this.$router.push({path:'/home',query: {id:'1'}})
+      // window.location.href = window.location.origin+window.location.pathname+'?customerId='+this.customerId+'&path=business'
+      this.$router.replace({ 
+        path: '/enterprise/'+encodeStr(this.companyId),
+        query: { 
+          'customerId': this.customerId,
+          'path':'business'
+          } ,
+        })
+        this.$router.go(0)
       // 跳转地址
     },
     renHide(){

dsk-operate-ui/src/views/detail/party-a/overview/component/operations.vue

@@ -122,7 +122,7 @@ export default {
               margin-right: 22px;
               font-weight: bold;
               font-size: 20px;
-              color: #0081FF;
+              color: #232323;
               padding: 24px 16px 0 16px;
               span{
                 font-size: 16px;
@@ -132,7 +132,7 @@ export default {
               padding: 14px 16px 10px 16px;
               justify-content: space-between;
               font-size: 14px;
-              color: #416587;
+              color: #232323;
               div{
                 flex-shrink: 0;
               }

dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue

@@ -143,7 +143,7 @@
 			<div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</div>
 		</div>
 	  	<div class=" table-item-jf" v-if="tableData.length>0">
-	  	  <el-table :data="tableData" v-loading="loading" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" element-loading-text="Loading" height="500" class="table-item1"  border  highlight-current-row>
+	  	  <el-table  :data="tableData" v-loading="loading" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" element-loading-text="Loading"  class="table-item1 fixed-table"  border  highlight-current-row>
 	  			<el-table-column type="index" label="序号" fixed width="60">
 	  			 <template slot-scope="scope">
 	  			 	<span>{{(pageNum - 1) *20 + scope.$index + 1}}</span>
@@ -614,10 +614,24 @@ export default {
   	});
   },
   mounted() {
-   
+	window.addEventListener("scroll",this.scrolling)
     this.init();
   },
+  beforeDestroy() {
+    window.removeEventListener("scroll", this.scrolling);
+  },
   methods: {
+	scrolling() {
+		let el = document.getElementsByClassName("el-table__fixed-header-wrapper")[0]
+      	let scrollTop =window.pageYOffset ||document.documentElement.scrollTop ||document.body.scrollTop;
+		if (scrollTop>400){
+			let top = scrollTop-401
+			el.style.top = top+'px'
+		}else{
+			el.style.top = 0
+		}
+      
+    },
     domicileChange() {
     	let arr = this.$refs.address.getCheckedNodes();
     	let provinceIds = [],
@@ -1245,6 +1259,20 @@ export default {
 			::v-deep .el-table__body-wrapper{
 				color: #232323;
 			}
+		}
+		.fixed-table{
+			overflow:initial;
+
+			::v-deep .el-table__header-wrapper{
+				position: sticky;
+				top:56px;
+				z-index: 9;
+			}
+			::v-deep .el-table__fixed-header-wrapper{
+				z-index: 9;
+			}
+			
+			
 		}
 		.table-item-jf1{
 			border-top:1px solid  #EFEFEF;

dsk-system/src/main/java/com/dsk/system/service/impl/EconomicServiceImpl.java

@@ -58,11 +58,14 @@ public class EconomicServiceImpl implements EconomicService {
     public AjaxResult location(OpRegionalLocalDto detailsDto) {
         Long userId = SecurityUtils.getLoginUser().getUserId();
         String redisKey = CacheConstants.PERSONAL_LOCATION + userId;
-
+        if (ObjectUtil.isEmpty(detailsDto.getProvinceId()) && ObjectUtil.isEmpty(detailsDto.getCityId()) && ObjectUtil.isEmpty(detailsDto.getAreaId())) {
+            if (ObjectUtil.isNotEmpty(redisKey)) {
                 Map<String, Object> cacheMap = redisCache.getCacheMap(redisKey);
                 if (MapUtils.isNotEmpty(cacheMap)) {
                     return AjaxResult.success(cacheMap);
                 }
+            }
+        }
 
         Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/location", BeanUtil.beanToMap(detailsDto, false, false));
         Integer code = MapUtils.getInteger(map, "code", 300);